dbgate-filterparser 4.3.0 → 4.4.0-alpha.1

package/lib/common.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.interpretEscapes = exports.word = exports.token = exports.whitespace = void 0;
 const parsimmon_1 = __importDefault(require("parsimmon"));
 exports.whitespace = parsimmon_1.default.regexp(/\s*/m);
 function token(parser) {

package/lib/filterTool.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMultiLineFilter = exports.getFilterValueExpression = void 0;
 const dbgate_tools_1 = require("dbgate-tools");
 const moment_1 = __importDefault(require("moment"));
 function getFilterValueExpression(value, dataType) {
     if (value == null)
         return 'NULL';
-    if (dbgate_tools_1.isTypeDateTime(dataType))
-        return moment_1.default(value).format('YYYY-MM-DD HH:mm:ss');
+    if ((0, dbgate_tools_1.isTypeDateTime)(dataType))
+        return (0, moment_1.default)(value).format('YYYY-MM-DD HH:mm:ss');
     return `="${value}"`;
 }
 exports.getFilterValueExpression = getFilterValueExpression;

package/lib/getFilterType.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFilterType = void 0;
 const dbgate_tools_1 = require("dbgate-tools");
 function getFilterType(dataType) {
     if (!dataType)
         return 'string';
-    if (dbgate_tools_1.isTypeNumber(dataType))
+    if ((0, dbgate_tools_1.isTypeNumber)(dataType))
         return 'number';
-    if (dbgate_tools_1.isTypeString(dataType))
+    if ((0, dbgate_tools_1.isTypeString)(dataType))
         return 'string';
-    if (dbgate_tools_1.isTypeLogical(dataType))
+    if ((0, dbgate_tools_1.isTypeLogical)(dataType))
         return 'logical';
-    if (dbgate_tools_1.isTypeDateTime(dataType))
+    if ((0, dbgate_tools_1.isTypeDateTime)(dataType))
         return 'datetime';
     return 'string';
 }

package/lib/index.js

@@ -1,8 +1,15 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./parseFilter"));
-__export(require("./getFilterType"));
-__export(require("./filterTool"));
+__exportStar(require("./parseFilter"), exports);
+__exportStar(require("./getFilterType"), exports);
+__exportStar(require("./filterTool"), exports);

package/lib/mongoParser.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mongoParser = void 0;
 const parsimmon_1 = __importDefault(require("parsimmon"));
 const common_1 = require("./common");
 const operatorCondition = operator => value => ({
@@ -61,39 +62,39 @@ const negateCondition = condition => ({
 });
 const createParser = () => {
     const langDef = {
-        string1: () => common_1.token(parsimmon_1.default.regexp(/"((?:\\.|.)*?)"/, 1))
+        string1: () => (0, common_1.token)(parsimmon_1.default.regexp(/"((?:\\.|.)*?)"/, 1))
             .map(common_1.interpretEscapes)
             .desc('string quoted'),
-        string2: () => common_1.token(parsimmon_1.default.regexp(/'((?:\\.|.)*?)'/, 1))
+        string2: () => (0, common_1.token)(parsimmon_1.default.regexp(/'((?:\\.|.)*?)'/, 1))
             .map(common_1.interpretEscapes)
             .desc('string quoted'),
-        number: () => common_1.token(parsimmon_1.default.regexp(/-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?/))
+        number: () => (0, common_1.token)(parsimmon_1.default.regexp(/-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?/))
             .map(Number)
             .desc('number'),
-        objectid: () => common_1.token(parsimmon_1.default.regexp(/[0-9a-f]{24}/)).desc('ObjectId'),
+        objectid: () => (0, common_1.token)(parsimmon_1.default.regexp(/[0-9a-f]{24}/)).desc('ObjectId'),
         noQuotedString: () => parsimmon_1.default.regexp(/[^\s^,^'^"]+/).desc('string unquoted'),
         value: r => parsimmon_1.default.alt(r.objectid, r.string1, r.string2, r.number, r.noQuotedString),
         valueTestObjectId: r => r.objectid.map(objectIdTestCondition()),
         valueTestNum: r => r.number.map(numberTestCondition()),
         valueTest: r => r.value.map(regexCondition('.*#VALUE#.*')),
-        comma: () => common_1.word(','),
-        not: () => common_1.word('NOT'),
+        comma: () => (0, common_1.word)(','),
+        not: () => (0, common_1.word)('NOT'),
         notExists: r => r.not.then(r.exists).map(testCondition('$exists', false)),
-        exists: () => common_1.word('EXISTS').map(testCondition('$exists', true)),
-        true: () => common_1.word('TRUE').map(testCondition('$eq', true)),
-        false: () => common_1.word('FALSE').map(testCondition('$eq', false)),
-        eq: r => common_1.word('=').then(r.value).map(operatorCondition('$eq')),
-        ne: r => common_1.word('!=').then(r.value).map(operatorCondition('$ne')),
-        lt: r => common_1.word('<').then(r.value).map(operatorCondition('$lt')),
-        gt: r => common_1.word('>').then(r.value).map(operatorCondition('$gt')),
-        le: r => common_1.word('<=').then(r.value).map(operatorCondition('$lte')),
-        ge: r => common_1.word('>=').then(r.value).map(operatorCondition('$gte')),
-        startsWith: r => common_1.word('^').then(r.value).map(regexCondition('#VALUE#.*')),
-        endsWith: r => common_1.word('$').then(r.value).map(regexCondition('.*#VALUE#')),
-        contains: r => common_1.word('+').then(r.value).map(regexCondition('.*#VALUE#.*')),
-        startsWithNot: r => common_1.word('!^').then(r.value).map(regexCondition('#VALUE#.*')).map(negateCondition),
-        endsWithNot: r => common_1.word('!$').then(r.value).map(regexCondition('.*#VALUE#')).map(negateCondition),
-        containsNot: r => common_1.word('~').then(r.value).map(regexCondition('.*#VALUE#.*')).map(negateCondition),
+        exists: () => (0, common_1.word)('EXISTS').map(testCondition('$exists', true)),
+        true: () => (0, common_1.word)('TRUE').map(testCondition('$eq', true)),
+        false: () => (0, common_1.word)('FALSE').map(testCondition('$eq', false)),
+        eq: r => (0, common_1.word)('=').then(r.value).map(operatorCondition('$eq')),
+        ne: r => (0, common_1.word)('!=').then(r.value).map(operatorCondition('$ne')),
+        lt: r => (0, common_1.word)('<').then(r.value).map(operatorCondition('$lt')),
+        gt: r => (0, common_1.word)('>').then(r.value).map(operatorCondition('$gt')),
+        le: r => (0, common_1.word)('<=').then(r.value).map(operatorCondition('$lte')),
+        ge: r => (0, common_1.word)('>=').then(r.value).map(operatorCondition('$gte')),
+        startsWith: r => (0, common_1.word)('^').then(r.value).map(regexCondition('#VALUE#.*')),
+        endsWith: r => (0, common_1.word)('$').then(r.value).map(regexCondition('.*#VALUE#')),
+        contains: r => (0, common_1.word)('+').then(r.value).map(regexCondition('.*#VALUE#.*')),
+        startsWithNot: r => (0, common_1.word)('!^').then(r.value).map(regexCondition('#VALUE#.*')).map(negateCondition),
+        endsWithNot: r => (0, common_1.word)('!$').then(r.value).map(regexCondition('.*#VALUE#')).map(negateCondition),
+        containsNot: r => (0, common_1.word)('~').then(r.value).map(regexCondition('.*#VALUE#.*')).map(negateCondition),
         element: r => parsimmon_1.default.alt(r.exists, r.notExists, r.true, r.false, r.eq, r.ne, r.lt, r.gt, r.le, r.ge, r.startsWith, r.endsWith, r.contains, r.startsWithNot, r.endsWithNot, r.containsNot, r.valueTestObjectId, r.valueTestNum, r.valueTest).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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFilter = void 0;
 const parsimmon_1 = __importDefault(require("parsimmon"));
 const moment_1 = __importDefault(require("moment"));
 const common_1 = require("./common");
@@ -134,7 +135,7 @@ const createDateIntervalCondition = (start, end) => {
     return createIntervalCondition(start.format('YYYY-MM-DDTHH:mm:ss.SSS'), end.format('YYYY-MM-DDTHH:mm:ss.SSS'));
 };
 const fixedMomentIntervalCondition = (intervalType, diff) => () => {
-    return createDateIntervalCondition(moment_1.default().add(intervalType, diff).startOf(intervalType), moment_1.default().add(intervalType, diff).endOf(intervalType));
+    return createDateIntervalCondition((0, moment_1.default)().add(intervalType, diff).startOf(intervalType), (0, moment_1.default)().add(intervalType, diff).endOf(intervalType));
 };
 const yearMonthDayMinuteCondition = () => value => {
     const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)\s+(\d\d?):(\d\d?)/);
@@ -144,7 +145,7 @@ const yearMonthDayMinuteCondition = () => value => {
     const hour = m[4];
     const minute = m[5];
     const dateObject = new Date(year, month - 1, day, hour, minute);
-    return createDateIntervalCondition(moment_1.default(dateObject).startOf('minute'), moment_1.default(dateObject).endOf('minute'));
+    return createDateIntervalCondition((0, moment_1.default)(dateObject).startOf('minute'), (0, moment_1.default)(dateObject).endOf('minute'));
 };
 const yearMonthDaySecondCondition = () => value => {
     const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)(T|\s+)(\d\d?):(\d\d?):(\d\d?)/);
@@ -155,23 +156,23 @@ const yearMonthDaySecondCondition = () => value => {
     const minute = m[6];
     const second = m[7];
     const dateObject = new Date(year, month - 1, day, hour, minute, second);
-    return createDateIntervalCondition(moment_1.default(dateObject).startOf('second'), moment_1.default(dateObject).endOf('second'));
+    return createDateIntervalCondition((0, moment_1.default)(dateObject).startOf('second'), (0, moment_1.default)(dateObject).endOf('second'));
 };
 const createParser = (filterType) => {
     const langDef = {
-        string1: () => common_1.token(parsimmon_1.default.regexp(/"((?:\\.|.)*?)"/, 1))
+        string1: () => (0, common_1.token)(parsimmon_1.default.regexp(/"((?:\\.|.)*?)"/, 1))
             .map(common_1.interpretEscapes)
             .desc('string quoted'),
-        string2: () => common_1.token(parsimmon_1.default.regexp(/'((?:\\.|.)*?)'/, 1))
+        string2: () => (0, common_1.token)(parsimmon_1.default.regexp(/'((?:\\.|.)*?)'/, 1))
             .map(common_1.interpretEscapes)
             .desc('string quoted'),
-        string1Num: () => common_1.token(parsimmon_1.default.regexp(/"-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?"/, 1))
+        string1Num: () => (0, common_1.token)(parsimmon_1.default.regexp(/"-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?"/, 1))
             .map(Number)
             .desc('numer quoted'),
-        string2Num: () => common_1.token(parsimmon_1.default.regexp(/'-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?'/, 1))
+        string2Num: () => (0, common_1.token)(parsimmon_1.default.regexp(/'-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?'/, 1))
             .map(Number)
             .desc('numer quoted'),
-        number: () => common_1.token(parsimmon_1.default.regexp(/-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?/))
+        number: () => (0, common_1.token)(parsimmon_1.default.regexp(/-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?/))
             .map(Number)
             .desc('number'),
         noQuotedString: () => parsimmon_1.default.regexp(/[^\s^,^'^"]+/).desc('string unquoted'),
@@ -183,25 +184,25 @@ const createParser = (filterType) => {
         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#%')),
-        comma: () => common_1.word(','),
-        not: () => common_1.word('NOT'),
+        comma: () => (0, common_1.word)(','),
+        not: () => (0, common_1.word)('NOT'),
         notNull: r => r.not.then(r.null).map(unaryCondition('isNotNull')),
-        null: () => common_1.word('NULL').map(unaryCondition('isNull')),
-        empty: () => common_1.word('EMPTY').map(unaryCondition('isEmpty')),
+        null: () => (0, common_1.word)('NULL').map(unaryCondition('isNull')),
+        empty: () => (0, common_1.word)('EMPTY').map(unaryCondition('isEmpty')),
         notEmpty: r => r.not.then(r.empty).map(unaryCondition('isNotEmpty')),
-        true: () => common_1.word('TRUE').map(binaryFixedValueCondition(1)),
-        false: () => common_1.word('FALSE').map(binaryFixedValueCondition(0)),
-        trueNum: () => common_1.word('1').map(binaryFixedValueCondition(1)),
-        falseNum: () => common_1.word('0').map(binaryFixedValueCondition(0)),
-        this: () => common_1.word('THIS'),
-        last: () => common_1.word('LAST'),
-        next: () => common_1.word('NEXT'),
-        week: () => common_1.word('WEEK'),
-        month: () => common_1.word('MONTH'),
-        year: () => common_1.word('YEAR'),
-        yesterday: () => common_1.word('YESTERDAY').map(fixedMomentIntervalCondition('day', -1)),
-        today: () => common_1.word('TODAY').map(fixedMomentIntervalCondition('day', 0)),
-        tomorrow: () => common_1.word('TOMORROW').map(fixedMomentIntervalCondition('day', 1)),
+        true: () => (0, common_1.word)('TRUE').map(binaryFixedValueCondition(1)),
+        false: () => (0, common_1.word)('FALSE').map(binaryFixedValueCondition(0)),
+        trueNum: () => (0, common_1.word)('1').map(binaryFixedValueCondition(1)),
+        falseNum: () => (0, common_1.word)('0').map(binaryFixedValueCondition(0)),
+        this: () => (0, common_1.word)('THIS'),
+        last: () => (0, common_1.word)('LAST'),
+        next: () => (0, common_1.word)('NEXT'),
+        week: () => (0, common_1.word)('WEEK'),
+        month: () => (0, common_1.word)('MONTH'),
+        year: () => (0, common_1.word)('YEAR'),
+        yesterday: () => (0, common_1.word)('YESTERDAY').map(fixedMomentIntervalCondition('day', -1)),
+        today: () => (0, common_1.word)('TODAY').map(fixedMomentIntervalCondition('day', 0)),
+        tomorrow: () => (0, common_1.word)('TOMORROW').map(fixedMomentIntervalCondition('day', 1)),
         lastWeek: r => r.last.then(r.week).map(fixedMomentIntervalCondition('week', -1)),
         thisWeek: r => r.this.then(r.week).map(fixedMomentIntervalCondition('week', 0)),
         nextWeek: r => r.next.then(r.week).map(fixedMomentIntervalCondition('week', 1)),
@@ -211,18 +212,18 @@ const createParser = (filterType) => {
         lastYear: r => r.last.then(r.year).map(fixedMomentIntervalCondition('year', -1)),
         thisYear: r => r.this.then(r.year).map(fixedMomentIntervalCondition('year', 0)),
         nextYear: r => r.next.then(r.year).map(fixedMomentIntervalCondition('year', 1)),
-        eq: r => common_1.word('=').then(r.value).map(binaryCondition('=')),
-        ne: r => common_1.word('!=').then(r.value).map(binaryCondition('<>')),
-        lt: r => common_1.word('<').then(r.value).map(binaryCondition('<')),
-        gt: r => common_1.word('>').then(r.value).map(binaryCondition('>')),
-        le: r => common_1.word('<=').then(r.value).map(binaryCondition('<=')),
-        ge: r => common_1.word('>=').then(r.value).map(binaryCondition('>=')),
-        startsWith: r => common_1.word('^').then(r.value).map(likeCondition('like', '#VALUE#%')),
-        endsWith: r => common_1.word('$').then(r.value).map(likeCondition('like', '%#VALUE#')),
-        contains: r => common_1.word('+').then(r.value).map(likeCondition('like', '%#VALUE#%')),
-        startsWithNot: r => common_1.word('!^').then(r.value).map(likeCondition('like', '#VALUE#%')).map(negateCondition),
-        endsWithNot: r => common_1.word('!$').then(r.value).map(likeCondition('like', '%#VALUE#')).map(negateCondition),
-        containsNot: r => common_1.word('~').then(r.value).map(likeCondition('like', '%#VALUE#%')).map(negateCondition),
+        eq: r => (0, common_1.word)('=').then(r.value).map(binaryCondition('=')),
+        ne: 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('>=')),
+        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#%')),
+        startsWithNot: r => (0, common_1.word)('!^').then(r.value).map(likeCondition('like', '#VALUE#%')).map(negateCondition),
+        endsWithNot: r => (0, common_1.word)('!$').then(r.value).map(likeCondition('like', '%#VALUE#')).map(negateCondition),
+        containsNot: r => (0, common_1.word)('~').then(r.value).map(likeCondition('like', '%#VALUE#%')).map(negateCondition),
         element: r => parsimmon_1.default.alt(...allowedElements.map(x => r[x])).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/parserFilter.test.js

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

package/package.json

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