fixup! esm: add experimental support for addon modules

Author: legendecas

lib/internal/modules/esm/translators.js

@@ -245,13 +245,14 @@ function createCJSNoSourceModuleWrap(url, isMain) {
 
   // Addon export names are not known until the addon is loaded.
   const exportNames = ['default', 'module.exports'];
-  return new ModuleWrap(url, undefined, exportNames, function() {
+  return new ModuleWrap(url, undefined, exportNames, function evaluationCallback() {
     debug(`Loading CJSModule ${url}`);
 
     if (!module.loaded) {
       wrapModuleLoad(filename, null, isMain);
     }
 
+    /** @type {import('./loader').ModuleExports} */
     let exports;
     if (module[kModuleExport] !== undefined) {
       exports = module[kModuleExport];
@@ -323,18 +324,18 @@ translators.set('commonjs', function commonjsStrategy(url, source, isMain) {
  */
 function cjsEmplaceModuleCacheEntry(filename, exportNames) {
   // TODO: Do we want to keep hitting the user mutable CJS loader here?
-  let module = CJSModule._cache[filename];
-  if (module) {
-    return module;
+  let cjsMod = CJSModule._cache[filename];
+  if (cjsMod) {
+    return cjsMod;
   }
 
-  module = new CJSModule(filename);
-  module.filename = filename;
-  module.paths = CJSModule._nodeModulePaths(module.path);
-  module[kIsCachedByESMLoader] = true;
-  CJSModule._cache[filename] = module;
+  cjsMod = new CJSModule(filename);
+  cjsMod.filename = filename;
+  cjsMod.paths = CJSModule._nodeModulePaths(cjsMod.path);
+  cjsMod[kIsCachedByESMLoader] = true;
+  CJSModule._cache[filename] = cjsMod;
 
-  return module;
+  return cjsMod;
 }
 
 /**
@@ -510,7 +511,7 @@ translators.set('wasm', async function(url, source) {
 });
 
 // Strategy for loading a addon
-translators.set('addon', function(url, source, isMain) {
+translators.set('addon', function translateAddon(url, source, isMain) {
   emitExperimentalWarning('Importing addons');
 
   // The addon must be loaded from file system with dlopen. Assert

test/addons/esm-package-dependent/node_modules/esm-package

@@ -0,0 +1,10 @@
+// Flags: --experimental-addon-modules
+'use strict';
+const common = require('../../common');
+const assert = require('node:assert');
+
+import(`esm-package/${common.buildType}`)
+  .then((mod) => {
+    assert.strictEqual(mod.default.hello(), 'world');
+  })
+  .then(common.mustCall());

test/addons/esm-package-dependent/test-import.js

@@ -0,0 +1,10 @@
+// Flags: --experimental-addon-modules
+'use strict';
+const common = require('../../common');
+const assert = require('node:assert');
+
+require(`esm-package/${common.buildType}`)
+  .then((mod) => {
+    assert.strictEqual(mod.hello(), 'world');
+  })
+  .then(common.mustCall());

test/addons/esm-package-dependent/test-require.js

@@ -0,0 +1,11 @@
+{
+  "name": "esm-package",
+  "exports": {
+    "./Debug": {
+      "node-addons": "./build/Debug/binding.node"
+    },
+    "./Release": {
+      "node-addons": "./build/Release/binding.node"
+    }
+  }
+}

test/addons/esm/binding-export-default.cc renamed to test/addons/esm-package/binding-export-default.cc

@@ -1,3 +1,9 @@
+/**
+ * This file is supposed to be loaded by `test-import.js` and `test-require.js`
+ * to verify that `import('*.node')` is working properly either been loaded with
+ * the ESM loader or the CJS loader.
+ */
+
 // eslint-disable-next-line node-core/require-common-first
 import { buildType } from '../../common/index.mjs';
 import assert from 'node:assert';
@@ -9,6 +15,7 @@ export async function run() {
   // binding.node
   {
     const bindingPath = require.resolve(`./build/${buildType}/binding.node`);
+    // Test with order of import+require
     const { default: binding, 'module.exports': exports } = await import(bindingPath);
     assert.strictEqual(binding, exports);
     assert.strictEqual(binding.hello(), 'world');
@@ -28,14 +35,14 @@ export async function run() {
   // binding-export-default.node
   {
     const bindingPath = require.resolve(`./build/${buildType}/binding-export-default.node`);
+    // Test with order of require+import
+    const bindingRequire = require(bindingPath);
     const ns = await import(bindingPath);
+    assert.strictEqual(ns.default, bindingRequire);
 
     // As same as ESM-import-CJS, the default export is the value of `module.exports`.
     assert.strictEqual(ns.default, ns['module.exports']);
     assert.strictEqual(ns.default.default(), 'hello world');
-
-    const bindingRequire = require(bindingPath);
-    assert.strictEqual(ns.default, bindingRequire);
   }
 
   // binding-export-primitive.node