@tsrx/core 0.0.21 → 0.0.22

package/package.json

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

package/src/transform/jsx/helpers.js

@@ -186,7 +186,31 @@ export function tsx_with_ts_locations() {
 				context.visit(body);
 			}
 		},
+
+		// esrap's JSXOpeningElement printer doesn't emit `typeArguments`, so generic
+		// component tags like `<RenderProp<User>>` lose the `<User>` in the output.
+		JSXOpeningElement: (node, context) => {
+			context.write('<');
+			context.visit(node.name);
+			if (node.typeArguments) {
+				context.visit(node.typeArguments);
+			}
+			for (const attribute of node.attributes) {
+				context.write(' ');
+				context.visit(attribute);
+			}
+			if (node.selfClosing) {
+				context.write(' /');
+			}
+			context.write('>');
+		},
 	};
+
+	// Be careful when duplicating visitors that are already defined
+	// above in the `wrappers`
+	// if there is already a visitor but you still need a mapping
+	// on the whole node, only then duplicate it here
+	// e.g. JSXOpeningElement is such a case
 	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
@@ -214,7 +238,9 @@ export function tsx_with_ts_locations() {
 		'TSTypeParameterDeclaration',
 		'TSTypeParameter',
 	]) {
-		wrappers[type] = (node, context) => wrap_with_locations(node, context, base[type]);
+		const visitor = wrappers[type];
+
+		wrappers[type] = (node, context) => wrap_with_locations(node, context, visitor ?? base[type]);
 	}
 
 	return { ...base, ...wrappers };

package/src/transform/jsx/index.js

@@ -2209,7 +2209,12 @@ function to_jsx_element(node, transform_context, raw_children = node.children ||
 		(/** @type {any} */ attribute) => attribute?.metadata?.has_unmappable_value,
 	);
 
-	const opening_element_node = b.jsx_opening_element(name, attributes, selfClosing);
+	const opening_element_node = b.jsx_opening_element(
+		name,
+		attributes,
+		selfClosing,
+		node.openingElement?.typeArguments,
+	);
 	const openingElement = has_unmappable_attribute
 		? opening_element_node
 		: set_loc(opening_element_node, node.openingElement || node);

package/src/transform/segments.js

@@ -653,8 +653,11 @@ export function convert_source_map_to_mappings(
 				// Nothing to visit (just source string)
 				return;
 			} else if (node.type === 'JSXOpeningElement') {
-				// Visit name and attributes in source order
+				// Visit name, type arguments, and attributes in source order
 				visit(node.name);
+				if (node.typeArguments) {
+					visit(node.typeArguments);
+				}
 				for (const attr of node.attributes) {
 					visit(attr);
 				}

package/src/utils/builders.js

@@ -1107,15 +1107,23 @@ export function jsx_attribute(name, value = null, shorthand = false, loc_info) {
  * @param {ESTreeJSX.JSXOpeningElement['name']} name
  * @param {ESTreeJSX.JSXOpeningElement['attributes']} [attributes]
  * @param {boolean} [self_closing]
+ * @param {ESTreeJSX.JSXOpeningElement['typeArguments']} [type_arguments]
  * @param {AST.NodeWithLocation} [loc_info]
  * @returns {ESTreeJSX.JSXOpeningElement}
  */
-export function jsx_opening_element(name, attributes = [], self_closing = false, loc_info) {
+export function jsx_opening_element(
+	name,
+	attributes = [],
+	self_closing = false,
+	type_arguments = undefined,
+	loc_info,
+) {
 	const node = /** @type {ESTreeJSX.JSXOpeningElement} */ ({
 		type: 'JSXOpeningElement',
 		name,
 		attributes,
 		selfClosing: self_closing,
+		typeArguments: type_arguments,
 		metadata: { path: [] },
 	});