Replaced System.Text.Json with JSON.parse

Author: tomvanenckevort

src/AngleSharp.Js/AngleSharp.Js.csproj

@@ -23,7 +23,6 @@
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="1.1.0" />
     <PackageReference Include="Jint" Version="3.0.1" />
-    <PackageReference Include="System.Text.Json" Version="8.0.2" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">

src/AngleSharp.Js/EngineInstance.cs

@@ -11,7 +11,6 @@ namespace AngleSharp.Js
     using System.IO;
     using System.Linq;
     using System.Reflection;
-    using System.Text.Json;
 
     sealed class EngineInstance
     {
@@ -123,24 +122,17 @@ public JsValue RunScript(String source, String type, JsValue context)
 
         private JsValue LoadImportMap(String source)
         {
-            JsImportMap importMap;
-
-            try
-            {
-                importMap = JsonSerializer.Deserialize<JsImportMap>(source);
-            }
-            catch (JsonException)
-            {
-                importMap = null;
-            }
+            var importMap = _engine.Evaluate($"JSON.parse('{source}')").AsObject();
 
             // get list of imports based on any scoped imports for the current document path, and any global imports
-            var imports = new Dictionary<string, Uri>();
+            var moduleImports = new Dictionary<string, string>();
             var documentPathName = Url.Create(_documentUrl).PathName.ToLower();
 
-            if (importMap?.Scopes?.Count > 0)
+            if (importMap.TryGetValue("scopes", out var scopes))
             {
-                var scopePaths = importMap.Scopes.Keys.OrderByDescending(k => k.Length);
+                var scopesObj = scopes.AsObject();
+
+                var scopePaths = scopesObj.GetOwnPropertyKeys().Select(k => k.AsString()).OrderByDescending(k => k.Length);
 
                 foreach (var scopePath in scopePaths)
                 {
@@ -149,32 +141,38 @@ private JsValue LoadImportMap(String source)
                         continue;
                     }
 
-                    var scopeImports = importMap.Scopes[scopePath];
+                    var scopeImports = scopesObj[scopePath].AsObject();
+
+                    var scopeImportImportSpecifiers = scopeImports.GetOwnPropertyKeys().Select(k => k.AsString());
 
-                    foreach (var scopeImport in scopeImports)
+                    foreach (var scopeImportSpecifier in scopeImportImportSpecifiers)
                     {
-                        if (!imports.ContainsKey(scopeImport.Key))
+                        if (!moduleImports.ContainsKey(scopeImportSpecifier))
                         {
-                            imports.Add(scopeImport.Key, scopeImport.Value);
+                            moduleImports.Add(scopeImportSpecifier, scopeImports[scopeImportSpecifier].AsString());
                         }
                     }
                 }
             }
 
-            if (importMap?.Imports?.Count > 0)
+            if (importMap.TryGetValue("imports", out var imports))
             {
-                foreach (var globalImport in importMap.Imports)
+                var importsObj = imports.AsObject();
+
+                var importSpecifiers = importsObj.GetOwnPropertyKeys().Select(k => k.AsString());
+
+                foreach (var importSpecifier in importSpecifiers)
                 {
-                    if (!imports.ContainsKey(globalImport.Key))
+                    if (!moduleImports.ContainsKey(importSpecifier))
                     {
-                        imports.Add(globalImport.Key, globalImport.Value);
+                        moduleImports.Add(importSpecifier, importsObj[importSpecifier].AsString());
                     }
                 }
             }
 
-            foreach (var import in imports)
+            foreach (var import in moduleImports)
             {
-                var moduleContent = FetchModule(import.Value);
+                var moduleContent = FetchModule(new Uri(import.Value, UriKind.RelativeOrAbsolute));
 
                 ImportModule(import.Key, moduleContent);
             }