update mirror-based crawling to only run from relative path libraries that are unreachable by the m…

lib/src/mirror_loader.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 initialize.mirror_loader;
 
 import 'dart:collection' show Queue;
 import 'dart:mirrors';
 import 'package:path/path.dart' as path;
 import 'package:initialize/initialize.dart';
 
@@ skipping 19 matching lines @@
   // function will be processed.
   final InitializerFilter customFilter;
 
   InitializationCrawler(this.typeFilter, this.customFilter);
 
   // The primary function in this class, invoke it to crawl and collect all the
   // annotations into a queue of init functions.
   Queue<Function> run() {
     var librariesSeen = new Set<LibraryMirror>();
     var queue = new Queue<Function>();
+    var libraries = currentMirrorSystem().libraries;
 
-    var libraries = currentMirrorSystem().libraries;
-    var nonDartOrPackageImports = new List.from(libraries.keys.where(
-        (uri) => uri.scheme != 'package' && uri.scheme != 'dart'));
+    var trampolineUri = Uri.parse('${_root.uri}\$trampoline');
+    if (libraries.containsKey(trampolineUri)) {
+      // In dartium, process all relative libraries in reverse order of when

[Siggi Cherem (dart-lang), 2015/03/04 22:12:25]

let's add the TODO here saying that this logic shouldn't is an approximation of
what we want and point to the bug with the long term solution we discussed

[jakemac, 2015/03/06 19:06:39]

Done.

+      // they were seen.
+      var relativeLibraryUris = new List.from(libraries.keys.where(
+              (uri) => uri.scheme != 'package' && uri.scheme != 'dart'));
 
-    for (var import in nonDartOrPackageImports.reversed) {
-      // Always load the package: version of a library if available.
-      var libToRun;
-      if (_isHttpStylePackageUrl(import)) {
-        var packageUri = _packageUriFor(import);
-        libToRun = libraries[packageUri];
+      for (var import in relativeLibraryUris.reversed) {
+        // Always load the package: version of a library if available for
+        // canonicalization purposes.
+        var libToRun;
+        if (_isHttpStylePackageUrl(import)) {
+          var packageUri = _packageUriFor(import);
+          libToRun = libraries[packageUri];
+        }
+        if (libToRun == null) libToRun = libraries[import];
+
+        // Dartium creates an extra trampoline lib that loads the main dart script
+        // and breaks our ordering, we should skip it.
+        if (librariesSeen.contains(libToRun) ||
+            libToRun.uri.path.endsWith('\$trampoline')) {
+          continue;
+        }
+        _readLibraryDeclarations(libToRun, librariesSeen, queue);
       }
-      if (libToRun == null) libToRun = libraries[import];
-
-      // Dartium creates an extra trampoline lib that loads the main dart script
-      // and breaks our ordering.
-      if (librariesSeen.contains(libToRun) ||
-          libToRun.uri.path.endsWith('\$trampoline')) {
-        continue;
-      }
-      _readLibraryDeclarations(libToRun, librariesSeen, queue);
+    } else {
+      // Not in dartium, just process from the root library.
+      _readLibraryDeclarations(_root, librariesSeen, queue);
     }
 
     return queue;
   }
 
+  // Crawls all imports that are not dart: or package: urls from a given [root]
+  // and return them as a [Set]
+  Set<LibraryMirror> _visibleRelativeLibraries(

[Siggi Cherem (dart-lang), 2015/03/04 22:12:25]

we can delete this now I think

[jakemac, 2015/03/06 19:06:39]

Done.

+      LibraryMirror root, [Set<LibraryMirror> libraries]) {
+    if (libraries == null) libraries = new Set<LibraryMirror>();
+    for (var import in root.libraryDependencies) {
+      var library = import.targetLibrary;
+      var scheme = library.uri.scheme;
+      if (scheme == 'dart' || scheme == 'package') continue;
+      if (libraries.contains(library)) continue;
+      libraries.add(library);
+      _visibleRelativeLibraries(library, libraries);
+    }
+    return libraries;
+  }
+
+
   /// Whether [uri] is an http URI that contains a 'packages' segment, and
   /// therefore could be converted into a 'package:' URI.
   bool _isHttpStylePackageUrl(Uri uri) {
     var uriPath = uri.path;
     return uri.scheme == _root.uri.scheme &&
         // Don't process cross-domain uris.
         uri.authority == _root.uri.authority &&
         uriPath.endsWith('.dart') &&
         (uriPath.contains('/packages/') || uriPath.startsWith('packages/'));
   }
@@ skipping 151 matching lines @@
     return true;
   }
 }
 
 final _TOP_LEVEL_FUNCTIONS_ONLY = new UnsupportedError(
     'Only top level methods are supported for initializers');
 
 final _UNSUPPORTED_DECLARATION = new UnsupportedError(
     'Initializers are only supported on libraries, classes, and top level '
     'methods');