@jbrowse/jexl 3.0.2 → 3.1.0
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/README.md +11 -2
- package/dist/Expression.d.ts +16 -6
- package/dist/Expression.js +34 -8
- package/dist/Expression.js.map +1 -1
- package/dist/Jexl.d.ts +13 -12
- package/dist/Jexl.js +31 -30
- package/dist/Jexl.js.map +1 -1
- package/dist/Lexer.d.ts +9 -8
- package/dist/Lexer.js +58 -18
- package/dist/Lexer.js.map +1 -1
- package/dist/evaluator/Evaluator.d.ts +20 -34
- package/dist/evaluator/Evaluator.js +19 -64
- package/dist/evaluator/Evaluator.js.map +1 -1
- package/dist/evaluator/compile.d.ts +27 -0
- package/dist/evaluator/compile.js +261 -0
- package/dist/evaluator/compile.js.map +1 -0
- package/dist/grammar.d.ts +29 -9
- package/dist/grammar.js +19 -3
- package/dist/grammar.js.map +1 -1
- package/dist/parser/Parser.d.ts +5 -7
- package/dist/parser/Parser.js +17 -2
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/handlers.d.ts +0 -6
- package/dist/parser/handlers.js +54 -46
- package/dist/parser/handlers.js.map +1 -1
- package/dist/parser/states.d.ts +2 -2
- package/dist/parser/states.js +0 -20
- package/dist/parser/states.js.map +1 -1
- package/dist/types.d.ts +18 -7
- package/esm/Expression.d.ts +16 -6
- package/esm/Expression.js +34 -8
- package/esm/Expression.js.map +1 -1
- package/esm/Jexl.d.ts +13 -12
- package/esm/Jexl.js +31 -30
- package/esm/Jexl.js.map +1 -1
- package/esm/Lexer.d.ts +9 -8
- package/esm/Lexer.js +58 -18
- package/esm/Lexer.js.map +1 -1
- package/esm/evaluator/Evaluator.d.ts +20 -34
- package/esm/evaluator/Evaluator.js +19 -31
- package/esm/evaluator/Evaluator.js.map +1 -1
- package/esm/evaluator/compile.d.ts +27 -0
- package/esm/evaluator/compile.js +258 -0
- package/esm/evaluator/compile.js.map +1 -0
- package/esm/grammar.d.ts +29 -9
- package/esm/grammar.js +18 -3
- package/esm/grammar.js.map +1 -1
- package/esm/parser/Parser.d.ts +5 -7
- package/esm/parser/Parser.js +17 -2
- package/esm/parser/Parser.js.map +1 -1
- package/esm/parser/handlers.d.ts +0 -6
- package/esm/parser/handlers.js +54 -45
- package/esm/parser/handlers.js.map +1 -1
- package/esm/parser/states.d.ts +2 -2
- package/esm/parser/states.js +0 -20
- package/esm/parser/states.js.map +1 -1
- package/esm/types.d.ts +18 -7
- package/package.json +25 -28
- package/src/Expression.ts +33 -13
- package/src/Jexl.ts +59 -21
- package/src/Lexer.ts +60 -27
- package/src/evaluator/Evaluator.ts +27 -44
- package/src/evaluator/compile.ts +310 -0
- package/src/grammar.ts +66 -17
- package/src/parser/Parser.ts +24 -20
- package/src/parser/handlers.ts +96 -73
- package/src/parser/states.ts +2 -22
- package/src/types.ts +22 -7
- package/CHANGELOG.md +0 -249
- package/dist/evaluator/handlers.d.ts +0 -112
- package/dist/evaluator/handlers.js +0 -208
- package/dist/evaluator/handlers.js.map +0 -1
- package/esm/evaluator/handlers.d.ts +0 -112
- package/esm/evaluator/handlers.js +0 -194
- package/esm/evaluator/handlers.js.map +0 -1
- package/src/evaluator/handlers.ts +0 -212
|
@@ -0,0 +1,258 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Jexl
|
|
3
|
+
* Copyright 2020 Tom Shawver
|
|
4
|
+
*/
|
|
5
|
+
/** Renders an interpolated value for a template literal. */
|
|
6
|
+
function stringify(value) {
|
|
7
|
+
if (value == null) {
|
|
8
|
+
return '';
|
|
9
|
+
}
|
|
10
|
+
if (typeof value === 'string' ||
|
|
11
|
+
typeof value === 'number' ||
|
|
12
|
+
typeof value === 'boolean') {
|
|
13
|
+
return String(value);
|
|
14
|
+
}
|
|
15
|
+
return JSON.stringify(value);
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Lowers an expression tree into a tree of closures, resolving each node's type
|
|
19
|
+
* and its operator's implementation once, at compile time, rather than
|
|
20
|
+
* re-dispatching on `node.type` for every node on every evaluation. An
|
|
21
|
+
* expression compiled once and evaluated per-item — the usual shape for
|
|
22
|
+
* per-feature config callbacks — pays the dispatch cost once instead of N
|
|
23
|
+
* times.
|
|
24
|
+
*
|
|
25
|
+
* Operators are bound here, so a grammar change after compilation requires
|
|
26
|
+
* recompiling, which is what {@link Expression#compile} already documents.
|
|
27
|
+
* Functions are looked up per call, since they are commonly registered after
|
|
28
|
+
* an expression has been compiled.
|
|
29
|
+
*
|
|
30
|
+
* @param {{}} ast An expression tree, as produced by the Parser
|
|
31
|
+
* @param {{}} grammar The grammar to resolve operators against
|
|
32
|
+
* @returns {function} a closure returning the expression's value
|
|
33
|
+
* @throws {Error} if the tree contains an unrecognized node type
|
|
34
|
+
*/
|
|
35
|
+
export function compileAst(ast, grammar) {
|
|
36
|
+
switch (ast.type) {
|
|
37
|
+
case 'Literal': {
|
|
38
|
+
const { value } = ast;
|
|
39
|
+
return () => value;
|
|
40
|
+
}
|
|
41
|
+
case 'Identifier': {
|
|
42
|
+
const node = ast;
|
|
43
|
+
const name = node.value;
|
|
44
|
+
if (!node.from) {
|
|
45
|
+
return node.relative
|
|
46
|
+
? (ev) => ev._relContext[name]
|
|
47
|
+
: (ev) => ev._context[name];
|
|
48
|
+
}
|
|
49
|
+
const from = compileAst(node.from, grammar);
|
|
50
|
+
return (ev) => {
|
|
51
|
+
const context = from(ev);
|
|
52
|
+
if (context == null) {
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
// an identifier chained off an array reads through its first element
|
|
56
|
+
const ctx = Array.isArray(context) ? context[0] : context;
|
|
57
|
+
return ctx == null
|
|
58
|
+
? undefined
|
|
59
|
+
: ctx[name];
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
case 'BinaryExpression': {
|
|
63
|
+
const node = ast;
|
|
64
|
+
const op = grammar.elements[node.operator];
|
|
65
|
+
if (op?.type !== 'binaryOp') {
|
|
66
|
+
// matches the tree-walking behaviour: an unknown operator yields
|
|
67
|
+
// undefined without evaluating either operand
|
|
68
|
+
return () => undefined;
|
|
69
|
+
}
|
|
70
|
+
const left = compileAst(node.left, grammar);
|
|
71
|
+
const right = compileAst(node.right, grammar);
|
|
72
|
+
const { evalOnDemand } = op;
|
|
73
|
+
if (evalOnDemand) {
|
|
74
|
+
// operands stay unevaluated behind an `eval` thunk, so operators such
|
|
75
|
+
// as && and || can short-circuit
|
|
76
|
+
return (ev) => evalOnDemand({ eval: () => left(ev) }, { eval: () => right(ev) });
|
|
77
|
+
}
|
|
78
|
+
const fn = op.eval;
|
|
79
|
+
if (!fn) {
|
|
80
|
+
return (ev) => {
|
|
81
|
+
left(ev);
|
|
82
|
+
right(ev);
|
|
83
|
+
return undefined;
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
return (ev) => fn(left(ev), right(ev));
|
|
87
|
+
}
|
|
88
|
+
case 'UnaryExpression': {
|
|
89
|
+
const node = ast;
|
|
90
|
+
const right = compileAst(node.right, grammar);
|
|
91
|
+
const elem = grammar.elements[node.operator];
|
|
92
|
+
const fn = elem?.type === 'unaryOp'
|
|
93
|
+
? elem.eval
|
|
94
|
+
: elem?.type === 'binaryOp'
|
|
95
|
+
? elem.unaryEval
|
|
96
|
+
: undefined;
|
|
97
|
+
if (!fn) {
|
|
98
|
+
// the operand is still evaluated for an unknown operator, as before
|
|
99
|
+
return (ev) => {
|
|
100
|
+
right(ev);
|
|
101
|
+
return undefined;
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
return (ev) => fn(right(ev));
|
|
105
|
+
}
|
|
106
|
+
case 'ConditionalExpression': {
|
|
107
|
+
const node = ast;
|
|
108
|
+
const test = compileAst(node.test, grammar);
|
|
109
|
+
const consequent = node.consequent
|
|
110
|
+
? compileAst(node.consequent, grammar)
|
|
111
|
+
: undefined;
|
|
112
|
+
const alternate = node.alternate
|
|
113
|
+
? compileAst(node.alternate, grammar)
|
|
114
|
+
: undefined;
|
|
115
|
+
return (ev) => {
|
|
116
|
+
const res = test(ev);
|
|
117
|
+
if (res) {
|
|
118
|
+
// an omitted consequent ("a ?: b") yields the test result
|
|
119
|
+
return consequent ? consequent(ev) : res;
|
|
120
|
+
}
|
|
121
|
+
return alternate ? alternate(ev) : undefined;
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
case 'FilterExpression': {
|
|
125
|
+
const node = ast;
|
|
126
|
+
if (node.relative) {
|
|
127
|
+
// thrown on evaluation rather than compilation, as before
|
|
128
|
+
return () => {
|
|
129
|
+
throw new Error('Relative filter expressions are not supported');
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
const subject = compileAst(node.subject, grammar);
|
|
133
|
+
const index = compileAst(node.expr, grammar);
|
|
134
|
+
return (ev) => {
|
|
135
|
+
const subjectVal = subject(ev);
|
|
136
|
+
const indexVal = index(ev);
|
|
137
|
+
if (subjectVal == null) {
|
|
138
|
+
return undefined;
|
|
139
|
+
}
|
|
140
|
+
return typeof indexVal === 'string' || typeof indexVal === 'number'
|
|
141
|
+
? subjectVal[indexVal]
|
|
142
|
+
: undefined;
|
|
143
|
+
};
|
|
144
|
+
}
|
|
145
|
+
case 'ArrayLiteral': {
|
|
146
|
+
const items = ast.value.map((item) => compileAst(item, grammar));
|
|
147
|
+
const len = items.length;
|
|
148
|
+
return (ev) => {
|
|
149
|
+
const out = new Array(len);
|
|
150
|
+
for (let i = 0; i < len; i++) {
|
|
151
|
+
out[i] = items[i](ev);
|
|
152
|
+
}
|
|
153
|
+
return out;
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
case 'ObjectLiteral': {
|
|
157
|
+
const entries = Object.entries(ast.value);
|
|
158
|
+
const keys = entries.map(([key]) => key);
|
|
159
|
+
const values = entries.map(([, node]) => compileAst(node, grammar));
|
|
160
|
+
const len = keys.length;
|
|
161
|
+
return (ev) => {
|
|
162
|
+
const out = {};
|
|
163
|
+
for (let i = 0; i < len; i++) {
|
|
164
|
+
out[keys[i]] = values[i](ev);
|
|
165
|
+
}
|
|
166
|
+
return out;
|
|
167
|
+
};
|
|
168
|
+
}
|
|
169
|
+
case 'TemplateLiteral': {
|
|
170
|
+
// every part renders to a string, so these are narrower than CompiledNode
|
|
171
|
+
const parts = ast.parts.map((part) => {
|
|
172
|
+
if (part.type === 'static') {
|
|
173
|
+
const { value } = part;
|
|
174
|
+
return () => value;
|
|
175
|
+
}
|
|
176
|
+
const expr = compileAst(part.value, grammar);
|
|
177
|
+
return (ev) => stringify(expr(ev));
|
|
178
|
+
});
|
|
179
|
+
return (ev) => {
|
|
180
|
+
let out = '';
|
|
181
|
+
for (const part of parts) {
|
|
182
|
+
out += part(ev);
|
|
183
|
+
}
|
|
184
|
+
return out;
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
case 'FunctionCall': {
|
|
188
|
+
const node = ast;
|
|
189
|
+
const { name } = node;
|
|
190
|
+
const args = node.args.map((arg) => compileAst(arg, grammar));
|
|
191
|
+
// hasOwn, so that inherited Object.prototype members such as `toString`
|
|
192
|
+
// and `constructor` aren't callable as Jexl functions. Resolved per call
|
|
193
|
+
// rather than baked in, since functions are routinely registered after
|
|
194
|
+
// an expression has been compiled.
|
|
195
|
+
const lookup = (ev) => {
|
|
196
|
+
const { functions } = ev._grammar;
|
|
197
|
+
if (!Object.hasOwn(functions, name)) {
|
|
198
|
+
throw new Error(`Jexl Function ${name} is not defined.`);
|
|
199
|
+
}
|
|
200
|
+
return functions[name];
|
|
201
|
+
};
|
|
202
|
+
// the small arities are spelled out so an ordinary call allocates no
|
|
203
|
+
// argument array and needs no spread
|
|
204
|
+
switch (args.length) {
|
|
205
|
+
case 0: {
|
|
206
|
+
return (ev) => lookup(ev)();
|
|
207
|
+
}
|
|
208
|
+
case 1: {
|
|
209
|
+
const [a0] = args;
|
|
210
|
+
return (ev) => lookup(ev)(a0(ev));
|
|
211
|
+
}
|
|
212
|
+
case 2: {
|
|
213
|
+
const [a0, a1] = args;
|
|
214
|
+
return (ev) => lookup(ev)(a0(ev), a1(ev));
|
|
215
|
+
}
|
|
216
|
+
case 3: {
|
|
217
|
+
const [a0, a1, a2] = args;
|
|
218
|
+
return (ev) => lookup(ev)(a0(ev), a1(ev), a2(ev));
|
|
219
|
+
}
|
|
220
|
+
default: {
|
|
221
|
+
const len = args.length;
|
|
222
|
+
return (ev) => {
|
|
223
|
+
const vals = new Array(len);
|
|
224
|
+
for (let i = 0; i < len; i++) {
|
|
225
|
+
vals[i] = args[i](ev);
|
|
226
|
+
}
|
|
227
|
+
return lookup(ev)(...vals);
|
|
228
|
+
};
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
case 'SequenceExpression': {
|
|
233
|
+
const exprs = ast.expressions.map((expr) => compileAst(expr, grammar));
|
|
234
|
+
const len = exprs.length;
|
|
235
|
+
return (ev) => {
|
|
236
|
+
let last;
|
|
237
|
+
for (let i = 0; i < len; i++) {
|
|
238
|
+
last = exprs[i](ev);
|
|
239
|
+
}
|
|
240
|
+
return last;
|
|
241
|
+
};
|
|
242
|
+
}
|
|
243
|
+
case 'AssignmentExpression': {
|
|
244
|
+
const node = ast;
|
|
245
|
+
const name = node.left.value;
|
|
246
|
+
const right = compileAst(node.right, grammar);
|
|
247
|
+
return (ev) => {
|
|
248
|
+
const value = right(ev);
|
|
249
|
+
ev._context[name] = value;
|
|
250
|
+
return value;
|
|
251
|
+
};
|
|
252
|
+
}
|
|
253
|
+
default: {
|
|
254
|
+
throw new Error(`Corrupt AST: unknown node type '${ast.type}'`);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
//# sourceMappingURL=compile.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/evaluator/compile.ts"],"names":[],"mappings":"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"}
|
package/esm/grammar.d.ts
CHANGED
|
@@ -1,24 +1,44 @@
|
|
|
1
|
+
import type { JexlValue } from './types.ts';
|
|
2
|
+
export type BinaryOpEval = (left: JexlValue, right: JexlValue) => JexlValue;
|
|
3
|
+
export type BinaryOpEvalOnDemand = (left: {
|
|
4
|
+
eval: () => JexlValue;
|
|
5
|
+
}, right: {
|
|
6
|
+
eval: () => JexlValue;
|
|
7
|
+
}) => JexlValue;
|
|
1
8
|
export interface BinaryOp {
|
|
2
9
|
type: 'binaryOp';
|
|
3
10
|
precedence: number;
|
|
4
|
-
eval?:
|
|
5
|
-
evalOnDemand?:
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
11
|
+
eval?: BinaryOpEval;
|
|
12
|
+
evalOnDemand?: BinaryOpEvalOnDemand;
|
|
13
|
+
/**
|
|
14
|
+
* Evaluator for the operator's prefix form, if it has one. The Lexer emits a
|
|
15
|
+
* unaryOp token when such an operator appears where an operand is expected,
|
|
16
|
+
* which is how `-x` is distinguished from `a - x`.
|
|
17
|
+
*/
|
|
18
|
+
unaryEval?: (right: JexlValue) => JexlValue;
|
|
10
19
|
}
|
|
11
20
|
export interface UnaryOp {
|
|
12
21
|
type: 'unaryOp';
|
|
13
22
|
precedence: number;
|
|
14
|
-
eval: (right:
|
|
23
|
+
eval: (right: JexlValue) => JexlValue;
|
|
15
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* The punctuation elements of the grammar. Unlike operators these carry no
|
|
27
|
+
* behavior of their own; the Parser's state machine gives them meaning. The
|
|
28
|
+
* type is a literal union rather than `string` so that `GrammarElement` is a
|
|
29
|
+
* discriminated union, letting operator properties be accessed without casts.
|
|
30
|
+
*/
|
|
16
31
|
export interface SimpleElement {
|
|
17
|
-
type:
|
|
32
|
+
type: 'dot' | 'openBracket' | 'closeBracket' | 'openCurl' | 'closeCurl' | 'colon' | 'comma' | 'openParen' | 'closeParen' | 'question' | 'semicolon';
|
|
18
33
|
}
|
|
19
34
|
export type GrammarElement = BinaryOp | UnaryOp | SimpleElement;
|
|
20
35
|
export interface Grammar {
|
|
21
36
|
elements: Record<string, GrammarElement>;
|
|
22
|
-
functions: Record<string, (...args:
|
|
37
|
+
functions: Record<string, (...args: JexlValue[]) => JexlValue>;
|
|
23
38
|
}
|
|
39
|
+
/**
|
|
40
|
+
* Returns the binding power of a grammar element, or 0 for elements that
|
|
41
|
+
* aren't operators and therefore don't participate in precedence.
|
|
42
|
+
*/
|
|
43
|
+
export declare function precedenceOf(elem: GrammarElement | undefined): number;
|
|
24
44
|
export declare const getGrammar: () => Grammar;
|
package/esm/grammar.js
CHANGED
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
* Jexl
|
|
3
3
|
* Copyright 2020 Tom Shawver
|
|
4
4
|
*/
|
|
5
|
+
/**
|
|
6
|
+
* Returns the binding power of a grammar element, or 0 for elements that
|
|
7
|
+
* aren't operators and therefore don't participate in precedence.
|
|
8
|
+
*/
|
|
9
|
+
export function precedenceOf(elem) {
|
|
10
|
+
return elem && (elem.type === 'binaryOp' || elem.type === 'unaryOp')
|
|
11
|
+
? elem.precedence
|
|
12
|
+
: 0;
|
|
13
|
+
}
|
|
5
14
|
export const getGrammar = () => ({
|
|
6
15
|
/**
|
|
7
16
|
* A map of all expression elements to their properties. Note that changes
|
|
@@ -28,7 +37,8 @@ export const getGrammar = () => ({
|
|
|
28
37
|
'-': {
|
|
29
38
|
type: 'binaryOp',
|
|
30
39
|
precedence: 30,
|
|
31
|
-
eval: (left, right) => left - right
|
|
40
|
+
eval: (left, right) => left - right,
|
|
41
|
+
unaryEval: (right) => -right
|
|
32
42
|
},
|
|
33
43
|
'*': {
|
|
34
44
|
type: 'binaryOp',
|
|
@@ -53,7 +63,7 @@ export const getGrammar = () => ({
|
|
|
53
63
|
'^': {
|
|
54
64
|
type: 'binaryOp',
|
|
55
65
|
precedence: 50,
|
|
56
|
-
eval: (left, right) =>
|
|
66
|
+
eval: (left, right) => left ** right
|
|
57
67
|
},
|
|
58
68
|
'==': {
|
|
59
69
|
type: 'binaryOp',
|
|
@@ -112,7 +122,12 @@ export const getGrammar = () => ({
|
|
|
112
122
|
precedence: 20,
|
|
113
123
|
eval: (left, right) => {
|
|
114
124
|
if (typeof right === 'string') {
|
|
115
|
-
|
|
125
|
+
const leftStr = typeof left === 'string' ||
|
|
126
|
+
typeof left === 'number' ||
|
|
127
|
+
typeof left === 'boolean'
|
|
128
|
+
? String(left)
|
|
129
|
+
: '';
|
|
130
|
+
return right.includes(leftStr);
|
|
116
131
|
}
|
|
117
132
|
if (Array.isArray(right)) {
|
|
118
133
|
return right.includes(left);
|
package/esm/grammar.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grammar.js","sourceRoot":"","sources":["../src/grammar.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"grammar.js","sourceRoot":"","sources":["../src/grammar.ts"],"names":[],"mappings":"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"}
|
package/esm/parser/Parser.d.ts
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import type Lexer from '../Lexer.ts';
|
|
2
|
+
import type { Grammar } from '../grammar.ts';
|
|
2
3
|
import type { AstNode, Token } from '../types.ts';
|
|
3
|
-
interface Grammar {
|
|
4
|
-
elements: Record<string, any>;
|
|
5
|
-
}
|
|
6
4
|
/**
|
|
7
5
|
* The Parser is a state machine that converts tokens from the {@link Lexer}
|
|
8
6
|
* into an Abstract Syntax Tree (AST), capable of being evaluated in any
|
|
@@ -27,7 +25,7 @@ declare class Parser {
|
|
|
27
25
|
_tree: AstNode | null;
|
|
28
26
|
_exprStr: string;
|
|
29
27
|
_relative: boolean;
|
|
30
|
-
_stopMap: Record<string,
|
|
28
|
+
_stopMap: Record<string, string>;
|
|
31
29
|
_cursor?: AstNode | null;
|
|
32
30
|
_subParser?: Parser;
|
|
33
31
|
_parentStop?: boolean;
|
|
@@ -35,7 +33,7 @@ declare class Parser {
|
|
|
35
33
|
_nextIdentRelative?: boolean;
|
|
36
34
|
_curObjKey?: string;
|
|
37
35
|
_sequenceExpressions?: AstNode[];
|
|
38
|
-
constructor(grammar: Grammar, lexer: Lexer, prefix?: string, stopMap?: Record<string,
|
|
36
|
+
constructor(grammar: Grammar, lexer: Lexer, prefix?: string, stopMap?: Record<string, string>);
|
|
39
37
|
/**
|
|
40
38
|
* Processes a new token into the AST and manages the transitions of the state
|
|
41
39
|
* machine.
|
|
@@ -46,7 +44,7 @@ declare class Parser {
|
|
|
46
44
|
* @returns {boolean|*} the stopState value if this parser encountered a token
|
|
47
45
|
* in the stopState mapb false if tokens can continue.
|
|
48
46
|
*/
|
|
49
|
-
addToken(token: Token):
|
|
47
|
+
addToken(token: Token): string | false;
|
|
50
48
|
/**
|
|
51
49
|
* Processes an array of tokens iteratively through the {@link #addToken}
|
|
52
50
|
* function.
|
|
@@ -62,7 +60,7 @@ declare class Parser {
|
|
|
62
60
|
* @throws {Error} if the parser is not in a state where it's legal to end
|
|
63
61
|
* the expression, indicating that the expression is incomplete
|
|
64
62
|
*/
|
|
65
|
-
complete():
|
|
63
|
+
complete(): AstNode | null;
|
|
66
64
|
/**
|
|
67
65
|
* Indicates whether the expression tree contains a relative path identifier.
|
|
68
66
|
* @returns {boolean} true if a relative identifier exists false otherwise.
|
package/esm/parser/Parser.js
CHANGED
|
@@ -22,6 +22,20 @@ import { states } from "./states.js";
|
|
|
22
22
|
* instead of boolean false.
|
|
23
23
|
*/
|
|
24
24
|
class Parser {
|
|
25
|
+
_grammar;
|
|
26
|
+
_lexer;
|
|
27
|
+
_state;
|
|
28
|
+
_tree;
|
|
29
|
+
_exprStr;
|
|
30
|
+
_relative;
|
|
31
|
+
_stopMap;
|
|
32
|
+
_cursor;
|
|
33
|
+
_subParser;
|
|
34
|
+
_parentStop;
|
|
35
|
+
_nextIdentEncapsulate;
|
|
36
|
+
_nextIdentRelative;
|
|
37
|
+
_curObjKey;
|
|
38
|
+
_sequenceExpressions;
|
|
25
39
|
constructor(grammar, lexer, prefix, stopMap) {
|
|
26
40
|
this._grammar = grammar;
|
|
27
41
|
this._lexer = lexer;
|
|
@@ -97,7 +111,9 @@ class Parser {
|
|
|
97
111
|
* the {@link Lexer#tokenize} function.
|
|
98
112
|
*/
|
|
99
113
|
addTokens(tokens) {
|
|
100
|
-
|
|
114
|
+
for (const token of tokens) {
|
|
115
|
+
this.addToken(token);
|
|
116
|
+
}
|
|
101
117
|
}
|
|
102
118
|
/**
|
|
103
119
|
* Marks this Parser instance as completed and retrieves the full AST.
|
|
@@ -156,7 +172,6 @@ class Parser {
|
|
|
156
172
|
this._tree = node;
|
|
157
173
|
}
|
|
158
174
|
else {
|
|
159
|
-
;
|
|
160
175
|
this._cursor.right = node;
|
|
161
176
|
this._setParent(node, this._cursor);
|
|
162
177
|
}
|
package/esm/parser/Parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Parser.js","sourceRoot":"","sources":["../../src/parser/Parser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"Parser.js","sourceRoot":"","sources":["../../src/parser/Parser.ts"],"names":[],"mappings":"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"}
|
package/esm/parser/handlers.d.ts
CHANGED
|
@@ -94,12 +94,6 @@ export declare function ternaryMid(this: Parser, ast: AstNode | null): void;
|
|
|
94
94
|
* test element.
|
|
95
95
|
*/
|
|
96
96
|
export declare function ternaryStart(this: Parser): void;
|
|
97
|
-
/**
|
|
98
|
-
* Handles identifier tokens when used to indicate the name of a transform to
|
|
99
|
-
* be applied.
|
|
100
|
-
* @param {{type: <string>}} token A token object
|
|
101
|
-
*/
|
|
102
|
-
export declare function transform(this: Parser, token: Token): void;
|
|
103
97
|
/**
|
|
104
98
|
* Handles token of type 'unaryOp', indicating that the operation has only
|
|
105
99
|
* one input: a right side.
|