@torpor/view 0.0.4 → 0.0.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @torpor/view
 
+## 0.0.5
+
+### Patch Changes
+
+- 44cf656: Fix: replace @for vars in even more places
+
 ## 0.0.4
 
 ### Patch Changes

package/dist/compile.cjs

@@ -838,16 +838,22 @@ function getFragmentVarPathPart(path, varPath, status, root = false) {
   return varPath;
 }
 
-// src/compile/build/client/buildRun.ts
-function buildRun(functionName, functionBody, status, b) {
-  status.imports.add("$run");
-  b.append(`$run(function ${functionName}() {`);
+// src/compile/build/client/replaceForVarNames.ts
+function replaceForVarNames(value, status) {
   for (let varName of status.forVarNames) {
-    functionBody = functionBody.replaceAll(
-      new RegExp(`([\\s\\(\\[\\{])${varName}([\\s\\.\\(\\)\\[\\]\\};])`, "g"),
+    value = value.replaceAll(
+      new RegExp(`(^|\\s|\\(|\\[|\\{)${varName}($|\\s|\\.|\\(|\\)|\\[|\\]|\\}|;)`, "g"),
       `$1t_item.data.${varName}$2`
     );
   }
+  return value;
+}
+
+// src/compile/build/client/buildRun.ts
+function buildRun(functionName, functionBody, status, b) {
+  functionBody = replaceForVarNames(functionBody, status);
+  status.imports.add("$run");
+  b.append(`$run(function ${functionName}() {`);
   b.append(functionBody);
   b.append("});");
 }
@@ -1365,15 +1371,10 @@ function buildControlNode(node, status, b) {
 }
 
 // src/compile/build/client/buildMount.ts
-function buildRun2(functionName, functionBody, status, b) {
+function buildMount(functionName, functionBody, status, b) {
+  functionBody = replaceForVarNames(functionBody, status);
   status.imports.add("$mount");
   b.append(`$mount(function ${functionName}() {`);
-  for (let varName of status.forVarNames) {
-    functionBody = functionBody.replaceAll(
-      new RegExp(`([\\s\\(\\[])${varName}([\\s\\.\\(\\)\\[\\];])`, "g"),
-      `$1t_item.data.${varName}$2`
-    );
-  }
   b.append(functionBody);
   b.append("});");
 }
@@ -1506,7 +1507,7 @@ function buildElementAttributes(node, varName, status, b) {
       } else if (name === ":value" || name === ":checked") {
         buildBindAttribute(node, varName, name, value, status, b);
       } else if (name === ":onmount") {
-        buildRun2("elMount", `return (${trimEnd(value.trim(), ";")})(${varName});`, status, b);
+        buildMount("elMount", `return (${trimEnd(value.trim(), ";")})(${varName});`, status, b);
       } else if (name.startsWith("on")) {
         buildEventAttribute(varName, name, value, status, b);
       } else if (name.startsWith(":transition")) {
@@ -1530,6 +1531,7 @@ function buildElementAttributes(node, varName, status, b) {
   }
 }
 function buildBindGroupAttribute(node, varName, value, status, b) {
+  value = replaceForVarNames(value, status);
   let eventName = "change";
   let inputValue = node.attributes.find((a) => a.name === "value")?.value;
   let set = `${value} == ${inputValue}`;
@@ -1542,6 +1544,7 @@ function buildBindGroupAttribute(node, varName, value, status, b) {
 		});`);
 }
 function buildBindAttribute(node, varName, name, value, status, b) {
+  value = replaceForVarNames(value, status);
   let eventName = "input";
   let defaultValue = '""';
   let inputValue = "e.target.value";
@@ -1577,17 +1580,13 @@ function buildBindAttribute(node, varName, name, value, status, b) {
   b.append(`t_event(${varName}, "${eventName}", (e) => ${value} = ${inputValue});`);
 }
 function buildEventAttribute(varName, name, value, status, b) {
-  for (let varName2 of status.forVarNames) {
-    value = value.replaceAll(
-      new RegExp(`([\\s\\(\\[])${varName2}([\\s\\.\\(\\)\\[\\];])`, "g"),
-      `$1t_item.data.${varName2}$2`
-    );
-  }
+  value = replaceForVarNames(value, status);
   const eventName = name.substring(2);
   status.imports.add("t_event");
   b.append(`t_event(${varName}, "${eventName}", ${value});`);
 }
 function buildTransitionAttribute(node, varName, name, value, status, b) {
+  value = replaceForVarNames(value, status);
   status.imports.add("t_animate");
   let entryVarName = nextVarName("trans_in", status);
   let exitVarName = nextVarName("trans_out", status);
@@ -3540,6 +3539,8 @@ function parseStyleBlock(status) {
         } else {
           break;
         }
+      } else {
+        return block;
       }
       consumeSpace(status);
     }