dbgate-tools 4.7.4-alpha.8 → 4.8.1

package/lib/driverBase.d.ts

@@ -15,6 +15,7 @@ export declare const driverBase: {
         };
     };
     databaseEngineTypes: string[];
+    supportedCreateDatabase: boolean;
     analyseFull(pool: any, version: any): Promise<any>;
     analyseSingleObject(pool: any, name: any, typeField?: string): Promise<any>;
     analyseSingleTable(pool: any, name: any): any;

package/lib/driverBase.js

@@ -36,6 +36,7 @@ exports.driverBase = {
     dumperClass: SqlDumper_1.SqlDumper,
     dialect,
     databaseEngineTypes: ['sql'],
+    supportedCreateDatabase: true,
     analyseFull(pool, version) {
         return __awaiter(this, void 0, void 0, function* () {
             const analyser = new this.analyserClass(pool, this, version);

package/lib/filterName.js

@@ -35,6 +35,26 @@ const compact_1 = __importDefault(require("lodash/compact"));
 //     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) {
+        return false;
+    }
+    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;
+    }
+    return true;
+}
 function filterName(filter, ...names) {
     if (!filter)
         return true;
@@ -43,7 +63,7 @@ function filterName(filter, ...names) {
     const namesCompacted = (0, compact_1.default)(names);
     for (const token of tokens) {
         const tokenUpper = token.toUpperCase();
-        const found = namesCompacted.find(name => name.toUpperCase().includes(tokenUpper));
+        const found = namesCompacted.find(name => fuzzysearch(tokenUpper, name.toUpperCase()));
         if (!found)
             return false;
     }

package/lib/testPermission.d.ts

@@ -1,6 +1,9 @@
+interface CompiledPermissionLevel {
+    re: RegExp;
+    type: 'allow' | 'deny';
+}
 interface CompiledPermissions {
-    revoke: RegExp;
-    allow: RegExp;
+    levels: CompiledPermissionLevel[];
 }
 export declare function compilePermissions(permissions: string[] | string): CompiledPermissions;
 export declare function testPermission(tested: string, permissions: CompiledPermissions): boolean;

package/lib/testPermission.js

@@ -7,6 +7,7 @@ exports.testPermission = exports.compilePermissions = void 0;
 const escapeRegExp_1 = __importDefault(require("lodash/escapeRegExp"));
 const isString_1 = __importDefault(require("lodash/isString"));
 const compact_1 = __importDefault(require("lodash/compact"));
+const flatten_1 = __importDefault(require("lodash/flatten"));
 function compileRegexp(permissions) {
     if (permissions.length == 0)
         return null;
@@ -16,26 +17,50 @@ function compilePermissions(permissions) {
     if (!permissions)
         return null;
     if ((0, isString_1.default)(permissions))
-        permissions = permissions.split(',');
+        permissions = permissions.split(/,|;|\||\s/);
+    else
+        permissions = (0, flatten_1.default)(permissions.map(x => x.split(/,|;|\||\s/)));
     permissions = (0, compact_1.default)(permissions.map(x => x.trim()));
-    const revoke = permissions.filter(x => x.startsWith('~')).map(x => x.substring(1));
-    const allow = permissions.filter(x => !x.startsWith('~'));
-    return {
-        revoke: compileRegexp(revoke),
-        allow: compileRegexp(allow),
+    let lastType = null;
+    let lastItems = [];
+    const res = {
+        levels: [],
     };
+    for (const item of permissions) {
+        const type = item.startsWith('~') ? 'deny' : 'allow';
+        const perm = item.startsWith('~') ? item.substring(1) : item;
+        if (lastType != null && type != lastType) {
+            res.levels.push({
+                re: compileRegexp(lastItems),
+                type: lastType,
+            });
+            lastItems = [];
+        }
+        lastItems.push(perm);
+        lastType = type;
+    }
+    if (lastItems.length > 0) {
+        res.levels.push({
+            re: compileRegexp(lastItems),
+            type: lastType,
+        });
+    }
+    return res;
 }
 exports.compilePermissions = compilePermissions;
 function testPermission(tested, permissions) {
-    if (!permissions)
-        return true;
-    if (!permissions.revoke)
+    let allow = true;
+    if (!permissions) {
         return true;
-    if (tested.match(permissions.revoke)) {
-        if (!tested.match(permissions.allow)) {
-            return false;
+    }
+    for (const level of permissions.levels) {
+        if (tested.match(level.re)) {
+            if (level.type == 'allow')
+                allow = true;
+            if (level.type == 'deny')
+                allow = false;
         }
     }
-    return true;
+    return allow;
 }
 exports.testPermission = testPermission;

package/package.json

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