Dev compiler debugger related tweaks.

pkg/dev_compiler/web/web_command.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.
 @JS()
 library dev_compiler.web.web_command;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:html' show HttpRequest;
+import 'dart:typed_data';
 
 import 'package:analyzer/dart/element/element.dart'
     show
         LibraryElement,
         ImportElement,
         ShowElementCombinator,
         HideElementCombinator;
 import 'package:analyzer/file_system/file_system.dart' show ResourceUriResolver;
 import 'package:analyzer/file_system/memory_file_system.dart'
     show MemoryResourceProvider;
@@ skipping 10 matching lines @@
     show BuildUnit, CompilerOptions, JSModuleFile, ModuleCompiler;
 
 import 'package:dev_compiler/src/compiler/module_builder.dart';
 import 'package:js/js.dart';
 import 'package:path/path.dart' as path;
 
 typedef void MessageHandler(Object message);
 
 @JS()
 @anonymous
+class JSIterator<V> {}
+
+@JS('Map')
+class JSMap<K, V> {
+  external V get(K v);
+  external set(K k, V v);
+  external JSIterator<K> keys();
+  external JSIterator<V> values();
+}
+
+@JS('Array.from')
+external List<V> iteratorToList<V>(JSIterator<V> iterator);
+
+@JS()
+@anonymous
 class CompileResult {
   external factory CompileResult(
       {String code, List<String> errors, bool isValid});
 }
 
 typedef CompileModule(String imports, String body, String libraryName,
     String existingLibrary, String fileName);
 
 /// The command for invoking the modular compiler.
 class WebCompileCommand extends Command {
   get name => 'compile';
 
   get description => 'Compile a set of Dart files into a JavaScript module.';
   final MessageHandler messageHandler;
 
   WebCompileCommand({MessageHandler messageHandler})
       : this.messageHandler = messageHandler ?? print {
     CompilerOptions.addArguments(argParser);
     AnalyzerOptions.addArguments(argParser);
   }
 
   @override
   Function run() {
     return requestSummaries;
   }
 
-  void requestSummaries(String summaryRoot, String sdkUrl,
-      List<String> summaryUrls, Function onCompileReady, Function onError) {
-    HttpRequest
-        .request(sdkUrl,
-            responseType: "arraybuffer", mimeType: "application/octet-stream")
-        .then((sdkRequest) {
-      var sdkBytes = sdkRequest.response.asUint8List();
+  Future<Null> requestSummaries(String sdkUrl, JSMap<String, String> summaryMap,
+      Function onCompileReady, Function onError) async {
+    var sdkRequest;
+    try {
+      sdkRequest = await HttpRequest.request(sdkUrl,
+          responseType: "arraybuffer", mimeType: "application/octet-stream");
+    } catch (error) {
+      onError('Dart sdk summaries failed to load: $error. url: $sdkUrl');
+      return null;
+    }
 
-      // Map summary URLs to HttpRequests.
-      var summaryRequests = summaryUrls.map((summary) => new Future(() =>
-          HttpRequest.request(summaryRoot + summary,
-              responseType: "arraybuffer",
-              mimeType: "application/octet-stream")));
+    var sdkBytes = (sdkRequest.response as ByteBuffer).asUint8List();
 
-      Future.wait(summaryRequests).then((summaryResponses) {
-        // Map summary responses to summary bytes.
-        var summaryBytes = <List<int>>[];
-        for (var response in summaryResponses) {
-          summaryBytes.add(response.response.asUint8List());
-        }
-
-        onCompileReady(setUpCompile(sdkBytes, summaryBytes, summaryUrls));
-      }).catchError((error) => onError('Summaries failed to load: $error'));
-    }).catchError((error) =>
-            onError('Dart sdk summaries failed to load: $error. url: $sdkUrl'));
+    // Map summary URLs to HttpRequests.
+    var summaryRequests = iteratorToList(summaryMap.values())
+        .map((String summaryUrl) => HttpRequest.request(summaryUrl,
+            responseType: "arraybuffer", mimeType: "application/octet-stream"))
+        .toList();
+    try {
+      var summaryResponses = await Future.wait(summaryRequests);
+      // Map summary responses to summary bytes.
+      List<List<int>> summaryBytes = summaryResponses
+          .map((response) => (response.response as ByteBuffer).asUint8List())
+          .toList();
+      onCompileReady(setUpCompile(
+          sdkBytes, summaryBytes, iteratorToList(summaryMap.keys())));
+    } catch (error) {
+      onError('Summaries failed to load: $error');
+    }
   }
 
   List<Function> setUpCompile(List<int> sdkBytes, List<List<int>> summaryBytes,
-      List<String> summaryUrls) {
+      List<String> moduleIds) {
     var dartSdkSummaryPath = '/dart-sdk/lib/_internal/web_sdk.sum';
 
     var resourceProvider = new MemoryResourceProvider()
       ..newFileWithBytes(dartSdkSummaryPath, sdkBytes);
 
     var resourceUriResolver = new ResourceUriResolver(resourceProvider);
 
     var options = new AnalyzerOptions.basic(
         dartSdkPath: '/dart-sdk', dartSdkSummaryPath: dartSdkSummaryPath);
 
     var summaryDataStore = new SummaryDataStore(options.summaryPaths,
         resourceProvider: resourceProvider, recordDependencyInfo: true);
     for (var i = 0; i < summaryBytes.length; i++) {
       var bytes = summaryBytes[i];
-      var url = '/' + summaryUrls[i];
+
+      // Packages with no dart source files will have empty invalid summaries.
+      if (bytes.length == 0) continue;
+
+      var url = '/${moduleIds[i]}.api.ds';
       var summaryBundle = new PackageBundle.fromBuffer(bytes);
       summaryDataStore.addBundle(url, summaryBundle);
     }
     var summaryResolver =
         new InSummaryUriResolver(resourceProvider, summaryDataStore);
 
     var fileResolvers = [summaryResolver, resourceUriResolver];
 
     var compiler = new ModuleCompiler(options,
         analysisRoot: '/web-compile-root',
@@ skipping 156 matching lines @@
   if (source is InSummarySource) {
     return source.summaryPath.substring(1).replaceAll('.api.ds', '');
   }
   return source.toString().substring(1).replaceAll('.dart', '');
 }
 
 /// Thrown when the input source code has errors.
 class CompileErrorException implements Exception {
   toString() => '\nPlease fix all errors before compiling (warnings are okay).';
 }