@vitest/snapshot 3.0.5 → 3.0.6

package/dist/environment.js

@@ -1,5 +1,5 @@
 import { promises, existsSync } from 'node:fs';
-import { isAbsolute, resolve, dirname, join, basename } from 'pathe';
+import { resolve, isAbsolute, dirname, join, basename } from 'pathe';
 
 class NodeSnapshotEnvironment {
   constructor(options = {}) {

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { S as SnapshotStateOptions, a as SnapshotMatchOptions, b as SnapshotResult, R as RawSnapshotInfo } from './rawSnapshot-BWAfsPv1.js';
-export { c as SnapshotData, d as SnapshotSerializer, e as SnapshotSummary, f as SnapshotUpdateState, U as UncheckedSnapshot } from './rawSnapshot-BWAfsPv1.js';
+import { S as SnapshotStateOptions, a as SnapshotMatchOptions, b as SnapshotResult, R as RawSnapshotInfo } from './rawSnapshot-DOKg5unn.js';
+export { c as SnapshotData, d as SnapshotSerializer, e as SnapshotSummary, f as SnapshotUpdateState, U as UncheckedSnapshot } from './rawSnapshot-DOKg5unn.js';
 import { S as SnapshotEnvironment } from './environment-Ddx0EDtY.js';
 import { Plugin, Plugins } from '@vitest/pretty-format';
 
@@ -10,6 +10,26 @@ interface ParsedStack {
     column: number;
 }
 
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+declare class DefaultMap<K, V> extends Map<K, V> {
+    private defaultFn;
+    constructor(defaultFn: (key: K) => V, entries?: Iterable<readonly [K, V]>);
+    get(key: K): V;
+}
+declare class CounterMap<K> extends DefaultMap<K, number> {
+    constructor();
+    _total: number | undefined;
+    valueOf(): number;
+    increment(key: K): void;
+    total(): number;
+}
+
 /**
  * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
  *
@@ -44,11 +64,19 @@ declare class SnapshotState {
     private _snapshotFormat;
     private _environment;
     private _fileExists;
-    private added;
-    private matched;
-    private unmatched;
-    private updated;
     expand: boolean;
+    private _added;
+    private _matched;
+    private _unmatched;
+    private _updated;
+    get added(): CounterMap<string>;
+    set added(value: number);
+    get matched(): CounterMap<string>;
+    set matched(value: number);
+    get unmatched(): CounterMap<string>;
+    set unmatched(value: number);
+    get updated(): CounterMap<string>;
+    set updated(value: number);
     private constructor();
     static create(testFilePath: string, options: SnapshotStateOptions): Promise<SnapshotState>;
     get environment(): SnapshotEnvironment;

package/dist/index.js

@@ -663,7 +663,7 @@ function extractLocation(urlLike) {
     const isWindows = /^\/@fs\/[a-zA-Z]:\//.test(url);
     url = url.slice(isWindows ? 5 : 4);
   }
-  return [url, parts[2] || undefined, parts[3] || undefined];
+  return [url, parts[2] || void 0, parts[3] || void 0];
 }
 function parseSingleFFOrSafariStack(raw) {
   let line = raw.trim();
@@ -681,7 +681,7 @@ function parseSingleFFOrSafariStack(raw) {
   }
   const functionNameRegex = /((.*".+"[^@]*)?[^@]*)(@)/;
   const matches = line.match(functionNameRegex);
-  const functionName = matches && matches[1] ? matches[1] : undefined;
+  const functionName = matches && matches[1] ? matches[1] : void 0;
   const [url, lineNumber, columnNumber] = extractLocation(
     line.replace(functionNameRegex, "")
   );
@@ -710,7 +710,7 @@ function parseSingleV8Stack(raw) {
     location ? location[1] : sanitizedLine
   );
   let method = location && sanitizedLine || "";
-  let file = url && ["eval", "<anonymous>"].includes(url) ? undefined : url;
+  let file = url && ["eval", "<anonymous>"].includes(url) ? void 0 : url;
   if (!file || !lineNumber || !columnNumber) {
     return null;
   }
@@ -744,7 +744,7 @@ function parseStacktrace(stack, options = {}) {
     if (options.getFileName) {
       stack2.file = options.getFileName(stack2.file);
     }
-    const map = (_a = options.getSourceMap) == null ? undefined : _a.call(options, stack2.file);
+    const map = (_a = options.getSourceMap) == null ? void 0 : _a.call(options, stack2.file);
     if (!map || typeof map !== "object" || !map.version) {
       return stack2;
     }
@@ -814,6 +814,15 @@ catch (noNodeInspect) {
     nodeInspect = false;
 }
 
+const {
+  AsymmetricMatcher: AsymmetricMatcher$1,
+  DOMCollection: DOMCollection$1,
+  DOMElement: DOMElement$1,
+  Immutable: Immutable$1,
+  ReactElement: ReactElement$1,
+  ReactTestComponent: ReactTestComponent$1
+} = plugins;
+
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
@@ -873,7 +882,7 @@ function requireJsTokens () {
 							yield ({
 								type: "RegularExpressionLiteral",
 								value: match[0],
-								closed: match[1] !== undefined && match[1] !== "\\"
+								closed: match[1] !== void 0 && match[1] !== "\\"
 							});
 							continue;
 						}
@@ -1011,7 +1020,7 @@ function requireJsTokens () {
 						yield ({
 							type: "StringLiteral",
 							value: match[0],
-							closed: match[2] !== undefined
+							closed: match[2] !== void 0
 						});
 						continue;
 					}
@@ -1112,7 +1121,7 @@ function requireJsTokens () {
 						yield ({
 							type: "JSXString",
 							value: match[0],
-							closed: match[2] !== undefined
+							closed: match[2] !== void 0
 						});
 						continue;
 					}
@@ -1187,7 +1196,7 @@ function requireJsTokens () {
 				yield ({
 					type: "MultiLineComment",
 					value: match[0],
-					closed: match[1] !== undefined
+					closed: match[1] !== void 0
 				});
 				continue;
 			}
@@ -1210,7 +1219,7 @@ function requireJsTokens () {
 				value: firstCodePoint
 			});
 		}
-		return undefined;
+		return void 0;
 	};
 	return jsTokens_1;
 }
@@ -1319,8 +1328,8 @@ function a(n) {
 a.open = "";
 a.close = "";
 function C(n = false) {
-  let e = typeof process != "undefined" ? process : undefined, i = (e == null ? undefined : e.env) || {}, g = (e == null ? undefined : e.argv) || [];
-  return !("NO_COLOR" in i || g.includes("--no-color")) && ("FORCE_COLOR" in i || g.includes("--color") || (e == null ? undefined : e.platform) === "win32" || n && i.TERM !== "dumb" || "CI" in i) || typeof window != "undefined" && !!window.chrome;
+  let e = typeof process != "undefined" ? process : void 0, i = (e == null ? void 0 : e.env) || {}, g = (e == null ? void 0 : e.argv) || [];
+  return !("NO_COLOR" in i || g.includes("--no-color")) && ("FORCE_COLOR" in i || g.includes("--color") || (e == null ? void 0 : e.platform) === "win32" || n && i.TERM !== "dumb" || "CI" in i) || typeof window != "undefined" && !!window.chrome;
 }
 function p(n = false) {
   let e = C(n), i = (r, t, c, o) => {
@@ -1481,7 +1490,7 @@ function replaceInlineSnap(code, s, currentIndex, newSnap) {
   const firstKeywordMatch = /toMatchInlineSnapshot|toThrowErrorMatchingInlineSnapshot/.exec(
     codeStartingAtIndex
   );
-  if (!startMatch || startMatch.index !== (firstKeywordMatch == null ? undefined : firstKeywordMatch.index)) {
+  if (!startMatch || startMatch.index !== (firstKeywordMatch == null ? void 0 : firstKeywordMatch.index)) {
     return replaceObjectSnap(code, s, index, newSnap);
   }
   const quote = startMatch[1];
@@ -1732,17 +1741,17 @@ function prepareExpected(expected) {
   function findStartIndent() {
     var _a, _b;
     const matchObject = /^( +)\}\s+$/m.exec(expected || "");
-    const objectIndent = (_a = matchObject == null ? undefined : matchObject[1]) == null ? undefined : _a.length;
+    const objectIndent = (_a = matchObject == null ? void 0 : matchObject[1]) == null ? void 0 : _a.length;
     if (objectIndent) {
       return objectIndent;
     }
     const matchText = /^\n( +)"/.exec(expected || "");
-    return ((_b = matchText == null ? undefined : matchText[1]) == null ? undefined : _b.length) || 0;
+    return ((_b = matchText == null ? void 0 : matchText[1]) == null ? void 0 : _b.length) || 0;
   }
   const startIndent = findStartIndent();
-  let expectedTrimmed = expected == null ? undefined : expected.trim();
+  let expectedTrimmed = expected == null ? void 0 : expected.trim();
   if (startIndent) {
-    expectedTrimmed = expectedTrimmed == null ? undefined : expectedTrimmed.replace(new RegExp(`^${" ".repeat(startIndent)}`, "gm"), "").replace(/ +\}$/, "}");
+    expectedTrimmed = expectedTrimmed == null ? void 0 : expectedTrimmed.replace(new RegExp(`^${" ".repeat(startIndent)}`, "gm"), "").replace(/ +\}$/, "}");
   }
   return expectedTrimmed;
 }
@@ -1798,10 +1807,25 @@ class CounterMap extends DefaultMap {
   constructor() {
     super(() => 0);
   }
+  // compat for jest-image-snapshot https://github.com/vitest-dev/vitest/issues/7322
+  // `valueOf` and `Snapshot.added` setter allows
+  //   snapshotState.added = snapshotState.added + 1
+  // to function as
+  //   snapshotState.added.total_ = snapshotState.added.total() + 1
+  _total;
+  valueOf() {
+    return this._total = this.total();
+  }
   increment(key) {
+    if (typeof this._total !== "undefined") {
+      this._total++;
+    }
     this.set(key, this.get(key) + 1);
   }
   total() {
+    if (typeof this._total !== "undefined") {
+      return this._total;
+    }
     let total = 0;
     for (const x of this.values()) {
       total += x;
@@ -1845,11 +1869,37 @@ class SnapshotState {
   _snapshotFormat;
   _environment;
   _fileExists;
-  added = new CounterMap();
-  matched = new CounterMap();
-  unmatched = new CounterMap();
-  updated = new CounterMap();
   expand;
+  // getter/setter for jest-image-snapshot compat
+  // https://github.com/vitest-dev/vitest/issues/7322
+  _added = new CounterMap();
+  _matched = new CounterMap();
+  _unmatched = new CounterMap();
+  _updated = new CounterMap();
+  get added() {
+    return this._added;
+  }
+  set added(value) {
+    this._added._total = value;
+  }
+  get matched() {
+    return this._matched;
+  }
+  set matched(value) {
+    this._matched._total = value;
+  }
+  get unmatched() {
+    return this._unmatched;
+  }
+  set unmatched(value) {
+    this._unmatched._total = value;
+  }
+  get updated() {
+    return this._updated;
+  }
+  set updated(value) {
+    this._updated._total = value;
+  }
   static async create(testFilePath, options) {
     const snapshotPath = await options.snapshotEnvironment.resolvePath(
       testFilePath
@@ -1981,10 +2031,10 @@ class SnapshotState {
       key = testNameToKey(testName, count);
     }
     this._testIdToKeys.get(testId).push(key);
-    if (!(isInline && this._snapshotData[key] !== undefined)) {
+    if (!(isInline && this._snapshotData[key] !== void 0)) {
       this._uncheckedKeys.delete(key);
     }
-    let receivedSerialized = rawSnapshot && typeof received === "string" ? received : serialize(received, undefined, this._snapshotFormat);
+    let receivedSerialized = rawSnapshot && typeof received === "string" ? received : serialize(received, void 0, this._snapshotFormat);
     if (!rawSnapshot) {
       receivedSerialized = addExtraLineBreaks(receivedSerialized);
     }
@@ -1996,7 +2046,7 @@ class SnapshotState {
     const expected = isInline ? inlineSnapshot : rawSnapshot ? rawSnapshot.content : this._snapshotData[key];
     const expectedTrimmed = rawSnapshot ? expected : prepareExpected(expected);
     const pass = expectedTrimmed === (rawSnapshot ? receivedSerialized : prepareExpected(receivedSerialized));
-    const hasSnapshot = expected !== undefined;
+    const hasSnapshot = expected !== void 0;
     const snapshotIsPersisted = isInline || this._fileExists || rawSnapshot && rawSnapshot.content != null;
     if (pass && !isInline && !rawSnapshot) {
       this._snapshotData[key] = receivedSerialized;
@@ -2016,7 +2066,7 @@ ${JSON.stringify(
           )}`
         );
       }
-      stack = ((_b = (_a = this.environment).processStackTrace) == null ? undefined : _b.call(_a, _stack)) || _stack;
+      stack = ((_b = (_a = this.environment).processStackTrace) == null ? void 0 : _b.call(_a, _stack)) || _stack;
       stack.column--;
       if (this._inlineSnapshotStacks.some((s) => s.file === stack.file && s.line === stack.line && s.column === stack.column)) {
         this._inlineSnapshots = this._inlineSnapshots.filter((s) => !(s.file === stack.file && s.line === stack.line && s.column === stack.column));
@@ -2061,7 +2111,7 @@ ${JSON.stringify(
         return {
           actual: rawSnapshot ? receivedSerialized : removeExtraLineBreaks(receivedSerialized),
           count,
-          expected: expectedTrimmed !== undefined ? rawSnapshot ? expectedTrimmed : removeExtraLineBreaks(expectedTrimmed) : undefined,
+          expected: expectedTrimmed !== void 0 ? rawSnapshot ? expectedTrimmed : removeExtraLineBreaks(expectedTrimmed) : void 0,
           key,
           pass: false
         };
@@ -2215,8 +2265,8 @@ class SnapshotClient {
       throw createMismatchError(
         `Snapshot \`${key || "unknown"}\` mismatched`,
         snapshotState.expand,
-        rawSnapshot ? actual : actual == null ? undefined : actual.trim(),
-        rawSnapshot ? expected : expected == null ? undefined : expected.trim()
+        rawSnapshot ? actual : actual == null ? void 0 : actual.trim(),
+        rawSnapshot ? expected : expected == null ? void 0 : expected.trim()
       );
     }
   }
@@ -2235,7 +2285,7 @@ class SnapshotClient {
         filepath,
         rawSnapshot.file
       );
-      rawSnapshot.content = await snapshotState.environment.readSnapshotFile(rawSnapshot.file) ?? undefined;
+      rawSnapshot.content = await snapshotState.environment.readSnapshotFile(rawSnapshot.file) ?? void 0;
     }
     return this.assert(options);
   }

package/dist/manager.d.ts

@@ -1,4 +1,4 @@
-import { S as SnapshotStateOptions, e as SnapshotSummary, b as SnapshotResult } from './rawSnapshot-BWAfsPv1.js';
+import { S as SnapshotStateOptions, e as SnapshotSummary, b as SnapshotResult } from './rawSnapshot-DOKg5unn.js';
 import '@vitest/pretty-format';
 import './environment-Ddx0EDtY.js';
 

package/dist/manager.js

@@ -1,4 +1,4 @@
-import { join, dirname, basename, isAbsolute, resolve } from 'pathe';
+import { join, dirname, basename, resolve, isAbsolute } from 'pathe';
 
 class SnapshotManager {
   constructor(options) {

package/dist/{rawSnapshot-BWAfsPv1.d.ts → rawSnapshot-DOKg5unn.d.ts}

@@ -1,4 +1,4 @@
-import { Plugin, OptionsReceived } from '@vitest/pretty-format';
+import { OptionsReceived, Plugin } from '@vitest/pretty-format';
 import { S as SnapshotEnvironment } from './environment-Ddx0EDtY.js';
 
 type SnapshotData = Record<string, string>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/snapshot",
   "type": "module",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "description": "Vitest snapshot manager",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -39,13 +39,13 @@
   ],
   "dependencies": {
     "magic-string": "^0.30.17",
-    "pathe": "^2.0.2",
-    "@vitest/pretty-format": "3.0.5"
+    "pathe": "^2.0.3",
+    "@vitest/pretty-format": "3.0.6"
   },
   "devDependencies": {
     "@types/natural-compare": "^1.4.3",
     "natural-compare": "^1.4.0",
-    "@vitest/utils": "3.0.5"
+    "@vitest/utils": "3.0.6"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",