Skip to content

Commit c701664

Browse files
committed
chore(transformers): remove reflector parameter from initReflector signature
Remove reflector parameter from initReflector method to simplify ng_deps for reflection initialization. It wasn't used and was added for testability, but wasn't used. This keeps the interface simplier.
1 parent a4915ad commit c701664

File tree

39 files changed

+108
-74
lines changed

39 files changed

+108
-74
lines changed

modules/angular2/src/transform/directive_linker/linker.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ Future<String> linkNgDeps(AssetReader reader, AssetId entryPoint) async {
7272
importBuf.write('''
7373
import '${linkedDepsMap[it.current]}' as i${i};
7474
''');
75-
declarationBuf
76-
.write('i${i}.${SETUP_METHOD_NAME}(${REFLECTOR_VAR_NAME});');
75+
declarationBuf.write('i${i}.${SETUP_METHOD_NAME}();');
7776
++i;
7877
}
7978
}

modules/angular2/src/transform/directive_processor/rewriter.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ class CreateNgDepsVisitor extends Object with SimpleAstVisitor<Object> {
9494
if (_wroteBaseLibImport) return;
9595
_wroteBaseLibImport = true;
9696
writer.print('''import '${path.basename(assetId.path)}';''');
97+
writer.print("import '$_REFLECTOR_IMPORT' as $_REF_PREFIX;");
9798
}
9899

99100
void _updateUsesNonLangLibs(UriBasedDirective directive) {
@@ -118,7 +119,7 @@ class CreateNgDepsVisitor extends Object with SimpleAstVisitor<Object> {
118119
void _openFunctionWrapper() {
119120
_maybeWriteImport();
120121
writer.print('var _visited = false;'
121-
'void ${SETUP_METHOD_NAME}(${REFLECTOR_VAR_NAME}) {'
122+
'void ${SETUP_METHOD_NAME}() {'
122123
'if (_visited) return; _visited = true;');
123124
}
124125

@@ -256,6 +257,9 @@ class CreateNgDepsVisitor extends Object with SimpleAstVisitor<Object> {
256257
_foundNgInjectable = true;
257258

258259
// The receiver for cascaded calls.
259-
writer.print(REFLECTOR_VAR_NAME);
260+
writer.print('$_REF_PREFIX.$REFLECTOR_VAR_NAME');
260261
}
261262
}
263+
264+
const _REF_PREFIX = '_ngRef';
265+
const _REFLECTOR_IMPORT = 'package:angular2/src/reflection/reflection.dart';

modules/angular2/src/transform/reflection_remover/codegen.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ class Codegen {
5353

5454
var count = 0;
5555
return importUris
56-
.map((_) =>
57-
'${prefix}${count++}.${SETUP_METHOD_NAME}(${reflectorExpression});')
56+
.map((_) => '${prefix}${count++}.${SETUP_METHOD_NAME}();')
5857
.join('');
5958
}
6059
}

modules/angular2/test/transform/directive_linker/simple_export_files/bar.ng_deps.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
library bar.ng_deps.dart;
22

33
import 'bar.dart';
4+
import 'package:angular2/src/reflection/reflection.dart' as _ngRef;
45
import 'package:angular2/src/core/annotations_impl/annotations.dart';
56
export 'foo.dart';
67

78
var _visited = false;
8-
void initReflector(reflector) {
9+
void initReflector() {
910
if (_visited) return;
1011
_visited = true;
11-
reflector
12+
_ngRef.reflector
1213
..registerType(MyComponent, {
1314
'factory': () => new MyComponent(),
1415
'parameters': const [],
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
library bar.ng_deps.dart;
22

33
import 'bar.dart';
4+
import 'package:angular2/src/reflection/reflection.dart' as _ngRef;
45
import 'package:angular2/src/core/annotations_impl/annotations.dart';
56
export 'foo.dart';
67
import 'foo.ng_deps.dart' as i0;
78

89
var _visited = false;
9-
void initReflector(reflector) {
10+
void initReflector() {
1011
if (_visited) return;
1112
_visited = true;
12-
reflector
13+
_ngRef.reflector
1314
..registerType(MyComponent, {
1415
'factory': () => new MyComponent(),
1516
'parameters': const [],
1617
'annotations': const [const Component(selector: '[soup]')]
1718
});
18-
i0.initReflector(reflector);
19+
i0.initReflector();
1920
}

modules/angular2/test/transform/directive_linker/simple_export_files/expected/foo.ng_deps.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
library foo.ng_deps.dart;
22

33
import 'foo.dart';
4+
import 'package:angular2/src/reflection/reflection.dart' as _ngRef;
45
import 'package:angular2/src/core/annotations_impl/annotations.dart';
56

67
var _visited = false;
7-
void initReflector(reflector) {
8+
void initReflector() {
89
if (_visited) return;
910
_visited = true;
10-
reflector
11+
_ngRef.reflector
1112
..registerType(DependencyComponent, {
1213
'factory': () => new DependencyComponent(),
1314
'parameters': const [],
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
library web_foo.ng_deps.dart;
22

3+
import 'package:angular2/src/reflection/reflection.dart' as _ngRef;
34
import 'package:angular2/src/core/application.dart';
45
import 'package:angular2/src/reflection/reflection_capabilities.dart';
56
import 'bar.dart';
67
import 'bar.ng_deps.dart' as i0;
78

89
var _visited = false;
9-
void initReflector(reflector) {
10+
void initReflector() {
1011
if (_visited) return;
1112
_visited = true;
12-
i0.initReflector(reflector);
13+
i0.initReflector();
1314
}

modules/angular2/test/transform/directive_linker/simple_export_files/foo.ng_deps.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
library foo.ng_deps.dart;
22

33
import 'foo.dart';
4+
import 'package:angular2/src/reflection/reflection.dart' as _ngRef;
45
import 'package:angular2/src/core/annotations_impl/annotations.dart';
56

67
var _visited = false;
7-
void initReflector(reflector) {
8+
void initReflector() {
89
if (_visited) return;
910
_visited = true;
10-
reflector
11+
_ngRef.reflector
1112
..registerType(DependencyComponent, {
1213
'factory': () => new DependencyComponent(),
1314
'parameters': const [],
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
library web_foo.ng_deps.dart;
22

3+
import 'package:angular2/src/reflection/reflection.dart' as _ngRef;
34
import 'package:angular2/src/core/application.dart';
45
import 'package:angular2/src/reflection/reflection_capabilities.dart';
56
import 'bar.dart';
67

78
var _visited = false;
8-
void initReflector(reflector) {
9+
void initReflector() {
910
if (_visited) return;
1011
_visited = true;
1112
}

modules/angular2/test/transform/directive_linker/simple_files/bar.ng_deps.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
library bar.ng_deps.dart;
22

33
import 'bar.dart';
4+
import 'package:angular2/src/reflection/reflection.dart' as _ngRef;
45
import 'package:angular2/src/core/annotations_impl/annotations.dart';
56
import 'foo.dart' as dep;
67

78
var _visited = false;
8-
void initReflector(reflector) {
9+
void initReflector() {
910
if (_visited) return;
1011
_visited = true;
11-
reflector
12+
_ngRef.reflector
1213
..registerType(MyComponent, {
1314
'factory': () => new MyComponent(),
1415
'parameters': const [],

0 commit comments

Comments
 (0)