Use path package in dartdoc

utils/apidoc/apidoc.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * This generates the reference documentation for the core libraries that come
  * with dart. It is built on top of dartdoc, which is a general-purpose library
  * for generating docs from any Dart code. This library extends that to include
  * additional information and styling specific to our standard library.
  *
  * Usage:
  *
  *     $ dart apidoc.dart [--out=<output directory>]
  */
 library apidoc;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:json' as json;
 
 import 'html_diff.dart';
 
 // TODO(rnystrom): Use "package:" URL (#4968).
 import '../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors.dart';
 import '../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart';
 import '../../sdk/lib/_internal/compiler/implementation/filenames.dart';
 import '../../sdk/lib/_internal/dartdoc/lib/dartdoc.dart';
 import '../../sdk/lib/_internal/libraries.dart';
-import 'package:path/path.dart' as pathos;
+import 'package:path/path.dart' as path;
 
 HtmlDiff _diff;
 
 void main() {
   final args = new Options().arguments;
 
   int mode = MODE_STATIC;
-  Path outputDir = new Path('docs');
+  String outputDir = 'docs';
   bool generateAppCache = false;
 
   List<String> excludedLibraries = <String>[];
 
   // For libraries that have names matching the package name,
   // such as library unittest in package unittest, we just give
   // the package name with a --include-lib argument, such as:
   // --include-lib=unittest. These arguments are collected in
   // includedLibraries.
   List<String> includedLibraries = <String>[];
@@ skipping 26 matching lines @@
         break;
 
       default:
         if (arg.startsWith('--exclude-lib=')) {
           excludedLibraries.add(arg.substring('--exclude-lib='.length));
         } else if (arg.startsWith('--include-lib=')) {
           includedLibraries.add(arg.substring('--include-lib='.length));
         } else if (arg.startsWith('--extra-lib=')) {
           extraLibraries.add(arg.substring('--extra-lib='.length));
         } else if (arg.startsWith('--out=')) {
-          outputDir = new Path(arg.substring('--out='.length));
+          outputDir = arg.substring('--out='.length);
         } else if (arg.startsWith('--package-root=')) {
           packageRoot = arg.substring('--package-root='.length);
         } else if (arg.startsWith('--version=')) {
           version = arg.substring('--version='.length);
         } else {
           print('Unknown option: $arg');
           return;
         }
         break;
     }
   }
 
-  final libPath = scriptDir.append('../../sdk/');
+  final libPath = path.join(scriptDir, '..', '..', 'sdk/');
 
   cleanOutputDirectory(outputDir);
 
   print('Copying static files...');
   // The basic dartdoc-provided static content.
   final copiedStatic = copyDirectory(
-      scriptDir.append('../../sdk/lib/_internal/dartdoc/static'),
+      path.join(scriptDir,
+          '..', '..', 'sdk', 'lib', '_internal', 'dartdoc', 'static'),
       outputDir);
 
   // The apidoc-specific static content.
   final copiedApiDocStatic = copyDirectory(
-      scriptDir.append('static'),
+      path.join(scriptDir, 'static'),
       outputDir);
 
   print('Parsing MDN data...');
-  final mdnFile = new File.fromPath(scriptDir.append('mdn/database.json'));
+  final mdnFile = new File(path.join(scriptDir, 'mdn', 'database.json'));
   final mdn = json.parse(mdnFile.readAsStringSync());
 
   print('Cross-referencing dart:html...');
   // TODO(amouravski): move HtmlDiff inside of the future chain below to re-use
   // the MirrorSystem already analyzed.
   _diff = new HtmlDiff(printWarnings:false);
-  Future htmlDiff = _diff.run(currentDirectory.resolve(libPath.toString()));
+  Future htmlDiff = _diff.run(currentDirectory.resolve(libPath));
 
   // TODO(johnniwinther): Libraries for the compilation seem to be more like
   // URIs. Perhaps Path should have a toURI() method.
   // Add all of the core libraries.
   final apidocLibraries = <Uri>[];
   LIBRARIES.forEach((String name, LibraryInfo info) {
     if (info.documented) {
       apidocLibraries.add(Uri.parse('dart:$name'));
     }
   });
 
   // TODO(amouravski): This code is really wonky.
-  var lister = new Directory.fromPath(scriptDir.append('../../pkg')).list();
+  var lister = new Directory(path.join(scriptDir, '..', '..', 'pkg')).list();
   lister.listen((entity) {
     if (entity is Directory) {
-      var path = new Path(entity.path);
-      var libName = path.filename;
-      var libPath = path.append('lib/$libName.dart');
+      var libName = path.basename(entity.path);
+      var libPath = path.join(entity.path, 'lib', '${libName}.dart');
 
       // Ignore some libraries.
       if (excludedLibraries.contains(libName)) {
         return;
       }
 
       // Ignore hidden directories (like .svn) as well as pkg.xcodeproj.
       if (libName.startsWith('.') || libName.endsWith('.xcodeproj')) {
         return;
       }
 
-      if (new File.fromPath(libPath).existsSync()) {
-        apidocLibraries.add(pathos.toUri(libPath.toNativePath()));
+      if (new File(libPath).existsSync()) {
+        apidocLibraries.add(path.toUri(libPath));
         includedLibraries.add(libName);
       } else {
-        print('Warning: could not find package at $path');
+        print('Warning: could not find package at ${entity.path}');
       }
     }
   }, onDone: () {
     // Add any --extra libraries that had full pkg paths.
     // TODO(gram): if the handling of --include-lib libraries in the
     // listen() block above is cleaned up, then this will need to be
     // too, as it is a special case of the above.
     for (var lib in extraLibraries) {
-      var libPath = new Path('../../$lib');
-      if (new File.fromPath(libPath).existsSync()) {
-        apidocLibraries.add(pathos.toUri(libPath.toNativePath()));
-        var libName = libPath.filename.replaceAll('.dart', '');
+      var libPath = '../../$lib';
+      if (new File(libPath).existsSync()) {
+        apidocLibraries.add(path.toUri(libPath));
+        var libName = libPath.replaceAll('.dart', '');
         includedLibraries.add(libName);
       }
     }
 
     final apidoc = new Apidoc(mdn, outputDir, mode, generateAppCache,
                               excludedLibraries, version);
-    apidoc.dartdocPath =
-        scriptDir.append('../../sdk/lib/_internal/dartdoc/');
+    apidoc.dartdocPath = 
+        path.join(scriptDir, '..', '..', 'sdk', 'lib', '_internal', 'dartdoc');
     // Select the libraries to include in the produced documentation:
     apidoc.includeApi = true;
     apidoc.includedLibraries = includedLibraries;
 
     // TODO(amouravski): make apidoc use roughly the same flow as bin/dartdoc.
     Future.wait([copiedStatic, copiedApiDocStatic, htmlDiff])
       .then((_) => apidoc.documentLibraries(apidocLibraries, libPath,
             packageRoot))
       .then((_) => compileScript(mode, outputDir, libPath, apidoc.tmpPath))
       .then((_) => print(apidoc.status))
@@ skipping 19 matching lines @@
   // any entries that need to be ignored.
   static Set<String> _mdnTypeNamesToSkip = null;
 
   /**
    * The URL to the page on MDN that content was pulled from for the current
    * type being documented. Will be `null` if the type doesn't use any MDN
    * content.
    */
   String mdnUrl = null;
 
-  Apidoc(this.mdn, Path outputDir, int mode, bool generateAppCache,
+  Apidoc(this.mdn, String outputDir, int mode, bool generateAppCache,
       [List<String> excludedLibraries, String version]) {
     if (excludedLibraries != null) this.excludedLibraries = excludedLibraries;
     this.version = version;
     this.outputDir = outputDir;
     this.mode = mode;
     this.generateAppCache = generateAppCache;
 
     // Skip bad entries in the checked-in mdn/database.json:
     //  * UnknownElement has a top-level Gecko DOM page in German.
     if (_mdnTypeNamesToSkip == null)
@@ skipping 247 matching lines @@
     var memberName = '$typeName.${member.simpleName}';
     if (member is MethodMirror && member.isConstructor) {
       final separator = member.constructorName == '' ? '' : '.';
       memberName = 'new $typeName$separator${member.constructorName}';
     }
 
     return a(memberUrl(member), memberName);
   }
 }