Ensure modules have always source specified (#1791)

sebastienros · Feb 25, 2024 · 2c56043 · 2c56043
1 parent 580b9e5
commit 2c56043
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/Jint.Tests/Runtime/ModuleTests.cs b/Jint.Tests/Runtime/ModuleTests.cs
@@ -614,4 +614,51 @@ public override ResolvedSpecifier Resolve(string referencingModuleLocation, Modu
         protected override string LoadModuleContents(Engine engine, ResolvedSpecifier resolved)
             => throw new InvalidOperationException();
     }
+
+    [Fact]
+    public void EngineShouldTransmitSourceModuleForModuleLoader()
+    {
+        var engine = new Engine(o => o.EnableModules(new ModuleLoaderForEngineShouldTransmitSourceModuleForModuleLoaderTest()));
+
+        var logs = new List<string>();
+        engine.SetValue("log", logs.Add);
+
+        engine.Modules.Import($"code/lib/module.js");
+
+        Assert.Collection(logs,
+            s => Assert.Equal("code/execute.js", s),
+            s => Assert.Equal("code/lib/module.js", s));
+    }
+    public class ModuleLoaderForEngineShouldTransmitSourceModuleForModuleLoaderTest : ModuleLoader
+    {
+        public override ResolvedSpecifier Resolve(string? referencingModuleLocation, ModuleRequest moduleRequest)
+        {
+            var moduleSpec = moduleRequest.Specifier;
+
+            // to resolve this statement requires information about source module
+            if (moduleSpec == "../execute.js")
+            {
+                Assert.True(!string.IsNullOrEmpty(referencingModuleLocation), "module loader cannot resolve referensing module - has no referencing module location");
+                moduleSpec = $"code/execute.js";
+            }
+
+            return new ResolvedSpecifier(
+                moduleRequest,
+                moduleSpec,
+                Uri: null,
+                SpecifierType.RelativeOrAbsolute
+            );
+        }
+        protected override string LoadModuleContents(Engine engine, ResolvedSpecifier resolved)
+        {
+            if (resolved.Key == $"code/lib/module.js")
+                return $"import * as m from '../execute.js'; log('code/lib/module.js')";
+            if (resolved.Key == $"code/execute.js")
+            {
+                return $"log('code/execute.js')";
+            }
+
+            throw new NotImplementedException(); // no need in this test
+        }
+    }
 }
diff --git a/Jint/Runtime/Modules/ModuleFactory.cs b/Jint/Runtime/Modules/ModuleFactory.cs
@@ -22,7 +22,7 @@ public static class ModuleFactory
     /// <exception cref="JavaScriptException">Is thrown if an error occured when parsing <paramref name="code"/>.</exception>
     public static Module BuildSourceTextModule(Engine engine, ResolvedSpecifier resolved, string code)
     {
-        var source = resolved.Uri?.LocalPath;
+        var source = resolved.Uri?.LocalPath ?? resolved.Key;
         Esprima.Ast.Module module;
         try
         {