Merge branch 'trunk' into edge_py

Author: Delta456

dotnet/src/webdriver/Command.cs

@@ -21,6 +21,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 
 namespace OpenQA.Selenium
 {
@@ -35,7 +36,7 @@ public class Command
 
         private readonly static JsonSerializerOptions s_jsonSerializerOptions = new()
         {
-            TypeInfoResolver = CommandJsonSerializerContext.Default,
+            TypeInfoResolver = JsonTypeInfoResolver.Combine(CommandJsonSerializerContext.Default, new DefaultJsonTypeInfoResolver()),
             Converters = { new ResponseValueJsonConverter() }
         };
 

dotnet/src/webdriver/SeleniumManager.cs

@@ -40,8 +40,6 @@ public static class SeleniumManager
     {
         private static readonly ILogger _logger = Log.GetLogger(typeof(SeleniumManager));
 
-        private static readonly JsonSerializerOptions _serializerOptions = new() { PropertyNameCaseInsensitive = true, TypeInfoResolver = SeleniumManagerSerializerContext.Default };
-
         private static readonly Lazy<string> _lazyBinaryFullPath = new(() =>
         {
             string? binaryFullPath = Environment.GetEnvironmentVariable("SE_MANAGER_PATH");
@@ -187,7 +185,7 @@ private static ResultResponse RunCommand(string fileName, string arguments)
 
             try
             {
-                jsonResponse = JsonSerializer.Deserialize<SeleniumManagerResponse>(output, _serializerOptions)!;
+                jsonResponse = JsonSerializer.Deserialize(output, SeleniumManagerSerializerContext.Default.SeleniumManagerResponse)!;
             }
             catch (Exception ex)
             {
@@ -210,11 +208,11 @@ private static ResultResponse RunCommand(string fileName, string arguments)
         }
     }
 
-    internal record SeleniumManagerResponse(IReadOnlyList<LogEntryResponse> Logs, ResultResponse Result)
+    internal sealed record SeleniumManagerResponse(IReadOnlyList<LogEntryResponse> Logs, ResultResponse Result)
     {
-        public record LogEntryResponse(string Level, string Message);
+        public sealed record LogEntryResponse(string Level, string Message);
 
-        public record ResultResponse
+        public sealed record ResultResponse
         (
             [property: JsonPropertyName("driver_path")]
             string DriverPath,
@@ -224,5 +222,6 @@ string BrowserPath
     }
 
     [JsonSerializable(typeof(SeleniumManagerResponse))]
-    internal partial class SeleniumManagerSerializerContext : JsonSerializerContext;
+    [JsonSourceGenerationOptions(PropertyNameCaseInsensitive = true)]
+    internal sealed partial class SeleniumManagerSerializerContext : JsonSerializerContext;
 }

dotnet/test/common/CommandTests.cs

@@ -0,0 +1,41 @@
+// <copyright file="CommandTests.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
+using NUnit.Framework;
+using System.Collections.Generic;
+
+namespace OpenQA.Selenium
+{
+    [TestFixture]
+    public class CommandTests
+    {
+        [Test]
+        public void CommandSerializesAnonymousType()
+        {
+            var parameters = new Dictionary<string, object>
+            {
+                ["arg"] = new { param1 = true, param2 = false },
+            };
+
+            var command = new Command(new SessionId("session"), "test command", parameters);
+
+            Assert.That(command.ParametersAsJsonString, Is.EqualTo("""{"arg":{"param1":true,"param2":false}}"""));
+        }
+    }
+}

javascript/grid-ui/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@apollo/client": "3.11.8",
+    "@apollo/client": "3.11.9",
     "@emotion/react": "11.13.3",
     "@emotion/styled": "11.13.0",
     "@mui/icons-material": "5.15.18",
@@ -16,10 +16,10 @@
     "@types/react-dom": "18.2.22",
     "@types/react-modal": "3.16.3",
     "@types/react-router-dom": "5.3.3",
-    "graphql": "16.8.1",
+    "graphql": "16.9.0",
     "graphql.macro": "1.4.2",
     "path-browserify": "1.0.1",
-    "pretty-ms": "9.0.0",
+    "pretty-ms": "9.1.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-modal": "3.16.1",

javascript/node/selenium-webdriver/bidi/browsingContext.js

@@ -156,8 +156,7 @@ class BrowsingContext {
       method: 'browsingContext.create',
       params: Object.fromEntries(parameters),
     }
-    const res = await this.bidi.send(params)
-    return res
+    return await this.bidi.send(params)
   }
 
   /**

javascript/node/selenium-webdriver/bidi/continueRequestParameters.js

@@ -47,7 +47,7 @@ class ContinueRequestParameters {
    * Sets the cookies for the request.
    *
    * @param {Header[]} cookieHeaders - An array of cookie headers.
-   * @returns {continueRequestParameters} - The current instance of the ContinueRequestParameters for chaining.
+   * @returns {ContinueRequestParameters} - The current instance of the ContinueRequestParameters for chaining.
    * @throws {Error} - If a cookie header is not an instance of Header.
    */
   cookies(cookieHeaders) {

javascript/node/selenium-webdriver/bidi/filterBy.js

@@ -21,7 +21,7 @@ class FilterBy {
   }
 
   static logLevel(level) {
-    if (level === undefined || (level != undefined && !['debug', 'error', 'info', 'warning'].includes(level))) {
+    if (level === undefined || (level !== undefined && !['debug', 'error', 'info', 'warning'].includes(level))) {
       throw Error(
         `Please pass valid log level. Valid log levels are 'debug', 'error', 'info' and 'warning'. Received: ${level}`,
       )

javascript/node/selenium-webdriver/bidi/logEntries.js

@@ -21,12 +21,13 @@ const { Source } = require('./scriptTypes')
 
 /**
  * Represents a base log entry.
- * Desribed in https://w3c.github.io/webdriver-bidi/#types-log-logentry.
+ * Described in https://w3c.github.io/webdriver-bidi/#types-log-logentry.
  */
 class BaseLogEntry {
   /**
    * Creates a new instance of BaseLogEntry.
    * @param {string} level - The log level.
+   * @param {source} source - Script Source
    * @param {string} text - The log source.
    * @param {string} text - The log text.
    * @param {number} timeStamp - The log timestamp.
@@ -86,6 +87,7 @@ class GenericLogEntry extends BaseLogEntry {
   /**
    * Creates an instance of GenericLogEntry.
    * @param {string} level - The log level.
+   * @param {source} source - Script Source
    * @param {string} text - The log text.
    * @param {Date} timeStamp - The log timestamp.
    * @param {string} type - The log type.

javascript/node/selenium-webdriver/bidi/protocolValue.js

@@ -145,7 +145,7 @@ class LocalValue {
   /**
    * Creates a new LocalValue object from the passed object.
    *
-   * @param {Object} map - The object.
+   * @param {Object} object - The object.
    * @returns {LocalValue} - The created LocalValue object.
    */
   static createObjectValue(object) {
@@ -431,7 +431,7 @@ class ChannelValue {
       }
     }
 
-    if (resultOwnership != undefined) {
+    if (resultOwnership !== undefined) {
       if (['root', 'none'].includes(resultOwnership)) {
         this.resultOwnership = resultOwnership
       } else {

javascript/node/selenium-webdriver/bidi/storage.js

@@ -138,11 +138,7 @@ class Storage {
         Object.prototype.hasOwnProperty.call(response.result.partitionKey, 'userContext') &&
         Object.prototype.hasOwnProperty.call(response.result.partitionKey, 'sourceOrigin')
       ) {
-        let partitionKey = new PartitionKey(
-          response.result.partitionKey.userContext,
-          response.result.partitionKey.sourceOrigin,
-        )
-        return partitionKey
+        return new PartitionKey(response.result.partitionKey.userContext, response.result.partitionKey.sourceOrigin)
       }
     }
   }
@@ -182,11 +178,7 @@ class Storage {
         Object.prototype.hasOwnProperty.call(response.result.partitionKey, 'userContext') &&
         Object.prototype.hasOwnProperty.call(response.result.partitionKey, 'sourceOrigin')
       ) {
-        let partitionKey = new PartitionKey(
-          response.result.partitionKey.userContext,
-          response.result.partitionKey.sourceOrigin,
-        )
-        return partitionKey
+        return new PartitionKey(response.result.partitionKey.userContext, response.result.partitionKey.sourceOrigin)
       }
     }
   }