@rohal12/spindle 0.31.1 → 0.31.3

package/package.json

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

package/src/components/macros/MenubarButtons.tsx

@@ -119,7 +119,7 @@ defineMenubarAction({
   setup: () => {
     const load = useStoryStore((s) => s.load);
     const hasSave = useStoryStore((s) => s.hasSave);
-    useStoryStore((s) => s.saveVersion);
+    useStoryStore((s) => s.knownSaves);
     return { perform: () => load(), disabled: !hasSave() };
   },
 });

package/src/define-macro.ts

@@ -173,7 +173,8 @@ export function defineMacro(config: MacroDefinition): void {
     }
 
     if (config.storeVar) {
-      const firstToken = props.rawArgs.trim().split(/[\s"']+/)[0] ?? '';
+      const firstToken =
+        props.rawArgs.trim().split(/\s+/)[0]?.replace(/["']/g, '') ?? '';
       const varExpr = firstToken.replace(/["']/g, '').replace(/^\$/, '');
       const segments = varExpr.split('.');
       ctx.varName = varExpr;

package/src/saves/save-manager.ts

@@ -258,16 +258,25 @@ export async function getSavesGrouped(
   return result;
 }
 
-// --- Quick Save ---
+// --- Quick Save / Slot Save ---
 
 const AUTOSAVE_KEY_PREFIX = 'autosave.';
+const SLOT_KEY_PREFIX = 'slot.';
+const SLOT_INDEX_KEY_PREFIX = 'slotIndex.';
+
+function slotMetaKey(ifid: string, slot?: string): string {
+  return slot != null
+    ? `${SLOT_KEY_PREFIX}${slot}.${ifid}`
+    : `${AUTOSAVE_KEY_PREFIX}${ifid}`;
+}
 
 export async function quickSave(
   ifid: string,
   playthroughId: string,
   payload: SavePayload,
+  slot?: string,
 ): Promise<SaveRecord> {
-  const metaKey = `${AUTOSAVE_KEY_PREFIX}${ifid}`;
+  const metaKey = slotMetaKey(ifid, slot);
   const existingId = await getMeta<string>(metaKey);
 
   if (existingId) {
@@ -275,16 +284,30 @@ export async function quickSave(
     if (updated) return updated;
   }
 
-  // Create new autosave
+  // Create new save
   const record = await createSave(ifid, playthroughId, payload, {
-    isAutosave: true,
+    isAutosave: !slot,
+    ...(slot != null ? { slot } : {}),
   });
   await setMeta(metaKey, record.meta.id);
+
+  // Track named slots in the index
+  if (slot != null) {
+    const indexKey = `${SLOT_INDEX_KEY_PREFIX}${ifid}`;
+    const existing = (await getMeta<string[]>(indexKey)) ?? [];
+    if (!existing.includes(slot)) {
+      await setMeta(indexKey, [...existing, slot]);
+    }
+  }
+
   return record;
 }
 
-export async function hasQuickSave(ifid: string): Promise<boolean> {
-  const metaKey = `${AUTOSAVE_KEY_PREFIX}${ifid}`;
+export async function hasQuickSave(
+  ifid: string,
+  slot?: string,
+): Promise<boolean> {
+  const metaKey = slotMetaKey(ifid, slot);
   const existingId = await getMeta<string>(metaKey);
   if (!existingId) return false;
   const record = await getSave(existingId);
@@ -293,13 +316,40 @@ export async function hasQuickSave(ifid: string): Promise<boolean> {
 
 export async function loadQuickSave(
   ifid: string,
+  slot?: string,
 ): Promise<SavePayload | undefined> {
-  const metaKey = `${AUTOSAVE_KEY_PREFIX}${ifid}`;
+  const metaKey = slotMetaKey(ifid, slot);
   const existingId = await getMeta<string>(metaKey);
   if (!existingId) return undefined;
   return loadSave(existingId);
 }
 
+/**
+ * Check IDB for all known saves and return a map of slot keys to true.
+ * The default (autosave) slot uses empty string as key.
+ */
+export async function populateKnownSaves(
+  ifid: string,
+): Promise<Record<string, true>> {
+  const result: Record<string, true> = {};
+
+  // Check default autosave
+  if (await hasQuickSave(ifid)) {
+    result[''] = true;
+  }
+
+  // Check named slots from the index
+  const indexKey = `${SLOT_INDEX_KEY_PREFIX}${ifid}`;
+  const slots = (await getMeta<string[]>(indexKey)) ?? [];
+  for (const slot of slots) {
+    if (await hasQuickSave(ifid, slot)) {
+      result[slot] = true;
+    }
+  }
+
+  return result;
+}
+
 // --- Session Persistence (survives F5, cleared on tab close) ---
 
 const SESSION_KEY_PREFIX = 'spindle.session.';

package/src/store.ts

@@ -17,6 +17,7 @@ import {
   getCurrentPlaythroughId,
   quickSave,
   loadQuickSave,
+  populateKnownSaves,
   saveSession,
   clearSession,
 } from './saves/save-manager';
@@ -198,7 +199,7 @@ export interface StoryState {
   historyIndex: number;
   visitCounts: Record<string, number>;
   renderCounts: Record<string, number>;
-  saveVersion: number;
+  knownSaves: Record<string, true>;
   playthroughId: string;
   maxHistory: number;
   saveError: string | null;
@@ -243,7 +244,7 @@ export const useStoryStore = create<StoryState>()(
     historyIndex: -1,
     visitCounts: {},
     renderCounts: {},
-    saveVersion: 0,
+    knownSaves: {},
     playthroughId: '',
     maxHistory: 40,
     saveError: null,
@@ -307,6 +308,14 @@ export const useStoryStore = create<StoryState>()(
               state.playthroughId = newId;
             });
           }
+
+          // Populate knownSaves from IDB so hasSave() works after reload
+          const saves = await populateKnownSaves(ifid);
+          if (Object.keys(saves).length > 0) {
+            set((state) => {
+              state.knownSaves = saves;
+            });
+          }
         })
         .catch((err) =>
           console.error('spindle: failed to init save system', err),
@@ -487,7 +496,7 @@ export const useStoryStore = create<StoryState>()(
         );
     },
 
-    save: () => {
+    save: (slot?: string) => {
       const { storyData, playthroughId } = get();
       if (!storyData) return;
 
@@ -496,14 +505,17 @@ export const useStoryStore = create<StoryState>()(
       set((state) => {
         state.saveError = null;
       });
-      quickSave(storyData.ifid, playthroughId, payload)
+      quickSave(storyData.ifid, playthroughId, payload, slot)
         .then(() => {
           set((state) => {
-            state.saveVersion++;
+            state.knownSaves = {
+              ...state.knownSaves,
+              [slot ?? '']: true,
+            };
           });
         })
         .catch((err) => {
-          console.error('spindle: failed to quick save', err);
+          console.error('spindle: failed to save', err);
           set((state) => {
             state.saveError =
               err instanceof Error ? err.message : 'Failed to save';
@@ -511,20 +523,20 @@ export const useStoryStore = create<StoryState>()(
         });
     },
 
-    load: () => {
+    load: (slot?: string) => {
       const { storyData } = get();
       if (!storyData) return;
 
       set((state) => {
         state.loadError = null;
       });
-      loadQuickSave(storyData.ifid)
+      loadQuickSave(storyData.ifid, slot)
         .then((payload) => {
           if (!payload) return;
           get().loadFromPayload(payload);
         })
         .catch((err) => {
-          console.error('spindle: failed to load quick save', err);
+          console.error('spindle: failed to load save', err);
           set((state) => {
             state.loadError =
               err instanceof Error ? err.message : 'Failed to load';
@@ -532,11 +544,10 @@ export const useStoryStore = create<StoryState>()(
         });
     },
 
-    hasSave: () => {
-      // Synchronous: return true if a save has been made this session
-      const { storyData, saveVersion } = get();
+    hasSave: (slot?: string) => {
+      const { storyData, knownSaves } = get();
       if (!storyData) return false;
-      return saveVersion > 0;
+      return (slot ?? '') in knownSaves;
     },
 
     getSavePayload: (): SavePayload => {