patchright-core 1.48.2 → 1.49.1

package/lib/utils/isomorphic/locatorGenerators.js

@@ -175,17 +175,27 @@ function innerAsLocators(factory, parsed, isFrameLocator = false, maxOutputSize
       }
     }
     if (part.name === 'internal:control' && part.body === 'enter-frame') {
-      tokens.push([factory.generateLocator(base, 'frame', '')]);
+      // transform last tokens from `${selector}` into `${selector}.contentFrame()` and `frameLocator(${selector})`
+      const lastTokens = tokens[tokens.length - 1];
+      const lastPart = parts[index - 1];
+      const transformed = lastTokens.map(token => factory.chainLocators([token, factory.generateLocator(base, 'frame', '')]));
+      if (['xpath', 'css'].includes(lastPart.name)) {
+        transformed.push(factory.generateLocator(base, 'frame-locator', (0, _selectorParser.stringifySelector)({
+          parts: [lastPart]
+        })), factory.generateLocator(base, 'frame-locator', (0, _selectorParser.stringifySelector)({
+          parts: [lastPart]
+        }, true)));
+      }
+      lastTokens.splice(0, lastTokens.length, ...transformed);
       nextBase = 'frame-locator';
       continue;
     }
-    let locatorType = 'default';
     const nextPart = parts[index + 1];
     const selectorPart = (0, _selectorParser.stringifySelector)({
       parts: [part]
     });
-    const locatorPart = factory.generateLocator(base, locatorType, selectorPart);
-    if (locatorType === 'default' && nextPart && ['internal:has-text', 'internal:has-not-text'].includes(nextPart.name)) {
+    const locatorPart = factory.generateLocator(base, 'default', selectorPart);
+    if (nextPart && ['internal:has-text', 'internal:has-not-text'].includes(nextPart.name)) {
       const {
         exact,
         text
@@ -213,7 +223,7 @@ function innerAsLocators(factory, parsed, isFrameLocator = false, maxOutputSize
       const selectorPart = (0, _selectorParser.stringifySelector)({
         parts: [part]
       }, /* forceEngineName */true);
-      locatorPartWithEngine = factory.generateLocator(base, locatorType, selectorPart);
+      locatorPartWithEngine = factory.generateLocator(base, 'default', selectorPart);
     }
     tokens.push([locatorPart, locatorPartWithEngine].filter(Boolean));
   }
@@ -267,6 +277,8 @@ class JavaScriptLocatorFactory {
         if (options.hasText !== undefined) return `locator(${this.quote(body)}, { hasText: ${this.toHasText(options.hasText)} })`;
         if (options.hasNotText !== undefined) return `locator(${this.quote(body)}, { hasNotText: ${this.toHasText(options.hasNotText)} })`;
         return `locator(${this.quote(body)})`;
+      case 'frame-locator':
+        return `frameLocator(${this.quote(body)})`;
       case 'frame':
         return `contentFrame()`;
       case 'nth':
@@ -350,6 +362,8 @@ class PythonLocatorFactory {
         if (options.hasText !== undefined) return `locator(${this.quote(body)}, has_text=${this.toHasText(options.hasText)})`;
         if (options.hasNotText !== undefined) return `locator(${this.quote(body)}, has_not_text=${this.toHasText(options.hasNotText)})`;
         return `locator(${this.quote(body)})`;
+      case 'frame-locator':
+        return `frame_locator(${this.quote(body)})`;
       case 'frame':
         return `content_frame`;
       case 'nth':
@@ -450,6 +464,8 @@ class JavaLocatorFactory {
         if (options.hasText !== undefined) return `locator(${this.quote(body)}, new ${clazz}.LocatorOptions().setHasText(${this.toHasText(options.hasText)}))`;
         if (options.hasNotText !== undefined) return `locator(${this.quote(body)}, new ${clazz}.LocatorOptions().setHasNotText(${this.toHasText(options.hasNotText)}))`;
         return `locator(${this.quote(body)})`;
+      case 'frame-locator':
+        return `frameLocator(${this.quote(body)})`;
       case 'frame':
         return `contentFrame()`;
       case 'nth':
@@ -534,6 +550,8 @@ class CSharpLocatorFactory {
         if (options.hasText !== undefined) return `Locator(${this.quote(body)}, new() { ${this.toHasText(options.hasText)} })`;
         if (options.hasNotText !== undefined) return `Locator(${this.quote(body)}, new() { ${this.toHasNotText(options.hasNotText)} })`;
         return `Locator(${this.quote(body)})`;
+      case 'frame-locator':
+        return `FrameLocator(${this.quote(body)})`;
       case 'frame':
         return `ContentFrame`;
       case 'nth':

package/lib/utils/isomorphic/recorderUtils.js

@@ -25,6 +25,7 @@ exports.traceParamsForAction = traceParamsForAction;
 function buildFullSelector(framePath, selector) {
   return [...framePath, selector].join(' >> internal:control=enter-frame >> ');
 }
+const kDefaultTimeout = 5_000;
 function traceParamsForAction(actionInContext) {
   const {
     action
@@ -37,6 +38,7 @@ function traceParamsForAction(actionInContext) {
         };
         return {
           method: 'goto',
+          apiName: 'page.goto',
           params
         };
       }
@@ -58,6 +60,7 @@ function traceParamsForAction(actionInContext) {
         };
         return {
           method: 'click',
+          apiName: 'locator.click',
           params
         };
       }
@@ -70,6 +73,7 @@ function traceParamsForAction(actionInContext) {
         };
         return {
           method: 'press',
+          apiName: 'locator.press',
           params
         };
       }
@@ -82,6 +86,7 @@ function traceParamsForAction(actionInContext) {
         };
         return {
           method: 'fill',
+          apiName: 'locator.fill',
           params
         };
       }
@@ -94,6 +99,7 @@ function traceParamsForAction(actionInContext) {
         };
         return {
           method: 'setInputFiles',
+          apiName: 'locator.setInputFiles',
           params
         };
       }
@@ -105,6 +111,7 @@ function traceParamsForAction(actionInContext) {
         };
         return {
           method: 'check',
+          apiName: 'locator.check',
           params
         };
       }
@@ -116,6 +123,7 @@ function traceParamsForAction(actionInContext) {
         };
         return {
           method: 'uncheck',
+          apiName: 'locator.uncheck',
           params
         };
       }
@@ -130,6 +138,7 @@ function traceParamsForAction(actionInContext) {
         };
         return {
           method: 'selectOption',
+          apiName: 'locator.selectOption',
           params
         };
       }
@@ -138,10 +147,12 @@ function traceParamsForAction(actionInContext) {
         const params = {
           selector: action.selector,
           expression: 'to.be.checked',
-          isNot: !action.checked
+          isNot: !action.checked,
+          timeout: kDefaultTimeout
         };
         return {
           method: 'expect',
+          apiName: 'expect.toBeChecked',
           params
         };
       }
@@ -151,10 +162,12 @@ function traceParamsForAction(actionInContext) {
           selector,
           expression: 'to.have.text',
           expectedText: [],
-          isNot: false
+          isNot: false,
+          timeout: kDefaultTimeout
         };
         return {
           method: 'expect',
+          apiName: 'expect.toContainText',
           params
         };
       }
@@ -164,10 +177,12 @@ function traceParamsForAction(actionInContext) {
           selector,
           expression: 'to.have.value',
           expectedValue: undefined,
-          isNot: false
+          isNot: false,
+          timeout: kDefaultTimeout
         };
         return {
           method: 'expect',
+          apiName: 'expect.toHaveValue',
           params
         };
       }
@@ -176,10 +191,27 @@ function traceParamsForAction(actionInContext) {
         const params = {
           selector,
           expression: 'to.be.visible',
-          isNot: false
+          isNot: false,
+          timeout: kDefaultTimeout
         };
         return {
           method: 'expect',
+          apiName: 'expect.toBeVisible',
+          params
+        };
+      }
+    case 'assertSnapshot':
+      {
+        const params = {
+          selector,
+          expression: 'to.match.snapshot',
+          expectedText: [],
+          isNot: false,
+          timeout: kDefaultTimeout
+        };
+        return {
+          method: 'expect',
+          apiName: 'expect.toMatchAriaSnapshot',
           params
         };
       }

package/lib/utils/isomorphic/stringUtils.js

@@ -10,8 +10,10 @@ exports.escapeForTextSelector = escapeForTextSelector;
 exports.escapeHTML = escapeHTML;
 exports.escapeHTMLAttribute = escapeHTMLAttribute;
 exports.escapeRegExp = escapeRegExp;
+exports.escapeTemplateString = escapeTemplateString;
 exports.escapeWithQuotes = escapeWithQuotes;
 exports.isString = isString;
+exports.longestCommonSubstring = longestCommonSubstring;
 exports.normalizeEscapedRegexQuotes = normalizeEscapedRegexQuotes;
 exports.normalizeWhiteSpace = normalizeWhiteSpace;
 exports.quoteCSSAttributeValue = quoteCSSAttributeValue;
@@ -44,6 +46,9 @@ function escapeWithQuotes(text, char = '\'') {
   if (char === '`') return char + escapedText.replace(/[`]/g, '`') + char;
   throw new Error('Invalid escape char');
 }
+function escapeTemplateString(text) {
+  return text.replace(/\\/g, '\\\\').replace(/`/g, '\\`').replace(/\$\{/g, '\\${');
+}
 function isString(obj) {
   return typeof obj === 'string' || obj instanceof String;
 }
@@ -136,4 +141,29 @@ function escapeHTMLAttribute(s) {
 }
 function escapeHTML(s) {
   return s.replace(/[&<]/ug, char => escaped[char]);
+}
+function longestCommonSubstring(s1, s2) {
+  const n = s1.length;
+  const m = s2.length;
+  let maxLen = 0;
+  let endingIndex = 0;
+
+  // Initialize a 2D array with zeros
+  const dp = Array(n + 1).fill(null).map(() => Array(m + 1).fill(0));
+
+  // Build the dp table
+  for (let i = 1; i <= n; i++) {
+    for (let j = 1; j <= m; j++) {
+      if (s1[i - 1] === s2[j - 1]) {
+        dp[i][j] = dp[i - 1][j - 1] + 1;
+        if (dp[i][j] > maxLen) {
+          maxLen = dp[i][j];
+          endingIndex = i;
+        }
+      }
+    }
+  }
+
+  // Extract the longest common substring
+  return s1.slice(endingIndex - maxLen, endingIndex);
 }

package/lib/utils/isomorphic/urlMatch.js

@@ -94,7 +94,11 @@ function urlMatchesEqual(match1, match2) {
 }
 function urlMatches(baseURL, urlString, match) {
   if (match === undefined || match === '') return true;
-  if ((0, _stringUtils.isString)(match) && !match.startsWith('*')) match = constructURLBasedOnBaseURL(baseURL, match);
+  if ((0, _stringUtils.isString)(match) && !match.startsWith('*')) {
+    // Allow http(s) baseURL to match ws(s) urls.
+    if (baseURL && /^https?:\/\//.test(baseURL) && /^wss?:\/\//.test(urlString)) baseURL = baseURL.replace(/^http/, 'ws');
+    match = constructURLBasedOnBaseURL(baseURL, match);
+  }
   if ((0, _stringUtils.isString)(match)) match = globToRegex(match);
   if (isRegExp(match)) return match.test(urlString);
   if (typeof match === 'string' && match === urlString) return true;

package/lib/utils/network.js

@@ -47,7 +47,7 @@ function httpRequest(params, onResponse, onError) {
   const timeout = (_params$timeout = params.timeout) !== null && _params$timeout !== void 0 ? _params$timeout : NET_DEFAULT_TIMEOUT;
   const proxyURL = (0, _utilsBundle.getProxyForUrl)(params.url);
   if (proxyURL) {
-    const parsedProxyURL = _url.default.parse(proxyURL);
+    const parsedProxyURL = new URL(proxyURL);
     if (params.url.startsWith('http:')) {
       options = {
         path: parsedUrl.href,

package/lib/utils/sequence.js

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findRepeatedSubsequences = findRepeatedSubsequences;
+/**
+ * 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.
+ */
+
+function findRepeatedSubsequences(s) {
+  const n = s.length;
+  const result = [];
+  let i = 0;
+  const arraysEqual = (a1, a2) => {
+    if (a1.length !== a2.length) return false;
+    for (let j = 0; j < a1.length; j++) {
+      if (a1[j] !== a2[j]) return false;
+    }
+    return true;
+  };
+  while (i < n) {
+    let maxRepeatCount = 1;
+    let maxRepeatSubstr = [s[i]]; // Initialize with the element at index i
+    let maxRepeatLength = 1;
+
+    // Try substrings of length from 1 to the remaining length of the array
+    for (let p = 1; p <= n - i; p++) {
+      const substr = s.slice(i, i + p); // Extract substring as array
+      let k = 1;
+
+      // Count how many times the substring repeats consecutively
+      while (i + p * k <= n && arraysEqual(s.slice(i + p * (k - 1), i + p * k), substr)) k += 1;
+      k -= 1; // Adjust k since it increments one extra time in the loop
+
+      // Update the maximal repeating substring if necessary
+      if (k > 1 && k * p > maxRepeatCount * maxRepeatLength) {
+        maxRepeatCount = k;
+        maxRepeatSubstr = substr;
+        maxRepeatLength = p;
+      }
+    }
+
+    // Record the substring and its count
+    result.push({
+      sequence: maxRepeatSubstr,
+      count: maxRepeatCount
+    });
+    i += maxRepeatLength * maxRepeatCount; // Move index forward
+  }
+  return result;
+}

package/lib/utils/stackTrace.js

@@ -7,13 +7,14 @@ exports.addInternalStackPrefix = void 0;
 exports.captureLibraryStackText = captureLibraryStackText;
 exports.captureLibraryStackTrace = captureLibraryStackTrace;
 exports.captureRawStack = captureRawStack;
+exports.compressCallLog = compressCallLog;
 exports.formatCallLog = formatCallLog;
 exports.rewriteErrorMessage = rewriteErrorMessage;
 exports.splitErrorMessage = splitErrorMessage;
 exports.stringifyStackFrames = stringifyStackFrames;
 var _path = _interopRequireDefault(require("path"));
 var _utilsBundle = require("../utilsBundle");
-var _ = require("./");
+var _sequence = require("./sequence");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -53,7 +54,6 @@ function captureRawStack() {
 }
 function captureLibraryStackTrace() {
   const stack = captureRawStack();
-  const isTesting = (0, _.isUnderTest)();
   let parsedFrames = stack.map(line => {
     const frame = (0, _utilsBundle.parseStackTraceLine)(line);
     if (!frame || !frame.file) return null;
@@ -116,6 +116,19 @@ function formatCallLog(log) {
   if (!log || !log.some(l => !!l)) return '';
   return `
 Call log:
-  ${_utilsBundle.colors.dim('- ' + (log || []).join('\n  - '))}
+${_utilsBundle.colors.dim(log.join('\n'))}
 `;
+}
+function compressCallLog(log) {
+  const lines = [];
+  for (const block of (0, _sequence.findRepeatedSubsequences)(log)) {
+    for (let i = 0; i < block.sequence.length; i++) {
+      const line = block.sequence[i];
+      const leadingWhitespace = line.match(/^\s*/);
+      const whitespacePrefix = '  ' + (leadingWhitespace === null || leadingWhitespace === void 0 ? void 0 : leadingWhitespace[0]) || '';
+      const countPrefix = `${block.count} × `;
+      if (block.count > 1 && i === 0) lines.push(whitespacePrefix + countPrefix + line.trim());else if (block.count > 1) lines.push(whitespacePrefix + ' '.repeat(countPrefix.length - 2) + '- ' + line.trim());else lines.push(whitespacePrefix + '- ' + line.trim());
+    }
+  }
+  return lines;
 }

package/lib/utils/zones.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.zones = void 0;
+exports.zones = exports.Zone = void 0;
 var _async_hooks = require("async_hooks");
 /**
  * Copyright (c) Microsoft Corporation.
@@ -26,37 +26,46 @@ class ZoneManager {
     this._asyncLocalStorage = new _async_hooks.AsyncLocalStorage();
   }
   run(type, data, func) {
-    const previous = this._asyncLocalStorage.getStore();
-    const zone = new Zone(previous, type, data);
+    const zone = Zone._createWithData(this._asyncLocalStorage, type, data);
     return this._asyncLocalStorage.run(zone, func);
   }
   zoneData(type) {
-    for (let zone = this._asyncLocalStorage.getStore(); zone; zone = zone.previous) {
-      if (zone.type === type) return zone.data;
-    }
-    return undefined;
+    const zone = this._asyncLocalStorage.getStore();
+    return zone === null || zone === void 0 ? void 0 : zone.get(type);
+  }
+  currentZone() {
+    var _this$_asyncLocalStor;
+    return (_this$_asyncLocalStor = this._asyncLocalStorage.getStore()) !== null && _this$_asyncLocalStor !== void 0 ? _this$_asyncLocalStor : Zone._createEmpty(this._asyncLocalStorage);
   }
   exitZones(func) {
     return this._asyncLocalStorage.run(undefined, func);
   }
-  printZones() {
-    const zones = [];
-    for (let zone = this._asyncLocalStorage.getStore(); zone; zone = zone.previous) {
-      let str = zone.type;
-      if (zone.type === 'apiZone') str += `(${zone.data.apiName})`;
-      zones.push(str);
-    }
-    console.log('zones: ', zones.join(' -> '));
-  }
 }
 class Zone {
-  constructor(previous, type, data) {
-    this.type = void 0;
-    this.data = void 0;
-    this.previous = void 0;
-    this.type = type;
-    this.data = data;
-    this.previous = previous;
+  static _createWithData(asyncLocalStorage, type, data) {
+    var _asyncLocalStorage$ge;
+    const store = new Map((_asyncLocalStorage$ge = asyncLocalStorage.getStore()) === null || _asyncLocalStorage$ge === void 0 ? void 0 : _asyncLocalStorage$ge._data);
+    store.set(type, data);
+    return new Zone(asyncLocalStorage, store);
+  }
+  static _createEmpty(asyncLocalStorage) {
+    return new Zone(asyncLocalStorage, new Map());
+  }
+  constructor(asyncLocalStorage, store) {
+    this._asyncLocalStorage = void 0;
+    this._data = void 0;
+    this._asyncLocalStorage = asyncLocalStorage;
+    this._data = store;
+  }
+  run(func) {
+    // Reset apiZone and expectZone, but restore stepZone.
+    const entries = [...this._data.entries()].filter(([type]) => type !== 'apiZone' && type !== 'expectZone');
+    const resetZone = new Zone(this._asyncLocalStorage, new Map(entries));
+    return this._asyncLocalStorage.run(resetZone, func);
+  }
+  get(type) {
+    return this._data.get(type);
   }
 }
+exports.Zone = Zone;
 const zones = exports.zones = new ZoneManager();

package/lib/utilsBundle.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.minimatch = exports.mime = exports.lockfile = exports.jpegjs = exports.getProxyForUrl = exports.dotenv = exports.debug = exports.colors = exports.SocksProxyAgent = exports.PNG = exports.HttpsProxyAgent = void 0;
+exports.minimatch = exports.mime = exports.lockfile = exports.jpegjs = exports.getProxyForUrl = exports.dotenv = exports.diff = exports.debug = exports.colors = exports.SocksProxyAgent = exports.PNG = exports.HttpsProxyAgent = void 0;
 exports.ms = ms;
 exports.open = void 0;
 exports.parseStackTraceLine = parseStackTraceLine;
-exports.wsServer = exports.wsSender = exports.wsReceiver = exports.ws = exports.progress = exports.program = void 0;
+exports.yaml = exports.wsServer = exports.wsSender = exports.wsReceiver = exports.ws = exports.progress = exports.program = void 0;
 var _url = _interopRequireDefault(require("url"));
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -29,6 +29,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const colors = exports.colors = require('./utilsBundleImpl').colors;
 const debug = exports.debug = require('./utilsBundleImpl').debug;
+const diff = exports.diff = require('./utilsBundleImpl').diff;
 const dotenv = exports.dotenv = require('./utilsBundleImpl').dotenv;
 const getProxyForUrl = exports.getProxyForUrl = require('./utilsBundleImpl').getProxyForUrl;
 const HttpsProxyAgent = exports.HttpsProxyAgent = require('./utilsBundleImpl').HttpsProxyAgent;
@@ -41,6 +42,7 @@ const PNG = exports.PNG = require('./utilsBundleImpl').PNG;
 const program = exports.program = require('./utilsBundleImpl').program;
 const progress = exports.progress = require('./utilsBundleImpl').progress;
 const SocksProxyAgent = exports.SocksProxyAgent = require('./utilsBundleImpl').SocksProxyAgent;
+const yaml = exports.yaml = require('./utilsBundleImpl').yaml;
 const ws = exports.ws = require('./utilsBundleImpl').ws;
 const wsServer = exports.wsServer = require('./utilsBundleImpl').wsServer;
 const wsReceiver = exports.wsReceiver = require('./utilsBundleImpl').wsReceiver;
@@ -49,11 +51,8 @@ const StackUtils = require('./utilsBundleImpl').StackUtils;
 const stackUtils = new StackUtils({
   internals: StackUtils.nodeInternals()
 });
-const nodeInternals = StackUtils.nodeInternals();
-const nodeMajorVersion = +process.versions.node.split('.')[0];
 function parseStackTraceLine(line) {
   var _frame$file, _frame$file2;
-  if (!process.env.PWDEBUGIMPL && nodeMajorVersion < 16 && nodeInternals.some(internal => internal.test(line))) return null;
   const frame = stackUtils.parseLine(line);
   if (!frame) return null;
   if (!process.env.PWDEBUGIMPL && ((_frame$file = frame.file) !== null && _frame$file !== void 0 && _frame$file.startsWith('internal') || (_frame$file2 = frame.file) !== null && _frame$file2 !== void 0 && _frame$file2.startsWith('node:'))) return null;