Skip to content

Commit d326c4f

Browse files
Refactored module import
1 parent e93f3f9 commit d326c4f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/AngleSharp.Js/EngineInstance.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,10 @@ public JsValue RunScript(String source, String type, JsValue context)
109109
}
110110
else if (type.Isi("module"))
111111
{
112-
return RunModule(source);
112+
// use a unique specifier to import the module into Jint
113+
var specifier = Guid.NewGuid().ToString();
114+
115+
return ImportModule(specifier, source);
113116
}
114117
else
115118
{
@@ -173,19 +176,16 @@ private JsValue LoadImportMap(String source)
173176
{
174177
var moduleContent = FetchModule(import.Value);
175178

176-
_engine.Modules.Add(import.Key, moduleContent);
177-
_engine.Modules.Import(import.Key);
179+
ImportModule(import.Key, moduleContent);
178180
}
179181

180182
return JsValue.Undefined;
181183
}
182184

183-
private JsValue RunModule(String source)
185+
private JsValue ImportModule(String specifier, String source)
184186
{
185-
var moduleIdentifier = Guid.NewGuid().ToString();
186-
187-
_engine.Modules.Add(moduleIdentifier, source);
188-
_engine.Modules.Import(moduleIdentifier);
187+
_engine.Modules.Add(specifier, source);
188+
_engine.Modules.Import(specifier);
189189

190190
return JsValue.Undefined;
191191
}

0 commit comments

Comments
 (0)