2020-04-30 11:45:52 +00:00
|
|
|
/**
|
|
|
|
* Copyright 2020 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.
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
import {ariaHandler} from './AriaQueryHandler.js';
|
2022-08-09 13:17:42 +00:00
|
|
|
import {IsolatedWorld, WaitForSelectorOptions} from './IsolatedWorld.js';
|
2022-06-23 09:31:43 +00:00
|
|
|
import {ElementHandle} from './ElementHandle.js';
|
2022-07-06 07:05:37 +00:00
|
|
|
import {JSHandle} from './JSHandle.js';
|
2020-09-23 14:02:22 +00:00
|
|
|
|
2022-08-04 13:45:21 +00:00
|
|
|
/**
|
|
|
|
* @public
|
|
|
|
*/
|
|
|
|
export interface CustomQueryHandler {
|
|
|
|
/**
|
2022-08-10 21:34:29 +00:00
|
|
|
* @returns A {@link Node} matching the given `selector` from {@link node}.
|
2022-08-04 13:45:21 +00:00
|
|
|
*/
|
|
|
|
queryOne?: (node: Node, selector: string) => Node | null;
|
|
|
|
/**
|
2022-08-10 21:34:29 +00:00
|
|
|
* @returns Some {@link Node}s matching the given `selector` from {@link node}.
|
2022-08-04 13:45:21 +00:00
|
|
|
*/
|
|
|
|
queryAll?: (node: Node, selector: string) => Node[];
|
|
|
|
}
|
|
|
|
|
2020-09-23 14:02:22 +00:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
2020-10-05 06:25:55 +00:00
|
|
|
export interface InternalQueryHandler {
|
2022-08-04 13:45:21 +00:00
|
|
|
/**
|
|
|
|
* Queries for a single node given a selector and {@link ElementHandle}.
|
|
|
|
*
|
|
|
|
* Akin to {@link Window.prototype.querySelector}.
|
|
|
|
*/
|
2020-09-23 14:02:22 +00:00
|
|
|
queryOne?: (
|
2022-07-06 07:05:37 +00:00
|
|
|
element: ElementHandle<Node>,
|
|
|
|
selector: string
|
|
|
|
) => Promise<ElementHandle<Node> | null>;
|
2022-08-04 13:45:21 +00:00
|
|
|
/**
|
|
|
|
* Queries for multiple nodes given a selector and {@link ElementHandle}.
|
|
|
|
*
|
|
|
|
* Akin to {@link Window.prototype.querySelectorAll}.
|
|
|
|
*/
|
2022-07-06 07:05:37 +00:00
|
|
|
queryAll?: (
|
|
|
|
element: ElementHandle<Node>,
|
2020-09-23 14:02:22 +00:00
|
|
|
selector: string
|
2022-07-06 07:05:37 +00:00
|
|
|
) => Promise<Array<ElementHandle<Node>>>;
|
2022-08-04 13:45:21 +00:00
|
|
|
/**
|
|
|
|
* Queries for multiple nodes given a selector and {@link ElementHandle}.
|
|
|
|
* Unlike {@link queryAll}, this returns a handle to a node array.
|
|
|
|
*
|
|
|
|
* Akin to {@link Window.prototype.querySelectorAll}.
|
|
|
|
*/
|
|
|
|
queryAllArray?: (
|
|
|
|
element: ElementHandle<Node>,
|
|
|
|
selector: string
|
|
|
|
) => Promise<JSHandle<Node[]>>;
|
2022-08-10 21:34:29 +00:00
|
|
|
|
2022-08-04 13:45:21 +00:00
|
|
|
/**
|
|
|
|
* Waits until a single node appears for a given selector and
|
|
|
|
* {@link ElementHandle}.
|
|
|
|
*
|
|
|
|
* Akin to {@link Window.prototype.querySelectorAll}.
|
|
|
|
*/
|
2020-09-23 14:02:22 +00:00
|
|
|
waitFor?: (
|
2022-08-09 13:17:42 +00:00
|
|
|
isolatedWorld: IsolatedWorld,
|
2020-09-23 14:02:22 +00:00
|
|
|
selector: string,
|
|
|
|
options: WaitForSelectorOptions
|
2022-07-06 07:05:37 +00:00
|
|
|
) => Promise<ElementHandle<Node> | null>;
|
2020-09-23 14:02:22 +00:00
|
|
|
}
|
|
|
|
|
2022-08-04 13:45:21 +00:00
|
|
|
function internalizeCustomQueryHandler(
|
2022-07-06 07:05:37 +00:00
|
|
|
handler: CustomQueryHandler
|
|
|
|
): InternalQueryHandler {
|
2020-09-23 14:02:22 +00:00
|
|
|
const internalHandler: InternalQueryHandler = {};
|
|
|
|
|
|
|
|
if (handler.queryOne) {
|
2022-05-31 14:34:16 +00:00
|
|
|
const queryOne = handler.queryOne;
|
2020-09-23 14:02:22 +00:00
|
|
|
internalHandler.queryOne = async (element, selector) => {
|
2022-05-31 14:34:16 +00:00
|
|
|
const jsHandle = await element.evaluateHandle(queryOne, selector);
|
2020-09-23 14:02:22 +00:00
|
|
|
const elementHandle = jsHandle.asElement();
|
2022-06-14 11:55:35 +00:00
|
|
|
if (elementHandle) {
|
|
|
|
return elementHandle;
|
|
|
|
}
|
2020-09-23 14:02:22 +00:00
|
|
|
await jsHandle.dispose();
|
|
|
|
return null;
|
|
|
|
};
|
|
|
|
internalHandler.waitFor = (
|
2022-08-10 21:34:29 +00:00
|
|
|
domWorld: IsolatedWorld,
|
2020-09-23 14:02:22 +00:00
|
|
|
selector: string,
|
|
|
|
options: WaitForSelectorOptions
|
2022-06-15 10:42:21 +00:00
|
|
|
) => {
|
2022-08-10 21:34:29 +00:00
|
|
|
return domWorld._waitForSelectorInPage(queryOne, selector, options);
|
2022-06-15 10:42:21 +00:00
|
|
|
};
|
2020-09-23 14:02:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (handler.queryAll) {
|
2022-05-31 14:34:16 +00:00
|
|
|
const queryAll = handler.queryAll;
|
2020-09-23 14:02:22 +00:00
|
|
|
internalHandler.queryAll = async (element, selector) => {
|
2022-05-31 14:34:16 +00:00
|
|
|
const jsHandle = await element.evaluateHandle(queryAll, selector);
|
2020-09-23 14:02:22 +00:00
|
|
|
const properties = await jsHandle.getProperties();
|
|
|
|
await jsHandle.dispose();
|
|
|
|
const result = [];
|
|
|
|
for (const property of properties.values()) {
|
|
|
|
const elementHandle = property.asElement();
|
2022-06-14 11:55:35 +00:00
|
|
|
if (elementHandle) {
|
|
|
|
result.push(elementHandle);
|
|
|
|
}
|
2020-09-23 14:02:22 +00:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
};
|
|
|
|
internalHandler.queryAllArray = async (element, selector) => {
|
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
|
|
|
const resultHandle = (await element.evaluateHandle(
|
|
|
|
queryAll,
|
|
|
|
selector
|
|
|
|
)) as JSHandle<Element[] | NodeListOf<Element>>;
|
|
|
|
const arrayHandle = await resultHandle.evaluateHandle(res => {
|
|
|
|
return Array.from(res);
|
|
|
|
});
|
2020-09-23 14:02:22 +00:00
|
|
|
return arrayHandle;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
return internalHandler;
|
|
|
|
}
|
|
|
|
|
2022-08-04 13:45:21 +00:00
|
|
|
const defaultHandler = internalizeCustomQueryHandler({
|
2022-07-06 07:05:37 +00:00
|
|
|
queryOne: (element, selector) => {
|
|
|
|
if (!('querySelector' in element)) {
|
|
|
|
throw new Error(
|
|
|
|
`Could not invoke \`querySelector\` on node of type ${element.nodeName}.`
|
|
|
|
);
|
|
|
|
}
|
|
|
|
return (
|
|
|
|
element as unknown as {querySelector(selector: string): Element}
|
|
|
|
).querySelector(selector);
|
2022-06-15 10:42:21 +00:00
|
|
|
},
|
2022-07-06 07:05:37 +00:00
|
|
|
queryAll: (element, selector) => {
|
|
|
|
if (!('querySelectorAll' in element)) {
|
|
|
|
throw new Error(
|
|
|
|
`Could not invoke \`querySelectorAll\` on node of type ${element.nodeName}.`
|
|
|
|
);
|
|
|
|
}
|
|
|
|
return [
|
|
|
|
...(
|
|
|
|
element as unknown as {
|
|
|
|
querySelectorAll(selector: string): NodeList;
|
|
|
|
}
|
|
|
|
).querySelectorAll(selector),
|
|
|
|
];
|
2022-06-15 10:42:21 +00:00
|
|
|
},
|
2020-09-23 14:02:22 +00:00
|
|
|
});
|
2020-04-30 11:45:52 +00:00
|
|
|
|
2022-08-04 13:45:21 +00:00
|
|
|
const pierceHandler = internalizeCustomQueryHandler({
|
2020-10-13 09:05:47 +00:00
|
|
|
queryOne: (element, selector) => {
|
2022-07-06 07:05:37 +00:00
|
|
|
let found: Node | null = null;
|
|
|
|
const search = (root: Node) => {
|
2020-10-13 09:05:47 +00:00
|
|
|
const iter = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT);
|
|
|
|
do {
|
|
|
|
const currentNode = iter.currentNode as HTMLElement;
|
|
|
|
if (currentNode.shadowRoot) {
|
|
|
|
search(currentNode.shadowRoot);
|
|
|
|
}
|
|
|
|
if (currentNode instanceof ShadowRoot) {
|
|
|
|
continue;
|
|
|
|
}
|
2022-05-11 12:17:02 +00:00
|
|
|
if (currentNode !== root && !found && currentNode.matches(selector)) {
|
2020-10-13 09:05:47 +00:00
|
|
|
found = currentNode;
|
|
|
|
}
|
|
|
|
} while (!found && iter.nextNode());
|
|
|
|
};
|
|
|
|
if (element instanceof Document) {
|
|
|
|
element = element.documentElement;
|
|
|
|
}
|
|
|
|
search(element);
|
|
|
|
return found;
|
|
|
|
},
|
|
|
|
|
|
|
|
queryAll: (element, selector) => {
|
2022-07-06 07:05:37 +00:00
|
|
|
const result: Node[] = [];
|
|
|
|
const collect = (root: Node) => {
|
2020-10-13 09:05:47 +00:00
|
|
|
const iter = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT);
|
|
|
|
do {
|
|
|
|
const currentNode = iter.currentNode as HTMLElement;
|
|
|
|
if (currentNode.shadowRoot) {
|
|
|
|
collect(currentNode.shadowRoot);
|
|
|
|
}
|
|
|
|
if (currentNode instanceof ShadowRoot) {
|
|
|
|
continue;
|
|
|
|
}
|
2022-05-11 12:17:02 +00:00
|
|
|
if (currentNode !== root && currentNode.matches(selector)) {
|
2020-10-13 09:05:47 +00:00
|
|
|
result.push(currentNode);
|
|
|
|
}
|
|
|
|
} while (iter.nextNode());
|
|
|
|
};
|
|
|
|
if (element instanceof Document) {
|
|
|
|
element = element.documentElement;
|
|
|
|
}
|
|
|
|
collect(element);
|
|
|
|
return result;
|
|
|
|
},
|
|
|
|
});
|
|
|
|
|
2022-08-04 13:45:21 +00:00
|
|
|
const xpathHandler = internalizeCustomQueryHandler({
|
|
|
|
queryOne: (element, selector) => {
|
|
|
|
const doc = element.ownerDocument || document;
|
|
|
|
const result = doc.evaluate(
|
|
|
|
selector,
|
|
|
|
element,
|
|
|
|
null,
|
|
|
|
XPathResult.FIRST_ORDERED_NODE_TYPE
|
|
|
|
);
|
|
|
|
return result.singleNodeValue;
|
|
|
|
},
|
|
|
|
|
|
|
|
queryAll: (element, selector) => {
|
|
|
|
const doc = element.ownerDocument || document;
|
|
|
|
const iterator = doc.evaluate(
|
|
|
|
selector,
|
|
|
|
element,
|
|
|
|
null,
|
|
|
|
XPathResult.ORDERED_NODE_ITERATOR_TYPE
|
|
|
|
);
|
|
|
|
const array: Node[] = [];
|
|
|
|
let item;
|
|
|
|
while ((item = iterator.iterateNext())) {
|
|
|
|
array.push(item);
|
|
|
|
}
|
|
|
|
return array;
|
|
|
|
},
|
|
|
|
});
|
|
|
|
|
|
|
|
interface RegisteredQueryHandler {
|
|
|
|
handler: InternalQueryHandler;
|
|
|
|
transformSelector?: (selector: string) => string;
|
|
|
|
}
|
|
|
|
|
|
|
|
const INTERNAL_QUERY_HANDLERS = new Map<string, RegisteredQueryHandler>([
|
|
|
|
['aria', {handler: ariaHandler}],
|
|
|
|
['pierce', {handler: pierceHandler}],
|
|
|
|
['xpath', {handler: xpathHandler}],
|
2020-10-13 09:05:47 +00:00
|
|
|
]);
|
2022-08-04 13:45:21 +00:00
|
|
|
const QUERY_HANDLERS = new Map<string, RegisteredQueryHandler>();
|
2020-10-05 06:25:55 +00:00
|
|
|
|
2020-10-07 08:43:46 +00:00
|
|
|
/**
|
2022-06-27 07:24:23 +00:00
|
|
|
* Registers a {@link CustomQueryHandler | custom query handler}.
|
|
|
|
*
|
|
|
|
* @remarks
|
|
|
|
* After registration, the handler can be used everywhere where a selector is
|
|
|
|
* expected by prepending the selection string with `<name>/`. The name is only
|
|
|
|
* allowed to consist of lower- and upper case latin letters.
|
|
|
|
*
|
|
|
|
* @example
|
|
|
|
* ```
|
|
|
|
* puppeteer.registerCustomQueryHandler('text', { … });
|
|
|
|
* const aHandle = await page.$('text/…');
|
|
|
|
* ```
|
|
|
|
*
|
|
|
|
* @param name - The name that the custom query handler will be registered
|
|
|
|
* under.
|
|
|
|
* @param queryHandler - The {@link CustomQueryHandler | custom query handler}
|
|
|
|
* to register.
|
|
|
|
*
|
|
|
|
* @public
|
2020-10-07 08:43:46 +00:00
|
|
|
*/
|
2022-06-27 07:24:23 +00:00
|
|
|
export function registerCustomQueryHandler(
|
2020-05-07 10:54:55 +00:00
|
|
|
name: string,
|
2020-09-23 14:02:22 +00:00
|
|
|
handler: CustomQueryHandler
|
2020-05-07 10:54:55 +00:00
|
|
|
): void {
|
2022-08-04 13:45:21 +00:00
|
|
|
if (INTERNAL_QUERY_HANDLERS.has(name)) {
|
|
|
|
throw new Error(`A query handler named "${name}" already exists`);
|
|
|
|
}
|
|
|
|
if (QUERY_HANDLERS.has(name)) {
|
2020-04-30 11:45:52 +00:00
|
|
|
throw new Error(`A custom query handler named "${name}" already exists`);
|
2022-06-14 11:55:35 +00:00
|
|
|
}
|
2020-04-30 11:45:52 +00:00
|
|
|
|
|
|
|
const isValidName = /^[a-zA-Z]+$/.test(name);
|
2022-06-14 11:55:35 +00:00
|
|
|
if (!isValidName) {
|
2020-04-30 11:45:52 +00:00
|
|
|
throw new Error(`Custom query handler names may only contain [a-zA-Z]`);
|
2022-06-14 11:55:35 +00:00
|
|
|
}
|
2020-04-30 11:45:52 +00:00
|
|
|
|
2022-08-04 13:45:21 +00:00
|
|
|
QUERY_HANDLERS.set(name, {handler: internalizeCustomQueryHandler(handler)});
|
2020-04-30 11:45:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2022-06-27 07:24:23 +00:00
|
|
|
* @param name - The name of the query handler to unregistered.
|
|
|
|
*
|
|
|
|
* @public
|
2020-04-30 11:45:52 +00:00
|
|
|
*/
|
2022-06-27 07:24:23 +00:00
|
|
|
export function unregisterCustomQueryHandler(name: string): void {
|
2022-08-04 13:45:21 +00:00
|
|
|
QUERY_HANDLERS.delete(name);
|
2020-04-30 11:45:52 +00:00
|
|
|
}
|
|
|
|
|
2020-10-07 08:43:46 +00:00
|
|
|
/**
|
2022-06-27 07:24:23 +00:00
|
|
|
* @returns a list with the names of all registered custom query handlers.
|
|
|
|
*
|
|
|
|
* @public
|
2020-10-07 08:43:46 +00:00
|
|
|
*/
|
2022-06-27 07:24:23 +00:00
|
|
|
export function customQueryHandlerNames(): string[] {
|
2022-08-04 13:45:21 +00:00
|
|
|
return [...QUERY_HANDLERS.keys()];
|
2020-04-30 11:45:52 +00:00
|
|
|
}
|
|
|
|
|
2020-10-07 08:43:46 +00:00
|
|
|
/**
|
2022-06-27 07:24:23 +00:00
|
|
|
* Clears all registered handlers.
|
|
|
|
*
|
|
|
|
* @public
|
2020-10-07 08:43:46 +00:00
|
|
|
*/
|
2022-06-27 07:24:23 +00:00
|
|
|
export function clearCustomQueryHandlers(): void {
|
2022-08-04 13:45:21 +00:00
|
|
|
QUERY_HANDLERS.clear();
|
2020-04-30 11:45:52 +00:00
|
|
|
}
|
|
|
|
|
2022-08-04 13:45:21 +00:00
|
|
|
const CUSTOM_QUERY_SEPARATORS = ['=', '/'];
|
|
|
|
|
2020-10-07 08:43:46 +00:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
2022-06-27 07:24:23 +00:00
|
|
|
export function getQueryHandlerAndSelector(selector: string): {
|
2021-05-12 14:48:30 +00:00
|
|
|
updatedSelector: string;
|
|
|
|
queryHandler: InternalQueryHandler;
|
|
|
|
} {
|
2022-08-04 13:45:21 +00:00
|
|
|
for (const handlerMap of [QUERY_HANDLERS, INTERNAL_QUERY_HANDLERS]) {
|
|
|
|
for (const [
|
|
|
|
name,
|
|
|
|
{handler: queryHandler, transformSelector},
|
|
|
|
] of handlerMap) {
|
|
|
|
for (const separator of CUSTOM_QUERY_SEPARATORS) {
|
|
|
|
const prefix = `${name}${separator}`;
|
|
|
|
if (selector.startsWith(prefix)) {
|
|
|
|
selector = selector.slice(prefix.length);
|
|
|
|
if (transformSelector) {
|
|
|
|
selector = transformSelector(selector);
|
|
|
|
}
|
|
|
|
return {updatedSelector: selector, queryHandler};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2022-06-14 11:55:35 +00:00
|
|
|
}
|
2022-08-04 13:45:21 +00:00
|
|
|
return {updatedSelector: selector, queryHandler: defaultHandler};
|
2020-04-30 11:45:52 +00:00
|
|
|
}
|