Rename several classes in barback.

pkg/barback/lib/src/package_graph.dart

Index: pkg/barback/lib/src/package_graph.dart
diff --git a/pkg/barback/lib/src/asset_graph_manager.dart b/pkg/barback/lib/src/package_graph.dart
similarity index 52%
rename from pkg/barback/lib/src/asset_graph_manager.dart
rename to pkg/barback/lib/src/package_graph.dart
index e7bf958386a8ec6ed886cedd7fe8d5bbf534e7f9..4dc2719221467bd29fe50a07041910903eb8e35a 100644
--- a/pkg/barback/lib/src/asset_graph_manager.dart
+++ b/pkg/barback/lib/src/package_graph.dart
@@ -2,42 +2,40 @@
 // 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 barback.asset_graph_manager;
+library barback.package_graph;
 
 import 'dart:async';
 
 import 'package:stack_trace/stack_trace.dart';
 
 import 'asset.dart';
-import 'asset_provider.dart';
-import 'asset_graph.dart';
+import 'asset_cascade.dart';
 import 'asset_id.dart';
 import 'errors.dart';
+import 'package_provider.dart';
 import 'utils.dart';
 
-// TODO(nweiz): come up with better names for this and AssetGraph.
-
-/// The asset manager for an entire application.
+/// The collection of [AssetCascade]s for an entire application.
 ///
-/// This tracks each package's [AssetGraph] and routes asset requests between
+/// This tracks each package's [AssetCascade] and routes asset requests between
 /// them.
-class AssetGraphManager {
+class PackageGraph {
   /// The provider that exposes asset and package information.
-  final AssetProvider provider;
+  final PackageProvider provider;
 
-  /// The [AssetGraph] for each package.
-  final _graphs = <String, AssetGraph>{};
+  /// The [AssetCascade] for each package.
+  final _cascades = <String, AssetCascade>{};
 
-  /// The current [BuildResult] for each package's [AssetGraph].
+  /// The current [BuildResult] for each package's [AssetCascade].
   ///
-  /// The result for a given package will be `null` if that [AssetGraph] is
+  /// The result for a given package will be `null` if that [AssetCascade] is
   /// actively building.
-  final _graphResults = <String, BuildResult>{};
+  final _cascadeResults = <String, BuildResult>{};
 
   /// A stream that emits a [BuildResult] each time the build is completed,
   /// whether or not it succeeded.
   ///
-  /// This will emit a result only once every package's [AssetGraph] has
+  /// This will emit a result only once every package's [AssetCascade] has
   /// finished building.
   ///
   /// If an unexpected error in barback itself occurs, it will be emitted
@@ -45,41 +43,41 @@ class AssetGraphManager {
   Stream<BuildResult> get results => _resultsController.stream;
   final _resultsController = new StreamController<BuildResult>.broadcast();
 
-  /// A stream that emits any errors from the asset graph or the transformers.
+  /// A stream that emits any errors from the graph or the transformers.
   ///
   /// This emits errors as they're detected. If an error occurs in one part of
-  /// the asset graph, unrelated parts will continue building.
+  /// the graph, unrelated parts will continue building.
   ///
   /// This will not emit programming errors from barback itself. Those will be
   /// emitted through the [results] stream's error channel.
   Stream get errors => _errors;
   Stream _errors;
 
-  /// Creates a new [AssetGraphManager] that will transform assets in all
-  /// packages made available by [provider].
-  AssetGraphManager(this.provider) {
+  /// Creates a new [PackageGraph] that will transform assets in all packages
+  /// made available by [provider].
+  PackageGraph(this.provider) {
     for (var package in provider.packages) {
-      var graph = new AssetGraph(this, package,
+      var cascade = new AssetCascade(this, package,
           provider.getTransformers(package));
-      // The initial result for each graph is "success" since the graph doesn't
-      // start building until some source in that graph is updated.
-      _graphResults[package] = new BuildResult.success();
-      _graphs[package] = graph;
-
-      graph.results.listen((result) {
-        _graphResults[graph.package] = result;
-        // If any graph hasn't yet finished, the overall build isn't finished
+      // The initial result for each cascade is "success" since the cascade
+      // doesn't start building until some source in that graph is updated.
+      _cascadeResults[package] = new BuildResult.success();
+      _cascades[package] = cascade;
+
+      cascade.results.listen((result) {
+        _cascadeResults[cascade.package] = result;
+        // If any cascade hasn't yet finished, the overall build isn't finished
         // either.
-        if (_graphResults.values.any((result) => result == null)) return;
+        if (_cascadeResults.values.any((result) => result == null)) return;
 
-        // Include all build errors for all graphs. If no graphs have errors,
-        // the result will automatically be considered a success.
+        // Include all build errors for all cascades. If no cascades have
+        // errors, the result will automatically be considered a success.
         _resultsController.add(new BuildResult(flatten(
-            _graphResults.values.map((result) => result.errors))));
+            _cascadeResults.values.map((result) => result.errors))));
       }, onError: _resultsController.addError);
     }
 
-    _errors = mergeStreams(_graphs.values.map((graph) => graph.errors));
+    _errors = mergeStreams(_cascades.values.map((cascade) => cascade.errors));
   }
 
   /// Gets the asset identified by [id].
@@ -88,8 +86,8 @@ class AssetGraphManager {
   /// it has been created and return it. If the asset cannot be found, throws
   /// [AssetNotFoundException].
   Future<Asset> getAssetById(AssetId id) {
-    var graph = _graphs[id.package];
-    if (graph != null) return graph.getAssetById(id);
+    var cascade = _cascades[id.package];
+    if (cascade != null) return cascade.getAssetById(id);
     return new Future.error(
         new AssetNotFoundException(id),
         new Trace.current().vmTrace);
@@ -102,20 +100,20 @@ class AssetGraphManager {
   /// transforms that use it will be re-applied.
   void updateSources(Iterable<AssetId> sources) {
     groupBy(sources, (id) => id.package).forEach((package, ids) {
-      var graph = _graphs[package];
-      if (graph == null) throw new ArgumentError("Unknown package $package.");
-      _graphResults[package] = null;
-      graph.updateSources(ids);
+      var cascade = _cascades[package];
+      if (cascade == null) throw new ArgumentError("Unknown package $package.");
+      _cascadeResults[package] = null;
+      cascade.updateSources(ids);
     });
   }
 
   /// Removes [removed] from the graph's known set of source assets.
   void removeSources(Iterable<AssetId> sources) {
     groupBy(sources, (id) => id.package).forEach((package, ids) {
-      var graph = _graphs[package];
-      if (graph == null) throw new ArgumentError("Unknown package $package.");
-      _graphResults[package] = null;
-      graph.removeSources(ids);
+      var cascade = _cascades[package];
+      if (cascade == null) throw new ArgumentError("Unknown package $package.");
+      _cascadeResults[package] = null;
+      cascade.removeSources(ids);
     });
   }
 }