@tsrx/core 0.1.55 → 0.1.57

package/package.json

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

package/src/plugin.js

@@ -108,6 +108,28 @@ function get_argument_clash_reported_names(check_clashes) {
 	return reported_names;
 }
 
+/**
+ * A `<` opens a tag only when the character after it can begin one: `/` for a
+ * closing tag, `>` for a fragment, `{` for a dynamic tag, or an element or
+ * component name start. Any other character, or end of input, leaves the `<`
+ * as literal text.
+ * @param {string} input
+ * @param {number} index Index of the `<`.
+ */
+function can_start_tag_after_lt(input, index) {
+	const next = index + 1 < input.length ? input.charCodeAt(index + 1) : -1;
+	return (
+		next === CharCode.slash ||
+		next === CharCode.greaterThan ||
+		next === CharCode.openBrace ||
+		next === CharCode.at ||
+		next === CharCode.dollar ||
+		next === CharCode.underscore ||
+		(next >= CharCode.uppercaseA && next <= CharCode.uppercaseZ) ||
+		(next >= CharCode.lowercaseA && next <= CharCode.lowercaseZ)
+	);
+}
+
 /**
  * @param {string} input
  * @param {number} i
@@ -299,12 +321,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;
 			}
@@ -603,7 +645,7 @@ export function TSRXPlugin(config) {
 					}
 					const ch = this.input.charCodeAt(index);
 					if (
-						ch === CharCode.lessThan ||
+						(ch === CharCode.lessThan && can_start_tag_after_lt(this.input, index)) ||
 						ch === CharCode.openBrace ||
 						ch === CharCode.closeBrace ||
 						this.#isCodeBlockStart(index) ||
@@ -1126,7 +1168,7 @@ export function TSRXPlugin(config) {
 				while (index < this.input.length) {
 					const ch = this.input.charCodeAt(index);
 					if (
-						ch === CharCode.lessThan ||
+						(ch === CharCode.lessThan && can_start_tag_after_lt(this.input, index)) ||
 						ch === CharCode.openBrace ||
 						ch === CharCode.closeBrace ||
 						this.#isJSXControlFlowDirectiveAt(index) ||
@@ -1227,16 +1269,8 @@ export function TSRXPlugin(config) {
 				const index = skip_whitespace_from(this.input, this.start);
 				const ch = this.input.charCodeAt(index);
 				if (ch === CharCode.lessThan) {
-					const next = this.input.charCodeAt(index + 1);
-					if (next === CharCode.slash) return false;
-					const tagLike =
-						next === CharCode.greaterThan ||
-						next === CharCode.openBrace ||
-						next === CharCode.at ||
-						next === CharCode.dollar ||
-						next === CharCode.underscore ||
-						(next >= CharCode.uppercaseA && next <= CharCode.uppercaseZ) ||
-						(next >= CharCode.lowercaseA && next <= CharCode.lowercaseZ);
+					if (this.input.charCodeAt(index + 1) === CharCode.slash) return false;
+					const tagLike = can_start_tag_after_lt(this.input, index);
 					const previous = this.#previousNonSpaceTabIndex(index);
 					const afterSemicolon =
 						previous >= 0 && this.input.charCodeAt(previous) === CharCode.semicolon;
@@ -2875,7 +2909,7 @@ export function TSRXPlugin(config) {
 				this.#suppressTemplateRawTextToken = false;
 				const context = this.curContext();
 				if (
-					code !== CharCode.lessThan &&
+					(code !== CharCode.lessThan || !can_start_tag_after_lt(this.input, this.pos)) &&
 					code !== CharCode.greaterThan &&
 					code !== CharCode.openBrace &&
 					code !== CharCode.closeBrace &&
@@ -2913,17 +2947,7 @@ export function TSRXPlugin(config) {
 					return super.readToken(code);
 				}
 				if (code === CharCode.lessThan) {
-					const next = this.input.charCodeAt(this.pos + 1);
-					const isTagLikeAfterLt =
-						next === CharCode.slash ||
-						next === CharCode.greaterThan ||
-						next === CharCode.openBrace ||
-						next === CharCode.at ||
-						next === CharCode.dollar ||
-						next === CharCode.underscore ||
-						(next >= CharCode.uppercaseA && next <= CharCode.uppercaseZ) ||
-						(next >= CharCode.lowercaseA && next <= CharCode.lowercaseZ);
-					if (this.exprAllowed && isTagLikeAfterLt) {
+					if (this.exprAllowed && can_start_tag_after_lt(this.input, this.pos)) {
 						++this.pos;
 						return this.finishToken(tstt.jsxTagStart);
 					}
@@ -3038,21 +3062,7 @@ export function TSRXPlugin(config) {
 					// <Something>...</Something>\n\n<Child />
 					// <head><style>...</style></head>
 					// We only do this when '<' is in a tag-like position.
-					const isWhitespaceAfterLt =
-						nextChar === CharCode.space ||
-						nextChar === CharCode.tab ||
-						nextChar === CharCode.lineFeed ||
-						nextChar === CharCode.carriageReturn;
-					const isTagLikeAfterLt =
-						!isWhitespaceAfterLt &&
-						(nextChar === CharCode.slash ||
-							nextChar === CharCode.greaterThan ||
-							nextChar === CharCode.openBrace ||
-							nextChar === CharCode.at ||
-							nextChar === CharCode.dollar ||
-							nextChar === CharCode.underscore ||
-							(nextChar >= CharCode.uppercaseA && nextChar <= CharCode.uppercaseZ) ||
-							(nextChar >= CharCode.lowercaseA && nextChar <= CharCode.lowercaseZ));
+					const isTagLikeAfterLt = can_start_tag_after_lt(this.input, this.pos);
 					const prevAllowsTagStart =
 						prevNonWhitespaceChar === null ||
 						prevNonWhitespaceChar === CharCode.lineFeed || // '\n'
@@ -3079,7 +3089,7 @@ export function TSRXPlugin(config) {
 							prevNonWhitespaceChar === CharCode.openBrace ||
 							prevNonWhitespaceChar === CharCode.greaterThan
 						) {
-							if (!isWhitespaceAfterLt) {
+							if (isTagLikeAfterLt) {
 								++this.pos;
 								return this.finishToken(tstt.jsxTagStart);
 							}
@@ -4116,6 +4126,16 @@ export function TSRXPlugin(config) {
 
 						case CharCode.lessThan:
 						case CharCode.openBrace:
+							// This path reads the children of an element nested in a `{ … }`
+							// expression container, where the raw-text intercept in `readToken`
+							// is off, so the literal-`<` rule has to be applied here too. Keep
+							// scanning rather than finishing the token: the `<` belongs to the
+							// text run, and finishing here would emit an empty text token when
+							// it is the run's first character.
+							if (ch === CharCode.lessThan && !can_start_tag_after_lt(this.input, this.pos)) {
+								++this.pos;
+								break;
+							}
 							if (out || this.pos > chunkStart) {
 								return this.finishToken(tstt.jsxText, out + this.input.slice(chunkStart, this.pos));
 							}
@@ -4609,10 +4629,13 @@ export function TSRXPlugin(config) {
 				} else if (this.type === tstt.jsxText) {
 					// A nested element with its own body can leak a JSX expression context,
 					// so the whitespace after its closing tag is mis-tokenized as a stale
-					// text token whose start was advanced onto the following `<`. Real JSX
-					// text never starts at `<`, so drop the leaked context and re-read the
-					// tag instead of emitting an empty node.
-					if (this.input.charCodeAt(this.start) === CharCode.lessThan) {
+					// text token whose start was advanced onto the following `<`. Text never
+					// starts at a `<` that can open a tag, so drop the leaked context and
+					// re-read the tag instead of emitting an empty node.
+					if (
+						this.input.charCodeAt(this.start) === CharCode.lessThan &&
+						can_start_tag_after_lt(this.input, this.start)
+					) {
 						if (this.#jsxExpressionContainerDepth > 0) {
 							// Inside a `{ … }` container the whole-stack counts below are
 							// blind: the enclosing template's `tc_expr` contexts sit on the

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

@@ -152,6 +152,15 @@ export function tsx_with_ts_locations(boundary_tokens = false, comments = undefi
 			context.visit(value.body);
 		},
 
+		// TSRX text may contain a literal `<` — one that cannot start a tag
+		// (`<span><3</span>`) or a raw-text `<script>` body — but the printed TSX
+		// is re-parsed by a JSX toolchain (esbuild, Babel, SWC), and JSX forbids
+		// a bare `<` in text. Emit it as `&lt;`, which those parsers decode back
+		// to the same string.
+		JSXText: (node, context) => {
+			context.write(node.value.replace(/</g, '&lt;'), node);
+		},
+
 		// esrap's JSXOpeningElement printer doesn't emit `typeArguments`, so generic
 		// component tags like `<RenderProp<User>>` lose the `<User>` in the output.
 		JSXOpeningElement: (node, context) => {
@@ -180,12 +189,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
@@ -1302,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>'`. */