dbgate-tools 5.0.4-alpha.8 → 5.0.6-alpha.2

package/lib/filterName.d.ts

@@ -1 +1,4 @@
-export declare function filterName(filter: string, ...names: string[]): boolean;
+export interface FilterNameDefinition {
+    childName: string;
+}
+export declare function filterName(filter: string, ...names: (string | FilterNameDefinition)[]): boolean;

package/lib/filterName.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterName = void 0;
 const compact_1 = __importDefault(require("lodash/compact"));
+const isString_1 = __importDefault(require("lodash/isString"));
 // original C# variant
 // public bool Match(string value)
 // {
@@ -61,11 +62,23 @@ function filterName(filter, ...names) {
     // const camelVariants = [name.replace(/[^A-Z]/g, '')]
     const tokens = filter.split(' ').map(x => x.trim());
     const namesCompacted = (0, compact_1.default)(names);
+    // @ts-ignore
+    const namesOwn = namesCompacted.filter(x => (0, isString_1.default)(x));
+    // @ts-ignore
+    const namesChild = namesCompacted.filter(x => x.childName).map(x => x.childName);
     for (const token of tokens) {
         const tokenUpper = token.toUpperCase();
-        const found = namesCompacted.find(name => fuzzysearch(tokenUpper, name.toUpperCase()));
-        if (!found)
-            return false;
+        if (tokenUpper.startsWith('#')) {
+            const tokenUpperSub = tokenUpper.substring(1);
+            const found = namesChild.find(name => fuzzysearch(tokenUpperSub, name.toUpperCase()));
+            if (!found)
+                return false;
+        }
+        else {
+            const found = namesOwn.find(name => fuzzysearch(tokenUpper, name.toUpperCase()));
+            if (!found)
+                return false;
+        }
     }
     return true;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.0.4-alpha.8",
+  "version": "5.0.6-alpha.2",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,7 +25,7 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^5.0.4-alpha.8",
+    "dbgate-types": "^5.0.6-alpha.2",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
@@ -33,7 +33,7 @@
   "dependencies": {
     "lodash": "^4.17.21",
     "dbgate-query-splitter": "^4.9.0",
-    "dbgate-sqltree": "^5.0.4-alpha.8",
+    "dbgate-sqltree": "^5.0.6-alpha.2",
     "uuid": "^3.4.0"
   }
 }