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

package/src/clause_types.ts

@@ -1,12 +1,20 @@
 export type NumberOperator = '<=' | '>=' | '!=' | '=' | '>' | '<';
 
-export type NumberValue = number | null;
+export type NumberValue = number;
 
 export interface NumberCondition {
   operator: NumberOperator;
   values: NumberValue[];
 }
 
+export interface NumberNull {
+  operator: 'NULL';
+}
+
+export interface NumberNotNull {
+  operator: 'NOTNULL';
+}
+
 export type NumberRangeOperator = '<=' | '>=' | '>' | '<';
 
 export interface NumberRange {
@@ -17,19 +25,13 @@ export interface NumberRange {
   endValue: NumberValue;
 }
 
-export type QuoteType =
-  | 'SINGLE'
-  | 'DOUBLE'
-  | 'BACKTICK'
-  | 'TRIPLESINGLE'
-  | 'TRIPLEDOUBLE'
-  | 'ESCAPEDSINGLE'
-  | 'ESCAPEDDOUBLE'
-  | 'ESCAPEDBACKTICK';
+export type NumberClause =
+  | NumberCondition
+  | NumberRange
+  | NumberNull
+  | NumberNotNull;
 
-export type StringOperator =
-  | 'EMPTY'
-  | 'NOTEMPTY'
+export type StringConditionOperator =
   | 'starts'
   | 'ends'
   | 'contains'
@@ -41,120 +43,75 @@ export type StringOperator =
   | '!~'
   | '!=';
 
-export type StringValue = string | null;
+export type StringValue = string;
 
 export interface StringCondition {
-  operator: StringOperator;
+  operator: StringConditionOperator;
   values: StringValue[];
-  quotes?: QuoteType[]; // List of quote types found in the string.
 }
 
-export type BooleanOperator = 'TRUE' | 'FALSE' | 'NULL' | 'NOTNULL';
-
-export interface BooleanClause {
-  operator: BooleanOperator;
+export interface StringNull {
+  operator: 'NULL';
 }
 
-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';
-
-// now, after today, before yesterday, tomorrow
-export interface DateMomentNow {
-  prefix?: DatePrefix;
-  operator: DateMomentNowOperator;
+export interface StringNotNull {
+  operator: 'NOTNULL';
 }
 
-export type DateMomentIntervalOperator = 'LAST' | 'THIS' | 'NEXT';
-
-// LAST|UNITOFTIME, LAST|DAYOFWEEK
-// THIS|UNITOFTIME
-// NEXT|UNITOFTIME, NEXT|DAYOFWEEK
-// before last month, after next tuesday, this month
-export interface DateMomentInterval {
-  prefix?: DatePrefix;
-  operator: DateMomentIntervalOperator;
-  unit: DateTimeUnit | DateWeekday;
+export interface StringEmpty {
+  operator: 'EMPTY';
 }
 
-export type DateMomentNumberIntervalOperator =
-  | 'LASTN'
-  | 'NEXTN'
-  | 'AGO'
-  | 'FROMNOW';
-
-// LAST|NUMBER|UNITOFTIME
-// NEXT|NUMBER|UNITOFTIME
-// NUMBER|UNITOFTIME|AGO
-// NUMBER|UNITOFTIME|FROM|NOW
-// before 3 hours ago, next 5 days, 2025 seconds ago, after 6 weeks from now
-export interface DateMomentNumberInterval {
-  prefix?: DatePrefix;
-  operator: DateMomentNumberIntervalOperator;
-  unit: DateTimeUnit;
-  value: string;
+export interface StringNotEmpty {
+  operator: 'NOTEMPTY';
 }
 
-export type DateMomentNumberUnitOperator = 'TIMEBLOCK';
+export type StringClause =
+  | StringCondition
+  | StringNull
+  | StringNotNull
+  | StringEmpty
+  | StringNotEmpty;
+
+export type BooleanOperator =
+  | 'TRUE'
+  | 'FALSE'
+  | 'FALSEORNULL'
+  | 'NULL'
+  | 'NOTNULL';
 
-// NUMBER|UNITOFTIME
-// 2025 seconds, after 32 hours
-export interface DateMomentNumberUnit {
-  prefix?: DatePrefix;
-  operator: DateMomentNumberUnitOperator;
-  unit: DateTimeUnit;
-  value: string;
+export interface BooleanClause {
+  operator: BooleanOperator;
 }
 
-export type DateMomentNumberOperator = 'DATE' | 'DATETIME';
-
-// DATE|TIME, DATE
-// after 2025, before 2025-08-04, 2025-08-04 08:11:52
-export interface DateMomentNumber {
-  prefix?: DatePrefix;
-  operator: DateMomentNumberOperator;
-  date: string;
-  time?: string;
+export interface FilterError {
+  message: string;
+  startIndex: number;
+  endIndex: number;
 }
 
-export type DateMoment =
-  | DateMomentNow
-  | DateMomentInterval
-  | DateMomentNumberInterval
-  | DateMomentNumberUnit
-  | DateMomentNumber;
-
-export interface DateRange {
-  start: DateMoment;
-  operator: 'TO' | 'FOR';
-  end: DateMoment;
+export interface BooleanParserResponse {
+  clauses: BooleanClause[];
+  errors: FilterError[];
 }
 
-export type NumberClause = NumberCondition | NumberRange;
+export interface NumberParserResponse {
+  clauses: NumberClause[];
+  errors: FilterError[];
+}
 
-export type DateClause = DateMoment | DateRange;
+export type QuoteType =
+  | 'SINGLE'
+  | 'DOUBLE'
+  | 'BACKTICK'
+  | 'TRIPLESINGLE'
+  | 'TRIPLEDOUBLE'
+  | 'ESCAPEDSINGLE'
+  | 'ESCAPEDDOUBLE'
+  | 'ESCAPEDBACKTICK';
 
-export type Clause =
-  | NumberClause
-  | StringCondition
-  | BooleanClause
-  | DateClause;
+export interface StringParserResponse {
+  clauses: StringClause[];
+  errors: FilterError[];
+  quotes?: QuoteType[]; // List of quote types found in the string.
+}