dbgate-filterparser 6.3.2 → 6.3.3

package/lib/filterTool.d.ts

@@ -1,3 +1,7 @@
+import { Condition } from 'dbgate-sqltree';
 export type FilterMultipleValuesMode = 'is' | 'is_not' | 'contains' | 'begins' | 'ends';
 export declare function getFilterValueExpression(value: any, dataType?: any): string;
 export declare function createMultiLineFilter(mode: FilterMultipleValuesMode, text: string): string;
+export declare function compileCompoudEvalCondition(filters: {
+    [column: string]: string;
+}): Condition;

package/lib/filterTool.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMultiLineFilter = exports.getFilterValueExpression = void 0;
+exports.compileCompoudEvalCondition = exports.createMultiLineFilter = exports.getFilterValueExpression = void 0;
 const dbgate_tools_1 = require("dbgate-tools");
 const date_fns_1 = require("date-fns");
 const isString_1 = __importDefault(require("lodash/isString"));
+const cloneDeepWith_1 = __importDefault(require("lodash/cloneDeepWith"));
+const parseFilter_1 = require("./parseFilter");
 function getDateStringWithoutTimeZone(dateString) {
     if ((0, isString_1.default)(dateString)) {
         return dateString.replace(/Z|([+-]\d{2}:\d{2})$/, '');
@@ -67,3 +69,31 @@ function createMultiLineFilter(mode, text) {
     return res;
 }
 exports.createMultiLineFilter = createMultiLineFilter;
+function compileCompoudEvalCondition(filters) {
+    if (!filters)
+        return null;
+    const conditions = [];
+    for (const name in filters) {
+        try {
+            const condition = (0, parseFilter_1.parseFilter)(filters[name], dbgate_tools_1.evalFilterBehaviour);
+            const replaced = (0, cloneDeepWith_1.default)(condition, (expr) => {
+                if (expr.exprType == 'placeholder')
+                    return {
+                        exprType: 'column',
+                        columnName: name,
+                    };
+            });
+            conditions.push(replaced);
+        }
+        catch (err) {
+            // filter parse error - ignore filter
+        }
+    }
+    if (conditions.length == 0)
+        return null;
+    return {
+        conditionType: 'and',
+        conditions,
+    };
+}
+exports.compileCompoudEvalCondition = compileCompoudEvalCondition;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.3.2",
+  "version": "6.3.3",
   "name": "dbgate-filterparser",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -13,7 +13,7 @@
     "lib"
   ],
   "devDependencies": {
-    "dbgate-types": "^6.3.2",
+    "dbgate-types": "^6.3.3",
     "@types/jest": "^25.1.4",
     "@types/node": "^13.7.0",
     "jest": "^28.1.3",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@types/parsimmon": "^1.10.1",
-    "dbgate-tools": "^6.3.2",
+    "dbgate-tools": "^6.3.3",
     "lodash": "^4.17.21",
     "date-fns": "^4.1.0",
     "moment": "^2.24.0",