Revert "Support Package Resolution Configuration files."

pkg/compiler/lib/src/apiimpl.dart

 // Copyright (c) 2012, 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 leg_apiimpl;
 
 import 'dart:async';
-import 'dart:convert';
 
 import '../compiler.dart' as api;
 import 'dart2jslib.dart' as leg;
 import 'tree/tree.dart' as tree;
 import 'elements/elements.dart' as elements;
 import 'package:_internal/libraries.dart' hide LIBRARIES;
 import 'package:_internal/libraries.dart' as library_info show LIBRARIES;
 import 'io/source_file.dart';
-import 'package:package_config/packages.dart';
-import 'package:package_config/packages_file.dart' as pkgs;
-import 'package:package_config/src/packages_impl.dart'
-    show NonFilePackagesDirectoryPackages, MapPackages;
 
 const bool forceIncrementalSupport =
     const bool.fromEnvironment('DART2JS_EXPERIMENTAL_INCREMENTAL_SUPPORT');
 
 class Compiler extends leg.Compiler {
   api.CompilerInputProvider provider;
   api.DiagnosticHandler handler;
   final Uri libraryRoot;
-  final Uri packageConfig;
   final Uri packageRoot;
-  final api.PackagesDiscoveryProvider packagesDiscoveryProvider;
-  Packages packages;
   List<String> options;
   Map<String, dynamic> environment;
   bool mockableLibraryUsed = false;
   final Set<String> allowedLibraryCategories;
 
   leg.GenericTask userHandlerTask;
   leg.GenericTask userProviderTask;
-  leg.GenericTask userPackagesDiscoveryTask;
 
   Compiler(this.provider,
            api.CompilerOutputProvider outputProvider,
            this.handler,
            this.libraryRoot,
            this.packageRoot,
            List<String> options,
-           this.environment,
-           [this.packageConfig,
-            this.packagesDiscoveryProvider])
+           this.environment)
       : this.options = options,
         this.allowedLibraryCategories = getAllowedLibraryCategories(options),
         super(
             outputProvider: outputProvider,
             enableTypeAssertions: hasOption(options, '--enable-checked-mode'),
             enableUserAssertions: hasOption(options, '--enable-checked-mode'),
             trustTypeAnnotations:
                 hasOption(options, '--trust-type-annotations'),
             trustPrimitives:
                 hasOption(options, '--trust-primitives'),
@@ skipping 38 matching lines @@
                 hasOption(options, '--enable-experimental-mirrors'),
             generateCodeWithCompileTimeErrors:
                 hasOption(options, '--generate-code-with-compile-time-errors'),
             allowNativeExtensions:
                 hasOption(options, '--allow-native-extensions'),
             enableNullAwareOperators:
                 hasOption(options, '--enable-null-aware-operators')) {
     tasks.addAll([
         userHandlerTask = new leg.GenericTask('Diagnostic handler', this),
         userProviderTask = new leg.GenericTask('Input provider', this),
-        userPackagesDiscoveryTask =
-            new leg.GenericTask('Package discovery', this),
     ]);
     if (libraryRoot == null) {
       throw new ArgumentError("[libraryRoot] is null.");
     }
     if (!libraryRoot.path.endsWith("/")) {
       throw new ArgumentError("[libraryRoot] must end with a /.");
     }
-    if (packageRoot != null && packageConfig != null) {
-      throw new ArgumentError("Only one of [packageRoot] or [packageConfig] "
-                              "may be given.");
+    if (packageRoot == null) {
+      throw new ArgumentError("[packageRoot] is null.");
     }
-    if (packageRoot != null && !packageRoot.path.endsWith("/")) {
+    if (!packageRoot.path.endsWith("/")) {
       throw new ArgumentError("[packageRoot] must end with a /.");
     }
     if (!analyzeOnly) {
       if (allowNativeExtensions) {
         throw new ArgumentError(
             "--allow-native-extensions is only supported in combination with "
             "--analyze-only");
       }
     }
   }
@@ skipping 33 matching lines @@
     result.add('Internal');
     return new Set<String>.from(result);
   }
 
   static bool hasOption(List<String> options, String option) {
     return options.indexOf(option) >= 0;
   }
 
   // TODO(johnniwinther): Merge better with [translateDartUri] when
   // [scanBuiltinLibrary] is removed.
-  String lookupLibraryPath(LibraryInfo info) {
+  String lookupLibraryPath(String dartLibraryName) {
+    LibraryInfo info = lookupLibraryInfo(dartLibraryName);
     if (info == null) return null;
     if (!info.isDart2jsLibrary) return null;
     if (!allowedLibraryCategories.contains(info.category)) return null;
     String path = info.dart2jsPath;
     if (path == null) {
       path = info.path;
     }
     return "lib/$path";
   }
 
@@ skipping 103 matching lines @@
   Uri translateUri(leg.Spannable node, Uri readableUri) {
     switch (readableUri.scheme) {
       case 'package': return translatePackageUri(node, readableUri);
       default: return readableUri;
     }
   }
 
   Uri translateDartUri(elements.LibraryElement importingLibrary,
                        Uri resolvedUri, tree.Node node) {
     LibraryInfo libraryInfo = lookupLibraryInfo(resolvedUri.path);
-    String path = lookupLibraryPath(libraryInfo);
+    String path = lookupLibraryPath(resolvedUri.path);
     if (libraryInfo != null &&
         libraryInfo.category == "Internal") {
       bool allowInternalLibraryAccess = false;
       if (importingLibrary != null) {
         if (importingLibrary.isPlatformLibrary || importingLibrary.isPatch) {
           allowInternalLibraryAccess = true;
         } else if (importingLibrary.canonicalUri.path.contains(
                        'sdk/tests/compiler/dart2js_native')) {
           allowInternalLibraryAccess = true;
         }
@@ skipping 27 matching lines @@
     return libraryRoot.resolve(path);
   }
 
   Uri resolvePatchUri(String dartLibraryPath) {
     String patchPath = lookupPatchPath(dartLibraryPath);
     if (patchPath == null) return null;
     return libraryRoot.resolve(patchPath);
   }
 
   Uri translatePackageUri(leg.Spannable node, Uri uri) {
-    return packages.resolve(uri);
+    return packageRoot.resolve(uri.path);
   }
 
-  Future setupPackages(Uri uri) async {
-    if (packageRoot != null) {
-      // Use "non-file" packages because the file version requires a [Directory]
-      // and we can't depend on 'dart:io' classes.
-      packages = new NonFilePackagesDirectoryPackages(packageRoot);
-    } else if (packageConfig != null) {
-      var packageConfigContents = await provider(packageConfig);
-      if (packageConfigContents is String) {
-        packageConfigContents = UTF8.encode(packageConfigContents);
+  Future<bool> run(Uri uri) {
+    log('Allowed library categories: $allowedLibraryCategories');
+    return super.run(uri).then((bool success) {
+      int cumulated = 0;
+      for (final task in tasks) {
+        int elapsed = task.timing;
+        if (elapsed != 0) {
+          cumulated += elapsed;
+          log('${task.name} took ${elapsed}msec');
+        }
       }
-      packages =
-          new MapPackages(pkgs.parse(packageConfigContents, packageConfig));
-    } else {
-      if (packagesDiscoveryProvider == null) {
-        packages = Packages.noPackages;
-      } else {
-        packages = await callUserPackagesDiscovery(uri);
-      }
-    }
-  }
-
-  Future<bool> run(Uri uri) async {
-    log('Allowed library categories: $allowedLibraryCategories');
-
-    await setupPackages(uri);
-    assert(packages != null);
-
-    bool success = await super.run(uri);
-    int cumulated = 0;
-    for (final task in tasks) {
-      int elapsed = task.timing;
-      if (elapsed != 0) {
-        cumulated += elapsed;
-        log('${task.name} took ${elapsed}msec');
-      }
-    }
-    int total = totalCompileTime.elapsedMilliseconds;
-    log('Total compile-time ${total}msec;'
-        ' unaccounted ${total - cumulated}msec');
-    return success;
+      int total = totalCompileTime.elapsedMilliseconds;
+      log('Total compile-time ${total}msec;'
+          ' unaccounted ${total - cumulated}msec');
+      return success;
+    });
   }
 
   void reportDiagnostic(leg.Spannable node,
                         leg.Message message,
                         api.Diagnostic kind) {
     leg.SourceSpan span = spanFromSpannable(node);
     if (identical(kind, api.Diagnostic.ERROR)
         || identical(kind, api.Diagnostic.CRASH)
         || (fatalWarnings && identical(kind, api.Diagnostic.WARNING))) {
       compilationFailed = true;
@@ skipping 28 matching lines @@
 
   Future callUserProvider(Uri uri) {
     try {
       return userProviderTask.measure(() => provider(uri));
     } catch (ex, s) {
       diagnoseCrashInUserCode('Uncaught exception in input provider', ex, s);
       rethrow;
     }
   }
 
-  Future<Packages> callUserPackagesDiscovery(Uri uri) {
-    try {
-      return userPackagesDiscoveryTask.measure(
-                 () => packagesDiscoveryProvider(uri));
-    } catch (ex, s) {
-      diagnoseCrashInUserCode('Uncaught exception in package discovery', ex, s);
-      rethrow;
-    }
-  }
-
   void diagnoseCrashInUserCode(String message, exception, stackTrace) {
     hasCrashed = true;
     print('$message: ${tryToString(exception)}');
     print(tryToString(stackTrace));
   }
 
   fromEnvironment(String name) => environment[name];
 
   LibraryInfo lookupLibraryInfo(String libraryName) {
     return library_info.LIBRARIES[libraryName];
   }
 }