@lark.js/mvc 0.0.14 → 0.0.16

package/dist/compiler.js

@@ -14709,12 +14709,7 @@ function convertArtSyntax(source, debug) {
     } else {
       cleanCode = code.trim();
     }
-    const converted = convertArtExpression(
-      cleanCode,
-      debug,
-      lineNo,
-      blockStack
-    );
+    const converted = convertArtExpression(cleanCode, debug, lineNo, blockStack);
     result.push(converted);
     result.push(rest);
   }
@@ -14959,12 +14954,74 @@ var VOID_ELEMENTS = /* @__PURE__ */ new Set([
 function vdomEscapeStr(s) {
   return s.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\x1e/g, "\\x1e");
 }
+function vdomResolveAttrValueIIFE(rawValue, exprStore) {
+  const stmts = [];
+  let remaining = rawValue;
+  while (remaining.length > 0) {
+    const phIdx = remaining.indexOf("\0");
+    const viIdx = remaining.indexOf("");
+    let nextSpecial = -1;
+    let specialType = null;
+    if (phIdx >= 0 && (viIdx < 0 || phIdx <= viIdx)) {
+      nextSpecial = phIdx;
+      specialType = "ph";
+    } else if (viIdx >= 0) {
+      nextSpecial = viIdx;
+      specialType = "vi";
+    }
+    if (nextSpecial === -1) {
+      if (remaining) stmts.push(`$s+='${vdomEscapeStr(remaining)}'`);
+      break;
+    }
+    if (nextSpecial > 0) {
+      stmts.push(`$s+='${vdomEscapeStr(remaining.substring(0, nextSpecial))}'`);
+    }
+    if (specialType === "vi") {
+      stmts.push(`$s+=$viewId`);
+      remaining = remaining.substring(nextSpecial + 1);
+    } else {
+      const closeIdx = remaining.indexOf("\0", nextSpecial + 1);
+      if (closeIdx === -1) {
+        stmts.push(`$s+='${vdomEscapeStr(remaining.substring(nextSpecial))}'`);
+        break;
+      }
+      const idx = parseInt(remaining.substring(nextSpecial + 1, closeIdx), 10);
+      const expr = exprStore[idx];
+      if (expr.op === "=" || expr.op === ":") {
+        stmts.push(`$s+=$strSafe(${expr.content})`);
+      } else if (expr.op === "!") {
+        if (expr.content.startsWith("$encUri(") && expr.content.endsWith(")")) {
+          stmts.push(`$s+=${expr.content}`);
+        } else {
+          stmts.push(`$s+=$strSafe(${expr.content})`);
+        }
+      } else if (expr.op === "@") {
+        stmts.push(`$s+=$refFn($refAlt,${expr.content})`);
+      } else {
+        stmts.push(expr.content);
+      }
+      remaining = remaining.substring(closeIdx + 1);
+    }
+  }
+  const body = stmts.join(";");
+  return `(()=>{let $s='';${body};return $s;})()`;
+}
 function vdomResolveAttrValue(rawValue, exprStore) {
   const hasPlaceholders = rawValue.includes("\0");
   const hasViewId = rawValue.includes("");
   if (!hasPlaceholders && !hasViewId) {
     return `'${vdomEscapeStr(rawValue)}'`;
   }
+  if (hasPlaceholders) {
+    const codeBlockRegExp = /\x00(\d+)\x00/g;
+    let m;
+    while ((m = codeBlockRegExp.exec(rawValue)) !== null) {
+      const idx = parseInt(m[1], 10);
+      if (exprStore[idx] && exprStore[idx].op === "") {
+        return vdomResolveAttrValueIIFE(rawValue, exprStore);
+      }
+    }
+  }
   const segments = [];
   let remaining = rawValue;
   while (remaining.length > 0) {
@@ -14998,17 +15055,17 @@ function vdomResolveAttrValue(rawValue, exprStore) {
       const idx = parseInt(remaining.substring(nextSpecial + 1, closeIdx));
       const expr = exprStore[idx];
       if (expr.op === "=" || expr.op === ":") {
-        segments.push(`$n(${expr.content})`);
+        segments.push(`$strSafe(${expr.content})`);
       } else if (expr.op === "!") {
         if (expr.content.startsWith("$encUri(") && expr.content.endsWith(")")) {
           segments.push(expr.content);
         } else {
-          segments.push(`$n(${expr.content})`);
+          segments.push(`$strSafe(${expr.content})`);
         }
       } else if (expr.op === "@") {
         segments.push(`$refFn($refAlt,${expr.content})`);
       } else {
-        segments.push(`$n(${expr.content})`);
+        segments.push(`$strSafe(${expr.content})`);
       }
       remaining = remaining.substring(closeIdx + 1);
     }
@@ -15050,14 +15107,7 @@ function compileToVDomFunction(source, debug, file) {
   });
   const rootVar = `$v${varCounter++}`;
   lines.push(`let ${rootVar}=[]`);
-  const maxVars = 30;
-  const varDecls = [];
-  for (let i = 1; i < maxVars; i++) {
-    varDecls.push(`$v${i}`);
-  }
-  lines.push(`let ${varDecls.join(",")}`);
   function allocVar() {
-    if (varCounter >= maxVars) return `$v${maxVars - 1}`;
     return `$v${varCounter++}`;
   }
   function emitNode(node, parentVar) {
@@ -15074,7 +15124,7 @@ function compileToVDomFunction(source, debug, file) {
       if (i % 2 === 0) {
         const trimmed = parts[i];
         if (trimmed.trim()) {
-          lines.push(`${parentVar}.push($c(0,'${vdomEscapeStr(trimmed)}'))`);
+          lines.push(`${parentVar}.push($vdomCreate(0,'${vdomEscapeStr(trimmed)}'))`);
         }
       } else {
         const idx = parseInt(parts[i]);
@@ -15085,15 +15135,15 @@ function compileToVDomFunction(source, debug, file) {
   }
   function emitExpr(expr, parentVar) {
     if (expr.op === "=" || expr.op === ":") {
-      lines.push(`${parentVar}.push($c(0,$n(${expr.content})))`);
+      lines.push(`${parentVar}.push($vdomCreate(0,$strSafe(${expr.content})))`);
     } else if (expr.op === "!") {
       if (expr.content.startsWith("$encUri(") && expr.content.endsWith(")")) {
-        lines.push(`${parentVar}.push($c(0,${expr.content}))`);
+        lines.push(`${parentVar}.push($vdomCreate(0,${expr.content},1))`);
       } else {
-        lines.push(`${parentVar}.push($c(0,$n(${expr.content})))`);
+        lines.push(`${parentVar}.push($vdomCreate(0,$strSafe(${expr.content}),1))`);
       }
     } else if (expr.op === "@") {
-      lines.push(`${parentVar}.push($c(0,$refFn($refAlt,${expr.content})))`);
+      lines.push(`${parentVar}.push($vdomCreate(0,$refFn($refAlt,${expr.content})))`);
     } else if (expr.content) {
       lines.push(expr.content);
     }
@@ -15111,25 +15161,26 @@ function compileToVDomFunction(source, debug, file) {
     }
     const isVoid = VOID_ELEMENTS.has(tagName) && children.length === 0;
     const childrenArg = isVoid ? "1" : childVar;
-    lines.push(
-      `${parentVar}.push($c('${tagName}',${propsKey},${childrenArg}))`
-    );
+    lines.push(`${parentVar}.push($vdomCreate('${tagName}',${propsKey},${childrenArg}))`);
   }
   for (const child of doc.children) {
     emitNode(child, rootVar);
   }
-  lines.push(`return $c($viewId,0,${rootVar})`);
-  const body = lines.join(";");
+  lines.push(`return $vdomCreate($viewId,0,${rootVar})`);
+  const varDeclStmts = [];
+  for (let i = 1; i < varCounter; i++) varDeclStmts.push(`$v${i}`);
+  const varDecl = varDeclStmts.length ? `let ${varDeclStmts.join(",")};` : "";
+  const body = varDecl + lines.join(";");
   let funcBody = body;
   if (debug) {
     const filePart = file ? `\\r\\n\\tat file:${file}` : "";
-    funcBody = `let $dbgExpr,$dbgArt,$dbgLine;try{${body}}catch(ex){let msg='render view error:'+(ex.message||ex);msg+='${filePart}';throw msg;}`;
+    funcBody = `let $dbgExpr,$dbgArt;try{${body}}catch(e){let msg='render error:'+(e.message||e);msg+='${filePart}';throw msg;}`;
   }
   const viewIdRegExp = new RegExp(String.fromCharCode(31), "g");
   funcBody = funcBody.replace(viewIdRegExp, `'+$viewId+'`);
   const refFallback = "if(!$refAlt)$refAlt=$data;";
   const fullSource = `${refFallback}let $splitter='\\x1e'{{VARS}};${funcBody}`;
-  return `($data,$viewId,$refAlt,$n,$refFn,$encUri,$encQuote)=>{${fullSource}}`;
+  return `($data,$viewId,$refAlt,$strSafe,$refFn,$encUri,$encQuote)=>{${fullSource}}`;
 }
 
 // src/compiler/extract-global-vars.ts
@@ -15362,9 +15413,6 @@ var BUILTIN_GLOBALS = /* @__PURE__ */ new Set([
   // conversion, for error reporting. Only present in debug mode.
   // e.g. $dbgArt='{{=user.name}}'
   "$dbgArt",
-  // Debug: source line number — tracks the current line in the template
-  // source, for error reporting. Only present in debug mode.
-  "$dbgLine",
   // RefData alias — fallback reference lookup table.
   // Defaults to $data when no explicit $refAlt is provided.
   // Ensures $refFn() does not crash when @ operator is used without refData.
@@ -15448,19 +15496,14 @@ function compileToFunction(source, debug, file) {
     funcSource += source.substring(index, offset).replace(escapeSlashRegExp, "\\$&").replace(escapeBreakReturnRegExp, "\\n");
     index = offset + match.length;
     if (debug) {
-      let expr = source.substring(
-        index - match.length + 2 + (operate ? 1 : 0),
-        index - 2
-      );
+      let expr = source.substring(index - match.length + 2 + (operate ? 1 : 0), index - 2);
       const x11 = String.fromCharCode(17);
       const artRegExp = new RegExp(`^'(\\d+)${x11}([^${x11}]+)${x11}'$`);
       const artM = expr.match(artRegExp);
       let art = "";
-      let line = -1;
       if (artM) {
         expr = expr.replace(artRegExp, "");
         art = artM[2];
-        line = parseInt(artM[1], 10);
       } else {
         expr = expr.replace(escapeSlashRegExp, "\\$&").replace(escapeBreakReturnRegExp, "\\n");
       }
@@ -15475,8 +15518,8 @@ function compileToFunction(source, debug, file) {
         }
         funcSource += `'+($dbgExpr='<%${operate + expr}%>',${content})+'`;
       } else if (content) {
-        if (line > -1) {
-          funcSource += `';$dbgLine=${line};$dbgArt='${art}';`;
+        if (artM) {
+          funcSource += `';$dbgArt='${art}';`;
           content = "";
         } else {
           funcSource += `';`;
@@ -15515,7 +15558,7 @@ function compileToFunction(source, debug, file) {
   funcSource = funcSource.replace(/\$out\+=''\+/g, "$out+=");
   if (debug) {
     const filePart = file ? `\\r\\n\\tat file:${file}` : "";
-    funcSource = `let $dbgExpr,$dbgArt,$dbgLine;try{${funcSource}}catch(ex){let msg='render view error:'+(ex.message||ex);if($dbgArt)msg+='\\r\\n\\tsrc art:{{'+$dbgArt+'}}\\r\\n\\tat line:'+$dbgLine;msg+='\\r\\n\\t'+($dbgArt?'translate to:':'expr:');msg+=$dbgExpr+'${filePart}';throw msg;}`;
+    funcSource = `let $dbgExpr,$dbgArt;try{${funcSource}}catch(e){let msg='render error:'+(e.message||e);if($dbgArt)msg+='\\r\\n\\tsrc art:{{'+$dbgArt+'}};msg+='\\r\\n\\t'+($dbgArt?'translate to:':'expr:');msg+=$dbgExpr+'${filePart}';throw msg;}`;
   }
   const viewIdRegExp = new RegExp(String.fromCharCode(31), "g");
   funcSource = funcSource.replace(viewIdRegExp, `'+$viewId+'`);
@@ -15535,28 +15578,30 @@ async function compileTemplate(source, options = {}) {
   if (virtualDom) {
     const funcBody2 = compileToVDomFunction(finalSource, debug, file);
     const funcWithVars2 = funcBody2.replace("{{VARS}}", () => varDeclarations);
-    return `import { vdomCreate as __larkC } from "@lark.js/mvc";
+    return `import { vdomCreate as __larkVdomCreate } from "@lark.js/mvc";
 import { strSafe as __larkStrSafe, encUri as __larkEncUri, encQuote as __larkEncQuote, refFn as __larkRefFn } from "@lark.js/mvc/runtime";
-export default function(data, viewId, refData) {
+function __larkTemplate(data, viewId, refData) {
   let $data = data || {},
       $viewId = viewId || '',
-      $c = __larkC,
-      $n = __larkStrSafe;
+      $vdomCreate = __larkVdomCreate,
+      $strSafe = __larkStrSafe;
   return (${funcWithVars2})($data, $viewId, refData,
-    $n, __larkRefFn, __larkEncUri, __larkEncQuote
+    $strSafe, __larkRefFn, __larkEncUri, __larkEncQuote
   );
-}`;
+}
+export default __larkTemplate;`;
   }
   const funcBody = compileToFunction(finalSource, debug, file);
   const funcWithVars = funcBody.replace("{{VARS}}", () => varDeclarations);
   return `import { encHtml as __larkEncHtml, strSafe as __larkStrSafe, encUri as __larkEncUri, encQuote as __larkEncQuote, refFn as __larkRefFn } from "@lark.js/mvc/runtime";
-export default function(data, viewId, refData) {
+function __larkTemplate(data, viewId, refData) {
   let $data = data || {},
       $viewId = viewId || '';
   return (${funcWithVars})($data, $viewId, refData,
     __larkEncHtml, __larkStrSafe, __larkEncUri, __larkRefFn, __larkEncQuote
   );
-}`;
+}
+export default __larkTemplate;`;
 }
 export {
   compileTemplate,