patchright-bun 1.58.2 → 1.59.0

package/lib/worker/fixtureRunner.js

@@ -222,14 +222,14 @@ class FixtureRunner {
         return null;
       params[name] = fixture.value;
     }
-    return params;
+    return { result: params };
   }
   async resolveParametersAndRunFunction(fn, testInfo, autoFixtures, runnable) {
     const params = await this.resolveParametersForFunction(fn, testInfo, autoFixtures, runnable);
     if (params === null) {
       return null;
     }
-    await testInfo._runWithTimeout(runnable, () => fn(params, testInfo));
+    await testInfo._runWithTimeout(runnable, () => fn(params.result, testInfo));
   }
   async _setupFixtureForRegistration(registration, testInfo, runnable) {
     if (registration.scope === "test")

package/lib/worker/testInfo.js

@@ -50,9 +50,7 @@ const emtpyTestInfoCallbacks = {
   },
   onAttach: () => {
   },
-  onTestPaused: () => Promise.reject(new Error("TestInfoImpl not initialized")),
-  onCloneStorage: () => Promise.reject(new Error("TestInfoImpl not initialized")),
-  onUpstreamStorage: () => Promise.resolve()
+  onTestPaused: () => Promise.reject(new Error("TestInfoImpl not initialized"))
 };
 class TestInfoImpl {
   constructor(configInternal, projectInternal, workerParams, test, retry, callbacks) {
@@ -62,6 +60,7 @@ class TestInfoImpl {
     this._lastStepId = 0;
     this._steps = [];
     this._stepMap = /* @__PURE__ */ new Map();
+    this._onDidFinishTestFunctionCallbacks = /* @__PURE__ */ new Set();
     this._hasNonRetriableError = false;
     this._hasUnhandledError = false;
     this._allowSkips = false;
@@ -71,6 +70,7 @@ class TestInfoImpl {
     this.status = "passed";
     this.snapshotSuffix = "";
     this.errors = [];
+    this._ignoreTimeoutsCounter = 0;
     this.testId = test?.id ?? "";
     this._callbacks = callbacks;
     this._startTime = (0, import_utils.monotonicTime)();
@@ -96,8 +96,8 @@ class TestInfoImpl {
     });
     this.expectedStatus = test?.expectedStatus ?? "skipped";
     this._timeoutManager = new import_timeoutManager.TimeoutManager(this.project.timeout);
-    if (configInternal.configCLIOverrides.debug)
-      this._setDebugMode();
+    if (configInternal.configCLIOverrides.debug === "inspector")
+      this._setIgnoreTimeouts(true);
     this.outputDir = (() => {
       const relativeTestFilePath = import_path.default.relative(this.project.testDir, this._requireFile.replace(/\.(spec|test)\.(js|ts|jsx|tsx|mjs|mts|cjs|cts)$/, ""));
       const sanitizedRelativePath = relativeTestFilePath.replace(process.platform === "win32" ? new RegExp("\\\\", "g") : new RegExp("/", "g"), "-");
@@ -341,8 +341,9 @@ ${(0, import_utils.stringifyStackFrames)(step.boxedStack).join("\n")}`;
     const type = this._timeoutManager.currentSlotType();
     return ["beforeAll", "afterAll", "beforeEach", "afterEach"].includes(type) ? type : void 0;
   }
-  _setDebugMode() {
-    this._timeoutManager.setIgnoreTimeouts();
+  _setIgnoreTimeouts(ignoreTimeouts) {
+    this._ignoreTimeoutsCounter += ignoreTimeouts ? 1 : -1;
+    this._timeoutManager.setIgnoreTimeouts(this._ignoreTimeoutsCounter > 0);
   }
   async _didFinishTestFunction() {
     const shouldPause = this._workerParams.pauseAtEnd && !this._isFailure() || this._workerParams.pauseOnError && this._isFailure();
@@ -352,7 +353,8 @@ ${(0, import_utils.stringifyStackFrames)(step.boxedStack).join("\n")}`;
         this._interruptedPromise
       ]);
     }
-    await this._onDidFinishTestFunctionCallback?.();
+    for (const cb of this._onDidFinishTestFunctionCallbacks)
+      await cb();
   }
   // ------------ TestInfo methods ------------
   async attach(name, options = {}) {
@@ -472,12 +474,6 @@ ${(0, import_utils.stringifyStackFrames)(step.boxedStack).join("\n")}`;
   setTimeout(timeout) {
     this._timeoutManager.setTimeout(timeout);
   }
-  async _cloneStorage(storageFile) {
-    return await this._callbacks.onCloneStorage({ storageFile });
-  }
-  async _upstreamStorage(storageFile, storageOutFile) {
-    await this._callbacks.onUpstreamStorage({ storageFile, storageOutFile });
-  }
   artifactsDir() {
     return this._workerParams.artifactsDir;
   }

package/lib/worker/testTracing.js

@@ -35,7 +35,6 @@ module.exports = __toCommonJS(testTracing_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_utils = require("patchright-bun-core/lib/utils");
-var import_zipBundle = require("patchright-bun-core/lib/zipBundle");
 var import_util = require("../util");
 const testTraceEntryName = "test.trace";
 const version = 8;
@@ -73,10 +72,12 @@ class TestTracing {
       return true;
     if (this._options?.mode === "retain-on-first-failure" && this._testInfo.retry === 0)
       return true;
+    if (this._options?.mode === "retain-on-failure-and-retries")
+      return true;
     return false;
   }
   async startIfNeeded(value) {
-    const defaultTraceOptions = { screenshots: true, snapshots: true, sources: true, attachments: true, _live: false, mode: "off" };
+    const defaultTraceOptions = { screenshots: true, snapshots: true, sources: true, attachments: true, live: false, mode: "off" };
     if (!value) {
       this._options = defaultTraceOptions;
     } else if (typeof value === "string") {
@@ -89,7 +90,7 @@ class TestTracing {
       this._options = void 0;
       return;
     }
-    if (!this._liveTraceFile && this._options._live) {
+    if (!this._liveTraceFile && this._options.live) {
       this._liveTraceFile = { file: import_path.default.join(this._tracesDir, `${this._testInfo.testId}-test.trace`), fs: new import_utils.SerializedFS() };
       this._liveTraceFile.fs.mkdir(import_path.default.dirname(this._liveTraceFile.file));
       const data = this._traceEvents.map((e) => JSON.stringify(e)).join("\n") + "\n";
@@ -131,9 +132,12 @@ class TestTracing {
     if (!this._options)
       return true;
     const testFailed = this._testInfo.status !== this._testInfo.expectedStatus;
+    if (this._options.mode === "retain-on-failure-and-retries")
+      return !testFailed && this._testInfo.retry === 0;
     return !testFailed && (this._options.mode === "retain-on-failure" || this._options.mode === "retain-on-first-failure");
   }
   async stopIfNeeded() {
+    this._contextCreatedEvent.testTimeout = this._testInfo.timeout;
     if (!this._options)
       return;
     const error = await this._liveTraceFile?.fs.syncAndGetError();
@@ -145,7 +149,8 @@ class TestTracing {
         });
       return;
     }
-    const zipFile = new import_zipBundle.yazl.ZipFile();
+    const { yazl } = await import("playwright-core/lib/zipBundle");
+    const zipFile = new yazl.ZipFile();
     if (!this._options?.attachments) {
       for (const event of this._traceEvents) {
         if (event.type === "after")
@@ -292,13 +297,14 @@ async function mergeTraceFiles(fileName, temporaryTraceFiles) {
     return;
   }
   const mergePromise = new import_utils.ManualPromise();
-  const zipFile = new import_zipBundle.yazl.ZipFile();
+  const { yazl, yauzl } = await import("playwright-core/lib/zipBundle");
+  const zipFile = new yazl.ZipFile();
   const entryNames = /* @__PURE__ */ new Set();
   zipFile.on("error", (error) => mergePromise.reject(error));
   for (let i = temporaryTraceFiles.length - 1; i >= 0; --i) {
     const tempFile = temporaryTraceFiles[i];
     const promise = new import_utils.ManualPromise();
-    import_zipBundle.yauzl.open(tempFile, (err, inZipFile) => {
+    yauzl.open(tempFile, (err, inZipFile) => {
       if (err) {
         promise.reject(err);
         return;

package/lib/worker/timeoutManager.js

@@ -30,12 +30,20 @@ const kMaxDeadline = 2147483647;
 class TimeoutManager {
   constructor(timeout) {
     this._ignoreTimeouts = false;
+    this._slow = false;
     this._defaultSlot = { timeout, elapsed: 0 };
   }
-  setIgnoreTimeouts() {
-    this._ignoreTimeouts = true;
-    if (this._running)
+  setIgnoreTimeouts(ignoreTimeouts) {
+    if (this._ignoreTimeouts === ignoreTimeouts)
+      return;
+    this._ignoreTimeouts = ignoreTimeouts;
+    if (this._running) {
+      if (ignoreTimeouts)
+        this._running.slot.elapsed += (0, import_utils.monotonicTime)() - this._running.start;
+      else
+        this._running.start = (0, import_utils.monotonicTime)();
       this._updateTimeout(this._running);
+    }
   }
   interrupt() {
     if (this._running)
@@ -97,6 +105,9 @@ class TimeoutManager {
     return this._defaultSlot;
   }
   slow() {
+    if (this._slow)
+      return;
+    this._slow = true;
     const slot = this._running ? this._running.slot : this._defaultSlot;
     slot.timeout = slot.timeout * 3;
     if (this._running)

package/lib/worker/workerMain.js

@@ -181,24 +181,27 @@ class WorkerMain extends import_process.ProcessRunner {
       const suite = (0, import_suiteUtils.bindFileSuiteToProject)(this._project, fileSuite);
       if (this._params.repeatEachIndex)
         (0, import_suiteUtils.applyRepeatEachIndex)(this._project, suite, this._params.repeatEachIndex);
-      const hasEntries = (0, import_suiteUtils.filterTestsRemoveEmptySuites)(suite, (test) => entries.has(test.id));
-      if (hasEntries) {
-        this._poolBuilder.buildPools(suite);
-        this._activeSuites = /* @__PURE__ */ new Map();
-        this._didRunFullCleanup = false;
-        const tests = suite.allTests();
-        for (let i = 0; i < tests.length; i++) {
-          if (this._isStopped && this._didRunFullCleanup)
-            break;
-          const entry = entries.get(tests[i].id);
-          entries.delete(tests[i].id);
-          (0, import_util.debugTest)(`test started "${tests[i].title}"`);
-          await this._runTest(tests[i], entry.retry, tests[i + 1]);
-          (0, import_util.debugTest)(`test finished "${tests[i].title}"`);
-        }
-      } else {
-        fatalUnknownTestIds = runPayload.entries.map((e) => e.testId);
+      (0, import_suiteUtils.filterTestsRemoveEmptySuites)(suite, (test) => entries.has(test.id));
+      const tests = suite.allTests();
+      const unknownTestIds = new Set(entries.keys());
+      for (const test of tests)
+        unknownTestIds.delete(test.id);
+      if (unknownTestIds.size) {
+        fatalUnknownTestIds = [...unknownTestIds];
         void this._stop();
+        return;
+      }
+      this._poolBuilder.buildPools(suite);
+      this._activeSuites = /* @__PURE__ */ new Map();
+      this._didRunFullCleanup = false;
+      for (let i = 0; i < tests.length; i++) {
+        if (this._isStopped && this._didRunFullCleanup)
+          break;
+        const entry = entries.get(tests[i].id);
+        entries.delete(tests[i].id);
+        (0, import_util.debugTest)(`test started "${tests[i].title}"`);
+        await this._runTest(tests[i], entry.retry, tests[i + 1]);
+        (0, import_util.debugTest)(`test finished "${tests[i].title}"`);
       }
     } catch (e) {
       this._fatalErrors.push((0, import_util2.testInfoError)(e));
@@ -242,9 +245,7 @@ class WorkerMain extends import_process.ProcessRunner {
         this._resumePromise = new import_utils.ManualPromise();
         this.dispatchEvent("testPaused", payload);
         return this._resumePromise;
-      },
-      onCloneStorage: async (payload) => this.sendRequest("cloneStorage", payload),
-      onUpstreamStorage: (payload) => this.sendRequest("upstreamStorage", payload)
+      }
     });
     const processAnnotation = (annotation) => {
       testInfo.annotations.push(annotation);
@@ -313,7 +314,9 @@ class WorkerMain extends import_process.ProcessRunner {
           await this._runBeforeAllHooksForSuite(suite, testInfo);
         shouldRunAfterEachHooks = true;
         await this._runEachHooksForSuites(suites, "beforeEach", testInfo);
-        testFunctionParams = await this._fixtureRunner.resolveParametersForFunction(test.fn, testInfo, "test", { type: "test" });
+        const params = await this._fixtureRunner.resolveParametersForFunction(test.fn, testInfo, "test", { type: "test" });
+        if (params !== null)
+          testFunctionParams = params.result;
       });
       if (testFunctionParams === null) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "patchright-bun",
-    "version": "1.58.2",
+    "version": "1.59.0",
     "description": "Patchright with Bun WebSocket support",
     "repository": {
         "type": "git",
@@ -22,10 +22,6 @@
         "./lib/common/configLoader": "./lib/common/configLoader.js",
         "./lib/fsWatcher": "./lib/fsWatcher.js",
         "./lib/mcp/index": "./lib/mcp/index.js",
-        "./lib/mcp/browser/tools": "./lib/mcp/browser/tools.js",
-        "./lib/mcp/program": "./lib/mcp/program.js",
-        "./lib/mcp/sdk/bundle": "./lib/mcp/sdk/bundle.js",
-        "./lib/mcp/sdk/exports": "./lib/mcp/sdk/exports.js",
         "./lib/program": "./lib/program.js",
         "./lib/reporters/base": "./lib/reporters/base.js",
         "./lib/reporters/list": "./lib/reporters/list.js",
@@ -64,7 +60,7 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-        "patchright-bun-core": "1.58.2"
+        "patchright-bun-core": "1.59.0"
     },
     "optionalDependencies": {
         "fsevents": "2.3.2"

package/types/test.d.ts

@@ -20,7 +20,7 @@ export * from 'patchright-bun-core';
 
 export type BlobReporterOptions = { outputDir?: string, fileName?: string };
 export type ListReporterOptions = { printSteps?: boolean };
-export type JUnitReporterOptions = { outputFile?: string, stripANSIControlSequences?: boolean, includeProjectInTestName?: boolean };
+export type JUnitReporterOptions = { outputFile?: string, stripANSIControlSequences?: boolean, includeProjectInTestName?: boolean, includeRetries?: boolean };
 export type JsonReporterOptions = { outputFile?: string };
 export type HtmlReporterOptions = {
   outputFolder?: string;
@@ -31,6 +31,7 @@ export type HtmlReporterOptions = {
   title?: string;
   noSnippets?: boolean;
   noCopyPrompt?: boolean;
+  doNotInlineAssets?: boolean;
 };
 
 export type ReporterDescription = Readonly<
@@ -250,6 +251,13 @@ interface TestProject<TestArgs = {}, WorkerArgs = {}> {
        * for details.
        */
       pathTemplate?: string;
+
+      /**
+       * Controls how children of the snapshot root are matched against the actual accessibility tree. This is equivalent to
+       * adding a `/children` property at the top of every aria snapshot template. Individual snapshots can override this by
+       * including an explicit `/children` property.
+       */
+      children?: "contain"|"equal"|"deep-equal";
     };
 
     /**
@@ -764,6 +772,11 @@ export interface FullProject<TestArgs = {}, WorkerArgs = {}> {
    */
   grepInvert: null|RegExp|Array<RegExp>;
 
+  /**
+   * See [testProject.ignoreSnapshots](https://playwright.dev/docs/api/class-testproject#test-project-ignore-snapshots).
+   */
+  ignoreSnapshots: boolean;
+
   /**
    * See [testProject.metadata](https://playwright.dev/docs/api/class-testproject#test-project-metadata).
    */
@@ -1176,6 +1189,13 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
        * for details.
        */
       pathTemplate?: string;
+
+      /**
+       * Controls how children of the snapshot root are matched against the actual accessibility tree. This is equivalent to
+       * adding a `/children` property at the top of every aria snapshot template. Individual snapshots can override this by
+       * including an explicit `/children` property.
+       */
+      children?: "contain"|"equal"|"deep-equal";
     };
 
     /**
@@ -6882,6 +6902,7 @@ export interface PlaywrightWorkerOptions {
    * - `'retain-on-failure'`: Record trace for each test. When test run passes, remove the recorded trace.
    * - `'retain-on-first-failure'`: Record trace for the first run of each test, but not for retries. When test run
    *   passes, remove the recorded trace.
+   * - `'retain-on-failure-and-retries'`: Record trace for each test run. Retains all traces when an attempt fails.
    *
    * For more control, pass an object that specifies `mode` and trace features to enable.
    *
@@ -6913,6 +6934,10 @@ export interface PlaywrightWorkerOptions {
    * down to fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual
    * picture of each page will be scaled down if necessary to fit the specified size.
    *
+   * To annotate actions in the video, pass `show` with `action` and/or `test` sub-options. The `action` option controls
+   * visual highlights on interacted elements with an optional `delay` in milliseconds (defaults to `500`). The `test`
+   * option controls which test information is displayed as a status overlay.
+   *
    * **Usage**
    *
    * ```js
@@ -6928,13 +6953,12 @@ export interface PlaywrightWorkerOptions {
    *
    * Learn more about [recording video](https://playwright.dev/docs/test-use-options#recording-options).
    */
-  video: VideoMode | /** deprecated */ 'retry-with-video' | { mode: VideoMode, size?: ViewportSize };
+  video: VideoMode | /** deprecated */ 'retry-with-video' | { mode: VideoMode, size?: ViewportSize, show?: { actions?: { duration?: number, position?: 'top-left' | 'top' | 'top-right' | 'bottom-left' | 'bottom' | 'bottom-right', fontSize?: number }, test?: { level?: 'file' | 'title' | 'step', position?: 'top-left' | 'top' | 'top-right' | 'bottom-left' | 'bottom' | 'bottom-right', fontSize?: number } } };
 }
 
 export type ScreenshotMode = 'off' | 'on' | 'only-on-failure' | 'on-first-failure';
-export type TraceMode = 'off' | 'on' | 'retain-on-failure' | 'on-first-retry' | 'on-all-retries' | 'retain-on-first-failure';
+export type TraceMode = 'off' | 'on' | 'retain-on-failure' | 'on-first-retry' | 'on-all-retries' | 'retain-on-first-failure' | 'retain-on-failure-and-retries';
 export type VideoMode = 'off' | 'on' | 'retain-on-failure' | 'on-first-retry';
-
 /**
  * Playwright Test provides many options to configure test environment,
  * [Browser](https://playwright.dev/docs/api/class-browser),
@@ -7693,6 +7717,9 @@ type CustomProperties<T> = ExcludeProps<T, PlaywrightTestOptions & PlaywrightWor
 export type PlaywrightTestProject<TestArgs = {}, WorkerArgs = {}> = Project<PlaywrightTestOptions & CustomProperties<TestArgs>, PlaywrightWorkerOptions & CustomProperties<WorkerArgs>>;
 export type PlaywrightTestConfig<TestArgs = {}, WorkerArgs = {}> = Config<PlaywrightTestOptions & CustomProperties<TestArgs>, PlaywrightWorkerOptions & CustomProperties<WorkerArgs>>;
 
+// Use the global URLPattern type if available (Node.js 22+, modern browsers),
+// otherwise fall back to `never` so it disappears from union types.
+type URLPattern = typeof globalThis extends { URLPattern: infer T } ? T : never;
 type AsymmetricMatcher = Record<string, any>;
 
 interface AsymmetricMatchers {
@@ -7880,7 +7907,11 @@ interface AsymmetricMatchers {
  */
 interface GenericAssertions<R> {
   /**
-   * Makes the assertion check for the opposite condition. For example, the following code passes:
+   * Makes the assertion check for the opposite condition.
+   *
+   * **Usage**
+   *
+   * For example, the following code passes:
    *
    * ```js
    * const value = 1;
@@ -7889,6 +7920,34 @@ interface GenericAssertions<R> {
    *
    */
   not: GenericAssertions<R>;
+  /**
+   * Use `resolves` to unwrap the value of a fulfilled promise so any other matcher can be chained. If the promise is
+   * rejected the assertion fails.
+   *
+   * For example, this code tests that the promise resolves and that the resulting value is `'lemon'`:
+   *
+   * ```js
+   * test('resolves to lemon', async () => {
+   *   await expect(Promise.resolve('lemon')).resolves.toBe('lemon');
+   * });
+   * ```
+   *
+   */
+  resolves: GenericAssertions<R>;
+  /**
+   * Use `.rejects` to unwrap the reason of a rejected promise so any other matcher can be chained. If the promise is
+   * fulfilled the assertion fails.
+   *
+   * For example, this code tests that the promise rejects with reason `'octopus'`:
+   *
+   * ```js
+   * test('rejects to octopus', async () => {
+   *   await expect(Promise.reject(new Error('octopus'))).rejects.toThrow('octopus');
+   * });
+   * ```
+   *
+   */
+  rejects: GenericAssertions<R>;
   /**
    * Compares value with
    * [`expected`](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be-option-expected) by
@@ -8542,8 +8601,11 @@ interface APIResponseAssertions {
   toBeOK(): Promise<void>;
 
   /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the response status is not
-   * successful:
+   * Makes the assertion check for the opposite condition.
+   *
+   * **Usage**
+   *
+   * For example, this code tests that the response status is not successful:
    *
    * ```js
    * await expect(response).not.toBeOK();
@@ -9574,8 +9636,11 @@ interface LocatorAssertions {
   }): Promise<void>;
 
   /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the Locator doesn't contain
-   * text `"error"`:
+   * Makes the assertion check for the opposite condition.
+   *
+   * **Usage**
+   *
+   * For example, this code tests that the Locator doesn't contain text `"error"`:
    *
    * ```js
    * await expect(locator).not.toContainText('error');
@@ -9663,6 +9728,9 @@ interface PageAssertions {
    * // Check for the page URL to contain 'doc', followed by an optional 's', followed by '/'
    * await expect(page).toHaveURL(/docs?\//);
    *
+   * // Check for the page URL to match the URL pattern
+   * await expect(page).toHaveURL(new URLPattern({ pathname: '/docs/*' }));
+   *
    * // Check for the predicate to be satisfied
    * // For example: verify query strings
    * await expect(page).toHaveURL(url => {
@@ -9678,7 +9746,7 @@ interface PageAssertions {
    * against the current browser URL.
    * @param options
    */
-  toHaveURL(url: string|RegExp|((url: URL) => boolean), options?: {
+  toHaveURL(url: string|RegExp|URLPattern|((url: URL) => boolean), options?: {
     /**
      * Whether to perform case-insensitive match.
      * [`ignoreCase`](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-url-option-ignore-case)
@@ -9694,8 +9762,11 @@ interface PageAssertions {
   }): Promise<void>;
 
   /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the page URL doesn't
-   * contain `"error"`:
+   * Makes the assertion check for the opposite condition.
+   *
+   * **Usage**
+   *
+   * For example, this code tests that the page URL doesn't contain `"error"`:
    *
    * ```js
    * await expect(page).not.toHaveURL('error');