@rohal12/spindle 0.10.0 → 0.11.0

package/src/markup/render.tsx

@@ -40,7 +40,9 @@ import { getWidget } from '../widgets/widget-registry';
 import { getMacro } from '../registry';
 import { markdownToHtml } from './markdown';
 import { h } from 'preact';
-import type { ASTNode, Branch, MacroNode } from './ast';
+import type { ASTNode, Branch, HtmlNode, MacroNode, VariableNode } from './ast';
+import { useStoryStore } from '../store';
+import { useInterpolate } from '../hooks/use-interpolate';
 
 export interface LocalsScope {
   values: Record<string, unknown>;
@@ -106,6 +108,19 @@ function convertDomNode(
   return null;
 }
 
+function HtmlNodeRenderer({ node }: { node: HtmlNode }) {
+  const resolve = useInterpolate();
+  const attrs: Record<string, unknown> = {};
+  for (const [k, v] of Object.entries(node.attributes)) {
+    attrs[k] = resolve(v) ?? v;
+  }
+  return h(
+    node.tag,
+    attrs,
+    node.children.length > 0 ? renderNodes(node.children) : undefined,
+  );
+}
+
 function renderMacro(node: MacroNode, key: number) {
   switch (node.name) {
     case 'set':
@@ -381,17 +396,19 @@ function renderMacro(node: MacroNode, key: number) {
         />
       );
 
-    case 'timed':
+    case 'timed': {
+      const firstBranch = node.branches?.[0];
       return (
         <Timed
           key={key}
           rawArgs={node.rawArgs}
           children={node.children}
           branches={node.branches ?? EMPTY_BRANCHES}
-          className={node.className}
-          id={node.id}
+          className={node.className ?? firstBranch?.className}
+          id={node.id ?? firstBranch?.id}
         />
       );
+    }
 
     case 'repeat':
       return (
@@ -513,10 +530,11 @@ function renderSingleNode(
       return renderMacro(node, key);
 
     case 'html':
-      return h(
-        node.tag,
-        { key, ...node.attributes },
-        node.children.length > 0 ? renderNodes(node.children) : undefined,
+      return (
+        <HtmlNodeRenderer
+          key={key}
+          node={node}
+        />
       );
 
     default: {
@@ -536,6 +554,31 @@ export function renderInlineNodes(nodes: ASTNode[]): preact.ComponentChildren {
   return nodes.map((node, i) => renderSingleNode(node, i));
 }
 
+function hasUnclosedBacktick(s: string): boolean {
+  let count = 0;
+  for (let i = 0; i < s.length; i++) {
+    if (s[i] === '`') count++;
+  }
+  return count % 2 === 1;
+}
+
+function getVariableTextValue(node: VariableNode): string {
+  const state = useStoryStore.getState();
+  const parts = node.name.split('.');
+  const root = parts[0]!;
+
+  let value: unknown;
+  if (node.scope === 'variable') value = state.variables[root];
+  else if (node.scope === 'temporary') value = state.temporary[root];
+
+  for (let i = 1; i < parts.length; i++) {
+    if (value == null || typeof value !== 'object') return '';
+    value = (value as Record<string, unknown>)[parts[i]!];
+  }
+
+  return value == null ? '' : String(value);
+}
+
 /**
  * Render AST nodes with full CommonMark markdown support.
  *
@@ -563,7 +606,10 @@ export function renderNodes(nodes: ASTNode[]): preact.ComponentChildren {
   for (let i = 0; i < nodes.length; i++) {
     const node = nodes[i]!;
     if (node.type === 'text') {
-      combined += node.value;
+      combined += node.value.replace(/^[ \t]{4,}/gm, ' ');
+    } else if (node.type === 'variable' && hasUnclosedBacktick(combined)) {
+      // Inline variable value to avoid placeholder inside code span
+      combined += getVariableTextValue(node);
     } else {
       const phIdx = components.length;
       components.push(renderSingleNode(node, i));

package/src/markup/tokenizer.ts

@@ -198,10 +198,32 @@ function parseSelectors(
   while (i < input.length && (input[i] === '.' || input[i] === '#')) {
     const prefix = input[i]!;
     i++; // skip the . or #
-    const nameStart = i;
-    while (i < input.length && /[a-zA-Z0-9_-]/.test(input[i]!)) i++;
-    if (i > nameStart) {
-      const name = input.slice(nameStart, i);
+    let name = '';
+    while (i < input.length) {
+      if (/[a-zA-Z0-9_-]/.test(input[i]!)) {
+        name += input[i];
+        i++;
+      } else if (
+        input[i] === '{' &&
+        (input[i + 1] === '$' || input[i + 1] === '_' || input[i + 1] === '@')
+      ) {
+        // Consume interpolation: {$var}, {_var}, {@var} (with optional dot paths)
+        const braceStart = i;
+        i += 2; // skip { and prefix
+        while (i < input.length && /[\w.]/.test(input[i]!)) i++;
+        if (i < input.length && input[i] === '}') {
+          i++; // skip }
+          name += input.slice(braceStart, i);
+        } else {
+          // Not a valid interpolation — stop
+          i = braceStart;
+          break;
+        }
+      } else {
+        break;
+      }
+    }
+    if (name) {
       if (prefix === '.') {
         classes.push(name);
       } else {
@@ -286,6 +308,15 @@ export function tokenize(input: string): Token[] {
   }
 
   while (i < input.length) {
+    // Handle escaped braces: \{ and \}
+    if (input[i] === '\\' && (input[i + 1] === '{' || input[i + 1] === '}')) {
+      flushText(i);
+      tokens.push({ type: 'text', value: input[i + 1]!, start: i, end: i + 2 });
+      i += 2;
+      textStart = i;
+      continue;
+    }
+
     // Check for [[ link
     if (input[i] === '[' && input[i + 1] === '[') {
       flushText(i);