@torpor/view 0.4.12 → 0.4.14

package/src/compile/parse/parseTag.ts

@@ -2,7 +2,6 @@ import type Attribute from "../types/nodes/Attribute";
 import type ElementNode from "../types/nodes/ElementNode";
 import isFullyReactive from "../utils/isFullyReactive";
 import isReactive from "../utils/isReactive";
-import trimQuotes from "../utils/trimQuotes";
 import type ParseStatus from "./ParseStatus";
 import parseInlineScript from "./parseInlineScript";
 import accept from "./utils/accept";
@@ -17,7 +16,7 @@ export default function parseTag(status: ParseStatus): ElementNode {
 
 	consumeSpace(status);
 
-	let tagStart = status.i;
+	let tagStart = status.i + 1;
 	let snailed = accept("@", status);
 	let tagName = consumeAlphaNumeric(status);
 	let tagEnd = status.i;
@@ -109,11 +108,6 @@ function parseAttribute(status: ParseStatus): Attribute {
 			value = value.substring(1, value.length - 1);
 			valueStart++;
 			valueEnd--;
-		} else if (reactive) {
-			// TODO: Ranges etc, like text nodes -- I think we would need to
-			// leave things reactive (or fully reactive) and check it when
-			// building instead
-			value = `\`${trimQuotes(value).replaceAll("{", "${")}\``;
 		}
 	} else if (name.startsWith("{") && name.endsWith("}")) {
 		// It's a shortcut attribute. It could be e.g. {width} or it could be

package/src/compile/parse/parseText.ts

@@ -84,7 +84,7 @@ export default function parseText(status: ParseStatus, element: ElementNode): vo
 				const text: TextNode = {
 					type: "text",
 					content: content + spaceContent,
-					spans: spans,
+					spans,
 				};
 				element.children.push(text);
 			}

package/src/index.ts

@@ -25,9 +25,11 @@ import t_run_list from "./render/runList";
 import t_attribute from "./render/setAttribute";
 import t_dynamic from "./render/setDynamicElement";
 import type Animation from "./types/Animation";
+import type ClassValue from "./types/ClassValue";
 import type Component from "./types/Component";
 import type ListItem from "./types/ListItem";
 import type SlotRender from "./types/SlotRender";
+import type StyleValue from "./types/StyleValue";
 import $batch from "./watch/$batch";
 import $cache from "./watch/$cache";
 import $mount from "./watch/$mount";
@@ -72,4 +74,4 @@ export {
 	t_dynamic,
 };
 
-export type { Component, SlotRender, ListItem, Animation };
+export type { Component, SlotRender, ListItem, Animation, ClassValue, StyleValue };

package/src/render/buildClasses.ts

@@ -1,11 +1,6 @@
-export default function buildClasses(
-	value:
-		| string
-		| Record<string, string>
-		| Array<string | Record<string, string> | undefined>
-		| undefined,
-	styleHash?: string,
-): string {
+import ClassValue from "../types/ClassValue";
+
+export default function buildClasses(value: ClassValue, styleHash?: string): string {
 	if (typeof value === "string") {
 		if (styleHash !== undefined) {
 			value += " " + styleHash;
@@ -21,15 +16,7 @@ export default function buildClasses(
 	}
 }
 
-function gatherNames(
-	name: string,
-	value:
-		| string
-		| Record<string, string>
-		| Array<string | Record<string, string> | undefined>
-		| undefined,
-	classes: string[],
-) {
+function gatherNames(name: string, value: unknown, classes: string[]) {
 	if (value) {
 		if (Array.isArray(value)) {
 			for (let v of value) {

package/src/render/buildStyles.ts

@@ -1,6 +1,6 @@
-export default function buildStyles(
-	value: string | Record<string, string> | Array<string> | undefined,
-): string {
+import type StyleValue from "../types/StyleValue";
+
+export default function buildStyles(value: StyleValue): string {
 	if (typeof value === "string") {
 		return value;
 	} else {
@@ -8,7 +8,9 @@ export default function buildStyles(
 		if (value) {
 			if (Array.isArray(value)) {
 				for (let v of value) {
-					styles.push(v);
+					if (v) {
+						styles.push(v);
+					}
 				}
 			} else if (typeof value === "object") {
 				for (let [n, v] of Object.entries(value)) {

package/src/types/ClassValue.ts

@@ -0,0 +1,8 @@
+type ClassValue =
+	| string
+	| Record<string, boolean | null | undefined>
+	| Array<ClassValue>
+	| null
+	| undefined;
+
+export default ClassValue;

package/src/types/StyleValue.ts

@@ -0,0 +1,8 @@
+type StyleValue =
+	| string
+	| Record<string, string | null | undefined>
+	| Array<string | null | undefined>
+	| null
+	| undefined;
+
+export default StyleValue;

package/test/source-maps/interpolated.test.ts

@@ -0,0 +1,88 @@
+import { expect, test } from "vitest";
+import { build } from "../../src/compile";
+import parse from "../../src/compile/parse";
+
+test("source maps with interpolated attributes in element", () => {
+	const input = `
+export default function Source() {
+	@render {
+		<div id="{a}-{bc}-{d}"></div>
+	}
+}
+`.trim();
+
+	const parsed = parse(input);
+	const built = build(parsed.template!, { mapped: true });
+
+	//console.log(built.code);
+	//console.log(built.map);
+
+	const matches = built.map.filter(
+		(m) => m.script === 't_attribute(t_div_1, "id", `${a}-${bc}-${d}`);',
+	);
+	expect(matches.length).toBe(3);
+
+	expect(matches[0].source.start).toBe(input.indexOf("{a}") + 1);
+	expect(matches[0].compiled.start).toBe(built.code.indexOf("{a}") + 1);
+	expect(matches[1].source.start).toBe(input.indexOf("{bc}") + 1);
+	expect(matches[1].compiled.start).toBe(built.code.indexOf("{bc}") + 1);
+	expect(matches[2].source.start).toBe(input.indexOf("{d}") + 1);
+	expect(matches[2].compiled.start).toBe(built.code.indexOf("{d}") + 1);
+});
+
+test("source maps with interpolated attributes in component", () => {
+	const input = `
+export default function Source() {
+	@render {
+		<Child id="{a}-{bc}-{d}" />
+	}
+}
+`.trim();
+
+	const parsed = parse(input);
+	const built = build(parsed.template!, { mapped: true });
+
+	//console.log(built.code);
+	//console.log(built.map);
+
+	const matches = built.map.filter((m) => m.script === "id: `${a}-${bc}-${d}`,");
+	expect(matches.length).toBe(3);
+
+	expect(matches[0].source.start).toBe(input.indexOf("{a}") + 1);
+	expect(matches[0].compiled.start).toBe(built.code.indexOf("{a}") + 1);
+	expect(matches[1].source.start).toBe(input.indexOf("{bc}") + 1);
+	expect(matches[1].compiled.start).toBe(built.code.indexOf("{bc}") + 1);
+	expect(matches[2].source.start).toBe(input.indexOf("{d}") + 1);
+	expect(matches[2].compiled.start).toBe(built.code.indexOf("{d}") + 1);
+});
+
+test("source maps with interpolated text", () => {
+	const input = `
+export default function Source() {
+	@render {
+		<div>
+			id={a}
+			and {bc}, {d}
+		</div>
+	}
+}
+`.trim();
+
+	const parsed = parse(input);
+	const built = build(parsed.template!, { mapped: true });
+
+	//console.log(built.code);
+	//console.log(built.map);
+
+	const matches = built.map.filter(
+		(m) => m.script === "t_text_1.textContent = ` id=${t_fmt(a)} and ${t_fmt(bc)}, ${t_fmt(d)} `;",
+	);
+	expect(matches.length).toBe(3);
+
+	expect(matches[0].source.start).toBe(input.indexOf("{a}") + 1);
+	expect(matches[0].compiled.start).toBe(built.code.indexOf("(a)") + 1);
+	expect(matches[1].source.start).toBe(input.indexOf("{bc}") + 1);
+	expect(matches[1].compiled.start).toBe(built.code.indexOf("(bc)") + 1);
+	expect(matches[2].source.start).toBe(input.indexOf("{d}") + 1);
+	expect(matches[2].compiled.start).toBe(built.code.indexOf("(d)") + 1);
+});

package/test/source-maps/parse.test.ts

@@ -2,7 +2,7 @@ import { assert, expect, test } from "vitest";
 import { build } from "../../src/compile";
 import parse from "../../src/compile/parse";
 
-test("source maps", () => {
+test("parse source maps", () => {
 	const input = `
 export default function Source($props: { counter: number }) {
 const x = 5;

package/tsdown.config.ts

@@ -1,13 +1,6 @@
-import { type Options, defineConfig } from "tsdown";
-
-type Config =
-	| Options
-	| Options[]
-	| ((overrideOptions: Options) => Options | Options[] | Promise<Options | Options[]>);
+import { type UserConfig, defineConfig } from "tsdown";
 
 export default defineConfig({
 	entry: ["src/index.ts", "src/compile.ts", "src/ssr.ts", "src/dev.ts"],
 	format: ["esm", "cjs"],
-	dts: true,
-	sourcemap: true,
-}) satisfies Config as Config;
+}) satisfies UserConfig as UserConfig;

package/vitest.config.ts

@@ -1,5 +1,5 @@
-import { type UserConfigFnObject, defineConfig } from "vitest/config";
-import torpor from "../unplugin/dist/vite";
+import { type ViteUserConfigFnObject, defineConfig } from "vitest/config";
+import torpor from "../unplugin/dist/vite.mjs";
 
 export default defineConfig(({ mode }) => ({
 	plugins: [torpor()],
@@ -10,4 +10,4 @@ export default defineConfig(({ mode }) => ({
 		environment: "jsdom",
 		globalSetup: "./test/globalSetup.ts",
 	},
-})) satisfies UserConfigFnObject as UserConfigFnObject;
+})) satisfies ViteUserConfigFnObject as ViteUserConfigFnObject;

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

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

package/dist/Cleanup-Ca8IspaG.d.ts.map

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

package/dist/Component-JVwSemf-.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Component-JVwSemf-.d.ts","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.map

@@ -1 +0,0 @@
-{"version":3,"file":"Region-BrsZLZUe.d.ts","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"}