fix(compiler): reduce chance of conflicts between generated factory and local variables (#57181)

crisbeto · thePunderWoman · commit d9d68e73d2b5 · 2024-08-07T17:25:05.000Z
Currently we use some short variable names like `t` and `r` in the generated factory functions. They can conflict with local symbols with the same names, if they're used for DI. These changes rename the parameters to reduce the change for conflicts. Fixes #57168. PR Close #57181
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/pipes/pipe_di_change_detector_ref_my_other_pipe_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/pipes/pipe_di_change_detector_ref_my_other_pipe_fac.js
@@ -1 +1 @@
-MyOtherPipe.ɵfac = function MyOtherPipe_Factory(t) { return new (t || MyOtherPipe)($i0$.ɵɵdirectiveInject($i0$.ChangeDetectorRef, 24)); };
+MyOtherPipe.ɵfac = function MyOtherPipe_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyOtherPipe)($i0$.ɵɵdirectiveInject($i0$.ChangeDetectorRef, 24)); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/pipes/pipe_di_change_detector_ref_my_pipe_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/pipes/pipe_di_change_detector_ref_my_pipe_fac.js
@@ -1 +1 @@
-MyPipe.ɵfac = function MyPipe_Factory(t) { return new (t || MyPipe)($i0$.ɵɵdirectiveInject($i0$.ChangeDetectorRef, 16)); };
+MyPipe.ɵfac = function MyPipe_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyPipe)($i0$.ɵɵdirectiveInject($i0$.ChangeDetectorRef, 16)); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/pipes/pipes_my_pipe_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/pipes/pipes_my_pipe_fac.js
@@ -1 +1 @@
-MyPipe.ɵfac = function MyPipe_Factory(t) { return new (t || MyPipe)(); };
+MyPipe.ɵfac = function MyPipe_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyPipe)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/pipes/pipes_my_pure_pipe_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/pipes/pipes_my_pure_pipe_fac.js
@@ -1 +1 @@
-MyPurePipe.ɵfac = function MyPurePipe_Factory(t) { return new (t || MyPurePipe)(); };
+MyPurePipe.ɵfac = function MyPurePipe_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyPurePipe)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/template_variables/for_of_def.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/template_variables/for_of_def.js
@@ -1,3 +1,3 @@
-ForOfDirective.ɵfac = function ForOfDirective_Factory(t) {
-  return new (t || ForOfDirective)($r3$.ɵɵdirectiveInject($r3$.ViewContainerRef), $r3$.ɵɵdirectiveInject($r3$.TemplateRef));
+ForOfDirective.ɵfac = function ForOfDirective_Factory(__ngFactoryType__) {
+  return new (__ngFactoryType__ || ForOfDirective)($r3$.ɵɵdirectiveInject($r3$.ViewContainerRef), $r3$.ɵɵdirectiveInject($r3$.TemplateRef));
 };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/complex_selectors_other_directive_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/complex_selectors_other_directive_fac.js
@@ -1 +1 @@
-OtherDirective.ɵfac = function OtherDirective_Factory(t) {return new (t || OtherDirective)(); };
+OtherDirective.ɵfac = function OtherDirective_Factory(__ngFactoryType__) {return new (__ngFactoryType__ || OtherDirective)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/complex_selectors_some_directive_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/complex_selectors_some_directive_fac.js
@@ -1 +1 @@
-SomeDirective.ɵfac = function SomeDirective_Factory(t) {return new (t || SomeDirective)(); };
+SomeDirective.ɵfac = function SomeDirective_Factory(__ngFactoryType__) {return new (__ngFactoryType__ || SomeDirective)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_child_component_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_child_component_fac.js
@@ -1 +1 @@
-ChildComponent.ɵfac = function ChildComponent_Factory(t) { return new (t || ChildComponent)(); };
+ChildComponent.ɵfac = function ChildComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || ChildComponent)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_child_component_fac.local.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_child_component_fac.local.js
@@ -1 +1 @@
-ChildComponent.ɵfac = function ChildComponent_Factory(t) { return new (t || ChildComponent)(); };
+ChildComponent.ɵfac = function ChildComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || ChildComponent)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_my_component_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_my_component_fac.js
@@ -1 +1 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t || MyComponent)(); };
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyComponent)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_my_component_fac.local.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_my_component_fac.local.js
@@ -1 +1 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t || MyComponent)(); };
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyComponent)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_some_directive_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_some_directive_fac.js
@@ -1 +1 @@
-SomeDirective.ɵfac = function SomeDirective_Factory(t) {return new (t || SomeDirective)(); };
+SomeDirective.ɵfac = function SomeDirective_Factory(__ngFactoryType__) {return new (__ngFactoryType__ || SomeDirective)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_some_directive_fac.local.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/directives_some_directive_fac.local.js
@@ -1 +1 @@
-SomeDirective.ɵfac = function SomeDirective_Factory(t) {return new (t || SomeDirective)(); };
+SomeDirective.ɵfac = function SomeDirective_Factory(__ngFactoryType__) {return new (__ngFactoryType__ || SomeDirective)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/no_selector_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/no_selector_fac.js
@@ -1 +1 @@
-EmptyOutletComponent.ɵfac = function EmptyOutletComponent_Factory(t) { return new (t || EmptyOutletComponent)(); };
+EmptyOutletComponent.ɵfac = function EmptyOutletComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || EmptyOutletComponent)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/structural_directives_if_directive_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/structural_directives_if_directive_fac.js
@@ -1 +1 @@
-IfDirective.ɵfac = function IfDirective_Factory(t) { return new (t || IfDirective)($r3$.ɵɵdirectiveInject($i$.TemplateRef)); };
+IfDirective.ɵfac = function IfDirective_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || IfDirective)($r3$.ɵɵdirectiveInject($i$.TemplateRef)); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/structural_directives_my_component_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/structural_directives_my_component_fac.js
@@ -1 +1 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t || MyComponent)(); };
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyComponent)(); };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/view_tokens_di_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/value_composition/view_tokens_di_fac.js
@@ -1,5 +1,5 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) {
-  return new (t || MyComponent)(
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) {
+  return new (__ngFactoryType__ || MyComponent)(
     $r3$.ɵɵdirectiveInject($i$.ElementRef), $r3$.ɵɵdirectiveInject($i$.ViewContainerRef),
     $r3$.ɵɵdirectiveInject($i$.ChangeDetectorRef));
 };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/class_style_bindings_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/class_style_bindings_factory.js
@@ -1 +1 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t || MyComponent)(); }
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyComponent)(); }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/dom_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/dom_factory.js
@@ -1 +1 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t || MyComponent)(); }
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyComponent)(); }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/mathml_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/mathml_factory.js
@@ -1 +1 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t || MyComponent)(); }
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyComponent)(); }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/namespace_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/namespace_factory.js
@@ -1 +1 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t || MyComponent)(); }
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyComponent)(); }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/properties_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/properties_factory.js
@@ -1 +1 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t || MyComponent)(); }
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyComponent)(); }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/property_pure_functions_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/property_pure_functions_factory.js
@@ -1 +1 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t || MyComponent)(); }
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyComponent)(); }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/svg_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/elements/svg_factory.js
@@ -1 +1 @@
-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t || MyComponent)(); }
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || MyComponent)(); }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/basic_full.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/basic_full.js
@@ -1,5 +1,5 @@
-BasicModule.ɵfac = function BasicModule_Factory(t) { return new (t || BasicModule)(); };
+BasicModule.ɵfac = function BasicModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || BasicModule)(); };
 BasicModule.ɵmod = /*@__PURE__*/ $i0$.ɵɵdefineNgModule({type: BasicModule, id: 'BasicModuleId'});
 BasicModule.ɵinj = /*@__PURE__*/ $i0$.ɵɵdefineInjector({});
 …
-$i0$.ɵɵregisterNgModuleType(BasicModule, 'BasicModuleId');
+$i0$.ɵɵregisterNgModuleType(BasicModule, 'BasicModuleId');
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/basic_full.local.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/basic_full.local.js
@@ -1,5 +1,5 @@
-BasicModule.ɵfac = function BasicModule_Factory(t) { return new (t || BasicModule)(); };
+BasicModule.ɵfac = function BasicModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || BasicModule)(); };
 BasicModule.ɵmod = /*@__PURE__*/ $i0$.ɵɵdefineNgModule({type: BasicModule, id: 'BasicModuleId'});
 BasicModule.ɵinj = /*@__PURE__*/ $i0$.ɵɵdefineInjector({});
 …
-$i0$.ɵɵregisterNgModuleType(BasicModule, 'BasicModuleId');
+$i0$.ɵɵregisterNgModuleType(BasicModule, 'BasicModuleId');
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/basic_linked.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/basic_linked.js
@@ -1,4 +1,4 @@
-BasicModule.ɵfac = function BasicModule_Factory(t) { return new (t || BasicModule)(); };
+BasicModule.ɵfac = function BasicModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || BasicModule)(); };
 BasicModule.ɵmod = function() {
   $i0$.ɵɵregisterNgModuleType(BasicModule, 'BasicModuleId');
   return /*@__PURE__*/ $i0$.ɵɵdefineNgModule({type: BasicModule, id: 'BasicModuleId'});
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/declarations.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/declarations.js
@@ -7,7 +7,7 @@ BarDirective.ɵdir…
 QuxPipe.ɵfac…
 QuxPipe.ɵpipe…
 
-FooModule.ɵfac = function FooModule_Factory(t) { return new (t || FooModule)(); };
+FooModule.ɵfac = function FooModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || FooModule)(); };
 FooModule.ɵmod = /*@__PURE__*/ $i0$.ɵɵdefineNgModule({type: FooModule, bootstrap: [FooComponent]});
 FooModule.ɵinj = /*@__PURE__*/ $i0$.ɵɵdefineInjector({});
 …
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/declarations_jit_mode.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/declarations_jit_mode.js
@@ -7,7 +7,7 @@ BarDirective.ɵdir…
 QuxPipe.ɵfac…
 QuxPipe.ɵpipe…
 
-FooModule.ɵfac = function FooModule_Factory(t) { return new (t || FooModule)(); };
+FooModule.ɵfac = function FooModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || FooModule)(); };
 FooModule.ɵmod = /*@__PURE__*/ $i0$.ɵɵdefineNgModule({type: FooModule, bootstrap: [FooComponent], declarations: [FooComponent, BarDirective, QuxPipe]});
 FooModule.ɵinj = /*@__PURE__*/ $i0$.ɵɵdefineInjector({});
 …
@@ -16,4 +16,4 @@ FooModule.ɵinj = /*@__PURE__*/ $i0$.ɵɵdefineInjector({});
     type: NgModule,
     args: [{ declarations: [FooComponent, BarDirective, QuxPipe], bootstrap: [FooComponent] }]
   }], null, null);
-})();
+})();
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/forward_refs.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/forward_refs.js
@@ -3,11 +3,11 @@ export function provideModule() {
 }
 …
 export class TestModule {}
-TestModule.ɵfac = function TestModule_Factory(t) { return new (t || TestModule)(); };
+TestModule.ɵfac = function TestModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || TestModule)(); };
 TestModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: TestModule, imports: () => [ForwardModule] });
 TestModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [provideModule()] });
 …
 export class ForwardModule {}
-ForwardModule.ɵfac = function ForwardModule_Factory(t) { return new (t || ForwardModule)(); };
+ForwardModule.ɵfac = function ForwardModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || ForwardModule)(); };
 ForwardModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: ForwardModule });
-ForwardModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
+ForwardModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/forward_refs.local.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/forward_refs.local.js
@@ -3,13 +3,13 @@ export function provideModule() {
 }
 …
 class TestModule {}
-TestModule.ɵfac = function TestModule_Factory(t) { return new (t || TestModule)(); };
+TestModule.ɵfac = function TestModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || TestModule)(); };
 TestModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: TestModule, imports: function () { return [ForwardModule]; } });
 TestModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [provideModule()] });
 export { TestModule };
 …
 class ForwardModule {}
-ForwardModule.ɵfac = function ForwardModule_Factory(t) { return new (t || ForwardModule)(); };
+ForwardModule.ɵfac = function ForwardModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || ForwardModule)(); };
 ForwardModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: ForwardModule });
 ForwardModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
-export { ForwardModule };
+export { ForwardModule };
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/imports_exports.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/imports_exports.js
@@ -1,5 +1,5 @@
 export class AModule {}
-AModule.ɵfac = function AModule_Factory(t) { return new (t || AModule)(); };
+AModule.ɵfac = function AModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || AModule)(); };
 AModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: AModule });
 AModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
 …
@@ -12,7 +12,7 @@ AModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
 …
 
 export class BModule {}
-BModule.ɵfac = function BModule_Factory(t) { return new (t || BModule)(); };
+BModule.ɵfac = function BModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || BModule)(); };
 BModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: BModule });
 BModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [AModule] });
 …
@@ -25,7 +25,7 @@ BModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [AModule] });
 …
 
 export class AppModule {}
-AppModule.ɵfac = function AppModule_Factory(t) { return new (t || AppModule)(); };
+AppModule.ɵfac = function AppModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || AppModule)(); };
 AppModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: AppModule });
 AppModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [BModule] });
 …
@@ -34,4 +34,4 @@ AppModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [BModule] });
     type: NgModule,
     args: [{ imports: [BModule] }]
   }], null, null);
-})();
+})();
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/imports_exports.local.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/imports_exports.local.js
@@ -1,5 +1,5 @@
 export class AModule {}
-AModule.ɵfac = function AModule_Factory(t) { return new (t || AModule)(); };
+AModule.ɵfac = function AModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || AModule)(); };
 AModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: AModule });
 AModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [A1Component, A2Component] });
 …
@@ -12,7 +12,7 @@ AModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [A1Component, A2C
 …
 
 export class BModule {}
-BModule.ɵfac = function BModule_Factory(t) { return new (t || BModule)(); };
+BModule.ɵfac = function BModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || BModule)(); };
 BModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: BModule });
 BModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [AModule] });
 …
@@ -25,7 +25,7 @@ BModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [AModule] });
 …
 
 export class AppModule {}
-AppModule.ɵfac = function AppModule_Factory(t) { return new (t || AppModule)(); };
+AppModule.ɵfac = function AppModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || AppModule)(); };
 AppModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: AppModule });
 AppModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [BModule] });
 …
@@ -34,4 +34,4 @@ AppModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [BModule] });
     type: NgModule,
     args: [{ imports: [BModule] }]
   }], null, null);
-})();
+})();
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/imports_exports_jit_mode.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/imports_exports_jit_mode.js
@@ -1,5 +1,5 @@
 export class AModule {}
-AModule.ɵfac = function AModule_Factory(t) { return new (t || AModule)(); };
+AModule.ɵfac = function AModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || AModule)(); };
 AModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: AModule, declarations: [A1Component, A2Component], exports: [A1Component, A2Component] });
 AModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
 …
@@ -11,7 +11,7 @@ AModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
 })();
 …
 export class BModule {}
-BModule.ɵfac = function BModule_Factory(t) { return new (t || BModule)(); };
+BModule.ɵfac = function BModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || BModule)(); };
 BModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: BModule, declarations: [B1Component, B2Component], exports: [AModule] });
 BModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [AModule] });
 …
@@ -23,7 +23,7 @@ BModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [AModule] });
 })();
 …
 export class AppModule {}
-AppModule.ɵfac = function AppModule_Factory(t) { return new (t || AppModule)(); };
+AppModule.ɵfac = function AppModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || AppModule)(); };
 AppModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: AppModule, imports: [BModule] });
 AppModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [BModule] });
 …
@@ -32,4 +32,4 @@ AppModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [BModule] });
     type: NgModule,
     args: [{ imports: [BModule] }]
   }], null, null);
-})();
+})();
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/inheritance.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/inheritance.js
@@ -1,7 +1,7 @@
 export class BaseModule {
   constructor(service) { this.service = service; }
 }
-BaseModule.ɵfac = function BaseModule_Factory(t) { return new (t || BaseModule)(i0.ɵɵinject(Service)); };
+BaseModule.ɵfac = function BaseModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || BaseModule)(i0.ɵɵinject(Service)); };
 BaseModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: BaseModule });
 BaseModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [Service] });
 (() => {
@@ -16,8 +16,8 @@ export class BasicModule extends BaseModule {
 
 BasicModule.ɵfac = /*@__PURE__*/ (() => {
   let ɵBasicModule_BaseFactory;
-  return function BasicModule_Factory(t) {
-    return (ɵBasicModule_BaseFactory || (ɵBasicModule_BaseFactory = i0.ɵɵgetInheritedFactory(BasicModule)))(t || BasicModule);
+  return function BasicModule_Factory(__ngFactoryType__) {
+    return (ɵBasicModule_BaseFactory || (ɵBasicModule_BaseFactory = i0.ɵɵgetInheritedFactory(BasicModule)))(__ngFactoryType__ || BasicModule);
   };
 })();
 
@@ -29,4 +29,4 @@ BasicModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
     args: [{}]
   }], null, null);
 })();
-…
+…
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/inheritance.local.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/inheritance.local.js
@@ -1,7 +1,7 @@
 export class BaseModule {
   constructor(service) { this.service = service; }
 }
-BaseModule.ɵfac = function BaseModule_Factory(t) { return new (t || BaseModule)(i0.ɵɵinject(Service)); };
+BaseModule.ɵfac = function BaseModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || BaseModule)(i0.ɵɵinject(Service)); };
 BaseModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: BaseModule });
 BaseModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [Service] });
 (() => {
@@ -16,8 +16,8 @@ export class BasicModule extends BaseModule {
 
 BasicModule.ɵfac = /*@__PURE__*/ (() => {
   let ɵBasicModule_BaseFactory;
-  return function BasicModule_Factory(t) {
-    return (ɵBasicModule_BaseFactory || (ɵBasicModule_BaseFactory = i0.ɵɵgetInheritedFactory(BasicModule)))(t || BasicModule);
+  return function BasicModule_Factory(__ngFactoryType__) {
+    return (ɵBasicModule_BaseFactory || (ɵBasicModule_BaseFactory = i0.ɵɵgetInheritedFactory(BasicModule)))(__ngFactoryType__ || BasicModule);
   };
 })();
 
@@ -29,4 +29,4 @@ BasicModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
     args: [{}]
   }], null, null);
 })();
-…
+…
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/providers.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/providers.js
@@ -1,5 +1,5 @@
 export class FooModule {}
-FooModule.ɵfac = function FooModule_Factory(t) { return new (t || FooModule)(); };
+FooModule.ɵfac = function FooModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || FooModule)(); };
 FooModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: FooModule });
 FooModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
     Thing,
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/providers.local.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/ng_modules/providers.local.js
@@ -1,5 +1,5 @@
 export class FooModule {}
-FooModule.ɵfac = function FooModule_Factory(t) { return new (t || FooModule)(); };
+FooModule.ɵfac = function FooModule_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || FooModule)(); };
 FooModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: FooModule });
 FooModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
     Thing,
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/component_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/component_factory.js
@@ -1,6 +1,6 @@
 
-MyComponent.ɵfac = function MyComponent_Factory(t) {
-  return new (t || MyComponent)(
+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) {
+  return new (__ngFactoryType__ || MyComponent)(
     $r3$.ɵɵinjectAttribute('name'),
     $r3$.ɵɵinjectAttribute(dynamicAttrName()),
     $r3$.ɵɵdirectiveInject(MyService),
@@ -10,4 +10,4 @@ MyComponent.ɵfac = function MyComponent_Factory(t) {
     $r3$.ɵɵdirectiveInject(MyService, 8),
     $r3$.ɵɵdirectiveInject(MyService, 10)
   );
-}
+}
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/ctor_overload_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/ctor_overload_fac.js
@@ -1,3 +1,3 @@
-MyService.ɵfac = function MyService_Factory(t) {
-  return new (t || MyService)($r3$.ɵɵinject(MyDependency), $r3$.ɵɵinject(MyOptionalDependency, 8));
+MyService.ɵfac = function MyService_Factory(__ngFactoryType__) {
+  return new (__ngFactoryType__ || MyService)($r3$.ɵɵinject(MyDependency), $r3$.ɵɵinject(MyOptionalDependency, 8));
 }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/injectable_factory_fac.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/injectable_factory_fac.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/pipe_and_injectable_pipe_first.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/pipe_and_injectable_pipe_first.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/pipe_and_injectable_pipe_last.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/pipe_and_injectable_pipe_last.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/providedin_forwardref.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/providedin_forwardref.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/useclass_forwardref.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/useclass_forwardref.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/useclass_with_deps.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/useclass_with_deps.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/useclass_without_deps.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/useclass_without_deps.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/usefactory_with_deps.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_di/di/usefactory_with_deps.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_directives/matching/i18n_attribute_directive_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_directives/matching/i18n_attribute_directive_factory.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_directives/matching/i18n_prefix_attribute_directive_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_directives/matching/i18n_prefix_attribute_directive_factory.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_listener/local_ref_before_listener_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_listener/local_ref_before_listener_factory.js
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_providers/providers_feature_no_providers_factory.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_providers/providers_feature_no_providers_factory.js
diff --git a/packages/compiler-cli/test/ngtsc/local_compilation_spec.ts b/packages/compiler-cli/test/ngtsc/local_compilation_spec.ts
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
diff --git a/packages/compiler/src/injectable_compiler_2.ts b/packages/compiler/src/injectable_compiler_2.ts
diff --git a/packages/compiler/src/render3/r3_factory.ts b/packages/compiler/src/render3/r3_factory.ts

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-MyOtherPipe.ɵfac = function MyOtherPipe_Factory(t) { return new (t \|\| MyOtherPipe)($i0$.ɵɵdirectiveInject($i0$.ChangeDetectorRef, 24)); };`
	`1`	`+MyOtherPipe.ɵfac = function MyOtherPipe_Factory(__ngFactoryType__) { return new (__ngFactoryType__ \|\| MyOtherPipe)($i0$.ɵɵdirectiveInject($i0$.ChangeDetectorRef, 24)); };`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-MyPipe.ɵfac = function MyPipe_Factory(t) { return new (t \|\| MyPipe)($i0$.ɵɵdirectiveInject($i0$.ChangeDetectorRef, 16)); };`
	`1`	`+MyPipe.ɵfac = function MyPipe_Factory(__ngFactoryType__) { return new (__ngFactoryType__ \|\| MyPipe)($i0$.ɵɵdirectiveInject($i0$.ChangeDetectorRef, 16)); };`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-MyPurePipe.ɵfac = function MyPurePipe_Factory(t) { return new (t \|\| MyPurePipe)(); };`
	`1`	`+MyPurePipe.ɵfac = function MyPurePipe_Factory(__ngFactoryType__) { return new (__ngFactoryType__ \|\| MyPurePipe)(); };`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OtherDirective.ɵfac = function OtherDirective_Factory(t) {return new (t \|\| OtherDirective)(); };`
	`1`	`+OtherDirective.ɵfac = function OtherDirective_Factory(__ngFactoryType__) {return new (__ngFactoryType__ \|\| OtherDirective)(); };`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-SomeDirective.ɵfac = function SomeDirective_Factory(t) {return new (t \|\| SomeDirective)(); };`
	`1`	`+SomeDirective.ɵfac = function SomeDirective_Factory(__ngFactoryType__) {return new (__ngFactoryType__ \|\| SomeDirective)(); };`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ChildComponent.ɵfac = function ChildComponent_Factory(t) { return new (t \|\| ChildComponent)(); };`
	`1`	`+ChildComponent.ɵfac = function ChildComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ \|\| ChildComponent)(); };`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-MyComponent.ɵfac = function MyComponent_Factory(t) { return new (t \|\| MyComponent)(); };`
	`1`	`+MyComponent.ɵfac = function MyComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ \|\| MyComponent)(); };`