summaryrefslogtreecommitdiff
path: root/test/parallel/test-vm-module-link.js
diff options
context:
space:
mode:
Diffstat (limited to 'test/parallel/test-vm-module-link.js')
-rw-r--r--test/parallel/test-vm-module-link.js35
1 files changed, 16 insertions, 19 deletions
diff --git a/test/parallel/test-vm-module-link.js b/test/parallel/test-vm-module-link.js
index 20518c4054..9678d13737 100644
--- a/test/parallel/test-vm-module-link.js
+++ b/test/parallel/test-vm-module-link.js
@@ -23,8 +23,6 @@ async function simple() {
return foo;
}));
- bar.instantiate();
-
assert.strictEqual((await bar.evaluate()).result, 5);
}
@@ -49,7 +47,6 @@ async function depth() {
const baz = await getProxy('bar', bar);
const barz = await getProxy('baz', baz);
- barz.instantiate();
await barz.evaluate();
assert.strictEqual(barz.namespace.default, 5);
@@ -67,20 +64,19 @@ async function circular() {
return foo;
}
`);
- await foo.link(common.mustCall(async (fooSpecifier, fooModule) => {
- assert.strictEqual(fooModule, foo);
- assert.strictEqual(fooSpecifier, 'bar');
- await bar.link(common.mustCall((barSpecifier, barModule) => {
- assert.strictEqual(barModule, bar);
- assert.strictEqual(barSpecifier, 'foo');
- assert.strictEqual(foo.linkingStatus, 'linking');
- return foo;
- }));
- assert.strictEqual(bar.linkingStatus, 'linked');
- return bar;
- }));
+ await foo.link(common.mustCall(async (specifier, module) => {
+ if (specifier === 'bar') {
+ assert.strictEqual(module, foo);
+ return bar;
+ }
+ assert.strictEqual(specifier, 'foo');
+ assert.strictEqual(module, bar);
+ assert.strictEqual(foo.status, 'linking');
+ return foo;
+ }, 2));
+
+ assert.strictEqual(bar.status, 'linked');
- foo.instantiate();
await foo.evaluate();
assert.strictEqual(foo.namespace.default, 42);
}
@@ -109,19 +105,20 @@ async function circular2() {
`
};
const moduleMap = new Map();
- const rootModule = new SourceTextModule(sourceMap.root, { url: 'vm:root' });
+ const rootModule = new SourceTextModule(sourceMap.root, {
+ identifier: 'vm:root',
+ });
async function link(specifier, referencingModule) {
if (moduleMap.has(specifier)) {
return moduleMap.get(specifier);
}
const mod = new SourceTextModule(sourceMap[specifier], {
- url: new URL(specifier, 'file:///').href,
+ identifier: new URL(specifier, 'file:///').href,
});
moduleMap.set(specifier, mod);
return mod;
}
await rootModule.link(link);
- rootModule.instantiate();
await rootModule.evaluate();
}