Support full dart2js output for dartdoc/apidoc.

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.
  *
@@ skipping 17 matching lines @@
 
 void main() {
   final args = new Options().arguments;
 
   int mode = doc.MODE_STATIC;
   Path outputDir = new Path('docs');
   bool generateAppCache = false;
 
   List<String> excludedLibraries = <String>[];
   List<String> includedLibraries = <String>[];
-  var pkgPath;
+  Path pkgPath;
   String version;
 
   // Parse the command-line arguments.
   for (int i = 0; i < args.length; i++) {
     final arg = args[i];
 
     switch (arg) {
       case '--mode=static':
         mode = doc.MODE_STATIC;
         break;
 
       case '--mode=live-nav':
         mode = doc.MODE_LIVE_NAV;
         break;
 
       case '--generate-app-cache=true':
         generateAppCache = true;
         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('--out=')) {
           outputDir = new Path(arg.substring('--out='.length));
         } else if (arg.startsWith('--pkg=')) {
-          pkgPath = arg.substring('--pkg='.length);
+          pkgPath = new Path(arg.substring('--pkg='.length));
         } else if (arg.startsWith('--version=')) {
           version = arg.substring('--version='.length);
         } else {
           print('Unknown option: $arg');
           return;
         }
         break;
     }
   }
 
   final libPath = doc.scriptDir.append('../../sdk/');
 
   doc.cleanOutputDirectory(outputDir);
 
   // The basic dartdoc-provided static content.
   final copiedStatic = doc.copyDirectory(
       doc.scriptDir.append('../../sdk/lib/_internal/dartdoc/static'),
       outputDir);
 
   // The apidoc-specific static content.
   final copiedApiDocStatic = doc.copyDirectory(
       doc.scriptDir.append('static'),
       outputDir);
 
   print('Parsing MDN data...');
   final mdnFile = new File.fromPath(doc.scriptDir.append('mdn/database.json'));
   final mdn = json.parse(mdnFile.readAsStringSync());
 
   print('Cross-referencing dart:html...');
-  HtmlDiff.initialize(libPath);
   _diff = new HtmlDiff(printWarnings:false);
-  _diff.run();
+  Future htmlDiff = _diff.run(libPath);
 
   // Process libraries.
 
   // 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 = <Path>[];
   LIBRARIES.forEach((String name, LibraryInfo info) {
     if (info.documented) {
       apidocLibraries.add(new Path('dart:$name'));
@@ skipping 31 matching lines @@
       onDone: () {
         print('Generating docs...');
         final apidoc = new Apidoc(mdn, outputDir, mode, generateAppCache,
                                   excludedLibraries, version);
         apidoc.dartdocPath =
             doc.scriptDir.append('../../sdk/lib/_internal/dartdoc/');
         // Select the libraries to include in the produced documentation:
         apidoc.includeApi = true;
         apidoc.includedLibraries = includedLibraries;
 
-        Future.wait([copiedStatic, copiedApiDocStatic]).then((_) {
-          apidoc.documentLibraries(apidocLibraries, libPath, pkgPath);
+        Future.wait([copiedStatic, copiedApiDocStatic, htmlDiff]).then((_) {
+          Future<bool> documented =
+              apidoc.documentLibraries(apidocLibraries, libPath, pkgPath);
 
-          final compiled = doc.compileScript(mode, outputDir, libPath);
+          documented.then((_) {
+            final compiled = doc.compileScript(mode, outputDir, libPath);
 
-          Future.wait([compiled, copiedStatic, copiedApiDocStatic]).then((_) {
+            Future.wait([compiled]).then((_) {
+              apidoc.cleanup();
+            });
+          }, onError: (AsyncError asyncError) {
+            print('Generation failed: ${asyncError.error}');
             apidoc.cleanup();
           });
         });
       });
 }
 
 class Apidoc extends doc.Dartdoc {
   /** Big ball of JSON containing the scraped MDN documentation. */
   final Map mdn;
 
@@ skipping 155 matching lines @@
           <a href="$CCA">Creative Commons: Attribution-Sharealike license</a>.
           Mozilla has no other association with Dart or dartlang.org. We
           encourage you to improve the web by
           <a href="$CONTRIB">contributing</a> to
           <a href="$MDN">The Mozilla Developer Network</a>.
           </p>
           ''');
     }
   }
 
-  doc.MdnComment lookupMdnComment(Mirror mirror) { 
+  doc.MdnComment lookupMdnComment(Mirror mirror) {
     if (mirror is TypeMirror) {
       return includeMdnTypeComment(mirror);
     } else if (mirror is MemberMirror) {
       return includeMdnMemberComment(mirror);
     } else {
       return null;
     }
   }
 
   /**
@@ skipping 34 matching lines @@
     if (mdnType['summary'].trim().isEmpty) return null;
 
     // Remember which MDN page we're using so we can attribute it.
     return new doc.MdnComment(mdnType['summary'], mdnType['srcUrl']);
   }
 
   /**
    * Gets the MDN-scraped docs for [member], or `null` if this type isn't
    * scraped from MDN.
    */
-  MdnComment includeMdnMemberComment(MemberMirror member) {
+  doc.MdnComment includeMdnMemberComment(MemberMirror member) {
     var library = findLibrary(member);
     var memberString = '';
     if (HTML_LIBRARY_NAMES.contains(doc.displayName(library))) {
       // If it's an HTML type, try to map it to a DOM type name so we can find
       // the MDN docs.
       final domMembers = _diff.htmlToDom[member.qualifiedName];
 
       // Couldn't find a DOM type.
       if ((domMembers == null) || (domMembers.length != 1)) return null;
 
@@ skipping 43 matching lines @@
     final typeName = member.owner.simpleName;
     var memberName = '$typeName.${member.simpleName}';
     if (member is MethodMirror && (member.isConstructor || member.isFactory)) {
       final separator = member.constructorName == '' ? '' : '.';
       memberName = 'new $typeName$separator${member.constructorName}';
     }
 
     return a(memberUrl(member), memberName);
   }
 }