@malloydata/malloy-filter 0.0.320 → 0.0.322

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/boolean_filter_expression.js +7 -15
  2. package/dist/boolean_filter_expression.js.map +1 -1
  3. package/dist/filter_interface.d.ts +1 -1
  4. package/dist/filter_interface.js +1 -1
  5. package/dist/filter_interface.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/boolean_filter_expression.ts +6 -15
  8. package/src/filter_interface.ts +2 -2
package/dist/boolean_filter_expression.js CHANGED
@@ -23,24 +23,24 @@ exports.BooleanFilterExpression = {
23
23
  if (src === 'true') {
24
24
  ret.parsed = { operator: 'true' };
25
25
  }
26
+ else if (src === '=true') {
27
+ ret.parsed = { operator: '=true' };
28
+ }
26
29
  else if (src === 'false') {
27
- ret.parsed = { operator: 'false_or_null' };
30
+ ret.parsed = { operator: 'false' };
28
31
  }
29
32
  else if (src === '=false') {
30
- ret.parsed = { operator: 'false' };
33
+ ret.parsed = { operator: '=false' };
31
34
  }
32
35
  else if (src === 'null') {
33
36
  ret.parsed = { operator: 'null' };
34
37
  }
35
- else if (src === 'not null') {
36
- ret.parsed = { operator: 'null', not: true };
37
- }
38
38
  else {
39
39
  const nonSpace = srcText.match(/[^\s]/);
40
40
  const startIndex = nonSpace ? (_a = nonSpace.index) !== null && _a !== void 0 ? _a : 0 : 0;
41
41
  ret.log = [
42
42
  {
43
- message: 'Illegal boolean filter. Must be one of true,false,=false,null,not null',
43
+ message: `Illegal boolean filter '${src}'. Must be one of true,=true,false,=false,null`,
44
44
  severity: 'error',
45
45
  startIndex,
46
46
  endIndex: startIndex + srcText.length - 1,
@@ -57,15 +57,7 @@ exports.BooleanFilterExpression = {
57
57
  return '';
58
58
  }
59
59
  const n = bc.not ? 'not ' : '';
60
- switch (bc.operator) {
61
- case 'true':
62
- case 'null':
63
- return n + bc.operator;
64
- case 'false_or_null':
65
- return n + 'false';
66
- case 'false':
67
- return n + '=false';
68
- }
60
+ return n + bc.operator;
69
61
  },
70
62
  };
71
63
  //# sourceMappingURL=boolean_filter_expression.js.map
package/dist/boolean_filter_expression.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"boolean_filter_expression.js","sourceRoot":"","sources":["../src/boolean_filter_expression.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIU,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,OAAe;;QACnB,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;QACjC,CAAC;QACD,MAAM,GAAG,GAAwC,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;QACzE,IAAI,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC7D,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,GAAG,IAAI,CAAC;YACd,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;QACD,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YACnB,GAAG,CAAC,MAAM,GAAG,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC;QAClC,CAAC;aAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YAC3B,GAAG,CAAC,MAAM,GAAG,EAAC,QAAQ,EAAE,eAAe,EAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,GAAG,CAAC,MAAM,GAAG,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC;QACnC,CAAC;aAAM,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAM,GAAG,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC;QAClC,CAAC;aAAM,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;YAC9B,GAAG,CAAC,MAAM,GAAG,EAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAA,QAAQ,CAAC,KAAK,mCAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,GAAG,CAAC,GAAG,GAAG;gBACR;oBACE,OAAO,EACL,wEAAwE;oBAC1E,QAAQ,EAAE,OAAO;oBACjB,UAAU;oBACV,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC;iBAC1C;aACF,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACzB,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,OAAO,CAAC,EAAwB;QAC9B,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;YACpB,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM;gBACT,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC;YACzB,KAAK,eAAe;gBAClB,OAAO,CAAC,GAAG,OAAO,CAAC;YACrB,KAAK,OAAO;gBACV,OAAO,CAAC,GAAG,QAAQ,CAAC;QACxB,CAAC;IACH,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"boolean_filter_expression.js","sourceRoot":"","sources":["../src/boolean_filter_expression.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIU,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,OAAe;;QACnB,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;QACjC,CAAC;QACD,MAAM,GAAG,GAAwC,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;QACzE,IAAI,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC7D,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,GAAG,IAAI,CAAC;YACd,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;QACD,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YACnB,GAAG,CAAC,MAAM,GAAG,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC;QAClC,CAAC;aAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YAC3B,GAAG,CAAC,MAAM,GAAG,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC;QACnC,CAAC;aAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YAC3B,GAAG,CAAC,MAAM,GAAG,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC;QACnC,CAAC;aAAM,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,GAAG,CAAC,MAAM,GAAG,EAAC,QAAQ,EAAE,QAAQ,EAAC,CAAC;QACpC,CAAC;aAAM,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAM,GAAG,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAA,QAAQ,CAAC,KAAK,mCAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,GAAG,CAAC,GAAG,GAAG;gBACR;oBACE,OAAO,EAAE,2BAA2B,GAAG,gDAAgD;oBACvF,QAAQ,EAAE,OAAO;oBACjB,UAAU;oBACV,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC;iBAC1C;aACF,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACzB,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,OAAO,CAAC,EAAwB;QAC9B,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC;IACzB,CAAC;CACF,CAAC"}
package/dist/filter_interface.d.ts CHANGED
@@ -30,7 +30,7 @@ export interface StringEmpty extends FilterOperator<'empty'>, Negatable {
30
30
  }
31
31
  export type StringFilter = StringCondition | StringMatch | Null | StringEmpty | ClauseChain<StringFilter> | ClauseGroup<StringFilter>;
32
32
  export declare function isStringFilter(sc: Object): sc is StringFilter;
33
- export type BooleanOperator = 'true' | 'false' | 'false_or_null';
33
+ export type BooleanOperator = 'true' | 'false' | '=true' | '=false';
34
34
  export interface BooleanCondition extends Negatable {
35
35
  operator: BooleanOperator;
36
36
  }
package/dist/filter_interface.js CHANGED
@@ -40,7 +40,7 @@ function isStringFilter(sc) {
40
40
  function isBooleanFilter(bc) {
41
41
  return ('operator' in bc &&
42
42
  typeof bc.operator === 'string' &&
43
- ['null', 'true', 'false', 'false_or_null'].includes(bc.operator));
43
+ ['null', 'true', 'false', '=false', '=true'].includes(bc.operator));
44
44
  }
45
45
  function isNumberFilter(sc) {
46
46
  return ('operator' in sc &&
package/dist/filter_interface.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"filter_interface.js","sourceRoot":"","sources":["../src/filter_interface.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAaH,8BAEC;AAgBD,8CAEC;AAsBD,wCAkBC;AAUD,0CAMC;AA0BD,wCAkBC;AA8GD,4CAqBC;AAQD,gDAIC;AAsBD,oCAEC;AA/RD,SAAgB,SAAS,CAAC,CAAS;IACjC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAgBD,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;AAsBD,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;AAUD,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;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;AA8GD,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;AAQD,SAAgB,kBAAkB,CAChC,GAAuB;IAEvB,OAAO,CAAC,CAAC,GAAG,IAAI,UAAU,IAAI,GAAG,CAAC;AACpC,CAAC;AAsBD,SAAgB,YAAY,CAAC,CAAS;IACpC,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC"}
1
+ {"version":3,"file":"filter_interface.js","sourceRoot":"","sources":["../src/filter_interface.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAaH,8BAEC;AAgBD,8CAEC;AAsBD,wCAkBC;AAUD,0CAMC;AA0BD,wCAkBC;AA8GD,4CAqBC;AAQD,gDAIC;AAsBD,oCAEC;AA/RD,SAAgB,SAAS,CAAC,CAAS;IACjC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAgBD,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;AAsBD,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;AAUD,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,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CACnE,CAAC;AACJ,CAAC;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;AA8GD,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;AAQD,SAAgB,kBAAkB,CAChC,GAAuB;IAEvB,OAAO,CAAC,CAAC,GAAG,IAAI,UAAU,IAAI,GAAG,CAAC;AACpC,CAAC;AAsBD,SAAgB,YAAY,CAAC,CAAS;IACpC,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@malloydata/malloy-filter",
3
- "version": "0.0.320",
3
+ "version": "0.0.322",
4
4
  "license": "MIT",
5
5
  "description": "Parsers for the Malloy filtering sub-languages",
6
6
  "main": "dist/index.js",
package/src/boolean_filter_expression.ts CHANGED
@@ -21,21 +21,20 @@ export const BooleanFilterExpression = {
21
21
  }
22
22
  if (src === 'true') {
23
23
  ret.parsed = {operator: 'true'};
24
+ } else if (src === '=true') {
25
+ ret.parsed = {operator: '=true'};
24
26
  } else if (src === 'false') {
25
- ret.parsed = {operator: 'false_or_null'};
26
- } else if (src === '=false') {
27
27
  ret.parsed = {operator: 'false'};
28
+ } else if (src === '=false') {
29
+ ret.parsed = {operator: '=false'};
28
30
  } else if (src === 'null') {
29
31
  ret.parsed = {operator: 'null'};
30
- } else if (src === 'not null') {
31
- ret.parsed = {operator: 'null', not: true};
32
32
  } else {
33
33
  const nonSpace = srcText.match(/[^\s]/);
34
34
  const startIndex = nonSpace ? nonSpace.index ?? 0 : 0;
35
35
  ret.log = [
36
36
  {
37
- message:
38
- 'Illegal boolean filter. Must be one of true,false,=false,null,not null',
37
+ message: `Illegal boolean filter '${src}'. Must be one of true,=true,false,=false,null`,
39
38
  severity: 'error',
40
39
  startIndex,
41
40
  endIndex: startIndex + srcText.length - 1,
@@ -52,14 +51,6 @@ export const BooleanFilterExpression = {
52
51
  return '';
53
52
  }
54
53
  const n = bc.not ? 'not ' : '';
55
- switch (bc.operator) {
56
- case 'true':
57
- case 'null':
58
- return n + bc.operator;
59
- case 'false_or_null':
60
- return n + 'false';
61
- case 'false':
62
- return n + '=false';
63
- }
54
+ return n + bc.operator;
64
55
  },
65
56
  };
package/src/filter_interface.ts CHANGED
@@ -78,7 +78,7 @@ export function isStringFilter(sc: Object): sc is StringFilter {
78
78
  );
79
79
  }
80
80
 
81
- export type BooleanOperator = 'true' | 'false' | 'false_or_null';
81
+ export type BooleanOperator = 'true' | 'false' | '=true' | '=false';
82
82
 
83
83
  export interface BooleanCondition extends Negatable {
84
84
  operator: BooleanOperator;
@@ -90,7 +90,7 @@ export function isBooleanFilter(bc: Object): bc is BooleanFilter {
90
90
  return (
91
91
  'operator' in bc &&
92
92
  typeof bc.operator === 'string' &&
93
- ['null', 'true', 'false', 'false_or_null'].includes(bc.operator)
93
+ ['null', 'true', 'false', '=false', '=true'].includes(bc.operator)
94
94
  );
95
95
  }
96
96