dbgate-filterparser 4.8.1 → 4.8.4

package/lib/parseFilter.js

@@ -215,10 +215,10 @@ const createParser = (filterType) => {
         eq: r => (0, common_1.word)('=').then(r.value).map(binaryCondition('=')),
         ne: r => (0, common_1.word)('!=').then(r.value).map(binaryCondition('<>')),
         ne2: r => (0, common_1.word)('<>').then(r.value).map(binaryCondition('<>')),
-        lt: r => (0, common_1.word)('<').then(r.value).map(binaryCondition('<')),
-        gt: r => (0, common_1.word)('>').then(r.value).map(binaryCondition('>')),
         le: r => (0, common_1.word)('<=').then(r.value).map(binaryCondition('<=')),
         ge: r => (0, common_1.word)('>=').then(r.value).map(binaryCondition('>=')),
+        lt: r => (0, common_1.word)('<').then(r.value).map(binaryCondition('<')),
+        gt: r => (0, common_1.word)('>').then(r.value).map(binaryCondition('>')),
         startsWith: r => (0, common_1.word)('^').then(r.value).map(likeCondition('like', '#VALUE#%')),
         endsWith: r => (0, common_1.word)('$').then(r.value).map(likeCondition('like', '%#VALUE#')),
         contains: r => (0, common_1.word)('+').then(r.value).map(likeCondition('like', '%#VALUE#%')),
@@ -230,24 +230,38 @@ const createParser = (filterType) => {
         list: r => r.factor.sepBy(r.comma).map(compoudCondition('or')),
     };
     const allowedValues = []; // 'string1', 'string2', 'number', 'noQuotedString'];
-    if (filterType == 'string')
+    if (filterType == 'string' || filterType == 'eval') {
         allowedValues.push('string1', 'string2', 'noQuotedString');
-    if (filterType == 'number')
+    }
+    if (filterType == 'number') {
         allowedValues.push('string1Num', 'string2Num', 'number');
+    }
     const allowedElements = ['null', 'notNull', 'eq', 'ne', 'ne2'];
-    if (filterType == 'number' || filterType == 'datetime')
-        allowedElements.push('lt', 'gt', 'le', 'ge');
-    if (filterType == 'string')
-        allowedElements.push('empty', 'notEmpty', 'startsWith', 'endsWith', 'contains', 'startsWithNot', 'endsWithNot', 'containsNot');
-    if (filterType == 'logical')
+    if (filterType == 'number' || filterType == 'datetime' || filterType == 'eval') {
+        allowedElements.push('le', 'ge', 'lt', 'gt');
+    }
+    if (filterType == 'string') {
+        allowedElements.push('empty', 'notEmpty');
+    }
+    if (filterType == 'eval' || filterType == 'string') {
+        allowedElements.push('startsWith', 'endsWith', 'contains', 'startsWithNot', 'endsWithNot', 'containsNot');
+    }
+    if (filterType == 'logical') {
         allowedElements.push('true', 'false', 'trueNum', 'falseNum');
-    if (filterType == 'datetime')
+    }
+    if (filterType == 'eval') {
+        allowedElements.push('true', 'false');
+    }
+    if (filterType == 'datetime') {
         allowedElements.push('yearMonthDaySecond', 'yearMonthDayMinute', 'yearMonthDayNum', 'yearMonthNum', 'yearNum', 'yesterday', 'today', 'tomorrow', 'lastWeek', 'thisWeek', 'nextWeek', 'lastMonth', 'thisMonth', 'nextMonth', 'lastYear', 'thisYear', 'nextYear');
+    }
     // must be last
-    if (filterType == 'string')
+    if (filterType == 'string' || filterType == 'eval') {
         allowedElements.push('valueTestStr');
-    else
+    }
+    else {
         allowedElements.push('valueTestEq');
+    }
     return parsimmon_1.default.createLanguage(langDef);
 };
 const parsers = {
@@ -255,6 +269,7 @@ const parsers = {
     string: createParser('string'),
     datetime: createParser('datetime'),
     logical: createParser('logical'),
+    eval: createParser('eval'),
     mongo: mongoParser_1.mongoParser,
 };
 function parseFilter(value, filterType) {

package/lib/types.d.ts

@@ -1 +1 @@
-export declare type FilterType = 'number' | 'string' | 'datetime' | 'logical' | 'mongo';
+export declare type FilterType = 'number' | 'string' | 'datetime' | 'logical' | 'eval' | 'mongo';

package/package.json

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