patchright-bun 1.58.2 → 1.59.0

package/lib/runner/dispatcher.js

@@ -28,9 +28,9 @@ var import_workerHost = require("./workerHost");
 var import_ipc = require("../common/ipc");
 var import_internalReporter = require("../reporters/internalReporter");
 var import_util = require("../util");
-var import_storage = require("./storage");
 class Dispatcher {
   constructor(config, reporter, failureTracker) {
+    // Worker slot is claimed when it has jobDispatcher assigned.
     this._workerSlots = [];
     this._queue = [];
     this._workerLimitPerProjectId = /* @__PURE__ */ new Map();
@@ -53,7 +53,7 @@ class Dispatcher {
       const projectIdWorkerLimit = this._workerLimitPerProjectId.get(job.projectId);
       if (!projectIdWorkerLimit)
         return index;
-      const runningWorkersWithSameProjectId = this._workerSlots.filter((w) => w.busy && w.worker && w.worker.projectId() === job.projectId).length;
+      const runningWorkersWithSameProjectId = this._workerSlots.filter((w) => w.jobDispatcher?.job.projectId === job.projectId).length;
       if (runningWorkersWithSameProjectId < projectIdWorkerLimit)
         return index;
     }
@@ -66,20 +66,18 @@ class Dispatcher {
     if (jobIndex === -1)
       return;
     const job = this._queue[jobIndex];
-    let workerIndex = this._workerSlots.findIndex((w) => !w.busy && w.worker && w.worker.hash() === job.workerHash && !w.worker.didSendStop());
+    let workerIndex = this._workerSlots.findIndex((w) => !w.jobDispatcher && w.worker && w.worker.hash() === job.workerHash && !w.worker.didSendStop());
     if (workerIndex === -1)
-      workerIndex = this._workerSlots.findIndex((w) => !w.busy);
+      workerIndex = this._workerSlots.findIndex((w) => !w.jobDispatcher);
     if (workerIndex === -1) {
       return;
     }
     this._queue.splice(jobIndex, 1);
     const jobDispatcher = new JobDispatcher(job, this._config, this._reporter, this._failureTracker, () => this.stop().catch(() => {
     }));
-    this._workerSlots[workerIndex].busy = true;
     this._workerSlots[workerIndex].jobDispatcher = jobDispatcher;
     void this._runJobInWorker(workerIndex, jobDispatcher).then(() => {
       this._workerSlots[workerIndex].jobDispatcher = void 0;
-      this._workerSlots[workerIndex].busy = false;
       this._checkFinished();
       this._scheduleJob();
     });
@@ -127,7 +125,7 @@ class Dispatcher {
       return;
     if (this._queue.length && !this._isStopped)
       return;
-    if (this._workerSlots.some((w) => w.busy))
+    if (this._workerSlots.some((w) => !!w.jobDispatcher))
       return;
     this._finished.resolve();
   }
@@ -152,7 +150,7 @@ class Dispatcher {
     if (this._failureTracker.hasReachedMaxFailures())
       void this.stop();
     for (let i = 0; i < this._config.config.workers; i++)
-      this._workerSlots.push({ busy: false });
+      this._workerSlots.push({});
     for (let i = 0; i < this._workerSlots.length; i++)
       this._scheduleJob();
     this._checkFinished();
@@ -198,12 +196,6 @@ class Dispatcher {
       const producedEnv = this._producedEnvByProjectId.get(testGroup.projectId) || {};
       this._producedEnvByProjectId.set(testGroup.projectId, { ...producedEnv, ...worker.producedEnv() });
     });
-    worker.onRequest("cloneStorage", async (params) => {
-      return await import_storage.Storage.clone(params.storageFile, outputDir);
-    });
-    worker.onRequest("upstreamStorage", async (params) => {
-      await import_storage.Storage.upstream(params.storageFile, params.storageOutFile);
-    });
     return worker;
   }
   producedEnvByProjectId() {

package/lib/runner/loadUtils.js

@@ -52,7 +52,6 @@ async function collectProjectsAndTestFiles(testRun, doNotRunTestsOutsideProjectF
   const config = testRun.config;
   const fsCache = /* @__PURE__ */ new Map();
   const sourceMapCache = /* @__PURE__ */ new Map();
-  const cliFileMatcher = config.cliArgs.length ? (0, import_util.createFileMatcherFromArguments)(config.cliArgs) : null;
   const allFilesForProject = /* @__PURE__ */ new Map();
   const filteredProjects = (0, import_projectUtils.filterProjects)(config.projects, config.cliProjectFilter);
   for (const project of filteredProjects) {
@@ -62,10 +61,12 @@ async function collectProjectsAndTestFiles(testRun, doNotRunTestsOutsideProjectF
   const filesToRunByProject = /* @__PURE__ */ new Map();
   for (const [project, files] of allFilesForProject) {
     const matchedFiles = files.filter((file) => {
-      const hasMatchingSources = sourceMapSources(file, sourceMapCache).some((source) => {
-        if (cliFileMatcher && !cliFileMatcher(source))
-          return false;
+      if (!config.loadFileFilters.length) {
         return true;
+      }
+      const hasMatchingSources = sourceMapSources(file, sourceMapCache).some((source) => {
+        const matchesAllFileFilters = config.loadFileFilters.every((filter) => filter(source));
+        return matchesAllFileFilters;
       });
       return hasMatchingSources;
     });
@@ -310,7 +311,7 @@ async function loadTestList(config, filePath) {
       }
       return { project, file: (0, import_utils.toPosixPath)((0, import_util.parseLocationArg)(tokens[0]).file), titlePath: tokens.slice(1) };
     });
-    return (test) => descriptions.some((d) => {
+    const testFilter = (test) => descriptions.some((d) => {
       const [projectName, , ...titles] = test.titlePath();
       if (d.project !== void 0 && d.project !== projectName)
         return false;
@@ -319,6 +320,11 @@ async function loadTestList(config, filePath) {
         return false;
       return d.titlePath.length <= titles.length && d.titlePath.every((_, index) => titles[index] === d.titlePath[index]);
     });
+    const fileFilter = (file) => {
+      const relativeFile = (0, import_utils.toPosixPath)(import_path.default.relative(config.config.rootDir, file));
+      return descriptions.some((d) => d.file === relativeFile);
+    };
+    return { testFilter, fileFilter };
   } catch (e) {
     throw (0, import_util.errorWithFile)(filePath, "Cannot read test list file: " + e.message);
   }

package/lib/runner/projectUtils.js

@@ -145,7 +145,7 @@ function buildDependentProjects(forProjects, projects) {
   return result;
 }
 async function collectFilesForProject(project, fsCache = /* @__PURE__ */ new Map()) {
-  const extensions = /* @__PURE__ */ new Set([".js", ".ts", ".mjs", ".mts", ".cjs", ".cts", ".jsx", ".tsx", ".mjsx", ".mtsx", ".cjsx", ".ctsx", ".md"]);
+  const extensions = /* @__PURE__ */ new Set([".js", ".ts", ".mjs", ".mts", ".cjs", ".cts", ".jsx", ".tsx", ".mjsx", ".mtsx", ".cjsx", ".ctsx"]);
   const testFileExtension = (file) => extensions.has(import_path.default.extname(file));
   const allFiles = await cachedCollectFiles(project.project.testDir, project.respectGitIgnore, fsCache);
   const testMatch = (0, import_util2.createFileMatcher)(project.project.testMatch);

package/lib/runner/reporters.js

@@ -33,6 +33,7 @@ __export(reporters_exports, {
   createReporters: () => createReporters
 });
 module.exports = __toCommonJS(reporters_exports);
+var import_fs = __toESM(require("fs"));
 var import_utils = require("patchright-bun-core/lib/utils");
 var import_loadUtils = require("./loadUtils");
 var import_base = require("../reporters/base");
@@ -126,6 +127,10 @@ function computeCommandHash(config) {
     command.cliOnlyChanged = config.cliOnlyChanged;
   if (config.config.tags.length)
     command.tags = config.config.tags.join(" ");
+  if (config.cliTestList)
+    command.cliTestList = (0, import_utils.calculateSha1)(import_fs.default.readFileSync(config.cliTestList));
+  if (config.cliTestListInvert)
+    command.cliTestListInvert = (0, import_utils.calculateSha1)(import_fs.default.readFileSync(config.cliTestListInvert));
   if (Object.keys(command).length)
     parts.push((0, import_utils.calculateSha1)(JSON.stringify(command)).substring(0, 7));
   return parts.join("-");

package/lib/runner/tasks.js

@@ -239,6 +239,17 @@ function createLoadTask(mode, options) {
   return {
     title: "load tests",
     setup: async (testRun, errors, softErrors) => {
+      if (testRun.config.cliArgs.length)
+        testRun.config.loadFileFilters.push((0, import_util2.createFileMatcherFromArguments)(testRun.config.cliArgs));
+      if (testRun.config.cliTestList) {
+        const { testFilter, fileFilter } = await (0, import_loadUtils.loadTestList)(testRun.config, testRun.config.cliTestList);
+        testRun.config.preOnlyTestFilters.push(testFilter);
+        testRun.config.loadFileFilters.push(fileFilter);
+      }
+      if (testRun.config.cliTestListInvert) {
+        const { testFilter } = await (0, import_loadUtils.loadTestList)(testRun.config, testRun.config.cliTestListInvert);
+        testRun.config.preOnlyTestFilters.push((test) => !testFilter(test));
+      }
       await (0, import_loadUtils.collectProjectsAndTestFiles)(testRun, !!options.doNotRunDepsOutsideProjectFilter);
       await (0, import_loadUtils.loadFileSuites)(testRun, mode, options.failOnLoadErrors ? errors : softErrors);
       if (testRun.config.cliOnlyChanged || options.populateDependencies) {
@@ -249,14 +260,6 @@ function createLoadTask(mode, options) {
         const changedFiles = await (0, import_vcs.detectChangedTestFiles)(testRun.config.cliOnlyChanged, testRun.config.configDir);
         testRun.config.preOnlyTestFilters.push((test) => changedFiles.has(test.location.file));
       }
-      if (testRun.config.cliTestList) {
-        const testListFilter = await (0, import_loadUtils.loadTestList)(testRun.config, testRun.config.cliTestList);
-        testRun.config.preOnlyTestFilters.push(testListFilter);
-      }
-      if (testRun.config.cliTestListInvert) {
-        const testListInvertFilter = await (0, import_loadUtils.loadTestList)(testRun.config, testRun.config.cliTestListInvert);
-        testRun.config.preOnlyTestFilters.push((test) => !testListInvertFilter(test));
-      }
       const { rootSuite, topLevelProjects } = await (0, import_loadUtils.createRootSuite)(testRun, options.failOnLoadErrors ? errors : softErrors, !!options.filterOnly);
       testRun.rootSuite = rootSuite;
       testRun.failureTracker.onRootSuite(rootSuite, topLevelProjects);

package/lib/runner/testRunner.js

@@ -201,6 +201,7 @@ class TestRunner extends import_events.default {
     config.cliGrep = params.grep;
     config.cliGrepInvert = params.grepInvert;
     config.cliProjectFilter = params.projects?.length ? params.projects : void 0;
+    config.cliOnlyChanged = params.onlyChanged;
     config.cliListOnly = true;
     const status = await (0, import_tasks.runTasks)(new import_tasks.TestRun(config, reporter), [
       (0, import_tasks.createLoadTask)("out-of-process", { failOnLoadErrors: false, filterOnly: false, populateDependencies: this._populateDependenciesOnList }),
@@ -248,7 +249,7 @@ class TestRunner extends import_events.default {
       reporter: params.reporters ? params.reporters.map((r) => [r]) : void 0,
       use: {
         ...this._configCLIOverrides.use,
-        ...params.trace === "on" ? { trace: { mode: "on", sources: false, _live: true } } : {},
+        ...params.trace === "on" ? { trace: { mode: "on", sources: false, live: true } } : {},
         ...params.trace === "off" ? { trace: "off" } : {},
         ...params.video === "on" || params.video === "off" ? { video: params.video } : {},
         ...params.headed !== void 0 ? { headless: !params.headed } : {},
@@ -258,7 +259,6 @@ class TestRunner extends import_events.default {
       },
       ...params.updateSnapshots ? { updateSnapshots: params.updateSnapshots } : {},
       ...params.updateSourceMethod ? { updateSourceMethod: params.updateSourceMethod } : {},
-      ...params.runAgents ? { runAgents: params.runAgents } : {},
       ...params.workers ? { workers: params.workers } : {}
     };
     const config = await this._loadConfigOrReportError(new import_internalReporter.InternalReporter([userReporter]), overrides);

package/lib/runner/workerHost.js

@@ -61,9 +61,6 @@ class WorkerHost extends import_processHost.ProcessHost {
       pauseAtEnd: options.pauseAtEnd
     };
   }
-  artifactsDir() {
-    return this._params.artifactsDir;
-  }
   async start() {
     await import_fs.default.promises.mkdir(this._params.artifactsDir, { recursive: true });
     return await this.startRunner(this._params, {

package/lib/testActions.js

@@ -0,0 +1,220 @@
+"use strict";
+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 testActions_exports = {};
+__export(testActions_exports, {
+  clearCache: () => clearCache,
+  runTestServerAction: () => runTestServerAction,
+  runTests: () => runTests,
+  startDevServer: () => startDevServer
+});
+module.exports = __toCommonJS(testActions_exports);
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var import_utils = require("patchright-bun-core/lib/utils");
+var import_config = require("./common/config");
+var import_configLoader = require("./common/configLoader");
+var import_base = require("./reporters/base");
+var import_projectUtils = require("./runner/projectUtils");
+var testServer = __toESM(require("./runner/testServer"));
+var import_watchMode = require("./runner/watchMode");
+var import_testRunner = require("./runner/testRunner");
+var import_reporters = require("./runner/reporters");
+async function runTests(args, opts) {
+  await (0, import_utils.startProfiling)();
+  const cliOverrides = overridesFromOptions(opts);
+  const config = await (0, import_configLoader.loadConfigFromFile)(opts.config, cliOverrides, opts.deps === false);
+  config.cliArgs = args;
+  config.cliGrep = opts.grep;
+  config.cliOnlyChanged = opts.onlyChanged === true ? "HEAD" : opts.onlyChanged;
+  config.cliGrepInvert = opts.grepInvert;
+  config.cliListOnly = !!opts.list;
+  config.cliProjectFilter = opts.project || void 0;
+  config.cliPassWithNoTests = !!opts.passWithNoTests;
+  config.cliLastFailed = !!opts.lastFailed;
+  config.cliTestList = opts.testList ? import_path.default.resolve(process.cwd(), opts.testList) : void 0;
+  config.cliTestListInvert = opts.testListInvert ? import_path.default.resolve(process.cwd(), opts.testListInvert) : void 0;
+  (0, import_projectUtils.filterProjects)(config.projects, config.cliProjectFilter);
+  if (opts.ui || opts.uiHost || opts.uiPort) {
+    if (opts.onlyChanged)
+      throw new Error(`--only-changed is not supported in UI mode. If you'd like that to change, see https://github.com/microsoft/playwright/issues/15075 for more details.`);
+    const status2 = await testServer.runUIMode(opts.config, cliOverrides, {
+      host: opts.uiHost,
+      port: opts.uiPort ? +opts.uiPort : void 0,
+      args,
+      grep: opts.grep,
+      grepInvert: opts.grepInvert,
+      project: opts.project || void 0,
+      reporter: Array.isArray(opts.reporter) ? opts.reporter : opts.reporter ? [opts.reporter] : void 0
+    });
+    await (0, import_utils.stopProfiling)("runner");
+    const exitCode2 = status2 === "interrupted" ? 130 : status2 === "passed" ? 0 : 1;
+    (0, import_utils.gracefullyProcessExitDoNotHang)(exitCode2);
+    return;
+  }
+  if (process.env.PWTEST_WATCH) {
+    if (opts.onlyChanged)
+      throw new Error(`--only-changed is not supported in watch mode. If you'd like that to change, file an issue and let us know about your usecase for it.`);
+    const status2 = await (0, import_watchMode.runWatchModeLoop)(
+      (0, import_configLoader.resolveConfigLocation)(opts.config),
+      {
+        projects: opts.project,
+        files: args,
+        grep: opts.grep
+      }
+    );
+    await (0, import_utils.stopProfiling)("runner");
+    const exitCode2 = status2 === "interrupted" ? 130 : status2 === "passed" ? 0 : 1;
+    (0, import_utils.gracefullyProcessExitDoNotHang)(exitCode2);
+    return;
+  }
+  const status = await (0, import_testRunner.runAllTestsWithConfig)(config);
+  await (0, import_utils.stopProfiling)("runner");
+  const exitCode = status === "interrupted" ? 130 : status === "passed" ? 0 : 1;
+  (0, import_utils.gracefullyProcessExitDoNotHang)(exitCode);
+}
+async function runTestServerAction(opts) {
+  const host = opts.host;
+  const port = opts.port ? +opts.port : void 0;
+  const status = await testServer.runTestServer(opts.config, {}, { host, port });
+  const exitCode = status === "interrupted" ? 130 : status === "passed" ? 0 : 1;
+  (0, import_utils.gracefullyProcessExitDoNotHang)(exitCode);
+}
+async function clearCache(opts) {
+  const runner = new import_testRunner.TestRunner((0, import_configLoader.resolveConfigLocation)(opts.config), {});
+  const { status } = await runner.clearCache((0, import_reporters.createErrorCollectingReporter)(import_base.terminalScreen));
+  const exitCode = status === "interrupted" ? 130 : status === "passed" ? 0 : 1;
+  (0, import_utils.gracefullyProcessExitDoNotHang)(exitCode);
+}
+async function startDevServer(options) {
+  const runner = new import_testRunner.TestRunner((0, import_configLoader.resolveConfigLocation)(options.config), {});
+  await runner.startDevServer((0, import_reporters.createErrorCollectingReporter)(import_base.terminalScreen), "in-process");
+}
+function overridesFromOptions(options) {
+  if (options.ui) {
+    options.debug = void 0;
+    options.trace = void 0;
+  }
+  const overrides = {
+    debug: options.debug,
+    failOnFlakyTests: options.failOnFlakyTests ? true : void 0,
+    forbidOnly: options.forbidOnly ? true : void 0,
+    fullyParallel: options.fullyParallel ? true : void 0,
+    globalTimeout: options.globalTimeout ? parseInt(options.globalTimeout, 10) : void 0,
+    maxFailures: options.x ? 1 : options.maxFailures ? parseInt(options.maxFailures, 10) : void 0,
+    outputDir: options.output ? import_path.default.resolve(process.cwd(), options.output) : void 0,
+    pause: !!process.env.PWPAUSE,
+    quiet: options.quiet ? options.quiet : void 0,
+    repeatEach: options.repeatEach ? parseInt(options.repeatEach, 10) : void 0,
+    retries: options.retries ? parseInt(options.retries, 10) : void 0,
+    reporter: resolveReporterOption(options.reporter),
+    shard: resolveShardOption(options.shard),
+    shardWeights: resolveShardWeightsOption(),
+    timeout: options.timeout ? parseInt(options.timeout, 10) : void 0,
+    tsconfig: options.tsconfig ? import_path.default.resolve(process.cwd(), options.tsconfig) : void 0,
+    ignoreSnapshots: options.ignoreSnapshots ? !!options.ignoreSnapshots : void 0,
+    updateSnapshots: options.updateSnapshots,
+    updateSourceMethod: options.updateSourceMethod,
+    use: {
+      trace: options.trace
+    },
+    workers: options.workers
+  };
+  if (options.browser) {
+    const browserOpt = options.browser.toLowerCase();
+    if (!["all", "chromium", "firefox", "webkit"].includes(browserOpt))
+      throw new Error(`Unsupported browser "${options.browser}", must be one of "all", "chromium", "firefox" or "webkit"`);
+    const browserNames = browserOpt === "all" ? ["chromium", "firefox", "webkit"] : [browserOpt];
+    overrides.projects = browserNames.map((browserName) => {
+      return {
+        name: browserName,
+        use: { browserName }
+      };
+    });
+  }
+  if (options.headed)
+    overrides.use.headless = false;
+  if (options.debug === "inspector") {
+    overrides.use.headless = false;
+    process.env.PWDEBUG = "1";
+  }
+  if (overrides.tsconfig && !import_fs.default.existsSync(overrides.tsconfig))
+    throw new Error(`--tsconfig "${options.tsconfig}" does not exist`);
+  return overrides;
+}
+function resolveReporterOption(reporter) {
+  if (!reporter || !reporter.length)
+    return void 0;
+  return reporter.split(",").map((r) => [resolveReporter(r)]);
+}
+function resolveShardOption(shard) {
+  if (!shard)
+    return void 0;
+  const shardPair = shard.split("/");
+  if (shardPair.length !== 2) {
+    throw new Error(
+      `--shard "${shard}", expected format is "current/all", 1-based, for example "3/5".`
+    );
+  }
+  const current = parseInt(shardPair[0], 10);
+  const total = parseInt(shardPair[1], 10);
+  if (isNaN(total) || total < 1)
+    throw new Error(`--shard "${shard}" total must be a positive number`);
+  if (isNaN(current) || current < 1 || current > total) {
+    throw new Error(
+      `--shard "${shard}" current must be a positive number, not greater than shard total`
+    );
+  }
+  return { current, total };
+}
+function resolveShardWeightsOption() {
+  const shardWeights = process.env.PWTEST_SHARD_WEIGHTS;
+  if (!shardWeights)
+    return void 0;
+  return shardWeights.split(":").map((w) => {
+    const weight = parseInt(w, 10);
+    if (isNaN(weight) || weight < 0)
+      throw new Error(`PWTEST_SHARD_WEIGHTS="${shardWeights}" weights must be non-negative numbers`);
+    return weight;
+  });
+}
+function resolveReporter(id) {
+  if (import_config.builtInReporters.includes(id))
+    return id;
+  const localPath = import_path.default.resolve(process.cwd(), id);
+  if (import_fs.default.existsSync(localPath))
+    return localPath;
+  return require.resolve(id, { paths: [process.cwd()] });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  clearCache,
+  runTestServerAction,
+  runTests,
+  startDevServer
+});

package/lib/transform/babelBundle.js

@@ -22,7 +22,6 @@ __export(babelBundle_exports, {
   babelTransform: () => babelTransform,
   codeFrameColumns: () => codeFrameColumns,
   declare: () => declare,
-  genMapping: () => genMapping,
   traverse: () => traverse,
   types: () => types
 });
@@ -33,14 +32,12 @@ const types = require("./babelBundleImpl").types;
 const traverse = require("./babelBundleImpl").traverse;
 const babelTransform = require("./babelBundleImpl").babelTransform;
 const babelParse = require("./babelBundleImpl").babelParse;
-const genMapping = require("./babelBundleImpl").genMapping;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   babelParse,
   babelTransform,
   codeFrameColumns,
   declare,
-  genMapping,
   traverse,
   types
 });