Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/internal/vm/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const {
PromiseReject,
PromiseResolve,
SafePromiseAllReturnArrayLike,
SafeSet,
Symbol,
SymbolToStringTag,
TypeError,
Expand Down Expand Up @@ -332,7 +333,10 @@ class SourceTextModule extends Module {
}));
}

async [kLink](linker) {
async [kLink](linker, linkedModules = new SafeSet()) {
if (linkedModules.has(this)) {
return;
}
this.#statusOverride = 'linking';

// Iterates the module requests and links with the linker.
Expand All @@ -358,7 +362,7 @@ class SourceTextModule extends Module {
throw new ERR_VM_MODULE_LINK_FAILURE(`request for '${specifier}' resolved to an errored module`, module.error);
}
if (module.status === 'unlinked') {
await module[kLink](linker);
await module[kLink](linker, linkedModules);
}
return module[kWrap];
});
Expand All @@ -368,6 +372,7 @@ class SourceTextModule extends Module {
try {
const modules = await SafePromiseAllReturnArrayLike(modulePromises);
this[kWrap].link(modules);
linkedModules.add(this);
} catch (e) {
this.#error = e;
throw e;
Expand Down
77 changes: 77 additions & 0 deletions test/parallel/test-vm-module-link-linked-deps.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
// Flags: --experimental-vm-modules

'use strict';

const common = require('../common');
const vm = require('vm');
const assert = require('assert');

// This test verifies that `module.link(linker)` does not link a dependency
// again when it has already finished linking before another module
// requests it.

// Regression of https://github.com/nodejs/node/issues/66938

const sources = {
'./index.js': `
import foo from "./foo.js";
import shared from "./shared.js";
export default { foo, shared };
`,
'./foo.js': `
import shared from "./shared.js";
export default "foo";
`,
'./shared.js': `
import leaf from "./leaf.js";
export default leaf;
`,
'./leaf.js': `
export default "leaf";
`,
};

const moduleCache = new Map();

function getModuleInstance(identifier) {
let module = moduleCache.get(identifier);

if (!module) {
module = new vm.SourceTextModule(sources[identifier], {
identifier,
});
moduleCache.set(identifier, module);
}

return module;
}

async function test() {
const module = getModuleInstance('./index.js');
const requests = [];

await module.link(async (specifier, referrer) => {
requests.push([specifier, referrer.identifier]);
// Delay `./foo.js` so that `./shared.js` finishes linking before
// `./foo.js` requests it.
if (specifier === './foo.js') {
await new Promise((resolve) => setImmediate(resolve));
}
return getModuleInstance(specifier);
});

await module.evaluate();
assert.strictEqual(module.namespace.default.foo, 'foo');
assert.strictEqual(module.namespace.default.shared, 'leaf');

// Assert that `./shared.js` is not linked again for `./foo.js`.
assert.deepStrictEqual(requests, [
// [specifier, referrer]
['./foo.js', './index.js'],
['./shared.js', './index.js'],
['./leaf.js', './shared.js'],
['./shared.js', './foo.js'],
]);
}

test().then(common.mustCall());
Loading