@jbrowse/jexl 5.0.0 → 5.0.2

package/esm/print.js

@@ -0,0 +1,183 @@
+/*
+ * Jexl
+ * Copyright 2020 Tom Shawver
+ */
+const PRECEDENCE = {
+    '=': 2,
+    '||': 10,
+    '??': 10,
+    '&&': 11,
+    '==': 20,
+    '!=': 20,
+    '~': 20,
+    '!~': 20,
+    '<': 20,
+    '<=': 20,
+    '>': 20,
+    '>=': 20,
+    in: 20,
+    '+': 30,
+    '-': 30,
+    '*': 40,
+    '/': 40,
+    '//': 40,
+    '%': 50,
+    '^': 50
+};
+const RIGHT_ASSOCIATIVE = new Set(['^']);
+const LOGICAL = new Set(['||', '&&']);
+// how tightly each form binds, mirroring the Parser's levels: `;`, then `=`
+// and lambdas, then `?:`, then binary operators, then prefix operators
+const SEQUENCE = 0;
+const ASSIGNMENT = 1;
+const CONDITIONAL = 2;
+const CUSTOM_BINARY = 3;
+const UNARY = 100;
+const letter = String.raw `a-zA-Zа-яА-Я_À-ÖØ-öø-ÿ$`;
+const IDENTIFIER = new RegExp(`^[${letter}][${letter}0-9]*$`);
+const WORDS = new Set(['in', 'true', 'false', 'null']);
+export function isName(text) {
+    return IDENTIFIER.test(text) && !WORDS.has(text);
+}
+export function key(name) {
+    return isName(name) ? `.${name}` : `[${quote(name)}]`;
+}
+export function quote(text) {
+    return `'${text.replaceAll('\\', '\\\\').replaceAll("'", String.raw `\'`)}'`;
+}
+function precedenceOf(node) {
+    switch (node.type) {
+        case 'SequenceExpression': {
+            return SEQUENCE;
+        }
+        case 'AssignmentExpression':
+        case 'Lambda': {
+            return ASSIGNMENT;
+        }
+        case 'ConditionalExpression': {
+            // with no alternate, it ends only before `)`, `]`, `}`, `,`, `;` or the end
+            return node.alternate ? CONDITIONAL : SEQUENCE;
+        }
+        case 'BinaryExpression': {
+            return PRECEDENCE[node.operator] ?? CUSTOM_BINARY;
+        }
+        case 'UnaryExpression': {
+            return UNARY;
+        }
+        default: {
+            return Infinity;
+        }
+    }
+}
+function within(ast, least) {
+    const text = print(ast);
+    return precedenceOf(ast) < least ? `(${text})` : text;
+}
+function binaryOperand(parent, ast, left) {
+    const own = PRECEDENCE[parent.operator];
+    if (own === undefined) {
+        return within(ast, UNARY);
+    }
+    const child = ast;
+    const theirs = precedenceOf(child);
+    const chained = child.type === 'BinaryExpression' &&
+        RIGHT_ASSOCIATIVE.has(parent.operator) &&
+        RIGHT_ASSOCIATIVE.has(child.operator);
+    const mixesNullish = child.type === 'BinaryExpression' &&
+        ((parent.operator === '??' && LOGICAL.has(child.operator)) ||
+            (child.operator === '??' && LOGICAL.has(parent.operator)));
+    const text = print(ast);
+    return theirs < own || (theirs === own && left === chained) || mixesNullish
+        ? `(${text})`
+        : text;
+}
+/**
+ * Renders a tree back to expression text, for messages and suggestions. The
+ * text parses back to the same tree.
+ */
+export function print(ast) {
+    const node = ast;
+    switch (node.type) {
+        case 'Literal': {
+            const { value } = node;
+            return typeof value === 'string'
+                ? quote(value)
+                : Object.is(value, -0)
+                    ? '-0'
+                    : String(value);
+        }
+        case 'Identifier': {
+            return node.from
+                ? within(node.from, Infinity) + key(node.value)
+                : node.value;
+        }
+        case 'FilterExpression': {
+            return `${within(node.subject, Infinity)}[${within(node.expr, ASSIGNMENT)}]`;
+        }
+        case 'BinaryExpression': {
+            return `${binaryOperand(node, node.left, true)} ${node.operator} ${binaryOperand(node, node.right, false)}`;
+        }
+        case 'UnaryExpression': {
+            const { operator } = node;
+            const right = within(node.right, UNARY);
+            // the Lexer folds a minus before a digit into the number
+            if (operator === '-' && /^\d/.test(right)) {
+                return `-(${right})`;
+            }
+            return IDENTIFIER.test(operator)
+                ? `${operator} ${right}`
+                : operator + right;
+        }
+        case 'ConditionalExpression': {
+            const test = within(node.test, CUSTOM_BINARY);
+            const consequent = node.consequent
+                ? ` ${within(node.consequent, ASSIGNMENT)} `
+                : '';
+            const alternate = node.alternate
+                ? ` ${within(node.alternate, ASSIGNMENT)}`
+                : '';
+            return `${test} ?${consequent}:${alternate}`;
+        }
+        case 'FunctionCall': {
+            const args = node.args.map((arg) => within(arg, ASSIGNMENT));
+            return `${node.name}(${args.join(', ')})`;
+        }
+        case 'ArrayLiteral': {
+            const items = node.value.map((item) => within(item, ASSIGNMENT));
+            return `[${items.join(', ')}]`;
+        }
+        case 'ObjectLiteral': {
+            const entries = Object.entries(node.value).map(([name, value]) => `${isName(name) ? name : quote(name)}: ${within(value, ASSIGNMENT)}`);
+            return `{${entries.join(', ')}}`;
+        }
+        case 'TemplateLiteral': {
+            const parts = node.parts.map((part) => part.type === 'static'
+                ? part.value
+                    .replaceAll('\\', '\\\\')
+                    .replaceAll('`', '\\`')
+                    .replaceAll('${', '\\${')
+                : `\${${print(part.value)}}`);
+            return `\`${parts.join('')}\``;
+        }
+        case 'SequenceExpression': {
+            const { expressions } = node;
+            const text = expressions
+                .map((expr) => within(expr, ASSIGNMENT))
+                .join('; ');
+            return expressions.length === 1 ? `${text};` : text;
+        }
+        case 'AssignmentExpression': {
+            return `${node.left.value} = ${within(node.right, ASSIGNMENT)}`;
+        }
+        case 'Lambda': {
+            const params = node.params.length === 1
+                ? node.params[0]
+                : `(${node.params.join(', ')})`;
+            return `${params} => ${within(node.body, ASSIGNMENT)}`;
+        }
+        default: {
+            return '?';
+        }
+    }
+}
+//# sourceMappingURL=print.js.map

package/esm/print.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/jexl",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "A fork of the jexl lang for jbrowse",
   "type": "module",
   "main": "dist/index.js",
@@ -8,6 +8,7 @@
     "import": "./esm/index.js",
     "require": "./dist/index.js"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "esm",

package/src/Expression.ts

@@ -4,13 +4,9 @@
  */
 
 import Lexer from './Lexer.ts'
-import { analyze } from './analyze.ts'
-import { check } from './check.ts'
 import { compileAst } from './evaluator/compile.ts'
 import Parser from './parser/Parser.ts'
 
-import type { AnalyzeOptions } from './analyze.ts'
-import type { CheckOptions } from './check.ts'
 import type { CompiledNode } from './evaluator/compile.ts'
 import type { Grammar } from './grammar.ts'
 import type { AstNode } from './types.ts'
@@ -86,22 +82,6 @@ class Expression {
     }
     return this._ast
   }
-
-  /**
-   * Lists what the expression reads from its context, without evaluating it.
-   * See {@link analyze}.
-   */
-  analyze(options?: AnalyzeOptions) {
-    return analyze(this.ast, options)
-  }
-
-  /**
-   * Checks the expression against a host's fields and functions, without
-   * evaluating it. See {@link check}.
-   */
-  check(options?: CheckOptions) {
-    return check(this.ast, options)
-  }
 }
 
 export default Expression

package/src/check.ts

@@ -3,11 +3,12 @@
  * Copyright 2020 Tom Shawver
  */
 
+import { isName, key, print, quote } from './print.ts'
+
 import type { AnalyzeOptions } from './analyze.ts'
 import type {
   AstNode,
   AstNodeUnion,
-  BinaryExpression,
   FunctionCall,
   Identifier,
   Lambda,
@@ -160,203 +161,6 @@ const MAX_VALUES = 64
 const ARITHMETIC = new Set(['-', '*', '/', '//', '%', '^'])
 const ORDER = new Set(['<', '<=', '>', '>='])
 const EQUALITY = new Set(['==', '!='])
-const PRECEDENCE: Record<string, number> = {
-  '=': 2,
-  '||': 10,
-  '??': 10,
-  '&&': 11,
-  '==': 20,
-  '!=': 20,
-  '~': 20,
-  '!~': 20,
-  '<': 20,
-  '<=': 20,
-  '>': 20,
-  '>=': 20,
-  in: 20,
-  '+': 30,
-  '-': 30,
-  '*': 40,
-  '/': 40,
-  '//': 40,
-  '%': 50,
-  '^': 50
-}
-
-const RIGHT_ASSOCIATIVE = new Set(['^'])
-const LOGICAL = new Set(['||', '&&'])
-
-// how tightly each form binds, mirroring the Parser's levels: `;`, then `=`
-// and lambdas, then `?:`, then binary operators, then prefix operators
-const SEQUENCE = 0
-const ASSIGNMENT = 1
-const CONDITIONAL = 2
-const CUSTOM_BINARY = 3
-const UNARY = 100
-
-const letter = String.raw`a-zA-Zа-яА-Я_À-ÖØ-öø-ÿ$`
-const IDENTIFIER = new RegExp(`^[${letter}][${letter}0-9]*$`)
-const WORDS = new Set(['in', 'true', 'false', 'null'])
-
-function isName(text: string) {
-  return IDENTIFIER.test(text) && !WORDS.has(text)
-}
-
-function key(name: string) {
-  return isName(name) ? `.${name}` : `[${quote(name)}]`
-}
-
-function quote(text: string) {
-  return `'${text.replaceAll('\\', '\\\\').replaceAll("'", String.raw`\'`)}'`
-}
-
-function precedenceOf(node: Node) {
-  switch (node.type) {
-    case 'SequenceExpression': {
-      return SEQUENCE
-    }
-    case 'AssignmentExpression':
-    case 'Lambda': {
-      return ASSIGNMENT
-    }
-    case 'ConditionalExpression': {
-      // with no alternate, it ends only before `)`, `]`, `}`, `,`, `;` or the end
-      return node.alternate ? CONDITIONAL : SEQUENCE
-    }
-    case 'BinaryExpression': {
-      return PRECEDENCE[node.operator] ?? CUSTOM_BINARY
-    }
-    case 'UnaryExpression': {
-      return UNARY
-    }
-    default: {
-      return Infinity
-    }
-  }
-}
-
-function within(ast: AstNode, least: number) {
-  const text = print(ast)
-  return precedenceOf(ast as Node) < least ? `(${text})` : text
-}
-
-function binaryOperand(parent: BinaryExpression, ast: AstNode, left: boolean) {
-  const own = PRECEDENCE[parent.operator]
-  if (own === undefined) {
-    return within(ast, UNARY)
-  }
-  const child = ast as Node
-  const theirs = precedenceOf(child)
-  const chained =
-    child.type === 'BinaryExpression' &&
-    RIGHT_ASSOCIATIVE.has(parent.operator) &&
-    RIGHT_ASSOCIATIVE.has(child.operator)
-  const mixesNullish =
-    child.type === 'BinaryExpression' &&
-    ((parent.operator === '??' && LOGICAL.has(child.operator)) ||
-      (child.operator === '??' && LOGICAL.has(parent.operator)))
-  const text = print(ast)
-  return theirs < own || (theirs === own && left === chained) || mixesNullish
-    ? `(${text})`
-    : text
-}
-
-/**
- * Renders a tree back to expression text, for messages and suggestions. The
- * text parses back to the same tree.
- */
-export function print(ast: AstNode): string {
-  const node = ast as Node
-  switch (node.type) {
-    case 'Literal': {
-      const { value } = node
-      return typeof value === 'string'
-        ? quote(value)
-        : Object.is(value, -0)
-          ? '-0'
-          : String(value)
-    }
-    case 'Identifier': {
-      return node.from
-        ? within(node.from, Infinity) + key(node.value)
-        : node.value
-    }
-    case 'FilterExpression': {
-      return `${within(node.subject, Infinity)}[${within(node.expr, ASSIGNMENT)}]`
-    }
-    case 'BinaryExpression': {
-      return `${binaryOperand(node, node.left, true)} ${node.operator} ${binaryOperand(node, node.right!, false)}`
-    }
-    case 'UnaryExpression': {
-      const { operator } = node
-      const right = within(node.right!, UNARY)
-      // the Lexer folds a minus before a digit into the number
-      if (operator === '-' && /^\d/.test(right)) {
-        return `-(${right})`
-      }
-      return IDENTIFIER.test(operator)
-        ? `${operator} ${right}`
-        : operator + right
-    }
-    case 'ConditionalExpression': {
-      const test = within(node.test, CUSTOM_BINARY)
-      const consequent = node.consequent
-        ? ` ${within(node.consequent, ASSIGNMENT)} `
-        : ''
-      const alternate = node.alternate
-        ? ` ${within(node.alternate, ASSIGNMENT)}`
-        : ''
-      return `${test} ?${consequent}:${alternate}`
-    }
-    case 'FunctionCall': {
-      const args = node.args.map((arg) => within(arg, ASSIGNMENT))
-      return `${node.name}(${args.join(', ')})`
-    }
-    case 'ArrayLiteral': {
-      const items = node.value.map((item) => within(item, ASSIGNMENT))
-      return `[${items.join(', ')}]`
-    }
-    case 'ObjectLiteral': {
-      const entries = Object.entries(node.value).map(
-        ([name, value]) =>
-          `${isName(name) ? name : quote(name)}: ${within(value, ASSIGNMENT)}`
-      )
-      return `{${entries.join(', ')}}`
-    }
-    case 'TemplateLiteral': {
-      const parts = node.parts.map((part) =>
-        part.type === 'static'
-          ? part.value
-              .replaceAll('\\', '\\\\')
-              .replaceAll('`', '\\`')
-              .replaceAll('${', '\\${')
-          : `\${${print(part.value)}}`
-      )
-      return `\`${parts.join('')}\``
-    }
-    case 'SequenceExpression': {
-      const { expressions } = node
-      const text = expressions
-        .map((expr) => within(expr, ASSIGNMENT))
-        .join('; ')
-      return expressions.length === 1 ? `${text};` : text
-    }
-    case 'AssignmentExpression': {
-      return `${node.left.value} = ${within(node.right!, ASSIGNMENT)}`
-    }
-    case 'Lambda': {
-      const params =
-        node.params.length === 1
-          ? node.params[0]
-          : `(${node.params.join(', ')})`
-      return `${params} => ${within(node.body, ASSIGNMENT)}`
-    }
-    default: {
-      return '?'
-    }
-  }
-}
-
 function distance(a: string, b: string) {
   let before: number[] = []
   let previous = Array.from({ length: b.length + 1 }, (_, i) => i)

package/src/conditions.ts

@@ -4,7 +4,7 @@
  */
 
 import { analyze } from './analyze.ts'
-import { print } from './check.ts'
+import { print } from './print.ts'
 
 import type { PathKey } from './analyze.ts'
 import type { AstNode, AstNodeUnion } from './types.ts'

package/src/evaluator/compile.ts

@@ -3,6 +3,8 @@
  * Copyright 2020 Tom Shawver
  */
 
+import { and, nullish, or } from '../grammar.ts'
+
 import type { Grammar } from '../grammar.ts'
 import type {
   AstNode,
@@ -375,8 +377,23 @@ function compileNode(
       const right = compile(node.right!)
       if (op?.type === 'binaryOp' && op.evalOnDemand) {
         const { evalOnDemand } = op
-        // operands stay unevaluated behind an `eval` thunk, so operators such
-        // as && and || can short-circuit
+        if (evalOnDemand === and) {
+          return (ctx) => {
+            const value = left(ctx)
+            return value ? right(ctx) : value
+          }
+        }
+        if (evalOnDemand === or) {
+          return (ctx) => {
+            const value = left(ctx)
+            return value || right(ctx)
+          }
+        }
+        if (evalOnDemand === nullish) {
+          return (ctx) => left(ctx) ?? right(ctx)
+        }
+        // a host's operator gets its operands unevaluated, behind `eval`
+        // thunks, so that it can short-circuit as it chooses
         return (ctx) =>
           evalOnDemand({ eval: () => left(ctx) }, { eval: () => right(ctx) })
       }

package/src/grammar.ts

@@ -139,6 +139,19 @@ const less = (left: JexlValue, right: JexlValue) =>
   left != null && right != null && (left as number) < (right as number)
 const atMost = (left: JexlValue, right: JexlValue) =>
   left != null && right != null && (left as number) <= (right as number)
+// named so the compiler can recognize the built-in forms and short-circuit
+// without the thunks a host's evalOnDemand operator is handed
+export const and: BinaryOpEvalOnDemand = (left, right) => {
+  const leftVal = left.eval()
+  return leftVal ? right.eval() : leftVal
+}
+export const or: BinaryOpEvalOnDemand = (left, right) => {
+  const leftVal = left.eval()
+  return leftVal || right.eval()
+}
+export const nullish: BinaryOpEvalOnDemand = (left, right) =>
+  left.eval() ?? right.eval()
+
 const equals = (left: JexlValue, right: JexlValue) =>
   isList(left, right) ? anyPair(loose, left, right) : left == right
 
@@ -267,29 +280,17 @@ export const getGrammar = (): Grammar => ({
     '&&': {
       type: 'binaryOp',
       precedence: 11,
-      evalOnDemand: (left, right) => {
-        const leftVal = left.eval()
-        if (!leftVal) {
-          return leftVal
-        }
-        return right.eval()
-      }
+      evalOnDemand: and
     },
     '||': {
       type: 'binaryOp',
       precedence: 10,
-      evalOnDemand: (left, right) => {
-        const leftVal = left.eval()
-        if (leftVal) {
-          return leftVal
-        }
-        return right.eval()
-      }
+      evalOnDemand: or
     },
     '??': {
       type: 'binaryOp',
       precedence: 10,
-      evalOnDemand: (left, right) => left.eval() ?? right.eval()
+      evalOnDemand: nullish
     },
     in: {
       type: 'binaryOp',

package/src/index.ts

@@ -8,7 +8,8 @@ export type { JexlOptions } from './Jexl.ts'
 export type { GetMember, VariableReader } from './grammar.ts'
 export { default as Expression } from './Expression.ts'
 export { analyze } from './analyze.ts'
-export { check, print, recordOf, union } from './check.ts'
+export { check, recordOf, union } from './check.ts'
+export { print } from './print.ts'
 export {
   callSubject,
   conditions,