-
Notifications
You must be signed in to change notification settings - Fork 29.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
module: allow ESM that failed to be required to be re-imported
When a ESM module cannot be loaded by require due to the presence of TLA, its module status would be stopped at kInstantiated. In this case, when it's imported again, we should allow it to be evaluated asynchronously, as it's also a common pattern for users to retry with dynamic import when require fails. PR-URL: #55502 Backport-PR-URL: #55217 Fixes: #55500 Refs: #52697 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
- Loading branch information
1 parent
6ac3400
commit 28b5b9a
Showing
8 changed files
with
152 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
test/es-module/test-require-module-retry-import-errored.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
// This tests that after failing to require an ESM that contains TLA, | ||
// retrying with import() still works, and produces consistent results. | ||
'use strict'; | ||
const common = require('../common'); | ||
const assert = require('assert'); | ||
|
||
const { exportedReject } = require('../fixtures/es-modules/tla/export-promise.mjs'); | ||
|
||
assert.throws(() => { | ||
require('../fixtures/es-modules/tla/await-export-promise.mjs'); | ||
}, { | ||
code: 'ERR_REQUIRE_ASYNC_MODULE' | ||
}); | ||
|
||
const interval = setInterval(() => {}, 1000); // Keep the test running, because await alone doesn't. | ||
const err = new Error('rejected'); | ||
|
||
const p1 = import('../fixtures/es-modules/tla/await-export-promise.mjs') | ||
.then(common.mustNotCall(), common.mustCall((e) => { | ||
assert.strictEqual(e, err); | ||
})); | ||
|
||
const p2 = import('../fixtures/es-modules/tla/await-export-promise.mjs') | ||
.then(common.mustNotCall(), common.mustCall((e) => { | ||
assert.strictEqual(e, err); | ||
})); | ||
|
||
const p3 = import('../fixtures/es-modules/tla/await-export-promise.mjs') | ||
.then(common.mustNotCall(), common.mustCall((e) => { | ||
assert.strictEqual(e, err); | ||
})); | ||
|
||
exportedReject(err); | ||
|
||
Promise.all([p1, p2, p3]).then(common.mustCall(() => { clearInterval(interval); })); |
32 changes: 32 additions & 0 deletions
32
test/es-module/test-require-module-retry-import-evaluating.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// This tests that after failing to require an ESM that contains TLA, | ||
// retrying with import() still works, and produces consistent results. | ||
'use strict'; | ||
const common = require('../common'); | ||
const assert = require('assert'); | ||
|
||
const { exportedResolve } = require('../fixtures/es-modules/tla/export-promise.mjs'); | ||
|
||
assert.throws(() => { | ||
require('../fixtures/es-modules/tla/await-export-promise.mjs'); | ||
}, { | ||
code: 'ERR_REQUIRE_ASYNC_MODULE' | ||
}); | ||
|
||
const interval = setInterval(() => {}, 1000); // Keep the test running, because await alone doesn't. | ||
const value = { hello: 'world' }; | ||
|
||
const p1 = import('../fixtures/es-modules/tla/await-export-promise.mjs').then(common.mustCall((ns) => { | ||
assert.strictEqual(ns.default, value); | ||
}), common.mustNotCall()); | ||
|
||
const p2 = import('../fixtures/es-modules/tla/await-export-promise.mjs').then(common.mustCall((ns) => { | ||
assert.strictEqual(ns.default, value); | ||
}), common.mustNotCall()); | ||
|
||
const p3 = import('../fixtures/es-modules/tla/await-export-promise.mjs').then(common.mustCall((ns) => { | ||
assert.strictEqual(ns.default, value); | ||
}), common.mustNotCall()); | ||
|
||
exportedResolve(value); | ||
|
||
Promise.all([p1, p2, p3]).then(common.mustCall(() => { clearInterval(interval); })); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// This tests that after loading a ESM with import() and then retrying | ||
// with require(), it errors as expected, and produces consistent results. | ||
'use strict'; | ||
const common = require('../common'); | ||
const assert = require('assert'); | ||
|
||
let ns; | ||
async function test() { | ||
const newNs = await import('../fixtures/es-modules/tla/export-async.mjs'); | ||
if (ns === undefined) { | ||
ns = newNs; | ||
} else { | ||
// Check that re-evalaution is returning the same namespace. | ||
assert.strictEqual(ns, newNs); | ||
} | ||
assert.strictEqual(ns.hello, 'world'); | ||
|
||
assert.throws(() => { | ||
require('../fixtures/es-modules/tla/export-async.mjs'); | ||
}, { | ||
code: 'ERR_REQUIRE_ASYNC_MODULE' | ||
}); | ||
} | ||
|
||
// Run the test twice to check consistency after caching. | ||
test().then(common.mustCall(test)).catch(common.mustNotCall()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
// This tests that after failing to require an ESM that contains TLA, | ||
// retrying with import() still works, and produces consistent results. | ||
'use strict'; | ||
const common = require('../common'); | ||
const assert = require('assert'); | ||
|
||
let ns; | ||
async function test() { | ||
assert.throws(() => { | ||
require('../fixtures/es-modules/tla/export-async.mjs'); | ||
}, { | ||
code: 'ERR_REQUIRE_ASYNC_MODULE' | ||
}); | ||
const newNs = await import('../fixtures/es-modules/tla/export-async.mjs'); | ||
if (ns === undefined) { | ||
ns = newNs; | ||
} else { | ||
// Check that re-evalaution is returning the same namespace. | ||
assert.strictEqual(ns, newNs); | ||
} | ||
assert.strictEqual(ns.hello, 'world'); | ||
} | ||
|
||
// Run the test twice to check consistency after caching. | ||
test().then(common.mustCall(test)).catch(common.mustNotCall()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
import promise from './export-promise.mjs'; | ||
let result; | ||
result = await promise; | ||
export default result; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
let hello = await Promise.resolve('world'); | ||
export { hello }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
let exportedResolve; | ||
let exportedReject; | ||
const promise = new Promise((resolve, reject) => { | ||
exportedResolve = resolve; | ||
exportedReject = reject; | ||
}); | ||
export default promise; | ||
export { exportedResolve, exportedReject }; |