esm: tidy tests

Author: JakobJingleheimer

test/fixtures/es-module-loaders/assertionless-json-import.mjs

@@ -4,14 +4,14 @@ const JSON_URL_PATTERN = /\.json(\?[^#]*)?(#.*)?$/;
 export function resolve(url, context, next) {
   // Mutation from resolve hook should be discarded.
   context.importAssertions.type = 'whatever';
-  return next(url, context);
+  return next(url);
 }
 
 export function load(url, context, next) {
-  if (context.importAssertions.type == null && 
+  if (context.importAssertions.type == null &&
       (DATA_URL_PATTERN.test(url) || JSON_URL_PATTERN.test(url))) {
     const { importAssertions } = context;
     importAssertions.type = 'json';
   }
-  return next(url, context);
+  return next(url);
 }

test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs

@@ -35,7 +35,7 @@ export function load(url, context, next) {
       format: 'module',
     };
   }
-  return next(url, context);
+  return next(url);
 }
 
 function generateBuiltinModule(builtinName) {

test/fixtures/es-module-loaders/example-loader.mjs

@@ -8,7 +8,7 @@ const JS_EXTENSIONS = new Set(['.js', '.mjs']);
 const baseURL = new URL('file://');
 baseURL.pathname = process.cwd() + '/';
 
-export function resolve(specifier, { parentURL = baseURL }, defaultResolve) {
+export function resolve(specifier, { parentURL = baseURL }, next) {
   if (builtinModules.includes(specifier)) {
     return {
       shortCircuit: true,
@@ -17,7 +17,7 @@ export function resolve(specifier, { parentURL = baseURL }, defaultResolve) {
   }
   if (/^\.{1,2}[/]/.test(specifier) !== true && !specifier.startsWith('file:')) {
     // For node_modules support:
-    // return defaultResolve(specifier, {parentURL}, defaultResolve);
+    // return next(specifier);
     throw new Error(
       `imports must be URLs or begin with './', or '../'; '${specifier}' does not`);
   }

test/fixtures/es-module-loaders/hook-resolve-type.mjs

@@ -3,7 +3,7 @@ let importedCJS = 0;
 global.getModuleTypeStats = () => { return {importedESM, importedCJS} };
 
 export async function load(url, context, next) {
-  return next(url, context, next);
+  return next(url);
 }
 
 export async function resolve(specifier, context, next) {

test/fixtures/es-module-loaders/hooks-custom.mjs

@@ -56,10 +56,10 @@ export function load(url, context, next) {
     source: `export const message = 'Woohoo!'.toUpperCase();`,
   };
 
-  return next(url, context, next);
+  return next(url);
 }
 
-export function resolve(specifier, context, next) {
+export function resolve(specifier, { importAssertions }, next) {
   let format = '';
 
   if (specifier === 'esmHook/format.false') format = false;
@@ -70,8 +70,8 @@ export function resolve(specifier, context, next) {
     format,
     shortCircuit: true,
     url: pathToFileURL(specifier).href,
-    importAssertions: context.importAssertions,
+    importAssertions,
   };
 
-  return next(specifier, context, next);
+  return next(specifier);
 }

test/fixtures/es-module-loaders/hooks-obsolete.mjs

@@ -4,19 +4,19 @@ export function getSource() {}
 export function transformSource() {}
 
 
-export function load(url, context, next) {
-	if (url === 'whatever') return {
-		format: 'module',
-		source: '',
+export function resolve(specifier, context, next) {
+	if (specifier === 'whatever') return {
+		url: specifier,
 	};
 
-	return next(url, context, next);
+	return next(specifier);
 }
 
-export function resolve(specifier, context, next) {
-	if (specifier === 'whatever') return {
-		url: specifier,
+export function load(url, context, next) {
+	if (url === 'whatever') return {
+		format: 'module',
+		source: '',
 	};
 
-	return next(specifier, context, next);
+	return next(url);
 }

test/fixtures/es-module-loaders/http-loader.mjs

@@ -15,7 +15,7 @@ export function resolve(specifier, context, nextResolve) {
     };
   }
 
-  return nextResolve(specifier, context);
+  return nextResolve(specifier);
 }
 
 export function load(url, context, nextLoad) {
@@ -36,5 +36,5 @@ export function load(url, context, nextLoad) {
     });
   }
 
-  return nextLoad(url, context);
+  return nextLoad(url);
 }

test/fixtures/es-module-loaders/loader-get-format.mjs

@@ -1,11 +1,11 @@
-export async function resolve(specifier, { parentURL, importAssertions }, defaultResolve) {
+export async function resolve(specifier, { parentURL, importAssertions }, next) {
   if (parentURL && specifier === '../fixtures/es-modules/test-esm-ok.mjs') {
     return {
       shortCircuit: true,
       url: 'file:///asdf',
     };
   }
-  return defaultResolve(specifier, {parentURL, importAssertions}, defaultResolve);
+  return next(specifier);
 }
 
 export async function load(url, context, next) {
@@ -16,5 +16,5 @@ export async function load(url, context, next) {
       source: '',
     }
   }
-  return next(url, context, next);
+  return next(url);
 }

test/fixtures/es-module-loaders/loader-invalid-format.mjs

@@ -1,10 +1,10 @@
-export async function resolve(specifier, { parentURL, importAssertions }, defaultResolve) {
+export async function resolve(specifier, { parentURL, importAssertions }, next) {
   if (parentURL && specifier === '../fixtures/es-modules/test-esm-ok.mjs') {
     return {
       shortCircuit: true,
       url: specifier,
       importAssertions,
     };
   }
-  return defaultResolve(specifier, {parentURL, importAssertions}, defaultResolve);
+  return next(specifier);
 }