subscript 7.6.1 → 8.0.0

package/README.md

@@ -1,126 +1,88 @@
-# <img alt="subscript" src="/subscript2.svg" height=28/> <!--sub͘<em>script</em>--> <!--<sub>SUB͘<em>SCRIPT</em></sub>--> <a href="https://github.com/spectjs/subscript/actions/workflows/node.js.yml"><img src="https://github.com/spectjs/subscript/actions/workflows/node.js.yml/badge.svg"/></a> <a href="http://npmjs.org/subscript"><img src="https://img.shields.io/npm/v/subscript"/></a> <a href="http://microjs.com/#subscript"><img src="https://img.shields.io/badge/microjs-subscript-blue?color=darkslateblue"/></a>
+# <img alt="subscript" src="/subscript2.svg" height=28/> <!--sub͘<em>script</em>--> <!--<sub>SUB͘<em>SCRIPT</em></sub>--> <a href="https://github.com/spectjs/subscript/actions/workflows/node.js.yml"><img src="https://github.com/spectjs/subscript/actions/workflows/node.js.yml/badge.svg"/></a> <a href="https://bundlephobia.com/package/subscript"><img alt="npm bundle size" src="https://img.shields.io/bundlephobia/minzip/subscript/latest?color=brightgreen&label=gzip"/></a> <a href="http://npmjs.org/subscript"><img src="https://img.shields.io/npm/v/subscript"/></a> <a href="http://microjs.com/#subscript"><img src="https://img.shields.io/badge/microjs-subscript-blue?color=darkslateblue"/></a>
 
-_Subscript_ is expression evaluator / microlanguage with [common syntax](https://en.wikipedia.org/wiki/Comparison_of_programming_languages_(syntax)) (JavaScript, Java, C, C++, Rust, Go, Python, Kotlin etc).<br/>
+> _Subscript_ is fast, tiny & extensible expression evaluator / microlanguage.
 
-* Tiny size <sub><a href="https://bundlephobia.com/package/subscript"><img alt="npm bundle size" src="https://img.shields.io/bundlephobia/minzip/subscript/latest?color=brightgreen&label=gzip"/></a></sub>
-* :rocket: Fast [performance](#performance)
-* Configurable & extensible
-* Trivial to use
-
-```js
-import subscript, { parse, compile } from './subscript.js'
-
-// create expression evaluator
-let fn = subscript('a.b + Math.sqrt(c - 1)')
-fn({ a: { b:1 }, c: 5, Math }) // 3
-
-// --- or ---
-// parse expression
-let tree = parse('a.b + c')
-tree // ['+', ['.', 'a', 'b'], 'c']
-
-// compile tree to evaluable function
-fn = compile(tree)
-fn({a:{b:1}, c:2}) // 3
-```
-
-## Motivation
-
-_Subscript_ is designed to be useful for:
+Used for:
 
 * templates (eg. [sprae](https://github.com/dy/sprae), [templize](https://github.com/dy/templize))
 * expressions evaluators, calculators
 * subsets of languages (eg. [justin](#justin))
-* pluggable/configurable/mock language features (eg. pipe operator)
 * sandboxes, playgrounds, safe eval
-* custom DSL (see [mell](https://github.com/dy/lino)) <!-- uneural -->
-* preprocessors (see [prepr](https://github.com/dy/prepr))
+* custom DSL (eg. [mell](https://github.com/dy/lino)) <!-- uneural -->
+* preprocessors (eg. [prepr](https://github.com/dy/prepr))
+
+_Subscript_ has [3.5kb](https://npmfs.com/package/subscript/7.4.3/subscript.min.js) footprint (compare to [11.4kb](https://npmfs.com/package/jsep/1.2.0/dist/jsep.min.js) _jsep_ + [4.5kb](https://npmfs.com/package/expression-eval/5.0.0/dist/expression-eval.module.js) _expression-eval_), good [performance](#performance) and wide test coverage.
+
+
+## Usage
+
+```js
+import subscript from './subscript.js'
 
-_Subscript_ has [3.5kb](https://npmfs.com/package/subscript/7.4.3/subscript.min.js) footprint, compared to [11.4kb](https://npmfs.com/package/jsep/1.2.0/dist/jsep.min.js) _jsep_ + [4.5kb](https://npmfs.com/package/expression-eval/5.0.0/dist/expression-eval.module.js) _expression-eval_, with better test coverage and better performance.
+// parse expression
+const fn = subscript('a.b + Math.sqrt(c - 1)')
 
+// evaluate with context
+fn({ a: { b:1 }, c: 5, Math })
+// 3
+```
 
-## Operators / literals
+## Operators
 
-<small>↑ precedence order</small>
+_Subscript_ supports [common syntax](https://en.wikipedia.org/wiki/Comparison_of_programming_languages_(syntax)) (shared by _JavaScript_,_C_, _C++_, _Java_, _C#_, _PHP_, _Swift_, _Objective-C_, _Kotlin_, _Perl_ etc.):
 
-* `( a, b, c )`
-* `a.b`, `a[b]`, `a(b, c)`
-* `a++`, `a--` unary postfix
-* `!a`, `+a`, `-a`, `++a`, `--a` unary prefix
+* `a.b`, `a[b]`, `a(b)`
+* `a++`, `a--`, `++a`, `--a`
 * `a * b`, `a / b`, `a % b`
-* `a + b`, `a - b`
-* `a << b`, `a >> b`, `a >>> b`
-* `a < b`, `a <= b`, `a > b`, `a >= b`
-* `a == b`, `a != b`
-* `a & b`
-* `a ^ b`
-* `a | b`
-* `a && b`
-* `a || b`
-* `a , b`
-* `"abc"` strings
-* `1.2e+3` numbers
-
-## Justin
-
-_Justin_ is minimal JS subset − JSON with JS expressions (see original [thread](https://github.com/endojs/Jessie/issues/66)).<br/>
-
-It extends _subscript_ with:
-
-+ `**` exponentiation operator (right-assoc)
-+ `~` bit inversion operator
-+ `'` strings
-+ `?:` ternary operator
-+ `?.` optional chain operator
-+ `[...]` Array literal
-+ `{...}` Object literal
-+ `in` binary
-+ `;` expression separator
-+ `//`, `/* */` comments
-+ `true`, `false`, `null` literals
+* `+a`, `-a`, `a + b`, `a - b`
+* `a < b`, `a <= b`, `a > b`, `a >= b`, `a == b`, `a != b`
+* `~a`, `a & b`, `a ^ b`, `a | b`, `a << b`, `a >> b`
+* `!a`, `a && b`, `a || b`
+* `a = b`, `a += b`, `a -= b`, `a *= b`, `a /= b`, `a %= b`
+* `(a, (b))`, `a; b;`
+* `"abc"`, `'abc'`
+* `0.1`, `1.2e+3`
+
+### Justin
+
+_Justin_ is minimal JS subset, _JSON_ + _Expressions_ (see [thread](https://github.com/endojs/Jessie/issues/66)). It extends _subscript_ with:
+
++ `a ** b` (right-assoc)
++ `a ? b : c`
++ `a?.b`
++ `[a, b]` Array
++ `{a: b}` Object
++ `a in b`
++ `// foo`, `/* bar */`
++ `true`, `false`, `null`
 <!-- + `...x` unary operator -->
 <!-- + strings interpolation -->
 
 ```js
-import jstin from 'subscript/justin.js'
+import jstin from './justin.js'
 
 let xy = jstin('{ x: 1, "y": 2+2 }["x"]')
 xy()  // 1
 ```
 
-## Extending
 
-Operators/tokens can be extended via:
+## Parse / Compile
 
-* `unary(str, precedence, postfix=false)` − register unary operator, either prefix or postfix.
-* `binary(str, precedence, rightAssoc=false)` − register binary operator, optionally right-associative.
-* `nary(str, precedence, allowSkip=false)` − register n-ary (sequence) operator, optionally allowing skipping args.
-* `token(str, precedence, map)` − register custom token or literal. `map` takes last token argument and returns tree node.
-* `operator(str, fn)` − register evaluator for operator. `fn` takes node arguments and returns evaluator function.
+Subscript exposes `parse` to build AST and `compile` to create evaluators.
 
 ```js
-import script, { operator, unary, binary, token } from './subscript.js'
-
-// add ~ unary operator with precedence 15
-unary('~', 15)
-operator('~', a => ctx => ~a)
+import { parse, compile } from 'subscript'
 
-// add === binary operator with precedence 9
-binary('===', 9)
-operator('===', (a, b) => ctx => ctx[a]===ctx[b])
+// parse expression
+let tree = parse('a.b + c - 1')
+tree // ['-', ['+', ['.', 'a', 'b'], 'c'], [,1]]
 
-// add boolean literals
-token('true', 20, prev => ['',true])
-token('false', 20, prev => ['',false])
-operator('', boolNode => ctx => boolNode[1])
+// compile tree to evaluable function
+fn = compile(tree)
+fn({ a: {b: 1}, c: 2 }) // 3
 ```
 
-See [subscript.js](subscript.js) or [justin.js](./justin.js) for examples.
-
-
-## Syntax tree
-
-Subscript exposes separate `./parse.js` and `./compile.js` entries. Parser builds AST, compiler converts it to evaluable function.
+## Syntax Tree
 
 AST has simplified lispy tree structure (inspired by [frisk](https://ghub.io/frisk) / [nisp](https://github.com/ysmood/nisp)), opposed to [ESTree](https://github.com/estree/estree):
 
@@ -133,11 +95,37 @@ AST has simplified lispy tree structure (inspired by [frisk](https://ghub.io/fri
 ```js
 import { compile } from 'subscript.js'
 
-const fn = compile(['+', ['*', 'min', ['',60]], ['','sec']])
+const fn = compile(['+', ['*', 'min', [,60]], [,'sec']])
 
 fn({min: 5}) // min*60 + "sec" == "300sec"
 ```
 
+## Extending
+
+_Subscript_ provides API to customize or extend syntax:
+
+* `unary(str, precedence, postfix=false)` − register unary operator, either prefix or postfix.
+* `binary(str, precedence, rightAssoc=false)` − register binary operator, optionally right-associative.
+* `nary(str, precedence, allowSkip=false)` − register n-ary (sequence) operator, optionally allowing skipping args.
+* `token(str, precedence, prevNode => curNode)` − register custom token or literal. Function takes last token and returns tree node.
+* `operator(str, (a, b) => ctx => result)` − register evaluator for an operator. Function takes node arguments and returns evaluator function.
+
+```js
+import script, { compile, operator, unary, binary, token } from './subscript.js'
+
+// add identity operators with precedence 9
+binary('===', 9), binary('!==', 9)
+operator('===', (a, b) => (a = compile(a), b = compile(b), ctx => a(ctx)===b(ctx)))
+operator('===', (a, b) => (a = compile(a), b = compile(b), ctx => a(ctx)!==b(ctx)))
+
+// add JS literals
+token('undefined', 20, a => a ? err() : [, undefined])
+token('NaN', 20, a => a ? err() : [, NaN])
+```
+
+See [`./feature/*`](./feature) for examples.
+
+
 <!--
 ## Ideas
 
@@ -151,133 +139,31 @@ template-parts proposal
 </template>
 ```
 
-// a.b.c
-// (node, c) => c === PERIOD ? (index++, space(), ['.', node, '"'+id()+'"']) : node,
-
-// a[b][c]
-// (node, c) => c === OBRACK ? (index++, node=['.', node, expr(CBRACK)], index++, node) : node,
-
-// a(b)(c)
-// (node, c, arg) => c === OPAREN ? (
-//   index++, arg=expr(CPAREN),
-//   node = Array.isArray(arg) && arg[0]===',' ? (arg[0]=node, arg) : arg == null ? [node] : [node, arg],
-//   index++, node
-// ) : node,
-
-<details>
-  <summary>Keyed arrays <code>[a:1, b:2, c:3]</code></summary>
-
-  ```js
-
-  ```
-</details>
-
-<details>
-  <summary>`7!` (factorial)</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>`5s`, `5rem` (units)</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>`?`, `?.`, `??`</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>`arrᵀ` - transpose,</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>`int 5` (typecast)</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>`$a` (param expansion)</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>`1 to 10 by 2`</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>`a if b else c`</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>`a, b in c`</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>`a.xyz` swizzles</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>vector operators</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>set operators</summary>
-
-  ```js
-  ```
-
-</details>
-<details>
-  <summary>polynomial operators</summary>
-
-  ```js
-  ```
-
-</details>
+* Keyed arrays <code>[a:1, b:2, c:3]</code>
+* 7!` (factorial)
+* `5s`, `5rem` (units)
+* `?`, `?.`, `??`
+* `arrᵀ` - transpose
+* `int 5` (typecast)
+* `$a` (param expansion)
+* `1 to 10 by 2`
+* `a if b else c`
+* `a, b in c`
+* `a.xyz` swizzles
+* vector operators
+* set operators
+* polynomial operators
 
 like versions, units, hashes, urls, regexes etc
 
 2a as `2*a`
 
 string interpolation ` ${} 1 ${} `
-
-keyed arrays? [a:1, b:2, c:3]
-
-Examples: sonr, template-parts, neural-chunks
 -->
 
 ## Performance
 
-Subscript shows relatively good performance within other evaluators. Example expression:
+Subscript shows good performance within other evaluators. Example expression:
 
 ```
 1 + (a * b / c % d) - 2.0 + -3e-3 * +4.4e4 / f.g[0] - i.j(+k == 1)(0)
@@ -286,11 +172,10 @@ Subscript shows relatively good performance within other evaluators. Example exp
 Parse 30k times:
 
 ```
-es-module-lexer: 50ms 🥇
-subscript: ~150 ms 🥈
+subscript: ~150 ms 🥇
 justin: ~183 ms
-jsep: ~270 ms 🥉
-jexpr: ~297 ms
+jsep: ~270 ms 🥈
+jexpr: ~297 ms 🥉
 mr-parser: ~420 ms
 expr-eval: ~480 ms
 math-parser: ~570 ms

package/justin.js

@@ -1,41 +1,31 @@
 // justin lang https://github.com/endojs/Jessie/issues/66
-import { skip, cur, idx, err, expr, lookup, token, binary } from './parse.js'
-import compile, { operator } from './compile.js'
-import subscript, { set } from './subscript.js'
-
-const PERIOD = 46, OPAREN = 40, CPAREN = 41, OBRACK = 91, CBRACK = 93, SPACE = 32, DQUOTE = 34, QUOTE = 39, _0 = 48, _9 = 57, BSLASH = 92,
-  PREC_SEQ = 1, PREC_COND = 3, PREC_SOME = 4, PREC_EVERY = 5, PREC_OR = 6, PREC_XOR = 7, PREC_AND = 8,
-  PREC_EQ = 9, PREC_COMP = 10, PREC_SHIFT = 11, PREC_SUM = 12, PREC_MULT = 13, PREC_EXP = 14, PREC_UNARY = 15, PREC_POSTFIX = 16, PREC_CALL = 18, PREC_GROUP = 19
-
-let escape = { n: '\n', r: '\r', t: '\t', b: '\b', f: '\f', v: '\v' },
-  string = q => (qc, c, str = '') => {
-    qc && err('Unexpected string') // must not follow another token
-    skip() // first quote
-    while (c = cur.charCodeAt(idx), c - q) {
-      if (c === BSLASH) skip(), c = skip(), str += escape[c] || c
-      else str += skip()
-    }
-    skip() || err('Bad string')
-    return ['', str]
-  }
+import { skip, cur, idx, err, expr, lookup, token, binary, unary } from './src/parse.js'
+import compile, { operator } from './src/compile.js'
+import { CPAREN, COLON, PREC_ASSIGN, PREC_PREFIX, PREC_OR, PREC_ACCESS, PREC_COMP, PREC_EXP, PREC_GROUP } from './src/const.js'
+
+// register subscript operators set
+import subscript from './subscript.js'
+import './feature/comment.js'
+import './feature/pow.js'
+import './feature/in.js'
+import './feature/ternary.js'
+import './feature/bool.js'
+import './feature/array.js'
+import './feature/object.js'
 
 // operators
 // set('===', PREC_EQ, (a, b) => a === b)
 // set('!==', PREC_EQ, (a, b) => a !== b)
-set('~', PREC_UNARY, (a) => ~a)
-
-// ?:
-token('?', PREC_COND, (a, b, c) => a && (b = expr(2, 58)) && (c = expr(3), ['?', a, b, c]))
-operator('?', (a, b, c) => (a = compile(a), b = compile(b), c = compile(c), ctx => a(ctx) ? b(ctx) : c(ctx)))
-
-set('??', PREC_OR, (a, b) => a ?? b)
+binary('??', PREC_OR), operator('??', (a, b) => b && (a = compile(a), b = compile(b), ctx => a(ctx) ?? b(ctx)))
 
 // a?.[, a?.( - postfix operator
-token('?.', PREC_CALL, a => a && ['?.', a])
+token('?.', PREC_ACCESS, a => a && ['?.', a])
+// a ?.
 operator('?.', a => (a = compile(a), ctx => a(ctx) || (() => { })))
 
 // a?.b, a?.() - optional chain operator
-token('?.', PREC_CALL, (a, b) => a && (b = expr(PREC_CALL), !b?.map) && (b ? ['?.', a, b] : ['?.', a, b]))
+token('?.', PREC_ACCESS, (a, b) => a && (b = expr(PREC_ACCESS), !b?.map) && ['?.', a, b])
+// a ?. b
 operator('?.', (a, b) => b && (a = compile(a), ctx => a(ctx)?.[b]))
 
 // a?.x() - keep context, but watch out a?.()
@@ -43,59 +33,22 @@ operator('(', (a, b, container, args, path, optional) => (b != null) && (a[0] ==
   args = b == '' ? () => [] : // a()
     b[0] === ',' ? (b = b.slice(1).map(compile), ctx => b.map(a => a(ctx))) : // a(b,c)
       (b = compile(b), ctx => [b(ctx)]), // a(b)
+
   // a?.()
   !a[2] && (optional = true, a = a[1]),
+
   // a?.['x']?.()
-  a[0] === '[' ? (path = compile(a[2])) : (path = ctx => a[2]),
+  a[0] === '[' ? (path = compile(a[2])) : (path = () => a[2]),
   (container = compile(a[1]), optional ?
     ctx => (container(ctx)?.[path(ctx)]?.(...args(ctx))) :
     ctx => (container(ctx)?.[path(ctx)](...args(ctx)))
   )
 ))
 
-// a in b
-set('in', PREC_COMP, (a, b) => a in b)
-
-// "' with /
-lookup[DQUOTE] = string(DQUOTE)
-lookup[QUOTE] = string(QUOTE)
-
-// /**/, //
-token('/*', 20, (a, prec) => (skip(c => c !== 42 && cur.charCodeAt(idx + 1) !== 47), skip(2), a || expr(prec) || ['']))
-token('//', 20, (a, prec) => (skip(c => c >= 32), a || expr(prec) || ['']))
-
 // literals
-token('null', 20, a => a ? err() : ['', null])
-token('true', 20, a => a ? err() : ['', true])
-token('false', 20, a => a ? err() : ['', false])
-// token('undefined', 20, a => a ? err() : ['', undefined])
-// token('NaN', 20, a => a ? err() : ['', NaN])
-
-set(';', -20, (...args) => args[args.length - 1])
-
-// right order
-// '**', (a,prec,b=expr(PREC_EXP-1)) => ctx=>a(ctx)**b(ctx), PREC_EXP,
-set('**', -PREC_EXP, (a, b) => a ** b)
-
-// [a,b,c]
-token('[', 20, (a) => !a && ['[', expr(0, 93) || ''])
-operator('[', (a, b) => !b && (
-  !a ? () => [] : // []
-    a[0] === ',' ? (a = a.slice(1).map(compile), ctx => a.map(a => a(ctx))) : // [a,b,c]
-      (a = compile(a), ctx => [a(ctx)]) // [a]
-))
-
-// {a:1, b:2, c:3}
-token('{', 20, a => !a && (['{', expr(0, 125) || '']))
-operator('{', (a, b) => (
-  !a ? ctx => ({}) : // {}
-    a[0] === ',' ? (a = a.slice(1).map(compile), ctx => Object.fromEntries(a.map(a => a(ctx)))) : // {a:1,b:2}
-      a[0] === ':' ? (a = compile(a), ctx => Object.fromEntries([a(ctx)])) : // {a:1}
-        (b = compile(a), ctx => ({ [a]: b(ctx) }))
-))
-
-token(':', 1.1, (a, b) => (b = expr(1.1) || err(), [':', a, b]))
-operator(':', (a, b) => (b = compile(b), a = Array.isArray(a) ? compile(a) : (a => a).bind(0, a), ctx => [a(ctx), b(ctx)]))
+token('null', 20, a => a ? err() : [, null])
+// token('undefined', 20, a => a ? err() : [, undefined])
+// token('NaN', 20, a => a ? err() : [, NaN])
 
 export default subscript
 export * from './subscript.js'

package/justin.min.js

@@ -1 +1 @@
-let e,t,r=r=>(e=0,t=r,r=a(),t[e]?l():r||""),l=(r="Bad syntax",l=t[e],n=t.slice(0,e).split("\n"),a=n.pop())=>{let s=t.slice(e-108,e).split("\n").pop(),i=t.slice(e+1,e+108).split("\n").shift();throw EvalError(`${r} at ${n.length}:${a.length} \`${s+l+i}\``,"font-weight: bold")},n=(r=1,l=e,n)=>{if("number"==typeof r)e+=r;else for(;n=r(t.charCodeAt(e));)e+=n;return t.slice(l,e)},a=(t=0,n,a,s,i,p)=>{for(;(a=r.space())&&(i=((p=o[a])&&p(s,t))??(!s&&r.id()));)s=i;return n&&(a==n?e++:l()),s},s=e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192&&215!=e&&247!=e,i=r.space=r=>{for(;(r=t.charCodeAt(e))<=32;)e++;return r},p=r.id=e=>n(s),o=[],h=(r,l=32,n,a=r.charCodeAt(0),i=r.length,p=o[a],h=r.toUpperCase()!==r)=>o[a]=(a,o,c=e)=>o<l&&(i<2||t.substr(e,i)==r)&&(!h||!s(t.charCodeAt(e+i)))&&(e+=i,n(a,o))||(e=c,p?.(a,o)),c=(e,t,r=0)=>h(e,t,((l,n)=>l&&(n=a(t-r/2))&&[e,l,n])),f=(e,t,r)=>h(e,t,(l=>r?l&&[e,l]:!l&&(l=a(t-.5))&&[e,l])),g=(e,t,r)=>{h(e,t,((l,n)=>(l||r)&&((n=a(t))||r)&&((!l||l[0]!==e)&&(l=[e,l]),(n||r)&&l.push(n),l)))};const d=e=>Array.isArray(e)?u[e[0]](...e.slice(1)):t=>t?.[e],u={},m=(e,t,r=u[e])=>u[e]=(...e)=>t(...e)||r&&r(...e),A=e=>(e=r(e),t=>(e.call?e:e=d(e))(t)),b=(e,t,r)=>r.length?r.length>1?(c(e,Math.abs(t),t<0),m(e,((e,t)=>t&&(e=d(e),t=d(t),e.length||t.length?l=>r(e(l),t(l)):(e=r(e(),t()),()=>e))))):(f(e,t),m(e,((e,t)=>!t&&((e=d(e)).length?t=>r(e(t)):(e=r(e()),()=>e))))):(g(e,Math.abs(t),t<0),m(e,((...e)=>(e=e.map(d),t=>r(...e.map((e=>e(t)))))))),y=e=>e?l():["",(e=+n((e=>46===e||e>=48&&e<=57||(69===e||101===e?2:0))))!=e?l():e],C=(e,t,r,l)=>(h(e,t,(r=>r?["++"===e?"-":"+",[e,r],["",1]]:[e,a(t-1)])),m(e,l=(e,t)=>"("===e[0]?l(e[1]):"."===e[0]?(t=e[2],e=d(e[1]),l=>r(e(l),t)):"["===e[0]?([,e,t]=e,e=d(e),t=d(t),l=>r(e(l),t(l))):t=>r(t,e)));m("",(e=>()=>e)),o[34]=e=>e?l():["",(n()+n((e=>e-34?1:0))+(n()||l("Bad string"))).slice(1,-1)],o[46]=e=>!e&&y();for(let e=0;e<=9;e++)o[48+e]=y;b(",",1,((...e)=>e[e.length-1])),b("||",4,((...e)=>{let t,r=0;for(;!t&&r<e.length;)t=e[r++];return t})),b("&&",5,((...e)=>{let t=0,r=!0;for(;r&&t<e.length;)r=e[t++];return r})),c("=",10,!0),m("=",((e,t)=>{let r,n,a=d(t),s="string"==typeof e?(t,r)=>t[e]=r:"."===e[0]?(r=d(e[1]),n=e[2],(e,t)=>r(e)[n]=t):"["===e[0]?(r=d(e[1]),n=d(e[2]),(e,t)=>r(e)[n(e)]=t):l("Bad LHS");return e=>s(e,a(e))})),b("+",12,((e,t)=>e+t)),b("-",12,((e,t)=>e-t)),b("*",13,((e,t)=>e*t)),b("/",13,((e,t)=>e/t)),b("%",13,((e,t)=>e%t)),b("|",6,((e,t)=>e|t)),b("&",8,((e,t)=>e&t)),b("^",7,((e,t)=>e^t)),b("==",9,((e,t)=>e==t)),b("!=",9,((e,t)=>e!=t)),b(">",10,((e,t)=>e>t)),b(">=",10,((e,t)=>e>=t)),b("<",10,((e,t)=>e<t)),b("<=",10,((e,t)=>e<=t)),b(">>",11,((e,t)=>e>>t)),b(">>>",11,((e,t)=>e>>>t)),b("<<",11,((e,t)=>e<<t)),b("+",15,(e=>+e)),b("-",15,(e=>-e)),b("!",15,(e=>!e)),C("++",15,((e,t)=>++e[t])),C("--",15,((e,t)=>--e[t])),h("[",18,(e=>e&&["[",e,a(0,93)||l()])),m("[",((e,t)=>t&&(e=d(e),t=d(t),r=>e(r)[t(r)]))),h(".",18,((e,t)=>e&&(t=a(18))&&[".",e,t])),m(".",((e,t)=>(e=d(e),t=t[0]?t:t[1],r=>e(r)[t]))),h("(",18,(e=>!e&&["(",a(0,41)||l()])),h("(",18,((e,t)=>e&&((t=a(0,41))?["(",e,t]:["(",e,""]))),m("(",((e,t,r,l,n)=>null==t?d(e):(n=""==t?()=>[]:","===t[0]?(t=t.slice(1).map(d),e=>t.map((t=>t(e)))):(t=d(t),e=>[t(e)]),"."===e[0]?(r=e[2],e=d(e[1]),t=>e(t)[r](...n(t))):"["===e[0]?(r=d(e[2]),e=d(e[1]),t=>e(t)[r(t)](...n(t))):(e=d(e),t=>e(t)(...n(t))))));let B={n:"\n",r:"\r",t:"\t",b:"\b",f:"\f",v:"\v"},E=r=>(a,s,i="")=>{for(a&&l("Unexpected string"),n();(s=t.charCodeAt(e))-r;)92===s?(n(),s=n(),i+=B[s]||s):i+=n();return n()||l("Bad string"),["",i]};b("~",15,(e=>~e)),h("?",3,((e,t,r)=>e&&(t=a(2,58))&&["?",e,t,a(3)])),m("?",((e,t,r)=>(e=d(e),t=d(t),r=d(r),l=>e(l)?t(l):r(l)))),b("??",6,((e,t)=>e??t)),h("?.",18,(e=>e&&["?.",e])),m("?.",(e=>(e=d(e),t=>e(t)||(()=>{})))),h("?.",18,((e,t)=>e&&!(t=a(18))?.map&&["?.",e,t])),m("?.",((e,t)=>t&&(e=d(e),r=>e(r)?.[t]))),m("(",((e,t,r,l,n,a)=>null!=t&&"?."===e[0]&&(e[2]||Array.isArray(e[1]))&&(l=""==t?()=>[]:","===t[0]?(t=t.slice(1).map(d),e=>t.map((t=>t(e)))):(t=d(t),e=>[t(e)]),!e[2]&&(e=e[1]),n="["===e[0]?d(e[2]):t=>e[2],r=d(e[1]),e=>r(e)?.[n(e)]?.(...l(e))))),b("in",10,((e,t)=>e in t)),o[34]=E(34),o[39]=E(39),h("/*",20,((r,l)=>(n((r=>42!==r&&47!==t.charCodeAt(e+1))),n(2),r||a(l)||[""]))),h("//",20,((e,t)=>(n((e=>e>=32)),e||a(t)||[""]))),h("null",20,(e=>e?l():["",null])),h("true",20,(e=>e?l():["",!0])),h("false",20,(e=>e?l():["",!1])),b(";",-20,((...e)=>e[e.length-1])),b("**",-14,((e,t)=>e**t)),h("[",20,(e=>!e&&["[",a(0,93)||""])),m("[",((e,t)=>!t&&(e?","===e[0]?(e=e.slice(1).map(d),t=>e.map((e=>e(t)))):(e=d(e),t=>[e(t)]):()=>[]))),h("{",20,(e=>!e&&["{",a(0,125)||""])),m("{",((e,t)=>e?","===e[0]?(e=e.slice(1).map(d),t=>Object.fromEntries(e.map((e=>e(t))))):":"===e[0]?(e=d(e),t=>Object.fromEntries([e(t)])):(t=d(e),r=>({[e]:t(r)})):e=>({}))),h(":",1.1,((e,t)=>[":",e,a(1.1)||l()])),m(":",((e,t)=>(t=d(t),e=Array.isArray(e)?d(e):(e=>e).bind(0,e),r=>[e(r),t(r)])));export{c as binary,d as compile,t as cur,A as default,l as err,a as expr,p as id,e as idx,s as isId,o as lookup,g as nary,m as operator,u as operators,r as parse,b as set,n as skip,i as space,h as token,f as unary};
+let r,e,t=t=>(r=0,e=t,t=i(),e[r]?a():t||""),a=(t="Bad syntax",a=e.slice(0,r).split("\n"),n=a.pop())=>{let i=e.slice(r-108,r).split("\n").pop(),s=e.slice(r,r+108).split("\n").shift();throw EvalError(`${t} at ${a.length}:${n.length} \`${r>=108?"…":""}${i}▶${s}\``,"font-weight: bold")},n=(t=1,a=r,n)=>{if("number"==typeof t)r+=t;else for(;n=t(e.charCodeAt(r));)r+=n;return e.slice(a,r)},i=(e=0,n,i,s,l,p)=>{for(;(i=t.space())&&(l=((p=o[i])&&p(s,e))??(!s&&t.id()));)s=l;return n&&(i==n?r++:a()),s},s=r=>r>=48&&r<=57||r>=65&&r<=90||r>=97&&r<=122||36==r||95==r||r>=192&&215!=r&&247!=r,l=t.id=r=>n(s),p=t.space=t=>{for(;(t=e.charCodeAt(r))<=32;)r++;return t},o=[],c=(t,a=32,n,i=t.charCodeAt(0),l=t.length,p=o[i],c=t.toUpperCase()!==t)=>o[i]=(i,o,f=r)=>o<a&&(l<2||e.substr(r,l)==t)&&(!c||!s(e.charCodeAt(r+l)))&&(r+=l,n(i,o))||(r=f,p?.(i,o)),f=(r,e,t=0)=>c(r,e,((a,n)=>a&&(n=i(e-t/2))&&[r,a,n])),d=(r,e,t)=>c(r,e,(a=>t?a&&[r,a]:!a&&(a=i(e-.5))&&[r,a])),u=(r,e,t)=>{c(r,e,((a,n)=>(a||t)&&((n=i(e))||t)&&((!a||a[0]!==r)&&(a=[r,a]),(n||t)&&a.push(n),a)))};const m=r=>Array.isArray(r)?r[0]?h[r[0]](...r.slice(1)):()=>r[1]:e=>e?.[r],h={},b=(r,e,t=h[r])=>h[r]=(...r)=>e(...r)||t&&t(...r),A=(r,e,t)=>"()"===r[0]?A(r[1],e,t):"string"==typeof r?e.bind(0,(r=>r),(()=>r)):"."===r[0]?e.bind(0,m(r[1]),(r=r[2],()=>r)):"["===r[0]?e.bind(0,m(r[1]),m(r[2])):t?(r=m(r),e.bind(0,(e=>[r(e)]),(()=>0))):()=>a("Bad left value"),y=r=>r?a():[,(r=+n((r=>46===r||r>=48&&r<=57||(69===r||101===r?2:0))))!=r?a():r];o[46]=r=>!r&&y();for(let r=48;r<=57;r++)o[r]=y;const g={n:"\n",r:"\r",t:"\t",b:"\b",f:"\f",v:"\v"},C=t=>(i,s,l="")=>{for(i&&a("Unexpected string"),n();(s=e.charCodeAt(r))-t;)92===s?(n(),s=n(),l+=g[s]||s):l+=n();return n()||a("Bad string"),[,l]};o[34]=C(34),o[39]=C(39),c("(",17,((r,e)=>r&&((e=i(0,41))?["(",r,e]:["(",r,""]))),b("(",((r,e,t)=>(t=""==e?()=>[]:","===e[0]?(e=e.slice(1).map(m),r=>e.map((e=>e(r)))):(e=m(e),r=>[e(r)]),A(r,((r,e,a)=>r(a)[e(a)](...t(a))),!0)))),c("[",17,(r=>r&&["[",r,i(0,93)||a()])),b("[",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)[e(t)]))),c(".",17,((r,e)=>r&&(e=i(17))&&[".",r,e])),b(".",((r,e)=>(r=m(r),e=e[0]?e:e[1],t=>r(t)[e]))),c("(",17,(r=>!r&&["()",i(0,41)||a("Empty group")])),b("()",(r=>m(r)));const $=(...r)=>(r=r.map(m),e=>r.map((r=>r(e))).pop());u(",",1),b(",",$),u(";",1,!0),b(";",$),f("*",12),b("*",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)*e(t)))),f("/",12),b("/",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)/e(t)))),f("%",12),b("%",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)%e(t)))),f("*=",2,!0),b("*=",((r,e)=>(e=m(e),A(r,((r,t,a)=>r(a)[t(a)]*=e(a)))))),f("/=",2,!0),b("/=",((r,e)=>(e=m(e),A(r,((r,t,a)=>r(a)[t(a)]/=e(a)))))),f("%=",2,!0),b("%=",((r,e)=>(e=m(e),A(r,((r,t,a)=>r(a)[t(a)]%=e(a)))))),d("+",14),b("+",((r,e)=>!e&&(r=m(r),e=>+r(e)))),d("-",14),b("-",((r,e)=>!e&&(r=m(r),e=>-r(e)))),f("+",11),b("+",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)+e(t)))),f("-",11),b("-",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)-e(t)))),f("+=",2,!0),b("+=",((r,e)=>(e=m(e),A(r,((r,t,a)=>r(a)[t(a)]+=e(a)))))),f("-=",2,!0),b("-=",((r,e)=>(e=m(e),A(r,((r,t,a)=>r(a)[t(a)]-=e(a)))))),c("++",15,(r=>r?["-",["++",r],[,1]]:["++",i(14)])),b("++",(r=>A(r,((r,e,t)=>++r(t)[e(t)])))),c("--",15,(r=>r?["+",["--",r],[,1]]:["--",i(14)])),b("--",(r=>A(r,((r,e,t)=>--r(t)[e(t)])))),d("~",14),b("~",((r,e)=>!e&&(r=m(r),e=>~r(e)))),f("|",5),b("|",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)|e(t)))),f("&",7),b("&",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)&e(t)))),f("^",6),b("^",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)^e(t)))),f(">>",10),b(">>",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)>>e(t)))),f("<<",10),b("<<",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)<<e(t)))),f("==",8),b("==",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)==e(t)))),f("!=",8),b("!=",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)!=e(t)))),f(">",8),b(">",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)>e(t)))),f("<",8),b("<",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)<e(t)))),f(">=",8),b(">=",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)>=e(t)))),f("<=",8),b("<=",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)<=e(t)))),d("!",14),b("!",((r,e)=>!e&&(r=m(r),e=>!r(e)))),u("||",3),b("||",((...r)=>(r=r.map(m),e=>{let t,a;for(t of r)if(a=t(e))return a;return a}))),u("&&",4),b("&&",((...r)=>(r=r.map(m),e=>{let t,a;for(t of r)if(!(a=t(e)))return a;return a}))),f("=",2,!0),b("=",((r,e)=>(e=m(e),A(r,((r,t,a)=>r(a)[t(a)]=e(a))))));var v=r=>m(t(r));c("/*",20,((t,a)=>(n((t=>42!==t&&47!==e.charCodeAt(r+1))),n(2),t||i(a)||[""]))),c("//",20,((r,e)=>(n((r=>r>=32)),r||i(e)||[""]))),f("**",13,!0),b("**",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)**e(t)))),f("in",9),b("in",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)in e(t)))),c("?",2,((r,e,t)=>r&&(e=i(2,58))&&["?",r,e,i(3)])),b("?",((r,e,t)=>(r=m(r),e=m(e),t=m(t),a=>r(a)?e(a):t(a)))),c("true",20,(r=>r?err():[,!0])),c("false",20,(r=>r?err():[,!1])),c("[",20,(r=>!r&&["[",i(0,93)||""])),b("[",((r,e)=>!e&&(r?","===r[0]?(r=r.slice(1).map(m),e=>r.map((r=>r(e)))):(r=m(r),e=>[r(e)]):()=>[]))),c("{",20,(r=>!r&&["{",i(0,125)||""])),b("{",((r,e)=>r?","===r[0]?(r=r.slice(1).map(m),e=>Object.fromEntries(r.map((r=>r(e))))):":"===r[0]?(r=m(r),e=>Object.fromEntries([r(e)])):(e=m(r),t=>({[r]:e(t)})):r=>({}))),c(":",1.1,((r,e)=>[":",r,i(1.1)||err()])),b(":",((r,e)=>(e=m(e),r=Array.isArray(r)?m(r):(r=>r).bind(0,r),t=>[r(t),e(t)]))),f("??",5),b("??",((r,e)=>e&&(r=m(r),e=m(e),t=>r(t)??e(t)))),c("?.",17,(r=>r&&["?.",r])),b("?.",(r=>(r=m(r),e=>r(e)||(()=>{})))),c("?.",17,((r,e)=>r&&!(e=i(17))?.map&&["?.",r,e])),b("?.",((r,e)=>e&&(r=m(r),t=>r(t)?.[e]))),b("(",((r,e,t,a,n,i)=>null!=e&&"?."===r[0]&&(r[2]||Array.isArray(r[1]))&&(a=""==e?()=>[]:","===e[0]?(e=e.slice(1).map(m),r=>e.map((e=>e(r)))):(e=m(e),r=>[e(r)]),!r[2]&&(r=r[1]),n="["===r[0]?m(r[2]):()=>r[2],t=m(r[1]),r=>t(r)?.[n(r)]?.(...a(r))))),c("null",20,(r=>r?a():[,null]));export{A as access,f as binary,m as compile,e as cur,v as default,a as err,i as expr,l as id,r as idx,s as isId,o as lookup,u as nary,b as operator,h as operators,t as parse,n as skip,p as space,c as token,d as unary};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "subscript",
-  "version": "7.6.1",
+  "version": "8.0.0",
   "description": "Fast and tiny expression evaluator with minimal syntax.",
   "main": "subscript.js",
   "module": "subscript.js",

package/subscript.js

@@ -1,127 +1,22 @@
-import parse, { lookup, nary, binary, unary, token, skip, err, expr } from './parse.js'
-import compile, { operator } from './compile.js'
-
-const OPAREN = 40, CPAREN = 41, OBRACK = 91, CBRACK = 93, SPACE = 32, DQUOTE = 34, PERIOD = 46, _0 = 48, _9 = 57,
-  PREC_SEQ = 1, PREC_SOME = 4, PREC_EVERY = 5, PREC_OR = 6, PREC_XOR = 7, PREC_AND = 8,
-  PREC_EQ = 9, PREC_COMP = 10, PREC_SHIFT = 11, PREC_SUM = 12, PREC_MULT = 13, PREC_UNARY = 15, PREC_POSTFIX = 16, PREC_CALL = 18
-
-const subscript = s => (s = parse(s), ctx => (s.call ? s : (s = compile(s)))(ctx)),
-
-  // set any operator
-  // right assoc is indicated by negative precedence (meaning go from right to left)
-  set = (op, prec, fn) => (
-    !fn.length ? (
-      nary(op, Math.abs(prec), prec < 0),
-      operator(op, (...args) => (args = args.map(compile), ctx => fn(...args.map(arg => arg(ctx)))))
-    ) :
-      fn.length > 1 ? (
-        binary(op, Math.abs(prec), prec < 0),
-        operator(op,
-          (a, b) => b && (a = compile(a), b = compile(b), !a.length && !b.length ? (a = fn(a(), b()), () => a) : ctx => fn(a(ctx), b(ctx)))
-        )
-      ) :
-        (
-          unary(op, prec),
-          operator(op, (a, b) => !b && (a = compile(a), !a.length ? (a = fn(a()), () => a) : ctx => fn(a(ctx))))
-        )
-  ),
-
-  num = a => a ? err() : ['', (a = +skip(c => c === PERIOD || (c >= _0 && c <= _9) || (c === 69 || c === 101 ? 2 : 0))) != a ? err() : a],
-
-  // create increment-assign pair from fn
-  inc = (op, prec, fn, ev) => (
-    token(op, prec, a => a ? [op === '++' ? '-' : '+', [op, a], ['', 1]] : [op, expr(prec - 1)]), // ++a → [++, a], a++ → [-,[++,a],1]
-    operator(op, ev = (a, b) => (
-      a[0] === '(' ? ev(a[1]) : // ++(((a)))
-        a[0] === '.' ? (b = a[2], a = compile(a[1]), ctx => fn(a(ctx), b)) : // ++a.b
-          a[0] === '[' ? ([, a, b] = a, a = compile(a), b = compile(b), ctx => fn(a(ctx), b(ctx))) : // ++a[b]
-            (ctx => fn(ctx, a)) // ++a
-    ))
-  )
-
-// literals
-// null operator returns first value (needed for direct literals)
-operator('', v => () => v)
-
-// "a"
-lookup[DQUOTE] = (a) => (a ? err() : ['', (skip() + skip(c => c - DQUOTE ? 1 : 0) + (skip() || err('Bad string'))).slice(1, -1)])
-
-// .1
-lookup[PERIOD] = a => (!a && num())
-
-// 0-9
-for (let i = 0; i <= 9; i++) lookup[_0 + i] = num
-
-// sequences
-set(',', PREC_SEQ, (...args) => args[args.length - 1])
-set('||', PREC_SOME, (...args) => { let i = 0, v; for (; !v && i < args.length;) v = args[i++]; return v })
-set('&&', PREC_EVERY, (...args) => { let i = 0, v = true; for (; v && i < args.length;) v = args[i++]; return v })
-
-// assignment
-binary('=', 10, true)
-operator('=', (a, b) => {
-  let calc = compile(b), container, path,
-    set = typeof a === 'string' ? (ctx, v) => ctx[a] = v :
-      a[0] === '.' ? (container = compile(a[1]), path = a[2], (ctx, v) => container(ctx)[path] = v) :
-        a[0] === '[' ? (container = compile(a[1]), path = compile(a[2]), (ctx, v) => container(ctx)[path(ctx)] = v) :
-          err('Bad LHS');
-  return ctx => set(ctx, calc(ctx))
-})
-
-// binaries
-set('+', PREC_SUM, (a, b) => a + b)
-set('-', PREC_SUM, (a, b) => a - b)
-set('*', PREC_MULT, (a, b) => a * b)
-set('/', PREC_MULT, (a, b) => a / b)
-set('%', PREC_MULT, (a, b) => a % b)
-set('|', PREC_OR, (a, b) => a | b)
-set('&', PREC_AND, (a, b) => a & b)
-set('^', PREC_XOR, (a, b) => a ^ b)
-set('==', PREC_EQ, (a, b) => a == b)
-set('!=', PREC_EQ, (a, b) => a != b)
-set('>', PREC_COMP, (a, b) => a > b)
-set('>=', PREC_COMP, (a, b) => a >= b)
-set('<', PREC_COMP, (a, b) => a < b)
-set('<=', PREC_COMP, (a, b) => a <= b)
-set('>>', PREC_SHIFT, (a, b) => a >> b)
-set('>>>', PREC_SHIFT, (a, b) => a >>> b)
-set('<<', PREC_SHIFT, (a, b) => a << b)
-
-// unaries
-set('+', PREC_UNARY, a => +a)
-set('-', PREC_UNARY, a => -a)
-set('!', PREC_UNARY, a => !a)
-
-// increments
-inc('++', PREC_UNARY, (a, b) => ++a[b])
-inc('--', PREC_UNARY, (a, b) => --a[b])
-
-// a[b]
-token('[', PREC_CALL, a => a && ['[', a, expr(0, CBRACK) || err()])
-operator('[', (a, b) => b && (a = compile(a), b = compile(b), ctx => a(ctx)[b(ctx)]))
-
-// a.b
-token('.', PREC_CALL, (a, b) => a && (b = expr(PREC_CALL)) && ['.', a, b])
-operator('.', (a, b) => (a = compile(a), b = !b[0] ? b[1] : b, ctx => a(ctx)[b])) // a.true, a.1 → needs to work fine
-
-// (a,b,c), (a)
-token('(', PREC_CALL, a => !a && ['(', expr(0, CPAREN) || err()])
-
-// a(b,c,d), a()
-token('(', PREC_CALL, (a, b) => a && (b = expr(0, CPAREN), b ? ['(', a, b] : ['(', a, '']))
-operator('(', (a, b, path, container, args) => b == null ? (compile(a, b)) : (
-  args = b == '' ? () => [] : // a()
-    b[0] === ',' ? (b = b.slice(1).map(compile), ctx => b.map(arg => arg(ctx))) : // a(b,c)
-      (b = compile(b), ctx => [b(ctx)]), // a(b)
-
-  a[0] === '.' ? (path = a[2], a = compile(a[1]), ctx => a(ctx)[path](...args(ctx))) : // a.b(...args)
-    a[0] === '[' ? (path = compile(a[2]), a = compile(a[1]), ctx => a(ctx)[path(ctx)](...args(ctx))) : // a[b](...args)
-      (a = compile(a), ctx => a(ctx)(...args(ctx))) // a(...args)
-)
-)
-
-
-export default subscript
-export { set }
-export * from './parse.js'
-export * from './compile.js'
+/**
+ * Subscript dialect includes common operators / primitives for all languages
+ */
+import './feature/number.js'
+import './feature/string.js'
+import './feature/call.js'
+import './feature/access.js'
+import './feature/group.js'
+import './feature/mult.js'
+import './feature/add.js'
+import './feature/increment.js'
+import './feature/bitwise.js'
+import './feature/compare.js'
+import './feature/logic.js'
+import './feature/assign.js'
+import compile from './src/compile.js'
+import parse from './src/parse.js'
+
+export * from './src/parse.js'
+export * from './src/compile.js'
+
+export default s => compile(parse(s))

package/subscript.min.js

@@ -1 +1 @@
-let t,e,r=r=>(t=0,e=r,r=a(),e[t]?l():r||""),l=(r="Bad syntax",l=e[t],n=e.slice(0,t).split("\n"),a=n.pop())=>{let s=e.slice(t-108,t).split("\n").pop(),h=e.slice(t+1,t+108).split("\n").shift();throw EvalError(`${r} at ${n.length}:${a.length} \`${s+l+h}\``,"font-weight: bold")},n=(r=1,l=t,n)=>{if("number"==typeof r)t+=r;else for(;n=r(e.charCodeAt(t));)t+=n;return e.slice(l,t)},a=(e=0,n,a,s,h,o)=>{for(;(a=r.space())&&(h=((o=p[a])&&o(s,e))??(!s&&r.id()));)s=h;return n&&(a==n?t++:l()),s},s=t=>t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122||36==t||95==t||t>=192&&215!=t&&247!=t,h=r.space=r=>{for(;(r=e.charCodeAt(t))<=32;)t++;return r},o=r.id=t=>n(s),p=[],i=(r,l=32,n,a=r.charCodeAt(0),h=r.length,o=p[a],i=r.toUpperCase()!==r)=>p[a]=(a,p,c=t)=>p<l&&(h<2||e.substr(t,h)==r)&&(!i||!s(e.charCodeAt(t+h)))&&(t+=h,n(a,p))||(t=c,o?.(a,p)),c=(t,e,r=0)=>i(t,e,((l,n)=>l&&(n=a(e-r/2))&&[t,l,n])),g=(t,e,r)=>i(t,e,(l=>r?l&&[t,l]:!l&&(l=a(e-.5))&&[t,l])),f=(t,e,r)=>{i(t,e,((l,n)=>(l||r)&&((n=a(e))||r)&&((!l||l[0]!==t)&&(l=[t,l]),(n||r)&&l.push(n),l)))};const d=t=>Array.isArray(t)?u[t[0]](...t.slice(1)):e=>e?.[t],u={},A=(t,e,r=u[t])=>u[t]=(...t)=>e(...t)||r&&r(...t),b=t=>(t=r(t),e=>(t.call?t:t=d(t))(e)),m=(t,e,r)=>r.length?r.length>1?(c(t,Math.abs(e),e<0),A(t,((t,e)=>e&&(t=d(t),e=d(e),t.length||e.length?l=>r(t(l),e(l)):(t=r(t(),e()),()=>t))))):(g(t,e),A(t,((t,e)=>!e&&((t=d(t)).length?e=>r(t(e)):(t=r(t()),()=>t))))):(f(t,Math.abs(e),e<0),A(t,((...t)=>(t=t.map(d),e=>r(...t.map((t=>t(e)))))))),y=t=>t?l():["",(t=+n((t=>46===t||t>=48&&t<=57||(69===t||101===t?2:0))))!=t?l():t],C=(t,e,r,l)=>(i(t,e,(r=>r?["++"===t?"-":"+",[t,r],["",1]]:[t,a(e-1)])),A(t,l=(t,e)=>"("===t[0]?l(t[1]):"."===t[0]?(e=t[2],t=d(t[1]),l=>r(t(l),e)):"["===t[0]?([,t,e]=t,t=d(t),e=d(e),l=>r(t(l),e(l))):e=>r(e,t)));A("",(t=>()=>t)),p[34]=t=>t?l():["",(n()+n((t=>t-34?1:0))+(n()||l("Bad string"))).slice(1,-1)],p[46]=t=>!t&&y();for(let t=0;t<=9;t++)p[48+t]=y;m(",",1,((...t)=>t[t.length-1])),m("||",4,((...t)=>{let e,r=0;for(;!e&&r<t.length;)e=t[r++];return e})),m("&&",5,((...t)=>{let e=0,r=!0;for(;r&&e<t.length;)r=t[e++];return r})),c("=",10,!0),A("=",((t,e)=>{let r,n,a=d(e),s="string"==typeof t?(e,r)=>e[t]=r:"."===t[0]?(r=d(t[1]),n=t[2],(t,e)=>r(t)[n]=e):"["===t[0]?(r=d(t[1]),n=d(t[2]),(t,e)=>r(t)[n(t)]=e):l("Bad LHS");return t=>s(t,a(t))})),m("+",12,((t,e)=>t+e)),m("-",12,((t,e)=>t-e)),m("*",13,((t,e)=>t*e)),m("/",13,((t,e)=>t/e)),m("%",13,((t,e)=>t%e)),m("|",6,((t,e)=>t|e)),m("&",8,((t,e)=>t&e)),m("^",7,((t,e)=>t^e)),m("==",9,((t,e)=>t==e)),m("!=",9,((t,e)=>t!=e)),m(">",10,((t,e)=>t>e)),m(">=",10,((t,e)=>t>=e)),m("<",10,((t,e)=>t<e)),m("<=",10,((t,e)=>t<=e)),m(">>",11,((t,e)=>t>>e)),m(">>>",11,((t,e)=>t>>>e)),m("<<",11,((t,e)=>t<<e)),m("+",15,(t=>+t)),m("-",15,(t=>-t)),m("!",15,(t=>!t)),C("++",15,((t,e)=>++t[e])),C("--",15,((t,e)=>--t[e])),i("[",18,(t=>t&&["[",t,a(0,93)||l()])),A("[",((t,e)=>e&&(t=d(t),e=d(e),r=>t(r)[e(r)]))),i(".",18,((t,e)=>t&&(e=a(18))&&[".",t,e])),A(".",((t,e)=>(t=d(t),e=e[0]?e:e[1],r=>t(r)[e]))),i("(",18,(t=>!t&&["(",a(0,41)||l()])),i("(",18,((t,e)=>t&&((e=a(0,41))?["(",t,e]:["(",t,""]))),A("(",((t,e,r,l,n)=>null==e?d(t):(n=""==e?()=>[]:","===e[0]?(e=e.slice(1).map(d),t=>e.map((e=>e(t)))):(e=d(e),t=>[e(t)]),"."===t[0]?(r=t[2],t=d(t[1]),e=>t(e)[r](...n(e))):"["===t[0]?(r=d(t[2]),t=d(t[1]),e=>t(e)[r(e)](...n(e))):(t=d(t),e=>t(e)(...n(e))))));export{c as binary,d as compile,e as cur,b as default,l as err,a as expr,o as id,t as idx,s as isId,p as lookup,f as nary,A as operator,u as operators,r as parse,m as set,n as skip,h as space,i as token,g as unary};
+let t,r,e=e=>(t=0,r=e,e=s(),r[t]?n():e||""),n=(e="Bad syntax",n=r.slice(0,t).split("\n"),o=n.pop())=>{let s=r.slice(t-108,t).split("\n").pop(),a=r.slice(t,t+108).split("\n").shift();throw EvalError(`${e} at ${n.length}:${o.length} \`${t>=108?"…":""}${s}▶${a}\``,"font-weight: bold")},o=(e=1,n=t,o)=>{if("number"==typeof e)t+=e;else for(;o=e(r.charCodeAt(t));)t+=o;return r.slice(n,t)},s=(r=0,o,s,a,p,i)=>{for(;(s=e.space())&&(p=((i=l[s])&&i(a,r))??(!a&&e.id()));)a=p;return o&&(s==o?t++:n()),a},a=t=>t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122||36==t||95==t||t>=192&&215!=t&&247!=t,p=e.id=t=>o(a),i=e.space=e=>{for(;(e=r.charCodeAt(t))<=32;)t++;return e},l=[],f=(e,n=32,o,s=e.charCodeAt(0),p=e.length,i=l[s],f=e.toUpperCase()!==e)=>l[s]=(s,l,c=t)=>l<n&&(p<2||r.substr(t,p)==e)&&(!f||!a(r.charCodeAt(t+p)))&&(t+=p,o(s,l))||(t=c,i?.(s,l)),c=(t,r,e=0)=>f(t,r,((n,o)=>n&&(o=s(r-e/2))&&[t,n,o])),d=(t,r,e)=>f(t,r,(n=>e?n&&[t,n]:!n&&(n=s(r-.5))&&[t,n])),u=(t,r,e)=>{f(t,r,((n,o)=>(n||e)&&((o=s(r))||e)&&((!n||n[0]!==t)&&(n=[t,n]),(o||e)&&n.push(o),n)))};const h=t=>t?n():[,(t=+o((t=>46===t||t>=48&&t<=57||(69===t||101===t?2:0))))!=t?n():t];l[46]=t=>!t&&h();for(let t=48;t<=57;t++)l[t]=h;const b={n:"\n",r:"\r",t:"\t",b:"\b",f:"\f",v:"\v"},g=e=>(s,a,p="")=>{for(s&&n("Unexpected string"),o();(a=r.charCodeAt(t))-e;)92===a?(o(),a=o(),p+=b[a]||a):p+=o();return o()||n("Bad string"),[,p]};l[34]=g(34),l[39]=g(39);const m=t=>Array.isArray(t)?t[0]?A[t[0]](...t.slice(1)):()=>t[1]:r=>r?.[t],A={},y=(t,r,e=A[t])=>A[t]=(...t)=>r(...t)||e&&e(...t),C=(t,r,e)=>"()"===t[0]?C(t[1],r,e):"string"==typeof t?r.bind(0,(t=>t),(()=>t)):"."===t[0]?r.bind(0,m(t[1]),(t=t[2],()=>t)):"["===t[0]?r.bind(0,m(t[1]),m(t[2])):e?(t=m(t),r.bind(0,(r=>[t(r)]),(()=>0))):()=>n("Bad left value");f("(",17,((t,r)=>t&&((r=s(0,41))?["(",t,r]:["(",t,""]))),y("(",((t,r,e)=>(e=""==r?()=>[]:","===r[0]?(r=r.slice(1).map(m),t=>r.map((r=>r(t)))):(r=m(r),t=>[r(t)]),C(t,((t,r,n)=>t(n)[r(n)](...e(n))),!0)))),f("[",17,(t=>t&&["[",t,s(0,93)||n()])),y("[",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)[r(e)]))),f(".",17,((t,r)=>t&&(r=s(17))&&[".",t,r])),y(".",((t,r)=>(t=m(t),r=r[0]?r:r[1],e=>t(e)[r]))),f("(",17,(t=>!t&&["()",s(0,41)||n("Empty group")])),y("()",(t=>m(t)));const $=(...t)=>(t=t.map(m),r=>t.map((t=>t(r))).pop());u(",",1),y(",",$),u(";",1,!0),y(";",$),c("*",12),y("*",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)*r(e)))),c("/",12),y("/",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)/r(e)))),c("%",12),y("%",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)%r(e)))),c("*=",2,!0),y("*=",((t,r)=>(r=m(r),C(t,((t,e,n)=>t(n)[e(n)]*=r(n)))))),c("/=",2,!0),y("/=",((t,r)=>(r=m(r),C(t,((t,e,n)=>t(n)[e(n)]/=r(n)))))),c("%=",2,!0),y("%=",((t,r)=>(r=m(r),C(t,((t,e,n)=>t(n)[e(n)]%=r(n)))))),d("+",14),y("+",((t,r)=>!r&&(t=m(t),r=>+t(r)))),d("-",14),y("-",((t,r)=>!r&&(t=m(t),r=>-t(r)))),c("+",11),y("+",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)+r(e)))),c("-",11),y("-",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)-r(e)))),c("+=",2,!0),y("+=",((t,r)=>(r=m(r),C(t,((t,e,n)=>t(n)[e(n)]+=r(n)))))),c("-=",2,!0),y("-=",((t,r)=>(r=m(r),C(t,((t,e,n)=>t(n)[e(n)]-=r(n)))))),f("++",15,(t=>t?["-",["++",t],[,1]]:["++",s(14)])),y("++",(t=>C(t,((t,r,e)=>++t(e)[r(e)])))),f("--",15,(t=>t?["+",["--",t],[,1]]:["--",s(14)])),y("--",(t=>C(t,((t,r,e)=>--t(e)[r(e)])))),d("~",14),y("~",((t,r)=>!r&&(t=m(t),r=>~t(r)))),c("|",5),y("|",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)|r(e)))),c("&",7),y("&",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)&r(e)))),c("^",6),y("^",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)^r(e)))),c(">>",10),y(">>",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)>>r(e)))),c("<<",10),y("<<",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)<<r(e)))),c("==",8),y("==",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)==r(e)))),c("!=",8),y("!=",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)!=r(e)))),c(">",8),y(">",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)>r(e)))),c("<",8),y("<",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)<r(e)))),c(">=",8),y(">=",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)>=r(e)))),c("<=",8),y("<=",((t,r)=>r&&(t=m(t),r=m(r),e=>t(e)<=r(e)))),d("!",14),y("!",((t,r)=>!r&&(t=m(t),r=>!t(r)))),u("||",3),y("||",((...t)=>(t=t.map(m),r=>{let e,n;for(e of t)if(n=e(r))return n;return n}))),u("&&",4),y("&&",((...t)=>(t=t.map(m),r=>{let e,n;for(e of t)if(!(n=e(r)))return n;return n}))),c("=",2,!0),y("=",((t,r)=>(r=m(r),C(t,((t,e,n)=>t(n)[e(n)]=r(n))))));var v=t=>m(e(t));export{C as access,c as binary,m as compile,r as cur,v as default,n as err,s as expr,p as id,t as idx,a as isId,l as lookup,u as nary,y as operator,A as operators,e as parse,o as skip,i as space,f as token,d as unary};

package/compile.js

@@ -1,8 +0,0 @@
-// build optimized evaluator for the tree
-export const compile = (node) => !Array.isArray(node) ? ctx => ctx?.[node] : operators[node[0]](...node.slice(1)),
-
-operators = {},
-
-operator = (op, fn, prev=operators[op]) => operators[op] = (...args) => fn(...args) || prev && prev(...args)
-
-export default compile

package/parse.js

@@ -1,94 +0,0 @@
-const SPACE = 32
-
-// current string, index and collected ids
-export let idx, cur,
-
-  // no handling tagged literals since easily done on user side with cache, if needed
-  parse = s => (idx = 0, cur = s, s = expr(), cur[idx] ? err() : s || ''),
-
-  err = (msg = 'Bad syntax',
-    frag = cur[idx],
-    lines = cur.slice(0, idx).split('\n'),
-    last = lines.pop()
-  ) => {
-    let before = cur.slice(idx - 108, idx).split('\n').pop()
-    let after = cur.slice(idx + 1, idx + 108).split('\n').shift()
-    throw EvalError(`${msg} at ${lines.length}:${last.length} \`${before + frag + after}\``, 'font-weight: bold')
-  },
-
-  skip = (is = 1, from = idx, l) => {
-    if (typeof is == 'number') idx += is
-    else while (l = is(cur.charCodeAt(idx))) idx += l
-    return cur.slice(from, idx)
-  },
-
-  // a + b - c
-  expr = (prec = 0, end, cc, token, newNode, fn) => {
-    // chunk/token parser
-    while (
-      (cc = parse.space()) && // till not end
-      // FIXME: extra work is happening here, when lookup bails out due to lower precedence -
-      // it makes extra `space` call for parent exprs on the same character to check precedence again
-      (newNode =
-        ((fn = lookup[cc]) && fn(token, prec)) ?? // if operator with higher precedence isn't found
-        (!token && parse.id()) // parse literal or quit. token seqs are forbidden: `a b`, `a "b"`, `1.32 a`
-      )
-    ) token = newNode;
-
-    // check end character
-    // FIXME: can't show "Unclosed paren", because can be unknown operator within group as well
-    if (end) cc == end ? idx++ : err()
-
-    return token
-  },
-
-  isId = c =>
-    (c >= 48 && c <= 57) || // 0..9
-    (c >= 65 && c <= 90) || // A...Z
-    (c >= 97 && c <= 122) || // a...z
-    c == 36 || c == 95 || // $, _,
-    (c >= 192 && c != 215 && c != 247), // any non-ASCII
-
-  // skip space chars, return first non-space character
-  space = parse.space = cc => { while ((cc = cur.charCodeAt(idx)) <= SPACE) idx++; return cc },
-
-  id = parse.id = n => skip(isId),
-
-  // operator/token lookup table
-  // lookup[0] is id parser to let configs redefine it
-  lookup = [],
-
-
-  // create operator checker/mapper (see examples)
-  token = (
-    op,
-    prec = SPACE,
-    map,
-    c = op.charCodeAt(0),
-    l = op.length,
-    prev = lookup[c],
-    word = op.toUpperCase() !== op // make sure word boundary comes after word operator
-  ) => lookup[c] = (a, curPrec, from = idx) =>
-    (curPrec < prec && (l < 2 || cur.substr(idx, l) == op) && (!word || !isId(cur.charCodeAt(idx + l))) && (idx += l, map(a, curPrec))) ||
-    (idx = from, prev?.(a, curPrec)),
-
-  // right assoc is indicated by negative precedence (meaning go from right to left)
-  binary = (op, prec, right = 0) => token(op, prec, (a, b) => a && (b = expr(prec - right / 2)) && [op, a, b]),
-
-  // post indicates postfix rather than prefix operator
-  unary = (op, prec, post) => token(op, prec, a => post ? (a && [op, a]) : (!a && (a = expr(prec - .5)) && [op, a])),
-
-  // skips means ,,, ;;; are allowed
-  nary = (op, prec, skips) => {
-    token(op, prec, (a, b) => (
-      (a || skips) && // if lhs exists or we're ok to skip
-      (b = expr(prec), b || skips) && // either rhs exists or we're ok to skip rhs
-      (
-        (!a || a[0] !== op) && (a = [op, a]), // if beginning of sequence - init node
-        (b || skips) && a.push(b),
-        a
-      ))
-    )
-  }
-
-export default parse