@tsrx/core 0.1.46 → 0.1.47

package/src/transform/lazy.js

@@ -1,7 +1,7 @@
 /** @import * as AST from 'estree' */
 
 import * as b from '../utils/builders.js';
-import { is_function_or_component_node } from '../utils/ast.js';
+import { has_location, is_function_or_component_node } from '../utils/ast.js';
 
 /**
  * Lazy destructuring transform — framework-agnostic.
@@ -57,7 +57,7 @@ function generate_lazy_id(context) {
  * @returns {any}
  */
 function set_source_location(node, loc_info) {
-	if (loc_info?.loc) {
+	if (has_location(loc_info)) {
 		node.start = loc_info.start;
 		node.end = loc_info.end;
 		node.loc = loc_info.loc;
@@ -84,7 +84,7 @@ function create_generated_identifier(name, loc_info, source_name, source_length)
  * @returns {{ start: number, end: number, loc: any, source_length: number } | null}
  */
 function get_lazy_pattern_mapping_range(pattern) {
-	if (!pattern.loc) return null;
+	if (!has_location(pattern)) return null;
 
 	const end = pattern.typeAnnotation?.start ?? pattern.end;
 	const end_loc = pattern.typeAnnotation?.loc?.start ?? pattern.loc.end;
@@ -148,11 +148,11 @@ function set_lazy_param_binding_mappings(lazy_id, pattern) {
 
 		const value = prop.value;
 		const actual = value.type === 'AssignmentPattern' ? value.left : value;
-		if (actual.type !== 'Identifier' || !actual.loc) continue;
+		if (actual.type !== 'Identifier' || !has_location(actual)) continue;
 
 		const key_name = get_static_property_name(prop.key);
 		const generated = key_name == null ? null : type_keys.get(key_name);
-		if (generated?.loc) {
+		if (has_location(generated)) {
 			generated.metadata = { ...generated.metadata, disable_verification: true };
 			mappings.push({ source: actual, generated });
 		}

package/src/transform/segments.js

@@ -65,6 +65,7 @@ import {
 	get_mapping_from_node,
 } from '../source-map-utils.js';
 import { should_preserve_comment } from '../comment-utils.js';
+import { has_location } from '../utils/ast.js';
 
 const LAZY_PARAM_IDENTIFIER_REGEX = /^__lazy\d+$/;
 
@@ -453,8 +454,8 @@ export function convert_source_map_to_mappings(
 	 * @returns {void}
 	 */
 	function set_bracket_computed_mapping(node, mappings) {
-		if (node.loc) {
-			const key = /** @type {typeof node.key & AST.NodeWithLocation} */ (node.key);
+		if (has_location(node.key)) {
+			const key = node.key;
 			mappings.push(
 				get_mapping_from_node(
 					/** @type {AST.NodeWithLocation} */ ({
@@ -513,7 +514,7 @@ export function convert_source_map_to_mappings(
 	 * @param {AST.Literal} node
 	 */
 	function handle_literal(node) {
-		if (node.loc) {
+		if (has_location(node)) {
 			const mapping = get_mapping_from_node(node, src_to_gen_map, gen_line_offsets);
 			mappings.push(mapping);
 		}
@@ -524,12 +525,15 @@ export function convert_source_map_to_mappings(
 	 * @returns {void}
 	 */
 	function add_extra_source_mapping_tokens(generated_node) {
-		if (!generated_node?.loc || !Array.isArray(generated_node.metadata?.extra_source_mappings)) {
+		if (
+			!has_location(generated_node) ||
+			!Array.isArray(generated_node.metadata?.extra_source_mappings)
+		) {
 			return;
 		}
 
 		for (const source_node of generated_node.metadata.extra_source_mappings) {
-			if (!source_node?.loc) continue;
+			if (!has_location(source_node)) continue;
 
 			tokens.push({
 				source: source_node.name ?? generated_node.name,
@@ -537,10 +541,7 @@ export function convert_source_map_to_mappings(
 				loc: source_node.loc,
 				generatedLoc: generated_node.loc,
 				metadata: {},
-				sourceLength:
-					typeof source_node.start === 'number' && typeof source_node.end === 'number'
-						? source_node.end - source_node.start
-						: undefined,
+				sourceLength: source_node.end - source_node.start,
 			});
 		}
 	}
@@ -602,7 +603,7 @@ export function convert_source_map_to_mappings(
 						for (const binding_mapping of node.metadata.lazy_param_binding_mappings) {
 							const source_node = binding_mapping.source;
 							const generated_node = binding_mapping.generated;
-							if (!source_node?.loc || !generated_node?.loc) continue;
+							if (!has_location(source_node) || !has_location(generated_node)) continue;
 
 							const mapping = get_mapping_from_node(
 								generated_node,
@@ -610,8 +611,8 @@ export function convert_source_map_to_mappings(
 								gen_line_offsets,
 								mapping_data_verify_only,
 							);
-							const source_start = /** @type {number} */ (source_node.start);
-							const source_end = /** @type {number} */ (source_node.end);
+							const source_start = source_node.start;
+							const source_end = source_node.end;
 							mapping.sourceOffsets = [source_start];
 							mapping.lengths = [source_end - source_start];
 							mappings.push(mapping);
@@ -649,7 +650,7 @@ export function convert_source_map_to_mappings(
 				// We only map the 'import' and the last character
 				// to avoid overlapping with individual specifier mappings
 				// which would interfere when only SOME imports are unused.
-				if (node.loc) {
+				if (has_location(node)) {
 					tokens.push({
 						source: 'import',
 						generated: 'import',
@@ -842,7 +843,7 @@ export function convert_source_map_to_mappings(
 				}
 				return;
 			} else if (node.type === 'JSXExpressionContainer') {
-				if (node.loc) {
+				if (has_location(node)) {
 					mappings.push(
 						get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
 					);
@@ -929,9 +930,9 @@ export function convert_source_map_to_mappings(
 					}
 				}
 
-				if ((closing?.loc || opening.loc) && (closing || opening.selfClosing)) {
+				const target_node = closing ?? opening;
+				if (has_location(target_node) && (closing || opening.selfClosing)) {
 					// Add the whole closing tag or the self-closing.
-					const target_node = closing ? closing : opening;
 					const mapping = get_mapping_from_node(
 						target_node,
 						src_to_gen_map,
@@ -948,7 +949,7 @@ export function convert_source_map_to_mappings(
 					mapping.generatedLengths = [mapping.generatedLengths[0] + 1];
 					if (!closing && opening.selfClosing) {
 						const generated_close_length = '/>;'.length;
-						mapping.sourceOffsets = [/** @type {AST.NodeWithLocation} */ (opening).end - 2];
+						mapping.sourceOffsets = [target_node.end - 2];
 						mapping.lengths = ['/>'.length];
 						mapping.generatedOffsets = [
 							mapping.generatedOffsets[0] + mapping.generatedLengths[0] - generated_close_length,
@@ -970,7 +971,7 @@ export function convert_source_map_to_mappings(
 			) {
 				const is_method = node.metadata?.is_method;
 
-				if (node.type === 'ArrowFunctionExpression' && node.loc) {
+				if (node.type === 'ArrowFunctionExpression' && has_location(node)) {
 					// The printer emits node-level boundary markers for arrows (their
 					// span can start at a bare `(`), so the strict lookup always
 					// resolves — no defensive has() guard.
@@ -1258,7 +1259,7 @@ export function convert_source_map_to_mappings(
 					visit(node.empty);
 				}
 
-				if (node.loc) {
+				if (has_location(node)) {
 					mappings.push(
 						get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
 					);
@@ -1328,7 +1329,7 @@ export function convert_source_map_to_mappings(
 				}
 				return;
 			} else if (node.type === 'CallExpression' || node.type === 'NewExpression') {
-				if (node.type === 'NewExpression' && node.loc) {
+				if (node.type === 'NewExpression' && has_location(node)) {
 					mappings.push(
 						get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
 					);
@@ -1358,7 +1359,7 @@ export function convert_source_map_to_mappings(
 				}
 				return;
 			} else if (node.type === 'MemberExpression') {
-				if (node.loc) {
+				if (has_location(node)) {
 					const mapping = get_mapping_from_node(
 						node,
 						src_to_gen_map,
@@ -1375,7 +1376,7 @@ export function convert_source_map_to_mappings(
 				if (node.property) {
 					visit(node.property);
 
-					if (node.computed && node.property.loc) {
+					if (node.computed && has_location(node.property)) {
 						mappings.push(
 							get_mapping_from_node(
 								node.property,
@@ -1411,7 +1412,7 @@ export function convert_source_map_to_mappings(
 
 				return;
 			} else if (node.type === 'ObjectExpression' || node.type === 'ObjectPattern') {
-				if (node.loc && node.type === 'ObjectExpression') {
+				if (node.type === 'ObjectExpression' && has_location(node)) {
 					mappings.push(
 						get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
 					);
@@ -1474,7 +1475,7 @@ export function convert_source_map_to_mappings(
 				}
 				return;
 			} else if (node.type === 'TemplateLiteral') {
-				if (node.loc) {
+				if (has_location(node)) {
 					mappings.push(
 						get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
 					);
@@ -1505,7 +1506,7 @@ export function convert_source_map_to_mappings(
 					visit(node.argument);
 				}
 
-				if (node.type === 'ReturnStatement' && node.loc) {
+				if (node.type === 'ReturnStatement' && has_location(node)) {
 					const mapping = get_mapping_from_node(
 						node,
 						src_to_gen_map,
@@ -1545,7 +1546,7 @@ export function convert_source_map_to_mappings(
 					}
 				}
 
-				if (node.loc) {
+				if (has_location(node)) {
 					mappings.push(
 						get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
 					);
@@ -1762,7 +1763,7 @@ export function convert_source_map_to_mappings(
 				}
 				return;
 			} else if (node.type === 'ParenthesizedExpression') {
-				if (node.metadata.forceMapping && node.loc) {
+				if (node.metadata.forceMapping && has_location(node)) {
 					const mapping = get_mapping_from_node(node, src_to_gen_map, gen_line_offsets);
 					if (node.metadata.skipParenthesisMapping) {
 						mapping.generatedOffsets[0] = mapping.generatedOffsets[0] + 1; // Skip the opening parenthesis
@@ -1801,7 +1802,7 @@ export function convert_source_map_to_mappings(
 				node.type === 'TSTypeParameterInstantiation' ||
 				node.type === 'TSTypeParameterDeclaration'
 			) {
-				if (node.loc) {
+				if (has_location(node)) {
 					const mapping = get_mapping_from_node(
 						node,
 						src_to_gen_map,

package/src/transform/style-ref.js

@@ -2,7 +2,7 @@
 
 import * as b from '../utils/builders.js';
 import { is_function_or_class_node as is_function_or_class_boundary } from '../utils/ast.js';
-import { clone_expression_node, clone_identifier } from './jsx/ast-builders.js';
+import { clone_ast_node, clone_identifier } from './jsx/ast-builders.js';
 
 const regex_backslash_and_following_character = /\\(.)/g;
 
@@ -131,14 +131,10 @@ function create_style_ref_expression_statements(source, style_map, options) {
 		options.allowMutableRefTarget !== false &&
 		(source.type === 'Identifier' || source.type === 'MemberExpression')
 	) {
-		const target = clone_expression_node(source, false);
+		const target = clone_ast_node(source, false);
 		return [
 			b.stmt(
-				b.assignment(
-					'=',
-					/** @type {AST.Pattern} */ (target),
-					clone_expression_node(style_map, false),
-				),
+				b.assignment('=', /** @type {AST.Pattern} */ (target), clone_ast_node(style_map, false)),
 			),
 		];
 	}
@@ -147,8 +143,8 @@ function create_style_ref_expression_statements(source, style_map, options) {
 		return [
 			b.stmt(
 				b.call(
-					visit_expression(clone_expression_node(source, false), options),
-					clone_expression_node(style_map, false),
+					visit_expression(clone_ast_node(source, false), options),
+					clone_ast_node(style_map, false),
 				),
 			),
 		];
@@ -167,17 +163,17 @@ function create_dynamic_style_ref_statement(source, style_map, options) {
 	const ref_id = options.createTempIdentifier?.() ?? b.id('__tsrx_style_ref');
 	const ref_read = () => clone_identifier(ref_id);
 	const current_write = b.stmt(
-		b.assignment('=', b.member(ref_read(), 'current'), clone_expression_node(style_map, false)),
+		b.assignment('=', b.member(ref_read(), 'current'), clone_ast_node(style_map, false)),
 	);
 	const value_write = b.stmt(
-		b.assignment('=', b.member(ref_read(), 'value'), clone_expression_node(style_map, false)),
+		b.assignment('=', b.member(ref_read(), 'value'), clone_ast_node(style_map, false)),
 	);
 
 	return [
-		b.let(ref_id, visit_expression(clone_expression_node(source, false), options)),
+		b.let(ref_id, visit_expression(clone_ast_node(source, false), options)),
 		b.if(
 			b.binary('===', b.unary('typeof', ref_read()), b.literal('function')),
-			b.block([b.stmt(b.call(ref_read(), clone_expression_node(style_map, false)))]),
+			b.block([b.stmt(b.call(ref_read(), clone_ast_node(style_map, false)))]),
 			b.if(
 				b.logical(
 					'&&',

package/src/utils/ast.js

@@ -20,6 +20,17 @@
 
 import * as b from './builders.js';
 
+/**
+ * @template {object} T
+ * @param {T | null | undefined} node
+ * @returns {node is T & AST.NodeWithLocation}
+ */
+export function has_location(node) {
+	if (node == null) return false;
+	const location = /** @type {Partial<AST.NodeWithLocation>} */ (node);
+	return location.loc != null && location.start !== undefined && location.end !== undefined;
+}
+
 /**
  * @param {AST.Node} node
  * @returns {node is AST.Function}

package/src/utils/builders.js

@@ -1121,7 +1121,7 @@ export function key(name) {
 
 /**
  * @param {ESTreeJSX.JSXIdentifier | ESTreeJSX.JSXNamespacedName} name
- * @param {AST.Literal | ESTreeJSX.JSXExpressionContainer | null} value
+ * @param {ESTreeJSX.JSXAttribute['value']} value
  * @param {boolean} [shorthand]
  * @param {AST.NodeWithLocation} [loc_info]
  * @returns {ESTreeJSX.JSXAttribute}
@@ -1142,7 +1142,7 @@ export function jsx_attribute(name, value = null, shorthand = false, loc_info) {
  * Build a fresh `JSXOpeningElement`. For elements derived from an existing
  * JSX element node, prefer `jsx_element` which spreads from the source.
  *
- * @param {ESTreeJSX.JSXOpeningElement['name']} name
+ * @param {ESTreeJSX.TSRXJSXOpeningElement['name']} name
  * @param {ESTreeJSX.JSXOpeningElement['attributes']} [attributes]
  * @param {boolean} [self_closing]
  * @param {ESTreeJSX.JSXOpeningElement['typeArguments']} [type_arguments]
@@ -1171,7 +1171,7 @@ export function jsx_opening_element(
 /**
  * Build a fresh `JSXClosingElement`.
  *
- * @param {ESTreeJSX.JSXClosingElement['name']} name
+ * @param {ESTreeJSX.TSRXJSXClosingElement['name']} name
  * @param {AST.NodeWithLocation} [loc_info]
  * @returns {ESTreeJSX.JSXClosingElement}
  */

package/types/index.d.ts

@@ -24,11 +24,23 @@ export type {
 };
 export { createJsxTransform };
 
-export function collectStyleRefAttributes(node: any, refs?: any[]): any[];
-export function createStyleClassMap(component: any, css: any): AST.ObjectExpression;
-export function createStyleClassMapFromStylesheet(css: any): AST.ObjectExpression;
+/** Result of extracting a branch body into a generated helper component. */
+export interface JsxHelperComponent {
+	setup_statements: AST.Statement[];
+	component_element: ESTreeJSX.JSXElement;
+}
+
+export function collectStyleRefAttributes(
+	node: AST.Node | AST.Node[],
+	refs?: ESTreeJSX.JSXAttribute[],
+): ESTreeJSX.JSXAttribute[];
+export function createStyleClassMap(
+	component: AST.Node,
+	css: AST.CSS.StyleSheet,
+): AST.ObjectExpression;
+export function createStyleClassMapFromStylesheet(css: AST.CSS.StyleSheet): AST.ObjectExpression;
 export function createStyleRefSetupStatements(
-	refAttributes: any[],
+	refAttributes: ESTreeJSX.JSXAttribute[],
 	styleMap: AST.Expression,
 	options?: {
 		allowMutableRefTarget?: boolean;
@@ -36,7 +48,9 @@ export function createStyleRefSetupStatements(
 		visitExpression?: (expression: AST.Expression) => AST.Expression;
 	},
 ): AST.Statement[];
-export function getStyleElementStylesheet(styleElement: any): any | null;
+export function getStyleElementStylesheet(
+	styleElement: AST.JSXStyleElement,
+): AST.CSS.StyleSheet | null;
 
 /**
  * Compile error interface
@@ -119,11 +133,11 @@ interface BaseNodeMetaData {
 	/** Memoized `<> … </>` wrapper for a value-position directive (see get_directive_value_wrapper). */
 	tsrx_value_wrapper?: AST.TSRXJSXFragment;
 	ts_name?: string;
-	delegated?: any;
+	delegated?: boolean;
 	returned_tsrx_return?: AST.ReturnStatement;
 	styleScopeHash?: string;
 	css?: {
-		scopedClasses: Map<string, { start: number; end: number; selector: any }>;
+		scopedClasses: TopScopedClasses;
 		hash: string;
 	};
 	elementLeadingComments?: AST.Comment[];
@@ -139,6 +153,12 @@ interface BaseNodeMetaData {
 	generated_loop_skip_if?: boolean;
 	lazy_id?: string;
 	disable_verification?: boolean;
+	extra_source_mappings?: AST.NodeWithLocation[];
+	generated_setup_declarations?: AST.Statement[];
+	has_unmappable_value?: boolean;
+	synthetic_ref?: boolean;
+	tsrx_reactive_block?: boolean;
+	vapor_pending_fallback?: ESTreeJSX.JSXRenderNode;
 	lazy_param_binding_mappings?: Array<{
 		source: AST.Identifier;
 		generated: AST.Identifier | AST.Literal;
@@ -156,8 +176,8 @@ interface FunctionMetaData extends BaseNodeMetaData {
 	/** Top-level scoped classes collected while pruning the component's CSS. */
 	topScopedClasses?: TopScopedClasses;
 	synthetic_children?: boolean;
-	generated_helpers?: any[];
-	generated_statics?: any[];
+	generated_helpers?: AST.Statement[];
+	generated_statics?: AST.Statement[];
 }
 
 // Strip parent, loc, and range from TSESTree nodes to match @sveltejs/acorn-typescript output
@@ -445,6 +465,25 @@ declare module 'estree' {
 		| JSXSwitchExpression
 		| JSXTryExpression;
 
+	/** A statement-form template directive after its parser node has been retyped. */
+	type JSXTemplateStatement =
+		| (AST.IfStatement & { statementType: 'IfStatement' })
+		| (AST.ForOfStatement & { statementType: 'ForOfStatement' })
+		| (AST.SwitchStatement & { statementType: 'SwitchStatement' })
+		| (AST.TryStatement & { statementType: 'TryStatement' });
+
+	/** A source node that the shared JSX transform can lower into a JSX child. */
+	type TSRXRenderChild =
+		| ESTreeJSX.JSXElement
+		| ESTreeJSX.JSXFragment
+		| ESTreeJSX.JSXExpressionContainer
+		| ESTreeJSX.JSXText
+		| JSXTemplateDirective
+		| JSXTemplateStatement;
+
+	/** An AST node that represents component-level `await` during validation. */
+	type TSRXAwaitNode = AST.AwaitExpression | AST.ForOfStatement | JSXForOfExpression;
+
 	/** Any node that can be the rendered output of a TSRX template or statement container. */
 	type TSRXRenderOutput =
 		| ESTreeJSX.JSXElement
@@ -453,6 +492,9 @@ declare module 'estree' {
 		| JSXCodeBlock
 		| JSXTemplateDirective;
 
+	/** A parser node whose body uses native TSRX template semantics. */
+	type NativeTSRXNode = TSRXJSXElement | TSRXJSXFragment | JSXStyleElement | JSXCodeBlock;
+
 	interface ParenthesizedExpression extends AST.BaseNode {
 		type: 'ParenthesizedExpression';
 		expression: AST.Expression;
@@ -480,14 +522,24 @@ declare module 'estree' {
 	type CommentWithLocation = AST.Comment & NodeWithLocation;
 
 	interface TryStatement {
+		statementType?: 'TryStatement';
 		pending?: AST.BlockStatement | null;
 	}
 
+	interface IfStatement {
+		statementType?: 'IfStatement';
+	}
+
+	interface SwitchStatement {
+		statementType?: 'SwitchStatement';
+	}
+
 	interface CatchClause {
 		resetParam?: AST.Pattern | null;
 	}
 
 	interface ForOfStatement {
+		statementType?: 'ForOfStatement';
 		index?: AST.Identifier | null;
 		key?: AST.Expression | null;
 		empty?: AST.BlockStatement | null;
@@ -733,6 +785,27 @@ declare module 'estree' {
 }
 
 declare module 'estree-jsx' {
+	/** A node that can be returned from a platform hook into a JSX render slot. */
+	type JSXRenderNode = AST.Expression | JSXExpressionContainer | JSXText | JSXSpreadChild;
+
+	/** A JSX child produced by the transform's render-body lowering. */
+	type JSXRenderChild = JSXElement | JSXFragment | JSXExpressionContainer | JSXText;
+
+	/** An attribute accepted by and emitted from the shared JSX transformer. */
+	type JSXAttributeNode = JSXAttribute | JSXSpreadAttribute;
+
+	/** A `ref` attribute whose value has been narrowed to a non-empty expression. */
+	interface JSXRefAttribute extends JSXAttribute {
+		name: JSXIdentifier;
+		value: JSXExpressionContainer & { expression: AST.Expression };
+	}
+
+	/** A child accepted while TSRX JSX is being lowered to standard ESTree JSX. */
+	type JSXTransformChild =
+		| JSXElement['children'][number]
+		| AST.TSRXJSXElement
+		| AST.TSRXJSXFragment;
+
 	interface JSXAttribute {
 		shorthand: boolean;
 	}
@@ -785,7 +858,8 @@ declare module 'estree-jsx' {
 			| JSXIdentifier
 			| JSXNamespacedName
 			| JSXExpressionContainer
-			| import('estree').MemberExpression;
+			| AST.Identifier
+			| AST.MemberExpression;
 	}
 
 	interface TSRXJSXClosingElement extends Omit<JSXClosingElement, 'name'> {
@@ -795,7 +869,8 @@ declare module 'estree-jsx' {
 			| JSXIdentifier
 			| JSXNamespacedName
 			| JSXExpressionContainer
-			| import('estree').MemberExpression;
+			| AST.Identifier
+			| AST.MemberExpression;
 	}
 
 	interface ExpressionMap {