Merge branch 'sebastienros:main' into SourceText

sebastienros · Feb 2, 2024 · bdd5cae · bdd5cae
2 parents 69b73c9 + ac2b527
commit bdd5cae
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 8 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -34,7 +34,7 @@ jobs:
       run: dotnet test --configuration Release --logger GitHubActions
 
   macos:
-    runs-on: macos-latest
+    runs-on: macos-14
     env:
         DOTNET_NOLOGO: true
         DOTNET_CLI_TELEMETRY_OPTOUT: 1

diff --git a/Jint.Tests/Runtime/InteropTests.Dynamic.cs → ...s.PublicInterface/InteropTests.Dynamic.cs b/Jint.Tests/Runtime/InteropTests.Dynamic.cs → ...s.PublicInterface/InteropTests.Dynamic.cs
@@ -1,9 +1,8 @@
 using System.Dynamic;
 using Jint.Native;
 using Jint.Native.Symbol;
-using Jint.Tests.Runtime.Domain;
 
-namespace Jint.Tests.Runtime
+namespace Jint.Tests.PublicInterface
 {
     public partial class InteropTests
     {
@@ -143,5 +142,11 @@ public bool ContainsKey(string key)
                 return _properties.ContainsKey(key);
             }
         }
+
+        private class Person
+        {
+            public string Name { get; set; }
+            public int Age { get; set; }
+        }
     }
 }
diff --git a/Jint.Tests/Runtime/InteropTests.Json.cs → ...ests.PublicInterface/InteropTests.Json.cs b/Jint.Tests/Runtime/InteropTests.Json.cs → ...ests.PublicInterface/InteropTests.Json.cs
@@ -1,7 +1,7 @@
 using System.Dynamic;
 using Jint.Runtime.Interop;
 
-namespace Jint.Tests.Runtime;
+namespace Jint.Tests.PublicInterface;
 
 public partial class InteropTests
 {

diff --git a/...ts/Runtime/InteropTests.NewtonsoftJson.cs → ...cInterface/InteropTests.NewtonsoftJson.cs b/...ts/Runtime/InteropTests.NewtonsoftJson.cs → ...cInterface/InteropTests.NewtonsoftJson.cs
@@ -2,7 +2,7 @@
 using Jint.Runtime;
 using Newtonsoft.Json.Linq;
 
-namespace Jint.Tests.Runtime
+namespace Jint.Tests.PublicInterface
 {
     public partial class InteropTests
     {

diff --git a/...ts/Runtime/InteropTests.SystemTextJson.cs → ...cInterface/InteropTests.SystemTextJson.cs b/...ts/Runtime/InteropTests.SystemTextJson.cs → ...cInterface/InteropTests.SystemTextJson.cs
@@ -2,7 +2,7 @@
 using System.Text.Json.Nodes;
 using Jint.Runtime.Interop;
 
-namespace Jint.Tests.Runtime;
+namespace Jint.Tests.PublicInterface;
 
 public partial class InteropTests
 {
@@ -37,7 +37,7 @@ public void AccessingJsonNodeShouldWork()
                 var wrapped = new ObjectWrapper(e, target);
                 if (target is JsonArray)
                 {
-                    wrapped.SetPrototypeOf(e.Realm.Intrinsics.Array.PrototypeObject);
+                    wrapped.Prototype = e.Intrinsics.Array.PrototypeObject;
                 }
                 return wrapped;
             };

diff --git a/Jint.Tests.PublicInterface/InteropTests.cs b/Jint.Tests.PublicInterface/InteropTests.cs
@@ -0,0 +1,24 @@
+using System.Reflection;
+
+namespace Jint.Tests.PublicInterface
+{
+    public partial class InteropTests : IDisposable
+    {
+        private readonly Engine _engine;
+
+        public InteropTests()
+        {
+            _engine = new Engine(cfg => cfg.AllowClr(
+                        typeof(Console).GetTypeInfo().Assembly,
+                        typeof(File).GetTypeInfo().Assembly))
+                    .SetValue("log", new Action<object>(Console.WriteLine))
+                    .SetValue("assert", new Action<bool>(Assert.True))
+                    .SetValue("equal", new Action<object, object>(Assert.Equal))
+                ;
+        }
+
+        void IDisposable.Dispose()
+        {
+        }
+    }
+}
diff --git a/Jint.Tests.PublicInterface/Jint.Tests.PublicInterface.csproj b/Jint.Tests.PublicInterface/Jint.Tests.PublicInterface.csproj
@@ -28,6 +28,7 @@
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="NodaTime" />
     <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
+    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>

diff --git a/Jint.Tests/Runtime/JsonTests.cs b/Jint.Tests/Runtime/JsonTests.cs
@@ -28,6 +28,10 @@ public void CanParseTabsInProperties()
         [InlineData("{\"a\":\"\\u0000\"}", "\0")]
         [InlineData("{\"a\":\"\\u0001\"}", "\x01")]
         [InlineData("{\"a\":\"\\u0061\"}", "a")]
+        [InlineData("{\"a\":\"\\u003C\"}", "<")]
+        [InlineData("{\"a\":\"\\u003E\"}", ">")]
+        [InlineData("{\"a\":\"\\u003c\"}", "<")]
+        [InlineData("{\"a\":\"\\u003e\"}", ">")]
         public void ShouldParseEscapedCharactersCorrectly(string json, string expectedCharacter)
         {
             var engine = new Engine();

diff --git a/Jint/Native/Json/JsonParser.cs b/Jint/Native/Json/JsonParser.cs
@@ -103,7 +103,7 @@ private char ScanHexEscape()
             {
                 if (_index < _length + 1 && IsHexDigit(_source[_index]))
                 {
-                    char ch = _source[_index++];
+                    char ch = char.ToLower(_source[_index++], CultureInfo.InvariantCulture);
                     code = code * 16 + "0123456789abcdef".IndexOf(ch);
                 }
                 else