@rohal12/spindle 0.59.1 → 0.59.3

package/dist/pkg/headless.js

@@ -32,6 +32,26 @@ function create() {
 	return (initializer) => bindPreact(createStore()(initializer));
 }
 //#endregion
+//#region src/utils/uuid.ts
+/**
+* A random UUID (v4). `crypto.randomUUID` exists only in secure contexts, so
+* on a plain HTTP origin the ID is built from `crypto.getRandomValues`.
+*/
+function randomUUID() {
+	if (typeof crypto.randomUUID === "function") return crypto.randomUUID();
+	const bytes = crypto.getRandomValues(new Uint8Array(16));
+	bytes[6] = bytes[6] & 15 | 64;
+	bytes[8] = bytes[8] & 63 | 128;
+	const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, "0"));
+	return [
+		hex.slice(0, 4).join(""),
+		hex.slice(4, 6).join(""),
+		hex.slice(6, 8).join(""),
+		hex.slice(8, 10).join(""),
+		hex.slice(10).join("")
+	].join("-");
+}
+//#endregion
 //#region src/markup/tokens.ts
 /** Variable sigils: story ($), temporary (_), local (@), transient (%). */
 var SIGIL_SCOPES$1 = {
@@ -13061,7 +13081,14 @@ function createIDBBackend() {
 					for (const [index, path] of Object.entries(indexes)) store.createIndex(index, path, { unique: false });
 				}
 			};
-			req.onsuccess = () => resolve(req.result);
+			req.onsuccess = () => {
+				const db = req.result;
+				db.onversionchange = () => {
+					db.close();
+					dbPromise = null;
+				};
+				resolve(db);
+			};
 			req.onerror = () => reject(req.error);
 		});
 		return dbPromise;
@@ -13117,6 +13144,7 @@ function createIDBBackend() {
 			const req = indexedDB.deleteDatabase(IDB_DB_NAME);
 			req.onsuccess = () => resolve();
 			req.onerror = () => reject(req.error);
+			req.onblocked = () => reject(/* @__PURE__ */ new Error("Cannot clear the saved data: another tab or window of this site still has it open. Close the other tabs and try again."));
 		});
 	});
 }
@@ -13517,7 +13545,11 @@ function equalBytes(a, b) {
 function equalBuiltin(a, b, assumed) {
 	if (a instanceof Date) return Object.is(a.getTime(), b.getTime());
 	if (a instanceof RegExp) return String(a) === String(b);
-	if (ArrayBuffer.isView(a) || a instanceof ArrayBuffer) return equalBytes(a, b);
+	if (ArrayBuffer.isView(a)) {
+		const v = b;
+		return a.byteOffset === v.byteOffset && a.byteLength === v.byteLength && equal(a.buffer, v.buffer, assumed);
+	}
+	if (a instanceof ArrayBuffer) return equalBytes(a, b);
 	if (a instanceof URL || a instanceof URLSearchParams) return String(a) === String(b);
 	if (isBoxed(a)) return Object.is(a.valueOf(), b.valueOf());
 	if (isTemporal(a)) return String(a) === String(b);
@@ -13654,6 +13686,91 @@ function diffPaths(before, after) {
 	})(before, after, []);
 	return changes;
 }
+var pathKey = (path) => JSON.stringify(path);
+/** Whether `path`, or one of its ancestors, is one of `keys`. */
+function underChange(path, keys) {
+	for (let n = 1; n <= path.length; n++) if (keys.has(pathKey(path.slice(0, n)))) return true;
+	return false;
+}
+/**
+* Where each object (or array, or other value) of `root` first appears, in
+* depth-first order. Plain objects are entered; arrays and other values are
+* leaves. A path at or below one of `skip` is left out.
+*/
+function firstPaths(root, skip = /* @__PURE__ */ new Set()) {
+	const found = /* @__PURE__ */ new Map();
+	(function walk(node, path) {
+		for (const key of Object.keys(node)) {
+			const value = node[key];
+			if (!isObjectValue(value) || found.has(value)) continue;
+			const at = [...path, key];
+			if (skip.has(pathKey(at))) continue;
+			found.set(value, at);
+			if (isMergeable(value)) walk(value, at);
+		}
+	})(root, []);
+	return found;
+}
+/**
+* The paths whose object is another one in the references of `after` than in
+* `before`, as to where its first appearance is: `$a = $b` makes `a` another
+* name for the object of `b` even where both hold equal content, and a
+* `diffPaths` over the content finds nothing. Only paths both hold an object
+* at are reported, parents before children; each is a write of the object
+* `after` holds.
+*/
+function aliasChanges(before, after) {
+	const earlier = firstPaths(before);
+	const later = firstPaths(after);
+	const changes = [];
+	(function walk(b, a, path) {
+		for (const key of Object.keys(a)) {
+			if (!hasOwn(b, key)) continue;
+			const x = b[key];
+			const y = a[key];
+			if (!isObjectValue(x) || !isObjectValue(y)) continue;
+			const at = [...path, key];
+			const wasAt = earlier.get(x);
+			const isAt = later.get(y);
+			const k = pathKey(at);
+			if (pathKey(wasAt) !== pathKey(isAt)) changes.push({
+				path: at,
+				deleted: false,
+				value: y,
+				alias: true
+			});
+			if (isMergeable(x) && mergesWith(x, y, false) && pathKey(isAt) === k && pathKey(wasAt) === k) walk(x, y, at);
+		}
+	})(before, after, []);
+	return changes;
+}
+/**
+* Where the objects of `source` are, other than at or below the paths of
+* `changes` (which write something new there), for `existingObjects`.
+*/
+function locateObjects(source, changes) {
+	return firstPaths(source, new Set(changes.map((c) => pathKey(c.path))));
+}
+/**
+* A map for `deepClone`'s `seen`: an object of the source `paths` locate
+* (see locateObjects) is copied as the object at the same path in `target`,
+* so a value that refers to an object the store holds refers to it again
+* after the copy, not to a copy of it. Objects are looked up in `target`
+* when met, not up front.
+*/
+function existingObjects(paths, target) {
+	return new class extends Map {
+		has(obj) {
+			if (super.has(obj)) return true;
+			const path = paths.get(obj);
+			if (!path) return false;
+			const found = getByPath(target, path);
+			if (!(isObjectValue(found) && (Array.isArray(found) ? Array.isArray(obj) : Object.getPrototypeOf(found) === Object.getPrototypeOf(obj)))) return false;
+			super.set(obj, found);
+			return true;
+		}
+	}();
+}
 /** Whether `target` already holds what `change` would write. */
 function isApplied(target, change) {
 	const parent = getByPath(target, change.path.slice(0, -1));
@@ -13798,7 +13915,7 @@ var readingSlot = (read) => queued(async (ifid, slot) => read(await slotRecord(i
 * saves issued before this resolves are tagged with it).
 */
 var startNewPlaythrough = queued(startNewPlaythroughNow);
-async function startNewPlaythroughNow(ifid, id = crypto.randomUUID()) {
+async function startNewPlaythroughNow(ifid, id = randomUUID()) {
 	const backend = await getBackend();
 	const num = await nextPlaythroughNumber(ifid);
 	const record = {
@@ -13922,7 +14039,7 @@ var createSave = queued(createSaveNow);
 async function createSaveNow(ifid, playthroughId, payload, custom = {}) {
 	const now = (/* @__PURE__ */ new Date()).toISOString();
 	const record = storedRecord({
-		id: crypto.randomUUID(),
+		id: randomUUID(),
 		ifid,
 		playthroughId,
 		createdAt: now,
@@ -14248,7 +14365,7 @@ async function prepareImport(data, ifid) {
 	checkSaveExport(data);
 	if (data.ifid !== ifid) throw new Error(`Save is from a different story (expected IFID ${ifid}, got ${data.ifid})`);
 	const record = deepClone(data.save);
-	record.meta.id = crypto.randomUUID();
+	record.meta.id = randomUUID();
 	record.meta.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 	record.meta.ifid = ifid;
 	await ensurePlaythrough(ifid, record.meta.playthroughId, record.meta.createdAt);
@@ -14438,6 +14555,32 @@ function readState() {
 }
 var cloneValue = (value) => deepClone(value, { keepUnregistered: true });
 /**
+* A cloner of values written into `target`. The references among the values
+* it copies are kept (`$b = $a` writes one array twice: the two paths get
+* one copy), and, given where the objects of the source are (see
+* locateObjects), an object that is one the target holds already is that
+* one, not a copy: `$a.self = $a` refers to the root of `a` in the store.
+*/
+function clonerFor(target, paths) {
+	const seen = paths ? existingObjects(paths, target) : /* @__PURE__ */ new Map();
+	return (value) => deepClone(value, {
+		keepUnregistered: true,
+		seen
+	});
+}
+/** One cloner per target copy, made when first used. */
+var clonersFor = (paths) => {
+	const made = /* @__PURE__ */ new Map();
+	return (target) => {
+		let cloner = made.get(target);
+		if (!cloner) {
+			cloner = clonerFor(target, paths?.(target));
+			made.set(target, cloner);
+		}
+		return cloner;
+	};
+};
+/**
 * A frozen copy of a value read from a working copy, matching what reads
 * from the (frozen) store return: writing to it fails instead of changing
 * the code's pending state behind its back.
@@ -14454,12 +14597,12 @@ function frozenCopy(value) {
 * path (the code replaced or deleted an intermediate object), its root is
 * replaced with the store's root as written.
 */
-function mirror(draft, ns, change, scopes = activeScopes) {
+function mirror(draft, ns, change, scopes = activeScopes, cloner = clonerOf) {
 	const root = change.path[0];
 	for (const scope of scopes) for (const copy of [scope.work[ns], scope.base[ns]]) try {
 		applyChange(copy, change.deleted ? change : {
 			...change,
-			value: cloneValue(change.value)
+			value: cloner(copy)(change.value)
 		});
 	} catch {
 		const stored = draft[ns][root];
@@ -14467,6 +14610,8 @@ function mirror(draft, ns, change, scopes = activeScopes) {
 		else delete copy[root];
 	}
 }
+/** A cloner of a copy of its own (no references shared with others). */
+var clonerOf = (target) => clonerFor(target);
 var NAMESPACE_KEYS$1 = new Set(NAMESPACES);
 /**
 * Runs store updates on the running code's working copies. They stay the
@@ -14566,11 +14711,12 @@ function routeStoreUpdate(recipe) {
 		const own = patches.filter((p) => p.path[0] === ns);
 		return [ns, own.length ? writtenPaths(view[ns], next[ns], own) : []];
 	});
-	const owned = (change) => change.deleted ? change : {
+	const cloners = clonersFor();
+	const owned = (change, target) => change.deleted ? change : {
 		...change,
-		value: cloneValue(change.value)
+		value: cloners(target)(change.value)
 	};
-	for (const [ns, list] of changes) for (const change of list) applyChange(inner.work[ns], owned(change));
+	for (const [ns, list] of changes) for (const change of list) applyChange(inner.work[ns], owned(change, inner.work[ns]));
 	return (draft) => {
 		const target = draft;
 		for (const key of Object.keys(next)) {
@@ -14581,12 +14727,12 @@ function routeStoreUpdate(recipe) {
 		for (const [ns, list] of changes) for (const change of list) {
 			const root = change.path[0];
 			try {
-				applyChange(namespaces[ns], owned(change));
+				applyChange(namespaces[ns], owned(change, namespaces[ns]));
 			} catch {
 				if (hasOwn(inner.work[ns], root)) namespaces[ns][root] = cloneValue(inner.work[ns][root]);
 				else delete namespaces[ns][root];
 			}
-			mirror(namespaces, ns, change);
+			mirror(namespaces, ns, change, activeScopes, cloners);
 		}
 	};
 }
@@ -14614,7 +14760,7 @@ function commitScopes(commits) {
 	const all = commits.map(({ scope, keepRunning }) => ({
 		scope,
 		keepRunning,
-		changes: NAMESPACES.map((ns) => [ns, diffPaths(scope.base[ns], scope.work[ns])])
+		changes: NAMESPACES.map((ns) => [ns, changesOf(scope.base[ns], scope.work[ns])])
 	}));
 	const changed = all.filter(({ changes }) => changes.some(([, list]) => list.length > 0));
 	if (changed.length === 0) return;
@@ -14626,29 +14772,53 @@ function commitScopes(commits) {
 		committing = false;
 	}
 	function commitRecipe(draft) {
-		all.forEach(({ scope, keepRunning, changes }, i) => {
-			const own = (value) => keepRunning ? cloneValue(value) : value;
+		all.forEach(({ scope, changes }, i) => {
+			const paths = new Map(changes.map(([ns, list]) => [ns, locateObjects(scope.work[ns], list)]));
+			const own = new Map(changes.map(([ns]) => [ns, clonerFor(draft[ns], paths.get(ns))]));
+			const enclosing = all.slice(0, i).map((c) => c.scope);
+			const enclosingCloners = new Map(changes.map(([ns]) => [ns, clonersFor(() => paths.get(ns))]));
 			for (const [ns, list] of changes) {
 				const replaced = /* @__PURE__ */ new Set();
 				for (const change of list) {
 					const root = change.path[0];
-					if (replaced.has(root) || isApplied(draft[ns], change)) continue;
+					if (replaced.has(root)) continue;
 					try {
-						applyChange(draft[ns], change.deleted ? change : {
+						if (change.deleted) {
+							if (!isApplied(draft[ns], change)) applyChange(draft[ns], change);
+							continue;
+						}
+						const value = change.alias ? own.get(ns)(change.value) : void 0;
+						if (change.alias ? Object.is(getByPath(draft[ns], change.path), value) : isApplied(draft[ns], change)) continue;
+						applyChange(draft[ns], {
 							...change,
-							value: own(change.value)
+							value: change.alias ? value : own.get(ns)(change.value)
 						});
 					} catch {
-						draft[ns][root] = own(scope.work[ns][root]);
+						draft[ns][root] = own.get(ns)(scope.work[ns][root]);
 						replaced.add(root);
 					}
 				}
-				const enclosing = all.slice(0, i).map((c) => c.scope);
-				for (const change of list) mirror(draft, ns, change, enclosing);
+				for (const change of list) mirror(draft, ns, change, enclosing, enclosingCloners.get(ns));
 			}
 		});
 	}
 }
+/**
+* The changes of the code to a namespace: its property paths that differ
+* (see diffPaths), and those that hold equal content but another object
+* than they did (see aliasChanges), those first.
+*/
+function changesOf(base, work) {
+	const written = diffPaths(base, work);
+	const keys = new Set(written.map((c) => pathKey(c.path)));
+	const aliases = [];
+	for (const change of aliasChanges(base, work)) {
+		if (underChange(change.path, keys)) continue;
+		keys.add(pathKey(change.path));
+		aliases.push(change);
+	}
+	return [...aliases, ...written];
+}
 /** Every running mutation, to commit with its code going on. */
 var running = () => activeScopes.map((scope) => ({
 	scope,
@@ -14884,15 +15054,33 @@ function registerDialogHost(callbacks) {
 		if (dialogHostCallbacks === callbacks) dialogHostCallbacks = null;
 	};
 }
+/**
+* The dialogs on display, bottom first, whoever opened them: the trigger
+* host, `{dialog}` or a menubar button (each PassageDialog registers itself
+* while mounted), as the function that closes each.
+*/
+var openDialogs = [];
+/** Register a displayed dialog; returns the function that unregisters it. */
+function registerOpenDialog(close) {
+	openDialogs.push(close);
+	return () => {
+		const i = openDialogs.lastIndexOf(close);
+		if (i >= 0) openDialogs.splice(i, 1);
+	};
+}
+/** Close the topmost dialog. */
 function closeCurrentDialog() {
-	dialogHostCallbacks?.close();
+	const top = openDialogs[openDialogs.length - 1];
+	if (top) top();
+	else dialogHostCallbacks?.close();
 }
 function closeAllOpenDialogs() {
 	clearDialogQueue();
+	for (const close of [...openDialogs].reverse()) close();
 	dialogHostCallbacks?.closeAll();
 }
 function isDialogShowing() {
-	return dialogHostCallbacks?.isOpen() ?? false;
+	return openDialogs.length > 0 || (dialogHostCallbacks?.isOpen() ?? false);
 }
 //#endregion
 //#region src/runtime-errors.ts
@@ -15331,7 +15519,7 @@ function switchToPlaythrough(id, stored) {
 }
 /** Move the running game to a new playthrough at once (see restart). */
 function switchToNewPlaythrough(ifid) {
-	const id = crypto.randomUUID();
+	const id = randomUUID();
 	switchToPlaythrough(id, startNewPlaythrough(ifid, id).catch((err) => {
 		console.error("spindle: failed to start new playthrough", err);
 	}));
@@ -15844,7 +16032,7 @@ var useStoryStore = create()(storyStore((set, get) => ({
 		const ifid = storyData.ifid;
 		const current = knownPlaythroughId();
 		const established = playthroughSetup;
-		const replacementId = crypto.randomUUID();
+		const replacementId = randomUUID();
 		const deletion = deletePlaythroughData(ifid, playthroughId, {
 			current: current || established,
 			id: replacementId
@@ -16080,6 +16268,7 @@ function PassageDialog({ passageName, fallbackMarkup, panelClass, onClose, dismi
 	}, [markup, nobr]);
 	const panelRef = useRef(null);
 	useModalFocus(panelRef, ".dialog-body", dismissible, stableOnClose);
+	useLayoutEffect(() => registerOpenDialog(stableOnClose), [stableOnClose]);
 	useLayoutEffect(() => {
 		if (panelRef.current) emitFromRender("dialogrender", passageName ?? "", panelRef.current);
 	}, []);
@@ -16677,7 +16866,7 @@ function unset(param) {
 	return param.type === "options" ? {} : void 0;
 }
 var WORD_RE = /\w+/y;
-var DIGITS_RE = /\d+/y;
+var NUMBER_RE = /[-+]?(?:\d+\.?\d*|\.\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) {
@@ -16686,7 +16875,8 @@ function matchAt(re, src, pos) {
 }
 /**
 * Read keyword options (`goto "X" priority 5 once`). A keyword takes the
-* quoted string (with or without whitespace before it) or digit run after
+* quoted string (with or without whitespace before it) or number (signed,
+* fractional) 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.
@@ -16705,7 +16895,7 @@ function readOptions(params, src, { at, spans }) {
 		let j = i;
 		while (j < src.length && isWhitespace(src[j])) j++;
 		const quoted = readQuoted(src, j);
-		const digits = quoted || j === i ? null : matchAt(DIGITS_RE, src, j);
+		const digits = quoted || j === i ? null : matchAt(NUMBER_RE, src, j);
 		if (quoted) {
 			val = quoted.value;
 			i = quoted.end;
@@ -17444,15 +17634,22 @@ function* codeAndText(src, tokens, parametersOf) {
 	const closeOf = (t, name) => tokens.findIndex((c, k) => k > t && c.type === "macro" && c.isClose && c.name.toLowerCase() === name);
 	for (let t = 0; t < tokens.length; t++) {
 		const token = tokens[t];
-		if (token.type === "link") yield {
-			kind: "passage",
-			name: token.target,
-			offset: token.targetStart,
-			length: token.targetEnd - token.targetStart,
-			macro: "link",
-			label: src.slice(token.start, token.end)
-		};
-		else if (token.type === "expression") yield {
+		if (token.type === "link") {
+			yield {
+				kind: "passage",
+				name: token.target,
+				offset: token.targetStart,
+				length: token.targetEnd - token.targetStart,
+				macro: "link",
+				label: src.slice(token.start, token.end)
+			};
+			if (token.display.includes("{")) yield {
+				kind: "text",
+				text: token.display,
+				offset: locate(src, token.display, token.start),
+				where: "In the label of a link: "
+			};
+		} else if (token.type === "expression") yield {
 			kind: "code",
 			code: token.expression,
 			offset: token.end - 1 - token.expression.length,
@@ -18059,22 +18256,25 @@ function collectTokenRefs(content, tokens, storeVarMacros, onRef, parametersOf =
 		const token = tokens[t];
 		if (token.type === "variable") {
 			if (token.scope === "variable" && token.name) onRef(token.name);
-		} else if (token.type === "expression") scanCode(token.expression, onRef);
+		} else if (token.type === "link") scanInterpolations(token.display, onRef);
+		else if (token.type === "expression") scanCode(token.expression, onRef);
 		else if (token.type === "html") for (const [name, value] of Object.entries(token.attributes)) if (isCodeAttribute(name)) scanSigilReferences(value, onRef);
 		else scanInterpolations(value, onRef, storeVarMacros);
 		else if (token.type === "macro" && !token.isClose) {
 			scanArgs(token, parametersOf(token.name), onRef);
+			if (token.className) scanInterpolations(token.className, onRef);
+			if (token.id) scanInterpolations(token.id, onRef);
 			if (storeVarMacros.has(token.name.toLowerCase())) {
 				const first = token.rawArgs.trim().split(/\s+/)[0] ?? "";
 				const quoted = QUOTED_VAR_ARG_RE.exec(first);
 				if (quoted) onRef(quoted[1]);
 				else if (!/^["'`]/.test(first)) scanCode(first, onRef);
 			}
-			if (token.name === "do") {
+			if (token.name.toLowerCase() === "do") {
 				let close = t + 1;
 				while (close < tokens.length) {
 					const c = tokens[close];
-					if (c.type === "macro" && c.isClose && c.name === "do") break;
+					if (c.type === "macro" && c.isClose && c.name.toLowerCase() === "do") break;
 					close++;
 				}
 				if (close < tokens.length) {
@@ -18913,7 +19113,7 @@ defineMacro({
 		visibleCharsRef.current = visibleChars;
 		useEffect(() => {
 			if (containerRef.current) setTotalChars((containerRef.current.textContent || "").length);
-		}, []);
+		});
 		useEffect(() => {
 			if (totalChars === 0) return;
 			if (visibleCharsRef.current >= totalChars) return;

package/dist/pkg/story-variables.js

@@ -10040,7 +10040,7 @@ function unset(param) {
 	return param.type === "options" ? {} : void 0;
 }
 var WORD_RE = /\w+/y;
-var DIGITS_RE = /\d+/y;
+var NUMBER_RE = /[-+]?(?:\d+\.?\d*|\.\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) {
@@ -10049,7 +10049,8 @@ function matchAt(re, src, pos) {
 }
 /**
 * Read keyword options (`goto "X" priority 5 once`). A keyword takes the
-* quoted string (with or without whitespace before it) or digit run after
+* quoted string (with or without whitespace before it) or number (signed,
+* fractional) 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.
@@ -10068,7 +10069,7 @@ function readOptions(params, src, { at, spans }) {
 		let j = i;
 		while (j < src.length && isWhitespace(src[j])) j++;
 		const quoted = readQuoted(src, j);
-		const digits = quoted || j === i ? null : matchAt(DIGITS_RE, src, j);
+		const digits = quoted || j === i ? null : matchAt(NUMBER_RE, src, j);
 		if (quoted) {
 			val = quoted.value;
 			i = quoted.end;
@@ -10392,15 +10393,22 @@ function* codeAndText(src, tokens, parametersOf) {
 	const closeOf = (t, name) => tokens.findIndex((c, k) => k > t && c.type === "macro" && c.isClose && c.name.toLowerCase() === name);
 	for (let t = 0; t < tokens.length; t++) {
 		const token = tokens[t];
-		if (token.type === "link") yield {
-			kind: "passage",
-			name: token.target,
-			offset: token.targetStart,
-			length: token.targetEnd - token.targetStart,
-			macro: "link",
-			label: src.slice(token.start, token.end)
-		};
-		else if (token.type === "expression") yield {
+		if (token.type === "link") {
+			yield {
+				kind: "passage",
+				name: token.target,
+				offset: token.targetStart,
+				length: token.targetEnd - token.targetStart,
+				macro: "link",
+				label: src.slice(token.start, token.end)
+			};
+			if (token.display.includes("{")) yield {
+				kind: "text",
+				text: token.display,
+				offset: locate(src, token.display, token.start),
+				where: "In the label of a link: "
+			};
+		} else if (token.type === "expression") yield {
 			kind: "code",
 			code: token.expression,
 			offset: token.end - 1 - token.expression.length,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rohal12/spindle",
-  "version": "0.59.1",
+  "version": "0.59.3",
   "type": "module",
   "description": "A Preact-based story format for Twine 2.",
   "license": "Unlicense",

package/src/code-check.ts

@@ -249,6 +249,15 @@ export function* codeAndText(
         macro: 'link',
         label: src.slice(token.start, token.end),
       };
+      // The label is markup too (the link renders as `{link}`)
+      if (token.display.includes('{')) {
+        yield {
+          kind: 'text',
+          text: token.display,
+          offset: locate(src, token.display, token.start),
+          where: 'In the label of a link: ',
+        };
+      }
     } else if (token.type === 'expression') {
       yield {
         kind: 'code',

package/src/components/PassageDialog.tsx

@@ -5,6 +5,7 @@ import { renderNodes, NobrContext } from '../markup/render';
 import { useStoryFields } from '../hooks/use-story-fields';
 import { emitFromRender } from '../event-emitter';
 import { useModalFocus } from '../hooks/use-modal-focus';
+import { registerOpenDialog } from '../triggers';
 import { errorMessage } from '../utils/error-message';
 
 export const DialogCloseContext = createContext<(() => void) | null>(null);
@@ -70,6 +71,9 @@ export function PassageDialog({
   // Declared before the dialogrender effect so handlers can move focus.
   useModalFocus(panelRef, '.dialog-body', dismissible, stableOnClose);
 
+  // Be on the stack of displayed dialogs the Story dialog API works on.
+  useLayoutEffect(() => registerOpenDialog(stableOnClose), [stableOnClose]);
+
   // Signal that the dialog's DOM is committed (once per open).
   useLayoutEffect(() => {
     if (panelRef.current) {

package/src/components/macros/Type.tsx

@@ -15,12 +15,14 @@ defineMacro({
     const visibleCharsRef = useRef(0);
     visibleCharsRef.current = visibleChars;
 
+    // Measure after every render: reactive content can become nonempty (or
+    // change length) after mounting. Setting an equal count is a no-op.
     useEffect(() => {
       if (containerRef.current) {
         const text = containerRef.current.textContent || '';
         setTotalChars(text.length);
       }
-    }, []);
+    });
 
     // Typewriter interval
     useEffect(() => {

package/src/components/macros/macro-args.ts

@@ -108,7 +108,7 @@ function unset(param: ParameterDef): unknown {
 }
 
 const WORD_RE = /\w+/y;
-const DIGITS_RE = /\d+/y;
+const NUMBER_RE = /[-+]?(?:\d+\.?\d*|\.\d+)/y;
 const WORD_OR_PUNCT_RE = /\S+/y;
 
 /** Match the sticky regex `re` at `pos`, returning the matched text. */
@@ -119,7 +119,8 @@ function matchAt(re: RegExp, src: string, pos: number): string | null {
 
 /**
  * Read keyword options (`goto "X" priority 5 once`). A keyword takes the
- * quoted string (with or without whitespace before it) or digit run after
+ * quoted string (with or without whitespace before it) or number (signed,
+ * fractional) 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.
@@ -141,13 +142,13 @@ function readOptions(
     i += key.length;
 
     // A value is a quoted string, which may follow the keyword directly
-    // (`goto"Hall"`: a quote can't be part of one), or a digit run after
+    // (`goto"Hall"`: a quote can't be part of one), or a number after
     // whitespace.
     let val: string | undefined;
     let j = i;
     while (j < src.length && isWhitespace(src[j]!)) j++;
     const quoted = readQuoted(src, j);
-    const digits = quoted || j === i ? null : matchAt(DIGITS_RE, src, j);
+    const digits = quoted || j === i ? null : matchAt(NUMBER_RE, src, j);
     if (quoted) {
       val = quoted.value;
       i = quoted.end;