@malloydata/malloy-filter 0.0.245 → 0.0.246-dev250320220920

package/dist/nearley_parse.js.map

@@ -1 +1 @@
-{"version":3,"file":"nearley_parse.js","sourceRoot":"","sources":["../src/nearley_parse.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,mDAA6C;AAE7C,SAAgB,UAAU,CACxB,GAAW,EACX,MAAc;IAEd,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,IAAA,4BAAY,EAAC,IAAI,CAAC,EAAE,CAAC;YACvB,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;QACjC,CAAC;QACD,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;IACjC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;QACtB,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;QAC1B,MAAM,QAAQ,GAAG,OAAO;aACrB,KAAK,CAAC,0BAA0B,CAAC;aACjC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;QACxC,IAAI,UAAU,GAAG,cAAc,KAAK,CAAC,IAAI,WAAW,KAAK,CAAC,KAAK,GAAG,CAAC;QACnE,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAChC,UAAU,IAAI,qBAAqB,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC9D,CAAC;QACD,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE;gBACH;oBACE,OAAO,EAAE,UAAU;oBACnB,UAAU,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC;oBACzB,QAAQ,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;oBAC/C,QAAQ,EAAE,OAAO;iBAClB;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC;AAlCD,gCAkCC"}
+{"version":3,"file":"nearley_parse.js","sourceRoot":"","sources":["../src/nearley_parse.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,yDAAsD;AAEtD,SAAgB,UAAU,CACxB,GAAW,EACX,MAAc;IAEd,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,IAAA,qCAAkB,EAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;QACjC,CAAC;QACD,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;IACjC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC;QAC3B,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,IAAI,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;QACrB,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YACtB,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;YAChB,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;YACxB,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;YAC1B,MAAM,QAAQ,GAAG,OAAO;iBACrB,KAAK,CAAC,0BAA0B,CAAC;iBACjC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;YACxC,UAAU,GAAG,cAAc,KAAK,CAAC,IAAI,WAAW,KAAK,CAAC,KAAK,GAAG,CAAC;YAC/D,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAChC,UAAU,IAAI,qBAAqB,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YAC9D,CAAC;QACH,CAAC;QACD,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE;gBACH;oBACE,OAAO,EAAE,UAAU;oBACnB,UAAU,EAAE,GAAG,GAAG,CAAC;oBACnB,QAAQ,EAAE,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC;oBAC3B,QAAQ,EAAE,OAAO;iBAClB;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC;AAzCD,gCAyCC"}

package/dist/number_filter_expression.d.ts

@@ -1,5 +1,5 @@
-import type { FilterParserResponse, NumberClause } from './filter_clause';
+import type { FilterParserResponse, NumberFilter } from './filter_interface';
 export declare const NumberFilterExpression: {
-    parse(src: string): FilterParserResponse<NumberClause>;
-    unparse(nc: NumberClause | null): string;
+    parse(src: string): FilterParserResponse<NumberFilter>;
+    unparse(nc: NumberFilter | null): string;
 };

package/dist/number_filter_expression.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NumberFilterExpression = void 0;
-const filter_clause_1 = require("./filter_clause");
+const filter_interface_1 = require("./filter_interface");
 const nearley = __importStar(require("nearley"));
 const fexpr_number_parser_1 = __importDefault(require("./lib/fexpr_number_parser"));
 const nearley_parse_1 = require("./nearley_parse");
@@ -41,7 +41,7 @@ exports.NumberFilterExpression = {
     parse(src) {
         const fnumber_parser = new nearley.Parser(nearley.Grammar.fromCompiled(fexpr_number_parser_1.default));
         const parse_result = (0, nearley_parse_1.run_parser)(src, fnumber_parser);
-        if (parse_result.parsed && (0, filter_clause_1.isNumberClause)(parse_result.parsed)) {
+        if (parse_result.parsed && (0, filter_interface_1.isNumberFilter)(parse_result.parsed)) {
             return { parsed: parse_result.parsed, log: [] };
         }
         return { parsed: null, log: parse_result.log };

package/dist/number_filter_expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"number_filter_expression.js","sourceRoot":"","sources":["../src/number_filter_expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"number_filter_expression.js","sourceRoot":"","sources":["../src/number_filter_expression.ts"],"names":[],"mappings":"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"}

package/dist/string_filter_expression.d.ts

@@ -1,5 +1,5 @@
-import type { FilterParserResponse, StringClause } from './filter_clause';
+import type { FilterParserResponse, StringFilter } from './filter_interface';
 export declare const StringFilterExpression: {
-    parse(src: string): FilterParserResponse<StringClause>;
-    unparse(sc: StringClause | null): string;
+    parse(src: string): FilterParserResponse<StringFilter>;
+    unparse(sc: StringFilter | null): string;
 };

package/dist/string_filter_expression.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringFilterExpression = void 0;
-const filter_clause_1 = require("./filter_clause");
+const filter_interface_1 = require("./filter_interface");
 const nearley = __importStar(require("nearley"));
 const fexpr_string_parser_1 = __importDefault(require("./lib/fexpr_string_parser"));
 const clause_utils_1 = require("./clause_utils");
@@ -47,7 +47,7 @@ exports.StringFilterExpression = {
     parse(src) {
         const fstring_parser = new nearley.Parser(nearley.Grammar.fromCompiled(fexpr_string_parser_1.default));
         const parse_result = (0, nearley_parse_1.run_parser)(src, fstring_parser);
-        if (parse_result.parsed && (0, filter_clause_1.isStringClause)(parse_result.parsed)) {
+        if (parse_result.parsed && (0, filter_interface_1.isStringFilter)(parse_result.parsed)) {
             return { parsed: parse_result.parsed, log: [] };
         }
         return { parsed: null, log: parse_result.log };

package/dist/string_filter_expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"string_filter_expression.js","sourceRoot":"","sources":["../src/string_filter_expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"string_filter_expression.js","sourceRoot":"","sources":["../src/string_filter_expression.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,yDAAkD;AAClD,iDAAmC;AACnC,oFAAwD;AACxD,iDAAsC;AACtC,mDAA2C;AAE3C,yEAAyE;AACzE,wEAAwE;AACxE,uEAAuE;AACvE,uEAAuE;AACvE,iBAAiB;AACJ,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,GAAW;QACf,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,MAAM,CACvC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,6BAAe,CAAC,CAC9C,CAAC;QACF,MAAM,YAAY,GAAG,IAAA,0BAAU,EAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QACrD,IAAI,YAAY,CAAC,MAAM,IAAI,IAAA,iCAAc,EAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/D,OAAO,EAAC,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;QAChD,CAAC;QACD,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAC,CAAC;IAC/C,CAAC;IACD,OAAO,CAAC,EAAuB;QAC7B,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;YACpB,KAAK,GAAG;gBACN,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC;oBACX,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,IAAA,qBAAM,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxD,CAAC;gBACD,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,qBAAM,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClD,KAAK,GAAG;gBACN,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC;oBACX,OAAO,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxD,CAAC;gBACD,OAAO,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,KAAK,QAAQ;gBACX,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC;oBACX,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,IAAA,qBAAM,EAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9D,CAAC;gBACD,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,qBAAM,EAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxD,KAAK,MAAM;gBACT,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC;oBACX,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,GAAG,IAAA,qBAAM,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzD,CAAC;gBACD,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,IAAA,qBAAM,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxD,KAAK,UAAU;gBACb,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC;oBACX,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,GAAG,IAAA,qBAAM,EAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/D,CAAC;gBACD,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,IAAA,qBAAM,EAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9D,KAAK,IAAI;gBACP,OAAO,EAAE,CAAC,OAAO;qBACd,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,8BAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;qBAC7C,IAAI,CAAC,KAAK,CAAC,CAAC;YACjB,KAAK,KAAK;gBACR,OAAO,EAAE,CAAC,OAAO;qBACd,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,8BAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;qBAC7C,IAAI,CAAC,IAAI,CAAC,CAAC;YAChB,KAAK,GAAG;gBACN,OAAO,EAAE,CAAC,OAAO;qBACd,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,8BAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;qBAC7C,IAAI,CAAC,IAAI,CAAC,CAAC;YAChB,KAAK,IAAI,CAAC,CAAC,CAAC;gBACV,MAAM,IAAI,GAAG,GAAG,GAAG,8BAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;gBACjE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YACpC,CAAC;YACD,KAAK,MAAM;gBACT,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;YACnC,KAAK,OAAO;gBACV,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;QACvC,CAAC;IACH,CAAC;CACF,CAAC"}

package/dist/temporal_filter_expression.d.ts

@@ -1,5 +1,5 @@
-import type { FilterParserResponse, TemporalClause } from './filter_clause';
+import type { FilterParserResponse, TemporalFilter } from './filter_interface';
 export declare const TemporalFilterExpression: {
-    parse(src: string): FilterParserResponse<TemporalClause>;
-    unparse(tc: TemporalClause | null): string;
+    parse(src: string): FilterParserResponse<TemporalFilter>;
+    unparse(tc: TemporalFilter | null): string;
 };

package/dist/temporal_filter_expression.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemporalFilterExpression = void 0;
-const filter_clause_1 = require("./filter_clause");
+const filter_interface_1 = require("./filter_interface");
 const ftemporal_parser_1 = __importDefault(require("./lib/ftemporal_parser"));
 const nearley = __importStar(require("nearley"));
 const nearley_parse_1 = require("./nearley_parse");
@@ -41,7 +41,7 @@ exports.TemporalFilterExpression = {
     parse(src) {
         const ftemporal_parser = new nearley.Parser(nearley.Grammar.fromCompiled(ftemporal_parser_1.default));
         const parse_result = (0, nearley_parse_1.run_parser)(src, ftemporal_parser);
-        if (parse_result.parsed && (0, filter_clause_1.isTemporalClause)(parse_result.parsed)) {
+        if (parse_result.parsed && (0, filter_interface_1.isTemporalFilter)(parse_result.parsed)) {
             return { parsed: parse_result.parsed, log: [] };
         }
         return { parsed: null, log: parse_result.log };

package/dist/temporal_filter_expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"temporal_filter_expression.js","sourceRoot":"","sources":["../src/temporal_filter_expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"temporal_filter_expression.js","sourceRoot":"","sources":["../src/temporal_filter_expression.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy-filter",
-  "version": "0.0.245",
+  "version": "0.0.246-dev250320220920",
   "license": "MIT",
   "description": "Parsers for the Malloy filtering sub-languages",
   "main": "dist/index.js",
@@ -23,6 +23,7 @@
   "author": "",
   "dependencies": {
     "jest-diff": "^29.6.2",
+    "luxon": "^3.5.0",
     "moo": "^0.5.2",
     "nearley": "^2.20.1"
   },

package/src/boolean_filter_expression.ts

@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {BooleanClause, FilterParserResponse} from './filter_clause';
+import type {BooleanFilter, FilterParserResponse} from './filter_interface';
 
 export const BooleanFilterExpression = {
-  parse(srcText: string): FilterParserResponse<BooleanClause> {
-    const ret: FilterParserResponse<BooleanClause> = {parsed: null, log: []};
+  parse(srcText: string): FilterParserResponse<BooleanFilter> {
+    const ret: FilterParserResponse<BooleanFilter> = {parsed: null, log: []};
     let src = srcText.toLowerCase().trim().replace(/\s\s+/, ' ');
     let negate = false;
     if (src.startsWith('not ')) {
@@ -44,7 +44,7 @@ export const BooleanFilterExpression = {
     }
     return ret;
   },
-  unparse(bc: BooleanClause | null): string {
+  unparse(bc: BooleanFilter | null): string {
     if (bc === null) {
       return '';
     }

package/src/clause_utils.ts

@@ -8,26 +8,26 @@
 import type {
   ChainOp,
   NumberRange,
-  StringClause,
-  NumberClause,
-  ClauseBase,
+  StringFilter,
+  NumberFilter,
   TemporalUnit,
   TemporalLiteral,
-  TemporalClause,
-} from './filter_clause';
+  TemporalFilter,
+  FilterExpression,
+} from './filter_interface';
 import {
-  isNumberClause,
-  isStringClause,
+  isNumberFilter,
+  isStringFilter,
   isStringCondition,
-  isTemporalClause,
-} from './filter_clause';
+  isTemporalFilter,
+} from './filter_interface';
 
 /**
  * If there is a minus token, add "not:true" to the clause
  */
 export function maybeNot(data: (Object | undefined)[]) {
   const [isMinus, op] = data;
-  if (isMinus && op && isStringClause(op)) {
+  if (isMinus && op && isStringFilter(op)) {
     return {...op, not: true};
   }
   return op;
@@ -98,7 +98,7 @@ function describeString(s: string) {
  * Generate the correct match clause operator based on the contents
  * of the match string.
  */
-export function matchOp(matchSrc: string): StringClause {
+export function matchOp(matchSrc: string): StringFilter {
   let matchTxt = matchSrc.trimStart();
   const {hasLike, percentEnd, percentStart, endSpace} =
     describeString(matchTxt);
@@ -143,7 +143,7 @@ export function matchOp(matchSrc: string): StringClause {
   return {operator: '=', values: [unescape(matchTxt)]};
 }
 
-function sameAs<T extends ClauseBase>(a: T, b: ClauseBase): b is T {
+function sameAs<T extends FilterExpression>(a: T, b: FilterExpression): b is T {
   return (
     a.operator === b.operator && (a['not'] ?? false) === (b['not'] ?? false)
   );
@@ -153,8 +153,8 @@ export function conjoin(
   left: Object,
   op: string,
   right: Object
-): StringClause | null {
-  if (isStringClause(left) && isStringClause(right)) {
+): StringFilter | null {
+  if (isStringFilter(left) && isStringFilter(right)) {
     if (op === ',') {
       if (left.operator === '~' && sameAs(left, right)) {
         return {
@@ -182,10 +182,10 @@ export function joinNumbers(
   left: Object,
   op: string,
   right: Object
-): NumberClause | null {
-  if (isNumberClause(left) && isNumberClause(right)) {
+): NumberFilter | null {
+  if (isNumberFilter(left) && isNumberFilter(right)) {
     if (op === 'or' && left.operator === '=' && sameAs(left, right)) {
-      const ret: NumberClause = {
+      const ret: NumberFilter = {
         operator: '=',
         values: [...left.values, ...right.values],
       };
@@ -224,7 +224,7 @@ export function mkValues(n: string, nList: string[]) {
 }
 
 export function numNot(op: Object, notToken: unknown) {
-  if (isNumberClause(op) && notToken) {
+  if (isNumberFilter(op) && notToken) {
     if (op.operator === '=') return {operator: '!=', values: op.values};
     if (op.operator === '!=') return {operator: '=', values: op.values};
     return {...op, not: true};
@@ -233,7 +233,7 @@ export function numNot(op: Object, notToken: unknown) {
 }
 
 export function temporalNot(op: Object, notToken: unknown) {
-  if (isTemporalClause(op) && notToken) {
+  if (isTemporalFilter(op) && notToken) {
     return {...op, not: true};
   }
   return op;
@@ -243,8 +243,8 @@ export function joinTemporal(
   left: Object,
   op: string,
   right: Object
-): TemporalClause | null {
-  if (isTemporalClause(left) && isTemporalClause(right)) {
+): TemporalFilter | null {
+  if (isTemporalFilter(left) && isTemporalFilter(right)) {
     // if (
     //   (op === ',' || op === 'or') &&
     //   left.operator === '=' &&

package/src/{filter_clause.ts → filter_interface.ts}

@@ -5,87 +5,60 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-export interface ClauseBase {
-  operator: string;
-}
-
-export function isClauseBase(o: Object): o is ClauseBase {
-  return 'operator' in o;
+interface FilterOperator<T extends string> {
+  operator: T;
 }
 
 interface Negateable {
   not?: boolean;
 }
 
-export interface Null extends ClauseBase, Negateable {
-  operator: 'null';
-}
+export interface Null extends FilterOperator<'null'>, Negateable {}
 
 export type ChainOp = 'and' | 'or' | ',';
 export function isChainOp(s: string): s is ChainOp {
   return ['and', 'or', ','].includes(s);
 }
 
-interface ClauseChain<T> extends ClauseBase {
-  operator: ChainOp;
+interface ClauseChain<T> extends FilterOperator<ChainOp> {
   members: T[];
 }
 
 type BooleanChainOp = 'and' | 'or';
-export interface BooleanChain<T> extends ClauseBase {
-  operator: BooleanChainOp;
+export interface BooleanChain<T> extends FilterOperator<BooleanChainOp> {
   members: T[];
 }
 
-interface ClauseGroup<T> extends ClauseBase, Negateable {
-  operator: '()';
+interface ClauseGroup<T> extends FilterOperator<'()'>, Negateable {
   expr: T;
 }
 
 export type StringConditionOperator = 'starts' | 'ends' | 'contains' | '=';
-export function isStringCondition(sc: StringClause): sc is StringCondition {
+export function isStringCondition(sc: StringFilter): sc is StringCondition {
   return ['starts', 'ends', 'contains', '='].includes(sc.operator);
 }
 
-export interface StringCondition extends ClauseBase, Negateable {
-  operator: StringConditionOperator;
+export interface StringCondition
+  extends FilterOperator<StringConditionOperator>,
+    Negateable {
   values: string[];
 }
 
-export interface StringMatch extends ClauseBase, Negateable {
-  operator: '~';
+export interface StringMatch extends FilterOperator<'~'>, Negateable {
   escaped_values: string[];
 }
 
-export interface StringEmpty extends ClauseBase, Negateable {
-  operator: 'empty';
-}
+export interface StringEmpty extends FilterOperator<'empty'>, Negateable {}
 
-export type StringClause =
+export type StringFilter =
   | StringCondition
   | StringMatch
   | Null
   | StringEmpty
-  | ClauseChain<StringClause>
-  | ClauseGroup<StringClause>;
-
-export type BooleanOperator = 'true' | 'false' | 'false_or_null';
-
-export interface BooleanCondition extends Negateable {
-  operator: BooleanOperator;
-}
+  | ClauseChain<StringFilter>
+  | ClauseGroup<StringFilter>;
 
-export type BooleanClause = BooleanCondition | Null;
-
-export function isBooleanClause(bc: Object): bc is BooleanClause {
-  return (
-    'operator' in bc &&
-    typeof bc.operator === 'string' &&
-    ['null', 'true', 'false', 'false_or_null'].includes(bc.operator)
-  );
-}
-
-export function isStringClause(sc: Object): sc is StringClause {
+export function isStringFilter(sc: Object): sc is StringFilter {
   return (
     'operator' in sc &&
     typeof sc.operator === 'string' &&
@@ -105,31 +78,47 @@ export function isStringClause(sc: Object): sc is StringClause {
   );
 }
 
+export type BooleanOperator = 'true' | 'false' | 'false_or_null';
+
+export interface BooleanCondition extends Negateable {
+  operator: BooleanOperator;
+}
+
+export type BooleanFilter = BooleanCondition | Null;
+
+export function isBooleanFilter(bc: Object): bc is BooleanFilter {
+  return (
+    'operator' in bc &&
+    typeof bc.operator === 'string' &&
+    ['null', 'true', 'false', 'false_or_null'].includes(bc.operator)
+  );
+}
+
 export type NumberOperator = '<=' | '>=' | '!=' | '=' | '>' | '<';
 
-export interface NumberCondition extends ClauseBase, Negateable {
-  operator: NumberOperator;
+export interface NumberCondition
+  extends FilterOperator<NumberOperator>,
+    Negateable {
   values: string[];
 }
 
 export type NumberRangeOperator = '<=' | '>=' | '>' | '<';
 
-export interface NumberRange extends ClauseBase, Negateable {
-  operator: 'range';
+export interface NumberRange extends FilterOperator<'range'>, Negateable {
   startOperator: NumberRangeOperator;
   startValue: string;
   endOperator: NumberRangeOperator;
   endValue: string;
 }
 
-export type NumberClause =
+export type NumberFilter =
   | NumberCondition
   | NumberRange
   | Null
-  | ClauseGroup<NumberClause>
-  | BooleanChain<NumberClause>;
+  | ClauseGroup<NumberFilter>
+  | BooleanChain<NumberFilter>;
 
-export function isNumberClause(sc: Object): sc is NumberClause {
+export function isNumberFilter(sc: Object): sc is NumberFilter {
   return (
     'operator' in sc &&
     typeof sc.operator === 'string' &&
@@ -212,43 +201,40 @@ export type Moment =
   | WhichdayMoment
   | WeekdayMoment;
 
-export interface Before extends Negateable {
-  operator: 'before';
+export interface Before extends FilterOperator<'before'>, Negateable {
   before: Moment;
 }
 
-export interface After extends Negateable {
-  operator: 'after';
+export interface After extends FilterOperator<'after'>, Negateable {
   after: Moment;
 }
 
-export interface To extends Negateable {
-  operator: 'to';
+export interface To extends FilterOperator<'to'>, Negateable {
   fromMoment: Moment;
   toMoment: Moment;
 }
 
-export interface For extends Negateable, Duration {
-  operator: 'for';
+export interface For extends FilterOperator<'for'>, Negateable, Duration {
   begin: Moment;
 }
 
 // N units starting in the past, including this one
-export interface in_last extends Negateable, Duration {
-  operator: 'in_last';
-}
+export interface in_last
+  extends FilterOperator<'in_last'>,
+    Negateable,
+    Duration {}
 
 // Nunits starting in the past, not including this one
-export interface JustUnits extends Negateable, Duration {
-  operator: 'last' | 'next';
-}
+export interface JustUnits
+  extends FilterOperator<'last' | 'next'>,
+    Negateable,
+    Duration {}
 
-export interface InMoment extends Negateable {
-  operator: 'in';
+export interface InMoment extends FilterOperator<'in'>, Negateable {
   in: Moment;
 }
 
-export type TemporalClause =
+export type TemporalFilter =
   | Null
   | Before
   | After
@@ -257,10 +243,10 @@ export type TemporalClause =
   | JustUnits
   | in_last
   | InMoment
-  | BooleanChain<TemporalClause>
-  | ClauseGroup<TemporalClause>;
+  | BooleanChain<TemporalFilter>
+  | ClauseGroup<TemporalFilter>;
 
-export function isTemporalClause(sc: Object): sc is TemporalClause {
+export function isTemporalFilter(sc: Object): sc is TemporalFilter {
   return (
     'operator' in sc &&
     typeof sc.operator === 'string' &&
@@ -283,6 +269,16 @@ export function isTemporalClause(sc: Object): sc is TemporalClause {
   );
 }
 
+export type FilterExpression =
+  | BooleanFilter
+  | NumberFilter
+  | StringFilter
+  | TemporalFilter;
+
+export function isFilterExpression(obj: Object): obj is FilterExpression {
+  return 'operator' in obj;
+}
+
 export type FilterLogSeverity = 'error' | 'warn';
 
 export interface FilterLog {
@@ -292,7 +288,17 @@ export interface FilterLog {
   severity: FilterLogSeverity;
 }
 
-export interface FilterParserResponse<T extends ClauseBase> {
+export interface FilterParserResponse<T extends FilterExpression> {
   parsed: T | null;
   log: FilterLog[];
 }
+
+export type FilterableType =
+  | 'string'
+  | 'number'
+  | 'boolean'
+  | 'timestamp'
+  | 'date';
+export function isFilterable(s: string): s is FilterableType {
+  return ['string', 'number', 'boolean', 'timestamp', 'date'].includes(s);
+}

package/src/index.ts

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+export * from './filter_interface';
 export {BooleanFilterExpression} from './boolean_filter_expression';
-export {TemporalFilterExpression} from './temporal_filter_expression';
 export {NumberFilterExpression} from './number_filter_expression';
 export {StringFilterExpression} from './string_filter_expression';
-export * from './filter_clause';
+export {TemporalFilterExpression} from './temporal_filter_expression';

package/src/lib/ftemporal_parser.ts

@@ -38,6 +38,7 @@ declare var AGO: any;
 declare var FROM: any;
 declare var literal: any;
 declare var lit_day: any;
+declare var lit_min: any;
 declare var lit_hour: any;
 declare var lit_month: any;
 declare var lit_quarter: any;
@@ -111,9 +112,10 @@ const temporal_lexer = moo.compile({
   literal: /\d\d\d\d-\d\d-\d\d[ Tt]\d\d:\d\d(?::\d\d(?:[.,]\d*))/,
   lit_week: /\d\d\d\d-\d\d-\d\d-[Ww][Kk]/,
   lit_quarter: /\d\d\d\d-[qQ][1234]/,
+  lit_min: /\d\d\d\d-\d\d-\d\d[ Tt]\d\d:\d\d/,
   lit_hour: /\d\d\d\d-\d\d-\d\d[ Tt]\d\d/,
   lit_day: /\d\d\d\d-\d\d-\d\d/,
-  lit_month: /\d\d\d\d-\d\d-\d\d/,
+  lit_month: /\d\d\d\d-\d\d/,
   lit_year: /\d\d\d\d/,
   n: /\d+/,
 });
@@ -210,6 +212,7 @@ const grammar: Grammar = {
     {"name": "moment", "symbols": ["timeLiteral"], "postprocess": d => d[0]},
     {"name": "timeLiteral", "symbols": [(temporal_lexer.has("literal") ? {type: "literal"} : literal)], "postprocess": ([l]) => timeLiteral(l.text)},
     {"name": "timeLiteral", "symbols": [(temporal_lexer.has("lit_day") ? {type: "lit_day"} : lit_day)], "postprocess": ([l]) => timeLiteral(l.text, 'day')},
+    {"name": "timeLiteral", "symbols": [(temporal_lexer.has("lit_min") ? {type: "lit_min"} : lit_min)], "postprocess": ([l]) => timeLiteral(l.text, 'minute')},
     {"name": "timeLiteral", "symbols": [(temporal_lexer.has("lit_hour") ? {type: "lit_hour"} : lit_hour)], "postprocess": ([l]) => timeLiteral(l.text, 'hour')},
     {"name": "timeLiteral", "symbols": [(temporal_lexer.has("lit_month") ? {type: "lit_month"} : lit_month)], "postprocess": ([l]) => timeLiteral(l.text, 'month')},
     {"name": "timeLiteral", "symbols": [(temporal_lexer.has("lit_quarter") ? {type: "lit_quarter"} : lit_quarter)], "postprocess": ([l]) => timeLiteral(l.text, 'quarter')},