Merge pull request #95 from lahma/jint-3.1.0

Upgrade to Jint 3.1.0
AngleSharp · Apr 13, 2024 · 551f1d3 · 551f1d3
2 parents e8de221 + 37d4fa3
commit 551f1d3
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 47 deletions.
diff --git a/src/AngleSharp.Js.Tests/AngleSharp.Js.Tests.csproj b/src/AngleSharp.Js.Tests/AngleSharp.Js.Tests.csproj
@@ -1,13 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <RootNamespace>AngleSharp.Js.Tests</RootNamespace>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net6.0;net7.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net462;net472;net6.0;net7.0;net8.0</TargetFrameworks>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <IsPackable>false</IsPackable>
-    <LangVersion>7.1</LangVersion>
-    <AssemblyName>AngleSharp.Js.Tests</AssemblyName>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!-- https://github.com/Tyrrrz/GitHubActionsTestLogger/issues/5 -->
   </PropertyGroup>
 

diff --git a/src/AngleSharp.Js.Tests/Mocks/MockHttpClientRequester.cs b/src/AngleSharp.Js.Tests/Mocks/MockHttpClientRequester.cs
@@ -21,7 +21,7 @@ public MockHttpClientRequester(Dictionary<string, string> mockResponses) : base(
             _mockResponses = mockResponses;
         }
 
-        protected override async Task<IResponse> PerformRequestAsync(Request request, CancellationToken cancel)
+        protected override Task<IResponse> PerformRequestAsync(Request request, CancellationToken cancel)
         {
             var response = new DefaultResponse();
 
@@ -36,7 +36,7 @@ protected override async Task<IResponse> PerformRequestAsync(Request request, Ca
                 response.Content = new MemoryStream(Encoding.UTF8.GetBytes(string.Empty));
             }
 
-            return response;
+            return Task.FromResult<IResponse>(response);
         }
     }
 }
diff --git a/src/AngleSharp.Js/AngleSharp.Js.csproj b/src/AngleSharp.Js/AngleSharp.Js.csproj
@@ -1,28 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <AssemblyName>AngleSharp.Js</AssemblyName>
-    <RootNamespace>AngleSharp.Js</RootNamespace>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;net462;net472;net6.0;net7.0;net8.0</TargetFrameworks>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462;net472</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>7.1</LangVersion>
     <RepositoryUrl>https://github.com/AngleSharp/AngleSharp.Js</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="1.1.0" />
-    <PackageReference Include="Jint" Version="3.0.1" />
+    <PackageReference Include="AngleSharp" Version="1.1.2" />
+    <PackageReference Include="Jint" Version="3.1.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">

diff --git a/src/AngleSharp.Js/Extensions/EngineExtensions.cs b/src/AngleSharp.Js/Extensions/EngineExtensions.cs
@@ -148,21 +148,18 @@ private static JsValue[] ExpandInitDict(JsValue[] arguments, ParameterInfo[] par
                 newArgs[i] = arguments[i];
             }
 
-            if (obj != null)
+            for (var i = end + offset; i < max; i++)
             {
-                for (var i = end + offset; i < max; i++)
-                {
-                    var p = parameters[i];
-                    var name = p.Name;
+                var p = parameters[i];
+                var name = p.Name;
 
-                    if (obj.HasProperty(name))
-                    {
-                        newArgs[i - offset] = obj.GetProperty(name).Value;
-                    }
-                    else
-                    {
-                        newArgs[i - offset] = JsValue.Undefined;
-                    }
+                if (obj.HasProperty(name))
+                {
+                    newArgs[i - offset] = obj.Get(name);
+                }
+                else
+                {
+                    newArgs[i - offset] = JsValue.Undefined;
                 }
             }
 

diff --git a/src/AngleSharp.Js/Proxies/DomNodeInstance.cs b/src/AngleSharp.Js/Proxies/DomNodeInstance.cs
@@ -32,9 +32,11 @@ public override PropertyDescriptor GetOwnProperty(JsValue property)
                 {
                     return descriptor;
                 }
-                else if (prototype.HasProperty(property))
+
+                var prototypeProperty = prototype.GetOwnProperty(property);
+                if (prototypeProperty != PropertyDescriptor.Undefined)
                 {
-                    return prototype.GetProperty(property);
+                    return prototypeProperty;
                 }
             }
 

diff --git a/src/AngleSharp.Js/Proxies/DomPrototypeInstance.cs b/src/AngleSharp.Js/Proxies/DomPrototypeInstance.cs
@@ -1,9 +1,7 @@
 namespace AngleSharp.Js
 {
     using AngleSharp.Attributes;
-    using AngleSharp.Dom;
     using AngleSharp.Text;
-    using Jint.Native;
     using Jint.Native.Object;
     using Jint.Native.Symbol;
     using Jint.Runtime.Descriptors;
@@ -55,7 +53,7 @@ public Boolean TryGetFromIndex(Object value, String index, out PropertyDescripto
                 {
                     if (ex.InnerException is ArgumentOutOfRangeException)
                     {
-                        result = new PropertyDescriptor(JsValue.Undefined, false, false, false);
+                        result = PropertyDescriptor.Undefined;
                         return true;
                     }
 
@@ -104,12 +102,9 @@ private void SetNormalEvents(IEnumerable<EventInfo> eventInfos)
         {
             foreach (var eventInfo in eventInfos)
             {
-                var names = eventInfo.GetCustomAttributes<DomNameAttribute>()
-                    .Select(m => m.OfficialName);
-
-                foreach (var name in names)
+                foreach (var m in eventInfo.GetCustomAttributes<DomNameAttribute>())
                 {
-                    SetEvent(name, eventInfo.AddMethod, eventInfo.RemoveMethod);
+                    SetEvent(m.OfficialName, eventInfo.AddMethod, eventInfo.RemoveMethod);
                 }
             }
         }
@@ -123,6 +118,7 @@ private void SetExtensionMethods(IEnumerable<MethodInfo> methods)
 
                 if (HasProperty(name))
                 {
+                    // skip
                 }
                 else if (value.Adder != null && value.Remover != null)
                 {
@@ -148,9 +144,10 @@ private void SetNormalProperties(IEnumerable<PropertyInfo> properties)
                 var putsForward = property.GetCustomAttribute<DomPutForwardsAttribute>();
                 var names = property
                     .GetCustomAttributes<DomNameAttribute>()
-                    .Select(m => m.OfficialName);
+                    .Select(m => m.OfficialName)
+                    .ToArray();
 
-                if (index != null || names.Any(m => m.Is("item")))
+                if (index != null || Array.Exists(names, m => m.Is("item")))
                 {
                     SetIndexer(property, indexParameters);
                 }
@@ -166,12 +163,9 @@ private void SetNormalMethods(IEnumerable<MethodInfo> methods)
         {
             foreach (var method in methods)
             {
-                var names = method.GetCustomAttributes<DomNameAttribute>()
-                    .Select(m => m.OfficialName);
-
-                foreach (var name in names)
+                foreach (var m in method.GetCustomAttributes<DomNameAttribute>())
                 {
-                    SetMethod(name, method);
+                    SetMethod(m.OfficialName, method);
                 }
             }
         }

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -5,6 +5,7 @@
     <Version>1.0.0</Version>
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 </Project>