From 1632a30d83efde0cb7972b7967507cf3ffe3e876 Mon Sep 17 00:00:00 2001
From: Nathan Sarang-Walters <nwalters512@gmail.com>
Date: Tue, 23 Apr 2024 16:53:44 -0700
Subject: [PATCH 1/2] Support TS resolution in JS files when allowJs is set

---
 src/esm/loaders.ts   | 13 ++++++-------
 src/esm/utils.ts     |  1 +
 tests/specs/smoke.ts | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/esm/loaders.ts b/src/esm/loaders.ts
index 8dadd6e8..1a47fe42 100644
--- a/src/esm/loaders.ts
+++ b/src/esm/loaders.ts
@@ -17,6 +17,7 @@ import {
 	isJsonPattern,
 	getFormatFromFileUrl,
 	fileProtocol,
+	allowJs,
 	type MaybePromise,
 	type NodeError,
 } from './utils.js';
@@ -166,13 +167,11 @@ export const resolve: resolve = async (
 		}
 	}
 
-	/**
-	 * Typescript gives .ts, .cts, or .mts priority over actual .js, .cjs, or .mjs extensions
-	 */
-	if (
-		// !recursiveCall &&
-		tsExtensionsPattern.test(context.parentURL!)
-	) {
+	// Typescript gives .ts, .cts, or .mts priority over actual .js, .cjs, or .mjs extensions
+	//
+	// If `allowJs` is set in `tsconfig.json`, then we'll apply the same resolution logic
+	// to files without a TypeScript extension.
+	if (tsExtensionsPattern.test(context.parentURL!) || allowJs) {
 		const tsPaths = resolveTsPath(specifier);
 		if (tsPaths) {
 			for (const tsPath of tsPaths) {
diff --git a/src/esm/utils.ts b/src/esm/utils.ts
index cfecb187..6c87ed8d 100644
--- a/src/esm/utils.ts
+++ b/src/esm/utils.ts
@@ -19,6 +19,7 @@ const tsconfig = (
 
 export const fileMatcher = tsconfig && createFilesMatcher(tsconfig);
 export const tsconfigPathsMatcher = tsconfig && createPathsMatcher(tsconfig);
+export const allowJs = tsconfig?.config.compilerOptions?.allowJs ?? false;
 
 export const fileProtocol = 'file://';
 
diff --git a/tests/specs/smoke.ts b/tests/specs/smoke.ts
index f61c713e..154c70a6 100644
--- a/tests/specs/smoke.ts
+++ b/tests/specs/smoke.ts
@@ -218,6 +218,14 @@ const files = {
 
 	'file.txt': 'hello',
 
+	'import-typescript-parent.js': sourcemap.tag`
+	import './import-typescript-child.js';
+	`,
+
+	'import-typescript-child.js': sourcemap.tag`
+	console.log('imported');
+	`,
+
 	node_modules: {
 		'pkg-commonjs': {
 			'package.json': JSON.stringify({
@@ -663,6 +671,17 @@ export default testSuite(async ({ describe }, { tsx }: NodeApis) => {
 						expect(pTsconfigAllowJs.stderr).toMatch('Error: No error thrown');
 						expect(pTsconfigAllowJs.stdout).toBe('');
 					});
+
+					test('allowJs in tsconfig.json', async ({ onTestFail }) => {
+						const pTsconfigAllowJs = await tsx(['--tsconfig', 'tsconfig/tsconfig-allowJs.json', 'import-typescript-parent.js'], fixture.path);
+						onTestFail((error) => {
+							console.error(error);
+							console.log(pTsconfigAllowJs);
+						});
+						expect(pTsconfigAllowJs.failed).toBe(false);
+						expect(pTsconfigAllowJs.stderr).toBe('');
+						expect(pTsconfigAllowJs.stdout).toBe('imported');
+					});
 				});
 			});
 		}

From 86e33ea81b654808fb51c7c7ec611fe5f863e1a1 Mon Sep 17 00:00:00 2001
From: Nathan Sarang-Walters <nwalters512@gmail.com>
Date: Tue, 23 Apr 2024 17:13:10 -0700
Subject: [PATCH 2/2] Fix test and CJS behavior

---
 src/cjs/index.ts     | 5 ++++-
 tests/specs/smoke.ts | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/cjs/index.ts b/src/cjs/index.ts
index 57f27372..21d5b2bc 100644
--- a/src/cjs/index.ts
+++ b/src/cjs/index.ts
@@ -205,7 +205,10 @@ const resolveTsFilename = (
 
 	if (
 		parent?.filename
-		&& isTsFilePatten.test(parent.filename)
+		&& (
+			isTsFilePatten.test(parent.filename)
+			|| tsconfig?.config.compilerOptions?.allowJs
+		)
 		&& tsPath
 	) {
 		for (const tryTsPath of tsPath) {
diff --git a/tests/specs/smoke.ts b/tests/specs/smoke.ts
index 154c70a6..f978694a 100644
--- a/tests/specs/smoke.ts
+++ b/tests/specs/smoke.ts
@@ -222,7 +222,7 @@ const files = {
 	import './import-typescript-child.js';
 	`,
 
-	'import-typescript-child.js': sourcemap.tag`
+	'import-typescript-child.ts': sourcemap.tag`
 	console.log('imported');
 	`,