release: WRNexusJS 0.2.38

2026-07-15 10:26:24 +05:30
parent 17a535d4dc
commit 98445c2ec7
56 changed files with 311 additions and 104 deletions
@@ -430,17 +430,16 @@ function renderPageComponentInvocation(
  loops: string[],
  reactive: PageReactive | null,
 ): string {
-  const attrs = node.attrs.filter((attr) => attr.name !== "data-component");
+  const attrs = node.attrs
+    .filter((attr) => attr.name !== "data-component")
+    .map((attr) => renderPageComponentAttr(attr, loops))
+    .join("");

  const inner = node.children
    .map((child) => renderNode(child, ssrBindings, csrBindings, apiBindings, loops, reactive))
    .join("");

-  return `<div data-component="${attrEscape(node.tag)}"${renderAttrs(
-    attrs,
-    undefined,
-    reactive,
-  )}>${inner}</div>`;
+  return `<div data-component="${attrEscape(node.tag)}"` + `${attrs}>${inner}</div>`;
 }

 function renderNestedComponentInvocation(
@@ -462,9 +461,19 @@ function renderNestedComponentInvocation(
        return ` ${attr.name}`;
      }

-      const rendered = ` ${attr.name}="` + `${compileAttrValue(attr.value, ctx)}"`;
+      const wholeExpression = wholeAttributeExpression(attr.value);

-      if (!attr.value.includes("{") || !exprRefsState(attr.value, ctx.stateNames)) {
+      const compiledValue = wholeExpression
+        ? `\${__wireProp(${ctx.resolveExpr(wholeExpression)})}`
+        : compileAttrValue(attr.value, ctx);
+
+      const rendered = ` ${attr.name}="${compiledValue}"`;
+
+      if (
+        wholeExpression ||
+        !attr.value.includes("{") ||
+        !exprRefsState(attr.value, ctx.stateNames)
+      ) {
        return rendered;
      }

@@ -591,6 +600,28 @@ function __wrnexusEvalData(data: unknown, body: string, helpers = "", ctx: any):
  return new Function("$data", "$adapters", "const cookies = $adapters.cookies;\\nconst session = $adapters.session;\\nconst localStorage = $adapters.localStorage;\\nwith ($data ?? {}) {\\n" + helpers + "\\n" + body + "\\n}")(data, adapters);
 }

+function __wrnexusPropAttr(
+  value: unknown,
+): string {
+  const serialized =
+    value !== null &&
+    typeof value === "object"
+      ? JSON.stringify(value)
+      : String(value == null ? "" : value);
+
+  return serialized.replace(
+    /[&<>"]/g,
+    (character) =>
+      character === "&"
+        ? "&amp;"
+        : character === "<"
+          ? "&lt;"
+          : character === ">"
+            ? "&gt;"
+            : "&quot;",
+  );
+}
+
 async function __wrnexusCallApi(path: string, method: string, ctx: any): Promise<unknown> {
  if (typeof ctx.__wrnexusCallApi === "function") {
    return await ctx.__wrnexusCallApi(path, method);
@@ -1256,19 +1287,101 @@ function generateComponent(ast: PageAst): string {
  }

  out.push(`function __coerce(v: any, def: any): any {
-  if (v === undefined || v === null) return def;
-  if (typeof def === "number") return Number(v);
-  if (typeof def === "boolean") return v === true || v === "" || v === "true";
+  if (v === undefined || v === null) {
+    return def;
+  }
+
+  if (typeof def === "number") {
+    return Number(v);
+  }
+
+  if (typeof def === "boolean") {
+    return v === true || v === "" || v === "true";
+  }
+
+  if (Array.isArray(def)) {
+    if (Array.isArray(v)) {
+      return v;
+    }
+
+    if (typeof v === "string") {
+      try {
+        const parsed = JSON.parse(v);
+        return Array.isArray(parsed) ? parsed : def;
+      } catch {
+        return def;
+      }
+    }
+
+    return def;
+  }
+
+  if (def !== null && typeof def === "object") {
+    if (
+      v !== null &&
+      typeof v === "object" &&
+      !Array.isArray(v)
+    ) {
+      return v;
+    }
+
+    if (typeof v === "string") {
+      try {
+        const parsed = JSON.parse(v);
+
+        return (
+          parsed !== null &&
+          typeof parsed === "object" &&
+          !Array.isArray(parsed)
+        )
+          ? parsed
+          : def;
+      } catch {
+        return def;
+      }
+    }
+
+    return def;
+  }
+
  return String(v);
 }
+
 function __wireHtml(v: any): string {
-  return String(v == null ? "" : v).replace(/[&<>]/g, (c) => (c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&gt;"));
-}
-function __wireAttr(v: any): string {
-  return String(v == null ? "" : v).replace(/[&<>"]/g, (c) =>
-    c === "&" ? "&amp;" : c === "<" ? "&lt;" : c === ">" ? "&gt;" : "&quot;",
+  return String(v == null ? "" : v).replace(
+    /[&<>]/g,
+    (c) =>
+      c === "&"
+        ? "&amp;"
+        : c === "<"
+          ? "&lt;"
+          : "&gt;",
  );
 }
+
+function __wireAttr(v: any): string {
+  return String(v == null ? "" : v).replace(
+    /[&<>"]/g,
+    (c) =>
+      c === "&"
+        ? "&amp;"
+        : c === "<"
+          ? "&lt;"
+          : c === ">"
+            ? "&gt;"
+            : "&quot;",
+  );
+}
+
+function __wireProp(v: any): string {
+  const value =
+    v !== null && typeof v === "object"
+      ? JSON.stringify(v)
+      : String(v == null ? "" : v);
+
+  return __wireAttr(value);
+}
+
 function __wireRaw(v: any): string {
  return String(v == null ? "" : v);
 }`);
@@ -1301,12 +1414,51 @@ function __wireRaw(v: any): string {
  return out.join("\n\n") + "\n";
 }

+function __wireRaw(v: any): string {
+  return String(v == null ? "" : v);
+}
+
+function wholeAttributeExpression(value: string): string | null {
+  const match = /^\s*\{([\s\S]+)\}\s*$/.exec(value);
+
+  return match?.[1]?.trim() || null;
+}
 function __wireHtml(v: any): string {
  return String(v == null ? "" : v).replace(/[&<>]/g, (c) =>
    c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&gt;",
  );
 }

-function __wireRaw(v: any): string {
-  return String(v == null ? "" : v);
+function __wireAttr(v: any): string {
+  return String(v == null ? "" : v).replace(/[&<>"]/g, (c) =>
+    c === "&" ? "&amp;" : c === "<" ? "&lt;" : c === ">" ? "&gt;" : "&quot;",
+  );
+}
+
+function __wireProp(v: any): string {
+  const value =
+    v !== null && typeof v === "object" ? JSON.stringify(v) : String(v == null ? "" : v);
+
+  return __wireAttr(value);
+}
+function renderPageComponentAttr(attr: Attr, dynamicExpressions: string[]): string {
+  if (attr.event) {
+    return ` ${eventAttribute(attr.name)}="${attrEscape(attr.value)}"`;
+  }
+
+  if (attr.boolean) {
+    return ` ${attr.name}`;
+  }
+
+  const expression = wholeAttributeExpression(attr.value);
+
+  if (!expression) {
+    return ` ${attr.name}="${attrEscape(attr.value)}"`;
+  }
+
+  dynamicExpressions.push(`\${__wrnexusPropAttr(${expression})}`);
+
+  const marker = `\x00WRNEACH${dynamicExpressions.length - 1}\x00`;
+
+  return ` ${attr.name}="${marker}"`;
 }