@vertz/ui-compiler 0.2.3 → 0.2.5

package/dist/index.js

@@ -557,8 +557,12 @@ class ReactivityAnalyzer {
         const name = decl.getName();
         const deps = init ? collectIdentifierRefs(init) : [];
         const entry = { start: decl.getStart(), end: decl.getEnd(), deps };
-        if (init?.isKind(SyntaxKind6.CallExpression)) {
-          const callExpr = init.asKindOrThrow(SyntaxKind6.CallExpression);
+        let callInit = init;
+        if (callInit?.isKind(SyntaxKind6.NonNullExpression)) {
+          callInit = callInit.getExpression();
+        }
+        if (callInit?.isKind(SyntaxKind6.CallExpression)) {
+          const callExpr = callInit.asKindOrThrow(SyntaxKind6.CallExpression);
           const callName = callExpr.getExpression();
           if (callName.isKind(SyntaxKind6.Identifier)) {
             const fnName = callName.getText();
@@ -1106,6 +1110,24 @@ function transformComputedReads(source, bodyNode, computeds) {
 
 // src/transformers/jsx-transformer.ts
 import { SyntaxKind as SyntaxKind10 } from "ts-morph";
+function cleanJsxText(raw) {
+  if (!raw.includes(`
+`) && !raw.includes("\r")) {
+    return raw;
+  }
+  const lines = raw.split(/\r\n|\n|\r/);
+  const cleaned = [];
+  for (let i = 0;i < lines.length; i++) {
+    let line = lines[i].replace(/\t/g, " ");
+    if (i > 0)
+      line = line.trimStart();
+    if (i < lines.length - 1)
+      line = line.trimEnd();
+    if (line)
+      cleaned.push(line);
+  }
+  return cleaned.join(" ");
+}
 var varCounter = 0;
 function genVar() {
   return `__el${varCounter++}`;
@@ -1158,7 +1180,7 @@ function transformJsxNode(node, reactiveNames, jsxMap, source, formVarNames = ne
     return transformFragment(node, reactiveNames, jsxMap, source, formVarNames);
   }
   if (node.isKind(SyntaxKind10.JsxText)) {
-    const text = node.getText().trim();
+    const text = cleanJsxText(node.getFullText());
     if (!text)
       return "";
     return `__staticText(${JSON.stringify(text)})`;
@@ -1305,7 +1327,7 @@ function processAttribute(attr, elVar, jsxMap, source) {
 }
 function transformChild(child, reactiveNames, jsxMap, parentVar, source, formVarNames = new Set) {
   if (child.isKind(SyntaxKind10.JsxText)) {
-    const text = child.getText().trim();
+    const text = cleanJsxText(child.getFullText());
     if (!text)
       return null;
     return `__append(${parentVar}, __staticText(${JSON.stringify(text)}))`;
@@ -1325,7 +1347,7 @@ function transformChild(child, reactiveNames, jsxMap, parentVar, source, formVar
         return listCode;
       }
     }
-    const exprText = source.slice(exprNode.getStart(), exprNode.getEnd());
+    const exprText = sliceWithTransformedJsx(exprNode, reactiveNames, jsxMap, source, formVarNames);
     if (exprInfo?.reactive) {
       return `__append(${parentVar}, __child(() => ${exprText}))`;
     }
@@ -1339,7 +1361,7 @@ function transformChild(child, reactiveNames, jsxMap, parentVar, source, formVar
 }
 function transformChildAsValue(child, reactiveNames, jsxMap, source, formVarNames = new Set) {
   if (child.isKind(SyntaxKind10.JsxText)) {
-    const text = child.getText().trim();
+    const text = cleanJsxText(child.getFullText());
     if (!text)
       return null;
     return `__staticText(${JSON.stringify(text)})`;
@@ -1355,7 +1377,7 @@ function transformChildAsValue(child, reactiveNames, jsxMap, source, formVarName
         return conditionalCode;
       }
     }
-    const exprText = source.slice(exprNode.getStart(), exprNode.getEnd());
+    const exprText = sliceWithTransformedJsx(exprNode, reactiveNames, jsxMap, source, formVarNames);
     if (exprInfo?.reactive) {
       return `__child(() => ${exprText})`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertz/ui-compiler",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "type": "module",
   "license": "MIT",
   "description": "Vertz UI compiler — SSR and build-time optimizations",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@ampproject/remapping": "^2.3.0",
-    "@vertz/ui": "0.2.2",
+    "@vertz/ui": "^0.2.2",
     "magic-string": "^0.30.0",
     "ts-morph": "^27.0.2"
   },