@malloydata/malloy-filter 0.0.421 → 0.0.423

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.421",
+  "version": "0.0.423",
   "license": "MIT",
   "description": "Parsers for the Malloy filtering sub-languages",
   "main": "dist/index.js",

package/src/boolean_filter_expression.ts

@@ -27,12 +27,14 @@ export const BooleanFilterExpression = {
       ret.parsed = {operator: '=false'};
     } else if (src === 'null') {
       ret.parsed = {operator: 'null'};
+    } else if (src === 'none') {
+      ret.parsed = {operator: 'none'};
     } else {
       const nonSpace = srcText.match(/[^\s]/);
       const startIndex = nonSpace ? (nonSpace.index ?? 0) : 0;
       ret.log = [
         {
-          message: `Illegal boolean filter '${src}'. Must be one of true,=true,false,=false,null`,
+          message: `Illegal boolean filter '${src}'. Must be one of true,=true,false,=false,null,none`,
           severity: 'error',
           startIndex,
           endIndex: startIndex + srcText.length - 1,

package/src/clause_utils.ts

@@ -40,7 +40,7 @@ export function unescape(str: string) {
  */
 export function escape(str: string) {
   const lstr = str.toLowerCase();
-  if (lstr === 'null' || lstr === 'empty') {
+  if (lstr === 'null' || lstr === 'empty' || lstr === 'none') {
     return '\\' + str;
   }
   return str.replace(/([,; |()\\%_-])/g, '\\$1');
@@ -138,6 +138,9 @@ export function matchOp(matchSrc: string): StringFilter {
   if (matchTxt.toLowerCase() === 'empty') {
     return {operator: 'empty'};
   }
+  if (matchTxt.toLowerCase() === 'none') {
+    return {operator: 'none'};
+  }
   return {operator: '=', values: [unescape(matchTxt)]};
 }
 

package/src/filter_interface.ts

@@ -13,6 +13,11 @@ interface Negatable {
 
 export interface Null extends FilterOperator<'null'>, Negatable {}
 
+// The "always false" filter — matches nothing. Companion to the empty filter
+// `f''` (which is the null/absent filter, "always true"). Universal across all
+// filter types. `not none` is "always true".
+export interface None extends FilterOperator<'none'>, Negatable {}
+
 export type ChainOp = 'and' | 'or' | ',';
 export function isChainOp(s: string): s is ChainOp {
   return ['and', 'or', ','].includes(s);
@@ -51,6 +56,7 @@ export type StringFilter =
   | StringCondition
   | StringMatch
   | Null
+  | None
   | StringEmpty
   | ClauseChain<StringFilter>
   | ClauseGroup<StringFilter>;
@@ -68,6 +74,7 @@ export function isStringFilter(sc: unknown): sc is StringFilter {
       '=',
       '~',
       'null',
+      'none',
       'empty',
       'and',
       'or',
@@ -83,7 +90,7 @@ export interface BooleanCondition extends Negatable {
   operator: BooleanOperator;
 }
 
-export type BooleanFilter = BooleanCondition | Null;
+export type BooleanFilter = BooleanCondition | Null | None;
 
 export function isBooleanFilter(bc: unknown): bc is BooleanFilter {
   return (
@@ -91,7 +98,7 @@ export function isBooleanFilter(bc: unknown): bc is BooleanFilter {
     bc !== null &&
     'operator' in bc &&
     typeof bc.operator === 'string' &&
-    ['null', 'true', 'false', '=false', '=true'].includes(bc.operator)
+    ['null', 'none', 'true', 'false', '=false', '=true'].includes(bc.operator)
   );
 }
 
@@ -115,6 +122,7 @@ export type NumberFilter =
   | NumberCondition
   | NumberRange
   | Null
+  | None
   | ClauseGroup<NumberFilter>
   | BooleanChain<NumberFilter>;
 
@@ -136,6 +144,7 @@ export function isNumberFilter(sc: unknown): sc is NumberFilter {
       'or',
       '()',
       'null',
+      'none',
     ].includes(sc.operator)
   );
 }
@@ -234,6 +243,7 @@ export interface InMoment extends FilterOperator<'in'>, Negatable {
 
 export type TemporalFilter =
   | Null
+  | None
   | Before
   | After
   | To
@@ -265,6 +275,7 @@ export function isTemporalFilter(sc: unknown): sc is TemporalFilter {
       'next',
       '()',
       'null',
+      'none',
     ].includes(sc.operator)
   );
 }

package/src/grammars/fexpr_number.peggy

@@ -19,6 +19,7 @@ numberUnary
 
 clause
   = NULL { return {operator: 'null'}; }
+  / NONE { return {operator: 'none'}; }
   / "(" _ expr:numberFilter _ ")" { return {operator: "()", expr}; }
   / open:openInterval _ b:N _ TO _ e:N _ close:closeInterval { return mkRange(open, b, e, close); }
   / "!=" _ n:N nList:(_ "," _ N)* { return {operator: '!=', ...mkValues(n, nList.map(x => x[3]))}; }
@@ -37,6 +38,7 @@ conjunction
 
 NOT = "not"i !idChar { return "not"; }
 NULL = "null"i !idChar
+NONE = "none"i !idChar
 AND = "and"i !idChar
 OR = "or"i !idChar
 TO = "to"i !idChar

package/src/grammars/ftemporal.peggy

@@ -19,6 +19,7 @@ temporalUnary
 
 clause
   = NULL { return {operator: 'null'}; }
+  / NONE { return {operator: 'none'}; }
   / "(" _ expr:temporalFilter _ ")" { return {operator: "()", expr}; }
   / BEFORE __ m:moment { return {operator: 'before', before: m}; }
   / STARTING __ m:moment { return {operator: 'before', before: m, not: true}; }
@@ -80,6 +81,7 @@ conjunction
 // Keywords - case insensitive, must not be followed by more id chars
 NOT = "not"i !idChar
 NULL = "null"i !idChar
+NONE = "none"i !idChar
 TO = "to"i !idChar
 NOW = "now"i !idChar
 LAST = "last"i !idChar