dbgate-filterparser 5.1.0 → 5.1.2

package/lib/datetimeParser.js

@@ -154,9 +154,32 @@ const binaryCondition = operator => value => ({
         value,
     },
 });
+const unaryCondition = conditionType => () => {
+    return {
+        conditionType,
+        expr: {
+            exprType: 'placeholder',
+        },
+    };
+};
+const sqlTemplate = templateSql => {
+    return {
+        conditionType: 'rawTemplate',
+        templateSql,
+        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')),
+        sql: () => (0, common_1.token)(parsimmon_1.default.regexp(/\{(.*?)\}/, 1))
+            .map(sqlTemplate)
+            .desc('sql literal'),
         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 +219,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, r.sql).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/parseFilter.js

@@ -64,6 +64,15 @@ const negateCondition = condition => {
         condition,
     };
 };
+const sqlTemplate = templateSql => {
+    return {
+        conditionType: 'rawTemplate',
+        templateSql,
+        expr: {
+            exprType: 'placeholder',
+        },
+    };
+};
 const createParser = (filterType) => {
     const langDef = {
         string1: () => (0, common_1.token)(parsimmon_1.default.regexp(/"((?:\\.|.)*?)"/, 1))
@@ -82,6 +91,9 @@ const createParser = (filterType) => {
             .map(Number)
             .desc('number'),
         noQuotedString: () => parsimmon_1.default.regexp(/[^\s^,^'^"]+/).desc('string unquoted'),
+        sql: () => (0, common_1.token)(parsimmon_1.default.regexp(/\{(.*?)\}/, 1))
+            .map(sqlTemplate)
+            .desc('sql literal'),
         value: r => parsimmon_1.default.alt(...allowedValues.map(x => r[x])),
         valueTestEq: r => r.value.map(binaryCondition('=')),
         valueTestStr: r => r.value.map(likeCondition('like', '%#VALUE#%')),
@@ -119,7 +131,7 @@ const createParser = (filterType) => {
     if (filterType == 'number') {
         allowedValues.push('string1Num', 'string2Num', 'number');
     }
-    const allowedElements = ['null', 'notNull', 'eq', 'ne', 'ne2'];
+    const allowedElements = ['null', 'notNull', 'eq', 'ne', 'ne2', 'sql'];
     if (filterType == 'number' || filterType == 'datetime' || filterType == 'eval') {
         allowedElements.push('le', 'ge', 'lt', 'gt');
     }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.1.0",
+  "version": "5.1.2",
   "name": "dbgate-filterparser",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -13,7 +13,7 @@
     "lib"
   ],
   "devDependencies": {
-    "dbgate-types": "^5.1.0",
+    "dbgate-types": "^5.1.2",
     "@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": "^5.1.0",
+    "dbgate-tools": "^5.1.2",
     "lodash": "^4.17.21",
     "moment": "^2.24.0",
     "parsimmon": "^1.13.0"