Add JavaScriptSourceNode to represent runtime libraries (fixes #85)

lib/devc.dart

 // Copyright (c) 2015, 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.
 
 /// Command line tool to run the checker on a Dart program.
 library dev_compiler.devc;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
@@ skipping 33 matching lines @@
   final CompilerOptions _options;
   final TypeResolver _resolver;
   final CheckerReporter _reporter;
   final TypeRules _rules;
   final CodeChecker _checker;
   final SourceGraph _graph;
   final SourceNode _entryNode;
   List<LibraryInfo> _libraries = <LibraryInfo>[];
   final List<CodeGenerator> _generators;
   bool _failure = false;
-  bool _devCompilerRuntimeCopied = false;
 
   factory Compiler(CompilerOptions options,
       [TypeResolver resolver, CheckerReporter reporter]) {
     if (resolver == null) {
       resolver = options.useMockSdk
           ? new TypeResolver.fromMock(mockSdkSources, options)
           : new TypeResolver.fromDir(options.dartSdkPath, options);
     }
 
     if (reporter == null) {
@@ skipping 27 matching lines @@
   }
 
   Compiler._(this._options, this._resolver, this._reporter, this._rules,
       this._checker, this._graph, this._entryNode, this._generators);
 
   bool _buildSource(SourceNode node) {
     if (node is HtmlSourceNode) {
       _buildHtmlFile(node);
     } else if (node is DartSourceNode) {
       _buildDartLibrary(node);
+    } else if (node is JavaScriptSourceNode) {
+      _buildJavaScriptFile(node);
     } else {
       assert(false); // should not get a build request on PartSourceNode
     }
 
     // TODO(sigmund): don't always return true. Use summarization to better
     // determine when rebuilding is needed.
     return true;
   }
 
   void _buildHtmlFile(HtmlSourceNode node) {
     if (_options.outputDir == null) return;
     var output = generateEntryHtml(node, _options);
     if (output == null) {
       _failure = true;
       return;
     }
     var filename = path.basename(node.uri.path);
     String outputFile = path.join(_options.outputDir, filename);
     new File(outputFile).writeAsStringSync(output);
 
-    if (_options.outputDart || _devCompilerRuntimeCopied) return;
-    // Copy the dev_compiler runtime (implicit dependency for js codegen)
-    // TODO(sigmund): split this out as a separate node in our dependency graph
-    // (https://github.com/dart-lang/dev_compiler/issues/85).
-    var runtimeDir = path.join(
-        path.dirname(path.dirname(Platform.script.path)), 'lib/runtime/');
-    var runtimeOutput = path.join(_options.outputDir, 'dev_compiler/runtime/');
-    new Directory(runtimeOutput).createSync(recursive: true);
-    new File(path.join(runtimeDir, 'harmony_feature_check.js'))
-        .copy(path.join(runtimeOutput, 'harmony_feature_check.js'));
-    new File(path.join(runtimeDir, 'dart_runtime.js'))
-        .copy(path.join(runtimeOutput, 'dart_runtime.js'));
-    _devCompilerRuntimeCopied = true;
+    if (_options.outputDart) return;
+  }
+
+  void _buildJavaScriptFile(JavaScriptSourceNode node) {
+    // JavaScriptSourceNodes are pieces of the dev_compiler runtime which are

[Jennifer Messerly, 2015/03/09 16:12:41]

Is this necessarily the case? What about other .js files, e.g. written by hand,
or pulled in from a package manager like NPM/Bower?

[Siggi Cherem (dart-lang), 2015/03/09 17:31:39]

True, good point. I'll adjust the comment. FYI in a follow up CL I'm changing
this to "ResourceSourceNode, since it can be other things too.

+    // dependencies added for js codegen.
+    if (_options.outputDart) return;
+    assert(node.uri.scheme == 'package');
+    var filepath = path.join(_options.outputDir, node.uri.path);
+    var dir = path.dirname(filepath);
+    new Directory(dir).createSync(recursive: true);
+    new File(filepath).writeAsStringSync(node.source.contents.data);
   }
 
   bool _isEntry(DartSourceNode node) {
     if (_entryNode is DartSourceNode) return _entryNode == node;
     return (_entryNode as HtmlSourceNode).scripts.contains(node);
   }
 
   void _buildDartLibrary(DartSourceNode node) {
     var source = node.source;
     // TODO(sigmund): find out from analyzer team if there is a better way
@@ skipping 118 matching lines @@
   }
 
   rebuildIfNeeded(shelf.Request request) {
     var filepath = request.url.path;
     if (filepath == '/$_entryPath' || filepath == '/') compiler._runAgain();
   }
 }
 
 final _log = new Logger('dev_compiler');
 final _earlyErrorResult = new CheckerResults(const [], null, true);