@tsrx/core 0.1.63 → 0.1.65

package/package.json

@@ -3,7 +3,7 @@
   "description": "Core compiler infrastructure for TSRX syntax",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.1.63",
+  "version": "0.1.65",
   "type": "module",
   "repository": {
     "type": "git",
@@ -79,7 +79,7 @@
     "is-reference": "^3.0.3",
     "magic-string": "^0.30.18",
     "zimmerframe": "^1.1.2",
-    "@tsrx/runtime": "0.1.2"
+    "@tsrx/runtime": "0.1.4"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",

package/src/analyze/index.js

@@ -7,30 +7,75 @@ import { walk } from 'zimmerframe';
 import {
 	is_code_block_function_body,
 	is_statement_position,
+	is_supported_lazy_assignment_position,
+	is_transparent_expression_wrapper,
 	is_tsrx_render_output_node,
 } from '../utils/ast.js';
-import { validate_forgotten_statement_container } from './validation.js';
+import {
+	validate_forgotten_statement_container,
+	validate_unsupported_lazy_assignment_position,
+} from './validation.js';
 
 /**
- * Wrappers that preserve an expression's value and therefore do not turn a
- * template into a used value on their own. Looking through them keeps strict
- * builds and `preserveParens` type-only builds on the same diagnostic path.
+ * Find the first authored lazy pattern along an assignment target's binding
+ * edges. Default-value expressions and computed keys are evaluated
+ * expressions, so nested assignments there own their own diagnostics.
  *
- * @param {AST.Node} parent
- * @param {AST.Node} child
- * @returns {boolean}
+ * @param {AST.Node} node
+ * @returns {import('../../types/index').LazyPattern | null}
  */
-function is_transparent_expression_wrapper(parent, child) {
-	return (
-		(parent.type === 'ParenthesizedExpression' ||
-			parent.type === 'TSAsExpression' ||
-			parent.type === 'TSSatisfiesExpression' ||
-			parent.type === 'TSNonNullExpression' ||
-			parent.type === 'TSInstantiationExpression' ||
-			parent.type === 'TSTypeAssertion' ||
-			parent.type === 'ChainExpression') &&
-		/** @type {{ expression?: AST.Node }} */ (parent).expression === child
-	);
+function find_first_lazy_pattern(node) {
+	if ((node.type === 'ObjectPattern' || node.type === 'ArrayPattern') && node.lazy) {
+		return node;
+	}
+
+	switch (node.type) {
+		case 'AssignmentPattern':
+			return find_first_lazy_pattern(node.left);
+		case 'RestElement':
+			return find_first_lazy_pattern(node.argument);
+		case 'ObjectPattern':
+			for (const property of node.properties) {
+				const lazy =
+					property.type === 'Property'
+						? find_first_lazy_pattern(property.value)
+						: find_first_lazy_pattern(property.argument);
+				if (lazy) return lazy;
+			}
+			return null;
+		case 'ArrayPattern':
+			for (const element of node.elements) {
+				if (!element) continue;
+				const lazy = find_first_lazy_pattern(element);
+				if (lazy) return lazy;
+			}
+			return null;
+		default: {
+			const expression = /** @type {{ expression?: AST.Node }} */ (node).expression;
+			return expression && is_transparent_expression_wrapper(node, expression)
+				? find_first_lazy_pattern(expression)
+				: null;
+		}
+	}
+}
+
+/**
+ * @param {AST.AssignmentExpression} node
+ * @param {{ next: () => unknown, path: AST.Node[], state: TSRXAnalysisState }} context
+ */
+function visit_assignment_expression(node, { next, path, state }) {
+	const lazy = find_first_lazy_pattern(node.left);
+
+	if (lazy && !is_supported_lazy_assignment_position(node, path)) {
+		validate_unsupported_lazy_assignment_position(
+			lazy,
+			state.filename,
+			state.collect ? state.errors : undefined,
+			state.comments,
+		);
+	}
+
+	next();
 }
 
 /**
@@ -126,6 +171,8 @@ function visit_class(_node, { next, state }) {
 }
 
 const visitors = {
+	AssignmentExpression: visit_assignment_expression,
+
 	FunctionDeclaration: visit_function,
 	FunctionExpression: visit_function,
 	ArrowFunctionExpression: visit_function,

package/src/analyze/validation.js

@@ -30,6 +30,8 @@ export const TSRX_DO_WHILE_STATEMENT_ERROR =
 	'Do...while loops are not supported in TSRX templates. Move the do...while loop into a function.';
 export const TSRX_FORGOTTEN_STATEMENT_CONTAINER_ERROR =
 	"This TSRX template output is unused. Return it, assign it to a value that is rendered, or make it part of the rendered output of a function '@{...}' body.";
+export const TSRX_UNSUPPORTED_LAZY_ASSIGNMENT_POSITION_ERROR =
+	'Lazy destructuring assignments require a directly lazy target as a standalone statement inside a program, block, TSRX code block, or switch case.';
 
 const invalid_nestings = {
 	// <p> cannot contain block-level elements
@@ -220,6 +222,23 @@ export function validate_forgotten_statement_container(node, filename, errors, c
 	);
 }
 
+/**
+ * @param {import('../../types/index').LazyPattern} node
+ * @param {string | null | undefined} filename
+ * @param {CompileError[]} [errors]
+ * @param {AST.CommentWithLocation[]} [comments]
+ */
+export function validate_unsupported_lazy_assignment_position(node, filename, errors, comments) {
+	error(
+		TSRX_UNSUPPORTED_LAZY_ASSIGNMENT_POSITION_ERROR,
+		filename ?? null,
+		node,
+		errors,
+		comments,
+		DIAGNOSTIC_CODES.UNSUPPORTED_LAZY_ASSIGNMENT_POSITION,
+	);
+}
+
 /**
  * @param {AST.ReturnStatement} node
  * @param {string | null | undefined} filename

package/src/diagnostics.js

@@ -5,4 +5,5 @@ export const DIAGNOSTIC_CODES = {
 	TEMPLATE_EXPRESSION_TRAILING_SEMICOLON: 'tsrx-template-expression-trailing-semicolon',
 	TEMPLATE_RETURN_STATEMENT: 'tsrx-template-return-statement',
 	FORGOTTEN_STATEMENT_CONTAINER: 'tsrx-forgotten-statement-container',
+	UNSUPPORTED_LAZY_ASSIGNMENT_POSITION: 'tsrx-unsupported-lazy-assignment-position',
 };

package/src/index.js

@@ -94,6 +94,7 @@ export {
 	is_template_directive as isTemplateDirective,
 	is_tsrx_render_output_node as isTsrxRenderOutputNode,
 	is_code_block_function_body as isCodeBlockFunctionBody,
+	is_statement_list_item as isStatementListItem,
 	is_statement_position as isStatementPosition,
 } from './utils/ast.js';
 
@@ -262,6 +263,7 @@ export {
 	TSRX_LOOP_CONTINUE_ERROR,
 	TSRX_LOOP_RETURN_ERROR,
 	TSRX_RETURN_STATEMENT_ERROR,
+	TSRX_UNSUPPORTED_LAZY_ASSIGNMENT_POSITION_ERROR,
 	TSRX_WHILE_STATEMENT_ERROR,
 	get_return_keyword_node as getReturnKeywordNode,
 	get_statement_keyword_node as getStatementKeywordNode,
@@ -272,6 +274,7 @@ export {
 	validate_tsrx_loop_continue_statement as validateTsrxLoopContinueStatement,
 	validate_tsrx_loop_return_statement as validateTsrxLoopReturnStatement,
 	validate_tsrx_return_statement as validateTsrxReturnStatement,
+	validate_unsupported_lazy_assignment_position as validateUnsupportedLazyAssignmentPosition,
 	validate_tsrx_unsupported_loop_statement as validateTsrxUnsupportedLoopStatement,
 	validate_forgotten_statement_container as validateForgottenStatementContainer,
 	validate_nesting as validateNesting,

package/src/plugin.js

@@ -49,6 +49,60 @@ const CharCode = Object.freeze({
 	closeBrace: 125,
 });
 
+/** @type {WeakMap<Parse.Parser, number[]>} */
+const parser_line_starts = new WeakMap();
+
+/**
+ * Resolve an offset without rescanning the source from the beginning on every
+ * TSRX tokenizer rewind. Acorn's `getLineInfo` is linear in the offset; the
+ * parser calls this path often enough that large modules otherwise pay a
+ * quadratic location-tracking cost.
+ *
+ * @param {Parse.Parser} parser
+ * @param {number} offset
+ * @returns {acorn.Position}
+ */
+function get_line_info(parser, offset) {
+	let starts = parser_line_starts.get(parser);
+	if (starts === undefined) {
+		starts = [0];
+		for (let i = 0; i < parser.input.length; i++) {
+			const ch = parser.input.charCodeAt(i);
+			if (ch === CharCode.carriageReturn && parser.input.charCodeAt(i + 1) === CharCode.lineFeed) {
+				i++;
+				starts.push(i + 1);
+			} else if (
+				ch === CharCode.lineFeed ||
+				ch === CharCode.carriageReturn ||
+				ch === 0x2028 ||
+				ch === 0x2029
+			) {
+				starts.push(i + 1);
+			}
+		}
+		parser_line_starts.set(parser, starts);
+	}
+
+	let low = 0;
+	let high = starts.length;
+	while (low + 1 < high) {
+		const middle = (low + high) >>> 1;
+		if (starts[middle] <= offset) low = middle;
+		else high = middle;
+	}
+	// `getLineInfo(input, offset)` treats a CR as a complete line break when
+	// `offset` points at the LF of a CRLF pair, even though later offsets treat
+	// the pair as one terminator. Preserve that boundary behavior exactly.
+	if (
+		offset > 0 &&
+		parser.input.charCodeAt(offset) === CharCode.lineFeed &&
+		parser.input.charCodeAt(offset - 1) === CharCode.carriageReturn
+	) {
+		return new acorn.Position(low + 2, 0);
+	}
+	return new acorn.Position(low + 1, offset - starts[low]);
+}
+
 // Transparent wrappers to look through when validating a dynamic tag
 // expression (`<{expr}>`), and syntax that disqualifies one outright.
 const DYNAMIC_TAG_WRAPPER_TYPES = new Set([
@@ -709,12 +763,12 @@ export function TSRXPlugin(config) {
 					}
 					if (this.#isTemplateBlockCommentStart(index)) {
 						const comment_start = index;
-						const comment_start_loc = acorn.getLineInfo(this.input, comment_start);
+						const comment_start_loc = get_line_info(this, comment_start);
 						const close = this.input.indexOf('*/', index + 2);
 						const value_end = close === -1 ? this.input.length : close;
 						index = close === -1 ? this.input.length : close + 2;
 						if (this.options.onComment && comment_start >= token_end) {
-							const comment_end_loc = acorn.getLineInfo(this.input, index);
+							const comment_end_loc = get_line_info(this, index);
 							this.options.onComment(
 								true,
 								this.input.slice(comment_start + 2, value_end),
@@ -741,7 +795,7 @@ export function TSRXPlugin(config) {
 					index++;
 				}
 
-				const endLoc = acorn.getLineInfo(this.input, index);
+				const endLoc = get_line_info(this, index);
 				const node = /** @type {ESTreeJSX.JSXText} */ (this.startNodeAt(start, this.startLoc));
 				node.value = value;
 				node.raw = this.input.slice(start, index);
@@ -793,7 +847,7 @@ export function TSRXPlugin(config) {
 					}
 				}
 				if (!has_newline) return;
-				const loc = acorn.getLineInfo(this.input, index);
+				const loc = get_line_info(this, index);
 				this.start = index;
 				this.startLoc = new acorn.Position(loc.line, loc.column);
 				if (this.pos <= index) {
@@ -822,8 +876,8 @@ export function TSRXPlugin(config) {
 					this.input.slice(start + 2, end),
 					start,
 					end,
-					acorn.getLineInfo(this.input, start),
-					acorn.getLineInfo(this.input, end),
+					get_line_info(this, start),
+					get_line_info(this, end),
 					metadata,
 				);
 			}
@@ -936,7 +990,7 @@ export function TSRXPlugin(config) {
 				}
 				this.pos = start;
 				this.start = start;
-				this.startLoc = acorn.getLineInfo(this.input, start);
+				this.startLoc = get_line_info(this, start);
 				this.exprAllowed = true;
 				this.#suppressTemplateRawTextToken = true;
 				this.next();
@@ -1031,7 +1085,7 @@ export function TSRXPlugin(config) {
 					index++;
 				}
 
-				const endLoc = acorn.getLineInfo(this.input, index);
+				const endLoc = get_line_info(this, index);
 				const node = /** @type {ESTreeJSX.JSXText} */ (this.startNodeAt(start, this.startLoc));
 				node.value = this.input.slice(start, index);
 				node.raw = node.value;
@@ -1195,7 +1249,7 @@ export function TSRXPlugin(config) {
 				const start = this.pos;
 				const index = this.#templateRawTextEnd(start);
 
-				const endLoc = acorn.getLineInfo(this.input, index);
+				const endLoc = get_line_info(this, index);
 				const value = this.input.slice(start, index);
 				if (value.match(regex_newline_characters)) {
 					this.curLine = endLoc.line;
@@ -1394,7 +1448,7 @@ export function TSRXPlugin(config) {
 				let node;
 				try {
 					if (this.type === tstt.jsxText || this.type === tstt.jsxName) {
-						const loc = acorn.getLineInfo(this.input, this.start);
+						const loc = get_line_info(this, this.start);
 						this.pos = this.start;
 						this.curLine = loc.line;
 						this.lineStart = this.start - loc.column;
@@ -1429,7 +1483,7 @@ export function TSRXPlugin(config) {
 				// (a preceding setup statement's context restore can strip the JSX tag
 				// contexts the trailing `<`/`@` token first pushed).
 				if (this.start !== at_index) {
-					const loc = acorn.getLineInfo(this.input, at_index);
+					const loc = get_line_info(this, at_index);
 					this.pos = at_index;
 					this.start = at_index;
 					this.startLoc = new acorn.Position(loc.line, loc.column);
@@ -1541,7 +1595,7 @@ export function TSRXPlugin(config) {
 				if (this.curContext() !== b_stat) {
 					this.context.push(b_stat);
 				}
-				const braceLoc = acorn.getLineInfo(this.input, braceStart);
+				const braceLoc = get_line_info(this, braceStart);
 				this.pos = braceStart;
 				this.start = braceStart;
 				this.startLoc = new acorn.Position(braceLoc.line, braceLoc.column);
@@ -1681,7 +1735,7 @@ export function TSRXPlugin(config) {
 				const keywordStart = start + 1;
 				this.pos = keywordStart;
 				this.start = keywordStart;
-				this.startLoc = acorn.getLineInfo(this.input, keywordStart);
+				this.startLoc = get_line_info(this, keywordStart);
 				this.curLine = this.startLoc.line;
 				this.lineStart = keywordStart - this.startLoc.column;
 				this.#filterTemplateScriptContexts();
@@ -1814,13 +1868,13 @@ export function TSRXPlugin(config) {
 					start: keywordStart,
 					end: keywordEnd,
 					loc: {
-						start: acorn.getLineInfo(this.input, keywordStart),
-						end: acorn.getLineInfo(this.input, keywordEnd),
+						start: get_line_info(this, keywordStart),
+						end: get_line_info(this, keywordEnd),
 					},
 				};
 				this.pos = wordStart;
 				this.start = wordStart;
-				this.startLoc = acorn.getLineInfo(this.input, wordStart);
+				this.startLoc = get_line_info(this, wordStart);
 				this.curLine = this.startLoc.line;
 				this.lineStart = wordStart - this.startLoc.column;
 				this.#filterTemplateScriptContexts();
@@ -1856,7 +1910,7 @@ export function TSRXPlugin(config) {
 
 				this.pos = wordStart;
 				this.start = wordStart;
-				this.startLoc = acorn.getLineInfo(this.input, wordStart);
+				this.startLoc = get_line_info(this, wordStart);
 				this.curLine = this.startLoc.line;
 				this.lineStart = wordStart - this.startLoc.column;
 				this.#filterTemplateScriptContexts();
@@ -2211,12 +2265,12 @@ export function TSRXPlugin(config) {
 
 				if (relativeCloseStart !== -1) {
 					const closingStart = contentStart + content.length;
-					const closingLineInfo = acorn.getLineInfo(this.input, closingStart);
+					const closingLineInfo = get_line_info(this, closingStart);
 					const closingStartLoc = new acorn.Position(closingLineInfo.line, closingLineInfo.column);
 					const nameStart = closingStart + 2;
 					const nameEnd = nameStart + tagName.length;
-					const nameStartInfo = acorn.getLineInfo(this.input, nameStart);
-					const nameEndInfo = acorn.getLineInfo(this.input, nameEnd);
+					const nameStartInfo = get_line_info(this, nameStart);
+					const nameEndInfo = get_line_info(this, nameEnd);
 					const name = /** @type {ESTreeJSX.JSXIdentifier} */ (
 						this.startNodeAt(
 							nameStart,
@@ -2231,7 +2285,7 @@ export function TSRXPlugin(config) {
 						new acorn.Position(nameEndInfo.line, nameEndInfo.column),
 					);
 					const closingEnd = closingStart + closeTag.length;
-					const closingEndInfo = acorn.getLineInfo(this.input, closingEnd);
+					const closingEndInfo = get_line_info(this, closingEnd);
 					const closingElement =
 						/** @type {ESTreeJSX.TSRXJSXClosingElement & AST.NodeWithLocation} */ (
 							this.startNodeAt(closingStart, closingStartLoc)
@@ -2337,14 +2391,14 @@ export function TSRXPlugin(config) {
 				node.children = [];
 
 				if (content.length > 0) {
-					const bodyStartInfo = acorn.getLineInfo(this.input, open.end);
+					const bodyStartInfo = get_line_info(this, open.end);
 					const text = /** @type {ESTreeJSX.JSXText} */ (
 						this.startNodeAt(open.end, new acorn.Position(bodyStartInfo.line, bodyStartInfo.column))
 					);
 					text.value = content;
 					text.raw = content;
 					const bodyEnd = open.end + content.length;
-					const bodyEndInfo = acorn.getLineInfo(this.input, bodyEnd);
+					const bodyEndInfo = get_line_info(this, bodyEnd);
 					this.finishNodeAt(
 						text,
 						'JSXText',
@@ -2625,8 +2679,8 @@ export function TSRXPlugin(config) {
 			#report_recoverable_error_range(position, end, message, code) {
 				const start = Math.max(0, Math.min(position, this.input.length));
 				const range_end = Math.max(start, Math.min(end, this.input.length));
-				const start_loc = acorn.getLineInfo(this.input, start);
-				const end_loc = acorn.getLineInfo(this.input, range_end);
+				const start_loc = get_line_info(this, start);
+				const end_loc = get_line_info(this, range_end);
 
 				error(
 					message,
@@ -3026,7 +3080,7 @@ export function TSRXPlugin(config) {
 					this.input.charCodeAt(this.pos - 1) === CharCode.equals
 				) {
 					const start = this.pos - 1;
-					const loc = acorn.getLineInfo(this.input, start);
+					const loc = get_line_info(this, start);
 					this.start = start;
 					this.startLoc = loc;
 					this.pos++;
@@ -3078,7 +3132,7 @@ export function TSRXPlugin(config) {
 					this.input.charCodeAt(this.pos - 1) === CharCode.equals
 				) {
 					const start = this.pos - 1;
-					const loc = acorn.getLineInfo(this.input, start);
+					const loc = get_line_info(this, start);
 					this.start = start;
 					this.startLoc = loc;
 					this.pos++;
@@ -3823,8 +3877,8 @@ export function TSRXPlugin(config) {
 						}
 						const brace_start = skip_whitespace_from(this.input, name_end);
 						if (this.input.charCodeAt(brace_start) === CharCode.closeBrace) {
-							const name_start_loc = acorn.getLineInfo(this.input, name_start);
-							const name_end_loc = acorn.getLineInfo(this.input, name_end);
+							const name_start_loc = get_line_info(this, name_start);
+							const name_end_loc = get_line_info(this, name_end);
 							const name_value = this.input.slice(name_start, name_end);
 							const id = /** @type {ESTreeJSX.JSXIdentifier} */ (
 								this.startNodeAt(name_start, name_start_loc)
@@ -3844,14 +3898,14 @@ export function TSRXPlugin(config) {
 								expression,
 								'JSXExpressionContainer',
 								brace_start + 1,
-								acorn.getLineInfo(this.input, brace_start + 1),
+								get_line_info(this, brace_start + 1),
 							);
 							/** @type {ESTreeJSX.JSXAttribute} */ (node).name = id;
 							/** @type {ESTreeJSX.JSXAttribute} */ (node).value = expression;
 							/** @type {ESTreeJSX.JSXAttribute} */ (node).shorthand = true;
 
 							const end = brace_start + 1;
-							const endLoc = acorn.getLineInfo(this.input, end);
+							const endLoc = get_line_info(this, end);
 							this.pos = end;
 							this.curLine = endLoc.line;
 							this.lineStart = end - endLoc.column;
@@ -4104,7 +4158,7 @@ export function TSRXPlugin(config) {
 							if (this.input.charCodeAt(paramStart) === CharCode.openParen) {
 								this.pos = paramStart;
 								this.start = paramStart;
-								this.startLoc = acorn.getLineInfo(this.input, paramStart);
+								this.startLoc = get_line_info(this, paramStart);
 								this.curLine = this.startLoc.line;
 								this.lineStart = paramStart - this.startLoc.column;
 								this.#filterTemplateScriptContexts();
@@ -4274,7 +4328,7 @@ export function TSRXPlugin(config) {
 						this.input.charCodeAt(index + 1) === CharCode.greaterThan &&
 						this.context.includes(tstc.tc_expr)
 					) {
-						const loc = acorn.getLineInfo(this.input, index);
+						const loc = get_line_info(this, index);
 						this.pos = index;
 						this.start = index;
 						this.startLoc = loc;
@@ -4467,7 +4521,7 @@ export function TSRXPlugin(config) {
 								!this.#shouldReadTemplateRawTextToken()
 							) {
 								const start = this.pos - 1;
-								const loc = acorn.getLineInfo(this.input, start);
+								const loc = get_line_info(this, start);
 								this.start = start;
 								this.startLoc = loc;
 								this.pos++;
@@ -4818,7 +4872,7 @@ export function TSRXPlugin(config) {
 						);
 						text_node.value = ws_value;
 						text_node.raw = ws_value;
-						const loc = acorn.getLineInfo(this.input, at_index);
+						const loc = get_line_info(this, at_index);
 						const at_position = new acorn.Position(loc.line, loc.column);
 						this.finishNodeAt(text_node, 'JSXText', at_index, at_position);
 						if (this.#shouldKeepTemplateTextNode(text_node)) {
@@ -4928,7 +4982,7 @@ export function TSRXPlugin(config) {
 						this.start > blockEnd &&
 						/^\s*$/.test(this.input.slice(blockEnd, this.start))
 					) {
-						const loc = acorn.getLineInfo(this.input, blockEnd);
+						const loc = get_line_info(this, blockEnd);
 						this.pos = blockEnd;
 						this.start = blockEnd;
 						this.startLoc = new acorn.Position(loc.line, loc.column);
@@ -5373,7 +5427,16 @@ export function TSRXPlugin(config) {
 			parseBlock(createNewLexicalScope, node, exitStrict) {
 				const parent = this.#path.at(-1);
 
-				if (this.#isNativeTemplateNode(parent) && this.#templateControlFlowBlockDepth > 0) {
+				// `#templateControlFlowBlockDepth` alone decides here — don't also
+				// require `#isNativeTemplateNode(parent)`: a directive body's own
+				// parsing (`#parseTemplateControlFlowBlock`) empties `#path`, so for
+				// a `@for` nested inside another directive's branch, `parent` is
+				// `undefined` and that check would skip this redirect, dropping the
+				// `@for`'s body into plain statement parsing (nested directives then
+				// land in expression position instead of template position). The
+				// depth counter is set only around a `@for`'s own header+body and
+				// `@empty` clause, so plain JS `for` loops can't false-positive.
+				if (this.#templateControlFlowBlockDepth > 0) {
 					this.#templateControlFlowBlockDepth--;
 					try {
 						return this.#parseTemplateControlFlowBlock(createNewLexicalScope, node, exitStrict);