| Index: third_party/pkg/barback-0.13.0/lib/src/transform.dart
|
| diff --git a/pkg/barback/lib/src/transformer/transform.dart b/third_party/pkg/barback-0.13.0/lib/src/transform.dart
|
| similarity index 52%
|
| copy from pkg/barback/lib/src/transformer/transform.dart
|
| copy to third_party/pkg/barback-0.13.0/lib/src/transform.dart
|
| index 7991a82200d2520933f7f1e4a1b643b8467cb3ed..25c260af53a809be0af5c067fb6af2f9d3de7a0a 100644
|
| --- a/pkg/barback/lib/src/transformer/transform.dart
|
| +++ b/third_party/pkg/barback-0.13.0/lib/src/transform.dart
|
| @@ -2,32 +2,18 @@
|
| // 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.transformer.transform;
|
| +library barback.transform;
|
|
|
| import 'dart:async';
|
| import 'dart:convert';
|
|
|
| -import '../asset/asset.dart';
|
| -import '../asset/asset_id.dart';
|
| -import '../errors.dart';
|
| -import 'aggregate_transform.dart';
|
| -import 'transform_logger.dart';
|
| -
|
| -/// Creates a new [Transform] wrapping an [AggregateTransform].
|
| -///
|
| -/// Although barback internally works in terms of [AggregateTransformer]s, most
|
| -/// transformers only work on individual primary inputs in isolation. We want to
|
| -/// allow those transformers to implement the more user-friendly [Transformer]
|
| -/// interface which takes the more user-friendly [Transform] object. This method
|
| -/// wraps the more general [AggregateTransform] to return a [Transform] instead.
|
| -Future<Transform> newTransform(AggregateTransform aggregate) {
|
| - // A wrapped [Transformer] will assign each primary input a unique transform
|
| - // key, so we can safely get the first asset emitted. We don't want to wait
|
| - // for the stream to close, since that requires barback to prove that no more
|
| - // new assets will be generated.
|
| - return aggregate.primaryInputs.first.then((primaryInput) =>
|
| - new Transform._(aggregate, primaryInput));
|
| -}
|
| +import 'asset.dart';
|
| +import 'asset_id.dart';
|
| +import 'asset_set.dart';
|
| +import 'base_transform.dart';
|
| +import 'errors.dart';
|
| +import 'transform_node.dart';
|
| +import 'utils.dart';
|
|
|
| /// While a [Transformer] represents a *kind* of transformation, this defines
|
| /// one specific usage of it on a set of files.
|
| @@ -36,9 +22,10 @@ Future<Transform> newTransform(AggregateTransform aggregate) {
|
| /// facilitate communication between the [Transformer] and the code hosting
|
| /// the transformation. It lets the [Transformer] access inputs and generate
|
| /// outputs.
|
| -class Transform {
|
| - /// The underlying aggregate transform.
|
| - final AggregateTransform _aggregate;
|
| +class Transform extends BaseTransform {
|
| + final TransformNode _node;
|
| +
|
| + final _outputs = new AssetSet();
|
|
|
| /// Gets the primary input asset.
|
| ///
|
| @@ -49,17 +36,28 @@ class Transform {
|
| /// For example, with a dart2js transform, the primary input would be the
|
| /// entrypoint Dart file. All of the other Dart files that that imports
|
| /// would be secondary inputs.
|
| - final Asset primaryInput;
|
| + ///
|
| + /// This method may fail at runtime with an [AssetNotFoundException] if called
|
| + /// asynchronously after the transform begins running. The primary input may
|
| + /// become unavailable while this transformer is running due to asset changes
|
| + /// earlier in the graph. You can ignore the error if this happens: the
|
| + /// transformer will be re-run automatically for you.
|
| + Asset get primaryInput {
|
| + if (!_node.primary.state.isAvailable) {
|
| + throw new AssetNotFoundException(_node.primary.id);
|
| + }
|
|
|
| - /// A logger so that the [Transformer] can report build details.
|
| - TransformLogger get logger => _aggregate.logger;
|
| + return _node.primary.asset;
|
| + }
|
|
|
| - Transform._(this._aggregate, this.primaryInput);
|
| + Transform._(TransformNode node)
|
| + : _node = node,
|
| + super(node);
|
|
|
| /// Gets the asset for an input [id].
|
| ///
|
| /// If an input with [id] cannot be found, throws an [AssetNotFoundException].
|
| - Future<Asset> getInput(AssetId id) => _aggregate.getInput(id);
|
| + Future<Asset> getInput(AssetId id) => _node.getInput(id);
|
|
|
| /// A convenience method to the contents of the input with [id] as a string.
|
| ///
|
| @@ -70,8 +68,10 @@ class Transform {
|
| /// asset is decoded using [encoding], which defaults to [UTF8].
|
| ///
|
| /// If an input with [id] cannot be found, throws an [AssetNotFoundException].
|
| - Future<String> readInputAsString(AssetId id, {Encoding encoding}) =>
|
| - _aggregate.readInputAsString(id, encoding: encoding);
|
| + Future<String> readInputAsString(AssetId id, {Encoding encoding}) {
|
| + if (encoding == null) encoding = UTF8;
|
| + return getInput(id).then((input) => input.readAsString(encoding: encoding));
|
| + }
|
|
|
| /// A convenience method to the contents of the input with [id].
|
| ///
|
| @@ -80,25 +80,37 @@ class Transform {
|
| /// If the asset was created from a [String], this returns its UTF-8 encoding.
|
| ///
|
| /// If an input with [id] cannot be found, throws an [AssetNotFoundException].
|
| - Stream<List<int>> readInput(AssetId id) => _aggregate.readInput(id);
|
| + Stream<List<int>> readInput(AssetId id) =>
|
| + futureStream(getInput(id).then((input) => input.read()));
|
|
|
| /// A convenience method to return whether or not an asset exists.
|
| ///
|
| /// This is equivalent to calling [getInput] and catching an
|
| /// [AssetNotFoundException].
|
| - Future<bool> hasInput(AssetId id) => _aggregate.hasInput(id);
|
| + Future<bool> hasInput(AssetId id) {
|
| + return getInput(id).then((_) => true).catchError((error) {
|
| + if (error is AssetNotFoundException && error.id == id) return false;
|
| + throw error;
|
| + });
|
| + }
|
|
|
| /// Stores [output] as the output created by this transformation.
|
| ///
|
| /// A transformation can output as many assets as it wants.
|
| - void addOutput(Asset output) => _aggregate.addOutput(output);
|
| + void addOutput(Asset output) {
|
| + // TODO(rnystrom): This should immediately throw if an output with that ID
|
| + // has already been created by this transformer.
|
| + _outputs.add(output);
|
| + }
|
| +}
|
|
|
| - /// Consume the primary input so that it doesn't get processed by future
|
| - /// phases or emitted once processing has finished.
|
| - ///
|
| - /// Normally the primary input will automatically be forwarded unless the
|
| - /// transformer overwrites it by emitting an input with the same id. This
|
| - /// allows the transformer to tell barback not to forward the primary input
|
| - /// even if it's not overwritten.
|
| - void consumePrimary() => _aggregate.consumePrimary(primaryInput.id);
|
| +/// The controller for [Transform].
|
| +class TransformController extends BaseTransformController {
|
| + Transform get transform => super.transform;
|
| +
|
| + /// The set of assets that the transformer has emitted.
|
| + AssetSet get outputs => transform._outputs;
|
| +
|
| + TransformController(TransformNode node)
|
| + : super(new Transform._(node));
|
| }
|
|
|