chore: upgrade internal types to support TypeScript 4.9.3 (#19280)

Fixes microsoft/TypeScript#51619

Co-authored-by: Max Schmitt <[email protected]>

Author: dgozman

package-lock.json

@@ -58,7 +58,7 @@
     "@babel/preset-react": "^7.18.6",
     "@types/codemirror": "^5.60.5",
     "@types/formidable": "^2.0.4",
-    "@types/node": "=14.18.24",
+    "@types/node": "=14.18.34",
     "@types/react": "^18.0.12",
     "@types/react-dom": "^18.0.5",
     "@types/resize-observer-browser": "^0.1.7",
@@ -94,7 +94,7 @@
     "rimraf": "^3.0.2",
     "socksv5": "0.0.6",
     "ssim.js": "^3.5.0",
-    "typescript": "^4.7.3",
+    "typescript": "^4.9.3",
     "vite": "^3.2.1",
     "ws": "^8.5.0",
     "xml2js": "^0.4.23",

package.json

@@ -120,6 +120,7 @@ export class FrameExecutionContext extends js.ExecutionContext {
 }
 
 export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
+  __elementhandle: T = true as any;
   declare readonly _context: FrameExecutionContext;
   readonly _page: Page;
   declare readonly _objectId: string;

packages/playwright-core/src/server/dom.ts

@@ -27,10 +27,16 @@ export type RemoteObject = {
   value?: any
 };
 
-type NoHandles<Arg> = Arg extends JSHandle ? never : (Arg extends object ? { [Key in keyof Arg]: NoHandles<Arg[Key]> } : Arg);
+interface TaggedAsJSHandle<T> {
+  __jshandle: T;
+}
+interface TaggedAsElementHandle<T> {
+  __elementhandle: T;
+}
+type NoHandles<Arg> = Arg extends TaggedAsJSHandle<any> ? never : (Arg extends object ? { [Key in keyof Arg]: NoHandles<Arg[Key]> } : Arg);
 type Unboxed<Arg> =
-  Arg extends dom.ElementHandle<infer T> ? T :
-  Arg extends JSHandle<infer T> ? T :
+  Arg extends TaggedAsElementHandle<infer T> ? T :
+  Arg extends TaggedAsJSHandle<infer T> ? T :
   Arg extends NoHandles<Arg> ? Arg :
   Arg extends [infer A0] ? [Unboxed<A0>] :
   Arg extends [infer A0, infer A1] ? [Unboxed<A0>, Unboxed<A1>] :
@@ -129,6 +135,7 @@ export class ExecutionContext extends SdkObject {
 }
 
 export class JSHandle<T = any> extends SdkObject {
+  __jshandle: T = true as any;
   readonly _context: ExecutionContext;
   _disposed = false;
   readonly _objectId: ObjectId | undefined;

packages/playwright-core/src/server/javascript.ts

@@ -29,7 +29,7 @@ export async function queryObjectCount(type: Function): Promise<number> {
       prototypeObjectId: constructorFunction.objectId
     }, (_, result) => f(result))) as any;
 
-    const { result: { value } } = await new Promise(f => session.post('Runtime.callFunctionOn', {
+    const { result: { value } } = await new Promise<any>(f => session.post('Runtime.callFunctionOn', {
       functionDeclaration: 'function (arr) { return this.length; }',
       objectId: instanceArray.objectId,
       arguments: [{ objectId: instanceArray.objectId }],

tests/config/queryObjects.ts

@@ -657,8 +657,7 @@ async function captureLastKeydown(page) {
       lastEvent.key = e.key;
       lastEvent.code = e.code;
       lastEvent.metaKey = e.metaKey;
-      // keyIdentifier only exists in WebKit, and isn't in TypeScript's lib.
-      lastEvent.keyIdentifier = 'keyIdentifier' in e && e['keyIdentifier'];
+      lastEvent.keyIdentifier = 'keyIdentifier' in e && typeof e['keyIdentifier'] === 'string' && e['keyIdentifier'];
     }, true);
     return lastEvent;
   });

tests/page/page-keyboard.spec.ts

@@ -567,6 +567,23 @@ playwright.chromium.launch().then(async browser => {
     const value = await handle.jsonValue();
     const assertion: AssertType<number, typeof value> = true;
   }
+  {
+    const handle = await page.evaluateHandle(() => document.body);
+    const tuple = { s: '', n: 23, h: handle };
+    const value = await page.evaluate(([{ s, n, h }]) => {
+      return parseInt(s) + n + parseInt(h.nodeName);
+    }, [tuple]);
+    const assertion: AssertType<number, typeof value> = true;
+  }
+  {
+    type T = ({ s: string } | playwright.ElementHandle)[];
+    const handle = await page.evaluateHandle(() => document.body);
+    const tuple: T = [{ s: '' }, handle];
+    const value = await page.evaluate(([a, b]) => {
+      return (a instanceof Node ? a.nodeName : a.s) + (b instanceof Node ? b.nodeName : b.s);
+    }, tuple);
+    const assertion: AssertType<string, typeof value> = true;
+  }
 
   {
     const handle = await page.evaluateHandle(() => document.createElement('body'));
@@ -861,3 +878,4 @@ import {
   Geolocation,
   HTTPCredentials,
 } from 'playwright';
+