patchright-core 1.52.4 → 1.52.5

package/lib/client/frame.js

@@ -192,9 +192,9 @@ class Frame extends import_channelOwner.ChannelOwner {
     const result = await this._channel.evalOnSelector({ selector, expression: String(pageFunction), isFunction: typeof pageFunction === "function", arg: (0, import_jsHandle.serializeArgument)(arg) });
     return (0, import_jsHandle.parseResult)(result.value);
   }
-  async $$eval(selector, pageFunction, arg) {
-    (0, import_jsHandle.assertMaxArguments)(arguments.length, 3);
-    const result = await this._channel.evalOnSelectorAll({ selector, expression: String(pageFunction), isFunction: typeof pageFunction === "function", arg: (0, import_jsHandle.serializeArgument)(arg) });
+  async $$eval(selector, pageFunction, arg, isolatedContext = true) {
+    (0, import_jsHandle.assertMaxArguments)(arguments.length, 4);
+    const result = await this._channel.evalOnSelectorAll({ selector, expression: String(pageFunction), isFunction: typeof pageFunction === "function", arg: (0, import_jsHandle.serializeArgument)(arg), isolatedContext });
     return (0, import_jsHandle.parseResult)(result.value);
   }
   async $$(selector) {

package/lib/client/locator.js

@@ -112,8 +112,8 @@ class Locator {
       options?.timeout
     );
   }
-  async evaluateAll(pageFunction, arg) {
-    return await this._frame.$$eval(this._selector, pageFunction, arg);
+  async evaluateAll(pageFunction, arg, isolatedContext = true) {
+    return await this._frame.$$eval(this._selector, pageFunction, arg, isolatedContext);
   }
   async evaluateHandle(pageFunction, arg, options, isolatedContext = true) {
     return await this._withElement(

package/lib/protocol/validator.js

@@ -1464,7 +1464,8 @@ import_validatorPrimitives.scheme.FrameEvalOnSelectorAllParams = (0, import_vali
   selector: import_validatorPrimitives.tString,
   expression: import_validatorPrimitives.tString,
   isFunction: (0, import_validatorPrimitives.tOptional)(import_validatorPrimitives.tBoolean),
-  arg: (0, import_validatorPrimitives.tType)("SerializedArgument")
+  arg: (0, import_validatorPrimitives.tType)("SerializedArgument"),
+  isolatedContext: (0, import_validatorPrimitives.tOptional)(import_validatorPrimitives.tBoolean)
 });
 import_validatorPrimitives.scheme.FrameEvalOnSelectorAllResult = (0, import_validatorPrimitives.tObject)({
   value: (0, import_validatorPrimitives.tType)("SerializedValue")

package/lib/server/chromium/crNetworkManager.js

@@ -518,11 +518,11 @@ class RouteImpl {
     if (overrides.url && (overrides.url === "http://patchright-init-script-inject.internal/" || overrides.url === "https://patchright-init-script-inject.internal/")) {
       await catchDisallowedErrors(async () => {
         this._sessionManager._alreadyTrackedNetworkIds.add(this._networkId);
-        this._session.send("Fetch.continueRequest", { requestId: this._interceptionId, interceptResponse: true });
+        this._session._sendMayFail("Fetch.continueRequest", { requestId: this._interceptionId, interceptResponse: true });
       });
     } else {
       await catchDisallowedErrors(async () => {
-        await this._session.send("Fetch.continueRequest", this._alreadyContinuedParams);
+        await this._session._sendMayFail("Fetch.continueRequest", this._alreadyContinuedParams);
       });
     }
   }

package/lib/server/chromium/crPage.js

@@ -495,7 +495,6 @@ class FrameSession {
   }
   async _navigate(frame, url, referrer) {
     const response = await this._client.send("Page.navigate", { url, referrer, frameId: frame._id, referrerPolicy: "unsafeUrl" });
-    this._client._sendMayFail("Page.waitForDebugger");
     if (response.errorText)
       throw new frames.NavigationAbortedError(response.loaderId, `${response.errorText} at ${url}`);
     return { newDocumentId: response.loaderId };

package/lib/server/dispatchers/frameDispatcher.js

@@ -94,7 +94,7 @@ class FrameDispatcher extends import_dispatcher.Dispatcher {
     return { value: (0, import_jsHandleDispatcher.serializeResult)(await this._frame.evalOnSelector(params.selector, !!params.strict, params.expression, params.isFunction, (0, import_jsHandleDispatcher.parseArgument)(params.arg))) };
   }
   async evalOnSelectorAll(params, metadata) {
-    return { value: (0, import_jsHandleDispatcher.serializeResult)(await this._frame.evalOnSelectorAll(params.selector, params.expression, params.isFunction, (0, import_jsHandleDispatcher.parseArgument)(params.arg))) };
+    return { value: (0, import_jsHandleDispatcher.serializeResult)(await this._frame.evalOnSelectorAll(params.selector, params.expression, params.isFunction, (0, import_jsHandleDispatcher.parseArgument)(params.arg), null, params.isolatedContext)) };
   }
   async querySelector(params, metadata) {
     return { element: import_elementHandlerDispatcher.ElementHandleDispatcher.fromNullable(this, await this._frame.querySelector(params.selector, params)) };

package/lib/server/frameSelectors.js

@@ -46,8 +46,8 @@ class FrameSelectors {
     }
     return adoptIfNeeded(elementHandle, await resolved.frame._mainContext());
   }
-  async queryArrayInMainWorld(selector, scope) {
-    const resolved = await this.resolveInjectedForSelector(selector, { mainWorld: true }, scope);
+  async queryArrayInMainWorld(selector, scope, isolatedContext) {
+    const resolved = await this.resolveInjectedForSelector(selector, { mainWorld: !isolatedContext }, scope);
     if (!resolved)
       throw new Error(`Failed to find frame for selector "${selector}"`);
     return await resolved.injected.evaluateHandle((injected, { info, scope: scope2 }) => {

package/lib/server/frames.js

@@ -612,6 +612,7 @@ class Frame extends import_instrumentation.SdkObject {
     return this._page._delegate.getFrameElement(this);
   }
   async _context(world) {
+    if (this.isDetached()) throw new Error("Frame was detached");
     try {
       var client = this._page._delegate._sessionForFrame(this)._client;
     } catch (e) {
@@ -767,16 +768,21 @@ class Frame extends import_instrumentation.SdkObject {
   async evalOnSelector(selector, strict, expression, isFunction, arg, scope) {
     const handle = await this.selectors.query(selector, { strict }, scope);
     if (!handle)
-      throw new Error(`Failed to find element matching selector "${selector}"`);
-    const result = await handle.evaluateExpression(expression, { isFunction }, arg);
+      throw new Error("Failed to find element matching selector " + selector);
+    const result = await handle.evaluateExpression(expression, { isFunction }, arg, true);
     handle.dispose();
     return result;
   }
-  async evalOnSelectorAll(selector, expression, isFunction, arg, scope) {
-    const arrayHandle = await this.selectors.queryArrayInMainWorld(selector, scope);
-    const result = await arrayHandle.evaluateExpression(expression, { isFunction }, arg);
-    arrayHandle.dispose();
-    return result;
+  async evalOnSelectorAll(selector, expression, isFunction, arg, scope, isolatedContext) {
+    try {
+      const arrayHandle = await this.selectors.queryArrayInMainWorld(selector, scope, isolatedContext);
+      const result = await arrayHandle.evaluateExpression(expression, { isFunction }, arg, isolatedContext);
+      arrayHandle.dispose();
+      return result;
+    } catch (e) {
+      if ("JSHandles can be evaluated only in the context they were created!" === e.message) return await this.evalOnSelectorAll(selector, expression, isFunction, arg, scope, isolatedContext);
+      throw e;
+    }
   }
   async maskSelectors(selectors, color) {
     const context = await this._utilityContext();
@@ -789,14 +795,15 @@ class Frame extends import_instrumentation.SdkObject {
     return this.selectors.queryAll(selector);
   }
   async queryCount(selector) {
-    const custom_metadata = {
+    const customMetadata = {
       "internal": false,
-      "log": []
+      "log": [],
+      "method": "queryCount"
     };
-    const controller = new import_progress.ProgressController(custom_metadata, this);
+    const controller = new import_progress.ProgressController(customMetadata, this);
     const resultPromise = await controller.run(async (progress) => {
       progress.log("waiting for " + this._asLocator(selector));
-      const promise = await this._retryWithProgressIfNotConnected(progress, selector, false, false, async (result) => {
+      const promise = await this._retryWithProgressIfNotConnected(progress, selector, null, false, async (result) => {
         if (!result) return 0;
         const handle = result[0];
         const handles = result[1];
@@ -979,7 +986,7 @@ class Frame extends import_instrumentation.SdkObject {
     return result;
   }
   async retryWithProgressAndTimeouts(progress, timeouts, action) {
-    const continuePolling3 = Symbol("continuePolling");
+    const continuePolling = Symbol("continuePolling");
     timeouts = [0, ...timeouts];
     let timeoutIndex = 0;
     while (progress.isRunning()) {
@@ -993,8 +1000,8 @@ class Frame extends import_instrumentation.SdkObject {
       }
       progress.throwIfAborted();
       try {
-        const result = await action(continuePolling3);
-        if (result === continuePolling3)
+        const result = await action(continuePolling);
+        if (result === continuePolling)
           continue;
         return result;
       } catch (e) {
@@ -1017,7 +1024,7 @@ class Frame extends import_instrumentation.SdkObject {
   }
   async _retryWithProgressIfNotConnected(progress, selector, strict, performActionPreChecks, action, returnAction) {
     progress.log("waiting for " + this._asLocator(selector));
-    return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async (continuePolling3) => {
+    return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async (continuePolling) => {
       if (performActionPreChecks) await this._page.performActionPreChecks(progress);
       const resolved = await this.selectors.resolveInjectedForSelector(selector, {
         strict
@@ -1028,29 +1035,38 @@ class Frame extends import_instrumentation.SdkObject {
           const result2 = await action(null);
           return result2 === "internal:continuepolling" ? continuePolling2 : result2;
         }
-        return continuePolling3;
+        return continuePolling;
       }
       try {
         var client = this._page._delegate._sessionForFrame(resolved.frame)._client;
       } catch (e) {
         var client = this._page._delegate._mainFrameSession._client;
       }
-      var context = await resolved.frame._context("main");
+      var utilityContext = await resolved.frame._utilityContext();
+      var mainContext = await resolved.frame._mainContext();
       const documentNode = await client.send("Runtime.evaluate", {
         expression: "document",
         serializationOptions: {
           serialization: "idOnly"
         },
-        contextId: context.delegate._contextId
+        contextId: utilityContext.delegate._contextId
       });
-      const documentScope = new dom.ElementHandle(context, documentNode.result.objectId);
-      const currentScopingElements = await this._customFindElementsByParsed(resolved, client, context, documentScope, progress, resolved.info.parsed);
+      const documentScope = new dom.ElementHandle(utilityContext, documentNode.result.objectId);
+      let currentScopingElements;
+      try {
+        currentScopingElements = await this._customFindElementsByParsed(resolved, client, mainContext, documentScope, progress, resolved.info.parsed);
+      } catch (e) {
+        if ("JSHandles can be evaluated only in the context they were created!" === e.message) return continuePolling3;
+        await resolved.injected.evaluateHandle((injected, { error }) => {
+          throw error;
+        }, { error: e });
+      }
       if (currentScopingElements.length == 0) {
         if (returnAction === "returnOnNotResolved" || returnAction === "returnAll") {
           const result2 = await action(null);
           return result2 === "internal:continuepolling" ? continuePolling2 : result2;
         }
-        return continuePolling3;
+        return continuePolling;
       }
       const resultElement = currentScopingElements[0];
       if (currentScopingElements.length > 1) {
@@ -1078,9 +1094,9 @@ class Frame extends import_instrumentation.SdkObject {
         }
         if (result === "error:notconnected") {
           progress.log("element was detached from the DOM, retrying");
-          return continuePolling3;
+          return continuePolling;
         } else if (result === "internal:continuepolling") {
-          return continuePolling3;
+          return continuePolling;
         }
         return result;
       } finally {
@@ -1216,8 +1232,8 @@ class Frame extends import_instrumentation.SdkObject {
   }
   async isVisibleInternal(selector, options = {}, scope) {
     try {
-      const custom_metadata = { "internal": false, "log": [] };
-      const controller = new import_progress.ProgressController(custom_metadata, this);
+      const customMetadata = { "internal": false, "log": [], "method": "isVisible" };
+      const controller = new import_progress.ProgressController(customMetadata, this);
       return await controller.run(async (progress) => {
         progress.log("waiting for " + this._asLocator(selector));
         const promise = this._retryWithProgressIfNotConnected(progress, selector, options.strict, false, async (handle) => {
@@ -1350,11 +1366,11 @@ class Frame extends import_instrumentation.SdkObject {
       if (timeout < 0)
         return { matches: options.isNot, log: (0, import_callLog.compressCallLog)(metadata.log), timedOut: true, received: lastIntermediateResult.received };
       return await new import_progress.ProgressController(metadata, this).run(async (progress) => {
-        return await this.retryWithProgressAndTimeouts(progress, [100, 250, 500, 1e3], async (continuePolling3) => {
+        return await this.retryWithProgressAndTimeouts(progress, [100, 250, 500, 1e3], async (continuePolling) => {
           await this._page.performActionPreChecks(progress);
           const { matches, received } = await this._expectInternal(progress, selector, options, lastIntermediateResult);
           if (matches === options.isNot) {
-            return continuePolling3;
+            return continuePolling;
           }
           return { matches, received };
         });
@@ -1374,6 +1390,21 @@ class Frame extends import_instrumentation.SdkObject {
     progress.log("waiting for " + this._asLocator(selector));
     const isArray = options.expression === "to.have.count" || options.expression.endsWith(".array");
     const promise = await this._retryWithProgressIfNotConnected(progress, selector, !isArray, false, async (result) => {
+      if (!result) {
+        if (options.expectedNumber === 0)
+          return { matches: true };
+        if (!options.isNot && options.expression === "to.be.hidden")
+          return { matches: true };
+        if (options.isNot && options.expression === "to.be.visible")
+          return { matches: false };
+        if (!options.isNot && options.expression === "to.be.detached")
+          return { matches: true };
+        if (options.isNot && options.expression === "to.be.attached")
+          return { matches: false };
+        if (options.isNot && options.expression === "to.be.in.viewport")
+          return { matches: false };
+        return { matches: options.isNot, missingReceived: true };
+      }
       const handle = result[0];
       const handles = result[1];
       if (handle.parentNode.constructor.name == "ElementHandle") {
@@ -1506,7 +1537,7 @@ class Frame extends import_instrumentation.SdkObject {
     const controller = new import_progress.ProgressController(metadata, this);
     return controller.run(async (progress) => {
       progress.log("waiting for " + this._asLocator(selector));
-      const promise = this._retryWithProgressIfNotConnected(progress, selector, false, false, async (handle) => {
+      const promise = this._retryWithProgressIfNotConnected(progress, selector, options.strict, false, async (handle) => {
         if (handle.parentNode.constructor.name == "ElementHandle") {
           return await handle.parentNode.evaluateInUtility(([injected, node, { callbackText: callbackText2, handle: handle2, taskData: taskData2 }]) => {
             const callback = injected.eval(callbackText2);
@@ -1632,8 +1663,8 @@ class Frame extends import_instrumentation.SdkObject {
       var elementsIndexes = [];
       if (part.name == "nth") {
         const partNth = Number(part.body);
-        if (partNth > currentScopingElements.length || partNth < -currentScopingElements.length) {
-          return continuePolling;
+        if (partNth > currentScopingElements.length - 1 || partNth < -(currentScopingElements.length - 1)) {
+          throw new Error("Can't query n-th element");
         } else {
           currentScopingElements = [currentScopingElements.at(partNth)];
           continue;
@@ -1701,7 +1732,7 @@ class Frame extends import_instrumentation.SdkObject {
             callId: progress.metadata.id
           });
           const rootElementsAmount = await rootElements.getProperty("length");
-          queryingElements.push([rootElements, rootElementsAmount, resolved.injected]);
+          queryingElements.push([rootElements, rootElementsAmount, scope]);
           for (var queryedElement of queryingElements) {
             var elementsToCheck = queryedElement[0];
             var elementsAmount = await queryedElement[1].jsonValue();
@@ -1730,6 +1761,7 @@ class Frame extends import_instrumentation.SdkObject {
       currentScopingElements = [];
       for (var element of elements) {
         var elemIndex = element.backendNodeId;
+        if (elementsIndexes.includes(elemIndex)) continue;
         var elemPos = elementsIndexes.findIndex((index) => index > elemIndex);
         if (elemPos === -1) {
           currentScopingElements.push(element);

package/lib/server/javascript.js

@@ -134,7 +134,7 @@ class JSHandle extends import_instrumentation.SdkObject {
   }
   async evaluateExpressionHandle(expression, options, arg, isolatedContext) {
     let context = this._context;
-    if (this._context.constructor.name === "FrameExecutionContext") {
+    if (context.constructor.name === "FrameExecutionContext") {
       const frame = this._context.frame;
       if (frame) {
         if (isolatedContext) context = await frame._utilityContext();

package/lib/server/page.js

@@ -663,7 +663,7 @@ class Worker extends import_instrumentation.SdkObject {
   }
   async evaluateExpressionHandle(expression, isFunction, arg, isolatedContext) {
     let context = await this._executionContextPromise;
-    if (this._context.constructor.name === "FrameExecutionContext") {
+    if (context.constructor.name === "FrameExecutionContext") {
       const frame = this._context.frame;
       if (frame) {
         if (isolatedContext) context = await frame._utilityContext();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "patchright-core",
-    "version": "1.52.4",
+    "version": "1.52.5",
     "description": "A high-level API to automate web browsers",
     "repository": {
         "type": "git",

package/types/types.d.ts

@@ -121,7 +121,7 @@ export interface Page {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression).
    */
-  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<R>;
+  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg, isolatedContext?: boolean): Promise<R>;
   /**
    * Returns the value of the
    * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression) invocation.
@@ -172,7 +172,7 @@ export interface Page {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression).
    */
-  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<R>;
+  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any, isolatedContext?: boolean): Promise<R>;
 
   /**
    * Returns the value of the
@@ -218,7 +218,7 @@ export interface Page {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression).
    */
-  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg, isolatedContext?: boolean): Promise<SmartHandle<R>>;
   /**
    * Returns the value of the
    * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression) invocation as a
@@ -263,7 +263,7 @@ export interface Page {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression).
    */
-  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<SmartHandle<R>>;
+  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any, isolatedContext?: boolean): Promise<SmartHandle<R>>;
 
   /**
    * Adds a script which would be evaluated in one of the following scenarios:
@@ -5260,7 +5260,7 @@ export interface Frame {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
    */
-  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<R>;
+  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg, isolatedContext?: boolean): Promise<R>;
   /**
    * Returns the return value of
    * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
@@ -5307,7 +5307,7 @@ export interface Frame {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
    */
-  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<R>;
+  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any, isolatedContext?: boolean): Promise<R>;
 
   /**
    * Returns the return value of
@@ -5355,7 +5355,7 @@ export interface Frame {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression).
    */
-  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg, isolatedContext?: boolean): Promise<SmartHandle<R>>;
   /**
    * Returns the return value of
    * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression) as a
@@ -5402,7 +5402,7 @@ export interface Frame {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression).
    */
-  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<SmartHandle<R>>;
+  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any, isolatedContext?: boolean): Promise<SmartHandle<R>>;
 
   /**
    * **NOTE** Use locator-based [frame.locator(selector[, options])](https://playwright.dev/docs/api/class-frame#frame-locator)
@@ -10239,7 +10239,7 @@ export interface Worker {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
    */
-  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<R>;
+  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg, isolatedContext?: boolean): Promise<R>;
   /**
    * Returns the return value of
    * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
@@ -10260,7 +10260,7 @@ export interface Worker {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
    */
-  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<R>;
+  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any, isolatedContext?: boolean): Promise<R>;
 
   /**
    * Returns the return value of
@@ -10283,7 +10283,7 @@ export interface Worker {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression).
    */
-  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg, isolatedContext?: boolean): Promise<SmartHandle<R>>;
   /**
    * Returns the return value of
    * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression) as a
@@ -10305,7 +10305,7 @@ export interface Worker {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression).
    */
-  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<SmartHandle<R>>;
+  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any, isolatedContext?: boolean): Promise<SmartHandle<R>>;
   /**
    * Emitted when this dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is
    * terminated.
@@ -10383,7 +10383,7 @@ export interface JSHandle<T = any> {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
    */
-  evaluate<R, Arg, O extends T = T>(pageFunction: PageFunctionOn<O, Arg, R>, arg: Arg): Promise<R>;
+  evaluate<R, Arg, O extends T = T>(pageFunction: PageFunctionOn<O, Arg, R>, arg: Arg, isolatedContext?: boolean): Promise<R>;
   /**
    * Returns the return value of
    * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
@@ -10405,7 +10405,7 @@ export interface JSHandle<T = any> {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
    */
-  evaluate<R, O extends T = T>(pageFunction: PageFunctionOn<O, void, R>, arg?: any): Promise<R>;
+  evaluate<R, O extends T = T>(pageFunction: PageFunctionOn<O, void, R>, arg?: any, isolatedContext?: boolean): Promise<R>;
 
   /**
    * Returns the return value of
@@ -10427,7 +10427,7 @@ export interface JSHandle<T = any> {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression).
    */
-  evaluateHandle<R, Arg, O extends T = T>(pageFunction: PageFunctionOn<O, Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  evaluateHandle<R, Arg, O extends T = T>(pageFunction: PageFunctionOn<O, Arg, R>, arg: Arg, isolatedContext?: boolean): Promise<SmartHandle<R>>;
   /**
    * Returns the return value of
    * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression)
@@ -10448,7 +10448,7 @@ export interface JSHandle<T = any> {
    * @param arg Optional argument to pass to
    * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression).
    */
-  evaluateHandle<R, O extends T = T>(pageFunction: PageFunctionOn<O, void, R>, arg?: any): Promise<SmartHandle<R>>;
+  evaluateHandle<R, O extends T = T>(pageFunction: PageFunctionOn<O, void, R>, arg?: any, isolatedContext?: boolean): Promise<SmartHandle<R>>;
 
   /**
    * Returns a JSON representation of the object. If the object has a `toJSON` function, it **will not be called**.
@@ -12204,7 +12204,7 @@ export interface Locator {
    */
   evaluate<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg, options?: {
     timeout?: number;
-  }): Promise<R>;
+  }, isolatedContext?: boolean): Promise<R>;
   /**
    * Execute JavaScript code in the page, taking the matching element as an argument.
    *
@@ -12229,7 +12229,7 @@ export interface Locator {
    */
   evaluate<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, void, R>, options?: {
     timeout?: number;
-  }): Promise<R>;
+  }, isolatedContext?: boolean): Promise<R>;
   /**
    * Execute JavaScript code in the page, taking the matching element as an argument, and return a
    * [JSHandle](https://playwright.dev/docs/api/class-jshandle) with the result.
@@ -12262,7 +12262,7 @@ export interface Locator {
    * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression).
    * @param options
    */
-  evaluateHandle<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  evaluateHandle<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg, isolatedContext?: boolean): Promise<SmartHandle<R>>;
   /**
    * Execute JavaScript code in the page, taking the matching element as an argument, and return a
    * [JSHandle](https://playwright.dev/docs/api/class-jshandle) with the result.
@@ -12295,7 +12295,7 @@ export interface Locator {
    * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression).
    * @param options
    */
-  evaluateHandle<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, void, R>): Promise<SmartHandle<R>>;
+  evaluateHandle<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, void, R>, isolatedContext?: boolean): Promise<SmartHandle<R>>;
   /**
    * Execute JavaScript code in the page, taking all matching elements as an argument.
    *