subscript 9.1.0 → 10.0.0

package/subscript.js

@@ -1,24 +1,64 @@
 /**
- * Subscript dialect includes common operators / primitives for all languages
+ * subscript: Minimal expression parser + compiler
+ *
+ * Usage:
+ *   subscript`a + b`(ctx)           - template tag, returns compiled evaluator
+ *   subscript`a + ${x}`(ctx)        - interpolations: primitives, objects, AST nodes
+ *   subscript('a + b')(ctx)         - direct call (no caching)
+ *
+ * For more features:
+ *   import { parse, compile } from 'subscript/justin.js'  // + JSON, arrows, templates
+ *   import { parse, compile } from 'subscript/jessie.js'  // + statements, functions
  */
-import './feature/number.js'
-import './feature/string.js'
-import './feature/call.js'
-import './feature/access.js'
-import './feature/group.js'
-import './feature/assign.js'
-import './feature/mult.js'
-import './feature/add.js'
-import './feature/increment.js'
-import './feature/bitwise.js'
-import './feature/logic.js'
-import './feature/compare.js'
-import './feature/shift.js'
-import compile from './src/compile.js'
-import parse from './src/parse.js'
-
-export { parse, access, binary, unary, nary, group, token } from './src/parse.js'
-export { compile, operator } from './src/compile.js'
-export { stringify } from './src/stringify.js'
-
-export default s => compile(parse(s))
+
+// Expression features
+import './feature/number.js';       // Decimal numbers: 123, 1.5, 1e3
+import './feature/string.js';       // Double-quoted strings with escapes
+
+// Operators (C-family common set) - order matters for token chain performance
+import './feature/op/assignment.js';  // = += -= *= /= %= |= &= ^= >>= <<=
+import './feature/op/logical.js';     // ! && ||
+import './feature/op/bitwise.js';     // ~ | & ^ >> <<
+import './feature/op/comparison.js';  // < > <= >=
+import './feature/op/equality.js';    // == !=
+import './feature/op/arithmetic.js';  // + - * / %
+import './feature/op/increment.js';   // ++ --
+
+import './feature/group.js';          // Grouping: (a), sequences: a, b; a; b
+import './feature/access.js';         // Property access: a.b, a[b], f(), [a,b]
+
+import { parse, compile } from './parse.js';
+export * from './parse.js';
+
+// Cache for compiled templates (keyed by template strings array reference)
+const cache = new WeakMap();
+
+// Template tag: subscript`a + b` or subscript`a + ${x}`
+const subscript = (strings, ...values) =>
+  // Direct call subscript('code') - strings is just a string
+  typeof strings === 'string' ? compile(parse(strings)) :
+  // Template literal - use cache
+  cache.get(strings) || cache.set(strings, compileTemplate(strings, values)).get(strings);
+
+// Compile template with placeholders (using Private Use Area chars)
+const PUA = 0xE000;
+const compileTemplate = (strings, values) => {
+  const code = strings.reduce((acc, s, i) => acc + (i ? String.fromCharCode(PUA + i - 1) : '') + s, '');
+  const ast = parse(code);
+  const inject = node => {
+    if (typeof node === 'string' && node.length === 1) {
+      let i = node.charCodeAt(0) - PUA, v;
+      if (i >= 0 && i < values.length) return v = values[i], isAST(v) ? v : [, v];
+    }
+    return Array.isArray(node) ? node.map(inject) : node;
+  };
+  return compile(inject(ast));
+};
+
+// Detect AST node vs regular value
+// AST: string (identifier), or array with string/undefined first element
+const isAST = v =>
+  typeof v === 'string' ||
+  (Array.isArray(v) && (typeof v[0] === 'string' || v[0] === undefined));
+
+export default subscript;

package/subscript.min.js

@@ -1 +1,5 @@
-let t,r,e=e=>(t=0,r=e,e=i(),r[t]?n():e||""),n=(e="Bad syntax",n=r.slice(0,t).split("\n"),l=n.pop())=>{const o=r.slice(t-108,t).split("\n").pop(),i=r.slice(t,t+108).split("\n").shift();throw EvalError(`${e} at ${n.length}:${l.length} \`${t>=108?"…":""}${o}┃${i}\``,"font-weight: bold")},l=(e,n=t,l)=>{for(;l=e(r.charCodeAt(t));)t+=l;return r.slice(n,t)},o=(e=1,n=t)=>(t+=e,r.slice(n,t)),i=(r=0,o)=>{let i,p,c,h;for(;(i=s())&&(c=((h=a[i])&&h(p,r))??(!p&&l(e.id)));)p=c;return o&&(i==o?t++:n()),p},s=e=>{for(;(e=r.charCodeAt(t))<=32;)t++;return e};e.id=t=>t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122||36==t||95==t||t>=192&&215!=t&&247!=t;let a=[],p=(l,o=32,i,s=l.charCodeAt(0),p=l.length,c=a[s],h=l.toUpperCase()!==l)=>a[s]=(s,a,d,u=t)=>(d?l==d:(p<2||r.substr(t,p)==l)&&(d=l))&&a<o&&!(h&&e.id(r.charCodeAt(t+p)))&&(t+=p,i(s)||(t=u,!c&&n()))||c?.(s,a,d),c=(t,r,e=!1)=>p(t,r,((n,l)=>n&&(l=i(r-(e?.5:0)))&&[t,n,l])),h=(t,r,e)=>p(t,r,(n=>e?n&&[t,n]:!n&&(n=i(r-.5))&&[t,n])),d=(t,r,e)=>{p(t,r,((e,n)=>(n=i(r),e?.[0]!==t&&(e=[t,e||null]),n?.[0]===t?e.push(...n.slice(1)):e.push(n||null),e)))},u=(t,r)=>p(t[0],r,(r=>!r&&[t,i(0,t.charCodeAt(1))])),f=(t,r)=>p(t[0],r,(r=>r&&[t,r,i(0,t.charCodeAt(1))||null]));const g=(t,r)=>[,(t=+l((t=>46===t||t>=48&&t<=57||(69===t||101===t?2:0))))!=t?n():t];a[46]=t=>!t&&g();for(let t=48;t<=57;t++)a[t]=t=>t?n():g();const A={n:"\n",r:"\r",t:"\t",b:"\b",f:"\f",v:"\v"},y=e=>(l,i,s="")=>{for(l&&n("Unexpected string"),o();(i=r.charCodeAt(t))-e;)92===i?(o(),i=o(),s+=A[i]||i):s+=o();return o()||n("Bad string"),[,s]};a[34]=y(34),a[39]=y(39);const C=t=>Array.isArray(t)?t[0]?v[t[0]].call(...t):()=>t[1]:C.id(t);C.id=t=>r=>r?.[t];const v={},m=(t,r,e=v[t])=>v[t]=(...t)=>r(...t)||e?.(...t),$=(t,r,e,l,o)=>"()"===t[0]&&2==t.length?$(t[1],r,e):"string"==typeof t?e=>r(e,t,e):"."===t[0]?(l=C(t[1]),o=t[2],t=>r(l(t),o,t)):"[]"===t[0]&&3===t.length?(l=C(t[1]),o=C(t[2]),t=>r(l(t),o(t),t)):e?(t=C(t),e=>r([t(e)],0,e)):()=>n("Bad left value");f("()",170),m("()",((t,r,e)=>void 0!==r&&(e=r?","===r[0]?(r=r.slice(1).map((t=>t?C(t):err())),t=>r.map((r=>r(t)))):(r=C(r),t=>[r(t)]):()=>[],$(t,((t,r,n)=>t[r](...e(n))),!0)))),f("[]",170),m("[]",((t,r)=>r?(t=C(t),r=C(r),e=>t(e)[r(e)]):err())),c(".",170),m(".",((t,r)=>(t=C(t),r=r[0]?r:r[1],e=>t(e)[r]))),u("()",170),m("()",((t,r)=>void 0===r&&(!t&&n("Empty ()"),C(t))));const b=(...t)=>(t=t.map(C),r=>t.map((t=>t(r))).pop());function B(t){if(!t)return"";if(Array.isArray(t)){const[r,...e]=t;return r?"[]"==r||"{}"==r||"()"==r?(e.length>1?B(e.shift()):"")+r[0]+B(e[0])+r[1]:1===e.length?r+B(e[0]):2===e.length?B(e[0])+("."===r?r:" "+r+" ")+B(e[1]):e.filter(Boolean).map((t=>B(t))).join(r+"\n"):JSON.stringify(e[0])}return t}d(",",10),m(",",b),d(";",5),m(";",b),c("=",20,!0),m("=",((t,r)=>(r=C(r),$(t,((t,e,n)=>t[e]=r(n)))))),c("*",120),m("*",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)*r(e)))),c("/",120),m("/",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)/r(e)))),c("%",120),m("%",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)%r(e)))),c("*=",20,!0),m("*=",((t,r)=>(r=C(r),$(t,((t,e,n)=>t[e]*=r(n)))))),c("/=",20,!0),m("/=",((t,r)=>(r=C(r),$(t,((t,e,n)=>t[e]/=r(n)))))),c("%=",20,!0),m("%=",((t,r)=>(r=C(r),$(t,((t,e,n)=>t[e]%=r(n)))))),c("+",110),m("+",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)+r(e)))),c("-",110),m("-",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)-r(e)))),h("+",140),m("+",((t,r)=>!r&&(t=C(t),r=>+t(r)))),h("-",140),m("-",((t,r)=>!r&&(t=C(t),r=>-t(r)))),c("+=",20,!0),m("+=",((t,r)=>(r=C(r),$(t,((t,e,n)=>t[e]+=r(n)))))),c("-=",20,!0),m("-=",((t,r)=>(r=C(r),$(t,((t,e,n)=>t[e]-=r(n)))))),p("++",150,(t=>t?["++",t,null]:["++",i(149)])),m("++",((t,r)=>$(t,null===r?(t,r)=>t[r]++:(t,r)=>++t[r]))),p("--",150,(t=>t?["--",t,null]:["--",i(149)])),m("--",((t,r)=>$(t,null===r?(t,r)=>t[r]--:(t,r)=>--t[r]))),h("~",140),m("~",((t,r)=>!r&&(t=C(t),r=>~t(r)))),c("|",50),m("|",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)|r(e)))),c("&",70),m("&",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)&r(e)))),c("^",60),m("^",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)^r(e)))),h("!",140),m("!",((t,r)=>!r&&(t=C(t),r=>!t(r)))),c("||",30),m("||",((t,r)=>(t=C(t),r=C(r),e=>t(e)||r(e)))),c("&&",40),m("&&",((t,r)=>(t=C(t),r=C(r),e=>t(e)&&r(e)))),c("==",80),m("==",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)==r(e)))),c("!=",80),m("!=",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)!=r(e)))),c(">",90),m(">",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)>r(e)))),c("<",90),m("<",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)<r(e)))),c(">=",90),m(">=",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)>=r(e)))),c("<=",90),m("<=",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)<=r(e)))),c(">>",100),m(">>",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)>>r(e)))),c("<<",100),m("<<",((t,r)=>r&&(t=C(t),r=C(r),e=>t(e)<<r(e)))),c(">>=",20,!0),m(">>=",((t,r)=>(r=C(r),prop(t,((t,e,n)=>t[e]>>=r(n)))))),c("<<=",20,!0),m("<<=",((t,r)=>(r=C(r),prop(t,((t,e,n)=>t[e]<<=r(n))))));var x=t=>C(e(t));export{f as access,c as binary,C as compile,x as default,u as group,d as nary,m as operator,e as parse,B as stringify,p as token,h as unary};
+var f,A,m=r=>(f=0,A=r,m.newline=!1,r=h(),A[f]?S():r||""),S=(r="Unexpected token",e=f,t=A.slice(0,e).split(`
+`),n=t.pop(),o=A.slice(Math.max(0,e-40),e),s="\u032D",u=(A[e]||"\u2205")+s,c=A.slice(e+1,e+20))=>{throw SyntaxError(`${r} at ${t.length+1}:${n.length+1}
+${(A[e-41]!==`
+`?"...":"")+o}${u}${c}`)},W=(r,e=f)=>(Array.isArray(r)&&(r.loc=e),r),N=(r,e=f,t)=>{for(;t=r(A.charCodeAt(f));)f+=t;return A.slice(e,f)},g=(r=1)=>A[f+=r],z=r=>f=r,h=(r=0,e)=>{let t,n,o,s,u=m.reserved,c;for(e&&m.asi&&(m.newline=!1),m.reserved=0;(t=m.space())&&(c=m.newline,1)&&t!==e&&(o=((s=C[t])&&s(n,r))??(m.asi&&n&&c&&(o=m.asi(n,r,h)))??(!n&&!m.reserved&&N(m.id)));)n=o,m.reserved=0;return m.reserved=u,e&&(t==e?f++:S("Unclosed "+String.fromCharCode(e-(e>42?2:1)))),n},k=m.space=(r,e=f)=>{for(;(r=A.charCodeAt(f))<=32;)m.asi&&r===10&&(m.newline=!0),f++;return r},Zr=m.id=r=>r>=48&&r<=57||r>=65&&r<=90||r>=97&&r<=122||r==36||r==95||r>=192&&r!=215&&r!=247,b=(r,e=r.length)=>A.substr(f,e)===r&&!m.id(A.charCodeAt(f+e)),M=()=>(g(),h(0,41)),C=[],v=(r,e=32,t,n=r.charCodeAt(0),o=r.length,s=C[n],u=r.toUpperCase()!==r,c,d)=>C[n]=(y,U,L,x=f)=>(c=L,(L?r==L:(o<2||r.charCodeAt(1)===A.charCodeAt(f+1)&&(o<3||A.substr(f,o)==r))&&(!u||!m.id(A.charCodeAt(f+o)))&&(c=L=r))&&U<e&&(f+=o,(d=t(y))?W(d,x):(f=x,c=0,u&&d!==!1&&(m.reserved=1),!u&&!s&&S()),d)||s?.(y,U,c)),p=(r,e,t=!1)=>v(r,e,(n,o)=>n&&(o=h(e-(t?.5:0)))&&[r,n,o]),T=(r,e,t)=>v(r,e,n=>t?n&&[r,n]:!n&&(n=h(e-.5))&&[r,n]),qr=(r,e)=>v(r,200,t=>!t&&[,e]),J=(r,e,t)=>{v(r,e,(n,o)=>(o=h(e-(t?.5:0)),n?.[0]!==r&&(n=[r,n||null]),o?.[0]===r?n.push(...o.slice(1)):n.push(o||null),n))},rr=(r,e)=>v(r[0],e,t=>!t&&[r,h(0,r.charCodeAt(1))||null]),V=(r,e)=>v(r[0],e,t=>t&&[r,t,h(0,r.charCodeAt(1))||null]),er,Cr=(r="Compile error",e=er)=>S(r,e?.loc),G={},l=(r,e,t=G[r])=>G[r]=(...n)=>e(...n)||t?.(...n),i=r=>(er=r,Array.isArray(r)?r[0]===void 0?(e=>()=>e)(r[1]):G[r[0]]?.(...r.slice(1))??Cr(`Unknown operator: ${r[0]}`):r===void 0?()=>{}:e=>e?.[r]);var $=46,_=48,F=57,Er=69,gr=101,wr=43,Sr=45,kr=97,vr=102,Tr=65,Ir=70,Y=r=>[,(r=+N(e=>e===$&&A.charCodeAt(f+1)!==$||e>=_&&e<=F||((e===Er||e===gr)&&((e=A.charCodeAt(f+1))>=_&&e<=F||e===wr||e===Sr)?2:0)))!=r?S():r],Rr={2:r=>r===48||r===49,8:r=>r>=48&&r<=55,16:r=>r>=_&&r<=F||r>=kr&&r<=vr||r>=Tr&&r<=Ir};m.number=null;C[$]=r=>!r&&A.charCodeAt(f+1)!==$&&Y();for(let r=_;r<=F;r++)C[r]=e=>e?void 0:Y();C[_]=r=>{if(r)return;let e=m.number;if(e){for(let[t,n]of Object.entries(e))if(t[0]==="0"&&A[f+1]?.toLowerCase()===t[1])return g(2),[,parseInt(N(Rr[n]),n)]}return Y()};var Nr=92,tr=34,nr=39,Ur={n:`
+`,r:"\r",t:"	",b:"\b",f:"\f",v:"\v"},or=r=>(e,t,n="")=>{if(!(e||!m.string?.[String.fromCharCode(r)]))return g(),N(o=>o-r&&(o===Nr?(n+=Ur[A[f+1]]||A[f+1],2):(n+=A[f],1))),A[f]===String.fromCharCode(r)?g():S("Bad string"),[,n]};C[tr]=or(tr);C[nr]=or(nr);m.string={'"':!0};var w=20;p("=",w,!0);p("+=",w,!0);p("-=",w,!0);p("*=",w,!0);p("/=",w,!0);p("%=",w,!0);p("|=",w,!0);p("&=",w,!0);p("^=",w,!0);p(">>=",w,!0);p("<<=",w,!0);var E=(r,e,t,n)=>typeof r=="string"?o=>e(o,r,o):r[0]==="."?(t=i(r[1]),n=r[2],o=>e(t(o),n,o)):r[0]==="[]"&&r.length===3?(t=i(r[1]),n=i(r[2]),o=>e(t(o),n(o),o)):r[0]==="()"&&r.length===2?E(r[1],e):(()=>{throw Error("Invalid assignment target")})();l("=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]=e(o))));l("+=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]+=e(o))));l("-=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]-=e(o))));l("*=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]*=e(o))));l("/=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]/=e(o))));l("%=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]%=e(o))));l("|=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]|=e(o))));l("&=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]&=e(o))));l("^=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]^=e(o))));l(">>=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]>>=e(o))));l("<<=",(r,e)=>(e=i(e),E(r,(t,n,o)=>t[n]<<=e(o))));var Mr=30,_r=40,ir=140;p("!",ir);T("!",ir);p("||",Mr);p("&&",_r);l("!",r=>(r=i(r),e=>!r(e)));l("||",(r,e)=>(r=i(r),e=i(e),t=>r(t)||e(t)));l("&&",(r,e)=>(r=i(r),e=i(e),t=>r(t)&&e(t)));var Pr=50,Br=60,Dr=70,sr=100,Lr=140;p("|",Pr);p("&",Dr);p("^",Br);p(">>",sr);p("<<",sr);T("~",Lr);l("~",r=>(r=i(r),e=>~r(e)));l("|",(r,e)=>(r=i(r),e=i(e),t=>r(t)|e(t)));l("&",(r,e)=>(r=i(r),e=i(e),t=>r(t)&e(t)));l("^",(r,e)=>(r=i(r),e=i(e),t=>r(t)^e(t)));l(">>",(r,e)=>(r=i(r),e=i(e),t=>r(t)>>e(t)));l("<<",(r,e)=>(r=i(r),e=i(e),t=>r(t)<<e(t)));var X=90;p("<",X);p(">",X);p("<=",X);p(">=",X);l(">",(r,e)=>(r=i(r),e=i(e),t=>r(t)>e(t)));l("<",(r,e)=>(r=i(r),e=i(e),t=>r(t)<e(t)));l(">=",(r,e)=>(r=i(r),e=i(e),t=>r(t)>=e(t)));l("<=",(r,e)=>(r=i(r),e=i(e),t=>r(t)<=e(t)));var lr=80;p("==",lr);p("!=",lr);l("==",(r,e)=>(r=i(r),e=i(e),t=>r(t)==e(t)));l("!=",(r,e)=>(r=i(r),e=i(e),t=>r(t)!=e(t)));var ur=110,Z=120,fr=140;p("+",ur);p("-",ur);p("*",Z);p("/",Z);p("%",Z);T("+",fr);T("-",fr);l("+",(r,e)=>e!==void 0?(r=i(r),e=i(e),t=>r(t)+e(t)):(r=i(r),t=>+r(t)));l("-",(r,e)=>e!==void 0?(r=i(r),e=i(e),t=>r(t)-e(t)):(r=i(r),t=>-r(t)));l("*",(r,e)=>(r=i(r),e=i(e),t=>r(t)*e(t)));l("/",(r,e)=>(r=i(r),e=i(e),t=>r(t)/e(t)));l("%",(r,e)=>(r=i(r),e=i(e),t=>r(t)%e(t)));var O=150;v("++",O,r=>r?["++",r,null]:["++",h(O-1)]);v("--",O,r=>r?["--",r,null]:["--",h(O-1)]);var q=(r,e,t,n)=>typeof r=="string"?o=>e(o,r):r[0]==="."?(t=i(r[1]),n=r[2],o=>e(t(o),n)):r[0]==="[]"&&r.length===3?(t=i(r[1]),n=i(r[2]),o=>e(t(o),n(o))):r[0]==="()"&&r.length===2?q(r[1],e):(()=>{throw Error("Invalid increment target")})();l("++",(r,e)=>q(r,e===null?(t,n)=>t[n]++:(t,n)=>++t[n]));l("--",(r,e)=>q(r,e===null?(t,n)=>t[n]--:(t,n)=>--t[n]));var pr=5,$r=123,Fr=125,I=(r,e,t,n=r.charCodeAt(0),o=r.length,s=C[n],u)=>C[n]=(c,d,y,U=f)=>!c&&(y?r==y:(o<2||A.substr(f,o)==r)&&(y=r))&&d<e&&!m.id(A.charCodeAt(f+o))&&(z(f+o),(u=t())?W(u,U):(z(U),!s&&S()),u)||s?.(c,d,y);var P=()=>k()!==$r?h(pr+.5):(g(),["block",h(pr-.5,Fr)||null]);l("block",r=>r===void 0?()=>{}:(r=i(r),e=>r(e)));var B=(r,e,t)=>{if(typeof r=="string"){t[r]=e;return}let[n,...o]=r;if(n==="{}")for(let s of o){let u,c,d;s[0]==="="?[,[,u,c],d]=s:[,u,c]=s;let y=e[u];y===void 0&&d&&(y=i(d)(t)),B(c,y,t)}else if(n==="[]"){let s=0;for(let u of o){if(u===null){s++;continue}if(Array.isArray(u)&&u[0]==="..."){t[u[1]]=e.slice(s);break}let c=u,d;Array.isArray(u)&&u[0]==="="&&([,c,d]=u);let y=e[s++];y===void 0&&d&&(y=i(d)(t)),B(c,y,t)}}};var Q=Symbol("break"),H=Symbol("continue"),mr=Symbol("return"),D=(r,e)=>{try{return{v:r(e)}}catch(t){if(t?.type===Q)return{b:1};if(t?.type===H)return{c:1};if(t?.type===mr)return{r:1,v:t.value};throw t}},R=5,Xr=125,Or=59;I("while",R+1,()=>(k(),["while",M(),P()]));I("do",R+1,()=>(r=>(k(),g(5),k(),["do",r,M()]))(P()));I("for",R+1,()=>(k(),b("await")?(g(5),k(),["for await",M(),P()]):["for",M(),P()]));I("break",R+1,()=>["break"]);I("continue",R+1,()=>["continue"]);I("return",R+1,()=>{m.asi&&(m.newline=!1),k();let r=A.charCodeAt(f);return!r||r===Xr||r===Or||m.newline?["return"]:["return",h(R)]});l("while",(r,e)=>(r=i(r),e=i(e),t=>{let n,o;for(;r(t)&&!(n=D(e,t)).b;){if(n.r)return n.v;n.c||(o=n.v)}return o}));l("do",(r,e)=>(r=i(r),e=i(e),t=>{let n,o;do{if((n=D(r,t)).b)break;if(n.r)return n.v;n.c||(o=n.v)}while(e(t));return o}));l("for",(r,e)=>{if(Array.isArray(r)&&r[0]===";"){let[,t,n,o]=r;return t=t?i(t):null,n=n?i(n):()=>!0,o=o?i(o):null,e=i(e),s=>{let u,c;for(t?.(s);n(s)&&!(u=D(e,s)).b;o?.(s)){if(u.r)return u.v;u.c||(c=u.v)}return c}}if(Array.isArray(r)&&(r[0]==="in"||r[0]==="of")){let[t,n,o]=r;if(Array.isArray(n)&&(n[0]==="let"||n[0]==="const"||n[0]==="var")&&(n=n[1]),t==="in")return Hr(n,o,e);if(t==="of")return Qr(n,o,e)}});var Qr=(r,e,t)=>{e=i(e),t=i(t);let n=Array.isArray(r);return o=>{let s,u,c=n?null:o[r];for(let d of e(o)){if(n?B(r,d,o):o[r]=d,(s=D(t,o)).b)break;if(s.r)return s.v;s.c||(u=s.v)}return n||(o[r]=c),u}},Hr=(r,e,t)=>{e=i(e),t=i(t);let n=Array.isArray(r);return o=>{let s,u,c=n?null:o[r];for(let d in e(o)){if(n?B(r,d,o):o[r]=d,(s=D(t,o)).b)break;if(s.r)return s.v;s.c||(u=s.v)}return n||(o[r]=c),u}};l("break",()=>()=>{throw{type:Q}});l("continue",()=>()=>{throw{type:H}});l("return",r=>(r=r!==void 0?i(r):null,e=>{throw{type:mr,value:r?.(e)}}));var cr=r=>r?.[0]==="_"&&r[1]==="_"||r==="constructor"||r==="prototype",j=170;V("[]",j);p(".",j);V("()",j);var a=r=>{throw Error(r)};l("[]",(r,e)=>e===void 0?(r=r?r[0]===","?r.slice(1):[r]:[],r=r.map(t=>t==null?(()=>{}):t[0]==="..."?(t=i(t[1]),n=>t(n)):(t=i(t),n=>[t(n)])),t=>r.flatMap(n=>n(t))):(e==null&&a("Missing index"),r=i(r),e=i(e),t=>{let n=e(t);return cr(n)?void 0:r(t)[n]}));l(".",(r,e)=>(r=i(r),e=e[0]?e:e[1],cr(e)?()=>{}:t=>r(t)[e]));l("()",(r,e)=>{if(e===void 0)return r==null?a("Empty ()"):i(r);let t=o=>o?.[0]===","&&o.slice(1).some(s=>s==null||t(s));t(e)&&a("Empty argument");let n=e?e[0]===","?(e=e.slice(1).map(i),o=>e.map(s=>s(o))):(e=i(e),o=>[e(o)]):()=>[];return K(r,(o,s,u)=>o[s](...n(u)),!0)});var Kr=r=>{throw Error(r)},K=(r,e,t,n,o)=>r==null?Kr("Empty ()"):r[0]==="()"&&r.length==2?K(r[1],e,t):typeof r=="string"?s=>e(s,r,s):r[0]==="."?(n=i(r[1]),o=r[2],s=>e(n(s),o,s)):r[0]==="?."?(n=i(r[1]),o=r[2],s=>{let u=n(s);return u==null?void 0:e(u,o,s)}):r[0]==="[]"&&r.length===3?(n=i(r[1]),o=i(r[2]),s=>e(n(s),o(s),s)):r[0]==="?.[]"?(n=i(r[1]),o=i(r[2]),s=>{let u=n(s);return u==null?void 0:e(u,o(s),s)}):(r=i(r),s=>e([r(s)],0,s));var Gr=5,Wr=10,zr=170;rr("()",zr);J(",",Wr);J(";",Gr,!0);var Ar=r=>{throw Error(r)};l("()",(r,e)=>{if(e===void 0)return r==null?Ar("Empty ()"):i(r);let t=o=>o?.[0]===","&&o.slice(1).some(s=>s==null||t(s));t(e)&&Ar("Empty argument");let n=e?e[0]===","?(e=e.slice(1).map(i),o=>e.map(s=>s(o))):(e=i(e),o=>[e(o)]):()=>[];return K(r,(o,s,u)=>o[s](...n(u)),!0)});var dr=(...r)=>(r=r.map(i),e=>{let t;for(let n of r)try{t=n(e)}catch(o){throw(o?.type===Q||o?.type===H)&&(o.value=t),o}return t});l(",",dr);l(";",dr);var hr=new WeakMap,Jr=(r,...e)=>typeof r=="string"?i(m(r)):hr.get(r)||hr.set(r,Vr(r,e)).get(r),yr=57344,Vr=(r,e)=>{let t=r.reduce((s,u,c)=>s+(c?String.fromCharCode(yr+c-1):"")+u,""),n=m(t),o=s=>{if(typeof s=="string"&&s.length===1){let u=s.charCodeAt(0)-yr,c;if(u>=0&&u<e.length)return c=e[u],Yr(c)?c:[,c]}return Array.isArray(s)?s.map(o):s};return i(o(n))},Yr=r=>typeof r=="string"||Array.isArray(r)&&(typeof r[0]=="string"||r[0]===void 0),De=Jr;export{V as access,p as binary,i as compile,A as cur,De as default,S as err,h as expr,rr as group,Zr as id,f as idx,qr as literal,W as loc,C as lookup,J as nary,N as next,l as operator,G as operators,M as parens,m as parse,z as seek,g as skip,k as space,v as token,T as unary,b as word};

package/util/bundle.js

@@ -0,0 +1,507 @@
+/**
+ * ESM Bundler using subscript's own parser (dogfooding)
+ *
+ * Thin layer: scope analysis + tree transform
+ * Parser comes from the dialect (jessie by default)
+ */
+import { parse } from '../jessie.js';
+import { codegen } from './stringify.js';
+import { readFile } from 'fs/promises';
+import { resolve } from 'path';
+
+// === AST Utilities ===
+
+/** Walk AST, call fn(node, parent, key) for each node */
+const walk = (node, fn, parent = null, key = null) => {
+  if (!node || typeof node !== 'object') return;
+  fn(node, parent, key);
+  if (Array.isArray(node)) {
+    for (let i = 0; i < node.length; i++) walk(node[i], fn, node, i);
+  }
+};
+
+/** Deep clone AST */
+const clone = node =>
+  !node ? node :
+  Array.isArray(node) ? node.map(clone) :
+  node instanceof RegExp ? new RegExp(node.source, node.flags) :
+  typeof node === 'object' ? Object.fromEntries(Object.entries(node).map(([k,v]) => [k, clone(v)])) :
+  node;
+
+/** Rename identifier in AST - skip property access positions */
+const renameId = (ast, old, neu) => {
+  walk(ast, (node, parent, key) => {
+    if (Array.isArray(node)) {
+      for (let i = 0; i < node.length; i++) {
+        if (node[i] === old) {
+          // Don't rename if this is a property name in a '.' or '?.' access
+          if ((node[0] === '.' || node[0] === '?.') && i === 2) continue;
+          // Don't rename if this is a property name in object literal {a: b} or shorthand {a}
+          if (node[0] === ':' && i === 1 && typeof node[1] === 'string') continue;
+          node[i] = neu;
+        }
+      }
+    }
+  });
+  return ast;
+};
+
+/** Flatten comma nodes into array: [',', 'a', 'b'] → ['a', 'b'], 'x' → ['x'] */
+const flattenComma = node =>
+  Array.isArray(node) && node[0] === ',' ? node.slice(1) :
+  node ? [node] : [];
+
+// === Module Analysis ===
+
+/** Extract string from path node [null, 'path'] (string literal) */
+const getPath = node => Array.isArray(node) && (node[0] === undefined || node[0] === null) ? node[1] : node;
+
+/** Extract imports from AST
+ * New AST shapes:
+ *   import './x.js'           → ['import', [null, path]]
+ *   import X from './x.js'    → ['import', ['from', 'X', [null, path]]]
+ *   import {a,b} from './x'   → ['import', ['from', ['{}', ...], [null, path]]]
+ *   import * as X from './x'  → ['import', ['from', ['as', '*', 'X'], [null, path]]]
+ */
+const getImports = ast => {
+  const imports = [];
+  walk(ast, node => {
+    if (!Array.isArray(node) || node[0] !== 'import') return;
+    const body = node[1];
+    const imp = { node };
+
+    // import './x.js' - bare import: [, 'path'] sparse array with undefined at index 0
+    if (Array.isArray(body) && (body[0] === undefined || body[0] === null)) {
+      imp.path = body[1];
+      imports.push(imp);
+      return;
+    }
+
+    // import X from './x.js' or import {...} from './x.js'
+    if (Array.isArray(body) && body[0] === 'from') {
+      const spec = body[1];
+      const pathNode = body[2];
+      imp.path = getPath(pathNode);
+
+      if (typeof spec === 'string') {
+        // import X from - default import
+        imp.default_ = spec;
+      } else if (Array.isArray(spec)) {
+        if (spec[0] === '{}') {
+          // import { a, b, c as d }
+          const items = spec.slice(1).flatMap(flattenComma);
+          imp.named = items.map(s =>
+            Array.isArray(s) && s[0] === 'as' ? { name: s[1], alias: s[2] } : { name: s, alias: s }
+          );
+        } else if (spec[0] === 'as' && spec[1] === '*') {
+          // import * as X
+          imp.namespace = spec[2];
+        } else if (spec[0] === '*') {
+          // import * as X (alternate shape)
+          imp.namespace = spec[1];
+        }
+      }
+      imports.push(imp);
+    }
+  });
+  return imports;
+};
+
+/** Extract exports from AST
+ * New AST shapes:
+ *   export const x = 1        → ['export', ['const', ['=', 'x', val]]]
+ *   export default x          → ['export', ['default', 'x']]
+ *   export { a }              → ['export', ['{}', 'a']]
+ *   export { a } from './x'   → ['export', ['from', ['{}', 'a'], [null, path]]]
+ *   export * from './x'       → ['export', ['from', '*', [null, path]]]
+ */
+const getExports = ast => {
+  const exports = { named: {}, reexports: [], default_: null };
+
+  walk(ast, node => {
+    if (!Array.isArray(node) || node[0] !== 'export') return;
+    const spec = node[1];
+
+    // export { a } from './x' or export * from './x'
+    if (Array.isArray(spec) && spec[0] === 'from') {
+      const what = spec[1];
+      const pathNode = spec[2];
+      const path = getPath(pathNode);
+
+      if (what === '*') {
+        exports.reexports.push({ star: true, path });
+      } else if (Array.isArray(what) && what[0] === '{}') {
+        const items = what.slice(1).flatMap(flattenComma);
+        const names = items.map(s =>
+          Array.isArray(s) && s[0] === 'as' ? { name: s[1], alias: s[2] } : { name: s, alias: s }
+        );
+        exports.reexports.push({ names, path });
+      }
+      return;
+    }
+
+    // export { a, b }
+    if (Array.isArray(spec) && spec[0] === '{}') {
+      const items = spec.slice(1).flatMap(flattenComma);
+      const names = items.map(s =>
+        Array.isArray(s) && s[0] === 'as' ? { name: s[1], alias: s[2] } : { name: s, alias: s }
+      );
+      for (const { name, alias } of names) exports.named[alias] = name;
+      return;
+    }
+
+    // export default x
+    if (Array.isArray(spec) && spec[0] === 'default') {
+      exports.default_ = spec[1];
+      return;
+    }
+
+    // export const/let/var x = ... - varargs: ['let', decl1, decl2, ...]
+    if (Array.isArray(spec) && (spec[0] === 'const' || spec[0] === 'let' || spec[0] === 'var')) {
+      for (let i = 1; i < spec.length; i++) {
+        const decl = spec[i];
+        if (typeof decl === 'string') {
+          exports.named[decl] = decl;
+        } else if (Array.isArray(decl) && decl[0] === '=') {
+          const name = decl[1];
+          if (typeof name === 'string') exports.named[name] = name;
+        }
+      }
+      return;
+    }
+
+    // export function x() {} or export class x {}
+    if (Array.isArray(spec) && (spec[0] === 'function' || spec[0] === 'class')) {
+      if (typeof spec[1] === 'string') exports.named[spec[1]] = spec[1];
+    }
+  });
+
+  return exports;
+};
+
+/** Get all declared names in AST
+ * New AST shapes:
+ *   const x = 1   → ['const', ['=', 'x', val]]
+ *   let x         → ['let', 'x']
+ *   function f()  → ['function', 'f', ...]
+ *   const a = 1, b = 2 → ['const', ['=', 'a', ...], ['=', 'b', ...]] (varargs)
+ */
+const getDecls = ast => {
+  const decls = new Set();
+
+  const addDecl = node => {
+    if (typeof node === 'string') decls.add(node);
+    else if (Array.isArray(node)) {
+      if (node[0] === '=') {
+        if (typeof node[1] === 'string') decls.add(node[1]);
+      } else if (node[0] === ',') {
+        // Multiple declarations: const a = 1, b = 2 (older AST shape)
+        for (let i = 1; i < node.length; i++) addDecl(node[i]);
+      }
+    }
+  };
+
+  walk(ast, node => {
+    if (!Array.isArray(node)) return;
+    const op = node[0];
+
+    if (op === 'const' || op === 'let' || op === 'var') {
+      // Handle varargs: ['const', decl1, decl2, ...] for multiple declarations
+      for (let i = 1; i < node.length; i++) addDecl(node[i]);
+    }
+    if (op === 'function' || op === 'class') {
+      if (typeof node[1] === 'string') decls.add(node[1]);
+    }
+    if (op === 'export') {
+      const spec = node[1];
+      if (Array.isArray(spec) && (spec[0] === 'const' || spec[0] === 'let' || spec[0] === 'var')) {
+        addDecl(spec[1]);
+      }
+      if (Array.isArray(spec) && (spec[0] === 'function' || spec[0] === 'class') && typeof spec[1] === 'string') {
+        decls.add(spec[1]);
+      }
+    }
+  });
+
+  return decls;
+};
+
+// === AST Transforms ===
+
+/** Remove import/export nodes, extract declarations */
+/** Remove import/export nodes, extract declarations
+ * New AST shapes for export:
+ *   export const x = 1      → ['export', ['const', ...]] → keep ['const', ...]
+ *   export default x        → ['export', ['default', x]] → keep, or convert to __default
+ *   export { a }            → ['export', ['{}', ...]] → remove
+ *   export { a } from './x' → ['export', ['from', ['{}', ...], path]] → remove
+ *   export * from './x'     → ['export', ['from', '*', path]] → remove
+ */
+const stripModuleSyntax = ast => {
+  const defaultExpr = { value: null };
+
+  const process = node => {
+    if (!Array.isArray(node)) return node;
+    const op = node[0];
+
+    if (op === 'import') return null;
+
+    if (op === 'export') {
+      const spec = node[1];
+      // Re-exports: export { a } from './x' or export * from './x'
+      if (Array.isArray(spec) && spec[0] === 'from') return null;
+      // Named exports: export { a, b }
+      if (Array.isArray(spec) && spec[0] === '{}') return null;
+      // Default export
+      if (Array.isArray(spec) && spec[0] === 'default') {
+        defaultExpr.value = spec[1];
+        if (typeof spec[1] === 'string') return null;
+        return ['const', ['=', '__default', spec[1]]];
+      }
+      // Declaration export: export const x = 1
+      return spec;
+    }
+
+    if (op === ';') {
+      const parts = node.slice(1).map(process).filter(Boolean);
+      if (parts.length === 0) return null;
+      if (parts.length === 1) return parts[0];
+      return [';', ...parts];
+    }
+
+    return node;
+  };
+
+  return { ast: process(ast), defaultExpr: defaultExpr.value };
+};
+
+// === Path Resolution ===
+
+const resolvePath = (from, to) => {
+  if (!to.startsWith('.')) return to;
+  const base = from.split('/').slice(0, -1);
+  for (const part of to.split('/')) {
+    if (part === '..') base.pop();
+    else if (part !== '.') base.push(part);
+  }
+  let path = base.join('/');
+  if (!path.endsWith('.js')) path += '.js';
+  return path;
+};
+
+// === Bundler ===
+
+/**
+ * Bundle ES modules into single file
+ * @param {string} entry - Entry file path
+ * @param {(path: string) => string|Promise<string>} read - File reader
+ */
+export async function bundle(entry, read) {
+  const modules = new Map();
+  const order = [];
+
+  async function load(path) {
+    if (modules.has(path)) return;
+    modules.set(path, null);
+
+    const code = await read(path);
+    const ast = parse(code);
+    const imports = getImports(ast);
+    const exports = getExports(ast);
+    const decls = getDecls(ast);
+
+    for (const imp of imports) {
+      imp.resolved = resolvePath(path, imp.path);
+      await load(imp.resolved);
+    }
+    for (const re of exports.reexports) {
+      re.resolved = resolvePath(path, re.path);
+      await load(re.resolved);
+    }
+
+    modules.set(path, { ast: clone(ast), imports, exports, decls });
+    order.push(path);
+  }
+
+  await load(entry);
+
+  // Detect conflicts
+  const allDecls = new Map();
+  for (const [path, mod] of modules) {
+    const importAliases = new Set();
+    for (const imp of mod.imports) {
+      if (imp.default_) importAliases.add(imp.default_);
+      if (imp.namespace) importAliases.add(imp.namespace);
+      if (imp.named) for (const { alias } of imp.named) importAliases.add(alias);
+    }
+
+    for (const name of mod.decls) {
+      if (importAliases.has(name)) continue;
+      if (!allDecls.has(name)) allDecls.set(name, []);
+      allDecls.get(name).push(path);
+    }
+  }
+
+  // Build rename maps
+  const renames = new Map();
+  for (const [name, paths] of allDecls) {
+    if (paths.length > 1) {
+      for (const path of paths) {
+        if (!renames.has(path)) renames.set(path, {});
+        // Make valid JS identifier: replace non-alphanumeric with underscore
+        const prefix = path.split('/').pop().replace('.js', '').replace(/[^a-zA-Z0-9]/g, '_') + '_';
+        renames.get(path)[name] = prefix + name;
+      }
+    }
+  }
+
+  const traceDefault = path => {
+    const mod = modules.get(path);
+    if (!mod) return null;
+    const def = mod.exports.default_;
+    if (!def) return null;
+    if (typeof def === 'string') {
+      const pathRenames = renames.get(path) || {};
+      if (pathRenames[def]) return pathRenames[def];
+      const defImp = mod.imports.find(i => i.default_ === def);
+      if (defImp) return traceDefault(defImp.resolved);
+      return def;
+    }
+    return '__default';
+  };
+
+  // Transform each module
+  const chunks = [];
+  for (const path of order) {
+    const mod = modules.get(path);
+    const pathRenames = renames.get(path) || {};
+
+    let ast = clone(mod.ast);
+    for (const [old, neu] of Object.entries(pathRenames)) {
+      renameId(ast, old, neu);
+    }
+
+    for (const imp of mod.imports) {
+      const dep = modules.get(imp.resolved);
+      if (!dep) continue;
+      const depRenames = renames.get(imp.resolved) || {};
+
+      if (imp.named) {
+        for (const { name, alias } of imp.named) {
+          // `name` is the exported name, look up what local name it maps to in the dep
+          const localName = dep.exports.named[name] || name;
+          // Check if that local name was renamed in the dep
+          const resolved = depRenames[localName] || localName;
+          if (alias !== resolved) renameId(ast, alias, resolved);
+        }
+      }
+
+      if (imp.default_) {
+        const resolved = traceDefault(imp.resolved);
+        if (resolved && imp.default_ !== resolved) {
+          renameId(ast, imp.default_, resolved);
+        }
+      }
+
+      if (imp.namespace) {
+        walk(ast, node => {
+          if (Array.isArray(node) && node[0] === '.' && node[1] === imp.namespace) {
+            const prop = node[2];
+            if (typeof prop === 'string' && dep.exports.named[prop]) {
+              const resolved = depRenames[dep.exports.named[prop]] || dep.exports.named[prop];
+              node.length = 0;
+              node.push(resolved);
+            }
+          }
+        });
+      }
+    }
+
+    const { ast: stripped } = stripModuleSyntax(ast);
+
+    if (stripped) {
+      const code = codegen(stripped);
+      if (code.trim()) {
+        chunks.push(`// === ${path} ===\n${code}`);
+      }
+    }
+  }
+
+  // Generate exports
+  const entryMod = modules.get(entry);
+  const entryRenames = renames.get(entry) || {};
+  const exportLines = [];
+
+  // Resolve all named exports including from re-exports
+  const resolveExports = (path, seen = new Set()) => {
+    if (seen.has(path)) return {};
+    seen.add(path);
+    const mod = modules.get(path);
+    if (!mod) return {};
+    const pathRenames = renames.get(path) || {};
+    const result = {};
+
+    // Direct named exports
+    for (const [exp, local] of Object.entries(mod.exports.named)) {
+      result[exp] = pathRenames[local] || local;
+    }
+
+    // Re-exports
+    for (const re of mod.exports.reexports) {
+      const depRenames = renames.get(re.resolved) || {};
+      if (re.star) {
+        // export * from './x' - get all exports from that module
+        const depExports = resolveExports(re.resolved, seen);
+        for (const [exp, resolved] of Object.entries(depExports)) {
+          if (!(exp in result)) result[exp] = resolved; // don't override local exports
+        }
+      } else if (re.names) {
+        // export { a, b } from './x'
+        const depMod = modules.get(re.resolved);
+        if (depMod) {
+          for (const { name, alias } of re.names) {
+            const local = depMod.exports.named[name] || name;
+            result[alias] = depRenames[local] || local;
+          }
+        }
+      }
+    }
+    return result;
+  };
+
+  const allExports = resolveExports(entry);
+  for (const [exp, resolved] of Object.entries(allExports)) {
+    exportLines.push(exp === resolved ? exp : `${resolved} as ${exp}`);
+  }
+
+  if (entryMod.exports.default_) {
+    const resolved = traceDefault(entry) || '__default';
+    exportLines.push(`${resolved} as default`);
+  }
+
+  let result = chunks.join('\n\n');
+  if (exportLines.length) {
+    result += `\n\nexport { ${exportLines.join(', ')} }`;
+  }
+
+  return result;
+}
+
+/** Bundle with Node.js fs */
+export const bundleFile = (entry) => bundle(resolve(entry), path => readFile(path, 'utf-8'));
+
+// CLI
+if (typeof process !== 'undefined' && process.argv[1]?.includes('bundle')) {
+  const entry = process.argv[2];
+  if (!entry) {
+    console.error('Usage: node bundle.js <entry>');
+    process.exit(1);
+  }
+  bundleFile(entry)
+    .then(result => console.log(result))
+    .catch(e => {
+      console.error('Error:', e.message);
+      console.error(e.stack);
+      process.exit(1);
+    });
+}