@rohal12/spindle 0.52.0 → 0.52.1

package/dist/pkg/headless.js

@@ -149,10 +149,10 @@ function equal(a, b, assumed) {
 	const bo = b;
 	const keys = Object.keys(ao);
 	if (keys.length !== Object.keys(bo).length) return false;
-	for (const key of keys) if (!hasOwn$2(bo, key) || !equal(ao[key], bo[key], assumed)) return false;
+	for (const key of keys) if (!hasOwn$3(bo, key) || !equal(ao[key], bo[key], assumed)) return false;
 	return true;
 }
-var hasOwn$2 = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
+var hasOwn$3 = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
 var CLASS_TAG = "__spindle_class__";
 var DATA_TAG = "__spindle_data__";
 /** A tagged value, as serialize() writes and deserialize() reads it. */
@@ -224,7 +224,7 @@ function serialize(value) {
 		const name = registeredClassName(val);
 		if (name !== void 0) return tagged(name, serKeys(val));
 		const data = serKeys(val);
-		return hasOwn$2(val, CLASS_TAG) ? tagged("__Object__", data) : data;
+		return hasOwn$3(val, CLASS_TAG) ? tagged("__Object__", data) : data;
 	}
 	return ser(value);
 }
@@ -310,7 +310,7 @@ function isDeserializable(value) {
 			case "__Map__": return Array.isArray(data.entries) && Array.from(data.entries).every((entry) => Array.isArray(entry) && entry.length === 2 && check(entry[0]) && check(entry[1]));
 			case "__Set__": return Array.isArray(data.entries) && Array.from(data.entries).every(check);
 			case "__Undefined__": return true;
-			case "__Number__": return typeof data.value === "string" && hasOwn$2(SPECIAL_NUMBERS, data.value);
+			case "__Number__": return typeof data.value === "string" && hasOwn$3(SPECIAL_NUMBERS, data.value);
 			case "__BigInt__": return typeof data.value === "string" && /^-?\d+$/.test(data.value);
 			default: return checkKeys(data);
 		}
@@ -2743,8 +2743,8 @@ function buildAST(tokens) {
 				current().push(top.node);
 				break;
 			}
-			if (BRANCH_PARENT[name]) {
-				const expectedParent = BRANCH_PARENT[name];
+			const expectedParent = Object.prototype.hasOwnProperty.call(BRANCH_PARENT, name) ? BRANCH_PARENT[name] : void 0;
+			if (expectedParent) {
 				const topNode = stack.length > 0 ? stack[stack.length - 1].node : null;
 				if (!topNode || topNode.type !== "macro" || topNode.name !== expectedParent) throw new Error(`{${token.name}} without matching {${expectedParent}} (at character ${token.start})`);
 				const branch = {
@@ -2860,6 +2860,8 @@ var enabled = false;
 var currentSeed = "";
 var currentPull = 0;
 var generator = null;
+/** Incremented whenever the generator is replaced (init, restore, reset). */
+var generation = 0;
 /**
 * Initialize the PRNG.
 * @param seed   Optional seed string. If omitted, a random seed is generated.
@@ -2876,12 +2878,18 @@ function initPRNG(seed, useEntropy = true) {
 	currentPull = 0;
 	generator = mulberry32(hashSeed(resolvedSeed));
 	enabled = true;
+	generation++;
 }
 /**
 * Restore PRNG state from a snapshot (used on save/load).
 * Recreates the generator from the seed and fast-forwards to the saved pull count.
 */
 function restorePRNG(seed, pull) {
+	generation++;
+	moveTo(seed, pull);
+}
+/** Recreate the generator at `pull` pulls from `seed`. */
+function moveTo(seed, pull) {
 	currentSeed = seed;
 	const steps = Math.imul(pull % 4294967296, MULBERRY_STEP);
 	generator = mulberry32(hashSeed(seed) + steps | 0);
@@ -2890,11 +2898,32 @@ function restorePRNG(seed, pull) {
 }
 /** Disable the PRNG (used on restart before StoryInit re-enables it). */
 function resetPRNG() {
+	generation++;
 	enabled = false;
 	currentSeed = "";
 	currentPull = 0;
 	generator = null;
 }
+/**
+* Run `fn` without its draws advancing the sequence: the draws it makes are
+* taken back afterwards (also when it throws), so the next draws return the
+* same values again. Save and load event handlers run like this, so that
+* saving or loading never shifts the story's random sequence (a load replays
+* the saved passage from its entry state, without the save's handlers). A
+* generator `fn` replaced (a restart or load it started) is kept.
+*/
+function withoutDraws(fn) {
+	const start = {
+		generation,
+		seed: currentSeed,
+		pull: currentPull
+	};
+	try {
+		return fn();
+	} finally {
+		if (enabled && generation === start.generation && currentPull !== start.pull) moveTo(start.seed, start.pull);
+	}
+}
 /** Returns the current PRNG state for snapshotting, or null if disabled. */
 function snapshotPRNG() {
 	if (!enabled) return null;
@@ -2958,6 +2987,30 @@ var EMPTY_NAMESPACE = Object.freeze(createNamespace());
 /** `ns[key]` if `ns` holds it as an own property, else undefined. */
 var ownValue = (ns, key) => Object.prototype.hasOwnProperty.call(ns, key) ? ns[key] : void 0;
 //#endregion
+//#region src/utils/counts.ts
+var isCount = (value) => typeof value === "number" && Number.isInteger(value) && value >= 0;
+/** The count of `name` in `counts`: its own entry, or 0. */
+function countOf(counts, name) {
+	if (!counts || !Object.prototype.hasOwnProperty.call(counts, name)) return 0;
+	const value = counts[name];
+	return isCount(value) ? value : 0;
+}
+/**
+* Counters with no prototype holding the own entries of `source` that are
+* counts, with `name` (if given) counted once more. Immer copies the
+* counters on every write anyway, so counting into a fresh copy costs no
+* more than counting in place.
+*/
+function createCounts(source, name) {
+	const counts = Object.create(null);
+	if (source) for (const key of Object.keys(source)) {
+		const value = source[key];
+		if (isCount(value)) counts[key] = value;
+	}
+	if (name !== void 0) counts[name] = countOf(source, name) + 1;
+	return counts;
+}
+//#endregion
 //#region src/expression.ts
 var FN_CACHE_MAX = 500;
 var fnCache = /* @__PURE__ */ new Map();
@@ -3021,11 +3074,11 @@ var cachedRenderCounts = null;
 function buildExpressionFns() {
 	const { visitCounts, renderCounts } = useStoryStore.getState();
 	if (cachedFns && cachedVisitCounts === visitCounts && cachedRenderCounts === renderCounts) return cachedFns;
-	const visited = (name) => visitCounts[name ?? useStoryStore.getState().currentPassage] ?? 0;
+	const visited = (name) => countOf(visitCounts, name ?? useStoryStore.getState().currentPassage);
 	const hasVisited = (name) => visited(name) > 0;
 	const hasVisitedAny = (...names) => names.some((n) => visited(n) > 0);
 	const hasVisitedAll = (...names) => names.every((n) => visited(n) > 0);
-	const rendered = (name) => renderCounts[name ?? useStoryStore.getState().currentPassage] ?? 0;
+	const rendered = (name) => countOf(renderCounts, name ?? useStoryStore.getState().currentPassage);
 	const hasRendered = (name) => rendered(name) > 0;
 	const hasRenderedAny = (...names) => names.some((n) => rendered(n) > 0);
 	const hasRenderedAll = (...names) => names.every((n) => rendered(n) > 0);
@@ -5150,6 +5203,10 @@ function establishPlaythrough(ifid) {
 * that captures the payload after them, so the capture can tell which
 * variables the hooks changed (the store's `beginSave`).
 *
+* Random numbers the hooks draw do not advance the story's PRNG (see
+* withoutDraws()): the game goes on with the sequence a load of the save
+* continues with, which replays the saved passage without the hooks.
+*
 * 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.
@@ -5157,9 +5214,9 @@ function establishPlaythrough(ifid) {
 function saveWithHooks(slot, custom, beginCapture, write) {
 	try {
 		const capture = beginCapture();
-		emit("beforesave", slot, custom);
+		withoutDraws(() => emit("beforesave", slot, custom));
 		return write(capture()).then((result) => {
-			emit("aftersave", slot);
+			withoutDraws(() => emit("aftersave", slot));
 			return result;
 		});
 	} catch (err) {
@@ -5727,7 +5784,7 @@ function initializeStory(session) {
 }
 //#endregion
 //#region src/utils/object-path.ts
-var hasOwn$1 = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
+var hasOwn$2 = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
 /**
 * Traverse dot-path segments on an object and return the nested value.
 * Members of Object.prototype (`constructor`, `toString`, `__proto__`, ...)
@@ -5739,7 +5796,7 @@ function getByPath(obj, segments) {
 	let current = obj;
 	for (const seg of segments) {
 		if (current == null || typeof current !== "object") return void 0;
-		if (seg in Object.prototype && !hasOwn$1(current, seg)) return void 0;
+		if (seg in Object.prototype && !hasOwn$2(current, seg)) return void 0;
 		current = current[seg];
 	}
 	return current;
@@ -5797,10 +5854,10 @@ function deleteByPath(root, segments) {
 	checkSegments(segments);
 	let holder = root;
 	for (const seg of segments.slice(0, -1)) {
-		if (holder == null || typeof holder !== "object" || !hasOwn$1(holder, seg)) return;
+		if (holder == null || typeof holder !== "object" || !hasOwn$2(holder, seg)) return;
 		holder = holder[seg];
 	}
-	if (holder == null || typeof holder !== "object" || !hasOwn$1(holder, last)) return;
+	if (holder == null || typeof holder !== "object" || !hasOwn$2(holder, last)) return;
 	const parent = walkToParent(root, segments, false);
 	delete parent[last];
 }
@@ -5826,7 +5883,7 @@ function walkToParent(root, segments, createMissing) {
 	for (let i = 0; i < segments.length - 1; i++) {
 		const seg = segments[i];
 		checkHolder(current, seg, segments, i);
-		let next = hasOwn$1(current, seg) ? current[seg] : void 0;
+		let next = hasOwn$2(current, seg) ? current[seg] : void 0;
 		if (next == null || typeof next !== "object") {
 			if (!createMissing) throw new TypeError(`spindle: Cannot set property "${segments[i + 1]}" on ${next === null ? "null" : typeof next} (at "${segments.slice(0, i + 1).join(".")}")`);
 			next = {};
@@ -5890,7 +5947,7 @@ function frozenCopy(value) {
 function isMergeable(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value) && !(value instanceof Map) && !(value instanceof Set) && !(value instanceof Date) && !(value instanceof RegExp);
 }
-var hasOwn = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
+var hasOwn$1 = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
 /** Collect the property paths where `work` differs from `base`. */
 function diff(base, work, path, changes, ancestors) {
 	if (ancestors.has(work)) return;
@@ -5898,7 +5955,7 @@ function diff(base, work, path, changes, ancestors) {
 	for (const key of Object.keys(work)) {
 		const b = base[key];
 		const w = work[key];
-		if (!hasOwn(base, key)) changes.push({
+		if (!hasOwn$1(base, key)) changes.push({
 			path: [...path, key],
 			deleted: false,
 			value: w
@@ -5911,7 +5968,7 @@ function diff(base, work, path, changes, ancestors) {
 			value: w
 		});
 	}
-	for (const key of Object.keys(base)) if (!hasOwn(work, key)) changes.push({
+	for (const key of Object.keys(base)) if (!hasOwn$1(work, key)) changes.push({
 		path: [...path, key],
 		deleted: true
 	});
@@ -5922,7 +5979,7 @@ function isApplied(ns, change) {
 	const parent = getByPath(ns, change.path.slice(0, -1));
 	if (parent === null || typeof parent !== "object") return change.deleted;
 	const key = change.path[change.path.length - 1];
-	if (!hasOwn(parent, key)) return change.deleted;
+	if (!hasOwn$1(parent, key)) return change.deleted;
 	return !change.deleted && deepEqual(parent[key], change.value);
 }
 function applyChange(ns, change) {
@@ -5947,7 +6004,7 @@ function mirror(draft, ns, change, scopes = activeScopes) {
 		});
 	} catch {
 		const stored = draft[ns][root];
-		if (hasOwn(draft[ns], root)) copy[root] = cloneValue(isDraft(stored) ? current(stored) : stored);
+		if (hasOwn$1(draft[ns], root)) copy[root] = cloneValue(isDraft(stored) ? current(stored) : stored);
 		else delete copy[root];
 	}
 }
@@ -5971,7 +6028,7 @@ function changedPath(ns, segments) {
 		if (!isMergeable(node)) break;
 		const key = String(segment);
 		path.push(key);
-		node = hasOwn(node, key) ? node[key] : void 0;
+		node = hasOwn$1(node, key) ? node[key] : void 0;
 	}
 	return path;
 }
@@ -5979,7 +6036,7 @@ function changedPath(ns, segments) {
 function changeTo(ns, path) {
 	const parent = getByPath(ns, path.slice(0, -1));
 	const key = path[path.length - 1];
-	return isMergeable(parent) && hasOwn(parent, key) ? {
+	return isMergeable(parent) && hasOwn$1(parent, key) ? {
 		path,
 		deleted: false,
 		value: parent[key]
@@ -5995,7 +6052,7 @@ function changeTo(ns, path) {
 * replaces exactly what it replaced in program order.
 */
 function writtenPaths(before, after, patches) {
-	if (patches.some((p) => p.path.length === 1)) return [...new Set([...Object.keys(before), ...Object.keys(after)])].filter((root) => !hasOwn(before, root) || before[root] !== after[root]).map((root) => changeTo(after, [root]));
+	if (patches.some((p) => p.path.length === 1)) return [...new Set([...Object.keys(before), ...Object.keys(after)])].filter((root) => !hasOwn$1(before, root) || before[root] !== after[root]).map((root) => changeTo(after, [root]));
 	const seen = /* @__PURE__ */ new Set();
 	const changes = [];
 	for (const patch of patches) {
@@ -6067,7 +6124,7 @@ function routeStoreUpdate(recipe) {
 			try {
 				applyChange(namespaces[ns], owned(change));
 			} catch {
-				if (hasOwn(inner.work[ns], root)) namespaces[ns][root] = cloneValue(inner.work[ns][root]);
+				if (hasOwn$1(inner.work[ns], root)) namespaces[ns][root] = cloneValue(inner.work[ns][root]);
 				else delete namespaces[ns][root];
 			}
 			mirror(namespaces, ns, change);
@@ -6153,8 +6210,8 @@ function resync(scope) {
 	for (const ns of NAMESPACES) {
 		const work = scope.work[ns];
 		const stored = state[ns];
-		for (const key of Object.keys(work)) if (!hasOwn(stored, key)) delete work[key];
-		for (const key of Object.keys(stored)) if (!hasOwn(work, key) || !deepEqual(work[key], stored[key])) work[key] = deepClone(stored[key]);
+		for (const key of Object.keys(work)) if (!hasOwn$1(stored, key)) delete work[key];
+		for (const key of Object.keys(stored)) if (!hasOwn$1(work, key) || !deepEqual(work[key], stored[key])) work[key] = deepClone(stored[key]);
 	}
 	scope.base = cloneNamespaces(state);
 }
@@ -6194,11 +6251,10 @@ function executeMutation(code, mergedLocals, scopeUpdate) {
 		keepRunning: false
 	}]);
 	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 (!hasOwn(localsClone, key)) scopeUpdate(key, void 0);
+	for (const key of Object.keys(mergedLocals)) if (!hasOwn$1(localsClone, key)) scopeUpdate(key, void 0);
 }
 //#endregion
 //#region src/triggers.ts
-var nextId = 0;
 var triggers = [];
 var checking = false;
 var dialogQueue = [];
@@ -6214,12 +6270,10 @@ function evalCondition(condition) {
 	}
 }
 function registerTrigger(condition, callbackOrOptions, macroKey) {
-	const id = nextId++;
 	const isCallback = typeof callbackOrOptions === "function";
 	const options = isCallback ? void 0 : callbackOrOptions;
 	const callback = isCallback ? callbackOrOptions : void 0;
 	const trigger = {
-		id,
 		name: options?.name,
 		condition,
 		callback,
@@ -6231,7 +6285,7 @@ function registerTrigger(condition, callbackOrOptions, macroKey) {
 	triggers.push(trigger);
 	triggers.sort((a, b) => b.priority - a.priority);
 	return () => {
-		triggers = triggers.filter((t) => t.id !== id);
+		triggers = triggers.filter((t) => t !== trigger);
 	};
 }
 function addTrigger(condition, callbackOrOptions) {
@@ -6283,7 +6337,7 @@ function runCheckLoop() {
 			trigger.lastResult = result;
 			if (result && wasFalse) {
 				anyFired = true;
-				if (trigger.options?.once) triggers = triggers.filter((t) => t.id !== trigger.id);
+				if (trigger.options?.once) triggers = triggers.filter((t) => t !== trigger);
 				fireTrigger(trigger);
 			}
 		}
@@ -6349,7 +6403,6 @@ function reinitTriggerState() {
 function resetTriggers() {
 	triggers = [];
 	dialogQueue = [];
-	nextId = 0;
 	dialogHostCallbacks?.closeAll();
 }
 function subscribeTriggerDialogs(cb) {
@@ -6716,20 +6769,65 @@ function loadedEntryMoment(payload) {
 	return moment;
 }
 /**
-* Copy the variables that changed between `before` and `after` (the live
-* variables around the `beforesave` hooks) into the payload's snapshot of the
-* saved moment. A load restores that snapshot, the state on entering the
-* passage, and runs the passage again, so data a hook adds to a save would
-* otherwise be lost on load (#227). Only the payload's copy changes: the live
-* history keeps the recorded snapshot (#159). Store updates are immutable, so
-* a value a hook did not touch keeps its identity.
+* Write the changes between `before` and `after` (the live variables around
+* the `beforesave` hooks) into the payload's snapshot of the saved moment. A
+* load restores that snapshot, the state on entering the passage, and runs
+* the passage again, so data a hook adds to a save would otherwise be lost
+* on load (#227). Only the property paths the hooks changed are written: a
+* whole variable would bring along what the passage did to the rest of it,
+* which the passage then does again on load (#232). Only the payload's copy
+* changes: the live history keeps the recorded snapshot (#159).
 */
 function keepHookWrites(payload, before, after) {
 	const moment = payload.history[payload.historyIndex];
 	if (!moment) return;
-	const has = (vars, key) => Object.prototype.hasOwnProperty.call(vars, key);
-	for (const key of new Set([...Object.keys(before), ...Object.keys(after)])) if (!has(after, key)) delete moment.variables[key];
-	else if (!has(before, key) || after[key] !== before[key]) moment.variables[key] = deepClone(after[key]);
+	mergeHookWrites(moment.variables, before, after, /* @__PURE__ */ new Set());
+}
+var hasOwn = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
+/**
+* Whether changes between `a` and `b` merge key by key: both are arrays,
+* or both are objects of one class (see isMergeable).
+*/
+function mergeable(a, b) {
+	if (Array.isArray(a) || Array.isArray(b)) return Array.isArray(a) && Array.isArray(b);
+	return isMergeable(a) && isMergeable(b) && Object.getPrototypeOf(a) === Object.getPrototypeOf(b);
+}
+/**
+* Apply the hooks' change of a value, from `before` to `after`, to the
+* snapshot's copy of it, `target[key]`. Store updates are immutable, so a
+* value no hook touched keeps its identity; one rebuilt with equal content
+* (mutation code commits whole values) is no change either. Where `target`
+* lacks the key or holds another kind of value (the passage created or
+* replaced it), the hooks' whole value is written.
+*/
+function mergeHookWrite(target, key, before, after, ancestors) {
+	if (Object.is(before, after)) return;
+	if (mergeable(before, after) && hasOwn(target, key) && mergeable(after, target[key]) && !ancestors.has(after)) mergeHookWrites(target[key], before, after, ancestors);
+	else if (!deepEqual(before, after)) target[key] = deepClone(after);
+}
+/**
+* Apply the changes between `before` and `after`, two objects or two arrays
+* (see mergeable()), to the snapshot's `target`. Array elements merge by
+* index. Elements the hooks removed from an array's end are removed from
+* the snapshot's array at the same indices, and elements they added are
+* appended to it: where the passage resized the array, its indices do not
+* line up with the snapshot's, and the passage resizes it again on load.
+*/
+function mergeHookWrites(target, before, after, ancestors) {
+	ancestors.add(after);
+	if (Array.isArray(target)) {
+		const b = before;
+		const a = after;
+		const shared = Math.min(b.length, a.length, target.length);
+		for (let i = 0; i < shared; i++) mergeHookWrite(target, String(i), b[i], a[i], ancestors);
+		if (a.length < b.length) target.length = Math.min(target.length, a.length);
+		for (let i = b.length; i < a.length; i++) target.push(deepClone(a[i]));
+	} else {
+		for (const key of Object.keys(before)) if (!hasOwn(after, key)) delete target[key];
+		for (const key of Object.keys(after)) if (hasOwn(before, key)) mergeHookWrite(target, key, before[key], after[key], ancestors);
+		else target[key] = deepClone(after[key]);
+	}
+	ancestors.delete(after);
 }
 /** Restore or reset PRNG from a history moment's snapshot. */
 function restorePRNGFromMoment(moment) {
@@ -6828,8 +6926,8 @@ var useStoryStore = create()(storyStore((set, get) => ({
 	temporary: createNamespace(),
 	history: [],
 	historyIndex: -1,
-	visitCounts: {},
-	renderCounts: {},
+	visitCounts: createCounts(),
+	renderCounts: createCounts(),
 	knownSaves: {},
 	playthroughId: "",
 	maxHistory: 40,
@@ -6879,8 +6977,8 @@ var useStoryStore = create()(storyStore((set, get) => ({
 				timestamp: Date.now()
 			}];
 			state.historyIndex = 0;
-			state.visitCounts = { [startPassage.name]: 1 };
-			state.renderCounts = { [startPassage.name]: 1 };
+			state.visitCounts = createCounts(null, startPassage.name);
+			state.renderCounts = createCounts(null, startPassage.name);
 		});
 		lastNavigationVars = get().variables;
 		replaceStateNow();
@@ -6927,8 +7025,8 @@ var useStoryStore = create()(storyStore((set, get) => ({
 			});
 			state.historyIndex = state.history.length - 1;
 			trimHistory(state);
-			state.visitCounts[passageName] = (state.visitCounts[passageName] ?? 0) + 1;
-			state.renderCounts[passageName] = (state.renderCounts[passageName] ?? 0) + 1;
+			state.visitCounts = createCounts(state.visitCounts, passageName);
+			state.renderCounts = createCounts(state.renderCounts, passageName);
 		});
 		enteredMoment = {
 			navigationId: get().navigationId,
@@ -7032,7 +7130,7 @@ var useStoryStore = create()(storyStore((set, get) => ({
 	},
 	trackRender: (passageName) => {
 		set((state) => {
-			state.renderCounts[passageName] = (state.renderCounts[passageName] ?? 0) + 1;
+			state.renderCounts = createCounts(state.renderCounts, passageName);
 		});
 	},
 	restart: () => {
@@ -7063,8 +7161,8 @@ var useStoryStore = create()(storyStore((set, get) => ({
 				timestamp: Date.now()
 			}];
 			state.historyIndex = 0;
-			state.visitCounts = { [startPassage.name]: 1 };
-			state.renderCounts = { [startPassage.name]: 1 };
+			state.visitCounts = createCounts(null, startPassage.name);
+			state.renderCounts = createCounts(null, startPassage.name);
 			if (!keepDeferred) state.renderDeferred = false;
 		});
 		lastNavigationVars = get().variables;
@@ -7287,8 +7385,8 @@ var useStoryStore = create()(storyStore((set, get) => ({
 			}));
 			state.historyIndex = Math.max(0, Math.min(payload.historyIndex, state.history.length - 1));
 			trimHistory(state);
-			state.visitCounts = payload.visitCounts ?? {};
-			state.renderCounts = payload.renderCounts ?? {};
+			state.visitCounts = createCounts(payload.visitCounts);
+			state.renderCounts = createCounts(payload.renderCounts);
 			state.temporary = createNamespace();
 			state.transient = createNamespace(deepClone(get().transientDefaults));
 		});
@@ -7298,7 +7396,7 @@ var useStoryStore = create()(storyStore((set, get) => ({
 		if (prng) restorePRNG(prng.seed, prng.pull);
 		else resetPRNG();
 		persistSession(get);
-		emit("afterload", slot);
+		withoutDraws(() => emit("afterload", slot));
 	},
 	getHistoryVariables: (index) => {
 		return deepClone(reconstructVarsAt(index));
@@ -7632,7 +7730,7 @@ function parseStoryData() {
 //#endregion
 //#region src/settings.ts
 var definitions = /* @__PURE__ */ new Map();
-var values = {};
+var values = createNamespace();
 var storageLoaded = false;
 var unsubscribeStoryData = null;
 function storageKey() {
@@ -7657,10 +7755,7 @@ function loadFromStorage() {
 		const raw = localStorage.getItem(storageKey());
 		if (raw) {
 			const parsed = JSON.parse(raw);
-			if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) values = {
-				...values,
-				...parsed
-			};
+			if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) values = createNamespace(values, parsed);
 		}
 	} catch {}
 }
@@ -7670,7 +7765,7 @@ var settings = {
 			type: "toggle",
 			config
 		});
-		if (!(name in values)) values[name] = config.default;
+		if (!Object.prototype.hasOwnProperty.call(values, name)) values[name] = config.default;
 		loadFromStorage();
 	},
 	addList(name, config) {
@@ -7678,7 +7773,7 @@ var settings = {
 			type: "list",
 			config
 		});
-		if (!(name in values)) values[name] = config.default;
+		if (!Object.prototype.hasOwnProperty.call(values, name)) values[name] = config.default;
 		loadFromStorage();
 	},
 	addRange(name, config) {
@@ -7686,22 +7781,22 @@ var settings = {
 			type: "range",
 			config
 		});
-		if (!(name in values)) values[name] = config.default;
+		if (!Object.prototype.hasOwnProperty.call(values, name)) values[name] = config.default;
 		loadFromStorage();
 	},
 	get(name) {
-		return values[name];
+		return ownValue(values, name);
 	},
 	getToggle(name) {
-		const v = values[name];
+		const v = ownValue(values, name);
 		return typeof v === "boolean" ? v : false;
 	},
 	getList(name) {
-		const v = values[name];
+		const v = ownValue(values, name);
 		return typeof v === "string" ? v : "";
 	},
 	getRange(name) {
-		const v = values[name];
+		const v = ownValue(values, name);
 		return typeof v === "number" ? v : 0;
 	},
 	set(name, value) {
@@ -7720,36 +7815,66 @@ var settings = {
 };
 //#endregion
 //#region src/action-registry.ts
+/**
+* The registrations holding each ID, oldest first; the newest is the one
+* listed. Generated IDs don't collide, but author IDs can, and one control's
+* cleanup must not remove another control holding the same ID (#233).
+*/
 var actions = /* @__PURE__ */ new Map();
 var idCounters = /* @__PURE__ */ new Map();
+/**
+* The counters reset on every navigation, so a passage's controls get the
+* same IDs each time it is shown. Controls that stay mounted across
+* navigations (e.g. in StoryInterface) keep theirs, so allocation skips every
+* ID still registered (#233).
+*/
 function generateActionId(type, key, authorId) {
 	if (authorId) return authorId;
 	const base = `${type}:${key}`;
-	const count = (idCounters.get(base) ?? 0) + 1;
+	let count = idCounters.get(base) ?? 0;
+	let id;
+	do {
+		count++;
+		id = count === 1 ? base : `${base}:${count}`;
+	} while (actions.has(id));
 	idCounters.set(base, count);
-	return count === 1 ? base : `${base}:${count}`;
+	return id;
 }
 function registerAction(action) {
-	actions.set(action.id, action);
+	const id = action.id;
+	const entry = { action };
+	const entries = actions.get(id);
+	if (entries) {
+		console.warn(`spindle: two mounted controls share the action ID "${id}"; Story.getActions() lists only the newer one.`);
+		entries.push(entry);
+	} else actions.set(id, [entry]);
 	notify();
-	return () => {
-		actions.delete(action.id);
-		notify();
-	};
-}
-function updateAction(action) {
-	actions.set(action.id, action);
-	notify();
-	return () => {
-		actions.delete(action.id);
-		notify();
+	return {
+		update(next) {
+			const current = actions.get(id);
+			if (!current?.includes(entry)) return;
+			entry.action = next;
+			if (current[current.length - 1] === entry) notify();
+		},
+		unregister() {
+			const current = actions.get(id);
+			const index = current ? current.indexOf(entry) : -1;
+			if (!current || index === -1) return;
+			current.splice(index, 1);
+			if (current.length === 0) actions.delete(id);
+			if (index === current.length) notify();
+		}
 	};
 }
 function getActions() {
-	return Array.from(actions.values());
+	return Array.from(actions.values(), listed);
 }
 function getAction(id) {
-	return actions.get(id);
+	const entries = actions.get(id);
+	return entries && listed(entries);
+}
+function listed(entries) {
+	return entries[entries.length - 1].action;
 }
 function resetIdCounters() {
 	idCounters.clear();
@@ -7779,14 +7904,19 @@ function useAction(opts) {
 		if (opts.disabled !== void 0) action.disabled = opts.disabled;
 		return action;
 	};
-	useLayoutEffect(() => registerAction(buildAction()), [id]);
+	const registration = useRef(null);
+	useLayoutEffect(() => {
+		const own = registerAction(buildAction());
+		registration.current = own;
+		return () => own.unregister();
+	}, [id]);
 	const registered = useRef(false);
 	useLayoutEffect(() => {
 		if (!registered.current) {
 			registered.current = true;
 			return;
 		}
-		updateAction(buildAction());
+		registration.current?.update(buildAction());
 	}, [
 		opts.type,
 		opts.label,
@@ -8087,33 +8217,33 @@ function createStoryAPI() {
 		},
 		visited(name) {
 			const state = useStoryStore.getState();
-			return state.visitCounts[name ?? state.currentPassage] ?? 0;
+			return countOf(state.visitCounts, name ?? state.currentPassage);
 		},
 		hasVisited(name) {
 			return this.visited(name) > 0;
 		},
 		hasVisitedAny(...names) {
 			const { visitCounts } = useStoryStore.getState();
-			return names.some((n) => (visitCounts[n] ?? 0) > 0);
+			return names.some((n) => countOf(visitCounts, n) > 0);
 		},
 		hasVisitedAll(...names) {
 			const { visitCounts } = useStoryStore.getState();
-			return names.every((n) => (visitCounts[n] ?? 0) > 0);
+			return names.every((n) => countOf(visitCounts, n) > 0);
 		},
 		rendered(name) {
 			const state = useStoryStore.getState();
-			return state.renderCounts[name ?? state.currentPassage] ?? 0;
+			return countOf(state.renderCounts, name ?? state.currentPassage);
 		},
 		hasRendered(name) {
 			return this.rendered(name) > 0;
 		},
 		hasRenderedAny(...names) {
 			const { renderCounts } = useStoryStore.getState();
-			return names.some((n) => (renderCounts[n] ?? 0) > 0);
+			return names.some((n) => countOf(renderCounts, n) > 0);
 		},
 		hasRenderedAll(...names) {
 			const { renderCounts } = useStoryStore.getState();
-			return names.every((n) => (renderCounts[n] ?? 0) > 0);
+			return names.every((n) => countOf(renderCounts, n) > 0);
 		},
 		currentPassage() {
 			const state = useStoryStore.getState();
@@ -8588,19 +8718,19 @@ defineMacro({
 	name: "set",
 	render({ rawArgs }, ctx) {
 		const ran = ctx.hooks.useRef(false);
-		const error = ctx.hooks.useRef(null);
+		const failure = ctx.hooks.useRef(null);
 		if (!ran.current) {
 			ran.current = true;
 			try {
 				ctx.mutate(rawArgs);
 			} catch (err) {
-				error.current = err;
+				failure.current = { error: err };
 				console.error(`spindle: Error in {set ${rawArgs}}${ctx.sourceLocation()}:`, err);
 			}
 		}
-		if (error.current) return /* @__PURE__ */ jsx(MacroError, {
+		if (failure.current) return /* @__PURE__ */ jsx(MacroError, {
 			macro: "set",
-			error: error.current
+			error: failure.current.error
 		});
 		return null;
 	}
@@ -8630,6 +8760,12 @@ defineMacro({
 });
 //#endregion
 //#region src/components/macros/Computed.tsx
+/**
+* The previous output before the first successful evaluation. Distinct from
+* every value an expression can produce, so the first result is always
+* applied, even `undefined`; a first evaluation that throws leaves it unset.
+*/
+var UNSET = Symbol("unset");
 function parseComputedArgs(rawArgs) {
 	const trimmed = rawArgs.trim();
 	let depth = 0;
@@ -8658,10 +8794,11 @@ function parseComputedArgs(rawArgs) {
 /**
 * Evaluate `expr` against the current values — the store's state and the
 * enclosing locals scope's live values (`getLocals`) — and write the result
-* to the target if it changed. Reading live values rather than the render's
-* snapshot means the first computation sees a local a preceding {set} just
-* assigned (the scope's context value only catches up on its re-render), and
-* the first computation and later recomputations read the same source.
+* to the target if it differs from the previous output (always, the first
+* time). Reading live values rather than the render's snapshot means the
+* first computation sees a local a preceding {set} just assigned (the scope's
+* context value only catches up on its re-render), and the first computation
+* and later recomputations read the same source.
 */
 function computeAndApply(expr, name, isTemp, isLocal, getLocals, rawArgs, prevRef, localsUpdate) {
 	let newValue;
@@ -8705,7 +8842,7 @@ defineMacro({
 		const isTemp = target.startsWith("_");
 		const name = target.slice(1);
 		const localsUpdate = isLocal ? ctx.update : null;
-		const prevOutput = ctx.hooks.useRef(void 0);
+		const prevOutput = ctx.hooks.useRef(UNSET);
 		const ran = ctx.hooks.useRef(false);
 		if (!ran.current) {
 			ran.current = true;
@@ -10066,7 +10203,7 @@ defineMacro({
 	name: "unset",
 	render({ rawArgs }, ctx) {
 		const ran = ctx.hooks.useRef(false);
-		const error = ctx.hooks.useRef(null);
+		const failure = ctx.hooks.useRef(null);
 		if (!ran.current) {
 			ran.current = true;
 			const state = useStoryStore.getState();
@@ -10078,13 +10215,13 @@ defineMacro({
 				else if (name.startsWith("@")) ctx.update(name.slice(1), void 0);
 				else throw new Error(`{unset} expects a variable ($name, _name, %name, or @name), got "${name}"`);
 			} catch (err) {
-				error.current = err;
+				failure.current = { error: err };
 				console.error(`spindle: Error in {unset ${rawArgs}}${ctx.sourceLocation()}:`, err);
 			}
 		}
-		if (error.current) return /* @__PURE__ */ jsx(MacroError, {
+		if (failure.current) return /* @__PURE__ */ jsx(MacroError, {
 			macro: "unset",
-			error: error.current
+			error: failure.current.error
 		});
 		return null;
 	}