@rohal12/spindle 0.57.0 → 0.59.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",
@@ -75,34 +103,46 @@ var LINK_SEPARATORS = [
 	["<-", true]
 ];
 var NO_SELECTORS = {};
-function parseLink(inner) {
+/**
+* A link's display text and target, from its text `inner` (at `at` in the
+* input), with where the target is written.
+*/
+function parseLink(inner, at) {
+	/** The trimmed text from `start` to `end` of inner, and where it is. */
+	const part = (start, end) => {
+		const raw = inner.slice(start, end);
+		const value = raw.trim();
+		const from = at + start + (value ? raw.indexOf(value) : 0);
+		return {
+			value,
+			start: from,
+			end: from + value.length
+		};
+	};
 	for (const [separator, targetFirst] of LINK_SEPARATORS) {
 		const idx = inner.indexOf(separator);
 		if (idx === -1) continue;
-		const before = inner.slice(0, idx).trim();
-		const after = inner.slice(idx + separator.length).trim();
-		return targetFirst ? {
-			display: after,
-			target: before
-		} : {
-			display: before,
-			target: after
+		const before = part(0, idx);
+		const after = part(idx + separator.length, inner.length);
+		const [display, target] = targetFirst ? [after, before] : [before, after];
+		return {
+			display: display.value,
+			target: target.value,
+			targetStart: target.start,
+			targetEnd: target.end
 		};
 	}
-	const trimmed = inner.trim();
+	const whole = part(0, inner.length);
 	return {
-		display: trimmed,
-		target: trimmed
+		display: whole.value,
+		target: whole.value,
+		targetStart: whole.start,
+		targetEnd: whole.end
 	};
 }
 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 = "";
@@ -179,6 +219,8 @@ function tokenOf(x) {
 			type: "link",
 			display: x.display,
 			target: x.target,
+			targetStart: x.targetStart,
+			targetEnd: x.targetEnd,
 			...span
 		}, x);
 		case "variable": return withSelectors({
@@ -322,7 +364,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 = "\\";
@@ -709,8 +752,8 @@ function peg$parse(input, options) {
 	function peg$f48() {
 		return !textMode;
 	}
-	function peg$f49(s, inner) {
-		return withSelectors(lexeme("link", location(), parseLink(inner)), s);
+	function peg$f49(s, at, inner) {
+		return withSelectors(lexeme("link", location(), parseLink(inner, at)), s);
 	}
 	function peg$f50() {
 		return !textMode;
@@ -724,40 +767,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 +827,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 +849,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 +867,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 +876,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;
@@ -1753,7 +1802,7 @@ function peg$parse(input, options) {
 		return s0;
 	}
 	function peg$parseLinkLexeme() {
-		let s0, s1, s2, s3, s4, s5;
+		let s0, s1, s2, s3, s4, s5, s6;
 		s0 = peg$currPos;
 		peg$savedPos = peg$currPos;
 		s1 = peg$f48();
@@ -1770,19 +1819,20 @@ function peg$parse(input, options) {
 			if (s2 !== peg$FAILED) {
 				s3 = peg$parseSelectors();
 				if (s3 !== peg$FAILED) {
-					s4 = peg$currPos;
-					s5 = peg$parseLinkText();
-					s4 = input.substring(s4, peg$currPos);
+					s4 = peg$parseHere();
+					s5 = peg$currPos;
+					s6 = peg$parseLinkText();
+					s5 = input.substring(s5, peg$currPos);
 					if (input.substr(peg$currPos, 2) === peg$c5) {
-						s5 = peg$c5;
+						s6 = peg$c5;
 						peg$currPos += 2;
 					} else {
-						s5 = peg$FAILED;
+						s6 = peg$FAILED;
 						if (peg$silentFails === 0) peg$fail(peg$e9);
 					}
-					if (s5 !== peg$FAILED) {
+					if (s6 !== peg$FAILED) {
 						peg$savedPos = s0;
-						s0 = peg$f49(s3, s4);
+						s0 = peg$f49(s3, s4, s5);
 					} else {
 						peg$currPos = s0;
 						s0 = peg$FAILED;
@@ -1953,6 +2003,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 +2054,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 +2179,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 +2233,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 +2281,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 +2303,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 +2339,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 +2377,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 +2421,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 +2436,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 +2470,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 +2527,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 +2591,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 +2656,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 +2695,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 +2829,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 +2847,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 +2858,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 +2913,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 +2965,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 +2984,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 +3015,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 +3044,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 +3083,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 +3110,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 +3197,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 +3288,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 +3523,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,
@@ -9395,6 +9461,22 @@ function regexEnd(src, start) {
 	return -1;
 }
 /**
+* The value of `src` when it is exactly one `"…"` or `'…'` string literal,
+* as JavaScript reads it (`"\u0048all"` is `Hall`, `"\1"` is U+0001 in
+* the non-strict code passages run), otherwise `null`: other code, or a
+* literal that is not well-formed (`"\u{110000}"`).
+*/
+function stringLiteralValue(src) {
+	if (src[0] !== "\"" && src[0] !== "'") return null;
+	try {
+		const p = tokenizerAt(src, 0, "expression");
+		p.nextToken();
+		return p.type === types$1.string && p.end === src.length ? p.value : null;
+	} catch {
+		return null;
+	}
+}
+/**
 * Scan the `"…"` or `'…'` string literal opening at `start`. `end` is the
 * index just past its closing quote, or `src.length` when it is unterminated
 * (`closed` false). A backslash escapes the character after it, so a quote
@@ -9876,9 +9958,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 +9985,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 +10003,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);
@@ -10092,24 +10182,53 @@ var PARAMETER_TYPES = [
 	"options"
 ];
 /**
+* What the value of a `string` or `text` argument holds, for the check at
+* story start and for tooling (see code-check.ts):
+* - `markup`: markup the macro renders (`{button}`'s label): its markup
+*   is checked.
+* - `text`: plain text the macro uses as written (`{checkbox}`'s label).
+* - `passage`: a passage name (`{watch}`'s `goto`): the passage must exist.
+* - `expression`, `statements`: code (`{watch}`'s condition and `run`): it
+*   is checked as code, and its variable references against the schema.
+*
+* Without it, the argument of a macro with `interpolate` holds `markup`,
+* any other `text`.
+*/
+var STRING_HOLDS = [
+	"markup",
+	"text",
+	"passage",
+	"expression",
+	"statements"
+];
+/**
 * Throw if a parameter `macro` declares (or an option of one) has no type,
 * or one that isn't a ParameterType: arguments are read by their type, and
-* there is no default.
+* there is no default. Throw too if it declares what it `holds` wrongly.
 */
 function checkParameterTypes(macro, parameters) {
+	const holdsFix = `Give a \`string\` or \`text\` parameter one of ${STRING_HOLDS.join(", ")} to hold (see docs/custom-macros.md#what-a-string-holds).`;
 	for (const param of parameters) {
 		const type = param.type;
-		if (!PARAMETER_TYPES.includes(type)) {
-			const problem = type === void 0 ? "has no type" : `has the unknown type ${JSON.stringify(type)}`;
-			throw new Error(`spindle: The parameter "${param.name}" of the macro {${macro}} ${problem}. Give it one of the types ${PARAMETER_TYPES.join(", ")} (see docs/custom-macros.md#parameter-types), or declare no parameters and read props.rawArgs.`);
-		}
+		if (!PARAMETER_TYPES.includes(type)) throw parameterError(macro, param, type === void 0 ? "has no type" : `has the unknown type ${JSON.stringify(type)}`, `Give it one of the types ${PARAMETER_TYPES.join(", ")} (see docs/custom-macros.md#parameter-types), or declare no parameters and read props.rawArgs.`);
+		const holds = param.holds;
+		if (holds !== void 0 && type !== "string" && type !== "text") throw parameterError(macro, param, `is of the type ${type}, which holds what it is`, holdsFix);
+		if (holds !== void 0 && !STRING_HOLDS.includes(holds)) throw parameterError(macro, param, `holds the unknown ${JSON.stringify(holds)}`, holdsFix);
 		if (param.parameters) checkParameterTypes(macro, param.parameters);
 	}
 }
+/** The error for the parameter `param` of `macro`: what is wrong, and the fix. */
+function parameterError(macro, param, problem, fix) {
+	return /* @__PURE__ */ new Error(`spindle: The parameter "${param.name}" of the macro {${macro}} ${problem}. ${fix}`);
+}
 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());
 }
@@ -10563,7 +10682,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) {
@@ -16474,11 +16593,13 @@ function readText(src) {
 */
 var MacroArgumentError = class extends Error {
 	constructor(param, src) {
-		super(`The ${param.name} must be a quoted string ("…" or '…'), not ${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) {
+/** Read `src`, at `place`, as `param` says. */
+function readValue(param, src, place) {
+	place.spans?.set(param, [place.at, place.at + src.length]);
 	switch (param.type) {
 		case "string": {
 			const value = readWholeQuoted(src);
@@ -16489,7 +16610,7 @@ function readValue(param, src) {
 		case "names": return src.split(",").map((name) => name.trim());
 		case "delay": return parseDelay(src);
 		case "number": return Number(src);
-		case "options": return readOptions(param.parameters ?? [], src);
+		case "options": return readOptions(param.parameters ?? [], src, place);
 		default: return src;
 	}
 }
@@ -16499,6 +16620,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;
@@ -16506,10 +16628,12 @@ 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.
+* quoted string (with or without whitespace before it) or digit run after
+* it as its value; keywords that aren't declared, and their values, are
+* skipped. A keyword of a `string` parameter must be followed by a quoted
+* string.
 */
-function readOptions(params, src) {
+function readOptions(params, src, { at, spans }) {
 	const options = {};
 	let i = 0;
 	while (i < src.length) {
@@ -16522,18 +16646,18 @@ function readOptions(params, src) {
 		let val;
 		let j = i;
 		while (j < src.length && isWhitespace(src[j])) j++;
-		if (j > i) {
-			const quoted = readQuoted(src, j);
-			const digits = quoted ? null : matchAt(DIGITS_RE, src, j);
-			if (quoted) {
-				val = quoted.value;
-				i = quoted.end;
-			} else if (digits) {
-				val = digits;
-				i = j + digits.length;
-			}
+		const quoted = readQuoted(src, j);
+		const digits = quoted || j === i ? null : matchAt(DIGITS_RE, src, j);
+		if (quoted) {
+			val = quoted.value;
+			i = quoted.end;
+		} else if (digits) {
+			val = digits;
+			i = j + digits.length;
 		}
 		const param = params.find((p) => p.name === key);
+		if (param && param.type !== "flag" && val !== void 0) spans?.set(param, [at + j, at + i]);
+		if (param?.type === "string" && !quoted) 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;
@@ -16543,21 +16667,21 @@ function readOptions(params, src) {
 /** `inline %name` reads a transient variable; `inline % 2` is modulo. */
 var LEADING_OPERATOR_RE = /^(?:[-+*/&|^=<>?:,.]|%(?![A-Za-z_]))/;
 /**
-* The rest of `src` without the flag `word` as its last or first term, or
-* `null` if it has no such flag. Next to a binary operator the word is an
-* operand (`"a" + inline`), not a flag; the closing `/` of a regex literal
-* is not one.
+* Where the rest of `src` is without the flag `word` as its last or first
+* term, or `null` if it has no such flag. Next to a binary operator the
+* word is an operand (`"a" + inline`), not a flag; the closing `/` of a
+* regex literal is not one.
 */
 function takeFlag(src, word) {
 	const spans = terms(src);
 	if (spans.length < 2) return null;
 	if (slice(src, spans[spans.length - 1]) === word) {
-		const rest = src.slice(0, spans[spans.length - 2][1]);
-		if (!endsWithOperator(rest)) return rest;
+		const rest = [0, spans[spans.length - 2][1]];
+		if (!endsWithOperator(slice(src, rest))) return rest;
 	}
 	if (slice(src, spans[0]) === word) {
-		const rest = src.slice(spans[1][0]);
-		if (!LEADING_OPERATOR_RE.test(rest)) return rest;
+		const rest = [spans[1][0], src.length];
+		if (!LEADING_OPERATOR_RE.test(slice(src, rest))) return rest;
 	}
 	return null;
 }
@@ -16585,42 +16709,55 @@ function findSeparator(src, word) {
 	return null;
 }
 var takesRest = (param) => param.type === "expression" || param.type === "statements" || param.type === "passage" || param.type === "text";
-/** Read the parameters of one group from `src` (`null`: no text) into `args`. */
-function readGroup(params, src, args) {
-	let text = src?.trim() ?? "";
+/** The text of `src` without the whitespace around it, and where it is. */
+function trimmed(src, at) {
+	const text = src.trim();
+	return [text, text ? at + src.indexOf(text) : at];
+}
+/**
+* Read the parameters of one group from `src` (`null`: no text), which is
+* at `at` in the raw arguments, into `args`.
+*/
+function readGroup(params, src, args, { at: srcAt, spans }) {
+	let [text, at] = trimmed(src ?? "", srcAt);
 	for (const flag of params.filter((p) => p.type === "flag")) {
 		const rest = src === null ? null : takeFlag(text, flag.name);
 		args[flag.name] = rest !== null;
-		text = rest ?? text;
+		if (rest) [text, at] = trimmed(slice(text, rest), at + rest[0]);
 	}
 	const positional = params.filter((p) => p.type !== "flag");
 	if (positional.length === 0) return;
 	const lastText = positional.findIndex((p, i) => takesRest(p) && !positional.slice(i + 1).some(takesRest));
 	const restIndex = lastText < 0 ? positional.length - 1 : lastText;
-	const read = (param, value) => value === "" ? unset(param) : readValue(param, value);
+	/** Read `param` from the text from `start` to `end`. */
+	const read = (param, [start, end]) => start === end ? unset(param) : readValue(param, text.slice(start, end), {
+		at: at + start,
+		spans
+	});
 	if (positional.length === 1) {
-		args[positional[0].name] = read(positional[0], text);
+		args[positional[0].name] = read(positional[0], [0, text.length]);
 		return;
 	}
-	const spans = terms(text);
+	const parts = terms(text);
 	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) => {
+	let to = parts.length;
+	for (const param of positional.slice(0, restIndex)) args[param.name] = from < to ? read(param, parts[from++]) : unset(param);
+	const readTrailing = (param, span) => {
 		try {
-			return read(param, value);
+			return read(param, span);
 		} 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])) ? readTrailing(param, slice(text, spans[to - 1])) : void 0;
+		const value = from < to && !endsWithOperator(text.slice(0, parts[to - 1][0])) ? readTrailing(param, parts[to - 1]) : void 0;
 		args[param.name] = value ?? unset(param);
 		if (value !== void 0) to--;
+		else spans?.delete(param);
 	}
 	const rest = positional[restIndex];
-	args[rest.name] = from < to ? read(rest, text.slice(spans[from][0], spans[to - 1][1])) : unset(rest);
+	args[rest.name] = from < to ? read(rest, [parts[from][0], parts[to - 1][1]]) : unset(rest);
 }
 /** The duration a timing macro ({repeat}, {type}, {timed}/{next}) waits. */
 var DELAY_PARAMETER = {
@@ -16628,24 +16765,52 @@ var DELAY_PARAMETER = {
 	type: "delay",
 	required: true
 };
-/** Read `rawArgs` into the declared `parameters` (see above). */
-function parseMacroArgs(rawArgs, parameters) {
+/**
+* Read `rawArgs` into the declared `parameters` (see above). With `spans`,
+* note there where each argument set was read.
+*/
+function parseMacroArgs(rawArgs, parameters, spans) {
 	const args = {};
-	let rest = rawArgs.trim();
+	let [rest, restAt] = trimmed(rawArgs, 0);
 	let groupStart = 0;
 	parameters.forEach((separator, i) => {
 		if (separator.type !== "separator") return;
 		const at = rest === null ? null : findSeparator(rest, separator.name);
 		args[separator.name] = at !== null;
 		const before = at ? rest.slice(0, at[0]) : rest;
-		readGroup(parameters.slice(groupStart, i), before, args);
+		readGroup(parameters.slice(groupStart, i), before, args, {
+			at: restAt,
+			spans
+		});
 		rest = at ? rest.slice(at[1]) : null;
+		if (at) restAt += at[1];
 		groupStart = i + 1;
 	});
-	readGroup(parameters.slice(groupStart), rest, args);
+	readGroup(parameters.slice(groupStart), rest, args, {
+		at: restAt,
+		spans
+	});
 	return args;
 }
 /**
+* Read a `passage` argument as written (`{goto "Hall"}`, `{goto $room}`): a
+* string literal is the name JavaScript reads from it (`"\u0048all"` is
+* `Hall`), anything else (a literal that is not well-formed too) an
+* expression, whose value is the name when it
+* runs (see evaluatePassageName).
+*/
+function passageTarget(arg) {
+	const expression = arg.trim();
+	const name = stringLiteralValue(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
@@ -16685,10 +16850,15 @@ function parseVarArgs(rawArgs) {
 var OPTION_PARAMETERS = [{
 	name: "value",
 	type: "string",
+	holds: "text",
 	required: true
 }];
 /** The parameters of the built-in sub-macros that take arguments. */
-var SUB_MACRO_PARAMETERS = { option: OPTION_PARAMETERS };
+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.
 */
@@ -17155,21 +17325,63 @@ var CONDITION_MACROS = new Set([
 	"elseif",
 	"case"
 ]);
-/** Code inside the quoted strings of a macro's arguments, by parameter. */
-var CODE_IN_STRINGS = { watch: {
-	condition: "expression",
-	run: "statements"
-} };
-/** The `string` parameters of a macro that name a passage. */
-var PASSAGE_STRINGS = { watch: ["goto", "dialog"] };
 /** Block macros whose body is the name of a passage. */
 var PASSAGE_BODIES = new Set(["dialog"]);
+/**
+* `params` with each `string` and `text` parameter (options too) saying
+* what it holds: what it declares, else `holds`.
+*/
+function withHolds(params, holds) {
+	return params.map((param) => {
+		if (param.parameters) return {
+			...param,
+			parameters: withHolds(param.parameters, holds)
+		};
+		return (param.type === "string" || param.type === "text") && !param.holds ? {
+			...param,
+			holds
+		} : param;
+	});
+}
+/**
+* The declared parameters of `macros`, by name in any case, and of the
+* built-in sub-macros (`{option}`): what the story-start check, reference
+* collection and tooling read arguments by. Each `string` and `text`
+* parameter says what it holds: what it declares, else `markup` for a macro
+* with `interpolate` (which can resolve markup) and `text` for any other.
+*/
+function parameterLookup(macros) {
+	const parameters = new NameMap();
+	for (const { name, parameters: params, interpolate } of macros) if (params) parameters.set(name, withHolds(params, holdsByDefault(interpolate)));
+	return (name) => {
+		let params = parameters.get(name);
+		if (!params) {
+			const sub = subMacroParameters(name);
+			if (sub) parameters.set(name, params = withHolds(sub, "text"));
+		}
+		return params;
+	};
+}
+/** What a `string` or `text` argument holds when its parameter doesn't say. */
+var holdsByDefault = (interpolate) => interpolate ? "markup" : "text";
+/** Whether a parameter in `params` (options too) holds code in a string. */
+function holdsCode(params) {
+	return params.some((p) => p.holds === "expression" || p.holds === "statements" || !!p.parameters && holdsCode(p.parameters));
+}
 /** The goal of the code an argument of this type holds, if it is code. */
 function codeGoal(param) {
 	if (param.type === "expression" || param.type === "passage") return "expression";
 	if (param.type === "statements") return "statements";
 }
 /**
+* What a `string` or `text` argument holds: what its parameter says (see
+* parameterLookup), else markup, which is checked.
+*/
+function stringHolds(param) {
+	if (param.type !== "string" && param.type !== "text") return void 0;
+	return param.holds ?? "markup";
+}
+/**
 * The code and the markup-holding text in `tokens`, the tokens of `src`.
 * `parametersOf` gives the declared parameters of a macro, if it has any.
 */
@@ -17181,7 +17393,9 @@ function* codeAndText(src, tokens, parametersOf) {
 		if (token.type === "link") yield {
 			kind: "passage",
 			name: token.target,
-			offset: locate(src, token.target, token.start),
+			offset: token.targetStart,
+			length: token.targetEnd - token.targetStart,
+			macro: "link",
 			label: src.slice(token.start, token.end)
 		};
 		else if (token.type === "expression") yield {
@@ -17191,32 +17405,35 @@ function* codeAndText(src, tokens, parametersOf) {
 			goal: "expression",
 			label: `{${token.expression}}`
 		};
-		else if (token.type === "html") for (const [name, value] of Object.entries(token.attributes)) {
-			const at = locate(src, value, token.start);
-			if (!isCodeAttribute(name)) {
-				yield {
-					kind: "text",
-					text: value,
-					offset: at,
-					where: `In the ${name} attribute of <${token.tag}>: `
-				};
-				continue;
-			}
-			let from = 0;
-			for (const part of splitSigilTemplate(value)) {
-				if (!("expr" in part)) continue;
-				const k = locate(value, part.expr, from);
-				from = k + part.expr.length;
-				yield {
-					kind: "code",
-					code: part.expr,
-					offset: at + k,
-					goal: "expression",
-					label: `{${part.expr}} in the ${name} attribute of <${token.tag}>`
-				};
+		else if (token.type === "html") {
+			let cursor = token.start;
+			for (const [name, value] of Object.entries(token.attributes)) {
+				const at = locate(src, value, cursor);
+				cursor = at + value.length;
+				if (!isCodeAttribute(name)) {
+					yield {
+						kind: "text",
+						text: value,
+						offset: at,
+						where: `In the ${name} attribute of <${token.tag}>: `
+					};
+					continue;
+				}
+				let from = 0;
+				for (const part of splitSigilTemplate(value)) {
+					if (!("expr" in part)) continue;
+					const k = locate(value, part.expr, from);
+					from = k + part.expr.length;
+					yield {
+						kind: "code",
+						code: part.expr,
+						offset: at + k,
+						goal: "expression",
+						label: `{${part.expr}} in the ${name} attribute of <${token.tag}>`
+					};
+				}
 			}
-		}
-		else if (token.type === "macro" && !token.isClose) {
+		} else if (token.type === "macro" && !token.isClose) {
 			const name = token.name.toLowerCase();
 			if (name === "do") {
 				const close = closeOf(t, name);
@@ -17236,18 +17453,22 @@ function* codeAndText(src, tokens, parametersOf) {
 				const close = closeOf(t, name);
 				const body = tokens.slice(t + 1, close);
 				if (close > t + 1 && body.every((b) => b.type === "text")) {
-					const passage = src.slice(token.end, tokens[close].start).trim().replace(/^["']|["']$/g, "");
+					const text = src.slice(token.end, tokens[close].start);
+					const written = text.trim();
 					yield {
 						kind: "passage",
-						name: passage,
-						offset: locate(src, passage, token.end),
+						name: written.replace(/^["']|["']$/g, ""),
+						offset: token.end + text.indexOf(written),
+						length: written.length,
+						macro: name,
 						label: src.slice(token.start, token.end)
 					};
 				}
 			}
 			if (!args) continue;
 			const label = `{${token.name} ${args}}`;
-			const argsAt = locate(src, args, token.start + 1);
+			const tag = src.slice(token.start, token.end - 1);
+			const argsAt = token.start + tag.trimEnd().length - args.length;
 			if (CONDITION_MACROS.has(name)) {
 				yield {
 					kind: "code",
@@ -17266,8 +17487,9 @@ function* codeAndText(src, tokens, parametersOf) {
 /** The code and text in the arguments `args` (at `offset`) of `macro`. */
 function* argPieces(args, offset, params, macro, label) {
 	let values;
+	const spans = /* @__PURE__ */ new Map();
 	try {
-		values = parseMacroArgs(args, params);
+		values = parseMacroArgs(args, params, spans);
 	} catch (error) {
 		if (!(error instanceof MacroArgumentError)) throw error;
 		yield {
@@ -17278,9 +17500,7 @@ function* argPieces(args, offset, params, macro, label) {
 		};
 		return;
 	}
-	const inStrings = CODE_IN_STRINGS[macro.toLowerCase()] ?? {};
-	const passageStrings = PASSAGE_STRINGS[macro.toLowerCase()] ?? [];
-	let cursor = 0;
+	const name = macro.toLowerCase();
 	/** The pieces of the parameters `list`, with their values in `from`. */
 	function* visit(list, from) {
 		for (const param of list) {
@@ -17289,32 +17509,57 @@ function* argPieces(args, offset, params, macro, label) {
 				yield* visit(param.parameters, value ?? {});
 				continue;
 			}
-			if (typeof value !== "string" || !value.trim()) continue;
-			const at = locate(args, value, cursor);
-			if (at >= cursor) cursor = at + value.length;
-			const goal = codeGoal(param) ?? inStrings[param.name];
+			const span = spans.get(param);
+			if (typeof value !== "string" || !value.trim() || !span) continue;
+			const [start, end] = span;
+			const written = args.slice(start, end);
+			/** The name as written (quotes included), at the argument. */
+			const passage = (passageName) => ({
+				kind: "passage",
+				name: passageName,
+				offset: offset + start,
+				length: end - start,
+				macro: name,
+				label
+			});
+			const goal = codeGoal(param);
+			if (param.type === "passage") {
+				const target = passageTarget(value);
+				if (target.kind === "name") {
+					yield passage(target.name);
+					continue;
+				}
+			}
 			if (goal) {
 				const piece = {
 					kind: "code",
 					code: value,
-					offset: offset + at,
+					offset: offset + start,
 					goal,
 					label
 				};
-				if (param.type === "passage") piece.passage = true;
+				if (param.type === "passage") {
+					piece.passage = true;
+					piece.macro = name;
+				}
 				yield piece;
+				continue;
 			}
-			const name = param.type === "passage" ? readWholeQuoted(value.trim()) : passageStrings.includes(param.name) ? value : null;
-			if (name !== null) yield {
-				kind: "passage",
-				name,
-				offset: offset + at,
-				label
+			const at = offset + start + (value !== written && /^["']/.test(written) ? 1 : 0);
+			const holds = stringHolds(param);
+			if (holds === "expression" || holds === "statements") yield {
+				kind: "code",
+				code: value,
+				offset: at,
+				goal: holds,
+				label,
+				inString: true
 			};
-			if (!goal && (param.type === "text" || param.type === "string")) yield {
+			else if (holds === "passage") yield passage(value);
+			else if (holds === "markup") yield {
 				kind: "text",
 				text: value,
-				offset: offset + at,
+				offset: at,
 				where: `In the ${param.name} of {${macro}}: `
 			};
 		}
@@ -17332,56 +17577,277 @@ 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",
+	holds: "text",
+	required: true
+}, {
+	name: "parameters",
+	type: "text",
+	holds: "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 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: 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 = 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 === "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();
@@ -17547,11 +18013,21 @@ 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
+* (see ParameterDef.holds), the condition and `run` action of `{watch}`:
+* the argument scan sees only the strings. Only the macros that declare
+* code in a string have their arguments read.
+*/
+function scanStringCode(token, params, onRef) {
+	if (!params || !token.rawArgs || !holdsCode(params)) 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") {
@@ -17561,6 +18037,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);
@@ -17589,16 +18066,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;
 }
@@ -17612,218 +18089,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 = (name) => options.parametersOf?.(name) ?? SUB_MACRO_PARAMETERS[name.toLowerCase()];
-	/**
-	* 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/widgets/ast-scanner.ts
 /**
 * Recursively scan an AST node array for a VariableNode
@@ -18065,7 +18330,8 @@ defineMacro({
 		},
 		{
 			name: "label",
-			type: "string"
+			type: "string",
+			holds: "markup"
 		}
 	],
 	render(_props, ctx) {
@@ -18432,6 +18698,7 @@ defineMacro({
 	parameters: [{
 		name: "label",
 		type: "text",
+		holds: "markup",
 		required: true
 	}],
 	render({ rawArgs, children = [] }, ctx) {
@@ -18463,6 +18730,7 @@ defineMacro({
 	parameters: [{
 		name: "text",
 		type: "string",
+		holds: "markup",
 		required: true
 	}, {
 		name: "passage",
@@ -18479,6 +18747,7 @@ defineMacro({
 		}
 		const runBody = useDetachedBody();
 		const perform = () => {
+			if (failure) return;
 			runBody(children);
 			if (passage) useStoryStore.getState().navigate(passage);
 		};
@@ -18492,6 +18761,7 @@ defineMacro({
 			authorId: ctx.id,
 			label: display,
 			target: passage ?? void 0,
+			disabled: failure ? true : void 0,
 			perform
 		});
 		if (failure) return /* @__PURE__ */ jsx(MacroError, {
@@ -18790,6 +19060,7 @@ defineMacro({
 	parameters: [{
 		name: "label",
 		type: "text",
+		holds: "markup",
 		required: true
 	}, {
 		name: "noclose",
@@ -19336,7 +19607,8 @@ function defineInputMacro(name, type, toValue = (input) => input !== void 0 ? St
 		storeVar: true,
 		parameters: [VARIABLE_PARAMETER, {
 			name: "placeholder",
-			type: "string"
+			type: "string",
+			holds: "text"
 		}],
 		render(_props, ctx) {
 			const placeholder = ctx.args.placeholder ?? "";
@@ -19372,7 +19644,8 @@ defineMacro({
 	storeVar: true,
 	parameters: [VARIABLE_PARAMETER, {
 		name: "label",
-		type: "text"
+		type: "text",
+		holds: "text"
 	}],
 	render(_props, ctx) {
 		const label = ctx.args.label ?? "";
@@ -19403,11 +19676,13 @@ defineMacro({
 		{
 			name: "value",
 			type: "text",
+			holds: "text",
 			required: true
 		},
 		{
 			name: "label",
-			type: "text"
+			type: "text",
+			holds: "text"
 		}
 	],
 	render(_props, ctx) {
@@ -19827,6 +20102,7 @@ defineMacro({
 	parameters: [{
 		name: "condition",
 		type: "string",
+		holds: "expression",
 		required: true
 	}, {
 		name: "options",
@@ -19834,19 +20110,23 @@ defineMacro({
 		parameters: [
 			{
 				name: "goto",
-				type: "string"
+				type: "string",
+				holds: "passage"
 			},
 			{
 				name: "dialog",
-				type: "string"
+				type: "string",
+				holds: "passage"
 			},
 			{
 				name: "run",
-				type: "string"
+				type: "string",
+				holds: "statements"
 			},
 			{
 				name: "name",
-				type: "string"
+				type: "string",
+				holds: "text"
 			},
 			{
 				name: "priority",
@@ -19875,6 +20155,7 @@ defineMacro({
 	parameters: [{
 		name: "name",
 		type: "text",
+		holds: "text",
 		required: true
 	}],
 	render(_props, ctx) {
@@ -19923,11 +20204,10 @@ function stopWithErrors(errors) {
 */
 function markupErrors(storyData, only) {
 	const macros = getMacroRegistry();
-	const parameters = new Map(macros.map((m) => [m.name.toLowerCase(), m.parameters]));
 	return validateMarkup(storyData.passages.values(), {
 		isKnownMacro: (name) => !!getMacro(name) || isSubMacro(name) || !!getWidget(name),
 		macroNames: macros.map((m) => m.name),
-		parametersOf: (name) => parameters.get(name),
+		parametersOf: parameterLookup(macros),
 		only
 	}).map(formatDiagnostic);
 }