@rohal12/spindle 0.37.0 → 0.37.1

package/package.json

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

package/src/index.tsx

@@ -1,7 +1,7 @@
 import { render } from 'preact';
 import { App } from './components/App';
 import { parseStoryData } from './parser';
-import { useStoryStore } from './store';
+import { useStoryStore, fireStoryInit } from './store';
 import { installStoryAPI } from './story-api';
 import { resetIdCounters } from './action-registry';
 import { executeStoryInit } from './story-init';
@@ -101,7 +101,6 @@ function boot() {
 
   // Execute StoryInit passage if it exists
   executeStoryInit();
-  useStoryStore.getState().bumpInitCount();
 
   // Restore session state if the page was refreshed
   const sessionPayload = loadSession(storyData.ifid);
@@ -109,6 +108,9 @@ function boot() {
     useStoryStore.getState().loadFromPayload(sessionPayload);
   }
 
+  // Fire storyinit after all state is settled (defaults + StoryInit + session)
+  fireStoryInit();
+
   // Pass 1: Pre-scan all widget passages to discover block widgets.
   // Register them as block macros BEFORE any tokenize/buildAST calls,
   // so that widget bodies using other block widgets parse correctly

package/src/store.ts

@@ -176,6 +176,26 @@ function resetModuleState(base: Record<string, unknown>): void {
   serializedHistory = [];
 }
 
+// ---------------------------------------------------------------------------
+// storyinit callbacks (direct invocation — avoids Zustand subscription issues)
+// ---------------------------------------------------------------------------
+
+type StoryInitListener = () => void;
+let storyInitListeners: StoryInitListener[] = [];
+
+/** Register a callback to run after StoryInit completes (boot + every restart). */
+export function onStoryInit(cb: StoryInitListener): () => void {
+  storyInitListeners.push(cb);
+  return () => {
+    storyInitListeners = storyInitListeners.filter((l) => l !== cb);
+  };
+}
+
+/** Fire all storyinit listeners. Called after all state resets are complete. */
+export function fireStoryInit(): void {
+  for (const cb of storyInitListeners) cb();
+}
+
 // ---------------------------------------------------------------------------
 // Store
 // ---------------------------------------------------------------------------
@@ -207,7 +227,6 @@ export interface StoryState {
   renderCounts: Record<string, number>;
   knownSaves: Record<string, true>;
   playthroughId: string;
-  initCount: number;
   maxHistory: number;
   saveError: string | null;
   loadError: string | null;
@@ -215,7 +234,6 @@ export interface StoryState {
   nextTransition: TransitionConfig | null;
   nobr: boolean;
 
-  bumpInitCount: () => void;
   setMaxHistory: (limit: number) => void;
   init: (
     storyData: StoryData,
@@ -260,7 +278,6 @@ export const useStoryStore = create<StoryState>()(
     renderCounts: {},
     knownSaves: {},
     playthroughId: '',
-    initCount: 0,
     maxHistory: 40,
     saveError: null,
     loadError: null,
@@ -268,12 +285,6 @@ export const useStoryStore = create<StoryState>()(
     nextTransition: null,
     nobr: false,
 
-    bumpInitCount: () => {
-      set((state) => {
-        state.initCount++;
-      });
-    },
-
     setMaxHistory: (limit: number) => {
       set((state) => {
         state.maxHistory = Math.max(1, Math.round(limit));
@@ -503,8 +514,8 @@ export const useStoryStore = create<StoryState>()(
 
       lastNavigationVars = get().variables;
       executeStoryInit();
-      get().bumpInitCount();
       clearSession(storyData.ifid);
+      fireStoryInit();
 
       // Start a new playthrough on restart
       startNewPlaythrough(storyData.ifid)

package/src/story-api.ts

@@ -1,4 +1,4 @@
-import { useStoryStore } from './store';
+import { useStoryStore, onStoryInit } from './store';
 import type { Passage } from './parser';
 import { settings } from './settings';
 import type {
@@ -359,13 +359,7 @@ function createStoryAPI(): StoryAPI {
       }
 
       if (event === 'storyinit') {
-        let prevCount = useStoryStore.getState().initCount;
-        return useStoryStore.subscribe((state) => {
-          if (state.initCount !== prevCount) {
-            prevCount = state.initCount;
-            (callback as StoryInitCallback)();
-          }
-        });
+        return onStoryInit(callback as StoryInitCallback);
       }
 
       if (event === 'actionsChanged') {