@tsrx/core 0.1.53 → 0.1.55

package/package.json

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

package/src/plugin.js

@@ -2440,9 +2440,15 @@ export function TSRXPlugin(config) {
 				}
 				// Statement-bodied native template attributes can leave the attribute's
 				// expression contexts above the still-open JSX tag context. Strip
-				// those so a following `/>` stays in JSX opening-tag mode.
+				// those so a following `/>` stays in JSX opening-tag mode. Once the
+				// stack has unwound below the enclosing expression's depth the same
+				// tail shape means something else: the `}` closed an inner child
+				// container (its own brace context already popped) and the tc_expr
+				// belongs to a still-open element between the attribute brace and
+				// this one — stripping would drop the attribute container's brace.
 				if (
 					this.type === tt.braceR &&
+					ctx.length >= enclosing_context_depth &&
 					top === tstc.tc_expr &&
 					second === b_expr &&
 					ctx[ci - 2] === tstc.tc_oTag

package/types/index.d.ts

@@ -303,6 +303,8 @@ declare module 'estree' {
 		typeParameters?: TSTypeParameterDeclaration;
 		accessibility?: Accessibility;
 		optional?: boolean;
+		abstract?: boolean;
+		override?: boolean;
 	}
 
 	interface PropertyDefinition {
@@ -310,18 +312,26 @@ declare module 'estree' {
 		readonly?: boolean;
 		optional?: boolean;
 		definite?: boolean;
+		abstract?: boolean;
+		override?: boolean;
+		declare?: boolean;
+		accessor?: boolean;
 	}
 
 	interface ClassDeclaration {
 		typeParameters?: AST.TSTypeParameterDeclaration;
 		superTypeParameters?: AST.TSTypeParameterInstantiation;
 		implements?: AST.TSClassImplements[];
+		abstract?: boolean;
+		declare?: boolean;
 	}
 
 	interface ClassExpression {
 		typeParameters?: AST.TSTypeParameterDeclaration;
 		superTypeParameters?: AST.TSTypeParameterInstantiation;
 		implements?: AST.TSClassImplements[];
+		abstract?: boolean;
+		declare?: boolean;
 	}
 
 	interface Identifier extends AST.TrackedNode {
@@ -351,8 +361,16 @@ declare module 'estree' {
 		tracked?: boolean;
 	}
 
+	// A `@decorator` on a class, class member, or parameter. The parser emits
+	// these, but estree has no node type for them.
+	interface Decorator extends AST.BaseNode {
+		type: 'Decorator';
+		expression: AST.Expression;
+	}
+
 	// Include TypeScript node types and TSRX-specific nodes in NodeMap
 	interface NodeMap {
+		Decorator: Decorator;
 		JSXSpreadChild: ESTreeJSX.JSXSpreadChild;
 		TSRXImportDeclaration: TSRXImportDeclaration;
 		TSRXJSXElement: TSRXJSXElement;
@@ -697,6 +715,19 @@ declare module 'estree' {
 		declaration?: TSRXDeclaration | null | undefined;
 	}
 
+	/**
+	 * estree's `ExportDefaultDeclaration` predates the two TypeScript-only
+	 * declaration forms the parser puts in this slot: `export default interface
+	 * Foo {}` yields a `TSInterfaceDeclaration`, and the overload signature
+	 * `export default function foo();` yields a `TSDeclareFunction`.
+	 */
+	interface TSRXExportDefaultDeclaration extends Omit<AST.ExportDefaultDeclaration, 'declaration'> {
+		declaration:
+			| AST.ExportDefaultDeclaration['declaration']
+			| AST.TSDeclareFunction
+			| AST.TSInterfaceDeclaration;
+	}
+
 	interface TSRXProgram extends Omit<Program, 'body'> {
 		body: (Program['body'][number] | FunctionExpression)[];
 	}