Move Script

Author: nvborisenko

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

@@ -94,20 +94,6 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(Network.FetchErrorEventArgs))]
 [JsonSerializable(typeof(Network.AuthRequiredEventArgs))]
 
-[JsonSerializable(typeof(Script.AddPreloadScriptCommand))]
-[JsonSerializable(typeof(Script.AddPreloadScriptResult))]
-[JsonSerializable(typeof(Script.DisownCommand))]
-[JsonSerializable(typeof(Script.CallFunctionCommand))]
-[JsonSerializable(typeof(Script.EvaluateCommand))]
-[JsonSerializable(typeof(Script.EvaluateResult))]
-[JsonSerializable(typeof(Script.GetRealmsCommand))]
-[JsonSerializable(typeof(Script.GetRealmsResult))]
-[JsonSerializable(typeof(Script.RemovePreloadScriptCommand))]
-
-[JsonSerializable(typeof(Script.MessageEventArgs))]
-[JsonSerializable(typeof(Script.RealmDestroyedEventArgs))]
-[JsonSerializable(typeof(IReadOnlyList<Script.RealmInfo>))]
-
 [JsonSerializable(typeof(Log.LogEntry))]
 
 [JsonSerializable(typeof(Input.PerformActionsCommand))]

dotnet/src/webdriver/BiDi/Script/ScriptModule.cs

@@ -18,8 +18,8 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json;
 using System;
+using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
@@ -28,7 +28,7 @@ namespace OpenQA.Selenium.BiDi.Script;
 
 public sealed class ScriptModule : Module
 {
-    private JsonSerializerContext _jsonContext = null!;
+    private ScriptModuleJsonSerializerContext _jsonContext = null!;
 
     public async Task<EvaluateResult> EvaluateAsync(string expression, bool awaitPromise, Target target, EvaluateOptions? options = null)
     {
@@ -113,6 +113,24 @@ public async Task<Subscription> OnRealmDestroyedAsync(Action<RealmDestroyedEvent
 
     protected internal override void Initialize(JsonSerializerOptions options)
     {
-        _jsonContext = new BiDiJsonSerializerContext(options);
+        _jsonContext = new(options);
     }
 }
+
+[JsonSerializable(typeof(Command))]
+[JsonSerializable(typeof(EmptyResult))]
+
+[JsonSerializable(typeof(AddPreloadScriptCommand))]
+[JsonSerializable(typeof(AddPreloadScriptResult))]
+[JsonSerializable(typeof(DisownCommand))]
+[JsonSerializable(typeof(CallFunctionCommand))]
+[JsonSerializable(typeof(EvaluateCommand))]
+[JsonSerializable(typeof(EvaluateResult))]
+[JsonSerializable(typeof(GetRealmsCommand))]
+[JsonSerializable(typeof(GetRealmsResult))]
+[JsonSerializable(typeof(RemovePreloadScriptCommand))]
+
+[JsonSerializable(typeof(MessageEventArgs))]
+[JsonSerializable(typeof(RealmDestroyedEventArgs))]
+[JsonSerializable(typeof(IReadOnlyList<RealmInfo>))]
+internal partial class ScriptModuleJsonSerializerContext : JsonSerializerContext;

dotnet/src/webdriver/BiDi/WebExtension/WebExtensionModule.cs

@@ -18,7 +18,6 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;