@malloydata/malloy-filter 0.0.237-dev250222012247 → 0.0.237-dev250222034547

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.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;AAOrE,+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,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"}

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,10 +1,10 @@
 "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);

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,OAAO,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;IACnE,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;AA5BD,8CA4BC"}

package/dist/clause_types.d.ts

@@ -15,7 +15,7 @@ export interface NumberRange {
 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 interface StringCondition {
+export interface StringClause {
     operator: StringOperator;
     values: StringValue[];
     quotes?: QuoteType[];
@@ -24,47 +24,21 @@ export type BooleanOperator = 'TRUE' | 'FALSE' | 'NULL' | 'NOTNULL';
 export interface BooleanClause {
     operator: BooleanOperator;
 }
-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 type DateMomentIntervalOperator = 'LAST' | 'THIS' | 'NEXT';
-export interface DateMomentInterval {
-    prefix?: DatePrefix;
-    operator: DateMomentIntervalOperator;
-    unit: DateTimeUnit | DateWeekday;
-}
-export type DateMomentNumberIntervalOperator = 'LASTN' | 'NEXTN' | 'AGO' | 'FROMNOW';
-export interface DateMomentNumberInterval {
-    prefix?: DatePrefix;
-    operator: DateMomentNumberIntervalOperator;
-    unit: DateTimeUnit;
-    value: string;
+export type NumberClause = NumberCondition | NumberRange;
+export interface FilterError {
+    message: string;
+    startIndex: number;
+    endIndex: number;
 }
-export type DateMomentNumberUnitOperator = 'TIMEBLOCK';
-export interface DateMomentNumberUnit {
-    prefix?: DatePrefix;
-    operator: DateMomentNumberUnitOperator;
-    unit: DateTimeUnit;
-    value: string;
+export interface BooleanParserResponse {
+    clauses: BooleanClause[];
+    errors: FilterError[];
 }
-export type DateMomentNumberOperator = 'DATE' | 'DATETIME';
-export interface DateMomentNumber {
-    prefix?: DatePrefix;
-    operator: DateMomentNumberOperator;
-    date: string;
-    time?: string;
+export interface NumberParserResponse {
+    clauses: NumberClause[];
+    errors: FilterError[];
 }
-export type DateMoment = DateMomentNow | DateMomentInterval | DateMomentNumberInterval | DateMomentNumberUnit | DateMomentNumber;
-export interface DateRange {
-    start: DateMoment;
-    operator: 'TO' | 'FOR';
-    end: DateMoment;
+export interface StringParserResponse {
+    clauses: StringClause[];
+    errors: FilterError[];
 }
-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;
 }

package/dist/date_parser.js

@@ -39,7 +39,7 @@ class DateParser extends base_parser_1.BaseParser {
             { type: 'FROM', value: 'from', ignoreCase: true },
             { type: 'FOR', value: 'for', ignoreCase: true },
             { type: 'TO', value: 'to', ignoreCase: true },
-            { type: 'YEARORNUMBER', value: /^\d\d\d\d$/ },
+            { type: 'YEAR', value: /^\d\d\d\d$/ },
             { type: 'NUMBER', value: /^[\d.]+/, ignoreCase: true },
         ];
         const params = {
@@ -57,28 +57,28 @@ class DateParser extends base_parser_1.BaseParser {
         const output = [];
         this.index = 0;
         while (this.index < this.tokens.length) {
-            if (this.matchAndMerge('LAST|UNITOFTIME', this.tokens, output) ||
-                this.matchAndMerge('LAST|DAYOFWEEK', this.tokens, output) ||
-                this.matchAndMerge('LAST|NUMBER|UNITOFTIME', this.tokens, output) ||
-                this.matchAndMerge('LAST|YEARORNUMBER|UNITOFTIME', this.tokens, output) ||
-                this.matchAndMerge('THIS|UNITOFTIME', this.tokens, output) ||
-                this.matchAndMerge('NEXT|UNITOFTIME', this.tokens, output) ||
-                this.matchAndMerge('NEXT|DAYOFWEEK', this.tokens, output) ||
-                this.matchAndMerge('NEXT|NUMBER|UNITOFTIME', this.tokens, output) ||
-                this.matchAndMerge('NEXT|YEARORNUMBER|UNITOFTIME', this.tokens, output) ||
-                this.matchAndMerge('NUMBER|UNITOFTIME|AGO', this.tokens, output) ||
-                this.matchAndMerge('YEARORNUMBER|UNITOFTIME|AGO', this.tokens, output) ||
-                this.matchAndMerge('NUMBER|UNITOFTIME|FROM|NOW', this.tokens, output) ||
-                this.matchAndMerge('YEARORNUMBER|UNITOFTIME|FROM|NOW', this.tokens, output) ||
-                this.matchAndMerge('NUMBER|UNITOFTIME', this.tokens, output) ||
-                this.matchAndMerge('YEARORNUMBER|UNITOFTIME', this.tokens, output) ||
-                this.matchAndMerge('DATE|TIME', this.tokens, output) ||
-                this.matchAndMerge('TODAY', this.tokens, output) ||
-                this.matchAndMerge('YESTERDAY', this.tokens, output) ||
-                this.matchAndMerge('TOMORROW', this.tokens, output) ||
-                this.matchAndMerge('DATE', this.tokens, output) ||
-                this.matchAndMerge('YEARORNUMBER', this.tokens, output) ||
-                this.matchAndMerge('NOW', this.tokens, output)) {
+            if (this.matchAndMerge('LAST|UNITOFTIME', output) ||
+                this.matchAndMerge('LAST|DAYOFWEEK', output) ||
+                this.matchAndMerge('LAST|NUMBER|UNITOFTIME', output) ||
+                this.matchAndMerge('LAST|YEAR|UNITOFTIME', output) ||
+                this.matchAndMerge('THIS|UNITOFTIME', output) ||
+                this.matchAndMerge('NEXT|UNITOFTIME', output) ||
+                this.matchAndMerge('NEXT|DAYOFWEEK', output) ||
+                this.matchAndMerge('NEXT|NUMBER|UNITOFTIME', output) ||
+                this.matchAndMerge('NEXT|YEAR|UNITOFTIME', output) ||
+                this.matchAndMerge('NUMBER|UNITOFTIME|AGO', output) ||
+                this.matchAndMerge('YEAR|UNITOFTIME|AGO', output) ||
+                this.matchAndMerge('NUMBER|UNITOFTIME|FROM|NOW', output) ||
+                this.matchAndMerge('YEAR|UNITOFTIME|FROM|NOW', output) ||
+                this.matchAndMerge('NUMBER|UNITOFTIME', output) ||
+                this.matchAndMerge('YEAR|UNITOFTIME', output) ||
+                this.matchAndMerge('DATE|TIME', output) ||
+                this.matchAndMerge('TODAY', output) ||
+                this.matchAndMerge('YESTERDAY', output) ||
+                this.matchAndMerge('TOMORROW', output) ||
+                this.matchAndMerge('DATE', output) ||
+                this.matchAndMerge('YEAR', output) ||
+                this.matchAndMerge('NOW', output)) {
                 continue;
             }
             else {
@@ -88,12 +88,12 @@ class DateParser extends base_parser_1.BaseParser {
         }
         return output;
     }
-    matchAndMerge(types, tokens, output) {
+    matchAndMerge(types, output) {
         const idx = this.index;
-        const matchedTokens = tokenizer_1.Tokenizer.matchTypes(types, tokens, idx);
+        const matchedTokens = tokenizer_1.Tokenizer.matchTypes(types, this.tokens, idx);
         if (matchedTokens) {
             output.push({
-                type: 'MOMENT:' + types,
+                type: 'MERGE:' + types,
                 value: '',
                 values: matchedTokens,
                 startIndex: matchedTokens[0].startIndex,
@@ -136,7 +136,7 @@ class DateParser extends base_parser_1.BaseParser {
                     this.index++;
                 }
             }
-            else if (this.handleMoment(prefix, clauses)) {
+            else if (this.handleMerged(prefix, clauses)) {
                 prefix = undefined;
             }
             else {
@@ -151,116 +151,154 @@ class DateParser extends base_parser_1.BaseParser {
         }
         return { clauses, errors };
     }
-    // LAST|DAYOFWEEK
-    static createMomentInterval(prefix, tokens) {
-        const operator = tokens[0]
-            .type;
-        const unit = tokens[1].value;
-        const moment = { operator, unit };
-        if (prefix) {
-            moment.prefix = prefix;
+    static createMomentClause(prefix, moment) {
+        if (!prefix) {
+            return { operator: 'ON', moment }; // DateOnClause
         }
-        return moment;
-    }
-    // LAST|NUMBER|UNITOFTIME
-    static createMomentNumberInterval(prefix, tokens) {
-        const type0 = tokens[0].type;
-        const operator = type0 === 'LAST' ? 'LASTN' : 'NEXTN';
-        const value = tokens[1].value;
-        const unit = tokens[2].value;
-        const moment = { operator, value, unit };
-        if (prefix) {
-            moment.prefix = prefix;
+        else if (prefix === 'BEFORE') {
+            return { operator: 'BEFORE', moment }; // DateBeforeClause
+        }
+        else {
+            return { operator: 'AFTER', moment }; // DateAfterClause
         }
-        return moment;
     }
-    // NUMBER|UNITOFTIME|AGO
-    static createMomentNumberIntervalAgo(prefix, tokens) {
-        const operator = 'AGO';
-        const value = tokens[0].value;
+    // (BEFORE|AFTER) LAST|DAYOFWEEK
+    static createIntervalMoment(prefix, tokens) {
+        const kind = tokens[0]
+            .type;
         const unit = tokens[1].value;
-        const moment = { operator, value, unit };
-        if (prefix) {
-            moment.prefix = prefix;
-        }
-        return moment;
+        const moment = { type: 'INTERVAL', kind, unit };
+        return DateParser.createMomentClause(prefix, moment);
     }
+    // NUMBER|UNITOFTIME|AGO
     // NUMBER|UNITOFTIME|FROM|NOW
-    static createMomentNumberIntervalFromNow(prefix, tokens) {
-        const operator = 'FROMNOW';
-        const value = tokens[0].value;
+    static createOffsetMoment(prefix, tokens) {
+        const amount = Number(tokens[0].value);
         const unit = tokens[1].value;
-        const moment = { operator, value, unit };
-        if (prefix) {
-            moment.prefix = prefix;
+        const direction = tokens[2].type === 'AGO' ? 'AGO' : 'FROMNOW';
+        if (!DateParser.isValidNumber(amount)) {
+            return undefined;
         }
-        return moment;
+        const moment = {
+            type: 'OFFSET_FROM_NOW',
+            direction,
+            amount,
+            unit,
+        };
+        return DateParser.createMomentClause(prefix, moment);
     }
-    // NUMBER|UNITOFTIME
-    static createMomentNumberUnit(prefix, tokens) {
-        const operator = 'TIMEBLOCK';
-        const value = tokens[0].value;
+    // (LAST|NEXT)|NUMBER|UNITOFTIME
+    static createSpanMoment(prefix, tokens) {
+        const amount = Number(tokens[0].value);
         const unit = tokens[1].value;
-        const moment = { operator, value, unit };
+        const direction = tokens[2].type === 'LAST' ? 'LAST' : 'NEXT';
+        if (!DateParser.isValidNumber(amount)) {
+            return undefined;
+        }
+        const moment = { type: 'SPAN_FROM_NOW', direction, amount, unit };
+        return DateParser.createMomentClause(prefix, moment);
+    }
+    // (NUMBER|YEAR)|UNITOFTIME
+    static createDateDuration(prefix, tokens) {
         if (prefix) {
-            moment.prefix = prefix;
+            return undefined; // before 7 hours is ambiguous, not allowed.
+        }
+        const operator = 'DURATION';
+        const amount = Number(tokens[0].value);
+        const unit = tokens[1].value;
+        if (!DateParser.isValidNumber(amount)) {
+            return undefined;
         }
-        return moment;
+        const clause = { operator, duration: { amount, unit } };
+        return clause;
     }
-    // DATE  DATE|TIME
-    static createMomentNumber(prefix, tokens) {
-        const operator = tokens.length === 2 ? 'DATETIME' : 'DATE';
-        const moment = { operator, date: tokens[0].value };
+    // (BEFORE|AFTER)  DATE  DATE|TIME
+    static createAbsoluteMoment(prefix, tokens) {
+        let unit = 'YEAR';
+        let date = tokens[0].value;
         if (tokens.length === 2) {
-            moment.time = tokens[1].value;
+            const timeStr = tokens[1].value;
+            date += ' ' + timeStr;
+            if (timeStr.length > 5)
+                unit = 'SECOND';
+            else
+                unit = 'MINUTE';
         }
-        if (prefix) {
-            moment.prefix = prefix;
+        else if (date.length > 7) {
+            unit = 'DAY';
         }
-        return moment;
+        else if (date.length > 4) {
+            unit = 'MONTH';
+        }
+        const moment = { type: 'ABSOLUTE', date, unit };
+        return DateParser.createMomentClause(prefix, moment);
     }
     // NOW  YESTERDAY  TODAY  TOMORROW
-    static createMomentNow(prefix, tokens) {
-        const operator = tokens[0]
-            .type;
-        const moment = { operator };
-        if (prefix) {
-            moment.prefix = prefix;
+    static createNamedMoment(prefix, tokens) {
+        let momentName = 'NOW';
+        switch (tokens[0].type) {
+            case 'TODAY':
+                momentName = 'TODAY';
+                break;
+            case 'YESTERDAY':
+                momentName = 'YESTERDAY';
+                break;
+            case 'TOMORROW':
+                momentName = 'TOMORROW';
+                break;
+        }
+        const moment = { type: 'NAMED', name: momentName };
+        return DateParser.createMomentClause(prefix, moment);
+    }
+    static isValidNumber(value) {
+        return Number.isNaN(value) === false;
+    }
+    static createDurationFromMerged(token) {
+        if (!token.values || token.values.length !== 2) {
+            return undefined;
         }
-        return moment;
+        if (token.type === 'MERGE:NUMBER|UNITOFTIME' ||
+            token.type === 'MERGE:YEAR|UNITOFTIME') {
+            const value = Number(token.values[0].value);
+            if (!DateParser.isValidNumber(value)) {
+                return undefined;
+            }
+            const unit = token.values[1].value;
+            return { amount: value, unit: unit };
+        }
+        return undefined;
     }
-    static createMomentFromToken(prefix, token) {
+    static createClauseFromMerged(prefix, token) {
         const tokens = token.values || [];
         switch (token.type) {
-            case 'MOMENT:LAST|UNITOFTIME':
-            case 'MOMENT:LAST|DAYOFWEEK':
-            case 'MOMENT:THIS|UNITOFTIME':
-            case 'MOMENT:NEXT|UNITOFTIME':
-            case 'MOMENT:NEXT|DAYOFWEEK':
-                return this.createMomentInterval(prefix, tokens);
-            case 'MOMENT:LAST|NUMBER|UNITOFTIME':
-            case 'MOMENT:LAST|YEARORNUMBER|UNITOFTIME':
-            case 'MOMENT:NEXT|NUMBER|UNITOFTIME':
-            case 'MOMENT:NEXT|YEARORNUMBER|UNITOFTIME':
-                return this.createMomentNumberInterval(prefix, tokens);
-            case 'MOMENT:NUMBER|UNITOFTIME|AGO':
-            case 'MOMENT:YEARORNUMBER|UNITOFTIME|AGO':
-                return this.createMomentNumberIntervalAgo(prefix, tokens);
-            case 'MOMENT:NUMBER|UNITOFTIME|FROM|NOW':
-            case 'MOMENT:YEARORNUMBER|UNITOFTIME|FROM|NOW':
-                return this.createMomentNumberIntervalFromNow(prefix, tokens);
-            case 'MOMENT:NUMBER|UNITOFTIME':
-            case 'MOMENT:YEARORNUMBER|UNITOFTIME':
-                return this.createMomentNumberUnit(prefix, tokens);
-            case 'MOMENT:DATE|TIME':
-            case 'MOMENT:DATE':
-            case 'MOMENT:YEARORNUMBER':
-                return this.createMomentNumber(prefix, tokens);
-            case 'MOMENT:NOW':
-            case 'MOMENT:TODAY':
-            case 'MOMENT:YESTERDAY':
-            case 'MOMENT:TOMORROW':
-                return this.createMomentNow(prefix, tokens);
+            case 'MERGE:LAST|UNITOFTIME':
+            case 'MERGE:LAST|DAYOFWEEK':
+            case 'MERGE:THIS|UNITOFTIME':
+            case 'MERGE:NEXT|UNITOFTIME':
+            case 'MERGE:NEXT|DAYOFWEEK':
+                return this.createIntervalMoment(prefix, tokens);
+            case 'MERGE:LAST|NUMBER|UNITOFTIME':
+            case 'MERGE:LAST|YEAR|UNITOFTIME':
+            case 'MERGE:NEXT|NUMBER|UNITOFTIME':
+            case 'MERGE:NEXT|YEAR|UNITOFTIME':
+                return this.createSpanMoment(prefix, tokens);
+            case 'MERGE:NUMBER|UNITOFTIME|AGO':
+            case 'MERGE:YEAR|UNITOFTIME|AGO':
+            case 'MERGE:NUMBER|UNITOFTIME|FROM|NOW':
+            case 'MERGE:YEAR|UNITOFTIME|FROM|NOW':
+                return this.createOffsetMoment(prefix, tokens);
+            case 'MERGE:NUMBER|UNITOFTIME':
+            case 'MERGE:YEAR|UNITOFTIME':
+                return this.createDateDuration(prefix, tokens);
+            case 'MERGE:DATE|TIME':
+            case 'MERGE:DATE':
+            case 'MERGE:YEAR':
+                return this.createAbsoluteMoment(prefix, tokens);
+            case 'MERGE:NOW':
+            case 'MERGE:TODAY':
+            case 'MERGE:YESTERDAY':
+            case 'MERGE:TOMORROW':
+                return this.createNamedMoment(prefix, tokens);
             default:
                 return undefined;
         }
@@ -274,31 +312,50 @@ class DateParser extends base_parser_1.BaseParser {
             : this.tokens[position].type.startsWith(value);
     }
     handleRange(clauses) {
-        if (this.isMatchingToken(this.index, 'MOMENT', false) &&
+        if (this.isMatchingToken(this.index, 'MERGE', false) &&
             (this.isMatchingToken(this.index + 1, 'TO', true) ||
                 this.isMatchingToken(this.index + 1, 'FOR', true)) &&
-            this.isMatchingToken(this.index + 2, 'MOMENT', false)) {
-            const startMoment = DateParser.createMomentFromToken(undefined, this.tokens[this.index]);
-            const endMoment = DateParser.createMomentFromToken(undefined, this.tokens[this.index + 2]);
-            const operator = this.tokens[this.index + 1].type;
+            this.isMatchingToken(this.index + 2, 'MERGE', false)) {
+            const startToken = this.tokens[this.index];
+            const operator = this.tokens[this.index + 1].type; // TO | FOR
+            const endToken = this.tokens[this.index + 2];
+            const startClause = DateParser.createClauseFromMerged(undefined, startToken);
             this.index += 3;
-            if (startMoment === undefined || endMoment === undefined) {
+            if (startClause === undefined || !('moment' in startClause)) {
                 return false;
             }
-            const dateRange = {
-                start: startMoment,
-                operator,
-                end: endMoment,
-            };
-            clauses.push(dateRange);
+            if (operator === 'TO') {
+                const endClause = DateParser.createClauseFromMerged(undefined, endToken);
+                if (endClause === undefined || !('moment' in endClause)) {
+                    return false;
+                }
+                const clause = {
+                    operator: 'TO_RANGE',
+                    from: startClause.moment,
+                    to: endClause.moment,
+                };
+                clauses.push(clause);
+            }
+            else {
+                const endDuration = DateParser.createDurationFromMerged(endToken);
+                if (endDuration === undefined) {
+                    return false;
+                }
+                const clause = {
+                    operator: 'FOR_RANGE',
+                    from: startClause.moment,
+                    duration: endDuration,
+                };
+                clauses.push(clause);
+            }
             return true;
         }
         return false;
     }
-    handleMoment(prefix, clauses) {
+    handleMerged(prefix, clauses) {
         const token = this.getNext();
-        if (token.type.startsWith('MOMENT')) {
-            const clause = DateParser.createMomentFromToken(prefix, token);
+        if (token.type.startsWith('MERGE')) {
+            const clause = DateParser.createClauseFromMerged(prefix, token);
             this.index++;
             if (clause === undefined) {
                 return false;