Write canonicalized SDK

Author: srawlins

lib/src/dartdoc_options.dart

@@ -669,8 +669,8 @@ abstract class DartdocOption<T> {
   String get _directoryCurrentPath => resourceProvider.pathContext.current;
 
   /// Calls [valueAt] on the directory this element is defined in.
-  T valueAtElement(Element element) => valueAt(resourceProvider.getFolder(
-      resourceProvider.pathContext.canonicalize(
+  T valueAtElement(Element element) =>
+      valueAt(resourceProvider.getFolder(resourceProvider.pathContext.normalize(
           resourceProvider.pathContext.basename(element.source.fullName))));
 
   /// Adds a DartdocOption to the children of this DartdocOption.

lib/src/model/package.dart

@@ -12,7 +12,9 @@ import 'package:dartdoc/src/warnings.dart';
 import 'package:path/path.dart' as path;
 import 'package:pub_semver/pub_semver.dart';
 
-final RegExp substituteNameVersion = RegExp(r'%([bnv])%');
+@Deprecated('Public variable intended to be private; will be removed as early '
+    'as Dartdoc 1.0.0')
+RegExp get substituteNameVersion => Package._substituteNameVersion;
 
 // All hrefs are emitted as relative paths from the output root. We are unable
 // to compute them from the page we are generating, and many properties computed
@@ -224,51 +226,56 @@ class Package extends LibraryContainer
   String _baseHref;
 
   String get baseHref {
-    if (_baseHref == null) {
-      if (documentedWhere == DocumentLocation.remote) {
-        _baseHref =
-            config.linkToUrl.replaceAllMapped(substituteNameVersion, (m) {
-          switch (m.group(1)) {
-            // Return the prerelease tag of the release if a prerelease,
-            // or 'stable' otherwise. Mostly coded around
-            // the Dart SDK's use of dev/stable, but theoretically applicable
-            // elsewhere.
-            case 'b':
-              {
-                var version = Version.parse(packageMeta.version);
-                var tag = 'stable';
-                if (version.isPreRelease) {
-                  // version.preRelease is a List<dynamic> with a mix of
-                  // integers and strings.  Given this, handle
-                  // 2.8.0-dev.1.0, 2.9.0-1.0.dev, and similar
-                  // variations.
-                  tag = version.preRelease.whereType<String>().first;
-                  // Who knows about non-SDK packages, but assert that SDKs
-                  // must conform to the known format.
-                  assert(
-                      packageMeta.isSdk == false || int.tryParse(tag) == null,
-                      'Got an integer as string instead of the expected "dev" tag');
-                }
-                return tag;
-              }
-            case 'n':
-              return name;
-            // The full version string of the package.
-            case 'v':
-              return packageMeta.version;
-            default:
-              assert(false, 'Unsupported case: ${m.group(1)}');
-              return null;
-          }
-        });
-        if (!_baseHref.endsWith('/')) _baseHref = '${_baseHref}/';
-      } else {
-        _baseHref = config.useBaseHref ? '' : HTMLBASE_PLACEHOLDER;
-      }
+    if (_baseHref != null) {
+      return _baseHref;
     }
+
+    if (documentedWhere == DocumentLocation.remote) {
+      _baseHref = _remoteBaseHref;
+      if (!_baseHref.endsWith('/')) _baseHref = '${_baseHref}/';
+    } else {
+      _baseHref = config.useBaseHref ? '' : HTMLBASE_PLACEHOLDER;
+    }
+
     return _baseHref;
   }
 
+  String get _remoteBaseHref {
+    return config.linkToUrl.replaceAllMapped(_substituteNameVersion, (m) {
+      switch (m.group(1)) {
+        // Return the prerelease tag of the release if a prerelease, or 'stable'
+        // otherwise.  Mostly coded around the Dart SDK's use of dev/stable, but
+        // theoretically applicable elsewhere.
+        case 'b':
+          {
+            var version = Version.parse(packageMeta.version);
+            var tag = 'stable';
+            if (version.isPreRelease) {
+              // `version.preRelease` is a `List<dynamic>` with a mix of
+              // integers and strings.  Given this, handle
+              // "2.8.0-dev.1.0, 2.9.0-1.0.dev", and similar variations.
+              tag = version.preRelease.whereType<String>().first;
+              // Who knows about non-SDK packages, but SDKs must conform to the
+              // known format.
+              assert(packageMeta.isSdk == false || int.tryParse(tag) == null,
+                  'Got an integer as string instead of the expected "dev" tag');
+            }
+            return tag;
+          }
+        case 'n':
+          return name;
+        // The full version string of the package.
+        case 'v':
+          return packageMeta.version;
+        default:
+          assert(false, 'Unsupported case: ${m.group(1)}');
+          return null;
+      }
+    });
+  }
+
+  static final _substituteNameVersion = RegExp(r'%([bnv])%');
+
   @override
   String get href => '$baseHref$filePath';
 

lib/src/model/package_builder.dart

@@ -169,17 +169,9 @@ class PubPackageBuilder implements PackageBuilder {
       // TODO(jcollins-g): Make use of currently not existing API for managing
       //                   many AnalysisDrivers
       // TODO(jcollins-g): make use of DartProject isApi()
-      _driver = AnalysisDriver(
-        scheduler,
-        log,
-        resourceProvider,
-        MemoryByteStore(),
-        FileContentOverlay(),
-        null,
-        sourceFactory,
-        options,
-        packages: Packages.empty,
-      );
+      _driver = AnalysisDriver(scheduler, log, resourceProvider,
+          MemoryByteStore(), FileContentOverlay(), null, sourceFactory, options,
+          packages: Packages.empty);
       driver.results.listen((_) => logProgress(''));
       driver.exceptions.listen((_) {});
       scheduler.start();
@@ -439,7 +431,7 @@ class PubPackageBuilder implements PackageBuilder {
   }
 
   Future<void> getLibraries(PackageGraph uninitializedPackageGraph) async {
-    DartSdk findSpecialsSdk = sdk;
+    var findSpecialsSdk = sdk;
     if (embedderSdk != null && embedderSdk.urlMappings.isNotEmpty) {
       findSpecialsSdk = embedderSdk;
     }

lib/src/package_config_provider.dart

@@ -8,6 +8,10 @@ import 'dart:io' as io;
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:package_config/package_config.dart' as package_config;
 
+/// A provider of PackageConfig-finding methods.
+///
+/// This provides an abstraction around package_config, which can only work
+/// with the physical file system.
 abstract class PackageConfigProvider {
   Future<package_config.PackageConfig> findPackageConfig(Folder dir);
 }

lib/src/package_meta.dart

@@ -99,9 +99,10 @@ abstract class PackageMeta {
 
   p.Context get pathContext => resourceProvider.pathContext;
 
-  /// Returns true if this represents a 'Dart' SDK.  A package can be part of
-  /// Dart and Flutter at the same time, but if we are part of a Dart SDK
-  /// sdkType should never return null.
+  /// Returns true if this represents a 'Dart' SDK.
+  ///
+  /// A package can be part of Dart and Flutter at the same time, but if we are
+  /// part of a Dart SDK, [sdkType] should never return null.
   bool get isSdk;
 
   /// Returns 'Dart' or 'Flutter' (preferentially, 'Flutter' when the answer is
@@ -160,11 +161,10 @@ abstract class PubPackageMeta extends PackageMeta {
       __sdkDirFilePaths = [];
       if (Platform.isWindows) {
         for (var paths in __sdkDirFilePathsPosix) {
-          var windowsPaths = <String>[];
-          for (var path in paths) {
-            windowsPaths
-                .add(p.joinAll(p.Context(style: p.Style.posix).split(path)));
-          }
+          var windowsPaths = [
+            for (var path in paths)
+              p.joinAll(p.Context(style: p.Style.posix).split(path)),
+          ];
           __sdkDirFilePaths.add(windowsPaths);
         }
       } else {
@@ -176,8 +176,8 @@ abstract class PubPackageMeta extends PackageMeta {
 
   static final _sdkDirParent = <String, Folder>{};
 
-  /// Returns the directory of the SDK if the given directory is inside a Dart
-  /// SDK.  Returns null if the directory isn't a subdirectory of the SDK.
+  /// If [dir] is inside a Dart SDK, returns the directory of the SDK, and `null`
+  /// otherwise.
   static Folder sdkDirParent(Folder dir, ResourceProvider resourceProvider) {
     var pathContext = resourceProvider.pathContext;
     var dirPathCanonical = pathContext.canonicalize(dir.path);

pubspec.yaml

@@ -19,7 +19,7 @@ dependencies:
   logging: ^0.11.3+1
   process: ^3.0.5
   markdown: ^2.1.5
-  meta: ^1.2.3
+  meta: ^1.1.8
   mustache: ^1.1.0
   package_config: '>=0.1.5 <2.0.0'
   path: ^1.3.0
@@ -43,4 +43,4 @@ dev_dependencies:
   test: ^1.3.0
 
 executables:
-  dartdoc: null
+  dartdoc: null

test/comment_processable_test.dart

@@ -38,13 +38,12 @@ void main() {
         .writeAsStringSync('''
 name: foo
 ''');
-    //var sdk = MockSdk(resourceProvider: resourceProvider);
     var packageMetaProvider = PackageMetaProvider(
       PubPackageMeta.fromElement,
       PubPackageMeta.fromFilename,
       PubPackageMeta.fromDir,
       resourceProvider,
-      resourceProvider.getFolder(sdkRoot),
+      resourceProvider.getFolder(resourceProvider.convertPath(sdkRoot)),
     );
     var optionSet = await DartdocOptionSet.fromOptionGenerators(
         'dartdoc', [createDartdocOptions], packageMetaProvider);

test/package_test.dart

@@ -23,35 +23,52 @@ void main() {
   FakePackageConfigProvider packageConfigProvider;
   PackageGraph packageGraph;
 
+  /// Dartdoc has a few indicator files it uses to verify that a directory
+  /// represents a Dart SDK. These include "bin/dart" and "bin/pub".
+  void writeSdkBinFiles(Folder root) {
+    var sdkBinFolder = root.getChildAssumingFolder('bin');
+    sdkBinFolder.getChildAssumingFile('dart').writeAsStringSync('');
+    sdkBinFolder.getChildAssumingFile('pub').writeAsStringSync('');
+  }
+
   void writeSdk() {
     mockSdk = MockSdk(resourceProvider: resourceProvider);
-    sdkFolder = resourceProvider.getFolder(sdkRoot);
-    var pathContext = resourceProvider.pathContext;
-    resourceProvider.getFolder(sdkRoot).create();
-    resourceProvider
-        .getFile(pathContext.join(sdkRoot, 'bin', 'dart'))
-        .writeAsStringSync('');
-    resourceProvider
-        .getFile(pathContext.join(sdkRoot, 'bin', 'pub'))
-        .writeAsStringSync('');
+    // The [MockSdk] only works in non-canonicalized paths, which include
+    // "C:\sdk", on Windows. Howerver, dartdoc works almost exclusively with
+    // canonical paths ("c:\sdk"). Copy all MockSdk files to the canonicalized
+    // path.
+    for (var l in mockSdk.sdkLibraries) {
+      var p = l.path;
+      resourceProvider
+          .getFile(resourceProvider.pathContext.canonicalize(p))
+          .writeAsStringSync(resourceProvider.getFile(p).readAsStringSync());
+    }
+    sdkFolder = resourceProvider.getFolder(resourceProvider.pathContext
+        .canonicalize(resourceProvider.convertPath(sdkRoot)))
+      ..create();
+    sdkFolder.getChildAssumingFile('version').writeAsStringSync('2.9.0');
+
+    writeSdkBinFiles(sdkFolder);
+    writeSdkBinFiles(
+        resourceProvider.getFolder(resourceProvider.convertPath(sdkRoot)));
   }
 
   void writePackage() {
     var pathContext = resourceProvider.pathContext;
-    var projectFolder = resourceProvider
-        .getFolder(resourceProvider.convertPath('/projects/$packageName'));
+    var projectsFolder = resourceProvider.getFolder(
+        pathContext.canonicalize(resourceProvider.convertPath('/projects')));
+    var projectFolder = projectsFolder.getChildAssumingFolder(packageName)
+      ..create;
     projectRoot = projectFolder.path;
-    projectFolder.create();
-    resourceProvider
-        .getFile(pathContext.join(projectRoot, 'pubspec.yaml'))
-        .writeAsStringSync('''
+    projectFolder.getChildAssumingFile('pubspec.yaml').writeAsStringSync('''
 name: $packageName
+version: 0.0.1
 ''');
-    resourceProvider
-        .getFile(
-            pathContext.join(projectRoot, '.dart_tool', 'package_config.json'))
+    projectFolder
+        .getChildAssumingFolder('.dart_tool')
+        .getChildAssumingFile('package_config.json')
         .writeAsStringSync('');
-    resourceProvider.getFolder(pathContext.join(projectRoot, 'lib')).create();
+    projectFolder.getChildAssumingFolder('lib').create();
     packageConfigProvider.addPackageToConfigFor(
         projectRoot, packageName, Uri.file('$projectRoot/'));
   }