Internal libraries supported.

sdk/lib/_internal/compiler/implementation/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:uri';
 import 'dart:async';
 
 import '../compiler.dart' as api;
@@ skipping 71 matching lines @@
     LibraryInfo info = LIBRARIES[dartLibraryName];
     if (info == null) return null;
     if (!info.isDart2jsLibrary) return null;
     String path = info.dart2jsPatchPath;
     if (path == null) return null;
     return "lib/$path";
   }
 
   elements.LibraryElement scanBuiltinLibrary(String path) {
     Uri uri = libraryRoot.resolve(lookupLibraryPath(path));
-    Uri canonicalUri = null;
-    if (!path.startsWith("_")) {
-      canonicalUri = new Uri.fromComponents(scheme: "dart", path: path);
-    }
+    Uri canonicalUri = new Uri.fromComponents(scheme: "dart", path: path);
     elements.LibraryElement library =
         libraryLoader.loadLibrary(uri, null, canonicalUri);
     return library;
   }
 
   void log(message) {
     handler(null, null, null, message, api.Diagnostic.VERBOSE_INFO);
   }
 
+  /**
+   * Resolves the [uri] into a file resource URI.
+   *
+   * The [importingUri] holds the canonical uri for the library importing [uri]
+   * or [:null:] if [uri] is loaded as the main library. The [importingUri] is
+   * used to grant access to private libraries for platform libraries.

[ahe, 2013/01/18 11:03:10]

Please document that this method is responsible for reporting errors, and that
it will return null if an error occurred.

[Johnni Winther, 2013/01/21 09:27:54]

Done.

+   */
+  Uri resolveScriptUri(Uri importingUri, Uri uri, [tree.Node node]) {

[ahe, 2013/01/18 11:03:10]

I like this method.

+    if (uri.scheme == 'dart') {
+      return translateDartUri(importingUri, uri, node);
+    }
+    return translateUri(uri, node);
+  }
+
+  /**
+   * Reads the script designated by [uri].
+   */
   leg.Script readScript(Uri uri, [tree.Node node]) {
+    if (!uri.isAbsolute()) throw new ArgumentError(uri);

[ahe, 2013/01/18 11:03:10]

You should be able to report an (internal) error instead.

[Johnni Winther, 2013/01/21 09:27:54]

Done.

     return fileReadingTask.measure(() {
-      if (uri.scheme == 'dart') uri = translateDartUri(uri, node);

[ahe, 2013/01/18 11:03:10]

I really like that you got rid of this.

-      var translated = translateUri(uri, node);
       String text = "";
       try {
         // TODO(ahe): We expect the future to be complete and call value
         // directly. In effect, we don't support truly asynchronous API.
-        text = deprecatedFutureValue(provider(translated));
+        text = deprecatedFutureValue(provider(uri));
       } catch (exception) {
         if (node != null) {
           cancel("$exception", node: node);
         } else {
           reportDiagnostic(null, "$exception", api.Diagnostic.ERROR);
           throw new leg.CompilerCancelledException("$exception");
         }
       }
-      SourceFile sourceFile = new SourceFile(translated.toString(), text);
+      SourceFile sourceFile = new SourceFile(uri.toString(), text);
       return new leg.Script(uri, sourceFile);
     });
   }
 
   Uri translateUri(Uri uri, tree.Node node) {
     switch (uri.scheme) {
       case 'package': return translatePackageUri(uri, node);
       default: return uri;
     }
   }
 
-  Uri translateDartUri(Uri uri, tree.Node node) {
+  Uri translateDartUri(Uri sourceUri, Uri uri, tree.Node node) {
     String path = lookupLibraryPath(uri.path);
-    if (path == null || LIBRARIES[uri.path].category == "Internal") {
+    if (LIBRARIES[uri.path] != null &&

[ngeoffray, 2013/01/16 15:40:57]

Store LIBRARIES[uri.path] in a local variable?

[Johnni Winther, 2013/01/21 09:27:54]

Done.

+        LIBRARIES[uri.path].category == "Internal") {
+      bool allowPrivateLibraryAccess = false;
+      if (sourceUri != null) {
+        if (sourceUri.scheme == 'dart' || sourceUri.scheme == 'patch') {

[ahe, 2013/01/18 11:03:10]

What is the patch scheme?

[Johnni Winther, 2013/01/21 09:27:54]

A new scheme used to provide patch libraries with a canonical uri.

[ahe, 2013/01/21 09:39:38]

I don't think it is a good idea to invent new schemes. We have registered the
"dart" scheme, and I'll like to stick to standard schemes.

[Johnni Winther, 2013/01/21 09:45:55]

Then I'll have to encode it in the path, like dart:core_patch for the
core_patch. Is that better or do you have another idea?

[ahe, 2013/01/21 10:08:25]

I was hoping we could get rid of encoding this information in the URI. Is it
possible to set a bit on the library element?

But using the dart scheme to enable private library access seems much safer, as
it relies solely on a scheme that we control. This means that there is no
conceivable way for a user to ever be in a situation where he can present us
with a URI whose legitimate scheme is something we think means something else
(for example, "patch"), or whose path component fools us into thinking it is an
implementation detail.

Although the dart2js command line can only handle file URIs, it should be
possible to use the compiler API with arbitrary URIs and have them passed
through the compiler without the compiler getting the wrong idea.

[Johnni Winther, 2013/01/21 10:15:15]

Then I think I'd rather go back to having no canonical uri on patch libraries
and use the importing LibraryElement instead of its canonical uri to grant
access to internal libraries. The LibraryElement must then be either
[isPlatformLibrary] or [isPatch].

[ahe, 2013/01/21 10:18:09]

SGTM

+          allowPrivateLibraryAccess = true;
+        }
+        if (sourceUri.path.contains('dart/tests/compiler/dart2js_native')) {
+          allowPrivateLibraryAccess = true;
+        }
+      }
+      if (!allowPrivateLibraryAccess) {
+        log('Internal library $uri is not accessible '

[ngeoffray, 2013/01/16 15:40:57]

Why do you log that? Isn't that something that the user will face?

[ahe, 2013/01/18 11:03:10]

The user will see an error message like this:

fisk.dart:1:8: Error: library not found dart:_private
import 'dart:_private';
       ^^^^^^^^^^^

But the log is helpful, I think.

[Johnni Winther, 2013/01/21 09:27:54]

Changed to [reportError].

+            '${sourceUri != null ? 'from $sourceUri' : ''}');
+        path = null;
+      }
+    }
+    if (path == null) {
       if (node != null) {
         reportError(node, 'library not found ${uri}');
       } else {
         reportDiagnostic(null, 'library not found ${uri}',
                          api.Diagnostic.ERROR);
       }
       return null;
     }
     if (uri.path == 'html' ||
         uri.path == 'io') {
@@ skipping 39 matching lines @@
       handler(translateUri(span.uri, null), span.begin, span.end,
               message, kind);
     }
   }
 
   bool get isMockCompilation {
     return mockableLibraryUsed
       && (options.indexOf('--allow-mock-compilation') != -1);
   }
 }