@tsrx/core 0.0.11 → 0.0.13

package/package.json

@@ -3,7 +3,7 @@
   "description": "Core compiler infrastructure for TSRX syntax",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "type": "module",
   "repository": {
     "type": "git",

package/src/plugin.js

@@ -1059,9 +1059,23 @@ export function TSRXPlugin(config) {
 			 * @type {Parse.Parser['jsx_parseAttribute']}
 			 */
 			jsx_parseAttribute() {
-				let node = /** @type {AST.TSRXAttribute | ESTreeJSX.JSXAttribute} */ (this.startNode());
+				let node =
+					/** @type {AST.TSRXAttribute | ESTreeJSX.JSXAttribute | ESTreeJSX.JSXSpreadAttribute} */ (
+						this.startNode()
+					);
 
 				if (this.eat(tt.braceL)) {
+					const inside_tsx = this.#path.findLast((n) => n.type === 'TsxCompat' || n.type === 'Tsx');
+					if (inside_tsx) {
+						if (this.type === tt.ellipsis) {
+							this.expect(tt.ellipsis);
+							/** @type {ESTreeJSX.JSXSpreadAttribute} */ (node).argument = this.parseMaybeAssign();
+							this.expect(tt.braceR);
+							return this.finishNode(node, 'JSXSpreadAttribute');
+						}
+						this.unexpected();
+					}
+
 					if (this.value === 'ref') {
 						this.next();
 						if (this.type === tt.braceR) {

package/src/transform/jsx/helpers.js

@@ -99,7 +99,14 @@ export function tsx_with_ts_locations() {
 	};
 
 	/** @type {Record<string, (node: any, context: any) => void>} */
-	const wrappers = {};
+	const wrappers = {
+		ArrayPattern: (node, context) => {
+			base.ArrayPattern(node, context);
+			if (node.typeAnnotation) {
+				context.visit(node.typeAnnotation);
+			}
+		},
+	};
 	for (const type of [
 		// JS nodes whose esrap printer emits no location marker, causing
 		// segments.js get_mapping_from_node() to throw when it asks for the
@@ -111,6 +118,7 @@ export function tsx_with_ts_locations() {
 		'ReturnStatement',
 		'ForStatement',
 		'ForInStatement',
+		'ForOfStatement',
 		'TemplateLiteral',
 		'AwaitExpression',
 		'TaggedTemplateExpression',

package/src/transform/jsx/index.js

@@ -805,8 +805,8 @@ function create_helper_props_pattern(bindings) {
  * @returns {AST.Property}
  */
 function create_helper_props_property(binding) {
-	const key = clone_identifier(binding);
-	const value = clone_identifier(binding);
+	const key = create_generated_identifier(binding.name);
+	const value = create_generated_identifier(binding.name);
 
 	return /** @type {any} */ ({
 		type: 'Property',
@@ -824,38 +824,46 @@ function create_helper_props_property(binding) {
  * @param {AST.Identifier} helper_id
  * @param {AST.Identifier[]} bindings
  * @param {any} source_node
+ * @param {{
+ * 	mapWrapper?: boolean,
+ * 	mapBindingNames?: boolean,
+ * 	mapBindingValues?: boolean,
+ * }} [mapping]
  * @returns {ESTreeJSX.JSXElement}
  */
-function create_helper_component_element(helper_id, bindings, source_node) {
+function create_helper_component_element(helper_id, bindings, source_node, mapping = {}) {
+	const { mapWrapper = true, mapBindingNames = true, mapBindingValues = true } = mapping;
 	const attributes = bindings.map(
 		(binding) =>
 			/** @type {any} */ ({
 				type: 'JSXAttribute',
-				name: identifier_to_jsx_name(clone_identifier(binding)),
-				value: to_jsx_expression_container(clone_identifier(binding), binding),
+				name: identifier_to_jsx_name(
+					mapBindingNames ? clone_identifier(binding) : create_generated_identifier(binding.name),
+				),
+				value: to_jsx_expression_container(
+					mapBindingValues ? clone_identifier(binding) : create_generated_identifier(binding.name),
+					binding,
+				),
 				metadata: { path: [] },
 			}),
 	);
 
-	return set_loc(
-		/** @type {any} */ ({
-			type: 'JSXElement',
-			openingElement: set_loc(
-				{
-					type: 'JSXOpeningElement',
-					name: identifier_to_jsx_name(clone_identifier(helper_id)),
-					attributes,
-					selfClosing: true,
-					metadata: { path: [] },
-				},
-				source_node,
-			),
-			closingElement: null,
-			children: [],
-			metadata: { path: [] },
-		}),
-		source_node,
-	);
+	const openingElement = {
+		type: 'JSXOpeningElement',
+		name: identifier_to_jsx_name(clone_identifier(helper_id)),
+		attributes,
+		selfClosing: true,
+		metadata: { path: [] },
+	};
+	const element = /** @type {any} */ ({
+		type: 'JSXElement',
+		openingElement: mapWrapper ? set_loc(openingElement, source_node) : openingElement,
+		closingElement: null,
+		children: [],
+		metadata: { path: [] },
+	});
+
+	return mapWrapper ? set_loc(element, source_node) : element;
 }
 
 /**
@@ -1117,12 +1125,23 @@ function is_lone_return_if_statement(node) {
 /**
  * @param {any[]} render_nodes
  * @param {any} source_node
+ * @param {boolean} [map_render_node_locations]
  * @returns {any}
  */
-function create_component_return_statement(render_nodes, source_node) {
+function create_component_return_statement(
+	render_nodes,
+	source_node,
+	map_render_node_locations = true,
+) {
 	return /** @type {any} */ ({
 		type: 'ReturnStatement',
-		argument: build_return_expression(render_nodes.slice()) || {
+		argument: build_return_expression(
+			render_nodes.map((node) =>
+				map_render_node_locations
+					? clone_expression_node(node)
+					: clone_expression_node_without_locations(node),
+			),
+		) || {
 			type: 'Literal',
 			value: null,
 			raw: 'null',
@@ -1148,7 +1167,7 @@ function create_component_lone_return_if_statement(node, render_nodes) {
 			consequent: set_loc(
 				/** @type {any} */ ({
 					type: 'BlockStatement',
-					body: [create_component_return_statement(render_nodes, consequent_body[0])],
+					body: [create_component_return_statement(render_nodes, consequent_body[0], false)],
 					metadata: { path: [] },
 				}),
 				node.consequent,
@@ -1160,6 +1179,30 @@ function create_component_lone_return_if_statement(node, render_nodes) {
 	);
 }
 
+/**
+ * @param {any} node
+ * @returns {any}
+ */
+function clone_expression_node_without_locations(node) {
+	if (!node || typeof node !== 'object') return node;
+	if (Array.isArray(node)) return node.map(clone_expression_node_without_locations);
+
+	const clone = { ...node };
+	delete clone.loc;
+	delete clone.start;
+	delete clone.end;
+
+	for (const key of Object.keys(clone)) {
+		if (key === 'metadata') {
+			clone.metadata = clone.metadata ? { ...clone.metadata } : { path: [] };
+			continue;
+		}
+		clone[key] = clone_expression_node_without_locations(clone[key]);
+	}
+
+	return clone;
+}
+
 const TEMPLATE_FRAGMENT_ERROR =
 	'JSX fragment syntax is not needed in TSRX templates. TSRX renders in immediate mode, so everything is already a fragment. Use `<>...</>` only within <tsx>...</tsx>.';
 
@@ -1349,9 +1392,8 @@ function statement_body_to_jsx_child(body_nodes, transform_context) {
  */
 function hook_safe_statement_body_to_jsx_child(body_nodes, transform_context) {
 	const source_node = get_body_source_node(body_nodes);
-	const helper_id = set_loc(
-		create_generated_identifier(create_local_statement_component_name(transform_context)),
-		source_node,
+	const helper_id = create_generated_identifier(
+		create_local_statement_component_name(transform_context),
 	);
 	const helper_bindings = Array.from(transform_context.available_bindings.values());
 
@@ -1359,26 +1401,23 @@ function hook_safe_statement_body_to_jsx_child(body_nodes, transform_context) {
 	const saved_bindings = transform_context.available_bindings;
 	transform_context.available_bindings = new Map(saved_bindings);
 
-	const helper_fn = set_loc(
-		/** @type {any} */ ({
-			type: 'FunctionDeclaration',
-			id: helper_id,
-			params: helper_bindings.length > 0 ? [create_helper_props_pattern(helper_bindings)] : [],
-			body: {
-				type: 'BlockStatement',
-				body: build_render_statements(body_nodes, true, transform_context),
-				metadata: { path: [] },
-			},
-			async: false,
-			generator: false,
-			metadata: {
-				path: [],
-				is_component: true,
-				is_method: false,
-			},
-		}),
-		source_node,
-	);
+	const helper_fn = /** @type {any} */ ({
+		type: 'FunctionDeclaration',
+		id: helper_id,
+		params: helper_bindings.length > 0 ? [create_helper_props_pattern(helper_bindings)] : [],
+		body: {
+			type: 'BlockStatement',
+			body: build_render_statements(body_nodes, true, transform_context),
+			metadata: { path: [] },
+		},
+		async: false,
+		generator: false,
+		metadata: {
+			path: [],
+			is_component: true,
+			is_method: false,
+		},
+	});
 
 	// Restore bindings
 	transform_context.available_bindings = saved_bindings;
@@ -1388,7 +1427,13 @@ function hook_safe_statement_body_to_jsx_child(body_nodes, transform_context) {
 		transform_context.helper_state.helpers.push(helper_fn);
 
 		return to_jsx_expression_container(
-			/** @type {any} */ (create_helper_component_element(helper_id, helper_bindings, source_node)),
+			/** @type {any} */ (
+				create_helper_component_element(helper_id, helper_bindings, source_node, {
+					mapWrapper: false,
+					mapBindingNames: false,
+					mapBindingValues: false,
+				})
+			),
 			source_node,
 		);
 	}
@@ -1405,7 +1450,11 @@ function hook_safe_statement_body_to_jsx_child(body_nodes, transform_context) {
 						helper_fn,
 						{
 							type: 'ReturnStatement',
-							argument: create_helper_component_element(helper_id, helper_bindings, source_node),
+							argument: create_helper_component_element(helper_id, helper_bindings, source_node, {
+								mapWrapper: false,
+								mapBindingNames: false,
+								mapBindingValues: false,
+							}),
 							metadata: { path: [] },
 						},
 					],
@@ -1448,9 +1497,8 @@ function create_local_statement_component_name(transform_context) {
  */
 function hook_safe_render_statements(body_nodes, key_expression, transform_context) {
 	const source_node = get_body_source_node(body_nodes);
-	const helper_id = set_loc(
-		create_generated_identifier(create_local_statement_component_name(transform_context)),
-		source_node,
+	const helper_id = create_generated_identifier(
+		create_local_statement_component_name(transform_context),
 	);
 	const helper_bindings = Array.from(transform_context.available_bindings.values());
 
@@ -1458,26 +1506,23 @@ function hook_safe_render_statements(body_nodes, key_expression, transform_conte
 	const saved_bindings = transform_context.available_bindings;
 	transform_context.available_bindings = new Map(saved_bindings);
 
-	const helper_fn = set_loc(
-		/** @type {any} */ ({
-			type: 'FunctionDeclaration',
-			id: helper_id,
-			params: helper_bindings.length > 0 ? [create_helper_props_pattern(helper_bindings)] : [],
-			body: {
-				type: 'BlockStatement',
-				body: build_render_statements(body_nodes, true, transform_context),
-				metadata: { path: [] },
-			},
-			async: false,
-			generator: false,
-			metadata: {
-				path: [],
-				is_component: true,
-				is_method: false,
-			},
-		}),
-		source_node,
-	);
+	const helper_fn = /** @type {any} */ ({
+		type: 'FunctionDeclaration',
+		id: helper_id,
+		params: helper_bindings.length > 0 ? [create_helper_props_pattern(helper_bindings)] : [],
+		body: {
+			type: 'BlockStatement',
+			body: build_render_statements(body_nodes, true, transform_context),
+			metadata: { path: [] },
+		},
+		async: false,
+		generator: false,
+		metadata: {
+			path: [],
+			is_component: true,
+			is_method: false,
+		},
+	});
 
 	// Restore bindings
 	transform_context.available_bindings = saved_bindings;
@@ -1491,6 +1536,11 @@ function hook_safe_render_statements(body_nodes, key_expression, transform_conte
 		helper_id,
 		helper_bindings,
 		source_node,
+		{
+			mapWrapper: false,
+			mapBindingNames: false,
+			mapBindingValues: false,
+		},
 	);
 
 	if (key_expression) {

package/src/transform/segments.js

@@ -761,7 +761,8 @@ export function convert_source_map_to_mappings(
 				// Add function/component keyword token
 				if (
 					(node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression') &&
-					!is_method
+					!is_method &&
+					node.loc
 				) {
 					const node_fn = /** @type (typeof node) & AST.NodeWithLocation */ (node);
 					const is_component = node_fn.metadata?.is_component;
@@ -2250,21 +2251,25 @@ export function create_volar_mappings_result({
  * @returns {CodeMapping[]}
  */
 export function dedupe_mappings(mappings) {
-	const deduped = [];
-	const seen = new Set();
+	// keep for now more for testing and maybe logging later.
+	// We should not use deduping and instead should be
+	// fixing source map generation or mapping generation
+	return mappings;
+	// const deduped = [];
+	// const seen = new Set();
 
-	for (const mapping of mappings) {
-		const key = JSON.stringify(serialize_mapping_value(mapping));
+	// for (const mapping of mappings) {
+	// 	const key = JSON.stringify(serialize_mapping_value(mapping));
 
-		if (seen.has(key)) {
-			continue;
-		}
+	// 	if (seen.has(key)) {
+	// 		continue;
+	// 	}
 
-		seen.add(key);
-		deduped.push(mapping);
-	}
+	// 	seen.add(key);
+	// 	deduped.push(mapping);
+	// }
 
-	return deduped;
+	// return deduped;
 }
 
 /**

package/types/parse.d.ts

@@ -1639,7 +1639,7 @@ export namespace Parse {
 		 * Parse JSX attribute (name="value" or {spread})
 		 * @returns JSXAttribute or JSXSpreadAttribute
 		 */
-		jsx_parseAttribute(): AST.TSRXAttribute | ESTreeJSX.JSXAttribute;
+		jsx_parseAttribute(): AST.TSRXAttribute | ESTreeJSX.JSXAttribute | ESTreeJSX.JSXSpreadAttribute;
 
 		/**
 		 * Parse JSX opening element at position