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.
|
|
|
|
*/
|
|
|
|
|
2022-09-15 11:12:13 +00:00
|
|
|
import PuppeteerUtil from '../injected/injected.js';
|
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-06-23 09:31:43 +00:00
|
|
|
import {ElementHandle} from './ElementHandle.js';
|
2022-08-26 10:55:30 +00:00
|
|
|
import {Frame} from './Frame.js';
|
2022-11-10 16:11:18 +00:00
|
|
|
import {WaitForSelectorOptions} from './IsolatedWorld.js';
|
|
|
|
import {MAIN_WORLD, PUPPETEER_WORLD} from './IsolatedWorlds.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[];
|
|
|
|
}
|
|
|
|
|
2022-09-15 11:12:13 +00:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
|
|
|
export interface InternalQueryHandler {
|
|
|
|
/**
|
|
|
|
* @returns A {@link Node} matching the given `selector` from {@link node}.
|
|
|
|
*/
|
|
|
|
queryOne?: (
|
|
|
|
node: Node,
|
|
|
|
selector: string,
|
|
|
|
PuppeteerUtil: PuppeteerUtil
|
|
|
|
) => Node | null;
|
|
|
|
/**
|
|
|
|
* @returns Some {@link Node}s matching the given `selector` from {@link node}.
|
|
|
|
*/
|
|
|
|
queryAll?: (
|
|
|
|
node: Node,
|
|
|
|
selector: string,
|
|
|
|
PuppeteerUtil: PuppeteerUtil
|
|
|
|
) => Node[];
|
|
|
|
}
|
|
|
|
|
2020-09-23 14:02:22 +00:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
2022-09-15 06:48:59 +00:00
|
|
|
export interface PuppeteerQueryHandler {
|
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-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}.
|
|
|
|
*/
|
2020-09-23 14:02:22 +00:00
|
|
|
waitFor?: (
|
2022-08-26 10:55:30 +00:00
|
|
|
elementOrFrame: ElementHandle<Node> | Frame,
|
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-09-15 06:48:59 +00:00
|
|
|
function createPuppeteerQueryHandler(
|
2022-09-15 11:12:13 +00:00
|
|
|
handler: InternalQueryHandler
|
2022-09-15 06:48:59 +00:00
|
|
|
): PuppeteerQueryHandler {
|
|
|
|
const internalHandler: PuppeteerQueryHandler = {};
|
2020-09-23 14:02:22 +00:00
|
|
|
|
|
|
|
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-09-15 11:12:13 +00:00
|
|
|
const jsHandle = await element.evaluateHandle(
|
|
|
|
queryOne,
|
|
|
|
selector,
|
|
|
|
await element.executionContext()._world!.puppeteerUtil
|
|
|
|
);
|
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;
|
|
|
|
};
|
2022-08-26 10:55:30 +00:00
|
|
|
internalHandler.waitFor = async (elementOrFrame, selector, options) => {
|
|
|
|
let frame: Frame;
|
|
|
|
let element: ElementHandle<Node> | undefined;
|
|
|
|
if (elementOrFrame instanceof Frame) {
|
|
|
|
frame = elementOrFrame;
|
|
|
|
} else {
|
|
|
|
frame = elementOrFrame.frame;
|
|
|
|
element = await frame.worlds[PUPPETEER_WORLD].adoptHandle(
|
|
|
|
elementOrFrame
|
|
|
|
);
|
|
|
|
}
|
|
|
|
const result = await frame.worlds[PUPPETEER_WORLD]._waitForSelectorInPage(
|
|
|
|
queryOne,
|
|
|
|
element,
|
|
|
|
selector,
|
|
|
|
options
|
|
|
|
);
|
|
|
|
if (element) {
|
|
|
|
await element.dispose();
|
|
|
|
}
|
|
|
|
if (!result) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
if (!(result instanceof ElementHandle)) {
|
|
|
|
await result.dispose();
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
return frame.worlds[MAIN_WORLD].transferHandle(result);
|
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-09-15 11:12:13 +00:00
|
|
|
const jsHandle = await element.evaluateHandle(
|
|
|
|
queryAll,
|
|
|
|
selector,
|
|
|
|
await element.executionContext()._world!.puppeteerUtil
|
|
|
|
);
|
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;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
return internalHandler;
|
|
|
|
}
|
|
|
|
|
2022-09-15 06:48:59 +00:00
|
|
|
const defaultHandler = createPuppeteerQueryHandler({
|
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-09-15 06:48:59 +00:00
|
|
|
const pierceHandler = createPuppeteerQueryHandler({
|
2022-09-19 11:22:10 +00:00
|
|
|
queryOne: (element, selector, {pierceQuerySelector}) => {
|
|
|
|
return pierceQuerySelector(element, selector);
|
2020-10-13 09:05:47 +00:00
|
|
|
},
|
2022-09-19 11:22:10 +00:00
|
|
|
queryAll: (element, selector, {pierceQuerySelectorAll}) => {
|
|
|
|
return pierceQuerySelectorAll(element, selector);
|
2020-10-13 09:05:47 +00:00
|
|
|
},
|
|
|
|
});
|
|
|
|
|
2022-09-15 06:48:59 +00:00
|
|
|
const xpathHandler = createPuppeteerQueryHandler({
|
2022-09-19 11:22:10 +00:00
|
|
|
queryOne: (element, selector, {xpathQuerySelector}) => {
|
|
|
|
return xpathQuerySelector(element, selector);
|
2022-08-04 13:45:21 +00:00
|
|
|
},
|
2022-09-19 11:22:10 +00:00
|
|
|
queryAll: (element, selector, {xpathQuerySelectorAll}) => {
|
|
|
|
return xpathQuerySelectorAll(element, selector);
|
2022-08-04 13:45:21 +00:00
|
|
|
},
|
|
|
|
});
|
|
|
|
|
2022-09-15 11:12:13 +00:00
|
|
|
const textQueryHandler = createPuppeteerQueryHandler({
|
2022-09-15 16:48:55 +00:00
|
|
|
queryOne: (element, selector, {textQuerySelector}) => {
|
2022-09-19 11:22:10 +00:00
|
|
|
return textQuerySelector(element, selector);
|
2022-09-15 11:12:13 +00:00
|
|
|
},
|
2022-09-15 16:48:55 +00:00
|
|
|
queryAll: (element, selector, {textQuerySelectorAll}) => {
|
2022-09-19 11:22:10 +00:00
|
|
|
return textQuerySelectorAll(element, selector);
|
2022-09-15 11:12:13 +00:00
|
|
|
},
|
|
|
|
});
|
|
|
|
|
2022-08-04 13:45:21 +00:00
|
|
|
interface RegisteredQueryHandler {
|
2022-09-15 06:48:59 +00:00
|
|
|
handler: PuppeteerQueryHandler;
|
2022-08-04 13:45:21 +00:00
|
|
|
transformSelector?: (selector: string) => string;
|
|
|
|
}
|
|
|
|
|
|
|
|
const INTERNAL_QUERY_HANDLERS = new Map<string, RegisteredQueryHandler>([
|
|
|
|
['aria', {handler: ariaHandler}],
|
|
|
|
['pierce', {handler: pierceHandler}],
|
|
|
|
['xpath', {handler: xpathHandler}],
|
2022-09-15 11:12:13 +00:00
|
|
|
['text', {handler: textQueryHandler}],
|
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-10-10 14:01:09 +00:00
|
|
|
* @deprecated Import {@link Puppeteer} and use the static method
|
|
|
|
* {@link Puppeteer.registerCustomQueryHandler}
|
2022-06-27 07:24:23 +00:00
|
|
|
*
|
|
|
|
* @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-09-15 06:48:59 +00:00
|
|
|
QUERY_HANDLERS.set(name, {handler: createPuppeteerQueryHandler(handler)});
|
2020-04-30 11:45:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2022-10-10 14:01:09 +00:00
|
|
|
* @deprecated Import {@link Puppeteer} and use the static method
|
|
|
|
* {@link Puppeteer.unregisterCustomQueryHandler}
|
2022-06-27 07:24:23 +00:00
|
|
|
*
|
|
|
|
* @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-10-10 14:01:09 +00:00
|
|
|
* @deprecated Import {@link Puppeteer} and use the static method
|
|
|
|
* {@link Puppeteer.customQueryHandlerNames}
|
2022-06-27 07:24:23 +00:00
|
|
|
*
|
|
|
|
* @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-10-10 14:01:09 +00:00
|
|
|
* @deprecated Import {@link Puppeteer} and use the static method
|
|
|
|
* {@link Puppeteer.clearCustomQueryHandlers}
|
2022-06-27 07:24:23 +00:00
|
|
|
*
|
|
|
|
* @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;
|
2022-09-15 06:48:59 +00:00
|
|
|
queryHandler: PuppeteerQueryHandler;
|
2021-05-12 14:48:30 +00:00
|
|
|
} {
|
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
|
|
|
}
|