Skip to content

module: fix detect-module not retrying as ESM for code that errors only in CommonJS #52024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 8 commits into from
Mar 12, 2024
Merged

module: fix detect-module not retrying as ESM for code that errors only in CommonJS #52024

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f44c31c
module: fix detect-module not retrying as esm for cjs-only errors
GeoffreyBooth Mar 9, 2024
b28976c
fix tla above import/export
GeoffreyBooth Mar 10, 2024
9114338
add test for redeclaration above import/export
GeoffreyBooth Mar 10, 2024
7f99f57
add double declaration test case
GeoffreyBooth Mar 11, 2024
ecd8096
don't check second error message set unnecessarily
GeoffreyBooth Mar 11, 2024
b1c17bb
update docs
GeoffreyBooth Mar 11, 2024
026d6c1
lint
GeoffreyBooth Mar 11, 2024
228f5c7
use plain async function wrapper instead of CommonJS module wrapper a…
GeoffreyBooth Mar 11, 2024
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
Prev Previous commit
Next Next commit
fix tla above import/export
  • Loading branch information
@GeoffreyBooth
GeoffreyBooth committed Mar 11, 2024
commit b28976ca39d45bf883595e9d02ed04e2d26fa983
25 changes: 22 additions & 3 deletions src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,9 +1541,28 @@ void ContextifyContext::ContainsModuleSyntax(
true,
id_symbol,
second_parse_try_catch);
if (!second_parse_try_catch.HasCaught() &&
!second_parse_try_catch.HasTerminated()) {
should_retry_as_esm = true;
if (!second_parse_try_catch.HasTerminated()) {
if (second_parse_try_catch.HasCaught()) {
// If on the second parse an error is thrown by ESM syntax, then
// what happened was that the user had top-level `await` or a
// top-level declaration of one of the CommonJS module variables
// above the first `import` or `export`.
Utf8Value second_message_value(
env->isolate(), second_parse_try_catch.Message()->Get());
auto second_message = second_message_value.ToStringView();
for (const auto& error_message : esm_syntax_error_messages) {
if (second_message.find(error_message) !=
std::string_view::npos) {
should_retry_as_esm = true;
break;
}
}
} else {
// No errors thrown in the second parse, so most likely the error
// was caused by a top-level `await` or a top-level declaration of
// one of the CommonJS module variables.
should_retry_as_esm = true;
}
}
break;
}
Expand Down
13 changes: 13 additions & 0 deletions test/es-module/test-esm-detect-ambiguous.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,19 @@ describe('--experimental-detect-module', { concurrency: true }, () => {
strictEqual(signal, null);
});

it('permits top-level `await` above import/export syntax', async () => {
const { stdout, stderr, code, signal } = await spawnPromisified(process.execPath, [
'--experimental-detect-module',
'--eval',
'await Promise.resolve(); import "node:os"; console.log("executed");',
]);

strictEqual(stderr, '');
strictEqual(stdout, 'executed\n');
strictEqual(code, 0);
strictEqual(signal, null);
});

it('still throws on `await` in an ordinary sync function', async () => {
const { stdout, stderr, code, signal } = await spawnPromisified(process.execPath, [
'--experimental-detect-module',
Expand Down