Skip to content

esm: mark importAssertions as required #46164

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 4 commits into from
Jan 12, 2023
Merged

esm: mark importAssertions as required #46164

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b65872
esm: mark `importAssertions` as required
aduh95 Jan 10, 2023
4c14433
Apply suggestions from code review
aduh95 Jan 10, 2023
8fc2ece
Update lib/internal/modules/esm/loader.js
aduh95 Jan 10, 2023
cd7f6e6
Update lib/internal/modules/esm/loader.js
aduh95 Jan 10, 2023
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
Next Next commit
esm: mark importAssertions as required 
We already always specify a value, and failing to do so would likely be
a bug.
  • Loading branch information
@aduh95
aduh95 committed Jan 10, 2023
commit 0b65872e983b3b84220d74d74119973ae7704adb
16 changes: 4 additions & 12 deletions lib/internal/modules/esm/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,21 +295,15 @@ class ESMLoader {
* @param {string} originalSpecifier The specified URL path of the module to
* be resolved.
* @param {string} [parentURL] The URL path of the module's parent.
* @param {ImportAssertions} [importAssertions] Assertions from the import
* @param {ImportAssertions} importAssertions Assertions from the import
* statement or expression.
* @returns {Promise<{ format: string, url: URL['href'] }>}
*/
async resolve(
originalSpecifier,
parentURL,
importAssertions = { __proto__: null },
) {
async resolve(originalSpecifier, parentURL, importAssertions) {
if (this.#hooks) {
return this.#hooks.resolve(originalSpecifier, parentURL, importAssertions);
}
if (!this.#defaultResolve) {
this.#defaultResolve = require('internal/modules/esm/resolve').defaultResolve;
}
this.#defaultResolve ??= require('internal/modules/esm/resolve').defaultResolve;
Comment thread
aduh95 marked this conversation as resolved.
Outdated
const context = {
__proto__: null,
conditions: this.#defaultConditions,
Expand All @@ -332,9 +326,7 @@ class ESMLoader {
if (this.#hooks) {
loadResult = await this.#hooks.load(url, context);
} else {
if (!this.#defaultLoad) {
this.#defaultLoad = require('internal/modules/esm/load').defaultLoad;
}
this.#defaultLoad ??= require('internal/modules/esm/load').defaultLoad;
Comment thread
aduh95 marked this conversation as resolved.
Outdated
loadResult = await this.#defaultLoad(url, context);
}

Expand Down