@jbrowse/jexl 3.1.0 → 3.2.0

package/esm/parser/handlers.js

@@ -3,6 +3,9 @@
  * Copyright 2020 Tom Shawver
  */
 import { precedenceOf } from "../grammar.js";
+// circular with Parser.ts, which is fine: the binding is only read from inside
+// a handler, long after both modules have finished evaluating
+import Parser from "./Parser.js";
 /**
  * Handles a subexpression that's used to define a transform argument's value.
  * @param {{type: <string>}} ast The subexpression tree
@@ -115,13 +118,26 @@ export function filter(ast) {
 /**
  * Handles identifier tokens when used to indicate the name of a function to
  * be called.
- * @param {{type: <string>}} token A token object
+ *
+ * A call written against a value, `a.b(x)`, becomes `b(a, x)`: jexl functions
+ * live in one global pool and have no receiver, so the value the name was read
+ * from is passed as the first argument instead. Every function in the pool is
+ * already written that way — `get(feature, key)`, `split(str, sep)` — which is
+ * what makes the two spellings equivalent. Previously the receiver was simply
+ * dropped, so `refName.split(' ')` quietly called `split(' ')`.
  */
 export function functionCall() {
+    const cursor = this._cursor;
+    if (cursor?.type !== 'Identifier') {
+        // reached by `a[expr]()`, whose subject is a filter rather than a name;
+        // there is nothing to look up in the function pool
+        throw new Error(`Functions must be called by name: ${this._exprStr}`);
+    }
+    const { from } = cursor;
     const node = {
         type: 'FunctionCall',
-        name: this._cursor.value,
-        args: [],
+        name: cursor.value,
+        args: from ? [from] : [],
         pool: 'functions'
     };
     this._placeBeforeCursor(node);
@@ -177,8 +193,7 @@ export function templateString(token) {
         }
         else {
             const subTokens = this._lexer.tokenize(part.value);
-            const ParserClass = this.constructor;
-            const subParser = new ParserClass(this._grammar, this._lexer);
+            const subParser = new Parser(this._grammar, this._lexer);
             subParser.addTokens(subTokens);
             const subAst = subParser.complete();
             if (!subAst) {
@@ -220,8 +235,15 @@ export function objStart() {
  * @param {{type: <string>}} ast The subexpression tree
  */
 export function objVal(ast) {
-    ;
-    this._cursor.value[this._curObjKey] = ast;
+    // defined rather than assigned so that the key "__proto__" becomes an
+    // ordinary entry of the node's key map instead of re-pointing its prototype,
+    // which dropped the entry before the Evaluator ever saw it
+    Object.defineProperty(this._cursor.value, this._curObjKey, {
+        value: ast,
+        writable: true,
+        enumerable: true,
+        configurable: true
+    });
 }
 /**
  * Handles traditional subexpressions, delineated with the groupStart and

package/esm/parser/handlers.js.map

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

package/esm/parser/states.js

@@ -3,6 +3,19 @@
  * Copyright 2020 Tom Shawver
  */
 import * as h from "./handlers.js";
+/**
+ * The tokens that may follow a finished operand: an operator to combine it
+ * with, a dot or subscript to keep drilling into it, a question mark opening a
+ * ternary, or a semicolon ending the statement. Shared by every state that
+ * sits on a complete value, which is also why each of them is completable.
+ */
+const afterOperand = {
+    binaryOp: { toState: 'expectOperand' },
+    dot: { toState: 'traverse' },
+    openBracket: { toState: 'filter' },
+    question: { toState: 'ternaryMid', handler: h.ternaryStart },
+    semicolon: { handler: h.semicolon }
+};
 /**
  * A mapping of all states in the finite state machine to a set of instructions
  * for handling or transitioning into other states. Each state can be handled
@@ -49,13 +62,7 @@ export const states = {
         }
     },
     expectBinOp: {
-        tokenTypes: {
-            binaryOp: { toState: 'expectOperand' },
-            dot: { toState: 'traverse' },
-            openBracket: { toState: 'filter' },
-            question: { toState: 'ternaryMid', handler: h.ternaryStart },
-            semicolon: { handler: h.semicolon }
-        },
+        tokenTypes: afterOperand,
         completable: true
     },
     expectObjKey: {
@@ -71,23 +78,15 @@ export const states = {
         }
     },
     postArgs: {
-        tokenTypes: {
-            binaryOp: { toState: 'expectOperand' },
-            dot: { toState: 'traverse' },
-            openBracket: { toState: 'filter' },
-            question: { toState: 'ternaryMid', handler: h.ternaryStart },
-            semicolon: { handler: h.semicolon }
-        },
+        tokenTypes: afterOperand,
         completable: true
     },
     identifier: {
         tokenTypes: {
-            binaryOp: { toState: 'expectOperand' },
-            dot: { toState: 'traverse' },
-            openBracket: { toState: 'filter' },
-            openParen: { toState: 'argVal', handler: h.functionCall },
-            question: { toState: 'ternaryMid', handler: h.ternaryStart },
-            semicolon: { handler: h.semicolon }
+            ...afterOperand,
+            // a name is the only operand that can be followed by an argument list,
+            // since a function is called by name rather than evaluated as a value
+            openParen: { toState: 'argVal', handler: h.functionCall }
         },
         completable: true
     },

package/esm/parser/states.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/jexl",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "A fork of the jexl lang for jbrowse",
   "type": "module",
   "main": "dist/index.js",

package/src/Expression.ts

@@ -15,6 +15,9 @@ import type { AstNode } from './types.ts'
 class Expression {
   _grammar: Grammar
   _exprStr: string
+  /** The parsed tree, exposed for inspection. Legitimately null for an
+   * expression with no tokens, which is why compilation is tracked by
+   * `_compiled` rather than by this being set. */
   _ast: AstNode | null
   _lexer: Lexer
   _compiled = false
@@ -70,15 +73,6 @@ class Expression {
     }
     return this._fn(new Evaluator(this._grammar, context))
   }
-
-  _getAst() {
-    // tracked separately from _ast, which is legitimately null for an
-    // expression with no tokens and would otherwise recompile on every eval
-    if (!this._compiled) {
-      this.compile()
-    }
-    return this._ast
-  }
 }
 
 export default Expression

package/src/Lexer.ts

@@ -10,6 +10,9 @@ const numericRegex = /^-?(?:(?:[0-9]*\.[0-9]+)|[0-9]+)$/
 const identRegex =
   /^[a-zA-Zа-яА-Я_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$][a-zA-Zа-яА-Я0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$]*$/
 const escEscRegex = /\\\\/g
+// a string literal opens with one of exactly two quote characters, so the two
+// unescaping regexes can just be named rather than built and cached per quote
+const escQuoteRegex = { "'": /\\'/g, '"': /\\"/g }
 const whitespaceRegex = /^\s*$/
 const preOpRegexElems = [
   // Template strings
@@ -58,7 +61,6 @@ const minusNegatesAfter = new Set([
 class Lexer {
   _grammar: Grammar
   _splitRegex?: RegExp
-  _escQuoteRegexCache = new Map<string, RegExp>()
 
   constructor(grammar: Grammar) {
     this._grammar = grammar
@@ -284,15 +286,10 @@ class Lexer {
    * @private
    */
   _unquote(str: string) {
-    const quote = str[0]!
-    let escQuoteRegex = this._escQuoteRegexCache.get(quote)
-    if (!escQuoteRegex) {
-      escQuoteRegex = new RegExp('\\\\' + quote, 'g')
-      this._escQuoteRegexCache.set(quote, escQuoteRegex)
-    }
+    const quote = str.startsWith('"') ? '"' : "'"
     return str
       .slice(1, -1)
-      .replaceAll(escQuoteRegex, quote)
+      .replaceAll(escQuoteRegex[quote], quote)
       .replaceAll(escEscRegex, '\\')
   }
 

package/src/evaluator/compile.ts

@@ -4,22 +4,7 @@
  */
 
 import type { Grammar } from '../grammar.ts'
-import type {
-  ArrayLiteral,
-  AssignmentExpression,
-  AstNode,
-  BinaryExpression,
-  ConditionalExpression,
-  FilterExpression,
-  FunctionCall,
-  Identifier,
-  JexlValue,
-  Literal,
-  ObjectLiteral,
-  SequenceExpression,
-  TemplateLiteral,
-  UnaryExpression
-} from '../types.ts'
+import type { AstNode, AstNodeUnion, JexlValue } from '../types.ts'
 import type Evaluator from './Evaluator.ts'
 
 /**
@@ -28,6 +13,34 @@ import type Evaluator from './Evaluator.ts'
  */
 export type CompiledNode = (ev: Evaluator) => JexlValue
 
+/**
+ * Writes a key that a plain assignment would mishandle. Storing to
+ * "__proto__" invokes the prototype setter rather than creating a property, so
+ * an object literal or assignment using that key silently lost its value (and
+ * re-pointed the target's prototype). Defining the property instead matches
+ * what `JSON.parse('{"__proto__":1}')` produces: an ordinary own property.
+ */
+function defineOwn(
+  target: Record<string, JexlValue>,
+  key: string,
+  value: JexlValue
+) {
+  Object.defineProperty(target, key, {
+    value,
+    writable: true,
+    enumerable: true,
+    configurable: true
+  })
+}
+
+function assignOwn(
+  target: Record<string, JexlValue>,
+  key: string,
+  value: JexlValue
+) {
+  target[key] = value
+}
+
 /** Renders an interpolated value for a template literal. */
 function stringify(value: JexlValue) {
   if (value == null) {
@@ -62,14 +75,17 @@ function stringify(value: JexlValue) {
  * @throws {Error} if the tree contains an unrecognized node type
  */
 export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
-  switch (ast.type) {
+  // AstNode types its `type` as a plain string so the Parser can build the tree
+  // loosely; narrowing to the union once, here, lets every case below see its
+  // own node type instead of repeating the same cast in each branch
+  const node = ast as AstNodeUnion
+  switch (node.type) {
     case 'Literal': {
-      const { value } = ast as Literal
+      const { value } = node
       return () => value
     }
 
     case 'Identifier': {
-      const node = ast as Identifier
       const name = node.value
       if (!node.from) {
         return node.relative
@@ -91,7 +107,6 @@ export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
     }
 
     case 'BinaryExpression': {
-      const node = ast as BinaryExpression
       const op = grammar.elements[node.operator]
       if (op?.type !== 'binaryOp') {
         // matches the tree-walking behaviour: an unknown operator yields
@@ -119,7 +134,6 @@ export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
     }
 
     case 'UnaryExpression': {
-      const node = ast as UnaryExpression
       const right = compileAst(node.right!, grammar)
       const elem = grammar.elements[node.operator]
       const fn =
@@ -139,7 +153,6 @@ export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
     }
 
     case 'ConditionalExpression': {
-      const node = ast as ConditionalExpression
       const test = compileAst(node.test, grammar)
       const consequent = node.consequent
         ? compileAst(node.consequent, grammar)
@@ -158,7 +171,6 @@ export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
     }
 
     case 'FilterExpression': {
-      const node = ast as FilterExpression
       if (node.relative) {
         // thrown on evaluation rather than compilation, as before
         return () => {
@@ -180,9 +192,7 @@ export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
     }
 
     case 'ArrayLiteral': {
-      const items = (ast as ArrayLiteral).value.map((item) =>
-        compileAst(item, grammar)
-      )
+      const items = node.value.map((item) => compileAst(item, grammar))
       const len = items.length
       return (ev) => {
         const out: JexlValue[] = new Array(len)
@@ -194,14 +204,16 @@ export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
     }
 
     case 'ObjectLiteral': {
-      const entries = Object.entries((ast as ObjectLiteral).value)
+      const entries = Object.entries(node.value)
       const keys = entries.map(([key]) => key)
-      const values = entries.map(([, node]) => compileAst(node, grammar))
+      const values = entries.map(([, value]) => compileAst(value, grammar))
       const len = keys.length
+      // resolved once, here, so the common case keeps its plain store
+      const store = keys.includes('__proto__') ? defineOwn : assignOwn
       return (ev) => {
         const out: Record<string, JexlValue> = {}
         for (let i = 0; i < len; i++) {
-          out[keys[i]!] = values[i]!(ev)
+          store(out, keys[i]!, values[i]!(ev))
         }
         return out
       }
@@ -209,16 +221,14 @@ export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
 
     case 'TemplateLiteral': {
       // every part renders to a string, so these are narrower than CompiledNode
-      const parts = (ast as TemplateLiteral).parts.map(
-        (part): ((ev: Evaluator) => string) => {
-          if (part.type === 'static') {
-            const { value } = part
-            return () => value
-          }
-          const expr = compileAst(part.value, grammar)
-          return (ev) => stringify(expr(ev))
+      const parts = node.parts.map((part): ((ev: Evaluator) => string) => {
+        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) {
@@ -229,7 +239,6 @@ export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
     }
 
     case 'FunctionCall': {
-      const node = ast as FunctionCall
       const { name } = node
       const args = node.args.map((arg) => compileAst(arg, grammar))
       // hasOwn, so that inherited Object.prototype members such as `toString`
@@ -279,9 +288,7 @@ export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
     }
 
     case 'SequenceExpression': {
-      const exprs = (ast as SequenceExpression).expressions.map((expr) =>
-        compileAst(expr, grammar)
-      )
+      const exprs = node.expressions.map((expr) => compileAst(expr, grammar))
       const len = exprs.length
       return (ev) => {
         let last: JexlValue
@@ -293,12 +300,12 @@ export function compileAst(ast: AstNode, grammar: Grammar): CompiledNode {
     }
 
     case 'AssignmentExpression': {
-      const node = ast as AssignmentExpression
       const name = node.left.value
       const right = compileAst(node.right!, grammar)
+      const store = name === '__proto__' ? defineOwn : assignOwn
       return (ev) => {
         const value = right(ev)
-        ev._context[name] = value
+        store(ev._context, name, value)
         return value
       }
     }

package/src/grammar.ts

@@ -182,18 +182,17 @@ export const getGrammar = (): Grammar => ({
       precedence: 20,
       eval: (left, right) => {
         if (typeof right === 'string') {
-          const leftStr =
-            typeof left === 'string' ||
+          // only a primitive has a meaningful substring form. An absent or
+          // structured left operand is not "in" a string, and must not be
+          // coerced to '' — every string contains the empty string, so that
+          // made `feature.missingAttr in "someString"` true for every feature.
+          return typeof left === 'string' ||
             typeof left === 'number' ||
             typeof left === 'boolean'
-              ? String(left)
-              : ''
-          return right.includes(leftStr)
+            ? right.includes(String(left))
+            : false
         }
-        if (Array.isArray(right)) {
-          return right.includes(left)
-        }
-        return false
+        return Array.isArray(right) ? right.includes(left) : false
       }
     },
     '!': {

package/src/parser/Parser.ts

@@ -10,6 +10,25 @@ import type Lexer from '../Lexer.ts'
 import type { Grammar } from '../grammar.ts'
 import type { AstNode, SequenceExpression, Token } from '../types.ts'
 
+/**
+ * The handler to run for a token type when the state it appears in doesn't
+ * name one of its own. Token types absent here — the brackets, parens and
+ * separators — carry no behavior beyond the state transition the state machine
+ * gives them.
+ */
+const tokenHandlers: Record<
+  string,
+  ((this: Parser, token: Token) => void) | undefined
+> = {
+  binaryOp: handlers.binaryOp,
+  dot: handlers.dot,
+  identifier: handlers.identifier,
+  literal: handlers.literal,
+  semicolon: handlers.semicolon,
+  templateString: handlers.templateString,
+  unaryOp: handlers.unaryOp
+}
+
 /**
  * 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
@@ -76,10 +95,8 @@ class Parser {
     const startExpr = this._exprStr
     this._exprStr += token.raw
     if (state.subHandler) {
-      if (!this._subParser) {
-        this._startSubExpression(startExpr)
-      }
-      const stopState = this._subParser!.addToken(token)
+      const subParser = this._subParser ?? this._startSubExpression(startExpr)
+      const stopState = subParser.addToken(token)
       if (stopState) {
         this._endSubExpression()
         if (stopState === '_semicolon') {
@@ -94,18 +111,10 @@ class Parser {
       return this._stopMap[token.type]!
     } else if (state.tokenTypes?.[token.type]) {
       const typeOpts = state.tokenTypes[token.type]!
-      let handleFunc = (
-        handlers as Record<
-          string,
-          ((this: Parser, token: Token) => void) | undefined
-        >
-      )[token.type]
-      if (typeOpts.handler) {
-        handleFunc = typeOpts.handler
-      }
-      if (handleFunc) {
-        handleFunc.call(this, token)
-      }
+      // the state's own handler wins over the token type's default one, and a
+      // token type with neither only drives the transition below
+      const handleFunc = typeOpts.handler ?? tokenHandlers[token.type]
+      handleFunc?.call(this, token)
       if (typeOpts.toState) {
         this._state = typeOpts.toState
       }
@@ -140,7 +149,14 @@ class Parser {
    *      the expression, indicating that the expression is incomplete
    */
   complete() {
-    if (this._cursor && !states[this._state]!.completable) {
+    // `_subParser` counts as unfinished business alongside `_cursor`: a group
+    // that opened before anything was placed in the tree, as in "(1", leaves
+    // the cursor null, and testing the cursor alone let the missing ")" pass
+    // silently and evaluate as if it were closed.
+    if (
+      (this._cursor || this._subParser) &&
+      !states[this._state]!.completable
+    ) {
       throw new Error(`Unexpected end of expression: ${this._exprStr}`)
     }
     if (this._subParser) {
@@ -231,6 +247,7 @@ class Parser {
    * Prepares the Parser to accept a subexpression by (re)instantiating the
    * subParser.
    * @param {string} [exprStr] The expression string to prefix to the new Parser
+   * @returns {Parser} the new subParser, also stored on this instance
    * @private
    */
   _startSubExpression(exprStr?: string) {
@@ -243,6 +260,7 @@ class Parser {
       endStates = { ...endStates, semicolon: '_semicolon' }
     }
     this._subParser = new Parser(this._grammar, this._lexer, exprStr, endStates)
+    return this._subParser
   }
 }
 

package/src/parser/handlers.ts

@@ -4,6 +4,9 @@
  */
 
 import { precedenceOf } from '../grammar.ts'
+// circular with Parser.ts, which is fine: the binding is only read from inside
+// a handler, long after both modules have finished evaluating
+import Parser from './Parser.ts'
 
 import type {
   ArrayLiteral,
@@ -20,7 +23,6 @@ import type {
   Token,
   UnaryExpression
 } from '../types.ts'
-import type Parser from './Parser.ts'
 
 /**
  * Handles a subexpression that's used to define a transform argument's value.
@@ -145,13 +147,26 @@ export function filter(this: Parser, ast: AstNode | null) {
 /**
  * Handles identifier tokens when used to indicate the name of a function to
  * be called.
- * @param {{type: <string>}} token A token object
+ *
+ * A call written against a value, `a.b(x)`, becomes `b(a, x)`: jexl functions
+ * live in one global pool and have no receiver, so the value the name was read
+ * from is passed as the first argument instead. Every function in the pool is
+ * already written that way — `get(feature, key)`, `split(str, sep)` — which is
+ * what makes the two spellings equivalent. Previously the receiver was simply
+ * dropped, so `refName.split(' ')` quietly called `split(' ')`.
  */
 export function functionCall(this: Parser) {
+  const cursor = this._cursor
+  if (cursor?.type !== 'Identifier') {
+    // reached by `a[expr]()`, whose subject is a filter rather than a name;
+    // there is nothing to look up in the function pool
+    throw new Error(`Functions must be called by name: ${this._exprStr}`)
+  }
+  const { from } = cursor as Identifier
   const node: FunctionCall = {
     type: 'FunctionCall',
-    name: (this._cursor as Identifier).value,
-    args: [],
+    name: (cursor as Identifier).value,
+    args: from ? [from] : [],
     pool: 'functions'
   }
   this._placeBeforeCursor(node)
@@ -209,11 +224,7 @@ export function templateString(this: Parser, token: Token) {
       })
     } else {
       const subTokens = this._lexer.tokenize(part.value)
-      const ParserClass = this.constructor as new (
-        grammar: typeof this._grammar,
-        lexer: typeof this._lexer
-      ) => Parser
-      const subParser = new ParserClass(this._grammar, this._lexer)
+      const subParser = new Parser(this._grammar, this._lexer)
       subParser.addTokens(subTokens)
       const subAst = subParser.complete()
 
@@ -261,7 +272,19 @@ export function objStart(this: Parser) {
  * @param {{type: <string>}} ast The subexpression tree
  */
 export function objVal(this: Parser, ast: AstNode | null) {
-  ;(this._cursor as ObjectLiteral).value[this._curObjKey!] = ast!
+  // defined rather than assigned so that the key "__proto__" becomes an
+  // ordinary entry of the node's key map instead of re-pointing its prototype,
+  // which dropped the entry before the Evaluator ever saw it
+  Object.defineProperty(
+    (this._cursor as ObjectLiteral).value,
+    this._curObjKey!,
+    {
+      value: ast!,
+      writable: true,
+      enumerable: true,
+      configurable: true
+    }
+  )
 }
 
 /**