@tsrx/core 0.1.19 → 0.1.20

package/package.json

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

package/src/plugin.js

@@ -341,10 +341,7 @@ export function TSRXPlugin(config) {
 			 */
 			#isNativeTemplateNode(node) {
 				return (
-					node?.type === 'Element' ||
-					node?.type === 'Tsx' ||
-					node?.type === 'Tsrx' ||
-					node?.type === 'TsxCompat'
+					node?.type === 'Element' || node?.type === 'TsrxFragment' || node?.type === 'TsxCompat'
 				);
 			}
 
@@ -368,7 +365,7 @@ export function TSRXPlugin(config) {
 							);
 						}
 						this.#reportDynamicJsxElementsInTsx(/** @type {AST.Node[]} */ (child.children));
-					} else if (child?.type === 'Tsx' || child?.type === 'TsxCompat') {
+					} else if (child?.type === 'TsxCompat') {
 						this.#reportDynamicJsxElementsInTsx(/** @type {AST.Node[]} */ (child.children));
 					}
 				}
@@ -396,16 +393,11 @@ export function TSRXPlugin(config) {
 			}
 
 			/**
-			 * @param {AST.Tsx | AST.TsxCompat} island
+			 * @param {AST.TsxCompat} island
 			 * @param {AST.Node[]} body
 			 */
 			#parseTsxIslandBody(island, body) {
-				const tagName =
-					island.type === 'TsxCompat'
-						? `tsx:${island.kind}`
-						: island.openingElement.name
-							? 'tsx'
-							: '';
+				const tagName = `tsx:${island.kind}`;
 
 				this.exprAllowed = true;
 
@@ -424,7 +416,7 @@ export function TSRXPlugin(config) {
 						return;
 					}
 
-					if (this.#isAtTsxIslandClosing(island)) {
+					if (this.#isAtTsxIslandClosing()) {
 						this.exprAllowed = false;
 						return;
 					}
@@ -459,7 +451,7 @@ export function TSRXPlugin(config) {
 					);
 					node.expression = expression;
 					this.#popTokenContextsAfterTemplateExpressionElement(
-						/** @type {AST.Tsx | AST.Tsrx | AST.TsxCompat} */ (/** @type {unknown} */ (expression)),
+						/** @type {AST.TsrxFragment | AST.TsxCompat} */ (/** @type {unknown} */ (expression)),
 					);
 					this.expect(tt.braceR);
 					return this.finishNode(node, 'JSXExpressionContainer');
@@ -499,38 +491,13 @@ export function TSRXPlugin(config) {
 			 * @param {number} index
 			 */
 			#isReservedTemplateTagNameStart(index) {
-				const char_after_tsx = this.input.charCodeAt(index + 3);
-				return (
-					this.input.startsWith('tsx', index) &&
-					(index + 3 >= this.input.length ||
-						char_after_tsx === CharCode.greaterThan ||
-						char_after_tsx === CharCode.slash ||
-						char_after_tsx === CharCode.space ||
-						char_after_tsx === CharCode.tab ||
-						char_after_tsx === CharCode.lineFeed ||
-						char_after_tsx === CharCode.carriageReturn ||
-						char_after_tsx === CharCode.colon)
-				);
+				return this.input.startsWith('tsx:', index);
 			}
 
 			/**
-			 * @param {AST.Tsx | AST.TsxCompat} island
 			 */
-			#isAtTsxIslandClosing(island) {
-				if (island.type === 'TsxCompat') {
-					return this.input.slice(this.pos, this.pos + 5) === '/tsx:';
-				}
-
-				if (!island.openingElement.name) {
-					return this.input.slice(this.pos, this.pos + 2) === '/>';
-				}
-
-				if (this.input.slice(this.pos, this.pos + 4) !== '/tsx') {
-					return false;
-				}
-
-				const after = this.input.charCodeAt(this.pos + 4);
-				return after === CharCode.greaterThan;
+			#isAtTsxIslandClosing() {
+				return this.input.slice(this.pos, this.pos + 5) === '/tsx:';
 			}
 
 			#parseTsxIslandText() {
@@ -567,7 +534,7 @@ export function TSRXPlugin(config) {
 				let index = this.pos;
 				let has_newline = false;
 
-				// Text-only Tsx nodes can leave the tokenizer in JSX text mode.
+				// Text-only compat islands can leave the tokenizer in JSX text mode.
 				// Only unwind it for ASI before a following TSRX `{expr}` child;
 				// fragment props like `content={<></>}` still need the JSX context.
 				while (index < this.input.length) {
@@ -664,7 +631,7 @@ export function TSRXPlugin(config) {
 			}
 
 			/**
-			 * @param {AST.Tsx | AST.Tsrx | AST.TsxCompat} node
+			 * @param {AST.TsrxFragment | AST.TsxCompat} node
 			 * @returns {boolean}
 			 */
 			#hasDirectStatementChild(node) {
@@ -674,7 +641,7 @@ export function TSRXPlugin(config) {
 			}
 
 			/**
-			 * @param {AST.Tsx | AST.Tsrx | AST.TsxCompat} node
+			 * @param {AST.TsrxFragment | AST.TsxCompat} node
 			 */
 			#popTokenContextsAfterTemplateExpressionElement(node) {
 				const ctx = this.context;
@@ -769,15 +736,14 @@ export function TSRXPlugin(config) {
 
 			#isDoubleQuotedTextChildStart() {
 				const current_template_node = this.#path.findLast(
-					(n) =>
-						n.type === 'Element' || n.type === 'Tsx' || n.type === 'Tsrx' || n.type === 'TsxCompat',
+					(n) => n.type === 'Element' || n.type === 'TsrxFragment' || n.type === 'TsxCompat',
 				);
-				if (current_template_node?.type === 'TsxCompat' || current_template_node?.type === 'Tsx') {
+				if (current_template_node?.type === 'TsxCompat') {
 					return false;
 				}
 
 				const parent = this.#path.at(-1);
-				if (!parent || (parent.type !== 'Element' && parent.type !== 'Tsrx')) {
+				if (!parent || (parent.type !== 'Element' && parent.type !== 'TsrxFragment')) {
 					return false;
 				}
 
@@ -1193,7 +1159,7 @@ export function TSRXPlugin(config) {
 					const parent = this.#path.at(-1);
 					const inNativeTemplate =
 						this.#functionBodyDepth === 0 &&
-						(parent?.type === 'Element' || parent?.type === 'Tsrx');
+						(parent?.type === 'Element' || parent?.type === 'TsrxFragment');
 					/** @type {number | null} */
 					let prevNonWhitespaceChar = null;
 
@@ -1740,16 +1706,9 @@ export function TSRXPlugin(config) {
 
 				if (this.eat(tt.braceL)) {
 					const current_template_node = this.#path.findLast(
-						(n) =>
-							n.type === 'Element' ||
-							n.type === 'Tsx' ||
-							n.type === 'Tsrx' ||
-							n.type === 'TsxCompat',
+						(n) => n.type === 'Element' || n.type === 'TsrxFragment' || n.type === 'TsxCompat',
 					);
-					if (
-						current_template_node?.type === 'Tsx' ||
-						current_template_node?.type === 'TsxCompat'
-					) {
+					if (current_template_node?.type === 'TsxCompat') {
 						if (this.type === tt.ellipsis) {
 							this.expect(tt.ellipsis);
 							/** @type {ESTreeJSX.JSXSpreadAttribute} */ (node).argument = this.parseMaybeAssign();
@@ -1981,10 +1940,9 @@ export function TSRXPlugin(config) {
 			/** @type {Parse.Parser['jsx_readToken']} */
 			jsx_readToken() {
 				const current_template_node = this.#path.findLast(
-					(n) =>
-						n.type === 'Element' || n.type === 'Tsx' || n.type === 'Tsrx' || n.type === 'TsxCompat',
+					(n) => n.type === 'Element' || n.type === 'TsrxFragment' || n.type === 'TsxCompat',
 				);
-				if (current_template_node?.type === 'TsxCompat' || current_template_node?.type === 'Tsx') {
+				if (current_template_node?.type === 'TsxCompat') {
 					return super.jsx_readToken();
 				}
 				let out = '',
@@ -1993,11 +1951,7 @@ export function TSRXPlugin(config) {
 				while (true) {
 					if (this.pos >= this.input.length) {
 						const inside_open_template = this.#path.findLast(
-							(n) =>
-								n.type === 'Element' ||
-								n.type === 'Tsrx' ||
-								n.type === 'TsxCompat' ||
-								n.type === 'Tsx',
+							(n) => n.type === 'Element' || n.type === 'TsrxFragment' || n.type === 'TsxCompat',
 						);
 						if (!inside_open_template) {
 							while (this.curContext() === tstc.tc_expr) {
@@ -2117,7 +2071,7 @@ export function TSRXPlugin(config) {
 								ch === CharCode.closeBrace &&
 								(this.#path.length === 0 ||
 									this.#path.at(-1)?.type === 'Element' ||
-									this.#path.at(-1)?.type === 'Tsrx')
+									this.#path.at(-1)?.type === 'TsrxFragment')
 							) {
 								this.#resetTokenStartToCurrentPosition();
 								return original.readToken.call(this, ch);
@@ -2155,19 +2109,17 @@ export function TSRXPlugin(config) {
 
 			/**
 			 * Override jsx_parseElement to parse tags and bare fragments as native TSRX
-			 * by default. Explicit <tsx> and <tsx:*> islands keep ordinary TSX parsing
-			 * for their children.
+			 * by default. Explicit <tsx:*> islands keep ordinary TSX parsing for
+			 * their children.
 			 * @type {Parse.Parser['jsx_parseElement']}
 			 */
 			jsx_parseElement() {
 				// Current token is jsxTagStart, this.end is position after '<'
 				const tag_name_start = this.end;
 				const current_template_node = this.#path.findLast(
-					(n) =>
-						n.type === 'Element' || n.type === 'Tsx' || n.type === 'Tsrx' || n.type === 'TsxCompat',
+					(n) => n.type === 'Element' || n.type === 'TsrxFragment' || n.type === 'TsxCompat',
 				);
-				const inside_tsx_island =
-					current_template_node?.type === 'Tsx' || current_template_node?.type === 'TsxCompat';
+				const inside_tsx_island = current_template_node?.type === 'TsxCompat';
 				if (inside_tsx_island) {
 					if (this.input.charCodeAt(tag_name_start) === CharCode.at) {
 						this.#report_recoverable_error_range(
@@ -2186,7 +2138,7 @@ export function TSRXPlugin(config) {
 				);
 				if (!inside_tsx_island) {
 					this.#popTokenContextsAfterTemplateExpressionElement(
-						/** @type {AST.Tsx | AST.Tsrx | AST.TsxCompat} */ (/** @type {unknown} */ (parsed)),
+						/** @type {AST.TsrxFragment | AST.TsxCompat} */ (/** @type {unknown} */ (parsed)),
 					);
 				} else if (this.type === tt.braceR && this.curContext() === tstc.tc_expr) {
 					if (this.#tsxIslandExpressionDepth === 0) {
@@ -2210,7 +2162,7 @@ export function TSRXPlugin(config) {
 				const start = this.start - 1;
 				const position = new acorn.Position(this.curLine, start - this.lineStart);
 
-				const element = /** @type {AST.Element | AST.Tsx | AST.Tsrx | AST.TsxCompat} */ (
+				const element = /** @type {AST.Element | AST.TsrxFragment | AST.TsxCompat} */ (
 					this.startNode()
 				);
 				element.start = start;
@@ -2229,19 +2181,10 @@ export function TSRXPlugin(config) {
 
 				// Fragments (<>) produce JSXOpeningFragment with no `name` property
 				const is_fragment = !open.name;
-				const is_tsx_compat = !is_fragment && open.name.type === 'JSXNamespacedName';
-				const is_tsx =
-					!is_fragment &&
-					!is_tsx_compat &&
-					open.name.type === 'JSXIdentifier' &&
-					open.name.name === 'tsx';
-				const is_dynamic_name =
+				const is_tsx_compat =
 					!is_fragment &&
-					((open.name.type === 'JSXIdentifier' && open.name.tracked) ||
-						(open.name.type === 'JSXMemberExpression' &&
-							open.name.object.type === 'JSXIdentifier' &&
-							open.name.object.tracked));
-
+					open.name.type === 'JSXNamespacedName' &&
+					open.name.namespace.name === 'tsx';
 				if (is_tsx_compat) {
 					const namespace_node = /** @type {ESTreeJSX.JSXNamespacedName} */ (open.name);
 					/** @type {AST.TsxCompat} */ (element).type = 'TsxCompat';
@@ -2254,29 +2197,12 @@ export function TSRXPlugin(config) {
 							`TSX compatibility elements cannot be self-closing. '<${tagName} />' must have a closing tag '</${tagName}>'.`,
 						);
 					}
-				} else if (is_tsx) {
-					/** @type {AST.Tsx} */ (element).type = 'Tsx';
-
-					if (open.selfClosing) {
-						this.raise(
-							open.start,
-							`TSX elements cannot be self-closing. '<tsx />' must have a closing tag '</tsx>'.`,
-						);
-					}
 				} else if (is_fragment) {
-					/** @type {AST.Tsrx} */ (element).type = 'Tsrx';
+					/** @type {AST.TsrxFragment} */ (element).type = 'TsrxFragment';
 				} else {
 					element.type = 'Element';
 				}
 
-				if (is_tsx && is_dynamic_name) {
-					this.#report_recoverable_error_range(
-						open.name.start ?? open.start,
-						open.name.end ?? open.end,
-						DYNAMIC_ELEMENT_IN_TSX_ERROR,
-					);
-				}
-
 				for (const attr of open.attributes) {
 					if (attr.type === 'JSXAttribute') {
 						/** @type {AST.Attribute} */ (/** @type {unknown} */ (attr)).type = 'Attribute';
@@ -2298,7 +2224,7 @@ export function TSRXPlugin(config) {
 					}
 				}
 
-				if (!is_tsx_compat && !is_tsx && !is_fragment) {
+				if (!is_tsx_compat && !is_fragment) {
 					/** @type {AST.Element} */ (element).id = /** @type {AST.Identifier} */ (
 						convert_from_jsx(/** @type {ESTreeJSX.JSXIdentifier} */ (open.name))
 					);
@@ -2496,35 +2422,8 @@ export function TSRXPlugin(config) {
 							enterScope: true,
 							resetFunctionBodyDepth: true,
 						});
-						if (/** @type {AST.Tsx} */ (element).type === 'Tsx') {
+						if (/** @type {AST.TsxCompat} */ (element).type === 'TsxCompat') {
 							this.#reportDynamicJsxElementsInTsx(/** @type {AST.Element} */ (element).children);
-						}
-
-						if (/** @type {AST.Tsx} */ (element).type === 'Tsx') {
-							this.#path.pop();
-
-							if (!element.unclosed) {
-								const raise_error = () => {
-									this.raise(this.start, `Expected closing tag '</tsx>'`);
-								};
-
-								this.next();
-								// we should expect to see </tsx>
-								if (this.value !== '/') {
-									raise_error();
-								}
-								this.next();
-								if (this.value !== 'tsx') {
-									raise_error();
-								}
-								this.next();
-								if (this.type !== tstt.jsxTagEnd) {
-									raise_error();
-								}
-								this.#popTsxTokenContextBeforeTemplateExpressionChild();
-								this.next();
-							}
-						} else if (/** @type {AST.TsxCompat} */ (element).type === 'TsxCompat') {
 							this.#path.pop();
 
 							if (!element.unclosed) {
@@ -2560,7 +2459,7 @@ export function TSRXPlugin(config) {
 								this.next();
 							}
 						} else if (
-							/** @type {AST.Tsrx} */ (element).type === 'Tsrx' &&
+							/** @type {AST.TsrxFragment} */ (element).type === 'TsrxFragment' &&
 							this.#path[this.#path.length - 1] === element
 						) {
 							const displayTag = element.openingElement.name ? 'tsrx' : '';
@@ -2603,7 +2502,7 @@ export function TSRXPlugin(config) {
 					}
 				}
 
-				if (element.closingElement && !is_tsx_compat && !is_tsx && element.closingElement.name) {
+				if (element.closingElement && !is_tsx_compat && element.closingElement.name) {
 					/** @type {unknown} */ (element.closingElement.name) = convert_from_jsx(
 						element.closingElement.name,
 					);
@@ -2620,15 +2519,12 @@ export function TSRXPlugin(config) {
 				const inside_func =
 					this.context.some((n) => n.token === 'function') || this.scopeStack.length > 1;
 				const current_template_node = this.#path.findLast(
-					(n) =>
-						n.type === 'Element' || n.type === 'Tsx' || n.type === 'Tsrx' || n.type === 'TsxCompat',
+					(n) => n.type === 'Element' || n.type === 'TsrxFragment' || n.type === 'TsxCompat',
 				);
 				const inside_tsx_island =
-					current_template_node?.type === 'Tsx' || current_template_node?.type === 'TsxCompat'
-						? current_template_node
-						: null;
+					current_template_node?.type === 'TsxCompat' ? current_template_node : null;
 
-				if (current_template_node?.type === 'Tsrx' && this.type === tstt.jsxText) {
+				if (current_template_node?.type === 'TsrxFragment' && this.type === tstt.jsxText) {
 					while (this.curContext() === tstc.tc_expr) {
 						this.context.pop();
 					}
@@ -2649,13 +2545,13 @@ export function TSRXPlugin(config) {
 
 				if (inside_tsx_island) {
 					this.#parseTsxIslandBody(
-						/** @type {AST.Tsx | AST.TsxCompat} */ (inside_tsx_island),
+						/** @type {AST.TsxCompat} */ (inside_tsx_island),
 						/** @type {AST.Node[]} */ (/** @type {unknown} */ (body)),
 					);
 					return;
 				}
 				if (
-					current_template_node?.type === 'Tsrx' &&
+					current_template_node?.type === 'TsrxFragment' &&
 					!current_template_node.openingElement.name &&
 					((this.type === tstt.jsxTagStart && this.input.slice(this.pos, this.pos + 2) === '/>') ||
 						(this.input.charCodeAt(this.start) === CharCode.lessThan &&
@@ -2715,8 +2611,7 @@ export function TSRXPlugin(config) {
 						if (
 							!currentElement ||
 							(currentElement.type !== 'Element' &&
-								currentElement.type !== 'Tsx' &&
-								currentElement.type !== 'Tsrx' &&
+								currentElement.type !== 'TsrxFragment' &&
 								currentElement.type !== 'TsxCompat')
 						) {
 							this.raise(this.start, 'Unexpected closing tag');
@@ -2733,13 +2628,7 @@ export function TSRXPlugin(config) {
 								closingElement.name?.type === 'JSXNamespacedName'
 									? closingElement.name.namespace.name + ':' + closingElement.name.name.name
 									: this.getElementName(closingElement.name);
-						} else if (currentElement.type === 'Tsx') {
-							openingTagName = currentElement.openingElement.name ? 'tsx' : null;
-							closingTagName =
-								closingElement.name?.type === 'JSXNamespacedName'
-									? closingElement.name.namespace.name + ':' + closingElement.name.name.name
-									: this.getElementName(closingElement.name);
-						} else if (currentElement.type === 'Tsrx') {
+						} else if (currentElement.type === 'TsrxFragment') {
 							openingTagName = '';
 							closingTagName =
 								closingElement.name?.type === 'JSXNamespacedName'
@@ -2769,8 +2658,7 @@ export function TSRXPlugin(config) {
 								// Stop at non-template boundaries.
 								if (
 									elem.type !== 'Element' &&
-									elem.type !== 'Tsx' &&
-									elem.type !== 'Tsrx' &&
+									elem.type !== 'TsrxFragment' &&
 									elem.type !== 'TsxCompat'
 								) {
 									break;
@@ -2779,15 +2667,11 @@ export function TSRXPlugin(config) {
 								const elemName =
 									elem.type === 'TsxCompat'
 										? 'tsx:' + elem.kind
-										: elem.type === 'Tsx'
-											? elem.openingElement.name
-												? 'tsx'
-												: null
-											: elem.type === 'Tsrx'
-												? ''
-												: elem.id
-													? this.getElementName(elem.id)
-													: null;
+										: elem.type === 'TsrxFragment'
+											? ''
+											: elem.id
+												? this.getElementName(elem.id)
+												: null;
 
 								// Found matching opening tag
 								if (elemName === closingTagName) {
@@ -2808,16 +2692,16 @@ export function TSRXPlugin(config) {
 						const elementToClose = this.#path[this.#path.length - 1];
 						if (
 							elementToClose &&
-							(elementToClose.type === 'Element' || elementToClose.type === 'Tsrx')
+							(elementToClose.type === 'Element' || elementToClose.type === 'TsrxFragment')
 						) {
 							const elementToCloseName =
-								elementToClose.type === 'Tsrx'
+								elementToClose.type === 'TsrxFragment'
 									? ''
 									: /** @type {AST.Element} */ (elementToClose).id
 										? this.getElementName(/** @type {AST.Element} */ (elementToClose).id)
 										: null;
 							if (elementToCloseName === closingTagName) {
-								/** @type {AST.Element | AST.Tsrx} */ (elementToClose).closingElement =
+								/** @type {AST.Element | AST.TsrxFragment} */ (elementToClose).closingElement =
 									closingElement;
 							}
 						}
@@ -2933,7 +2817,11 @@ export function TSRXPlugin(config) {
 					if (!node) {
 						this.unexpected();
 					}
-					if (this.#functionBodyDepth > 0 && node.type === 'Tsrx' && this.curContext() === b_stat) {
+					if (
+						this.#functionBodyDepth > 0 &&
+						node.type === 'TsrxFragment' &&
+						this.curContext() === b_stat
+					) {
 						this.context.pop();
 						if (this.curContext() === tstc.tc_expr) {
 							this.context.pop();
@@ -2949,7 +2837,7 @@ export function TSRXPlugin(config) {
 					this.#functionBodyDepth === 0 &&
 					this.type === tt.string &&
 					this.input.charCodeAt(this.start) === CharCode.doubleQuote &&
-					(this.#path.at(-1)?.type === 'Element' || this.#path.at(-1)?.type === 'Tsrx')
+					(this.#path.at(-1)?.type === 'Element' || this.#path.at(-1)?.type === 'TsrxFragment')
 				) {
 					this.pos = this.start;
 					this.#readDoubleQuotedTextChildToken();
@@ -3003,7 +2891,7 @@ export function TSRXPlugin(config) {
 				// nested function callable, not in a template.
 				if (
 					this.#functionBodyDepth === 0 &&
-					(parent?.type === 'Element' || parent?.type === 'Tsrx')
+					(parent?.type === 'Element' || parent?.type === 'TsrxFragment')
 				) {
 					if (createNewLexicalScope === void 0) createNewLexicalScope = true;
 					if (node === void 0) node = /** @type {AST.BlockStatement} */ (this.startNode());

package/src/scope.js

@@ -114,7 +114,7 @@ export function create_scopes(ast, root, parent, error_options) {
 			next({ scope });
 		},
 
-		Tsrx(node, { state, next }) {
+		TsrxFragment(node, { state, next }) {
 			const scope = state.scope.child();
 			scopes.set(node, scope);
 
@@ -192,13 +192,13 @@ export function create_scopes(ast, root, parent, error_options) {
 			for (const declarator of node.declarations) {
 				/** @type {Binding[]} */
 				const bindings = [];
-				const initial = /** @type {AST.Expression | AST.Tsx | AST.Tsrx | null} */ (declarator.init);
+				const initial = /** @type {AST.Expression | AST.TsrxFragment | null} */ (declarator.init);
 
 				state.scope.declarators.set(declarator, bindings);
 
 				for (const id of extract_identifiers(declarator.id)) {
 					const binding = state.scope.declare(id, 'normal', node.kind, initial);
-					if (initial?.type === 'Tsx' || initial?.type === 'Tsrx') {
+					if (initial?.type === 'TsrxFragment') {
 						binding.metadata = {
 							...(binding.metadata ?? {}),
 							is_template_value: true,

package/src/transform/jsx/ast-builders.js

@@ -242,8 +242,7 @@ export function is_jsx_child(node) {
 		t === 'JSXFragment' ||
 		t === 'JSXExpressionContainer' ||
 		t === 'JSXText' ||
-		t === 'Tsx' ||
-		t === 'Tsrx' ||
+		t === 'TsrxFragment' ||
 		t === 'TsxCompat' ||
 		t === 'Element' ||
 		t === 'Text' ||
@@ -256,8 +255,8 @@ export function is_jsx_child(node) {
 }
 
 /**
- * The parser represents `<>{expr}</>` / `<tsx>{expr}</tsx>` as a Tsx node,
- * and expression-position lowering unwraps that to the inner expression.
+ * Expression-position lowering unwraps single-expression native fragments to
+ * the inner expression.
  * When such a node appears directly in a component or statement render body,
  * the unwrapped expression is still render output rather than an executable
  * statement.

package/src/transform/jsx/helpers.js

@@ -5,9 +5,9 @@ import tsx from 'esrap/languages/tsx';
 
 /**
  * Zimmerframe provides `path` as the ancestor chain (in original pre-transform
- * types, since visitors run bottom-up). A Tsx node whose parent is a ripple
- * `Element` will render as a JSX child of that element; anywhere else it
- * renders as a standalone expression (e.g. a return value).
+ * types, since visitors run bottom-up). A native template node whose parent is
+ * a ripple `Element` will render as a JSX child of that element; anywhere else
+ * it renders as a standalone expression (e.g. a return value).
  *
  * @param {any[]} path
  * @returns {boolean}
@@ -35,7 +35,7 @@ export function set_node_path_metadata(node, path) {
 }
 
 /**
- * Flatten a `<tsx>` / fragment node's children into a single expression. In a
+ * Flatten a JSX-compatible island's children into a single expression. In a
  * JSX-child position, a JSXExpressionContainer `{expr}` is valid and must stay
  * wrapped. In an expression position (e.g. `return ...`), `{expr}` parses as
  * a block/object literal, so unwrap to `expr`.

package/src/transform/jsx/index.js

@@ -62,7 +62,7 @@ const HOOK_OUTER_ASSIGNMENT_ERROR =
 const HOOK_CALLBACK_OUTER_MUTATION_ERROR =
 	'Hook callbacks inside conditional or repeated TSRX scopes must not mutate bindings declared outside the generated hook component.';
 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>.';
+	'JSX fragment syntax is not needed in TSRX templates. TSRX renders in immediate mode, so everything is already a fragment. Use `<>...</>` only in expression position.';
 
 /**
  * @param {AST.Node} node
@@ -213,15 +213,7 @@ export function createJsxTransform(platform) {
 				return next();
 			},
 
-			Tsx(node, { next, path }) {
-				const inner = /** @type {any} */ (next() ?? node);
-				const in_jsx_child = in_jsx_child_context(path);
-				return /** @type {any} */ (
-					wrap_jsx_setup_declarations(tsx_node_to_jsx_expression(inner, in_jsx_child), in_jsx_child)
-				);
-			},
-
-			Tsrx(node, { next, path, state, visit }) {
+			TsrxFragment(node, { next, path, state, visit }) {
 				const parent = /** @type {AST.ArrowFunctionExpression} */ (path.at(-1));
 				if (parent?.metadata?.native_tsrx && parent.body === node) {
 					return /** @type {any} */ (visit(create_native_tsrx_render_block(node, state), state));
@@ -1016,7 +1008,7 @@ function transform_block_statement(node, { next, visit, state, path }) {
  * @returns {any}
  */
 function transform_return_statement(node, { next, visit, state, path }) {
-	if (get_active_native_tsrx_function(path) && node.argument?.type === 'Tsrx') {
+	if (get_active_native_tsrx_function(path) && node.argument?.type === 'TsrxFragment') {
 		return visit(create_native_tsrx_render_block(node.argument, state), state);
 	}
 
@@ -1080,7 +1072,7 @@ function transform_native_tsrx_function(node, { next, state }) {
 	if (
 		inner !== node &&
 		node.type === 'ArrowFunctionExpression' &&
-		node.body?.type === 'Tsrx' &&
+		node.body?.type === 'TsrxFragment' &&
 		inner.body?.type === 'BlockStatement'
 	) {
 		inner.expression = false;
@@ -1163,7 +1155,7 @@ function find_native_await_in_list(statements) {
 function find_native_await_in_statement(statement) {
 	if (!statement || typeof statement !== 'object') return null;
 
-	if (statement.type === 'ReturnStatement' && statement.argument?.type === 'Tsrx') {
+	if (statement.type === 'ReturnStatement' && statement.argument?.type === 'TsrxFragment') {
 		return find_first_top_level_await_in_tsrx_function_body(statement.argument.children || []);
 	}
 
@@ -1258,7 +1250,7 @@ function transform_function_with_hook_helpers(node, { next, state }) {
  * @returns {string}
  */
 function get_function_helper_base_name(node) {
-	return get_function_like_name(node) || 'Tsrx';
+	return get_function_like_name(node) || 'TsrxFragment';
 }
 
 /**
@@ -1337,7 +1329,7 @@ function collect_function_scope_bindings(node) {
 	const bindings = collect_param_bindings(node.params || []);
 	if (node.body?.type === 'BlockStatement') {
 		for (const statement of node.body.body || []) {
-			if (statement.type === 'ReturnStatement' && statement.argument?.type === 'Tsrx') {
+			if (statement.type === 'ReturnStatement' && statement.argument?.type === 'TsrxFragment') {
 				for (const child of get_tsrx_render_children(statement.argument)) {
 					collect_statement_bindings(child, bindings);
 				}
@@ -1446,7 +1438,7 @@ function statement_contains_native_tsrx_return(statement) {
  */
 function node_contains_native_tsrx_template(node) {
 	if (!node || typeof node !== 'object') return false;
-	if (node.type === 'Element' || node.type === 'Tsrx') return true;
+	if (node.type === 'Element' || node.type === 'TsrxFragment') return true;
 
 	if (is_function_or_class_boundary(node)) {
 		return false;
@@ -1637,7 +1629,7 @@ function collect_style_elements(node, styles) {
 		return;
 	}
 
-	if (is_function_or_class_boundary(node) || node.type === 'Tsrx') {
+	if (is_function_or_class_boundary(node) || node.type === 'TsrxFragment') {
 		return;
 	}
 
@@ -1756,8 +1748,7 @@ function is_style_expression_position(path) {
 	const parent = path.at(-1);
 	return !(
 		parent?.type === 'Element' ||
-		parent?.type === 'Tsrx' ||
-		parent?.type === 'Tsx' ||
+		parent?.type === 'TsrxFragment' ||
 		parent?.type === 'TsxCompat' ||
 		parent?.type === 'BlockStatement' ||
 		parent?.type === 'Program' ||
@@ -1845,7 +1836,7 @@ function expand_native_tsrx_return_statement_list(statements, transform_context)
 function expand_native_tsrx_return_statement(statement, transform_context) {
 	if (!statement || typeof statement !== 'object') return [statement];
 
-	if (statement.type === 'ReturnStatement' && statement.argument?.type === 'Tsrx') {
+	if (statement.type === 'ReturnStatement' && statement.argument?.type === 'TsrxFragment') {
 		return create_native_tsrx_render_statements(statement.argument, transform_context);
 	}
 
@@ -2045,7 +2036,7 @@ function node_contains_hook_bearing_tsrx(node, transform_context) {
 		return node.some((child) => node_contains_hook_bearing_tsrx(child, transform_context));
 	}
 
-	if (node.type === 'Tsrx') {
+	if (node.type === 'TsrxFragment') {
 		return body_contains_top_level_hook_call(node.children || [], transform_context, true);
 	}
 
@@ -2092,7 +2083,7 @@ function should_extract_hook_helpers(transform_context) {
  */
 function create_module_scoped_hook_component_id(helper_id, transform_context) {
 	return create_generated_identifier(
-		`${transform_context.helper_state?.base_name || 'Tsrx'}__${helper_id.name}`,
+		`${transform_context.helper_state?.base_name || 'TsrxFragment'}__${helper_id.name}`,
 	);
 }
 
@@ -4014,11 +4005,7 @@ function get_body_source_node(body_nodes) {
 function to_jsx_child(node, transform_context) {
 	if (!node) return node;
 	switch (node.type) {
-		case 'Tsx':
-			// We're inside a JSX child position by construction, so keep a
-			// JSXExpressionContainer wrapper for bare `{expr}` children.
-			return tsx_node_to_jsx_expression(node, true);
-		case 'Tsrx':
+		case 'TsrxFragment':
 			return tsrx_node_to_jsx_expression(node, transform_context, true);
 		case 'TsxCompat':
 			return tsx_compat_node_to_jsx_expression(node, transform_context, true);
@@ -4052,8 +4039,8 @@ function to_jsx_child(node, transform_context) {
 
 /**
  * Lower a native TSRX fragment body to a JSX expression.
- * Unlike `<tsx>`, children have already been parsed and transformed through
- * the normal TSRX Element/Text/control-flow visitors.
+ * Children have already been parsed and transformed through the normal TSRX
+ * Element/Text/control-flow visitors.
  *
  * @param {any} node
  * @param {TransformContext} transform_context
@@ -5529,7 +5516,7 @@ function wrap_jsx_setup_declarations(expression, in_jsx_child) {
  * This validator runs over the raw, pre-lowering attribute list so each
  * shape is still distinguishable by `type`. Ripple `Element` attributes have type `Attribute` with an
  * `Identifier` name (the parser normalizes `JSXAttribute`/`JSXIdentifier`
- * for non-Tsx elements); inside `<tsx:react>` compat blocks they retain
+ * for native elements); inside `<tsx:react>` compat blocks they retain
  * the original `JSXAttribute`/`JSXIdentifier` shape, so we accept both.
  *
  * @param {any[]} raw_attrs
@@ -5942,7 +5929,7 @@ function tsx_compat_node_to_jsx_expression(node, transform_context, in_jsx_child
 	if (!platform.jsx.acceptedTsxKinds.includes(node.kind)) {
 		const accepted = platform.jsx.acceptedTsxKinds.map((k) => `<tsx:${k}>`).join(', ');
 		error(
-			`${platform.name} TSRX does not support <tsx:${node.kind}> blocks. Use <tsx> or one of: ${accepted}.`,
+			`${platform.name} TSRX does not support <tsx:${node.kind}> blocks. Use one of: ${accepted}.`,
 			transform_context.filename,
 			node,
 			transform_context.errors,

package/types/index.d.ts

@@ -236,8 +236,7 @@ declare module 'estree' {
 
 	// Include TypeScript node types and TSRX-specific nodes in NodeMap
 	interface NodeMap {
-		Tsx: Tsx;
-		Tsrx: Tsrx;
+		TsrxFragment: TsrxFragment;
 		TsxCompat: TsxCompat;
 		TSRXExpression: TSRXExpression;
 		Element: Element;
@@ -249,7 +248,7 @@ declare module 'estree' {
 	}
 
 	interface ExpressionMap {
-		Tsrx: Tsrx;
+		TsrxFragment: TsrxFragment;
 		Text: TextNode;
 		JSXEmptyExpression: ESTreeJSX.JSXEmptyExpression;
 		ParenthesizedExpression: ParenthesizedExpression;
@@ -345,18 +344,8 @@ declare module 'estree' {
 		trailingComments?: AST.Comment[] | undefined;
 	}
 
-	interface Tsx extends AST.BaseNode {
-		type: 'Tsx';
-		attributes: Array<any>;
-		children: ESTreeJSX.JSXElement['children'];
-		selfClosing?: boolean;
-		unclosed?: boolean;
-		openingElement: ESTreeJSX.JSXOpeningElement;
-		closingElement: ESTreeJSX.JSXClosingElement;
-	}
-
-	interface Tsrx extends AST.BaseExpression {
-		type: 'Tsrx';
+	interface TsrxFragment extends AST.BaseExpression {
+		type: 'TsrxFragment';
 		attributes: Array<any>;
 		children: AST.Node[];
 		selfClosing?: boolean;
@@ -461,7 +450,7 @@ declare module 'estree' {
 
 	export type TSRXStatement = AST.Statement | TSESTree.Statement;
 
-	export type NodeWithChildren = AST.Element | AST.Tsx | AST.Tsrx | AST.TsxCompat;
+	export type NodeWithChildren = AST.Element | AST.TsrxFragment | AST.TsxCompat;
 
 	export namespace CSS {
 		export interface BaseNode extends AST.NodeWithMaybeComments {
@@ -1222,8 +1211,7 @@ export interface Binding {
 		| AST.ClassDeclaration
 		| AST.ImportDeclaration
 		| AST.TSModuleDeclaration
-		| AST.Tsx
-		| AST.Tsrx;
+		| AST.TsrxFragment;
 	/** Whether this binding has been reassigned */
 	reassigned: boolean;
 	/** Whether this binding has been mutated (property access) */
@@ -1323,8 +1311,7 @@ export interface ScopeInterface {
 			| AST.ClassDeclaration
 			| AST.ImportDeclaration
 			| AST.TSModuleDeclaration
-			| AST.Tsx
-			| AST.Tsrx,
+			| AST.TsrxFragment,
 	): Binding;
 	/** Get binding by name */
 	get(name: string): Binding | null;

package/types/parse.d.ts

@@ -1172,7 +1172,7 @@ export namespace Parse {
 		 */
 		parseTopLevel(node: AST.Program): AST.Program;
 
-		parseElement(): AST.Element | AST.Tsx | AST.Tsrx | AST.TsxCompat;
+		parseElement(): AST.Element | AST.TsrxFragment | AST.TsxCompat;
 
 		parseDoubleQuotedTextChild(): AST.TextNode;