wip

Author: privatenumber

src/loaders.ts

@@ -22,8 +22,8 @@ import {
 	type NodeError,
 } from './utils.js';
 
-const isJsonPattern = /\.json($|\?)/;
-const isDirectoryPattern = /\/($|\?)/; // Not sure if queries are allowed in directories
+const isJsonPattern = /\.json(?:$|\?)/;
+const isDirectoryPattern = /\/(?:$|\?)/;
 
 type NextResolve = (
 	specifier: string,
@@ -109,7 +109,7 @@ async function tryDirectory(
 	context: ResolveHookContext,
 	defaultResolve: NextResolve,
 ) {
-	const isExplicitDirectory = isDirectoryPattern.test(specifier);//.endsWith('/');
+	const isExplicitDirectory = isDirectoryPattern.test(specifier);
 	const appendIndex = isExplicitDirectory ? 'index' : '/index';
 	const [specifierWithoutQuery, query] = specifier.split('?');
 

tests/specs/json.ts

@@ -31,7 +31,7 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 			});
 
 			test('Import with query', async () => {
-				const nodeProcess = await node.importFile(fixture.path, './index.json' + query);
+				const nodeProcess = await node.importFile(fixture.path, `./index.json${query}`);
 				expect(nodeProcess.stdout).toMatch('default: { loaded: \'json\' }');
 			});
 		});
@@ -49,13 +49,13 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 			});
 
 			test('Import with query', async () => {
-				const nodeProcess = await node.importFile(fixture.path, './index' + query);
+				const nodeProcess = await node.importFile(fixture.path, `./index${query}`);
 				expect(nodeProcess.stdout).toMatch('default: { loaded: \'json\' }');
 			});
 		});
 
 		describe('directory', ({ test }) => {
-			test('Load', async ({ onTestFail }) => {
+			test('Load', async () => {
 				const nodeProcess = await node.loadFile(fixture.path, '.');
 				expect(nodeProcess.exitCode).toBe(0);
 				expect(nodeProcess.stdout).toBe('');
@@ -66,8 +66,8 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 				expect(nodeProcess.stdout).toMatch('default: { loaded: \'json\' }');
 			});
 
-			test('Import with query', async ({ onTestFail }) => {
-				const nodeProcess = await node.importFile(fixture.path, './' + query);
+			test('Import with query', async () => {
+				const nodeProcess = await node.importFile(fixture.path, `./${query}`);
 				expect(nodeProcess.stdout).toMatch('default: { loaded: \'json\' }');
 			});
 		});

tests/specs/typescript/mts.ts

@@ -29,7 +29,7 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 				assertResults(nodeProcess.stdout);
 			});
 
-			test('Import', async ({ onTestFail }) => {
+			test('Import', async () => {
 				const nodeProcess = await node.import(importPath + query);
 				assertResults(nodeProcess.stdout);
 				expect(nodeProcess.stdout).toMatch('{"default":1234}');

tests/specs/typescript/ts.ts

@@ -59,6 +59,12 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 				assertResults(nodeProcess.stdout);
 				expect(nodeProcess.stdout).toMatch('{"default":1234}');
 			});
+
+			test('Import with query', async () => {
+				const nodeProcess = await node.import(importPath + query, { typescript: true });
+				assertResults(nodeProcess.stdout);
+				expect(nodeProcess.stdout).toMatch('{"default":1234}');
+			});
 		});
 
 		describe('extensionless', ({ test }) => {
@@ -74,6 +80,12 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 				assertResults(nodeProcess.stdout);
 				expect(nodeProcess.stdout).toMatch('{"default":1234}');
 			});
+
+			test('Import with query', async () => {
+				const nodeProcess = await node.import(importPath + query, { typescript: true });
+				assertResults(nodeProcess.stdout);
+				expect(nodeProcess.stdout).toMatch('{"default":1234}');
+			});
 		});
 
 		describe('extensionless with subextension', ({ test }) => {
@@ -89,6 +101,12 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 				assertResults(nodeProcess.stdout, 'ts-ext-ts/index.tsx.ts');
 				expect(nodeProcess.stdout).toMatch('{"default":1234}');
 			});
+
+			test('Import with query', async () => {
+				const nodeProcess = await node.import(importPath + query);
+				assertResults(nodeProcess.stdout, 'ts-ext-ts/index.tsx.ts');
+				expect(nodeProcess.stdout).toMatch('{"default":1234}');
+			});
 		});
 
 		describe('directory', ({ test }) => {
@@ -104,6 +122,12 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 				assertResults(nodeProcess.stdout);
 				expect(nodeProcess.stdout).toMatch('{"default":1234}');
 			});
+
+			test('Import with query', async () => {
+				const nodeProcess = await node.import(importPath + query);
+				assertResults(nodeProcess.stdout);
+				expect(nodeProcess.stdout).toMatch('{"default":1234}');
+			});
 		});
 
 		describe('empty directory should fallback to file', ({ test }) => {
@@ -119,6 +143,12 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 				assertResults(nodeProcess.stdout);
 				expect(nodeProcess.stdout).toMatch('{"default":1234}');
 			});
+
+			test('Import with query', async () => {
+				const nodeProcess = await node.import(importPath + query);
+				assertResults(nodeProcess.stdout);
+				expect(nodeProcess.stdout).toMatch('{"default":1234}');
+			});
 		});
 
 		describe('empty but explicit directory should not fallback to file', ({ test }) => {
@@ -128,6 +158,11 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
 				const nodeProcess = await node.import(importPath);
 				assertNotFound(nodeProcess.stderr, importPath);
 			});
+
+			test('Import with query', async () => {
+				const nodeProcess = await node.import(importPath + query);
+				assertNotFound(nodeProcess.stderr, importPath);
+			});
 		});
 	});
 });