From cbc4356e6580d2c50af5e153e1783934268ab46e Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Wed, 20 Jan 2021 18:56:57 +0300
Subject: [PATCH 1/2] add createTreeNodeFilterCreator util fn

---
 .../core/src/lib/tests/tree-utils.spec.ts     | 75 ++++++++++++++++++-
 .../packages/core/src/lib/utils/tree-utils.ts | 21 ++++++
 2 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/tests/tree-utils.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/tree-utils.spec.ts
index 6115114872..b4f8721f47 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/tree-utils.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/tree-utils.spec.ts
@@ -1,4 +1,9 @@
-import { BaseTreeNode, createTreeFromList, TreeNode } from '../utils/tree-utils';
+import {
+  BaseTreeNode,
+  createTreeFromList,
+  createTreeNodeFilterCreator,
+  TreeNode,
+} from '../utils/tree-utils';
 
 const LIST_1 = [
   { id: 1, pid: null },
@@ -38,6 +43,42 @@ const TREE_3 = [
     ],
   },
 ];
+const SOURCE_TREE: TreeNode<SearchModel>[] = [
+  {
+    id: 1,
+    pid: null,
+    isLeaf: false,
+    name: 'foo',
+    children: [
+      {
+        id: 2,
+        pid: 1,
+        name: 'bar',
+        isLeaf: false,
+        children: [{ id: 3, pid: 2, name: 'qux', isLeaf: true, children: [] }],
+      },
+      { id: 4, pid: 1, name: 'baz', isLeaf: true, children: [] },
+      { id: 5, pid: 1, name: 'quux', isLeaf: true, children: [] },
+    ],
+  },
+];
+const RESULT_TREE_1 = [
+  { id: 3, pid: 2, name: 'qux', isLeaf: true, children: [] },
+  { id: 5, pid: 1, name: 'quux', isLeaf: true, children: [] },
+];
+const RESULT_TREE_2 = [{ id: 5, pid: 1, name: 'quux', isLeaf: true, children: [] }];
+const RESULT_TREE_3 = [
+  {
+    id: 2,
+    pid: 1,
+    name: 'bar',
+    isLeaf: false,
+    children: [{ id: 3, pid: 2, name: 'qux', isLeaf: true, children: [] }],
+  },
+  { id: 4, pid: 1, name: 'baz', isLeaf: true, children: [] },
+];
+const RESULT_TREE_4 = [{ id: 4, pid: 1, name: 'baz', isLeaf: true, children: [] }];
+
 describe('Tree Utils', () => {
   describe('createTreeFromList', () => {
     test.each`
@@ -56,6 +97,23 @@ describe('Tree Utils', () => {
       expect(removeParents(tree)).toEqual(expected);
     });
   });
+
+  describe('createTreeNodeFilterCreator', () => {
+    test.each`
+      search   | expected
+      ${'qu'}  | ${RESULT_TREE_1}
+      ${'quu'} | ${RESULT_TREE_2}
+      ${'ba'}  | ${RESULT_TREE_3}
+      ${'baz'} | ${RESULT_TREE_4}
+    `(
+      'should return $expected when $search is searched',
+      ({ search, expected }: TestCreateTreeNodeFilter) => {
+        const filter = createTreeNodeFilterCreator('name', String)(search);
+
+        expect(filter(SOURCE_TREE)).toEqual(expected);
+      },
+    );
+  });
 });
 
 function removeParents(tree: TreeNode<Model>[]) {
@@ -72,6 +130,17 @@ interface TestCreateTreeFromList {
 }
 
 interface Model {
-  id: 1;
-  pid: null;
+  id: number;
+  pid?: number;
+}
+
+interface TestCreateTreeNodeFilter {
+  search: string;
+  expected: TreeNode<SearchModel>[];
+}
+
+interface SearchModel {
+  id: number;
+  pid?: number;
+  name: string;
 }
diff --git a/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts
index ba6e3a5b90..8339929718 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts
@@ -54,6 +54,27 @@ export function createMapFromList<T extends object, R extends unknown>(
   return map;
 }
 
+export function createTreeNodeFilterCreator<T extends object>(
+  key: keyof T,
+  mapperFn: (value: any) => string,
+) {
+  return (search: string) => {
+    const regex = new RegExp('.*' + search + '.*', 'i');
+
+    return function collectNodes(nodes: TreeNode<T>[], matches = []) {
+      for (let i = 0; i < nodes.length; i++) {
+        const node = nodes[i];
+
+        if (regex.test(mapperFn(node[key]))) matches.push(node);
+
+        if (node.children.length) collectNodes(node.children, matches);
+      }
+
+      return matches;
+    };
+  };
+}
+
 export type TreeNode<T extends object> = {
   [K in keyof T]: T[K];
 } & {

From 5fc956ec1edbfe30e7b7cd0f37e5b12a227e7074 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Wed, 20 Jan 2021 18:59:39 +0300
Subject: [PATCH 2/2] use for..of instead of for loop

---
 npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts
index 8339929718..235820abd6 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts
@@ -62,9 +62,7 @@ export function createTreeNodeFilterCreator<T extends object>(
     const regex = new RegExp('.*' + search + '.*', 'i');
 
     return function collectNodes(nodes: TreeNode<T>[], matches = []) {
-      for (let i = 0; i < nodes.length; i++) {
-        const node = nodes[i];
-
+      for (const node of nodes) {
         if (regex.test(mapperFn(node[key]))) matches.push(node);
 
         if (node.children.length) collectNodes(node.children, matches);