dbgate-filterparser 5.0.8 → 5.1.1

package/lib/datetimeParser.js

@@ -154,9 +154,20 @@ const binaryCondition = operator => value => ({
         value,
     },
 });
+const unaryCondition = conditionType => () => {
+    return {
+        conditionType,
+        expr: {
+            exprType: 'placeholder',
+        },
+    };
+};
 const createParser = () => {
     const langDef = {
         comma: () => (0, common_1.word)(','),
+        not: () => (0, common_1.word)('NOT'),
+        notNull: r => r.not.then(r.null).map(unaryCondition('isNotNull')),
+        null: () => (0, common_1.word)('NULL').map(unaryCondition('isNull')),
         yearNum: () => parsimmon_1.default.regexp(/\d\d\d\d/).map(yearCondition()),
         yearMonthNum: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?/).map(yearMonthCondition()),
         yearMonthDayNum: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?/).map(yearMonthDayCondition()),
@@ -196,7 +207,7 @@ const createParser = () => {
         ge: r => (0, common_1.word)('>=').then(r.valueStart).map(binaryCondition('>=')),
         lt: r => (0, common_1.word)('<').then(r.valueStart).map(binaryCondition('<')),
         gt: r => (0, common_1.word)('>').then(r.valueEnd).map(binaryCondition('>')),
-        element: r => parsimmon_1.default.alt(r.yearMonthDaySecond, r.yearMonthDayMinute, r.yearMonthDayNum, r.yearMonthNum, r.yearNum, r.yesterday, r.today, r.tomorrow, r.lastWeek, r.thisWeek, r.nextWeek, r.lastMonth, r.thisMonth, r.nextMonth, r.lastYear, r.thisYear, r.nextYear, r.le, r.lt, r.ge, r.gt).trim(common_1.whitespace),
+        element: r => parsimmon_1.default.alt(r.yearMonthDaySecond, r.yearMonthDayMinute, r.yearMonthDayNum, r.yearMonthNum, r.yearNum, r.yesterday, r.today, r.tomorrow, r.lastWeek, r.thisWeek, r.nextWeek, r.lastMonth, r.thisMonth, r.nextMonth, r.lastYear, r.thisYear, r.nextYear, r.null, r.notNull, r.le, r.lt, r.ge, r.gt).trim(common_1.whitespace),
         factor: r => r.element.sepBy(common_1.whitespace).map(compoudCondition('$and')),
         list: r => r.factor.sepBy(r.comma).map(compoudCondition('$or')),
     };

package/lib/filterTool.d.ts

@@ -1,3 +1,3 @@
 export declare type FilterMultipleValuesMode = 'is' | 'is_not' | 'contains' | 'begins' | 'ends';
-export declare function getFilterValueExpression(value: any, dataType: any): string;
+export declare function getFilterValueExpression(value: any, dataType?: any): string;
 export declare function createMultiLineFilter(mode: FilterMultipleValuesMode, text: string): string;

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/parserFilter.test.d.ts

@@ -1 +1 @@
-export {};
+declare const parseFilter: any;

package/lib/parserFilter.test.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const parseFilter_1 = require("./parseFilter");
+const { parseFilter } = require('./parseFilter');
 test('parse string', () => {
-    const ast = (0, parseFilter_1.parseFilter)('"123"', 'string');
+    const ast = parseFilter('"123"', 'string');
     console.log(JSON.stringify(ast));
     expect(ast).toEqual({
         conditionType: 'like',

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.0.8",
+  "version": "5.1.1",
   "name": "dbgate-filterparser",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -13,16 +13,16 @@
     "lib"
   ],
   "devDependencies": {
-    "dbgate-types": "^5.0.8",
+    "dbgate-types": "^5.1.1",
     "@types/jest": "^25.1.4",
     "@types/node": "^13.7.0",
-    "jest": "^24.9.0",
-    "ts-jest": "^25.2.1",
+    "jest": "^28.1.3",
+    "ts-jest": "^28.0.7",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "@types/parsimmon": "^1.10.1",
-    "dbgate-tools": "^5.0.8",
+    "dbgate-tools": "^5.1.1",
     "lodash": "^4.17.21",
     "moment": "^2.24.0",
     "parsimmon": "^1.13.0"