subscript 6.3.1 → 6.4.0

package/justin.js

@@ -1,184 +1,22 @@
-const SPACE=32;
-
-// current string, index and collected ids
-let idx, cur, args,
-
-// no handling tagged literals since easily done on user side with cache, if needed
-parse = (s, fn) => (
-  idx=0, args=[], cur=s.trim(),
-  !(s = cur ? expr() : ctx=>fn) || cur[idx] ? err() :
-  fn = ctx=>s(ctx||{}), fn.args = args, fn
-),
-
-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
-
-err = (msg='Bad syntax',c=cur[idx]) => { throw SyntaxError(msg + ' `' + c + '` at ' + idx) },
-
-skip = (is=1, from=idx, l) => {
-  if (typeof is == 'number') idx += is;
-  else while (is(cur.charCodeAt(idx))) idx++;
-  return cur.slice(from, idx)
-},
-
-// a + b - c
-expr = (prec=0, end, cc, token, newNode, fn) => {
-  // chunk/token parser
-  while (
-    ( cc=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 && 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 "Unclose paren", because can be unknown operator within group as well
-  if (end) cc==end?idx++:err();
-
-  return token
-},
-
-// skip space chars, return first non-space character
-space = cc => { while ((cc = cur.charCodeAt(idx)) <= SPACE) idx++; return cc },
-
-// variable identifier
-id = (name=skip(isId), fn) => name ? (fn=ctx => ctx[name], args.push(name), fn.id=()=>name, fn) : 0,
-
-// operator/token lookup table
-lookup = [],
-
-// create operator checker/mapper (see examples)
-set = parse.set = (
-  op,
-  opPrec, fn=SPACE, // if opPrec & fn come in reverse order - consider them raw parse fn case, still precedence possible
-  c=op.charCodeAt(0),
-  l=op.length,
-  prev=lookup[c],
-  arity=fn.length || ([fn,opPrec]=[opPrec,fn], 0),
-  word=op.toUpperCase()!==op, // make sure word boundary comes after word operator
-  map=
-    // binary
-    arity>1 ? (a,b) => a && (b=expr(opPrec)) && (
-      !a.length && !b.length ? (a=fn(a(),b()), ()=>a) : // static pre-eval like `"a"+"b"`
-      ctx => fn(a(ctx),b(ctx),a.id?.(ctx),b.id?.(ctx))
-    ) :
-    // unary prefix (0 args)
-    arity ? a => !a && (a=expr(opPrec-1)) && (ctx => fn(a(ctx))) :
-    fn // custom parser
-) =>
-lookup[c] = (a, curPrec, from=idx) => curPrec<opPrec && (l<2||cur.substr(idx,l)==op) && (!word||!isId(cur.charCodeAt(idx+l))) && (idx+=l, map(a, curPrec)) || (idx=from, prev&&prev(a, curPrec));
-
-const PERIOD=46, CPAREN=41, CBRACK$1=93, DQUOTE$1=34, _0=48, _9=57,
-PREC_SEQ=1, PREC_SOME=4, PREC_EVERY=5, PREC_OR$1=6, PREC_XOR=7, PREC_AND=8,
-PREC_EQ$1=9, PREC_COMP$1=10, PREC_SHIFT=11, PREC_SUM=12, PREC_MULT=13, PREC_UNARY$1=15, PREC_CALL=18;
-
-let list$1, op$1, prec$1, fn$1,
-    isNum = c => c>=_0 && c<=_9,
-    // 1.2e+3, .5
-    num = n => (
-      n&&err('Unexpected number'),
-      n = skip(c=>c == PERIOD || isNum(c)),
-      (cur.charCodeAt(idx) == 69 || cur.charCodeAt(idx) == 101) && (n += skip(2) + skip(isNum)),
-      n=+n, n!=n ? err('Bad number') : () => n // 0 args means token is static
-    ),
-
-    inc = (a,fn) => ctx => fn(a.of?a.of(ctx):ctx, a.id(ctx));
-
-// numbers
-for (op$1=_0;op$1<=_9;) lookup[op$1++] = num;
-
-// operators
-for (list$1=[
-  // "a"
-  '"', a => (a=a?err('Unexpected string'):skip(c => c-DQUOTE$1), skip()||err('Bad string'), ()=>a),,
-
-  // a.b
-  '.', (a,id) => (space(), id=skip(isId)||err(), fn$1=ctx=>a(ctx)[id], fn$1.id=()=>id, fn$1.of=a, fn$1), PREC_CALL,
-
-  // .2
-  // FIXME: .123 is not operator, so we skip back, but mb reorganizing num would be better
-  '.', a => !a && num(skip(-1)),,
-
-  // a[b]
-  '[', (a,b,fn) => a && (b=expr(0,CBRACK$1)||err(), fn=ctx=>a(ctx)[b(ctx)], fn.id=b, fn.of=a, fn), PREC_CALL,
-
-  // a(), a(b), (a,b), (a+b)
-  '(', (a,b,fn) => (
-    b=expr(0,CPAREN),
-    // a(), a(b), a(b,c,d)
-    a ? ctx => a(ctx).apply(a.of?.(ctx), b ? b.all ? b.all(ctx) : [b(ctx)] : []) :
-    // (a+b)
-    b || err()
-  ), PREC_CALL,
-
-  // [a,b,c] or (a,b,c)
-  ',', (a,prec,b=expr(PREC_SEQ),fn=ctx => (a(ctx), b(ctx))) => (
-    b ? (fn.all = a.all ? ctx => [...a.all(ctx),b(ctx)] : ctx => [a(ctx),b(ctx)]) : err('Skipped argument',),
-    fn
-  ), PREC_SEQ,
-
-  '|', PREC_OR$1, (a,b)=>a|b,
-  '||', PREC_SOME, (a,b)=>a||b,
-
-  '&', PREC_AND, (a,b)=>a&b,
-  '&&', PREC_EVERY, (a,b)=>a&&b,
-
-  '^', PREC_XOR, (a,b)=>a^b,
-
-  // ==, !=
-  '==', PREC_EQ$1, (a,b)=>a==b,
-  '!=', PREC_EQ$1, (a,b)=>a!=b,
-
-  // > >= >> >>>, < <= <<
-  '>', PREC_COMP$1, (a,b)=>a>b,
-  '>=', PREC_COMP$1, (a,b)=>a>=b,
-  '>>', PREC_SHIFT, (a,b)=>a>>b,
-  '>>>', PREC_SHIFT, (a,b)=>a>>>b,
-  '<', PREC_COMP$1, (a,b)=>a<b,
-  '<=', PREC_COMP$1, (a,b)=>a<=b,
-  '<<', PREC_SHIFT, (a,b)=>a<<b,
-
-  // + ++ - --
-  '+', PREC_SUM, (a,b)=>a+b,
-  '+', PREC_UNARY$1, (a)=>+a,
-  '++', a => inc(a||expr(PREC_UNARY$1-1), a ? (a,b)=>a[b]++ : (a,b)=>++a[b]), PREC_UNARY$1,
-
-  '-', PREC_SUM, (a,b)=>a-b,
-  '-', PREC_UNARY$1, (a)=>-a,
-  '--', a => inc(a||expr(PREC_UNARY$1-1), a ? (a,b)=>a[b]-- : (a,b)=>--a[b]), PREC_UNARY$1,
-
-  // ! ~
-  '!', PREC_UNARY$1, (a)=>!a,
-
-  // * / %
-  '*', PREC_MULT, (a,b)=>a*b,
-  '/', PREC_MULT, (a,b)=>a/b,
-  '%', PREC_MULT, (a,b)=>a%b
-]; [op$1,prec$1,fn$1,...list$1]=list$1, op$1;) set(op$1,prec$1,fn$1);
-
 // justin lang https://github.com/endojs/Jessie/issues/66
+import {set, lookup, skip, cur, idx, err, expr, isId, space, args} from './parser.js'
+export { default } from './subscript.js'
 
-const CBRACK=93, DQUOTE=34, QUOTE=39, BSLASH=92,
-PREC_OR=6, PREC_EQ=9, PREC_COMP=10, PREC_EXP=14, PREC_UNARY=15;
+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 list, op, prec, fn,
+let u, list, op, prec, fn,
     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
+      qc&&err('Unexpected string') // must not follow another token
       while (c=cur.charCodeAt(idx), c-q) {
-        if (c === BSLASH) skip(), c=skip(), str += escape[c] || c;
-        else str += skip();
+        if (c === BSLASH) skip(), c=skip(), str += escape[c] || c
+        else str += skip()
       }
       return skip()||err('Bad string'), () => str
-    };
+    }
 
 // operators
 for (list=[
@@ -233,6 +71,4 @@ for (list=[
   // for JSON case we should not collect arg (different evaluator than ternary)
   ':', (a, prec, b) => (b=expr(1.1)||err(), a.id&&args.pop(), ctx => [(a.id||a)(ctx), b(ctx)]), 1.1
 
-]; [op,prec,fn,...list]=list, op;) set(op,prec,fn);
-
-export { parse as default };
+]; [op,prec,fn,...list]=list, op;) set(op,prec,fn)

package/justin.min.js

@@ -1 +1 @@
-let e,t,r,l,a,n,d,o=(l,a)=>(e=0,r=[],t=l.trim(),!(l=t?c():e=>a)||t[e]?f():a=e=>l(e||{}),a.args=r,a),i=e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192&&215!=e&&247!=e,f=(r="Bad syntax",l=t[e])=>{throw SyntaxError(r+" `"+l+"` at "+e)},p=(r=1,l=e,a)=>{if("number"==typeof r)e+=r;else for(;r(t.charCodeAt(e));)e++;return t.slice(l,e)},c=(t=0,r,l,a,n,d)=>{for(;(l=s())&&(n=(d=h[l])&&d(a,t)||!a&&u());)a=n;return r&&(l==r?e++:f()),a},s=r=>{for(;(r=t.charCodeAt(e))<=32;)e++;return r},u=(e=p(i),t)=>e?(t=t=>t[e],r.push(e),t.id=()=>e,t):0,h=[],g=o.set=(r,l,a=32,n=r.charCodeAt(0),d=r.length,o=h[n],f=a.length||([a,l]=[l,a],0),p=r.toUpperCase()!==r,s=(f>1?(e,t)=>e&&(t=c(l))&&(e.length||t.length?r=>a(e(r),t(r),e.id?.(r),t.id?.(r)):(e=a(e(),t()),()=>e)):f?e=>!e&&(e=c(l-1))&&(t=>a(e(t))):a))=>h[n]=(a,n,f=e)=>n<l&&(d<2||t.substr(e,d)==r)&&(!p||!i(t.charCodeAt(e+d)))&&(e+=d,s(a,n))||(e=f,o&&o(a,n)),x=e=>e>=48&&e<=57,C=r=>(r&&f("Unexpected number"),r=p((e=>46==e||x(e))),(69==t.charCodeAt(e)||101==t.charCodeAt(e))&&(r+=p(2)+p(x)),(r=+r)!=r?f("Bad number"):()=>r),A=(e,t)=>r=>t(e.of?e.of(r):r,e.id(r));for(a=48;a<=57;)h[a++]=C;for(l=['"',e=>(e=e?f("Unexpected string"):p((e=>e-34)),p()||f("Bad string"),()=>e),,".",(e,t)=>(s(),t=p(i)||f(),d=r=>e(r)[t],d.id=()=>t,d.of=e,d),18,".",e=>!e&&C(p(-1)),,"[",(e,t,r)=>e&&(t=c(0,93)||f(),(r=r=>e(r)[t(r)]).id=t,r.of=e,r),18,"(",(e,t,r)=>(t=c(0,41),e?r=>e(r).apply(e.of?.(r),t?t.all?t.all(r):[t(r)]:[]):t||f()),18,",",(e,t,r=c(1),l=(t=>(e(t),r(t))))=>(r?l.all=e.all?t=>[...e.all(t),r(t)]:t=>[e(t),r(t)]:f("Skipped argument"),l),1,"|",6,(e,t)=>e|t,"||",4,(e,t)=>e||t,"&",8,(e,t)=>e&t,"&&",5,(e,t)=>e&&t,"^",7,(e,t)=>e^t,"==",9,(e,t)=>e==t,"!=",9,(e,t)=>e!=t,">",10,(e,t)=>e>t,">=",10,(e,t)=>e>=t,">>",11,(e,t)=>e>>t,">>>",11,(e,t)=>e>>>t,"<",10,(e,t)=>e<t,"<=",10,(e,t)=>e<=t,"<<",11,(e,t)=>e<<t,"+",12,(e,t)=>e+t,"+",15,e=>+e,"++",e=>A(e||c(14),e?(e,t)=>e[t]++:(e,t)=>++e[t]),15,"-",12,(e,t)=>e-t,"-",15,e=>-e,"--",e=>A(e||c(14),e?(e,t)=>e[t]--:(e,t)=>--e[t]),15,"!",15,e=>!e,"*",13,(e,t)=>e*t,"/",13,(e,t)=>e/t,"%",13,(e,t)=>e%t];[a,n,d,...l]=l,a;)g(a,n,d);let U,b,m,y,B={n:"\n",r:"\r",t:"\t",b:"\b",f:"\f",v:"\v"},v=r=>(l,a,n="")=>{for(l&&f("Unexpected string");(a=t.charCodeAt(e))-r;)92===a?(p(),a=p(),n+=B[a]||a):n+=p();return p()||f("Bad string"),()=>n};for((U=['"',v(34),,"'",v(39),,"/*",(r,l)=>(p((r=>42!==r&&47!==t.charCodeAt(e+1))),p(2),r||c(l)),,"//",(e,t)=>(p((e=>e>=32)),e||c(t)),,"null",e=>e?f("Unexpected literal"):()=>null,,"true",e=>e?f("Unexpected literal"):()=>!0,,"false",e=>e?f("Unexpected literal"):()=>!1,,"undefined",e=>e?f("Unexpected literal"):()=>{},,";",e=>c()||(()=>{}),,"===",9,(e,t)=>e===t,"!==",9,(e,t)=>e!==t,"~",15,e=>~e,"**",(e,t,r=c(13))=>t=>e(t)**r(t),14,":",3.1,(e,t)=>[e,t],"?",3,(e,t)=>e?t[0]:t[1],"??",6,(e,t)=>e??t,"?.",e=>e&&(t=>e(t)||(()=>{})),,"?.",(e,t)=>(s(),(t=p(i))&&(r=>e(r)?.[t])),,"in",10,(e,t)=>e in t,"[",e=>!e&&((e=c(0,93))?e.all?t=>e.all(t):t=>[e(t)]:e=>[]),,"{",(e,t)=>!e&&((e=c(0,125))?r=>(t=(e.all||e)(r),Object.fromEntries(e.all?t:[t])):e=>({})),,":",(e,t,l)=>(l=c(1.1)||f(),e.id&&r.pop(),t=>[(e.id||e)(t),l(t)]),1.1]);[b,m,y,...U]=U,b;)g(b,m,y);export{o as default};
+let e,t,r,l,a,n,d,o=(l,a)=>(e=0,r=[],t=l.trim(),!(l=t?c():e=>{})||t[e]?f():a=e=>l(e||{}),a.args=r,a),i=e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192&&215!=e&&247!=e,f=(r="Bad syntax",l=t[e])=>{throw SyntaxError(r+" `"+l+"` at "+e)},p=(r=1,l=e,a)=>{if("number"==typeof r)e+=r;else for(;r(t.charCodeAt(e));)e++;return t.slice(l,e)},c=(t=0,r,l,a,n,d)=>{for(;(l=s())&&(n=(d=h[l])&&d(a,t)||!a&&u());)a=n;return r&&(l==r?e++:f()),a},s=r=>{for(;(r=t.charCodeAt(e))<=32;)e++;return r},u=(e=p(i),t)=>e?(t=t=>t[e],r.push(e),t.id=()=>e,t):0,h=[],g=o.set=(r,l,a=32,n=r.charCodeAt(0),d=r.length,o=h[n],f=a.length||([a,l]=[l,a],0),p=r.toUpperCase()!==r,s=(f>1?(e,t)=>e&&(t=c(l))&&(e.length||t.length?r=>a(e(r),t(r),e.id?.(r),t.id?.(r)):(e=a(e(),t()),()=>e)):f?e=>!e&&(e=c(l-1))&&(t=>a(e(t))):a))=>h[n]=(a,n,f=e)=>n<l&&(d<2||t.substr(e,d)==r)&&(!p||!i(t.charCodeAt(e+d)))&&(e+=d,s(a,n))||(e=f,o&&o(a,n)),x=e=>e>=48&&e<=57,C=r=>(r&&f("Unexpected number"),r=p((e=>46==e||x(e))),(69==t.charCodeAt(e)||101==t.charCodeAt(e))&&(r+=p(2)+p(x)),(r=+r)!=r?f("Bad number"):()=>r),A=(e,t)=>r=>t(e.of?e.of(r):r,e.id(r));for(a=48;a<=57;)h[a++]=C;for(l=['"',e=>(e=e?f("Unexpected string"):p((e=>e-34)),p()||f("Bad string"),()=>e),,".",(e,t)=>(s(),t=p(i)||f(),d=r=>e(r)[t],d.id=()=>t,d.of=e,d),18,".",e=>!e&&C(p(-1)),,"[",(e,t,r)=>e&&(t=c(0,93)||f(),(r=r=>e(r)[t(r)]).id=t,r.of=e,r),18,"(",(e,t,r)=>(t=c(0,41),e?r=>e(r).apply(e.of?.(r),t?t.all?t.all(r):[t(r)]:[]):t||f()),18,",",(e,t,r=c(1),l=(t=>(e(t),r(t))))=>(r?l.all=e.all?t=>[...e.all(t),r(t)]:t=>[e(t),r(t)]:f("Skipped argument"),l),1,"|",6,(e,t)=>e|t,"||",4,(e,t)=>e||t,"&",8,(e,t)=>e&t,"&&",5,(e,t)=>e&&t,"^",7,(e,t)=>e^t,"==",9,(e,t)=>e==t,"!=",9,(e,t)=>e!=t,">",10,(e,t)=>e>t,">=",10,(e,t)=>e>=t,">>",11,(e,t)=>e>>t,">>>",11,(e,t)=>e>>>t,"<",10,(e,t)=>e<t,"<=",10,(e,t)=>e<=t,"<<",11,(e,t)=>e<<t,"+",12,(e,t)=>e+t,"+",15,e=>+e,"++",e=>A(e||c(14),e?(e,t)=>e[t]++:(e,t)=>++e[t]),15,"-",12,(e,t)=>e-t,"-",15,e=>-e,"--",e=>A(e||c(14),e?(e,t)=>e[t]--:(e,t)=>--e[t]),15,"!",15,e=>!e,"*",13,(e,t)=>e*t,"/",13,(e,t)=>e/t,"%",13,(e,t)=>e%t];[a,n,d,...l]=l,a;)g(a,n,d);let U,b,m,y,B={n:"\n",r:"\r",t:"\t",b:"\b",f:"\f",v:"\v"},v=r=>(l,a,n="")=>{for(l&&f("Unexpected string");(a=t.charCodeAt(e))-r;)92===a?(p(),a=p(),n+=B[a]||a):n+=p();return p()||f("Bad string"),()=>n};for((U=['"',v(34),,"'",v(39),,"/*",(r,l)=>(p((r=>42!==r&&47!==t.charCodeAt(e+1))),p(2),r||c(l)),,"//",(e,t)=>(p((e=>e>=32)),e||c(t)),,"null",e=>e?f("Unexpected literal"):()=>null,,"true",e=>e?f("Unexpected literal"):()=>!0,,"false",e=>e?f("Unexpected literal"):()=>!1,,"undefined",e=>e?f("Unexpected literal"):()=>{},,";",e=>c()||(()=>{}),,"===",9,(e,t)=>e===t,"!==",9,(e,t)=>e!==t,"~",15,e=>~e,"**",(e,t,r=c(13))=>t=>e(t)**r(t),14,":",3.1,(e,t)=>[e,t],"?",3,(e,t)=>e?t[0]:t[1],"??",6,(e,t)=>e??t,"?.",e=>e&&(t=>e(t)||(()=>{})),,"?.",(e,t)=>(s(),(t=p(i))&&(r=>e(r)?.[t])),,"in",10,(e,t)=>e in t,"[",e=>!e&&((e=c(0,93))?e.all?t=>e.all(t):t=>[e(t)]:e=>[]),,"{",(e,t)=>!e&&((e=c(0,125))?r=>(t=(e.all||e)(r),Object.fromEntries(e.all?t:[t])):e=>({})),,":",(e,t,l)=>(l=c(1.1)||f(),e.id&&r.pop(),t=>[(e.id||e)(t),l(t)]),1.1]);[b,m,y,...U]=U,b;)g(b,m,y);export{o as default};

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "subscript",
-  "version": "6.3.1",
+  "version": "6.4.0",
   "description": "Fast and tiny expression evaluator with common syntax microlanguage.",
-  "main": "src/subscript.js",
-  "module": "src/subscript.js",
+  "main": "subscript.js",
+  "module": "subscript.js",
   "browser": "subscript.js",
   "type": "module",
   "files": [
-    "src",
+    "parser.js",
     "subscript.js",
     "subscript.min.js",
     "justin.js",
@@ -19,12 +19,13 @@
     "test": "test"
   },
   "scripts": {
-    "build": "npm run build-subscript && npm run minify-subscript && npm run build-justin && npm run minify-justin",
-    "build-subscript": "rollup src/subscript.js --file subscript.js --format esm --name \"Subscript\"",
-    "minify-subscript": "terser subscript.js -o subscript.min.js --module -c passes=3 -m",
-    "build-justin": "rollup src/justin.js --file justin.js --format esm --name \"Justin\"",
-    "minify-justin": "terser justin.js -o justin.min.js --module -c passes=3 -m",
-    "test": "node test"
+    "build": "npm run build-subscript && npm run build-justin",
+    "minify": "npm run minify-subscript && npm run minify-justin",
+    "build-subscript": "rollup subscript.js --file subscript.min.js --format esm --name \"Subscript\"",
+    "minify-subscript": "terser subscript.min.js -o subscript.min.js --module -c passes=3 -m",
+    "build-justin": "rollup justin.js --file justin.min.js --format esm --name \"Justin\"",
+    "minify-justin": "terser justin.min.js -o justin.min.js --module -c passes=3 -m",
+    "test": "node test && node test/jsep && node test/perf"
   },
   "repository": {
     "type": "git",

package/subscript.js

@@ -1,85 +1,10 @@
-const SPACE=32;
-
-// current string, index and collected ids
-let idx, cur, args,
-
-// no handling tagged literals since easily done on user side with cache, if needed
-parse = (s, fn) => (
-  idx=0, args=[], cur=s.trim(),
-  !(s = cur ? expr() : ctx=>fn) || cur[idx] ? err() :
-  fn = ctx=>s(ctx||{}), fn.args = args, fn
-),
-
-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
-
-err = (msg='Bad syntax',c=cur[idx]) => { throw SyntaxError(msg + ' `' + c + '` at ' + idx) },
-
-skip = (is=1, from=idx, l) => {
-  if (typeof is == 'number') idx += is;
-  else while (is(cur.charCodeAt(idx))) idx++;
-  return cur.slice(from, idx)
-},
-
-// a + b - c
-expr = (prec=0, end, cc, token, newNode, fn) => {
-  // chunk/token parser
-  while (
-    ( cc=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 && 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 "Unclose paren", because can be unknown operator within group as well
-  if (end) cc==end?idx++:err();
-
-  return token
-},
-
-// skip space chars, return first non-space character
-space = cc => { while ((cc = cur.charCodeAt(idx)) <= SPACE) idx++; return cc },
-
-// variable identifier
-id = (name=skip(isId), fn) => name ? (fn=ctx => ctx[name], args.push(name), fn.id=()=>name, fn) : 0,
-
-// operator/token lookup table
-lookup = [],
-
-// create operator checker/mapper (see examples)
-set = parse.set = (
-  op,
-  opPrec, fn=SPACE, // if opPrec & fn come in reverse order - consider them raw parse fn case, still precedence possible
-  c=op.charCodeAt(0),
-  l=op.length,
-  prev=lookup[c],
-  arity=fn.length || ([fn,opPrec]=[opPrec,fn], 0),
-  word=op.toUpperCase()!==op, // make sure word boundary comes after word operator
-  map=
-    // binary
-    arity>1 ? (a,b) => a && (b=expr(opPrec)) && (
-      !a.length && !b.length ? (a=fn(a(),b()), ()=>a) : // static pre-eval like `"a"+"b"`
-      ctx => fn(a(ctx),b(ctx),a.id?.(ctx),b.id?.(ctx))
-    ) :
-    // unary prefix (0 args)
-    arity ? a => !a && (a=expr(opPrec-1)) && (ctx => fn(a(ctx))) :
-    fn // custom parser
-) =>
-lookup[c] = (a, curPrec, from=idx) => curPrec<opPrec && (l<2||cur.substr(idx,l)==op) && (!word||!isId(cur.charCodeAt(idx+l))) && (idx+=l, map(a, curPrec)) || (idx=from, prev&&prev(a, curPrec));
-
-const PERIOD=46, CPAREN=41, CBRACK=93, DQUOTE=34, _0=48, _9=57,
+import {parse, set, lookup, skip, cur, idx, err, expr, isId, args, space} from './parser.js'
+
+const PERIOD=46, OPAREN=40, CPAREN=41, OBRACK=91, CBRACK=93, SPACE=32, DQUOTE=34, _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_CALL=18;
+PREC_EQ=9, PREC_COMP=10, PREC_SHIFT=11, PREC_SUM=12, PREC_MULT=13, PREC_UNARY=15, PREC_POSTFIX=16, PREC_CALL=18, PREC_GROUP=19
 
-let list, op, prec, fn,
+let u, list, op, prec, fn,
     isNum = c => c>=_0 && c<=_9,
     // 1.2e+3, .5
     num = n => (
@@ -89,10 +14,10 @@ let list, op, prec, fn,
       n=+n, n!=n ? err('Bad number') : () => n // 0 args means token is static
     ),
 
-    inc = (a,fn) => ctx => fn(a.of?a.of(ctx):ctx, a.id(ctx));
+    inc = (a,fn) => ctx => fn(a.of?a.of(ctx):ctx, a.id(ctx))
 
 // numbers
-for (op=_0;op<=_9;) lookup[op++] = num;
+for (op=_0;op<=_9;) lookup[op++] = num
 
 // operators
 for (list=[
@@ -161,6 +86,6 @@ for (list=[
   '*', PREC_MULT, (a,b)=>a*b,
   '/', PREC_MULT, (a,b)=>a/b,
   '%', PREC_MULT, (a,b)=>a%b
-]; [op,prec,fn,...list]=list, op;) set(op,prec,fn);
-
-export { parse as default };
+]; [op,prec,fn,...list]=list, op;) set(op,prec,fn)
+
+export default parse

package/subscript.min.js

@@ -1 +1 @@
-let e,r,t,a,o,d,l,n=(a,o)=>(e=0,t=[],r=a.trim(),!(a=r?s():e=>o)||r[e]?h():o=e=>a(e||{}),o.args=t,o),f=e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192&&215!=e&&247!=e,h=(t="Bad syntax",a=r[e])=>{throw SyntaxError(t+" `"+a+"` at "+e)},i=(t=1,a=e,o)=>{if("number"==typeof t)e+=t;else for(;t(r.charCodeAt(e));)e++;return r.slice(a,e)},s=(r=0,t,a,o,d,l)=>{for(;(a=p())&&(d=(l=c[a])&&l(o,r)||!o&&u());)o=d;return t&&(a==t?e++:h()),o},p=t=>{for(;(t=r.charCodeAt(e))<=32;)e++;return t},u=(e=i(f),r)=>e?(r=r=>r[e],t.push(e),r.id=()=>e,r):0,c=[],g=n.set=(t,a,o=32,d=t.charCodeAt(0),l=t.length,n=c[d],h=o.length||([o,a]=[a,o],0),i=t.toUpperCase()!==t,p=(h>1?(e,r)=>e&&(r=s(a))&&(e.length||r.length?t=>o(e(t),r(t),e.id?.(t),r.id?.(t)):(e=o(e(),r()),()=>e)):h?e=>!e&&(e=s(a-1))&&(r=>o(e(r))):o))=>c[d]=(o,d,h=e)=>d<a&&(l<2||r.substr(e,l)==t)&&(!i||!f(r.charCodeAt(e+l)))&&(e+=l,p(o,d))||(e=h,n&&n(o,d)),C=e=>e>=48&&e<=57,A=t=>(t&&h("Unexpected number"),t=i((e=>46==e||C(e))),(69==r.charCodeAt(e)||101==r.charCodeAt(e))&&(t+=i(2)+i(C)),(t=+t)!=t?h("Bad number"):()=>t),m=(e,r)=>t=>r(e.of?e.of(t):t,e.id(t));for(o=48;o<=57;)c[o++]=A;for(a=['"',e=>(e=e?h("Unexpected string"):i((e=>e-34)),i()||h("Bad string"),()=>e),,".",(e,r)=>(p(),r=i(f)||h(),l=t=>e(t)[r],l.id=()=>r,l.of=e,l),18,".",e=>!e&&A(i(-1)),,"[",(e,r,t)=>e&&(r=s(0,93)||h(),(t=t=>e(t)[r(t)]).id=r,t.of=e,t),18,"(",(e,r,t)=>(r=s(0,41),e?t=>e(t).apply(e.of?.(t),r?r.all?r.all(t):[r(t)]:[]):r||h()),18,",",(e,r,t=s(1),a=(r=>(e(r),t(r))))=>(t?a.all=e.all?r=>[...e.all(r),t(r)]:r=>[e(r),t(r)]:h("Skipped argument"),a),1,"|",6,(e,r)=>e|r,"||",4,(e,r)=>e||r,"&",8,(e,r)=>e&r,"&&",5,(e,r)=>e&&r,"^",7,(e,r)=>e^r,"==",9,(e,r)=>e==r,"!=",9,(e,r)=>e!=r,">",10,(e,r)=>e>r,">=",10,(e,r)=>e>=r,">>",11,(e,r)=>e>>r,">>>",11,(e,r)=>e>>>r,"<",10,(e,r)=>e<r,"<=",10,(e,r)=>e<=r,"<<",11,(e,r)=>e<<r,"+",12,(e,r)=>e+r,"+",15,e=>+e,"++",e=>m(e||s(14),e?(e,r)=>e[r]++:(e,r)=>++e[r]),15,"-",12,(e,r)=>e-r,"-",15,e=>-e,"--",e=>m(e||s(14),e?(e,r)=>e[r]--:(e,r)=>--e[r]),15,"!",15,e=>!e,"*",13,(e,r)=>e*r,"/",13,(e,r)=>e/r,"%",13,(e,r)=>e%r];[o,d,l,...a]=a,o;)g(o,d,l);export{n as default};
+let e,r,t,a,o,d,l,n=(a,o)=>(e=0,t=[],r=a.trim(),!(a=r?s():e=>{})||r[e]?h():o=e=>a(e||{}),o.args=t,o),f=e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192&&215!=e&&247!=e,h=(t="Bad syntax",a=r[e])=>{throw SyntaxError(t+" `"+a+"` at "+e)},i=(t=1,a=e,o)=>{if("number"==typeof t)e+=t;else for(;t(r.charCodeAt(e));)e++;return r.slice(a,e)},s=(r=0,t,a,o,d,l)=>{for(;(a=p())&&(d=(l=c[a])&&l(o,r)||!o&&u());)o=d;return t&&(a==t?e++:h()),o},p=t=>{for(;(t=r.charCodeAt(e))<=32;)e++;return t},u=(e=i(f),r)=>e?(r=r=>r[e],t.push(e),r.id=()=>e,r):0,c=[],g=n.set=(t,a,o=32,d=t.charCodeAt(0),l=t.length,n=c[d],h=o.length||([o,a]=[a,o],0),i=t.toUpperCase()!==t,p=(h>1?(e,r)=>e&&(r=s(a))&&(e.length||r.length?t=>o(e(t),r(t),e.id?.(t),r.id?.(t)):(e=o(e(),r()),()=>e)):h?e=>!e&&(e=s(a-1))&&(r=>o(e(r))):o))=>c[d]=(o,d,h=e)=>d<a&&(l<2||r.substr(e,l)==t)&&(!i||!f(r.charCodeAt(e+l)))&&(e+=l,p(o,d))||(e=h,n&&n(o,d)),C=e=>e>=48&&e<=57,A=t=>(t&&h("Unexpected number"),t=i((e=>46==e||C(e))),(69==r.charCodeAt(e)||101==r.charCodeAt(e))&&(t+=i(2)+i(C)),(t=+t)!=t?h("Bad number"):()=>t),m=(e,r)=>t=>r(e.of?e.of(t):t,e.id(t));for(o=48;o<=57;)c[o++]=A;for(a=['"',e=>(e=e?h("Unexpected string"):i((e=>e-34)),i()||h("Bad string"),()=>e),,".",(e,r)=>(p(),r=i(f)||h(),l=t=>e(t)[r],l.id=()=>r,l.of=e,l),18,".",e=>!e&&A(i(-1)),,"[",(e,r,t)=>e&&(r=s(0,93)||h(),(t=t=>e(t)[r(t)]).id=r,t.of=e,t),18,"(",(e,r,t)=>(r=s(0,41),e?t=>e(t).apply(e.of?.(t),r?r.all?r.all(t):[r(t)]:[]):r||h()),18,",",(e,r,t=s(1),a=(r=>(e(r),t(r))))=>(t?a.all=e.all?r=>[...e.all(r),t(r)]:r=>[e(r),t(r)]:h("Skipped argument"),a),1,"|",6,(e,r)=>e|r,"||",4,(e,r)=>e||r,"&",8,(e,r)=>e&r,"&&",5,(e,r)=>e&&r,"^",7,(e,r)=>e^r,"==",9,(e,r)=>e==r,"!=",9,(e,r)=>e!=r,">",10,(e,r)=>e>r,">=",10,(e,r)=>e>=r,">>",11,(e,r)=>e>>r,">>>",11,(e,r)=>e>>>r,"<",10,(e,r)=>e<r,"<=",10,(e,r)=>e<=r,"<<",11,(e,r)=>e<<r,"+",12,(e,r)=>e+r,"+",15,e=>+e,"++",e=>m(e||s(14),e?(e,r)=>e[r]++:(e,r)=>++e[r]),15,"-",12,(e,r)=>e-r,"-",15,e=>-e,"--",e=>m(e||s(14),e?(e,r)=>e[r]--:(e,r)=>--e[r]),15,"!",15,e=>!e,"*",13,(e,r)=>e*r,"/",13,(e,r)=>e/r,"%",13,(e,r)=>e%r];[o,d,l,...a]=a,o;)g(o,d,l);export{n as default};

package/src/justin.js

@@ -1,74 +0,0 @@
-// justin lang https://github.com/endojs/Jessie/issues/66
-import {set, lookup, skip, cur, idx, err, expr, isId, space, args} from './index.js'
-export { default } 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 u, list, op, prec, fn,
-    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
-      while (c=cur.charCodeAt(idx), c-q) {
-        if (c === BSLASH) skip(), c=skip(), str += escape[c] || c
-        else str += skip()
-      }
-      return skip()||err('Bad string'), () => str
-    }
-
-// operators
-for (list=[
-  // "' with /
-  '"', string(DQUOTE),,
-  "'", string(QUOTE),,
-
-  // /**/, //
-  '/*', (a, prec) => (skip(c => c !== 42 && cur.charCodeAt(idx+1) !== 47), skip(2), a||expr(prec)),,
-  '//', (a, prec) => (skip(c => c >= 32), a||expr(prec)),,
-
-  // literals
-  'null', a => a ? err('Unexpected literal') : ()=>null,,
-  'true', a => a ? err('Unexpected literal') : ()=>true,,
-  'false', a => a ? err('Unexpected literal') : ()=>false,,
-  'undefined', a => a ? err('Unexpected literal') : ()=>undefined,,
-
-  ';', a => expr()||(()=>{}),,
-
-  // operators
-  '===', PREC_EQ, (a,b) => a===b,
-  '!==', PREC_EQ, (a,b) => a!==b,
-  '~', PREC_UNARY, (a) => ~a,
-
-  // right order
-  '**', (a,prec,b=expr(PREC_EXP-1)) => ctx=>a(ctx)**b(ctx), PREC_EXP,
-
-  // ?:
-  ':', 3.1, (a,b) => [a,b],
-  '?', 3, (a,b) => a ? b[0] : b[1],
-
-  '??', PREC_OR, (a,b) => a??b,
-
-  // a?.[, a?.( - postfix operator
-  '?.', a => a && (ctx => a(ctx)||(()=>{})),,//(a) => a||(()=>{}),
-  // a?.b - optional chain operator
-  '?.', (a,id) => (space(), id=skip(isId)) && (ctx => a(ctx)?.[id]),,
-
-  'in', PREC_COMP, (a,b) => a in b,
-
-  // [a,b,c]
-  '[', (a) => !a && (
-    a=expr(0,CBRACK),
-    !a ? ctx => [] : a.all ? ctx => a.all(ctx) : ctx => [a(ctx)]
-  ),,
-
-  // {a:1, b:2, c:3}
-  '{', (a, entries) => !a && (
-      a=expr(0,125),
-      !a ? ctx => ({}) : ctx => (entries=(a.all||a)(ctx), Object.fromEntries(a.all?entries:[entries]))
-    ),,
-  // for JSON case we should not collect arg (different evaluator than ternary)
-  ':', (a, prec, b) => (b=expr(1.1)||err(), a.id&&args.pop(), ctx => [(a.id||a)(ctx), b(ctx)]), 1.1
-
-]; [op,prec,fn,...list]=list, op;) set(op,prec,fn)

package/src/subscript.js

@@ -1,91 +0,0 @@
-import {parse, set, lookup, skip, cur, idx, err, expr, isId, args, space} from './index.js'
-
-const PERIOD=46, OPAREN=40, CPAREN=41, OBRACK=91, CBRACK=93, SPACE=32, DQUOTE=34, _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, PREC_GROUP=19
-
-let u, list, op, prec, fn,
-    isNum = c => c>=_0 && c<=_9,
-    // 1.2e+3, .5
-    num = n => (
-      n&&err('Unexpected number'),
-      n = skip(c=>c == PERIOD || isNum(c)),
-      (cur.charCodeAt(idx) == 69 || cur.charCodeAt(idx) == 101) && (n += skip(2) + skip(isNum)),
-      n=+n, n!=n ? err('Bad number') : () => n // 0 args means token is static
-    ),
-
-    inc = (a,fn) => ctx => fn(a.of?a.of(ctx):ctx, a.id(ctx))
-
-// numbers
-for (op=_0;op<=_9;) lookup[op++] = num
-
-// operators
-for (list=[
-  // "a"
-  '"', a => (a=a?err('Unexpected string'):skip(c => c-DQUOTE), skip()||err('Bad string'), ()=>a),,
-
-  // a.b
-  '.', (a,id) => (space(), id=skip(isId)||err(), fn=ctx=>a(ctx)[id], fn.id=()=>id, fn.of=a, fn), PREC_CALL,
-
-  // .2
-  // FIXME: .123 is not operator, so we skip back, but mb reorganizing num would be better
-  '.', a => !a && num(skip(-1)),,
-
-  // a[b]
-  '[', (a,b,fn) => a && (b=expr(0,CBRACK)||err(), fn=ctx=>a(ctx)[b(ctx)], fn.id=b, fn.of=a, fn), PREC_CALL,
-
-  // a(), a(b), (a,b), (a+b)
-  '(', (a,b,fn) => (
-    b=expr(0,CPAREN),
-    // a(), a(b), a(b,c,d)
-    a ? ctx => a(ctx).apply(a.of?.(ctx), b ? b.all ? b.all(ctx) : [b(ctx)] : []) :
-    // (a+b)
-    b || err()
-  ), PREC_CALL,
-
-  // [a,b,c] or (a,b,c)
-  ',', (a,prec,b=expr(PREC_SEQ),fn=ctx => (a(ctx), b(ctx))) => (
-    b ? (fn.all = a.all ? ctx => [...a.all(ctx),b(ctx)] : ctx => [a(ctx),b(ctx)]) : err('Skipped argument',),
-    fn
-  ), PREC_SEQ,
-
-  '|', PREC_OR, (a,b)=>a|b,
-  '||', PREC_SOME, (a,b)=>a||b,
-
-  '&', PREC_AND, (a,b)=>a&b,
-  '&&', PREC_EVERY, (a,b)=>a&&b,
-
-  '^', PREC_XOR, (a,b)=>a^b,
-
-  // ==, !=
-  '==', PREC_EQ, (a,b)=>a==b,
-  '!=', PREC_EQ, (a,b)=>a!=b,
-
-  // > >= >> >>>, < <= <<
-  '>', PREC_COMP, (a,b)=>a>b,
-  '>=', PREC_COMP, (a,b)=>a>=b,
-  '>>', PREC_SHIFT, (a,b)=>a>>b,
-  '>>>', PREC_SHIFT, (a,b)=>a>>>b,
-  '<', PREC_COMP, (a,b)=>a<b,
-  '<=', PREC_COMP, (a,b)=>a<=b,
-  '<<', PREC_SHIFT, (a,b)=>a<<b,
-
-  // + ++ - --
-  '+', PREC_SUM, (a,b)=>a+b,
-  '+', PREC_UNARY, (a)=>+a,
-  '++', a => inc(a||expr(PREC_UNARY-1), a ? (a,b)=>a[b]++ : (a,b)=>++a[b]), PREC_UNARY,
-
-  '-', PREC_SUM, (a,b)=>a-b,
-  '-', PREC_UNARY, (a)=>-a,
-  '--', a => inc(a||expr(PREC_UNARY-1), a ? (a,b)=>a[b]-- : (a,b)=>--a[b]), PREC_UNARY,
-
-  // ! ~
-  '!', PREC_UNARY, (a)=>!a,
-
-  // * / %
-  '*', PREC_MULT, (a,b)=>a*b,
-  '/', PREC_MULT, (a,b)=>a/b,
-  '%', PREC_MULT, (a,b)=>a%b
-]; [op,prec,fn,...list]=list, op;) set(op,prec,fn)
-
-export default parse