@itmetsam/samurai-framework 0.9.0 → 0.12.0

package/dist/types/bidi-modules/emulation.d.ts

@@ -12,35 +12,44 @@ export interface EmulationCommands {
     params: SetGeolocationOverrideParameters;
     result: SetGeolocationOverrideResult;
   };
-  "emulation.setLocaleOverride": { params: SetLocaleOverrideParameters; result: SetLocaleOverrideResult };
-  "emulation.setNetworkConditions": { params: SetNetworkConditionsParameters; result: EmptyResult };
+  "emulation.setLocaleOverride": {
+    params: SetLocaleOverrideParameters;
+    result: SetLocaleOverrideResult;
+  };
+  "emulation.setNetworkConditions": {
+    params: SetNetworkConditionsParameters;
+    result: EmptyResult;
+  };
   "emulation.setScreenOrientationOverride": {
     params: SetScreenOrientationOverrideParameters;
     result: SetScreenOrientationOverrideResult;
   };
-  "emulation.setScreenSettingsOverride": { params: SetScreenSettingsOverrideParameters; result: EmptyResult };
-  "emulation.setScriptingEnabled": { params: SetScriptingEnabledParameters; result: SetScriptingEnabledResult };
+  "emulation.setScreenSettingsOverride": {
+    params: SetScreenSettingsOverrideParameters;
+    result: EmptyResult;
+  };
+  "emulation.setScriptingEnabled": {
+    params: SetScriptingEnabledParameters;
+    result: SetScriptingEnabledResult;
+  };
   "emulation.setScrollbarTypeOverride": {
     params: SetScrollbarTypeOverrideParameters;
     result: SetScrollbarTypeOverrideResult;
   };
-  "emulation.setTimezoneOverride": { params: SetTimezoneOverrideParameters; result: SetTimezoneOverrideResult };
-  "emulation.setTouchOverride": { params: SetTouchOverrideParameters; result: SetTouchOverrideResult };
-  "emulation.setUserAgentOverride": { params: SetUserAgentOverrideParameters; result: SetUserAgentOverrideResult };
+  "emulation.setTimezoneOverride": {
+    params: SetTimezoneOverrideParameters;
+    result: SetTimezoneOverrideResult;
+  };
+  "emulation.setTouchOverride": {
+    params: SetTouchOverrideParameters;
+    result: SetTouchOverrideResult;
+  };
+  "emulation.setUserAgentOverride": {
+    params: SetUserAgentOverrideParameters;
+    result: SetUserAgentOverrideResult;
+  };
 }
 
-/** Union of all possible result types returned by emulation module commands. */
-export type EmulationResult =
-  | SetForcedColorsModeThemeOverrideResult
-  | SetGeolocationOverrideResult
-  | SetLocaleOverrideResult
-  | SetScreenOrientationOverrideResult
-  | SetScriptingEnabledResult
-  | SetScrollbarTypeOverrideResult
-  | SetTimezoneOverrideResult
-  | SetTouchOverrideResult
-  | SetUserAgentOverrideResult;
-
 /** Result of `emulation.setForcedColorsModeThemeOverride`. */
 export type SetForcedColorsModeThemeOverrideResult = EmptyResult;
 /** Result of `emulation.setGeolocationOverride`. */
@@ -108,8 +117,7 @@ export interface GeolocationCoordinatesResponse {
 
 /** Either a successful coordinates override or an error response. */
 export type GeolocationOverrideResponse =
-  | GeolocationCoordinatesResponse
-  | GeolocationCoordinatesResponseError;
+  GeolocationCoordinatesResponse | GeolocationCoordinatesResponseError;
 
 /** Parameters for `emulation.setGeolocationOverride`. */
 export type SetGeolocationOverrideParameters = GeolocationOverrideResponse & {

package/dist/types/bidi-modules/input.d.ts

@@ -68,10 +68,7 @@ export interface PointerParameters {
 
 /** A single action for a pointer input source. */
 export type PointerSourceAction =
-  | PauseAction
-  | PointerDownAction
-  | PointerUpAction
-  | PointerMoveAction;
+  PauseAction | PointerDownAction | PointerUpAction | PointerMoveAction;
 
 /** Actions for a wheel input source. */
 export interface WheelSourceActions {
@@ -191,11 +188,6 @@ export interface FileDialogOpened {
   params: FileDialogInfo;
 }
 
-export type InputResult =
-  | PerformActionResult
-  | ReleaseActionResult
-  | SetFilesResult;
-
 export type PerformActionResult = EmptyResult;
 export type ReleaseActionResult = EmptyResult;
 export type SetFilesResult = EmptyResult;

package/dist/types/bidi-modules/network.d.ts

@@ -14,7 +14,10 @@ export interface NetworkCommands {
     };
     result: AddInterceptResult;
   };
-  "network.removeIntercept": { params: { intercept: Intercept }; result: RemoveInterceptResult };
+  "network.removeIntercept": {
+    params: { intercept: Intercept };
+    result: RemoveInterceptResult;
+  };
   /** Lets a blocked request go on, optionally modified. */
   "network.continueRequest": {
     params: {
@@ -42,7 +45,11 @@ export interface NetworkCommands {
   "network.continueWithAuth": {
     params:
       | { request: Request; action: "default" | "cancel" }
-      | { request: Request; action: "provideCredentials"; credentials: AuthCredentials };
+      | {
+          request: Request;
+          action: "provideCredentials";
+          credentials: AuthCredentials;
+        };
     result: ContinueWithAuthResult;
   };
   /** Answers a blocked request without contacting the server. */
@@ -57,9 +64,15 @@ export interface NetworkCommands {
     };
     result: ProvideResponseResult;
   };
-  "network.failRequest": { params: { request: Request }; result: FailRequestResult };
+  "network.failRequest": {
+    params: { request: Request };
+    result: FailRequestResult;
+  };
   "network.setCacheBehavior": {
-    params: { cacheBehavior: "default" | "bypass"; contexts?: BrowsingContext[] | undefined };
+    params: {
+      cacheBehavior: "default" | "bypass";
+      contexts?: BrowsingContext[] | undefined;
+    };
     result: SetCacheBehaviorResult;
   };
   /** Starts retaining response bodies for later `network.getData`. */
@@ -73,7 +86,10 @@ export interface NetworkCommands {
     };
     result: AddDataCollectorResult;
   };
-  "network.removeDataCollector": { params: { collector: Collector }; result: RemoveDataCollectorResult };
+  "network.removeDataCollector": {
+    params: { collector: Collector };
+    result: RemoveDataCollectorResult;
+  };
   "network.getData": {
     params: {
       dataType: DataType;
@@ -89,9 +105,14 @@ export interface NetworkCommands {
   };
 }
 
-export type InterceptPhase = "beforeRequestSent" | "responseStarted" | "authRequired";
+export type InterceptPhase =
+  "beforeRequestSent" | "responseStarted" | "authRequired";
 export type DataType = "request" | "response";
-export type AuthCredentials = { type: "password"; username: string; password: string };
+export type AuthCredentials = {
+  type: "password";
+  username: string;
+  password: string;
+};
 export type UrlPattern =
   | { type: "string"; pattern: string }
   | {
@@ -202,7 +223,7 @@ export interface BaseParameters {
   /** Whether this request is currently blocked by an active intercept. */
   isBlocked: boolean;
   navigation: Navigation | null;
-  redirectCount: Number;
+  redirectCount: number;
   request: RequestData;
   timestamp: number;
   userContext?: UserContext | null;
@@ -301,22 +322,6 @@ export interface ResponseStarted {
   params: ResponseStartedParameters;
 }
 
-/** Union of all possible result types returned by network module commands. */
-export type NetworkResult =
-  | AddDataCollectorResult
-  | AddInterceptResult
-  | ContinueRequestResult
-  | ContinueResponseResult
-  | ContinueWithAuthResult
-  | DisownDataResult
-  | FailRequestResult
-  | GetDataResult
-  | ProvideResponseResult
-  | RemoveDataCollectorResult
-  | RemoveInterceptResult
-  | SetCacheBehaviorResult
-  | SetExtraHeadersResult;
-
 /** Unique identifier for an active network data collector. */
 export type Collector = string;
 

package/dist/types/bidi-modules/script.d.ts

@@ -528,15 +528,6 @@ export interface RealmDestroyedParameters {
   realm: Realm;
 }
 
-/** Union of all possible result types returned by script module commands. */
-export type ScriptResult =
-  | AddPreloadScriptResult
-  | CallFunctionResult
-  | DisownResult
-  | EvaluateResult
-  | GetRealmsResult
-  | RemovePreloadScriptResult;
-
 /** Unique identifier for a preload script registered via `script.addPreloadScript`. */
 export type PreloadScript = string;
 

package/dist/types/bidi-modules/session.d.ts

@@ -38,14 +38,6 @@ export type Subscription = string;
 /** Defines how user prompts (alerts, confirms, prompts) should be automatically handled. */
 export type UserPromptHandlerType = "accept" | "dismiss" | "ignore";
 
-/** Union of all possible result types returned by session module commands. */
-export type SessionResult =
-  | EndResult
-  | NewResult
-  | StatusResult
-  | SubscribeResult
-  | UnsubscribeResult;
-
 /** Result of `session.end`. */
 export type EndResult = EmptyResult;
 

package/dist/types/bidi-modules/storage.d.ts

@@ -68,11 +68,6 @@ export interface StorageKeyPartitionDescriptor extends Extensible {
   sourceOrigin?: string;
 }
 
-export type StorageResult =
-  | DeleteCookiesResult
-  | GetCookiesResult
-  | SetCookieResult;
-
 export interface PartitionKey extends Extensible {
   userContext?: UserContext;
   sourceOrigin?: string;

package/dist/types/bidi.d.ts

@@ -1,33 +1,16 @@
-import type { BrowserCommands, BrowserResult } from "./bidi-modules/browser.js";
+import type { BrowserCommands } from "./bidi-modules/browser.js";
 import type {
   BrowsingContextEvents,
   BrowsingContextModule as BrowsingContextCommands,
-  BrowsingContextResult,
 } from "./bidi-modules/browsing-context.js";
-import type { EmulationCommands, EmulationResult } from "./bidi-modules/emulation.js";
-import type {
-  InputCommands,
-  InputEvents,
-  InputResult,
-} from "./bidi-modules/input.js";
+import type { EmulationCommands } from "./bidi-modules/emulation.js";
+import type { InputCommands, InputEvents } from "./bidi-modules/input.js";
 import type { LogEvents } from "./bidi-modules/log.js";
 import type { PermissionsCommands } from "./bidi-modules/permissions.js";
-import type {
-  NetworkCommands,
-  NetworkEvents,
-  NetworkResult,
-} from "./bidi-modules/network.js";
-import type {
-  ScriptCommands,
-  ScriptEvents,
-  ScriptResult,
-} from "./bidi-modules/script.js";
-import type { SessionModule, SessionResult } from "./bidi-modules/session.js";
-import type { StorageCommands, StorageResult } from "./bidi-modules/storage.js";
-import type { WebExtensionResult } from "./bidi-modules/web-extensions.js";
-import type { CommandResponse } from "./bidi-protocols/command.js";
-import type { ErrorResponse } from "./bidi-protocols/error.js";
-import type { BiDiEvent } from "./bidi-protocols/event.js";
+import type { NetworkCommands, NetworkEvents } from "./bidi-modules/network.js";
+import type { ScriptCommands, ScriptEvents } from "./bidi-modules/script.js";
+import type { SessionModule } from "./bidi-modules/session.js";
+import type { StorageCommands } from "./bidi-modules/storage.js";
 
 export type BiDiCommands = BrowserCommands &
   SessionModule &
@@ -45,19 +28,6 @@ export type BiDiEvents = BrowsingContextEvents &
   NetworkEvents &
   ScriptEvents;
 
-export type BiDiMessages = CommandResponse | ErrorResponse | BiDiEvent;
-
-export type ResultData =
-  | BrowserResult
-  | BrowsingContextResult
-  | EmulationResult
-  | InputResult
-  | NetworkResult
-  | ScriptResult
-  | SessionResult
-  | StorageResult
-  | WebExtensionResult;
-
 export type EmptyResult = Extensible;
 
 export interface Extensible {

package/dist/types/config.d.ts

@@ -24,6 +24,13 @@ export interface SamuraiGroup {
    * Overrides 'src' and 'testMatch'  options.
    */
   tests?: SamuraiTest[];
+  /** The browsers this group's tests run in, instead of the project's `browsers` */
+  browsers?: SupportedBrowser[];
+  /**
+   * How many of this group's tests may run at the same time. Only `1` has an effect: the group's tests run one
+   * after the other, even when the run uses more workers (for tests that share an account or data).
+   */
+  workers?: number;
 }
 
 export interface SamuraiEnvironment {
@@ -45,10 +52,17 @@ export interface SamuraiTestConfig {
    */
   srcDir?: string;
   /**
-   * The browser to use for all tests: "firefox" or "chrome"
-   * @default "firefox"
+   * The browsers the tests run in, one after the other: every selected test runs once in each. A group can name its own.
+   * @default ["firefox"]
+   */
+  browsers?: SupportedBrowser[];
+  /**
+   * How many tests run at the same time, each in a worker process of its own: a whole number from 1, or a share of
+   * the CPUs like `"50%"`. `--workers` and `SAMURAI_WORKERS` win over it. A config passed as an object, not read
+   * from `samurai.config.ts`, runs on one worker.
+   * @default half the CPUs
    */
-  browser?: SupportedBrowser;
+  workers?: number | string;
   /**
    * Browser binaries to launch instead of the builds SAMURAI downloads, relative to the project.
    * `SAMURAI_FIREFOX_PATH` / `SAMURAI_CHROME_PATH` win over these.

package/dist/types/test.d.ts

@@ -1,10 +1,15 @@
-import type { Browser } from "../browser/browser.ts";
-import type Page from "../browser/page.ts";
+import type { Browser } from "../browser/browser.js";
+import type Page from "../browser/page.js";
+import type { SupportedBrowser } from "./browser.js";
 
 /** What a test function receives */
 export interface TestFixtures {
   page: Page;
   browser: Browser;
+  /** The browser this run of the test is in */
+  browserName: SupportedBrowser;
+  /** The worker process running the test; 0 when the run has one worker or none */
+  workerIndex: number;
   /** The chosen environment's variables; reading an unknown name throws */
   env: Readonly<Record<string, string | number | boolean>>;
   /** Secrets by name (SAMURAI_SECRET_<NAME>); reading an unset name throws */
@@ -66,12 +71,18 @@ export interface TestLogEntry {
 interface TestResultIdentity {
   name: string;
   file: string;
+  /** The browser the test ran in */
+  browser: SupportedBrowser;
+  /** The worker process that ran the test; absent when the test ran in the main process */
+  worker?: number;
   startTime: number;
 }
 
 interface TestResultBase {
   name: string;
   file: string;
+  browser: SupportedBrowser;
+  worker?: number;
   startTime: number;
   status: "started";
 }
@@ -102,4 +113,6 @@ interface TestSummaryBase {
   tests: TestResult[];
   /** The environment the run used */
   environment: string;
+  /** The browsers the run used, in the order they ran */
+  browsers: SupportedBrowser[];
 }

package/dist/wait/wait-until.d.ts

@@ -1,8 +1,6 @@
 export interface WaitOptions {
     /** Total time (ms) to keep probing; 0 probes exactly once */
     timeout: number;
-    /** Time (ms) between probes. @default 100 */
-    interval?: number;
 }
 export declare class WaitTimeoutError<T> extends Error {
     readonly timeout: number;
@@ -10,11 +8,9 @@ export declare class WaitTimeoutError<T> extends Error {
     readonly last: T | undefined;
     constructor(timeout: number, last: T | undefined);
 }
-/** Per-call timeout, else the active run's expect timeout, else config `expect.timeout`, else 5000 */
-export declare function resolveTimeout(perCall?: number): Promise<number>;
 /**
  * Probes until `isDone(current, previous)` is true and resolves with that result.
  * Always probes at least once; with `timeout > 0` every probe races the time left.
  * Probe errors are rethrown immediately. Throws WaitTimeoutError at the deadline.
  */
-export declare function waitUntil<T>(probe: () => Promise<T>, isDone: (current: T, previous: T | undefined) => boolean, { timeout, interval }: WaitOptions): Promise<T>;
+export declare function waitUntil<T>(probe: () => Promise<T>, isDone: (current: T, previous: T | undefined) => boolean, { timeout }: WaitOptions): Promise<T>;

package/dist/wait/wait-until.js

@@ -1,8 +1,6 @@
 import { setTimeout as sleep } from "node:timers/promises";
-import { readConfig } from "../config/config.js";
-import { peekRunSettings } from "../config/run-settings.js";
-const DEFAULT_TIMEOUT = 5000;
-const DEFAULT_INTERVAL = 100;
+/** Time (ms) between probes */
+const POLL_INTERVAL = 100;
 export class WaitTimeoutError extends Error {
     constructor(timeout, last) {
         super(`Condition not met within ${timeout}ms`);
@@ -11,15 +9,6 @@ export class WaitTimeoutError extends Error {
         this.last = last;
     }
 }
-/** Per-call timeout, else the active run's expect timeout, else config `expect.timeout`, else 5000 */
-export async function resolveTimeout(perCall) {
-    if (perCall !== undefined)
-        return perCall;
-    const run = peekRunSettings();
-    if (run)
-        return run.expectTimeout;
-    return (await readConfig("expect"))?.timeout ?? DEFAULT_TIMEOUT;
-}
 const DEADLINE = Symbol("deadline");
 /**
  * Races `probe()` against the time left. Resolves `{ value }` when the probe wins,
@@ -40,7 +29,7 @@ function probeBefore(probe, remaining) {
  * Always probes at least once; with `timeout > 0` every probe races the time left.
  * Probe errors are rethrown immediately. Throws WaitTimeoutError at the deadline.
  */
-export async function waitUntil(probe, isDone, { timeout, interval = DEFAULT_INTERVAL }) {
+export async function waitUntil(probe, isDone, { timeout }) {
     const deadline = Date.now() + timeout;
     let previous;
     for (let first = true;; first = false) {
@@ -49,7 +38,9 @@ export async function waitUntil(probe, isDone, { timeout, interval = DEFAULT_INT
         if (!first && remaining <= 0)
             throw new WaitTimeoutError(timeout, previous);
         // timeout 0 keeps the single probe un-raced so it always completes
-        const result = timeout > 0 ? await probeBefore(probe, remaining) : { value: await probe() };
+        const result = timeout > 0
+            ? await probeBefore(probe, remaining)
+            : { value: await probe() };
         if (result === DEADLINE)
             throw new WaitTimeoutError(timeout, previous);
         if (isDone(result.value, previous))
@@ -58,6 +49,6 @@ export async function waitUntil(probe, isDone, { timeout, interval = DEFAULT_INT
         const left = deadline - Date.now();
         if (left <= 0)
             throw new WaitTimeoutError(timeout, previous);
-        await sleep(Math.min(interval, left));
+        await sleep(Math.min(POLL_INTERVAL, left));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itmetsam/samurai-framework",
-  "version": "0.9.0",
+  "version": "0.12.0",
   "description": "Browser test framework over WebDriver BiDi: auto-waiting locators, environments and secrets, a recorder, and a command line.",
   "main": "dist/api.js",
   "exports": {
@@ -71,7 +71,8 @@
   "type": "module",
   "devDependencies": {
     "@types/node": "^25.6.0",
-    "tsx": "^4.21.0"
+    "esbuild": "^0.28.2",
+    "tsx": "^4.23.15"
   },
   "dependencies": {
     "@puppeteer/browsers": "^3.2.4",

package/dist/config/default.d.ts

@@ -1,2 +0,0 @@
-import type { SamuraiTestConfig } from "../types/config.js";
-export declare const config: SamuraiTestConfig;

package/dist/config/default.js

@@ -1,3 +0,0 @@
-export const config = {
-    srcDir: "./src",
-};

package/dist/types/bidi-modules/web-extensions.d.ts

@@ -1,9 +0,0 @@
-import type { EmptyResult } from "../bidi.js";
-
-export type WebExtensionResult = InstallResult | UninstallResult;
-
-export type UninstallResult = EmptyResult;
-export type Extension = string;
-export interface InstallResult {
-  extension: Extension;
-}

package/dist/types/bidi-protocols/command.d.ts

@@ -1,7 +0,0 @@
-import type { Extensible, ResultData } from "../bidi.js";
-
-export interface CommandResponse extends Extensible {
-  type: "success";
-  id: number;
-  result: ResultData;
-}

package/dist/types/bidi-protocols/event.d.ts

@@ -1,17 +0,0 @@
-import type { BrowsingContextEvent } from "../bidi-modules/browsing-context.js";
-import type { LogEvent } from "../bidi-modules/log.js";
-import type { NetworkEvent } from "../bidi-modules/network.js";
-import type { ScriptEvent } from "../bidi-modules/script.js";
-import type { Extensible } from "../bidi.js";
-
-export type BiDiEvent = Extensible &
-  EventData & {
-    type: "event";
-  };
-
-export type EventData =
-  | BrowsingContextEvent
-  | InputEvent
-  | LogEvent
-  | NetworkEvent
-  | ScriptEvent;