vitest 4.0.7 → 4.0.8

package/dist/chunks/{creator.cqqifzG7.js → creator.fzVyoMf3.js}

@@ -43,7 +43,8 @@ test('renders name', async () => {
   await expect.element(getByText('Hello Vitest!')).toBeInTheDocument()
 })
 `
-}, vueExample = {
+};
+const vueExample = {
 	name: "HelloWorld.vue",
 	js: `
 <script setup>
@@ -83,7 +84,8 @@ test('renders name', async () => {
   await expect.element(getByText('Hello Vitest!')).toBeInTheDocument()
 })
 `
-}, svelteExample = {
+};
+const svelteExample = {
 	name: "HelloWorld.svelte",
 	js: `
 <script>
@@ -109,7 +111,8 @@ test('renders name', async () => {
   await expect.element(getByText('Hello Vitest!')).toBeInTheDocument()
 })
 `
-}, markoExample = {
+};
+const markoExample = {
 	name: "HelloWorld.marko",
 	js: `
 class {
@@ -138,7 +141,8 @@ test('renders name', async () => {
   expect(element).toBeInTheDocument()
 })
 `
-}, litExample = {
+};
+const litExample = {
 	name: "HelloWorld.js",
 	js: `
 import { html, LitElement } from 'lit'
@@ -192,7 +196,8 @@ test('renders name', async () => {
   await expect.element(element).toBeInTheDocument()
 })
 `
-}, qwikExample = {
+};
+const qwikExample = {
 	name: "HelloWorld.jsx",
 	js: `
 import { component$ } from '@builder.io/qwik'
@@ -226,7 +231,8 @@ test('renders name', async () => {
   await expect.element(getByText('Hello Vitest!')).toBeInTheDocument()
 })
 `
-}, vanillaExample = {
+};
+const vanillaExample = {
 	name: "HelloWorld.js",
 	js: `
 export default function HelloWorld({ name }) {
@@ -286,14 +292,18 @@ function getExampleTest(framework) {
 async function generateExampleFiles(framework, lang) {
 	const example = getExampleTest(framework);
 	let fileName = example.name;
-	const folder = resolve(process.cwd(), "vitest-example"), fileContent = example[lang];
+	const folder = resolve(process.cwd(), "vitest-example");
+	const fileContent = example[lang];
 	if (!existsSync(folder)) await mkdir(folder, { recursive: true });
 	const isJSX = fileName.endsWith(".jsx");
 	if (isJSX && lang === "ts") fileName = fileName.replace(".jsx", ".tsx");
 	else if (fileName.endsWith(".js") && lang === "ts") fileName = fileName.replace(".js", ".ts");
 	example.test = example.test.replace("<EXT>", lang);
-	const filePath = resolve(folder, fileName), testPath = resolve(folder, `HelloWorld.test.${isJSX ? `${lang}x` : lang}`);
-	return writeFileSync(filePath, fileContent.trimStart(), "utf-8"), writeFileSync(testPath, example.test.trimStart(), "utf-8"), testPath;
+	const filePath = resolve(folder, fileName);
+	const testPath = resolve(folder, `HelloWorld.test.${isJSX ? `${lang}x` : lang}`);
+	writeFileSync(filePath, fileContent.trimStart(), "utf-8");
+	writeFileSync(testPath, example.test.trimStart(), "utf-8");
+	return testPath;
 }
 
 // eslint-disable-next-line no-console
@@ -422,7 +432,10 @@ async function installPackages(pkgManager, packages) {
 		log(c.green("✔"), c.bold("All packages are already installed."));
 		return;
 	}
-	log(c.cyan("◼"), c.bold("Installing packages...")), log(c.cyan("◼"), packages.join(", ")), log(), await installPackage(packages, {
+	log(c.cyan("◼"), c.bold("Installing packages..."));
+	log(c.cyan("◼"), packages.join(", "));
+	log();
+	await installPackage(packages, {
 		dev: true,
 		packageManager: pkgManager ?? void 0
 	});
@@ -433,19 +446,27 @@ function readPkgJson(path) {
 	return JSON.parse(content);
 }
 function getPossibleDefaults(dependencies) {
-	const provider = getPossibleProvider(dependencies), framework = getPossibleFramework(dependencies);
 	return {
 		lang: "ts",
-		provider,
-		framework
+		provider: getPossibleProvider(dependencies),
+		framework: getPossibleFramework(dependencies)
 	};
 }
 function getPossibleFramework(dependencies) {
-	return dependencies.vue || dependencies["vue-tsc"] || dependencies["@vue/reactivity"] ? "vue" : dependencies.react || dependencies["react-dom"] ? "react" : dependencies.svelte || dependencies["@sveltejs/kit"] ? "svelte" : dependencies.lit || dependencies["lit-html"] ? "lit" : dependencies.preact ? "preact" : dependencies["solid-js"] || dependencies["@solidjs/start"] ? "solid" : dependencies.marko ? "marko" : dependencies["@builder.io/qwik"] || dependencies["@qwik.dev/core"] ? "qwik" : "vanilla";
+	if (dependencies.vue || dependencies["vue-tsc"] || dependencies["@vue/reactivity"]) return "vue";
+	if (dependencies.react || dependencies["react-dom"]) return "react";
+	if (dependencies.svelte || dependencies["@sveltejs/kit"]) return "svelte";
+	if (dependencies.lit || dependencies["lit-html"]) return "lit";
+	if (dependencies.preact) return "preact";
+	if (dependencies["solid-js"] || dependencies["@solidjs/start"]) return "solid";
+	if (dependencies.marko) return "marko";
+	if (dependencies["@builder.io/qwik"] || dependencies["@qwik.dev/core"]) return "qwik";
+	return "vanilla";
 }
 function getPossibleProvider(dependencies) {
+	if (dependencies.webdriverio || dependencies["@wdio/cli"] || dependencies["@wdio/config"]) return "webdriverio";
 	// playwright is the default recommendation
-	return dependencies.webdriverio || dependencies["@wdio/cli"] || dependencies["@wdio/config"] ? "webdriverio" : "playwright";
+	return "playwright";
 }
 function getProviderDocsLink(provider) {
 	switch (provider) {
@@ -455,7 +476,8 @@ function getProviderDocsLink(provider) {
 }
 function sort(choices, value) {
 	const index = choices.findIndex((i) => i.value === value);
-	return index === -1 ? choices : [choices.splice(index, 1)[0], ...choices];
+	if (index === -1) return choices;
+	return [choices.splice(index, 1)[0], ...choices];
 }
 function fail() {
 	process.exitCode = 1;
@@ -477,7 +499,9 @@ function getFrameworkImportInfo(framework) {
 	}
 }
 async function generateFrameworkConfigFile(options) {
-	const { importName, isNamedExport } = getFrameworkImportInfo(options.framework), frameworkImport = isNamedExport ? `import { ${importName} } from '${options.frameworkPlugin}'` : `import ${importName} from '${options.frameworkPlugin}'`, configContent = [
+	const { importName, isNamedExport } = getFrameworkImportInfo(options.framework);
+	const frameworkImport = isNamedExport ? `import { ${importName} } from '${options.frameworkPlugin}'` : `import ${importName} from '${options.frameworkPlugin}'`;
+	const configContent = [
 		`import { defineConfig } from 'vitest/config'`,
 		`import { ${options.provider} } from '@vitest/browser-${options.provider}'`,
 		options.frameworkPlugin ? frameworkImport : null,
@@ -505,7 +529,9 @@ async function updatePkgJsonScripts(pkgJsonPath, vitestScript) {
 		await writeFile(pkgJsonPath, `${JSON.stringify(pkg, null, 2)}\n`, "utf-8");
 	} else {
 		const pkg = JSON.parse(readFileSync(pkgJsonPath, "utf-8"));
-		pkg.scripts = pkg.scripts || {}, pkg.scripts["test:browser"] = vitestScript, await writeFile(pkgJsonPath, `${JSON.stringify(pkg, null, 2)}\n`, "utf-8");
+		pkg.scripts = pkg.scripts || {};
+		pkg.scripts["test:browser"] = vitestScript;
+		await writeFile(pkgJsonPath, `${JSON.stringify(pkg, null, 2)}\n`, "utf-8");
 	}
 	log(c.green("✔"), "Added \"test:browser\" script to your package.json.");
 }
@@ -531,10 +557,14 @@ function getPlaywrightRunArgs(pkgManager) {
 }
 async function create() {
 	log(c.cyan("◼"), "This utility will help you set up a browser testing environment.\n");
-	const pkgJsonPath = resolve(process.cwd(), "package.json"), pkg = readPkgJson(pkgJsonPath) || {}, dependencies = {
+	const pkgJsonPath = resolve(process.cwd(), "package.json");
+	const pkg = readPkgJson(pkgJsonPath) || {};
+	const dependencies = {
 		...pkg.dependencies,
 		...pkg.devDependencies
-	}, defaults = getPossibleDefaults(dependencies), { lang } = await prompt({
+	};
+	const defaults = getPossibleDefaults(dependencies);
+	const { lang } = await prompt({
 		type: "select",
 		name: "lang",
 		message: "Choose a language for your tests",
@@ -572,23 +602,28 @@ async function create() {
 		message: `Install Playwright browsers (can be done manually via 'pnpm exec playwright install')?`
 	}));
 	if (installPlaywright == null) return fail();
-	const dependenciesToInstall = [`@vitest/browser-${provider}`], frameworkPackage = getFrameworkTestPackage(framework);
+	const dependenciesToInstall = [`@vitest/browser-${provider}`];
+	const frameworkPackage = getFrameworkTestPackage(framework);
 	if (frameworkPackage) dependenciesToInstall.push(frameworkPackage);
 	const frameworkPlugin = getFrameworkPluginPackage(framework);
 	if (frameworkPlugin) dependenciesToInstall.push(frameworkPlugin);
 	const pkgManager = await detectPackageManager();
-	log(), await installPackages(pkgManager, dependenciesToInstall.filter((pkg) => !dependencies[pkg]));
+	log();
+	await installPackages(pkgManager, dependenciesToInstall.filter((pkg) => !dependencies[pkg]));
 	const rootConfig = any(configFiles, { cwd: process.cwd() });
 	let scriptCommand = "vitest";
-	if (log(), rootConfig) {
+	log();
+	if (rootConfig) {
 		const configPath = resolve(dirname(rootConfig), `vitest.browser.config.${lang}`);
-		scriptCommand = `vitest --config=${relative(process.cwd(), configPath)}`, await generateFrameworkConfigFile({
+		scriptCommand = `vitest --config=${relative(process.cwd(), configPath)}`;
+		await generateFrameworkConfigFile({
 			configPath,
 			framework,
 			frameworkPlugin,
 			provider,
 			browsers
-		}), log(
+		});
+		log(
 			c.green("✔"),
 			"Created a new config file for browser tests:",
 			c.bold(relative(process.cwd(), configPath)),
@@ -605,17 +640,23 @@ async function create() {
 			frameworkPlugin,
 			provider,
 			browsers
-		}), log(c.green("✔"), "Created a config file for browser tests:", c.bold(relative(process.cwd(), configPath)));
+		});
+		log(c.green("✔"), "Created a config file for browser tests:", c.bold(relative(process.cwd(), configPath)));
 	}
-	if (log(), await updatePkgJsonScripts(pkgJsonPath, scriptCommand), installPlaywright) {
+	log();
+	await updatePkgJsonScripts(pkgJsonPath, scriptCommand);
+	if (installPlaywright) {
 		log();
-		const [command, ...args] = getPlaywrightRunArgs(pkgManager), allArgs = [
+		const [command, ...args] = getPlaywrightRunArgs(pkgManager);
+		const allArgs = [
 			...args,
 			"playwright",
 			"install",
 			"--with-deps"
 		];
-		log(c.cyan("◼"), `Installing Playwright dependencies with \`${c.bold(command)} ${c.bold(allArgs.join(" "))}\`...`), log(), await x(command, allArgs, { nodeOptions: { stdio: [
+		log(c.cyan("◼"), `Installing Playwright dependencies with \`${c.bold(command)} ${c.bold(allArgs.join(" "))}\`...`);
+		log();
+		await x(command, allArgs, { nodeOptions: { stdio: [
 			"pipe",
 			"inherit",
 			"inherit"
@@ -623,7 +664,10 @@ async function create() {
 	}
 	log();
 	const exampleTestFile = await generateExampleFiles(framework, lang);
-	log(c.green("✔"), "Created example test file in", c.bold(relative(process.cwd(), exampleTestFile))), log(c.dim("  You can safely delete this file once you have written your own tests.")), log(), log(c.cyan("◼"), "All done! Run your tests with", c.bold(getRunScript(pkgManager)));
+	log(c.green("✔"), "Created example test file in", c.bold(relative(process.cwd(), exampleTestFile)));
+	log(c.dim("  You can safely delete this file once you have written your own tests."));
+	log();
+	log(c.cyan("◼"), "All done! Run your tests with", c.bold(getRunScript(pkgManager)));
 }
 
 export { create };

package/dist/chunks/{date.-jtEtIeV.js → date.Bq6ZW5rf.js}

@@ -37,23 +37,34 @@ class MockDate extends RealDate {
 				date = new RealDate(y);
 				break;
 			default:
-				d = typeof d === "undefined" ? 1 : d, h = h || 0, M = M || 0, s = s || 0, ms = ms || 0, date = new RealDate(y, m, d, h, M, s, ms);
+				d = typeof d === "undefined" ? 1 : d;
+				h = h || 0;
+				M = M || 0;
+				s = s || 0;
+				ms = ms || 0;
+				date = new RealDate(y, m, d, h, M, s, ms);
 				break;
 		}
-		return Object.setPrototypeOf(date, MockDate.prototype), date;
+		Object.setPrototypeOf(date, MockDate.prototype);
+		return date;
 	}
 }
-MockDate.UTC = RealDate.UTC, MockDate.now = function() {
+MockDate.UTC = RealDate.UTC;
+MockDate.now = function() {
 	return new MockDate().valueOf();
-}, MockDate.parse = function(dateString) {
+};
+MockDate.parse = function(dateString) {
 	return RealDate.parse(dateString);
-}, MockDate.toString = function() {
+};
+MockDate.toString = function() {
 	return RealDate.toString();
 };
 function mockDate(date) {
 	const dateObj = new RealDate(date.valueOf());
 	if (Number.isNaN(dateObj.getTime())) throw new TypeError(`mockdate: The time set is an invalid date: ${date}`);
-	globalThis.Date = MockDate, now = dateObj.valueOf();
+	// @ts-expect-error global
+	globalThis.Date = MockDate;
+	now = dateObj.valueOf();
 }
 function resetDate() {
 	globalThis.Date = RealDate;

package/dist/chunks/{git.BFNcloKD.js → git.Bm2pzPAa.js}

@@ -11,7 +11,8 @@ class VitestGit {
 		try {
 			result = await x("git", args, { nodeOptions: { cwd: this.root } });
 		} catch (e) {
-			throw e.message = e.stderr, e;
+			e.message = e.stderr;
+			throw e;
 		}
 		return result.stdout.split("\n").filter((s) => s !== "").map((changedPath) => resolve(this.root, changedPath));
 	}
@@ -60,8 +61,7 @@ class VitestGit {
 	async getRoot(cwd) {
 		const args = ["rev-parse", "--show-cdup"];
 		try {
-			const result = await x("git", args, { nodeOptions: { cwd } });
-			return resolve(cwd, result.stdout.trim());
+			return resolve(cwd, (await x("git", args, { nodeOptions: { cwd } })).stdout.trim());
 		} catch {
 			return null;
 		}

package/dist/chunks/{global.d.DxtanrNO.d.ts → global.d.DVdCfKp5.d.ts}

@@ -2,7 +2,7 @@ import { PromisifyAssertion, Tester, ExpectStatic } from '@vitest/expect';
 import { Plugin } from '@vitest/pretty-format';
 import { SnapshotState } from '@vitest/snapshot';
 import { B as BenchmarkResult } from './benchmark.d.DAaHLpsq.js';
-import { U as UserConsoleLog } from './worker.d.D25zYZ7N.js';
+import { U as UserConsoleLog } from './worker.d.DadbA89M.js';
 
 interface SnapshotMatcher<T> {
 	<U extends { [P in keyof T] : any }>(snapshot: Partial<U>, hint?: string): void;

package/dist/chunks/{globals.BGT_RUsD.js → globals.DOh96BiR.js}

@@ -1,10 +1,10 @@
 import { g as globalApis } from './constants.D_Q9UYh-.js';
-import { i as index } from './index.RwjEGCQ0.js';
-import './vi.BZvkKVkM.js';
+import { i as index } from './index.DIFZf73e.js';
+import './vi.Bgcdy3bQ.js';
 import '@vitest/expect';
 import '@vitest/runner';
 import '@vitest/runner/utils';
-import './utils.CG9h5ccR.js';
+import './utils.DvEY5TfP.js';
 import '@vitest/utils/timers';
 import '@vitest/snapshot';
 import '@vitest/utils/error';
@@ -13,8 +13,8 @@ import '@vitest/spy';
 import '@vitest/utils/offset';
 import '@vitest/utils/source-map';
 import './_commonjsHelpers.BFTU3MAI.js';
-import './date.-jtEtIeV.js';
-import './benchmark.DHKMYAts.js';
+import './date.Bq6ZW5rf.js';
+import './benchmark.B3N2zMcH.js';
 import './evaluatedModules.Dg1zASAC.js';
 import 'pathe';
 import 'vite/module-runner';

package/dist/chunks/{index.DEPqWSIZ.js → index.BY4-tcno.js}

@@ -1,8 +1,8 @@
 import { chai } from '@vitest/expect';
-import { l as loadDiffConfig, b as loadSnapshotSerializers, t as takeCoverageInsideWorker } from './setup-common.DR1sucx6.js';
-import { r as rpc } from './rpc.D38ahn14.js';
-import { g as getWorkerState } from './utils.CG9h5ccR.js';
-import { V as VitestTestRunner, N as NodeBenchmarkRunner } from './test.B6aJd6T3.js';
+import { l as loadDiffConfig, b as loadSnapshotSerializers, t as takeCoverageInsideWorker } from './setup-common.LGjNSzXp.js';
+import { r as rpc } from './rpc.BUV7uWKJ.js';
+import { g as getWorkerState } from './utils.DvEY5TfP.js';
+import { V as VitestTestRunner, N as NodeBenchmarkRunner } from './test.ClrAtjMv.js';
 
 function setupChaiConfig(config) {
 	Object.assign(chai.config, config);
@@ -10,7 +10,7 @@ function setupChaiConfig(config) {
 
 async function resolveSnapshotEnvironment(config, executor) {
 	if (!config.snapshotEnvironment) {
-		const { VitestNodeSnapshotEnvironment } = await import('./node.BwAWWjHZ.js');
+		const { VitestNodeSnapshotEnvironment } = await import('./node.Ce0vMQM7.js');
 		return new VitestNodeSnapshotEnvironment();
 	}
 	const mod = await executor.import(config.snapshotEnvironment);
@@ -26,11 +26,13 @@ async function getTestRunnerConstructor(config, moduleRunner) {
 }
 async function resolveTestRunner(config, moduleRunner) {
 	const testRunner = new (await (getTestRunnerConstructor(config, moduleRunner)))(config);
-	if (Object.defineProperty(testRunner, "moduleRunner", {
+	// inject private executor to every runner
+	Object.defineProperty(testRunner, "moduleRunner", {
 		value: moduleRunner,
 		enumerable: false,
 		configurable: false
-	}), !testRunner.config) testRunner.config = config;
+	});
+	if (!testRunner.config) testRunner.config = config;
 	if (!testRunner.importFile) throw new Error("Runner must implement \"importFile\" method.");
 	const [diffOptions] = await Promise.all([loadDiffConfig(config, moduleRunner), loadSnapshotSerializers(config, moduleRunner)]);
 	testRunner.config.diffOptions = diffOptions;
@@ -38,28 +40,39 @@ async function resolveTestRunner(config, moduleRunner) {
 	const originalOnTaskUpdate = testRunner.onTaskUpdate;
 	testRunner.onTaskUpdate = async (task, events) => {
 		const p = rpc().onTaskUpdate(task, events);
-		return await originalOnTaskUpdate?.call(testRunner, task, events), p;
+		await originalOnTaskUpdate?.call(testRunner, task, events);
+		return p;
 	};
 	// patch some methods, so custom runners don't need to call RPC
 	const originalOnTestAnnotate = testRunner.onTestAnnotate;
 	testRunner.onTestAnnotate = async (test, annotation) => {
-		const p = rpc().onTaskAnnotate(test.id, annotation), overriddenResult = await originalOnTestAnnotate?.call(testRunner, test, annotation), vitestResult = await p;
+		const p = rpc().onTaskAnnotate(test.id, annotation);
+		const overriddenResult = await originalOnTestAnnotate?.call(testRunner, test, annotation);
+		const vitestResult = await p;
 		return overriddenResult || vitestResult;
 	};
 	const originalOnCollectStart = testRunner.onCollectStart;
 	testRunner.onCollectStart = async (file) => {
-		await rpc().onQueued(file), await originalOnCollectStart?.call(testRunner, file);
+		await rpc().onQueued(file);
+		await originalOnCollectStart?.call(testRunner, file);
 	};
 	const originalOnCollected = testRunner.onCollected;
 	testRunner.onCollected = async (files) => {
 		const state = getWorkerState();
 		files.forEach((file) => {
-			file.prepareDuration = state.durations.prepare, file.environmentLoad = state.durations.environment, state.durations.prepare = 0, state.durations.environment = 0;
-		}), rpc().onCollected(files), await originalOnCollected?.call(testRunner, files);
+			file.prepareDuration = state.durations.prepare;
+			file.environmentLoad = state.durations.environment;
+			// should be collected only for a single test file in a batch
+			state.durations.prepare = 0;
+			state.durations.environment = 0;
+		});
+		rpc().onCollected(files);
+		await originalOnCollected?.call(testRunner, files);
 	};
 	const originalOnAfterRun = testRunner.onAfterRunFiles;
 	testRunner.onAfterRunFiles = async (files) => {
-		const state = getWorkerState(), coverage = await takeCoverageInsideWorker(config.coverage, moduleRunner);
+		const state = getWorkerState();
+		const coverage = await takeCoverageInsideWorker(config.coverage, moduleRunner);
 		if (coverage) rpc().onAfterSuiteRun({
 			coverage,
 			testFiles: files.map((file) => file.name).sort(),
@@ -69,12 +82,16 @@ async function resolveTestRunner(config, moduleRunner) {
 		await originalOnAfterRun?.call(testRunner, files);
 	};
 	const originalOnAfterRunTask = testRunner.onAfterRunTask;
-	return testRunner.onAfterRunTask = async (test) => {
+	testRunner.onAfterRunTask = async (test) => {
 		if (config.bail && test.result?.state === "fail") {
-			if (1 + await rpc().getCountOfFailedTests() >= config.bail) rpc().onCancel("test-failure"), testRunner.cancel?.("test-failure");
+			if (1 + await rpc().getCountOfFailedTests() >= config.bail) {
+				rpc().onCancel("test-failure");
+				testRunner.cancel?.("test-failure");
+			}
 		}
 		await originalOnAfterRunTask?.call(testRunner, test);
-	}, testRunner;
+	};
+	return testRunner;
 }
 
 export { resolveSnapshotEnvironment as a, resolveTestRunner as r, setupChaiConfig as s };

package/dist/chunks/{index.Bgo3tNWt.js → index.DAL392Ss.js}

@@ -21,7 +21,7 @@ function createBirpc(functions, options) {
     timeout = DEFAULT_TIMEOUT
   } = options;
   const rpcPromiseMap = /* @__PURE__ */ new Map();
-  let _promise;
+  let _promiseInit;
   let closed = false;
   const rpc = new Proxy({}, {
     get(_, method) {
@@ -36,8 +36,8 @@ function createBirpc(functions, options) {
         return closed;
       if (method === "then" && !eventNames.includes("then") && !("then" in functions))
         return void 0;
-      const sendEvent = (...args) => {
-        post(serialize({ m: method, a: args, t: TYPE_REQUEST }));
+      const sendEvent = async (...args) => {
+        await post(serialize({ m: method, a: args, t: TYPE_REQUEST }));
       };
       if (eventNames.includes(method)) {
         sendEvent.asEvent = sendEvent;
@@ -46,16 +46,18 @@ function createBirpc(functions, options) {
       const sendCall = async (...args) => {
         if (closed)
           throw new Error(`[birpc] rpc is closed, cannot call "${method}"`);
-        if (_promise) {
+        if (_promiseInit) {
           try {
-            await _promise;
+            await _promiseInit;
           } finally {
-            _promise = void 0;
+            _promiseInit = void 0;
           }
         }
-        return new Promise((resolve, reject) => {
-          const id = nanoid();
-          let timeoutId;
+        let { promise, resolve, reject } = createPromiseWithResolvers();
+        const id = nanoid();
+        let timeoutId;
+        const _req = { m: method, a: args, i: id, t: TYPE_REQUEST };
+        async function handler(req = _req) {
           if (timeout >= 0) {
             timeoutId = setTimeout(() => {
               try {
@@ -71,8 +73,22 @@ function createBirpc(functions, options) {
               timeoutId = timeoutId.unref?.();
           }
           rpcPromiseMap.set(id, { resolve, reject, timeoutId, method });
-          post(serialize({ m: method, a: args, i: id, t: "q" }));
-        });
+          await post(serialize(req));
+          return promise;
+        }
+        try {
+          if (options.onRequest)
+            await options.onRequest(_req, handler, resolve);
+          else
+            await handler();
+        } catch (e) {
+          clearTimeout(timeoutId);
+          rpcPromiseMap.delete(id);
+          if (options.onGeneralError?.(e) !== true)
+            throw e;
+          return;
+        }
+        return promise;
       };
       sendCall.asEvent = sendEvent;
       return sendCall;
@@ -114,7 +130,7 @@ function createBirpc(functions, options) {
     if (msg.t === TYPE_REQUEST) {
       const { m: method, a: args } = msg;
       let result, error;
-      const fn = resolver ? resolver(method, functions[method]) : functions[method];
+      const fn = await (resolver ? resolver(method, functions[method]) : functions[method]);
       if (!fn) {
         error = new Error(`[birpc] function "${method}" not found`);
       } else {
@@ -133,7 +149,7 @@ function createBirpc(functions, options) {
         }
         if (!error) {
           try {
-            post(serialize({ t: TYPE_RESPONSE, i: msg.i, r: result }), ...extra);
+            await post(serialize({ t: TYPE_RESPONSE, i: msg.i, r: result }), ...extra);
             return;
           } catch (e) {
             error = e;
@@ -142,7 +158,7 @@ function createBirpc(functions, options) {
           }
         }
         try {
-          post(serialize({ t: TYPE_RESPONSE, i: msg.i, e: error }), ...extra);
+          await post(serialize({ t: TYPE_RESPONSE, i: msg.i, e: error }), ...extra);
         } catch (e) {
           if (options.onGeneralError?.(e, method, args) !== true)
             throw e;
@@ -161,9 +177,18 @@ function createBirpc(functions, options) {
       rpcPromiseMap.delete(ack);
     }
   }
-  _promise = on(onMessage);
+  _promiseInit = on(onMessage);
   return rpc;
 }
+function createPromiseWithResolvers() {
+  let resolve;
+  let reject;
+  const promise = new Promise((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
 const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
 function nanoid(size = 21) {
   let id = "";

package/dist/chunks/{index.RwjEGCQ0.js → index.DIFZf73e.js}

@@ -1,5 +1,5 @@
-import { b as assert, c as createExpect, g as globalExpect, i as inject, s as should, v as vi, d as vitest } from './vi.BZvkKVkM.js';
-import { b as bench } from './benchmark.DHKMYAts.js';
+import { b as assert, c as createExpect, g as globalExpect, i as inject, s as should, v as vi, d as vitest } from './vi.Bgcdy3bQ.js';
+import { b as bench } from './benchmark.B3N2zMcH.js';
 import { V as VitestEvaluatedModules } from './evaluatedModules.Dg1zASAC.js';
 import { expectTypeOf } from 'expect-type';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, suite, test } from '@vitest/runner';