chore: infer ElementHandle constructor params (#8843)

puppeteer · Aug 25, 2022 · d070a73 · d070a73
1 parent 744a6e0
commit d070a73
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/src/common/ElementHandle.ts b/src/common/ElementHandle.ts
@@ -71,23 +71,25 @@ export class ElementHandle<
   ElementType extends Node = Element
 > extends JSHandle<ElementType> {
   #frame: Frame;
-  #page: Page;
-  #frameManager: FrameManager;
 
   /**
    * @internal
    */
   constructor(
     context: ExecutionContext,
     remoteObject: Protocol.Runtime.RemoteObject,
-    frame: Frame,
-    page: Page,
-    frameManager: FrameManager
+    frame: Frame
   ) {
     super(context, remoteObject);
     this.#frame = frame;
-    this.#page = page;
-    this.#frameManager = frameManager;
+  }
+
+  get #frameManager(): FrameManager {
+    return this.#frame._frameManager;
+  }
+
+  get #page(): Page {
+    return this.#frame.page();
   }
 
   /**

diff --git a/src/common/util.ts b/src/common/util.ts
@@ -18,13 +18,14 @@ import {Protocol} from 'devtools-protocol';
 import type {Readable} from 'stream';
 import {isNode} from '../environment.js';
 import {assert} from '../util/assert.js';
+import {isErrorLike} from '../util/ErrorLike.js';
 import {CDPSession} from './Connection.js';
 import {debug} from './Debug.js';
 import {ElementHandle} from './ElementHandle.js';
-import {isErrorLike} from '../util/ErrorLike.js';
 import {TimeoutError} from './Errors.js';
 import {CommonEventEmitter} from './EventEmitter.js';
 import {ExecutionContext} from './ExecutionContext.js';
+import {Frame} from './Frame.js';
 import {JSHandle} from './JSHandle.js';
 
 /**
@@ -218,15 +219,8 @@ export function createJSHandle(
   remoteObject: Protocol.Runtime.RemoteObject
 ): JSHandle | ElementHandle<Node> {
   const frame = context.frame();
-  if (remoteObject.subtype === 'node' && frame) {
-    const frameManager = frame._frameManager;
-    return new ElementHandle(
-      context,
-      remoteObject,
-      frame,
-      frameManager.page(),
-      frameManager
-    );
+  if (remoteObject.subtype === 'node' && frame instanceof Frame) {
+    return new ElementHandle(context, remoteObject, frame);
   }
   return new JSHandle(context, remoteObject);
 }