Revert "refactor(core): remove unused injection props (angular#59209)" (angular#59386)

This reverts commit 91b5388.

PR Close angular#59386

Author: thePunderWoman

packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/app_spec.ts

@@ -158,6 +158,33 @@ describe('ngInjectableDef Bazel Integration', () => {
     expect(() => TestBed.inject(ChildService).value).toThrowError(/ChildService/);
   });
 
+  it('uses legacy `ngInjectable` property even if it inherits from a class that has `ɵprov` property', () => {
+    @Injectable({
+      providedIn: 'root',
+      useValue: new ParentService('parent'),
+    })
+    class ParentService {
+      constructor(public value: string) {}
+    }
+
+    // ChildServices extends ParentService but does not have @Injectable
+    class ChildService extends ParentService {
+      constructor(value: string) {
+        super(value);
+      }
+      static ngInjectableDef = {
+        providedIn: 'root',
+        factory: () => new ChildService('child'),
+        token: ChildService,
+      };
+    }
+
+    TestBed.configureTestingModule({});
+    // We are asserting that system throws an error, rather than taking the inherited
+    // annotation.
+    expect(TestBed.inject(ChildService).value).toEqual('child');
+  });
+
   it('NgModule injector understands requests for INJECTABLE', () => {
     TestBed.configureTestingModule({
       providers: [{provide: 'foo', useValue: 'bar'}],

packages/core/src/di/interface/defs.ts

@@ -212,7 +212,7 @@ export function ɵɵdefineInjector(options: {providers?: any[]; imports?: any[]}
  * @param type A type which may have its own (non-inherited) `ɵprov`.
  */
 export function getInjectableDef<T>(type: any): ɵɵInjectableDeclaration<T> | null {
-  return getOwnDefinition(type, NG_PROV_DEF);
+  return getOwnDefinition(type, NG_PROV_DEF) || getOwnDefinition(type, NG_INJECTABLE_DEF);
 }
 
 export function isInjectable(type: any): boolean {
@@ -224,8 +224,7 @@ export function isInjectable(type: any): boolean {
  * class of `type`.
  */
 function getOwnDefinition<T>(type: any, field: string): ɵɵInjectableDeclaration<T> | null {
-  // if the ɵprov prop exist but is undefined we still want to return null
-  return (type.hasOwnProperty(field) && type[field]) || null;
+  return type.hasOwnProperty(field) ? type[field] : null;
 }
 
 /**
@@ -237,8 +236,7 @@ function getOwnDefinition<T>(type: any, field: string): ɵɵInjectableDeclaratio
  *     scenario if we find the `ɵprov` on an ancestor only.
  */
 export function getInheritedInjectableDef<T>(type: any): ɵɵInjectableDeclaration<T> | null {
-  // if the ɵprov prop exist but is undefined we still want to return null
-  const def = type?.[NG_PROV_DEF] ?? null;
+  const def = type && (type[NG_PROV_DEF] || type[NG_INJECTABLE_DEF]);
 
   if (def) {
     ngDevMode &&
@@ -258,8 +256,14 @@ export function getInheritedInjectableDef<T>(type: any): ɵɵInjectableDeclarati
  * @param type type which may have an injector def (`ɵinj`)
  */
 export function getInjectorDef<T>(type: any): ɵɵInjectorDef<T> | null {
-  return type && type.hasOwnProperty(NG_INJ_DEF) ? (type as any)[NG_INJ_DEF] : null;
+  return type && (type.hasOwnProperty(NG_INJ_DEF) || type.hasOwnProperty(NG_INJECTOR_DEF))
+    ? (type as any)[NG_INJ_DEF]
+    : null;
 }
 
 export const NG_PROV_DEF = getClosureSafeProperty({ɵprov: getClosureSafeProperty});
 export const NG_INJ_DEF = getClosureSafeProperty({ɵinj: getClosureSafeProperty});
+
+// We need to keep these around so we can read off old defs if new defs are unavailable
+export const NG_INJECTABLE_DEF = getClosureSafeProperty({ngInjectableDef: getClosureSafeProperty});
+export const NG_INJECTOR_DEF = getClosureSafeProperty({ngInjectorDef: getClosureSafeProperty});

packages/core/test/bundling/animations-standalone/bundle.golden_symbols.json

@@ -103,6 +103,8 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
+  "NG_INJECTABLE_DEF",
+  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_PIPE_DEF",
   "NG_PROV_DEF",
@@ -323,6 +325,7 @@
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
   "getOrSetDefaultValue",
+  "getOwnDefinition",
   "getParentElement",
   "getParentInjectorIndex",
   "getParentInjectorLocation",

packages/core/test/bundling/animations/bundle.golden_symbols.json

@@ -110,6 +110,8 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
+  "NG_INJECTABLE_DEF",
+  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_MOD_DEF",
   "NG_PIPE_DEF",
@@ -346,6 +348,7 @@
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
   "getOrSetDefaultValue",
+  "getOwnDefinition",
   "getParentElement",
   "getParentInjectorIndex",
   "getParentInjectorLocation",

packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json

@@ -79,6 +79,8 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
+  "NG_INJECTABLE_DEF",
+  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_MOD_DEF",
   "NG_PIPE_DEF",
@@ -273,6 +275,7 @@
   "getOrCreateInjectable",
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
+  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

packages/core/test/bundling/defer/bundle.golden_symbols.json

@@ -105,6 +105,8 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
+  "NG_INJECTABLE_DEF",
+  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_PIPE_DEF",
   "NG_PROV_DEF",
@@ -328,6 +330,7 @@
   "getOrCreateInjectable",
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
+  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json

@@ -112,6 +112,8 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
+  "NG_INJECTABLE_DEF",
+  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_MODEL_WITH_FORM_CONTROL_WARNING",
   "NG_MOD_DEF",
@@ -391,6 +393,7 @@
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
   "getOrCreateViewRefs",
+  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json

@@ -105,6 +105,8 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
+  "NG_INJECTABLE_DEF",
+  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_MOD_DEF",
   "NG_PIPE_DEF",
@@ -377,6 +379,7 @@
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
   "getOrCreateViewRefs",
+  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

packages/core/test/bundling/hello_world/bundle.golden_symbols.json

@@ -53,6 +53,8 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
+  "NG_INJECTABLE_DEF",
+  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_MOD_DEF",
   "NG_PROV_DEF",
@@ -213,6 +215,7 @@
   "getOrCreateInjectable",
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
+  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

packages/core/test/bundling/hydration/bundle.golden_symbols.json

@@ -85,6 +85,8 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
+  "NG_INJECTABLE_DEF",
+  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_PIPE_DEF",
   "NG_PROV_DEF",
@@ -280,6 +282,7 @@
   "getOrCreateInjectable",
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
+  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",