@tsrx/core 0.1.39 → 0.1.41

package/package.json

@@ -3,7 +3,7 @@
   "description": "Core compiler infrastructure for TSRX syntax",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "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),
@@ -2379,6 +2381,14 @@ export function TSRXPlugin(config) {
 				const top = ctx[ci];
 				const second = ctx[ci - 1];
 
+				// A paired JSX element/fragment finishes on the closing tag's `>`, which
+				// leaves `exprAllowed` false even when the already-read next token is a
+				// comma. Re-arm expression mode for the value after that comma, matching
+				// the tokenizer state produced by a self-closing JSX element.
+				if (this.type === tt.comma) {
+					this.exprAllowed = true;
+				}
+
 				// Expression-bodied templates (no statement child) followed by `,`
 				// in an object/array literal need surgical fixups; statement-bodied
 				// templates fall through to the JSX-expression-container strip.

package/src/transform/jsx/index.js

@@ -3839,7 +3839,7 @@ function create_local_statement_component_name(transform_context) {
  * into their own component boundary to satisfy the Rules of Hooks.
  *
  * @param {any[]} body_nodes
- * @param {any} key_expression - Optional key expression to add to the component element (for for-of loops)
+ * @param {any} key_expression - Optional key expression to add to the component element (for `for-of` loops)
  * @param {TransformContext} transform_context
  * @returns {any[]}
  */