@vitest/snapshot 3.0.6 → 3.0.8

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/snapshot",
   "type": "module",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "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.6"
+    "@vitest/pretty-format": "3.0.8"
   },
   "devDependencies": {
     "@types/natural-compare": "^1.4.3",
     "natural-compare": "^1.4.0",
-    "@vitest/utils": "3.0.6"
+    "@vitest/utils": "3.0.8"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",