@tsrx/core 0.1.0 → 0.1.2

package/package.json

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

package/src/plugin.js

@@ -202,6 +202,7 @@ export function TSRXPlugin(config) {
 		// Some parser constructors (e.g. via TS plugins) expose `tokContexts` without `b_stat`.
 		// If we push an undefined context, Acorn's tokenizer will later crash reading `.override`.
 		const b_stat = tc.b_stat || acorn.tokContexts.b_stat;
+		const b_expr = tc.b_expr || acorn.tokContexts.b_expr;
 		const tstt = Parser.acornTypeScript.tokTypes;
 		const tstc = Parser.acornTypeScript.tokContexts;
 
@@ -319,6 +320,21 @@ export function TSRXPlugin(config) {
 				}
 			}
 
+			#popJsxAttributeExpressionContextAfterTemplateElement() {
+				if (this.type !== tt.braceR) {
+					return;
+				}
+
+				const context_index = this.context.length - 1;
+				if (
+					this.context[context_index] === b_expr &&
+					this.context[context_index - 1] === tstc.tc_oTag
+				) {
+					this.context.pop();
+					this.exprAllowed = false;
+				}
+			}
+
 			#isDoubleQuotedTextChildStart() {
 				if (this.#path.findLast((n) => n.type === 'TsxCompat' || n.type === 'Tsx')) {
 					return false;
@@ -1702,7 +1718,22 @@ export function TSRXPlugin(config) {
 					chunkStart = this.pos;
 
 				while (true) {
-					if (this.pos >= this.input.length) this.raise(this.start, 'Unterminated JSX contents');
+					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',
+						);
+						if (!inside_open_template) {
+							while (this.curContext() === tstc.tc_expr) {
+								this.context.pop();
+							}
+							return this.finishToken(tt.eof);
+						}
+						this.raise(this.start, 'Unterminated JSX contents');
+					}
 					let ch = this.input.charCodeAt(this.pos);
 
 					switch (ch) {
@@ -1895,9 +1926,18 @@ export function TSRXPlugin(config) {
 					// Use Ripple's parseElement to create a Tsx/Tsrx/TsxCompat node.
 					// Bare fragments (<></>) are shorthand for <tsx>...</tsx>.
 					this.next();
-					return /** @type {import('estree-jsx').JSXElement} */ (
+					const parsed = /** @type {import('estree-jsx').JSXElement} */ (
 						/** @type {unknown} */ (this.parseElement())
 					);
+					this.#popJsxAttributeExpressionContextAfterTemplateElement();
+					return parsed;
+				}
+
+				if (
+					!this.#path.findLast((node) => node.type === 'Component') &&
+					!this.#functionStack.findLast(is_pascal_case_function)
+				) {
+					return super.jsx_parseElement();
 				}
 
 				const code = this.#functionStack.findLast(is_pascal_case_function)