@malloydata/malloy-filter 0.0.237-dev250222025222 → 0.0.237-dev250222205057

package/dist/a_simple_parser.js

@@ -1,20 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const filter_parser_1 = require("./filter_parser");
+const boolean_parser_1 = require("./boolean_parser");
+const string_parser_1 = require("./string_parser");
+const number_parser_1 = require("./number_parser");
+const date_parser_1 = require("./date_parser");
 /* eslint-disable no-console */
 function aSimpleParser() {
     let str = 'CAT,DOG';
-    let response = new filter_parser_1.FilterParser(str, 'string').parse();
-    console.log(str, '\n', ...response.clauses, '\n');
+    const stringResponse = new string_parser_1.StringParser(str).parse();
+    console.log(str, '\n', ...stringResponse.clauses, '\n');
     str = '-5.5, 10, 2.3e7';
-    response = new filter_parser_1.FilterParser(str, 'number').parse();
-    console.log(str, '\n', ...response.clauses, '\n');
+    const numberResponse = new number_parser_1.NumberParser(str).parse();
+    console.log(str, '\n', ...numberResponse.clauses, '\n');
     str = 'null, false';
-    response = new filter_parser_1.FilterParser(str, 'boolean').parse();
-    console.log(str, '\n', ...response.clauses, '\n');
+    const booleanResponse = new boolean_parser_1.BooleanParser(str).parse();
+    console.log(str, '\n', ...booleanResponse.clauses, '\n');
     str = 'after 2025-10-05';
-    response = new filter_parser_1.FilterParser(str, 'date').parse();
-    console.log(str, '\n', ...response.clauses, '\n');
+    const dateResponse = new date_parser_1.DateParser(str).parse();
+    console.log(str, '\n', ...dateResponse.clauses, '\n');
 }
 aSimpleParser();
 //# sourceMappingURL=a_simple_parser.js.map

package/dist/a_simple_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"a_simple_parser.js","sourceRoot":"","sources":["../src/a_simple_parser.ts"],"names":[],"mappings":";;AAAA,mDAA6C;AAE7C,+BAA+B;AAC/B,SAAS,aAAa;IACpB,IAAI,GAAG,GAAG,SAAS,CAAC;IACpB,IAAI,QAAQ,GAAG,IAAI,4BAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAElD,GAAG,GAAG,iBAAiB,CAAC;IACxB,QAAQ,GAAG,IAAI,4BAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAElD,GAAG,GAAG,aAAa,CAAC;IACpB,QAAQ,GAAG,IAAI,4BAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAElD,GAAG,GAAG,kBAAkB,CAAC;IACzB,QAAQ,GAAG,IAAI,4BAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACpD,CAAC;AAED,aAAa,EAAE,CAAC"}
+{"version":3,"file":"a_simple_parser.js","sourceRoot":"","sources":["../src/a_simple_parser.ts"],"names":[],"mappings":";;AAAA,qDAA+C;AAC/C,mDAA6C;AAC7C,mDAA6C;AAC7C,+CAAyC;AAEzC,+BAA+B;AAC/B,SAAS,aAAa;IACpB,IAAI,GAAG,GAAG,SAAS,CAAC;IACpB,MAAM,cAAc,GAAG,IAAI,4BAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAExD,GAAG,GAAG,iBAAiB,CAAC;IACxB,MAAM,cAAc,GAAG,IAAI,4BAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAExD,GAAG,GAAG,aAAa,CAAC;IACpB,MAAM,eAAe,GAAG,IAAI,8BAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEzD,GAAG,GAAG,kBAAkB,CAAC;IACzB,MAAM,YAAY,GAAG,IAAI,wBAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACxD,CAAC;AAED,aAAa,EAAE,CAAC"}

package/dist/base_parser.d.ts

@@ -1,12 +1,10 @@
 import { Token } from './token_types';
-import { FilterParserResponse } from './filter_types';
 export declare abstract class BaseParser {
     protected inputString: string;
     protected index: number;
     protected tokens: Token[];
     constructor(inputString: string);
     getTokens(): Token[];
-    abstract parse(): FilterParserResponse;
     protected getAt(index: number): Token;
     protected getNext(): Token;
     protected static matchTokenTypes(candidates: string[], index: number, tokens: Token[]): boolean;

package/dist/base_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"base_parser.js","sourceRoot":"","sources":["../src/base_parser.ts"],"names":[],"mappings":";;;AAGA,MAAsB,UAAU;IAK9B,YAAY,WAAmB;QAC7B,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAIS,KAAK,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAES,OAAO;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAES,MAAM,CAAC,eAAe,CAC9B,UAAoB,EACpB,KAAa,EACb,MAAe;QAEf,MAAM,QAAQ,GAAG,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3C,IAAI,KAAK,GAAG,CAAC,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE;YACzC,OAAO,KAAK,CAAC;SACd;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,EAAE;gBAC5C,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAzCD,gCAyCC"}
+{"version":3,"file":"base_parser.js","sourceRoot":"","sources":["../src/base_parser.ts"],"names":[],"mappings":";;;AAEA,MAAsB,UAAU;IAK9B,YAAY,WAAmB;QAC7B,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAES,KAAK,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAES,OAAO;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAES,MAAM,CAAC,eAAe,CAC9B,UAAoB,EACpB,KAAa,EACb,MAAe;QAEf,MAAM,QAAQ,GAAG,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3C,IAAI,KAAK,GAAG,CAAC,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE;YACzC,OAAO,KAAK,CAAC;SACd;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,EAAE;gBAC5C,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAvCD,gCAuCC"}

package/dist/boolean_parser.d.ts

@@ -1,7 +1,7 @@
+import { BooleanParserResponse } from './clause_types';
 import { BaseParser } from './base_parser';
-import { FilterParserResponse } from './filter_types';
 export declare class BooleanParser extends BaseParser {
     constructor(input: string);
     private tokenize;
-    parse(): FilterParserResponse;
+    parse(): BooleanParserResponse;
 }

package/dist/boolean_parser.js

@@ -13,7 +13,8 @@ class BooleanParser extends base_parser_1.BaseParser {
             { type: 'NULL', value: 'null', ignoreCase: true },
             { type: 'NOTNULL', value: '-null', ignoreCase: true },
             { type: 'TRUE', value: 'true', ignoreCase: true },
-            { type: 'FALSE', value: 'false', ignoreCase: true },
+            { type: 'FALSE', value: '=false', ignoreCase: true },
+            { type: 'FALSEORNULL', value: 'false', ignoreCase: true },
         ];
         const params = {
             trimWordWhitespace: true,
@@ -38,6 +39,7 @@ class BooleanParser extends base_parser_1.BaseParser {
             else if (token.type === 'NULL' ||
                 token.type === 'TRUE' ||
                 token.type === 'FALSE' ||
+                token.type === 'FALSEORNULL' ||
                 token.type === 'NOTNULL') {
                 const clause = { operator: token.type };
                 clauses.push(clause);

package/dist/boolean_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"boolean_parser.js","sourceRoot":"","sources":["../src/boolean_parser.ts"],"names":[],"mappings":";;;AAAA,2CAAqE;AAErE,+CAAyC;AAGzC,MAAa,aAAc,SAAQ,wBAAU;IAC3C,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAEO,QAAQ;QACd,MAAM,iBAAiB,GAAmB,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC;QACpE,MAAM,YAAY,GAAmB;YACnC,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAC;YAC/C,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAC;YACnD,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAC;YAC/C,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAC;SAClD,CAAC;QACF,MAAM,MAAM,GAAoB;YAC9B,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,IAAI;YACvB,iBAAiB;YACjB,YAAY,EAAE,YAAY;SAC3B,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,qBAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,MAAM,OAAO,GAAoB,EAAE,CAAC;QACpC,MAAM,MAAM,GAAkB,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE;gBACtB,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;iBAAM,IACL,KAAK,CAAC,IAAI,KAAK,MAAM;gBACrB,KAAK,CAAC,IAAI,KAAK,MAAM;gBACrB,KAAK,CAAC,IAAI,KAAK,OAAO;gBACtB,KAAK,CAAC,IAAI,KAAK,SAAS,EACxB;gBACA,MAAM,MAAM,GAAkB,EAAC,QAAQ,EAAE,KAAK,CAAC,IAAuB,EAAC,CAAC;gBACxE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACrB,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC;oBACV,OAAO,EAAE,gBAAgB,GAAG,KAAK,CAAC,KAAK;oBACvC,UAAU,EAAE,KAAK,CAAC,UAAU;oBAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB,CAAC,CAAC;gBACH,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;SACF;QACD,OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,CAAC;IAC3B,CAAC;CACF;AAtDD,sCAsDC"}
+{"version":3,"file":"boolean_parser.js","sourceRoot":"","sources":["../src/boolean_parser.ts"],"names":[],"mappings":";;;AAAA,2CAAqE;AAMrE,+CAAyC;AAEzC,MAAa,aAAc,SAAQ,wBAAU;IAC3C,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAEO,QAAQ;QACd,MAAM,iBAAiB,GAAmB,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC;QACpE,MAAM,YAAY,GAAmB;YACnC,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAC;YAC/C,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAC;YACnD,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAC;YAC/C,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAC;YAClD,EAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAC;SACxD,CAAC;QACF,MAAM,MAAM,GAAoB;YAC9B,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,IAAI;YACvB,iBAAiB;YACjB,YAAY,EAAE,YAAY;SAC3B,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,qBAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,MAAM,OAAO,GAAoB,EAAE,CAAC;QACpC,MAAM,MAAM,GAAkB,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE;gBACtB,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;iBAAM,IACL,KAAK,CAAC,IAAI,KAAK,MAAM;gBACrB,KAAK,CAAC,IAAI,KAAK,MAAM;gBACrB,KAAK,CAAC,IAAI,KAAK,OAAO;gBACtB,KAAK,CAAC,IAAI,KAAK,aAAa;gBAC5B,KAAK,CAAC,IAAI,KAAK,SAAS,EACxB;gBACA,MAAM,MAAM,GAAkB,EAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAC,CAAC;gBACrD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACrB,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC;oBACV,OAAO,EAAE,gBAAgB,GAAG,KAAK,CAAC,KAAK;oBACvC,UAAU,EAAE,KAAK,CAAC,UAAU;oBAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB,CAAC,CAAC;gBACH,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;SACF;QACD,OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,CAAC;IAC3B,CAAC;CACF;AAxDD,sCAwDC"}

package/dist/boolean_serializer.d.ts

@@ -1,7 +1,7 @@
-import { Clause } from './clause_types';
-import { BaseSerializer } from './base_serializer';
-export declare class BooleanSerializer extends BaseSerializer {
-    constructor(clauses: Clause[]);
+import { BooleanClause } from './clause_types';
+export declare class BooleanSerializer {
+    private clauses;
+    constructor(clauses: BooleanClause[]);
     serialize(): string;
     private static booleanClauseToString;
     private static clauseToString;

package/dist/boolean_serializer.js

@@ -1,17 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BooleanSerializer = void 0;
-const base_serializer_1 = require("./base_serializer");
-class BooleanSerializer extends base_serializer_1.BaseSerializer {
+class BooleanSerializer {
     constructor(clauses) {
-        super(clauses);
+        this.clauses = clauses;
+        this.clauses = clauses;
     }
     serialize() {
         const result = BooleanSerializer.clauseToString(this.clauses);
         return result.trim().replace(/,$/, '');
     }
     static booleanClauseToString(clause) {
-        return clause.operator === 'NOTNULL' ? '-NULL' : clause.operator;
+        switch (clause.operator) {
+            case 'NOTNULL':
+                return '-NULL';
+            case 'FALSEORNULL':
+                return 'FALSE';
+            case 'FALSE':
+                return '=FALSE';
+        }
+        return clause.operator;
     }
     static clauseToString(clauses) {
         let result = '';

package/dist/boolean_serializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"boolean_serializer.js","sourceRoot":"","sources":["../src/boolean_serializer.ts"],"names":[],"mappings":";;;AACA,uDAAiD;AAEjD,MAAa,iBAAkB,SAAQ,gCAAc;IACnD,YAAY,OAAiB;QAC3B,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;IAEM,SAAS;QACd,MAAM,MAAM,GAAG,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9D,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAAC,MAAqB;QACxD,OAAO,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;IACnE,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,OAAiB;QAC7C,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,UAAU,IAAI,MAAM,EAAE;gBACxB,MAAM,IAAI,iBAAiB,CAAC,qBAAqB,CAC/C,MAAuB,CACxB,CAAC;aACH;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;aACrE;YACD,MAAM,IAAI,IAAI,CAAC;SAChB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA5BD,8CA4BC"}
+{"version":3,"file":"boolean_serializer.js","sourceRoot":"","sources":["../src/boolean_serializer.ts"],"names":[],"mappings":";;;AAEA,MAAa,iBAAiB;IAC5B,YAAoB,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,SAAS;QACd,MAAM,MAAM,GAAG,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9D,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAAC,MAAqB;QACxD,QAAQ,MAAM,CAAC,QAAQ,EAAE;YACvB,KAAK,SAAS;gBACZ,OAAO,OAAO,CAAC;YACjB,KAAK,aAAa;gBAChB,OAAO,OAAO,CAAC;YACjB,KAAK,OAAO;gBACV,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,OAAwB;QACpD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,UAAU,IAAI,MAAM,EAAE;gBACxB,MAAM,IAAI,iBAAiB,CAAC,qBAAqB,CAC/C,MAAuB,CACxB,CAAC;aACH;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;aACrE;YACD,MAAM,IAAI,IAAI,CAAC;SAChB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AApCD,8CAoCC"}

package/dist/clause_types.d.ts

@@ -1,9 +1,15 @@
 export type NumberOperator = '<=' | '>=' | '!=' | '=' | '>' | '<';
-export type NumberValue = number | null;
+export type NumberValue = number;
 export interface NumberCondition {
     operator: NumberOperator;
     values: NumberValue[];
 }
+export interface NumberNull {
+    operator: 'NULL';
+}
+export interface NumberNotNull {
+    operator: 'NOTNULL';
+}
 export type NumberRangeOperator = '<=' | '>=' | '>' | '<';
 export interface NumberRange {
     operator: 'range';
@@ -12,59 +18,46 @@ export interface NumberRange {
     endOperator: NumberRangeOperator;
     endValue: NumberValue;
 }
-export type QuoteType = 'SINGLE' | 'DOUBLE' | 'BACKTICK' | 'TRIPLESINGLE' | 'TRIPLEDOUBLE' | 'ESCAPEDSINGLE' | 'ESCAPEDDOUBLE' | 'ESCAPEDBACKTICK';
-export type StringOperator = 'EMPTY' | 'NOTEMPTY' | 'starts' | 'ends' | 'contains' | 'notStarts' | 'notEnds' | 'notContains' | '~' | '=' | '!~' | '!=';
-export type StringValue = string | null;
+export type NumberClause = NumberCondition | NumberRange | NumberNull | NumberNotNull;
+export type StringConditionOperator = 'starts' | 'ends' | 'contains' | 'notStarts' | 'notEnds' | 'notContains' | '~' | '=' | '!~' | '!=';
+export type StringValue = string;
 export interface StringCondition {
-    operator: StringOperator;
+    operator: StringConditionOperator;
     values: StringValue[];
-    quotes?: QuoteType[];
 }
-export type BooleanOperator = 'TRUE' | 'FALSE' | 'NULL' | 'NOTNULL';
-export interface BooleanClause {
-    operator: BooleanOperator;
+export interface StringNull {
+    operator: 'NULL';
 }
-export type DatePrefix = 'BEFORE' | 'AFTER';
-export type DateTimeUnit = 'YEAR' | 'QUARTER' | 'MONTH' | 'WEEK' | 'DAY' | 'HOUR' | 'MINUTE' | 'SECOND';
-export type DateWeekday = 'MONDAY' | 'TUESDAY' | 'WEDNESDAY' | 'THURSDAY' | 'FRIDAY' | 'SATURDAY' | 'SUNDAY';
-export type DateMomentNowOperator = 'NOW' | 'TODAY' | 'YESTERDAY' | 'TOMORROW';
-export interface DateMomentNow {
-    prefix?: DatePrefix;
-    operator: DateMomentNowOperator;
+export interface StringNotNull {
+    operator: 'NOTNULL';
 }
-export type DateMomentIntervalOperator = 'LAST' | 'THIS' | 'NEXT';
-export interface DateMomentInterval {
-    prefix?: DatePrefix;
-    operator: DateMomentIntervalOperator;
-    unit: DateTimeUnit | DateWeekday;
+export interface StringEmpty {
+    operator: 'EMPTY';
 }
-export type DateMomentNumberIntervalOperator = 'LASTN' | 'NEXTN' | 'AGO' | 'FROMNOW';
-export interface DateMomentNumberInterval {
-    prefix?: DatePrefix;
-    operator: DateMomentNumberIntervalOperator;
-    unit: DateTimeUnit;
-    value: string;
+export interface StringNotEmpty {
+    operator: 'NOTEMPTY';
 }
-export type DateMomentNumberUnitOperator = 'TIMEBLOCK';
-export interface DateMomentNumberUnit {
-    prefix?: DatePrefix;
-    operator: DateMomentNumberUnitOperator;
-    unit: DateTimeUnit;
-    value: string;
+export type StringClause = StringCondition | StringNull | StringNotNull | StringEmpty | StringNotEmpty;
+export type BooleanOperator = 'TRUE' | 'FALSE' | 'FALSEORNULL' | 'NULL' | 'NOTNULL';
+export interface BooleanClause {
+    operator: BooleanOperator;
+}
+export interface FilterError {
+    message: string;
+    startIndex: number;
+    endIndex: number;
 }
-export type DateMomentNumberOperator = 'DATE' | 'DATETIME';
-export interface DateMomentNumber {
-    prefix?: DatePrefix;
-    operator: DateMomentNumberOperator;
-    date: string;
-    time?: string;
+export interface BooleanParserResponse {
+    clauses: BooleanClause[];
+    errors: FilterError[];
 }
-export type DateMoment = DateMomentNow | DateMomentInterval | DateMomentNumberInterval | DateMomentNumberUnit | DateMomentNumber;
-export interface DateRange {
-    start: DateMoment;
-    operator: 'TO' | 'FOR';
-    end: DateMoment;
+export interface NumberParserResponse {
+    clauses: NumberClause[];
+    errors: FilterError[];
+}
+export type QuoteType = 'SINGLE' | 'DOUBLE' | 'BACKTICK' | 'TRIPLESINGLE' | 'TRIPLEDOUBLE' | 'ESCAPEDSINGLE' | 'ESCAPEDDOUBLE' | 'ESCAPEDBACKTICK';
+export interface StringParserResponse {
+    clauses: StringClause[];
+    errors: FilterError[];
+    quotes?: QuoteType[];
 }
-export type NumberClause = NumberCondition | NumberRange;
-export type DateClause = DateMoment | DateRange;
-export type Clause = NumberClause | StringCondition | BooleanClause | DateClause;

package/dist/date_parser.d.ts

@@ -1,5 +1,5 @@
+import { DateParserResponse } from './date_types';
 import { BaseParser } from './base_parser';
-import { FilterParserResponse } from './filter_types';
 export declare class DateParser extends BaseParser {
     private static readonly yearRegex;
     private static readonly negatedStartRegex;
@@ -7,16 +7,18 @@ export declare class DateParser extends BaseParser {
     private tokenize;
     private mergeMomentTokens;
     private matchAndMerge;
-    parse(): FilterParserResponse;
-    private static createMomentInterval;
-    private static createMomentNumberInterval;
-    private static createMomentNumberIntervalAgo;
-    private static createMomentNumberIntervalFromNow;
-    private static createMomentNumberUnit;
-    private static createMomentNumber;
-    private static createMomentNow;
-    private static createMomentFromToken;
+    parse(): DateParserResponse;
+    private static createMomentClause;
+    private static createIntervalMoment;
+    private static createOffsetMoment;
+    private static createSpanMoment;
+    private static createDateDuration;
+    private static createAbsoluteMoment;
+    private static createNamedMoment;
+    private static isValidNumber;
+    private static createDurationFromMerged;
+    private static createClauseFromMerged;
     private isMatchingToken;
     private handleRange;
-    private handleMoment;
+    private handleMerged;
 }