@malloydata/malloy-filter 0.0.249-dev250326193717 → 0.0.249-dev250327152019
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.
package/dist/filter_interface.js
CHANGED
|
@@ -79,7 +79,7 @@ function isTemporalFilter(sc) {
|
|
|
79
79
|
}
|
|
80
80
|
exports.isTemporalFilter = isTemporalFilter;
|
|
81
81
|
function isFilterExpression(obj) {
|
|
82
|
-
return 'operator' in obj;
|
|
82
|
+
return obj && 'operator' in obj;
|
|
83
83
|
}
|
|
84
84
|
exports.isFilterExpression = isFilterExpression;
|
|
85
85
|
function isFilterable(s) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter_interface.js","sourceRoot":"","sources":["../src/filter_interface.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAaH,SAAgB,SAAS,CAAC,CAAS;IACjC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAFD,8BAEC;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;AAFD,8CAEC;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;AAlBD,wCAkBC;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;AAND,0CAMC;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;AAlBD,wCAkBC;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;AArBD,4CAqBC;AAQD,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,OAAO,UAAU,IAAI,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"filter_interface.js","sourceRoot":"","sources":["../src/filter_interface.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAaH,SAAgB,SAAS,CAAC,CAAS;IACjC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAFD,8BAEC;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;AAFD,8CAEC;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;AAlBD,wCAkBC;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;AAND,0CAMC;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;AAlBD,wCAkBC;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;AArBD,4CAqBC;AAQD,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,OAAO,GAAG,IAAI,UAAU,IAAI,GAAG,CAAC;AAClC,CAAC;AAFD,gDAEC;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;AAFD,oCAEC"}
|
package/dist/nearley_parse.js
CHANGED
|
@@ -13,7 +13,7 @@ function run_parser(src, parser) {
|
|
|
13
13
|
parser.feed(src);
|
|
14
14
|
const results = parser.finish();
|
|
15
15
|
const expr = results[0];
|
|
16
|
-
if ((0, filter_interface_1.isFilterExpression)(expr)) {
|
|
16
|
+
if (expr && (0, filter_interface_1.isFilterExpression)(expr)) {
|
|
17
17
|
return { parsed: expr, log: [] };
|
|
18
18
|
}
|
|
19
19
|
return { parsed: null, log: [] };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nearley_parse.js","sourceRoot":"","sources":["../src/nearley_parse.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,yDAAsD;AAEtD,SAAgB,UAAU,CACxB,GAAW,EACX,MAAc;IAEd,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,IAAA,qCAAkB,EAAC,IAAI,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"nearley_parse.js","sourceRoot":"","sources":["../src/nearley_parse.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,yDAAsD;AAEtD,SAAgB,UAAU,CACxB,GAAW,EACX,MAAc;IAEd,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,IAAI,IAAI,IAAA,qCAAkB,EAAC,IAAI,CAAC,EAAE,CAAC;YACrC,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;QACjC,CAAC;QACD,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAC,CAAC;IACjC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC;QAC3B,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,IAAI,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;QACrB,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YACtB,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;YAChB,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;YACxB,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;YAC1B,MAAM,QAAQ,GAAG,OAAO;iBACrB,KAAK,CAAC,0BAA0B,CAAC;iBACjC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;YACxC,UAAU,GAAG,cAAc,KAAK,CAAC,IAAI,WAAW,KAAK,CAAC,KAAK,GAAG,CAAC;YAC/D,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAChC,UAAU,IAAI,qBAAqB,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YAC9D,CAAC;QACH,CAAC;QACD,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE;gBACH;oBACE,OAAO,EAAE,UAAU;oBACnB,UAAU,EAAE,GAAG,GAAG,CAAC;oBACnB,QAAQ,EAAE,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC;oBAC3B,QAAQ,EAAE,OAAO;iBAClB;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC;AAzCD,gCAyCC"}
|
package/package.json
CHANGED
package/src/filter_interface.ts
CHANGED
|
@@ -276,7 +276,7 @@ export type FilterExpression =
|
|
|
276
276
|
| TemporalFilter;
|
|
277
277
|
|
|
278
278
|
export function isFilterExpression(obj: Object): obj is FilterExpression {
|
|
279
|
-
return 'operator' in obj;
|
|
279
|
+
return obj && 'operator' in obj;
|
|
280
280
|
}
|
|
281
281
|
|
|
282
282
|
export type FilterLogSeverity = 'error' | 'warn';
|
package/src/nearley_parse.ts
CHANGED
|
@@ -17,7 +17,7 @@ export function run_parser(
|
|
|
17
17
|
parser.feed(src);
|
|
18
18
|
const results = parser.finish();
|
|
19
19
|
const expr = results[0];
|
|
20
|
-
if (isFilterExpression(expr)) {
|
|
20
|
+
if (expr && isFilterExpression(expr)) {
|
|
21
21
|
return {parsed: expr, log: []};
|
|
22
22
|
}
|
|
23
23
|
return {parsed: null, log: []};
|