dbgate-filterparser 6.5.6 → 6.6.1

package/lib/parseFilter.js

@@ -8,9 +8,10 @@ const parsimmon_1 = __importDefault(require("parsimmon"));
 const moment_1 = __importDefault(require("moment"));
 const common_1 = require("./common");
 const dbgate_tools_1 = require("dbgate-tools");
-const binaryCondition = (operator, numberDualTesting = false) => value => {
+const binaryCondition = (operator, filterBehaviour = {}) => value => {
+    const { passNumbers, allowNumberDualTesting } = filterBehaviour;
     const numValue = (0, dbgate_tools_1.parseNumberSafe)(value);
-    if (numberDualTesting &&
+    if (allowNumberDualTesting &&
         // @ts-ignore
         !isNaN(numValue)) {
         return {
@@ -41,6 +42,20 @@ const binaryCondition = (operator, numberDualTesting = false) => value => {
             ],
         };
     }
+    // @ts-ignore
+    if (passNumbers && !isNaN(numValue)) {
+        return {
+            conditionType: 'binary',
+            operator,
+            left: {
+                exprType: 'placeholder',
+            },
+            right: {
+                exprType: 'value',
+                value: numValue,
+            },
+        };
+    }
     return {
         conditionType: 'binary',
         operator,
@@ -381,17 +396,17 @@ const createParser = (filterBehaviour) => {
         null: () => (0, common_1.word)('NULL').map(unaryCondition('isNull')),
         isEmpty: r => r.empty.map(unaryCondition('isEmpty')),
         isNotEmpty: r => r.not.then(r.empty).map(unaryCondition('isNotEmpty')),
-        true: () => parsimmon_1.default.regexp(/true/i).map(binaryFixedValueCondition('1')),
-        false: () => parsimmon_1.default.regexp(/false/i).map(binaryFixedValueCondition('0')),
+        true: () => parsimmon_1.default.regexp(/true/i).map(binaryFixedValueCondition(filterBehaviour.passBooleans ? true : '1')),
+        false: () => parsimmon_1.default.regexp(/false/i).map(binaryFixedValueCondition(filterBehaviour.passBooleans ? false : '0')),
         trueNum: () => (0, common_1.word)('1').map(binaryFixedValueCondition('1')),
         falseNum: () => (0, common_1.word)('0').map(binaryFixedValueCondition('0')),
-        eq: r => (0, common_1.word)('=').then(r.value).map(binaryCondition('=', filterBehaviour.allowNumberDualTesting)),
-        ne: r => (0, common_1.word)('!=').then(r.value).map(binaryCondition('<>', filterBehaviour.allowNumberDualTesting)),
-        ne2: r => (0, common_1.word)('<>').then(r.value).map(binaryCondition('<>', filterBehaviour.allowNumberDualTesting)),
-        le: r => (0, common_1.word)('<=').then(r.value).map(binaryCondition('<=', filterBehaviour.allowNumberDualTesting)),
-        ge: r => (0, common_1.word)('>=').then(r.value).map(binaryCondition('>=', filterBehaviour.allowNumberDualTesting)),
-        lt: r => (0, common_1.word)('<').then(r.value).map(binaryCondition('<', filterBehaviour.allowNumberDualTesting)),
-        gt: r => (0, common_1.word)('>').then(r.value).map(binaryCondition('>', filterBehaviour.allowNumberDualTesting)),
+        eq: r => (0, common_1.word)('=').then(r.value).map(binaryCondition('=', filterBehaviour)),
+        ne: r => (0, common_1.word)('!=').then(r.value).map(binaryCondition('<>', filterBehaviour)),
+        ne2: r => (0, common_1.word)('<>').then(r.value).map(binaryCondition('<>', filterBehaviour)),
+        le: r => (0, common_1.word)('<=').then(r.value).map(binaryCondition('<=', filterBehaviour)),
+        ge: r => (0, common_1.word)('>=').then(r.value).map(binaryCondition('>=', filterBehaviour)),
+        lt: r => (0, common_1.word)('<').then(r.value).map(binaryCondition('<', filterBehaviour)),
+        gt: r => (0, common_1.word)('>').then(r.value).map(binaryCondition('>', filterBehaviour)),
         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#%')),
@@ -422,8 +437,11 @@ const createParser = (filterBehaviour) => {
     if (filterBehaviour.supportExistsTesting) {
         allowedElements.push('exists', 'notExists');
     }
-    if (filterBehaviour.supportArrayTesting) {
-        allowedElements.push('emptyArray', 'notEmptyArray');
+    if (filterBehaviour.supportEmptyArrayTesting) {
+        allowedElements.push('emptyArray');
+    }
+    if (filterBehaviour.supportNotEmptyArrayTesting) {
+        allowedElements.push('notEmptyArray');
     }
     if (filterBehaviour.supportNullTesting) {
         allowedElements.push('null', 'notNull');

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.5.6",
+  "version": "6.6.1",
   "name": "dbgate-filterparser",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -13,7 +13,7 @@
     "lib"
   ],
   "devDependencies": {
-    "dbgate-types": "^6.5.6",
+    "dbgate-types": "^6.6.1",
     "@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.5.6",
+    "dbgate-tools": "^6.6.1",
     "lodash": "^4.17.21",
     "date-fns": "^4.1.0",
     "moment": "^2.24.0",