And nested pseudo modules

Author: nvborisenko

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextInputModule.cs

@@ -20,7 +20,6 @@
 using System.Threading.Tasks;
 using OpenQA.Selenium.BiDi.Input;
 using System.Collections.Generic;
-using OpenQA.Selenium.BiDi.Communication;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs

@@ -25,13 +25,11 @@ namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 public sealed class BrowsingContextModule : Module
 {
-    public async Task<BrowsingContext> CreateAsync(ContextType type, CreateOptions? options = null)
+    public async Task<CreateResult> CreateAsync(ContextType type, CreateOptions? options = null)
     {
         var @params = new CreateParameters(type, options?.ReferenceContext, options?.Background, options?.UserContext);
 
-        var createResult = await Broker.ExecuteCommandAsync(new CreateCommand(@params), options, JsonContext.CreateCommand, JsonContext.CreateResult).ConfigureAwait(false);
-
-        return createResult.Context;
+        return await Broker.ExecuteCommandAsync(new CreateCommand(@params), options, JsonContext.CreateCommand, JsonContext.CreateResult).ConfigureAwait(false);
     }
 
     public async Task<NavigateResult> NavigateAsync(BrowsingContext context, string url, NavigateOptions? options = null)

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextNetworkModule.cs

@@ -20,7 +20,6 @@
 using System.Threading.Tasks;
 using System;
 using OpenQA.Selenium.BiDi.Network;
-using OpenQA.Selenium.BiDi.Communication;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextScriptModule.cs

@@ -19,13 +19,12 @@
 
 using System.Threading.Tasks;
 using OpenQA.Selenium.BiDi.Script;
-using System.Collections.Generic;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 public sealed class BrowsingContextScriptModule(BrowsingContext context, ScriptModule scriptModule)
 {
-    public async Task<PreloadScript> AddPreloadScriptAsync(string functionDeclaration, BrowsingContextAddPreloadScriptOptions? options = null)
+    public async Task<AddPreloadScriptResult> AddPreloadScriptAsync(string functionDeclaration, BrowsingContextAddPreloadScriptOptions? options = null)
     {
         AddPreloadScriptOptions addPreloadScriptOptions = new(options)
         {
@@ -35,7 +34,7 @@ public async Task<PreloadScript> AddPreloadScriptAsync(string functionDeclaratio
         return await scriptModule.AddPreloadScriptAsync(functionDeclaration, addPreloadScriptOptions).ConfigureAwait(false);
     }
 
-    public async Task<IReadOnlyList<RealmInfo>> GetRealmsAsync(GetRealmsOptions? options = null)
+    public async Task<GetRealmsResult> GetRealmsAsync(GetRealmsOptions? options = null)
     {
         options ??= new();
 

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

@@ -51,4 +51,4 @@ public sealed record BrowsingContextAddPreloadScriptOptions
     public string? Sandbox { get; set; }
 }
 
-internal sealed record AddPreloadScriptResult(PreloadScript Script) : EmptyResult;
+public sealed record AddPreloadScriptResult(PreloadScript Script) : EmptyResult;

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

@@ -68,13 +68,11 @@ public async Task<GetRealmsResult> GetRealmsAsync(GetRealmsOptions? options = nu
         return await Broker.ExecuteCommandAsync(new GetRealmsCommand(@params), options, JsonContext.GetRealmsCommand, JsonContext.GetRealmsResult).ConfigureAwait(false);
     }
 
-    public async Task<PreloadScript> AddPreloadScriptAsync(string functionDeclaration, AddPreloadScriptOptions? options = null)
+    public async Task<AddPreloadScriptResult> AddPreloadScriptAsync(string functionDeclaration, AddPreloadScriptOptions? options = null)
     {
         var @params = new AddPreloadScriptParameters(functionDeclaration, options?.Arguments, options?.Contexts, options?.Sandbox);
 
-        var result = await Broker.ExecuteCommandAsync(new AddPreloadScriptCommand(@params), options, JsonContext.AddPreloadScriptCommand, JsonContext.AddPreloadScriptResult).ConfigureAwait(false);
-
-        return result.Script;
+        return await Broker.ExecuteCommandAsync(new AddPreloadScriptCommand(@params), options, JsonContext.AddPreloadScriptCommand, JsonContext.AddPreloadScriptResult).ConfigureAwait(false);
     }
 
     public async Task<RemovePreloadScriptResult> RemovePreloadScriptAsync(PreloadScript script, RemovePreloadScriptOptions? options = null)

dotnet/test/common/BiDi/BrowsingContext/BrowsingContextTest.cs

@@ -139,7 +139,7 @@ public async Task CanCloseWindow()
     {
         var window = await bidi.BrowsingContext.CreateAsync(ContextType.Window);
 
-        await window.CloseAsync();
+        await window.Context.CloseAsync();
 
         var tree = await bidi.BrowsingContext.GetTreeAsync();
 
@@ -151,7 +151,7 @@ public async Task CanCloseTab()
     {
         var tab = await bidi.BrowsingContext.CreateAsync(ContextType.Tab);
 
-        await tab.CloseAsync();
+        await tab.Context.CloseAsync();
 
         var tree = await bidi.BrowsingContext.GetTreeAsync();
 

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

@@ -64,25 +64,25 @@ public async Task CanGetRealmInBrowsingContext()
     {
         var tab = await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Tab);
 
-        var realms = await tab.Script.GetRealmsAsync();
+        var realms = await tab.Context.Script.GetRealmsAsync();
 
         var tabRealm = realms[0] as WindowRealmInfo;
 
         Assert.That(tabRealm, Is.Not.Null);
-        Assert.That(tabRealm.Context, Is.EqualTo(tab));
+        Assert.That(tabRealm.Context, Is.EqualTo(tab.Context));
     }
 
     [Test]
     public async Task CanGetRealmInBrowsingContextByType()
     {
         var tab = await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Tab);
 
-        var realms = await tab.Script.GetRealmsAsync(new() { Type = RealmType.Window });
+        var realms = await tab.Context.Script.GetRealmsAsync(new() { Type = RealmType.Window });
 
         var tabRealm = realms[0] as WindowRealmInfo;
 
         Assert.That(tabRealm, Is.Not.Null);
-        Assert.That(tabRealm.Context, Is.EqualTo(tab));
+        Assert.That(tabRealm.Context, Is.EqualTo(tab.Context));
     }
 
     [Test]
@@ -159,7 +159,7 @@ public async Task CanRemovePreloadedScript()
 
         Assert.That(bar, Is.EqualTo(2));
 
-        await preloadScript.RemoveAsync();
+        await preloadScript.Script.RemoveAsync();
 
         var resultAfterRemoval = await context.Script.EvaluateAsync("window.bar", true, targetOptions: new() { Sandbox = "sandbox" });
 

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

@@ -71,7 +71,7 @@ public async Task CanListenToRealmDestroyedEvent()
         await bidi.Script.OnRealmDestroyedAsync(tcs.SetResult);
 
         var ctx = await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Window);
-        await ctx.CloseAsync();
+        await ctx.Context.CloseAsync();
 
         var args = await tcs.Task.WaitAsync(TimeSpan.FromSeconds(5));