Refactor CompilerOutput

pkg/compiler/lib/src/js_emitter/startup_emitter/model_emitter.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.
 
 library dart2js.js_emitter.startup_emitter.model_emitter;
 
 import 'dart:convert' show JsonEncoder;
 
 import 'package:js_runtime/shared/embedded_names.dart'
     show
@@ skipping 12 matching lines @@
         IS_HUNK_LOADED,
         LEAF_TAGS,
         MANGLED_GLOBAL_NAMES,
         MANGLED_NAMES,
         METADATA,
         NATIVE_SUPERCLASS_TAG_NAME,
         STATIC_FUNCTION_NAME_TO_CLOSURE,
         TYPE_TO_INTERCEPTOR_MAP,
         TYPES;
 
+import '../../../compiler_new.dart';
 import '../../common.dart';
 import '../../compiler.dart' show Compiler;
 import '../../constants/values.dart' show ConstantValue, FunctionConstantValue;
 import '../../core_types.dart' show CommonElements;
 import '../../elements/elements.dart' show ClassElement, MethodElement;
 import '../../hash/sha1.dart' show Hasher;
 import '../../io/code_output.dart';
 import '../../io/line_column_provider.dart'
     show LineColumnCollector, LineColumnProvider;
 import '../../io/source_map_builder.dart' show SourceMapBuilder;
@@ skipping 201 matching lines @@
   void writeMainFragment(MainFragment fragment, js.Statement code,
       {bool isSplit}) {
     LineColumnCollector lineColumnCollector;
     List<CodeOutputListener> codeOutputListeners;
     if (shouldGenerateSourceMap) {
       lineColumnCollector = new LineColumnCollector();
       codeOutputListeners = <CodeOutputListener>[lineColumnCollector];
     }
 
     CodeOutput mainOutput = new StreamCodeOutput(
-        compiler.outputProvider('', 'js'), codeOutputListeners);
+        compiler.outputProvider('', 'js', OutputType.js), codeOutputListeners);
     outputBuffers[fragment] = mainOutput;
 
     js.Program program = new js.Program([
       buildGeneratedBy(),
       new js.Comment(HOOKS_API_USAGE),
       isSplit ? buildDeferredInitializerGlobal() : new js.Block.empty(),
       code
     ]);
 
     mainOutput.addBuffer(
@@ skipping 24 matching lines @@
 
     LineColumnCollector lineColumnCollector;
     if (shouldGenerateSourceMap) {
       lineColumnCollector = new LineColumnCollector();
       outputListeners.add(lineColumnCollector);
     }
 
     String hunkPrefix = fragment.outputFileName;
 
     CodeOutput output = new StreamCodeOutput(
-        compiler.outputProvider(hunkPrefix, deferredExtension),
+        compiler.outputProvider(hunkPrefix, deferredExtension, OutputType.part),
         outputListeners);
 
     outputBuffers[fragment] = output;
 
     // The [code] contains the function that must be invoked when the deferred
     // hunk is loaded.
     // That function must be in a map from its hashcode to the function. Since
     // we don't know the hash before we actually emit the code we store the
     // function in a temporary field first:
     //
@@ skipping 64 matching lines @@
   void outputSourceMap(
       CodeOutput output, LineColumnProvider lineColumnProvider, String name,
       [Uri sourceMapUri, Uri fileUri]) {
     if (!shouldGenerateSourceMap) return;
     // Create a source file for the compilation output. This allows using
     // [:getLine:] to transform offsets to line numbers in [SourceMapBuilder].
     SourceMapBuilder sourceMapBuilder =
         new SourceMapBuilder(sourceMapUri, fileUri, lineColumnProvider);
     output.forEachSourceLocation(sourceMapBuilder.addMapping);
     String sourceMap = sourceMapBuilder.build();
-    compiler.outputProvider(name, 'js.map')
+    compiler.outputProvider(name, 'js.map', OutputType.js_map)
       ..add(sourceMap)
       ..close();
   }
 
   /// Writes a mapping from library-name to hunk files.
   ///
   /// The output is written into a separate file that can be used by outside
   /// tools.
   void writeDeferredMap() {
     Map<String, dynamic> mapping = new Map<String, dynamic>();
     // Json does not support comments, so we embed the explanation in the
     // data.
     mapping["_comment"] = "This mapping shows which compiled `.js` files are "
         "needed for a given deferred library import.";
     mapping.addAll(compiler.deferredLoadTask.computeDeferredMap());
     compiler.outputProvider(
-        compiler.options.deferredMapUri.path, 'deferred_map')
+        compiler.options.deferredMapUri.path, '', OutputType.info)
       ..add(const JsonEncoder.withIndent("  ").convert(mapping))
       ..close();
   }
 }