@vitest/snapshot 3.0.7 → 3.0.9

package/dist/environment.d-DHdQ1Csl.d.ts

@@ -0,0 +1,22 @@
+interface ParsedStack {
+	method: string;
+	file: string;
+	line: number;
+	column: number;
+}
+
+interface SnapshotEnvironment {
+	getVersion: () => string;
+	getHeader: () => string;
+	resolvePath: (filepath: string) => Promise<string>;
+	resolveRawPath: (testPath: string, rawPath: string) => Promise<string>;
+	saveSnapshotFile: (filepath: string, snapshot: string) => Promise<void>;
+	readSnapshotFile: (filepath: string) => Promise<string | null>;
+	removeSnapshotFile: (filepath: string) => Promise<void>;
+	processStackTrace?: (stack: ParsedStack) => ParsedStack;
+}
+interface SnapshotEnvironmentOptions {
+	snapshotsDirName?: string;
+}
+
+export type { ParsedStack as P, SnapshotEnvironment as S, SnapshotEnvironmentOptions as a };

package/dist/environment.d.ts

@@ -1,16 +1,16 @@
-import { S as SnapshotEnvironment, a as SnapshotEnvironmentOptions } from './environment-Ddx0EDtY.js';
+import { S as SnapshotEnvironment, a as SnapshotEnvironmentOptions } from './environment.d-DHdQ1Csl.js';
 
 declare class NodeSnapshotEnvironment implements SnapshotEnvironment {
-    private options;
-    constructor(options?: SnapshotEnvironmentOptions);
-    getVersion(): string;
-    getHeader(): string;
-    resolveRawPath(testPath: string, rawPath: string): Promise<string>;
-    resolvePath(filepath: string): Promise<string>;
-    prepareDirectory(dirPath: string): Promise<void>;
-    saveSnapshotFile(filepath: string, snapshot: string): Promise<void>;
-    readSnapshotFile(filepath: string): Promise<string | null>;
-    removeSnapshotFile(filepath: string): Promise<void>;
+	private options;
+	constructor(options?: SnapshotEnvironmentOptions);
+	getVersion(): string;
+	getHeader(): string;
+	resolveRawPath(testPath: string, rawPath: string): Promise<string>;
+	resolvePath(filepath: string): Promise<string>;
+	prepareDirectory(dirPath: string): Promise<void>;
+	saveSnapshotFile(filepath: string, snapshot: string): Promise<void>;
+	readSnapshotFile(filepath: string): Promise<string | null>;
+	removeSnapshotFile(filepath: string): Promise<void>;
 }
 
 export { NodeSnapshotEnvironment, SnapshotEnvironment };

package/dist/index.d.ts

@@ -1,139 +1,128 @@
-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 { S as SnapshotStateOptions, a as SnapshotMatchOptions, b as SnapshotResult, R as RawSnapshotInfo } from './rawSnapshot.d-lFsMJFUd.js';
+export { c as SnapshotData, d as SnapshotSerializer, e as SnapshotSummary, f as SnapshotUpdateState, U as UncheckedSnapshot } from './rawSnapshot.d-lFsMJFUd.js';
+import { S as SnapshotEnvironment, P as ParsedStack } from './environment.d-DHdQ1Csl.js';
 import { Plugin, Plugins } from '@vitest/pretty-format';
 
-interface ParsedStack {
-    method: string;
-    file: string;
-    line: number;
-    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.
- */
+* 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 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;
+	constructor();
+	_total: number | undefined;
+	valueOf(): number;
+	increment(key: K): void;
+	total(): 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.
- */
-
 interface SnapshotReturnOptions {
-    actual: string;
-    count: number;
-    expected?: string;
-    key: string;
-    pass: boolean;
+	actual: string;
+	count: number;
+	expected?: string;
+	key: string;
+	pass: boolean;
 }
 interface SaveStatus {
-    deleted: boolean;
-    saved: boolean;
+	deleted: boolean;
+	saved: boolean;
 }
 declare class SnapshotState {
-    testFilePath: string;
-    snapshotPath: string;
-    private _counters;
-    private _dirty;
-    private _updateSnapshot;
-    private _snapshotData;
-    private _initialData;
-    private _inlineSnapshots;
-    private _inlineSnapshotStacks;
-    private _testIdToKeys;
-    private _rawSnapshots;
-    private _uncheckedKeys;
-    private _snapshotFormat;
-    private _environment;
-    private _fileExists;
-    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;
-    markSnapshotsAsCheckedForTest(testName: string): void;
-    clearTest(testId: string): void;
-    protected _inferInlineSnapshotStack(stacks: ParsedStack[]): ParsedStack | null;
-    private _addSnapshot;
-    save(): Promise<SaveStatus>;
-    getUncheckedCount(): number;
-    getUncheckedKeys(): Array<string>;
-    removeUncheckedKeys(): void;
-    match({ testId, testName, received, key, inlineSnapshot, isInline, error, rawSnapshot, }: SnapshotMatchOptions): SnapshotReturnOptions;
-    pack(): Promise<SnapshotResult>;
+	testFilePath: string;
+	snapshotPath: string;
+	private _counters;
+	private _dirty;
+	private _updateSnapshot;
+	private _snapshotData;
+	private _initialData;
+	private _inlineSnapshots;
+	private _inlineSnapshotStacks;
+	private _testIdToKeys;
+	private _rawSnapshots;
+	private _uncheckedKeys;
+	private _snapshotFormat;
+	private _environment;
+	private _fileExists;
+	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;
+	markSnapshotsAsCheckedForTest(testName: string): void;
+	clearTest(testId: string): void;
+	protected _inferInlineSnapshotStack(stacks: ParsedStack[]): ParsedStack | null;
+	private _addSnapshot;
+	save(): Promise<SaveStatus>;
+	getUncheckedCount(): number;
+	getUncheckedKeys(): Array<string>;
+	removeUncheckedKeys(): void;
+	match({ testId, testName, received, key, inlineSnapshot, isInline, error, rawSnapshot }: SnapshotMatchOptions): SnapshotReturnOptions;
+	pack(): Promise<SnapshotResult>;
 }
 
 interface AssertOptions {
-    received: unknown;
-    filepath: string;
-    name: string;
-    /**
-     * Not required but needed for `SnapshotClient.clearTest` to implement test-retry behavior.
-     * @default name
-     */
-    testId?: string;
-    message?: string;
-    isInline?: boolean;
-    properties?: object;
-    inlineSnapshot?: string;
-    error?: Error;
-    errorMessage?: string;
-    rawSnapshot?: RawSnapshotInfo;
+	received: unknown;
+	filepath: string;
+	name: string;
+	/**
+	* Not required but needed for `SnapshotClient.clearTest` to implement test-retry behavior.
+	* @default name
+	*/
+	testId?: string;
+	message?: string;
+	isInline?: boolean;
+	properties?: object;
+	inlineSnapshot?: string;
+	error?: Error;
+	errorMessage?: string;
+	rawSnapshot?: RawSnapshotInfo;
 }
 interface SnapshotClientOptions {
-    isEqual?: (received: unknown, expected: unknown) => boolean;
+	isEqual?: (received: unknown, expected: unknown) => boolean;
 }
 declare class SnapshotClient {
-    private options;
-    snapshotStateMap: Map<string, SnapshotState>;
-    constructor(options?: SnapshotClientOptions);
-    setup(filepath: string, options: SnapshotStateOptions): Promise<void>;
-    finish(filepath: string): Promise<SnapshotResult>;
-    skipTest(filepath: string, testName: string): void;
-    clearTest(filepath: string, testId: string): void;
-    getSnapshotState(filepath: string): SnapshotState;
-    assert(options: AssertOptions): void;
-    assertRaw(options: AssertOptions): Promise<void>;
-    clear(): void;
+	private options;
+	snapshotStateMap: Map<string, SnapshotState>;
+	constructor(options?: SnapshotClientOptions);
+	setup(filepath: string, options: SnapshotStateOptions): Promise<void>;
+	finish(filepath: string): Promise<SnapshotResult>;
+	skipTest(filepath: string, testName: string): void;
+	clearTest(filepath: string, testId: string): void;
+	getSnapshotState(filepath: string): SnapshotState;
+	assert(options: AssertOptions): void;
+	assertRaw(options: AssertOptions): Promise<void>;
+	clear(): void;
 }
 
 declare function stripSnapshotIndentation(inlineSnapshot: string): string;
 
 /**
- * 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.
- */
+* 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 function addSerializer(plugin: Plugin): void;
 declare function getSerializers(): Plugins;

package/dist/index.js

@@ -657,7 +657,9 @@ function extractLocation(urlLike) {
   }
   if (url.startsWith("http:") || url.startsWith("https:")) {
     const urlObj = new URL(url);
-    url = urlObj.pathname;
+    urlObj.searchParams.delete("import");
+    urlObj.searchParams.delete("browserv");
+    url = urlObj.pathname + urlObj.hash + urlObj.search;
   }
   if (url.startsWith("/@fs/")) {
     const isWindows = /^\/@fs\/[a-zA-Z]:\//.test(url);
@@ -733,28 +735,40 @@ function parseSingleV8Stack(raw) {
 }
 function parseStacktrace(stack, options = {}) {
   const { ignoreStackEntries = stackIgnorePatterns } = options;
-  let stacks = !CHROME_IE_STACK_REGEXP.test(stack) ? parseFFOrSafariStackTrace(stack) : parseV8Stacktrace(stack);
-  if (ignoreStackEntries.length) {
-    stacks = stacks.filter(
-      (stack2) => !ignoreStackEntries.some((p) => stack2.file.match(p))
-    );
-  }
+  const stacks = !CHROME_IE_STACK_REGEXP.test(stack) ? parseFFOrSafariStackTrace(stack) : parseV8Stacktrace(stack);
   return stacks.map((stack2) => {
     var _a;
-    if (options.getFileName) {
-      stack2.file = options.getFileName(stack2.file);
+    if (options.getUrlId) {
+      stack2.file = options.getUrlId(stack2.file);
     }
     const map = (_a = options.getSourceMap) == null ? void 0 : _a.call(options, stack2.file);
     if (!map || typeof map !== "object" || !map.version) {
-      return stack2;
+      return shouldFilter(ignoreStackEntries, stack2.file) ? null : stack2;
     }
     const traceMap = new TraceMap(map);
-    const { line, column } = originalPositionFor(traceMap, stack2);
+    const { line, column, source, name } = originalPositionFor(traceMap, stack2);
+    let file = stack2.file;
+    if (source) {
+      const fileUrl = stack2.file.startsWith("file://") ? stack2.file : `file://${stack2.file}`;
+      const sourceRootUrl = map.sourceRoot ? new URL(map.sourceRoot, fileUrl) : fileUrl;
+      file = new URL(source, sourceRootUrl).pathname;
+    }
+    if (shouldFilter(ignoreStackEntries, file)) {
+      return null;
+    }
     if (line != null && column != null) {
-      return { ...stack2, line, column };
+      return {
+        line,
+        column,
+        file,
+        method: name || stack2.method
+      };
     }
     return stack2;
-  });
+  }).filter((s) => s != null);
+}
+function shouldFilter(ignoreStackEntries, file) {
+  return ignoreStackEntries.some((p) => file.match(p));
 }
 function parseFFOrSafariStackTrace(stack) {
   return stack.split("\n").map((line) => parseSingleFFOrSafariStack(line)).filter(notNullish);
@@ -1834,6 +1848,9 @@ class CounterMap extends DefaultMap {
   }
 }
 
+function isSameStackPosition(x, y) {
+  return x.file === y.file && x.column === y.column && x.line === y.line;
+}
 class SnapshotState {
   constructor(testFilePath, snapshotPath, snapshotContent, options) {
     this.testFilePath = testFilePath;
@@ -2068,11 +2085,23 @@ ${JSON.stringify(
       }
       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));
-        throw new Error("toMatchInlineSnapshot cannot be called multiple times at the same location.");
+      const snapshotsWithSameStack = this._inlineSnapshotStacks.filter((s) => isSameStackPosition(s, stack));
+      if (snapshotsWithSameStack.length > 0) {
+        this._inlineSnapshots = this._inlineSnapshots.filter((s) => !isSameStackPosition(s, stack));
+        const differentSnapshot = snapshotsWithSameStack.find((s) => s.snapshot !== receivedSerialized);
+        if (differentSnapshot) {
+          throw Object.assign(
+            new Error(
+              "toMatchInlineSnapshot with different snapshots cannot be called at the same location"
+            ),
+            {
+              actual: receivedSerialized,
+              expected: differentSnapshot.snapshot
+            }
+          );
+        }
       }
-      this._inlineSnapshotStacks.push({ ...stack, testId });
+      this._inlineSnapshotStacks.push({ ...stack, testId, snapshot: receivedSerialized });
     }
     if (hasSnapshot && this._updateSnapshot === "all" || (!hasSnapshot || !snapshotIsPersisted) && (this._updateSnapshot === "new" || this._updateSnapshot === "all")) {
       if (this._updateSnapshot === "all") {

package/dist/manager.d.ts

@@ -1,18 +1,18 @@
-import { S as SnapshotStateOptions, e as SnapshotSummary, b as SnapshotResult } from './rawSnapshot-DOKg5unn.js';
+import { S as SnapshotStateOptions, e as SnapshotSummary, b as SnapshotResult } from './rawSnapshot.d-lFsMJFUd.js';
 import '@vitest/pretty-format';
-import './environment-Ddx0EDtY.js';
+import './environment.d-DHdQ1Csl.js';
 
 declare class SnapshotManager {
-    options: Omit<SnapshotStateOptions, 'snapshotEnvironment'>;
-    summary: SnapshotSummary;
-    extension: string;
-    constructor(options: Omit<SnapshotStateOptions, 'snapshotEnvironment'>);
-    clear(): void;
-    add(result: SnapshotResult): void;
-    resolvePath<T = any>(testPath: string, context?: T): string;
-    resolveRawPath(testPath: string, rawPath: string): string;
+	options: Omit<SnapshotStateOptions, "snapshotEnvironment">;
+	summary: SnapshotSummary;
+	extension: string;
+	constructor(options: Omit<SnapshotStateOptions, "snapshotEnvironment">);
+	clear(): void;
+	add(result: SnapshotResult): void;
+	resolvePath<T = any>(testPath: string, context?: T): string;
+	resolveRawPath(testPath: string, rawPath: string): string;
 }
-declare function emptySummary(options: Omit<SnapshotStateOptions, 'snapshotEnvironment'>): SnapshotSummary;
+declare function emptySummary(options: Omit<SnapshotStateOptions, "snapshotEnvironment">): SnapshotSummary;
 declare function addSnapshotResult(summary: SnapshotSummary, result: SnapshotResult): void;
 
 export { SnapshotManager, addSnapshotResult, emptySummary };

package/dist/rawSnapshot.d-lFsMJFUd.d.ts

@@ -0,0 +1,61 @@
+import { OptionsReceived, Plugin } from '@vitest/pretty-format';
+import { S as SnapshotEnvironment } from './environment.d-DHdQ1Csl.js';
+
+type SnapshotData = Record<string, string>;
+type SnapshotUpdateState = "all" | "new" | "none";
+type SnapshotSerializer = Plugin;
+interface SnapshotStateOptions {
+	updateSnapshot: SnapshotUpdateState;
+	snapshotEnvironment: SnapshotEnvironment;
+	expand?: boolean;
+	snapshotFormat?: OptionsReceived;
+	resolveSnapshotPath?: (path: string, extension: string, context?: any) => string;
+}
+interface SnapshotMatchOptions {
+	testId: string;
+	testName: string;
+	received: unknown;
+	key?: string;
+	inlineSnapshot?: string;
+	isInline: boolean;
+	error?: Error;
+	rawSnapshot?: RawSnapshotInfo;
+}
+interface SnapshotResult {
+	filepath: string;
+	added: number;
+	fileDeleted: boolean;
+	matched: number;
+	unchecked: number;
+	uncheckedKeys: Array<string>;
+	unmatched: number;
+	updated: number;
+}
+interface UncheckedSnapshot {
+	filePath: string;
+	keys: Array<string>;
+}
+interface SnapshotSummary {
+	added: number;
+	didUpdate: boolean;
+	failure: boolean;
+	filesAdded: number;
+	filesRemoved: number;
+	filesRemovedList: Array<string>;
+	filesUnmatched: number;
+	filesUpdated: number;
+	matched: number;
+	total: number;
+	unchecked: number;
+	uncheckedKeysByFile: Array<UncheckedSnapshot>;
+	unmatched: number;
+	updated: number;
+}
+
+interface RawSnapshotInfo {
+	file: string;
+	readonly?: boolean;
+	content?: string;
+}
+
+export type { RawSnapshotInfo as R, SnapshotStateOptions as S, UncheckedSnapshot as U, SnapshotMatchOptions as a, SnapshotResult as b, SnapshotData as c, SnapshotSerializer as d, SnapshotSummary as e, SnapshotUpdateState as f };

package/package.json

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

package/dist/environment-Ddx0EDtY.d.ts

@@ -1,22 +0,0 @@
-interface ParsedStack {
-    method: string;
-    file: string;
-    line: number;
-    column: number;
-}
-
-interface SnapshotEnvironment {
-    getVersion: () => string;
-    getHeader: () => string;
-    resolvePath: (filepath: string) => Promise<string>;
-    resolveRawPath: (testPath: string, rawPath: string) => Promise<string>;
-    saveSnapshotFile: (filepath: string, snapshot: string) => Promise<void>;
-    readSnapshotFile: (filepath: string) => Promise<string | null>;
-    removeSnapshotFile: (filepath: string) => Promise<void>;
-    processStackTrace?: (stack: ParsedStack) => ParsedStack;
-}
-interface SnapshotEnvironmentOptions {
-    snapshotsDirName?: string;
-}
-
-export type { SnapshotEnvironment as S, SnapshotEnvironmentOptions as a };

package/dist/rawSnapshot-DOKg5unn.d.ts

@@ -1,61 +0,0 @@
-import { OptionsReceived, Plugin } from '@vitest/pretty-format';
-import { S as SnapshotEnvironment } from './environment-Ddx0EDtY.js';
-
-type SnapshotData = Record<string, string>;
-type SnapshotUpdateState = 'all' | 'new' | 'none';
-type SnapshotSerializer = Plugin;
-interface SnapshotStateOptions {
-    updateSnapshot: SnapshotUpdateState;
-    snapshotEnvironment: SnapshotEnvironment;
-    expand?: boolean;
-    snapshotFormat?: OptionsReceived;
-    resolveSnapshotPath?: (path: string, extension: string, context?: any) => string;
-}
-interface SnapshotMatchOptions {
-    testId: string;
-    testName: string;
-    received: unknown;
-    key?: string;
-    inlineSnapshot?: string;
-    isInline: boolean;
-    error?: Error;
-    rawSnapshot?: RawSnapshotInfo;
-}
-interface SnapshotResult {
-    filepath: string;
-    added: number;
-    fileDeleted: boolean;
-    matched: number;
-    unchecked: number;
-    uncheckedKeys: Array<string>;
-    unmatched: number;
-    updated: number;
-}
-interface UncheckedSnapshot {
-    filePath: string;
-    keys: Array<string>;
-}
-interface SnapshotSummary {
-    added: number;
-    didUpdate: boolean;
-    failure: boolean;
-    filesAdded: number;
-    filesRemoved: number;
-    filesRemovedList: Array<string>;
-    filesUnmatched: number;
-    filesUpdated: number;
-    matched: number;
-    total: number;
-    unchecked: number;
-    uncheckedKeysByFile: Array<UncheckedSnapshot>;
-    unmatched: number;
-    updated: number;
-}
-
-interface RawSnapshotInfo {
-    file: string;
-    readonly?: boolean;
-    content?: string;
-}
-
-export type { RawSnapshotInfo as R, SnapshotStateOptions as S, UncheckedSnapshot as U, SnapshotMatchOptions as a, SnapshotResult as b, SnapshotData as c, SnapshotSerializer as d, SnapshotSummary as e, SnapshotUpdateState as f };