Unload ModuleBuilder from memory after loading, ModuleBuilder.ExportF…

…unction
sebastienros · Jan 21, 2022 · 9580f04 · 9580f04
1 parent 839ce7d
commit 9580f04
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/Jint.Tests/Runtime/ModuleTests.cs b/Jint.Tests/Runtime/ModuleTests.cs
@@ -146,6 +146,11 @@ public void ShouldDefineModuleFromClrType()
             Assert.Equal("hello world", ns.Get("exported").AsString());
         }
 
+        private class ImportedClass
+        {
+            public string Value { get; set; } = "hello world";
+        }
+
         [Fact]
         public void ShouldAllowExportMultipleImports()
         {
@@ -173,9 +178,16 @@ public void ShouldAllowChaining()
             Assert.Equal(-1, ns.Get("num").AsInteger());
         }
 
-        private class ImportedClass
+        [Fact]
+        public void ShouldAllowLoadingMoreThanOnce()
         {
-            public string Value { get; set; } = "hello world";
+            var called = 0;
+            _engine.AddModule("imported-module", builder => builder.ExportFunction("count", args => called++));
+            _engine.AddModule("my-module", @"import { count } from 'imported-module'; count();");
+            _engine.ImportModule("my-module");
+            _engine.ImportModule("my-module");
+
+            Assert.Equal(called, 1);
         }
 
 #if(NET6_0_OR_GREATER)

diff --git a/Jint/Engine.Modules.cs b/Jint/Engine.Modules.cs
@@ -45,6 +45,7 @@ internal JsModule LoadModule(string? referencingModuleLocation, string specifier
                 // Early link is required because we need to bind values before returning
                 module.Link();
                 moduleBuilder.BindExportedValues(module);
+                _builders.Remove(specifier);
             }
             else
             {

diff --git a/Jint/ModuleBuilder.cs b/Jint/ModuleBuilder.cs
@@ -63,6 +63,12 @@ public ModuleBuilder ExportType(string name, Type type)
         return this;
     }
 
+    public ModuleBuilder ExportFunction(string name, Func<JsValue[], JsValue> fn)
+    {
+        _exports.Add(name, new ClrFunctionInstance(_engine, name, (@this, args) => fn(args)));
+        return this;
+    }
+
     internal Module Parse()
     {
         if (_sourceRaw.Count > 0)