Bidi jsonvalue support (#2980)

kblok · web-flow · commit bc0b29061a67 · 2025-10-22T13:23:08.000-04:00
diff --git a/lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs b/lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs
@@ -22,8 +22,8 @@ public class PuppeteerTestAttribute : NUnitAttribute, IApplyToTest
         private static TestExpectation[] _localExpectations;
         private static TestExpectation[] _upstreamExpectations;
 
-        public static readonly bool IsChrome = false;
-        public static readonly bool IsCdp = false;
+        public static readonly bool IsChrome = Environment.GetEnvironmentVariable("BROWSER") != "FIREFOX";
+        public static readonly bool IsCdp = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("PROTOCOL")) || Environment.GetEnvironmentVariable("PROTOCOL")!.Equals("cdp");
 
         public static readonly HeadlessMode Headless =
             string.IsNullOrEmpty(Environment.GetEnvironmentVariable("HEADLESS_MODE")) ?
diff --git a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
@@ -795,21 +795,6 @@
       "FAIL"
     ]
   },
-  {
-    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[jshandle.spec] *.jsonValue*",
-    "platforms": [
-      "darwin",
-      "linux",
-      "win32"
-    ],
-    "parameters": [
-      "webDriverBiDi"
-    ],
-    "expectations": [
-      "FAIL"
-    ]
-  },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
     "testIdPattern": "[jshandle.spec] *.evaluateHandle*",
diff --git a/lib/PuppeteerSharp.Tests/ClickTests/ClickTests.cs b/lib/PuppeteerSharp.Tests/ClickTests/ClickTests.cs
@@ -183,7 +183,7 @@ public async Task ShouldClickWrappedLinks()
         public async Task ShouldClickOnCheckboxInputAndToggle()
         {
             await Page.GoToAsync(TestConstants.ServerUrl + "/input/checkbox.html");
-            Assert.That(await Page.EvaluateExpressionAsync("result.check"), Is.Null);
+            Assert.That(await Page.EvaluateExpressionAsync<bool?>("result.check"), Is.Null);
             await Page.ClickAsync("input#agree");
             Assert.That(await Page.EvaluateExpressionAsync<bool>("result.check"), Is.True);
             Assert.That(await Page.EvaluateExpressionAsync<string[]>("result.events"),
@@ -205,7 +205,7 @@ public async Task ShouldClickOnCheckboxInputAndToggle()
         public async Task ShouldClickOnCheckboxLabelAndToggle()
         {
             await Page.GoToAsync(TestConstants.ServerUrl + "/input/checkbox.html");
-            Assert.That(await Page.EvaluateExpressionAsync("result.check"), Is.Null);
+            Assert.That(await Page.EvaluateExpressionAsync<bool?>("result.check"), Is.Null);
             await Page.ClickAsync("label[for=\"agree\"]");
             Assert.That(await Page.EvaluateExpressionAsync<bool>("result.check"), Is.True);
             Assert.That(await Page.EvaluateExpressionAsync<string[]>("result.events"),
diff --git a/lib/PuppeteerSharp.Tests/ElementHandleTests/ContentFrameTests.cs b/lib/PuppeteerSharp.Tests/ElementHandleTests/ContentFrameTests.cs
@@ -32,7 +32,7 @@ public async Task ShouldWorkHeadful()
             await page.GoToAsync($"{TestConstants.ServerUrl}/frame-example.html");
             var elementHandle = await page.QuerySelectorAsync("iframe");
             var frame = await elementHandle.ContentFrameAsync();
-            Assert.That(frame, Is.EqualTo(await Page.FirstChildFrameAsync()));
+            Assert.That(frame, Is.EqualTo(await page.FirstChildFrameAsync()));
         }
     }
 }
diff --git a/lib/PuppeteerSharp.Tests/EvaluationTests/PageEvaluateOnNewDocumentTests.cs b/lib/PuppeteerSharp.Tests/EvaluationTests/PageEvaluateOnNewDocumentTests.cs
@@ -35,7 +35,7 @@ await Page.AddScriptTagAsync(new AddTagOptions
             {
                 Content = "window.e = 10;"
             }).ContinueWith(_ => Task.CompletedTask);
-            Assert.That(await Page.EvaluateExpressionAsync("window.e"), Is.Null);
+            Assert.That(await Page.EvaluateExpressionAsync<int?>("window.e"), Is.Null);
         }
 
         [Test, Ignore("Inconsistent results on Firefox")]
diff --git a/lib/PuppeteerSharp.Tests/EvaluationTests/PageEvaluateTests.cs b/lib/PuppeteerSharp.Tests/EvaluationTests/PageEvaluateTests.cs
@@ -196,12 +196,12 @@ public async Task ShouldAcceptNullAsOneOfMultipleParameters()
 
         [Test, PuppeteerTest("evaluation.spec", "Evaluation specs Page.evaluate", "should return undefined for non-serializable objects")]
         public async Task ShouldReturnNullForNonSerializableObjects()
-            => Assert.That(await Page.EvaluateFunctionAsync("() => window"), Is.Null);
+            => Assert.That(await Page.EvaluateFunctionAsync<object>("() => window"), Is.Null);
 
         [Test, PuppeteerTest("evaluation.spec", "Evaluation specs Page.evaluate", "should fail for circular object")]
         public async Task ShouldFailForCircularObject()
         {
-            var result = await Page.EvaluateFunctionAsync(@"() => {
+            var result = await Page.EvaluateFunctionAsync<object>(@"() => {
                 const a = {};
                 const b = {a};
                 a.b = b;
@@ -326,31 +326,6 @@ public async Task ShouldAcceptObjectHandleAsAnArgument()
             Assert.That(text, Is.EqualTo("42"));
         }
 
-#pragma warning disable NUnit2021 // Incompatible types for EqualTo constraint
-        [Test]
-        [Ignore("I'm not sure how this ever worked?")]
-        public async Task ShouldWorkWithoutGenerics()
-        {
-            Assert.That(await Page.EvaluateExpressionAsync("var obj = {}; obj;"), Is.Not.Null);
-            Assert.That(await Page.EvaluateExpressionAsync("[]"), Is.Not.Null);
-            Assert.That(await Page.EvaluateExpressionAsync("''"), Is.Not.Null);
-
-            var objectPopulated = await Page.EvaluateExpressionAsync("var obj = {a:1}; obj;");
-
-            Assert.That(objectPopulated, Is.Not.Null);
-            Assert.That(objectPopulated.Value.GetProperty("a").GetInt32(), Is.EqualTo(1));
-
-            var arrayPopulated = await Page.EvaluateExpressionAsync("[1]");
-            Assert.That(arrayPopulated.Value.EnumerateArray().ElementAt(0), Is.EqualTo(1));
-
-            Assert.That(await Page.EvaluateExpressionAsync("'1'"), Is.EqualTo("1"));
-            Assert.That(await Page.EvaluateExpressionAsync("1"), Is.EqualTo(1));
-            Assert.That(await Page.EvaluateExpressionAsync("11111111"), Is.EqualTo(11111111));
-            Assert.That(await Page.EvaluateExpressionAsync("11111111111111"), Is.EqualTo(11111111111111));
-            Assert.That(await Page.EvaluateExpressionAsync("1.1"), Is.EqualTo(1.1));
-        }
-#pragma warning restore NUnit2021 // Incompatible types for EqualTo constraint
-
         public class ComplexObjectTestClass
         {
             public string Foo { get; set; }
diff --git a/lib/PuppeteerSharp.Tests/EvaluationTests/RemoveScriptToEvaluateOnNewDocumentTests.cs b/lib/PuppeteerSharp.Tests/EvaluationTests/RemoveScriptToEvaluateOnNewDocumentTests.cs
@@ -17,7 +17,7 @@ public async Task ShouldRemoveNewDocumentScript()
             await Page.RemoveScriptToEvaluateOnNewDocumentAsync(id.Identifier);
 
             await Page.ReloadAsync();
-            Assert.That(await Page.EvaluateFunctionAsync("() => globalThis.result ?? null"), Is.Null);
+            Assert.That(await Page.EvaluateFunctionAsync<bool?>("() => globalThis.result ?? null"), Is.Null);
         }
     }
 }
diff --git a/lib/PuppeteerSharp.Tests/JSHandleTests/JsonValueTests.cs b/lib/PuppeteerSharp.Tests/JSHandleTests/JsonValueTests.cs
@@ -8,13 +8,18 @@ namespace PuppeteerSharp.Tests.JSHandleTests
 {
     public class JsonValueTests : PuppeteerPageBaseTest
     {
+        private struct MyObject
+        {
+            public string Foo { get; set; }
+        }
+
         [Test, PuppeteerTest("jshandle.spec", "JSHandle JSHandle.jsonValue", "should work")]
         public async Task ShouldWork()
         {
             var aHandle = await Page.EvaluateExpressionHandleAsync("({ foo: 'bar'})");
 
-            var json = await aHandle.JsonValueAsync<JsonElement>();
-            Assert.That(json.GetProperty("foo").GetString(), Is.EqualTo("bar"));
+            var json = await aHandle.JsonValueAsync<MyObject>();
+            Assert.That(json.Foo, Is.EqualTo("bar"));
         }
 
         [Test, Retry(2),
diff --git a/lib/PuppeteerSharp.Tests/NavigationTests/PageReloadTests.cs b/lib/PuppeteerSharp.Tests/NavigationTests/PageReloadTests.cs
@@ -12,7 +12,7 @@ public async Task ShouldWork()
             await Page.GoToAsync(TestConstants.EmptyPage);
             await Page.EvaluateFunctionAsync("() => (globalThis._foo = 10)");
             await Page.ReloadAsync();
-            Assert.That(await Page.EvaluateFunctionAsync("() => globalThis._foo"), Is.Null);
+            Assert.That(await Page.EvaluateFunctionAsync<int?>("() => globalThis._foo"), Is.Null);
         }
     }
 }
diff --git a/lib/PuppeteerSharp.Tests/PageTests/SetBypassCSPTests.cs b/lib/PuppeteerSharp.Tests/PageTests/SetBypassCSPTests.cs
@@ -19,7 +19,7 @@ await Page.AddScriptTagAsync(new AddTagOptions
             {
                 Content = "window.__injected = 42;"
             }).ContinueWith(_ => Task.CompletedTask);
-            Assert.That(await Page.EvaluateExpressionAsync("window.__injected"), Is.Null);
+            Assert.That(await Page.EvaluateExpressionAsync<int?>("window.__injected"), Is.Null);
 
             // By-pass CSP and try one more time.
             await Page.SetBypassCSPAsync(true);
@@ -41,7 +41,7 @@ await Page.AddScriptTagAsync(new AddTagOptions
             {
                 Content = "window.__injected = 42;"
             }).ContinueWith(_ => Task.CompletedTask);
-            Assert.That(await Page.EvaluateExpressionAsync("window.__injected"), Is.Null);
+            Assert.That(await Page.EvaluateExpressionAsync<int?>("window.__injected"), Is.Null);
 
             // By-pass CSP and try one more time.
             await Page.SetBypassCSPAsync(true);
diff --git a/lib/PuppeteerSharp/Bidi/BidiJSHandle.cs b/lib/PuppeteerSharp/Bidi/BidiJSHandle.cs
@@ -20,6 +20,8 @@
 //  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  * SOFTWARE.
 
+using System;
+using System.Globalization;
 using System.Threading.Tasks;
 using PuppeteerSharp.Cdp.Messaging;
 using WebDriverBiDi.Script;
@@ -53,7 +55,17 @@ public static BidiJSHandle From(RemoteValue value, BidiRealm realm)
         return new BidiJSHandle(value, realm);
     }
 
-    public override Task<T> JsonValueAsync<T>() => throw new System.NotImplementedException();
+    public override async Task<T> JsonValueAsync<T>()
+    {
+        // If it's a primitive value or doesn't have a handle, deserialize directly
+        if (IsPrimitiveValue || string.IsNullOrEmpty(Id))
+        {
+            return DeserializeValue<T>(RemoteValue.Value);
+        }
+
+        // Otherwise, use evaluation for objects with handles
+        return await EvaluateFunctionAsync<T>("value => value").ConfigureAwait(false);
+    }
 
     /// <inheritdoc/>
     public override string ToString()
@@ -77,4 +89,49 @@ public override async ValueTask DisposeAsync()
         _disposed = true;
         await realm.DestroyHandlesAsync(this).ConfigureAwait(false);
     }
+
+    private T DeserializeValue<T>(object value)
+    {
+        if (value is null)
+        {
+            return default;
+        }
+
+        if (typeof(T) == typeof(object))
+        {
+            return (T)value;
+        }
+
+        if (typeof(T) == typeof(string))
+        {
+            return (T)value;
+        }
+
+        if (typeof(T) == typeof(int))
+        {
+            return (T)(object)Convert.ToInt32(value, CultureInfo.InvariantCulture);
+        }
+
+        if (typeof(T) == typeof(double))
+        {
+            return (T)(object)Convert.ToDouble(value, CultureInfo.InvariantCulture);
+        }
+
+        if (typeof(T) == typeof(bool))
+        {
+            return (T)(object)Convert.ToBoolean(value, CultureInfo.InvariantCulture);
+        }
+
+        if (typeof(T) == typeof(decimal))
+        {
+            return (T)(object)Convert.ToDecimal(value, CultureInfo.InvariantCulture);
+        }
+
+        if (typeof(T) == typeof(DateTime) && RemoteValue.Type == "date")
+        {
+            return (T)(object)DateTime.Parse(value.ToString(), CultureInfo.InvariantCulture);
+        }
+
+        return (T)value;
+    }
 }
diff --git a/lib/PuppeteerSharp/Bidi/BidiRealm.cs b/lib/PuppeteerSharp/Bidi/BidiRealm.cs
@@ -101,9 +101,7 @@ internal override async Task<IJSHandle> AdoptHandleAsync(IJSHandle handle)
 
     internal override async Task<IJSHandle> TransferHandleAsync(IJSHandle handle)
     {
-        var handleImpl = handle as JSHandle;
-
-        if (handleImpl.Realm == this)
+        if (handle is JSHandle handleImpl && handleImpl.Realm == this)
         {
             return handle;
         }
@@ -113,22 +111,25 @@ internal override async Task<IJSHandle> TransferHandleAsync(IJSHandle handle)
         return await transferredHandle.ConfigureAwait(false);
     }
 
-    internal async override Task<IJSHandle> EvaluateExpressionHandleAsync(string script)
+    internal override async Task<IJSHandle> EvaluateExpressionHandleAsync(string script)
         => CreateHandleAsync(await EvaluateAsync(false, true, script).ConfigureAwait(false));
 
-    internal async override Task<IJSHandle> EvaluateFunctionHandleAsync(string script, params object[] args)
+    internal override async Task<IJSHandle> EvaluateFunctionHandleAsync(string script, params object[] args)
         => CreateHandleAsync(await EvaluateAsync(false, false, script, args).ConfigureAwait(false));
 
     internal override async Task<T> EvaluateExpressionAsync<T>(string script)
         => DeserializeResult<T>((await EvaluateAsync(true, true, script).ConfigureAwait(false)).Result.Value);
 
-    internal override Task<JsonElement?> EvaluateExpressionAsync(string script) => throw new System.NotImplementedException();
+    internal override async Task EvaluateExpressionAsync(string script)
+        => await EvaluateAsync(true, true, script).ConfigureAwait(false);
 
     internal override async Task<T> EvaluateFunctionAsync<T>(string script, params object[] args)
         => DeserializeResult<T>((await EvaluateAsync(true, false, script, args).ConfigureAwait(false)).Result.Value);
 
-    internal override async Task<JsonElement?> EvaluateFunctionAsync(string script, params object[] args)
-        => DeserializeResult<JsonElement?>((await EvaluateAsync(true, false, script, args).ConfigureAwait(false)).Result.Value);
+    internal override async Task EvaluateFunctionAsync(string script, params object[] args)
+    {
+        await EvaluateAsync(true, false, script, args).ConfigureAwait(false);
+    }
 
     protected virtual void ThrowIfDetached()
     {
@@ -144,7 +145,7 @@ protected virtual void Initialize()
             Dispose();
         };
 
-        realm.Updated += (_, __) =>
+        realm.Updated += (_, _) =>
         {
             InternalPuppeteerUtilHandle = null;
             TaskManager.RerunAll();
@@ -226,9 +227,9 @@ private T DeserializeResult<T>(object result)
             return default;
         }
 
-        if (typeof(T) == typeof(JsonElement?))
+        if (typeof(T) == typeof(object))
         {
-            return (T)(object)JsonSerializer.SerializeToElement(result);
+            return (T)result;
         }
 
         // Convert known types first
@@ -301,9 +302,13 @@ private T DeserializeResult<T>(object result)
 
     private T DeserializeRemoteValueDictionary<T>(RemoteValueDictionary remoteValueDictionary)
     {
+        var type = typeof(T);
+
         // Create an instance of T
         var instance = Activator.CreateInstance<T>();
-        var type = typeof(T);
+
+        // Box the instance if it's a value type (struct) to properly handle property setting
+        object boxedInstance = instance;
 
         // Iterate through the dictionary and populate properties
         foreach (var entry in remoteValueDictionary)
@@ -330,12 +335,13 @@ private T DeserializeRemoteValueDictionary<T>(RemoteValueDictionary remoteValueD
                     ?.MakeGenericMethod(property.PropertyType)
                     .Invoke(this, [value]);
 
-                // Set the property value
-                property.SetValue(instance, deserializedValue);
+                // Set the property value on the boxed instance
+                property.SetValue(boxedInstance, deserializedValue);
             }
         }
 
-        return instance;
+        // Unbox back to T
+        return (T)boxedInstance;
     }
 
     private async Task<ArgumentValue> FormatArgumentAsync(object arg)
diff --git a/lib/PuppeteerSharp/Frame.cs b/lib/PuppeteerSharp/Frame.cs
@@ -87,13 +87,13 @@ public Task<IResponse> GoToAsync(string url, int? timeout = null, WaitUntilNavig
         public abstract Task<IResponse> WaitForNavigationAsync(NavigationOptions options = null);
 
         /// <inheritdoc/>
-        public Task<JsonElement?> EvaluateExpressionAsync(string script) => MainRealm.EvaluateExpressionAsync(script);
+        public Task EvaluateExpressionAsync(string script) => MainRealm.EvaluateExpressionAsync(script);
 
         /// <inheritdoc/>
         public Task<T> EvaluateExpressionAsync<T>(string script) => MainRealm.EvaluateExpressionAsync<T>(script);
 
         /// <inheritdoc/>
-        public Task<JsonElement?> EvaluateFunctionAsync(string script, params object[] args) => MainRealm.EvaluateFunctionAsync(script, args);
+        public Task EvaluateFunctionAsync(string script, params object[] args) => MainRealm.EvaluateFunctionAsync(script, args);
 
         /// <inheritdoc/>
         public Task<T> EvaluateFunctionAsync<T>(string script, params object[] args) => MainRealm.EvaluateFunctionAsync<T>(script, args);
diff --git a/lib/PuppeteerSharp/IFrame.cs b/lib/PuppeteerSharp/IFrame.cs
@@ -117,7 +117,7 @@ public interface IFrame
         /// <returns>Task which resolves to script return value.</returns>
         /// <seealso cref="EvaluateFunctionAsync{T}(string, object[])"/>
         /// <seealso cref="IPage.EvaluateExpressionAsync{T}(string)"/>
-        Task<JsonElement?> EvaluateExpressionAsync(string script);
+        Task EvaluateExpressionAsync(string script);
 
         /// <summary>
         /// Executes a script in browser context.
@@ -158,7 +158,7 @@ public interface IFrame
         /// <returns>Task which resolves to script return value.</returns>
         /// <seealso cref="EvaluateExpressionAsync{T}(string)"/>
         /// <seealso cref="IPage.EvaluateFunctionAsync{T}(string, object[])"/>
-        Task<JsonElement?> EvaluateFunctionAsync(string script, params object[] args);
+        Task EvaluateFunctionAsync(string script, params object[] args);
 
         /// <summary>
         /// Executes a function in browser context.
diff --git a/lib/PuppeteerSharp/IPage.cs b/lib/PuppeteerSharp/IPage.cs
@@ -538,7 +538,7 @@ public interface IPage : IDisposable, IAsyncDisposable
         /// </example>
         /// <seealso cref="EvaluateFunctionAsync{T}(string, object[])"/>
         /// <returns>Task which resolves to script return value.</returns>
-        Task<JsonElement?> EvaluateExpressionAsync(string script);
+        Task EvaluateExpressionAsync(string script);
 
         /// <summary>
         /// Executes a script in browser context.
@@ -591,7 +591,7 @@ public interface IPage : IDisposable, IAsyncDisposable
         /// </remarks>
         /// <seealso cref="EvaluateExpressionAsync{T}(string)"/>
         /// <returns>Task which resolves to script return value.</returns>
-        Task<JsonElement?> EvaluateFunctionAsync(string script, params object[] args);
+        Task EvaluateFunctionAsync(string script, params object[] args);
 
         /// <summary>
         /// Executes a function in browser context.
diff --git a/lib/PuppeteerSharp/IsolatedWorld.cs b/lib/PuppeteerSharp/IsolatedWorld.cs
diff --git a/lib/PuppeteerSharp/Page.cs b/lib/PuppeteerSharp/Page.cs
diff --git a/lib/PuppeteerSharp/Realm.cs b/lib/PuppeteerSharp/Realm.cs
diff --git a/lib/PuppeteerSharp/WebWorker.cs b/lib/PuppeteerSharp/WebWorker.cs

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public async Task ShouldWorkHeadful()`
`32`	`32`	`await page.GoToAsync($"{TestConstants.ServerUrl}/frame-example.html");`
`33`	`33`	`var elementHandle = await page.QuerySelectorAsync("iframe");`
`34`	`34`	`var frame = await elementHandle.ContentFrameAsync();`
`35`		`- Assert.That(frame, Is.EqualTo(await Page.FirstChildFrameAsync()));`
	`35`	`+ Assert.That(frame, Is.EqualTo(await page.FirstChildFrameAsync()));`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ await Page.AddScriptTagAsync(new AddTagOptions`
`35`	`35`	`{`
`36`	`36`	`Content = "window.e = 10;"`
`37`	`37`	`}).ContinueWith(_ => Task.CompletedTask);`
`38`		`- Assert.That(await Page.EvaluateExpressionAsync("window.e"), Is.Null);`
	`38`	`+ Assert.That(await Page.EvaluateExpressionAsync<int?>("window.e"), Is.Null);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`[Test, Ignore("Inconsistent results on Firefox")]`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public async Task ShouldRemoveNewDocumentScript()`
`17`	`17`	`await Page.RemoveScriptToEvaluateOnNewDocumentAsync(id.Identifier);`
`18`	`18`
`19`	`19`	`await Page.ReloadAsync();`
`20`		`- Assert.That(await Page.EvaluateFunctionAsync("() => globalThis.result ?? null"), Is.Null);`
	`20`	`+ Assert.That(await Page.EvaluateFunctionAsync<bool?>("() => globalThis.result ?? null"), Is.Null);`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,18 @@ namespace PuppeteerSharp.Tests.JSHandleTests`
`8`	`8`	`{`
`9`	`9`	`public class JsonValueTests : PuppeteerPageBaseTest`
`10`	`10`	`{`
	`11`	`+ private struct MyObject`
	`12`	`+ {`
	`13`	`+ public string Foo { get; set; }`
	`14`	`+ }`
	`15`	`+`
`11`	`16`	`[Test, PuppeteerTest("jshandle.spec", "JSHandle JSHandle.jsonValue", "should work")]`
`12`	`17`	`public async Task ShouldWork()`
`13`	`18`	`{`
`14`	`19`	`var aHandle = await Page.EvaluateExpressionHandleAsync("({ foo: 'bar'})");`
`15`	`20`
`16`		`- var json = await aHandle.JsonValueAsync<JsonElement>();`
`17`		`- Assert.That(json.GetProperty("foo").GetString(), Is.EqualTo("bar"));`
	`21`	`+ var json = await aHandle.JsonValueAsync<MyObject>();`
	`22`	`+ Assert.That(json.Foo, Is.EqualTo("bar"));`
`18`	`23`	`}`
`19`	`24`
`20`	`25`	`[Test, Retry(2),`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public async Task ShouldWork()`
`12`	`12`	`await Page.GoToAsync(TestConstants.EmptyPage);`
`13`	`13`	`await Page.EvaluateFunctionAsync("() => (globalThis._foo = 10)");`
`14`	`14`	`await Page.ReloadAsync();`
`15`		`- Assert.That(await Page.EvaluateFunctionAsync("() => globalThis._foo"), Is.Null);`
	`15`	`+ Assert.That(await Page.EvaluateFunctionAsync<int?>("() => globalThis._foo"), Is.Null);`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`