feat(core): support flags option in NodeInjector.get

close angular#31776 the InectFlags was defined in both getOrCreateInjectable and Injector, but was ignored in NodeInjector this PR support getting parent token via injector.get in NodeInjector
vthinkxie · Apr 29, 2021 · 5795c51 · 5795c51
1 parent 55d9713
commit 5795c51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
@@ -71,7 +71,7 @@ export abstract class Injector {
    * @deprecated from v4.0.0 use ProviderToken<T>
    * @suppress {duplicate}
    */
-  abstract get(token: any, notFoundValue?: any): any;
+  abstract get(token: any, notFoundValue?: any, flags?: InjectFlags): any;
 
   /**
    * @deprecated from v5 use the new signature Injector.create(options)

diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
@@ -688,8 +688,8 @@ export class NodeInjector implements Injector {
       private _tNode: TElementNode|TContainerNode|TElementContainerNode|null,
       private _lView: LView) {}
 
-  get(token: any, notFoundValue?: any): any {
-    return getOrCreateInjectable(this._tNode, this._lView, token, undefined, notFoundValue);
+  get(token: any, notFoundValue?: any, flags?: InjectFlags): any {
+    return getOrCreateInjectable(this._tNode, this._lView, token, flags, notFoundValue);
   }
 }
 

diff --git a/packages/core/test/acceptance/di_spec.ts b/packages/core/test/acceptance/di_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule} from '@angular/common';
-import {Attribute, ChangeDetectorRef, Component, ComponentFactoryResolver, ComponentRef, ContentChild, Directive, ElementRef, EventEmitter, forwardRef, Host, HostBinding, Inject, Injectable, InjectionToken, INJECTOR, Injector, Input, LOCALE_ID, NgModule, NgZone, Optional, Output, Pipe, PipeTransform, Self, SkipSelf, TemplateRef, ViewChild, ViewContainerRef, ViewRef, ɵDEFAULT_LOCALE_ID as DEFAULT_LOCALE_ID} from '@angular/core';
+import {Attribute, ChangeDetectorRef, Component, ComponentFactoryResolver, ComponentRef, ContentChild, Directive, ElementRef, EventEmitter, forwardRef, Host, HostBinding, Inject, Injectable, InjectFlags, InjectionToken, INJECTOR, Injector, Input, LOCALE_ID, NgModule, NgZone, Optional, Output, Pipe, PipeTransform, Self, SkipSelf, TemplateRef, ViewChild, ViewContainerRef, ViewRef, ɵDEFAULT_LOCALE_ID as DEFAULT_LOCALE_ID} from '@angular/core';
 import {ɵINJECTOR_SCOPE} from '@angular/core/src/core';
 import {ViewRef as ViewRefInternal} from '@angular/core/src/render3/view_ref';
 import {TestBed} from '@angular/core/testing';
@@ -720,7 +720,7 @@ describe('di', () => {
 
       describe('SkipSelf', () => {
         describe('Injectors', () => {
-          it('should support @SkipSelf when injecting Injectors', () => {
+          it('should support @SkipSelf and SkipSelf flag when injecting Injectors', () => {
             @Component({
               selector: 'parent',
               template: '<child></child>',
@@ -753,6 +753,7 @@ describe('di', () => {
             const childComponent =
                 fixture.debugElement.query(By.directive(ChildComponent)).componentInstance;
             expect(childComponent.injector.get('token')).toBe('CHILD');
+            expect(childComponent.injector.get('token', null, InjectFlags.SkipSelf)).toBe('PARENT');
             expect(childComponent.parentInjector.get('token')).toBe('PARENT');
           });