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

Those were also properties that were kept to also support of old compiled targets.

PR Close angular#59209

Author: JeanMeche

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

@@ -158,33 +158,6 @@ 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) || getOwnDefinition(type, NG_INJECTABLE_DEF);
+  return getOwnDefinition(type, NG_PROV_DEF);
 }
 
 export function isInjectable(type: any): boolean {
@@ -224,7 +224,8 @@ export function isInjectable(type: any): boolean {
  * class of `type`.
  */
 function getOwnDefinition<T>(type: any, field: string): ɵɵInjectableDeclaration<T> | null {
-  return type.hasOwnProperty(field) ? type[field] : null;
+  // if the ɵprov prop exist but is undefined we still want to return null
+  return (type.hasOwnProperty(field) && type[field]) || null;
 }
 
 /**
@@ -236,7 +237,8 @@ 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 {
-  const def = type && (type[NG_PROV_DEF] || type[NG_INJECTABLE_DEF]);
+  // if the ɵprov prop exist but is undefined we still want to return null
+  const def = type?.[NG_PROV_DEF] ?? null;
 
   if (def) {
     ngDevMode &&
@@ -256,14 +258,8 @@ 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.hasOwnProperty(NG_INJECTOR_DEF))
-    ? (type as any)[NG_INJ_DEF]
-    : null;
+  return type && type.hasOwnProperty(NG_INJ_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

@@ -100,8 +100,6 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
-  "NG_INJECTABLE_DEF",
-  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_PIPE_DEF",
   "NG_PROV_DEF",
@@ -324,7 +322,6 @@
   "getOrCreateInjectable",
   "getOrCreateNodeInjectorForNode",
   "getOrSetDefaultValue",
-  "getOwnDefinition",
   "getParentElement",
   "getParentInjectorIndex",
   "getParentInjectorLocation",

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

@@ -75,8 +75,6 @@
   "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,7 +271,6 @@
   "getOrCreateInjectable",
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
-  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

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

@@ -102,8 +102,6 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
-  "NG_INJECTABLE_DEF",
-  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_PIPE_DEF",
   "NG_PROV_DEF",
@@ -331,7 +329,6 @@
   "getOrCreateInjectable",
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
-  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

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

@@ -108,8 +108,6 @@
   "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",
@@ -392,7 +390,6 @@
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
   "getOrCreateViewRefs",
-  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

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

@@ -101,8 +101,6 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
-  "NG_INJECTABLE_DEF",
-  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_MOD_DEF",
   "NG_PIPE_DEF",
@@ -378,7 +376,6 @@
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
   "getOrCreateViewRefs",
-  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

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

@@ -82,8 +82,6 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
-  "NG_INJECTABLE_DEF",
-  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_PIPE_DEF",
   "NG_PROV_DEF",
@@ -285,7 +283,6 @@
   "getOrCreateInjectable",
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
-  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

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

@@ -116,8 +116,6 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
-  "NG_INJECTABLE_DEF",
-  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_MOD_DEF",
   "NG_PIPE_DEF",
@@ -468,7 +466,6 @@
   "getOrCreateTViewCleanup",
   "getOrCreateViewRefs",
   "getOutlet",
-  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",

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

@@ -70,8 +70,6 @@
   "NG_ELEMENT_ID",
   "NG_ENV_ID",
   "NG_FACTORY_DEF",
-  "NG_INJECTABLE_DEF",
-  "NG_INJECTOR_DEF",
   "NG_INJ_DEF",
   "NG_PIPE_DEF",
   "NG_PROV_DEF",
@@ -247,7 +245,6 @@
   "getOrCreateInjectable",
   "getOrCreateNodeInjectorForNode",
   "getOrCreateTNode",
-  "getOwnDefinition",
   "getParentInjectorIndex",
   "getParentInjectorLocation",
   "getParentInjectorView",