| Index: sdk/lib/_internal/pub/lib/src/barback/load_transformers.dart
|
| diff --git a/sdk/lib/_internal/pub/lib/src/barback/load_transformers.dart b/sdk/lib/_internal/pub/lib/src/barback/load_transformers.dart
|
| index c5cb4b9ca815c643827f293f300d21647f676644..c9a6bb64dd725a7251960555eac334885e275e71 100644
|
| --- a/sdk/lib/_internal/pub/lib/src/barback/load_transformers.dart
|
| +++ b/sdk/lib/_internal/pub/lib/src/barback/load_transformers.dart
|
| @@ -8,16 +8,13 @@ import 'dart:async';
|
| import 'dart:convert';
|
| import 'dart:isolate';
|
|
|
| -import 'package:barback/barback.dart';
|
| -// TODO(nweiz): don't import from "src" once issue 14966 is fixed.
|
| -import 'package:barback/src/internal_asset.dart';
|
| -
|
| import '../../../asset/dart/serialize.dart';
|
| import '../barback.dart';
|
| import '../dart.dart' as dart;
|
| import '../log.dart' as log;
|
| import '../utils.dart';
|
| import 'build_environment.dart';
|
| +import 'foreign_transformer.dart';
|
| import 'excluding_transformer.dart';
|
| import 'barback_server.dart';
|
|
|
| @@ -53,7 +50,7 @@ Future<Set> loadTransformers(BuildEnvironment environment,
|
| 'configuration': JSON.encode(id.configuration)
|
| }).then((transformers) {
|
| transformers = transformers.map(
|
| - (transformer) => _deserializeTransformerOrGroup(transformer, id))
|
| + (transformer) => deserializeTransformerOrGroup(transformer, id))
|
| .toSet();
|
| log.fine("Transformers from $assetId: $transformers");
|
| return transformers;
|
| @@ -75,63 +72,3 @@ Future<Set> loadTransformers(BuildEnvironment environment,
|
| });
|
| });
|
| }
|
| -
|
| -/// A wrapper for a transformer that's in a different isolate.
|
| -class _ForeignTransformer extends Transformer {
|
| - /// The port with which we communicate with the child isolate.
|
| - ///
|
| - /// This port and all messages sent across it are specific to this
|
| - /// transformer.
|
| - final SendPort _port;
|
| -
|
| - /// The result of calling [toString] on the transformer in the isolate.
|
| - final String _toString;
|
| -
|
| - _ForeignTransformer(Map map)
|
| - : _port = map['port'],
|
| - _toString = map['toString'];
|
| -
|
| - Future<bool> isPrimary(AssetId id) {
|
| - return call(_port, {
|
| - 'type': 'isPrimary',
|
| - 'id': serializeId(id)
|
| - });
|
| - }
|
| -
|
| - Future apply(Transform transform) {
|
| - return call(_port, {
|
| - 'type': 'apply',
|
| - 'transform': serializeTransform(transform)
|
| - });
|
| - }
|
| -
|
| - String toString() => _toString;
|
| -}
|
| -
|
| -/// A wrapper for a transformer group that's in a different isolate.
|
| -class _ForeignGroup implements TransformerGroup {
|
| - final Iterable<Iterable> phases;
|
| -
|
| - /// The result of calling [toString] on the transformer group in the isolate.
|
| - final String _toString;
|
| -
|
| - _ForeignGroup(TransformerId id, Map map)
|
| - : phases = map['phases'].map((phase) {
|
| - return phase.map((transformer) => _deserializeTransformerOrGroup(
|
| - transformer, id)).toList();
|
| - }).toList(),
|
| - _toString = map['toString'];
|
| -
|
| - String toString() => _toString;
|
| -}
|
| -
|
| -/// Converts a serializable map into a [Transformer] or a [TransformerGroup].
|
| -_deserializeTransformerOrGroup(Map map, TransformerId id) {
|
| - if (map['type'] == 'Transformer') {
|
| - var transformer = new _ForeignTransformer(map);
|
| - return ExcludingTransformer.wrap(transformer, id.includes, id.excludes);
|
| - }
|
| -
|
| - assert(map['type'] == 'TransformerGroup');
|
| - return new _ForeignGroup(id, map);
|
| -}
|
|
|