@malloydata/malloy-filter 0.0.391 → 0.0.393
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.
|
@@ -37,7 +37,7 @@ exports.BooleanFilterExpression = {
|
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
39
39
|
const nonSpace = srcText.match(/[^\s]/);
|
|
40
|
-
const startIndex = nonSpace ? (_a = nonSpace.index) !== null && _a !== void 0 ? _a : 0 : 0;
|
|
40
|
+
const startIndex = nonSpace ? ((_a = nonSpace.index) !== null && _a !== void 0 ? _a : 0) : 0;
|
|
41
41
|
ret.log = [
|
|
42
42
|
{
|
|
43
43
|
message: `Illegal boolean filter '${src}'. Must be one of true,=true,false,=false,null`,
|
|
@@ -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,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;
|
|
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,CAAC,MAAA,QAAQ,CAAC,KAAK,mCAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter_interface.js","sourceRoot":"","sources":["../src/filter_interface.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAaH,8BAEC;AAgBD,8CAEC;
|
|
1
|
+
{"version":3,"file":"filter_interface.js","sourceRoot":"","sources":["../src/filter_interface.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAaH,8BAEC;AAgBD,8CAEC;AAqBD,wCAoBC;AAUD,0CAQC;AAyBD,wCAoBC;AA0GD,4CAuBC;AAQD,gDAEC;AAuBD,oCASC;AAvSD,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;AAqBD,SAAgB,cAAc,CAAC,EAAW;IACxC,OAAO,CACL,OAAO,EAAE,KAAK,QAAQ;QACtB,EAAE,KAAK,IAAI;QACX,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,EAAW;IACzC,OAAO,CACL,OAAO,EAAE,KAAK,QAAQ;QACtB,EAAE,KAAK,IAAI;QACX,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;AAyBD,SAAgB,cAAc,CAAC,EAAW;IACxC,OAAO,CACL,OAAO,EAAE,KAAK,QAAQ;QACtB,EAAE,KAAK,IAAI;QACX,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;AA0GD,SAAgB,gBAAgB,CAAC,EAAW;IAC1C,OAAO,CACL,OAAO,EAAE,KAAK,QAAQ;QACtB,EAAE,KAAK,IAAI;QACX,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,CAAC,GAAY;IAC7C,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,UAAU,IAAI,GAAG,CAAC;AACtE,CAAC;AAuBD,SAAgB,YAAY,CAAC,CAAS;IACpC,OAAO;QACL,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,WAAW;QACX,aAAa;QACb,MAAM;KACP,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAChB,CAAC"}
|
package/package.json
CHANGED
|
@@ -31,7 +31,7 @@ export const BooleanFilterExpression = {
|
|
|
31
31
|
ret.parsed = {operator: 'null'};
|
|
32
32
|
} else {
|
|
33
33
|
const nonSpace = srcText.match(/[^\s]/);
|
|
34
|
-
const startIndex = nonSpace ? nonSpace.index ?? 0 : 0;
|
|
34
|
+
const startIndex = nonSpace ? (nonSpace.index ?? 0) : 0;
|
|
35
35
|
ret.log = [
|
|
36
36
|
{
|
|
37
37
|
message: `Illegal boolean filter '${src}'. Must be one of true,=true,false,=false,null`,
|
package/src/filter_interface.ts
CHANGED
|
@@ -39,8 +39,7 @@ export function isStringCondition(sc: StringFilter): sc is StringCondition {
|
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
export interface StringCondition
|
|
42
|
-
extends FilterOperator<StringConditionOperator>,
|
|
43
|
-
Negatable {
|
|
42
|
+
extends FilterOperator<StringConditionOperator>, Negatable {
|
|
44
43
|
values: string[];
|
|
45
44
|
}
|
|
46
45
|
|
|
@@ -101,8 +100,7 @@ export function isBooleanFilter(bc: unknown): bc is BooleanFilter {
|
|
|
101
100
|
export type NumberOperator = '<=' | '>=' | '!=' | '=' | '>' | '<';
|
|
102
101
|
|
|
103
102
|
export interface NumberCondition
|
|
104
|
-
extends FilterOperator<NumberOperator>,
|
|
105
|
-
Negatable {
|
|
103
|
+
extends FilterOperator<NumberOperator>, Negatable {
|
|
106
104
|
values: string[];
|
|
107
105
|
}
|
|
108
106
|
|
|
@@ -226,15 +224,11 @@ export interface For extends FilterOperator<'for'>, Negatable, Duration {
|
|
|
226
224
|
|
|
227
225
|
// N units starting in the past, including this one
|
|
228
226
|
export interface in_last
|
|
229
|
-
extends FilterOperator<'in_last'>,
|
|
230
|
-
Negatable,
|
|
231
|
-
Duration {}
|
|
227
|
+
extends FilterOperator<'in_last'>, Negatable, Duration {}
|
|
232
228
|
|
|
233
229
|
// Nunits starting in the past, not including this one
|
|
234
230
|
export interface JustUnits
|
|
235
|
-
extends FilterOperator<'last' | 'next'>,
|
|
236
|
-
Negatable,
|
|
237
|
-
Duration {}
|
|
231
|
+
extends FilterOperator<'last' | 'next'>, Negatable, Duration {}
|
|
238
232
|
|
|
239
233
|
export interface InMoment extends FilterOperator<'in'>, Negatable {
|
|
240
234
|
in: Moment;
|