Fix various pub issues.

lib/src/dart.dart

 // Copyright (c) 2013, 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.
 
 /// A library for compiling Dart code and manipulating analyzer parse trees.
 library pub.dart;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 
 import 'package:analyzer/analyzer.dart';
 import 'package:compiler_unsupported/compiler.dart' as compiler;
 import 'package:compiler_unsupported/src/filenames.dart'
     show appendSlash;
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as p;
 
 import 'asset/dart/serialize.dart';
 import 'io.dart';
 import 'log.dart' as log;
 
 /// Interface to communicate with dart2js.
 ///
 /// This is basically an amalgamation of dart2js's
 /// [compiler.CompilerInputProvider], [compiler.CompilerOutputProvider], and
 /// [compiler.DiagnosticHandler] function types so that we can provide them
@@ skipping 36 matching lines @@
     bool verbose: false,
     Map<String, String> environment,
     String packageRoot,
     bool analyzeAll: false,
     bool preserveUris: false,
     bool suppressWarnings: false,
     bool suppressHints: false,
     bool suppressPackageWarnings: true,
     bool terse: false,
     bool includeSourceMapUrls: false,
-    bool toDart: false}) {
-  return new Future.sync(() {
-    var options = <String>['--categories=Client,Server'];
-    if (checked) options.add('--enable-checked-mode');
-    if (csp) options.add('--csp');
-    if (minify) options.add('--minify');
-    if (verbose) options.add('--verbose');
-    if (analyzeAll) options.add('--analyze-all');
-    if (preserveUris) options.add('--preserve-uris');
-    if (suppressWarnings) options.add('--suppress-warnings');
-    if (suppressHints) options.add('--suppress-hints');
-    if (!suppressPackageWarnings) options.add('--show-package-warnings');
-    if (terse) options.add('--terse');
-    if (toDart) options.add('--output-type=dart');
+    bool toDart: false}) async {
+  // dart2js chokes on relative paths. Including "/./" can also confuse it, so

[Bob Nystrom, 2015/07/09 22:47:19]

File bugs for these?

[nweiz, 2015/07/09 23:42:44]

They seem to be closely tied to the specific way we invoke it, which is kind of
weird and non-standard anyway. I can't reproduce them just from the command
line, and I don't think it's worth going through the pain of getting a clean
repro otherwise.

+  // we normalize as well.
+  entrypoint = p.normalize(p.absolute(entrypoint));
 
-    var sourceUrl = path.toUri(entrypoint);
-    options.add("--out=$sourceUrl.js");
+  var options = <String>['--categories=Client,Server'];
+  if (checked) options.add('--enable-checked-mode');
+  if (csp) options.add('--csp');
+  if (minify) options.add('--minify');
+  if (verbose) options.add('--verbose');
+  if (analyzeAll) options.add('--analyze-all');
+  if (preserveUris) options.add('--preserve-uris');
+  if (suppressWarnings) options.add('--suppress-warnings');
+  if (suppressHints) options.add('--suppress-hints');
+  if (!suppressPackageWarnings) options.add('--show-package-warnings');
+  if (terse) options.add('--terse');
+  if (toDart) options.add('--output-type=dart');
 
-    // Add the source map URLs.
-    if (includeSourceMapUrls) {
-      options.add("--source-map=$sourceUrl.js.map");
-    }
+  var sourceUrl = p.toUri(entrypoint);
+  options.add("--out=$sourceUrl.js");
 
-    if (environment == null) environment = {};
-    if (commandLineOptions != null) options.addAll(commandLineOptions);
+  // Add the source map URLs.
+  if (includeSourceMapUrls) {
+    options.add("--source-map=$sourceUrl.js.map");
+  }
 
-    if (packageRoot == null) {
-      packageRoot = path.join(path.dirname(entrypoint), 'packages');
-    }
+  if (environment == null) environment = {};
+  if (commandLineOptions != null) options.addAll(commandLineOptions);
 
-    return compiler.compile(
-        path.toUri(path.absolute(entrypoint)),
-        provider.libraryRoot,
-        path.toUri(appendSlash(path.absolute(packageRoot))),
-        provider.provideInput,
-        provider.handleDiagnostic,
-        options,
-        provider.provideOutput,
-        environment);
-  });
+  if (packageRoot == null) {
+    packageRoot = p.join(p.dirname(entrypoint), 'packages');
+  } else {
+    packageRoot = p.normalize(p.absolute(packageRoot));
+  }
+
+  await compiler.compile(
+      p.toUri(entrypoint),
+      provider.libraryRoot,
+      p.toUri(appendSlash(packageRoot)),
+      provider.provideInput,
+      provider.handleDiagnostic,
+      options,
+      provider.provideOutput,
+      environment);
 }
 
 /// Returns whether [dart] looks like an entrypoint file.
 bool isEntrypoint(CompilationUnit dart) {
   // Allow two or fewer arguments so that entrypoints intended for use with
   // [spawnUri] get counted.
   //
   // TODO(nweiz): this misses the case where a Dart file doesn't contain main(),
   // but it parts in another file that does.
   return dart.declarations.any((node) {
@@ skipping 30 matching lines @@
 ///
 /// If [snapshot] is passed, the isolate will be loaded from that path if it
 /// exists. Otherwise, a snapshot of the isolate's code will be saved to that
 /// path once the isolate is loaded.
 Future runInIsolate(String code, message, {packageRoot, String snapshot})
     async {
   if (snapshot != null && fileExists(snapshot)) {
     log.fine("Spawning isolate from $snapshot.");
     if (packageRoot != null) packageRoot = Uri.parse(packageRoot.toString());
     try {
-      await Isolate.spawnUri(path.toUri(snapshot), [], message,
+      await Isolate.spawnUri(p.toUri(snapshot), [], message,
           packageRoot: packageRoot);
       return;
     } on IsolateSpawnException catch (error) {
       log.fine("Couldn't load existing snapshot $snapshot:\n$error");
       // Do nothing, we will regenerate the snapshot below.
     }
   }
 
   await withTempDir((dir) async {
-    var dartPath = path.join(dir, 'runInIsolate.dart');
+    var dartPath = p.join(dir, 'runInIsolate.dart');
     writeTextFile(dartPath, code, dontLogContents: true);
     var port = new ReceivePort();
     await Isolate.spawn(_isolateBuffer, {
       'replyTo': port.sendPort,
-      'uri': path.toUri(dartPath).toString(),
+      'uri': p.toUri(dartPath).toString(),
       'packageRoot': packageRoot == null ? null : packageRoot.toString(),
       'message': message
     });
 
     var response = await port.first;
     if (response['type'] == 'error') {
       throw new CrossIsolateException.deserialize(response['error']);
     }
 
     if (snapshot == null) return;
 
-    ensureDir(path.dirname(snapshot));
+    ensureDir(p.dirname(snapshot));
     var snapshotArgs = [];
     if (packageRoot != null) snapshotArgs.add('--package-root=$packageRoot');
     snapshotArgs.addAll(['--snapshot=$snapshot', dartPath]);
     var result = await runProcess(Platform.executable, snapshotArgs);
 
     if (result.success) return;
 
     // Don't emit a fatal error here, since we don't want to crash the
     // otherwise successful isolate load.
     log.warning("Failed to compile a snapshot to "
-        "${path.relative(snapshot)}:\n" + result.stderr.join("\n"));
+        "${p.relative(snapshot)}:\n" + result.stderr.join("\n"));
   });
 }
 
 // TODO(nweiz): remove this when issue 12617 is fixed.
 /// A function used as a buffer between the host isolate and [spawnUri].
 ///
 /// [spawnUri] synchronously loads the file and its imports, which can deadlock
 /// the host isolate if there's an HTTP import pointing at a server in the host.
 /// Adding an additional isolate in the middle works around this.
 void _isolateBuffer(message) {
   var replyTo = message['replyTo'];
   var packageRoot = message['packageRoot'];
   if (packageRoot != null) packageRoot = Uri.parse(packageRoot);
   Isolate.spawnUri(Uri.parse(message['uri']), [], message['message'],
           packageRoot: packageRoot)
       .then((_) => replyTo.send({'type': 'success'}))
       .catchError((e, stack) {
     replyTo.send({
       'type': 'error',
       'error': CrossIsolateException.serialize(e, stack)
     });
   });
 }