Various DDC fixes for windows

pkg/dev_compiler/lib/src/compiler/compiler.dart

 // Copyright (c) 2016, 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.
 
 import 'dart:collection' show HashSet, Queue;
 import 'dart:convert' show JSON;
 import 'dart:io' show File;
 
 import 'package:analyzer/analyzer.dart'
     show AnalysisError, CompilationUnit, ErrorSeverity;
@@ skipping 136 matching lines @@
   /// If that is not desired, the analysis context must be pre-configured using
   /// summaries before calling this method.
   JSModuleFile compile(BuildUnit unit, CompilerOptions options) {
     var trees = <CompilationUnit>[];
     var errors = <AnalysisError>[];
 
     var librariesToCompile = new Queue<LibraryElement>();
 
     var compilingSdk = false;
     for (var sourcePath in unit.sources) {
-      var sourceUri = Uri.parse(sourcePath);
-      if (sourceUri.scheme == '') {
-        sourceUri = path.toUri(path.absolute(sourcePath));
-      } else if (sourceUri.scheme == 'dart') {
+      var sourceUri = _sourceToUri(sourcePath);
+      if (sourceUri.scheme == "dart") {
         compilingSdk = true;
       }
-      Source source = context.sourceFactory.forUri2(sourceUri);
+      var source = context.sourceFactory.forUri2(sourceUri);
 
       var fileUsage = 'You need to pass at least one existing .dart file as an'
           ' argument.';
       if (source == null) {
         throw new UsageException(
             'Could not create a source for "$sourcePath". The file name is in'
             ' the wrong format or was not found.',
             fileUsage);
       } else if (!source.exists()) {
         throw new UsageException(
@@ skipping 244 matching lines @@
   /// complete libraries including all of their parts, as well as all libraries
   /// that are part of a library cycle.
   final List<String> sources;
 
   /// Given an imported library URI, this will determine to what Dart/JS module
   /// it belongs to.
   // TODO(jmesserly): we should replace this with another way of tracking
   // build units.
   final Func1<Source, String> libraryToModule;
 
-  BuildUnit(this.name, this.libraryRoot, this.sources, this.libraryToModule);
+  BuildUnit(
+      String modulePath, this.libraryRoot, this.sources, this.libraryToModule)
+      : name = '${path.toUri(modulePath)}';
 }
 
 /// The output of Dart->JS compilation.
 ///
 /// This contains the file contents of the JS module, as well as a list of
 /// Dart libraries that are contained in this module.
 class JSModuleFile {
   /// The name of this module.
   final String name;
 
@@ skipping 54 matching lines @@
     var tree =
         transformModuleFormat(format, moduleTree, singleOutFile: singleOutFile);
     tree.accept(
         new JS.Printer(opts, printer, localNamer: new JS.TemporaryNamer(tree)));
 
     Map builtMap;
     if (options.sourceMap && sourceMap != null) {
       builtMap =
           placeSourceMap(sourceMap.build(jsUrl), mapUrl, options.bazelMapping);
       if (options.sourceMapComment) {
-        var relativeMapUrl = path
-            .toUri(
-                path.relative(path.fromUri(mapUrl), from: path.dirname(jsUrl)))
-            .toString();
+        var jsDir = path.dirname(path.fromUri(jsUrl));
+        var relative = path.relative(path.fromUri(mapUrl), from: jsDir);
+        var relativeMapUrl = path.toUri(relative).toString();
         assert(path.dirname(jsUrl) == path.dirname(mapUrl));
         printer.emit('\n//# sourceMappingURL=');
         printer.emit(relativeMapUrl);
         printer.emit('\n');
       }
     }
 
     var text = printer.getText();
     var rawSourceMap = options.inlineSourceMap
         ? js.escapedString(JSON.encode(builtMap), "'").value
         : 'null';
     text = text.replaceFirst(sourceMapHoleID, rawSourceMap);
 
     return new JSModuleCode(text, builtMap);
   }
 
   /// Similar to [getCode] but immediately writes the resulting files.
   ///
   /// If [mapPath] is not supplied but [options.sourceMap] is set, mapPath
   /// will default to [jsPath].map.
   void writeCodeSync(ModuleFormat format, String jsPath,
       {bool singleOutFile: false}) {
     String mapPath = jsPath + '.map';
-    var code = getCode(format, jsPath, mapPath, singleOutFile: singleOutFile);
+    var code = getCode(
+        format, path.toUri(jsPath).toString(), path.toUri(mapPath).toString(),
+        singleOutFile: singleOutFile);
     var c = code.code;
     if (singleOutFile) {
       // In singleOutFile mode we wrap each module in an eval statement to
       // leverage sourceURL to improve the debugging experience when source maps
       // are not enabled.
       //
       // Note: We replace all `/` with `.` so that we don't break relative urls
       // to sources in the original sourcemap. The name of this file is bogus
       // anyways, so it has very little effect on things.
       c += '\n//# sourceURL=${name.replaceAll("/", ".")}.js\n';
@@ skipping 27 matching lines @@
   /// The JSON of the source map, if generated, otherwise `null`.
   ///
   /// The source paths will initially be absolute paths. They can be adjusted
   /// using [placeSourceMap].
   final Map sourceMap;
 
   JSModuleCode(this.code, this.sourceMap);
 }
 
 /// Adjusts the source paths in [sourceMap] to be relative to [sourceMapPath],
-/// and returns the new map.
+/// and returns the new map.  Relative paths are in terms of URIs ('/'), not
+/// local OS paths (e.g., windows '\').
 // TODO(jmesserly): find a new home for this.
 Map placeSourceMap(
     Map sourceMap, String sourceMapPath, Map<String, String> bazelMappings) {
-  var dir = path.dirname(sourceMapPath);
   var map = new Map.from(sourceMap);
+  // Convert to a local file path if it's not.
+  sourceMapPath = path.fromUri(_sourceToUri(sourceMapPath));
+  var sourceMapDir = path.dirname(path.absolute(sourceMapPath));
   var list = new List.from(map['sources']);
   map['sources'] = list;
-  String transformUri(String uri) {
-    if (uri.startsWith('dart:')) return uri;
-    var match = bazelMappings[path.absolute(uri)];
+
+  String makeRelative(String sourcePath) {
+    var uri = _sourceToUri(sourcePath);
+    if (uri.scheme == 'dart' || uri.scheme == 'package') return sourcePath;
+
+    // Convert to a local file path if it's not.
+    sourcePath = path.absolute(path.fromUri(uri));
+
+    // Allow bazel mappings to override.
+    var match = bazelMappings[sourcePath];
     if (match != null) return match;
 
-    // Fall back to a relative path.
-    return path.toUri(path.relative(path.fromUri(uri), from: dir)).toString();
+    // Fall back to a relative path against the source map itself.
+    sourcePath = path.relative(sourcePath, from: sourceMapDir);
+
+    // Convert from relative local path to relative URI.
+    return path.toUri(sourcePath).path;
   }
 
   for (int i = 0; i < list.length; i++) {
-    list[i] = transformUri(list[i]);
+    list[i] = makeRelative(list[i]);
   }
-  map['file'] = transformUri(map['file']);
+  map['file'] = makeRelative(map['file']);
   return map;
 }
+
+// Convert a source string to a Uri.  The [source] may be a Dart URI, a file URI,

[Jennifer Messerly, 2017/04/20 18:22:39]

long line

[vsm, 2017/04/20 18:29:05]

Done.

+// or a local win/mac/linux path.
+Uri _sourceToUri(String source) {
+  var uri = Uri.parse(source);
+  var scheme = uri.scheme;
+  switch (scheme) {
+    case "dart":
+    case "package":
+    case "file":
+      // A valid URI.
+      return uri;
+    default:
+      // Assume a file path.
+      return new Uri.file(path.absolute(source));
+  }
+}