From adf69938100fad70d43683e493f9fc20be49e65c Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 5 Oct 2021 19:30:23 +0200
Subject: [PATCH] fixup! vm: add support for import assertions in dynamic
 imports

---
 src/module_wrap.cc | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/module_wrap.cc b/src/module_wrap.cc
index 1e7fb959a6ea8e..aeb0d2cb37313b 100644
--- a/src/module_wrap.cc
+++ b/src/module_wrap.cc
@@ -253,6 +253,21 @@ void ModuleWrap::New(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(that);
 }
 
+static Local<Object> createImportAssertionContainer(Environment* env,
+  Isolate* isolate, Local<FixedArray> raw_assertions) {
+  Local<Object> assertions =
+        Object::New(isolate, v8::Null(env->isolate()), nullptr, nullptr, 0);
+  for (int i = 0; i < raw_assertions->Length(); i += 3) {
+      assertions
+          ->Set(env->context(),
+                raw_assertions->Get(env->context(), i).As<String>(),
+                raw_assertions->Get(env->context(), i + 1).As<Value>())
+          .ToChecked();
+  }
+
+  return assertions;
+}
+
 void ModuleWrap::Link(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
   Isolate* isolate = args.GetIsolate();
@@ -288,14 +303,7 @@ void ModuleWrap::Link(const FunctionCallbackInfo<Value>& args) {
 
     Local<FixedArray> raw_assertions = module_request->GetImportAssertions();
     Local<Object> assertions =
-        Object::New(isolate, v8::Null(env->isolate()), nullptr, nullptr, 0);
-    for (int i = 0; i < raw_assertions->Length(); i += 3) {
-      assertions
-          ->Set(env->context(),
-                raw_assertions->Get(env->context(), i).As<String>(),
-                raw_assertions->Get(env->context(), i + 1).As<Value>())
-          .ToChecked();
-    }
+      createImportAssertionContainer(env, isolate, raw_assertions);
 
     Local<Value> argv[] = {
         specifier,
@@ -603,14 +611,7 @@ static MaybeLocal<Promise> ImportModuleDynamically(
   }
 
   Local<Object> assertions =
-    Object::New(isolate, v8::Null(env->isolate()), nullptr, nullptr, 0);
-  for (int i = 0; i < import_assertions->Length(); i += 2) {
-    assertions
-        ->Set(env->context(),
-              Local<String>::Cast(import_assertions->Get(env->context(), i)),
-              Local<Value>::Cast(import_assertions->Get(env->context(), i + 1)))
-        .ToChecked();
-  }
+    createImportAssertionContainer(env, isolate, import_assertions);
 
   Local<Value> import_args[] = {
     object,