Get rid of bash for dartdoc and do the whole thing in dart.

lib/dartdoc/dartdoc.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.
 
 /**
- * To use it, from this directory, run:
+ * To generate docs for a library, run this script with the path to an
+ * entrypoint .dart file, like:
  *
- *     $ ./dartdoc <path to .dart file>
+ * $ dart dartdoc.dart foo.dart

[nweiz, 2012/03/17 00:39:31]

Shouldn't this be indented so that it'll be code-formatted?

[Bob Nystrom, 2012/03/17 01:14:19]

Done.

  *
  * This will create a "docs" directory with the docs for your libraries. To
  * create these beautiful docs, dartdoc parses your library and every library
  * it imports (recursively). From each library, it parses all classes and
  * members, finds the associated doc comments and builds crosslinked docs from
  * them.
  */
 #library('dartdoc');
 
 #import('dart:io');
@@ skipping 63 matching lines @@
           return;
         }
         break;
     }
   }
 
   // The entrypoint of the library to generate docs for.
   final entrypoint = args[args.length - 1];
 
   final files = new VMFileSystem();
+
+  final frogPath = joinPaths(scriptDir, '../../frog/');
+
   // TODO(rnystrom): Note that the following line gets munged by create-sdk to
   // work with the SDK's different file layout. If you change it here, make
   // sure SDK builds still work.
-  parseOptions('../../frog', ['', '', '--libdir=../../frog/lib'], files);
+  parseOptions(frogPath, ['', '', '--libdir=$frogPath/lib'], files);
   initializeWorld(files);
 
-  var dartdoc;
-  final elapsed = time(() {
-    dartdoc = new Dartdoc();
+  var dartdoc = new Dartdoc();

[nweiz, 2012/03/17 00:39:31]

final

[Bob Nystrom, 2012/03/17 01:14:19]

Done.

 
-    if (includeSource != null) dartdoc.includeSource = includeSource;
-    if (mode != null) dartdoc.mode = mode;
-    if (outputDir != null) dartdoc.outputDir = outputDir;
+  if (includeSource != null) dartdoc.includeSource = includeSource;
+  if (mode != null) dartdoc.mode = mode;
+  if (outputDir != null) dartdoc.outputDir = outputDir;
 
-    cleanOutputDirectory(outputDir);
+  cleanOutputDirectory(dartdoc.outputDir);
 
-    // TODO(rnystrom): Use platform-specific path separator.
-    copyFiles('$scriptDir/static', outputDir);
+  // Compile the client-side code to JS.
+  final clientScript = (dartdoc.mode == MODE_STATIC) ? 'static' : 'live-nav';
+  compileScript(frogPath, '$scriptDir/client-$clientScript.dart',
+               '${dartdoc.outputDir}/client-$clientScript.js');
 
-    dartdoc.document(entrypoint);
-  });
+  // TODO(rnystrom): Use platform-specific path separator.

[nweiz, 2012/03/17 00:39:31]

I thought you were getting rid of this TODO

[Bob Nystrom, 2012/03/17 01:14:19]

Done.

+  copyFiles('$scriptDir/static', dartdoc.outputDir);
+
+  dartdoc.document(entrypoint);
 
   print('Documented ${dartdoc._totalLibraries} libraries, ' +
       '${dartdoc._totalTypes} types, and ' +
-      '${dartdoc._totalMembers} members in ${elapsed}msec.');
+      '${dartdoc._totalMembers} members.');
 }
 
 /**
  * Gets the full path to the directory containing the entrypoint of the current
  * script. In other words, if you invoked dartdoc, directly, it will be the
  * path to the directory containing `dartdoc.dart`. If you're running a script
  * that imports dartdoc, it will be the path to that script.
  */
 String get scriptDir() {
   return dirname(new File(new Options().script).fullPathSync());
@@ skipping 27 matching lines @@
     new File(path).readAsBytes((bytes) {
       final outFile = new File('$to/$name');
       final stream = outFile.openOutputStream(FileMode.WRITE);
       stream.write(bytes, copyBuffer: false);
       stream.close();
     });
   };
   fromDir.list(recursive: false);
 }
 
+/**
+ * Compiles the given Dart script to a JavaScript file at [jsPath] using frog.
+ */
+void compileScript(String frogPath, String dartPath, String jsPath) {
+  final process = new Process.start('$frogPath/minfrog', [
+    '--libdir=$frogPath/lib', '--out=$jsPath',
+    '--compile-only', '--enable-type-checks', '--warnings-as-errors',
+    dartPath]);
+
+  process.stdout.pipe(stdout, close: false);
+
+  process.onError = (error) {
+    print('Failed to compile $dartPath. Error:');
+    print(error);
+  };
+}
+
 class Dartdoc {
   /** Set to `false` to not include the source code in the generated docs. */
   bool includeSource = true;
 
   /**
    * Dartdoc can generate docs in a few different ways based on how dynamic you
    * want the client-side behavior to be. The value for this should be one of
    * the `MODE_` constants.
    */
   int mode = MODE_LIVE_NAV;
@@ skipping 59 matching lines @@
     // Patch in support for [:...:]-style code to the markdown parser.
     // TODO(rnystrom): Markdown already has syntax for this. Phase this out?
     md.InlineParser.syntaxes.insertRange(0, 1,
         new md.CodeSyntax(@'\[\:((?:.|\n)*?)\:\]'));
 
     md.setImplicitLinkResolver((name) => resolveNameReference(name,
             library: _currentLibrary, type: _currentType,
             member: _currentMember));
   }
 
-  void document(String entrypoint) {
+  void document([String entrypoint]) {
     var oldDietParse = options.dietParse;
     try {
       options.dietParse = true;
 
-      // Handle the built-in entrypoints.
-      switch (entrypoint) {
-        case 'corelib':
-          world.getOrAddLibrary('dart:core');
-          world.getOrAddLibrary('dart:coreimpl');
-          world.getOrAddLibrary('dart:json');
-          world.getOrAddLibrary('dart:isolate');
-          world.process();
-          break;
-
-        case 'dom':
-          world.getOrAddLibrary('dart:core');
-          world.getOrAddLibrary('dart:coreimpl');
-          world.getOrAddLibrary('dart:json');
-          world.getOrAddLibrary('dart:dom');
-          world.getOrAddLibrary('dart:isolate');
-          world.process();
-          break;
-
-        case 'html':
-          world.getOrAddLibrary('dart:core');
-          world.getOrAddLibrary('dart:coreimpl');
-          world.getOrAddLibrary('dart:json');
-          world.getOrAddLibrary('dart:dom');
-          world.getOrAddLibrary('dart:html');
-          world.getOrAddLibrary('dart:isolate');
-          world.process();
-          break;
-
-        default:
-          // Normal entrypoint script.
-          world.processDartScript(entrypoint);
+      // If we have an entrypoint, process it. Otherwise, just use whatever
+      // libraries have been previously loaded by the calling code.
+      if (entrypoint != null) {
+        world.processDartScript(entrypoint);
       }
 
       world.resolveAll();
 
       // Sort the libraries by name (not key).
       _sortedLibraries = world.libraries.getValues();
       _sortedLibraries.sort((a, b) {
         return a.name.toUpperCase().compareTo(b.name.toUpperCase());
       });
 
@@ skipping 984 matching lines @@
 
     return new md.Element.text('code', name);
   }
 
   // TODO(rnystrom): Move into SourceSpan?
   int getSpanColumn(SourceSpan span) {
     final line = span.file.getLine(span.start);
     return span.file.getColumn(line, span.start);
   }
 }