Skip to content

[v18.x backport] esm: use import attributes instead of import assertions #51136

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

Closed
nicolo-ribaudo wants to merge 5 commits into from
Closed

[v18.x backport] esm: use import attributes instead of import assertions #51136

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
909963e
deps: V8: cherry-pick a0fd3209dda8
nicolo-ribaudo Dec 12, 2023
5389c3a
deps: V8: cherry-pick ea996ad04a68
nicolo-ribaudo Dec 12, 2023
b9d4d7c
esm: use import attributes instead of import assertions
aduh95 Dec 12, 2023
9cb5138
vm: use import attributes instead of import assertions
aduh95 Dec 12, 2023
cc239fe
src: iterate on import attributes array correctly
targos Nov 19, 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
Prev Previous commit
src: iterate on import attributes array correctly 
The array's length is supposed to be a multiple of two for dynamic
import callbacks.

Fixes: #50700
PR-URL: #50703
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Shelley Vohr <shelley.vohr@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@targos @nicolo-ribaudo
targos authored and nicolo-ribaudo committed Dec 13, 2023
commit cc239feb03832808b26cd1568b66dede03b09303
12 changes: 8 additions & 4 deletions src/module_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,14 @@ void ModuleWrap::New(const FunctionCallbackInfo<Value>& args) {
}

static Local<Object> createImportAttributesContainer(
Environment* env, Isolate* isolate, Local<FixedArray> raw_attributes) {
Environment* env,
Isolate* isolate,
Local<FixedArray> raw_attributes,
const int elements_per_attribute) {
CHECK_EQ(raw_attributes->Length() % elements_per_attribute, 0);
Local<Object> attributes =
Object::New(isolate, v8::Null(env->isolate()), nullptr, nullptr, 0);
for (int i = 0; i < raw_attributes->Length(); i += 3) {
for (int i = 0; i < raw_attributes->Length(); i += elements_per_attribute) {
attributes
->Set(env->context(),
raw_attributes->Get(env->context(), i).As<String>(),
Expand Down Expand Up @@ -300,7 +304,7 @@ void ModuleWrap::Link(const FunctionCallbackInfo<Value>& args) {

Local<FixedArray> raw_attributes = module_request->GetImportAssertions();
Local<Object> attributes =
createImportAttributesContainer(env, isolate, raw_attributes);
createImportAttributesContainer(env, isolate, raw_attributes, 3);

Local<Value> argv[] = {
specifier,
Expand Down Expand Up @@ -603,7 +607,7 @@ static MaybeLocal<Promise> ImportModuleDynamically(
}

Local<Object> attributes =
createImportAttributesContainer(env, isolate, import_attributes);
createImportAttributesContainer(env, isolate, import_attributes, 2);

Local<Value> import_args[] = {
object,
Expand Down
5 changes: 5 additions & 0 deletions test/es-module/test-esm-import-attributes-errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ async function test() {
{ code: 'ERR_IMPORT_ASSERTION_TYPE_FAILED' }
);

await rejects(
import(jsModuleDataUrl, { with: { type: 'json', other: 'unsupported' } }),
{ code: 'ERR_IMPORT_ASSERTION_TYPE_FAILED' }
);

await rejects(
import(jsModuleDataUrl, { with: { type: 'unsupported' } }),
{ code: 'ERR_IMPORT_ASSERTION_TYPE_UNSUPPORTED' }
Expand Down
5 changes: 5 additions & 0 deletions test/es-module/test-esm-import-attributes-errors.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ await rejects(
{ code: 'ERR_IMPORT_ASSERTION_TYPE_FAILED' }
);

await rejects(
import(jsModuleDataUrl, { with: { type: 'json', other: 'unsupported' } }),
{ code: 'ERR_IMPORT_ASSERTION_TYPE_FAILED' }
);

await rejects(
import(import.meta.url, { with: { type: 'unsupported' } }),
{ code: 'ERR_IMPORT_ASSERTION_TYPE_UNSUPPORTED' }
Expand Down