@rohal12/spindle 0.56.0 → 0.58.0

package/dist/pkg/headless.js

@@ -32,15 +32,43 @@ function create() {
 	return (initializer) => bindPreact(createStore()(initializer));
 }
 //#endregion
-//#region src/markup/spindle.peggy
-var LB = String.fromCharCode(123);
-var RB = String.fromCharCode(125);
+//#region src/markup/tokens.ts
+/** Variable sigils: story ($), temporary (_), local (@), transient (%). */
 var SIGIL_SCOPES$1 = {
 	$: "variable",
 	_: "temporary",
 	"@": "local",
 	"%": "transient"
 };
+/** The sigil of each variable scope. */
+var SCOPE_SIGILS = Object.fromEntries(Object.entries(SIGIL_SCOPES$1).map(([sigil, scope]) => [scope, sigil]));
+var SIGIL_CHARS = new Set(Object.keys(SIGIL_SCOPES$1));
+/** Whether `c` is a variable sigil. */
+function isSigil(c) {
+	return c !== void 0 && SIGIL_CHARS.has(c);
+}
+/** Copy the selectors set in `from` onto `target`, and return it. */
+function withSelectors$1(target, from) {
+	if (from.className) target.className = from.className;
+	if (from.id) target.id = from.id;
+	return target;
+}
+//#endregion
+//#region src/markup/grammar-shared.ts
+/**
+* What the grammar (spindle.peggy) imports from the rest of Spindle, so that
+* it holds no second copy: the generated parser imports this module's
+* default export as `shared` (see scripts/peggy.ts).
+*/
+var grammar_shared_default = {
+	SIGIL_SCOPES: SIGIL_SCOPES$1,
+	withSelectors: withSelectors$1
+};
+//#endregion
+//#region src/markup/spindle.peggy
+var LB = String.fromCharCode(123);
+var RB = String.fromCharCode(125);
+var { SIGIL_SCOPES, withSelectors } = grammar_shared_default;
 var VOID_TAGS = new Set([
 	"area",
 	"base",
@@ -98,11 +126,6 @@ function parseLink(inner) {
 function quoteArg(value) {
 	return "\"" + value.replace(/[\\"]/g, "\\$&") + "\"";
 }
-function withSelectors(target, from) {
-	if (from.className) target.className = from.className;
-	if (from.id) target.id = from.id;
-	return target;
-}
 function selectorsOf(parts) {
 	const classes = [];
 	let id = "";
@@ -322,7 +345,8 @@ function peg$parse(input, options) {
 	const peg$source = options.grammarSource;
 	const peg$startRuleFunctions = {
 		Markup: peg$parseMarkup,
-		Tokens: peg$parseTokens
+		Tokens: peg$parseTokens,
+		SelectorsPrefix: peg$parseSelectorsPrefix
 	};
 	let peg$startRuleFunction = peg$parseMarkup;
 	const peg$c0 = "\\";
@@ -724,40 +748,46 @@ function peg$parse(input, options) {
 	function peg$f53() {
 		return NO_SELECTORS;
 	}
-	function peg$f54(prefix, name) {
+	function peg$f54(s, end) {
+		return {
+			...s,
+			end
+		};
+	}
+	function peg$f55(prefix, name) {
 		return [prefix, name];
 	}
-	function peg$f55(s, sigil, name) {
+	function peg$f56(s, sigil, name) {
 		return withSelectors(lexeme("variable", location(), {
 			name,
-			scope: SIGIL_SCOPES$1[sigil]
+			scope: SIGIL_SCOPES[sigil]
 		}), s);
 	}
-	function peg$f56(s, expression) {
+	function peg$f57(s, expression) {
 		return withSelectors(lexeme("expression", location(), { expression }), s);
 	}
-	function peg$f57() {
+	function peg$f58() {
 		fail("Unclosed " + LB + input.substr(location().end.offset, 1) + "…: no } ends it", location());
 	}
-	function peg$f58(start) {
+	function peg$f59(start) {
 		return skipTo(hooks.closeBrace(input, start, start));
 	}
-	function peg$f59(start) {
+	function peg$f60(start) {
 		return skipEnd - offset();
 	}
-	function peg$f60(start, code) {
+	function peg$f61(start, code) {
 		return code;
 	}
-	function peg$f61(s, start, close, name, nameEnd) {
+	function peg$f62(s, start, close, name, nameEnd) {
 		return skipTo(hooks.closeBrace(input, nameEnd, start));
 	}
-	function peg$f62(s, start, close, name, nameEnd) {
+	function peg$f63(s, start, close, name, nameEnd) {
 		return skipEnd - offset();
 	}
-	function peg$f63(s, start, close, name, nameEnd, args) {
+	function peg$f64(s, start, close, name, nameEnd, args) {
 		return args;
 	}
-	function peg$f64(s, start, close, name, nameEnd, tail) {
+	function peg$f65(s, start, close, name, nameEnd, tail) {
 		const loc = location();
 		const lower = name.toLowerCase();
 		const tag = lexeme("macro", loc, {
@@ -778,19 +808,19 @@ function peg$parse(input, options) {
 		}
 		return tag;
 	}
-	function peg$f65(s) {
+	function peg$f66(s) {
 		fail("A closing tag starts with a letter after " + LB + "/", location());
 	}
-	function peg$f66() {
+	function peg$f67() {
 		return !textMode;
 	}
-	function peg$f67(tag) {
+	function peg$f68(tag) {
 		return VOID_TAGS.has(tag.lower);
 	}
-	function peg$f68(tag) {
+	function peg$f69(tag) {
 		return null;
 	}
-	function peg$f69(tag, list, slash) {
+	function peg$f70(tag, list, slash) {
 		const lower = tag.toLowerCase();
 		return lexeme("html", location(), {
 			tag,
@@ -800,7 +830,7 @@ function peg$parse(input, options) {
 			isSelfClose: !!slash || VOID_TAGS.has(lower)
 		});
 	}
-	function peg$f70(tag, bad) {
+	function peg$f71(tag, bad) {
 		const c = input.charAt(bad);
 		if (!c) fail("Unclosed tag <" + tag + ": no > ends it (write &lt; for a < that starts no tag)", location());
 		const at = {
@@ -818,7 +848,7 @@ function peg$parse(input, options) {
 		};
 		fail("Unexpected " + JSON.stringify(c) + " in the tag <" + tag + ">: expected an attribute, or > to end the tag", at);
 	}
-	function peg$f71(tag) {
+	function peg$f72(tag) {
 		return lexeme("html", location(), {
 			tag,
 			lower: tag.toLowerCase(),
@@ -827,44 +857,44 @@ function peg$parse(input, options) {
 			isSelfClose: false
 		});
 	}
-	function peg$f72(name) {
+	function peg$f73(name) {
 		attrCode = hooks.isCodeAttribute(name);
 		return true;
 	}
-	function peg$f73(name, v) {
+	function peg$f74(name, v) {
 		return v;
 	}
-	function peg$f74(name, value) {
+	function peg$f75(name, value) {
 		return [name, value ?? ""];
 	}
-	function peg$f75(v) {
+	function peg$f76(v) {
 		return v;
 	}
-	function peg$f76(v) {
+	function peg$f77(v) {
 		return v;
 	}
-	function peg$f77(q) {
+	function peg$f78(q) {
 		fail("Unclosed attribute value: the " + q + " here has no closing " + q, location());
 	}
-	function peg$f78() {
+	function peg$f79() {
 		return !attrCode;
 	}
-	function peg$f79(bs) {
+	function peg$f80(bs) {
 		return bs.length % 2 === 1;
 	}
-	function peg$f80() {
+	function peg$f81() {
 		return !attrCode;
 	}
-	function peg$f81(start, nameEnd) {
+	function peg$f82(start, nameEnd) {
 		return skipTo(hooks.closeBrace(input, nameEnd, start));
 	}
-	function peg$f82(start, nameEnd) {
+	function peg$f83(start, nameEnd) {
 		return skipEnd - offset();
 	}
-	function peg$f83() {
+	function peg$f84() {
 		return !attrCode;
 	}
-	function peg$f84() {
+	function peg$f85() {
 		return attrCode;
 	}
 	let peg$currPos = options.peg$currPos | 0;
@@ -1953,6 +1983,38 @@ function peg$parse(input, options) {
 		}
 		return s0;
 	}
+	function peg$parseSelectorsPrefix() {
+		let s0, s1, s2, s3, s4;
+		s0 = peg$currPos;
+		s1 = peg$parseSelectors();
+		if (s1 !== peg$FAILED) {
+			s2 = peg$parseHere();
+			s3 = [];
+			if (input.length > peg$currPos) {
+				s4 = input.charAt(peg$currPos);
+				peg$currPos++;
+			} else {
+				s4 = peg$FAILED;
+				if (peg$silentFails === 0) peg$fail(peg$e0);
+			}
+			while (s4 !== peg$FAILED) {
+				s3.push(s4);
+				if (input.length > peg$currPos) {
+					s4 = input.charAt(peg$currPos);
+					peg$currPos++;
+				} else {
+					s4 = peg$FAILED;
+					if (peg$silentFails === 0) peg$fail(peg$e0);
+				}
+			}
+			peg$savedPos = s0;
+			s0 = peg$f54(s1, s2);
+		} else {
+			peg$currPos = s0;
+			s0 = peg$FAILED;
+		}
+		return s0;
+	}
 	function peg$parseSelectorPart() {
 		let s0, s1, s2, s3, s4;
 		s0 = peg$currPos;
@@ -1972,7 +2034,7 @@ function peg$parse(input, options) {
 			}
 			s2 = input.substring(s2, peg$currPos);
 			peg$savedPos = s0;
-			s0 = peg$f54(s1, s2);
+			s0 = peg$f55(s1, s2);
 		} else {
 			peg$currPos = s0;
 			s0 = peg$FAILED;
@@ -2097,7 +2159,7 @@ function peg$parse(input, options) {
 					}
 					if (s5 !== peg$FAILED) {
 						peg$savedPos = s0;
-						s0 = peg$f55(s2, s3, s4);
+						s0 = peg$f56(s2, s3, s4);
 					} else {
 						peg$currPos = s0;
 						s0 = peg$FAILED;
@@ -2151,7 +2213,7 @@ function peg$parse(input, options) {
 							}
 							if (s5 !== peg$FAILED) {
 								peg$savedPos = s0;
-								s0 = peg$f56(s2, s4);
+								s0 = peg$f57(s2, s4);
 							} else {
 								peg$currPos = s0;
 								s0 = peg$FAILED;
@@ -2199,7 +2261,7 @@ function peg$parse(input, options) {
 						} else s3 = peg$FAILED;
 						if (s3 !== peg$FAILED) {
 							peg$savedPos = s0;
-							s0 = peg$f57();
+							s0 = peg$f58();
 						} else {
 							peg$currPos = s0;
 							s0 = peg$FAILED;
@@ -2221,12 +2283,12 @@ function peg$parse(input, options) {
 		s0 = peg$currPos;
 		s1 = peg$parseHere();
 		peg$savedPos = peg$currPos;
-		s2 = peg$f58(s1);
+		s2 = peg$f59(s1);
 		if (s2) s2 = void 0;
 		else s2 = peg$FAILED;
 		if (s2 !== peg$FAILED) {
 			s3 = peg$currPos;
-			s4 = peg$f59(s1);
+			s4 = peg$f60(s1);
 			s5 = peg$currPos;
 			s6 = [];
 			if (s6.length >= (s4 | 0)) s7 = peg$FAILED;
@@ -2257,7 +2319,7 @@ function peg$parse(input, options) {
 			else s3 = s4;
 			if (s3 !== peg$FAILED) {
 				peg$savedPos = s0;
-				s0 = peg$f60(s1, s3);
+				s0 = peg$f61(s1, s3);
 			} else {
 				peg$currPos = s0;
 				s0 = peg$FAILED;
@@ -2295,12 +2357,12 @@ function peg$parse(input, options) {
 					s6 = peg$parseHere();
 					s7 = peg$currPos;
 					peg$savedPos = peg$currPos;
-					s8 = peg$f61(s2, s3, s4, s5, s6);
+					s8 = peg$f62(s2, s3, s4, s5, s6);
 					if (s8) s8 = void 0;
 					else s8 = peg$FAILED;
 					if (s8 !== peg$FAILED) {
 						s9 = peg$currPos;
-						s10 = peg$f62(s2, s3, s4, s5, s6);
+						s10 = peg$f63(s2, s3, s4, s5, s6);
 						s11 = peg$currPos;
 						s12 = [];
 						if (s12.length >= (s10 | 0)) s13 = peg$FAILED;
@@ -2339,7 +2401,7 @@ function peg$parse(input, options) {
 							}
 							if (s10 !== peg$FAILED) {
 								peg$savedPos = s7;
-								s7 = peg$f63(s2, s3, s4, s5, s6, s9);
+								s7 = peg$f64(s2, s3, s4, s5, s6, s9);
 							} else {
 								peg$currPos = s7;
 								s7 = peg$FAILED;
@@ -2354,7 +2416,7 @@ function peg$parse(input, options) {
 					}
 					if (s7 === peg$FAILED) s7 = null;
 					peg$savedPos = s0;
-					s0 = peg$f64(s2, s3, s4, s5, s6, s7);
+					s0 = peg$f65(s2, s3, s4, s5, s6, s7);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2388,7 +2450,7 @@ function peg$parse(input, options) {
 					}
 					if (s3 !== peg$FAILED) {
 						peg$savedPos = s0;
-						s0 = peg$f65(s2);
+						s0 = peg$f66(s2);
 					} else {
 						peg$currPos = s0;
 						s0 = peg$FAILED;
@@ -2445,19 +2507,19 @@ function peg$parse(input, options) {
 		let s0, s1, s2, s3;
 		s0 = peg$currPos;
 		peg$savedPos = peg$currPos;
-		s1 = peg$f66();
+		s1 = peg$f67();
 		if (s1) s1 = void 0;
 		else s1 = peg$FAILED;
 		if (s1 !== peg$FAILED) {
 			s2 = peg$parseHtmlClose();
 			if (s2 !== peg$FAILED) {
 				peg$savedPos = peg$currPos;
-				s3 = peg$f67(s2);
+				s3 = peg$f68(s2);
 				if (s3) s3 = void 0;
 				else s3 = peg$FAILED;
 				if (s3 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f68(s2);
+					s0 = peg$f69(s2);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2509,7 +2571,7 @@ function peg$parse(input, options) {
 				}
 				if (s6 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f69(s2, s3, s5);
+					s0 = peg$f70(s2, s3, s5);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2574,7 +2636,7 @@ function peg$parse(input, options) {
 						s5 = peg$parse_();
 						s6 = peg$parseHere();
 						peg$savedPos = s0;
-						s0 = peg$f70(s2, s6);
+						s0 = peg$f71(s2, s6);
 					} else {
 						peg$currPos = s0;
 						s0 = peg$FAILED;
@@ -2613,7 +2675,7 @@ function peg$parse(input, options) {
 				}
 				if (s4 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f71(s2);
+					s0 = peg$f72(s2);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2747,7 +2809,7 @@ function peg$parse(input, options) {
 		else s2 = s3;
 		if (s2 !== peg$FAILED) {
 			peg$savedPos = peg$currPos;
-			s3 = peg$f72(s2);
+			s3 = peg$f73(s2);
 			if (s3) s3 = void 0;
 			else s3 = peg$FAILED;
 			if (s3 !== peg$FAILED) {
@@ -2765,7 +2827,7 @@ function peg$parse(input, options) {
 					s8 = peg$parseAttrValue();
 					if (s8 !== peg$FAILED) {
 						peg$savedPos = s4;
-						s4 = peg$f73(s2, s8);
+						s4 = peg$f74(s2, s8);
 					} else {
 						peg$currPos = s4;
 						s4 = peg$FAILED;
@@ -2776,7 +2838,7 @@ function peg$parse(input, options) {
 				}
 				if (s4 === peg$FAILED) s4 = null;
 				peg$savedPos = s0;
-				s0 = peg$f74(s2, s4);
+				s0 = peg$f75(s2, s4);
 			} else {
 				peg$currPos = s0;
 				s0 = peg$FAILED;
@@ -2831,7 +2893,7 @@ function peg$parse(input, options) {
 			}
 			if (s3 !== peg$FAILED) {
 				peg$savedPos = s0;
-				s0 = peg$f75(s2);
+				s0 = peg$f76(s2);
 			} else {
 				peg$currPos = s0;
 				s0 = peg$FAILED;
@@ -2883,7 +2945,7 @@ function peg$parse(input, options) {
 				}
 				if (s3 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f76(s2);
+					s0 = peg$f77(s2);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2902,7 +2964,7 @@ function peg$parse(input, options) {
 				}
 				if (s1 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s1 = peg$f77(s1);
+					s1 = peg$f78(s1);
 				}
 				s0 = s1;
 				if (s0 === peg$FAILED) {
@@ -2933,7 +2995,7 @@ function peg$parse(input, options) {
 		let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
 		s0 = peg$currPos;
 		peg$savedPos = peg$currPos;
-		s1 = peg$f78();
+		s1 = peg$f79();
 		if (s1) s1 = void 0;
 		else s1 = peg$FAILED;
 		if (s1 !== peg$FAILED) {
@@ -2962,7 +3024,7 @@ function peg$parse(input, options) {
 			if (s2 !== peg$FAILED) {
 				s3 = peg$currPos;
 				peg$savedPos = peg$currPos;
-				s4 = peg$f79(s2);
+				s4 = peg$f80(s2);
 				if (s4) s4 = void 0;
 				else s4 = peg$FAILED;
 				if (s4 !== peg$FAILED) {
@@ -3001,7 +3063,7 @@ function peg$parse(input, options) {
 		if (s0 === peg$FAILED) {
 			s0 = peg$currPos;
 			peg$savedPos = peg$currPos;
-			s1 = peg$f80();
+			s1 = peg$f81();
 			if (s1) s1 = void 0;
 			else s1 = peg$FAILED;
 			if (s1 !== peg$FAILED) {
@@ -3028,12 +3090,12 @@ function peg$parse(input, options) {
 						if (s6 !== peg$FAILED) {
 							s7 = peg$parseHere();
 							peg$savedPos = peg$currPos;
-							s8 = peg$f81(s4, s7);
+							s8 = peg$f82(s4, s7);
 							if (s8) s8 = void 0;
 							else s8 = peg$FAILED;
 							if (s8 !== peg$FAILED) {
 								s9 = peg$currPos;
-								s10 = peg$f82(s4, s7);
+								s10 = peg$f83(s4, s7);
 								s11 = peg$currPos;
 								s12 = [];
 								if (s12.length >= (s10 | 0)) s13 = peg$FAILED;
@@ -3115,7 +3177,7 @@ function peg$parse(input, options) {
 			if (s0 === peg$FAILED) {
 				s0 = peg$currPos;
 				peg$savedPos = peg$currPos;
-				s1 = peg$f83();
+				s1 = peg$f84();
 				if (s1) s1 = void 0;
 				else s1 = peg$FAILED;
 				if (s1 !== peg$FAILED) {
@@ -3206,7 +3268,7 @@ function peg$parse(input, options) {
 				if (s0 === peg$FAILED) {
 					s0 = peg$currPos;
 					peg$savedPos = peg$currPos;
-					s1 = peg$f84();
+					s1 = peg$f85();
 					if (s1) s1 = void 0;
 					else s1 = peg$FAILED;
 					if (s1 !== peg$FAILED) {
@@ -3441,22 +3503,6 @@ function registerBlockMacro(name) {
 	BLOCK_MACROS.add(name);
 }
 //#endregion
-//#region src/markup/tokens.ts
-/** Variable sigils: story ($), temporary (_), local (@), transient (%). */
-var SIGIL_SCOPES = {
-	$: "variable",
-	_: "temporary",
-	"@": "local",
-	"%": "transient"
-};
-/** The sigil of each variable scope. */
-var SCOPE_SIGILS = Object.fromEntries(Object.entries(SIGIL_SCOPES).map(([sigil, scope]) => [scope, sigil]));
-var SIGIL_CHARS = new Set(Object.keys(SIGIL_SCOPES));
-/** Whether `c` is a variable sigil. */
-function isSigil(c) {
-	return c !== void 0 && SIGIL_CHARS.has(c);
-}
-//#endregion
 //#region node_modules/acorn/dist/acorn.mjs
 var astralIdentifierCodes = [
 	509,
@@ -9876,9 +9922,14 @@ function createCounts(source, name) {
 	return counts;
 }
 //#endregion
-//#region src/expression.ts
-var FN_CACHE_MAX = 500;
-var fnCache = /* @__PURE__ */ new Map();
+//#region src/transform.ts
+/**
+* The sigil transform: the story's code with its variable references
+* (`$var`, `_var`, `@var`, `%var`) turned into the namespace lookups the
+* expression engine runs. Pure string-to-string, so tooling can use it
+* (see src/tooling.ts).
+*/
+var TRANSFORM_CACHE_MAX = 500;
 var NAMESPACES$1 = {
 	$: "variables",
 	_: "temporary",
@@ -9898,8 +9949,7 @@ var IDENT_END_RE = /[\p{ID_Continue}$\u200c\u200d]$/u;
 * statements, as that decides whether a leading `{` opens an object literal
 * or a block. A reference to a variable named `__proto__` throws a
 * SyntaxError: no namespace can hold one (see utils/namespace.ts).
-* Exported for tests.
-*/
+*  */
 function transform(expr, goal = "expression") {
 	const key = goal === "statements" ? "s" + expr : "e" + expr;
 	const cached = transformCache.get(key);
@@ -9917,12 +9967,16 @@ function transform(expr, goal = "expression") {
 		at = ref.end;
 	}
 	result += expr.slice(at);
-	if (transformCache.size >= FN_CACHE_MAX) transformCache.delete(transformCache.keys().next().value);
+	if (transformCache.size >= TRANSFORM_CACHE_MAX) transformCache.delete(transformCache.keys().next().value);
 	transformCache.set(key, result);
 	return result;
 }
 /** Transformed code by goal and source. */
 var transformCache = /* @__PURE__ */ new Map();
+//#endregion
+//#region src/expression.ts
+var FN_CACHE_MAX = 500;
+var fnCache = /* @__PURE__ */ new Map();
 var preamble = "const {currentPassage,previousPassage,visited,hasVisited,hasVisitedAny,hasVisitedAll,rendered,hasRendered,hasRenderedAny,hasRenderedAll,random,randomInt}=__fns;";
 function getOrCompile(key, body) {
 	const cached = fnCache.get(key);
@@ -10110,6 +10164,10 @@ var metadataRegistry = new NameMap();
 function registerMacroMetadata(name, metadata) {
 	metadataRegistry.set(name, metadata);
 }
+/** The declared parameters of the macro `name`, if it declares any. */
+function getMacroParameters(name) {
+	return metadataRegistry.get(name)?.parameters;
+}
 function getMacroRegistry() {
 	return Array.from(metadataRegistry.values());
 }
@@ -10184,6 +10242,37 @@ function readWholeQuoted(src) {
 	const quoted = readQuoted(src, 0);
 	return quoted && quoted.end === src.length ? quoted.value : null;
 }
+var JS_SIMPLE_ESCAPES = {
+	n: "\n",
+	t: "	",
+	r: "\r",
+	b: "\b",
+	f: "\f",
+	v: "\v",
+	"0": "\0"
+};
+/** Undo every escape of a JavaScript string literal's body. */
+function decodeJsEscapes(body) {
+	return body.replace(/\\(?:u\{([0-9a-fA-F]+)\}|u([0-9a-fA-F]{4})|x([0-9a-fA-F]{2})|(\r\n|[\n\r\u2028\u2029])|([\s\S]))/g, (_, braced, unicode, hex, lineBreak, other) => {
+		if (lineBreak !== void 0) return "";
+		const code = braced ?? unicode ?? hex;
+		if (code !== void 0) {
+			const point = parseInt(code, 16);
+			return point <= 1114111 ? String.fromCodePoint(point) : "";
+		}
+		return JS_SIMPLE_ESCAPES[other] ?? other;
+	});
+}
+/**
+* The value of `src` when it is exactly one `"…"` or `'…'` string, read as
+* the JavaScript literal it is (`"\u0048all"` is `Hall`), otherwise `null`.
+* `readWholeQuoted` keeps other escapes as written, for labels and code.
+*/
+function readWholeJsString(src) {
+	const quoted = readQuoted(src, 0);
+	if (!quoted || quoted.end !== src.length) return null;
+	return decodeJsEscapes(src.slice(1, -1));
+}
 /**
 * Strip an optional quote from each end of an unquoted-or-loosely-quoted
 * argument (`"Red`, `Red'`), leaving at least one character. This is the
@@ -10563,7 +10652,7 @@ function interpolateCode(template, scope, decode) {
 	for (const part of splitSigilTemplate(template)) if ("text" in part) text += decode ? decode(part.text) : part.text;
 	else if ("verbatim" in part) text += part.verbatim;
 	else if (/^[$_@%][\w.]+$/.test(part.expr)) {
-		const kind = SIGIL_SCOPES[part.expr[0]];
+		const kind = SIGIL_SCOPES$1[part.expr[0]];
 		try {
 			text += display(resolveVariable(scope, kind, part.expr.slice(1)));
 		} catch (error) {
@@ -16468,9 +16557,23 @@ var slice = (src, [start, end]) => src.slice(start, end);
 function readText(src) {
 	return readWholeQuoted(src) ?? stripLooseQuotes(src);
 }
+/**
+* An argument that doesn't have its parameter's form: a `string` parameter
+* given anything but one quoted string.
+*/
+var MacroArgumentError = class extends Error {
+	constructor(param, src) {
+		super(`The ${param.name} must be a quoted string ("…" or '…'), ${src ? `not ${src}` : "but it has no value"}`);
+		this.name = "MacroArgumentError";
+	}
+};
 function readValue(param, src) {
 	switch (param.type) {
-		case "string": return readWholeQuoted(src) ?? void 0;
+		case "string": {
+			const value = readWholeQuoted(src);
+			if (value === null) throw new MacroArgumentError(param, src);
+			return value;
+		}
 		case "text": return readText(src);
 		case "names": return src.split(",").map((name) => name.trim());
 		case "delay": return parseDelay(src);
@@ -16485,6 +16588,7 @@ function unset(param) {
 }
 var WORD_RE = /\w+/y;
 var DIGITS_RE = /\d+/y;
+var WORD_OR_PUNCT_RE = /\S+/y;
 /** Match the sticky regex `re` at `pos`, returning the matched text. */
 function matchAt(re, src, pos) {
 	re.lastIndex = pos;
@@ -16493,7 +16597,8 @@ function matchAt(re, src, pos) {
 /**
 * Read keyword options (`goto "X" priority 5 once`). A keyword takes the
 * quoted string or digit run after it as its value; keywords that aren't
-* declared, and their values, are skipped.
+* declared, and their values, are skipped. A keyword of a `string` parameter
+* must be followed by a quoted string.
 */
 function readOptions(params, src) {
 	const options = {};
@@ -16506,10 +16611,11 @@ function readOptions(params, src) {
 		}
 		i += key.length;
 		let val;
+		let quoted = null;
 		let j = i;
 		while (j < src.length && isWhitespace(src[j])) j++;
 		if (j > i) {
-			const quoted = readQuoted(src, j);
+			quoted = readQuoted(src, j);
 			const digits = quoted ? null : matchAt(DIGITS_RE, src, j);
 			if (quoted) {
 				val = quoted.value;
@@ -16520,6 +16626,7 @@ function readOptions(params, src) {
 			}
 		}
 		const param = params.find((p) => p.name === key);
+		if (param?.type === "string" && (!quoted || val === void 0)) throw new MacroArgumentError(param, matchAt(WORD_OR_PUNCT_RE, src, j) ?? "");
 		if (param?.type === "flag") options[key] = true;
 		else if (param?.type === "number") options[key] = Number(val ?? 0);
 		else if (param) options[key] = val;
@@ -16592,8 +16699,16 @@ function readGroup(params, src, args) {
 	let from = 0;
 	let to = spans.length;
 	for (const param of positional.slice(0, restIndex)) args[param.name] = from < to ? read(param, slice(text, spans[from++])) : unset(param);
+	const readTrailing = (param, value) => {
+		try {
+			return read(param, value);
+		} catch (error) {
+			if (error instanceof MacroArgumentError) return void 0;
+			throw error;
+		}
+	};
 	for (const param of positional.slice(restIndex + 1).reverse()) {
-		const value = from < to && !endsWithOperator(text.slice(0, spans[to - 1][0])) ? read(param, slice(text, spans[to - 1])) : void 0;
+		const value = from < to && !endsWithOperator(text.slice(0, spans[to - 1][0])) ? readTrailing(param, slice(text, spans[to - 1])) : void 0;
 		args[param.name] = value ?? unset(param);
 		if (value !== void 0) to--;
 	}
@@ -16624,6 +16739,23 @@ function parseMacroArgs(rawArgs, parameters) {
 	return args;
 }
 /**
+* Read a `passage` argument as written (`{goto "Hall"}`, `{goto $room}`): a
+* quoted string is the name its JavaScript literal has (`"\u0048all"` is
+* `Hall`), anything else an expression, whose value is the name when it
+* runs (see evaluatePassageName).
+*/
+function passageTarget(arg) {
+	const expression = arg.trim();
+	const name = readWholeJsString(expression);
+	return name === null ? {
+		kind: "expression",
+		expression
+	} : {
+		kind: "name",
+		name
+	};
+}
+/**
 * The passage a `passage` argument names (`{goto "Hall"}`, `{goto $room}`):
 * the value of its expression. Throws what evaluating it throws, and if no
 * passage of the story `state` holds has that name, an error naming it and
@@ -16662,8 +16794,15 @@ function parseVarArgs(rawArgs) {
 /** The parameters of an `{option}` sub-macro: its value. */
 var OPTION_PARAMETERS = [{
 	name: "value",
-	type: "string"
+	type: "string",
+	required: true
 }];
+/** The parameters of the built-in sub-macros that take arguments. */
+var SUB_MACRO_PARAMETERS = new Map([["option", OPTION_PARAMETERS]]);
+/** The parameters of the built-in sub-macro `name`, if it takes any. */
+function subMacroParameters(name) {
+	return SUB_MACRO_PARAMETERS.get(name.toLowerCase());
+}
 /**
 * Walk AST children to find {option} macro nodes, returning their values.
 */
@@ -16671,7 +16810,7 @@ function extractOptions(children) {
 	const options = [];
 	for (const node of children) if (node.type === "macro" && node.name === "option") {
 		const { value } = parseMacroArgs(node.rawArgs, OPTION_PARAMETERS);
-		options.push(value ?? node.rawArgs.trim().replace(/^(["'])(.+)\1$/s, "$2"));
+		options.push(value ?? "");
 	}
 	return options;
 }
@@ -16708,8 +16847,18 @@ function defineMacro(config, source = "builtin") {
 			...renderOptions,
 			...options
 		});
+		let args;
+		try {
+			args = parseMacroArgs(props.rawArgs, parameters);
+		} catch (error) {
+			if (error instanceof MacroArgumentError) return h(MacroError, {
+				macro: config.name,
+				error
+			});
+			throw error;
+		}
 		const ctx = {
-			args: parseMacroArgs(props.rawArgs, parameters),
+			args,
 			collectText,
 			sourceLocation: currentSourceLocation,
 			parseVarArgs,
@@ -16748,7 +16897,15 @@ function defineMacro(config, source = "builtin") {
 				});
 			};
 		}
-		return config.render(props, ctx);
+		try {
+			return config.render(props, ctx);
+		} catch (error) {
+			if (error instanceof MacroArgumentError) return h(MacroError, {
+				macro: config.name,
+				error
+			});
+			throw error;
+		}
 	}
 	registerMacro(config.name, Wrapper);
 	const text = config.text;
@@ -17113,15 +17270,21 @@ var CONDITION_MACROS = new Set([
 	"case"
 ]);
 /** Code inside the quoted strings of a macro's arguments, by parameter. */
-var CODE_IN_STRINGS = { watch: {
+var CODE_IN_STRINGS = new Map([["watch", {
 	condition: "expression",
 	run: "statements"
-} };
+}]]);
 /** The `string` parameters of a macro that name a passage. */
-var PASSAGE_STRINGS = {
-	link: ["passage"],
-	watch: ["goto", "dialog"]
-};
+var PASSAGE_STRINGS = new Map([["watch", ["goto", "dialog"]]]);
+/**
+* The `text` and `string` parameters of a macro that the runtime keeps as
+* written, not as markup: an option's value, the name of a watcher.
+*/
+var LITERAL_STRINGS = new Map([
+	["option", ["value"]],
+	["watch", ["name"]],
+	["unwatch", ["name"]]
+]);
 /** Block macros whose body is the name of a passage. */
 var PASSAGE_BODIES = new Set(["dialog"]);
 /** The goal of the code an argument of this type holds, if it is code. */
@@ -17142,6 +17305,8 @@ function* codeAndText(src, tokens, parametersOf) {
 			kind: "passage",
 			name: token.target,
 			offset: locate(src, token.target, token.start),
+			length: token.target.length,
+			macro: "link",
 			label: src.slice(token.start, token.end)
 		};
 		else if (token.type === "expression") yield {
@@ -17201,6 +17366,8 @@ function* codeAndText(src, tokens, parametersOf) {
 						kind: "passage",
 						name: passage,
 						offset: locate(src, passage, token.end),
+						length: passage.length,
+						macro: name,
 						label: src.slice(token.start, token.end)
 					};
 				}
@@ -17225,9 +17392,23 @@ function* codeAndText(src, tokens, parametersOf) {
 }
 /** The code and text in the arguments `args` (at `offset`) of `macro`. */
 function* argPieces(args, offset, params, macro, label) {
-	const values = parseMacroArgs(args, params);
-	const inStrings = CODE_IN_STRINGS[macro.toLowerCase()] ?? {};
-	const passageStrings = PASSAGE_STRINGS[macro.toLowerCase()] ?? [];
+	let values;
+	try {
+		values = parseMacroArgs(args, params);
+	} catch (error) {
+		if (!(error instanceof MacroArgumentError)) throw error;
+		yield {
+			kind: "argument-error",
+			message: error.message,
+			offset,
+			label
+		};
+		return;
+	}
+	const key = macro.toLowerCase();
+	const inStrings = CODE_IN_STRINGS.get(key) ?? {};
+	const passageStrings = PASSAGE_STRINGS.get(key) ?? [];
+	const literalStrings = LITERAL_STRINGS.get(key) ?? [];
 	let cursor = 0;
 	/** The pieces of the parameters `list`, with their values in `from`. */
 	function* visit(list, from) {
@@ -17249,17 +17430,27 @@ function* argPieces(args, offset, params, macro, label) {
 					goal,
 					label
 				};
-				if (param.type === "passage") piece.passage = true;
+				if (param.type === "passage") {
+					piece.passage = true;
+					piece.macro = macro.toLowerCase();
+				}
+				if (!codeGoal(param)) piece.inString = true;
 				yield piece;
 			}
-			const name = param.type === "passage" ? readWholeQuoted(value.trim()) : passageStrings.includes(param.name) ? value : null;
-			if (name !== null) yield {
+			const written = param.type === "passage" ? value.trim() : value;
+			const target = param.type === "passage" ? passageTarget(value) : passageStrings.includes(param.name) ? {
+				kind: "name",
+				name: value
+			} : null;
+			if (target?.kind === "name") yield {
 				kind: "passage",
-				name,
-				offset: offset + at,
+				name: target.name,
+				offset: offset + at + value.indexOf(written),
+				length: written.length,
+				macro: macro.toLowerCase(),
 				label
 			};
-			if (!goal && (param.type === "text" || param.type === "string")) yield {
+			if (!goal && (param.type === "text" || param.type === "string") && !literalStrings.includes(param.name)) yield {
 				kind: "text",
 				text: value,
 				offset: offset + at,
@@ -17280,92 +17471,311 @@ function locate(text, part, from) {
 	return anywhere >= 0 ? anywhere : from;
 }
 //#endregion
-//#region src/story-variables.ts
+//#region src/widgets/widget-def.ts
 /**
-* The tokens of markup, or none if it is malformed: validateMarkup reports
-* that, with its position.
+* Reading widget definitions without rendering anything: the `{widget}`
+* macro, startup and markup validation (also in tooling) share these.
 */
-function tokensOf(text, textMode) {
-	try {
-		return tokenizeMarkup(text, { text: textMode });
-	} catch (err) {
-		if (err instanceof MarkupError) return [];
-		throw err;
-	}
-}
-function declarationRegex(sigil) {
-	const escaped = sigil.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-	return new RegExp(`^${escaped}(\\w+)\\s*=\\s*(.+)$`);
+/** A {widget} definition's name, then its `@` parameters. */
+var WIDGET_PARAMETERS = [{
+	name: "name",
+	type: "text",
+	required: true
+}, {
+	name: "parameters",
+	type: "text"
+}];
+/**
+* The widget a {widget} definition's arguments declare: its name and its
+* parameters, the words after it that start with `@` (docs/widgets.md).
+* Other words, such as `$name`, are not parameters.
+*/
+function widgetDef({ name = "", parameters = "" }) {
+	return {
+		name,
+		params: parameters.split(/\s+/).filter((word) => word.startsWith("@"))
+	};
 }
-/** A `$name` reference with its dot path, at a `$` the lexer found. */
-var VAR_PATH_RE = /\$(\w+(?:\.\w+)*)/y;
-/** Quoted first argument of an input macro naming a story variable. */
-var QUOTED_VAR_ARG_RE = /^["']\$(\w+(?:\.\w+)*)["']?$/;
-var FOR_LOCAL_RE = /\{for\s+@(\w+)(?:\s*,\s*@(\w+))?\s+of\b/g;
-var VALID_VAR_TYPES = new Set([
-	"number",
-	"string",
-	"boolean"
-]);
-/** Boxed sample values whose members a primitive of each type can access. */
-var PRIMITIVE_SAMPLES = {
-	string: Object(""),
-	number: Object(0),
-	boolean: Object(false)
-};
-function inferSchema(value) {
-	if (Array.isArray(value)) return { type: "array" };
-	if (value !== null && typeof value === "object") {
-		const fields = /* @__PURE__ */ new Map();
-		for (const [key, val] of Object.entries(value)) fields.set(key, inferSchema(val));
-		return {
-			type: "object",
-			fields
-		};
-	}
-	const jsType = typeof value;
-	if (!VALID_VAR_TYPES.has(jsType)) throw new Error(`Unsupported type "${jsType}" for value ${String(value)}. Expected number, string, boolean, array, or object.`);
-	return { type: jsType };
+/** Read the arguments of a {widget} definition (see widgetDef). */
+function parseWidgetDef(rawArgs) {
+	return widgetDef(parseMacroArgs(rawArgs, WIDGET_PARAMETERS));
 }
+var BLOCK_WIDGET = /\{widget\s+["']?(\w+)["']?[^}]*\}([\s\S]*?)\{\/widget\}/g;
 /**
-* Parse a StoryVariables or StoryTransients passage content into a schema map.
-* Each line: `$varName = expression` (or `%varName = expression` for transients)
+* The names of the block widgets (those whose body renders `{@children}`)
+* that StoryInit and the passages tagged `widget` define. They must be
+* known as block macros before any passage is parsed, so that passages
+* invoking them nest their content whatever the passage order.
 */
-function parseStoryVariables(content, sigil = "$") {
-	const schema = /* @__PURE__ */ new Map();
-	const DECLARATION_RE = declarationRegex(sigil);
-	const passageName = sigil === "%" ? "StoryTransients" : "StoryVariables";
-	for (const rawLine of content.split("\n")) {
-		const line = rawLine.trim();
-		if (!line) continue;
-		const match = line.match(DECLARATION_RE);
-		if (!match) throw new Error(`${passageName}: Invalid declaration: "${line}". Expected: ${sigil}name = value`);
-		const [, name, expr] = match;
-		const nameError = variableNameError(name, sigil + name);
-		if (nameError) throw new Error(`${passageName}: ${nameError}`);
-		let value;
-		try {
-			value = new Function("return (" + expr + ")")();
-		} catch (err) {
-			throw new Error(`${passageName}: Failed to evaluate "${sigil}${name} = ${expr}": ${errorMessage(err)}`);
-		}
-		let fieldSchema;
-		try {
-			fieldSchema = inferSchema(value);
-		} catch (err) {
-			throw new Error(`${passageName}: ${errorMessage(err)}`);
-		}
-		schema.set(name, {
-			...fieldSchema,
-			name,
-			default: value
-		});
+function blockWidgetNames(passages) {
+	const names = [];
+	for (const passage of passages) {
+		if (passage.name !== "StoryInit" && !passage.tags?.includes("widget")) continue;
+		for (const match of passage.content.matchAll(BLOCK_WIDGET)) if (/\{@children\}/.test(match[2])) names.push(match[1]);
 	}
-	return schema;
+	return names;
 }
+//#endregion
+//#region src/markup/validate.ts
 /**
-* Extract for-loop local variable names from passage content.
-* `{for @item of ...}` → "item"
+* Markup validation: parse every passage when the story starts and report
+* malformed markup, unknown macros, syntax errors in the code it runs and
+* passage names that name no passage (see code-check.ts) with the passage,
+* line and column they are at, instead of failing when the passage renders.
+* Tooling runs it too (see src/tooling.ts).
+*/
+/**
+* Passages that hold no markup: declarations, and the JavaScript function
+* body of SaveTitle.
+*/
+var NOT_MARKUP = new Set([
+	"StoryVariables",
+	"StoryTransients",
+	"SaveTitle"
+]);
+var NOT_MARKUP_TAGS = ["script", "stylesheet"];
+/** Branch macros, which their parent macro renders. */
+var BRANCH_MACROS = new Set([
+	"elseif",
+	"else",
+	"case",
+	"default",
+	"next"
+]);
+/** A diagnostic as one line of text. */
+function formatDiagnostic(d) {
+	const source = d.file ? ` (${d.file}${d.fileLine ? `:${d.fileLine}` : ""})` : "";
+	return `Passage "${d.passage}", line ${d.line}, column ${d.column}${source}: ${d.message}`;
+}
+/** Edit distance, for "did you mean" suggestions. */
+function distance(a, b) {
+	let prev = Array.from({ length: b.length + 1 }, (_, j) => j);
+	for (let i = 1; i <= a.length; i++) {
+		const row = [i];
+		for (let j = 1; j <= b.length; j++) row[j] = Math.min(prev[j] + 1, row[j - 1] + 1, prev[j - 1] + (a[i - 1] === b[j - 1] ? 0 : 1));
+		prev = row;
+	}
+	return prev[b.length];
+}
+/**
+* " Did you mean …?" with the known name closest to `name`, written by
+* `quote`, if one is close.
+*/
+function didYouMean(name, names, quote) {
+	const lower = name.toLowerCase();
+	let best = "";
+	let bestDistance = Math.max(2, Math.floor(lower.length / 3)) + 1;
+	for (const candidate of names) {
+		const d = distance(lower, candidate.toLowerCase());
+		if (d < bestDistance) {
+			best = candidate;
+			bestDistance = d;
+		}
+	}
+	return best ? ` Did you mean ${quote(best)}?` : "";
+}
+/** What a passage argument may be, after an error in one. */
+var PASSAGE_ARGUMENT_HINT = " (a passage name is a quoted string or an expression)";
+/** A passage argument that is one bare word (`{goto Kitchen}`). */
+var BARE_WORD_RE = /^[A-Za-z][\w$]*$/;
+/** The name of the widget a `{widget}` with these arguments defines. */
+function widgetName(rawArgs) {
+	try {
+		return parseWidgetDef(rawArgs).name.toLowerCase() || void 0;
+	} catch {
+		return;
+	}
+}
+/**
+* Validate the markup of every passage. Passage names written out (links,
+* quoted `passage` arguments) must name one of `passages`.
+*/
+function validateMarkup(passages, options) {
+	const diagnostics = [];
+	const hooks = options.isBlockMacro ? { isBlock: options.isBlockMacro } : void 0;
+	const report = (passage, offset, message) => {
+		const { line, column } = lineColumn(passage.content, offset);
+		const d = {
+			passage: passage.name,
+			line,
+			column,
+			message
+		};
+		const file = passage.metadata?.["data-source-file"];
+		if (file) {
+			d.file = file;
+			const header = Number(passage.metadata?.["data-source-line"]);
+			if (header) d.fileLine = header + line;
+		}
+		diagnostics.push(d);
+	};
+	const parsed = [];
+	const widgets = /* @__PURE__ */ new Set();
+	const passageNames = /* @__PURE__ */ new Set();
+	for (const passage of passages) {
+		passageNames.add(passage.name);
+		if (NOT_MARKUP.has(passage.name)) continue;
+		if (passage.tags?.some((tag) => NOT_MARKUP_TAGS.includes(tag))) continue;
+		const reported = !options.only || options.only(passage);
+		try {
+			const tokens = tokenizeMarkup(passage.content);
+			for (const token of tokens) {
+				if (token.type !== "macro" || token.isClose) continue;
+				if (token.name.toLowerCase() !== "widget") continue;
+				const name = widgetName(token.rawArgs);
+				if (name) widgets.add(name);
+			}
+			if (!reported) continue;
+			parseMarkup(passage.content, { hooks });
+			parsed.push([passage, tokens]);
+		} catch (err) {
+			if (!(err instanceof MarkupError)) throw err;
+			if (reported) report(passage, err.offset, err.reason);
+		}
+	}
+	const names = [...options.macroNames ?? [], ...widgets];
+	/** Report the unknown macros among `tokens`, which start at `base`. */
+	const checkMacros = (passage, tokens, base, where) => {
+		for (const token of tokens) {
+			if (token.type !== "macro" || token.isClose) continue;
+			const lower = token.name.toLowerCase();
+			if (BRANCH_MACROS.has(lower) || widgets.has(lower) || options.isKnownMacro(lower)) continue;
+			report(passage, base + token.start, `${where}Unknown macro {${token.name}}.${didYouMean(token.name, names, (n) => `{${n}}`)}`);
+		}
+	};
+	const parametersOf = (name) => options.parametersOf?.(name) ?? subMacroParameters(name);
+	/**
+	* Check `tokens`, the tokens of `src`, which starts at `base` in the
+	* passage: their macros, the code in them and the markup in their text.
+	*/
+	const checkTokens = (passage, src, tokens, base, where) => {
+		checkMacros(passage, tokens, base, where);
+		for (const piece of codeAndText(src, tokens, parametersOf)) {
+			const at = base + piece.offset;
+			if (piece.kind === "argument-error") {
+				report(passage, at, `${where}${piece.message} in ${piece.label}`);
+				continue;
+			}
+			if (piece.kind === "passage") {
+				if (options.checkPassageNames !== false && !passageNames.has(piece.name)) {
+					const hint = didYouMean(piece.name, passageNames, JSON.stringify);
+					report(passage, at, `${where}No passage named ${JSON.stringify(piece.name)} in ${piece.label}.${hint}`);
+				}
+				continue;
+			}
+			if (piece.kind === "code") {
+				const result = parseOrError(piece.code, piece.goal);
+				const code = piece.code.trim();
+				if (result instanceof CodeSyntaxError) {
+					const reason = result.reasonIn(passage.content, at);
+					report(passage, at + result.pos, `${where}${reason} in ${piece.label}` + (piece.passage ? PASSAGE_ARGUMENT_HINT : ""));
+				} else if (piece.passage && BARE_WORD_RE.test(code)) report(passage, at, `${where}Unquoted passage name in ${piece.label}: write ${JSON.stringify(code)}${PASSAGE_ARGUMENT_HINT}`);
+				continue;
+			}
+			if (!piece.text.includes("{")) continue;
+			try {
+				parseMarkup(piece.text, {
+					text: true,
+					hooks
+				});
+				const inner = tokenizeMarkup(piece.text, { text: true });
+				checkTokens(passage, piece.text, inner, at, piece.where);
+			} catch (err) {
+				if (!(err instanceof MarkupError)) throw err;
+				report(passage, at + err.offset, piece.where + err.reason);
+			}
+		}
+	};
+	for (const [passage, tokens] of parsed) withParseCache(() => checkTokens(passage, passage.content, tokens, 0, ""));
+	return diagnostics;
+}
+//#endregion
+//#region src/story-variables.ts
+/**
+* The tokens of markup, or none if it is malformed: validateMarkup reports
+* that, with its position.
+*/
+function tokensOf(text, textMode) {
+	try {
+		return tokenizeMarkup(text, { text: textMode });
+	} catch (err) {
+		if (err instanceof MarkupError) return [];
+		throw err;
+	}
+}
+function declarationRegex(sigil) {
+	const escaped = sigil.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	return new RegExp(`^${escaped}(\\w+)\\s*=\\s*(.+)$`);
+}
+/** A `$name` reference with its dot path, at a `$` the lexer found. */
+var VAR_PATH_RE = /\$(\w+(?:\.\w+)*)/y;
+/** Quoted first argument of an input macro naming a story variable. */
+var QUOTED_VAR_ARG_RE = /^["']\$(\w+(?:\.\w+)*)["']?$/;
+var FOR_LOCAL_RE = /\{for\s+@(\w+)(?:\s*,\s*@(\w+))?\s+of\b/g;
+var VALID_VAR_TYPES = new Set([
+	"number",
+	"string",
+	"boolean"
+]);
+/** Boxed sample values whose members a primitive of each type can access. */
+var PRIMITIVE_SAMPLES = {
+	string: Object(""),
+	number: Object(0),
+	boolean: Object(false)
+};
+function inferSchema(value) {
+	if (Array.isArray(value)) return { type: "array" };
+	if (value !== null && typeof value === "object") {
+		const fields = /* @__PURE__ */ new Map();
+		for (const [key, val] of Object.entries(value)) fields.set(key, inferSchema(val));
+		return {
+			type: "object",
+			fields
+		};
+	}
+	const jsType = typeof value;
+	if (!VALID_VAR_TYPES.has(jsType)) throw new Error(`Unsupported type "${jsType}" for value ${String(value)}. Expected number, string, boolean, array, or object.`);
+	return { type: jsType };
+}
+/**
+* Parse a StoryVariables or StoryTransients passage content into a schema map.
+* Each line: `$varName = expression` (or `%varName = expression` for transients)
+*/
+function parseStoryVariables(content, sigil = "$") {
+	const schema = /* @__PURE__ */ new Map();
+	const DECLARATION_RE = declarationRegex(sigil);
+	const passageName = sigil === "%" ? "StoryTransients" : "StoryVariables";
+	for (const rawLine of content.split("\n")) {
+		const line = rawLine.trim();
+		if (!line) continue;
+		const match = line.match(DECLARATION_RE);
+		if (!match) throw new Error(`${passageName}: Invalid declaration: "${line}". Expected: ${sigil}name = value`);
+		const [, name, expr] = match;
+		const nameError = variableNameError(name, sigil + name);
+		if (nameError) throw new Error(`${passageName}: ${nameError}`);
+		let value;
+		try {
+			value = new Function("return (" + expr + ")")();
+		} catch (err) {
+			throw new Error(`${passageName}: Failed to evaluate "${sigil}${name} = ${expr}": ${errorMessage(err)}`);
+		}
+		let fieldSchema;
+		try {
+			fieldSchema = inferSchema(value);
+		} catch (err) {
+			throw new Error(`${passageName}: ${errorMessage(err)}`);
+		}
+		schema.set(name, {
+			...fieldSchema,
+			name,
+			default: value
+		});
+	}
+	return schema;
+}
+/**
+* Extract for-loop local variable names from passage content.
+* `{for @item of ...}` → "item"
 * `{for @index, @item of ...}` → "index", "item"
 */
 function extractForLocals(content) {
@@ -17495,11 +17905,20 @@ function scanCodeLeniently(code, onRef, goal) {
 * code), quoted variable names bound by input macros, and `{$…}`
 * interpolations in HTML attributes. Prose is literal text and not scanned.
 */
-function collectPassageRefs(content, storeVarMacros, onRef) {
-	withParseCache(() => collectTokenRefs(content, tokensOf(content, false), storeVarMacros, onRef));
+function collectPassageRefs(content, storeVarMacros, onRef, parametersOf) {
+	withParseCache(() => collectTokenRefs(content, tokensOf(content, false), storeVarMacros, onRef, parametersOf));
+}
+/**
+* Report the references in the code that a macro's quoted arguments hold,
+* the condition and `run` action of `{watch}`: the argument scan sees only
+* the strings.
+*/
+function scanStringCode(token, params, onRef) {
+	if (!params || !token.rawArgs) return;
+	for (const piece of argPieces(token.rawArgs, 0, params, token.name, "")) if (piece.kind === "code" && piece.inString) scanCode(piece.code, onRef, piece.goal);
 }
 /** Report the `$var` references in the tokens of `content`. */
-function collectTokenRefs(content, tokens, storeVarMacros, onRef) {
+function collectTokenRefs(content, tokens, storeVarMacros, onRef, parametersOf = () => void 0) {
 	for (let t = 0; t < tokens.length; t++) {
 		const token = tokens[t];
 		if (token.type === "variable") {
@@ -17509,6 +17928,7 @@ function collectTokenRefs(content, tokens, storeVarMacros, onRef) {
 		else scanInterpolations(value, onRef, storeVarMacros);
 		else if (token.type === "macro" && !token.isClose) {
 			scanCode(token.rawArgs, onRef);
+			scanStringCode(token, parametersOf(token.name), onRef);
 			if (storeVarMacros.has(token.name.toLowerCase())) {
 				const first = token.rawArgs.trim().split(/\s+/)[0] ?? "";
 				const quoted = QUOTED_VAR_ARG_RE.exec(first);
@@ -17537,16 +17957,16 @@ function collectTokenRefs(content, tokens, storeVarMacros, onRef) {
 * `storeVarMacros` lists the input macros whose first argument names a bound
 * variable; it defaults to the built-in ones.
 */
-function validatePassages(passages, schema, storeVarMacros = BUILTIN_STORE_VAR_MACROS) {
+function validatePassages(passages, schema, storeVarMacros = BUILTIN_STORE_VAR_MACROS, parametersOf = getMacroParameters) {
 	const errors = [];
 	const storeVarSet = new Set(Array.from(storeVarMacros, (m) => m.toLowerCase()));
 	for (const [name, passage] of passages) {
-		if (name === "StoryVariables" || name === "StoryTransients") continue;
+		if (NOT_MARKUP.has(name)) continue;
 		const forLocals = extractForLocals(passage.content);
 		collectPassageRefs(passage.content, storeVarSet, (ref) => {
 			const error = validateRef(ref, schema, forLocals);
 			if (error) errors.push(`Passage "${name}": ${error}`);
-		});
+		}, parametersOf);
 	}
 	return errors;
 }
@@ -17560,214 +17980,6 @@ function extractDefaults(schema) {
 	return defaults;
 }
 //#endregion
-//#region src/widgets/widget-def.ts
-/**
-* Reading widget definitions without rendering anything: the `{widget}`
-* macro, startup and markup validation (also in tooling) share these.
-*/
-/** A {widget} definition's name, then its `@` parameters. */
-var WIDGET_PARAMETERS = [{
-	name: "name",
-	type: "text",
-	required: true
-}, {
-	name: "parameters",
-	type: "text"
-}];
-/**
-* The widget a {widget} definition's arguments declare: its name and its
-* parameters, the words after it that start with `@` (docs/widgets.md).
-* Other words, such as `$name`, are not parameters.
-*/
-function widgetDef({ name = "", parameters = "" }) {
-	return {
-		name,
-		params: parameters.split(/\s+/).filter((word) => word.startsWith("@"))
-	};
-}
-/** Read the arguments of a {widget} definition (see widgetDef). */
-function parseWidgetDef(rawArgs) {
-	return widgetDef(parseMacroArgs(rawArgs, WIDGET_PARAMETERS));
-}
-var BLOCK_WIDGET = /\{widget\s+["']?(\w+)["']?[^}]*\}([\s\S]*?)\{\/widget\}/g;
-/**
-* The names of the block widgets (those whose body renders `{@children}`)
-* that StoryInit and the passages tagged `widget` define. They must be
-* known as block macros before any passage is parsed, so that passages
-* invoking them nest their content whatever the passage order.
-*/
-function blockWidgetNames(passages) {
-	const names = [];
-	for (const passage of passages) {
-		if (passage.name !== "StoryInit" && !passage.tags?.includes("widget")) continue;
-		for (const match of passage.content.matchAll(BLOCK_WIDGET)) if (/\{@children\}/.test(match[2])) names.push(match[1]);
-	}
-	return names;
-}
-//#endregion
-//#region src/markup/validate.ts
-/**
-* Markup validation: parse every passage when the story starts and report
-* malformed markup, unknown macros, syntax errors in the code it runs and
-* passage names that name no passage (see code-check.ts) with the passage,
-* line and column they are at, instead of failing when the passage renders.
-* Tooling runs it too (see src/tooling.ts).
-*/
-/** Passages that hold no markup. */
-var NOT_MARKUP = new Set(["StoryVariables", "StoryTransients"]);
-var NOT_MARKUP_TAGS = ["script", "stylesheet"];
-/** Branch macros, which their parent macro renders. */
-var BRANCH_MACROS = new Set([
-	"elseif",
-	"else",
-	"case",
-	"default",
-	"next"
-]);
-/** A diagnostic as one line of text. */
-function formatDiagnostic(d) {
-	const source = d.file ? ` (${d.file}${d.fileLine ? `:${d.fileLine}` : ""})` : "";
-	return `Passage "${d.passage}", line ${d.line}, column ${d.column}${source}: ${d.message}`;
-}
-/** Edit distance, for "did you mean" suggestions. */
-function distance(a, b) {
-	let prev = Array.from({ length: b.length + 1 }, (_, j) => j);
-	for (let i = 1; i <= a.length; i++) {
-		const row = [i];
-		for (let j = 1; j <= b.length; j++) row[j] = Math.min(prev[j] + 1, row[j - 1] + 1, prev[j - 1] + (a[i - 1] === b[j - 1] ? 0 : 1));
-		prev = row;
-	}
-	return prev[b.length];
-}
-/**
-* " Did you mean …?" with the known name closest to `name`, written by
-* `quote`, if one is close.
-*/
-function didYouMean(name, names, quote) {
-	const lower = name.toLowerCase();
-	let best = "";
-	let bestDistance = Math.max(2, Math.floor(lower.length / 3)) + 1;
-	for (const candidate of names) {
-		const d = distance(lower, candidate.toLowerCase());
-		if (d < bestDistance) {
-			best = candidate;
-			bestDistance = d;
-		}
-	}
-	return best ? ` Did you mean ${quote(best)}?` : "";
-}
-/** What a passage argument may be, after an error in one. */
-var PASSAGE_ARGUMENT_HINT = " (a passage name is a quoted string or an expression)";
-/** A passage argument that is one bare word (`{goto Kitchen}`). */
-var BARE_WORD_RE = /^[A-Za-z][\w$]*$/;
-/** The name of the widget a `{widget}` with these arguments defines. */
-function widgetName(rawArgs) {
-	try {
-		return parseWidgetDef(rawArgs).name.toLowerCase() || void 0;
-	} catch {
-		return;
-	}
-}
-/**
-* Validate the markup of every passage. Passage names written out (links,
-* quoted `passage` arguments) must name one of `passages`.
-*/
-function validateMarkup(passages, options) {
-	const diagnostics = [];
-	const hooks = options.isBlockMacro ? { isBlock: options.isBlockMacro } : void 0;
-	const report = (passage, offset, message) => {
-		const { line, column } = lineColumn(passage.content, offset);
-		const d = {
-			passage: passage.name,
-			line,
-			column,
-			message
-		};
-		const file = passage.metadata?.["data-source-file"];
-		if (file) {
-			d.file = file;
-			const header = Number(passage.metadata?.["data-source-line"]);
-			if (header) d.fileLine = header + line;
-		}
-		diagnostics.push(d);
-	};
-	const parsed = [];
-	const widgets = /* @__PURE__ */ new Set();
-	const passageNames = /* @__PURE__ */ new Set();
-	for (const passage of passages) {
-		passageNames.add(passage.name);
-		if (NOT_MARKUP.has(passage.name)) continue;
-		if (passage.tags?.some((tag) => NOT_MARKUP_TAGS.includes(tag))) continue;
-		const reported = !options.only || options.only(passage);
-		try {
-			const tokens = tokenizeMarkup(passage.content);
-			for (const token of tokens) {
-				if (token.type !== "macro" || token.isClose) continue;
-				if (token.name.toLowerCase() !== "widget") continue;
-				const name = widgetName(token.rawArgs);
-				if (name) widgets.add(name);
-			}
-			if (!reported) continue;
-			parseMarkup(passage.content, { hooks });
-			parsed.push([passage, tokens]);
-		} catch (err) {
-			if (!(err instanceof MarkupError)) throw err;
-			if (reported) report(passage, err.offset, err.reason);
-		}
-	}
-	const names = [...options.macroNames ?? [], ...widgets];
-	/** Report the unknown macros among `tokens`, which start at `base`. */
-	const checkMacros = (passage, tokens, base, where) => {
-		for (const token of tokens) {
-			if (token.type !== "macro" || token.isClose) continue;
-			const lower = token.name.toLowerCase();
-			if (BRANCH_MACROS.has(lower) || widgets.has(lower) || options.isKnownMacro(lower)) continue;
-			report(passage, base + token.start, `${where}Unknown macro {${token.name}}.${didYouMean(token.name, names, (n) => `{${n}}`)}`);
-		}
-	};
-	const parametersOf = options.parametersOf ?? (() => void 0);
-	/**
-	* Check `tokens`, the tokens of `src`, which starts at `base` in the
-	* passage: their macros, the code in them and the markup in their text.
-	*/
-	const checkTokens = (passage, src, tokens, base, where) => {
-		checkMacros(passage, tokens, base, where);
-		for (const piece of codeAndText(src, tokens, parametersOf)) {
-			const at = base + piece.offset;
-			if (piece.kind === "passage") {
-				if (options.checkPassageNames !== false && !passageNames.has(piece.name)) {
-					const hint = didYouMean(piece.name, passageNames, JSON.stringify);
-					report(passage, at, `${where}No passage named ${JSON.stringify(piece.name)} in ${piece.label}.${hint}`);
-				}
-				continue;
-			}
-			if (piece.kind === "code") {
-				const result = parseOrError(piece.code, piece.goal);
-				const code = piece.code.trim();
-				if (result instanceof CodeSyntaxError) {
-					const reason = result.reasonIn(passage.content, at);
-					report(passage, at + result.pos, `${where}${reason} in ${piece.label}` + (piece.passage ? PASSAGE_ARGUMENT_HINT : ""));
-				} else if (piece.passage && BARE_WORD_RE.test(code)) report(passage, at, `${where}Unquoted passage name in ${piece.label}: write ${JSON.stringify(code)}${PASSAGE_ARGUMENT_HINT}`);
-				continue;
-			}
-			if (!piece.text.includes("{")) continue;
-			try {
-				parseMarkup(piece.text, {
-					text: true,
-					hooks
-				});
-				const inner = tokenizeMarkup(piece.text, { text: true });
-				checkTokens(passage, piece.text, inner, at, piece.where);
-			} catch (err) {
-				if (!(err instanceof MarkupError)) throw err;
-				report(passage, at + err.offset, piece.where + err.reason);
-			}
-		}
-	};
-	for (const [passage, tokens] of parsed) withParseCache(() => checkTokens(passage, passage.content, tokens, 0, ""));
-	return diagnostics;
-}
-//#endregion
 //#region src/widgets/ast-scanner.ts
 /**
 * Recursively scan an AST node array for a VariableNode
@@ -18403,20 +18615,27 @@ defineMacro({
 	name: "link",
 	block: true,
 	interpolate: true,
+	merged: true,
 	parameters: [{
 		name: "text",
 		type: "string",
 		required: true
 	}, {
 		name: "passage",
-		type: "string"
+		type: "passage"
 	}],
-	render({ rawArgs, children = [] }, ctx) {
-		const { text } = ctx.args;
-		const display = text ?? rawArgs.trim();
-		const passage = text === void 0 ? null : ctx.args.passage ?? null;
+	render({ children = [] }, ctx) {
+		const display = ctx.args.text ?? "";
+		let passage = null;
+		let failure;
+		if (ctx.args.passage !== void 0) try {
+			passage = evaluatePassageName(ctx.args.passage, ctx.evaluate, useStoryStore.getState());
+		} catch (error) {
+			failure = { error };
+		}
 		const runBody = useDetachedBody();
 		const perform = () => {
+			if (failure) return;
 			runBody(children);
 			if (passage) useStoryStore.getState().navigate(passage);
 		};
@@ -18430,8 +18649,13 @@ defineMacro({
 			authorId: ctx.id,
 			label: display,
 			target: passage ?? void 0,
+			disabled: failure ? true : void 0,
 			perform
 		});
+		if (failure) return /* @__PURE__ */ jsx(MacroError, {
+			macro: "link",
+			error: failure.error
+		});
 		return /* @__PURE__ */ jsx("a", {
 			id: ctx.id,
 			class: ctx.cls,