core: replace most usages of evaluateAsync with structured evaluate #11754
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
connorjclark
commented
Dec 2, 2020
| @@ -484,7 +489,7 @@ class Driver { | |||
| * @param {{args: T, useIsolation?: boolean, deps?: Array<Function|string>}} options `args` should | |||
| * match the args of `mainFn`, and can be any serializable value. `deps` are functions that must be | |||
| * defined for `mainFn` to work. | |||
| * @return {Promise<R>} | |||
| * @return {FlattenedPromise<R>} | |||
There was a problem hiding this comment.
Otherwise results in Promise<Promise<...>>, given some main functions (first arg to evaluate) return promises. see microsoft/TypeScript#27711 (comment) for more
connorjclark
commented
Dec 22, 2020
| @@ -26,6 +26,7 @@ declare global { | |||
| export interface FRTransitionalDriver { | |||
| defaultSession: FRProtocolSession; | |||
| evaluateAsync(expression: string, options?: {useIsolation?: boolean}): Promise<any>; | |||
| evaluate<T extends any[], R>(mainFn: (...args: T) => R, options: {args: T, useIsolation?: boolean, deps?: Array<Function|string>}): FlattenedPromise<R>; | |||
There was a problem hiding this comment.
@patrickhulce ya?
adamraine
reviewed
Dec 22, 2020
| /** | ||
| * @param {boolean} useIsolation | ||
| */ | ||
| function evaluateInPage(useIsolation) { |
There was a problem hiding this comment.
Adding another evaluate function seems unnecessary. I think it's better to just use
passContext.driver.evaluatetwice.
Bump, WDYT?
connorjclark
commented
Dec 22, 2020
|
|
||
| /** @type {LH.Artifacts['IFrameElements']} */ | ||
| const iframeElements = await driver.evaluateAsync(expression, {useIsolation: true}); | ||
| const iframeElements = await driver.evaluate(collectIFrameElements, { |
There was a problem hiding this comment.
yikes! almost missed this. forgot to include useIsolation: true.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ref #10781, #10816