Update crypto, add entryPoints option to buildStep#resolve, and enable custom resolvers

* Update crypto, add entryPoints option to buildStep#resolve, and enable custom resolvers

Author: jakemac53

CHANGELOG.md

@@ -3,6 +3,9 @@
 ## 0.3.0
 - **BREAKING** Renamed values of three enums to be lower-case:
   `BuildType`, `BuildStatus`, and `PackageDependencyType`.
+- Updated to crypto ^1.0.0.
+- Added option to resolve additional entry points in `buildStep.resolve`.
+- Added option to pass in a custom `Resolvers` instance.
 
 ## 0.2.1
 - Added the `deleteFilesByDefault` option to all top level methods. This will

lib/src/builder/build_step.dart

@@ -36,5 +36,6 @@ abstract class BuildStep {
   /// will only be resolved in [id], and not any other libraries. This gives a
   /// significant speed boost, at the cost of not being able to assume all
   /// constants are already resolved.
-  Future<Resolver> resolve(AssetId id, {bool resolveAllConstants});
+  Future<Resolver> resolve(AssetId id,
+      {bool resolveAllConstants, List<AssetId> entryPoints});
 }

lib/src/builder/build_step_impl.dart

@@ -21,8 +21,8 @@ import 'exceptions.dart';
 /// A single step in the build processes. This represents a single input and
 /// its expected and real outputs. It also handles tracking of dependencies.
 class BuildStepImpl implements BuildStep {
-  /// Single `_resolvers` instance for all [BuildStepImpl]s
-  static code_transformers.Resolvers _resolvers =
+  /// Single `resolvers` instance for all [BuildStepImpl]s
+  static code_transformers.Resolvers resolvers =
       new code_transformers.Resolvers(code_transformers.dartSdkDirectory,
           useSharedSources: true);
 
@@ -102,9 +102,13 @@ class BuildStepImpl implements BuildStep {
 
   /// Resolves [id] and returns a [Future<Resolver>] once that is done.
   @override
-  Future<Resolver> resolve(AssetId id, {bool resolveAllConstants}) async =>
-      new Resolver(await _resolvers.get(toBarbackTransform(this),
-          [toBarbackAssetId(id)], resolveAllConstants));
+  Future<Resolver> resolve(AssetId id,
+      {bool resolveAllConstants, List<AssetId> entryPoints}) async {
+    entryPoints ??= [];
+    if (!entryPoints.contains(id)) entryPoints.add(id);
+    return new Resolver(await resolvers.get(toBarbackTransform(this),
+        entryPoints.map(toBarbackAssetId).toList(), resolveAllConstants));
+  }
 
   /// Should be called after `build` has completed. This will wait until for
   /// [_outputsCompleted].

lib/src/generate/build.dart

@@ -4,6 +4,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:code_transformers/resolver.dart';
 import 'package:logging/logging.dart';
 import 'package:shelf/shelf.dart';
 
@@ -48,14 +49,16 @@ Future<BuildResult> build(PhaseGroup phaseGroup,
     AssetWriter writer,
     Level logLevel,
     onLog(LogRecord record),
+    Resolvers resolvers,
     Stream terminateEventStream}) async {
   var options = new BuildOptions(
       deleteFilesByDefault: deleteFilesByDefault,
       packageGraph: packageGraph,
       reader: reader,
       writer: writer,
       logLevel: logLevel,
-      onLog: onLog);
+      onLog: onLog,
+      resolvers: resolvers);
   var buildImpl = new BuildImpl(options, phaseGroup);
 
   /// Run the build!
@@ -94,6 +97,7 @@ Stream<BuildResult> watch(PhaseGroup phaseGroup,
     AssetWriter writer,
     Level logLevel,
     onLog(LogRecord record),
+    Resolvers resolvers,
     Duration debounceDelay,
     DirectoryWatcherFactory directoryWatcherFactory,
     Stream terminateEventStream}) {
@@ -104,6 +108,7 @@ Stream<BuildResult> watch(PhaseGroup phaseGroup,
       writer: writer,
       logLevel: logLevel,
       onLog: onLog,
+      resolvers: resolvers,
       debounceDelay: debounceDelay,
       directoryWatcherFactory: directoryWatcherFactory);
   var watchImpl = new WatchImpl(options, phaseGroup);
@@ -136,6 +141,7 @@ Stream<BuildResult> serve(PhaseGroup phaseGroup,
     AssetWriter writer,
     Level logLevel,
     onLog(LogRecord record),
+    Resolvers resolvers,
     Duration debounceDelay,
     DirectoryWatcherFactory directoryWatcherFactory,
     Stream terminateEventStream,
@@ -150,6 +156,7 @@ Stream<BuildResult> serve(PhaseGroup phaseGroup,
       writer: writer,
       logLevel: logLevel,
       onLog: onLog,
+      resolvers: resolvers,
       debounceDelay: debounceDelay,
       directoryWatcherFactory: directoryWatcherFactory,
       directory: directory,

lib/src/generate/build_impl.dart

@@ -54,7 +54,9 @@ class BuildImpl {
         _deleteFilesByDefault = options.deleteFilesByDefault,
         _packageGraph = options.packageGraph,
         _reader = options.reader,
-        _writer = options.writer;
+        _writer = options.writer {
+    if (options.resolvers != null) BuildStepImpl.resolvers = options.resolvers;
+  }
 
   /// Runs a build
   ///
@@ -471,9 +473,14 @@ class BuildImpl {
         package, [package == _packageGraph.root.name ? '**/*' : 'lib/**']));
     var allInputs = await _reader.listAssetIds(inputSets).toList();
     _inputsByPackage.clear();
-    for (var input in allInputs) {
-      _inputsByPackage.putIfAbsent(input.package, () => new Set<AssetId>());
 
+    // Initialize the set of inputs for each package.
+    for (var package in packages) {
+      _inputsByPackage[package] = new Set<AssetId>();
+    }
+
+    // Populate the inputs for each package.
+    for (var input in allInputs) {
       if (_isValidInput(input)) {
         _inputsByPackage[input.package].add(input);
       }

lib/src/generate/options.dart

@@ -4,6 +4,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:code_transformers/resolver.dart';
 import 'package:logging/logging.dart';
 import 'package:shelf/shelf.dart';
 import 'package:shelf_static/shelf_static.dart';
@@ -23,6 +24,7 @@ class BuildOptions {
   AssetReader reader;
   AssetWriter writer;
   bool deleteFilesByDefault;
+  Resolvers resolvers;
 
   // Watch mode options.
   Duration debounceDelay;
@@ -46,6 +48,7 @@ class BuildOptions {
       this.port,
       this.reader,
       this.requestHandler,
+      this.resolvers,
       this.writer}) {
     /// Set up logging
     logLevel ??= Level.INFO;

lib/src/util/constants.dart

@@ -11,8 +11,5 @@ final String assetGraphPath = '$cacheDir/$scriptHash/asset_graph.json';
 /// Relative path to the cache directory from the root package dir.
 const String cacheDir = '.dart_tool/build';
 
-final String scriptHash = () {
-  var hasher = new MD5();
-  hasher.add(Platform.script.path.codeUnits);
-  return CryptoUtils.bytesToHex(hasher.close());
-}();
+final String scriptHash =
+    md5.convert(Platform.script.path.codeUnits).toString();

pubspec.yaml

@@ -1,5 +1,5 @@
 name: build
-version: 0.3.0-dev
+version: 0.3.0
 description: A build system for Dart.
 author: Dart Team <[email protected]>
 homepage: https://github.com/dart-lang/build
@@ -11,7 +11,7 @@ dependencies:
   analyzer: ^0.27.1
   barback: ^0.15.0
   code_transformers: ^0.4.1
-  crypto: ^0.9.1
+  crypto: ^1.0.0
   logging: ^0.11.2
   glob: ^1.1.0
   path: ^1.1.0

test/analyzer/resolver_test.dart

@@ -279,34 +279,6 @@ void main() {
           });
     });
 
-    test('deleted files should be removed', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''import 'package:a/a.dart';''',
-            'a|lib/a.dart': '''import 'package:a/b.dart';''',
-            'a|lib/b.dart': '''class Engine{}''',
-          },
-          validator: (resolver) {
-            var engine = resolver.getType('Engine');
-            var uri = resolver.getImportUri(engine.library);
-            expect(uri.toString(), 'package:a/b.dart');
-          }).then((_) {
-        return validateResolver(
-            inputs: {
-              'a|web/main.dart': '''import 'package:a/a.dart';''',
-              'a|lib/a.dart': '''lib a;\n class Engine{}'''
-            },
-            validator: (resolver) {
-              var engine = resolver.getType('Engine');
-              var uri = resolver.getImportUri(engine.library);
-              expect(uri.toString(), 'package:a/a.dart');
-
-              // Make sure that we haven't leaked any sources.
-              expect((resolver.resolver as dynamic).sources.length, 2);
-            });
-      });
-    });
-
     test('handles circular imports', () {
       return validateResolver(
           inputs: {