dbgate-filterparser 5.3.3 → 5.4.0

package/lib/index.d.ts

@@ -1,3 +1,2 @@
 export * from './parseFilter';
-export * from './getFilterType';
 export * from './filterTool';

package/lib/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./parseFilter"), exports);
-__exportStar(require("./getFilterType"), exports);
 __exportStar(require("./filterTool"), exports);

package/lib/parseFilter.d.ts

@@ -1,3 +1,3 @@
-import { FilterType } from './types';
 import { Condition } from 'dbgate-sqltree';
-export declare function parseFilter(value: string, filterType: FilterType): Condition;
+import { FilterBehaviour } from 'dbgate-types';
+export declare function parseFilter(value: string, filterBehaviour: FilterBehaviour): Condition;

package/lib/parseFilter.js

@@ -5,21 +5,52 @@ var __importDefault = (this && this.__importDefault) || function (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");
-const mongoParser_1 = require("./mongoParser");
-const datetimeParser_1 = require("./datetimeParser");
 const dbgate_tools_1 = require("dbgate-tools");
-const binaryCondition = operator => value => ({
-    conditionType: 'binary',
-    operator,
-    left: {
-        exprType: 'placeholder',
-    },
-    right: {
-        exprType: 'value',
-        value,
-    },
-});
+const binaryCondition = (operator, numberDualTesting = false) => value => {
+    const numValue = parseFloat(value);
+    if (numberDualTesting && !isNaN(numValue)) {
+        return {
+            conditionType: 'or',
+            conditions: [
+                {
+                    conditionType: 'binary',
+                    operator,
+                    left: {
+                        exprType: 'placeholder',
+                    },
+                    right: {
+                        exprType: 'value',
+                        value,
+                    },
+                },
+                {
+                    conditionType: 'binary',
+                    operator,
+                    left: {
+                        exprType: 'placeholder',
+                    },
+                    right: {
+                        exprType: 'value',
+                        value: numValue,
+                    },
+                },
+            ],
+        };
+    }
+    return {
+        conditionType: 'binary',
+        operator,
+        left: {
+            exprType: 'placeholder',
+        },
+        right: {
+            exprType: 'value',
+            value,
+        },
+    };
+};
 const likeCondition = (conditionType, likeString) => value => ({
     conditionType,
     left: {
@@ -65,6 +96,53 @@ const negateCondition = condition => {
         condition,
     };
 };
+const numberTestCondition = () => value => {
+    return {
+        conditionType: 'or',
+        conditions: [
+            {
+                conditionType: 'like',
+                left: {
+                    exprType: 'placeholder',
+                },
+                right: {
+                    exprType: 'value',
+                    value: `.*${value}.*`,
+                },
+            },
+            {
+                conditionType: 'binary',
+                operator: '=',
+                left: {
+                    exprType: 'placeholder',
+                },
+                right: {
+                    exprType: 'value',
+                    value,
+                },
+            },
+        ],
+    };
+};
+const idRegex = /[('"]([0-9a-f]{24})['")]/;
+const objectIdTestCondition = () => value => ({
+    conditionType: 'binary',
+    operator: '=',
+    left: {
+        exprType: 'placeholder',
+    },
+    right: {
+        exprType: 'value',
+        value: { $oid: value.match(idRegex)[1] },
+    },
+});
+const specificPredicateCondition = predicate => () => ({
+    conditionType: 'specificPredicate',
+    predicate,
+    expr: {
+        exprType: 'placeholder',
+    },
+});
 const sqlTemplate = templateSql => {
     return {
         conditionType: 'rawTemplate',
@@ -74,7 +152,136 @@ const sqlTemplate = templateSql => {
         },
     };
 };
-const createParser = (filterType) => {
+function getTransformCondition(transform, value) {
+    return {
+        conditionType: 'binary',
+        operator: '=',
+        left: {
+            exprType: 'transform',
+            transform,
+            expr: {
+                exprType: 'placeholder',
+            },
+        },
+        right: {
+            exprType: 'value',
+            value,
+        },
+    };
+}
+const yearCondition = () => value => {
+    return getTransformCondition('YEAR', value);
+};
+const yearMonthCondition = () => value => {
+    const m = value.match(/(\d\d\d\d)-(\d\d?)/);
+    return {
+        conditionType: 'and',
+        conditions: [getTransformCondition('YEAR', m[1]), getTransformCondition('MONTH', m[2])],
+    };
+};
+const yearMonthDayCondition = () => value => {
+    const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)/);
+    return {
+        conditionType: 'and',
+        conditions: [
+            getTransformCondition('YEAR', m[1]),
+            getTransformCondition('MONTH', m[2]),
+            getTransformCondition('DAY', m[3]),
+        ],
+    };
+};
+const yearEdge = edgeFunction => value => {
+    return (0, moment_1.default)(new Date(parseInt(value), 0, 1))[edgeFunction]('year')
+        .format('YYYY-MM-DDTHH:mm:ss.SSS');
+};
+const yearMonthEdge = edgeFunction => value => {
+    const m = value.match(/(\d\d\d\d)-(\d\d?)/);
+    return (0, moment_1.default)(new Date(parseInt(m[1]), parseInt(m[2]) - 1, 1))[edgeFunction]('month')
+        .format('YYYY-MM-DDTHH:mm:ss.SSS');
+};
+const yearMonthDayEdge = edgeFunction => value => {
+    const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)/);
+    return (0, moment_1.default)(new Date(parseInt(m[1]), parseInt(m[2]) - 1, parseInt(m[3])))[edgeFunction]('day')
+        .format('YYYY-MM-DDTHH:mm:ss.SSS');
+};
+const yearMonthDayMinuteEdge = edgeFunction => value => {
+    const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)\s+(\d\d?):(\d\d?)/);
+    const year = m[1];
+    const month = m[2];
+    const day = m[3];
+    const hour = m[4];
+    const minute = m[5];
+    const dateObject = new Date(year, month - 1, day, hour, minute);
+    return (0, moment_1.default)(dateObject)[edgeFunction]('minute').format('YYYY-MM-DDTHH:mm:ss.SSS');
+};
+const yearMonthDayMinuteSecondEdge = edgeFunction => value => {
+    const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)(T|\s+)(\d\d?):(\d\d?):(\d\d?)/);
+    const year = m[1];
+    const month = m[2];
+    const day = m[3];
+    const hour = m[5];
+    const minute = m[6];
+    const second = m[7];
+    const dateObject = new Date(year, month - 1, day, hour, minute, second);
+    return (0, moment_1.default)(dateObject)[edgeFunction]('second').format('YYYY-MM-DDTHH:mm:ss.SSS');
+};
+const createIntervalCondition = (start, end) => {
+    return {
+        conditionType: 'and',
+        conditions: [
+            {
+                conditionType: 'binary',
+                operator: '>=',
+                left: {
+                    exprType: 'placeholder',
+                },
+                right: {
+                    exprType: 'value',
+                    value: start,
+                },
+            },
+            {
+                conditionType: 'binary',
+                operator: '<=',
+                left: {
+                    exprType: 'placeholder',
+                },
+                right: {
+                    exprType: 'value',
+                    value: end,
+                },
+            },
+        ],
+    };
+};
+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((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?)/);
+    const year = m[1];
+    const month = m[2];
+    const day = m[3];
+    const hour = m[4];
+    const minute = m[5];
+    const dateObject = new Date(year, month - 1, day, hour, 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?)/);
+    const year = m[1];
+    const month = m[2];
+    const day = m[3];
+    const hour = m[5];
+    const minute = m[6];
+    const second = m[7];
+    const dateObject = new Date(year, month - 1, day, hour, minute, second);
+    return createDateIntervalCondition((0, moment_1.default)(dateObject).startOf('second'), (0, moment_1.default)(dateObject).endOf('second'));
+};
+const createParser = (filterBehaviour) => {
     const langDef = {
         string1: () => (0, common_1.token)(parsimmon_1.default.regexp(/"((?:\\.|.)*?)"/, 1))
             .map(common_1.interpretEscapes)
@@ -91,6 +298,7 @@ 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'),
+        objectid: () => (0, common_1.token)(parsimmon_1.default.regexp(/ObjectId\(['"]?[0-9a-f]{24}['"]?\)/)).desc('ObjectId'),
         hexstring: () => (0, common_1.token)(parsimmon_1.default.regexp(/0x(([0-9a-fA-F][0-9a-fA-F])+)/, 1))
             .map(x => ({
             type: 'Buffer',
@@ -105,23 +313,70 @@ const createParser = (filterType) => {
         valueTestEq: r => r.value.map(binaryCondition('=')),
         hexTestEq: r => r.hexstring.map(binaryCondition('=')),
         valueTestStr: r => r.value.map(likeCondition('like', '%#VALUE#%')),
+        valueTestNum: r => r.number.map(numberTestCondition()),
+        valueTestObjectId: r => r.objectid.map(objectIdTestCondition()),
+        notExists: r => r.not.then(r.exists).map(specificPredicateCondition('notExists')),
+        notEmptyArray: r => r.not.then(r.empty).then(r.array).map(specificPredicateCondition('notEmptyArray')),
+        emptyArray: r => r.empty.then(r.array).map(specificPredicateCondition('emptyArray')),
+        exists: () => (0, common_1.word)('EXISTS').map(specificPredicateCondition('exists')),
+        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)),
+        lastMonth: r => r.last.then(r.month).map(fixedMomentIntervalCondition('month', -1)),
+        thisMonth: r => r.this.then(r.month).map(fixedMomentIntervalCondition('month', 0)),
+        nextMonth: r => r.next.then(r.month).map(fixedMomentIntervalCondition('month', 1)),
+        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)),
+        dateValueStart: r => parsimmon_1.default.alt(r.yearMonthDayMinuteSecondStart, r.yearMonthDayMinuteStart, r.yearMonthDayStart, r.yearMonthStart, r.yearNumStart),
+        dateValueEnd: r => parsimmon_1.default.alt(r.yearMonthDayMinuteSecondEnd, r.yearMonthDayMinuteEnd, r.yearMonthDayEnd, r.yearMonthEnd, r.yearNumEnd),
+        dateLe: r => (0, common_1.word)('<=').then(r.dateValueEnd).map(binaryCondition('<=')),
+        dateGe: r => (0, common_1.word)('>=').then(r.dateValueStart).map(binaryCondition('>=')),
+        dateLt: r => (0, common_1.word)('<').then(r.dateValueStart).map(binaryCondition('<')),
+        dateGt: r => (0, common_1.word)('>').then(r.dateValueEnd).map(binaryCondition('>')),
+        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()),
+        yearMonthDayMinute: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?\s+\d\d?:\d\d?/).map(yearMonthDayMinuteCondition()),
+        yearMonthDaySecond: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?(\s+|T)\d\d?:\d\d?:\d\d?/).map(yearMonthDaySecondCondition()),
+        yearNumStart: () => parsimmon_1.default.regexp(/\d\d\d\d/).map(yearEdge('startOf')),
+        yearNumEnd: () => parsimmon_1.default.regexp(/\d\d\d\d/).map(yearEdge('endOf')),
+        yearMonthStart: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?/).map(yearMonthEdge('startOf')),
+        yearMonthEnd: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?/).map(yearMonthEdge('endOf')),
+        yearMonthDayStart: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?/).map(yearMonthDayEdge('startOf')),
+        yearMonthDayEnd: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?/).map(yearMonthDayEdge('endOf')),
+        yearMonthDayMinuteStart: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?\s+\d\d?:\d\d?/).map(yearMonthDayMinuteEdge('startOf')),
+        yearMonthDayMinuteEnd: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?\s+\d\d?:\d\d?/).map(yearMonthDayMinuteEdge('endOf')),
+        yearMonthDayMinuteSecondStart: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?(\s+|T)\d\d?:\d\d?:\d\d?/).map(yearMonthDayMinuteSecondEdge('startOf')),
+        yearMonthDayMinuteSecondEnd: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?(\s+|T)\d\d?:\d\d?:\d\d?/).map(yearMonthDayMinuteSecondEdge('endOf')),
         comma: () => (0, common_1.word)(','),
         not: () => (0, common_1.word)('NOT'),
+        empty: () => (0, common_1.word)('EMPTY'),
+        array: () => (0, common_1.word)('ARRAY'),
         notNull: r => r.not.then(r.null).map(unaryCondition('isNotNull')),
         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')),
+        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')),
         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('=')),
-        ne: r => (0, common_1.word)('!=').then(r.value).map(binaryCondition('<>')),
-        ne2: 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('>=')),
-        lt: r => (0, common_1.word)('<').then(r.value).map(binaryCondition('<')),
-        gt: r => (0, common_1.word)('>').then(r.value).map(binaryCondition('>')),
+        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)),
         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#%')),
@@ -133,30 +388,65 @@ const createParser = (filterType) => {
         list: r => r.factor.sepBy(r.comma).map(compoudCondition('or')),
     };
     const allowedValues = []; // 'string1', 'string2', 'number', 'noQuotedString'];
-    if (filterType == 'string' || filterType == 'eval') {
+    if (filterBehaviour.allowStringToken) {
         allowedValues.push('string1', 'string2', 'noQuotedString');
     }
-    if (filterType == 'number') {
+    if (filterBehaviour.allowNumberToken) {
         allowedValues.push('string1Num', 'string2Num', 'number');
     }
-    const allowedElements = ['null', 'notNull', 'eq', 'ne', 'ne2', 'sql'];
-    if (filterType == 'number' || filterType == 'datetime' || filterType == 'eval') {
+    const allowedElements = [];
+    if (filterBehaviour.supportDatetimeComparison) {
+        allowedElements.push('yearMonthDaySecond', 'yearMonthDayMinute', 'yearMonthDayNum', 'yearMonthNum', 'yearNum');
+    }
+    if (filterBehaviour.supportDatetimeSymbols) {
+        allowedElements.push('today', 'tomorrow', 'lastWeek', 'thisWeek', 'nextWeek', 'lastMonth', 'thisMonth', 'nextMonth', 'lastYear', 'thisYear', 'nextYear');
+    }
+    if (filterBehaviour.supportDatetimeComparison) {
+        allowedElements.push('dateLe', 'dateGe', 'dateLt', 'dateGt');
+    }
+    if (filterBehaviour.supportExistsTesting) {
+        allowedElements.push('exists', 'notExists');
+    }
+    if (filterBehaviour.supportArrayTesting) {
+        allowedElements.push('emptyArray', 'notEmptyArray');
+    }
+    if (filterBehaviour.supportNullTesting) {
+        allowedElements.push('null', 'notNull');
+    }
+    if (filterBehaviour.supportEquals) {
+        allowedElements.push('eq', 'ne', 'ne2');
+    }
+    if (filterBehaviour.supportSqlCondition) {
+        allowedElements.push('sql');
+    }
+    if (filterBehaviour.supportNumberLikeComparison || filterBehaviour.supportDatetimeComparison) {
         allowedElements.push('le', 'ge', 'lt', 'gt');
     }
-    if (filterType == 'string') {
-        allowedElements.push('empty', 'notEmpty', 'hexTestEq');
+    if (filterBehaviour.supportEmpty) {
+        allowedElements.push('isEmpty', 'isNotEmpty');
     }
-    if (filterType == 'eval' || filterType == 'string') {
+    if (filterBehaviour.allowHexString) {
+        allowedElements.push('hexTestEq');
+    }
+    if (filterBehaviour.supportStringInclusion) {
         allowedElements.push('startsWith', 'endsWith', 'contains', 'startsWithNot', 'endsWithNot', 'containsNot');
     }
-    if (filterType == 'logical') {
-        allowedElements.push('true', 'false', 'trueNum', 'falseNum');
+    if (filterBehaviour.supportBooleanValues) {
+        if (filterBehaviour.allowNumberToken || filterBehaviour.allowStringToken) {
+            allowedElements.push('true', 'false');
+        }
+        else {
+            allowedElements.push('true', 'false', 'trueNum', 'falseNum');
+        }
+    }
+    if (filterBehaviour.allowNumberDualTesting) {
+        allowedElements.push('valueTestNum');
     }
-    if (filterType == 'eval') {
-        allowedElements.push('true', 'false');
+    if (filterBehaviour.allowObjectIdTesting) {
+        allowedElements.push('valueTestObjectId');
     }
     // must be last
-    if (filterType == 'string' || filterType == 'eval') {
+    if (filterBehaviour.allowStringToken) {
         allowedElements.push('valueTestStr');
     }
     else {
@@ -164,17 +454,19 @@ const createParser = (filterType) => {
     }
     return parsimmon_1.default.createLanguage(langDef);
 };
-const parsers = {
-    number: createParser('number'),
-    string: createParser('string'),
-    logical: createParser('logical'),
-    eval: createParser('eval'),
-    mongo: mongoParser_1.mongoParser,
-    datetime: datetimeParser_1.datetimeParser,
-};
-function parseFilter(value, filterType) {
-    // console.log('PARSING', value, 'WITH', filterType);
-    const ast = parsers[filterType].list.tryParse(value);
+const cachedFilters = {};
+function getParser(filterBehaviour) {
+    const key = JSON.stringify(filterBehaviour);
+    if (!cachedFilters[key]) {
+        cachedFilters[key] = createParser(filterBehaviour);
+    }
+    return cachedFilters[key];
+}
+function parseFilter(value, filterBehaviour) {
+    const parser = getParser(filterBehaviour);
+    // console.log('value', value);
+    // console.log('filterBehaviour', filterBehaviour);
+    const ast = parser.list.tryParse(value);
     // console.log('AST', ast);
     return ast;
 }

package/lib/parserFilter.test.d.ts

@@ -1 +1,2 @@
 declare const parseFilter: any;
+declare const stringFilterBehaviour: any;

package/lib/parserFilter.test.js

@@ -1,6 +1,7 @@
 const { parseFilter } = require('./parseFilter');
+const { stringFilterBehaviour } = require('dbgate-tools');
 test('parse string', () => {
-    const ast = parseFilter('"123"', 'string');
+    const ast = parseFilter('"123"', stringFilterBehaviour);
     console.log(JSON.stringify(ast));
     expect(ast).toEqual({
         conditionType: 'like',

package/package.json

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

package/lib/datetimeParser.d.ts

@@ -1,2 +0,0 @@
-import P from 'parsimmon';
-export declare const datetimeParser: P.Language;

package/lib/datetimeParser.js

@@ -1,228 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.datetimeParser = void 0;
-const parsimmon_1 = __importDefault(require("parsimmon"));
-const moment_1 = __importDefault(require("moment"));
-const common_1 = require("./common");
-const compoudCondition = conditionType => conditions => {
-    if (conditions.length == 1)
-        return conditions[0];
-    return {
-        [conditionType]: conditions,
-    };
-};
-function getTransformCondition(transform, value) {
-    return {
-        conditionType: 'binary',
-        operator: '=',
-        left: {
-            exprType: 'transform',
-            transform,
-            expr: {
-                exprType: 'placeholder',
-            },
-        },
-        right: {
-            exprType: 'value',
-            value,
-        },
-    };
-}
-const yearCondition = () => value => {
-    return getTransformCondition('YEAR', value);
-};
-const yearMonthCondition = () => value => {
-    const m = value.match(/(\d\d\d\d)-(\d\d?)/);
-    return {
-        conditionType: 'and',
-        conditions: [getTransformCondition('YEAR', m[1]), getTransformCondition('MONTH', m[2])],
-    };
-};
-const yearMonthDayCondition = () => value => {
-    const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)/);
-    return {
-        conditionType: 'and',
-        conditions: [
-            getTransformCondition('YEAR', m[1]),
-            getTransformCondition('MONTH', m[2]),
-            getTransformCondition('DAY', m[3]),
-        ],
-    };
-};
-const yearEdge = edgeFunction => value => {
-    return (0, moment_1.default)(new Date(parseInt(value), 0, 1))[edgeFunction]('year')
-        .format('YYYY-MM-DDTHH:mm:ss.SSS');
-};
-const yearMonthEdge = edgeFunction => value => {
-    const m = value.match(/(\d\d\d\d)-(\d\d?)/);
-    return (0, moment_1.default)(new Date(parseInt(m[1]), parseInt(m[2]) - 1, 1))[edgeFunction]('month')
-        .format('YYYY-MM-DDTHH:mm:ss.SSS');
-};
-const yearMonthDayEdge = edgeFunction => value => {
-    const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)/);
-    return (0, moment_1.default)(new Date(parseInt(m[1]), parseInt(m[2]) - 1, parseInt(m[3])))[edgeFunction]('day')
-        .format('YYYY-MM-DDTHH:mm:ss.SSS');
-};
-const yearMonthDayMinuteEdge = edgeFunction => value => {
-    const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)\s+(\d\d?):(\d\d?)/);
-    const year = m[1];
-    const month = m[2];
-    const day = m[3];
-    const hour = m[4];
-    const minute = m[5];
-    const dateObject = new Date(year, month - 1, day, hour, minute);
-    return (0, moment_1.default)(dateObject)[edgeFunction]('minute').format('YYYY-MM-DDTHH:mm:ss.SSS');
-};
-const yearMonthDayMinuteSecondEdge = edgeFunction => value => {
-    const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)(T|\s+)(\d\d?):(\d\d?):(\d\d?)/);
-    const year = m[1];
-    const month = m[2];
-    const day = m[3];
-    const hour = m[5];
-    const minute = m[6];
-    const second = m[7];
-    const dateObject = new Date(year, month - 1, day, hour, minute, second);
-    return (0, moment_1.default)(dateObject)[edgeFunction]('second').format('YYYY-MM-DDTHH:mm:ss.SSS');
-};
-const createIntervalCondition = (start, end) => {
-    return {
-        conditionType: 'and',
-        conditions: [
-            {
-                conditionType: 'binary',
-                operator: '>=',
-                left: {
-                    exprType: 'placeholder',
-                },
-                right: {
-                    exprType: 'value',
-                    value: start,
-                },
-            },
-            {
-                conditionType: 'binary',
-                operator: '<=',
-                left: {
-                    exprType: 'placeholder',
-                },
-                right: {
-                    exprType: 'value',
-                    value: end,
-                },
-            },
-        ],
-    };
-};
-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((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?)/);
-    const year = m[1];
-    const month = m[2];
-    const day = m[3];
-    const hour = m[4];
-    const minute = m[5];
-    const dateObject = new Date(year, month - 1, day, hour, 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?)/);
-    const year = m[1];
-    const month = m[2];
-    const day = m[3];
-    const hour = m[5];
-    const minute = m[6];
-    const second = m[7];
-    const dateObject = new Date(year, month - 1, day, hour, minute, second);
-    return createDateIntervalCondition((0, moment_1.default)(dateObject).startOf('second'), (0, moment_1.default)(dateObject).endOf('second'));
-};
-const binaryCondition = operator => value => ({
-    conditionType: 'binary',
-    operator,
-    left: {
-        exprType: 'placeholder',
-    },
-    right: {
-        exprType: '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()),
-        yearMonthDayMinute: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?\s+\d\d?:\d\d?/).map(yearMonthDayMinuteCondition()),
-        yearMonthDaySecond: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?(\s+|T)\d\d?:\d\d?:\d\d?/).map(yearMonthDaySecondCondition()),
-        yearNumStart: () => parsimmon_1.default.regexp(/\d\d\d\d/).map(yearEdge('startOf')),
-        yearNumEnd: () => parsimmon_1.default.regexp(/\d\d\d\d/).map(yearEdge('endOf')),
-        yearMonthStart: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?/).map(yearMonthEdge('startOf')),
-        yearMonthEnd: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?/).map(yearMonthEdge('endOf')),
-        yearMonthDayStart: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?/).map(yearMonthDayEdge('startOf')),
-        yearMonthDayEnd: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?/).map(yearMonthDayEdge('endOf')),
-        yearMonthDayMinuteStart: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?\s+\d\d?:\d\d?/).map(yearMonthDayMinuteEdge('startOf')),
-        yearMonthDayMinuteEnd: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?\s+\d\d?:\d\d?/).map(yearMonthDayMinuteEdge('endOf')),
-        yearMonthDayMinuteSecondStart: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?(\s+|T)\d\d?:\d\d?:\d\d?/).map(yearMonthDayMinuteSecondEdge('startOf')),
-        yearMonthDayMinuteSecondEnd: () => parsimmon_1.default.regexp(/\d\d\d\d-\d\d?-\d\d?(\s+|T)\d\d?:\d\d?:\d\d?/).map(yearMonthDayMinuteSecondEdge('endOf')),
-        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)),
-        lastMonth: r => r.last.then(r.month).map(fixedMomentIntervalCondition('month', -1)),
-        thisMonth: r => r.this.then(r.month).map(fixedMomentIntervalCondition('month', 0)),
-        nextMonth: r => r.next.then(r.month).map(fixedMomentIntervalCondition('month', 1)),
-        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)),
-        valueStart: r => parsimmon_1.default.alt(r.yearMonthDayMinuteSecondStart, r.yearMonthDayMinuteStart, r.yearMonthDayStart, r.yearMonthStart, r.yearNumStart),
-        valueEnd: r => parsimmon_1.default.alt(r.yearMonthDayMinuteSecondEnd, r.yearMonthDayMinuteEnd, r.yearMonthDayEnd, r.yearMonthEnd, r.yearNumEnd),
-        le: r => (0, common_1.word)('<=').then(r.valueEnd).map(binaryCondition('<=')),
-        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.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')),
-    };
-    return parsimmon_1.default.createLanguage(langDef);
-};
-exports.datetimeParser = createParser();

package/lib/getFilterType.d.ts

@@ -1,2 +0,0 @@
-import { FilterType } from './types';
-export declare function getFilterType(dataType: string): FilterType;

package/lib/getFilterType.js

@@ -1,18 +0,0 @@
-"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 ((0, dbgate_tools_1.isTypeNumber)(dataType))
-        return 'number';
-    if ((0, dbgate_tools_1.isTypeString)(dataType))
-        return 'string';
-    if ((0, dbgate_tools_1.isTypeLogical)(dataType))
-        return 'logical';
-    if ((0, dbgate_tools_1.isTypeDateTime)(dataType))
-        return 'datetime';
-    return 'string';
-}
-exports.getFilterType = getFilterType;

package/lib/mongoParser.d.ts

@@ -1,2 +0,0 @@
-import P from 'parsimmon';
-export declare const mongoParser: P.Language;

package/lib/mongoParser.js

@@ -1,110 +0,0 @@
-"use strict";
-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 => ({
-    __placeholder__: {
-        [operator]: value,
-    },
-});
-const regexCondition = regexString => value => ({
-    __placeholder__: {
-        $regex: regexString.replace('#VALUE#', value),
-        $options: 'i',
-    },
-});
-const numberTestCondition = () => value => ({
-    $or: [
-        {
-            __placeholder__: {
-                $regex: `.*${value}.*`,
-                $options: 'i',
-            },
-        },
-        {
-            __placeholder__: value,
-        },
-    ],
-});
-const idRegex = /[('"]([0-9a-f]{24})['")]/;
-const objectIdTestCondition = () => value => ({
-    $or: [
-        {
-            __placeholder__: { $oid: value.match(idRegex)[1] },
-        },
-    ],
-});
-const testCondition = (operator, value) => () => ({
-    __placeholder__: {
-        [operator]: value,
-    },
-});
-const multiTestCondition = condition => () => ({
-    __placeholder__: condition,
-});
-const compoudCondition = conditionType => conditions => {
-    if (conditions.length == 1)
-        return conditions[0];
-    return {
-        [conditionType]: conditions,
-    };
-};
-const negateCondition = condition => ({
-    __placeholder__: {
-        $not: condition.__placeholder__,
-    },
-});
-const createParser = () => {
-    const langDef = {
-        string1: () => (0, common_1.token)(parsimmon_1.default.regexp(/"((?:\\.|.)*?)"/, 1))
-            .map(common_1.interpretEscapes)
-            .desc('string quoted'),
-        string2: () => (0, common_1.token)(parsimmon_1.default.regexp(/'((?:\\.|.)*?)'/, 1))
-            .map(common_1.interpretEscapes)
-            .desc('string quoted'),
-        number: () => (0, common_1.token)(parsimmon_1.default.regexp(/-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?/))
-            .map(Number)
-            .desc('number'),
-        objectid: () => (0, common_1.token)(parsimmon_1.default.regexp(/ObjectId\(['"]?[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: () => (0, common_1.word)(','),
-        not: () => (0, common_1.word)('NOT'),
-        empty: () => (0, common_1.word)('EMPTY'),
-        array: () => (0, common_1.word)('ARRAY'),
-        notExists: r => r.not.then(r.exists).map(testCondition('$exists', false)),
-        notEmptyArray: r => r.not
-            .then(r.empty)
-            .then(r.array)
-            .map(multiTestCondition({ $exists: true, $type: 'array', $ne: [] })),
-        emptyArray: r => r.empty.then(r.array).map(multiTestCondition({ $exists: true, $eq: [] })),
-        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')),
-        ne2: 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.ne2, r.lt, r.gt, r.le, r.ge, r.notEmptyArray, r.emptyArray, 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')),
-    };
-    return parsimmon_1.default.createLanguage(langDef);
-};
-exports.mongoParser = createParser();

package/lib/types.d.ts

@@ -1 +0,0 @@
-export type FilterType = 'number' | 'string' | 'datetime' | 'logical' | 'eval' | 'mongo';

package/lib/types.js

@@ -1,3 +0,0 @@
-"use strict";
-// import types from 'dbgate-types';
-Object.defineProperty(exports, "__esModule", { value: true });