@torpor/view 0.0.3 → 0.0.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @torpor/view
 
+## 0.0.4
+
+### Patch Changes
+
+- 76dd6ea: Fix: return on invalid style
+- 8f0a0a1: Fix: replace @for vars in more places
+
 ## 0.0.3
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torpor/view",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Torpor's view library, for writing and mounting components",
   "type": "module",
   "main": "dist/index.cjs",

package/src/compile/build/client/buildElementNode.ts

@@ -13,6 +13,7 @@ import buildFragment from "./buildFragment";
 import buildMount from "./buildMount";
 import buildNode from "./buildNode";
 import buildRun from "./buildRun";
+import replaceForVarNames from "./replaceForVarNames";
 
 export default function buildElementNode(
 	node: ElementNode,
@@ -230,6 +231,8 @@ function buildBindGroupAttribute(
 	status: BuildStatus,
 	b: Builder,
 ) {
+	value = replaceForVarNames(value, status);
+
 	// Automatically add an event to bind the value
 	// TODO: Only tested this with radio buttons
 	let eventName = "change";
@@ -253,6 +256,8 @@ function buildBindAttribute(
 	status: BuildStatus,
 	b: Builder,
 ) {
+	value = replaceForVarNames(value, status);
+
 	// Automatically add an event to bind the value
 	// TODO: Need to check the element to find out what type of event to add
 	let eventName = "input";
@@ -298,14 +303,7 @@ function buildEventAttribute(
 	status: BuildStatus,
 	b: Builder,
 ) {
-	// HACK: If a value from a for loop is used in the function body,
-	// get it from the loop data to trigger an update when it is changed
-	for (let varName of status.forVarNames) {
-		value = value.replaceAll(
-			new RegExp(`([\\s\\(\\[])${varName}([\\s\\.\\(\\)\\[\\];])`, "g"),
-			`$1t_item.data.${varName}$2`,
-		);
-	}
+	value = replaceForVarNames(value, status);
 
 	// Add an event listener, after the fragment has been added
 	const eventName = name.substring(2);
@@ -321,6 +319,8 @@ function buildTransitionAttribute(
 	status: BuildStatus,
 	b: Builder,
 ) {
+	value = replaceForVarNames(value, status);
+
 	status.imports.add("t_animate");
 
 	// Add an in and out transition, after the fragment has been added

package/src/compile/build/client/buildMount.ts

@@ -1,22 +1,17 @@
 import Builder from "../../utils/Builder";
 import { type BuildStatus } from "./BuildStatus";
+import replaceForVarNames from "./replaceForVarNames";
 
-export default function buildRun(
+export default function buildMount(
 	functionName: string,
 	functionBody: string,
 	status: BuildStatus,
 	b: Builder,
 ) {
+	functionBody = replaceForVarNames(functionBody, status);
+
 	status.imports.add("$mount");
 	b.append(`$mount(function ${functionName}() {`);
-	// HACK: If a value from a for loop is used in the function body,
-	// get it from the loop data to trigger an update when it is changed
-	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("});");
 }

package/src/compile/build/client/buildRun.ts

@@ -1,5 +1,6 @@
 import Builder from "../../utils/Builder";
 import { type BuildStatus } from "./BuildStatus";
+import replaceForVarNames from "./replaceForVarNames";
 
 export default function buildRun(
 	functionName: string,
@@ -7,16 +8,10 @@ export default function buildRun(
 	status: BuildStatus,
 	b: Builder,
 ) {
+	functionBody = replaceForVarNames(functionBody, status);
+
 	status.imports.add("$run");
 	b.append(`$run(function ${functionName}() {`);
-	// HACK: If a value from a for loop is used in the function body,
-	// get it from the loop data to trigger an update when it is changed
-	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("});");
 }

package/src/compile/build/client/replaceForVarNames.ts

@@ -0,0 +1,16 @@
+import type { BuildStatus } from "./BuildStatus";
+
+/**
+ * Variables used within a for loop need to be retrieved from the loop data.
+ */
+export default function replaceForVarNames(value: string, status: BuildStatus) {
+	// HACK: If a value from a for loop is used in the function body,
+	// get it from the loop data to trigger an update when it is changed
+	for (let varName of status.forVarNames) {
+		value = value.replaceAll(
+			new RegExp(`([\\s\\(\\[\\{])${varName}([\\s\\.\\(\\)\\[\\]\\};])`, "g"),
+			`$1t_item.data.${varName}$2`,
+		);
+	}
+	return value;
+}

package/src/compile/parse/parseStyles.ts

@@ -70,6 +70,8 @@ function parseStyleBlock(status: ParseStatus): StyleBlock | undefined {
 				} else {
 					break;
 				}
+			} else {
+				return block;
 			}
 			consumeSpace(status);
 		}