2019-01-15 04:34:50 +00:00
|
|
|
/**
|
|
|
|
* Copyright 2019 Google Inc. All rights reserved.
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
2022-06-22 13:25:44 +00:00
|
|
|
import {Protocol} from 'devtools-protocol';
|
2022-08-17 12:39:41 +00:00
|
|
|
import {assert} from '../util/assert.js';
|
2022-06-22 13:25:44 +00:00
|
|
|
import {CDPSession} from './Connection.js';
|
2022-08-11 09:45:35 +00:00
|
|
|
import type {ElementHandle} from './ElementHandle.js';
|
2022-06-22 13:25:44 +00:00
|
|
|
import {ExecutionContext} from './ExecutionContext.js';
|
|
|
|
import {MouseButton} from './Input.js';
|
2022-08-11 09:45:35 +00:00
|
|
|
import {EvaluateFunc, HandleFor, HandleOr} from './types.js';
|
|
|
|
import {createJSHandle, releaseObject, valueFromRemoteObject} from './util.js';
|
2022-04-27 21:00:07 +00:00
|
|
|
|
2022-07-06 07:05:37 +00:00
|
|
|
declare const __JSHandleSymbol: unique symbol;
|
|
|
|
|
2021-04-06 08:58:01 +00:00
|
|
|
/**
|
|
|
|
* @public
|
|
|
|
*/
|
2020-06-22 15:21:57 +00:00
|
|
|
export interface BoxModel {
|
2022-05-31 14:34:16 +00:00
|
|
|
content: Point[];
|
|
|
|
padding: Point[];
|
|
|
|
border: Point[];
|
|
|
|
margin: Point[];
|
2020-04-21 11:11:06 +00:00
|
|
|
width: number;
|
|
|
|
height: number;
|
|
|
|
}
|
2019-01-15 04:34:50 +00:00
|
|
|
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
|
|
|
* @public
|
|
|
|
*/
|
2022-05-31 14:34:16 +00:00
|
|
|
export interface BoundingBox extends Point {
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
|
|
|
* the width of the element in pixels.
|
|
|
|
*/
|
|
|
|
width: number;
|
|
|
|
/**
|
|
|
|
* the height of the element in pixels.
|
|
|
|
*/
|
|
|
|
height: number;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* Represents a reference to a JavaScript object. Instances can be created using
|
|
|
|
* {@link Page.evaluateHandle}.
|
|
|
|
*
|
|
|
|
* Handles prevent the referenced JavaScript object from being garbage-collected
|
|
|
|
* unless the handle is purposely {@link JSHandle.dispose | disposed}. JSHandles
|
|
|
|
* are auto-disposed when their associated frame is navigated away or the parent
|
|
|
|
* context gets destroyed.
|
|
|
|
*
|
|
|
|
* Handles can be used as arguments for any evaluation function such as
|
|
|
|
* {@link Page.$eval}, {@link Page.evaluate}, and {@link Page.evaluateHandle}.
|
|
|
|
* They are resolved to their referenced object.
|
2020-06-25 14:49:35 +00:00
|
|
|
*
|
|
|
|
* @example
|
2022-08-12 12:15:26 +00:00
|
|
|
*
|
2022-07-01 11:52:39 +00:00
|
|
|
* ```ts
|
2020-06-25 14:49:35 +00:00
|
|
|
* const windowHandle = await page.evaluateHandle(() => window);
|
|
|
|
* ```
|
|
|
|
*
|
2020-06-22 15:21:57 +00:00
|
|
|
* @public
|
|
|
|
*/
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
export class JSHandle<T = unknown> {
|
2022-07-06 07:05:37 +00:00
|
|
|
/**
|
|
|
|
* Used for nominally typing {@link JSHandle}.
|
|
|
|
*/
|
|
|
|
[__JSHandleSymbol]?: T;
|
|
|
|
|
2022-06-13 09:16:25 +00:00
|
|
|
#disposed = false;
|
|
|
|
#context: ExecutionContext;
|
|
|
|
#remoteObject: Protocol.Runtime.RemoteObject;
|
|
|
|
|
2020-06-30 14:56:37 +00:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
2022-08-11 09:45:35 +00:00
|
|
|
get client(): CDPSession {
|
2022-08-25 15:00:35 +00:00
|
|
|
return this.#context._client;
|
2022-06-13 09:16:25 +00:00
|
|
|
}
|
|
|
|
|
2020-06-30 14:56:37 +00:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
2022-08-11 09:45:35 +00:00
|
|
|
get disposed(): boolean {
|
2022-06-13 09:16:25 +00:00
|
|
|
return this.#disposed;
|
|
|
|
}
|
|
|
|
|
2020-06-30 14:56:37 +00:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
2020-05-07 10:54:55 +00:00
|
|
|
constructor(
|
|
|
|
context: ExecutionContext,
|
|
|
|
remoteObject: Protocol.Runtime.RemoteObject
|
|
|
|
) {
|
2022-06-13 09:16:25 +00:00
|
|
|
this.#context = context;
|
|
|
|
this.#remoteObject = remoteObject;
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
|
2022-08-11 09:45:35 +00:00
|
|
|
/**
|
2022-08-25 15:02:44 +00:00
|
|
|
* @internal
|
2020-06-25 14:49:35 +00:00
|
|
|
*/
|
chore: migrate src/ExecutionContext (#5705)
* chore: migrate src/ExecutionContext to TypeScript
I spent a while trying to decide on the best course of action for
typing the `evaluate` function.
Ideally I wanted to use generics so that as a user you could type
something like:
```
handle.evaluate<HTMLElement, number, boolean>((node, x) => true, 5)
```
And have TypeScript know the arguments of `node` and `x` based on those
generics. But I hit two problems with that:
* you have to have n overloads of `evaluate` to cope for as many number
of arguments as you can be bothered too (e.g. we'd need an overload for
1 arg, 2 args, 3 args, etc)
* I decided it's actually confusing because you don't know as a user
what those generics actually map to.
So in the end I went with one generic which is the return type of the
function:
```
handle.evaluate<boolean>((node, x) => true, 5)
```
And `node` and `x` get typed as `any` which means you can tell TS
yourself:
```
handle.evaluate<boolean>((node: HTMLElement, x: number) => true, 5)
```
I'd like to find a way to force that the arguments after the function do
match the arguments you've given (in the above example, TS would moan if
I swapped that `5` for `"foo"`), but I tried a few things and to be
honest the complexity of the types wasn't worth it, I don't think.
I'm very open to tweaking these but I'd rather ship this and tweak going
forwards rather than spend hours now tweaking. Once we ship these
typedefs and get feedback from the community I'm sure we can improve
them.
2020-04-22 09:33:44 +00:00
|
|
|
executionContext(): ExecutionContext {
|
2022-06-13 09:16:25 +00:00
|
|
|
return this.#context;
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* Evaluates the given function with the current handle as its first argument.
|
2020-06-22 15:21:57 +00:00
|
|
|
*
|
2022-08-11 09:45:35 +00:00
|
|
|
* @see {@link ExecutionContext.evaluate} for more details.
|
2020-06-22 15:21:57 +00:00
|
|
|
*/
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
async evaluate<
|
|
|
|
Params extends unknown[],
|
2022-06-24 06:40:08 +00:00
|
|
|
Func extends EvaluateFunc<[this, ...Params]> = EvaluateFunc<
|
|
|
|
[this, ...Params]
|
|
|
|
>
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
>(
|
|
|
|
pageFunction: Func | string,
|
2022-06-24 06:40:08 +00:00
|
|
|
...args: Params
|
|
|
|
): // @ts-expect-error Circularity here is okay because we only need the return
|
|
|
|
// type which doesn't use `this`.
|
|
|
|
Promise<Awaited<ReturnType<Func>>> {
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
return await this.executionContext().evaluate(pageFunction, this, ...args);
|
2019-09-04 22:19:34 +00:00
|
|
|
}
|
|
|
|
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* Evaluates the given function with the current handle as its first argument.
|
2020-06-22 15:21:57 +00:00
|
|
|
*
|
2022-08-11 09:45:35 +00:00
|
|
|
* @see {@link ExecutionContext.evaluateHandle} for more details.
|
2020-06-22 15:21:57 +00:00
|
|
|
*/
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
async evaluateHandle<
|
|
|
|
Params extends unknown[],
|
2022-06-24 06:40:08 +00:00
|
|
|
Func extends EvaluateFunc<[this, ...Params]> = EvaluateFunc<
|
|
|
|
[this, ...Params]
|
|
|
|
>
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
>(
|
2022-06-27 08:57:31 +00:00
|
|
|
pageFunction: Func | string,
|
2022-06-24 06:40:08 +00:00
|
|
|
...args: Params
|
|
|
|
): // @ts-expect-error Circularity here is okay because we only need the return
|
|
|
|
// type which doesn't use `this`.
|
|
|
|
Promise<HandleFor<Awaited<ReturnType<Func>>>> {
|
2020-05-07 10:54:55 +00:00
|
|
|
return await this.executionContext().evaluateHandle(
|
|
|
|
pageFunction,
|
|
|
|
this,
|
|
|
|
...args
|
|
|
|
);
|
2019-09-04 22:19:34 +00:00
|
|
|
}
|
|
|
|
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
/**
|
|
|
|
* Fetches a single property from the referenced object.
|
2020-06-25 14:49:35 +00:00
|
|
|
*/
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
async getProperty<K extends keyof T>(
|
|
|
|
propertyName: HandleOr<K>
|
|
|
|
): Promise<HandleFor<T[K]>>;
|
|
|
|
async getProperty(propertyName: string): Promise<JSHandle<unknown>>;
|
|
|
|
async getProperty<K extends keyof T>(
|
|
|
|
propertyName: HandleOr<K>
|
|
|
|
): Promise<HandleFor<T[K]>> {
|
2022-08-11 09:45:35 +00:00
|
|
|
return this.evaluateHandle((object, propertyName) => {
|
2022-12-19 14:26:58 +00:00
|
|
|
return object[propertyName as K];
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
}, propertyName);
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* Gets a map of handles representing the properties of the current handle.
|
2020-06-22 15:21:57 +00:00
|
|
|
*
|
|
|
|
* @example
|
2022-08-12 12:15:26 +00:00
|
|
|
*
|
2022-07-01 11:52:39 +00:00
|
|
|
* ```ts
|
2020-06-22 15:21:57 +00:00
|
|
|
* const listHandle = await page.evaluateHandle(() => document.body.children);
|
|
|
|
* const properties = await listHandle.getProperties();
|
|
|
|
* const children = [];
|
|
|
|
* for (const property of properties.values()) {
|
|
|
|
* const element = property.asElement();
|
2022-08-11 09:45:35 +00:00
|
|
|
* if (element) {
|
2020-06-22 15:21:57 +00:00
|
|
|
* children.push(element);
|
2022-08-11 09:45:35 +00:00
|
|
|
* }
|
2020-06-22 15:21:57 +00:00
|
|
|
* }
|
|
|
|
* children; // holds elementHandles to all children of document.body
|
|
|
|
* ```
|
|
|
|
*/
|
2020-04-21 11:11:06 +00:00
|
|
|
async getProperties(): Promise<Map<string, JSHandle>> {
|
2022-06-13 09:16:25 +00:00
|
|
|
assert(this.#remoteObject.objectId);
|
2022-08-11 09:45:35 +00:00
|
|
|
// We use Runtime.getProperties rather than iterative building because the
|
|
|
|
// iterative approach might create a distorted snapshot.
|
2022-08-25 15:00:35 +00:00
|
|
|
const response = await this.client.send('Runtime.getProperties', {
|
2022-06-13 09:16:25 +00:00
|
|
|
objectId: this.#remoteObject.objectId,
|
2020-05-07 10:54:55 +00:00
|
|
|
ownProperties: true,
|
2019-01-15 04:34:50 +00:00
|
|
|
});
|
2020-04-21 11:11:06 +00:00
|
|
|
const result = new Map<string, JSHandle>();
|
2019-01-15 04:34:50 +00:00
|
|
|
for (const property of response.result) {
|
2022-06-14 11:55:35 +00:00
|
|
|
if (!property.enumerable || !property.value) {
|
|
|
|
continue;
|
|
|
|
}
|
2022-06-27 07:24:23 +00:00
|
|
|
result.set(property.name, createJSHandle(this.#context, property.value));
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* @returns A vanilla object representing the serializable portions of the
|
|
|
|
* referenced object.
|
|
|
|
* @throws Throws if the object cannot be serialized due to circularity.
|
2020-06-22 15:21:57 +00:00
|
|
|
*
|
2022-08-11 09:45:35 +00:00
|
|
|
* @remarks
|
2022-08-12 12:15:26 +00:00
|
|
|
* If the object has a `toJSON` function, it **will not** be called.
|
2020-06-22 15:21:57 +00:00
|
|
|
*/
|
2022-08-11 09:45:35 +00:00
|
|
|
async jsonValue(): Promise<T> {
|
|
|
|
if (!this.#remoteObject.objectId) {
|
|
|
|
return valueFromRemoteObject(this.#remoteObject);
|
|
|
|
}
|
|
|
|
const value = await this.evaluate(object => {
|
|
|
|
return object;
|
|
|
|
});
|
|
|
|
if (value === undefined) {
|
|
|
|
throw new Error('Could not serialize referenced object');
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
2022-08-11 09:45:35 +00:00
|
|
|
return value;
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
|
2020-06-25 14:49:35 +00:00
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* @returns Either `null` or the handle itself if the handle is an
|
|
|
|
* instance of {@link ElementHandle}.
|
2020-06-25 14:49:35 +00:00
|
|
|
*/
|
2022-07-06 07:05:37 +00:00
|
|
|
asElement(): ElementHandle<Node> | null {
|
2019-01-15 04:34:50 +00:00
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* Releases the object referenced by the handle for garbage collection.
|
2020-06-22 15:21:57 +00:00
|
|
|
*/
|
2020-04-21 11:11:06 +00:00
|
|
|
async dispose(): Promise<void> {
|
2022-06-14 11:55:35 +00:00
|
|
|
if (this.#disposed) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-13 09:16:25 +00:00
|
|
|
this.#disposed = true;
|
2022-08-25 15:00:35 +00:00
|
|
|
await releaseObject(this.client, this.#remoteObject);
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
|
2020-06-25 14:49:35 +00:00
|
|
|
/**
|
|
|
|
* Returns a string representation of the JSHandle.
|
|
|
|
*
|
2022-08-11 09:45:35 +00:00
|
|
|
* @remarks
|
|
|
|
* Useful during debugging.
|
2020-06-25 14:49:35 +00:00
|
|
|
*/
|
2020-04-21 11:11:06 +00:00
|
|
|
toString(): string {
|
2022-08-11 09:45:35 +00:00
|
|
|
if (!this.#remoteObject.objectId) {
|
|
|
|
return 'JSHandle:' + valueFromRemoteObject(this.#remoteObject);
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
2022-08-11 09:45:35 +00:00
|
|
|
const type = this.#remoteObject.subtype || this.#remoteObject.type;
|
|
|
|
return 'JSHandle@' + type;
|
2022-07-07 13:04:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* Provides access to the
|
|
|
|
* [Protocol.Runtime.RemoteObject](https://chromedevtools.github.io/devtools-protocol/tot/Runtime/#type-RemoteObject)
|
|
|
|
* backing this handle.
|
2022-07-07 13:04:28 +00:00
|
|
|
*/
|
|
|
|
remoteObject(): Protocol.Runtime.RemoteObject {
|
|
|
|
return this.#remoteObject;
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-20 09:01:32 +00:00
|
|
|
/**
|
|
|
|
* @public
|
|
|
|
*/
|
|
|
|
export interface Offset {
|
|
|
|
/**
|
2022-08-30 11:45:59 +00:00
|
|
|
* x-offset for the clickable point relative to the top-left corner of the border box.
|
2021-09-20 09:01:32 +00:00
|
|
|
*/
|
|
|
|
x: number;
|
|
|
|
/**
|
2022-08-30 11:45:59 +00:00
|
|
|
* y-offset for the clickable point relative to the top-left corner of the border box.
|
2021-09-20 09:01:32 +00:00
|
|
|
*/
|
|
|
|
y: number;
|
|
|
|
}
|
|
|
|
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
|
|
|
* @public
|
|
|
|
*/
|
|
|
|
export interface ClickOptions {
|
|
|
|
/**
|
|
|
|
* Time to wait between `mousedown` and `mouseup` in milliseconds.
|
|
|
|
*
|
|
|
|
* @defaultValue 0
|
|
|
|
*/
|
|
|
|
delay?: number;
|
|
|
|
/**
|
|
|
|
* @defaultValue 'left'
|
|
|
|
*/
|
2022-04-27 21:00:07 +00:00
|
|
|
button?: MouseButton;
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
|
|
|
* @defaultValue 1
|
|
|
|
*/
|
|
|
|
clickCount?: number;
|
2021-09-20 09:01:32 +00:00
|
|
|
/**
|
2022-08-30 11:45:59 +00:00
|
|
|
* Offset for the clickable point relative to the top-left corner of the border box.
|
2021-09-20 09:01:32 +00:00
|
|
|
*/
|
|
|
|
offset?: Offset;
|
2020-06-22 15:21:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @public
|
|
|
|
*/
|
|
|
|
export interface PressOptions {
|
|
|
|
/**
|
|
|
|
* Time to wait between `keydown` and `keyup` in milliseconds. Defaults to 0.
|
|
|
|
*/
|
|
|
|
delay?: number;
|
|
|
|
/**
|
|
|
|
* If specified, generates an input event with this text.
|
|
|
|
*/
|
|
|
|
text?: string;
|
|
|
|
}
|
|
|
|
|
2021-06-04 10:25:36 +00:00
|
|
|
/**
|
|
|
|
* @public
|
|
|
|
*/
|
|
|
|
export interface Point {
|
|
|
|
x: number;
|
|
|
|
y: number;
|
|
|
|
}
|