@malloydata/malloy-filter 0.0.245 → 0.0.246-dev250320220920

package/src/nearley_parse.ts

@@ -6,38 +6,45 @@
  */
 
 import type {Parser} from 'nearley';
-import type {ClauseBase, FilterLog} from './filter_clause';
-import {isClauseBase} from './filter_clause';
+import type {FilterExpression, FilterLog} from './filter_interface';
+import {isFilterExpression} from './filter_interface';
 
 export function run_parser(
   src: string,
   parser: Parser
-): {parsed: ClauseBase | null; log: FilterLog[]} {
+): {parsed: FilterExpression | null; log: FilterLog[]} {
   try {
     parser.feed(src);
     const results = parser.finish();
     const expr = results[0];
-    if (isClauseBase(expr)) {
+    if (isFilterExpression(expr)) {
       return {parsed: expr, log: []};
     }
     return {parsed: null, log: []};
   } catch (e) {
-    const token = e.token;
-    const message = e.message;
-    const expected = message
-      .match(/(?<=A ).*(?= based on:)/g)
-      .map(s => s.replace(/\s+token/i, ''));
-    let newMessage = `Unexpected ${token.type} token "${token.value}"`;
-    if (expected && expected.length) {
-      newMessage += ` Tokens expected: ${[...new Set(expected)]}`;
+    let newMessage = e.message;
+    let col = 1;
+    let len = src.length;
+    if (e.token) {
+      const token = e.token;
+      col = token.col;
+      len = token.text.length;
+      const message = e.message;
+      const expected = message
+        .match(/(?<=A ).*(?= based on:)/g)
+        .map(s => s.replace(/\s+token/i, ''));
+      newMessage = `Unexpected ${token.type} token "${token.value}"`;
+      if (expected && expected.length) {
+        newMessage += ` Tokens expected: ${[...new Set(expected)]}`;
+      }
     }
     return {
       parsed: null,
       log: [
         {
           message: newMessage,
-          startIndex: token.col - 1,
-          endIndex: token.col - 1 + token.text.length - 1,
+          startIndex: col - 1,
+          endIndex: col - 1 + len - 1,
           severity: 'error',
         },
       ],

package/src/number_filter_expression.ts

@@ -5,24 +5,24 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {FilterParserResponse, NumberClause} from './filter_clause';
-import {isNumberClause} from './filter_clause';
+import type {FilterParserResponse, NumberFilter} from './filter_interface';
+import {isNumberFilter} from './filter_interface';
 import * as nearley from 'nearley';
 import fnumber_grammar from './lib/fexpr_number_parser';
 import {run_parser} from './nearley_parse';
 
 export const NumberFilterExpression = {
-  parse(src: string): FilterParserResponse<NumberClause> {
+  parse(src: string): FilterParserResponse<NumberFilter> {
     const fnumber_parser = new nearley.Parser(
       nearley.Grammar.fromCompiled(fnumber_grammar)
     );
     const parse_result = run_parser(src, fnumber_parser);
-    if (parse_result.parsed && isNumberClause(parse_result.parsed)) {
+    if (parse_result.parsed && isNumberFilter(parse_result.parsed)) {
       return {parsed: parse_result.parsed, log: []};
     }
     return {parsed: null, log: parse_result.log};
   },
-  unparse(nc: NumberClause | null): string {
+  unparse(nc: NumberFilter | null): string {
     if (nc === null) {
       return '';
     }

package/src/string_filter_expression.ts

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {FilterParserResponse, StringClause} from './filter_clause';
-import {isStringClause} from './filter_clause';
+import type {FilterParserResponse, StringFilter} from './filter_interface';
+import {isStringFilter} from './filter_interface';
 import * as nearley from 'nearley';
 import fstring_grammar from './lib/fexpr_string_parser';
 import {escape} from './clause_utils';
@@ -18,17 +18,17 @@ import {run_parser} from './nearley_parse';
 // is not hand coded. Full apologies to the original author of the hand
 // coded parsers.
 export const StringFilterExpression = {
-  parse(src: string): FilterParserResponse<StringClause> {
+  parse(src: string): FilterParserResponse<StringFilter> {
     const fstring_parser = new nearley.Parser(
       nearley.Grammar.fromCompiled(fstring_grammar)
     );
     const parse_result = run_parser(src, fstring_parser);
-    if (parse_result.parsed && isStringClause(parse_result.parsed)) {
+    if (parse_result.parsed && isStringFilter(parse_result.parsed)) {
       return {parsed: parse_result.parsed, log: []};
     }
     return {parsed: null, log: parse_result.log};
   },
-  unparse(sc: StringClause | null): string {
+  unparse(sc: StringFilter | null): string {
     if (sc === null) {
       return '';
     }

package/src/temporal_filter_expression.ts

@@ -8,26 +8,26 @@
 import type {
   FilterParserResponse,
   Moment,
-  TemporalClause,
+  TemporalFilter,
   Duration,
-} from './filter_clause';
-import {isTemporalClause} from './filter_clause';
+} from './filter_interface';
+import {isTemporalFilter} from './filter_interface';
 import ftemporal_grammar from './lib/ftemporal_parser';
 import * as nearley from 'nearley';
 import {run_parser} from './nearley_parse';
 
 export const TemporalFilterExpression = {
-  parse(src: string): FilterParserResponse<TemporalClause> {
+  parse(src: string): FilterParserResponse<TemporalFilter> {
     const ftemporal_parser = new nearley.Parser(
       nearley.Grammar.fromCompiled(ftemporal_grammar)
     );
     const parse_result = run_parser(src, ftemporal_parser);
-    if (parse_result.parsed && isTemporalClause(parse_result.parsed)) {
+    if (parse_result.parsed && isTemporalFilter(parse_result.parsed)) {
       return {parsed: parse_result.parsed, log: []};
     }
     return {parsed: null, log: parse_result.log};
   },
-  unparse(tc: TemporalClause | null): string {
+  unparse(tc: TemporalFilter | null): string {
     if (tc === null) {
       return '';
     }
@@ -67,7 +67,7 @@ export const TemporalFilterExpression = {
   },
 };
 
-function notStr(tc: TemporalClause, s: string): string {
+function notStr(tc: TemporalFilter, s: string): string {
   if ('not' in tc && tc.not) {
     return 'not ' + s;
   }

package/dist/filter_clause.d.ts

@@ -1,133 +0,0 @@
-export interface ClauseBase {
-    operator: string;
-}
-export declare function isClauseBase(o: Object): o is ClauseBase;
-interface Negateable {
-    not?: boolean;
-}
-export interface Null extends ClauseBase, Negateable {
-    operator: 'null';
-}
-export type ChainOp = 'and' | 'or' | ',';
-export declare function isChainOp(s: string): s is ChainOp;
-interface ClauseChain<T> extends ClauseBase {
-    operator: ChainOp;
-    members: T[];
-}
-type BooleanChainOp = 'and' | 'or';
-export interface BooleanChain<T> extends ClauseBase {
-    operator: BooleanChainOp;
-    members: T[];
-}
-interface ClauseGroup<T> extends ClauseBase, Negateable {
-    operator: '()';
-    expr: T;
-}
-export type StringConditionOperator = 'starts' | 'ends' | 'contains' | '=';
-export declare function isStringCondition(sc: StringClause): sc is StringCondition;
-export interface StringCondition extends ClauseBase, Negateable {
-    operator: StringConditionOperator;
-    values: string[];
-}
-export interface StringMatch extends ClauseBase, Negateable {
-    operator: '~';
-    escaped_values: string[];
-}
-export interface StringEmpty extends ClauseBase, Negateable {
-    operator: 'empty';
-}
-export type StringClause = StringCondition | StringMatch | Null | StringEmpty | ClauseChain<StringClause> | ClauseGroup<StringClause>;
-export type BooleanOperator = 'true' | 'false' | 'false_or_null';
-export interface BooleanCondition extends Negateable {
-    operator: BooleanOperator;
-}
-export type BooleanClause = BooleanCondition | Null;
-export declare function isBooleanClause(bc: Object): bc is BooleanClause;
-export declare function isStringClause(sc: Object): sc is StringClause;
-export type NumberOperator = '<=' | '>=' | '!=' | '=' | '>' | '<';
-export interface NumberCondition extends ClauseBase, Negateable {
-    operator: NumberOperator;
-    values: string[];
-}
-export type NumberRangeOperator = '<=' | '>=' | '>' | '<';
-export interface NumberRange extends ClauseBase, Negateable {
-    operator: 'range';
-    startOperator: NumberRangeOperator;
-    startValue: string;
-    endOperator: NumberRangeOperator;
-    endValue: string;
-}
-export type NumberClause = NumberCondition | NumberRange | Null | ClauseGroup<NumberClause> | BooleanChain<NumberClause>;
-export declare function isNumberClause(sc: Object): sc is NumberClause;
-export type TemporalUnit = 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year';
-export interface TemporalLiteral {
-    moment: 'literal';
-    units?: TemporalUnit;
-    literal: string;
-}
-export interface Duration {
-    units: TemporalUnit;
-    n: string;
-}
-export interface WeekdayMoment {
-    moment: 'monday' | 'tuesday' | 'wednesday' | 'thursday' | 'friday' | 'saturday' | 'sunday';
-    which: 'last' | 'next';
-}
-export interface WhichdayMoment {
-    moment: 'yesterday' | 'today' | 'tomorrow';
-}
-export interface FromNowMoment extends Duration {
-    moment: 'from_now';
-}
-export interface AgoMoment extends Duration {
-    moment: 'ago';
-}
-export interface NowMoment {
-    moment: 'now';
-}
-export interface UnitMoment {
-    moment: 'this' | 'last' | 'next';
-    units: TemporalUnit;
-}
-export type Moment = UnitMoment | NowMoment | AgoMoment | FromNowMoment | TemporalLiteral | WhichdayMoment | WeekdayMoment;
-export interface Before extends Negateable {
-    operator: 'before';
-    before: Moment;
-}
-export interface After extends Negateable {
-    operator: 'after';
-    after: Moment;
-}
-export interface To extends Negateable {
-    operator: 'to';
-    fromMoment: Moment;
-    toMoment: Moment;
-}
-export interface For extends Negateable, Duration {
-    operator: 'for';
-    begin: Moment;
-}
-export interface in_last extends Negateable, Duration {
-    operator: 'in_last';
-}
-export interface JustUnits extends Negateable, Duration {
-    operator: 'last' | 'next';
-}
-export interface InMoment extends Negateable {
-    operator: 'in';
-    in: Moment;
-}
-export type TemporalClause = Null | Before | After | To | For | JustUnits | in_last | InMoment | BooleanChain<TemporalClause> | ClauseGroup<TemporalClause>;
-export declare function isTemporalClause(sc: Object): sc is TemporalClause;
-export type FilterLogSeverity = 'error' | 'warn';
-export interface FilterLog {
-    message: string;
-    startIndex: number;
-    endIndex: number;
-    severity: FilterLogSeverity;
-}
-export interface FilterParserResponse<T extends ClauseBase> {
-    parsed: T | null;
-    log: FilterLog[];
-}
-export {};

package/dist/filter_clause.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"filter_clause.js","sourceRoot":"","sources":["../src/filter_clause.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAMH,SAAgB,YAAY,CAAC,CAAS;IACpC,OAAO,UAAU,IAAI,CAAC,CAAC;AACzB,CAAC;AAFD,oCAEC;AAWD,SAAgB,SAAS,CAAC,CAAS;IACjC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAFD,8BAEC;AAmBD,SAAgB,iBAAiB,CAAC,EAAgB;IAChD,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;AACnE,CAAC;AAFD,8CAEC;AAgCD,SAAgB,eAAe,CAAC,EAAU;IACxC,OAAO,CACL,UAAU,IAAI,EAAE;QAChB,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ;QAC/B,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CACjE,CAAC;AACJ,CAAC;AAND,0CAMC;AAED,SAAgB,cAAc,CAAC,EAAU;IACvC,OAAO,CACL,UAAU,IAAI,EAAE;QAChB,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ;QAC/B;YACE,QAAQ;YACR,MAAM;YACN,UAAU;YACV,GAAG;YACH,GAAG;YACH,MAAM;YACN,OAAO;YACP,KAAK;YACL,IAAI;YACJ,GAAG;YACH,IAAI;SACL,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CACxB,CAAC;AACJ,CAAC;AAlBD,wCAkBC;AA0BD,SAAgB,cAAc,CAAC,EAAU;IACvC,OAAO,CACL,UAAU,IAAI,EAAE;QAChB,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ;QAC/B;YACE,OAAO;YACP,IAAI;YACJ,IAAI;YACJ,IAAI;YACJ,GAAG;YACH,GAAG;YACH,GAAG;YACH,KAAK;YACL,IAAI;YACJ,IAAI;YACJ,MAAM;SACP,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CACxB,CAAC;AACJ,CAAC;AAlBD,wCAkBC;AAiHD,SAAgB,gBAAgB,CAAC,EAAU;IACzC,OAAO,CACL,UAAU,IAAI,EAAE;QAChB,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ;QAC/B;YACE,SAAS;YACT,QAAQ;YACR,OAAO;YACP,IAAI;YACJ,KAAK;YACL,IAAI;YACJ,KAAK;YACL,IAAI;YACJ,SAAS;YACT,MAAM;YACN,MAAM;YACN,MAAM;YACN,IAAI;YACJ,MAAM;SACP,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CACxB,CAAC;AACJ,CAAC;AArBD,4CAqBC"}