Refactor CompilerOutput

pkg/compiler/lib/src/source_file_provider.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.
 
 library source_file_provider;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math' as math;
@@ skipping 239 matching lines @@
     String extension = 'precompiled.js';
     String outPath = out.path;
     if (outPath.endsWith('.js')) {
       outPath = outPath.substring(0, outPath.length - 3);
       return out.resolve('$outPath.$extension');
     } else {
       return out.resolve(extension);
     }
   }
 
-  EventSink<String> call(String name, String extension) {
-    return createEventSink(name, extension);
-  }
-
-  Uri createUri(String name, String extension) {
+  Uri createUri(String name, String extension, OutputType type) {
     Uri uri;
-    if (extension == "deferred_map") {
-      uri = out.resolve(name);
-    } else if (name == '') {
-      if (extension == 'js' || extension == 'dart') {
-        uri = out;
-      } else if (extension == 'precompiled.js') {
-        uri = computePrecompiledUri(out);
-        onInfo("File ($uri) is compatible with header"
-            " \"Content-Security-Policy: script-src 'self'\"");
-      } else if (extension == 'js.map' || extension == 'dart.map') {
-        uri = sourceMapOut;
-      } else if (extension == 'info.json') {
-        String outName = out.path.substring(out.path.lastIndexOf('/') + 1);
-        uri = out.resolve('$outName.$extension');
-      } else if (extension == 'data') {
+    // TODO(johnniwinther): Unify handle of [name] and [extension] to prepare
+    // for using a single, possibly relative, [uri] as input.
+    switch (type) {
+      case OutputType.js:
+        if (name == '') {

[Siggi Cherem (dart-lang), 2017/02/14 23:14:17]

any reason not to handle the name != '' case separately like you had before?

[Johnni Winther, 2017/02/20 09:18:11]

Because we shouldn't really be putting semantics here. This is a step towards
that, but I need to change Pub as well.

+          uri = out;
+        } else {
+          uri = out.resolve('$name.$extension');
+        }
+        break;
+      case OutputType.js_map:
+        if (name == '') {
+          uri = sourceMapOut;
+        } else {
+          uri = out.resolve('$name.$extension');
+        }
+        break;
+      case OutputType.part:
+        uri = out.resolve('$name.$extension');
+        break;
+      case OutputType.serialization_data:
         if (resolutionOutput == null) {
           onFailure('Serialization target unspecified.');
         }
         uri = resolutionOutput;
-      } else {
-        onFailure('Unknown extension: $extension');
-      }
-    } else {
-      uri = out.resolve('$name.$extension');
+        break;
+      case OutputType.info:
+        if (name == '') {
+          name = out.pathSegments.last;
+        }
+        if (extension == '') {
+          uri = out.resolve(name);
+        } else {
+          uri = out.resolve('$name.$extension');
+        }
+        break;
+      case OutputType.debug:
+        uri = out.resolve('$name.$extension');
+        break;
+      default:
+        onFailure('Unknown output type: $type');
     }
     return uri;
   }
 
-  EventSink<String> createEventSink(String name, String extension) {
-    // TODO (johnniwinther, sigurdm): Make a better interface for
-    // output-providers.
-    Uri uri = createUri(name, extension);
+  OutputSink createOutputSink(String name, String extension, OutputType type) {
+    Uri uri = createUri(name, extension, type);
     bool isPrimaryOutput = uri == out;
 
     if (uri.scheme != 'file') {
       onFailure('Unhandled scheme ${uri.scheme} in $uri.');
     }
 
     RandomAccessFile output;
     try {
       output = new File(uri.toFilePath()).openSync(mode: FileMode.WRITE);
     } on FileSystemException catch (e) {
@@ skipping 17 matching lines @@
       charactersWritten += data.length;
     }
 
     onDone() {
       output.closeSync();
       if (isPrimaryOutput) {
         totalCharactersWritten += charactersWritten;
       }
     }
 
-    return new _EventSinkWrapper(writeStringSync, onDone);
+    return new _OutputSinkWrapper(writeStringSync, onDone);
   }
 }
 
-class _EventSinkWrapper extends EventSink<String> {
+class _OutputSinkWrapper extends OutputSink {
   var onAdd, onClose;
 
-  _EventSinkWrapper(this.onAdd, this.onClose);
+  _OutputSinkWrapper(this.onAdd, this.onClose);
 
   void add(String data) => onAdd(data);
 
-  void addError(error, [StackTrace stackTrace]) => throw error;
-
   void close() => onClose();
 }
 
 /// Adapter to integrate dart2js in bazel.
 ///
 /// To handle bazel's special layout:
 ///
 ///  * We specify a .packages configuration file that expands packages to their
 ///    corresponding bazel location. This way there is no need to create a pub
 ///    cache prior to invoking dart2js.
@@ skipping 45 matching lines @@
           resolvedUri = file;
           break;
         }
       }
     }
     var result = await readUtf8BytesFromUri(resolvedUri);
     sourceFiles[uri] = sourceFiles[resolvedUri];
     return result;
   }
 }