Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(types): Add types to in-page functions like evaluate(Handle), waitForFunction, etc #8540

Closed
wants to merge 1 commit into from
Closed

chore(types): Add types to in-page functions like evaluate(Handle), waitForFunction, etc #8540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 23 additions & 12 deletions src/common/AriaQueryHandler.ts
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@ import { Protocol } from 'devtools-protocol';
import { CDPSession } from './Connection.js';
import { DOMWorld, PageBinding, WaitForSelectorOptions } from './DOMWorld.js';
import { assert } from './assert.js';
import { ExposedFunctionToInPage } from './EvalTypes.js';

async function queryAXTree(
client: CDPSession,
Expand Down Expand Up @@ -84,33 +85,38 @@ function parseAriaSelector(selector: string): ARIAQueryOption {
const queryOne = async (
element: ElementHandle,
selector: string
): Promise<ElementHandle | null> => {
): Promise<ElementHandle<Element> | null> => {
const exeCtx = element.executionContext();
const { name, role } = parseAriaSelector(selector);
const res = await queryAXTree(exeCtx._client, element, name, role);
if (!res[0] || !res[0].backendDOMNodeId) {
return null;
}
return exeCtx._adoptBackendNodeId(res[0].backendDOMNodeId);
return exeCtx._adoptBackendNodeId(res[0].backendDOMNodeId) as Promise<
ElementHandle<Element>
>;
};

const waitFor = async (
domWorld: DOMWorld,
selector: string,
options: WaitForSelectorOptions
): Promise<ElementHandle<Element> | null> => {
async function ariaQuerySelector(selector: string) {
const root = options.root || (await domWorld._document());
const element = await queryOne(root, selector);
return element;
}
const binding: PageBinding = {
name: 'ariaQuerySelector',
pptrFunction: async (selector: string) => {
const root = options.root || (await domWorld._document());
const element = await queryOne(root, selector);
return element;
},
pptrFunction: ariaQuerySelector,
};
return domWorld.waitForSelectorInPage(
(_: Element, selector: string) =>
(_, selector: string) =>
(
globalThis as unknown as { ariaQuerySelector(selector: string): void }
globalThis as unknown as {
ariaQuerySelector: ExposedFunctionToInPage<typeof ariaQuerySelector>;
}
).ariaQuerySelector(selector),
selector,
options,
Expand All @@ -121,19 +127,24 @@ const waitFor = async (
const queryAll = async (
element: ElementHandle,
selector: string
): Promise<ElementHandle[]> => {
): Promise<Array<ElementHandle<Element>>> => {
const exeCtx = element.executionContext();
const { name, role } = parseAriaSelector(selector);
const res = await queryAXTree(exeCtx._client, element, name, role);
return Promise.all(
res.map((axNode) => exeCtx._adoptBackendNodeId(axNode.backendDOMNodeId))
res.map(
(axNode) =>
exeCtx._adoptBackendNodeId(axNode.backendDOMNodeId) as Promise<
ElementHandle<Element>
>
)
);
};

const queryAllArray = async (
element: ElementHandle,
selector: string
): Promise<JSHandle> => {
): Promise<JSHandle<Element[]>> => {
const elementHandles = await queryAll(element, selector);
const exeCtx = element.executionContext();
const jsHandle = exeCtx.evaluateHandle(
Expand Down