@tsrx/core 0.1.54 → 0.1.56

package/package.json

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

package/src/plugin.js

@@ -299,12 +299,32 @@ export function TSRXPlugin(config) {
 			finishNode(node, type) {
 				const finished = super.finishNode(node, type);
 				if (type === 'TSModuleDeclaration') {
-					const start = /** @type {number} */ (finished.start);
-					const source = this.input.slice(start, start + 'namespace'.length);
-					finished.metadata ??= { path: [] };
-					finished.metadata.module_keyword = source.startsWith('namespace')
-						? 'namespace'
-						: 'module';
+					const declaration = /** @type {AST.TSModuleDeclaration} */ (finished);
+					const start = /** @type {number} */ (declaration.start);
+					// acorn-typescript still exposes the legacy `global` flag without
+					// TSESTree's replacement `kind`; replace it at the parser boundary
+					// so downstream consumers only receive the current discriminator.
+					const legacy = /** @type {{ global?: boolean }} */ (declaration);
+					const prefix = this.input
+						.slice(start, declaration.id.start)
+						.replace(/\/\*[\s\S]*?\*\/|\/\/[^\r\n]*/g, ' ')
+						.trim();
+					const kind =
+						declaration.kind ??
+						(legacy.global ? 'global' : prefix.endsWith('namespace') ? 'namespace' : 'module');
+					/** @type {AST.TSModuleDeclaration | null} */
+					let current = declaration;
+					while (current !== null) {
+						const current_legacy = /** @type {{ global?: boolean }} */ (current);
+						current.kind = kind;
+						delete current_legacy.global;
+						current.metadata ??= { path: [] };
+						current.metadata.module_keyword = kind;
+						const body = /** @type {AST.TSModuleBlock | AST.TSModuleDeclaration} */ (
+							/** @type {unknown} */ (current.body)
+						);
+						current = body?.type === 'TSModuleDeclaration' ? body : null;
+					}
 				}
 				return finished;
 			}

package/src/scope.js

@@ -130,7 +130,7 @@ export function create_scopes(ast, root, parent, error_options) {
 		},
 
 		TSModuleDeclaration(node, { state, next }) {
-			const is_submodule = node.metadata?.module_keyword === 'module';
+			const is_submodule = node.declare !== true && node.kind === 'module';
 			if (is_submodule && node.id?.type === 'Identifier') {
 				state.scope.declare(node.id, 'normal', 'module', node);
 			}

package/src/transform/jsx/helpers.js

@@ -180,12 +180,18 @@ export function tsx_with_ts_locations(boundary_tokens = false, comments = undefi
 			}
 		},
 		TSModuleDeclaration: (node, context) => {
-			// Ambient `declare module '…' { … }` must keep its `declare` — the
-			// typeOnly/volar output is real TS and `module '…' { … }` alone is a
-			// syntax error (TS1035). Non-ambient `module name { }` blocks have no
-			// `declare` and print unchanged.
+			// `declare global` is represented as a TSModuleDeclaration whose id is
+			// `global`; adding `module` changes it into an unrelated named module.
+			// Ambient `declare module '…' { … }` must still keep its `declare` —
+			// the typeOnly/volar output is real TS and `module '…' { … }` alone is
+			// a syntax error (TS1035).
 			if (node.declare) context.write('declare ');
-			context.write(node.metadata?.module_keyword ?? 'module');
+			if (node.kind === 'global') {
+				context.visit(node.id);
+				context.visit(node.body);
+				return;
+			}
+			context.write(node.kind);
 			context.write(' ');
 			context.visit(node.id);
 			context.visit(node.body);

package/src/transform/jsx/server-module.js

@@ -110,7 +110,7 @@ function is_server_module_declaration(node, block_name) {
 	return (
 		node.type === 'TSModuleDeclaration' &&
 		node.declare !== true &&
-		node.metadata?.module_keyword === 'module' &&
+		node.kind === 'module' &&
 		identifier_name(node.id) === block_name
 	);
 }
@@ -465,6 +465,7 @@ function lower_declaration(declaration, outside_names, block_name) {
 	const namespace = /** @type {AST.TSStatement<AST.TSModuleDeclaration>} */ ({
 		...declaration,
 		id,
+		kind: 'namespace',
 		metadata: { ...declaration.metadata, module_keyword: 'namespace' },
 		body: { ...declaration.body, body: [...aliases, ...rest] },
 	});

package/types/index.d.ts

@@ -106,7 +106,7 @@ export interface BaseNodeMetaData {
 	has_template?: boolean;
 	source_name?: string;
 	source_length?: number;
-	module_keyword?: 'module' | 'namespace';
+	module_keyword?: 'global' | 'module' | 'namespace';
 	/**
 	 * Generated identifier whose SOURCE span sits inside an authored string
 	 * literal (e.g. a server-module lowering's namespace reference carrying
@@ -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)[];
 	}
@@ -1271,7 +1302,7 @@ declare module 'estree' {
 	}
 	interface TSModuleDeclaration extends Omit<
 		AcornTSNode<TSESTree.TSModuleDeclaration>,
-		'body' | 'id'
+		'body' | 'global' | 'id'
 	> {
 		body: TSModuleBlock;
 		/** A string literal for `declare module '<specifier>'`. */