@torpor/view 0.4.15 → 0.4.17

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

@@ -1,83 +0,0 @@
-import type SourceSpan from "../../types/SourceSpan";
-import type ElementNode from "../../types/nodes/ElementNode";
-import Builder from "../../utils/Builder";
-import isSpecialNode from "../../utils/isSpecialNode";
-import trimQuotes from "../../utils/trimQuotes";
-import nextVarName from "../utils/nextVarName";
-import type BuildStatus from "./BuildStatus";
-import addMappedText from "./addMappedText";
-import buildAddFragment from "./buildAddFragment";
-import buildFragment from "./buildFragment";
-import buildNode from "./buildNode";
-import buildRun from "./buildRun";
-import replaceForVarNames from "./replaceForVarNames";
-
-export default function buildSlotNode(node: ElementNode, status: BuildStatus, b: Builder): void {
-	// If there's a slot, build that, otherwise build the default nodes
-	let slotName = node.attributes.find((a) => a.name === "name")?.value;
-	slotName = slotName ? trimQuotes(slotName) : "_";
-
-	// Slot props
-	const propsName = nextVarName("sprops", status);
-	const slotAttributes = node.attributes.filter((a) => a.name !== "name");
-	const slotHasProps = slotAttributes.length;
-	if (slotHasProps) {
-		// TODO: defaults etc props
-		status.imports.add("$watch");
-
-		// Gather props, runs and binding runs, and set them all at once
-		let props: { name: string; value: string; span: SourceSpan }[] = [];
-		let runs: string[] = [];
-
-		for (let { name, value, reactive, span } of slotAttributes) {
-			if (value != null) {
-				props.push({ name, value, span });
-				if (reactive) {
-					runs.push(`${propsName}["${name}"] = ${value};`);
-				}
-			} else {
-				props.push({ name, value: "true", span });
-			}
-		}
-
-		// Set the props, runs and binding runs that we gathered
-		b.append(`const ${propsName} = $watch({`);
-		for (let p of props) {
-			let value = replaceForVarNames(p.value, status);
-			addMappedText(`${p.name}: `, value, ",", p.span, status, b);
-		}
-		b.append("});");
-		// TODO: Map these things:
-		if (runs.length) {
-			buildRun("setProps", replaceForVarNames(runs.join("\n"), status), status, b);
-		}
-	}
-
-	const slotParentName = node.parentName!;
-	const slotAnchorName = node.varName!;
-
-	b.append(`if ($slots && $slots["${slotName}"]) {`);
-	let params = [slotParentName, slotAnchorName, slotHasProps ? propsName : "undefined", "$context"];
-	b.append(`$slots["${slotName}"](${params.join(", ")})`);
-
-	// TODO: Maybe not if there's only a single space node?
-	const fill = node.children.find((c) => isSpecialNode(c) && c.tagName === "fill");
-	if (fill && isSpecialNode(fill) && fill.children.length) {
-		b.append(`} else {`);
-
-		buildFragment(fill, status, b, slotParentName, slotAnchorName);
-
-		status.fragmentStack.push({
-			fragment: fill.fragment,
-			path: "0:ch/",
-		});
-		for (let child of fill.children) {
-			buildNode(child, status, b, slotParentName, slotAnchorName);
-		}
-		status.fragmentStack.pop();
-
-		buildAddFragment(fill, status, b, slotParentName, slotAnchorName);
-	}
-
-	b.append(`}`);
-}

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

@@ -1,38 +0,0 @@
-import type ElementNode from "../../types/nodes/ElementNode";
-import Builder from "../../utils/Builder";
-import type BuildStatus from "./BuildStatus";
-import buildComponentNode from "./buildComponentNode";
-import buildElementNode from "./buildElementNode";
-import buildSlotNode from "./buildSlotNode";
-
-export default function buildSpecialNode(
-	node: ElementNode,
-	status: BuildStatus,
-	b: Builder,
-	parentName: string,
-	root = false,
-) {
-	switch (node.tagName) {
-		case "slot": {
-			buildSlotNode(node, status, b);
-			break;
-		}
-		case "fill": {
-			// HACK:
-			break;
-		}
-		case "@element": {
-			buildElementNode(node, status, b, parentName, root);
-			break;
-		}
-		case "@component": {
-			buildComponentNode(node, status, b, root);
-			break;
-		}
-		default: {
-			// eslint-disable-next-line restrict-template-expressions
-			throw new Error(`Invalid special node: ${node.tagName}`);
-		}
-	}
-	return "";
-}

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

@@ -1,85 +0,0 @@
-import type Attribute from "../../types/styles/Attribute";
-import type Style from "../../types/styles/Style";
-import type StyleBlock from "../../types/styles/StyleBlock";
-import Builder from "../../utils/Builder";
-
-export default function buildStyles(style: Style, styleHash: string): string {
-	const b = new Builder();
-
-	for (let block of style.blocks) {
-		buildStyleBlock(block, b, styleHash);
-	}
-
-	return b.toString();
-}
-
-function buildStyleBlock(block: StyleBlock, b: Builder, styleHash: string) {
-	// TODO: This should probably be done while parsing
-	// And handle attribute selectors
-	if (block.selector.startsWith("@")) {
-		// Just output media queries and properties as-is
-		b.append(`${block.selector} {`);
-	} else {
-		block.selector = block.selector.replaceAll(/\s+/g, " ");
-		let selectors: string[] = [];
-		let global = false;
-		let start = 0;
-		for (let i = 0; i <= block.selector.length; i++) {
-			if (block.selector.substring(i).startsWith(":global(")) {
-				i += ":global".length;
-				start = i + 1;
-				global = true;
-			} else if (global && block.selector[i] === ")") {
-				addSelector(selectors, block.selector, styleHash, start, i, global);
-				start = i + 1;
-				global = false;
-			} else if ("*,>+~".includes(block.selector[i])) {
-				addSelector(selectors, block.selector, styleHash, start, i, global);
-				selectors.push(block.selector[i]);
-				start = i + 1;
-			} else if (i === block.selector.length) {
-				addSelector(selectors, block.selector, styleHash, start, i, global);
-			} else if (block.selector[i] === " ") {
-				addSelector(selectors, block.selector, styleHash, start, i, global);
-				start = i + 1;
-			}
-		}
-		b.append(`${selectors.join(" ").replaceAll(" ,", ",")} {`);
-	}
-	for (let attribute of block.attributes) {
-		buildStyleAttribute(attribute, b);
-	}
-	for (let child of block.children) {
-		buildStyleBlock(child, b, styleHash);
-	}
-	b.append(`}`);
-}
-
-function addSelector(
-	selectors: string[],
-	selector: string,
-	styleHash: string,
-	start: number,
-	end: number,
-	global: boolean,
-) {
-	if (end > start) {
-		let s = selector.substring(start, end);
-		if (!global) {
-			let pre = s;
-			let post = "";
-			// We might need to handle e.g. `:hover` or `::before`
-			let colonPosition = s.indexOf(":");
-			if (colonPosition !== -1) {
-				pre = s.substring(0, colonPosition);
-				post = s.substring(colonPosition);
-			}
-			s = `${pre}.torp-${styleHash}${post}`;
-		}
-		selectors.push(s);
-	}
-}
-
-function buildStyleAttribute(attribute: Attribute, b: Builder) {
-	b.append(`${attribute.name}: ${attribute.value};`);
-}

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

@@ -1,107 +0,0 @@
-import type ControlNode from "../../types/nodes/ControlNode";
-import Builder from "../../utils/Builder";
-import isControlNode from "../../utils/isControlNode";
-import nextVarName from "../utils/nextVarName";
-import type BuildStatus from "./BuildStatus";
-import addMappedText from "./addMappedText";
-import addPopDevBoundary from "./addPopDevBoundary";
-import addPushDevBoundary from "./addPushDevBoundary";
-import buildAddFragment from "./buildAddFragment";
-import buildFragment from "./buildFragment";
-import buildNode from "./buildNode";
-import replaceForVarNames from "./replaceForVarNames";
-
-export default function buildSwitchNode(node: ControlNode, status: BuildStatus, b: Builder): void {
-	const anchorName = node.varName ?? "null";
-	const parentName = node.parentName!;
-	const regionName = nextVarName("switch_region", status);
-	const indexName = nextVarName("switch_index", status);
-
-	// Filter non-control branches (spaces)
-	const branches = node.children.filter((n) => isControlNode(n)) as ControlNode[];
-
-	// Add a default branch if there isn't one, so that the content will be cleared if no branches match
-	if (branches.findIndex((n) => n.operation === "@default") === -1) {
-		const defaultBranch: ControlNode = {
-			type: "control",
-			operation: "@default",
-			statement: "default",
-			children: [],
-			span: { start: 0, end: 0 },
-		};
-		branches.push(defaultBranch);
-	}
-
-	status.imports.add("t_region");
-	status.imports.add("t_run_control");
-	status.imports.add("t_run_branch");
-	status.imports.add("t_push_region");
-	status.imports.add("t_pop_region");
-
-	b.append("");
-	b.append("/* @switch */");
-
-	addPushDevBoundary("control", `@${branches[0].statement}`, status, b);
-
-	b.append(`
-		const ${regionName} = t_region(${status.options.dev === true ? `"switch"` : ""});
-		let ${indexName} = -1;
-		t_run_control(${regionName}, ${anchorName}, (${status.inHead ? "" : "t_before"}) => {`);
-
-	// TODO: replaceForVarNames is going to throw mapping out
-	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++);
-	}
-	b.append(`
-		}
-	}${status.options.dev === true ? `, "runSwitch"` : ""});`);
-
-	addPopDevBoundary(status, b);
-
-	b.append("");
-}
-
-function buildSwitchBranch(
-	node: ControlNode,
-	status: BuildStatus,
-	b: Builder,
-	parentName: string,
-	regionName: string,
-	indexName: string,
-	index: number,
-) {
-	// TODO: replaceForVarNames is going to throw mapping out
-	addMappedText("", `${replaceForVarNames(node.statement, status)}`, " {", node.span, status, b);
-
-	b.append(`if (!t_run_branch(${regionName}, ${indexName}, ${index})) return;`);
-
-	if (node.children.length > 0) {
-		b.append(`
-			const t_new_region = t_region(${status.options.dev === true ? `"switch_branch"` : ""});
-			const t_old_region = t_push_region(t_new_region, true);
-		`);
-
-		buildFragment(node, status, b, parentName, "t_before");
-
-		status.fragmentStack.push({
-			fragment: node.fragment,
-			path: "",
-		});
-		for (let child of node.children) {
-			buildNode(child, status, b, parentName, "t_before");
-		}
-		status.fragmentStack.pop();
-
-		buildAddFragment(node, status, b, parentName, "t_before");
-
-		b.append("t_pop_region(t_old_region);");
-	}
-
-	b.append(`
-			${indexName} = ${index};
-			break;
-		}`);
-}

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

@@ -1,106 +0,0 @@
-import type TextNode from "../../types/nodes/TextNode";
-import endOfString from "../../utils/endOfString";
-import endOfTemplateString from "../../utils/endOfTemplateString";
-import type BuildStatus from "./BuildStatus";
-import stashRunWithOffsets from "./stashRunWithOffsets";
-
-export default function buildTextNode(node: TextNode, status: BuildStatus): void {
-	let fragment = status.fragmentStack.at(-1)?.fragment;
-	if (!fragment) return; // probably in @head...
-
-	let content = node.content || "";
-
-	if (!status.preserveWhitespace) {
-		// Replace all spaces with a single space, both to save space and to remove
-		// newlines from generated JS strings
-		content = content.replaceAll(/\s+/g, " ");
-	}
-
-	// TODO: Should we be parsing out the spans here? Like we do with
-	// attributes? And should we merge this with the attributes logic?
-	let textContent = "";
-	let reactiveCount = 0;
-	let reactiveStart = 0;
-	let offsets: number[] = [];
-	let lengths: number[] = [];
-	let level = 0;
-	let maxLevel = 0;
-	for (let i = 0; i < content.length; i++) {
-		const char = content[i];
-		const nextChar = content[i + 1];
-		if (char === "{") {
-			level++;
-			maxLevel = Math.max(level, maxLevel);
-			if (level === 1) {
-				reactiveCount += 1;
-				textContent += "${t_fmt(";
-				reactiveStart = textContent.length;
-				offsets.push(reactiveStart);
-				continue;
-			}
-		} else if (char === "}") {
-			level--;
-			if (level === 0) {
-				lengths.push(textContent.length - reactiveStart);
-				textContent += ")";
-			}
-		} else if (char === "`" && level === 0) {
-			// Escape backticks outside of braces, as they will be within a backtick string
-			textContent += "\\";
-		} else if (level > 0) {
-			if (char === "/" && nextChar === "/") {
-				// Skip one-line comments
-				let start = i;
-				i = content.indexOf("\n", i);
-				textContent += content.substring(start, i + 1);
-				continue;
-			} else if (char === "/" && nextChar === "*") {
-				// Skip block comments
-				let start = i;
-				i = content.indexOf("*/", i) + 1;
-				textContent += content.substring(start, i + 1);
-				continue;
-			} else if (char === '"' || char === "'") {
-				// Skip string contents
-				let start = i;
-				i = endOfString(char, content, i);
-				textContent += content.substring(start, i + 1);
-				continue;
-			} else if (char === "`") {
-				// Skip interpolated string contents
-				let start = i;
-				i = endOfTemplateString(content, i);
-				textContent += content.substring(start, i + 1);
-				continue;
-			}
-		}
-		textContent += content[i];
-	}
-
-	// Only need to build if there is any reactive content, otherwise the plain
-	// text content will be output in fragment text
-	if (maxLevel) {
-		let offsetChange = 0;
-		if (reactiveCount === 1 && content.startsWith("{") && content.endsWith("}")) {
-			textContent = textContent.substring(2, textContent.length - 1);
-			offsetChange = -2;
-		} else {
-			textContent = `\`${textContent}\``;
-			offsetChange = 1;
-		}
-
-		status.imports.add("t_fmt");
-		offsets.map((_, i) => (offsets[i] += offsetChange));
-
-		stashRunWithOffsets(
-			fragment,
-			`${node.varName}.textContent = `,
-			textContent,
-			";",
-			node.spans,
-			offsets,
-			lengths,
-			status,
-		);
-	}
-}

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

@@ -1,90 +0,0 @@
-import type SourceSpan from "../../types/SourceSpan";
-import endOfString from "../../utils/endOfString";
-import endOfTemplateString from "../../utils/endOfTemplateString";
-import trimQuotes from "../../utils/trimQuotes";
-
-export default function getAttributeOffsets(
-	value: string,
-	span: SourceSpan,
-): {
-	newValue: string;
-	spans: SourceSpan[];
-	offsets: number[];
-	lengths: number[];
-} {
-	// Build offsets for interpolated values e.g. attribute="value {x}
-	// and {y}" should have offsets for where the x and y are
-	// interpolated into the output
-	value = trimQuotes(value);
-	let spans: SourceSpan[] = [];
-	let offsets: number[] = [];
-	let lengths: number[] = [];
-
-	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++;
-			//maxLevel = Math.max(level, maxLevel);
-			if (level === 1) {
-				//reactiveCount += 1;
-				textContent += "${";
-				reactiveStart = textContent.length;
-				// 2 is for the start quote plus the new `$`
-				spans.push({ start: span.start + i + 2, end: -1 });
-				offsets.push(reactiveStart + 1);
-				continue;
-			}
-		} else if (char === "}") {
-			level--;
-			if (level === 0) {
-				// 2 is for the start quote plus the new `$`
-				spans.at(-1)!.end = span.start + i + 2;
-				lengths.push(textContent.length - reactiveStart);
-				textContent += "}";
-				continue;
-			}
-		} else if (char === "`" && level === 0) {
-			// Escape backticks outside of braces, as they will be within a backtick string
-			textContent += "\\";
-		} else if (level > 0) {
-			if (char === "/" && nextChar === "/") {
-				// Skip one-line comments
-				let start = i;
-				i = value.indexOf("\n", i);
-				textContent += value.substring(start, i + 1);
-				continue;
-			} else if (char === "/" && nextChar === "*") {
-				// Skip block comments
-				let start = i;
-				i = value.indexOf("*/", i) + 1;
-				textContent += value.substring(start, i + 1);
-				continue;
-			} else if (char === '"' || char === "'") {
-				// Skip string contents
-				let start = i;
-				i = endOfString(char, value, i);
-				textContent += value.substring(start, i + 1);
-				continue;
-			} else if (char === "`") {
-				// Skip interpolated string contents
-				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,
-	};
-}

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

@@ -1,16 +0,0 @@
-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): string {
-	// 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[0]}($|\\s|\\.|,|\\(|\\)|\\[|\\]|\\}|;)`, "g"),
-			`$1${varName[1]}$2`,
-		);
-	}
-	return value;
-}

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

@@ -1,22 +0,0 @@
-import type SourceSpan from "../../types/SourceSpan";
-import type Fragment from "../../types/nodes/Fragment";
-import type BuildStatus from "./BuildStatus";
-import replaceForVarNames from "./replaceForVarNames";
-
-export default function stashRun(
-	fragment: Fragment,
-	functionStart: string,
-	value: string,
-	functionEnd: string,
-	span: SourceSpan,
-	status: BuildStatus,
-): void {
-	value = replaceForVarNames(value, status);
-	let functionBody = functionStart + value + functionEnd;
-	fragment.effects.push({
-		functionBody,
-		spans: [span],
-		offsets: [functionStart.length],
-		lengths: [value.length],
-	});
-}

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

@@ -1,38 +0,0 @@
-import type SourceSpan from "../../types/SourceSpan";
-import type Fragment from "../../types/nodes/Fragment";
-import type BuildStatus from "./BuildStatus";
-import replaceForVarNames from "./replaceForVarNames";
-
-export default function stashRunWithOffsets(
-	fragment: Fragment,
-	functionStart: string,
-	value: string,
-	functionEnd: string,
-	spans: SourceSpan[],
-	offsets: number[],
-	lengths: number[],
-	status: BuildStatus,
-): void {
-	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: spans,
-		offsets,
-		lengths,
-	});
-}

package/src/compile/build/server/BuildServerStatus.ts

@@ -1,10 +0,0 @@
-import type BuildOptions from "../../types/BuildOptions";
-
-export default interface BuildServerStatus {
-	imports: Set<string>;
-	output: string;
-	styleHash: string;
-	varNames: Record<string, number>;
-	preserveWhitespace: boolean;
-	options?: BuildOptions;
-}

package/src/compile/build/server/buildServerAwaitNode.ts

@@ -1,49 +0,0 @@
-import {
-	ANCHOR_COMMENT,
-	HYDRATION_END_COMMENT,
-	HYDRATION_START_COMMENT,
-} from "../../types/comments";
-import type ControlNode from "../../types/nodes/ControlNode";
-import Builder from "../../utils/Builder";
-import isControlNode from "../../utils/isControlNode";
-import type BuildServerStatus from "./BuildServerStatus";
-import buildServerNode from "./buildServerNode";
-
-export default function buildServerAwaitNode(
-	node: ControlNode,
-	status: BuildServerStatus,
-	b: Builder,
-): void {
-	// Surround the entire control statement with bracketed comments, so that we
-	// can skip to the end to set the anchor node when hydrating
-	status.output += HYDRATION_START_COMMENT;
-
-	if (status.output) {
-		b.append(`t_body += \`${status.output}\`;`);
-		status.output = "";
-	}
-
-	// Build the await statement
-	for (let branch of node.children) {
-		if (isControlNode(branch) && branch.operation === "@await") {
-			buildServerAwaitBranch(branch, status, b);
-		}
-	}
-
-	// End the control statement
-	status.output += HYDRATION_END_COMMENT;
-
-	// Add the anchor node
-	status.output += ANCHOR_COMMENT;
-}
-
-function buildServerAwaitBranch(node: ControlNode, status: BuildServerStatus, b: Builder) {
-	for (let child of node.children) {
-		buildServerNode(child, status, b);
-	}
-
-	if (status.output) {
-		b.append(`t_body += \`${status.output}\`;`);
-		status.output = "";
-	}
-}