@rohal12/spindle 0.50.1 → 0.51.1

package/src/story-init.ts

@@ -4,6 +4,8 @@ import { tokenize } from './markup/tokenizer';
 import { buildAST } from './markup/ast';
 import { renderNodes } from './markup/render';
 import { setSaveTitlePassage } from './saves/save-manager';
+import { emit } from './event-emitter';
+import type { SavePayload } from './saves/types';
 
 /** Hidden container holding the currently mounted StoryInit tree. */
 let storyInitContainer: HTMLElement | null = null;
@@ -60,3 +62,24 @@ export function executeStoryInit() {
     setSaveTitlePassage(saveTitlePassage.content);
   }
 }
+
+/**
+ * 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.
+ */
+export function initializeStory(session?: SavePayload): void {
+  executeStoryInit();
+
+  if (session) {
+    useStoryStore.getState().loadFromPayload(session);
+  }
+
+  emit('storyinit');
+
+  if (!session) {
+    recordStoryInitState();
+  }
+}

package/src/story-variables.ts

@@ -26,6 +26,13 @@ const FOR_LOCAL_RE = /\{for\s+@(\w+)(?:\s*,\s*@(\w+))?\s+of\b/g;
 
 const VALID_VAR_TYPES = new Set<string>(['number', 'string', 'boolean']);
 
+/** Boxed sample values whose members a primitive of each type can access. */
+const PRIMITIVE_SAMPLES: Partial<Record<VarType, object>> = {
+  string: Object(''),
+  number: Object(0),
+  boolean: Object(false),
+};
+
 function inferSchema(value: unknown): FieldSchema {
   if (Array.isArray(value)) {
     return { type: 'array' };
@@ -138,6 +145,17 @@ function validateRef(
     // so any field access on an array is allowed.
     if (current.type === 'array') return null;
 
+    // Primitives expose their wrapper's built-ins (length, toUpperCase,
+    // toFixed, etc.). Keep validating past properties of primitive type.
+    const sample = PRIMITIVE_SAMPLES[current.type];
+    if (sample && part in sample) {
+      const member: unknown = sample[part as keyof typeof sample];
+      const memberType = typeof member;
+      if (!VALID_VAR_TYPES.has(memberType)) return null;
+      current = { type: memberType as VarType };
+      continue;
+    }
+
     if (current.type !== 'object' || !current.fields) {
       return `Cannot access field "${part}" on $${parts.slice(0, i).join('.')} (type: ${current.type})`;
     }

package/types/index.d.ts

@@ -541,11 +541,18 @@ export interface StoryAPI {
   /** Restart the story from the beginning. */
   restart(): void;
 
-  /** Save the current state. Pass `slot` for a named save, `custom` for metadata. */
-  save(slot?: string, custom?: Record<string, unknown>): void;
+  /**
+   * Save the current state. Pass `slot` for a named save, `custom` for metadata.
+   * Resolves once the save is persisted (after `aftersave` handlers ran and
+   * `hasSave(slot)` is true); rejects if persisting fails.
+   */
+  save(slot?: string, custom?: Record<string, unknown>): Promise<void>;
 
-  /** Load a saved state (quick load). */
-  load(slot?: string): void;
+  /**
+   * Load a saved state (quick load). Resolves once the loaded state is applied
+   * (immediately if the slot is empty); rejects if loading fails.
+   */
+  load(slot?: string): Promise<void>;
 
   /** Check whether a save exists. */
   hasSave(slot?: string): boolean;
@@ -556,8 +563,11 @@ export interface StoryAPI {
   /** List metadata for all known save slots. */
   listSaves(): Promise<SaveInfo[]>;
 
-  /** Delete a save by slot name. */
-  deleteSave(slot?: string): void;
+  /**
+   * Delete a save by slot name. Resolves once the save is removed and
+   * `hasSave(slot)` is false; rejects if deleting fails.
+   */
+  deleteSave(slot?: string): Promise<void>;
 
   /**
    * Export the save in a slot as a portable object (plain JSON).