Revise JsSetModuleHostInfo

Allow nullptr requestModule
in order to use currentContext when setting callbacks

Author: rhuanjl

bin/ch/WScriptJsrt.cpp

@@ -419,7 +419,7 @@ JsErrorCode WScriptJsrt::InitializeModuleInfo(JsValueRef specifier, JsModuleReco
         {
             errorCode = ChakraRTInterface::JsSetModuleHostInfo(moduleRecord, JsModuleHostInfo_NotifyModuleReadyCallback, (void*)WScriptJsrt::NotifyModuleReadyCallback);
 
-            if (errorCode == JsNoError)
+            if (errorCode == JsNoError && moduleRecord != nullptr)
             {
                 errorCode = ChakraRTInterface::JsSetModuleHostInfo(moduleRecord, JsModuleHostInfo_HostDefined, specifier);
             }
@@ -1130,14 +1130,7 @@ bool WScriptJsrt::Initialize()
 
 JsErrorCode WScriptJsrt::InitializeModuleCallbacks()
 {
-    JsModuleRecord moduleRecord = JS_INVALID_REFERENCE;
-    JsErrorCode errorCode = ChakraRTInterface::JsInitializeModuleRecord(nullptr, nullptr, &moduleRecord);
-    if (errorCode == JsNoError)
-    {
-        errorCode = InitializeModuleInfo(nullptr, moduleRecord);
-    }
-
-    return errorCode;
+    return InitializeModuleInfo(nullptr, nullptr);
 }
 
 bool WScriptJsrt::Uninitialize()

lib/Jsrt/ChakraCore.h

@@ -310,24 +310,26 @@ JsModuleEvaluation(
 /// <remarks>
 ///     This is used for four things:
 ///     1. Setting up the callbacks for module loading - note these are actually
-///         set on the current Context not the module so only have to be set for
-///         the first root module in any given context.
+///         set on the module's Context not the module itself so only have to be set
+///         for the first root module in any given context.
+///         Alternatively you can set these on the currentContext by supplying a nullptr
+///         as the requestModule
 ///     2. Setting host defined info on a module record - can be anything that
 ///         you wish to associate with your modules.
 ///     3. Setting a URL for a module to be used for stack traces/debugging -
 ///         note this must be set before calling JsParseModuleSource on the module
 ///         or it will be ignored.
 ///     4. Setting an exception on the module object - only relevant prior to it being Parsed.
 /// </remarks>
-/// <param name="requestModule">The request module.</param>
+/// <param name="requestModule">The request module, optional for setting callbacks, required for other uses.</param>
 /// <param name="moduleHostInfo">The type of host info to be set.</param>
 /// <param name="hostInfo">The host info to be set.</param>
 /// <returns>
 ///     The code <c>JsNoError</c> if the operation succeeded, a failure code otherwise.
 /// </returns>
 CHAKRA_API
 JsSetModuleHostInfo(
-    _In_ JsModuleRecord requestModule,
+    _In_opt_ JsModuleRecord requestModule,
     _In_ JsModuleHostInfoKind moduleHostInfo,
     _In_ void* hostInfo);
 

lib/Jsrt/Core/JsrtCore.cpp

@@ -138,16 +138,27 @@ JsModuleEvaluation(
 
 CHAKRA_API
 JsSetModuleHostInfo(
-    _In_ JsModuleRecord requestModule,
+    _In_opt_ JsModuleRecord requestModule,
     _In_ JsModuleHostInfoKind moduleHostInfo,
     _In_ void* hostInfo)
 {
+    Js::ScriptContext* scriptContext;
+    Js::SourceTextModuleRecord* moduleRecord;
     if (!Js::SourceTextModuleRecord::Is(requestModule))
     {
-        return JsErrorInvalidArgument;
+        if (moduleHostInfo != JsModuleHostInfo_FetchImportedModuleCallback &&
+            moduleHostInfo != JsModuleHostInfo_FetchImportedModuleFromScriptCallback &&
+            moduleHostInfo != JsModuleHostInfo_NotifyModuleReadyCallback)
+        {
+            return JsErrorInvalidArgument;
+        }
+        scriptContext = JsrtContext::GetCurrent()->GetScriptContext();
+    }
+    else
+    {
+        moduleRecord = Js::SourceTextModuleRecord::FromHost(requestModule);
+        scriptContext = moduleRecord->GetScriptContext();
     }
-    Js::SourceTextModuleRecord* moduleRecord = Js::SourceTextModuleRecord::FromHost(requestModule);
-    Js::ScriptContext* scriptContext = moduleRecord->GetScriptContext();
     JsrtContext* jsrtContext = (JsrtContext*)scriptContext->GetLibrary()->GetJsrtContext();
     JsErrorCode errorCode = SetContextAPIWrapper(jsrtContext, [&](Js::ScriptContext *scriptContext) -> JsErrorCode {
         JsrtContextCore* currentContext = static_cast<JsrtContextCore*>(JsrtContextCore::GetCurrent());