@tsrx/core 0.1.38 → 0.1.40

package/package.json

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

package/src/plugin.js

@@ -1000,13 +1000,15 @@ export function TSRXPlugin(config) {
 				// following raw text belongs to an enclosing template, not to it. With no
 				// enclosing template (e.g. a top-level `return <div />`), the trailing
 				// text is plain JS and must not be read as template raw text.
+				// Inter-token whitespace has already advanced `pos`; `lastTokEnd` still
+				// identifies the consumed `/>` boundary.
 				const opening = this.#openingNativeTemplateNode;
 				if (
 					opening &&
 					current_template_node === opening &&
 					/** @type {any} */ (opening).openingElement?.selfClosing &&
-					this.input.charCodeAt(this.pos - 1) === CharCode.greaterThan &&
-					this.input.charCodeAt(this.pos - 2) === CharCode.slash
+					this.input.charCodeAt(this.lastTokEnd - 1) === CharCode.greaterThan &&
+					this.input.charCodeAt(this.lastTokEnd - 2) === CharCode.slash
 				) {
 					const enclosing = this.#path.findLast(
 						(node) => node !== opening && this.#isNativeTemplateNode(node),

package/src/transform/jsx/helpers.js

@@ -185,6 +185,16 @@ export function tsx_with_ts_locations() {
 			}
 			context.write('>');
 		},
+		// esrap's TSExpressionWithTypeArguments printer only emits `expression`,
+		// dropping interface heritage arguments such as the `<T>` in
+		// `interface Foo<T> extends Bar<T> {}`. Besides changing the declaration's
+		// semantics, that leaves segments.js unable to map the omitted node.
+		TSExpressionWithTypeArguments: (node, context) => {
+			context.visit(node.expression);
+			if (node.typeParameters) {
+				context.visit(node.typeParameters);
+			}
+		},
 		TSModuleDeclaration: (node, context) => {
 			context.write(node.metadata?.module_keyword ?? 'module');
 			context.write(' ');