@checkly/playwright-core 1.51.17-beta.1 → 1.54.2-beta.0

package/lib/server/firefox/firefox.js

@@ -1,97 +1,105 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var firefox_exports = {};
+__export(firefox_exports, {
+  Firefox: () => Firefox
 });
-exports.Firefox = void 0;
-var _os = _interopRequireDefault(require("os"));
-var _path = _interopRequireDefault(require("path"));
-var _ffBrowser = require("./ffBrowser");
-var _ffConnection = require("./ffConnection");
-var _ascii = require("../utils/ascii");
-var _browserType = require("../browserType");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * Copyright 2017 Google Inc. All rights reserved.
- * Modifications copyright (c) Microsoft Corporation.
- *
- * 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.
- */
-
-class Firefox extends _browserType.BrowserType {
+module.exports = __toCommonJS(firefox_exports);
+var import_os = __toESM(require("os"));
+var import_path = __toESM(require("path"));
+var import_ffBrowser = require("./ffBrowser");
+var import_ffConnection = require("./ffConnection");
+var import_ascii = require("../utils/ascii");
+var import_browserType = require("../browserType");
+var import_manualPromise = require("../../utils/isomorphic/manualPromise");
+class Firefox extends import_browserType.BrowserType {
   constructor(parent) {
-    super(parent, 'firefox');
+    super(parent, "firefox");
   }
   connectToTransport(transport, options) {
-    return _ffBrowser.FFBrowser.connect(this.attribution.playwright, transport, options);
+    return import_ffBrowser.FFBrowser.connect(this.attribution.playwright, transport, options);
   }
   doRewriteStartupLog(error) {
-    if (!error.logs) return error;
-    // https://github.com/microsoft/playwright/issues/6500
-    if (error.logs.includes(`as root in a regular user's session is not supported.`)) error.logs = '\n' + (0, _ascii.wrapInASCIIBox)(`Firefox is unable to launch if the $HOME folder isn't owned by the current user.\nWorkaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ? ' in your GitHub Actions workflow file' : ''} when running Playwright.`, 1);
-    if (error.logs.includes('no DISPLAY environment variable specified')) error.logs = '\n' + (0, _ascii.wrapInASCIIBox)(_browserType.kNoXServerRunningError, 1);
+    if (!error.logs)
+      return error;
+    if (error.logs.includes(`as root in a regular user's session is not supported.`))
+      error.logs = "\n" + (0, import_ascii.wrapInASCIIBox)(`Firefox is unable to launch if the $HOME folder isn't owned by the current user.
+Workaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ? " in your GitHub Actions workflow file" : ""} when running Playwright.`, 1);
+    if (error.logs.includes("no DISPLAY environment variable specified"))
+      error.logs = "\n" + (0, import_ascii.wrapInASCIIBox)(import_browserType.kNoXServerRunningError, 1);
     return error;
   }
-  amendEnvironment(env, userDataDir, executable, browserArguments) {
-    if (!_path.default.isAbsolute(_os.default.homedir())) throw new Error(`Cannot launch Firefox with relative home directory. Did you set ${_os.default.platform() === 'win32' ? 'USERPROFILE' : 'HOME'} to a relative path?`);
-    if (_os.default.platform() === 'linux') {
-      // Always remove SNAP_NAME and SNAP_INSTANCE_NAME env variables since they
-      // confuse Firefox: in our case, builds never come from SNAP.
-      // See https://github.com/microsoft/playwright/issues/20555
-      return {
-        ...env,
-        SNAP_NAME: undefined,
-        SNAP_INSTANCE_NAME: undefined
-      };
+  amendEnvironment(env) {
+    if (!import_path.default.isAbsolute(import_os.default.homedir()))
+      throw new Error(`Cannot launch Firefox with relative home directory. Did you set ${import_os.default.platform() === "win32" ? "USERPROFILE" : "HOME"} to a relative path?`);
+    if (import_os.default.platform() === "linux") {
+      return { ...env, SNAP_NAME: void 0, SNAP_INSTANCE_NAME: void 0 };
     }
     return env;
   }
   attemptToGracefullyCloseBrowser(transport) {
-    const message = {
-      method: 'Browser.close',
-      params: {},
-      id: _ffConnection.kBrowserCloseMessageId
-    };
+    const message = { method: "Browser.close", params: {}, id: import_ffConnection.kBrowserCloseMessageId };
     transport.send(message);
   }
   defaultArgs(options, isPersistent, userDataDir) {
-    const {
-      args = [],
-      headless
-    } = options;
-    const userDataDirArg = args.find(arg => arg.startsWith('-profile') || arg.startsWith('--profile'));
-    if (userDataDirArg) throw this._createUserDataDirArgMisuseError('--profile');
-    if (args.find(arg => arg.startsWith('-juggler'))) throw new Error('Use the port parameter instead of -juggler argument');
-    const firefoxArguments = ['-no-remote'];
+    const { args = [], headless } = options;
+    const userDataDirArg = args.find((arg) => arg.startsWith("-profile") || arg.startsWith("--profile"));
+    if (userDataDirArg)
+      throw this._createUserDataDirArgMisuseError("--profile");
+    if (args.find((arg) => arg.startsWith("-juggler")))
+      throw new Error("Use the port parameter instead of -juggler argument");
+    const firefoxArguments = ["-no-remote"];
     if (headless) {
-      firefoxArguments.push('-headless');
+      firefoxArguments.push("-headless");
     } else {
-      firefoxArguments.push('-wait-for-browser');
-      firefoxArguments.push('-foreground');
+      firefoxArguments.push("-wait-for-browser");
+      firefoxArguments.push("-foreground");
     }
     firefoxArguments.push(`-profile`, userDataDir);
-    firefoxArguments.push('-juggler-pipe');
+    firefoxArguments.push("-juggler-pipe");
     firefoxArguments.push(...args);
-    if (isPersistent) firefoxArguments.push('about:blank');else firefoxArguments.push('-silent');
+    if (isPersistent)
+      firefoxArguments.push("about:blank");
+    else
+      firefoxArguments.push("-silent");
     return firefoxArguments;
   }
-  readyState(options) {
-    return new JugglerReadyState();
+  waitForReadyState(options, browserLogsCollector) {
+    const result = new import_manualPromise.ManualPromise();
+    browserLogsCollector.onMessage((message) => {
+      if (message.includes("Juggler listening to the pipe"))
+        result.resolve({});
+    });
+    return result;
   }
 }
-exports.Firefox = Firefox;
-class JugglerReadyState extends _browserType.BrowserReadyState {
-  onBrowserOutput(message) {
-    if (message.includes('Juggler listening to the pipe')) this._wsEndpoint.resolve(undefined);
-  }
-}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Firefox
+});

package/lib/server/firefox/protocol.d.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var protocol_d_exports = {};
+module.exports = __toCommonJS(protocol_d_exports);

package/lib/server/formData.js

@@ -1,29 +1,29 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var formData_exports = {};
+__export(formData_exports, {
+  MultipartFormData: () => MultipartFormData
 });
-exports.MultipartFormData = void 0;
-var _utilsBundle = require("../utilsBundle");
-/**
- * Copyright (c) Microsoft Corporation.
- *
- * 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.
- */
-
+module.exports = __toCommonJS(formData_exports);
+var import_utilsBundle = require("../utilsBundle");
 class MultipartFormData {
   constructor() {
-    this._boundary = void 0;
     this._chunks = [];
     this._boundary = generateUniqueBoundaryString();
   }
@@ -39,7 +39,8 @@ class MultipartFormData {
   addFileField(name, value) {
     this._beginMultiPartHeader(name);
     this._chunks.push(Buffer.from(`; filename="${value.name}"`));
-    this._chunks.push(Buffer.from(`\r\ncontent-type: ${value.mimeType || _utilsBundle.mime.getType(value.name) || 'application/octet-stream'}`));
+    this._chunks.push(Buffer.from(`\r
+content-type: ${value.mimeType || import_utilsBundle.mime.getType(value.name) || "application/octet-stream"}`));
     this._finishMultiPartHeader();
     this._chunks.push(value.buffer);
     this._finishMultiPartField();
@@ -53,23 +54,94 @@ class MultipartFormData {
     this._chunks.push(Buffer.from(`content-disposition: form-data; name="${name}"`));
   }
   _finishMultiPartHeader() {
-    this._chunks.push(Buffer.from(`\r\n\r\n`));
+    this._chunks.push(Buffer.from(`\r
+\r
+`));
   }
   _finishMultiPartField() {
-    this._chunks.push(Buffer.from(`\r\n`));
+    this._chunks.push(Buffer.from(`\r
+`));
   }
   _addBoundary(isLastBoundary) {
-    this._chunks.push(Buffer.from('--' + this._boundary));
-    if (isLastBoundary) this._chunks.push(Buffer.from('--'));
-    this._chunks.push(Buffer.from('\r\n'));
+    this._chunks.push(Buffer.from("--" + this._boundary));
+    if (isLastBoundary)
+      this._chunks.push(Buffer.from("--"));
+    this._chunks.push(Buffer.from("\r\n"));
   }
 }
-exports.MultipartFormData = MultipartFormData;
-const alphaNumericEncodingMap = [0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x41, 0x42];
-
-// See generateUniqueBoundaryString() in WebKit
+const alphaNumericEncodingMap = [
+  65,
+  66,
+  67,
+  68,
+  69,
+  70,
+  71,
+  72,
+  73,
+  74,
+  75,
+  76,
+  77,
+  78,
+  79,
+  80,
+  81,
+  82,
+  83,
+  84,
+  85,
+  86,
+  87,
+  88,
+  89,
+  90,
+  97,
+  98,
+  99,
+  100,
+  101,
+  102,
+  103,
+  104,
+  105,
+  106,
+  107,
+  108,
+  109,
+  110,
+  111,
+  112,
+  113,
+  114,
+  115,
+  116,
+  117,
+  118,
+  119,
+  120,
+  121,
+  122,
+  48,
+  49,
+  50,
+  51,
+  52,
+  53,
+  54,
+  55,
+  56,
+  57,
+  65,
+  66
+];
 function generateUniqueBoundaryString() {
   const charCodes = [];
-  for (let i = 0; i < 16; i++) charCodes.push(alphaNumericEncodingMap[Math.floor(Math.random() * alphaNumericEncodingMap.length)]);
-  return '----WebKitFormBoundary' + String.fromCharCode(...charCodes);
-}
+  for (let i = 0; i < 16; i++)
+    charCodes.push(alphaNumericEncodingMap[Math.floor(Math.random() * alphaNumericEncodingMap.length)]);
+  return "----WebKitFormBoundary" + String.fromCharCode(...charCodes);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MultipartFormData
+});

package/lib/server/frameSelectors.js

@@ -1,49 +1,43 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var frameSelectors_exports = {};
+__export(frameSelectors_exports, {
+  FrameSelectors: () => FrameSelectors
 });
-exports.FrameSelectors = void 0;
-var _utils = require("../utils");
-var _selectorParser = require("../utils/isomorphic/selectorParser");
-/**
- * Copyright (c) Microsoft Corporation.
- *
- * 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.
- */
-
+module.exports = __toCommonJS(frameSelectors_exports);
+var import_utils = require("../utils");
+var import_selectorParser = require("../utils/isomorphic/selectorParser");
 class FrameSelectors {
   constructor(frame) {
-    this.frame = void 0;
     this.frame = frame;
   }
   _parseSelector(selector, options) {
-    const strict = typeof (options === null || options === void 0 ? void 0 : options.strict) === 'boolean' ? options.strict : !!this.frame._page.context()._options.strictSelectors;
-    return this.frame._page.context().selectors().parseSelector(selector, strict);
+    const strict = typeof options?.strict === "boolean" ? options.strict : !!this.frame._page.browserContext._options.strictSelectors;
+    return this.frame._page.browserContext.selectors().parseSelector(selector, strict);
   }
   async query(selector, options, scope) {
     const resolved = await this.resolveInjectedForSelector(selector, options, scope);
-    // Be careful, |this.frame| can be different from |resolved.frame|.
-    if (!resolved) return null;
-    const handle = await resolved.injected.evaluateHandle((injected, {
-      info,
-      scope
-    }) => {
-      return injected.querySelector(info.parsed, scope || document, info.strict);
-    }, {
-      info: resolved.info,
-      scope: resolved.scope
-    });
+    if (!resolved)
+      return null;
+    const handle = await resolved.injected.evaluateHandle((injected, { info, scope: scope2 }) => {
+      return injected.querySelector(info.parsed, scope2 || document, info.strict);
+    }, { info: resolved.info, scope: resolved.scope });
     const elementHandle = handle.asElement();
     if (!elementHandle) {
       handle.dispose();
@@ -52,120 +46,110 @@ class FrameSelectors {
     return adoptIfNeeded(elementHandle, await resolved.frame._mainContext());
   }
   async queryArrayInMainWorld(selector, scope) {
-    const resolved = await this.resolveInjectedForSelector(selector, {
-      mainWorld: true
-    }, scope);
-    // Be careful, |this.frame| can be different from |resolved.frame|.
-    if (!resolved) throw new Error(`Failed to find frame for selector "${selector}"`);
-    return await resolved.injected.evaluateHandle((injected, {
-      info,
-      scope
-    }) => {
-      return injected.querySelectorAll(info.parsed, scope || document);
-    }, {
-      info: resolved.info,
-      scope: resolved.scope
-    });
+    const resolved = await this.resolveInjectedForSelector(selector, { mainWorld: true }, scope);
+    if (!resolved)
+      throw new Error(`Failed to find frame for selector "${selector}"`);
+    return await resolved.injected.evaluateHandle((injected, { info, scope: scope2 }) => {
+      return injected.querySelectorAll(info.parsed, scope2 || document);
+    }, { info: resolved.info, scope: resolved.scope });
   }
   async queryCount(selector) {
     const resolved = await this.resolveInjectedForSelector(selector);
-    // Be careful, |this.frame| can be different from |resolved.frame|.
-    if (!resolved) throw new Error(`Failed to find frame for selector "${selector}"`);
-    return await resolved.injected.evaluate((injected, {
-      info
-    }) => {
+    if (!resolved)
+      throw new Error(`Failed to find frame for selector "${selector}"`);
+    return await resolved.injected.evaluate((injected, { info }) => {
       return injected.querySelectorAll(info.parsed, document).length;
-    }, {
-      info: resolved.info
-    });
+    }, { info: resolved.info });
   }
   async queryAll(selector, scope) {
     const resolved = await this.resolveInjectedForSelector(selector, {}, scope);
-    // Be careful, |this.frame| can be different from |resolved.frame|.
-    if (!resolved) return [];
-    const arrayHandle = await resolved.injected.evaluateHandle((injected, {
-      info,
-      scope
-    }) => {
-      return injected.querySelectorAll(info.parsed, scope || document);
-    }, {
-      info: resolved.info,
-      scope: resolved.scope
-    });
+    if (!resolved)
+      return [];
+    const arrayHandle = await resolved.injected.evaluateHandle((injected, { info, scope: scope2 }) => {
+      return injected.querySelectorAll(info.parsed, scope2 || document);
+    }, { info: resolved.info, scope: resolved.scope });
     const properties = await arrayHandle.getProperties();
     arrayHandle.dispose();
-
-    // Note: adopting elements one by one may be slow. If we encounter the issue here,
-    // we might introduce 'useMainContext' option or similar to speed things up.
     const targetContext = await resolved.frame._mainContext();
     const result = [];
     for (const property of properties.values()) {
       const elementHandle = property.asElement();
-      if (elementHandle) result.push(adoptIfNeeded(elementHandle, targetContext));else property.dispose();
+      if (elementHandle)
+        result.push(adoptIfNeeded(elementHandle, targetContext));
+      else
+        property.dispose();
     }
     return Promise.all(result);
   }
+  _jumpToAriaRefFrameIfNeeded(selector, info, frame) {
+    if (info.parsed.parts[0].name !== "aria-ref")
+      return frame;
+    const body = info.parsed.parts[0].body;
+    const match = body.match(/^f(\d+)e\d+$/);
+    if (!match)
+      return frame;
+    const frameIndex = +match[1];
+    const page = this.frame._page;
+    const frameId = page.lastSnapshotFrameIds[frameIndex - 1];
+    const jumptToFrame = frameId ? page.frameManager.frame(frameId) : null;
+    if (!jumptToFrame)
+      throw new import_selectorParser.InvalidSelectorError(`Invalid frame in aria-ref selector "${selector}"`);
+    return jumptToFrame;
+  }
   async resolveFrameForSelector(selector, options = {}, scope) {
     let frame = this.frame;
-    const frameChunks = (0, _selectorParser.splitSelectorByFrame)(selector);
+    const frameChunks = (0, import_selectorParser.splitSelectorByFrame)(selector);
     for (const chunk of frameChunks) {
-      (0, _selectorParser.visitAllSelectorParts)(chunk, (part, nested) => {
-        if (nested && part.name === 'internal:control' && part.body === 'enter-frame') {
-          const locator = (0, _utils.asLocator)(this.frame._page.attribution.playwright.options.sdkLanguage, selector);
-          throw new _selectorParser.InvalidSelectorError(`Frame locators are not allowed inside composite locators, while querying "${locator}"`);
+      (0, import_selectorParser.visitAllSelectorParts)(chunk, (part, nested) => {
+        if (nested && part.name === "internal:control" && part.body === "enter-frame") {
+          const locator = (0, import_utils.asLocator)(this.frame._page.browserContext._browser.sdkLanguage(), selector);
+          throw new import_selectorParser.InvalidSelectorError(`Frame locators are not allowed inside composite locators, while querying "${locator}"`);
         }
       });
     }
     for (let i = 0; i < frameChunks.length - 1; ++i) {
       const info = this._parseSelector(frameChunks[i], options);
+      frame = this._jumpToAriaRefFrameIfNeeded(selector, info, frame);
       const context = await frame._context(info.world);
       const injectedScript = await context.injectedScript();
-      const handle = await injectedScript.evaluateHandle((injected, {
-        info,
-        scope,
-        selectorString
-      }) => {
-        const element = injected.querySelector(info.parsed, scope || document, info.strict);
-        if (element && element.nodeName !== 'IFRAME' && element.nodeName !== 'FRAME') throw injected.createStacklessError(`Selector "${selectorString}" resolved to ${injected.previewNode(element)}, <iframe> was expected`);
-        return element;
-      }, {
-        info,
-        scope: i === 0 ? scope : undefined,
-        selectorString: (0, _selectorParser.stringifySelector)(info.parsed)
-      });
+      const handle = await injectedScript.evaluateHandle((injected, { info: info2, scope: scope2, selectorString }) => {
+        const element2 = injected.querySelector(info2.parsed, scope2 || document, info2.strict);
+        if (element2 && element2.nodeName !== "IFRAME" && element2.nodeName !== "FRAME")
+          throw injected.createStacklessError(`Selector "${selectorString}" resolved to ${injected.previewNode(element2)}, <iframe> was expected`);
+        return element2;
+      }, { info, scope: i === 0 ? scope : void 0, selectorString: (0, import_selectorParser.stringifySelector)(info.parsed) });
       const element = handle.asElement();
-      if (!element) return null;
-      const maybeFrame = await frame._page._delegate.getContentFrame(element);
+      if (!element)
+        return null;
+      const maybeFrame = await frame._page.delegate.getContentFrame(element);
       element.dispose();
-      if (!maybeFrame) return null;
+      if (!maybeFrame)
+        return null;
       frame = maybeFrame;
     }
-    // If we end up in the different frame, we should start from the frame root, so throw away the scope.
-    if (frame !== this.frame) scope = undefined;
-    return {
-      frame,
-      info: frame.selectors._parseSelector(frameChunks[frameChunks.length - 1], options),
-      scope
-    };
+    if (frame !== this.frame)
+      scope = void 0;
+    const lastChunk = frame.selectors._parseSelector(frameChunks[frameChunks.length - 1], options);
+    frame = this._jumpToAriaRefFrameIfNeeded(selector, lastChunk, frame);
+    return { frame, info: lastChunk, scope };
   }
   async resolveInjectedForSelector(selector, options, scope) {
     const resolved = await this.resolveFrameForSelector(selector, options, scope);
-    // Be careful, |this.frame| can be different from |resolved.frame|.
-    if (!resolved) return;
-    const context = await resolved.frame._context(options !== null && options !== void 0 && options.mainWorld ? 'main' : resolved.info.world);
+    if (!resolved)
+      return;
+    const context = await resolved.frame._context(options?.mainWorld ? "main" : resolved.info.world);
     const injected = await context.injectedScript();
-    return {
-      injected,
-      info: resolved.info,
-      frame: resolved.frame,
-      scope: resolved.scope
-    };
+    return { injected, info: resolved.info, frame: resolved.frame, scope: resolved.scope };
   }
 }
-exports.FrameSelectors = FrameSelectors;
 async function adoptIfNeeded(handle, context) {
-  if (handle._context === context) return handle;
-  const adopted = await handle._page._delegate.adoptElementHandle(handle, context);
+  if (handle._context === context)
+    return handle;
+  const adopted = await handle._page.delegate.adoptElementHandle(handle, context);
   handle.dispose();
   return adopted;
-}
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FrameSelectors
+});