@rohal12/spindle 0.1.0 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rohal12/spindle",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "description": "A Preact-based story format for Twine 2.",
   "license": "Unlicense",
@@ -40,6 +40,7 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "test:e2e": "vitest run --config vitest.e2e.config.ts",
+    "typecheck": "tsc --noEmit",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "docs:dev": "vitepress dev docs",
@@ -61,7 +62,7 @@
     "happy-dom": "^20.7.0",
     "playwright": "^1.58.2",
     "prettier": "^3.8.1",
-    "tweenode": "^0.3.0",
+    "@rohal12/twee-ts": "^1.0.0",
     "typescript": "^5.7.0",
     "vite": "^6.0.0",
     "vite-plugin-singlefile": "^2.0.0",

package/src/class-registry.ts

@@ -0,0 +1,189 @@
+// Class registry for preserving class instances across clone/save/load cycles.
+
+type Constructor = new (...args: any[]) => any;
+
+const registry = new Map<string, Constructor>();
+const ctorToName = new Map<Constructor, string>();
+
+export function registerClass(name: string, ctor: Constructor): void {
+  registry.set(name, ctor);
+  ctorToName.set(ctor, name);
+}
+
+export function getClassName(ctor: Constructor): string | undefined {
+  return ctorToName.get(ctor);
+}
+
+export function clearRegistry(): void {
+  registry.clear();
+  ctorToName.clear();
+}
+
+// --- Deep Clone ---
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  if (typeof value !== 'object' || value === null) return false;
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null;
+}
+
+export function deepClone<T>(value: T): T {
+  const seen = new Map<object, object>();
+
+  function clone(val: unknown): unknown {
+    if (val === null || typeof val !== 'object') return val;
+
+    const obj = val as object;
+    if (seen.has(obj)) return seen.get(obj);
+
+    if (val instanceof Date) return new Date(val.getTime()) as unknown;
+    if (val instanceof RegExp)
+      return new RegExp(val.source, val.flags) as unknown;
+
+    if (Array.isArray(val)) {
+      const arr: unknown[] = [];
+      seen.set(obj, arr);
+      for (let i = 0; i < val.length; i++) {
+        arr[i] = clone(val[i]);
+      }
+      return arr;
+    }
+
+    // Registered class instance
+    const ctor = obj.constructor as Constructor;
+    const name = ctorToName.get(ctor);
+    if (name !== undefined) {
+      const copy = Object.create(Object.getPrototypeOf(obj)) as Record<
+        string,
+        unknown
+      >;
+      seen.set(obj, copy);
+      for (const key of Object.keys(obj)) {
+        copy[key] = clone((obj as Record<string, unknown>)[key]);
+      }
+      return copy;
+    }
+
+    // Plain object (or unregistered class — treat as plain)
+    if (isPlainObject(val) || typeof val === 'object') {
+      const copy: Record<string, unknown> = {};
+      seen.set(obj, copy);
+      for (const key of Object.keys(obj)) {
+        copy[key] = clone((obj as Record<string, unknown>)[key]);
+      }
+      return copy;
+    }
+
+    return val;
+  }
+
+  return clone(value) as T;
+}
+
+// --- Serialize ---
+
+const CLASS_TAG = '__spindle_class__';
+const DATA_TAG = '__spindle_data__';
+
+export function serialize<T>(value: T): T {
+  const seen = new Set<object>();
+
+  function ser(val: unknown): unknown {
+    if (val === null || typeof val !== 'object') return val;
+
+    const obj = val as object;
+    if (seen.has(obj)) {
+      throw new Error('spindle: Cannot serialize circular references');
+    }
+    seen.add(obj);
+
+    if (val instanceof Date) {
+      seen.delete(obj);
+      return val.toISOString();
+    }
+
+    if (val instanceof RegExp) {
+      seen.delete(obj);
+      return val.toString();
+    }
+
+    if (Array.isArray(val)) {
+      const result = val.map((item) => ser(item));
+      seen.delete(obj);
+      return result;
+    }
+
+    // Registered class instance
+    const ctor = obj.constructor as Constructor;
+    const name = ctorToName.get(ctor);
+    if (name !== undefined) {
+      const data: Record<string, unknown> = {};
+      for (const key of Object.keys(obj)) {
+        data[key] = ser((obj as Record<string, unknown>)[key]);
+      }
+      seen.delete(obj);
+      return { [CLASS_TAG]: name, [DATA_TAG]: data };
+    }
+
+    // Plain object
+    const result: Record<string, unknown> = {};
+    for (const key of Object.keys(obj)) {
+      result[key] = ser((obj as Record<string, unknown>)[key]);
+    }
+    seen.delete(obj);
+    return result;
+  }
+
+  return ser(value) as T;
+}
+
+// --- Deserialize ---
+
+export function deserialize<T>(value: T): T {
+  function deser(val: unknown): unknown {
+    if (val === null || typeof val !== 'object') return val;
+
+    if (Array.isArray(val)) {
+      return val.map((item) => deser(item));
+    }
+
+    const obj = val as Record<string, unknown>;
+
+    // Tagged class instance (from serialized data)
+    if (CLASS_TAG in obj && DATA_TAG in obj) {
+      const name = obj[CLASS_TAG] as string;
+      const data = obj[DATA_TAG] as Record<string, unknown>;
+      const ctor = registry.get(name);
+      if (!ctor) {
+        console.warn(
+          `spindle: Class "${name}" not registered. Falling back to plain object.`,
+        );
+        const plain: Record<string, unknown> = {};
+        for (const key of Object.keys(data)) {
+          plain[key] = deser(data[key]);
+        }
+        return plain;
+      }
+      const instance = Object.create(ctor.prototype) as Record<string, unknown>;
+      for (const key of Object.keys(data)) {
+        instance[key] = deser(data[key]);
+      }
+      return instance;
+    }
+
+    // Already-live registered class instance — pass through as-is
+    const ctor = (obj as object).constructor as Constructor;
+    if (ctorToName.has(ctor)) {
+      return val;
+    }
+
+    // Plain object
+    const result: Record<string, unknown> = {};
+    for (const key of Object.keys(obj)) {
+      result[key] = deser(obj[key]);
+    }
+    return result;
+  }
+
+  return deser(value) as T;
+}

package/src/components/StoryInterface.tsx

@@ -4,7 +4,8 @@ import { tokenize } from '../markup/tokenizer';
 import { buildAST } from '../markup/ast';
 import { renderNodes } from '../markup/render';
 
-const DEFAULT_MARKUP = '{story-title}{back}{forward}{restart}{quicksave}{quickload}{saves}{settings}';
+const DEFAULT_MARKUP =
+  '{story-title}{back}{forward}{restart}{quicksave}{quickload}{saves}{settings}';
 
 export function StoryInterface() {
   const storyData = useStoryStore((s) => s.storyData);

package/src/components/macros/Button.tsx

@@ -1,6 +1,7 @@
 import { useStoryStore } from '../../store';
 import { execute } from '../../expression';
 import { renderInlineNodes } from '../../markup/render';
+import { deepClone } from '../../class-registry';
 import type { ASTNode } from '../../markup/ast';
 
 interface ButtonProps {
@@ -13,8 +14,8 @@ interface ButtonProps {
 export function Button({ rawArgs, children, className, id }: ButtonProps) {
   const handleClick = () => {
     const state = useStoryStore.getState();
-    const vars = structuredClone(state.variables);
-    const temps = structuredClone(state.temporary);
+    const vars = deepClone(state.variables);
+    const temps = deepClone(state.temporary);
 
     try {
       execute(rawArgs, vars, temps);

package/src/components/macros/Cycle.tsx

@@ -33,7 +33,7 @@ export function Cycle({ rawArgs, children, className, id }: CycleProps) {
       class={cls}
       onClick={handleClick}
     >
-      {value == null ? (options[0] || '') : String(value)}
+      {value == null ? options[0] || '' : String(value)}
     </button>
   );
 }

package/src/components/macros/Do.tsx

@@ -2,6 +2,7 @@ import { useLayoutEffect } from 'preact/hooks';
 import { useStoryStore } from '../../store';
 import { execute } from '../../expression';
 import type { ASTNode } from '../../markup/ast';
+import { deepClone } from '../../class-registry';
 
 interface DoProps {
   children: ASTNode[];
@@ -19,8 +20,8 @@ export function Do({ children }: DoProps) {
 
   useLayoutEffect(() => {
     const state = useStoryStore.getState();
-    const vars = { ...state.variables };
-    const temps = { ...state.temporary };
+    const vars = deepClone(state.variables);
+    const temps = deepClone(state.temporary);
 
     try {
       execute(code, vars, temps);

package/src/components/macros/Listbox.tsx

@@ -25,9 +25,7 @@ export function Listbox({ rawArgs, children, className, id }: ListboxProps) {
       id={id}
       class={cls}
       value={value == null ? '' : String(value)}
-      onChange={(e) =>
-        setVariable(name, (e.target as HTMLSelectElement).value)
-      }
+      onChange={(e) => setVariable(name, (e.target as HTMLSelectElement).value)}
     >
       {options.map((opt) => (
         <option

package/src/components/macros/MacroLink.tsx

@@ -1,6 +1,7 @@
 import { useStoryStore } from '../../store';
 import { execute } from '../../expression';
 import type { ASTNode } from '../../markup/ast';
+import { deepClone } from '../../class-registry';
 
 interface MacroLinkProps {
   rawArgs: string;
@@ -42,8 +43,8 @@ function collectText(nodes: ASTNode[]): string {
  */
 function executeChildren(children: ASTNode[]) {
   const state = useStoryStore.getState();
-  const vars = structuredClone(state.variables);
-  const temps = structuredClone(state.temporary);
+  const vars = deepClone(state.variables);
+  const temps = deepClone(state.temporary);
 
   for (const node of children) {
     if (node.type !== 'macro') continue;

package/src/components/macros/Meter.tsx

@@ -0,0 +1,130 @@
+import { useStoryStore } from '../../store';
+import { useContext } from 'preact/hooks';
+import { evaluate } from '../../expression';
+import { LocalsContext } from '../../markup/render';
+
+interface MeterProps {
+  rawArgs: string;
+  className?: string;
+  id?: string;
+}
+
+/**
+ * Parse rawArgs into currentExpr, maxExpr, and optional labelMode.
+ * Supports: {meter $current $max}, {meter $current $max "%"}, etc.
+ */
+function parseArgs(rawArgs: string): {
+  currentExpr: string;
+  maxExpr: string;
+  labelMode: string;
+} {
+  const trimmed = rawArgs.trim();
+
+  // Extract quoted label mode from the end if present
+  let labelMode = '';
+  let rest = trimmed;
+  const quoteMatch = rest.match(/\s+(?:"([^"]*)"|'([^']*)')$/);
+  if (quoteMatch) {
+    labelMode = quoteMatch[1] ?? quoteMatch[2];
+    rest = rest.slice(0, quoteMatch.index!).trim();
+  }
+
+  // Split remaining into two expressions.
+  // Expressions can contain dots, brackets, parens — we need to find the split point.
+  // Strategy: walk tokens, splitting on whitespace that isn't inside parens/brackets.
+  const exprs = splitExpressions(rest);
+  if (exprs.length < 2) {
+    throw new Error(
+      'meter requires two arguments: {meter currentExpr maxExpr}',
+    );
+  }
+
+  return {
+    currentExpr: exprs[0],
+    maxExpr: exprs.slice(1).join(' '),
+    labelMode,
+  };
+}
+
+function splitExpressions(input: string): string[] {
+  const result: string[] = [];
+  let current = '';
+  let depth = 0;
+
+  for (let i = 0; i < input.length; i++) {
+    const ch = input[i];
+    if (ch === '(' || ch === '[') {
+      depth++;
+      current += ch;
+    } else if (ch === ')' || ch === ']') {
+      depth--;
+      current += ch;
+    } else if (/\s/.test(ch) && depth === 0 && current.length > 0) {
+      result.push(current);
+      current = '';
+      // Skip additional whitespace
+      while (i + 1 < input.length && /\s/.test(input[i + 1])) i++;
+    } else {
+      current += ch;
+    }
+  }
+  if (current.length > 0) result.push(current);
+  return result;
+}
+
+function formatLabel(
+  current: number,
+  max: number,
+  labelMode: string,
+): string | null {
+  if (labelMode === 'none') return null;
+  if (labelMode === '%') return `${Math.round((current / max) * 100)}%`;
+  if (labelMode) return `${current} ${labelMode} / ${max} ${labelMode}`;
+  return `${current} / ${max}`;
+}
+
+export function Meter({ rawArgs, className, id }: MeterProps) {
+  const variables = useStoryStore((s) => s.variables);
+  const temporary = useStoryStore((s) => s.temporary);
+  const locals = useContext(LocalsContext);
+
+  // Merge locals into variables for expression evaluation
+  const mergedVars = { ...variables };
+  const mergedTemps = { ...temporary };
+  for (const [key, val] of Object.entries(locals)) {
+    if (key.startsWith('$')) mergedVars[key.slice(1)] = val;
+    else if (key.startsWith('_')) mergedTemps[key.slice(1)] = val;
+  }
+
+  try {
+    const { currentExpr, maxExpr, labelMode } = parseArgs(rawArgs);
+    const current = Number(evaluate(currentExpr, mergedVars, mergedTemps));
+    const max = Number(evaluate(maxExpr, mergedVars, mergedTemps));
+    const pct = Math.max(0, Math.min(100, (current / max) * 100));
+    const label = formatLabel(current, max, labelMode);
+
+    const classes = ['macro-meter', className].filter(Boolean).join(' ');
+
+    return (
+      <div
+        class={classes}
+        id={id}
+      >
+        <div
+          class="macro-meter-fill"
+          style={`width: ${pct}%`}
+        />
+        {label != null && <span class="macro-meter-label">{label}</span>}
+      </div>
+    );
+  } catch (err) {
+    return (
+      <span
+        class="error"
+        title={String(err)}
+      >
+        {`{meter error: ${(err as Error).message}}`}
+      </span>
+    );
+  }
+}

package/src/components/macros/Numberbox.tsx

@@ -7,9 +7,7 @@ interface NumberboxProps {
 }
 
 function parseArgs(rawArgs: string): { varName: string; placeholder: string } {
-  const match = rawArgs.match(
-    /^\s*(["']?\$\w+["']?)\s*(?:["'](.*)["'])?\s*$/,
-  );
+  const match = rawArgs.match(/^\s*(["']?\$\w+["']?)\s*(?:["'](.*)["'])?\s*$/);
   if (!match) {
     return { varName: rawArgs.trim(), placeholder: '' };
   }

package/src/components/macros/Set.tsx

@@ -1,6 +1,7 @@
 import { useLayoutEffect } from 'preact/hooks';
 import { useStoryStore } from '../../store';
 import { execute } from '../../expression';
+import { deepClone } from '../../class-registry';
 
 interface SetProps {
   rawArgs: string;
@@ -9,8 +10,8 @@ interface SetProps {
 export function Set({ rawArgs }: SetProps) {
   useLayoutEffect(() => {
     const state = useStoryStore.getState();
-    const vars = structuredClone(state.variables);
-    const temps = structuredClone(state.temporary);
+    const vars = deepClone(state.variables);
+    const temps = deepClone(state.temporary);
 
     try {
       execute(rawArgs, vars, temps);

package/src/components/macros/Textarea.tsx

@@ -7,9 +7,7 @@ interface TextareaProps {
 }
 
 function parseArgs(rawArgs: string): { varName: string; placeholder: string } {
-  const match = rawArgs.match(
-    /^\s*(["']?\$\w+["']?)\s*(?:["'](.*)["'])?\s*$/,
-  );
+  const match = rawArgs.match(/^\s*(["']?\$\w+["']?)\s*(?:["'](.*)["'])?\s*$/);
   if (!match) {
     return { varName: rawArgs.trim(), placeholder: '' };
   }

package/src/components/macros/Textbox.tsx

@@ -7,9 +7,7 @@ interface TextboxProps {
 }
 
 function parseArgs(rawArgs: string): { varName: string; placeholder: string } {
-  const match = rawArgs.match(
-    /^\s*(["']?\$\w+["']?)\s*(?:["'](.*)["'])?\s*$/,
-  );
+  const match = rawArgs.match(/^\s*(["']?\$\w+["']?)\s*(?:["'](.*)["'])?\s*$/);
   if (!match) {
     return { varName: rawArgs.trim(), placeholder: '' };
   }

package/src/components/macros/Type.tsx

@@ -44,11 +44,7 @@ export function Type({ rawArgs, children, className, id }: TypeProps) {
 
   const done = visibleChars >= totalChars && totalChars > 0;
 
-  const cls = [
-    'macro-type',
-    done ? 'macro-type-done' : '',
-    className || '',
-  ]
+  const cls = ['macro-type', done ? 'macro-type-done' : '', className || '']
     .filter(Boolean)
     .join(' ');
 
@@ -58,10 +54,7 @@ export function Type({ rawArgs, children, className, id }: TypeProps) {
       class={cls}
       ref={containerRef}
       style={{
-        clipPath:
-          totalChars > 0 && !done
-            ? undefined
-            : undefined,
+        clipPath: totalChars > 0 && !done ? undefined : undefined,
       }}
     >
       <span

package/src/index.tsx

@@ -93,11 +93,7 @@ function boot() {
       const widgetTokens = tokenize(passage.content);
       const widgetAST = buildAST(widgetTokens);
       for (const node of widgetAST) {
-        if (
-          node.type === 'macro' &&
-          node.name === 'widget' &&
-          node.rawArgs
-        ) {
+        if (node.type === 'macro' && node.name === 'widget' && node.rawArgs) {
           const widgetName = node.rawArgs.trim().replace(/["']/g, '');
           registerWidget(widgetName, node.children as ASTNode[]);
         }

package/src/markup/ast.ts

@@ -89,11 +89,7 @@ export function buildAST(tokens: Token[]): ASTNode[] {
     if (stack.length === 0) return root;
     const top = stack[stack.length - 1].node;
     // For if-blocks, append to the last branch's children
-    if (
-      top.type === 'macro' &&
-      top.branches &&
-      top.branches.length > 0
-    ) {
+    if (top.type === 'macro' && top.branches && top.branches.length > 0) {
       return top.branches[top.branches.length - 1].children;
     }
     return top.children;
@@ -204,7 +200,8 @@ export function buildAST(tokens: Token[]): ASTNode[] {
         // Handle branch macros (elseif/else, case/default, next)
         if (BRANCH_PARENT[token.name]) {
           const expectedParent = BRANCH_PARENT[token.name];
-          const topNode = stack.length > 0 ? stack[stack.length - 1].node : null;
+          const topNode =
+            stack.length > 0 ? stack[stack.length - 1].node : null;
           if (
             !topNode ||
             topNode.type !== 'macro' ||

package/src/markup/markdown.ts

@@ -1,8 +1,5 @@
 import { micromark } from 'micromark';
-import {
-  gfmTable,
-  gfmTableHtml,
-} from 'micromark-extension-gfm-table';
+import { gfmTable, gfmTableHtml } from 'micromark-extension-gfm-table';
 import {
   gfmStrikethrough,
   gfmStrikethroughHtml,

package/src/markup/render.tsx

@@ -33,6 +33,7 @@ import { Stop } from '../components/macros/Stop';
 import { Type } from '../components/macros/Type';
 import { Widget } from '../components/macros/Widget';
 import { Computed } from '../components/macros/Computed';
+import { Meter } from '../components/macros/Meter';
 import { getWidget } from '../widgets/widget-registry';
 import { getMacro } from '../registry';
 import { markdownToHtml } from './markdown';
@@ -119,6 +120,16 @@ function renderMacro(node: MacroNode, key: number) {
         />
       );
 
+    case 'meter':
+      return (
+        <Meter
+          key={key}
+          rawArgs={node.rawArgs}
+          className={node.className}
+          id={node.id}
+        />
+      );
+
     case 'if':
       return (
         <If
@@ -371,9 +382,7 @@ function renderMacro(node: MacroNode, key: number) {
       );
 
     case 'stop':
-      return (
-        <Stop key={key} />
-      );
+      return <Stop key={key} />;
 
     case 'type':
       return (
@@ -487,9 +496,7 @@ function renderSingleNode(
  * Used for inline containers (button labels, link text) where block-level
  * markdown (lists, headers) would misinterpret content like "-" or "+".
  */
-export function renderInlineNodes(
-  nodes: ASTNode[],
-): preact.ComponentChildren {
+export function renderInlineNodes(nodes: ASTNode[]): preact.ComponentChildren {
   if (nodes.length === 0) return null;
   return nodes.map((node, i) => renderSingleNode(node, i));
 }