explicitly skip dart-ext: uris (#2046)

* explicitly skip dart-ext: uris

* skip dart-ext imports during module creation

Author: jakemac53

build_modules/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## 1.0.7
 
+- Explicitly skip dart-ext uris during module creation.
+  - Filed Issue #2047 to track real support for native extensions.
 - Run workers with mode `detachedWithStdio` if no terminal is connected. 
 
 ## 1.0.6

build_modules/lib/src/module_library.dart

@@ -78,6 +78,10 @@ class ModuleLibrary {
       if (directive is! UriBasedDirective) continue;
       var path = (directive as UriBasedDirective).uri.stringValue;
       var uri = Uri.parse(path);
+      if (uri.isScheme('dart-ext')) {
+        // TODO: What should we do for native extensions?
+        continue;
+      }
       if (uri.scheme == 'dart') {
         sdkDeps.add(uri.path);
         continue;

build_resolvers/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.3
+
+- Fixes a bug where transitive `dart-ext:` imports would cause the resolver
+  to fail. These uris will now be ignored.
+
 ## 1.0.2
 
 - Ensure that `BuildAssetUriResolver.restoreAbsolute` never returns null.

build_resolvers/lib/src/build_asset_uri_resolver.dart

@@ -13,6 +13,8 @@ import 'package:analyzer/src/generated/source.dart';
 import 'package:build/build.dart' show AssetId, BuildStep;
 import 'package:path/path.dart' as p;
 
+const _ignoredSchemes = ['dart', 'dart-ext'];
+
 class BuildAssetUriResolver extends UriResolver {
   final _cachedAssetDependencies = <AssetId, Set<AssetId>>{};
   final _cachedAssetContents = <AssetId, String>{};
@@ -48,7 +50,10 @@ class BuildAssetUriResolver extends UriResolver {
           var unit = parseDirectives(contents, suppressErrors: true);
           var dependencies = unit.directives
               .whereType<UriBasedDirective>()
-              .where((d) => !Uri.parse(d.uri.stringValue).isScheme('dart'))
+              .where((directive) {
+                var uri = Uri.parse(directive.uri.stringValue);
+                return !_ignoredSchemes.any(uri.isScheme);
+              })
               .map((d) => AssetId.resolve(d.uri.stringValue, from: assetId))
               .where((id) => id != null)
               .toSet();
@@ -79,7 +84,7 @@ class BuildAssetUriResolver extends UriResolver {
   ///
   /// Returns null if the Uri cannot be parsed or is not cached.
   AssetId lookupAsset(Uri uri) {
-    if (uri.isScheme('dart')) return null;
+    if (_ignoredSchemes.any(uri.isScheme)) return null;
     if (uri.isScheme('package') || uri.isScheme('asset')) {
       final assetId = AssetId.resolve('$uri');
       return _cachedAssetContents.containsKey(assetId) ? assetId : null;

build_resolvers/pubspec.yaml

@@ -1,5 +1,5 @@
 name: build_resolvers
-version: 1.0.2
+version: 1.0.3
 description: Resolve Dart code in a Builder
 author: Dart Team <[email protected]>
 homepage: https://github.com/dart-lang/build/tree/master/build_resolvers

build_resolvers/test/resolver_test.dart

@@ -103,7 +103,11 @@ void main() {
     test('should resolve types and library uris', () {
       return resolveSources({
         'a|web/main.dart': '''
+              // dart and dart-ext uris should be ignored
               import 'dart:core';
+              import 'dart-ext:some-ext';
+
+              // package: and relative uris should be available
               import 'package:a/a.dart';
               import 'package:a/b.dart';
               import 'sub_dir/d.dart';