@torpor/view 0.4.13 → 0.4.14

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @torpor/view
 
+## 0.4.14
+
+### Patch Changes
+
+- 9bca98e: Feat: mapping for interpolated attribute values
+- 7382b6d: Fix: allow null and undefined in classes and styles
+- d68d347: Fix: some mapping
+- 4e3d726: Fix: ifs and switches in @heads don't add elements
+- adfa504: Fix: ok I think those types are finally right
+
 ## 0.4.13
 
 ### Patch Changes

package/dist/{Cleanup-BGQ5zaxE.d.cts → Cleanup-CYsytTEc.d.cts}

@@ -6,4 +6,4 @@
 type Cleanup = () => void;
 //#endregion
 export { Cleanup as t };
-//# sourceMappingURL=Cleanup-BGQ5zaxE.d.cts.map
+//# sourceMappingURL=Cleanup-CYsytTEc.d.cts.map

package/dist/Cleanup-CYsytTEc.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Cleanup-CYsytTEc.d.cts","names":[],"sources":["../src/types/Cleanup.ts"],"sourcesContent":[],"mappings":";;;;;KAIK,OAAA"}

package/dist/{Cleanup-Ca8IspaG.d.ts → Cleanup-CgjyN0lW.d.mts}

@@ -6,4 +6,4 @@
 type Cleanup = () => void;
 //#endregion
 export { Cleanup as t };
-//# sourceMappingURL=Cleanup-Ca8IspaG.d.ts.map
+//# sourceMappingURL=Cleanup-CgjyN0lW.d.mts.map

package/dist/Cleanup-CgjyN0lW.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Cleanup-CgjyN0lW.d.mts","names":[],"sources":["../src/types/Cleanup.ts"],"sourcesContent":[],"mappings":";;;;;KAIK,OAAA"}

package/dist/{Component-BDUCwkBQ.d.cts → Component-DmWGMgak.d.mts}

@@ -8,4 +8,4 @@ type SlotRender = ($sparent: ParentNode, $sanchor: Node | null, $sprops?: Record
 type Component = ($parent: ParentNode, $anchor: Node | null, $props?: Record<PropertyKey, any>, $context?: Record<PropertyKey, any>, $slots?: Record<string, SlotRender>) => void;
 //#endregion
 export { SlotRender as n, Component as t };
-//# sourceMappingURL=Component-BDUCwkBQ.d.cts.map
+//# sourceMappingURL=Component-DmWGMgak.d.mts.map

package/dist/{Component-BDUCwkBQ.d.cts.map → Component-DmWGMgak.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"Component-BDUCwkBQ.d.cts","names":[],"sources":["../src/types/SlotRender.ts","../src/types/Component.ts"],"sourcesContent":[],"mappings":";KAAK,UAAA,cACM,sBACA,uBACA,OAAO,8BACN,OAAO;;;;;;KCCd,SAAA,GDFa,CAAA,OAAA,ECGR,UDHQ,EAAA,OAAA,ECIR,IDJQ,GAAA,IAAA,EAAA,MAAA,CAAA,ECKR,MDLQ,CCKD,WDLC,EAAA,GAAA,CAAA,EAAA,QAAA,CAAA,ECMN,MDNM,CCMC,WDND,EAAA,GAAA,CAAA,EAAA,MAAA,CAAA,ECOR,MDPQ,CAAA,MAAA,ECOO,UDPP,CAAA,EAAA,GAAA,IAAA"}
+{"version":3,"file":"Component-DmWGMgak.d.mts","names":[],"sources":["../src/types/SlotRender.ts","../src/types/Component.ts"],"sourcesContent":[],"mappings":";KAAK,UAAA,cACM,sBACA,uBACA,OAAO,8BACN,OAAO;;;;;;KCCd,SAAA,GDFa,CAAA,OAAA,ECGR,UDHQ,EAAA,OAAA,ECIR,IDJQ,GAAA,IAAA,EAAA,MAAA,CAAA,ECKR,MDLQ,CCKD,WDLC,EAAA,GAAA,CAAA,EAAA,QAAA,CAAA,ECMN,MDNM,CCMC,WDND,EAAA,GAAA,CAAA,EAAA,MAAA,CAAA,ECOR,MDPQ,CAAA,MAAA,ECOO,UDPP,CAAA,EAAA,GAAA,IAAA"}

package/dist/{Component-JVwSemf-.d.ts → Component-kGLRFYg2.d.cts}

@@ -8,4 +8,4 @@ type SlotRender = ($sparent: ParentNode, $sanchor: Node | null, $sprops?: Record
 type Component = ($parent: ParentNode, $anchor: Node | null, $props?: Record<PropertyKey, any>, $context?: Record<PropertyKey, any>, $slots?: Record<string, SlotRender>) => void;
 //#endregion
 export { SlotRender as n, Component as t };
-//# sourceMappingURL=Component-JVwSemf-.d.ts.map
+//# sourceMappingURL=Component-kGLRFYg2.d.cts.map

package/dist/Component-kGLRFYg2.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Component-kGLRFYg2.d.cts","names":[],"sources":["../src/types/SlotRender.ts","../src/types/Component.ts"],"sourcesContent":[],"mappings":";KAAK,UAAA,cACM,sBACA,uBACA,OAAO,8BACN,OAAO;;;;;;KCCd,SAAA,GDFa,CAAA,OAAA,ECGR,UDHQ,EAAA,OAAA,ECIR,IDJQ,GAAA,IAAA,EAAA,MAAA,CAAA,ECKR,MDLQ,CCKD,WDLC,EAAA,GAAA,CAAA,EAAA,QAAA,CAAA,ECMN,MDNM,CCMC,WDND,EAAA,GAAA,CAAA,EAAA,MAAA,CAAA,ECOR,MDPQ,CAAA,MAAA,ECOO,UDPP,CAAA,EAAA,GAAA,IAAA"}

package/dist/{Region-BrsZLZUe.d.ts → Region-Bb6HAb-F.d.cts}

@@ -1,4 +1,4 @@
-import { t as Cleanup } from "./Cleanup-Ca8IspaG.js";
+import { t as Cleanup } from "./Cleanup-CYsytTEc.cjs";
 
 //#region src/types/constants.d.ts
 /**
@@ -198,4 +198,4 @@ interface Region {
 }
 //#endregion
 export { Computed as i, Effect as n, ProxySignal as r, Region as t };
-//# sourceMappingURL=Region-BrsZLZUe.d.ts.map
+//# sourceMappingURL=Region-Bb6HAb-F.d.cts.map

package/dist/{Region-Cf7OeBIQ.d.cts.map → Region-Bb6HAb-F.d.cts.map}

@@ -1 +1 @@
-{"version":3,"file":"Region-Cf7OeBIQ.d.cts","names":[],"sources":["../src/types/constants.ts","../src/types/Computed.ts","../src/types/ProxySignal.ts","../src/types/Subscription.ts","../src/types/Effect.ts","../src/types/Region.ts"],"sourcesContent":[],"mappings":";;;;;;AAGa,cAAA,WAAA,GAAA,CAAA;AAKb;AAKA;;cALa,aAAA;;ACPiB;;AAgBtB,cDJK,WAAA,GCIL,CAAA;;;;ADdR;AAKA;AAKA;;UCLyB;;AAPK;;EAgBtB,IAAA,EAAA,OALM,aAKN;EAKI;;;EAiCD,KAAA,EAtCH,CAsCG;EAAA;;;aAjCC;ECrBgB;;;EAoBP,WAAA,EDMP,YCNO,GAAA,IAAA;EAAA;;;eDWP;EE9Be;;;;;;EA2BhB,MAAA,EAAA,OAAA;EAQI;;;;;ACnCW;;EAehB,QAAA,EAAA,OAAA;EAKF;;;EAoBQ,QAAA,EHaP,YGbO,GAAA,IAAA;EAAA;;;;;;;;AJvClB;AAKA;AAKA;UENyB,WAAA;;;ADNK;EAWhB,IAAA,EAAA,OCDA,WDCA;EAKN;;;EAeM,WAAA,EChBA,YDgBA,GAAA,IAAA;EAuBH;;;sBClCU;;AApBO;;EAed,IAAA,CAAA,EAAA,MAAA;;;;AFbd;AAKA;AAKA;;UGLyB,YAAA;;AFPK;;EAgBtB,MAAA,EELC,WFKD,GELe,QFKf;EAKI;;;EAiCD,MAAA,EEtCF,QFsCE,GEtCS,MFsCT;EAAA;;;;ECtDiB,UAMH,ECgBZ,YDhBY,GAAA,IAAA;EAIX;;;;cCkBD;;;AA3BgB;;;;EAeT,cAAA,EAoBH,YApBG,GAAA,IAAA;EAMP;;;;;;;ACrBe;;;EAoBlB,MAAA,EAAA,OAAA;EAKI;;;EAeI,IAAA,CAAA,EAAA,MAAA;;;;AJvClB;AAKA;AAKA;UINyB,MAAA;;;AHNK;EAWhB,IAAA,EAAA,OGDA,WHCA;EAKN;;;;EAsCG,GAAA,EAAA,GAAA,GGtCC,OHsCD,GAAA,IAAA;EAAA;;;WGjCD;EFrBkB;;;EAoBP,WAAA,EEMP,YFNO,GAAA,IAAA;EAAA,UAAA,EEWR,MFXQ,GAAA,IAAA;;;;ECnBQ,MAMJ,EAAA,MAAA;EAIhB;;;EAKW,eAAA,ECyBF,MDzBE,GAAA,IAAA;EAMP;;;EAcI,QAAA,EAAA,OAAA;;;;ECnCW,IAKH,CAAA,EAAA,MAAA;;;;UCPA,MAAA;aACb;WACF;ELCV,cAAa,EKCI,MLDJ,GAAA,IAAA;EAKb,UAAa,EKHA,MLGA,GAAA,IAAA;EAKb,KAAa,EAAA,MAAA;;;;ACZiB;EAWhB,UAAA,EIAD,GJAC,CIAG,SJAH,CAAA,GAAA,IAAA;EAKN;;;EAeM,IAAA,CAAA,EAAA,MAAA"}
+{"version":3,"file":"Region-Bb6HAb-F.d.cts","names":[],"sources":["../src/types/constants.ts","../src/types/Computed.ts","../src/types/ProxySignal.ts","../src/types/Subscription.ts","../src/types/Effect.ts","../src/types/Region.ts"],"sourcesContent":[],"mappings":";;;;;;AAGa,cAAA,WAAA,GAAA,CAAA;AAKb;AAKA;;cALa,aAAA;;ACPiB;;AAgBtB,cDJK,WAAA,GCIL,CAAA;;;;ADdR;AAKA;AAKA;;UCLyB;;AAPK;;EAgBtB,IAAA,EAAA,OALM,aAKN;EAKI;;;EAiCD,KAAA,EAtCH,CAsCG;EAAA;;;aAjCC;ECrBgB;;;EAoBP,WAAA,EDMP,YCNO,GAAA,IAAA;EAAA;;;eDWP;EE9Be;;;;;;EA2BhB,MAAA,EAAA,OAAA;EAQI;;;;;ACnCW;;EAehB,QAAA,EAAA,OAAA;EAKF;;;EAoBQ,QAAA,EHaP,YGbO,GAAA,IAAA;EAAA;;;;;;;;AJvClB;AAKA;AAKA;UENyB,WAAA;;;ADNK;EAWhB,IAAA,EAAA,OCDA,WDCA;EAKN;;;EAeM,WAAA,EChBA,YDgBA,GAAA,IAAA;EAuBH;;;sBClCU;;AApBO;;EAed,IAAA,CAAA,EAAA,MAAA;;;;AFbd;AAKA;AAKA;;UGLyB,YAAA;;AFPK;;EAgBtB,MAAA,EELC,WFKD,GELe,QFKf;EAKI;;;EAiCD,MAAA,EEtCF,QFsCE,GEtCS,MFsCT;EAAA;;;;ECtDiB,UAMH,ECgBZ,YDhBY,GAAA,IAAA;EAIX;;;;cCkBD;;;AA3BgB;;;;EAeT,cAAA,EAoBH,YApBG,GAAA,IAAA;EAMP;;;;;;;ACrBe;;;EAoBlB,MAAA,EAAA,OAAA;EAKI;;;EAeI,IAAA,CAAA,EAAA,MAAA;;;;AJvClB;AAKA;AAKA;UINyB,MAAA;;;AHNK;EAWhB,IAAA,EAAA,OGDA,WHCA;EAKN;;;;EAsCG,GAAA,EAAA,GAAA,GGtCC,OHsCD,GAAA,IAAA;EAAA;;;WGjCD;EFrBkB;;;EAoBP,WAAA,EEMP,YFNO,GAAA,IAAA;EAAA,UAAA,EEWR,MFXQ,GAAA,IAAA;;;;ECnBQ,MAMJ,EAAA,MAAA;EAIhB;;;EAKW,eAAA,ECyBF,MDzBE,GAAA,IAAA;EAMP;;;EAcI,QAAA,EAAA,OAAA;;;;ECnCW,IAKH,CAAA,EAAA,MAAA;;;;UCPA,MAAA;aACb;WACF;ELCV,cAAa,EKCI,MLDJ,GAAA,IAAA;EAKb,UAAa,EKHA,MLGA,GAAA,IAAA;EAKb,KAAa,EAAA,MAAA;;;;ACZiB;EAWhB,UAAA,EIAD,GJAC,CIAG,SJAH,CAAA,GAAA,IAAA;EAKN;;;EAeM,IAAA,CAAA,EAAA,MAAA"}

package/dist/{Region-Cf7OeBIQ.d.cts → Region-CTchywkr.d.mts}

@@ -1,4 +1,4 @@
-import { t as Cleanup } from "./Cleanup-BGQ5zaxE.cjs";
+import { t as Cleanup } from "./Cleanup-CgjyN0lW.mjs";
 
 //#region src/types/constants.d.ts
 /**
@@ -198,4 +198,4 @@ interface Region {
 }
 //#endregion
 export { Computed as i, Effect as n, ProxySignal as r, Region as t };
-//# sourceMappingURL=Region-Cf7OeBIQ.d.cts.map
+//# sourceMappingURL=Region-CTchywkr.d.mts.map

package/dist/Region-CTchywkr.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Region-CTchywkr.d.mts","names":[],"sources":["../src/types/constants.ts","../src/types/Computed.ts","../src/types/ProxySignal.ts","../src/types/Subscription.ts","../src/types/Effect.ts","../src/types/Region.ts"],"sourcesContent":[],"mappings":";;;;;;AAGa,cAAA,WAAA,GAAA,CAAA;AAKb;AAKA;;cALa,aAAA;;ACPiB;;AAgBtB,cDJK,WAAA,GCIL,CAAA;;;;ADdR;AAKA;AAKA;;UCLyB;;AAPK;;EAgBtB,IAAA,EAAA,OALM,aAKN;EAKI;;;EAiCD,KAAA,EAtCH,CAsCG;EAAA;;;aAjCC;ECrBgB;;;EAoBP,WAAA,EDMP,YCNO,GAAA,IAAA;EAAA;;;eDWP;EE9Be;;;;;;EA2BhB,MAAA,EAAA,OAAA;EAQI;;;;;ACnCW;;EAehB,QAAA,EAAA,OAAA;EAKF;;;EAoBQ,QAAA,EHaP,YGbO,GAAA,IAAA;EAAA;;;;;;;;AJvClB;AAKA;AAKA;UENyB,WAAA;;;ADNK;EAWhB,IAAA,EAAA,OCDA,WDCA;EAKN;;;EAeM,WAAA,EChBA,YDgBA,GAAA,IAAA;EAuBH;;;sBClCU;;AApBO;;EAed,IAAA,CAAA,EAAA,MAAA;;;;AFbd;AAKA;AAKA;;UGLyB,YAAA;;AFPK;;EAgBtB,MAAA,EELC,WFKD,GELe,QFKf;EAKI;;;EAiCD,MAAA,EEtCF,QFsCE,GEtCS,MFsCT;EAAA;;;;ECtDiB,UAMH,ECgBZ,YDhBY,GAAA,IAAA;EAIX;;;;cCkBD;;;AA3BgB;;;;EAeT,cAAA,EAoBH,YApBG,GAAA,IAAA;EAMP;;;;;;;ACrBe;;;EAoBlB,MAAA,EAAA,OAAA;EAKI;;;EAeI,IAAA,CAAA,EAAA,MAAA;;;;AJvClB;AAKA;AAKA;UINyB,MAAA;;;AHNK;EAWhB,IAAA,EAAA,OGDA,WHCA;EAKN;;;;EAsCG,GAAA,EAAA,GAAA,GGtCC,OHsCD,GAAA,IAAA;EAAA;;;WGjCD;EFrBkB;;;EAoBP,WAAA,EEMP,YFNO,GAAA,IAAA;EAAA,UAAA,EEWR,MFXQ,GAAA,IAAA;;;;ECnBQ,MAMJ,EAAA,MAAA;EAIhB;;;EAKW,eAAA,ECyBF,MDzBE,GAAA,IAAA;EAMP;;;EAcI,QAAA,EAAA,OAAA;;;;ECnCW,IAKH,CAAA,EAAA,MAAA;;;;UCPA,MAAA;aACb;WACF;ELCV,cAAa,EKCI,MLDJ,GAAA,IAAA;EAKb,UAAa,EKHA,MLGA,GAAA,IAAA;EAKb,KAAa,EAAA,MAAA;;;;ACZiB;EAWhB,UAAA,EIAD,GJAC,CIAG,SJAH,CAAA,GAAA,IAAA;EAKN;;;EAeM,IAAA,CAAA,EAAA,MAAA"}

package/dist/compile.cjs

@@ -300,6 +300,28 @@ function nextVarName(name, status) {
 	return varName;
 }
 
+//#endregion
+//#region src/compile/build/client/addMappedTextWithOffsets.ts
+function addMappedTextWithOffsets(preText, text, postText, spans, offsets, lengths, status, b) {
+	if (status.options.mapped === true) {
+		let mappedStart = b.toString().length + preText.length;
+		let functionBody = preText + text + postText;
+		b.append(functionBody);
+		for (let i = 0; i < spans.length; i++) {
+			let start = mappedStart + offsets[i];
+			let end = start + lengths[i];
+			status.map.push({
+				script: functionBody,
+				source: spans[i],
+				compiled: {
+					start,
+					end
+				}
+			});
+		}
+	} else b.append(preText + text + postText);
+}
+
 //#endregion
 //#region src/compile/build/client/buildAddFragment.ts
 function buildAddFragment(node, status, b, parentName, anchorName) {
@@ -310,19 +332,7 @@ function buildAddFragment(node, status, b, parentName, anchorName) {
 		if (fragment.effects.length > 0) {
 			status.imports.add("$run");
 			b.append("$run(() => {");
-			if (status.options.mapped === true) for (let effect of fragment.effects) for (let i = 0; i < effect.spans.length; i++) {
-				let start = b.toString().length + effect.offsets[i];
-				b.append(effect.functionBody);
-				let end = start + effect.lengths[i];
-				status.map.push({
-					script: effect.functionBody,
-					source: effect.spans[i],
-					compiled: {
-						start,
-						end
-					}
-				});
-			}
+			if (status.options.mapped === true) for (let effect of fragment.effects) addMappedTextWithOffsets("", effect.functionBody, "", effect.spans, effect.offsets, effect.lengths, status, b);
 			else b.append(fragment.effects.map((e) => e.functionBody).join("\n"));
 			b.append(`}${status.options.dev === true ? `, "setAttributes"` : ""});`);
 		}
@@ -705,6 +715,81 @@ function buildRun(functionName, functionBody, status, b) {
 	addPopDevBoundary(status, b);
 }
 
+//#endregion
+//#region src/compile/utils/endOfString.ts
+function endOfString(char, content, start) {
+	for (let j = start + 1; j < content.length; j++) if (content[j] === char && content[j - 1] !== "\\") return j;
+	return content.length;
+}
+
+//#endregion
+//#region src/compile/build/client/getAttributeOffsets.ts
+function getAttributeOffsets(value, span) {
+	value = trimQuotes(value);
+	let spans = [];
+	let offsets = [];
+	let lengths = [];
+	let textContent = "";
+	let reactiveStart = 0;
+	let level = 0;
+	for (let i = 0; i < value.length; i++) {
+		const char = value[i];
+		const nextChar = value[i + 1];
+		if (char === "{") {
+			level++;
+			if (level === 1) {
+				textContent += "${";
+				reactiveStart = textContent.length;
+				spans.push({
+					start: span.start + i + 2,
+					end: -1
+				});
+				offsets.push(reactiveStart + 1);
+				continue;
+			}
+		} else if (char === "}") {
+			level--;
+			if (level === 0) {
+				spans.at(-1).end = span.start + i + 2;
+				lengths.push(textContent.length - reactiveStart);
+				textContent += "}";
+				continue;
+			}
+		} else if (char === "`" && level === 0) textContent += "\\";
+		else if (level > 0) {
+			if (char === "/" && nextChar === "/") {
+				let start = i;
+				i = value.indexOf("\n", i);
+				textContent += value.substring(start, i + 1);
+				continue;
+			} else if (char === "/" && nextChar === "*") {
+				let start = i;
+				i = value.indexOf("*/", i) + 1;
+				textContent += value.substring(start, i + 1);
+				continue;
+			} else if (char === "\"" || char === "'") {
+				let start = i;
+				i = endOfString(char, value, i);
+				textContent += value.substring(start, i + 1);
+				continue;
+			} else if (char === "`") {
+				let start = i;
+				i = endOfTemplateString(value, i);
+				textContent += value.substring(start, i + 1);
+				continue;
+			}
+		}
+		textContent += value[i];
+	}
+	value = `\`${textContent}\``;
+	return {
+		newValue: value,
+		spans,
+		offsets,
+		lengths
+	};
+}
+
 //#endregion
 //#region src/compile/build/client/buildComponentNode.ts
 function buildComponentNode(node, status, b, root = false) {
@@ -717,51 +802,123 @@ function buildComponentNode(node, status, b, root = false) {
 		let props = [];
 		let runs = [];
 		let bindingRuns = [];
-		for (let { name, value, reactive, fullyReactive, span } of node.attributes) if (name === "self" && node.tagName === "@component") {} else if (name.startsWith("&") && value != null && fullyReactive) {
+		for (let { name, value, reactive, fullyReactive, span } of node.attributes) if (name === "self" && node.tagName === "@component") {} else if (value != null && fullyReactive) if (name.startsWith("&")) {
 			name = name.substring(1);
 			props.push({
 				name,
+				preText: "",
 				value,
-				span
+				postText: "",
+				spans: [span],
+				offsets: [],
+				lengths: []
 			});
 			runs.push(`${propsName}["${name}"] = ${value};`);
 			bindingRuns.push(`${value} = ${propsName}["${name}"];`);
-		} else if (name === "class" && value != null) {
+		} else if (name === "class") {
 			status.imports.add("t_class");
 			const params = [value];
 			if (node.scopeStyles) params.push(`"torp-${status.styleHash}"`);
-			value = `t_class(${params.join(", ")})`;
+			value = params.join(", ");
 			props.push({
 				name,
+				preText: "t_class(",
 				value,
-				span
+				postText: ")",
+				spans: [span],
+				offsets: [],
+				lengths: []
 			});
-			runs.push(`${propsName}["${name}"] = ${value};`);
-		} else if (name === "style" && value != null) {
+			runs.push(`${propsName}["${name}"] = t_class(${value});`);
+		} else if (name === "style") {
 			status.imports.add("t_style");
-			value = `t_style(${value})`;
 			props.push({
 				name,
+				preText: "t_style(",
 				value,
-				span
+				postText: ")",
+				spans: [span],
+				offsets: [],
+				lengths: []
 			});
-			runs.push(`${propsName}["${name}"] = ${value};`);
-		} else if (value != null) {
+			runs.push(`${propsName}["${name}"] = t_style(${value});`);
+		} else {
 			props.push({
 				name,
+				preText: "",
 				value,
-				span
+				postText: "",
+				spans: [span],
+				offsets: [],
+				lengths: []
 			});
-			if (reactive) runs.push(`${propsName}["${name}"] = ${value};`);
-		} else props.push({
+			runs.push(`${propsName}["${name}"] = ${value};`);
+		}
+		else if (value != null && reactive) {
+			const { newValue, spans, offsets, lengths } = getAttributeOffsets(value, span);
+			value = newValue;
+			if (name === "class") {
+				status.imports.add("t_class");
+				const params = [value];
+				if (node.scopeStyles) params.push(`"torp-${status.styleHash}"`);
+				value = params.join(", ");
+				props.push({
+					name,
+					preText: "t_class(",
+					value,
+					postText: ")",
+					spans,
+					offsets,
+					lengths
+				});
+				runs.push(`${propsName}["${name}"] = t_class(${value});`);
+			} else if (name === "style") {
+				status.imports.add("t_style");
+				props.push({
+					name,
+					preText: "t_style(",
+					value,
+					postText: ")",
+					spans,
+					offsets,
+					lengths
+				});
+				runs.push(`${propsName}["${name}"] = t_style(${value});`);
+			} else {
+				props.push({
+					name,
+					preText: "",
+					value,
+					postText: "",
+					spans,
+					offsets,
+					lengths
+				});
+				runs.push(`${propsName}["${name}"] = ${value};`);
+			}
+		} else if (value != null) props.push({
+			name,
+			preText: "",
+			value,
+			postText: "",
+			spans: [span],
+			offsets: [],
+			lengths: []
+		});
+		else props.push({
 			name,
+			preText: "",
 			value: "true",
-			span
+			postText: "",
+			spans: [span],
+			offsets: [],
+			lengths: []
 		});
 		b.append(`const ${propsName} = $watch({`);
 		for (let p of props) {
 			let value = replaceForVarNames(p.value, status);
-			addMappedText(`${p.name}: `, value, ",", p.span, status, b);
+			if (p.spans.length === 1) addMappedText(`${p.name}: ` + p.preText, value, p.postText + ",", p.spans[0], status, b);
+			else addMappedTextWithOffsets(`${p.name}: ` + p.preText, value, p.postText + ",", p.spans, p.offsets, p.lengths, status, b);
 		}
 		b.append("});");
 		if (runs.length) buildRun("setProps", replaceForVarNames(runs.join("\n"), status), status, b);
@@ -1100,7 +1257,7 @@ function buildIfNode(node, status, b) {
 	b.append(`
 		const ${regionName} = t_region(${status.options.dev === true ? `"if"` : ""});
 		let ${indexName} = -1;
-		t_run_control(${regionName}, ${anchorName}, (t_before) => {`);
+		t_run_control(${regionName}, ${anchorName}, (${status.inHead ? "" : "t_before"}) => {`);
 	let index = 0;
 	for (let branch of branches) buildIfBranch(branch, status, b, parentName, regionName, indexName, index++);
 	b.append(`}${status.options.dev === true ? `, "runIf"` : ""});`);
@@ -1209,7 +1366,7 @@ function buildSwitchNode(node, status, b) {
 	b.append(`
 		const ${regionName} = t_region(${status.options.dev === true ? `"switch"` : ""});
 		let ${indexName} = -1;
-		t_run_control(${regionName}, ${anchorName}, (t_before) => {`);
+		t_run_control(${regionName}, ${anchorName}, (${status.inHead ? "" : "t_before"}) => {`);
 	addMappedText("", `${replaceForVarNames(node.statement, status)}`, " {", node.span, status, b);
 	let index = 0;
 	for (let branch of branches) buildSwitchBranch(branch, status, b, parentName, regionName, indexName, index++);
@@ -1331,6 +1488,26 @@ function stashRun(fragment, functionStart, value, functionEnd, span, status) {
 	});
 }
 
+//#endregion
+//#region src/compile/build/client/stashRunWithOffsets.ts
+function stashRunWithOffsets(fragment, functionStart, value, functionEnd, spans, offsets, lengths, status) {
+	let functionBody = functionStart + value + functionEnd;
+	for (let i = 0; i < offsets.length; i++) {
+		offsets[i] += functionStart.length;
+		const oldLength = functionBody.length;
+		functionBody = functionBody.substring(0, offsets[i]) + replaceForVarNames(functionBody.substring(offsets[i], offsets[i] + lengths[i]), status) + functionBody.substring(offsets[i] + lengths[i]);
+		const changedLength = functionBody.length - oldLength;
+		lengths[i] += changedLength;
+		for (let j = i + 1; j < offsets.length; j++) offsets[j] += changedLength;
+	}
+	fragment.effects.push({
+		functionBody,
+		spans,
+		offsets,
+		lengths
+	});
+}
+
 //#endregion
 //#region src/compile/build/client/buildElementNode.ts
 function buildElementNode(node, status, b, parentName, root = false) {
@@ -1420,26 +1597,46 @@ function buildElementAttributes$1(node, varName, status, b) {
 		let { value, fullyReactive } = refAttribute;
 		if (value != null && fullyReactive) b.append(`${value} = ${varName};`);
 	}
-	for (let { name, value, reactive, span: range } of node.attributes) if (name === "self" && node.tagName === "@element") {} else if (name === "&ref") {} else if (value != null && reactive) if (name === "&group") buildBindGroupAttribute(node, varName, value, status, b);
+	for (let { name, value, reactive, fullyReactive, span } of node.attributes) if (name === "self" && node.tagName === "@element") {} else if (name === "&ref") {} else if (value != null && fullyReactive) if (name === "&group") buildBindGroupAttribute(node, varName, value, status, b);
 	else if (name === "&value" || name === "&checked") buildBindAttribute(node, varName, name, value, status, b);
 	else if (name === "onmount") buildMount("elMount", `return (${trimEnd(value.trim(), ";")})(${varName});`, status, b);
-	else if (name.startsWith("on")) buildEventAttribute(varName, name, value, range, status, b);
+	else if (name.startsWith("on")) buildEventAttribute(varName, name, value, span, status, b);
 	else if (name.startsWith("transition")) buildTransitionAttribute(node, varName, name, value, status, b);
 	else if (name === "class") {
 		status.imports.add("t_class");
 		const params = [value];
 		if (node.scopeStyles) params.push(`"torp-${status.styleHash}"`);
 		const propName = status.ns ? "className.baseVal" : "className";
-		stashRun(fragment, `${status.ns ? "// @ts-ignore\n" : ""}${varName}.${propName} = t_class(`, params.join(", "), ");", range, status);
+		stashRun(fragment, `${status.ns ? "// @ts-ignore\n" : ""}${varName}.${propName} = t_class(`, params.join(", "), ");", span, status);
 	} else if (name === "style") {
 		status.imports.add("t_style");
-		stashRun(fragment, `${varName}.setAttribute("style", t_style(`, value, "));", range, status);
+		stashRun(fragment, `${varName}.setAttribute("style", t_style(`, value, "));", span, status);
 	} else if (name.includes("-")) {
 		status.imports.add("t_attribute");
-		stashRun(fragment, `t_attribute(${varName}, "${name}", `, value, ");", range, status);
+		stashRun(fragment, `t_attribute(${varName}, "${name}", `, value, ");", span, status);
 	} else {
 		status.imports.add("t_attribute");
-		stashRun(fragment, `t_attribute(${varName}, "${name}", `, value, ");", range, status);
+		stashRun(fragment, `t_attribute(${varName}, "${name}", `, value, ");", span, status);
+	}
+	else if (value != null && reactive) {
+		const { newValue, spans, offsets, lengths } = getAttributeOffsets(value, span);
+		value = newValue;
+		if (name === "class") {
+			status.imports.add("t_class");
+			const params = [value];
+			if (node.scopeStyles) params.push(`"torp-${status.styleHash}"`);
+			const propName = status.ns ? "className.baseVal" : "className";
+			stashRunWithOffsets(fragment, `${status.ns ? "// @ts-ignore\n" : ""}${varName}.${propName} = t_class(`, params.join(", "), ");", spans, offsets, lengths, status);
+		} else if (name === "style") {
+			status.imports.add("t_style");
+			stashRunWithOffsets(fragment, `${varName}.setAttribute("style", t_style(`, value, "));", spans, offsets, lengths, status);
+		} else if (name.includes("-")) {
+			status.imports.add("t_attribute");
+			stashRunWithOffsets(fragment, `t_attribute(${varName}, "${name}", `, value, ");", spans, offsets, lengths, status);
+		} else {
+			status.imports.add("t_attribute");
+			stashRunWithOffsets(fragment, `t_attribute(${varName}, "${name}", `, value, ");", spans, offsets, lengths, status);
+		}
 	}
 }
 function buildBindGroupAttribute(node, varName, value, status, b) {
@@ -1603,31 +1800,6 @@ function buildSpecialNode(node, status, b, parentName, root = false) {
 	return "";
 }
 
-//#endregion
-//#region src/compile/utils/endOfString.ts
-function endOfString(char, content, start) {
-	for (let j = start + 1; j < content.length; j++) if (content[j] === char && content[j - 1] !== "\\") return j;
-	return content.length;
-}
-
-//#endregion
-//#region src/compile/build/client/stashRunWithOffsets.ts
-function stashRunWithOffsets(fragment, functionBody, spans, offsets, lengths, status) {
-	for (let i = 0; i < offsets.length; i++) {
-		const oldLength = functionBody.length;
-		functionBody = functionBody.substring(0, offsets[i]) + replaceForVarNames(functionBody.substring(offsets[i], offsets[i] + lengths[i]), status) + functionBody.substring(offsets[i] + lengths[i]);
-		const changedLength = functionBody.length - oldLength;
-		lengths[i] += changedLength;
-		for (let j = i + 1; j < offsets.length; j++) offsets[j] += changedLength;
-	}
-	fragment.effects.push({
-		functionBody,
-		spans,
-		offsets,
-		lengths
-	});
-}
-
 //#endregion
 //#region src/compile/build/client/buildTextNode.ts
 function buildTextNode(node, status) {
@@ -1697,11 +1869,8 @@ function buildTextNode(node, status) {
 			offsetChange = 1;
 		}
 		status.imports.add("t_fmt");
-		let functionBody = `${node.varName}.textContent = `;
-		offsetChange += functionBody.length;
 		offsets.map((_, i) => offsets[i] += offsetChange);
-		functionBody += `${textContent};`;
-		stashRunWithOffsets(fragment, functionBody, node.spans, offsets, lengths, status);
+		stashRunWithOffsets(fragment, `${node.varName}.textContent = `, textContent, ";", node.spans, offsets, lengths, status);
 	}
 }
 
@@ -2269,7 +2438,7 @@ function buildElementAttributes(node, status) {
 	}
 	else if (value != null && reactive) {
 		status.imports.add("t_attr");
-		attributes.push(`${name}="${trimQuotes(value).replaceAll("${", "${t_attr(").replaceAll("}", ")}")}"`);
+		attributes.push(`${name}="${trimQuotes(value).replaceAll("{", "${t_attr(").replaceAll("}", ")}")}"`);
 	} else if (name === "class" && node.scopeStyles) {
 		value = value ? `"${trimQuotes(value)} torp-${status.styleHash}"` : `"torp-${status.styleHash}"`;
 		attributes.push(`${name}="${trimQuotes(value).replaceAll("\"", "&quot;")}"`);
@@ -2719,7 +2888,7 @@ function parseTag(status) {
 	accept("<", status);
 	let closeTag = accept("/", status);
 	consumeSpace(status);
-	let tagStart = status.i;
+	let tagStart = status.i + 1;
 	let snailed = accept("@", status);
 	let tagName = consumeAlphaNumeric(status);
 	let tagEnd = status.i;
@@ -2783,7 +2952,7 @@ function parseAttribute(status) {
 			value = value.substring(1, value.length - 1);
 			valueStart++;
 			valueEnd--;
-		} else if (reactive) value = `\`${trimQuotes(value).replaceAll("{", "${")}\``;
+		}
 	} else if (name.startsWith("{") && name.endsWith("}")) {
 		value = name.substring(1, name.length - 1);
 		valueStart++;
@@ -3801,5 +3970,4 @@ function parse(source) {
 //#endregion
 exports.build = build;
 exports.buildType = buildType;
-exports.parse = parse;
-//# sourceMappingURL=compile.cjs.map
+exports.parse = parse;

package/dist/compile.d.cts

@@ -1,4 +1,4 @@
-import { t as Component } from "./Component-BDUCwkBQ.cjs";
+import { t as Component } from "./Component-kGLRFYg2.cjs";
 
 //#region src/compile/types/Import.d.ts
 interface Import {

package/dist/{compile.d.ts → compile.d.mts}

@@ -1,4 +1,4 @@
-import { t as Component } from "./Component-JVwSemf-.js";
+import { t as Component } from "./Component-DmWGMgak.mjs";
 
 //#region src/compile/types/Import.d.ts
 interface Import {
@@ -216,4 +216,4 @@ interface ParseResult {
 declare function parse(source: string): ParseResult;
 //#endregion
 export { type Component, type Template, build, buildType, parse };
-//# sourceMappingURL=compile.d.ts.map
+//# sourceMappingURL=compile.d.mts.map

package/dist/compile.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compile.d.mts","names":[],"sources":["../src/compile/types/Import.ts","../src/compile/types/SourceSpan.ts","../src/compile/types/ScriptChunk.ts","../src/compile/types/nodes/Fragment.ts","../src/compile/types/nodes/NodeType.ts","../src/compile/types/nodes/TemplateNode.ts","../src/compile/types/nodes/ParentNode.ts","../src/compile/types/nodes/RootNode.ts","../src/compile/types/styles/Attribute.ts","../src/compile/types/styles/StyleBlock.ts","../src/compile/types/styles/Style.ts","../src/types/TemplateComponent.ts","../src/types/Template.ts","../src/compile/types/BuildOptions.ts","../src/compile/types/SourceMapping.ts","../src/compile/types/BuildResult.ts","../src/compile/build.ts","../src/compile/buildType.ts","../src/compile/types/CompileError.ts","../src/compile/types/ParseResult.ts","../src/compile/parse.ts"],"sourcesContent":[],"mappings":";;;UAAyB,MAAA;;;MAAA,EAAA,MAAA;;;;;;UCAA,UAAA;;;;;;UCEA,WAAA;;MFFA,EEIlB,UFJkB;;;;UGEA,QAAA;;MHFA,EAAA,MAAA;;;;SCAA,EEQhB,UFRgB,EAAA;;;;ECAG,MAEH,EAAA;;;;ECFG,CAAA,EAEH;;;;;;KCFpB,QAAA;;;UCEoB,YAAA;QAClB;aLHkB,CAAA,EAAA,OAAA;;;;;;UMGA,UAAA,SAAmB;MNHnB,EMIlB,QNJkB;YMKd;;;;ANLc,UOIA,QAAA,SAAiB,UPJjB,CAAA;;YOMd;aAGC;;;;UCTa,SAAA;;;;;;UCEA,UAAA;;YTFA,ESIZ,STJY,EAAA;YSKd;;;;UCHc,KAAA;;QVFA,EUIhB,UVJgB,EAAA;;;;;UWGA,iBAAA;OXHA,CAAA,EAAA,MAAA;;;;UCAA,CAAA,EAAA,OAAA;;;;ECAG,aAEH,CAAA,EAAA,MAAA;;;WSaf;ERfkB,IAEH,CAAA,EQcjB,QRdiB;UQehB;;;;;;;ENjBiB;;;;;;;;UOOD,QAAA;SXPA,EWQf,MXRe,EAAA;UWShB;cACI;;;;UCVY,YAAA;;;;;;;;;;;AXAG;;;;ACAA;;;;kBCAvB,CAAA,EAAA,OAAA;;;;ECAqB,YAED,CAAA,EAAA,MAAA;;;;USAA,aAAA;;QdFA,EcIhB,UdJgB;YcKd;;;;UCHc,WAAA;;QfFA,EAAA;;;;KCAA,EcQnB,adRmB,EAAA;;;;;;;;;;;iBeeD,KAAA,WAAgB,oBAAoB,eAAe;;;;;;;;;;;iBCHnD,SAAA,WAAoB,oBAAoB;;;UCZvC,YAAA;;;WlBAA,EAAA,MAAA;;;;SCAA,EAAA,MAAA;;;;UkBGA,WAAA;MnBHA,OAAA;UmBKhB;aACG;;;;;;;;;;;;iBCKY,KAAA,kBAAuB"}