@lucidkiln/core 1.1.0 → 1.2.0

package/dist/node.d.ts

@@ -1,4 +1,4 @@
-import { f as Loader } from "./environment-DkfrPazl.js";
+import { f as Loader } from "./environment-DBvRrOn0.js";
 //#region src/node.d.ts
 export type FileLoaderOptions = {
   /** Directory that template names are relative to. */

package/dist/{parser-BU5dThuk.js → parser-isboTef0.js}

@@ -152,26 +152,14 @@ var Lexer = class {
 		const standalone = applyStandaloneLines(this.#text, parts);
 		const lines = textLines(this.#text, parts, standalone);
 		const tokens = [];
-		let line = 0;
-		for (const part of parts) {
-			const text = part.kind === "text";
-			const at = text ? part.from : part.start;
-			if (text && part.from < part.to) tokens.push({
+		for (const part of parts) if (part.kind === "text") {
+			if (part.from < part.to) tokens.push({
 				type: "text",
 				value: this.#text.slice(part.from, part.to),
 				start: part.from,
 				end: part.to
 			});
-			else if (lines[line]?.start === at) tokens.push({
-				type: "text",
-				value: "",
-				start: at,
-				end: at
-			});
-			if (!text && part.kind !== "comment") for (const token of part.tokens) tokens.push(token);
-			const end = text ? part.to : part.start;
-			while ((lines[line]?.start ?? Infinity) <= end) line++;
-		}
+		} else if (part.kind !== "comment") for (const token of part.tokens) tokens.push(token);
 		tokens.push({
 			type: "eof",
 			value: "",
@@ -701,9 +689,6 @@ const textLines = (text, parts, removed) => {
 			indentEnd
 		});
 	};
-	const first = parts[0];
-	const start = contentStart(text);
-	if (first && (first.kind !== "text" || first.from === start)) add(start);
 	for (const part of parts) {
 		if (part.kind !== "text") continue;
 		for (let newline = newlineIn(text, part.start, part.end); newline !== -1; newline = newlineIn(text, newline + 1, part.end)) {
@@ -718,11 +703,10 @@ const textLines = (text, parts, removed) => {
 //#region src/parser/indent.ts
 /** The bodies a statement holds. Branches share their tag's body. A component's fills are bodies of their own, inside the component's. */
 const bodiesOf = (node) => {
-	const own = (lists, full = false) => ({
+	const own = (lists) => ({
 		open: node.span.start,
 		end: node.span.end,
-		lists,
-		full
+		lists
 	});
 	switch (node.type) {
 		case "If": return [own([...node.branches.map((branch) => branch.body), node.alternate ?? []])];
@@ -730,16 +714,15 @@ const bodiesOf = (node) => {
 		case "Component": return [...node.fills.map((fill) => ({
 			open: fill.span.start,
 			end: fill.span.end,
-			lists: [fill.body],
-			full: true
-		})), own([node.body, ...node.fills.map((fill) => fill.body)], true)];
+			lists: [fill.body]
+		})), own([node.body, ...node.fills.map((fill) => fill.body)])];
 		case "Island": return [{
 			...own([node.body]),
 			keep: true
 		}];
 		case "Block":
 		case "Slot":
-		case "Add": return [own([node.body], true)];
+		case "Add":
 		case "SetBlock":
 		case "Macro":
 		case "Cache":
@@ -797,15 +780,16 @@ const preformatted = (text, textTokens) => {
 	return ranges;
 };
 /**
-* Works out the indentation of a template's text, so content can be inserted elsewhere and still line up.
+* Removes the extra indentation inside tags that stand on their own line: the spaces and tabs that every content line
+* inside shares, beyond the tag's own indentation. It happens when compiling, so rendering is no slower.
 *
-* - Removes the extra indentation inside tags that stand on their own line: the spaces and tabs that every content line inside shares, beyond the tag's own. Blocks, slots and a component's content can be inserted where another tag stands, so they lose all of it and take the indentation of where they land.
-* - Sets `indent` on the tags in `placedNodes`, which insert content, when they stand on their own line: the line's indentation once that removal is done.
-* - Sets `lines` on text nodes: where each line of text starts, to take the indentation of where the text is inserted.
+* Also sets the indentation of `islands` whose tags stand on lines of their own, since a deferred island writes its
+* tags back as `<kiln-island>` lines. See `IslandStatement`.
 *
-* Lines inside `<pre>` and `<textarea>` keep their whitespace. Amounts come from the source alone, so nested tags each remove their own step whatever order they are visited in.
+* Lines inside `<pre>` and `<textarea>` keep their whitespace. Amounts come from the source alone, so nested tags each
+* remove their own step whatever order they are visited in. Then the text nodes holding those offsets are rebuilt.
 */
-const arrangeIndentation = (ast, text, { tokens, standalone, lines }, placedNodes) => {
+const removeIndentation = (ast, text, { tokens, standalone, lines }, islands) => {
 	const textTokens = tokens.filter((token) => token.type === "text");
 	const pre = preformatted(text, textTokens);
 	const inPre = (offset) => {
@@ -823,28 +807,19 @@ const arrangeIndentation = (ast, text, { tokens, standalone, lines }, placedNode
 			indentEnd
 		};
 	};
-	const placed = [];
-	const islandEnds = [];
-	for (const node of placedNodes) {
+	const islandLines = [];
+	for (const node of islands) {
 		if (inPre(node.span.start)) continue;
-		if (node.type === "Island") {
-			const end = text.lastIndexOf("{%", node.span.end - 1);
-			if (standalone.has(end)) islandEnds.push({
-				node,
-				line: lineOf(end)
-			});
-		}
-		if (!standalone.has(node.span.start)) continue;
-		placed.push({
+		const end = text.lastIndexOf("{%", node.span.end - 1);
+		const open = standalone.has(node.span.start) ? lineOf(node.span.start) : null;
+		const close = standalone.has(end) ? lineOf(end) : null;
+		if (open || close) islandLines.push({
 			node,
-			line: lineOf(node.span.start)
+			open,
+			end: close
 		});
 	}
-	const contentLines = placed.length > 0 || islandEnds.length > 0 ? [
-		...textLines,
-		...placed.map((item) => item.line),
-		...islandEnds.map((item) => item.line)
-	].sort((a, b) => a.start - b.start) : textLines;
+	const contentLines = islandLines.length > 0 ? [...textLines, ...islandLines.flatMap((item) => [item.open, item.end].filter((line) => line !== null))].sort((a, b) => a.start - b.start) : textLines;
 	const cuts = [];
 	const indentOf = (offset) => {
 		const line = lineOf(offset);
@@ -860,6 +835,7 @@ const arrangeIndentation = (ast, text, { tokens, standalone, lines }, placedNode
 		const first = firstAtLeast(contentLines, newline + 1, (line) => line.start);
 		const last = firstAtLeast(contentLines, to, (line) => line.start);
 		if (first >= last) return;
+		const own = indentOf(body.open);
 		let shared = Infinity;
 		const firstLine = contentLines[first];
 		for (let i = first; i < last; i++) {
@@ -868,16 +844,11 @@ const arrangeIndentation = (ast, text, { tokens, standalone, lines }, placedNode
 			while (length < line.indentEnd - line.start && text[line.start + length] === text[firstLine.start + length]) length++;
 			shared = Math.min(shared, length);
 		}
-		let keep = 0;
-		if (!body.full) {
-			const own = indentOf(body.open);
-			if (shared <= own.length) return;
-			if (text.slice(firstLine.start, firstLine.start + own.length) !== own) return;
-			keep = own.length;
-		} else if (shared === 0) return;
+		if (shared <= own.length) return;
+		if (text.slice(firstLine.start, firstLine.start + own.length) !== own) return;
 		for (let i = first; i < last; i++) {
 			const line = contentLines[i];
-			cuts.push([line.start + keep, line.start + shared]);
+			cuts.push([line.start + own.length, line.start + shared]);
 		}
 	};
 	const visit = (list) => {
@@ -908,37 +879,28 @@ const arrangeIndentation = (ast, text, { tokens, standalone, lines }, placedNode
 		}
 		return out + text.slice(Math.min(at, end), end);
 	};
-	for (const { node, line } of placed) node.indent = uncut(line.start, line.indentEnd);
-	for (const { node, line } of islandEnds) node.closing = {
-		indent: line.start === lineOf(node.span.start).start ? null : uncut(line.start, line.indentEnd),
-		newline: text.includes("\n", node.span.end)
-	};
+	for (const { node, open, end } of islandLines) {
+		if (open) node.indent = uncut(open.start, open.indentEnd);
+		if (end) node.closing = {
+			indent: open !== null && end.start === open.start ? null : uncut(end.start, end.indentEnd),
+			newline: text.includes("\n", node.span.end)
+		};
+	}
+	if (merged.length === 0) return;
 	const hasCut = (start, end) => {
 		const range = merged[firstAtLeast(merged, start, (range) => range[1] - 1)];
 		return range !== void 0 && range[0] < end;
 	};
 	const rewrite = (list) => {
 		for (const node of list) {
-			if (node.type === "Text") {
-				let line = firstAtLeast(textLines, node.span.start, (l) => l.start);
-				const hasLines = (textLines[line]?.start ?? Infinity) <= node.span.end;
-				const cut = hasCut(node.span.start, node.span.end);
-				if (!hasLines && !cut) continue;
+			if (node.type === "Text" && hasCut(node.span.start, node.span.end)) {
 				let value = "";
-				let size = 0;
-				const starts = [];
 				for (let i = firstAtLeast(textTokens, node.span.start, (t) => t.start); i < textTokens.length; i++) {
 					const token = textTokens[i];
 					if (token.end > node.span.end) break;
-					for (let next = textLines[line]; next !== void 0 && next.start <= token.end; next = textLines[++line]) starts.push(size + (cut ? uncut(token.start, next.start).length : next.start - token.start));
-					if (cut) {
-						const piece = uncut(token.start, token.end);
-						value += piece;
-						size += piece.length;
-					} else size += token.end - token.start;
+					value += uncut(token.start, token.end);
 				}
-				if (cut) node.value = value;
-				if (starts.length > 0) node.lines = starts;
+				node.value = value;
 			}
 			const bodies = bodiesOf(node);
 			if (bodies.length > 0) for (const child of childLists(bodies)) rewrite(child);
@@ -967,7 +929,7 @@ const parse = (text, options) => {
 	const lexed = lex(text);
 	const parser = new Parser(lexed.tokens, options);
 	const ast = parser.parseTemplate(text.length);
-	arrangeIndentation(ast, text, lexed, parser.placed);
+	removeIndentation(ast, text, lexed, parser.islands);
 	return {
 		ast,
 		problems: [...lexed.problems, ...parser.problems]
@@ -1018,8 +980,8 @@ const describeToken = (token) => {
 };
 var Parser = class {
 	problems = [];
-	/** Every tag that inserts content, for `arrangeIndentation`. */
-	placed = [];
+	/** Every island, for `removeIndentation`. */
+	islands = [];
 	#tokens;
 	#options;
 	#index = 0;
@@ -1275,14 +1237,14 @@ var Parser = class {
 			case "outlet": {
 				const name = this.#parseStringLiteral("an outlet name");
 				const close = this.#expectTagEnd();
-				return this.#placed({
+				return {
 					type: "Outlet",
 					name,
 					span: {
 						start: open.start,
 						end: close.end
 					}
-				});
+				};
 			}
 			case "flush": {
 				const close = this.#expectTagEnd();
@@ -1593,7 +1555,7 @@ var Parser = class {
 		if (this.#peek().type !== "tagClose") {
 			const expression = this.#parseExpression();
 			const close = this.#expectTagEnd();
-			return this.#placed({
+			return {
 				type: "Block",
 				name,
 				body: [{
@@ -1608,13 +1570,13 @@ var Parser = class {
 					start: open.start,
 					end: close.end
 				}
-			});
+			};
 		}
 		this.#expectTagEnd();
 		const { body, end } = this.#parseBody(["endblock"]);
 		if (end) this.#finishEndTag(name);
 		else this.#unclosed("block", open, "endblock");
-		return this.#placed({
+		return {
 			type: "Block",
 			name,
 			body,
@@ -1622,7 +1584,7 @@ var Parser = class {
 				start: open.start,
 				end: this.#lastEnd
 			}
-		});
+		};
 	}
 	#parseInclude(open) {
 		const template = this.#parseExpression();
@@ -1638,7 +1600,7 @@ var Parser = class {
 			ignoreMissing = true;
 		}
 		const close = this.#expectTagEnd();
-		return this.#placed({
+		return {
 			type: "Include",
 			template,
 			with: withValue,
@@ -1647,7 +1609,7 @@ var Parser = class {
 				start: open.start,
 				end: close.end
 			}
-		});
+		};
 	}
 	#parseComponent(open) {
 		const header = this.#header(() => {
@@ -1696,7 +1658,7 @@ var Parser = class {
 				}
 			});
 		}
-		return this.#placed({
+		return {
 			type: "Component",
 			...header,
 			fills,
@@ -1705,11 +1667,7 @@ var Parser = class {
 				start: open.start,
 				end: this.#lastEnd
 			}
-		});
-	}
-	#placed(node) {
-		this.placed.push(node);
-		return node;
+		};
 	}
 	#parseStringLiteral(what) {
 		const token = this.#peek();
@@ -1722,7 +1680,7 @@ var Parser = class {
 		const { body, end } = this.#parseBody(["endslot"]);
 		if (end) this.#finishEndTag();
 		else this.#unclosed("slot", open, "endslot");
-		return this.#placed({
+		return {
 			type: "Slot",
 			name,
 			body,
@@ -1730,7 +1688,7 @@ var Parser = class {
 				start: open.start,
 				end: this.#lastEnd
 			}
-		});
+		};
 	}
 	#parseMacro(open) {
 		const header = this.#header(() => {
@@ -1898,7 +1856,7 @@ var Parser = class {
 		const { body, end } = this.#parseBody(["endisland"]);
 		if (end) this.#finishEndTag();
 		else this.#unclosed("island", open, "endisland");
-		return this.#placed({
+		const island = {
 			type: "Island",
 			...header,
 			body,
@@ -1906,7 +1864,9 @@ var Parser = class {
 				start: open.start,
 				end: this.#lastEnd
 			}
-		});
+		};
+		this.islands.push(island);
+		return island;
 	}
 	#parseApply(open) {
 		const filters = this.#header(() => {
@@ -2664,4 +2624,4 @@ var Parser = class {
 //#endregion
 export { ESCAPE_STRATEGIES as a, DEFAULT_SLOT as i, contentStart as n, scanParts as r, parse as t };
 
-//# sourceMappingURL=parser-BU5dThuk.js.map
+//# sourceMappingURL=parser-isboTef0.js.map