try to load typescript fallback for specifier with extensions.

Author: mshima

src/loaders.ts

@@ -35,26 +35,60 @@ type resolve = (
 	recursiveCall?: boolean,
 ) => MaybePromise<Resolved>;
 
-const extensions = ['.js', '.json', '.ts', '.tsx', '.jsx'] as const;
+const mappedExtensions: Record<string, string[]> = {
+	'.js': ['.ts', '.tsx'],
+	'.jsx': ['.ts', '.tsx'],
+	'.cjs': ['.cts'],
+	'.mjs': ['.mts'],
+	'': ['.ts', '.js', '.json', '.tsx', '.jsx'],
+};
+
+function resolveTsAlternativeSpecifiers(specifier: string) {
+	const alternativePaths = mappedExtensions[''].map(alternativeExtension => ({
+		specifier,
+		specifierExtension: '',
+		alternativeExtension,
+	}));
+	const specifierExtension = path.extname(specifier);
+	if (!specifierExtension) {
+		return alternativePaths;
+	}
+	const extensionsToTry = mappedExtensions[specifierExtension] ?? [];
+	specifier = specifier.slice(0, specifier.length - specifierExtension.length);
+	return [
+		// Try using subextension first
+		...alternativePaths,
+		...extensionsToTry.map(alternativeExtension => ({
+			specifier,
+			specifierExtension,
+			alternativeExtension,
+		})),
+	];
+}
 
 async function tryExtensions(
 	specifier: string,
 	context: Context,
 	defaultResolve: resolve,
 ) {
 	let error;
-	for (const extension of extensions) {
+	for (const alternativePath of resolveTsAlternativeSpecifiers(specifier)) {
+		const {
+			specifier: alternativeSpecifier,
+			specifierExtension,
+			alternativeExtension,
+		} = alternativePath;
 		try {
 			return await resolve(
-				specifier + extension,
+				`${alternativeSpecifier}${alternativeExtension}`,
 				context,
 				defaultResolve,
 				true,
 			);
 		} catch (_error: any) {
 			if (error === undefined) {
 				const { message } = _error;
-				_error.message = _error.message.replace(`${extension}'`, "'");
+				_error.message = _error.message.replace(`${alternativeExtension}'`, `${specifierExtension}'`);
 				_error.stack = _error.stack.replace(message, _error.message);
 				error = _error;
 			}

tests/specs/typescript/cts.ts

@@ -28,9 +28,9 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 		describe('full path via .cjs', ({ test }) => {
 			const importPath = './lib/ts-ext-cts/index.cjs';
 
-			test('Load - should not work', async () => {
+			test('Load', async () => {
 				const nodeProcess = await node.load(importPath);
-				expect(nodeProcess.stderr).toMatch('Cannot find module');
+				expect(nodeProcess.stderr).toMatch('SyntaxError: Unexpected token \':\'');
 			});
 
 			test('Import', async () => {

tests/specs/typescript/mts.ts

@@ -39,9 +39,9 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 		describe('full path via .mjs', ({ test }) => {
 			const importPath = './lib/ts-ext-mts/index.mjs';
 
-			test('Load - should not work', async () => {
+			test('Load', async () => {
 				const nodeProcess = await node.load(importPath);
-				expect(nodeProcess.stderr).toMatch('Cannot find module');
+				assertResults(nodeProcess.stdout);
 			});
 
 			test('Import', async () => {

tests/specs/typescript/ts.ts

@@ -47,9 +47,9 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 		describe('full path via .js', ({ test }) => {
 			const importPath = './lib/ts-ext-ts/index.js';
 
-			test('Load - should not work', async () => {
+			test('Load', async () => {
 				const nodeProcess = await node.load(importPath);
-				expect(nodeProcess.stderr).toMatch('Cannot find module');
+				assertResults(nodeProcess.stdout, 'ts-ext-ts/index.ts');
 			});
 
 			test('Import', async () => {