@malloydata/malloy-filter 0.0.349 → 0.0.351

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 (46) hide show
  1. package/README.md +3 -3
  2. package/dist/clause_utils.d.ts +7 -62
  3. package/dist/clause_utils.js +0 -14
  4. package/dist/clause_utils.js.map +1 -1
  5. package/dist/filter_interface.d.ts +5 -5
  6. package/dist/filter_interface.js +13 -5
  7. package/dist/filter_interface.js.map +1 -1
  8. package/dist/lib/fexpr_number_parser.d.ts +9 -26
  9. package/dist/lib/fexpr_number_parser.js +1476 -83
  10. package/dist/lib/fexpr_number_parser.js.map +1 -1
  11. package/dist/lib/fexpr_string_parser.d.ts +9 -26
  12. package/dist/lib/fexpr_string_parser.js +709 -50
  13. package/dist/lib/fexpr_string_parser.js.map +1 -1
  14. package/dist/lib/ftemporal_parser.d.ts +9 -26
  15. package/dist/lib/ftemporal_parser.js +4095 -163
  16. package/dist/lib/ftemporal_parser.js.map +1 -1
  17. package/dist/number_filter_expression.js +3 -41
  18. package/dist/number_filter_expression.js.map +1 -1
  19. package/dist/{nearley_parse.d.ts → peggy_parse.d.ts} +1 -2
  20. package/dist/peggy_parse.js +40 -0
  21. package/dist/peggy_parse.js.map +1 -0
  22. package/dist/string_filter_expression.js +3 -46
  23. package/dist/string_filter_expression.js.map +1 -1
  24. package/dist/temporal_filter_expression.js +3 -41
  25. package/dist/temporal_filter_expression.js.map +1 -1
  26. package/femto-config.motly +19 -0
  27. package/package.json +9 -11
  28. package/src/clause_utils.ts +9 -23
  29. package/src/filter_interface.ts +14 -8
  30. package/src/grammars/fexpr_number.peggy +46 -0
  31. package/src/grammars/fexpr_string.peggy +32 -0
  32. package/src/grammars/ftemporal.peggy +112 -0
  33. package/src/lib/fexpr_number_parser.js +1411 -0
  34. package/src/lib/fexpr_string_parser.js +740 -0
  35. package/src/lib/ftemporal_parser.js +3641 -0
  36. package/src/number_filter_expression.ts +3 -7
  37. package/src/peggy_parse.ts +50 -0
  38. package/src/string_filter_expression.ts +3 -12
  39. package/src/temporal_filter_expression.ts +3 -7
  40. package/tsconfig.json +3 -2
  41. package/dist/nearley_parse.js +0 -51
  42. package/dist/nearley_parse.js.map +0 -1
  43. package/src/lib/fexpr_number_parser.ts +0 -126
  44. package/src/lib/fexpr_string_parser.ts +0 -84
  45. package/src/lib/ftemporal_parser.ts +0 -246
  46. package/src/nearley_parse.ts +0 -53
@@ -1,53 +0,0 @@
1
- /*
2
- * Copyright (c) Meta Platforms, Inc. and affiliates.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE file in the root directory of this source tree.
6
- */
7
-
8
- import type {Parser} from 'nearley';
9
- import type {FilterExpression, FilterLog} from './filter_interface';
10
- import {isFilterExpression} from './filter_interface';
11
-
12
- export function run_parser(
13
- src: string,
14
- parser: Parser
15
- ): {parsed: FilterExpression | null; log: FilterLog[]} {
16
- try {
17
- parser.feed(src);
18
- const results = parser.finish();
19
- const expr = results[0];
20
- if (isFilterExpression(expr)) {
21
- return {parsed: expr, log: []};
22
- }
23
- return {parsed: null, log: []};
24
- } catch (e) {
25
- let newMessage = e.message;
26
- let col = 1;
27
- let len = src.length;
28
- if (e.token) {
29
- const token = e.token;
30
- col = token.col;
31
- len = token.text.length;
32
- const message = e.message;
33
- const expected = message
34
- .match(/(?<=A ).*(?= based on:)/g)
35
- .map(s => s.replace(/\s+token/i, ''));
36
- newMessage = `Unexpected ${token.type} token "${token.value}"`;
37
- if (expected && expected.length) {
38
- newMessage += ` Tokens expected: ${[...new Set(expected)]}`;
39
- }
40
- }
41
- return {
42
- parsed: null,
43
- log: [
44
- {
45
- message: newMessage,
46
- startIndex: col - 1,
47
- endIndex: col - 1 + len - 1,
48
- severity: 'error',
49
- },
50
- ],
51
- };
52
- }
53
- }