fix(Compiler): Revert parts of the view compiler change to support *Token<T>.

... as observed by client teams, this breaks compilation, as sometimes the
generic type is not in scope. The hacky way this was implemented inside of
compile_metadata.dart needs to be done properly to roll-forward.

PiperOrigin-RevId: 182103218

Author: matanlurey

_goldens/test_files/directives/directive_wrapper.template_debug.golden

@@ -204,7 +204,7 @@ List<StaticNodeDebugInfo> nodeDebugInfos_InputFormTest0 = [
   new StaticNodeDebugInfo(
       [
         import13.DefaultValueAccessor,
-        const OpaqueToken<ControlValueAccessor>('NgValueAccessor'),
+        const OpaqueToken<dynamic>('NgValueAccessor'),
         import14.NgControlName,
         import15.NgControl
       ],
@@ -218,7 +218,7 @@ class ViewInputFormTest0 extends DebugAppView<import1.InputFormTest> {
   dynamic _ControlContainer_0_5;
   import3.InputElement _el_1;
   import13.DefaultValueAccessor _DefaultValueAccessor_1_4;
-  List<dynamic> _const_OpaqueToken_ControlValueAccessor___NgValueAccessor___1_5;
+  List<dynamic> _const_OpaqueToken_dynamic___NgValueAccessor___1_5;
   import14.NgControlName _NgControlName_1_6;
   var _expr_0;
   static RenderComponentType _renderType;
@@ -248,11 +248,11 @@ class ViewInputFormTest0 extends DebugAppView<import1.InputFormTest> {
     createAttr(_el_1, 'ngControl', 'login');
     createAttr(_el_1, 'type', 'text');
     _DefaultValueAccessor_1_4 = new import13.DefaultValueAccessor(_el_1);
-    _const_OpaqueToken_ControlValueAccessor___NgValueAccessor___1_5 = [
+    _const_OpaqueToken_dynamic___NgValueAccessor___1_5 = [
       _DefaultValueAccessor_1_4
     ];
     _NgControlName_1_6 = new import14.NgControlName(_ControlContainer_0_5, null,
-        _const_OpaqueToken_ControlValueAccessor___NgValueAccessor___1_5);
+        _const_OpaqueToken_dynamic___NgValueAccessor___1_5);
     import8.appViewUtils.eventManager.addEventListener(
         _el_0, 'submit', eventHandler1(_NgFormModel_0_4.onSubmit));
     _el_1.addEventListener('input', eventHandler1(_handle_input_1_0));
@@ -268,10 +268,9 @@ class ViewInputFormTest0 extends DebugAppView<import1.InputFormTest> {
     if ((identical(token, import13.DefaultValueAccessor) && (1 == nodeIndex))) {
       return _DefaultValueAccessor_1_4;
     }
-    if ((identical(token,
-            const OpaqueToken<ControlValueAccessor>('NgValueAccessor')) &&
+    if ((identical(token, const OpaqueToken<dynamic>('NgValueAccessor')) &&
         (1 == nodeIndex))) {
-      return _const_OpaqueToken_ControlValueAccessor___NgValueAccessor___1_5;
+      return _const_OpaqueToken_dynamic___NgValueAccessor___1_5;
     }
     if (((identical(token, import14.NgControlName) ||
             identical(token, import15.NgControl)) &&

_goldens/test_files/directives/directive_wrapper.template_release.golden

@@ -178,7 +178,7 @@ class ViewInputFormTest0 extends AppView<import1.InputFormTest> {
   dynamic _ControlContainer_0_5;
   import2.InputElement _el_1;
   import10.DefaultValueAccessor _DefaultValueAccessor_1_4;
-  List<dynamic> _const_OpaqueToken_ControlValueAccessor___NgValueAccessor___1_5;
+  List<dynamic> _const_OpaqueToken_dynamic___NgValueAccessor___1_5;
   import11.NgControlName _NgControlName_1_6;
   var _expr_0;
   static RenderComponentType _renderType;
@@ -201,11 +201,11 @@ class ViewInputFormTest0 extends AppView<import1.InputFormTest> {
     createAttr(_el_1, 'ngControl', 'login');
     createAttr(_el_1, 'type', 'text');
     _DefaultValueAccessor_1_4 = new import10.DefaultValueAccessor(_el_1);
-    _const_OpaqueToken_ControlValueAccessor___NgValueAccessor___1_5 = [
+    _const_OpaqueToken_dynamic___NgValueAccessor___1_5 = [
       _DefaultValueAccessor_1_4
     ];
     _NgControlName_1_6 = new import11.NgControlName(_ControlContainer_0_5, null,
-        _const_OpaqueToken_ControlValueAccessor___NgValueAccessor___1_5);
+        _const_OpaqueToken_dynamic___NgValueAccessor___1_5);
     import6.appViewUtils.eventManager.addEventListener(
         _el_0, 'submit', eventHandler1(_NgFormModel_0_4.onSubmit));
     _el_1.addEventListener('input', eventHandler1(_handle_input_1_0));
@@ -221,10 +221,9 @@ class ViewInputFormTest0 extends AppView<import1.InputFormTest> {
     if ((identical(token, import10.DefaultValueAccessor) && (1 == nodeIndex))) {
       return _DefaultValueAccessor_1_4;
     }
-    if ((identical(token,
-            const OpaqueToken<ControlValueAccessor>('NgValueAccessor')) &&
+    if ((identical(token, const OpaqueToken<dynamic>('NgValueAccessor')) &&
         (1 == nodeIndex))) {
-      return _const_OpaqueToken_ControlValueAccessor___NgValueAccessor___1_5;
+      return _const_OpaqueToken_dynamic___NgValueAccessor___1_5;
     }
     if (((identical(token, import11.NgControlName) ||
             identical(token, import12.NgControl)) &&

_tests/test/di/directive_test.dart

@@ -86,7 +86,7 @@ void main() {
     expect(value1, 1);
     final value2 = fixture.assertOnlyInstance.injector.get(barTypedToken2);
     expect(value2, 2);
-  });
+  }, skip: 'Enable when supported in the ViewCompiler (again).');
 
   group('should support optional values', () {
     NgTestBed<UsingInjectAndOptional> testBed;

angular/lib/src/source_gen/template_compiler/compile_metadata.dart

@@ -327,7 +327,8 @@ class CompileTypeMetadataVisitor
     // type parameters in the source_gen compiler, refactor this out. We want
     // to get towards using code_builder anyways.
     final tokenHack = new _OpaqueToken(
-      "const $className<${genericType.name}>('$description')",
+      // TODO(matanl): Roll-forward to use the real generic type after fix.
+      "const $className<dynamic>('$description')",
     );
     return new CompileTokenMetadata(value: tokenHack);
   }