Skip to content

Commit 30ca043

Browse files
tboschtbosch
committed
refactor(transformer): apply properties/events rename
1 parent 841f878 commit 30ca043

34 files changed

Lines changed: 91 additions & 91 deletions

File tree

‎modules_dart/transform/lib/src/transform/bind_generator/generator.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Future<String> createNgSettersAndGetters(
7272
NgDeps ngDeps = await NgDeps.parse(reader, entryPoint);
7373

7474
String code = ngDeps.code;
75-
var setters = _generateSetters(_createPropertiesMap(ngDeps));
75+
var setters = _generateSetters(_createInputPropertiesMap(ngDeps));
7676

7777
ngDeps.registeredTypes.forEach((t) {
7878
final fromAnnotation = new _ExtractQueryFieldsFromAnnotation();
@@ -99,7 +99,7 @@ Future<String> createNgSettersAndGetters(
9999

100100
// TODO(kegluneq): De-dupe from template_compiler/generator.dart, #3589.
101101

102-
/// Consumes the map generated by {@link _createPropertiesMap} to codegen
102+
/// Consumes the map generated by {@link _createInputPropertiesMap} to codegen
103103
/// setters.
104104
List<String> _generateSetters(Map<String, String> bindMap) {
105105
var setters = [];
@@ -116,18 +116,18 @@ List<String> _generateSetters(Map<String, String> bindMap) {
116116
return setters;
117117
}
118118

119-
/// Collapses all `properties` in {@link ngDeps} into a map where the keys are
120-
/// the bind properties and the values are either the one and only type
119+
/// Collapses all `inputs` in {@link ngDeps} into a map where the keys are
120+
/// the bind inputs and the values are either the one and only type
121121
/// binding to that property or the empty string.
122-
Map<String, String> _createPropertiesMap(NgDeps ngDeps) {
123-
var visitor = new ExtractNamedExpressionVisitor('properties');
122+
Map<String, String> _createInputPropertiesMap(NgDeps ngDeps) {
123+
var visitor = new ExtractNamedExpressionVisitor('inputs');
124124
var bindMap = {};
125125
ngDeps.registeredTypes.forEach((RegisteredType t) {
126126
visitor.bindConfig.clear();
127127
t.annotations.accept(visitor);
128128
visitor.bindConfig.forEach((String config) {
129129
// See comments for `Directive` in annotations_impl/annotations.ts for
130-
// details on how `properties` is specified.
130+
// details on how `inputs` is specified.
131131
var prop;
132132
var idx = config.indexOf(':');
133133
if (idx > 0) {

‎modules_dart/transform/lib/src/transform/common/directive_metadata_reader.dart‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ class _DirectiveMetadataVisitor extends Object
137137
String _selector;
138138
String _exportAs;
139139
ChangeDetectionStrategy _changeDetection;
140-
List<String> _properties;
141-
List<String> _events;
140+
List<String> _inputs;
141+
List<String> _outputs;
142142
Map<String, String> _host;
143143
List<LifecycleHooks> _lifecycleHooks;
144144
CompileTemplateMetadata _template;
@@ -153,8 +153,8 @@ class _DirectiveMetadataVisitor extends Object
153153
_selector = '';
154154
_exportAs = null;
155155
_changeDetection = ChangeDetectionStrategy.Default;
156-
_properties = <String>[];
157-
_events = <String>[];
156+
_inputs = <String>[];
157+
_outputs = <String>[];
158158
_host = <String, String>{};
159159
_lifecycleHooks = null;
160160
_template = null;
@@ -169,8 +169,8 @@ class _DirectiveMetadataVisitor extends Object
169169
selector: _selector,
170170
exportAs: _exportAs,
171171
changeDetection: _changeDetection,
172-
properties: _properties,
173-
events: _events,
172+
inputs: _inputs,
173+
outputs: _outputs,
174174
host: _host,
175175
lifecycleHooks: _lifecycleHooks,
176176
template: _template);
@@ -232,7 +232,7 @@ class _DirectiveMetadataVisitor extends Object
232232
case 'selector':
233233
_populateSelector(node.expression);
234234
break;
235-
case 'properties':
235+
case 'inputs':
236236
_populateProperties(node.expression);
237237
break;
238238
case 'host':
@@ -244,7 +244,7 @@ class _DirectiveMetadataVisitor extends Object
244244
case 'changeDetection':
245245
_populateChangeDetection(node.expression);
246246
break;
247-
case 'events':
247+
case 'outputs':
248248
_populateEvents(node.expression);
249249
break;
250250
}
@@ -264,9 +264,9 @@ class _DirectiveMetadataVisitor extends Object
264264
}
265265
}
266266

267-
void _populateProperties(Expression propertiesValue) {
267+
void _populateProperties(Expression inputsValue) {
268268
_checkMeta();
269-
_populateList(propertiesValue, _properties, 'Directive#properties');
269+
_populateList(inputsValue, _inputs, 'Directive#inputs');
270270
}
271271

272272
void _populateHost(Expression hostValue) {
@@ -279,9 +279,9 @@ class _DirectiveMetadataVisitor extends Object
279279
_exportAs = _expressionToString(exportAsValue, 'Directive#exportAs');
280280
}
281281

282-
void _populateEvents(Expression eventsValue) {
282+
void _populateEvents(Expression outputsValue) {
283283
_checkMeta();
284-
_populateList(eventsValue, _events, 'Directive#events');
284+
_populateList(outputsValue, _outputs, 'Directive#outputs');
285285
}
286286

287287
void _populateChangeDetection(Expression value) {

‎modules_dart/transform/lib/src/transform/template_compiler/reflection/processor.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Processor implements CodegenModel {
1515
final Set<ReflectiveAccessor> methodNames = new Set<ReflectiveAccessor>();
1616

1717
void process(CompileDirectiveMetadata meta) {
18-
meta.events.keys.forEach((eventName) {
18+
meta.outputs.keys.forEach((eventName) {
1919
getterNames.add(new ReflectiveAccessor(eventName));
2020
});
2121
}

‎modules_dart/transform/test/transform/bind_generator/all_tests.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ main() => allTests();
1414
void allTests() {
1515
var reader = new TestAssetReader();
1616

17-
it('should generate a setter for a `properties` property in an annotation.',
17+
it('should generate a setter for an `inputs` property in an annotation.',
1818
() async {
1919
var inputPath = 'bind_generator/basic_bind_files/bar.ng_deps.dart';
2020
var expected = formatter.format(
@@ -27,7 +27,7 @@ void allTests() {
2727

2828
it(
2929
'should generate a single setter when multiple annotations bind to the '
30-
'same property.', () async {
30+
'same `inputs` property.', () async {
3131
var inputPath =
3232
'bind_generator/duplicate_bind_name_files/soup.ng_deps.dart';
3333
var expected = formatter.format(readFile(

‎modules_dart/transform/test/transform/common/compile_directive_metadata/ng_for.ng_meta.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ final ngFor = {
1414
"moduleUrl": "asset:angular2/lib/src/core/directives/ng_for.dart"
1515
},
1616
"changeDetection": null,
17-
"properties": {"ngForOf": "ngForOf"},
18-
"events": {},
17+
"inputs": {"ngForOf": "ngForOf"},
18+
"outputs": {},
1919
"hostListeners": {},
2020
"hostProperties": {},
2121
"hostAttributes": {},

‎modules_dart/transform/test/transform/directive_metadata_linker/absolute_export_files/bar.ng_meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"moduleUrl": "asset:angular2/test/transform/directive_metadata_linker/absolute_export_files/bar.dart"
1414
},
1515
"changeDetection": 5,
16-
"properties": {},
17-
"events": {},
16+
"inputs": {},
17+
"outputs": {},
1818
"hostListeners": {},
1919
"hostProperties": {},
2020
"hostAttributes": {},

‎modules_dart/transform/test/transform/directive_metadata_linker/absolute_export_files/foo.ng_meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"moduleUrl": "asset:angular2/test/transform/directive_metadata_linker/absolute_export_files/foo.dart"
1515
},
1616
"changeDetection": 5,
17-
"properties": {},
18-
"events": {},
17+
"inputs": {},
18+
"outputs": {},
1919
"hostListeners": {},
2020
"hostProperties": {},
2121
"hostAttributes": {},

‎modules_dart/transform/test/transform/directive_metadata_linker/export_cycle_files/bar.ng_meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"moduleUrl": "asset:angular2/test/transform/directive_metadata_linker/export_cycle_files/bar.dart"
1515
},
1616
"changeDetection": 5,
17-
"properties": {},
18-
"events": {},
17+
"inputs": {},
18+
"outputs": {},
1919
"hostListeners": {},
2020
"hostProperties": {},
2121
"hostAttributes": {},

‎modules_dart/transform/test/transform/directive_metadata_linker/export_cycle_files/baz.ng_meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"moduleUrl": "asset:angular2/test/transform/directive_metadata_linker/export_cycle_files/baz.dart"
1515
},
1616
"changeDetection": 5,
17-
"properties": {},
18-
"events": {},
17+
"inputs": {},
18+
"outputs": {},
1919
"hostListeners": {},
2020
"hostProperties": {},
2121
"hostAttributes": {},

‎modules_dart/transform/test/transform/directive_metadata_linker/export_cycle_files/foo.ng_meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"moduleUrl": "asset:angular2/test/transform/directive_metadata_linker/export_cycle_files/foo.dart"
1515
},
1616
"changeDetection": 5,
17-
"properties": {},
18-
"events": {},
17+
"inputs": {},
18+
"outputs": {},
1919
"hostListeners": {},
2020
"hostProperties": {},
2121
"hostAttributes": {},

0 commit comments

Comments
 (0)