dbgate-tools 5.1.5 → 5.1.7-alpha.13

package/lib/SqlDumper.d.ts

@@ -1,4 +1,4 @@
-import { ColumnInfo, ConstraintInfo, EngineDriver, ForeignKeyInfo, FunctionInfo, NamedObjectInfo, PrimaryKeyInfo, ProcedureInfo, SqlDialect, TableInfo, TransformType, TriggerInfo, ViewInfo, IndexInfo, UniqueInfo, CheckInfo, AlterProcessor, SqlObjectInfo } from 'dbgate-types';
+import type { ColumnInfo, ConstraintInfo, EngineDriver, ForeignKeyInfo, FunctionInfo, NamedObjectInfo, PrimaryKeyInfo, ProcedureInfo, SqlDialect, TableInfo, TransformType, TriggerInfo, ViewInfo, IndexInfo, UniqueInfo, CheckInfo, AlterProcessor, SqlObjectInfo } from 'dbgate-types';
 export declare class SqlDumper implements AlterProcessor {
     s: string;
     driver: EngineDriver;

package/lib/SqlGenerator.d.ts

@@ -1,4 +1,4 @@
-import { DatabaseInfo, EngineDriver, TableInfo } from 'dbgate-types';
+import type { DatabaseInfo, EngineDriver, TableInfo } from 'dbgate-types';
 import { SqlDumper } from './SqlDumper';
 interface SqlGeneratorOptions {
     dropTables: boolean;

package/lib/computeDiffRows.d.ts

@@ -1,5 +1,5 @@
 import { DbDiffOptions, testEqualTables, testEqualSqlObjects } from './diffTools';
-import { DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
+import type { DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
 export declare function computeDiffRowsCore(sourceList: any, targetList: any, testEqual: any): any[];
 export declare const DbDiffCompareDefs: {
     tables: {

package/lib/diffTools.d.ts

@@ -1,4 +1,4 @@
-import { ColumnInfo, DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
+import type { ColumnInfo, DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
 import { AlterPlan } from './alterPlan';
 declare type DbDiffSchemaMode = 'strict' | 'ignore' | 'ignoreImplicit';
 export interface DbDiffOptions {

package/lib/filterName.js

@@ -6,55 +6,21 @@ 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)
-// {
-//     if (String.IsNullOrEmpty(Filter)) return false;
-//     if (String.IsNullOrEmpty(value)) return true;
-//     var camelVariants = new HashSet<string>();
-//     camelVariants.Add(new String(value.Where(Char.IsUpper).ToArray()));
-//     if (value.All(x => Char.IsUpper(x) || x == '_'))
-//     {
-//         var sb = new StringBuilder();
-//         for (int i = 0; i < value.Length; i++)
-//         {
-//             if (Char.IsUpper(value[i]) && (i == 0 || value[i - 1] == '_')) sb.Append(value[i]);
-//         }
-//         camelVariants.Add(sb.ToString());
-//     }
-//     else
-//     {
-//         string s = value, s0;
-//         do
-//         {
-//             s0 = s;
-//             s = Regex.Replace(s, "([A-Z])([A-Z])([A-Z])", "$1$3");
-//         } while (s0 != s);
-//         camelVariants.Add(new String(s.Where(Char.IsUpper).ToArray()));
-//     }
-//     bool camelMatch = camelVariants.Any(x => DoMatch(Filter, x));
-//     if (Filter.All(Char.IsUpper)) return camelMatch;
-//     return DoMatch(Filter, value) || camelMatch;
-// }
-function fuzzysearch(needle, haystack) {
-    var hlen = haystack.length;
-    var nlen = needle.length;
-    if (nlen > hlen) {
+const startCase_1 = __importDefault(require("lodash/startCase"));
+function camelMatch(filter, text) {
+    if (!text)
         return false;
+    if (!filter)
+        return true;
+    if (filter.replace(/[A-Z]/g, '').length == 0) {
+        const textCapitals = (0, startCase_1.default)(text).replace(/[^A-Z]/g, '');
+        const pattern = '.*' + filter.split('').join('.*') + '.*';
+        const re = new RegExp(pattern);
+        return re.test(textCapitals);
     }
-    if (nlen === hlen) {
-        return needle === haystack;
-    }
-    outer: for (var i = 0, j = 0; i < nlen; i++) {
-        var nch = needle.charCodeAt(i);
-        while (j < hlen) {
-            if (haystack.charCodeAt(j++) === nch) {
-                continue outer;
-            }
-        }
-        return false;
+    else {
+        return text.toUpperCase().includes(filter.toUpperCase());
     }
-    return true;
 }
 function filterName(filter, ...names) {
     if (!filter)
@@ -67,15 +33,15 @@ function filterName(filter, ...names) {
     // @ts-ignore
     const namesChild = namesCompacted.filter(x => x.childName).map(x => x.childName);
     for (const token of tokens) {
-        const tokenUpper = token.toUpperCase();
-        if (tokenUpper.startsWith('#')) {
-            const tokenUpperSub = tokenUpper.substring(1);
-            const found = namesChild.find(name => fuzzysearch(tokenUpperSub, name.toUpperCase()));
+        // const tokenUpper = token.toUpperCase();
+        if (token.startsWith('#')) {
+            // const tokenUpperSub = tokenUpper.substring(1);
+            const found = namesChild.find(name => camelMatch(token.substring(1), name));
             if (!found)
                 return false;
         }
         else {
-            const found = namesOwn.find(name => fuzzysearch(tokenUpper, name.toUpperCase()));
+            const found = namesOwn.find(name => camelMatch(token, name));
             if (!found)
                 return false;
         }

package/lib/nameTools.d.ts

@@ -1,4 +1,4 @@
-import { ColumnInfo, DatabaseInfo, DatabaseInfoObjects, NamedObjectInfo, SqlDialect, TableInfo } from 'dbgate-types';
+import type { ColumnInfo, DatabaseInfo, DatabaseInfoObjects, NamedObjectInfo, SqlDialect, TableInfo } from 'dbgate-types';
 export declare function fullNameFromString(name: any): {
     schemaName: any;
     pureName: any;

package/lib/packageTools.d.ts

@@ -1,4 +1,4 @@
-import { EngineDriver, ExtensionsDirectory } from 'dbgate-types';
+import type { EngineDriver, ExtensionsDirectory } from 'dbgate-types';
 export declare function extractShellApiPlugins(functionName: any, props: any): string[];
 export declare function extractPackageName(name: any): string;
 export declare function extractShellApiFunctionName(functionName: any): string;

package/lib/preloadedRowsTools.d.ts

@@ -1,2 +1,2 @@
-import { DatabaseInfo, EngineDriver } from 'dbgate-types';
+import type { DatabaseInfo, EngineDriver } from 'dbgate-types';
 export declare function enrichWithPreloadedRows(dbModel: DatabaseInfo, dbTarget: DatabaseInfo, conn: any, driver: EngineDriver): Promise<DatabaseInfo>;

package/lib/schemaEditorTools.d.ts

@@ -1,4 +1,4 @@
-import { ColumnInfo, ConstraintInfo, TableInfo } from 'dbgate-types';
+import type { ColumnInfo, ConstraintInfo, TableInfo } from 'dbgate-types';
 export interface EditorColumnInfo extends ColumnInfo {
     isPrimaryKey?: boolean;
 }

package/lib/structureTools.d.ts

@@ -1,4 +1,4 @@
-import { DatabaseInfo, TableInfo, ApplicationDefinition, ViewInfo, CollectionInfo } from 'dbgate-types';
+import type { DatabaseInfo, TableInfo, ApplicationDefinition, ViewInfo, CollectionInfo } from 'dbgate-types';
 export declare function addTableDependencies(db: DatabaseInfo): DatabaseInfo;
 export declare function extendTableInfo(table: TableInfo): TableInfo;
 export declare function extendDatabaseInfo(db: DatabaseInfo): DatabaseInfo;

package/lib/tableTransforms.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="lodash" />
-import { TableInfo } from 'dbgate-types';
+import type { TableInfo } from 'dbgate-types';
 export declare function prepareTableForImport(table: TableInfo): TableInfo;
 interface TransformColumnDefinition {
     src: string;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.1.5",
+  "version": "5.1.7-alpha.13",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,14 +25,14 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^5.1.5",
+    "dbgate-types": "^5.1.7-alpha.13",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "dbgate-query-splitter": "^4.9.2",
-    "dbgate-sqltree": "^5.1.5",
+    "dbgate-query-splitter": "^4.9.3",
+    "dbgate-sqltree": "^5.1.7-alpha.13",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",