fix: correct stop of search in ivy tree

closes #298
satanTime · Feb 13, 2021 · 952986e · 952986e
1 parent 397ecf8
commit 952986e
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 10 deletions.
diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-element.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-element.ts
@@ -1,4 +1,4 @@
 import { DebugNode } from '@angular/core';
 
 export default (node: DebugNode): DebugNode =>
-  node.nativeNode.nodeName === '#text' && node.parent ? node.parent : node;
+  node.nativeNode?.nodeName === '#text' && node.parent ? node.parent : node;
diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-ivy.spec.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-ivy.spec.ts
@@ -39,6 +39,28 @@ describe('func.get-from-node-ivy', () => {
     expect(result).toEqual([proto]);
   });
 
+  it('disables on arrays', () => {
+    const result: any[] = [];
+    const proto = new Proto();
+    const node: any = {
+      nativeNode: {},
+      parent: {
+        nativeNode: {
+          __ngContext__: {
+            lView: [
+              [] /* now proto should not be collected */,
+              proto,
+            ],
+          },
+        },
+      },
+    };
+
+    funcGetFromNodeIvy(result, node, Proto);
+
+    expect(result).toEqual([]);
+  });
+
   it('handles empty context', () => {
     const result: any[] = [];
     const node: any = {
@@ -69,6 +91,20 @@ describe('func.get-from-node-ivy', () => {
     expect(result).toEqual([proto]);
   });
 
+  it('handles missed nativeNode', () => {
+    const result: any[] = [];
+    const node: any = {
+      parent: {
+        nativeNode: {
+          __ngContext__: [],
+        },
+      },
+    };
+
+    funcGetFromNodeIvy(result, node, Proto);
+    expect(result).toEqual([]);
+  });
+
   it('skips node with _debugContext', () => {
     const result: any[] = [];
     const proto = new Proto();

diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-ivy.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-ivy.ts
@@ -8,7 +8,7 @@ import funcGetFromNodeScan from './func.get-from-node-scan';
 
 const detectContext = (node: DebugNode): any => {
   let current = node;
-  let context = current.nativeNode.__ngContext__;
+  let context = current.nativeNode?.__ngContext__;
   while (!context && current.parent) {
     current = current.parent;
     context = current.nativeNode.__ngContext__;
@@ -25,7 +25,6 @@ export default <T>(result: T[], node: (DebugNode & Node) | null | undefined, pro
   }
 
   const el = funcGetFromNodeElement(node);
-
   funcGetFromNodeScan(
     {
       el,

diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-scan.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-scan.ts
@@ -3,6 +3,11 @@ import { DebugNode } from '@angular/core';
 import { Type } from '../common/core.types';
 
 const detectGatherFlag = (gather: boolean, el: DebugNode | null, node: any): boolean => {
+  // LContainer should stop the scan.
+  if (Array.isArray(node)) {
+    return false;
+  }
+
   if (!el || !node.nodeName) {
     return gather;
   }
@@ -12,8 +17,7 @@ const detectGatherFlag = (gather: boolean, el: DebugNode | null, node: any): boo
     return node.parentNode === el.nativeNode;
   }
 
-  // checking if an injectedNode belongs to the current element.
-  return node === el.nativeNode;
+  return false;
 };
 
 const isNotObject = (node: any): boolean => !node || typeof node !== 'object';

diff --git a/libs/ng-mocks/src/lib/mock-helper/func.parse-provider-tokens-directives.ts b/libs/ng-mocks/src/lib/mock-helper/func.parse-provider-tokens-directives.ts
@@ -14,6 +14,7 @@ const getMeta = (token: any): Directive | undefined => {
 };
 
 export default (el: DebugNode | null | undefined, token: any): Directive | undefined => {
+  // istanbul ignore if
   if (!el) {
     return undefined;
   }

diff --git a/libs/ng-mocks/src/lib/mock-helper/mock-helper.attributes.ts b/libs/ng-mocks/src/lib/mock-helper/mock-helper.attributes.ts
@@ -11,6 +11,16 @@ const parseArgs = (args: any[]): [MockedDebugElement | null | undefined, string,
   args.length === 3 ? args[2] : defaultNotFoundValue,
 ];
 
+const attrMatches = (attribute: string, selector: string): string | undefined => {
+  const [prop, alias = ''] = attribute.split(':', 2).map(v => v.trim());
+
+  if ((!alias && prop === selector) || (!!alias && alias === selector)) {
+    return prop;
+  }
+
+  return undefined;
+};
+
 const detectAttribute = (el: MockedDebugElement | null | undefined, attr: 'inputs' | 'outputs', sel: string) => {
   for (const token of el?.providerTokens || []) {
     const meta = funcParseProviderTokensDirectives(el, token);
@@ -19,12 +29,10 @@ const detectAttribute = (el: MockedDebugElement | null | undefined, attr: 'input
     }
 
     for (const attrDef of meta[attr] || /* istanbul ignore next */ []) {
-      const [prop, alias = ''] = attrDef.split(':', 2).map(v => v.trim());
-      if ((!alias && prop !== sel) || (alias && alias !== sel)) {
-        continue;
+      const prop = attrMatches(attrDef, sel);
+      if (prop) {
+        return mockHelperGet(el, token)[prop];
       }
-
-      return mockHelperGet(el, token)[prop];
     }
   }