fix: resolve tsconfig path aliases containing a colon (#780)

Co-authored-by: Hiroki Osame <hiroki.osame@gmail.com>

Author: msmx-mnakagawa

src/esm/hook/resolve.ts

@@ -11,11 +11,11 @@ import { readJsonFile } from '../../utils/read-json-file.js';
 import { mapTsExtensions } from '../../utils/map-ts-extensions.js';
 import type { NodeError } from '../../types.js';
 import {
-	requestAcceptsQuery,
 	fileUrlPrefix,
 	tsExtensionsPattern,
 	isDirectoryPattern,
 	isRelativePath,
+	isFilePath,
 } from '../../utils/path-utils.js';
 import type { TsxRequest } from '../types.js';
 import { isGlobalCjsLoaderActive } from '../../utils/cjs-loader-state.js';
@@ -31,6 +31,15 @@ import { data as defaultData, type Data } from './initialize.js';
 type NextResolve = Parameters<ResolveHook>[2];
 type NextResolveSync = Parameters<ResolveHookSync>[2];
 
+const urlLikeSpecifierPattern = /^(?:[a-z][\d+.a-z-]*:\/\/|data:|file:|node:)/i;
+
+const isTsconfigPathAliasSpecifier = (
+	specifier: string,
+) => (
+	!isFilePath(specifier)
+	&& !urlLikeSpecifierPattern.test(specifier)
+);
+
 const getMissingPathFromNotFound = (
 	nodeError: NodeError,
 ) => {
@@ -425,17 +434,18 @@ const resolveTsPaths = async (
 	nextResolve: NextResolve,
 	hookData: Data,
 ) => {
+	const tsconfigPathAliasSpecifier = isTsconfigPathAliasSpecifier(specifier);
 	log(3, 'resolveTsPaths', {
 		specifier,
 		context,
 
-		requestAcceptsQuery: requestAcceptsQuery(specifier),
+		tsconfigPathAliasSpecifier,
 		tsconfig: hookData.parsedTsconfig,
 		fromNodeModules: context.parentURL?.includes('/node_modules/'),
 	});
 	if (
-		// Bare specifier
-		!requestAcceptsQuery(specifier)
+		// Bare specifier or TS path alias (e.g. `ns:foo`)
+		tsconfigPathAliasSpecifier
 		// TS path alias
 		&& hookData.parsedTsconfig
 		&& !context.parentURL?.includes('/node_modules/')
@@ -465,17 +475,18 @@ const resolveTsPathsSync = (
 	nextResolve: NextResolveSync,
 	hookData: Data,
 ) => {
+	const tsconfigPathAliasSpecifier = isTsconfigPathAliasSpecifier(specifier);
 	log(3, 'resolveTsPathsSync', {
 		specifier,
 		context,
 
-		requestAcceptsQuery: requestAcceptsQuery(specifier),
+		tsconfigPathAliasSpecifier,
 		tsconfig: hookData.parsedTsconfig,
 		fromNodeModules: context.parentURL?.includes('/node_modules/'),
 	});
 	if (
-		// Bare specifier
-		!requestAcceptsQuery(specifier)
+		// Bare specifier or TS path alias (e.g. `ns:foo`)
+		tsconfigPathAliasSpecifier
 		// TS path alias
 		&& hookData.parsedTsconfig
 		&& !context.parentURL?.includes('/node_modules/')

tests/specs/cli.ts

@@ -1,4 +1,5 @@
 import { setTimeout } from 'node:timers/promises';
+import { on } from 'node:events';
 import {
 	describe, test, onFinish, onTestFail, expect,
 } from 'manten';
@@ -42,6 +43,58 @@ const isProcessAlive = (pid: number) => {
 	return false;
 };
 
+const isAbortError = (
+	error: unknown,
+) => error instanceof Error && error.name === 'AbortError';
+
+const waitForSignalRelay = async (
+	stdoutStream: NodeJS.ReadableStream,
+	signalName: string,
+	sendSignal: () => void,
+) => {
+	let stdout = '';
+	let sentFirstSignal = false;
+	let sentSecondSignal = isWindows;
+
+	try {
+		for await (const [data] of on(stdoutStream, 'data', {
+			close: ['end', 'close'],
+			signal: AbortSignal.timeout(10_000),
+		})) {
+			stdout += data.toString();
+
+			if (!sentFirstSignal && stdout.includes('READY')) {
+				sentFirstSignal = true;
+				sendSignal();
+
+				if (sentSecondSignal) {
+					return stdout;
+				}
+			}
+
+			if (!sentSecondSignal && stdout.includes(`${signalName} PRESS AGAIN`)) {
+				sentSecondSignal = true;
+				sendSignal();
+				return stdout;
+			}
+		}
+	} catch (error) {
+		if (isAbortError(error)) {
+			throw Object.assign(
+				new Error(`Timed out waiting for ${signalName} relay`),
+				{ stdout },
+			);
+		}
+
+		throw error;
+	}
+
+	throw Object.assign(
+		new Error(`Process exited before ${signalName} relay completed`),
+		{ stdout },
+	);
+};
+
 export const cli = (node: NodeApis) => describe('CLI', () => {
 	const { tsx } = node;
 	describe('argv', async () => {
@@ -183,10 +236,10 @@ export const cli = (node: NodeApis) => describe('CLI', () => {
 			
 			for (const name of signals) {
 				process.once(name, () => {
-					console.log(name, 'PRESS AGAIN');
 					process.once(name, () => {
 						process.exit(200);
 					});
+					console.log(name, 'PRESS AGAIN');
 				});
 			}
 			
@@ -234,25 +287,27 @@ export const cli = (node: NodeApis) => describe('CLI', () => {
 						fixture.getPath('catch-signals.js'),
 					]);
 
-					tsxProcess.stdout!.once('data', () => {
-						tsxProcess.kill(signal, {
-							forceKillAfterTimeout: false,
-						});
+					let stdout = '';
+					let tsxProcessResolved: Awaited<typeof tsxProcess> | undefined;
 
-						tsxProcess.stdout!.once('data', () => {
-							tsxProcess.kill(signal, {
-								forceKillAfterTimeout: false,
-							});
+					onTestFail(() => {
+						console.log({
+							tsxProcessResolved,
+							stdout,
 						});
 					});
 
-					const tsxProcessResolved = await tsxProcess;
+					stdout = await waitForSignalRelay(
+						tsxProcess.stdout!,
+						signal,
+						() => tsxProcess.kill(signal, {
+							forceKillAfterTimeout: false,
+						}),
+					);
 
-					onTestFail(() => {
-						console.log(tsxProcessResolved);
-					});
+					tsxProcessResolved = await tsxProcess;
 
-					if (process.platform === 'win32') {
+					if (isWindows) {
 						/**
 						 * Windows doesn't support sending signals to processes.
 						 * https://nodejs.org/api/process.html#signal-events
@@ -261,10 +316,10 @@ export const cli = (node: NodeApis) => describe('CLI', () => {
 						 * of the target process, and afterwards, subprocess will report that the process
 						 * was terminated by signal.
 						 */
-						expect(tsxProcessResolved.stdout).toBe('READY');
+						expect(stdout.trim()).toBe('READY');
 					} else {
 						expect(tsxProcessResolved.exitCode).toBe(200);
-						expectMatchInOrder(tsxProcessResolved.stdout, [
+						expectMatchInOrder(stdout, [
 							'READY\n',
 							`${signal} PRESS AGAIN`,
 						]);

tests/specs/tsconfig.ts

@@ -176,6 +176,68 @@ export const tsconfig = ({ tsx }: NodeApis) => describe('tsconfig', () => {
 					expect(pTsconfig.stderr).toBe('');
 					expect(pTsconfig.stdout).toBe('resolved via configDir');
 				});
+
+				test('tsconfig paths can match colon aliases', async () => {
+					await using fixture = await createFixture({
+						'package.json': createPackageJson(packageType ? { type: packageType } : {}),
+						'tsconfig.json': createTsconfig({
+							compilerOptions: {
+								baseUrl: '.',
+								paths: {
+									'ns:*': ['./src/*'],
+								},
+							},
+						}),
+						'index.mts': `
+						import { value } from 'ns:utils.mjs';
+
+						console.log(value);
+						`,
+						src: {
+							'utils.mts': "export const value = 'success';",
+						},
+					});
+
+					const pTsconfig = await tsx(['index.mts'], fixture.path);
+					onTestFail((error) => {
+						console.error(error);
+						console.log(pTsconfig);
+					});
+					expect(pTsconfig.failed).toBe(false);
+					expect(pTsconfig.stderr).toBe('');
+					expect(pTsconfig.stdout).toBe('success');
+				});
+
+				test('tsconfig paths do not resolve data URLs', async () => {
+					await using fixture = await createFixture({
+						'package.json': createPackageJson(packageType ? { type: packageType } : {}),
+						'tsconfig.json': createTsconfig({
+							compilerOptions: {
+								baseUrl: '.',
+								paths: {
+									'data:*': ['./src/wrong.mjs'],
+								},
+							},
+						}),
+						'index.mts': `
+						import { value } from 'data:text/javascript,export%20const%20value%20%3D%20%22data-url%22%3B';
+
+						console.log(value);
+						`,
+						src: {
+							'wrong.mts': "export const value = 'wrong';",
+						},
+					});
+
+					const pTsconfig = await tsx(['index.mts'], fixture.path);
+					onTestFail((error) => {
+						console.error(error);
+						console.log(pTsconfig);
+					});
+					expect(pTsconfig.failed).toBe(false);
+					expect(pTsconfig.stderr).toBe('');
+					expect(pTsconfig.stdout).toBe('data-url');
+				});
 			});
 
 			describe('custom tsconfig', () => {