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

package/src/string_parser.ts

@@ -1,7 +1,13 @@
 import {SpecialToken, Tokenizer, TokenizerParams} from './tokenizer';
-import {StringCondition, StringOperator, QuoteType} from './clause_types';
+import {
+  StringClause,
+  StringCondition,
+  StringConditionOperator,
+  QuoteType,
+  FilterError,
+  StringParserResponse,
+} from './clause_types';
 import {BaseParser} from './base_parser';
-import {FilterParserResponse, FilterError} from './filter_types';
 
 export class StringParser extends BaseParser {
   private static readonly percentRegex: RegExp = /(?<!\\)%/;
@@ -35,26 +41,22 @@ export class StringParser extends BaseParser {
     this.tokens = Tokenizer.convertSpecialWords(this.tokens, specialWords);
   }
 
-  public parse(): FilterParserResponse {
+  public parse(): StringParserResponse {
     this.index = 0;
     this.tokenize();
-    const clauses: StringCondition[] = [];
+    const clauses: StringClause[] = [];
     const errors: FilterError[] = [];
     while (this.index < this.tokens.length) {
       const token = this.getNext();
       if (token.type === ',') {
         this.index++;
-      } else if (token.type === 'NULL') {
-        clauses.push({operator: '=', values: [null]});
-        this.index++;
-      } else if (token.type === 'EMPTY') {
-        clauses.push({operator: 'EMPTY', values: [null]});
-        this.index++;
-      } else if (token.type === 'NOTNULL') {
-        clauses.push({operator: '!=', values: [null]});
-        this.index++;
-      } else if (token.type === 'NOTEMPTY') {
-        clauses.push({operator: 'NOTEMPTY', values: [null]});
+      } else if (
+        token.type === 'NULL' ||
+        token.type === 'NOTNULL' ||
+        token.type === 'EMPTY' ||
+        token.type === 'NOTEMPTY'
+      ) {
+        clauses.push({operator: token.type});
         this.index++;
       } else if (this.checkSimpleWord(clauses)) {
         this.index++;
@@ -67,7 +69,15 @@ export class StringParser extends BaseParser {
         this.index++;
       }
     }
-    return {clauses: StringParser.groupClauses(clauses), errors};
+    const response: StringParserResponse = {
+      clauses: StringParser.groupClauses(clauses),
+      errors,
+    };
+    const quotes: QuoteType[] = StringParser.findQuotes(this.inputString);
+    if (quotes.length > 0) {
+      response.quotes = quotes;
+    }
+    return response;
   }
 
   private static findQuotes(str: string): QuoteType[] {
@@ -119,18 +129,23 @@ export class StringParser extends BaseParser {
     return Array.from(quotes);
   }
 
-  private static groupClauses(clauses: StringCondition[]): StringCondition[] {
+  private static groupClauses(clauses: StringClause[]): StringClause[] {
     if (clauses.length < 2) {
       return clauses;
     }
-    let previous: StringCondition = clauses[0];
-    const outputs: StringCondition[] = [previous];
+    let previous: StringClause = clauses[0];
+    const outputs: StringClause[] = [previous];
     for (let i = 1; i < clauses.length; i++) {
-      if (previous.operator === clauses[i].operator) {
-        previous.values.push(...clauses[i].values);
+      const current = clauses[i];
+      if (
+        previous.operator === current.operator &&
+        'values' in previous &&
+        'values' in current
+      ) {
+        previous.values.push(...current.values);
       } else {
-        previous = clauses[i];
-        outputs.push(previous);
+        previous = current;
+        outputs.push(current);
       }
     }
     return outputs;
@@ -147,7 +162,7 @@ export class StringParser extends BaseParser {
     return word.replace(StringParser.singleBackslashRegex, _match => '');
   }
 
-  private checkSimpleWord(clauses: StringCondition[]): boolean {
+  private checkSimpleWord(clauses: StringClause[]): boolean {
     const token = this.getNext();
     if (token.type !== 'word') {
       return false;
@@ -161,7 +176,7 @@ export class StringParser extends BaseParser {
     const isUnderscore = StringParser.underscoreRegex.test(word);
     const isPercentMiddle = StringParser.percentInMiddle(word);
 
-    let operator: StringOperator = negatedMatch ? '!=' : '=';
+    let operator: StringConditionOperator = negatedMatch ? '!=' : '=';
     if (isUnderscore || isPercentMiddle || (isPercentBoth && word.length < 3)) {
       operator = negatedMatch ? '!~' : '~';
     } else if (isPercentBoth && word.length > 2) {
@@ -185,8 +200,6 @@ export class StringParser extends BaseParser {
     }
 
     const clause: StringCondition = {operator: operator, values: [word]};
-    //const quotes: QuoteType[] = StringParser.findQuotes(word);
-    //if (quotes.length > 0) { clause.quotes = quotes; }
     clauses.push(clause);
     return true;
   }

package/src/string_serializer.ts

@@ -1,9 +1,12 @@
-import {StringCondition, StringOperator, Clause} from './clause_types';
-import {BaseSerializer} from './base_serializer';
+import {
+  StringClause,
+  StringCondition,
+  StringConditionOperator,
+} from './clause_types';
 
-export class StringSerializer extends BaseSerializer {
-  constructor(clauses: Clause[]) {
-    super(clauses);
+export class StringSerializer {
+  constructor(private clauses: StringClause[]) {
+    this.clauses = clauses;
   }
 
   public serialize(): string {
@@ -11,9 +14,8 @@ export class StringSerializer extends BaseSerializer {
     return result.trim().replace(/,$/, '');
   }
 
-  private static isNegated(operator: StringOperator): boolean {
+  private static isNegated(operator: StringConditionOperator): boolean {
     return (
-      operator === 'NOTEMPTY' ||
       operator === '!~' ||
       operator === '!=' ||
       operator === 'notStarts' ||
@@ -30,22 +32,14 @@ export class StringSerializer extends BaseSerializer {
     return input.replace(/[_%]/g, match => `\\${match}`);
   }
 
-  // export type StringOperator = 'EMPTY' | 'NOTEMPTY' | 'starts' | 'ends' | 'contains' | 'notStarts' |
-  // 'notEnds' | 'notContains' | '~' | '=' | '!~' | '!=';
-  private static stringConditionToString(
-    operator: StringOperator,
-    value: string | null
+  // export type StringOperator =
+  //  | 'starts' | 'ends' | 'contains' | 'notStarts' | 'notEnds' | 'notContains'
+  //  | '~' | '=' | '!~' | '!=';
+  private static StringConditionWordToString(
+    operator: StringConditionOperator,
+    value: string
   ): string {
-    if (operator === 'EMPTY') {
-      return 'EMPTY';
-    } else if (operator === 'NOTEMPTY') {
-      return '-EMPTY';
-    }
-
     const negated: boolean = StringSerializer.isNegated(operator);
-    if (value === null) {
-      return negated ? '-NULL' : 'NULL';
-    }
     if (value === 'NULL' || value === '-NULL') {
       return (negated ? '-' : '') + '\\' + value;
     }
@@ -68,18 +62,50 @@ export class StringSerializer extends BaseSerializer {
     return (negated ? '-' : '') + value;
   }
 
-  private static clauseToString(clauses: Clause[]): string {
+  private static StringClauseToString(
+    operator:
+      | StringConditionOperator
+      | 'EMPTY'
+      | 'NOTEMPTY'
+      | 'NULL'
+      | 'NOTNULL',
+    clause: StringClause
+  ): string {
+    if (operator === 'EMPTY') {
+      return 'EMPTY';
+    } else if (operator === 'NOTEMPTY') {
+      return '-EMPTY';
+    } else if (operator === 'NULL') {
+      return 'NULL';
+    } else if (operator === 'NOTNULL') {
+      return '-NULL';
+    }
+    if (!('values' in clause) || clause.values.length === 0) {
+      return '';
+    }
+    let result = '';
+    const condition: StringCondition = clause;
+    for (const value of condition.values) {
+      const word = StringSerializer.StringConditionWordToString(
+        condition.operator,
+        value
+      );
+      if (word) {
+        result += word + ', ';
+      }
+    }
+    return result;
+  }
+
+  private static clauseToString(clauses: StringClause[]): string {
     let result = '';
-    for (const genericClause of clauses) {
-      const clause: StringCondition = genericClause as StringCondition;
-      for (const value of clause.values) {
-        const word = StringSerializer.stringConditionToString(
-          clause.operator,
-          value
-        );
-        if (word) {
-          result += word + ', ';
-        }
+    for (const clause of clauses) {
+      const words = StringSerializer.StringClauseToString(
+        clause.operator,
+        clause
+      );
+      if (words) {
+        result += words + ', ';
       }
     }
     return result;

package/tsconfig.json

@@ -5,10 +5,5 @@
     "outDir": "dist",
     "composite": true,
     "noImplicitReturns": true,
-  },
-  "references": [
-    {
-      "path": "../malloy"
-    }
-  ]
+  }
 }

package/dist/a_simple_serializer.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/a_simple_serializer.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const filter_serializer_1 = require("./filter_serializer");
-/* eslint-disable no-console */
-function aSimpleSerializer() {
-    const strings = [{ operator: '=', values: ['CAT', 'DOG'] }];
-    let response = new filter_serializer_1.FilterSerializer(strings, 'string').serialize();
-    console.log(...strings, '\n', response.result, '\n');
-    const numbers = [
-        {
-            operator: 'range',
-            startOperator: '>=',
-            startValue: -5.5,
-            endOperator: '<',
-            endValue: 10,
-        },
-    ];
-    response = new filter_serializer_1.FilterSerializer(numbers, 'number').serialize();
-    console.log(...numbers, '\n', response.result, '\n');
-    const booleans = [{ operator: 'NULL' }, { operator: 'TRUE' }];
-    response = new filter_serializer_1.FilterSerializer(booleans, 'boolean').serialize();
-    console.log(...booleans, '\n', response.result, '\n');
-    const dates = [
-        { operator: 'YESTERDAY' },
-        { operator: 'NEXT', unit: 'TUESDAY' },
-    ];
-    response = new filter_serializer_1.FilterSerializer(dates, 'date').serialize();
-    console.log(...dates, '\n', response.result, '\n');
-}
-aSimpleSerializer();
-//# sourceMappingURL=a_simple_serializer.js.map

package/dist/a_simple_serializer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"a_simple_serializer.js","sourceRoot":"","sources":["../src/a_simple_serializer.ts"],"names":[],"mappings":";;AAAA,2DAAqD;AAQrD,+BAA+B;AAC/B,SAAS,iBAAiB;IACxB,MAAM,OAAO,GAAsB,CAAC,EAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAC,CAAC,CAAC;IAC7E,IAAI,QAAQ,GAAG,IAAI,oCAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,SAAS,EAAE,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAErD,MAAM,OAAO,GAAmB;QAC9B;YACE,QAAQ,EAAE,OAAO;YACjB,aAAa,EAAE,IAAI;YACnB,UAAU,EAAE,CAAC,GAAG;YAChB,WAAW,EAAE,GAAG;YAChB,QAAQ,EAAE,EAAE;SACb;KACF,CAAC;IACF,QAAQ,GAAG,IAAI,oCAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,SAAS,EAAE,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAErD,MAAM,QAAQ,GAAoB,CAAC,EAAC,QAAQ,EAAE,MAAM,EAAC,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;IAE3E,QAAQ,GAAG,IAAI,oCAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAEtD,MAAM,KAAK,GAAiB;QAC1B,EAAC,QAAQ,EAAE,WAAW,EAAC;QACvB,EAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAC;KACpC,CAAC;IACF,QAAQ,GAAG,IAAI,oCAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC;IAC3D,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAED,iBAAiB,EAAE,CAAC"}

package/dist/base_serializer.d.ts

@@ -1,6 +0,0 @@
-import { Clause } from './clause_types';
-export declare abstract class BaseSerializer {
-    protected clauses: Clause[];
-    constructor(clauses: Clause[]);
-    abstract serialize(): string;
-}

package/dist/base_serializer.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseSerializer = void 0;
-class BaseSerializer {
-    constructor(clauses) {
-        this.clauses = clauses;
-        this.clauses = clauses;
-    }
-}
-exports.BaseSerializer = BaseSerializer;
-//# sourceMappingURL=base_serializer.js.map

package/dist/base_serializer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"base_serializer.js","sourceRoot":"","sources":["../src/base_serializer.ts"],"names":[],"mappings":";;;AAEA,MAAsB,cAAc;IAClC,YAAsB,OAAiB;QAAjB,YAAO,GAAP,OAAO,CAAU;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CAGF;AAND,wCAMC"}

package/dist/filter_parser.d.ts

@@ -1,12 +0,0 @@
-import { FilterParserResponse } from './filter_types';
-import { Token } from './token_types';
-export type FilterType = 'boolean' | 'number' | 'string' | 'date';
-export declare class FilterParser {
-    private input;
-    private type;
-    constructor(input: string, type: FilterType);
-    private initParser;
-    getTokens(): Token[];
-    private makeErrorMessage;
-    parse(): FilterParserResponse;
-}

package/dist/filter_parser.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FilterParser = void 0;
-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");
-class FilterParser {
-    constructor(input, type) {
-        this.input = input;
-        this.type = type;
-        this.input = input;
-        this.type = type;
-    }
-    initParser() {
-        switch (this.type) {
-            case 'boolean':
-                return new boolean_parser_1.BooleanParser(this.input);
-            case 'number':
-                return new number_parser_1.NumberParser(this.input);
-            case 'string':
-                return new string_parser_1.StringParser(this.input);
-            case 'date':
-                return new date_parser_1.DateParser(this.input);
-        }
-    }
-    /* eslint-disable no-console */
-    getTokens() {
-        let tokens = [];
-        try {
-            const parser = this.initParser();
-            tokens = parser.getTokens();
-        }
-        catch (ex) {
-            if (ex instanceof Error)
-                console.error('Error: ', ex.message, '\n');
-            else {
-                console.error('Unknown error: ', ex, '\n');
-            }
-        }
-        return tokens;
-    }
-    /* eslint-enable no-console */
-    makeErrorMessage(message) {
-        return { message, startIndex: 0, endIndex: this.input.length };
-    }
-    parse() {
-        try {
-            const parser = this.initParser();
-            return parser.parse();
-        }
-        catch (ex) {
-            if (ex instanceof Error) {
-                return { clauses: [], errors: [this.makeErrorMessage(ex.message)] };
-            }
-            else {
-                return {
-                    clauses: [],
-                    errors: [this.makeErrorMessage('Unknown error ' + ex)],
-                };
-            }
-        }
-    }
-}
-exports.FilterParser = FilterParser;
-//# sourceMappingURL=filter_parser.js.map

package/dist/filter_parser.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"filter_parser.js","sourceRoot":"","sources":["../src/filter_parser.ts"],"names":[],"mappings":";;;AAEA,qDAA+C;AAC/C,mDAA6C;AAC7C,mDAA6C;AAC7C,+CAAyC;AAKzC,MAAa,YAAY;IACvB,YACU,KAAa,EACb,IAAgB;QADhB,UAAK,GAAL,KAAK,CAAQ;QACb,SAAI,GAAJ,IAAI,CAAY;QAExB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEO,UAAU;QAChB,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,SAAS;gBACZ,OAAO,IAAI,8BAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvC,KAAK,QAAQ;gBACX,OAAO,IAAI,4BAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACtC,KAAK,QAAQ;gBACX,OAAO,IAAI,4BAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACtC,KAAK,MAAM;gBACT,OAAO,IAAI,wBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACrC;IACH,CAAC;IAED,+BAA+B;IACxB,SAAS;QACd,IAAI,MAAM,GAAY,EAAE,CAAC;QACzB,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACjC,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;SAC7B;QAAC,OAAO,EAAmB,EAAE;YAC5B,IAAI,EAAE,YAAY,KAAK;gBAAE,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;iBAC/D;gBACH,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;aAC5C;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,8BAA8B;IAEtB,gBAAgB,CAAC,OAAe;QACtC,OAAO,EAAC,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAC,CAAC;IAC/D,CAAC;IAEM,KAAK;QACV,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACjC,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;SACvB;QAAC,OAAO,EAAmB,EAAE;YAC5B,IAAI,EAAE,YAAY,KAAK,EAAE;gBACvB,OAAO,EAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,EAAC,CAAC;aACnE;iBAAM;gBACL,OAAO;oBACL,OAAO,EAAE,EAAE;oBACX,MAAM,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;iBACvD,CAAC;aACH;SACF;IACH,CAAC;CACF;AAzDD,oCAyDC"}

package/dist/filter_serializer.d.ts

@@ -1,13 +0,0 @@
-import { Clause } from './clause_types';
-export type FilterType = 'boolean' | 'number' | 'string' | 'date';
-export interface FilterSerializerResponse {
-    result: string;
-    error?: string;
-}
-export declare class FilterSerializer {
-    private input;
-    private type;
-    constructor(input: Clause[], type: FilterType);
-    private initSerializer;
-    serialize(): FilterSerializerResponse;
-}

package/dist/filter_serializer.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FilterSerializer = void 0;
-const boolean_serializer_1 = require("./boolean_serializer");
-const string_serializer_1 = require("./string_serializer");
-const number_serializer_1 = require("./number_serializer");
-const date_serializer_1 = require("./date_serializer");
-class FilterSerializer {
-    constructor(input, type) {
-        this.input = input;
-        this.type = type;
-        this.input = input;
-        this.type = type;
-    }
-    initSerializer() {
-        switch (this.type) {
-            case 'boolean':
-                return new boolean_serializer_1.BooleanSerializer(this.input);
-            case 'number':
-                return new number_serializer_1.NumberSerializer(this.input);
-            case 'string':
-                return new string_serializer_1.StringSerializer(this.input);
-            case 'date':
-                return new date_serializer_1.DateSerializer(this.input);
-        }
-    }
-    serialize() {
-        try {
-            const serializer = this.initSerializer();
-            return { result: serializer.serialize() };
-        }
-        catch (ex) {
-            if (ex instanceof Error) {
-                return { result: '', error: ex.message };
-            }
-            else {
-                return { result: '', error: 'Unknown error ' + ex };
-            }
-        }
-    }
-}
-exports.FilterSerializer = FilterSerializer;
-//# sourceMappingURL=filter_serializer.js.map

package/dist/filter_serializer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"filter_serializer.js","sourceRoot":"","sources":["../src/filter_serializer.ts"],"names":[],"mappings":";;;AACA,6DAAuD;AACvD,2DAAqD;AACrD,2DAAqD;AACrD,uDAAiD;AAUjD,MAAa,gBAAgB;IAC3B,YACU,KAAe,EACf,IAAgB;QADhB,UAAK,GAAL,KAAK,CAAU;QACf,SAAI,GAAJ,IAAI,CAAY;QAExB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEO,cAAc;QACpB,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,SAAS;gBACZ,OAAO,IAAI,sCAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,KAAK,QAAQ;gBACX,OAAO,IAAI,oCAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1C,KAAK,QAAQ;gBACX,OAAO,IAAI,oCAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1C,KAAK,MAAM;gBACT,OAAO,IAAI,gCAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACzC;IACH,CAAC;IAEM,SAAS;QACd,IAAI;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACzC,OAAO,EAAC,MAAM,EAAE,UAAU,CAAC,SAAS,EAAE,EAAC,CAAC;SACzC;QAAC,OAAO,EAAmB,EAAE;YAC5B,IAAI,EAAE,YAAY,KAAK,EAAE;gBACvB,OAAO,EAAC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,EAAC,CAAC;aACxC;iBAAM;gBACL,OAAO,EAAC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAgB,GAAG,EAAE,EAAC,CAAC;aACnD;SACF;IACH,CAAC;CACF;AAlCD,4CAkCC"}

package/dist/filter_types.d.ts

@@ -1,10 +0,0 @@
-import { Clause } from './clause_types';
-export interface FilterError {
-    message: string;
-    startIndex: number;
-    endIndex: number;
-}
-export interface FilterParserResponse {
-    clauses: Clause[];
-    errors: FilterError[];
-}

package/dist/filter_types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"filter_types.js","sourceRoot":"","sources":["../src/filter_types.ts"],"names":[],"mappings":""}

package/src/a_simple_serializer.ts

@@ -1,40 +0,0 @@
-import {FilterSerializer} from './filter_serializer';
-import {
-  NumberClause,
-  StringCondition,
-  BooleanClause,
-  DateClause,
-} from './clause_types';
-
-/* eslint-disable no-console */
-function aSimpleSerializer() {
-  const strings: StringCondition[] = [{operator: '=', values: ['CAT', 'DOG']}];
-  let response = new FilterSerializer(strings, 'string').serialize();
-  console.log(...strings, '\n', response.result, '\n');
-
-  const numbers: NumberClause[] = [
-    {
-      operator: 'range',
-      startOperator: '>=',
-      startValue: -5.5,
-      endOperator: '<',
-      endValue: 10,
-    },
-  ];
-  response = new FilterSerializer(numbers, 'number').serialize();
-  console.log(...numbers, '\n', response.result, '\n');
-
-  const booleans: BooleanClause[] = [{operator: 'NULL'}, {operator: 'TRUE'}];
-
-  response = new FilterSerializer(booleans, 'boolean').serialize();
-  console.log(...booleans, '\n', response.result, '\n');
-
-  const dates: DateClause[] = [
-    {operator: 'YESTERDAY'},
-    {operator: 'NEXT', unit: 'TUESDAY'},
-  ];
-  response = new FilterSerializer(dates, 'date').serialize();
-  console.log(...dates, '\n', response.result, '\n');
-}
-
-aSimpleSerializer();

package/src/base_serializer.ts

@@ -1,9 +0,0 @@
-import {Clause} from './clause_types';
-
-export abstract class BaseSerializer {
-  constructor(protected clauses: Clause[]) {
-    this.clauses = clauses;
-  }
-
-  public abstract serialize(): string;
-}

package/src/filter_parser.ts

@@ -1,68 +0,0 @@
-import {FilterError, FilterParserResponse} from './filter_types';
-import {Token} from './token_types';
-import {BooleanParser} from './boolean_parser';
-import {StringParser} from './string_parser';
-import {NumberParser} from './number_parser';
-import {DateParser} from './date_parser';
-import {BaseParser} from './base_parser';
-
-export type FilterType = 'boolean' | 'number' | 'string' | 'date';
-
-export class FilterParser {
-  constructor(
-    private input: string,
-    private type: FilterType
-  ) {
-    this.input = input;
-    this.type = type;
-  }
-
-  private initParser(): BaseParser {
-    switch (this.type) {
-      case 'boolean':
-        return new BooleanParser(this.input);
-      case 'number':
-        return new NumberParser(this.input);
-      case 'string':
-        return new StringParser(this.input);
-      case 'date':
-        return new DateParser(this.input);
-    }
-  }
-
-  /* eslint-disable no-console */
-  public getTokens(): Token[] {
-    let tokens: Token[] = [];
-    try {
-      const parser = this.initParser();
-      tokens = parser.getTokens();
-    } catch (ex: Error | unknown) {
-      if (ex instanceof Error) console.error('Error: ', ex.message, '\n');
-      else {
-        console.error('Unknown error: ', ex, '\n');
-      }
-    }
-    return tokens;
-  }
-  /* eslint-enable no-console */
-
-  private makeErrorMessage(message: string): FilterError {
-    return {message, startIndex: 0, endIndex: this.input.length};
-  }
-
-  public parse(): FilterParserResponse {
-    try {
-      const parser = this.initParser();
-      return parser.parse();
-    } catch (ex: Error | unknown) {
-      if (ex instanceof Error) {
-        return {clauses: [], errors: [this.makeErrorMessage(ex.message)]};
-      } else {
-        return {
-          clauses: [],
-          errors: [this.makeErrorMessage('Unknown error ' + ex)],
-        };
-      }
-    }
-  }
-}

package/src/filter_serializer.ts

@@ -1,49 +0,0 @@
-import {Clause} from './clause_types';
-import {BooleanSerializer} from './boolean_serializer';
-import {StringSerializer} from './string_serializer';
-import {NumberSerializer} from './number_serializer';
-import {DateSerializer} from './date_serializer';
-import {BaseSerializer} from './base_serializer';
-
-export type FilterType = 'boolean' | 'number' | 'string' | 'date';
-
-export interface FilterSerializerResponse {
-  result: string;
-  error?: string;
-}
-
-export class FilterSerializer {
-  constructor(
-    private input: Clause[],
-    private type: FilterType
-  ) {
-    this.input = input;
-    this.type = type;
-  }
-
-  private initSerializer(): BaseSerializer {
-    switch (this.type) {
-      case 'boolean':
-        return new BooleanSerializer(this.input);
-      case 'number':
-        return new NumberSerializer(this.input);
-      case 'string':
-        return new StringSerializer(this.input);
-      case 'date':
-        return new DateSerializer(this.input);
-    }
-  }
-
-  public serialize(): FilterSerializerResponse {
-    try {
-      const serializer = this.initSerializer();
-      return {result: serializer.serialize()};
-    } catch (ex: Error | unknown) {
-      if (ex instanceof Error) {
-        return {result: '', error: ex.message};
-      } else {
-        return {result: '', error: 'Unknown error ' + ex};
-      }
-    }
-  }
-}

package/src/filter_types.ts

@@ -1,12 +0,0 @@
-import {Clause} from './clause_types';
-
-export interface FilterError {
-  message: string;
-  startIndex: number;
-  endIndex: number;
-}
-
-export interface FilterParserResponse {
-  clauses: Clause[];
-  errors: FilterError[];
-}