fixup: apply code review changes

nodejs · Mar 2, 2022 · d6e8326 · d6e8326
1 parent e0da1a3
commit d6e8326
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -1015,10 +1015,10 @@ function wrapSafe(filename, content, cjsModuleInstance) {
       filename,
       lineOffset: 0,
       displayErrors: true,
-      importModuleDynamically: (specifier, _, importAssertions) => {
+      importModuleDynamically: async (specifier, _, importAssertions) => {
         const loader = asyncESM.esmLoader;
         return loader.import(specifier,
-                             loader.baseURL(normalizeReferrerURL(filename)),
+                             loader.getBaseURL(normalizeReferrerURL(filename)),
                              importAssertions);
       },
     });
@@ -1035,7 +1035,7 @@ function wrapSafe(filename, content, cjsModuleInstance) {
       importModuleDynamically(specifier, _, importAssertions) {
         const loader = asyncESM.esmLoader;
         return loader.import(specifier,
-                             loader.baseURL(normalizeReferrerURL(filename)),
+                             loader.getBaseURL(normalizeReferrerURL(filename)),
                              importAssertions);
       },
     });

diff --git a/lib/internal/modules/esm/initialize_import_meta.js b/lib/internal/modules/esm/initialize_import_meta.js
@@ -33,7 +33,7 @@ function initializeImportMeta(meta, context) {
     meta.resolve = createImportMetaResolve(url);
   }
 
-  url = asyncESM.esmLoader.baseURL(url);
+  url = asyncESM.esmLoader.getBaseURL(url);
 
   meta.url = url;
 }

diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
@@ -215,7 +215,7 @@ class ESMLoader {
       callbackMap.set(module, {
         importModuleDynamically: (specifier, { url }, importAssertions) => {
           return this.import(specifier,
-                             this.baseURL(url),
+                             this.getBaseURL(url),
                              importAssertions);
         }
       });
@@ -252,7 +252,7 @@ class ESMLoader {
    * @param {string} url
    * @returns {string}
    */
-  baseURL(url) {
+  getBaseURL(url) {
     if (
       StringPrototypeStartsWith(url, 'http:') ||
       StringPrototypeStartsWith(url, 'https:')

diff --git a/lib/internal/modules/esm/module_job.js b/lib/internal/modules/esm/module_job.js
@@ -76,7 +76,7 @@ class ModuleJob {
       // these `link` callbacks depending on each other.
       const dependencyJobs = [];
       const promises = this.module.link(async (specifier, assertions) => {
-        const baseURL = this.loader.baseURL(url);
+        const baseURL = this.loader.getBaseURL(url);
         const jobPromise = this.loader.getModuleJob(specifier, baseURL, assertions);
         ArrayPrototypePush(dependencyJobs, jobPromise);
         const job = await jobPromise;

diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
@@ -104,7 +104,7 @@ function errPath(url) {
 
 async function importModuleDynamically(specifier, { url }, assertions) {
   return asyncESM.esmLoader.import(specifier,
-                                   asyncESM.esmLoader.baseURL(url),
+                                   asyncESM.esmLoader.getBaseURL(url),
                                    assertions);
 }