2023-08-30 17:38:07 -07:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Samuel Attard <marshallofsound@electronjs.org>
|
|
|
|
|
Date: Wed, 8 Mar 2023 13:02:17 -0800
|
|
|
|
|
Subject: chore: expose ImportModuleDynamically and
|
|
|
|
|
HostInitializeImportMetaObjectCallback to embedders
|
|
|
|
|
|
|
|
|
|
This also subtly changes the behavior of shouldNotRegisterESMLoader to ensure that node sets up the handlers
|
|
|
|
|
internally but simply avoids setting its own handlers on the Isolate. This is so that Electron can set it to
|
|
|
|
|
its own blended handler between Node and Blink.
|
|
|
|
|
|
|
|
|
|
Not upstreamable.
|
|
|
|
|
|
2023-11-30 15:51:35 +01:00
|
|
|
diff --git a/lib/internal/modules/esm/utils.js b/lib/internal/modules/esm/utils.js
|
2025-08-04 14:40:36 -04:00
|
|
|
index 9b41db8b0714b7408f79cbd5b4c460d9bc08f239..35ecfb9bbaf2c8e7351e1c69da84c82a4a7cb049 100644
|
2023-11-30 15:51:35 +01:00
|
|
|
--- a/lib/internal/modules/esm/utils.js
|
|
|
|
|
+++ b/lib/internal/modules/esm/utils.js
|
2024-08-26 15:09:33 -04:00
|
|
|
@@ -30,7 +30,7 @@ const {
|
2023-11-30 15:51:35 +01:00
|
|
|
ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING,
|
|
|
|
|
ERR_INVALID_ARG_VALUE,
|
|
|
|
|
} = require('internal/errors').codes;
|
|
|
|
|
-const { getOptionValue } = require('internal/options');
|
|
|
|
|
+const { getOptionValue, getEmbedderOptions } = require('internal/options');
|
|
|
|
|
const {
|
|
|
|
|
loadPreloadModules,
|
|
|
|
|
initializeFrozenIntrinsics,
|
2025-08-04 14:40:36 -04:00
|
|
|
@@ -281,12 +281,13 @@ let _forceDefaultLoader = false;
|
2024-01-18 16:16:45 -05:00
|
|
|
* @param {boolean} [forceDefaultLoader=false] - A boolean indicating disabling custom loaders.
|
2023-12-11 21:09:50 +01:00
|
|
|
*/
|
2024-01-18 16:16:45 -05:00
|
|
|
function initializeESM(forceDefaultLoader = false) {
|
2023-08-30 17:38:07 -07:00
|
|
|
+ const shouldSetOnIsolate = !getEmbedderOptions().shouldNotRegisterESMLoader;
|
2024-01-18 16:16:45 -05:00
|
|
|
_forceDefaultLoader = forceDefaultLoader;
|
2023-11-30 15:51:35 +01:00
|
|
|
initializeDefaultConditions();
|
2024-01-18 16:16:45 -05:00
|
|
|
// Setup per-realm callbacks that locate data or callbacks that we keep
|
2023-08-30 17:38:07 -07:00
|
|
|
// track of for different ESM modules.
|
2023-11-30 15:51:35 +01:00
|
|
|
- setInitializeImportMetaObjectCallback(initializeImportMetaObject);
|
|
|
|
|
- setImportModuleDynamicallyCallback(importModuleDynamicallyCallback);
|
|
|
|
|
+ setInitializeImportMetaObjectCallback(initializeImportMetaObject, shouldSetOnIsolate);
|
|
|
|
|
+ setImportModuleDynamicallyCallback(importModuleDynamicallyCallback, shouldSetOnIsolate);
|
|
|
|
|
}
|
2023-08-30 17:38:07 -07:00
|
|
|
|
2023-12-11 21:09:50 +01:00
|
|
|
/**
|
2023-08-30 17:38:07 -07:00
|
|
|
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
|
2025-10-30 09:37:51 -04:00
|
|
|
index 1ff4971d6fedf6090120a63ba0af420dd6929c8b..4a35e41e78a22993f87ab9d5919f401a7b742438 100644
|
2023-08-30 17:38:07 -07:00
|
|
|
--- a/src/module_wrap.cc
|
|
|
|
|
+++ b/src/module_wrap.cc
|
2025-10-30 09:37:51 -04:00
|
|
|
@@ -1063,7 +1063,7 @@ Maybe<ModuleWrap*> ModuleWrap::ResolveModule(
|
|
|
|
|
return Just(module_wrap);
|
2023-08-30 17:38:07 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-static MaybeLocal<Promise> ImportModuleDynamically(
|
|
|
|
|
+MaybeLocal<Promise> ImportModuleDynamically(
|
|
|
|
|
Local<Context> context,
|
2025-02-14 11:05:01 +01:00
|
|
|
Local<Data> host_defined_options,
|
2023-08-30 17:38:07 -07:00
|
|
|
Local<Value> resource_name,
|
2025-10-30 09:37:51 -04:00
|
|
|
@@ -1135,12 +1135,13 @@ void ModuleWrap::SetImportModuleDynamicallyCallback(
|
2024-01-18 16:16:45 -05:00
|
|
|
Realm* realm = Realm::GetCurrent(args);
|
2023-08-30 17:38:07 -07:00
|
|
|
HandleScope handle_scope(isolate);
|
|
|
|
|
|
|
|
|
|
- CHECK_EQ(args.Length(), 1);
|
|
|
|
|
+ CHECK_EQ(args.Length(), 2);
|
|
|
|
|
CHECK(args[0]->IsFunction());
|
|
|
|
|
Local<Function> import_callback = args[0].As<Function>();
|
2024-01-18 16:16:45 -05:00
|
|
|
realm->set_host_import_module_dynamically_callback(import_callback);
|
2023-08-30 17:38:07 -07:00
|
|
|
|
|
|
|
|
- isolate->SetHostImportModuleDynamicallyCallback(ImportModuleDynamically);
|
|
|
|
|
+ if (args[1]->IsBoolean() && args[1]->BooleanValue(isolate))
|
|
|
|
|
+ isolate->SetHostImportModuleDynamicallyCallback(ImportModuleDynamically);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ModuleWrap::HostInitializeImportMetaObjectCallback(
|
2025-10-30 09:37:51 -04:00
|
|
|
@@ -1182,13 +1183,14 @@ void ModuleWrap::SetInitializeImportMetaObjectCallback(
|
2024-01-18 16:16:45 -05:00
|
|
|
Realm* realm = Realm::GetCurrent(args);
|
|
|
|
|
Isolate* isolate = realm->isolate();
|
2023-08-30 17:38:07 -07:00
|
|
|
|
|
|
|
|
- CHECK_EQ(args.Length(), 1);
|
|
|
|
|
+ CHECK_EQ(args.Length(), 2);
|
|
|
|
|
CHECK(args[0]->IsFunction());
|
|
|
|
|
Local<Function> import_meta_callback = args[0].As<Function>();
|
2024-01-18 16:16:45 -05:00
|
|
|
realm->set_host_initialize_import_meta_object_callback(import_meta_callback);
|
2023-08-30 17:38:07 -07:00
|
|
|
|
|
|
|
|
- isolate->SetHostInitializeImportMetaObjectCallback(
|
|
|
|
|
- HostInitializeImportMetaObjectCallback);
|
|
|
|
|
+ if (args[1]->IsBoolean() && args[1]->BooleanValue(isolate))
|
|
|
|
|
+ isolate->SetHostInitializeImportMetaObjectCallback(
|
|
|
|
|
+ HostInitializeImportMetaObjectCallback);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
MaybeLocal<Value> ModuleWrap::SyntheticModuleEvaluationStepsCallback(
|
|
|
|
|
diff --git a/src/module_wrap.h b/src/module_wrap.h
|
2025-10-30 09:37:51 -04:00
|
|
|
index 695b73ca7ffea850cd88e94546125d12ddc991f6..09602a8e619ba52f3525e3d312047c6dba0484a5 100644
|
2023-08-30 17:38:07 -07:00
|
|
|
--- a/src/module_wrap.h
|
|
|
|
|
+++ b/src/module_wrap.h
|
2024-11-13 06:34:30 -08:00
|
|
|
@@ -8,6 +8,7 @@
|
|
|
|
|
#include <unordered_map>
|
2024-03-29 13:34:56 +01:00
|
|
|
#include <vector>
|
|
|
|
|
#include "base_object.h"
|
|
|
|
|
+#include "node.h"
|
2024-11-13 06:34:30 -08:00
|
|
|
#include "v8-script.h"
|
2024-03-29 13:34:56 +01:00
|
|
|
|
|
|
|
|
namespace node {
|
2025-10-30 09:37:51 -04:00
|
|
|
@@ -86,7 +87,14 @@ struct ModuleCacheKey : public MemoryRetainer {
|
|
|
|
|
hash(hash) {}
|
2023-08-30 17:38:07 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
-class ModuleWrap : public BaseObject {
|
|
|
|
|
+NODE_EXTERN v8::MaybeLocal<v8::Promise> ImportModuleDynamically(
|
|
|
|
|
+ v8::Local<v8::Context> context,
|
|
|
|
|
+ v8::Local<v8::Data> host_defined_options,
|
|
|
|
|
+ v8::Local<v8::Value> resource_name,
|
|
|
|
|
+ v8::Local<v8::String> specifier,
|
|
|
|
|
+ v8::Local<v8::FixedArray> import_assertions);
|
|
|
|
|
+
|
|
|
|
|
+class NODE_EXTERN ModuleWrap : public BaseObject {
|
2025-10-30 09:37:51 -04:00
|
|
|
using ResolveCache =
|
|
|
|
|
std::unordered_map<ModuleCacheKey, uint32_t, ModuleCacheKey::Hash>;
|
|
|
|
|
|
|
|
|
|
@@ -151,6 +159,8 @@ class ModuleWrap : public BaseObject {
|
2024-11-13 06:34:30 -08:00
|
|
|
static void CreateRequiredModuleFacade(
|
|
|
|
|
const v8::FunctionCallbackInfo<v8::Value>& args);
|
2024-01-16 14:29:00 +01:00
|
|
|
|
|
|
|
|
+ static ModuleWrap* GetFromModule(node::Environment*, v8::Local<v8::Module>);
|
|
|
|
|
+
|
|
|
|
|
private:
|
2024-01-18 16:16:45 -05:00
|
|
|
ModuleWrap(Realm* realm,
|
2024-01-16 14:29:00 +01:00
|
|
|
v8::Local<v8::Object> object,
|
2025-10-30 09:37:51 -04:00
|
|
|
@@ -190,7 +200,6 @@ class ModuleWrap : public BaseObject {
|
2024-01-16 14:29:00 +01:00
|
|
|
v8::Local<v8::String> specifier,
|
|
|
|
|
v8::Local<v8::FixedArray> import_attributes,
|
|
|
|
|
v8::Local<v8::Module> referrer);
|
|
|
|
|
- static ModuleWrap* GetFromModule(node::Environment*, v8::Local<v8::Module>);
|
|
|
|
|
|
2025-10-30 09:37:51 -04:00
|
|
|
// This method may throw a JavaScript exception, so the return type is
|
|
|
|
|
// wrapped in a Maybe.
|