sjabloon 0.6.0 → 0.8.0

package/lib/index.js

@@ -0,0 +1,35 @@
+/**
+ * The token edition, and the engine proper: a template renders to a stream of
+ * literal and value tokens. Escaping belongs to whoever consumes the stream,
+ * so nothing here is HTML-aware and `{{{ }}}` has no meaning — `{{ }}` is
+ * already raw.
+ */
+import { make } from './core.js';
+
+export { isDiagnostic } from './core.js';
+
+export const { template, render } = make([
+	// Static text is a compile-time constant: hoist and freeze one token per
+	// text node rather than allocating a fresh object every loop iteration.
+	s => (t => (v, o) => { o.push(t); })(Object.freeze({ literal: s })),
+	e => (v, o) => { o.push({ value: e(v) }); },
+	0,
+	() => /** @type {import('./types.js').Token[]} */ ([]),
+	o => o,
+]);
+
+/**
+ * Join a token stream into the string `sjabloon/text` would have produced:
+ * literals verbatim, values as `String(value ?? '')`.
+ *
+ * @param {readonly import('./types.js').Token[]} tokens A render's output.
+ * @returns {string} The joined text.
+ */
+export const text = tokens => {
+	let s = '';
+	// One `?? ''` per token, so a literal never stringifies and a nullish value
+	// still renders empty. Widened here because each token carries one key or
+	// the other, which the public union deliberately does not model.
+	for (const t of /** @type {readonly { literal?: string, value?: unknown }[]} */ (tokens)) s += t.literal ?? String(t.value ?? '');
+	return s;
+};

package/lib/text.d.ts

@@ -0,0 +1,17 @@
+export * from './types.js';
+import type { SjabloonFunctions, SjabloonRenderer, SjabloonValues } from './types.js';
+
+/**
+ * Compile a template once, render it many times to a plain string.
+ *
+ * `{{ expr }}` interpolates unescaped — escaping belongs at the output edge —
+ * so `{{{ expr }}}` has no meaning here and is a compile-time
+ * `SJABLOON_RAW_TAG` error.
+ *
+ * @see SjabloonRenderer for `names`/`functions`, SjabloonScope for `$` and `@`.
+ * @throws {SyntaxError} On malformed tags, unclosed blocks, or bad expressions.
+ */
+export function template(str: string, funcs?: SjabloonFunctions): SjabloonRenderer<string>;
+
+/** Compile and render in one go. Shorthand for `template(str, funcs)(values)`. */
+export function render(str: string, values?: SjabloonValues, funcs?: SjabloonFunctions): string;

package/lib/text.js

@@ -0,0 +1,19 @@
+/**
+ * The plain-text edition: `{{ }}` interpolates unescaped and renders to a
+ * string. Escaping belongs at the output edge, so there is no raw form —
+ * `{{ }}` is already raw and `{{{ }}}` is a compile-time error.
+ *
+ * Definitionally `text(template(str)(values))` from the root entry, but built
+ * as a string accumulator so casual string users never allocate tokens.
+ */
+import { make } from './core.js';
+
+export { isDiagnostic } from './core.js';
+
+export const { template, render } = make([
+	s => (v, o) => { o.s += s; },
+	e => (v, o, x) => (x = e(v), o.s += String(x ?? '')),
+	0,
+	() => ({ s: '' }),
+	o => o.s,
+]);

package/lib/types.d.ts

@@ -0,0 +1,83 @@
+import type { XprsnErrorCode } from 'xprsn';
+
+export type SjabloonErrorCode =
+    | XprsnErrorCode
+    | 'SJABLOON_EACH_SYNTAX'
+    | 'SJABLOON_BLOCKED_BINDING'
+    | 'SJABLOON_UNEXPECTED_TAG'
+    | 'SJABLOON_UNKNOWN_BLOCK'
+    | 'SJABLOON_UNCLOSED_BLOCK'
+    | 'SJABLOON_TOO_DEEP'
+    | 'SJABLOON_RAW_TAG';
+
+export interface SjabloonBlock {
+    readonly type: 'if' | 'each';
+    readonly start: number;
+    readonly end: number;
+}
+
+export interface SjabloonDiagnostic extends Error {
+    readonly code: SjabloonErrorCode;
+    readonly start: number;
+    readonly end: number;
+    readonly blocks: readonly SjabloonBlock[];
+}
+
+export type SjabloonValues = Record<string, any>;
+export type SjabloonFunctions = Record<string, Function>;
+
+/**
+ * Per-render override of the scope anchors, for embedders with their own scope
+ * model.
+ *
+ * Two anchors are always in scope: `$` is the root values, and `@` is the
+ * current `#each` item (the root outside any loop). They let a nested loop
+ * reach the root (`$.company`) or the current item (`@.total`) explicitly,
+ * past any shadowing. Neither counts as a `name`.
+ *
+ * Passing this object as the renderer's second argument makes `$` become
+ * `root` and `@` become `item` (two distinct objects). Omit `item` to leave
+ * `@` unbound, so reading `@.x` throws through xprsn's guard — a group-header
+ * band that has no current row wants exactly that.
+ */
+export interface SjabloonScope {
+    root?: any;
+    item?: any;
+}
+
+/**
+ * A compiled template: render it many times.
+ *
+ * `names` are the variables the template reads from your values, deduplicated;
+ * loop variables the template introduces are not included. `functions` are the
+ * registry functions the template calls, deduplicated.
+ */
+export interface SjabloonRenderer<T> {
+    (values?: SjabloonValues, scope?: SjabloonScope): T;
+    names: string[];
+    functions: string[];
+}
+
+/** One static text run of the template, verbatim. */
+export interface LiteralToken {
+    literal: string;
+}
+
+/** One `{{ }}` interpolation, pre-stringify. Nullish values are preserved. */
+export interface ValueToken {
+    value: unknown;
+}
+
+/**
+ * A render's output in the token edition, in render order: loop bodies append
+ * once per iteration, untaken branches append nothing, and block expressions
+ * (`#if` conditions, `#each` collections) never appear.
+ */
+export type Token = LiteralToken | ValueToken;
+
+/**
+ * Check whether an error was produced or translated by sjabloon. Every entry
+ * shares one core, so a diagnostic thrown through any of them authenticates
+ * through all of them.
+ */
+export function isDiagnostic(error: unknown): error is SjabloonDiagnostic;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sjabloon",
-	"version": "0.6.0",
+	"version": "0.8.0",
 	"description": "Tiny, CSP-safe template engine for JavaScript, powered by xprsn expressions. No eval, no new Function.",
 	"repository": "getquario/sjabloon",
 	"license": "Apache-2.0",
@@ -10,55 +10,73 @@
 		"url": "https://robinvdvleuten.nl"
 	},
 	"type": "module",
-	"source": "src/index.js",
-	"main": "dist/index.cjs",
-	"module": "dist/index.js",
-	"types": "index.d.ts",
+	"module": "lib/index.js",
+	"types": "lib/index.d.ts",
 	"exports": {
 		".": {
-			"types": "./index.d.ts",
-			"import": "./dist/index.js",
-			"require": "./dist/index.cjs"
-		}
+			"types": "./lib/index.d.ts",
+			"default": "./lib/index.js"
+		},
+		"./text": {
+			"types": "./lib/text.d.ts",
+			"default": "./lib/text.js"
+		},
+		"./html": {
+			"types": "./lib/html.d.ts",
+			"default": "./lib/html.js"
+		},
+		"./package.json": "./package.json"
 	},
 	"engines": {
-		"node": ">=22.0.0"
+		"node": ">=22.12.0"
 	},
 	"files": [
-		"dist",
-		"src",
-		"index.d.ts"
+		"lib"
 	],
 	"size-limit": [
 		{
-			"path": "dist/index.js",
-			"limit": "1.76 kB"
+			"name": "sjabloon",
+			"path": "lib/index.js",
+			"ignore": [
+				"xprsn"
+			],
+			"limit": "1.95 kB"
+		},
+		{
+			"name": "sjabloon/text",
+			"path": "lib/text.js",
+			"ignore": [
+				"xprsn"
+			],
+			"limit": "1.9 kB"
 		},
 		{
-			"path": "dist/index.cjs",
-			"limit": "1.78 kB"
+			"name": "sjabloon/html",
+			"path": "lib/html.js",
+			"ignore": [
+				"xprsn"
+			],
+			"limit": "1.97 kB"
 		}
 	],
 	"scripts": {
 		"bench": "node --disallow-code-generation-from-strings bench/index.js",
-		"bench:comparison": "npm run build && npm --prefix bench/comparison run bench",
-		"build": "tsdown",
-		"check": "run-s build size test fuzz:regression test:browser",
+		"bench:comparison": "npm --prefix bench/comparison run bench",
+		"check": "run-s size test fuzz:regression test:browser",
 		"fuzz": "npm run fuzz:prepare && run-s fuzz:compile fuzz:render fuzz:structured",
 		"fuzz:prepare": "node -e \"for (const x of ['compile','render','structured']) require('fs').mkdirSync('.fuzz-corpus/'+x,{recursive:true})\"",
-		"fuzz:compile": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/compile.fuzz.js -i src/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync .fuzz-corpus/compile fuzz/corpus/compile -- -max_total_time=60 -use_value_profile=1 -dict=fuzz/sjabloon.dict -artifact_prefix=fuzz/",
-		"fuzz:render": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/render.fuzz.js -i src/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync .fuzz-corpus/render fuzz/corpus/render -- -max_total_time=60 -use_value_profile=1 -dict=fuzz/sjabloon.dict -artifact_prefix=fuzz/",
-		"fuzz:structured": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/structured.fuzz.js -i src/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync .fuzz-corpus/structured fuzz/corpus/structured -- -max_total_time=60 -use_value_profile=1 -dict=fuzz/sjabloon.dict -artifact_prefix=fuzz/",
+		"fuzz:compile": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/compile.fuzz.js -i lib/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync .fuzz-corpus/compile fuzz/corpus/compile -- -max_total_time=60 -use_value_profile=1 -dict=fuzz/sjabloon.dict -artifact_prefix=fuzz/",
+		"fuzz:render": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/render.fuzz.js -i lib/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync .fuzz-corpus/render fuzz/corpus/render -- -max_total_time=60 -use_value_profile=1 -dict=fuzz/sjabloon.dict -artifact_prefix=fuzz/",
+		"fuzz:structured": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/structured.fuzz.js -i lib/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync .fuzz-corpus/structured fuzz/corpus/structured -- -max_total_time=60 -use_value_profile=1 -dict=fuzz/sjabloon.dict -artifact_prefix=fuzz/",
 		"fuzz:regression": "run-s fuzz:regression:compile fuzz:regression:render fuzz:regression:structured",
-		"fuzz:regression:compile": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/compile.fuzz.js -i src/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync --mode=regression fuzz/corpus/compile -- -artifact_prefix=fuzz/",
-		"fuzz:regression:render": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/render.fuzz.js -i src/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync --mode=regression fuzz/corpus/render -- -artifact_prefix=fuzz/",
-		"fuzz:regression:structured": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/structured.fuzz.js -i src/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync --mode=regression fuzz/corpus/structured -- -artifact_prefix=fuzz/",
-		"prepublishOnly": "npm run build",
+		"fuzz:regression:compile": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/compile.fuzz.js -i lib/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync --mode=regression fuzz/corpus/compile -- -artifact_prefix=fuzz/",
+		"fuzz:regression:render": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/render.fuzz.js -i lib/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync --mode=regression fuzz/corpus/render -- -artifact_prefix=fuzz/",
+		"fuzz:regression:structured": "NODE_OPTIONS=--disallow-code-generation-from-strings jazzer fuzz/structured.fuzz.js -i lib/ --customHooks fuzz/hooks.js --disableBugDetectors='command-injection|path-traversal|ssrf' --sync --mode=regression fuzz/corpus/structured -- -artifact_prefix=fuzz/",
 		"size": "size-limit",
 		"test": "run-s test:unit test:types",
 		"test:unit": "node --disallow-code-generation-from-strings --test --test-concurrency=1 test/*.test.js",
-		"test:browser": "npm run build && playwright install chromium && node test/browser/harness.js",
-		"test:types": "tsc"
+		"test:browser": "playwright install chromium && node test/browser/harness.js",
+		"test:types": "tsc && attw --pack . --profile esm-only"
 	},
 	"keywords": [
 		"template",
@@ -68,16 +86,16 @@
 		"handlebars"
 	],
 	"dependencies": {
-		"xprsn": "^0.8.0"
+		"xprsn": "^0.9.0"
 	},
 	"devDependencies": {
+		"@arethetypeswrong/cli": "^0.18.3",
 		"@jazzer.js/bug-detectors": "^4.0.0",
 		"@jazzer.js/core": "^4.0.0",
-		"@size-limit/file": "^12.1.0",
+		"@size-limit/preset-small-lib": "^12.1.0",
 		"npm-run-all": "^4.1.5",
 		"playwright": "^1.61.1",
 		"size-limit": "^12.1.0",
-		"tsdown": "^0.22.12",
-		"typescript": "^7.0.2"
+		"typescript": "7.0.2"
 	}
 }

package/dist/index.cjs

@@ -1 +0,0 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});let e=require("xprsn");const t={"&":`&amp;`,"<":`&lt;`,">":`&gt;`,'"':`&quot;`,"'":`&#39;`},n=e=>String(e).replace(/[&<>"']/g,e=>t[e]),r=/^(?:__proto__|constructor|prototype)$/,i=new WeakSet,a=i.add.bind(i),o=i.has.bind(i),s=e=>o(e);let c=e=>{let t=[];for(let n=0,r=1;n<e.length;){let i=e.indexOf(`{{`,n);if(i<0){t.push([0,e.slice(n)]);break}i>n&&t.push([0,e.slice(n,i)]);let a=e[i+2]===`{`,o=i+2+a,s=e[o]===`-`,c=-1;if(s&&o++,a&&r&&(c=e.indexOf(`}}}`,o),c<0&&(r=0)),c<0&&(a&&(a=!1,o=i+2,s=e[o]===`-`,s&&o++),c=e.indexOf(`}}`,o)),c<0){t.push([0,e.slice(i)]);break}let l=c>o&&e[c-1]===`-`,u=l?c-1:c,d=e.slice(o,u),f=d.trim(),p=o+d.length-d.trimStart().length,m=c+2+a,h=[a?1:2,f,i,m,p],g=t.at(-1);if(s&&g?.[0]===0&&g[1]&&(g[1]=g[1].trimEnd()),t.push(h),n=m,l)for(;/\s/.test(e[n]);)n++}return t},l,u,d,f,p,m,h,g,_;const v=Symbol();let y=()=>Object.freeze(_.slice()),b=(e,t)=>(_.length<256||S(`Template too deeply nested`,`SJABLOON_TOO_DEEP`,t),Object.freeze({type:e,start:t[2],end:t[3]})),x=(e,t)=>(Object.defineProperty(e,"blocks",{value:t,enumerable:!0}),a(e),e),S=(e,t,n,r=n?.[2]??g.length,i=n?.[3]??g.length)=>{let a=SyntaxError(e);throw a.code=t,a.start=r,a.end=i,x(a,y())},C=(t,n,r,i=e.isDiagnostic)=>{throw i(t)?(t.start+=n,t.end+=n,x(t,r)):t},w=e=>S(`Unexpected {{`+e[1]+`}}`,`SJABLOON_UNEXPECTED_TAG`,e),T=(e,t)=>e.map(e=>e(t)).join(``),E=(e,t)=>(e=>(n,r)=>(r=e(n),n[v]?.push(r),t(r??``)))(D(e[1],e[4],y())),D=(t,n,r)=>{let i;try{i=(0,e.compile)(t,d)}catch(e){C(e,n,r)}for(let e of i.names)p.includes(e)||m.add(e);for(let e of i.functions)h.add(e);return e=>{try{return i(e)}catch(e){C(e,n,r,i.isDiagnostic)}}},O=e=>{let t=k([`#elif`,`#else`,`/if`]),n=f[1],r=[];return n.startsWith(`#elif `)?r=[O(D(n.slice(6),f[4]+6,y()))]:n===`#else`?(r=k([`/if`]),f[1]===`/if`||w(f)):n!==`/if`&&w(f),n=>T(e(n)?t:r,n)},k=e=>{let t=[];for(let i;i=l[u++];){let a=i[1];if(!i[0])t.push((e=>()=>e)(a));else if(i[0]===1)t.push(E(i,String));else if(e.includes(a.split(` `)[0]))return f=i,t;else if(a[0]!==`!`)if(a.startsWith(`#if `))_.push(b(`if`,i)),t.push(O(D(a.slice(4),i[4]+4,y()))),_.pop();else if(/^#each(?:\s|$)/.test(a)){_.push(b(`each`,i));let e=/^#each ([\s\S]+) as ((\w+)(?:\s*,\s*(\w+))?)$/.exec(a);e||S(`Bad {{`+a+`}}`,`SJABLOON_EACH_SYNTAX`,i);let n=e[3],o=e[4],s=i[4]+a.length-e[2].length;if(r.test(n)&&S(`Bad {{`+a+`}}`,`SJABLOON_BLOCKED_BINDING`,i,s,s+n.length),o&&r.test(o)){let e=i[4]+a.length-o.length;S(`Bad {{`+a+`}}`,`SJABLOON_BLOCKED_BINDING`,i,e,e+o.length)}let c=D(e[1],i[4]+6,y()),l=p.length;p.push(n),o&&p.push(o),p.push(`loop`);let u=k([`#else`,`/each`]);p.length=l;let d=[];f[1]===`#else`?(d=k([`/each`]),f[1]===`/each`||w(f)):f[1]!==`/each`&&w(f),_.pop(),t.push(e=>{let t=c(e),r=Array.isArray(t),i=r?t.slice():t&&typeof t==`object`?Object.keys(t).map(e=>[t[e],e]):[];return i.length?i.map((t,a)=>{let s=r?t:t[0],c=r?a:t[1],l=Object.create(e);return l[n]=s,o&&(l[o]=c),l[`@`]=s,l.loop={index:a+1,index0:a,first:!a,last:a===i.length-1,length:i.length},T(u,l)}).join(``):T(d,e)})}else/^#(?:if|elif|else)(?:\s|$)/.test(a)||a[0]===`/`?w(i):a[0]===`#`?S(`Unknown {{`+a+`}}`,`SJABLOON_UNKNOWN_BLOCK`,i):t.push(E(i,n))}return e.length&&S(`Missing {{`+e[e.length-1]+`}}`,`SJABLOON_UNCLOSED_BLOCK`),t};function A(e,t){d=t,p=[`$`,`@`],m=new Set,h=new Set,g=String(e),_=[],l=c(g),u=0;let n;try{n=k([])}catch(e){throw e instanceof RangeError&&S(`Template too deeply nested`,`SJABLOON_TOO_DEEP`),e}let r=(e,t,r)=>{e||={};let i=Object.create(e);return i.$=t?t.root:e,t?`item`in t&&(i[`@`]=t.item):i[`@`]=e,i[v]=r,T(n,i)},i=(e,t)=>r(e,t);return i.withRaw=(e,t,n=[])=>({text:r(e,t,n),raws:n}),i.names=Array.from(m),i.functions=Array.from(h),i}function j(e,t,n){return A(e,n)(t)}exports.isDiagnostic=s,exports.render=j,exports.template=A;

package/dist/index.js

@@ -1 +0,0 @@
-import{compile as e,isDiagnostic as t}from"xprsn";const n={"&":`&amp;`,"<":`&lt;`,">":`&gt;`,'"':`&quot;`,"'":`&#39;`},r=e=>String(e).replace(/[&<>"']/g,e=>n[e]),i=/^(?:__proto__|constructor|prototype)$/,a=new WeakSet,o=a.add.bind(a),s=a.has.bind(a),c=e=>s(e);let l=e=>{let t=[];for(let n=0,r=1;n<e.length;){let i=e.indexOf(`{{`,n);if(i<0){t.push([0,e.slice(n)]);break}i>n&&t.push([0,e.slice(n,i)]);let a=e[i+2]===`{`,o=i+2+a,s=e[o]===`-`,c=-1;if(s&&o++,a&&r&&(c=e.indexOf(`}}}`,o),c<0&&(r=0)),c<0&&(a&&(a=!1,o=i+2,s=e[o]===`-`,s&&o++),c=e.indexOf(`}}`,o)),c<0){t.push([0,e.slice(i)]);break}let l=c>o&&e[c-1]===`-`,u=l?c-1:c,d=e.slice(o,u),f=d.trim(),p=o+d.length-d.trimStart().length,m=c+2+a,h=[a?1:2,f,i,m,p],g=t.at(-1);if(s&&g?.[0]===0&&g[1]&&(g[1]=g[1].trimEnd()),t.push(h),n=m,l)for(;/\s/.test(e[n]);)n++}return t},u,d,f,p,m,h,g,_,v;const y=Symbol();let b=()=>Object.freeze(v.slice()),x=(e,t)=>(v.length<256||C(`Template too deeply nested`,`SJABLOON_TOO_DEEP`,t),Object.freeze({type:e,start:t[2],end:t[3]})),S=(e,t)=>(Object.defineProperty(e,"blocks",{value:t,enumerable:!0}),o(e),e),C=(e,t,n,r=n?.[2]??_.length,i=n?.[3]??_.length)=>{let a=SyntaxError(e);throw a.code=t,a.start=r,a.end=i,S(a,b())},w=(e,n,r,i=t)=>{throw i(e)?(e.start+=n,e.end+=n,S(e,r)):e},T=e=>C(`Unexpected {{`+e[1]+`}}`,`SJABLOON_UNEXPECTED_TAG`,e),E=(e,t)=>e.map(e=>e(t)).join(``),D=(e,t)=>(e=>(n,r)=>(r=e(n),n[y]?.push(r),t(r??``)))(O(e[1],e[4],b())),O=(t,n,r)=>{let i;try{i=e(t,f)}catch(e){w(e,n,r)}for(let e of i.names)m.includes(e)||h.add(e);for(let e of i.functions)g.add(e);return e=>{try{return i(e)}catch(e){w(e,n,r,i.isDiagnostic)}}},k=e=>{let t=A([`#elif`,`#else`,`/if`]),n=p[1],r=[];return n.startsWith(`#elif `)?r=[k(O(n.slice(6),p[4]+6,b()))]:n===`#else`?(r=A([`/if`]),p[1]===`/if`||T(p)):n!==`/if`&&T(p),n=>E(e(n)?t:r,n)},A=e=>{let t=[];for(let n;n=u[d++];){let a=n[1];if(!n[0])t.push((e=>()=>e)(a));else if(n[0]===1)t.push(D(n,String));else if(e.includes(a.split(` `)[0]))return p=n,t;else if(a[0]!==`!`)if(a.startsWith(`#if `))v.push(x(`if`,n)),t.push(k(O(a.slice(4),n[4]+4,b()))),v.pop();else if(/^#each(?:\s|$)/.test(a)){v.push(x(`each`,n));let e=/^#each ([\s\S]+) as ((\w+)(?:\s*,\s*(\w+))?)$/.exec(a);e||C(`Bad {{`+a+`}}`,`SJABLOON_EACH_SYNTAX`,n);let r=e[3],o=e[4],s=n[4]+a.length-e[2].length;if(i.test(r)&&C(`Bad {{`+a+`}}`,`SJABLOON_BLOCKED_BINDING`,n,s,s+r.length),o&&i.test(o)){let e=n[4]+a.length-o.length;C(`Bad {{`+a+`}}`,`SJABLOON_BLOCKED_BINDING`,n,e,e+o.length)}let c=O(e[1],n[4]+6,b()),l=m.length;m.push(r),o&&m.push(o),m.push(`loop`);let u=A([`#else`,`/each`]);m.length=l;let d=[];p[1]===`#else`?(d=A([`/each`]),p[1]===`/each`||T(p)):p[1]!==`/each`&&T(p),v.pop(),t.push(e=>{let t=c(e),n=Array.isArray(t),i=n?t.slice():t&&typeof t==`object`?Object.keys(t).map(e=>[t[e],e]):[];return i.length?i.map((t,a)=>{let s=n?t:t[0],c=n?a:t[1],l=Object.create(e);return l[r]=s,o&&(l[o]=c),l[`@`]=s,l.loop={index:a+1,index0:a,first:!a,last:a===i.length-1,length:i.length},E(u,l)}).join(``):E(d,e)})}else/^#(?:if|elif|else)(?:\s|$)/.test(a)||a[0]===`/`?T(n):a[0]===`#`?C(`Unknown {{`+a+`}}`,`SJABLOON_UNKNOWN_BLOCK`,n):t.push(D(n,r))}return e.length&&C(`Missing {{`+e[e.length-1]+`}}`,`SJABLOON_UNCLOSED_BLOCK`),t};function j(e,t){f=t,m=[`$`,`@`],h=new Set,g=new Set,_=String(e),v=[],u=l(_),d=0;let n;try{n=A([])}catch(e){throw e instanceof RangeError&&C(`Template too deeply nested`,`SJABLOON_TOO_DEEP`),e}let r=(e,t,r)=>{e||={};let i=Object.create(e);return i.$=t?t.root:e,t?`item`in t&&(i[`@`]=t.item):i[`@`]=e,i[y]=r,E(n,i)},i=(e,t)=>r(e,t);return i.withRaw=(e,t,n=[])=>({text:r(e,t,n),raws:n}),i.names=Array.from(h),i.functions=Array.from(g),i}function M(e,t,n){return j(e,n)(t)}export{c as isDiagnostic,M as render,j as template};

package/index.d.ts

@@ -1,82 +0,0 @@
-import type { XprsnErrorCode } from 'xprsn';
-
-export type SjabloonErrorCode =
-    | XprsnErrorCode
-    | 'SJABLOON_EACH_SYNTAX'
-    | 'SJABLOON_BLOCKED_BINDING'
-    | 'SJABLOON_UNEXPECTED_TAG'
-    | 'SJABLOON_UNKNOWN_BLOCK'
-    | 'SJABLOON_UNCLOSED_BLOCK';
-
-export interface SjabloonBlock {
-    readonly type: 'if' | 'each';
-    readonly start: number;
-    readonly end: number;
-}
-
-export interface SjabloonDiagnostic extends Error {
-    readonly code: SjabloonErrorCode;
-    readonly start: number;
-    readonly end: number;
-    readonly blocks: readonly SjabloonBlock[];
-}
-
-/**
- * Check whether an error was produced or translated by this sjabloon module instance.
- */
-export function isDiagnostic(error: unknown): error is SjabloonDiagnostic;
-
-/**
- * Compile a template once, render it many times.
- *
- * The returned renderer exposes `names`: the variables the template reads
- * from your values, deduplicated. Loop variables the template introduces are
- * not included. It also exposes `functions`: the registry functions the
- * template calls, deduplicated.
- *
- * Two anchors are always in scope: `$` is the root values, and `@` is the
- * current `#each` item (the root outside any loop). They let a nested loop
- * reach the root (`$.company`) or the current item (`@.total`) explicitly,
- * past any shadowing. Neither counts as a `name`.
- *
- * An embedder with its own scope model can override the anchors per render by
- * passing `{ root, item }` as the renderer's second argument: `$` becomes
- * `root` and `@` becomes `item` (two distinct objects). Omit `item` to leave
- * `@` unbound, so reading `@.x` throws through xprsn's guard.
- *
- * The renderer also exposes `withRaw(values, scope)`: one render, both channels.
- * It returns `{ text, raws }` — the rendered string plus each interpolation's
- * pre-escape, pre-stringify value (`{{ }}` and `{{{ }}}` alike, nullish
- * included), in render order: loop bodies push once per iteration, untaken
- * branches push nothing. Block expressions (`#if` conditions, `#each`
- * collections) are never captured.
- *
- * @param {string} str The template, e.g. `'Hello {{ user.name }}!'`.
- * @param {Record<string, Function>} [funcs] Functions callable inside expressions.
- * @returns {{(values?: Record<string, any>, scope?: { root?: any, item?: any }): string, withRaw: (values?: Record<string, any>, scope?: { root?: any, item?: any }) => { text: string, raws: unknown[] }, names: string[], functions: string[]}} Renderer for the compiled template.
- * @throws {SyntaxError} On malformed tags, unclosed blocks, or bad expressions.
- */
-export function template(str: string, funcs?: Record<string, Function>): {
-    (values?: Record<string, any>, scope?: {
-        root?: any;
-        item?: any;
-    }): string;
-    withRaw(values?: Record<string, any>, scope?: {
-        root?: any;
-        item?: any;
-    }): {
-        text: string;
-        raws: unknown[];
-    };
-    names: string[];
-    functions: string[];
-};
-/**
- * Compile and render a template in one go.
- *
- * @param {string} str The template to render.
- * @param {Record<string, any>} [values] Variables available to the template.
- * @param {Record<string, Function>} [funcs] Functions callable inside expressions.
- * @returns {string} The rendered output.
- */
-export function render(str: string, values?: Record<string, any>, funcs?: Record<string, Function>): string;