Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Unified Diff: pkg/barback/lib/src/graph/package_graph.dart

Issue 554783003: Add the ability for a PackageProvider to declare static packages. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/barback/lib/src/graph/asset_cascade.dart ('k') | pkg/barback/lib/src/graph/static_asset_cascade.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/barback/lib/src/graph/package_graph.dart
diff --git a/pkg/barback/lib/src/graph/package_graph.dart b/pkg/barback/lib/src/graph/package_graph.dart
index 0f9cde96d1576087b6bfce578481ad2c2e97f3e8..e66dc441c582f36bf3cadde32e481ee4184d3918 100644
--- a/pkg/barback/lib/src/graph/package_graph.dart
+++ b/pkg/barback/lib/src/graph/package_graph.dart
@@ -17,6 +17,7 @@ import '../package_provider.dart';
import '../utils.dart';
import 'asset_cascade.dart';
import 'node_status.dart';
+import 'static_asset_cascade.dart';
/// The collection of [AssetCascade]s for an entire application.
///
@@ -95,9 +96,26 @@ class PackageGraph {
});
}
+ if (provider is StaticPackageProvider) {
+ StaticPackageProvider staticProvider = provider;
+ for (var package in staticProvider.staticPackages) {
+ if (_cascades.containsKey(package)) {
+ throw new StateError('Package "$package" is in both '
+ 'PackageProvider.packages and PackageProvider.staticPackages.');
+ }
+
+ var cascade = new StaticAssetCascade(this, package);
+ _cascades[package] = cascade;
+ }
+ }
+
_errors = mergeStreams(_cascades.values.map((cascade) => cascade.errors),
broadcast: true);
_errors.listen(_accumulatedErrors.add);
+
+ // Make sure a result gets scheduled even if there are no cascades or all
+ // of them are static.
+ if (provider.packages.isEmpty) _tryScheduleResult();
});
}
@@ -147,10 +165,12 @@ class PackageGraph {
}
// Otherwise, return all of the final output assets.
- var assets = unionAll(_cascades.values.map(
- (cascade) => cascade.availableOutputs.toSet()));
-
- return new Future.value(new AssetSet.from(assets));
+ return Future.wait(_cascades.values.map(
+ (cascade) => cascade.availableOutputs))
+ .then((assetSets) {
+ var assets = unionAll(assetSets.map((assetSet) => assetSet.toSet()));
+ return new Future.value(new AssetSet.from(assets));
+ });
}
/// Adds [sources] to the graph's known set of source assets.
« no previous file with comments | « pkg/barback/lib/src/graph/asset_cascade.dart ('k') | pkg/barback/lib/src/graph/static_asset_cascade.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698