@kuratchi/js 0.0.13 → 0.0.15

package/dist/compiler/template.js

@@ -175,10 +175,56 @@ export function compileTemplate(template, componentNames, actionNames, rpcNameMa
             }
         }
         // HTML line → compile {expr} interpolations
-        out.push(compileHtmlLine(line, actionNames, rpcNameMap));
+        // Handle multi-line expressions: if a line has unclosed {, join continuation lines
+        let htmlLine = line;
+        let extraLines = 0;
+        if (hasUnclosedBrace(htmlLine)) {
+            let j = i + 1;
+            while (j < lines.length && hasUnclosedBrace(htmlLine)) {
+                htmlLine += '\n' + lines[j];
+                extraLines++;
+                j++;
+            }
+            i += extraLines;
+        }
+        out.push(compileHtmlLine(htmlLine, actionNames, rpcNameMap));
     }
     return out.join('\n');
 }
+/**
+ * Check if a string has unclosed template braces (more { than }).
+ * Respects string quotes to avoid false positives.
+ */
+function hasUnclosedBrace(src) {
+    let depth = 0;
+    let quote = null;
+    let escaped = false;
+    for (let i = 0; i < src.length; i++) {
+        const ch = src[i];
+        if (quote) {
+            if (escaped) {
+                escaped = false;
+                continue;
+            }
+            if (ch === '\\') {
+                escaped = true;
+                continue;
+            }
+            if (ch === quote)
+                quote = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'" || ch === '`') {
+            quote = ch;
+            continue;
+        }
+        if (ch === '{')
+            depth++;
+        if (ch === '}')
+            depth--;
+    }
+    return depth > 0;
+}
 function advanceHtmlTagState(src, startInTag, startQuote) {
     let inTag = startInTag;
     let quote = startQuote;
@@ -718,7 +764,7 @@ function compileHtmlLine(line, actionNames, rpcNameMap) {
                     continue;
                 }
                 else if (attrName === 'data-poll') {
-                    // data-poll={fn(args)} → data-poll="fnName" data-poll-args="[serialized]"
+                    // data-poll={fn(args)} → data-poll="fnName" data-poll-args="[serialized]" data-poll-id="stable-id"
                     const pollCallMatch = inner.match(/^(\w+)\((.*)\)$/);
                     if (pollCallMatch) {
                         const fnName = pollCallMatch[1];
@@ -726,10 +772,16 @@ function compileHtmlLine(line, actionNames, rpcNameMap) {
                         const argsExpr = pollCallMatch[2].trim();
                         // Remove the trailing "data-poll=" we already appended
                         result = result.replace(/\s*data-poll=$/, '');
-                        // Emit data-poll and data-poll-args attributes
+                        // Emit data-poll, data-poll-args, and stable data-poll-id (based on fn + args expression)
                         result += ` data-poll="${rpcName}"`;
                         if (argsExpr) {
                             result += ` data-poll-args="\${__esc(JSON.stringify([${argsExpr}]))}"`;
+                            // Stable ID based on args so same data produces same ID across renders
+                            result += ` data-poll-id="\${__esc('__poll_' + String(${argsExpr}).replace(/[^a-zA-Z0-9]/g, '_'))}"`;
+                        }
+                        else {
+                            // No args - use function name as ID
+                            result += ` data-poll-id="__poll_${rpcName}"`;
                         }
                     }
                     hasExpr = true;
@@ -861,33 +913,33 @@ function findClosingBrace(src, openPos) {
  */
 export function generateRenderFunction(template) {
     const body = compileTemplate(template);
-    return `function render(data) {
-  const __rawHtml = (v) => {
-    if (v == null) return '';
-    return String(v);
-  };
-  const __sanitizeHtml = (v) => {
-    let html = __rawHtml(v);
-    html = html.replace(/<script\\b[^>]*>[\\s\\S]*?<\\/script>/gi, '');
-    html = html.replace(/<iframe\\b[^>]*>[\\s\\S]*?<\\/iframe>/gi, '');
-    html = html.replace(/<object\\b[^>]*>[\\s\\S]*?<\\/object>/gi, '');
-    html = html.replace(/<embed\\b[^>]*>/gi, '');
-    html = html.replace(/\\son[a-z]+\\s*=\\s*(\"[^\"]*\"|'[^']*'|[^\\s>]+)/gi, '');
-    html = html.replace(/\\s(href|src|xlink:href)\\s*=\\s*([\"'])\\s*javascript:[\\s\\S]*?\\2/gi, ' $1="#"');
-    html = html.replace(/\\s(href|src|xlink:href)\\s*=\\s*javascript:[^\\s>]+/gi, ' $1="#"');
-    html = html.replace(/\\ssrcdoc\\s*=\\s*(\"[^\"]*\"|'[^']*'|[^\\s>]+)/gi, '');
-    return html;
-  };
-  const __esc = (v) => {
-    if (v == null) return '';
-    return String(v)
-      .replace(/&/g, '&amp;')
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
-      .replace(/"/g, '&quot;')
-      .replace(/'/g, '&#39;');
-  };
-  ${body}
+    return `function render(data) {
+  const __rawHtml = (v) => {
+    if (v == null) return '';
+    return String(v);
+  };
+  const __sanitizeHtml = (v) => {
+    let html = __rawHtml(v);
+    html = html.replace(/<script\\b[^>]*>[\\s\\S]*?<\\/script>/gi, '');
+    html = html.replace(/<iframe\\b[^>]*>[\\s\\S]*?<\\/iframe>/gi, '');
+    html = html.replace(/<object\\b[^>]*>[\\s\\S]*?<\\/object>/gi, '');
+    html = html.replace(/<embed\\b[^>]*>/gi, '');
+    html = html.replace(/\\son[a-z]+\\s*=\\s*(\"[^\"]*\"|'[^']*'|[^\\s>]+)/gi, '');
+    html = html.replace(/\\s(href|src|xlink:href)\\s*=\\s*([\"'])\\s*javascript:[\\s\\S]*?\\2/gi, ' $1="#"');
+    html = html.replace(/\\s(href|src|xlink:href)\\s*=\\s*javascript:[^\\s>]+/gi, ' $1="#"');
+    html = html.replace(/\\ssrcdoc\\s*=\\s*(\"[^\"]*\"|'[^']*'|[^\\s>]+)/gi, '');
+    return html;
+  };
+  const __esc = (v) => {
+    if (v == null) return '';
+    return String(v)
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#39;');
+  };
+  ${body}
 }`;
 }
 import { transpileTypeScript } from './transpile.js';

package/dist/runtime/types.d.ts

@@ -129,20 +129,6 @@ export interface kuratchiConfig<E extends Env = Env> {
         /** DO source files (e.g. ['auth.do.ts', 'sites.do.ts']) */
         files?: string[];
     }>;
-    /** Container classes exported into the generated worker entry. */
-    containers?: Record<string, string | {
-        /** Relative path from project root. Must end in `.container.ts|js|mjs|cjs`. */
-        file: string;
-        /** Optional override; inferred from exported class in `file` when omitted. */
-        className?: string;
-    }>;
-    /** Workflow classes exported into the generated worker entry. */
-    workflows?: Record<string, string | {
-        /** Relative path from project root. Must end in `.workflow.ts|js|mjs|cjs`. */
-        file: string;
-        /** Optional override; inferred from exported class in `file` when omitted. */
-        className?: string;
-    }>;
 }
 /** Auth configuration for kuratchi.config.ts */
 export interface AuthConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kuratchi/js",
-    "version": "0.0.13",
+    "version": "0.0.15",
     "description": "A thin, Cloudflare Workers-native web framework with Svelte-inspired syntax",
     "license": "MIT",
     "type": "module",