fix: TypeScript file detection

src/loaders-deprecated.ts

@@ -80,6 +80,7 @@ const _transformSource: transformSource = async function (
 
 	if (
 		url.endsWith('.json')
+		|| url.endsWith('.jsx')
 		|| tsExtensionsPattern.test(url)
 	) {
 		const transformed = await transform(

src/loaders.ts

@@ -132,7 +132,13 @@ export const resolve: resolve = async function (
 	/**
 	 * Typescript gives .ts, .cts, or .mts priority over actual .js, .cjs, or .mjs extensions
 	 */
-	if (tsExtensionsPattern.test(context.parentURL!)) {
+	if (
+		context.parentURL
+		&& (
+			tsExtensionsPattern.test(context.parentURL)
+			|| fileMatcher?.(fileURLToPath(context.parentURL))
+		)
+	) {
 		const tsPath = resolveTsPath(specifier);
 
 		if (tsPath) {
@@ -219,6 +225,7 @@ export const load: LoadHook = async function (
 
 	if (
 		loaded.format === 'json'
+		|| url.endsWith('.jsx')
 		|| tsExtensionsPattern.test(url)
 	) {
 		const transformed = await transform(

src/utils.ts

@@ -17,15 +17,21 @@ const tsconfig = (
 			path: path.resolve(process.env.ESBK_TSCONFIG_PATH),
 			config: parseTsconfig(process.env.ESBK_TSCONFIG_PATH),
 		}
-		: getTsconfig()
+		: (
+			getTsconfig()
+			?? {
+				path: process.cwd(),
+				config: {},
+			}
+		)
 );
 
 export const fileMatcher = tsconfig && createFilesMatcher(tsconfig);
 export const tsconfigPathsMatcher = tsconfig && createPathsMatcher(tsconfig);
 
 export const fileProtocol = 'file://';
 
-export const tsExtensionsPattern = /\.([cm]?ts|[tj]sx)$/;
+export const tsExtensionsPattern = /\.([cm]?ts|tsx)$/;
 
 const getFormatFromExtension = (fileUrl: string): ModuleFormat | undefined => {
 	const extension = path.extname(fileUrl);
@@ -43,15 +49,21 @@ const getFormatFromExtension = (fileUrl: string): ModuleFormat | undefined => {
 	}
 };
 
+export const knownExtensions = /\.[tj]sx?$/;
+
 export const getFormatFromFileUrl = (fileUrl: string) => {
 	const format = getFormatFromExtension(fileUrl);
 
 	if (format) {
 		return format;
 	}
 
-	// ts, tsx, jsx
-	if (tsExtensionsPattern.test(fileUrl)) {
+	/**
+	 * Since this is only called when Node.js can't figure
+	 * out the type, we only need to implement it for the
+	 * extensions it can't handle (e.g. ts, tsx, jsx)
+	 */
+	if (knownExtensions.test(fileUrl)) {
 		return getPackageType(fileUrl);
 	}
 };

tests/fixtures/package-module/lib/cjs-ext-cjs/index.cjs

@@ -31,9 +31,25 @@ test(
 	'sourcemaps',
 	() => {
 		const { stack } = new Error();
-		const pathIndex = stack.indexOf(__filename + ':33:');
-		const previousCharacter = stack[pathIndex - 1];
-		return pathIndex > -1 && previousCharacter !== ':';
+		const errorPosition = ':33:';
+		const isWindows = process.platform === 'win32';
+		let pathname = __filename;
+		if (isWindows) {
+			// Remove drive letter
+			pathname = pathname.slice(2);
+		}
+
+		let pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
+		if (
+			pathIndex === -1
+			&& isWindows
+		) {
+			// Convert backslash to slash
+			pathname = pathname.replace(/\\/g, '/');
+			pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
+		}
+
+		return pathIndex > -1;
 	},
 );
 

tests/fixtures/package-module/lib/cjs-ext-js/index.js

@@ -1,3 +1,5 @@
+import { fileURLToPath } from 'node:url';
+
 async function test(description, testFunction) {
 	try {
 		const result = await testFunction();
@@ -31,16 +33,25 @@ test(
 	'sourcemaps',
 	() => {
 		const { stack } = new Error();
-		let { pathname } = new URL(import.meta.url);
-		if (process.platform === 'win32') {
-			pathname = pathname.slice(1);
+		const errorPosition = ':35:';
+		const isWindows = process.platform === 'win32';
+		let pathname = fileURLToPath(import.meta.url);
+		if (isWindows) {
+			// Remove drive letter
+			pathname = pathname.slice(2);
 		}
-		let pathIndex = stack.indexOf(`${pathname}:33:`);
-		if (pathIndex === -1) {
-			pathIndex = stack.indexOf(`${pathname.toLowerCase()}:33:`);
+
+		let pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
+		if (
+			pathIndex === -1
+			&& isWindows
+		) {
+			// Convert backslash to slash
+			pathname = pathname.replace(/\\/g, '/');
+			pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
 		}
-		const previousCharacter = stack[pathIndex - 1];
-		return pathIndex > -1 && previousCharacter !== ':';
+
+		return pathIndex > -1;
 	},
 );
 

tests/fixtures/package-module/lib/esm-ext-js/index.js

@@ -1,3 +1,5 @@
+import { fileURLToPath } from 'node:url';
+
 async function test(description, testFunction) {
 	try {
 		const result = await testFunction();
@@ -31,16 +33,25 @@ test(
 	'sourcemaps',
 	() => {
 		const { stack } = new Error();
-		let { pathname } = new URL(import.meta.url);
-		if (process.platform === 'win32') {
-			pathname = pathname.slice(1);
+		const errorPosition = ':35:';
+		const isWindows = process.platform === 'win32';
+		let pathname = fileURLToPath(import.meta.url);
+		if (isWindows) {
+			// Remove drive letter
+			pathname = pathname.slice(2);
 		}
-		let pathIndex = stack.indexOf(`${pathname}:33:`);
-		if (pathIndex === -1) {
-			pathIndex = stack.indexOf(`${pathname.toLowerCase()}:33:`);
+
+		let pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
+		if (
+			pathIndex === -1
+			&& isWindows
+		) {
+			// Convert backslash to slash
+			pathname = pathname.replace(/\\/g, '/');
+			pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
 		}
-		const previousCharacter = stack[pathIndex - 1];
-		return pathIndex > -1 && previousCharacter !== ':';
+
+		return pathIndex > -1;
 	},
 );
 

tests/fixtures/package-module/lib/esm-ext-mjs/index.mjs

@@ -1,3 +1,5 @@
+import { fileURLToPath } from 'node:url';
+
 async function test(description, testFunction) {
 	try {
 		const result = await testFunction();
@@ -31,16 +33,25 @@ test(
 	'sourcemaps',
 	() => {
 		const { stack } = new Error();
-		let { pathname } = new URL(import.meta.url);
-		if (process.platform === 'win32') {
-			pathname = pathname.slice(1);
+		const errorPosition = ':35:';
+		const isWindows = process.platform === 'win32';
+		let pathname = fileURLToPath(import.meta.url);
+		if (isWindows) {
+			// Remove drive letter
+			pathname = pathname.slice(2);
 		}
-		let pathIndex = stack.indexOf(pathname + ':33:');
-		if (pathIndex === -1) {
-			pathIndex = stack.indexOf(pathname.toLowerCase() + ':33:');
+
+		let pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
+		if (
+			pathIndex === -1
+			&& isWindows
+		) {
+			// Convert backslash to slash
+			pathname = pathname.replace(/\\/g, '/');
+			pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
 		}
-		const previousCharacter = stack[pathIndex - 1];
-		return pathIndex > -1 && previousCharacter !== ':';
+
+		return pathIndex > -1;
 	},
 );
 

tests/fixtures/package-module/lib/ts-ext-cts/index.cts

@@ -1,3 +1,5 @@
+const { fileURLToPath } = require('node:url');
+
 async function test(description: string, testFunction: () => any | Promise<any>) {
 	try {
 		const result = await testFunction();
@@ -31,9 +33,25 @@ test(
 	'sourcemaps',
 	() => {
 		const stack = (new Error()).stack!;
-		const pathIndex = stack.indexOf(`${__filename}:33:`);
-		const previousCharacter = stack[pathIndex - 1];
-		return pathIndex > -1 && previousCharacter !== ':';
+		const errorPosition = ':35:';
+		const isWindows = process.platform === 'win32';
+		let pathname = fileURLToPath(import.meta.url);
+		if (isWindows) {
+			// Remove drive letter
+			pathname = pathname.slice(2);
+		}
+
+		let pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
+		if (
+			pathIndex === -1
+			&& isWindows
+		) {
+			// Convert backslash to slash
+			pathname = pathname.replace(/\\/g, '/');
+			pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
+		}
+
+		return pathIndex > -1;
 	},
 );
 

tests/fixtures/package-module/lib/ts-ext-jsx/index.jsx

@@ -33,19 +33,25 @@ test(
 	'sourcemaps',
 	() => {
 		const { stack } = new Error();
-		let { pathname } = new URL(import.meta.url);
-		if (process.platform === 'win32') {
-			pathname = pathname.slice(1);
+		const errorPosition = ':35:';
+		const isWindows = process.platform === 'win32';
+		let pathname = fileURLToPath(import.meta.url);
+		if (isWindows) {
+			// Remove drive letter
+			pathname = pathname.slice(2);
 		}
-		let pathIndex = stack.indexOf(`${pathname}:35:`);
-		if (pathIndex === -1) {
-			pathIndex = stack.indexOf(`${pathname.toLowerCase()}:35:`);
-		}
-		if (pathIndex === -1) {
-			pathIndex = stack.indexOf(`${fileURLToPath(import.meta.url).toLowerCase()}:35:`);
+
+		let pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
+		if (
+			pathIndex === -1
+			&& isWindows
+		) {
+			// Convert backslash to slash
+			pathname = pathname.replace(/\\/g, '/');
+			pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
 		}
-		const previousCharacter = stack[pathIndex - 1];
-		return pathIndex > -1 && previousCharacter !== ':';
+
+		return pathIndex > -1;
 	},
 );
 

tests/fixtures/package-module/lib/ts-ext-mts/index.mts

@@ -33,19 +33,25 @@ test(
 	'sourcemaps',
 	() => {
 		const stack = (new Error()).stack!;
-		let { pathname } = new URL(import.meta.url);
-		if (process.platform === 'win32') {
-			pathname = pathname.slice(1);
+		const errorPosition = ':35:';
+		const isWindows = process.platform === 'win32';
+		let pathname = fileURLToPath(import.meta.url);
+		if (isWindows) {
+			// Remove drive letter
+			pathname = pathname.slice(2);
 		}
-		let pathIndex = stack.indexOf(`${pathname}:35:`);
-		if (pathIndex === -1) {
-			pathIndex = stack.indexOf(`${pathname.toLowerCase()}:35:`);
-		}
-		if (pathIndex === -1) {
-			pathIndex = stack.indexOf(`${fileURLToPath(import.meta.url).toLowerCase()}:35:`);
+
+		let pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
+		if (
+			pathIndex === -1
+			&& isWindows
+		) {
+			// Convert backslash to slash
+			pathname = pathname.replace(/\\/g, '/');
+			pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
 		}
-		const previousCharacter = stack[pathIndex - 1];
-		return pathIndex > -1 && previousCharacter !== ':';
+
+		return pathIndex > -1;
 	},
 );
 

tests/fixtures/package-module/lib/ts-ext-ts/index.ts

@@ -33,19 +33,25 @@ test(
 	'sourcemaps',
 	() => {
 		const stack = (new Error()).stack!;
-		let { pathname } = new URL(import.meta.url);
-		if (process.platform === 'win32') {
-			pathname = pathname.slice(1);
+		const errorPosition = ':35:';
+		const isWindows = process.platform === 'win32';
+		let pathname = fileURLToPath(import.meta.url);
+		if (isWindows) {
+			// Remove drive letter
+			pathname = pathname.slice(2);
 		}
-		let pathIndex = stack.indexOf(`${pathname}:35:`);
-		if (pathIndex === -1) {
-			pathIndex = stack.indexOf(`${pathname.toLowerCase()}:35:`);
-		}
-		if (pathIndex === -1) {
-			pathIndex = stack.indexOf(`${fileURLToPath(import.meta.url).toLowerCase()}:35:`);
+
+		let pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
+		if (
+			pathIndex === -1
+			&& isWindows
+		) {
+			// Convert backslash to slash
+			pathname = pathname.replace(/\\/g, '/');
+			pathIndex = stack.indexOf(`${pathname}${errorPosition}`);
 		}
-		const previousCharacter = stack[pathIndex - 1];
-		return pathIndex > -1 && previousCharacter !== ':';
+
+		return pathIndex > -1;
 	},
 );