@jbrowse/jexl 3.0.1 → 3.1.0

package/esm/evaluator/Evaluator.js

@@ -2,15 +2,19 @@
  * Jexl
  * Copyright 2020 Tom Shawver
  */
-import * as handlers from "./handlers.js";
+import { compileAst } from "./compile.js";
 /**
- * The Evaluator takes a Jexl expression tree as generated by the
- * {@link Parser} and calculates its value within a given context. The
- * collection of transforms, context, and a relative context to be used as the
- * root for relative identifiers, are all specific to an Evaluator instance.
- * When any of these things change, a new instance is required.  However, a
- * single instance can be used to simultaneously evaluate many different
+ * The Evaluator carries everything an expression is evaluated against: the
+ * grammar, the context, and a relative context to be used as the root for
+ * relative identifiers. When any of these change, a new instance is required.
+ * However, a single instance can be used to evaluate many different
  * expressions, and does not have to be reinstantiated for each.
+ *
+ * The work of evaluation itself lives in {@link compileAst}, which lowers a
+ * tree to closures. Prefer compiling once and reusing the result — that is what
+ * {@link Expression} does — over calling {@link #eval}, which compiles the tree
+ * it is given every time.
+ *
  * @param {{}} grammar A grammar object against which to evaluate the expression
  *      tree
  * @param {{}} [context] A map of variable keys to their values. This will be
@@ -19,40 +23,24 @@ import * as handlers from "./handlers.js";
  *      to resolve the value of a relative identifier.
  */
 class Evaluator {
+    _grammar;
+    _context;
+    _relContext;
     constructor(grammar, context, relativeContext) {
         this._grammar = grammar;
         this._context = context || {};
         this._relContext = relativeContext || this._context;
     }
     /**
-     * Evaluates an expression tree within the configured context.
+     * Compiles and evaluates an expression tree within the configured context.
+     * Convenient for a one-shot evaluation; for repeated evaluation of the same
+     * tree, hold onto the closure from {@link compileAst} instead so the tree is
+     * only lowered once.
      * @param {{}} ast An expression tree object
      * @returns {*} the resulting value of the expression.
      */
     eval(ast) {
-        return handlers[ast.type].call(this, ast);
-    }
-    /**
-     * Evaluates each expression within an array, and delivers the response as an
-     * array with the resulting values at the same indexes as their originating
-     * expressions.
-     * @param {Array<string>} arr An array of expression strings to be evaluated
-     * @returns {Array<{}>} the result array
-     */
-    evalArray(arr) {
-        return arr.map((elem) => this.eval(elem));
-    }
-    /**
-     * Evaluates each expression within a map, and delivers the response as a map
-     * with the same keys, but with the evaluated result for each as their value.
-     * @param {{}} map A map of expression names to expression trees to be
-     *      evaluated
-     * @returns {{}} the result map.
-     */
-    evalMap(map) {
-        const entries = Object.entries(map);
-        const vals = entries.map(([_, ast]) => this.eval(ast));
-        return Object.fromEntries(entries.map(([key], idx) => [key, vals[idx]]));
+        return compileAst(ast, this._grammar)(this);
     }
 }
 export default Evaluator;

package/esm/evaluator/Evaluator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Evaluator.js","sourceRoot":"","sources":["../../src/evaluator/Evaluator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AASzC;;;;;;;;;;;;;;GAcG;AACH,MAAM,SAAS;IAKb,YAAY,OAAgB,EAAE,OAAa,EAAE,eAAqB;QAChE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,QAAQ,GAAG,OAAO,IAAI,EAAE,CAAA;QAC7B,IAAI,CAAC,WAAW,GAAG,eAAe,IAAI,IAAI,CAAC,QAAQ,CAAA;IACrD,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,GAAY;QACf,OAAQ,QAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IACpD,CAAC;IAED;;;;;;OAMG;IACH,SAAS,CAAC,GAAc;QACtB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IACpD,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,GAA4B;QAClC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACnC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QACtD,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1E,CAAC;CACF;AAED,eAAe,SAAS,CAAA"}
+{"version":3,"file":"Evaluator.js","sourceRoot":"","sources":["../../src/evaluator/Evaluator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAKzC;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,SAAS;IACb,QAAQ,CAAS;IACjB,QAAQ,CAA2B;IACnC,WAAW,CAA2B;IAEtC,YACE,OAAgB,EAChB,OAAmC,EACnC,eAA2C;QAE3C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,QAAQ,GAAG,OAAO,IAAI,EAAE,CAAA;QAC7B,IAAI,CAAC,WAAW,GAAG,eAAe,IAAI,IAAI,CAAC,QAAQ,CAAA;IACrD,CAAC;IAED;;;;;;;OAOG;IACH,IAAI,CAAC,GAAY;QACf,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAA;IAC7C,CAAC;CACF;AAED,eAAe,SAAS,CAAA"}

package/esm/evaluator/compile.d.ts

@@ -0,0 +1,27 @@
+import type { Grammar } from '../grammar.ts';
+import type { AstNode, JexlValue } from '../types.ts';
+import type Evaluator from './Evaluator.ts';
+/**
+ * An AST node lowered to a closure. Calling it with an Evaluator (which carries
+ * the context and grammar) produces the node's value.
+ */
+export type CompiledNode = (ev: Evaluator) => JexlValue;
+/**
+ * Lowers an expression tree into a tree of closures, resolving each node's type
+ * and its operator's implementation once, at compile time, rather than
+ * re-dispatching on `node.type` for every node on every evaluation. An
+ * expression compiled once and evaluated per-item — the usual shape for
+ * per-feature config callbacks — pays the dispatch cost once instead of N
+ * times.
+ *
+ * Operators are bound here, so a grammar change after compilation requires
+ * recompiling, which is what {@link Expression#compile} already documents.
+ * Functions are looked up per call, since they are commonly registered after
+ * an expression has been compiled.
+ *
+ * @param {{}} ast An expression tree, as produced by the Parser
+ * @param {{}} grammar The grammar to resolve operators against
+ * @returns {function} a closure returning the expression's value
+ * @throws {Error} if the tree contains an unrecognized node type
+ */
+export declare function compileAst(ast: AstNode, grammar: Grammar): CompiledNode;

package/esm/evaluator/compile.js

@@ -0,0 +1,258 @@
+/*
+ * Jexl
+ * Copyright 2020 Tom Shawver
+ */
+/** Renders an interpolated value for a template literal. */
+function stringify(value) {
+    if (value == null) {
+        return '';
+    }
+    if (typeof value === 'string' ||
+        typeof value === 'number' ||
+        typeof value === 'boolean') {
+        return String(value);
+    }
+    return JSON.stringify(value);
+}
+/**
+ * Lowers an expression tree into a tree of closures, resolving each node's type
+ * and its operator's implementation once, at compile time, rather than
+ * re-dispatching on `node.type` for every node on every evaluation. An
+ * expression compiled once and evaluated per-item — the usual shape for
+ * per-feature config callbacks — pays the dispatch cost once instead of N
+ * times.
+ *
+ * Operators are bound here, so a grammar change after compilation requires
+ * recompiling, which is what {@link Expression#compile} already documents.
+ * Functions are looked up per call, since they are commonly registered after
+ * an expression has been compiled.
+ *
+ * @param {{}} ast An expression tree, as produced by the Parser
+ * @param {{}} grammar The grammar to resolve operators against
+ * @returns {function} a closure returning the expression's value
+ * @throws {Error} if the tree contains an unrecognized node type
+ */
+export function compileAst(ast, grammar) {
+    switch (ast.type) {
+        case 'Literal': {
+            const { value } = ast;
+            return () => value;
+        }
+        case 'Identifier': {
+            const node = ast;
+            const name = node.value;
+            if (!node.from) {
+                return node.relative
+                    ? (ev) => ev._relContext[name]
+                    : (ev) => ev._context[name];
+            }
+            const from = compileAst(node.from, grammar);
+            return (ev) => {
+                const context = from(ev);
+                if (context == null) {
+                    return undefined;
+                }
+                // an identifier chained off an array reads through its first element
+                const ctx = Array.isArray(context) ? context[0] : context;
+                return ctx == null
+                    ? undefined
+                    : ctx[name];
+            };
+        }
+        case 'BinaryExpression': {
+            const node = ast;
+            const op = grammar.elements[node.operator];
+            if (op?.type !== 'binaryOp') {
+                // matches the tree-walking behaviour: an unknown operator yields
+                // undefined without evaluating either operand
+                return () => undefined;
+            }
+            const left = compileAst(node.left, grammar);
+            const right = compileAst(node.right, grammar);
+            const { evalOnDemand } = op;
+            if (evalOnDemand) {
+                // operands stay unevaluated behind an `eval` thunk, so operators such
+                // as && and || can short-circuit
+                return (ev) => evalOnDemand({ eval: () => left(ev) }, { eval: () => right(ev) });
+            }
+            const fn = op.eval;
+            if (!fn) {
+                return (ev) => {
+                    left(ev);
+                    right(ev);
+                    return undefined;
+                };
+            }
+            return (ev) => fn(left(ev), right(ev));
+        }
+        case 'UnaryExpression': {
+            const node = ast;
+            const right = compileAst(node.right, grammar);
+            const elem = grammar.elements[node.operator];
+            const fn = elem?.type === 'unaryOp'
+                ? elem.eval
+                : elem?.type === 'binaryOp'
+                    ? elem.unaryEval
+                    : undefined;
+            if (!fn) {
+                // the operand is still evaluated for an unknown operator, as before
+                return (ev) => {
+                    right(ev);
+                    return undefined;
+                };
+            }
+            return (ev) => fn(right(ev));
+        }
+        case 'ConditionalExpression': {
+            const node = ast;
+            const test = compileAst(node.test, grammar);
+            const consequent = node.consequent
+                ? compileAst(node.consequent, grammar)
+                : undefined;
+            const alternate = node.alternate
+                ? compileAst(node.alternate, grammar)
+                : undefined;
+            return (ev) => {
+                const res = test(ev);
+                if (res) {
+                    // an omitted consequent ("a ?: b") yields the test result
+                    return consequent ? consequent(ev) : res;
+                }
+                return alternate ? alternate(ev) : undefined;
+            };
+        }
+        case 'FilterExpression': {
+            const node = ast;
+            if (node.relative) {
+                // thrown on evaluation rather than compilation, as before
+                return () => {
+                    throw new Error('Relative filter expressions are not supported');
+                };
+            }
+            const subject = compileAst(node.subject, grammar);
+            const index = compileAst(node.expr, grammar);
+            return (ev) => {
+                const subjectVal = subject(ev);
+                const indexVal = index(ev);
+                if (subjectVal == null) {
+                    return undefined;
+                }
+                return typeof indexVal === 'string' || typeof indexVal === 'number'
+                    ? subjectVal[indexVal]
+                    : undefined;
+            };
+        }
+        case 'ArrayLiteral': {
+            const items = ast.value.map((item) => compileAst(item, grammar));
+            const len = items.length;
+            return (ev) => {
+                const out = new Array(len);
+                for (let i = 0; i < len; i++) {
+                    out[i] = items[i](ev);
+                }
+                return out;
+            };
+        }
+        case 'ObjectLiteral': {
+            const entries = Object.entries(ast.value);
+            const keys = entries.map(([key]) => key);
+            const values = entries.map(([, node]) => compileAst(node, grammar));
+            const len = keys.length;
+            return (ev) => {
+                const out = {};
+                for (let i = 0; i < len; i++) {
+                    out[keys[i]] = values[i](ev);
+                }
+                return out;
+            };
+        }
+        case 'TemplateLiteral': {
+            // every part renders to a string, so these are narrower than CompiledNode
+            const parts = ast.parts.map((part) => {
+                if (part.type === 'static') {
+                    const { value } = part;
+                    return () => value;
+                }
+                const expr = compileAst(part.value, grammar);
+                return (ev) => stringify(expr(ev));
+            });
+            return (ev) => {
+                let out = '';
+                for (const part of parts) {
+                    out += part(ev);
+                }
+                return out;
+            };
+        }
+        case 'FunctionCall': {
+            const node = ast;
+            const { name } = node;
+            const args = node.args.map((arg) => compileAst(arg, grammar));
+            // hasOwn, so that inherited Object.prototype members such as `toString`
+            // and `constructor` aren't callable as Jexl functions. Resolved per call
+            // rather than baked in, since functions are routinely registered after
+            // an expression has been compiled.
+            const lookup = (ev) => {
+                const { functions } = ev._grammar;
+                if (!Object.hasOwn(functions, name)) {
+                    throw new Error(`Jexl Function ${name} is not defined.`);
+                }
+                return functions[name];
+            };
+            // the small arities are spelled out so an ordinary call allocates no
+            // argument array and needs no spread
+            switch (args.length) {
+                case 0: {
+                    return (ev) => lookup(ev)();
+                }
+                case 1: {
+                    const [a0] = args;
+                    return (ev) => lookup(ev)(a0(ev));
+                }
+                case 2: {
+                    const [a0, a1] = args;
+                    return (ev) => lookup(ev)(a0(ev), a1(ev));
+                }
+                case 3: {
+                    const [a0, a1, a2] = args;
+                    return (ev) => lookup(ev)(a0(ev), a1(ev), a2(ev));
+                }
+                default: {
+                    const len = args.length;
+                    return (ev) => {
+                        const vals = new Array(len);
+                        for (let i = 0; i < len; i++) {
+                            vals[i] = args[i](ev);
+                        }
+                        return lookup(ev)(...vals);
+                    };
+                }
+            }
+        }
+        case 'SequenceExpression': {
+            const exprs = ast.expressions.map((expr) => compileAst(expr, grammar));
+            const len = exprs.length;
+            return (ev) => {
+                let last;
+                for (let i = 0; i < len; i++) {
+                    last = exprs[i](ev);
+                }
+                return last;
+            };
+        }
+        case 'AssignmentExpression': {
+            const node = ast;
+            const name = node.left.value;
+            const right = compileAst(node.right, grammar);
+            return (ev) => {
+                const value = right(ev);
+                ev._context[name] = value;
+                return value;
+            };
+        }
+        default: {
+            throw new Error(`Corrupt AST: unknown node type '${ast.type}'`);
+        }
+    }
+}
+//# sourceMappingURL=compile.js.map

package/esm/evaluator/compile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/evaluator/compile.ts"],"names":[],"mappings":"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"}

package/esm/grammar.d.ts

@@ -1,24 +1,44 @@
+import type { JexlValue } from './types.ts';
+export type BinaryOpEval = (left: JexlValue, right: JexlValue) => JexlValue;
+export type BinaryOpEvalOnDemand = (left: {
+    eval: () => JexlValue;
+}, right: {
+    eval: () => JexlValue;
+}) => JexlValue;
 export interface BinaryOp {
     type: 'binaryOp';
     precedence: number;
-    eval?: (left: any, right: any) => any;
-    evalOnDemand?: (left: {
-        eval: () => any;
-    }, right: {
-        eval: () => any;
-    }) => any;
+    eval?: BinaryOpEval;
+    evalOnDemand?: BinaryOpEvalOnDemand;
+    /**
+     * Evaluator for the operator's prefix form, if it has one. The Lexer emits a
+     * unaryOp token when such an operator appears where an operand is expected,
+     * which is how `-x` is distinguished from `a - x`.
+     */
+    unaryEval?: (right: JexlValue) => JexlValue;
 }
 export interface UnaryOp {
     type: 'unaryOp';
     precedence: number;
-    eval: (right: any) => any;
+    eval: (right: JexlValue) => JexlValue;
 }
+/**
+ * The punctuation elements of the grammar. Unlike operators these carry no
+ * behavior of their own; the Parser's state machine gives them meaning. The
+ * type is a literal union rather than `string` so that `GrammarElement` is a
+ * discriminated union, letting operator properties be accessed without casts.
+ */
 export interface SimpleElement {
-    type: string;
+    type: 'dot' | 'openBracket' | 'closeBracket' | 'openCurl' | 'closeCurl' | 'colon' | 'comma' | 'openParen' | 'closeParen' | 'question' | 'semicolon';
 }
 export type GrammarElement = BinaryOp | UnaryOp | SimpleElement;
 export interface Grammar {
     elements: Record<string, GrammarElement>;
-    functions: Record<string, (...args: any[]) => any>;
+    functions: Record<string, (...args: JexlValue[]) => JexlValue>;
 }
+/**
+ * Returns the binding power of a grammar element, or 0 for elements that
+ * aren't operators and therefore don't participate in precedence.
+ */
+export declare function precedenceOf(elem: GrammarElement | undefined): number;
 export declare const getGrammar: () => Grammar;

package/esm/grammar.js

@@ -2,6 +2,15 @@
  * Jexl
  * Copyright 2020 Tom Shawver
  */
+/**
+ * Returns the binding power of a grammar element, or 0 for elements that
+ * aren't operators and therefore don't participate in precedence.
+ */
+export function precedenceOf(elem) {
+    return elem && (elem.type === 'binaryOp' || elem.type === 'unaryOp')
+        ? elem.precedence
+        : 0;
+}
 export const getGrammar = () => ({
     /**
      * A map of all expression elements to their properties. Note that changes
@@ -28,7 +37,8 @@ export const getGrammar = () => ({
         '-': {
             type: 'binaryOp',
             precedence: 30,
-            eval: (left, right) => left - right
+            eval: (left, right) => left - right,
+            unaryEval: (right) => -right
         },
         '*': {
             type: 'binaryOp',
@@ -53,7 +63,7 @@ export const getGrammar = () => ({
         '^': {
             type: 'binaryOp',
             precedence: 50,
-            eval: (left, right) => Math.pow(left, right)
+            eval: (left, right) => left ** right
         },
         '==': {
             type: 'binaryOp',
@@ -112,7 +122,12 @@ export const getGrammar = () => ({
             precedence: 20,
             eval: (left, right) => {
                 if (typeof right === 'string') {
-                    return right.includes(left);
+                    const leftStr = typeof left === 'string' ||
+                        typeof left === 'number' ||
+                        typeof left === 'boolean'
+                        ? String(left)
+                        : '';
+                    return right.includes(leftStr);
                 }
                 if (Array.isArray(right)) {
                     return right.includes(left);

package/esm/grammar.js.map

@@ -1 +1 @@
-{"version":3,"file":"grammar.js","sourceRoot":"","sources":["../src/grammar.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grammar.js","sourceRoot":"","sources":["../src/grammar.ts"],"names":[],"mappings":"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"}

package/esm/parser/Parser.d.ts

@@ -1,8 +1,6 @@
 import type Lexer from '../Lexer.ts';
+import type { Grammar } from '../grammar.ts';
 import type { AstNode, Token } from '../types.ts';
-interface Grammar {
-    elements: Record<string, any>;
-}
 /**
  * The Parser is a state machine that converts tokens from the {@link Lexer}
  * into an Abstract Syntax Tree (AST), capable of being evaluated in any
@@ -27,7 +25,7 @@ declare class Parser {
     _tree: AstNode | null;
     _exprStr: string;
     _relative: boolean;
-    _stopMap: Record<string, any>;
+    _stopMap: Record<string, string>;
     _cursor?: AstNode | null;
     _subParser?: Parser;
     _parentStop?: boolean;
@@ -35,7 +33,7 @@ declare class Parser {
     _nextIdentRelative?: boolean;
     _curObjKey?: string;
     _sequenceExpressions?: AstNode[];
-    constructor(grammar: Grammar, lexer: Lexer, prefix?: string, stopMap?: Record<string, any>);
+    constructor(grammar: Grammar, lexer: Lexer, prefix?: string, stopMap?: Record<string, string>);
     /**
      * Processes a new token into the AST and manages the transitions of the state
      * machine.
@@ -46,7 +44,7 @@ declare class Parser {
      * @returns {boolean|*} the stopState value if this parser encountered a token
      *      in the stopState mapb false if tokens can continue.
      */
-    addToken(token: Token): any;
+    addToken(token: Token): string | false;
     /**
      * Processes an array of tokens iteratively through the {@link #addToken}
      * function.
@@ -62,7 +60,7 @@ declare class Parser {
      * @throws {Error} if the parser is not in a state where it's legal to end
      *      the expression, indicating that the expression is incomplete
      */
-    complete(): any;
+    complete(): AstNode | null;
     /**
      * Indicates whether the expression tree contains a relative path identifier.
      * @returns {boolean} true if a relative identifier exists false otherwise.

package/esm/parser/Parser.js

@@ -22,6 +22,20 @@ import { states } from "./states.js";
  *      instead of boolean false.
  */
 class Parser {
+    _grammar;
+    _lexer;
+    _state;
+    _tree;
+    _exprStr;
+    _relative;
+    _stopMap;
+    _cursor;
+    _subParser;
+    _parentStop;
+    _nextIdentEncapsulate;
+    _nextIdentRelative;
+    _curObjKey;
+    _sequenceExpressions;
     constructor(grammar, lexer, prefix, stopMap) {
         this._grammar = grammar;
         this._lexer = lexer;
@@ -55,12 +69,20 @@ class Parser {
             const stopState = this._subParser.addToken(token);
             if (stopState) {
                 this._endSubExpression();
-                if (this._parentStop) {
+                if (stopState === '_semicolon') {
+                    handlers.semicolon.call(this);
+                }
+                else if (this._parentStop) {
                     return stopState;
                 }
-                this._state = stopState;
+                else {
+                    this._state = stopState;
+                }
             }
         }
+        else if (token.type === 'semicolon' && this._stopMap[token.type]) {
+            return this._stopMap[token.type];
+        }
         else if (state.tokenTypes?.[token.type]) {
             const typeOpts = state.tokenTypes[token.type];
             let handleFunc = handlers[token.type];
@@ -89,7 +111,9 @@ class Parser {
      *      the {@link Lexer#tokenize} function.
      */
     addTokens(tokens) {
-        tokens.forEach((token) => this.addToken(token));
+        for (const token of tokens) {
+            this.addToken(token);
+        }
     }
     /**
      * Marks this Parser instance as completed and retrieves the full AST.
@@ -107,7 +131,9 @@ class Parser {
             this._endSubExpression();
         }
         if (this._sequenceExpressions) {
-            this._sequenceExpressions.push(this._tree);
+            if (this._tree) {
+                this._sequenceExpressions.push(this._tree);
+            }
             const sequence = {
                 type: 'SequenceExpression',
                 expressions: this._sequenceExpressions
@@ -146,7 +172,6 @@ class Parser {
             this._tree = node;
         }
         else {
-            ;
             this._cursor.right = node;
             this._setParent(node, this._cursor);
         }
@@ -191,6 +216,9 @@ class Parser {
             this._parentStop = true;
             endStates = this._stopMap;
         }
+        if (states[this._state].completable && !endStates.semicolon) {
+            endStates = { ...endStates, semicolon: '_semicolon' };
+        }
         this._subParser = new Parser(this._grammar, this._lexer, exprStr, endStates);
     }
 }