Refactor ElementHandle (#2850)

kblok · web-flow · commit 1459dbeef956 · 2024-12-26T14:51:06.000-03:00
* Refactor ElementHandle

* roll docs to .net 9

* it's net 8

* Assign before using
diff --git a/.github/workflows/on-push-do-docs.yml b/.github/workflows/on-push-do-docs.yml
@@ -9,7 +9,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Run MarkdownSnippets
       run: |
         dotnet tool install --global MarkdownSnippets.Tool
diff --git a/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs b/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs
@@ -37,13 +37,18 @@ public class CdpElementHandle : ElementHandle
 
     internal CdpElementHandle(
         IsolatedWorld world,
-        RemoteObject remoteObject) : base(world, remoteObject)
+        RemoteObject remoteObject)
     {
         Handle = new CdpJSHandle(world, remoteObject);
         Logger = Realm.Environment.Client.Connection.LoggerFactory.CreateLogger(GetType());
         _cdpFrame = Realm.Frame as CdpFrame;
     }
 
+    /// <inheritdoc />
+    public override RemoteObject RemoteObject => Handle.RemoteObject;
+
+    internal override IsolatedWorld Realm => Handle.Realm;
+
     /// <summary>
     /// Logger.
     /// </summary>
diff --git a/lib/PuppeteerSharp/Cdp/CdpJSHandle.cs b/lib/PuppeteerSharp/Cdp/CdpJSHandle.cs
@@ -31,11 +31,18 @@ namespace PuppeteerSharp.Cdp;
 /// <inheritdoc/>
 public class CdpJSHandle : JSHandle
 {
-    internal CdpJSHandle(IsolatedWorld world, RemoteObject remoteObject) : base(world, remoteObject)
+    internal CdpJSHandle(IsolatedWorld world, RemoteObject remoteObject)
     {
+        Realm = world;
+        RemoteObject = remoteObject;
         Logger = Client.Connection.LoggerFactory.CreateLogger(GetType());
     }
 
+    /// <inheritdoc/>
+    public override RemoteObject RemoteObject { get; }
+
+    internal override IsolatedWorld Realm { get; }
+
     /// <summary>
     /// Logger.
     /// </summary>
diff --git a/lib/PuppeteerSharp/ElementHandle.cs b/lib/PuppeteerSharp/ElementHandle.cs
@@ -19,9 +19,7 @@ public abstract class ElementHandle : JSHandle, IElementHandle
     {
         private ElementHandle _isolatedHandle;
 
-        internal ElementHandle(
-            IsolatedWorld world,
-            RemoteObject remoteObject) : base(world, remoteObject)
+        internal ElementHandle()
         {
         }
 
diff --git a/lib/PuppeteerSharp/JSHandle.cs b/lib/PuppeteerSharp/JSHandle.cs
@@ -9,21 +9,19 @@ namespace PuppeteerSharp
     /// <inheritdoc/>
     public abstract class JSHandle : IJSHandle
     {
-        internal JSHandle(IsolatedWorld world, RemoteObject remoteObject)
+        internal JSHandle()
         {
-            Realm = world;
-            RemoteObject = remoteObject;
         }
 
         /// <inheritdoc/>
         public bool Disposed { get; protected set; }
 
         /// <inheritdoc/>
-        public RemoteObject RemoteObject { get; }
+        public abstract RemoteObject RemoteObject { get; }
 
         internal Func<Task> DisposeAction { get; set; }
 
-        internal IsolatedWorld Realm { get; }
+        internal abstract IsolatedWorld Realm { get; }
 
         internal Frame Frame => Realm.Environment as Frame;
 

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,18 @@ namespace PuppeteerSharp.Cdp;`
`31`	`31`	`/// <inheritdoc/>`
`32`	`32`	`public class CdpJSHandle : JSHandle`
`33`	`33`	`{`
`34`		`- internal CdpJSHandle(IsolatedWorld world, RemoteObject remoteObject) : base(world, remoteObject)`
	`34`	`+ internal CdpJSHandle(IsolatedWorld world, RemoteObject remoteObject)`
`35`	`35`	`{`
	`36`	`+ Realm = world;`
	`37`	`+ RemoteObject = remoteObject;`
`36`	`38`	`Logger = Client.Connection.LoggerFactory.CreateLogger(GetType());`
`37`	`39`	`}`
`38`	`40`
	`41`	`+ /// <inheritdoc/>`
	`42`	`+ public override RemoteObject RemoteObject { get; }`
	`43`	`+`
	`44`	`+ internal override IsolatedWorld Realm { get; }`
	`45`	`+`
`39`	`46`	`/// <summary>`
`40`	`47`	`/// Logger.`
`41`	`48`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,7 @@ public abstract class ElementHandle : JSHandle, IElementHandle`
`19`	`19`	`{`
`20`	`20`	`private ElementHandle _isolatedHandle;`
`21`	`21`
`22`		`- internal ElementHandle(`
`23`		`- IsolatedWorld world,`
`24`		`- RemoteObject remoteObject) : base(world, remoteObject)`
	`22`	`+ internal ElementHandle()`
`25`	`23`	`{`
`26`	`24`	`}`
`27`	`25`
Original file line number	Diff line number	Diff line change
`@@ -9,21 +9,19 @@ namespace PuppeteerSharp`
`9`	`9`	`/// <inheritdoc/>`
`10`	`10`	`public abstract class JSHandle : IJSHandle`
`11`	`11`	`{`
`12`		`- internal JSHandle(IsolatedWorld world, RemoteObject remoteObject)`
	`12`	`+ internal JSHandle()`
`13`	`13`	`{`
`14`		`- Realm = world;`
`15`		`- RemoteObject = remoteObject;`
`16`	`14`	`}`
`17`	`15`
`18`	`16`	`/// <inheritdoc/>`
`19`	`17`	`public bool Disposed { get; protected set; }`
`20`	`18`
`21`	`19`	`/// <inheritdoc/>`
`22`		`- public RemoteObject RemoteObject { get; }`
	`20`	`+ public abstract RemoteObject RemoteObject { get; }`
`23`	`21`
`24`	`22`	`internal Func<Task> DisposeAction { get; set; }`
`25`	`23`
`26`		`- internal IsolatedWorld Realm { get; }`
	`24`	`+ internal abstract IsolatedWorld Realm { get; }`
`27`	`25`
`28`	`26`	`internal Frame Frame => Realm.Environment as Frame;`
`29`	`27`