refactor(core): minor ComponentDef improvements (#46093)

crisbeto · alxhub · commit 0206c10f8e11 · 2022-06-02T13:41:27.000-07:00
Makes the following improvements in the runtime: * Uses the unique ID of the component definition to keep track of its injector in the `StandaloneFeature`, instead of the definition itself. This reduces the amount of memory we can leak, if something doesn't get cleaned up. * Changes the naming and description of the `ComponentDef.id` to reflect what it is used for. PR Close #46093
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
@@ -17,12 +17,13 @@ import {initNgDevMode} from '../util/ng_dev_mode';
 import {stringify} from '../util/stringify';
 
 import {NG_COMP_DEF, NG_DIR_DEF, NG_MOD_DEF, NG_PIPE_DEF} from './fields';
-import {ComponentDef, ComponentDefFeature, ComponentTemplate, ComponentType, ContentQueriesFunction, DependencyTypeList, DirectiveDef, DirectiveDefFeature, DirectiveDefList, DirectiveTypesOrFactory, HostBindingsFunction, PipeDef, PipeDefList, PipeTypesOrFactory, TypeOrFactory, ViewQueriesFunction} from './interfaces/definition';
+import {ComponentDef, ComponentDefFeature, ComponentTemplate, ComponentType, ContentQueriesFunction, DependencyTypeList, DirectiveDef, DirectiveDefFeature, DirectiveDefList, HostBindingsFunction, PipeDef, PipeDefList, TypeOrFactory, ViewQueriesFunction} from './interfaces/definition';
 import {TAttributes, TConstantsOrFactory} from './interfaces/node';
 import {CssSelectorList} from './interfaces/projection';
 
 
-let _renderCompCount = 0;
+/** Counter used to generate unique IDs for component definitions. */
+let componentDefCount = 0;
 
 
 /**
@@ -318,7 +319,7 @@ export function ɵɵdefineComponent<T>(componentDefinition: {
       features: componentDefinition.features as DirectiveDefFeature[] || null,
       data: componentDefinition.data || {},
       encapsulation: componentDefinition.encapsulation || ViewEncapsulation.Emulated,
-      id: 'c',
+      id: `c${componentDefCount++}`,
       styles: componentDefinition.styles || EMPTY_ARRAY,
       _: null,
       setInput: null,
@@ -327,7 +328,6 @@ export function ɵɵdefineComponent<T>(componentDefinition: {
     };
     const dependencies = componentDefinition.dependencies;
     const feature = componentDefinition.features;
-    def.id += _renderCompCount++;
     def.inputs = invertObject(componentDefinition.inputs, declaredInputs),
     def.outputs = invertObject(componentDefinition.outputs),
     feature && feature.forEach((fn) => fn(def));
diff --git a/packages/core/src/render3/features/standalone_feature.ts b/packages/core/src/render3/features/standalone_feature.ts
@@ -19,7 +19,7 @@ import {createEnvironmentInjector} from '../ng_module_ref';
  * collected from the imports graph rooted at a given standalone component.
  */
 class StandaloneService implements OnDestroy {
-  cachedInjectors = new Map<ComponentDef<unknown>, EnvironmentInjector|null>();
+  cachedInjectors = new Map<string, EnvironmentInjector|null>();
 
   constructor(private _injector: EnvironmentInjector) {}
 
@@ -28,16 +28,16 @@ class StandaloneService implements OnDestroy {
       return null;
     }
 
-    if (!this.cachedInjectors.has(componentDef)) {
+    if (!this.cachedInjectors.has(componentDef.id)) {
       const providers = internalImportProvidersFrom(false, componentDef.type);
       const standaloneInjector = providers.length > 0 ?
           createEnvironmentInjector(
               [providers], this._injector, `Standalone[${componentDef.type.name}]`) :
           null;
-      this.cachedInjectors.set(componentDef, standaloneInjector);
+      this.cachedInjectors.set(componentDef.id, standaloneInjector);
     }
 
-    return this.cachedInjectors.get(componentDef)!;
+    return this.cachedInjectors.get(componentDef.id)!;
   }
 
   ngOnDestroy() {
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
@@ -226,7 +226,8 @@ export interface DirectiveDef<T> {
  */
 export interface ComponentDef<T> extends DirectiveDef<T> {
   /**
-   * Runtime unique component ID.
+   * Unique ID for the component. Used in view encapsulation and
+   * to keep track of the injector in standalone components.
    */
   readonly id: string;
 
diff --git a/packages/core/test/bundling/animations/bundle.golden_symbols.json b/packages/core/test/bundling/animations/bundle.golden_symbols.json
@@ -549,7 +549,7 @@
     "name": "_randomChar"
   },
   {
-    "name": "_renderCompCount"
+    "name": "componentDefCount"
   },
   {
     "name": "_testabilityGetter"
@@ -1403,4 +1403,4 @@
   {
     "name": "ɵɵproperty"
   }
-]
+]
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -66,7 +66,7 @@
     "name": "_injectImplementation"
   },
   {
-    "name": "_renderCompCount"
+    "name": "componentDefCount"
   },
   {
     "name": "addComponentLogic"
@@ -449,4 +449,4 @@
   {
     "name": "ɵɵinject"
   }
-]
+]
diff --git a/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json b/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
@@ -549,7 +549,7 @@
     "name": "_randomChar"
   },
   {
-    "name": "_renderCompCount"
+    "name": "componentDefCount"
   },
   {
     "name": "_symbolIterator"
@@ -1595,4 +1595,4 @@
   {
     "name": "ɵɵtext"
   }
-]
+]
diff --git a/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json b/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json
@@ -540,7 +540,7 @@
     "name": "_randomChar"
   },
   {
-    "name": "_renderCompCount"
+    "name": "componentDefCount"
   },
   {
     "name": "_symbolIterator"
@@ -1583,4 +1583,4 @@
   {
     "name": "ɵɵtext"
   }
-]
+]
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -63,7 +63,7 @@
     "name": "_injectImplementation"
   },
   {
-    "name": "_renderCompCount"
+    "name": "componentDefCount"
   },
   {
     "name": "allocExpando"
@@ -335,4 +335,4 @@
   {
     "name": "ɵɵinject"
   }
-]
+]
diff --git a/packages/core/test/bundling/router/bundle.golden_symbols.json b/packages/core/test/bundling/router/bundle.golden_symbols.json
@@ -780,7 +780,7 @@
     "name": "_randomChar"
   },
   {
-    "name": "_renderCompCount"
+    "name": "componentDefCount"
   },
   {
     "name": "_stripIndexHtml"
@@ -2018,4 +2018,4 @@
   {
     "name": "ɵɵtextInterpolate1"
   }
-]
+]
diff --git a/packages/core/test/bundling/standalone_bootstrap/bundle.golden_symbols.json b/packages/core/test/bundling/standalone_bootstrap/bundle.golden_symbols.json
@@ -342,7 +342,7 @@
     "name": "_randomChar"
   },
   {
-    "name": "_renderCompCount"
+    "name": "componentDefCount"
   },
   {
     "name": "_wrapInTimeout"
@@ -881,4 +881,4 @@
   {
     "name": "ɵɵinject"
   }
-]
+]
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -165,7 +165,7 @@
     "name": "_injectImplementation"
   },
   {
-    "name": "_renderCompCount"
+    "name": "componentDefCount"
   },
   {
     "name": "_symbolIterator"
@@ -866,4 +866,4 @@
   {
     "name": "ɵɵtextInterpolate1"
   }
-]
+]

Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@`
`549`	`549`	`"name": "_randomChar"`
`550`	`550`	`},`
`551`	`551`	`{`
`552`		`- "name": "_renderCompCount"`
	`552`	`+ "name": "componentDefCount"`
`553`	`553`	`},`
`554`	`554`	`{`
`555`	`555`	`"name": "_testabilityGetter"`
`@@ -1403,4 +1403,4 @@`
`1403`	`1403`	`{`
`1404`	`1404`	`"name": "ɵɵproperty"`
`1405`	`1405`	`}`
`1406`		`-]`
	`1406`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`"name": "_injectImplementation"`
`67`	`67`	`},`
`68`	`68`	`{`
`69`		`- "name": "_renderCompCount"`
	`69`	`+ "name": "componentDefCount"`
`70`	`70`	`},`
`71`	`71`	`{`
`72`	`72`	`"name": "addComponentLogic"`
`@@ -449,4 +449,4 @@`
`449`	`449`	`{`
`450`	`450`	`"name": "ɵɵinject"`
`451`	`451`	`}`
`452`		`-]`
	`452`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@`
`540`	`540`	`"name": "_randomChar"`
`541`	`541`	`},`
`542`	`542`	`{`
`543`		`- "name": "_renderCompCount"`
	`543`	`+ "name": "componentDefCount"`
`544`	`544`	`},`
`545`	`545`	`{`
`546`	`546`	`"name": "_symbolIterator"`
`@@ -1583,4 +1583,4 @@`
`1583`	`1583`	`{`
`1584`	`1584`	`"name": "ɵɵtext"`
`1585`	`1585`	`}`
`1586`		`-]`
	`1586`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`"name": "_injectImplementation"`
`64`	`64`	`},`
`65`	`65`	`{`
`66`		`- "name": "_renderCompCount"`
	`66`	`+ "name": "componentDefCount"`
`67`	`67`	`},`
`68`	`68`	`{`
`69`	`69`	`"name": "allocExpando"`
`@@ -335,4 +335,4 @@`
`335`	`335`	`{`
`336`	`336`	`"name": "ɵɵinject"`
`337`	`337`	`}`
`338`		`-]`
	`338`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -780,7 +780,7 @@`
`780`	`780`	`"name": "_randomChar"`
`781`	`781`	`},`
`782`	`782`	`{`
`783`		`- "name": "_renderCompCount"`
	`783`	`+ "name": "componentDefCount"`
`784`	`784`	`},`
`785`	`785`	`{`
`786`	`786`	`"name": "_stripIndexHtml"`
`@@ -2018,4 +2018,4 @@`
`2018`	`2018`	`{`
`2019`	`2019`	`"name": "ɵɵtextInterpolate1"`
`2020`	`2020`	`}`
`2021`		`-]`
	`2021`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@`
`342`	`342`	`"name": "_randomChar"`
`343`	`343`	`},`
`344`	`344`	`{`
`345`		`- "name": "_renderCompCount"`
	`345`	`+ "name": "componentDefCount"`
`346`	`346`	`},`
`347`	`347`	`{`
`348`	`348`	`"name": "_wrapInTimeout"`
`@@ -881,4 +881,4 @@`
`881`	`881`	`{`
`882`	`882`	`"name": "ɵɵinject"`
`883`	`883`	`}`
`884`		`-]`
	`884`	`+]`