Update web_command code so that it continues to use the legacy module loader. Drive by removal of m…

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:html' show HttpRequest;
 import 'dart:convert' show BASE64;
 
@@ skipping 15 matching lines @@
 
 import 'package:dev_compiler/src/analyzer/context.dart' show AnalyzerOptions;
 import 'package:dev_compiler/src/compiler/compiler.dart'
     show BuildUnit, CompilerOptions, JSModuleFile, ModuleCompiler;
 
 import 'package:dev_compiler/src/compiler/module_builder.dart';
 import 'package:js/js.dart';
 
 typedef void MessageHandler(Object message);
 
+@JS()
+@anonymous
+class CompileResult {
+  external factory CompileResult(
+      {String code, List<String> errors, bool isValid});
+}
+
+typedef CompileResult CompileModule(
+    String code, String libraryName, 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);
@@ skipping 22 matching lines @@
           summaryBytes.add(BASE64.decode(response.responseText));
         }
 
         var compileFn = setUpCompile(sdkBytes, summaryBytes, summaryUrls);
         onCompileReady(compileFn);
       }).catchError((error) => onError('Summaries failed to load: $error'));
     }).catchError(
         (error) => onError('Dart sdk summaries failed to load: $error'));
   }
 
-  Function setUpCompile(List<int> sdkBytes, List<List<int>> summaryBytes,
+  CompileModule setUpCompile(List<int> sdkBytes, List<List<int>> summaryBytes,
       List<String> summaryUrls) {
     var resourceProvider = new MemoryResourceProvider();
     var resourceUriResolver = new ResourceUriResolver(resourceProvider);
 
     var packageBundle = new PackageBundle.fromBuffer(sdkBytes);
     var webDartSdk = new SummaryBasedDartSdk.fromBundle(
         true, packageBundle, resourceProvider);
     var sdkResolver = new DartUriResolver(webDartSdk);
 
     var summaryDataStore = new SummaryDataStore([]);
@@ skipping 11 matching lines @@
         new AnalyzerOptions(dartSdkPath: '/dart-sdk'),
         sdkResolver: sdkResolver,
         fileResolvers: fileResolvers,
         resourceProvider: resourceProvider);
 
     (compiler.context as AnalysisContextImpl).resultProvider =
         new InputPackagesResultProvider(compiler.context, summaryDataStore);
 
     var compilerOptions = new CompilerOptions.fromArguments(argResults);
 
-    var compileFn = (String dart, int number) {
+    CompileModule compileFn =
+        (String sourceCode, String libraryName, String fileName) {
       // Create a new virtual File that contains the given Dart source.
-      resourceProvider.newFile("/expression${number}.dart", dart);
+      resourceProvider.newFile("/$fileName", sourceCode);
 
-      var unit = new BuildUnit("expression${number}", "",
-          ["file:///expression${number}.dart"], _moduleForLibrary);
+      var unit = new BuildUnit(
+          libraryName, "", ["file:///$fileName"], _moduleForLibrary);
 
       JSModuleFile module = compiler.compile(unit, compilerOptions);
-      module.errors.forEach(messageHandler);
 
-      if (!module.isValid) throw new CompileErrorException();
+      var moduleCode = module.isValid
+          ? module
+              .getCode(ModuleFormat.legacy, unit.name, unit.name + '.map')
+              .code
+          : '';
 
-      var code =
-          module.getCode(ModuleFormat.amd, unit.name, unit.name + '.map');
-      return code.code;
+      return new CompileResult(
+          code: moduleCode, isValid: module.isValid, errors: module.errors);
     };
 
     return allowInterop(compileFn);
   }
 }
 
 // Given path, determine corresponding dart library.
 String _moduleForLibrary(source) {
   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).';
 }