feat(Compiler): Support MutliToken and *Token<T> in initReflector().

See #782 for limitations of this CL.

PiperOrigin-RevId: 182118212

Author: matanlurey

angular_compiler/CHANGELOG.md

@@ -8,6 +8,9 @@
 
 * Require `code_builder ^3.0.0`.
 
+* `ReflectorEmitter` now supports `MultiToken` and generic-typed tokens, with
+  some known limitations. See https://github.com/dart-lang/angular/issues/782.
+
 ## 0.4.0-alpha+3
 
 * Added support for recognizing the `MultiToken` type.

angular_compiler/lib/src/emitter/reflector.dart

@@ -3,6 +3,7 @@ import 'package:build/build.dart';
 
 import '../analyzer/di/dependencies.dart';
 import '../analyzer/di/tokens.dart';
+import '../analyzer/link.dart';
 import '../analyzer/reflector.dart';
 
 /// Generates `.dart` source code given a [ReflectableOutput].
@@ -244,7 +245,23 @@ class ReflectableEmitter {
       return 'const _ngRef.Inject(${token.literal})';
     }
     if (token is OpaqueTokenElement) {
-      final expression = 'const _ngRef.OpaqueToken(r\'${token.identifier}\')';
+      // TODO(matanl): Make this more solid.
+      //
+      // Ideally we should be using code_builder for this entire class, as it
+      // would handle import resolution, etc, and make the code more future
+      // proof.
+      //
+      // As-is, this will breakdown if the generic type of an OpaqueToken is
+      // imported with a prefix, for example:
+      //
+      //   const fooToken = const OpaqueToken<foo.Foo>('fooToken');
+      //
+      // Since this feature is still WIP, this is acceptable, but it should be
+      // fixed 5.0-beta: https://github.com/dart-lang/angular/issues/782.
+      final classType = token.isMultiToken ? 'MultiToken' : 'OpaqueToken';
+      final genericTypeIfAny = _typesAsString([token.typeUrl]);
+      final expression =
+          'const _ngRef.$classType$genericTypeIfAny(r\'${token.identifier}\')';
       return 'const _ngRef.Inject($expression)';
     }
     if (token is TypeTokenElement) {
@@ -254,4 +271,11 @@ class ReflectableEmitter {
     }
     throw new UnsupportedError('Invalid token type: $token.');
   }
+
+  static String _typesAsString(List<TypeLink> types) {
+    if (types.isEmpty) {
+      return '';
+    }
+    return '<${types.map((l) => l.symbol + _typesAsString(l.generics)).join(', ')}>';
+  }
 }

angular_compiler/test/emitter/reflector_test.dart

@@ -269,7 +269,79 @@ void main() {
           '  );\n'
           '  _ngRef.registerDependencies(\n'
           '    Example,\n'
-          '    const [const [const _ngRef.Inject(const _ngRef.OpaqueToken(r\'someToken\')),],],\n'
+          '    const [const [const _ngRef.Inject(const _ngRef.OpaqueToken<dynamic>(r\'someToken\')),],],\n'
+          '  );\n'
+          '\n'
+          '}\n',
+    );
+  });
+
+  test('should support MultiToken', () async {
+    final reflector = new ReflectableReader.noLinking();
+    final output = await reflector.resolve(await resolveLibrary(r'''
+      const someToken = const MultiToken('someToken');
+      @Injectable()
+      class Example {
+        final Map<String, Map<int, String>> example;
+        Example(@Inject(someToken) this.example);
+      }
+    '''));
+    final emitter = new ReflectableEmitter(
+      output,
+      reflectorSource: libReflection,
+    );
+    expect(
+      emitter.emitInitReflector(),
+      ''
+          'var _visited = false;\n'
+          'void initReflector() {\n'
+          '  if (_visited) {\n'
+          '    return;\n'
+          '  }\n'
+          '  _visited = true;\n'
+          '  _ngRef.registerFactory(\n'
+          '    Example,\n'
+          '    (Map p0) => new Example(p0),\n'
+          '  );\n'
+          '  _ngRef.registerDependencies(\n'
+          '    Example,\n'
+          '    const [const [const _ngRef.Inject(const _ngRef.MultiToken<dynamic>(r\'someToken\')),],],\n'
+          '  );\n'
+          '\n'
+          '}\n',
+    );
+  });
+
+  test('should support generic typed OpaqueToken', () async {
+    final reflector = new ReflectableReader.noLinking();
+    final output = await reflector.resolve(await resolveLibrary(r'''
+      const stringToken = const OpaqueToken<String>('stringToken');
+      @Injectable()
+      class Example {
+        final String example;
+        Example(@Inject(stringToken) this.example);
+      }
+    '''));
+    final emitter = new ReflectableEmitter(
+      output,
+      reflectorSource: libReflection,
+    );
+    expect(
+      emitter.emitInitReflector(),
+      ''
+          'var _visited = false;\n'
+          'void initReflector() {\n'
+          '  if (_visited) {\n'
+          '    return;\n'
+          '  }\n'
+          '  _visited = true;\n'
+          '  _ngRef.registerFactory(\n'
+          '    Example,\n'
+          '    (String p0) => new Example(p0),\n'
+          '  );\n'
+          '  _ngRef.registerDependencies(\n'
+          '    Example,\n'
+          '    const [const [const _ngRef.Inject(const _ngRef.OpaqueToken<String>(r\'stringToken\')),],],\n'
           '  );\n'
           '\n'
           '}\n',