@rohal12/spindle 0.8.0 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rohal12/spindle",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "type": "module",
   "description": "A Preact-based story format for Twine 2.",
   "license": "Unlicense",
@@ -38,6 +38,7 @@
     "compile": "bun run scripts/compile-story.ts",
     "preview": "bun run build && bun run compile",
     "test": "vitest run",
+    "test:coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "test:e2e": "vitest run --config vitest.e2e.config.ts",
     "typecheck": "tsc --noEmit",
@@ -64,6 +65,7 @@
     "@preact/preset-vite": "^2.10.3",
     "@rohal12/twee-ts": "^1.1.2",
     "@types/js-yaml": "^4.0.9",
+    "@types/react": "^18.3.28",
     "@vitest/coverage-v8": "^4.0.18",
     "happy-dom": "^20.8.3",
     "husky": "^9.1.7",

package/src/components/Passage.tsx

@@ -3,6 +3,7 @@ import { tokenize } from '../markup/tokenizer';
 import { buildAST } from '../markup/ast';
 import { renderNodes } from '../markup/render';
 import type { Passage as PassageData } from '../parser';
+import { sourceLocationOf } from '../utils/source-location';
 
 interface PassageProps {
   passage: PassageData;
@@ -17,8 +18,8 @@ export function Passage({ passage }: PassageProps) {
     } catch (err) {
       return (
         <div class="error">
-          Error parsing passage &ldquo;{passage.name}&rdquo;:{' '}
-          {(err as Error).message}
+          Error parsing passage &ldquo;{passage.name}&rdquo;
+          {sourceLocationOf(passage)}: {(err as Error).message}
         </div>
       );
     }

package/src/components/macros/Button.tsx

@@ -6,6 +6,7 @@ import { deepClone } from '../../class-registry';
 import { collectText } from '../../utils/extract-text';
 import { useAction } from '../../hooks/use-action';
 import { useMergedLocals } from '../../hooks/use-merged-locals';
+import { currentSourceLocation } from '../../utils/source-location';
 import type { ASTNode } from '../../markup/ast';
 
 interface ButtonProps {
@@ -28,7 +29,10 @@ export function Button({ rawArgs, children, className, id }: ButtonProps) {
     try {
       execute(rawArgs, vars, temps, localsClone);
     } catch (err) {
-      console.error(`spindle: Error in {button ${rawArgs}}:`, err);
+      console.error(
+        `spindle: Error in {button ${rawArgs}}${currentSourceLocation()}:`,
+        err,
+      );
       return;
     }
 

package/src/components/macros/Computed.tsx

@@ -2,6 +2,7 @@ import { useLayoutEffect } from 'preact/hooks';
 import { useStoryStore } from '../../store';
 import { evaluate } from '../../expression';
 import { useMergedLocals } from '../../hooks/use-merged-locals';
+import { currentSourceLocation } from '../../utils/source-location';
 
 interface ComputedProps {
   rawArgs: string;
@@ -71,7 +72,7 @@ export function Computed({ rawArgs }: ComputedProps) {
         class="error"
         title={String(err)}
       >
-        {`{computed error: ${err instanceof Error ? err.message : String(err)}}`}
+        {`{computed error${currentSourceLocation()}: ${err instanceof Error ? err.message : String(err)}}`}
       </span>
     );
   }
@@ -86,7 +87,10 @@ export function Computed({ rawArgs }: ComputedProps) {
     try {
       newValue = evaluate(expr, mergedVars, mergedTemps, mergedLocals);
     } catch (err) {
-      console.error(`spindle: Error in {computed ${rawArgs}}:`, err);
+      console.error(
+        `spindle: Error in {computed ${rawArgs}}${currentSourceLocation()}:`,
+        err,
+      );
       return;
     }
 

package/src/components/macros/Do.tsx

@@ -5,6 +5,7 @@ import type { ASTNode } from '../../markup/ast';
 import { deepClone } from '../../class-registry';
 import { LocalsContext } from '../../markup/render';
 import { useMergedLocals } from '../../hooks/use-merged-locals';
+import { currentSourceLocation } from '../../utils/source-location';
 
 interface DoProps {
   children: ASTNode[];
@@ -31,7 +32,7 @@ export function Do({ children }: DoProps) {
     try {
       execute(code, vars, temps, localsClone);
     } catch (err) {
-      console.error(`spindle: Error in {do}:`, err);
+      console.error(`spindle: Error in {do}${currentSourceLocation()}:`, err);
       return;
     }
 

package/src/components/macros/For.tsx

@@ -3,6 +3,7 @@ import { evaluate } from '../../expression';
 import { LocalsContext, renderNodes } from '../../markup/render';
 import type { LocalsScope } from '../../markup/render';
 import { useMergedLocals } from '../../hooks/use-merged-locals';
+import { currentSourceLocation } from '../../utils/source-location';
 import type { ASTNode } from '../../markup/ast';
 
 interface ForProps {
@@ -87,7 +88,7 @@ export function For({ rawArgs, children, className, id }: ForProps) {
         class="error"
         title={String(err)}
       >
-        {`{for error: ${err instanceof Error ? err.message : String(err)}}`}
+        {`{for error${currentSourceLocation()}: ${err instanceof Error ? err.message : String(err)}}`}
       </span>
     );
   }
@@ -100,7 +101,7 @@ export function For({ rawArgs, children, className, id }: ForProps) {
     if (!Array.isArray(result)) {
       return (
         <span class="error">
-          {`{for error: expression did not evaluate to an array}`}
+          {`{for error${currentSourceLocation()}: expression did not evaluate to an array}`}
         </span>
       );
     }
@@ -111,7 +112,7 @@ export function For({ rawArgs, children, className, id }: ForProps) {
         class="error"
         title={String(err)}
       >
-        {`{for error: ${err instanceof Error ? err.message : String(err)}}`}
+        {`{for error${currentSourceLocation()}: ${err instanceof Error ? err.message : String(err)}}`}
       </span>
     );
   }

package/src/components/macros/If.tsx

@@ -1,6 +1,7 @@
 import { evaluate } from '../../expression';
 import { renderNodes } from '../../markup/render';
 import { useMergedLocals } from '../../hooks/use-merged-locals';
+import { currentSourceLocation } from '../../utils/source-location';
 import type { Branch } from '../../markup/ast';
 
 interface IfProps {
@@ -46,7 +47,7 @@ export function If({ branches }: IfProps) {
           class="error"
           title={String(err)}
         >
-          {`{if error: ${err instanceof Error ? err.message : String(err)}}`}
+          {`{if error${currentSourceLocation()}: ${err instanceof Error ? err.message : String(err)}}`}
         </span>
       );
     }

package/src/components/macros/Include.tsx

@@ -4,6 +4,7 @@ import { tokenize } from '../../markup/tokenizer';
 import { buildAST } from '../../markup/ast';
 import { renderNodes } from '../../markup/render';
 import { useMergedLocals } from '../../hooks/use-merged-locals';
+import { currentSourceLocation } from '../../utils/source-location';
 
 interface IncludeProps {
   rawArgs: string;
@@ -31,7 +32,7 @@ export function Include({ rawArgs, className, id }: IncludeProps) {
   }
   if (!passage) {
     return (
-      <span class="error">{`{include: passage "${passageName}" not found}`}</span>
+      <span class="error">{`{include${currentSourceLocation()}: passage "${passageName}" not found}`}</span>
     );
   }
 

package/src/components/macros/MacroLink.tsx

@@ -5,6 +5,7 @@ import type { ASTNode } from '../../markup/ast';
 import { deepClone } from '../../class-registry';
 import { LocalsContext } from '../../markup/render';
 import { useMergedLocals } from '../../hooks/use-merged-locals';
+import { currentSourceLocation } from '../../utils/source-location';
 
 interface MacroLinkProps {
   rawArgs: string;
@@ -56,14 +57,20 @@ function executeChildren(
       try {
         execute(node.rawArgs, vars, temps, localsClone);
       } catch (err) {
-        console.error(`spindle: Error in {link} child {set}:`, err);
+        console.error(
+          `spindle: Error in {link} child {set}${currentSourceLocation()}:`,
+          err,
+        );
       }
     } else if (node.name === 'do') {
       const code = collectText(node.children);
       try {
         execute(code, vars, temps, localsClone);
       } catch (err) {
-        console.error(`spindle: Error in {link} child {do}:`, err);
+        console.error(
+          `spindle: Error in {link} child {do}${currentSourceLocation()}:`,
+          err,
+        );
       }
     }
   }

package/src/components/macros/Print.tsx

@@ -1,5 +1,6 @@
 import { evaluate } from '../../expression';
 import { useMergedLocals } from '../../hooks/use-merged-locals';
+import { currentSourceLocation } from '../../utils/source-location';
 
 interface PrintProps {
   rawArgs: string;
@@ -29,7 +30,7 @@ export function Print({ rawArgs, className, id }: PrintProps) {
         class="error"
         title={String(err)}
       >
-        {`{print error: ${err instanceof Error ? err.message : String(err)}}`}
+        {`{print error${currentSourceLocation()}: ${err instanceof Error ? err.message : String(err)}}`}
       </span>
     );
   }

package/src/components/macros/Set.tsx

@@ -4,6 +4,7 @@ import { execute } from '../../expression';
 import { deepClone } from '../../class-registry';
 import { LocalsContext } from '../../markup/render';
 import { useMergedLocals } from '../../hooks/use-merged-locals';
+import { currentSourceLocation } from '../../utils/source-location';
 
 interface SetProps {
   rawArgs: string;
@@ -22,7 +23,10 @@ export function Set({ rawArgs }: SetProps) {
     try {
       execute(rawArgs, vars, temps, localsClone);
     } catch (err) {
-      console.error(`spindle: Error in {set ${rawArgs}}:`, err);
+      console.error(
+        `spindle: Error in {set ${rawArgs}}${currentSourceLocation()}:`,
+        err,
+      );
       return;
     }
 

package/src/components/macros/Switch.tsx

@@ -1,6 +1,7 @@
 import { evaluate } from '../../expression';
 import { renderNodes } from '../../markup/render';
 import { useMergedLocals } from '../../hooks/use-merged-locals';
+import { currentSourceLocation } from '../../utils/source-location';
 import type { Branch } from '../../markup/ast';
 
 interface SwitchProps {
@@ -20,14 +21,16 @@ export function Switch({ rawArgs, branches }: SwitchProps) {
         class="error"
         title={String(err)}
       >
-        {`{switch error: ${err instanceof Error ? err.message : String(err)}}`}
+        {`{switch error${currentSourceLocation()}: ${err instanceof Error ? err.message : String(err)}}`}
       </span>
     );
   }
 
   // Find matching {case} branch or {default}
+  // Skip first branch (index 0) — it holds the switch expression, not a case
   let defaultBranch: Branch | null = null;
-  for (const branch of branches) {
+  for (let i = 1; i < branches.length; i++) {
+    const branch = branches[i]!;
     // {default} has empty rawArgs
     if (branch.rawArgs === '') {
       defaultBranch = branch;
@@ -50,7 +53,7 @@ export function Switch({ rawArgs, branches }: SwitchProps) {
           class="error"
           title={String(err)}
         >
-          {`{case error: ${err instanceof Error ? err.message : String(err)}}`}
+          {`{case error${currentSourceLocation()}: ${err instanceof Error ? err.message : String(err)}}`}
         </span>
       );
     }

package/src/utils/source-location.ts

@@ -0,0 +1,19 @@
+import type { Passage } from '../parser';
+import { useStoryStore } from '../store';
+
+/** Returns e.g. " (story.twee:5)" or "" if not available. */
+export function sourceLocationOf(passage: Passage): string {
+  const file = passage.metadata['data-source-file'];
+  const line = passage.metadata['data-source-line'];
+  if (!file) return '';
+  return line ? ` (${file}:${line})` : ` (${file})`;
+}
+
+/** Look up current passage from store and return its source location. */
+export function currentSourceLocation(): string {
+  const state = useStoryStore.getState();
+  if (!state.storyData) return '';
+  const passage = state.storyData.passages.get(state.currentPassage);
+  if (!passage) return '';
+  return sourceLocationOf(passage);
+}