cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(dart/transform): Generate inputs setters in TemplateCompiler step

Browse Source 
Move generation of setters for `inputs` from `BindGenerator` into
`TemplateCompiler`.
This commit is contained in:
Tim Blasi
2015-10-07 10:03:50 -07:00
parent c94f239536
commit fcc6f2c561
14 changed files with 207 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules_dart/transform/lib/src/transform/bind_generator/generator.dart
View File

@ -8,8 +8,6 @@ import 'package:angular2/src/transform/common/ng_deps.dart';
import 'package:angular2/src/transform/common/property_utils.dart' as prop;
import 'package:barback/barback.dart';
import 'visitor.dart';
class _ExtractQueryFieldsFromAnnotation extends Object
with RecursiveAstVisitor<Object> {
final ConstantEvaluator _evaluator = new ConstantEvaluator();
@ -73,7 +71,7 @@ Future<String> createNgSettersAndGetters(
NgDeps ngDeps = await NgDeps.parse(reader, entryPoint);
String code = ngDeps.code;
var setters = _generateSetters(_createInputPropertiesMap(ngDeps));
var setters = [];
ngDeps.registeredTypes.forEach((t) {
final fromAnnotation = new _ExtractQueryFieldsFromAnnotation();
@ -116,32 +114,3 @@ List<String> _generateSetters(Map<String, String> bindMap) {
});
return setters;
}
/// Collapses all `inputs` in {@link ngDeps} into a map where the keys are
/// the bind inputs and the values are either the one and only type
/// binding to that property or the empty string.
Map<String, String> _createInputPropertiesMap(NgDeps ngDeps) {
var visitor = new ExtractNamedExpressionVisitor('inputs');
var bindMap = {};
ngDeps.registeredTypes.forEach((RegisteredType t) {
visitor.bindConfig.clear();
t.annotations.accept(visitor);
visitor.bindConfig.forEach((String config) {
// See comments for `Directive` in annotations_impl/annotations.ts for
// details on how `inputs` is specified.
var prop;
var idx = config.indexOf(':');
if (idx > 0) {
prop = config.substring(0, idx).trim();
} else {
prop = config;
}
if (bindMap.containsKey(prop)) {
bindMap[prop] = '';
} else {
bindMap[prop] = '${t.typeName}';
}
});
});
return bindMap;
}

30
modules_dart/transform/lib/src/transform/bind_generator/visitor.dart
View File

@ -1,30 +0,0 @@
library angular2.transform.bind_generator.visitor;
import 'package:analyzer/analyzer.dart';
import 'package:angular2/src/transform/common/logging.dart';
/// Visitor responsible for crawling the "annotations" value in a
/// `registerType` call and pulling out the properties of any "bind"
/// values found.
class ExtractNamedExpressionVisitor extends Object
with RecursiveAstVisitor<Object> {
final ConstantEvaluator _evaluator = new ConstantEvaluator();
final List<String> bindConfig = [];
final String nameToExtract;
ExtractNamedExpressionVisitor(this.nameToExtract);
@override
Object visitNamedExpression(NamedExpression node) {
if ('${node.name.label}' == nameToExtract) {
var evaluated = node.expression.accept(_evaluator);
if (evaluated is List) {
bindConfig.addAll(evaluated);
} else {
logger.error('`$nameToExtract` currently only supports List values');
}
return null;
}
return super.visitNamedExpression(node);
}
}

13
modules_dart/transform/lib/src/transform/template_compiler/reflection/processor.dart
View File

@ -15,8 +15,15 @@ class Processor implements CodegenModel {
final Set<ReflectiveAccessor> methodNames = new Set<ReflectiveAccessor>();
void process(CompileDirectiveMetadata meta) {
meta.outputs.keys.forEach((eventName) {
getterNames.add(new ReflectiveAccessor(eventName));
});
if (meta.outputs != null) {
meta.outputs.keys.forEach((eventName) {
getterNames.add(new ReflectiveAccessor(eventName));
});
}
if (meta.inputs != null) {
meta.inputs.keys.forEach((inputName) {
setterNames.add(new ReflectiveAccessor(inputName));
});
}
}
}