dbgate-filterparser 5.2.1 → 5.2.2-alpha.11

package/lib/filterTool.js

@@ -17,6 +17,9 @@ function getFilterValueExpression(value, dataType) {
         return 'FALSE';
     if (value.$oid)
         return `ObjectId("${value.$oid}")`;
+    if (value.type == 'Buffer' && Array.isArray(value.data)) {
+        return '0x' + (0, dbgate_tools_1.arrayToHexString)(value.data);
+    }
     return `="${value}"`;
 }
 exports.getFilterValueExpression = getFilterValueExpression;

package/lib/parseFilter.js

@@ -8,6 +8,7 @@ const parsimmon_1 = __importDefault(require("parsimmon"));
 const common_1 = require("./common");
 const mongoParser_1 = require("./mongoParser");
 const datetimeParser_1 = require("./datetimeParser");
+const dbgate_tools_1 = require("dbgate-tools");
 const binaryCondition = operator => value => ({
     conditionType: 'binary',
     operator,
@@ -90,12 +91,19 @@ const createParser = (filterType) => {
         number: () => (0, common_1.token)(parsimmon_1.default.regexp(/-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?/))
             .map(Number)
             .desc('number'),
+        hexstring: () => (0, common_1.token)(parsimmon_1.default.regexp(/0x(([0-9a-fA-F][0-9a-fA-F])+)/, 1))
+            .map(x => ({
+            type: 'Buffer',
+            data: (0, dbgate_tools_1.hexStringToArray)(x),
+        }))
+            .desc('hex string'),
         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('=')),
+        hexTestEq: r => r.hexstring.map(binaryCondition('=')),
         valueTestStr: r => r.value.map(likeCondition('like', '%#VALUE#%')),
         comma: () => (0, common_1.word)(','),
         not: () => (0, common_1.word)('NOT'),
@@ -136,7 +144,7 @@ const createParser = (filterType) => {
         allowedElements.push('le', 'ge', 'lt', 'gt');
     }
     if (filterType == 'string') {
-        allowedElements.push('empty', 'notEmpty');
+        allowedElements.push('empty', 'notEmpty', 'hexTestEq');
     }
     if (filterType == 'eval' || filterType == 'string') {
         allowedElements.push('startsWith', 'endsWith', 'contains', 'startsWithNot', 'endsWithNot', 'containsNot');

package/package.json

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