Merge pull request #2126 from satanTime/issues/2097

satanTime · web-flow · commit a26c982ef6cd · 2022-03-27T15:04:14.000+02:00
diff --git a/e2e/a5es2015/package.json b/e2e/a5es2015/package.json
@@ -9,7 +9,7 @@
     "start": "ng serve",
     "build": "ng build --prod",
     "test": "npm run test:jasmine -- --progress=false && npm run test:jest",
-    "test:debug": "npm run test:jasmine -- --browsers=Chrome --watch",
+    "test:debug": "npm run test:jasmine -- --browsers=Chrome --watch --single-run=false",
     "test:jasmine": "ng test",
     "test:jasmine:debug": "ng test -- --watch --browsers Chrome",
     "test:jest": "jest -i",
diff --git a/e2e/a5es5/package.json b/e2e/a5es5/package.json
@@ -9,7 +9,7 @@
     "start": "ng serve",
     "build": "ng build --prod",
     "test": "npm run test:jasmine -- --progress=false && npm run test:jest",
-    "test:debug": "npm run test:jasmine -- --browsers=Chrome --watch",
+    "test:debug": "npm run test:jasmine -- --browsers=Chrome --watch --single-run=false",
     "test:jasmine": "ng test",
     "test:jasmine:debug": "ng test -- --watch --browsers Chrome",
     "test:jest": "jest -i",
diff --git a/libs/ng-mocks/src/lib/mock-helper/find-instance/func.is-valid-find-instance-selector.ts b/libs/ng-mocks/src/lib/mock-helper/find-instance/func.is-valid-find-instance-selector.ts
@@ -1,3 +1,5 @@
+import { isNgDef } from '../../common/func.is-ng-def';
+
 export default (value: any): boolean => {
-  return typeof value === 'function';
+  return typeof value === 'function' || isNgDef(value, 't');
 };
diff --git a/libs/ng-mocks/src/lib/mock-helper/find-instance/mock-helper.find-instance.ts b/libs/ng-mocks/src/lib/mock-helper/find-instance/mock-helper.find-instance.ts
@@ -1,4 +1,5 @@
 import { getSourceOfMock } from '../../common/func.get-source-of-mock';
+import { isNgDef } from '../../common/func.is-ng-def';
 import mockHelperCrawl from '../crawl/mock-helper.crawl';
 import mockHelperFind from '../find/mock-helper.find';
 import funcGetFromNode from '../func.get-from-node';
@@ -12,8 +13,8 @@ const defaultNotFoundValue = {}; // simulating Symbol
 
 export default (...args: any[]) => {
   const [el, sel, notFoundValue] = funcParseFindArgs(args, funcIsValidFindInstanceSelector, defaultNotFoundValue);
-  if (typeof sel !== 'function') {
-    throw new Error('Only classes are accepted');
+  if (typeof sel !== 'function' && !isNgDef(sel, 't')) {
+    throw new Error('Only classes or tokens are accepted');
   }
 
   const declaration = getSourceOfMock(sel);
diff --git a/libs/ng-mocks/src/lib/mock-helper/find-instance/mock-helper.find-instances.ts b/libs/ng-mocks/src/lib/mock-helper/find-instance/mock-helper.find-instances.ts
@@ -1,4 +1,5 @@
 import { getSourceOfMock } from '../../common/func.get-source-of-mock';
+import { isNgDef } from '../../common/func.is-ng-def';
 import mockHelperCrawl from '../crawl/mock-helper.crawl';
 import mockHelperFindAll from '../find/mock-helper.find-all';
 import funcGetFromNode from '../func.get-from-node';
@@ -9,18 +10,22 @@ import funcIsValidFindInstanceSelector from './func.is-valid-find-instance-selec
 
 export default <T>(...args: any[]): T[] => {
   const [el, sel] = funcParseFindArgs(args, funcIsValidFindInstanceSelector);
-  if (typeof sel !== 'function') {
-    throw new Error('Only classes are accepted');
+  if (typeof sel !== 'function' && !isNgDef(sel, 't')) {
+    throw new Error('Only classes or tokens are accepted');
   }
 
   const declaration = getSourceOfMock(sel);
   const result: T[] = [];
+  const scanned: any[] = [];
   const elements = mockHelperFindAll(funcGetLastFixture(), el, undefined);
   for (const element of elements) {
     mockHelperCrawl(
       element,
       node => {
-        funcGetFromNode(result, node, declaration);
+        if (scanned.indexOf(node) === -1) {
+          funcGetFromNode(result, node, declaration);
+          scanned.push(node);
+        }
       },
       true,
     );
diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-injector.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-injector.ts
@@ -1,17 +1,44 @@
-import { DebugNode } from '@angular/core';
+import { DebugNode, InjectionToken, Injector } from '@angular/core';
 
 import coreInjector from '../common/core.injector';
 import { Type } from '../common/core.types';
+import { isNgDef } from '../common/func.is-ng-def';
 
 import { Node } from './func.get-from-node';
 
-export default <T>(result: T[], node: (DebugNode & Node) | null | undefined, proto: Type<T>): void => {
-  if (!node) {
+const getParentWithInjector = (node: (DebugNode & Node) | null): Injector | undefined => {
+  let parent: DebugNode | null = node;
+  while (parent?.injector.constructor.name === 'NullInjector') {
+    parent = parent.parent;
+  }
+
+  if (parent) {
+    return parent.injector;
+  }
+
+  return undefined;
+};
+
+export default <T>(
+  result: T[],
+  node: (DebugNode & Node) | null | undefined,
+  proto: Type<T> | InjectionToken<T>,
+): void => {
+  if (!node?.injector || node.injector.constructor.name === 'NullInjector') {
     return;
   }
 
+  const parentInjector = getParentWithInjector(node.parent);
+  const parentInstance = parentInjector ? coreInjector(proto, parentInjector) : undefined;
   const instance = coreInjector(proto, node.injector);
-  if (instance && result.indexOf(instance) === -1) {
+  // a way to avoid inherited injections
+  if (parentInstance === instance) {
+    return;
+  }
+
+  if (isNgDef(proto, 't') && instance !== undefined) {
+    result.push(instance);
+  } else if (instance !== undefined && result.indexOf(instance) === -1) {
     result.push(instance);
   }
 };
diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node.ts
@@ -1,6 +1,7 @@
-import { DebugNode } from '@angular/core';
+import { DebugNode, InjectionToken } from '@angular/core';
 
 import { Type } from '../common/core.types';
+import { isNgDef } from '../common/func.is-ng-def';
 
 import funcGetFromNodeInjector from './func.get-from-node-injector';
 import funcGetFromNodeIvy from './func.get-from-node-ivy';
@@ -27,10 +28,16 @@ export interface Node {
   parent?: (DebugNode & Node) | null;
 }
 
-export default <T>(result: T[], node: (DebugNode & Node) | null | undefined, proto: Type<T>): T[] => {
+export default <T>(
+  result: T[],
+  node: (DebugNode & Node) | null | undefined,
+  proto: Type<T> | InjectionToken<T>,
+): T[] => {
   funcGetFromNodeInjector(result, node, proto);
-  funcGetFromNodeStandard(result, node, proto);
-  funcGetFromNodeIvy(result, node, proto);
+  if (!isNgDef(proto, 't')) {
+    funcGetFromNodeStandard(result, node, proto);
+    funcGetFromNodeIvy(result, node, proto);
+  }
 
   return result;
 };
diff --git a/libs/ng-mocks/src/lib/mock-helper/func.parse-find-args-name.ts b/libs/ng-mocks/src/lib/mock-helper/func.parse-find-args-name.ts
@@ -1,4 +1,5 @@
 import { AnyType, DebugNodeSelector } from '../common/core.types';
+import { isNgDef } from '../common/func.is-ng-def';
 
 export default (selector: AnyType<any> | DebugNodeSelector): string => {
   if (typeof selector === 'string') {
@@ -7,6 +8,9 @@ export default (selector: AnyType<any> | DebugNodeSelector): string => {
   if (typeof selector === 'function') {
     return selector.name;
   }
+  if (isNgDef(selector, 't')) {
+    return (selector as any)._desc;
+  }
   if (Array.isArray(selector)) {
     return selector[0];
   }
diff --git a/libs/ng-mocks/src/lib/mock-helper/mock-helper.ts b/libs/ng-mocks/src/lib/mock-helper/mock-helper.ts
@@ -195,32 +195,36 @@ export const ngMocks: {
   /**
    * @see https://ng-mocks.sudo.eu/api/ngMocks/findInstance
    */
-  findInstance<T>(instanceClass: AnyType<T>): T;
+  findInstance<T>(instanceClass: AnyType<T> | InjectionToken<T>): T;
 
   /**
    * @see https://ng-mocks.sudo.eu/api/ngMocks/findInstance
    */
-  findInstance<T>(elSelector: DebugNodeSelector, instanceClass: AnyType<T>): T;
+  findInstance<T>(elSelector: DebugNodeSelector, instanceClass: AnyType<T> | InjectionToken<T>): T;
 
   /**
    * @see https://ng-mocks.sudo.eu/api/ngMocks/findInstance
    */
-  findInstance<T, D>(instanceClass: AnyType<T>, notFoundValue: D): D | T;
+  findInstance<T, D>(instanceClass: AnyType<T> | InjectionToken<T>, notFoundValue: D): D | T;
 
   /**
    * @see https://ng-mocks.sudo.eu/api/ngMocks/findInstance
    */
-  findInstance<T, D>(elSelector: DebugNodeSelector, instanceClass: AnyType<T>, notFoundValue: D): D | T;
+  findInstance<T, D>(
+    elSelector: DebugNodeSelector,
+    instanceClass: AnyType<T> | InjectionToken<T>,
+    notFoundValue: D,
+  ): D | T;
 
   /**
    * @see https://ng-mocks.sudo.eu/api/ngMocks/findInstances
    */
-  findInstances<T>(instanceClass: AnyType<T>): T[];
+  findInstances<T>(instanceClass: AnyType<T> | InjectionToken<T>): T[];
 
   /**
    * @see https://ng-mocks.sudo.eu/api/ngMocks/findInstances
    */
-  findInstances<T>(elSelector: DebugNodeSelector, instanceClass: AnyType<T>): T[];
+  findInstances<T>(elSelector: DebugNodeSelector, instanceClass: AnyType<T> | InjectionToken<T>): T[];
 
   /**
    * @see https://ng-mocks.sudo.eu/api/ngMocks/findTemplateRef
diff --git a/tests/issue-2097/nested.spec.ts b/tests/issue-2097/nested.spec.ts
@@ -0,0 +1,60 @@
+import {
+  Component,
+  Injectable,
+  InjectionToken,
+  NgModule,
+} from '@angular/core';
+import { MockBuilder, MockRender, ngMocks } from 'ng-mocks';
+
+const TOKEN = new InjectionToken<string>('TOKEN');
+
+@Component({
+  providers: [
+    {
+      provide: TOKEN,
+      useValue: 'parent',
+    },
+  ],
+  selector: 'parent',
+  template: '<child></child><child></child><ng-content></ng-content>',
+})
+class ParentComponent {}
+
+@Component({
+  selector: 'child',
+  template: 'child',
+})
+class ChildComponent {}
+
+@NgModule({
+  declarations: [ParentComponent, ChildComponent],
+  providers: [
+    {
+      provide: TOKEN,
+      useValue: 'token',
+    },
+  ],
+})
+class TargetModule {}
+
+describe('issue-2097:nested', () => {
+  beforeEach(() =>
+    MockBuilder(
+      [ParentComponent, ChildComponent, TOKEN],
+      TargetModule,
+    ),
+  );
+
+  it('finds tokens correctly', () => {
+    const fixture = MockRender(`
+        <parent>
+            <child></child>
+            <child></child>
+        </parent>
+    `);
+
+    // it should be found on the parent node only.
+    const instances = ngMocks.findInstances('parent', TOKEN);
+    expect(instances).toEqual(['parent']);
+  });
+});
diff --git a/tests/issue-2097/test.spec.ts b/tests/issue-2097/test.spec.ts
diff --git a/tests/ng-mocks-find-instance/test.spec.ts b/tests/ng-mocks-find-instance/test.spec.ts
diff --git a/tests/ng-mocks-find-instances/test.spec.ts b/tests/ng-mocks-find-instances/test.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { AnyType, DebugNodeSelector } from '../common/core.types';`
	`2`	`+import { isNgDef } from '../common/func.is-ng-def';`
`2`	`3`
`3`	`4`	`export default (selector: AnyType<any> \| DebugNodeSelector): string => {`
`4`	`5`	`if (typeof selector === 'string') {`
`@@ -7,6 +8,9 @@ export default (selector: AnyType<any> \| DebugNodeSelector): string => {`
`7`	`8`	`if (typeof selector === 'function') {`
`8`	`9`	`return selector.name;`
`9`	`10`	`}`
	`11`	`+ if (isNgDef(selector, 't')) {`
	`12`	`+ return (selector as any)._desc;`
	`13`	`+ }`
`10`	`14`	`if (Array.isArray(selector)) {`
`11`	`15`	`return selector[0];`
`12`	`16`	`}`