esm: sincify defaultLoad

marco-ippolito · marco-ippolito · commit e0d702b89585 · 2025-03-17T15:24:08.000+01:00
diff --git a/lib/internal/modules/esm/load.js b/lib/internal/modules/esm/load.js
@@ -24,30 +24,6 @@ const {
   dataURLProcessor,
 } = require('internal/data_url');
 
-/**
- * @param {URL} url URL to the module
- * @param {ESModuleContext} context used to decorate error messages
- * @returns {Promise<{ responseURL: string, source: string | BufferView }>}
- */
-async function getSource(url, context) {
-  const { protocol, href } = url;
-  const responseURL = href;
-  let source;
-  if (protocol === 'file:') {
-    const { readFile: readFileAsync } = require('internal/fs/promises').exports;
-    source = await readFileAsync(url);
-  } else if (protocol === 'data:') {
-    const result = dataURLProcessor(url);
-    if (result === 'failure') {
-      throw new ERR_INVALID_URL(responseURL, null);
-    }
-    source = BufferFrom(result.body);
-  } else {
-    const supportedSchemes = ['file', 'data'];
-    throw new ERR_UNSUPPORTED_ESM_URL_SCHEME(url, supportedSchemes);
-  }
-  return { __proto__: null, responseURL, source };
-}
 
 /**
  * @param {URL} url URL to the module
@@ -80,7 +56,7 @@ function getSourceSync(url, context) {
  * @param {LoadContext} context
  * @returns {LoadReturn}
  */
-async function defaultLoad(url, context = kEmptyObject) {
+function defaultLoad(url, context = kEmptyObject) {
   let responseURL = url;
   let {
     importAttributes,
@@ -110,13 +86,13 @@ async function defaultLoad(url, context = kEmptyObject) {
     source = null;
   } else if (format !== 'commonjs') {
     if (source == null) {
-      ({ responseURL, source } = await getSource(urlInstance, context));
+      ({ responseURL, source } = getSourceSync(urlInstance, context));
       context = { __proto__: context, source };
     }
 
     if (format == null) {
       // Now that we have the source for the module, run `defaultGetFormat` to detect its format.
-      format = await defaultGetFormat(urlInstance, context);
+      format = defaultGetFormat(urlInstance, context);
 
       if (format === 'commonjs') {
         // For backward compatibility reasons, we need to discard the source in
diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
@@ -804,9 +804,9 @@ class ModuleLoader {
    * if any.
    * @param {string} url The URL of the module to be loaded.
    * @param {object} context Metadata about the module
-   * @returns {Promise<{ format: ModuleFormat, source: ModuleSource }>}
+   * @returns {{ format: ModuleFormat, source: ModuleSource }}
    */
-  async load(url, context) {
+  load(url, context) {
     if (loadHooks.length) {
       // Has module.registerHooks() hooks, use the synchronous variant that can handle both hooks.
       return this.#loadSync(url, context);
diff --git a/lib/internal/modules/esm/module_job.js b/lib/internal/modules/esm/module_job.js
@@ -238,7 +238,7 @@ class ModuleJob extends ModuleJobBase {
           // in the import attributes and some formats require them; but we only
           // care about CommonJS for the purposes of this error message.
           ({ format } =
-            await this.#loader.load(childFileURL));
+            this.#loader.load(childFileURL));
         } catch {
           // Continue regardless of error.
         }
diff --git a/lib/internal/modules/esm/resolve.js b/lib/internal/modules/esm/resolve.js
@@ -965,7 +965,7 @@ function defaultResolve(specifier, context = {}) {
   if (protocol === 'node:') { return { __proto__: null, url: specifier }; }
 
 
-  const isMain = parentURL === undefined;
+  const isMain = parentURL === undefined || StringPrototypeStartsWith(parentURL, 'node:internal/');
   if (isMain) {
     parentURL = getCWDURL().href;
 

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ class ModuleJob extends ModuleJobBase {`
`238`	`238`	`// in the import attributes and some formats require them; but we only`
`239`	`239`	`// care about CommonJS for the purposes of this error message.`
`240`	`240`	`({ format } =`
`241`		`- await this.#loader.load(childFileURL));`
	`241`	`+ this.#loader.load(childFileURL));`
`242`	`242`	`} catch {`
`243`	`243`	`// Continue regardless of error.`
`244`	`244`	`}`