refactor(cjs): move implicitResolver outside of closure

Author: privatenumber

src/cjs/api/module-resolve-filename.ts

@@ -148,19 +148,7 @@ const resolveRequest = (
 export const createResolveFilename = (
 	nextResolve: ResolveFilename,
 	namespace?: string,
-): ResolveFilename => (
-	request,
-	parent,
-	isMain,
-	options,
-) => {
-	let resolve: SimpleResolve = request_ => nextResolve(
-		request_,
-		parent,
-		isMain,
-		options,
-	);
-
+): ResolveFilename => {
 	if (namespace) {
 		/**
 		 * When namespaced, the loaders are registered to the extensions in a hidden way
@@ -169,41 +157,55 @@ export const createResolveFilename = (
 		 * To support implicit extensions, we need to wrap the resolver with our own
 		 * re-implementation of the implicit extension resolution
 		 */
-		resolve = createImplicitResolver(resolve);
+		nextResolve = createImplicitResolver(nextResolve);
 	}
 
-	request = interopCjsExports(request);
-
-	// Strip query string
-	const requestAndQuery = request.split('?');
-	const searchParams = new URLSearchParams(requestAndQuery[1]);
-
-	// Inherit parent namespace if it exists
-	if (parent?.filename) {
-		const parentQuery = new URLSearchParams(parent.filename.split('?')[1]);
-		const parentNamespace = parentQuery.get('namespace');
-		if (parentNamespace) {
-			searchParams.append('namespace', parentNamespace);
+	return (
+		request,
+		parent,
+		isMain,
+		options,
+	) => {
+		const resolve: SimpleResolve = request_ => nextResolve(
+			request_,
+			parent,
+			isMain,
+			options,
+		);
+
+		request = interopCjsExports(request);
+
+		// Strip query string
+		const requestAndQuery = request.split('?');
+		const searchParams = new URLSearchParams(requestAndQuery[1]);
+
+		// Inherit parent namespace if it exists
+		if (parent?.filename) {
+			const parentQuery = new URLSearchParams(parent.filename.split('?')[1]);
+			const parentNamespace = parentQuery.get('namespace');
+			if (parentNamespace) {
+				searchParams.append('namespace', parentNamespace);
+			}
 		}
-	}
 
-	// If request namespace doesnt match the namespace, ignore
-	if ((searchParams.get('namespace') ?? undefined) !== namespace) {
-		return resolve(request);
-	}
+		// If request namespace doesnt match the namespace, ignore
+		if ((searchParams.get('namespace') ?? undefined) !== namespace) {
+			return resolve(request);
+		}
 
-	let resolved = resolveRequest(requestAndQuery[0], parent, resolve);
+		let resolved = resolveRequest(requestAndQuery[0], parent, resolve);
 
-	// Only add query back if it's a file path (not a core Node module)
-	if (
-		path.isAbsolute(resolved)
+		// Only add query back if it's a file path (not a core Node module)
+		if (
+			path.isAbsolute(resolved)
 
-		// These two have native loaders which don't support queries
-		&& !resolved.endsWith('.json')
-		&& !resolved.endsWith('.node')
-	) {
-		resolved += urlSearchParamsStringify(searchParams);
-	}
+			// These two have native loaders which don't support queries
+			&& !resolved.endsWith('.json')
+			&& !resolved.endsWith('.node')
+		) {
+			resolved += urlSearchParamsStringify(searchParams);
+		}
 
-	return resolved;
+		return resolved;
+	};
 };

src/cjs/api/resolve-implicit-extensions.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import type { NodeError } from '../../types.js';
-import type { SimpleResolve } from './types.js';
+import type { ResolveFilename } from './types.js';
 
 export const implicitlyResolvableExtensions = [
 	'.ts',
@@ -9,31 +9,35 @@ export const implicitlyResolvableExtensions = [
 ] as const;
 
 const tryExtensions = (
-	resolve: SimpleResolve,
-	request: string,
+	resolve: ResolveFilename,
+	...args: Parameters<ResolveFilename>
 ) => {
 	for (const extension of implicitlyResolvableExtensions) {
 		try {
-			return resolve(request + extension);
+			args[0] += extension;
+			return resolve(...args);
 		} catch {}
 	}
 };
 
 export const createImplicitResolver = (
-	resolve: SimpleResolve,
-): SimpleResolve => (request) => {
+	resolve: ResolveFilename,
+): ResolveFilename => (
+	request,
+	...args
+) => {
 	try {
-		return resolve(request);
+		return resolve(request, ...args);
 	} catch (_error) {
 		const nodeError = _error as NodeError;
 		if (
 			nodeError.code === 'MODULE_NOT_FOUND'
 		) {
 			const resolved = (
-				tryExtensions(resolve, request)
+				tryExtensions(resolve, request, ...args)
 
 				// Default resolve handles resovling paths relative to the parent
-				|| tryExtensions(resolve, `${request}${path.sep}index`)
+				|| tryExtensions(resolve, `${request}${path.sep}index`, ...args)
 			);
 			if (resolved) {
 				return resolved;

tests/specs/api.ts

@@ -111,7 +111,7 @@ export default testSuite(({ describe }, node: NodeApis) => {
 
 			describe('tsx.require()', ({ test }) => {
 				test('loads', async () => {
-					const fixture = await createFixture({
+					await using fixture = await createFixture({
 						'require.cjs': `
 						const path = require('node:path');
 						const tsx = require(${JSON.stringify(tsxCjsApiPath)});
@@ -137,7 +137,6 @@ export default testSuite(({ describe }, node: NodeApis) => {
 						`,
 						...tsFiles,
 					});
-					console.log(fixture.path);
 
 					const { stdout } = await execaNode(fixture.getPath('require.cjs'), [], {
 						nodePath: node.path,