@vitest/utils 3.0.7 → 3.0.8

package/dist/source-map.d.ts

@@ -123,7 +123,7 @@ declare function eachMapping(map: TraceMap, cb: (mapping: EachMapping) => void):
 interface StackTraceParserOptions {
     ignoreStackEntries?: (RegExp | string)[];
     getSourceMap?: (file: string) => unknown;
-    getFileName?: (id: string) => string;
+    getUrlId?: (id: string) => string;
     frameFilter?: (error: ErrorWithDiff, frame: ParsedStack) => boolean | void;
 }
 declare function parseSingleFFOrSafariStack(raw: string): ParsedStack | null;

package/dist/source-map.js

@@ -821,7 +821,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);
@@ -913,28 +915,40 @@ function createStackString(stacks) {
 }
 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);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/utils",
   "type": "module",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Shared Vitest utility functions",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -62,7 +62,7 @@
   "dependencies": {
     "loupe": "^3.1.3",
     "tinyrainbow": "^2.0.0",
-    "@vitest/pretty-format": "3.0.7"
+    "@vitest/pretty-format": "3.0.8"
   },
   "devDependencies": {
     "@jridgewell/trace-mapping": "^0.3.25",