@malloydata/malloy-filter 0.0.237-dev250224215546 → 0.0.237-dev250225015031

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy-filter",
-  "version": "0.0.237-dev250224215546",
+  "version": "0.0.237-dev250225015031",
   "license": "MIT",
   "description": "",
   "main": "dist/index.js",

package/src/a_simple_parser.ts

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 import {BooleanParser} from './boolean_parser';
 import {StringParser} from './string_parser';
 import {NumberParser} from './number_parser';

package/src/base_parser.ts

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 import {Token} from './token_types';
 
 export abstract class BaseParser {

package/src/boolean_parser.ts

@@ -1,9 +1,12 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 import {SpecialToken, Tokenizer, TokenizerParams} from './tokenizer';
-import {
-  BooleanClause,
-  BooleanParserResponse,
-  FilterError,
-} from './clause_types';
+import {BooleanClause, BooleanParserResponse, FilterLog} from './clause_types';
 import {BaseParser} from './base_parser';
 
 export class BooleanParser extends BaseParser {
@@ -14,11 +17,11 @@ export class BooleanParser extends BaseParser {
   private tokenize(): void {
     const specialSubstrings: SpecialToken[] = [{type: ',', value: ','}];
     const specialWords: SpecialToken[] = [
-      {type: 'NULL', value: 'null', ignoreCase: true},
-      {type: 'NOTNULL', value: '-null', ignoreCase: true},
-      {type: 'TRUE', value: 'true', ignoreCase: true},
-      {type: 'FALSE', value: '=false', ignoreCase: true},
-      {type: 'FALSEORNULL', value: 'false', ignoreCase: true},
+      {type: 'null', value: 'null', ignoreCase: true},
+      {type: 'not_null', value: '-null', ignoreCase: true},
+      {type: 'true', value: 'true', ignoreCase: true},
+      {type: 'false', value: '=false', ignoreCase: true},
+      {type: 'false_or_null', value: 'false', ignoreCase: true},
     ];
     const params: TokenizerParams = {
       trimWordWhitespace: true,
@@ -36,23 +39,32 @@ export class BooleanParser extends BaseParser {
     this.index = 0;
     this.tokenize();
     const clauses: BooleanClause[] = [];
-    const errors: FilterError[] = [];
+    const logs: FilterLog[] = [];
     while (this.index < this.tokens.length) {
       const token = this.getNext();
       if (token.type === ',') {
+        if (this.index > 0 && this.tokens[this.index - 1].type === ',') {
+          logs.push({
+            severity: 'warn',
+            message: 'Empty clause',
+            startIndex: token.startIndex,
+            endIndex: token.endIndex,
+          });
+        }
         this.index++;
       } else if (
-        token.type === 'NULL' ||
-        token.type === 'TRUE' ||
-        token.type === 'FALSE' ||
-        token.type === 'FALSEORNULL' ||
-        token.type === 'NOTNULL'
+        token.type === 'null' ||
+        token.type === 'true' ||
+        token.type === 'false' ||
+        token.type === 'false_or_null' ||
+        token.type === 'not_null'
       ) {
         const clause: BooleanClause = {operator: token.type};
         clauses.push(clause);
         this.index++;
       } else {
-        errors.push({
+        logs.push({
+          severity: 'error',
           message: 'Invalid token ' + token.value,
           startIndex: token.startIndex,
           endIndex: token.endIndex,
@@ -60,6 +72,6 @@ export class BooleanParser extends BaseParser {
         this.index++;
       }
     }
-    return {clauses, errors};
+    return {clauses, logs};
   }
 }

package/src/boolean_serializer.ts

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 import {BooleanClause} from './clause_types';
 
 export class BooleanSerializer {
@@ -12,12 +19,12 @@ export class BooleanSerializer {
 
   private static booleanClauseToString(clause: BooleanClause): string {
     switch (clause.operator) {
-      case 'NOTNULL':
-        return '-NULL';
-      case 'FALSEORNULL':
-        return 'FALSE';
-      case 'FALSE':
-        return '=FALSE';
+      case 'not_null':
+        return '-null';
+      case 'false_or_null':
+        return 'false';
+      case 'false':
+        return '=false';
     }
     return clause.operator;
   }

package/src/clause_types.ts

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 export type NumberOperator = '<=' | '>=' | '!=' | '=' | '>' | '<';
 
 export type NumberValue = number;
@@ -8,11 +15,11 @@ export interface NumberCondition {
 }
 
 export interface NumberNull {
-  operator: 'NULL';
+  operator: 'null';
 }
 
 export interface NumberNotNull {
-  operator: 'NOTNULL';
+  operator: 'not_null';
 }
 
 export type NumberRangeOperator = '<=' | '>=' | '>' | '<';
@@ -35,14 +42,14 @@ export type StringConditionOperator =
   | 'starts'
   | 'ends'
   | 'contains'
-  | 'notStarts'
-  | 'notEnds'
-  | 'notContains'
-  | '~'
+  | 'not_starts'
+  | 'not_ends'
+  | 'not_contains'
   | '='
-  | '!~'
   | '!=';
 
+export type StringMatchOperator = '~' | '!~';
+
 export type StringValue = string;
 
 export interface StringCondition {
@@ -50,68 +57,66 @@ export interface StringCondition {
   values: StringValue[];
 }
 
+export interface StringMatch {
+  operator: StringMatchOperator;
+  escaped_values: StringValue[];
+}
+
 export interface StringNull {
-  operator: 'NULL';
+  operator: 'null';
 }
 
 export interface StringNotNull {
-  operator: 'NOTNULL';
+  operator: 'not_null';
 }
 
 export interface StringEmpty {
-  operator: 'EMPTY';
+  operator: 'empty';
 }
 
 export interface StringNotEmpty {
-  operator: 'NOTEMPTY';
+  operator: 'not_empty';
 }
 
 export type StringClause =
   | StringCondition
+  | StringMatch
   | StringNull
   | StringNotNull
   | StringEmpty
   | StringNotEmpty;
 
 export type BooleanOperator =
-  | 'TRUE'
-  | 'FALSE'
-  | 'FALSEORNULL'
-  | 'NULL'
-  | 'NOTNULL';
+  | 'true'
+  | 'false'
+  | 'false_or_null'
+  | 'null'
+  | 'not_null';
 
 export interface BooleanClause {
   operator: BooleanOperator;
 }
 
-export interface FilterError {
+export type FilterLogSeverity = 'error' | 'warn';
+
+export interface FilterLog {
   message: string;
   startIndex: number;
   endIndex: number;
+  severity: FilterLogSeverity;
 }
 
 export interface BooleanParserResponse {
   clauses: BooleanClause[];
-  errors: FilterError[];
+  logs: FilterLog[];
 }
 
 export interface NumberParserResponse {
   clauses: NumberClause[];
-  errors: FilterError[];
+  logs: FilterLog[];
 }
 
-export type QuoteType =
-  | 'SINGLE'
-  | 'DOUBLE'
-  | 'BACKTICK'
-  | 'TRIPLESINGLE'
-  | 'TRIPLEDOUBLE'
-  | 'ESCAPEDSINGLE'
-  | 'ESCAPEDDOUBLE'
-  | 'ESCAPEDBACKTICK';
-
 export interface StringParserResponse {
   clauses: StringClause[];
-  errors: FilterError[];
-  quotes?: QuoteType[]; // List of quote types found in the string.
+  logs: FilterLog[];
 }