@vitest/snapshot 5.0.0-beta.1 → 5.0.0-beta.3

package/dist/index.d.ts

@@ -27,7 +27,9 @@ interface AssertDomainOptions extends Omit<AssertOptions, "received"> {
 	adapter: DomainSnapshotAdapter<any, any>;
 }
 interface AssertDomainPollOptions extends Omit<AssertDomainOptions, "received"> {
-	poll: () => Promise<unknown> | unknown;
+	poll: (options: {
+		signal: AbortSignal;
+	}) => Promise<unknown> | unknown;
 	timeout?: number;
 	interval?: number;
 }

package/dist/index.js

@@ -863,7 +863,7 @@ class SnapshotState {
 			key: expectedSnapshot.key,
 			count: expectedSnapshot.count,
 			pass: matchResult?.pass ?? false,
-			hasSnapshot: !!expectedSnapshot.data,
+			hasSnapshot: expectedSnapshot.data !== undefined,
 			snapshotIsPersisted: isInline ? true : this._fileExists,
 			addValue: actualResolved,
 			actualDisplay: removeExtraLineBreaks(actualResolved),
@@ -1027,7 +1027,7 @@ class SnapshotClient {
 			inlineSnapshot
 		});
 		expectedSnapshot.markAsChecked();
-		const matchResult = expectedSnapshot.data ? adapter.match(captured, adapter.parseExpected(expectedSnapshot.data)) : undefined;
+		const matchResult = expectedSnapshot.data !== undefined ? adapter.match(captured, adapter.parseExpected(expectedSnapshot.data)) : undefined;
 		const { actual, expected, key, pass } = snapshotState.processDomainSnapshot({
 			testId,
 			received: rendered,
@@ -1057,17 +1057,21 @@ class SnapshotClient {
 			isInline,
 			inlineSnapshot
 		});
-		const reference = expectedSnapshot.data && snapshotState.snapshotUpdateState !== "all" ? adapter.parseExpected(expectedSnapshot.data) : undefined;
-		const timedOut = timeout > 0 ? new Promise((r) => setTimeout(r, timeout)) : undefined;
+		const reference = expectedSnapshot.data !== undefined && snapshotState.snapshotUpdateState !== "all" ? adapter.parseExpected(expectedSnapshot.data) : undefined;
+		const timeoutController = new AbortController();
+		const timedOut = timeout > 0 ? new Promise((r) => setTimeout(() => {
+			timeoutController.abort();
+			r();
+		}, timeout)) : undefined;
 		const stableResult = await getStableSnapshot({
 			adapter,
-			poll,
+			poll: () => poll({ signal: timeoutController.signal }),
 			interval,
 			timedOut,
 			match: reference ? (captured) => adapter.match(captured, reference).pass : undefined
 		});
 		expectedSnapshot.markAsChecked();
-		if (!stableResult?.rendered) {
+		if (stableResult?.rendered === undefined) {
 			// the original caller `expect.poll` later manipulates error via `throwWithCause`,
 			// so here we can directly throw `lastPollError` if exists.
 			if (stableResult?.lastPollError) {
@@ -1081,7 +1085,7 @@ class SnapshotClient {
 		// TODO: should `all` mode ignore parse error?
 		// Sielently hiding the error and creating snaphsot full scratch isn't good either.
 		// Users can fix or purge the broken snapshot manually and that decision affects how domain snapshot gets updated.
-		const matchResult = expectedSnapshot.data ? adapter.match(stableResult.captured, adapter.parseExpected(expectedSnapshot.data)) : undefined;
+		const matchResult = expectedSnapshot.data !== undefined ? adapter.match(stableResult.captured, adapter.parseExpected(expectedSnapshot.data)) : undefined;
 		const { actual, expected, key, pass } = snapshotState.processDomainSnapshot({
 			testId,
 			received: stableResult.rendered,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/snapshot",
   "type": "module",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.3",
   "description": "Vitest snapshot manager",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -22,18 +22,21 @@
   "sideEffects": false,
   "exports": {
     ".": {
+      "__vitest_source__": "./src/index.ts",
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
     "./environment": {
+      "__vitest_source__": "./src/environment.ts",
       "types": "./dist/environment.d.ts",
       "default": "./dist/environment.js"
     },
     "./manager": {
+      "__vitest_source__": "./src/manager.ts",
       "types": "./dist/manager.d.ts",
       "default": "./dist/manager.js"
     },
-    "./*": "./*"
+    "./package.json": "./package.json"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -45,8 +48,8 @@
   "dependencies": {
     "magic-string": "^0.30.21",
     "pathe": "^2.0.3",
-    "@vitest/pretty-format": "5.0.0-beta.1",
-    "@vitest/utils": "5.0.0-beta.1"
+    "@vitest/pretty-format": "5.0.0-beta.3",
+    "@vitest/utils": "5.0.0-beta.3"
   },
   "devDependencies": {
     "@types/natural-compare": "^1.4.3",