@rohal12/spindle 0.51.0 → 0.51.2

package/dist/pkg/headless.js

@@ -1,12 +1,36 @@
 import { Fragment, createContext, h, render } from "preact";
 import { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "preact/hooks";
-import { create } from "zustand";
+import { useSyncExternalStore } from "preact/compat";
+import { createStore } from "zustand/vanilla";
 import { immer } from "zustand/middleware/immer";
 import { applyPatches, enablePatches, produceWithPatches } from "immer";
 import { Fragment as Fragment$1, jsx, jsxs } from "preact/jsx-runtime";
 import { micromark } from "micromark";
 import { gfmTable, gfmTableHtml } from "micromark-extension-gfm-table";
 import { gfmStrikethrough, gfmStrikethroughHtml } from "micromark-extension-gfm-strikethrough";
+//#region src/preact-store.ts
+/**
+* Zustand's `create()` for Preact.
+*
+* Zustand's default entry (`zustand` / `zustand/react`) imports `react`, which
+* Spindle doesn't depend on. Bundlers that alias `react` to `preact/compat`
+* hide that, but the published headless entry keeps Zustand external and runs
+* under plain Node resolution, where `react` doesn't exist. Building on the
+* vanilla store and Preact's own hooks keeps `react` out of the module graph.
+*/
+var identity = (value) => value;
+function bindPreact(api) {
+	function useBoundStore(selector = identity) {
+		const getSnapshot = useCallback(() => selector(api.getState()), [selector]);
+		return useSyncExternalStore(api.subscribe, getSnapshot);
+	}
+	return Object.assign(useBoundStore, api);
+}
+/** Curried `create<State>()(initializer)`, as in Zustand. */
+function create() {
+	return (initializer) => bindPreact(createStore()(initializer));
+}
+//#endregion
 //#region src/saves/types.ts
 function isSaveExport(value) {
 	if (typeof value !== "object" || value === null) return false;
@@ -23,12 +47,37 @@ function isSaveExport(value) {
 	if (typeof meta.createdAt !== "string") return false;
 	if (typeof meta.updatedAt !== "string") return false;
 	if (typeof meta.title !== "string") return false;
-	const payload = save.payload;
-	if (typeof payload.passage !== "string") return false;
-	if (!Array.isArray(payload.history) || payload.history.length === 0) return false;
-	if (typeof payload.historyIndex !== "number") return false;
-	if (typeof payload.variables !== "object" || payload.variables === null) return false;
-	return true;
+	return isImportablePayload(save.payload);
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/** Absent, null, or a `{ seed, pull }` PRNG snapshot. */
+function isOptionalPRNGSnapshot(value) {
+	if (value == null) return true;
+	return isRecord(value) && typeof value.seed === "string" && typeof value.pull === "number" && Number.isInteger(value.pull) && value.pull >= 0;
+}
+function isSaveHistoryMoment(value) {
+	return isRecord(value) && typeof value.passage === "string" && isRecord(value.variables) && typeof value.timestamp === "number" && isOptionalPRNGSnapshot(value.prng);
+}
+/**
+* Full check of a payload from outside the running story (an imported save):
+* every history moment is well formed, and `historyIndex` is an integer that
+* points at a moment of the payload's passage. Anything that passes can be
+* stored and later loaded.
+*/
+function isImportablePayload(value) {
+	if (!isRecord(value)) return false;
+	if (typeof value.passage !== "string") return false;
+	if (!isRecord(value.variables)) return false;
+	const { history, historyIndex } = value;
+	if (!Array.isArray(history) || history.length === 0) return false;
+	if (!history.every(isSaveHistoryMoment)) return false;
+	if (typeof historyIndex !== "number" || !Number.isInteger(historyIndex) || historyIndex < 0 || historyIndex >= history.length) return false;
+	if (history[historyIndex].passage !== value.passage) return false;
+	if (value.visitCounts !== void 0 && !isRecord(value.visitCounts)) return false;
+	if (value.renderCounts !== void 0 && !isRecord(value.renderCounts)) return false;
+	return isOptionalPRNGSnapshot(value.prng);
 }
 function isSavePayload(value) {
 	if (typeof value !== "object" || value === null) return false;
@@ -831,6 +880,13 @@ var BRANCHING_BLOCK_MACROS = new Set([
 	"timed"
 ]);
 /**
+* Quote a bracket-link value as a {link} argument, escaping backslashes and
+* double quotes so MacroLink reads the value back unchanged (#200).
+*/
+function quoteArg(value) {
+	return `"${value.replace(/[\\"]/g, "\\$&")}"`;
+}
+/**
 * Build an AST from a token array. Block macros are nested into trees
 * using a stack. Throws on unclosed or mismatched macros.
 */
@@ -854,7 +910,7 @@ function buildAST(tokens) {
 			const macroNode = {
 				type: "macro",
 				name: "link",
-				rawArgs: `"${token.display}" "${token.target}"`,
+				rawArgs: `${quoteArg(token.display)} ${quoteArg(token.target)}`,
 				children: []
 			};
 			if (token.className) macroNode.className = token.className;
@@ -1115,33 +1171,105 @@ var FN_CACHE_MAX = 500;
 var fnCache = /* @__PURE__ */ new Map();
 /**
 * Transform expression: $var → variables["var"], _var → temporary["var"],
-* @var → locals["var"], %var → transient["var"]
+* @var → locals["var"]
 * Only transforms when sigils appear as a word boundary (not inside strings naively,
 * but authors already have full JS access so this is acceptable).
+* `%var` → transient["var"] is handled by `transform` itself, because `%` is
+* also the modulo operator and only an operand position makes it a sigil.
 */
 var VAR_RE = /\$(\w+)/g;
 var TEMP_RE = /(?<![.\w])_(\w+)/g;
 var LOCAL_RE = /@(\w+)/g;
-var TRANS_RE = /(?<!\w)%(\w+)/g;
+/** Transient name after `%`: an identifier, so `%3` is never a reference. */
+var TRANS_NAME_RE = /[A-Za-z_]\w*/y;
+/** Characters of identifiers, numbers and sigil variable references. */
+var WORD_CHAR_RE = /[\w$@]/;
+var SPACE_RE = /\s/;
+/** Keywords followed by an operand rather than an operator. */
+var OPERAND_KEYWORDS = new Set([
+	"await",
+	"case",
+	"delete",
+	"do",
+	"else",
+	"in",
+	"instanceof",
+	"new",
+	"of",
+	"return",
+	"throw",
+	"typeof",
+	"void",
+	"yield"
+]);
+/** Keywords whose parenthesised header is followed by a statement. */
+var HEADER_KEYWORDS = new Set([
+	"for",
+	"if",
+	"while",
+	"with"
+]);
 function transformSegment(segment) {
-	return segment.replace(VAR_RE, "variables[\"$1\"]").replace(TEMP_RE, "temporary[\"$1\"]").replace(LOCAL_RE, "locals[\"$1\"]").replace(TRANS_RE, "transient[\"$1\"]");
+	return segment.replace(VAR_RE, "variables[\"$1\"]").replace(TEMP_RE, "temporary[\"$1\"]").replace(LOCAL_RE, "locals[\"$1\"]");
 }
 /**
 * String-aware expression transformer. Walks the expression character by
 * character so that variable sigils ($, _, @, %) inside string literals are
 * left untouched while code — including expressions inside template-literal
 * `${…}` interpolations — is transformed.
+*
+* It also tracks whether the next token is an operand or an operator, so that
+* `%name` in operand position is a transient reference while `%` after an
+* operand — `($n)%3`, `$a[i] %2`, `$a%$b` — stays the modulo operator.
 */
 function transform(expr) {
 	let result = "";
 	let code = "";
 	let i = 0;
+	let operandNext = true;
+	let word = "";
+	let afterDot = false;
+	let afterHeaderKeyword = false;
+	let lastPunct = "";
+	const parenIsHeader = [];
 	function flushCode() {
 		if (code) {
 			result += transformSegment(code);
 			code = "";
 		}
 	}
+	function endWord() {
+		if (!word) return;
+		operandNext = !afterDot && OPERAND_KEYWORDS.has(word);
+		afterHeaderKeyword = !afterDot && HEADER_KEYWORDS.has(word);
+		afterDot = false;
+		lastPunct = "";
+		word = "";
+	}
+	/** A string or template literal, or a transient reference, just ended. */
+	function endOperand() {
+		endWord();
+		operandNext = false;
+		afterHeaderKeyword = false;
+		afterDot = false;
+		lastPunct = "";
+	}
+	function trackCode(c) {
+		if (WORD_CHAR_RE.test(c)) {
+			word += c;
+			return;
+		}
+		endWord();
+		if (c === "\n") operandNext = true;
+		if (SPACE_RE.test(c)) return;
+		if (c === "(") parenIsHeader.push(afterHeaderKeyword);
+		if (c === ")") operandNext = parenIsHeader.pop() ?? false;
+		else if (c === ".") operandNext = lastPunct === ".";
+		else operandNext = c !== "]";
+		afterDot = c === ".";
+		afterHeaderKeyword = false;
+		lastPunct = c;
+	}
 	while (i < expr.length) {
 		const ch = expr.charAt(i);
 		if (ch === "\"" || ch === "'") {
@@ -1164,6 +1292,7 @@ function transform(expr) {
 				}
 			}
 			result += str;
+			endOperand();
 			continue;
 		}
 		if (ch === "`") {
@@ -1257,8 +1386,22 @@ function transform(expr) {
 					i++;
 				}
 			}
+			endOperand();
 			continue;
 		}
+		if (ch === "%") {
+			endWord();
+			TRANS_NAME_RE.lastIndex = i + 1;
+			const name = operandNext ? TRANS_NAME_RE.exec(expr)?.[0] : void 0;
+			if (name) {
+				flushCode();
+				result += `transient["${name}"]`;
+				i += 1 + name.length;
+				endOperand();
+				continue;
+			}
+		}
+		trackCode(ch);
 		code += ch;
 		i++;
 	}
@@ -1349,7 +1492,7 @@ function hasInterpolation(s) {
 function resolveDotPath(root, parts) {
 	let value = root;
 	for (let i = 1; i < parts.length; i++) {
-		if (value == null || typeof value !== "object") return void 0;
+		if (value == null) return void 0;
 		value = value[parts[i]];
 	}
 	return value;
@@ -1434,7 +1577,7 @@ function VarDisplay({ name, scope, className, id }) {
 	if (scope === "local") value = root in localsValues ? localsValues[root] : void 0;
 	else value = storeValue;
 	for (let i = 1; i < parts.length; i++) {
-		if (value == null || typeof value !== "object") {
+		if (value == null) {
 			value = void 0;
 			break;
 		}
@@ -1630,14 +1773,14 @@ function WidgetInvocation({ body, params, rawArgs, invocationChildren }) {
 	const nobr = useContext(NobrContext);
 	const [mergedVars, mergedTemps, mergedLocals, mergedTrans] = useMergedLocals();
 	const childrenValue = invocationChildren?.length ? invocationChildren : null;
-	if (params.length === 0 || !rawArgs) return /* @__PURE__ */ jsx(WidgetChildrenContext.Provider, {
+	if (params.length === 0) return /* @__PURE__ */ jsx(WidgetChildrenContext.Provider, {
 		value: childrenValue,
 		children: renderNodes(body, {
 			nobr,
 			locals: parentValues
 		})
 	});
-	const argExprs = splitArgs(rawArgs);
+	const argExprs = rawArgs ? splitArgs(rawArgs) : [];
 	const values = [];
 	for (let i = 0; i < params.length; i++) {
 		const expr = argExprs[i];
@@ -1948,7 +2091,7 @@ function getVariableTextValue(node, locals) {
 	else if (node.scope === "transient") value = state.transient[root];
 	else value = locals[root];
 	for (let i = 1; i < parts.length; i++) {
-		if (value == null || typeof value !== "object") return "";
+		if (value == null) return "";
 		value = value[parts[i]];
 	}
 	return value == null ? "" : String(value);
@@ -2354,13 +2497,25 @@ async function detectBackend() {
 	} catch {}
 	return createMemoryBackend();
 }
-async function getBackend() {
-	if (_backend) return _backend;
-	_backend = await detectBackend();
-	return _backend;
+/**
+* Detection in flight. Concurrent first callers share it so they all get the
+* same backend (the memory fallback makes a new, empty store per detection).
+*/
+var _backendPromise = null;
+function getBackend() {
+	if (_backend) return Promise.resolve(_backend);
+	if (!_backendPromise) {
+		const pending = detectBackend().then((backend) => {
+			if (_backendPromise === pending) _backend = backend;
+			return backend;
+		});
+		_backendPromise = pending;
+	}
+	return _backendPromise;
 }
 function resetBackend() {
 	_backend = null;
+	_backendPromise = null;
 }
 /**
 * Synchronous accessor for the current backend type.
@@ -2382,7 +2537,7 @@ function isPlainObject(value) {
 	const proto = Object.getPrototypeOf(value);
 	return proto === Object.prototype || proto === null;
 }
-function deepClone(value) {
+function deepClone(value, options = {}) {
 	const seen = /* @__PURE__ */ new Map();
 	function clone(val) {
 		if (val === null || typeof val !== "object") return val;
@@ -2415,6 +2570,7 @@ function deepClone(value) {
 			for (const key of Object.keys(obj)) copy[key] = clone(obj[key]);
 			return copy;
 		}
+		if (!isPlainObject(val) && options.keepUnregistered) return val;
 		if (isPlainObject(val) || typeof val === "object") {
 			const copy = {};
 			seen.set(obj, copy);
@@ -2425,6 +2581,34 @@ function deepClone(value) {
 	}
 	return clone(value);
 }
+/**
+* Structural equality over the value types deepClone() supports: primitives,
+* arrays, plain objects, class instances, Date, RegExp, Map and Set (nested
+* at any depth). Map and Set entries are compared in insertion order.
+*/
+function deepEqual(a, b, seen = /* @__PURE__ */ new Map()) {
+	if (Object.is(a, b)) return true;
+	if (a === null || b === null || typeof a !== "object" || typeof b !== "object") return false;
+	if (Object.getPrototypeOf(a) !== Object.getPrototypeOf(b)) return false;
+	if (seen.get(a) === b) return true;
+	seen.set(a, b);
+	if (a instanceof Date) return Object.is(a.getTime(), b.getTime());
+	if (a instanceof RegExp) return String(a) === String(b);
+	if (a instanceof Map || a instanceof Set) {
+		const bc = b;
+		if (a.size !== bc.size) return false;
+		const ai = a.entries();
+		const bi = bc.entries();
+		for (let x = ai.next(), y = bi.next(); !x.done; x = ai.next(), y = bi.next()) if (!deepEqual(x.value, y.value, seen)) return false;
+		return true;
+	}
+	const ao = a;
+	const bo = b;
+	const keys = Object.keys(ao);
+	if (keys.length !== Object.keys(bo).length) return false;
+	for (const key of keys) if (!(key in bo) || !deepEqual(ao[key], bo[key], seen)) return false;
+	return true;
+}
 var CLASS_TAG = "__spindle_class__";
 var DATA_TAG = "__spindle_data__";
 function serialize(value) {
@@ -2628,13 +2812,21 @@ async function getCurrentPlaythroughId(ifid) {
 * before `getPayload()` captures the state, so data a hook sets is part of the
 * save; `aftersave` fires once `write` has stored it. Every user-facing save
 * path goes through here.
+*
+* The hook and capture run synchronously, but an error they throw (a failing
+* hook, an unserializable payload) rejects the returned promise like a failed
+* write rather than escaping to the caller.
 */
 function saveWithHooks(slot, custom, getPayload, write) {
-	emit("beforesave", slot, custom);
-	return write(getPayload()).then((result) => {
-		emit("aftersave", slot);
-		return result;
-	});
+	try {
+		emit("beforesave", slot, custom);
+		return write(getPayload()).then((result) => {
+			emit("aftersave", slot);
+			return result;
+		});
+	} catch (err) {
+		return Promise.reject(err);
+	}
 }
 async function createSave(ifid, playthroughId, payload, custom = {}) {
 	const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -2708,8 +2900,25 @@ async function loadSave(saveId) {
 	if (!record) return void 0;
 	return deserializePayload(record.payload);
 }
+/**
+* Delete a save record. If the default slot or a named slot holds it, that
+* slot is cleared as well (pointer and slot index), as `deleteSlotSave` would.
+*/
 async function deleteSaveById(saveId) {
-	await (await getBackend()).deleteSave(saveId);
+	const backend = await getBackend();
+	const record = await backend.getSave(saveId);
+	await backend.deleteSave(saveId);
+	if (!record) return;
+	const ifid = record.meta.ifid;
+	const slots = [void 0, ...await getIndexedSlots(ifid)];
+	for (const slot of slots) {
+		const metaKey = slotMetaKey(ifid, slot);
+		await withSlot(metaKey, async () => {
+			if (await backend.getMeta(metaKey) !== saveId) return;
+			await backend.deleteMeta(metaKey);
+			await removeFromSlotIndex(ifid, slot);
+		});
+	}
 }
 async function renameSave(saveId, newTitle) {
 	const backend = await getBackend();
@@ -2771,6 +2980,23 @@ function isNamedSlot(slot) {
 function slotMetaKey(ifid, slot) {
 	return isNamedSlot(slot) ? `${SLOT_KEY_PREFIX}${slot}.${ifid}` : `${AUTOSAVE_KEY_PREFIX}${ifid}`;
 }
+/** Tail of each slot's operation queue, keyed by the slot's meta key. */
+var slotQueues = /* @__PURE__ */ new Map();
+/**
+* Run a complete operation on one slot (save, import, delete) after the ones
+* already queued for it. Each operation reads the slot pointer and writes the
+* record and pointer as a unit, so concurrent operations on the same slot
+* apply in call order instead of each creating its own record.
+*/
+function withSlot(metaKey, op) {
+	const run = (slotQueues.get(metaKey) ?? Promise.resolve()).then(op);
+	const tail = run.catch(() => {});
+	slotQueues.set(metaKey, tail);
+	tail.then(() => {
+		if (slotQueues.get(metaKey) === tail) slotQueues.delete(metaKey);
+	});
+	return run;
+}
 /** Tail of the queue that serializes slot index updates. */
 var slotIndexQueue = Promise.resolve();
 /**
@@ -2813,22 +3039,24 @@ function toSaveInfo(record, slot) {
 		custom: record.meta.custom ?? {}
 	};
 }
-async function quickSave(ifid, playthroughId, payload, slot, custom) {
-	const backend = await getBackend();
+function quickSave(ifid, playthroughId, payload, slot, custom) {
 	const metaKey = slotMetaKey(ifid, slot);
-	const existingId = await backend.getMeta(metaKey);
-	if (existingId) {
-		const updated = await overwriteSave(existingId, payload, custom);
-		if (updated) return updated;
-	}
-	const record = await createSave(ifid, playthroughId, payload, {
-		isAutosave: !isNamedSlot(slot),
-		...isNamedSlot(slot) ? { slot } : {},
-		...custom
+	return withSlot(metaKey, async () => {
+		const backend = await getBackend();
+		const existingId = await backend.getMeta(metaKey);
+		if (existingId) {
+			const updated = await overwriteSave(existingId, payload, custom);
+			if (updated) return updated;
+		}
+		const record = await createSave(ifid, playthroughId, payload, {
+			isAutosave: !isNamedSlot(slot),
+			...isNamedSlot(slot) ? { slot } : {},
+			...custom
+		});
+		await backend.setMeta(metaKey, record.meta.id);
+		await addToSlotIndex(ifid, slot);
+		return record;
 	});
-	await backend.setMeta(metaKey, record.meta.id);
-	await addToSlotIndex(ifid, slot);
-	return record;
 }
 async function hasQuickSave(ifid, slot) {
 	const backend = await getBackend();
@@ -2848,7 +3076,7 @@ async function loadQuickSave(ifid, slot) {
 * The default (autosave) slot uses empty string as key.
 */
 async function populateKnownSaves(ifid) {
-	const result = {};
+	const result = Object.create(null);
 	if (await hasQuickSave(ifid)) result[""] = true;
 	for (const slot of await getIndexedSlots(ifid)) if (await hasQuickSave(ifid, slot)) result[slot] = true;
 	return result;
@@ -2882,14 +3110,16 @@ async function listSlotSaves(ifid) {
 /**
 * Delete a save by slot name. Removes from slot index if named.
 */
-async function deleteSlotSave(ifid, slot) {
-	const backend = await getBackend();
+function deleteSlotSave(ifid, slot) {
 	const metaKey = slotMetaKey(ifid, slot);
-	const existingId = await backend.getMeta(metaKey);
-	if (!existingId) return;
-	await backend.deleteSave(existingId);
-	await backend.deleteMeta(metaKey);
-	await removeFromSlotIndex(ifid, slot);
+	return withSlot(metaKey, async () => {
+		const backend = await getBackend();
+		const existingId = await backend.getMeta(metaKey);
+		if (!existingId) return;
+		await backend.deleteSave(existingId);
+		await backend.deleteMeta(metaKey);
+		await removeFromSlotIndex(ifid, slot);
+	});
 }
 var SESSION_KEY_PREFIX = "spindle.session.";
 /**
@@ -2935,6 +3165,7 @@ async function exportSave(saveId) {
 async function prepareImport(data, ifid) {
 	if (data.version !== 1) throw new Error(`Unsupported save version: ${data.version}`);
 	if (data.ifid !== ifid) throw new Error(`Save is from a different story (expected IFID ${ifid}, got ${data.ifid})`);
+	if (!isSaveExport(data)) throw new Error("Invalid save file format");
 	const backend = await getBackend();
 	const record = deepClone(data.save);
 	record.meta.id = crypto.randomUUID();
@@ -2970,22 +3201,24 @@ async function exportSlotSave(ifid, slot) {
 * validation as `importSave` (version, IFID) and keeps the playthrough record
 * and slot index consistent.
 */
-async function importSlotSave(data, ifid, slot) {
-	const record = await prepareImport(data, ifid);
-	const { slot: _exportedSlot, ...custom } = record.meta.custom ?? {};
-	record.meta.custom = {
-		...custom,
-		isAutosave: !isNamedSlot(slot),
-		...isNamedSlot(slot) ? { slot } : {}
-	};
-	const backend = await getBackend();
+function importSlotSave(data, ifid, slot) {
 	const metaKey = slotMetaKey(ifid, slot);
-	const previousId = await backend.getMeta(metaKey);
-	await backend.putSave(record);
-	await backend.setMeta(metaKey, record.meta.id);
-	await addToSlotIndex(ifid, slot);
-	if (previousId) await backend.deleteSave(previousId);
-	return toSaveInfo(record, slot);
+	return withSlot(metaKey, async () => {
+		const record = await prepareImport(data, ifid);
+		const { slot: _exportedSlot, ...custom } = record.meta.custom ?? {};
+		record.meta.custom = {
+			...custom,
+			isAutosave: !isNamedSlot(slot),
+			...isNamedSlot(slot) ? { slot } : {}
+		};
+		const backend = await getBackend();
+		const previousId = await backend.getMeta(metaKey);
+		await backend.putSave(record);
+		await backend.setMeta(metaKey, record.meta.id);
+		await addToSlotIndex(ifid, slot);
+		if (previousId) await backend.deleteSave(previousId);
+		return toSaveInfo(record, slot);
+	});
 }
 async function getStorageInfo(ifid) {
 	const backend = await getBackend();
@@ -3075,37 +3308,21 @@ function executeStoryInit() {
 	const saveTitlePassage = state.storyData.passages.get("SaveTitle");
 	if (saveTitlePassage) setSaveTitlePassage(saveTitlePassage.content);
 }
-//#endregion
-//#region src/execute-mutation.ts
 /**
-* Structural equality for a deepClone() copy against its source. Lets
-* executeMutation write back only the variables the code actually changed,
-* so untouched clones don't overwrite updates made during execution
-* (e.g. Story.set called from inside {do}).
+* Initialize a freshly booted story: run StoryInit, restore `session` (the
+* state a page refresh left behind) if there is one, then fire `storyinit`
+* once all state is settled. Without a session, what the `storyinit`
+* handlers set synchronously belongs to the start moment, like StoryInit's
+* changes; a restored session keeps the history it recorded.
 */
-function deepEqual(a, b, seen = /* @__PURE__ */ new Map()) {
-	if (Object.is(a, b)) return true;
-	if (a === null || b === null || typeof a !== "object" || typeof b !== "object") return false;
-	if (Object.getPrototypeOf(a) !== Object.getPrototypeOf(b)) return false;
-	if (seen.get(a) === b) return true;
-	seen.set(a, b);
-	if (a instanceof Date) return a.getTime() === b.getTime();
-	if (a instanceof RegExp) return String(a) === String(b);
-	if (a instanceof Map || a instanceof Set) {
-		const bc = b;
-		if (a.size !== bc.size) return false;
-		const ai = a.entries();
-		const bi = bc.entries();
-		for (let x = ai.next(), y = bi.next(); !x.done; x = ai.next(), y = bi.next()) if (!deepEqual(x.value, y.value, seen)) return false;
-		return true;
-	}
-	const ao = a;
-	const bo = b;
-	const keys = Object.keys(ao);
-	if (keys.length !== Object.keys(bo).length) return false;
-	for (const key of keys) if (!(key in bo) || !deepEqual(ao[key], bo[key], seen)) return false;
-	return true;
+function initializeStory(session) {
+	executeStoryInit();
+	if (session) useStoryStore.getState().loadFromPayload(session);
+	emit("storyinit");
+	if (!session) recordStoryInitState();
 }
+//#endregion
+//#region src/execute-mutation.ts
 /**
 * Write the keys `code` changed (`clone` vs the pre-execution `before`) into
 * an Immer draft of the same namespace, and delete the keys it removed.
@@ -3120,14 +3337,14 @@ function executeMutation(code, mergedLocals, scopeUpdate) {
 	const vars = deepClone(state.variables);
 	const temps = deepClone(state.temporary);
 	const trans = deepClone(state.transient);
-	const localsClone = { ...mergedLocals };
+	const localsClone = deepClone(mergedLocals, { keepUnregistered: true });
 	execute(code, vars, temps, localsClone, trans);
 	state.updateVariables((draft) => {
 		commitNamespace(draft.variables, vars, state.variables);
 		commitNamespace(draft.temporary, temps, state.temporary);
 		commitNamespace(draft.transient, trans, state.transient);
 	});
-	for (const key of Object.keys(localsClone)) if (localsClone[key] !== mergedLocals[key]) scopeUpdate(key, localsClone[key]);
+	for (const key of Object.keys(localsClone)) if (!deepEqual(localsClone[key], mergedLocals[key])) scopeUpdate(key, localsClone[key]);
 	for (const key of Object.keys(mergedLocals)) if (!(key in localsClone)) scopeUpdate(key, void 0);
 }
 //#endregion
@@ -3432,8 +3649,10 @@ function resetModuleState(base) {
 /**
 * Record the state StoryInit left behind as the start moment: its variable
 * snapshot (the history base) and PRNG state. Called by executeStoryInit()
-* after the StoryInit passage has rendered; init()/restart() record the
-* start moment before StoryInit runs. A no-op once the story has moved on.
+* after the StoryInit passage has rendered, and again after the `storyinit`
+* handlers have run at boot (unless a session was restored) and on restart;
+* init()/restart() record the start moment before StoryInit runs. A no-op
+* once the story has moved on.
 */
 function recordStoryInitState() {
 	const { history, historyIndex, variables } = useStoryStore.getState();
@@ -3756,6 +3975,7 @@ var useStoryStore = create()(immer((set, get) => ({
 		executeStoryInit();
 		clearSession(storyData.ifid);
 		emit("storyinit");
+		recordStoryInitState();
 		startNewPlaythrough(storyData.ifid).then((newId) => {
 			set((state) => {
 				state.playthroughId = newId;
@@ -3804,7 +4024,7 @@ var useStoryStore = create()(immer((set, get) => ({
 	hasSave: (slot) => {
 		const { storyData, knownSaves } = get();
 		if (!storyData) return false;
-		return (slot ?? "") in knownSaves;
+		return Object.prototype.hasOwnProperty.call(knownSaves, slot ?? "");
 	},
 	getSaveInfo: async (slot) => {
 		const { storyData } = get();
@@ -4605,16 +4825,17 @@ function defineMacro(config, source = "builtin") {
 //#endregion
 //#region src/passage-render-state.ts
 /**
-* Name of the passage most recently mounted by <Passage> (null until the
-* first render, e.g. when the story interface has no {passage}).
-* Lets Story.waitForActions() tell whether the current passage is on screen.
+* Navigation id (the store's `navigationId`) of the passage most recently
+* mounted by <Passage> (null until the first render, e.g. when the story
+* interface has no {passage}). Lets Story.waitForActions() tell whether the
+* current navigation is on screen, also when it revisits the passage shown.
 */
-var renderedPassage = null;
-function markPassageRendered(name) {
-	renderedPassage = name;
+var renderedNavigationId = null;
+function markPassageRendered(navigationId) {
+	renderedNavigationId = navigationId;
 }
-function getRenderedPassage() {
-	return renderedPassage;
+function getRenderedNavigationId() {
+	return renderedNavigationId;
 }
 //#endregion
 //#region src/story-api.ts
@@ -4908,11 +5129,10 @@ function createStoryAPI() {
 			await new Promise((resolve) => {
 				requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
 			});
-			const { currentPassage, renderDeferred } = useStoryStore.getState();
-			const rendered = getRenderedPassage();
-			if (rendered !== null && rendered !== currentPassage && !renderDeferred) await new Promise((resolve) => {
-				const off = on("passagerender", (name) => {
-					if (name === useStoryStore.getState().currentPassage) {
+			const isRendered = () => getRenderedNavigationId() === useStoryStore.getState().navigationId;
+			if (getRenderedNavigationId() !== null && !isRendered() && !useStoryStore.getState().renderDeferred) await new Promise((resolve) => {
+				const off = on("passagerender", () => {
+					if (isRendered()) {
 						off();
 						resolve();
 					}
@@ -5036,6 +5256,12 @@ var VALID_VAR_TYPES = new Set([
 	"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") {
@@ -5113,6 +5339,13 @@ function validateRef(ref, schema, forLocals) {
 	for (let i = 1; i < parts.length; i++) {
 		const part = parts[i];
 		if (current.type === "array") return null;
+		const sample = PRIMITIVE_SAMPLES[current.type];
+		if (sample && part in sample) {
+			const memberType = typeof sample[part];
+			if (!VALID_VAR_TYPES.has(memberType)) return null;
+			current = { type: memberType };
+			continue;
+		}
 		if (current.type !== "object" || !current.fields) return `Cannot access field "${part}" on $${parts.slice(0, i).join(".")} (type: ${current.type})`;
 		const fieldSchema = current.fields.get(part);
 		if (!fieldSchema) return null;
@@ -5377,15 +5610,6 @@ function parseComputedArgs(rawArgs) {
 	}
 	throw new Error(`{computed}: expected "target = expression", got "${rawArgs}"`);
 }
-function valuesEqual(a, b) {
-	if (Object.is(a, b)) return true;
-	if (typeof a === "object" && a !== null && typeof b === "object" && b !== null) try {
-		return JSON.stringify(a) === JSON.stringify(b);
-	} catch {
-		return false;
-	}
-	return false;
-}
 function computeAndApply(expr, name, isTemp, isLocal, variables, temporary, locals, transient, rawArgs, prevRef, localsUpdate) {
 	let newValue;
 	try {
@@ -5394,7 +5618,7 @@ function computeAndApply(expr, name, isTemp, isLocal, variables, temporary, loca
 		console.error(`spindle: Error in {computed ${rawArgs}}${currentSourceLocation()}:`, err);
 		return;
 	}
-	if (!valuesEqual(prevRef.current, newValue)) {
+	if (!deepEqual(prevRef.current, newValue)) {
 		prevRef.current = newValue;
 		if (isLocal) try {
 			localsUpdate(name, newValue);
@@ -5743,9 +5967,9 @@ defineMacro({
 //#region src/components/macros/MacroLink.tsx
 function parseArgs(rawArgs) {
 	const parts = [];
-	const re = /(["'])(.*?)\1/g;
+	const re = /(["'])((?:\\[^]|(?!\1)[^\\])*)\1/g;
 	let m;
-	while ((m = re.exec(rawArgs)) !== null) parts.push(m[2]);
+	while ((m = re.exec(rawArgs)) !== null) parts.push(m[2].replace(/\\(["'\\])/g, "$1"));
 	if (parts.length >= 2) return {
 		display: parts[0],
 		passage: parts[1]
@@ -6003,7 +6227,9 @@ defineMacro({
 		const childrenKey = JSON.stringify(children);
 		const paramsKey = params.join(",");
 		ctx.hooks.useLayoutEffect(() => {
-			registerWidget(name, children, params);
+			const isBlock = astContainsChildren(children);
+			registerWidget(name, children, params, isBlock);
+			if (isBlock) registerBlockMacro(name);
 		}, [
 			name,
 			childrenKey,
@@ -6269,6 +6495,10 @@ function SaveManagerContent() {
 		if (!confirm("Delete this save?")) return;
 		try {
 			await deleteSaveById(saveId);
+			const known = await populateKnownSaves(ifid);
+			useStoryStore.setState((state) => {
+				state.knownSaves = known;
+			});
 			showStatus("Save deleted");
 			await refresh();
 		} catch {
@@ -6541,14 +6771,63 @@ defineMacro({
 });
 //#endregion
 //#region src/components/macros/Include.tsx
+var FLAG = "inline";
+/**
+* Split a standalone `inline` flag off the start or end of the include
+* arguments. The flag only counts outside quotes, brackets, parentheses and
+* braces, separated by whitespace from the target expression, so passage
+* names and expressions containing the word stay intact (#201).
+*/
+function parseIncludeArgs(rawArgs) {
+	const trimmed = rawArgs.trim();
+	let first = null;
+	let last = null;
+	let depth = 0;
+	let inString = null;
+	for (let i = 0; i < trimmed.length; i++) {
+		const ch = trimmed[i];
+		if (inString) {
+			if (ch === "\\") i++;
+			else if (ch === inString) inString = null;
+			continue;
+		}
+		if (ch === "\"" || ch === "'" || ch === "`") inString = ch;
+		else if (ch === "(" || ch === "[" || ch === "{") depth++;
+		else if (ch === ")" || ch === "]" || ch === "}") depth--;
+		else if (depth === 0 && /\s/.test(ch)) {
+			let end = i + 1;
+			while (end < trimmed.length && /\s/.test(trimmed[end])) end++;
+			last = [i, end];
+			first ??= last;
+			i = end - 1;
+		}
+	}
+	if (last && last[1] === trimmed.length - 6 && trimmed.endsWith(FLAG)) {
+		const rest = trimmed.slice(0, last[0]);
+		if (!/[-+*/%&|^!=<>?:,.]$/.test(rest)) return {
+			nameExpr: rest,
+			inline: true
+		};
+	}
+	if (first && first[0] === 6 && trimmed.startsWith(FLAG)) {
+		const rest = trimmed.slice(first[1]);
+		if (!/^[-+*/%&|^=<>?:,.]/.test(rest)) return {
+			nameExpr: rest,
+			inline: true
+		};
+	}
+	return {
+		nameExpr: trimmed,
+		inline: false
+	};
+}
 defineMacro({
 	name: "include",
 	interpolate: true,
 	merged: true,
 	render({ rawArgs }, ctx) {
 		const storyData = useStoryStore((s) => s.storyData);
-		const inline = /\binline\b/.test(rawArgs);
-		const nameExpr = rawArgs.replace(/\binline\b/, "").trim();
+		const { nameExpr, inline } = parseIncludeArgs(rawArgs);
 		let passageName;
 		try {
 			const result = ctx.evaluate(nameExpr);
@@ -6873,7 +7152,7 @@ var CODE_PASSAGES = new Set([
 	"PassageFooter",
 	"PassageDone"
 ]);
-function Passage({ passage, dataTransition }) {
+function Passage({ passage, dataTransition, navigationId }) {
 	const storyData = useStoryStore((s) => s.storyData);
 	const isCodePassage = CODE_PASSAGES.has(passage.name);
 	const [doneReady, setDoneReady] = useState(false);
@@ -6931,9 +7210,9 @@ function Passage({ passage, dataTransition }) {
 	}, [doneReady, donePassage?.content]);
 	const elRef = useRef(null);
 	useLayoutEffect(() => {
-		markPassageRendered(passage.name);
+		if (navigationId !== void 0) markPassageRendered(navigationId);
 		if (elRef.current) emitFromRender("passagerender", passage.name, elRef.current);
-	}, [passage.name]);
+	}, [passage.name, navigationId]);
 	const nobr = passage.tags.includes("nobr");
 	const inner = /* @__PURE__ */ jsxs("div", {
 		ref: elRef,
@@ -7179,7 +7458,8 @@ defineMacro({
 				ref: containerRef,
 				children: effectivePassage && /* @__PURE__ */ jsx(Passage, {
 					passage: effectivePassage,
-					dataTransition: renderDeferred ? "none" : resolvedTypeRef.current
+					dataTransition: renderDeferred ? "none" : resolvedTypeRef.current,
+					navigationId: renderDeferred ? void 0 : displayed.id
 				}, renderDeferred ? "loading" : `nav-${displayed.id}`)
 			})]
 		});
@@ -7319,12 +7599,8 @@ function boot() {
 	setDeclaredVariables(Object.keys(defaults), Object.keys(transientDefaults));
 	useStoryStore.getState().init(storyData, defaults, transientDefaults);
 	enterRuntimePhase();
-	executeStoryInit();
-	const sessionPayload = loadSession(storyData.ifid);
-	if (sessionPayload) useStoryStore.getState().loadFromPayload(sessionPayload);
-	emit("storyinit");
 	const blockWidgetPattern = /\{widget\s+["']?(\w+)["']?[^}]*\}([\s\S]*?)\{\/widget\}/g;
-	for (const [, passage] of storyData.passages) if (passage.tags.includes("widget")) {
+	for (const [passageName, passage] of storyData.passages) if (passageName === "StoryInit" || passage.tags.includes("widget")) {
 		let match;
 		while ((match = blockWidgetPattern.exec(passage.content)) !== null) {
 			const name = match[1];
@@ -7333,6 +7609,7 @@ function boot() {
 		}
 		blockWidgetPattern.lastIndex = 0;
 	}
+	initializeStory(loadSession(storyData.ifid));
 	for (const [, passage] of storyData.passages) if (passage.tags.includes("widget")) {
 		const widgetAST = buildAST(tokenize(passage.content));
 		for (const node of widgetAST) if (node.type === "macro" && node.name === "widget" && node.rawArgs) {