[dotnet] [bidi] Reuse RegExpValue in script Local/Remote values

Author: nvborisenko

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

@@ -41,7 +41,6 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(Modules.Script.ObjectRemoteValue))]
 [JsonSerializable(typeof(Modules.Script.FunctionRemoteValue))]
 [JsonSerializable(typeof(Modules.Script.RegExpRemoteValue))]
-[JsonSerializable(typeof(Modules.Script.RegExpRemoteValue.RegExpValue), TypeInfoPropertyName = "Script_RegExpRemoteValue_RegExpValue")]
 [JsonSerializable(typeof(Modules.Script.DateRemoteValue))]
 [JsonSerializable(typeof(Modules.Script.MapRemoteValue))]
 [JsonSerializable(typeof(Modules.Script.SetRemoteValue))]

dotnet/src/webdriver/BiDi/Modules/Script/LocalValue.cs

@@ -112,12 +112,6 @@ public record MapLocalValue(IEnumerable<IEnumerable<LocalValue>> Value) : LocalV
 
 public record ObjectLocalValue(IEnumerable<IEnumerable<LocalValue>> Value) : LocalValue;
 
-public record RegExpLocalValue(RegExpLocalValue.RegExpValue Value) : LocalValue
-{
-    public record RegExpValue(string Pattern)
-    {
-        public string? Flags { get; set; }
-    }
-}
+public record RegExpLocalValue(RegExpValue Value) : LocalValue;
 
 public record SetLocalValue(IEnumerable<LocalValue> Value) : LocalValue;

dotnet/src/webdriver/BiDi/Modules/Script/RegExpValue.cs

@@ -0,0 +1,25 @@
+// <copyright file="RegExpValue.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>
+
+namespace OpenQA.Selenium.BiDi.Modules.Script;
+
+public record RegExpValue(string Pattern)
+{
+    public string? Flags { get; set; }
+}

dotnet/src/webdriver/BiDi/Modules/Script/RemoteValue.cs

@@ -141,16 +141,11 @@ public record FunctionRemoteValue : RemoteValue
     public InternalId? InternalId { get; set; }
 }
 
-public record RegExpRemoteValue(RegExpRemoteValue.RegExpValue Value) : RemoteValue
+public record RegExpRemoteValue(RegExpValue Value) : RemoteValue
 {
     public Handle? Handle { get; set; }
 
     public InternalId? InternalId { get; set; }
-
-    public record RegExpValue(string Pattern)
-    {
-        public string? Flags { get; set; }
-    }
 }
 
 public record DateRemoteValue(string Value) : RemoteValue

dotnet/test/common/BiDi/Script/CallFunctionLocalValueTest.cs

@@ -281,7 +281,7 @@ await context.Script.CallFunctionAsync($$"""
     [Test]
     public void CanCallFunctionWithArgumentRegExp()
     {
-        var arg = new RegExpLocalValue(new RegExpLocalValue.RegExpValue("foo*") { Flags = "g" });
+        var arg = new RegExpLocalValue(new RegExpValue("foo*") { Flags = "g" });
 
         Assert.That(async () =>
         {

dotnet/test/common/BiDi/Script/CallFunctionRemoteValueTest.cs

@@ -177,7 +177,7 @@ public async Task CanCallFunctionAndReturnRegExp()
         var response = await context.Script.CallFunctionAsync("() => { return /foo*/g; }", false);
 
         Assert.That(response.Result, Is.AssignableTo<RegExpRemoteValue>());
-        Assert.That(response.Result, Is.EqualTo(new RegExpRemoteValue(new RegExpRemoteValue.RegExpValue("foo*") { Flags = "g" })));
+        Assert.That(response.Result, Is.EqualTo(new RegExpRemoteValue(new RegExpValue("foo*") { Flags = "g" })));
     }
 
     [Test]