@vitest/utils 1.6.0 → 2.0.0-beta.2

package/dist/chunk-display.js

@@ -46,7 +46,7 @@ function format(...args) {
   if (typeof args[0] !== "string") {
     const objects = [];
     for (let i2 = 0; i2 < args.length; i2++)
-      objects.push(inspect(args[i2], { depth: 0, colors: false, compact: 3 }));
+      objects.push(inspect(args[i2], { depth: 0, colors: false }));
     return objects.join(" ");
   }
   const len = args.length;
@@ -65,7 +65,7 @@ function format(...args) {
         if (typeof value === "number" && value === 0 && 1 / value < 0)
           return "-0";
         if (typeof value === "object" && value !== null)
-          return inspect(value, { depth: 0, colors: false, compact: 3 });
+          return inspect(value, { depth: 0, colors: false });
         return String(value);
       }
       case "%d": {

package/dist/diff.d.ts

@@ -1,5 +1,5 @@
-import { D as DiffOptions } from './types-9l4niLY8.js';
-export { a as DiffOptionsColor } from './types-9l4niLY8.js';
+import { D as DiffOptions } from './types-DyShQl4f.js';
+export { a as DiffOptionsColor } from './types-DyShQl4f.js';
 import 'pretty-format';
 
 /**

package/dist/error.d.ts

@@ -1,8 +1,8 @@
-import { D as DiffOptions } from './types-9l4niLY8.js';
+import { D as DiffOptions } from './types-DyShQl4f.js';
 import 'pretty-format';
 
 declare function serializeError(val: any, seen?: WeakMap<WeakKey, any>): any;
-declare function processError(err: any, diffOptions?: DiffOptions): any;
+declare function processError(err: any, diffOptions?: DiffOptions, seen?: WeakSet<WeakKey>): any;
 declare function replaceAsymmetricMatcher(actual: any, expected: any, actualReplaced?: WeakSet<WeakKey>, expectedReplaced?: WeakSet<WeakKey>): {
     replacedActual: any;
     replacedExpected: any;

package/dist/error.js

@@ -74,7 +74,7 @@ function serializeError(val, seen = /* @__PURE__ */ new WeakMap()) {
 function normalizeErrorMessage(message) {
   return message.replace(/__(vite_ssr_import|vi_import)_\d+__\./g, "");
 }
-function processError(err, diffOptions) {
+function processError(err, diffOptions, seen = /* @__PURE__ */ new WeakSet()) {
   if (!err || typeof err !== "object")
     return { message: err };
   if (err.stack)
@@ -94,8 +94,13 @@ function processError(err, diffOptions) {
   try {
     if (typeof err.message === "string")
       err.message = normalizeErrorMessage(err.message);
-    if (typeof err.cause === "object" && typeof err.cause.message === "string")
-      err.cause.message = normalizeErrorMessage(err.cause.message);
+  } catch {
+  }
+  try {
+    if (!seen.has(err) && typeof err.cause === "object") {
+      seen.add(err);
+      err.cause = processError(err.cause, diffOptions, seen);
+    }
   } catch {
   }
   try {

package/dist/helpers.js

@@ -61,8 +61,7 @@ function clone(val, seen, options = defaultCloneOptions) {
   if (Array.isArray(val)) {
     out = Array(k = val.length);
     seen.set(val, out);
-    while (k--)
-      out[k] = clone(val[k], seen, options);
+    while (k--) out[k] = clone(val[k], seen, options);
     return out;
   }
   if (Object.prototype.toString.call(val) === "[object Object]") {

package/dist/index.d.ts

@@ -19,21 +19,21 @@ declare function setSafeTimers(): void;
 
 declare function shuffle<T>(array: T[], seed?: number): T[];
 
-interface LoupeOptions {
-    showHidden?: boolean | undefined;
-    depth?: number | null | undefined;
-    colors?: boolean | undefined;
-    customInspect?: boolean | undefined;
-    showProxy?: boolean | undefined;
-    maxArrayLength?: number | null | undefined;
-    maxStringLength?: number | null | undefined;
-    breakLength?: number | undefined;
-    compact?: boolean | number | undefined;
-    sorted?: boolean | ((a: string, b: string) => number) | undefined;
-    getters?: 'get' | 'set' | boolean | undefined;
-    numericSeparator?: boolean | undefined;
-    truncate?: number;
+type Inspect = (value: unknown, options: Options) => string;
+interface Options {
+    showHidden: boolean;
+    depth: number;
+    colors: boolean;
+    customInspect: boolean;
+    showProxy: boolean;
+    maxArrayLength: number;
+    breakLength: number;
+    truncate: number;
+    seen: unknown[];
+    inspect: Inspect;
+    stylize: (value: string, styleType: string) => string;
 }
+type LoupeOptions = Partial<Options>;
 declare function format(...args: unknown[]): string;
 declare function inspect(obj: unknown, options?: LoupeOptions): string;
 declare function objDisplay(obj: unknown, options?: LoupeOptions): string;

package/dist/source-map.d.ts

@@ -14,6 +14,7 @@ interface SourceMapV3 {
     sources: (string | null)[];
     sourcesContent?: (string | null)[];
     version: 3;
+    ignoreList?: number[];
 }
 interface EncodedSourceMap extends SourceMapV3 {
     mappings: string;
@@ -42,7 +43,12 @@ type InvalidGeneratedMapping = {
     column: null;
 };
 type Bias = typeof GREATEST_LOWER_BOUND | typeof LEAST_UPPER_BOUND;
-type SourceMapInput = string | Ro<EncodedSourceMap> | Ro<DecodedSourceMap> | TraceMap;
+type XInput = {
+    x_google_ignoreList?: SourceMapV3['ignoreList'];
+};
+type EncodedSourceMapXInput = EncodedSourceMap & XInput;
+type DecodedSourceMapXInput = DecodedSourceMap & XInput;
+type SourceMapInput = string | EncodedSourceMapXInput | DecodedSourceMapXInput | TraceMap;
 type Needle = {
     line: number;
     column: number;
@@ -62,25 +68,12 @@ declare abstract class SourceMap {
     sources: SourceMapV3['sources'];
     sourcesContent: SourceMapV3['sourcesContent'];
     resolvedSources: SourceMapV3['sources'];
+    ignoreList: SourceMapV3['ignoreList'];
 }
-type Ro<T> = T extends Array<infer V> ? V[] | Readonly<V[]> | RoArray<V> | Readonly<RoArray<V>> : T extends object ? T | Readonly<T> | RoObject<T> | Readonly<RoObject<T>> : T;
-type RoArray<T> = Ro<T>[];
-type RoObject<T> = {
-    [K in keyof T]: T[K] | Ro<T[K]>;
-};
 
 declare const LEAST_UPPER_BOUND = -1;
 declare const GREATEST_LOWER_BOUND = 1;
-/**
- * A higher-level API to find the source/line/column associated with a generated line/column
- * (think, from a stack trace). Line is 1-based, but column is 0-based, due to legacy behavior in
- * `source-map` library.
- */
-declare let originalPositionFor: (map: TraceMap, needle: Needle) => OriginalMapping | InvalidOriginalMapping;
-/**
- * Finds the generated line/column position of the provided source/line/column source position.
- */
-declare let generatedPositionFor: (map: TraceMap, needle: SourceNeedle) => GeneratedMapping | InvalidGeneratedMapping;
+
 declare class TraceMap implements SourceMap {
     version: SourceMapV3['version'];
     file: SourceMapV3['file'];
@@ -88,6 +81,7 @@ declare class TraceMap implements SourceMap {
     sourceRoot: SourceMapV3['sourceRoot'];
     sources: SourceMapV3['sources'];
     sourcesContent: SourceMapV3['sourcesContent'];
+    ignoreList: SourceMapV3['ignoreList'];
     resolvedSources: string[];
     private _encoded;
     private _decoded;
@@ -96,6 +90,16 @@ declare class TraceMap implements SourceMap {
     private _bySourceMemos;
     constructor(map: SourceMapInput, mapUrl?: string | null);
 }
+/**
+ * A higher-level API to find the source/line/column associated with a generated line/column
+ * (think, from a stack trace). Line is 1-based, but column is 0-based, due to legacy behavior in
+ * `source-map` library.
+ */
+declare function originalPositionFor(map: TraceMap, needle: Needle): OriginalMapping | InvalidOriginalMapping;
+/**
+ * Finds the generated line/column position of the provided source/line/column source position.
+ */
+declare function generatedPositionFor(map: TraceMap, needle: SourceNeedle): GeneratedMapping | InvalidGeneratedMapping;
 
 interface StackTraceParserOptions {
     ignoreStackEntries?: (RegExp | string)[];

package/dist/source-map.js

@@ -1,14 +1,15 @@
 import { notNullish, isPrimitive } from './helpers.js';
 
+const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
-  if (!input || !input.includes("\\")) {
+  if (!input) {
     return input;
   }
-  return input.replace(/\\/g, "/");
+  return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
 }
 const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
 function cwd() {
-  if (typeof process !== "undefined") {
+  if (typeof process !== "undefined" && typeof process.cwd === "function") {
     return process.cwd().replace(/\\/g, "/");
   }
   return "/";
@@ -584,8 +585,9 @@ function buildBySources(decoded, memos) {
             // segment should go. Either way, we want to insert after that. And there may be multiple
             // generated segments associated with an original location, so there may need to move several
             // indexes before we find where we need to insert.
-            const index = upperBound(originalLine, sourceColumn, memoizedBinarySearch(originalLine, sourceColumn, memo, sourceLine));
-            insert(originalLine, (memo.lastIndex = index + 1), [sourceColumn, i, seg[COLUMN]]);
+            let index = upperBound(originalLine, sourceColumn, memoizedBinarySearch(originalLine, sourceColumn, memo, sourceLine));
+            memo.lastIndex = ++index;
+            insert(originalLine, index, [sourceColumn, i, seg[COLUMN]]);
         }
     }
     return sources;
@@ -609,20 +611,6 @@ const LINE_GTR_ZERO = '`line` must be greater than 0 (lines start at line 1)';
 const COL_GTR_EQ_ZERO = '`column` must be greater than or equal to 0 (columns start at column 0)';
 const LEAST_UPPER_BOUND = -1;
 const GREATEST_LOWER_BOUND = 1;
-/**
- * Returns the decoded (array of lines of segments) form of the SourceMap's mappings field.
- */
-let decodedMappings;
-/**
- * A higher-level API to find the source/line/column associated with a generated line/column
- * (think, from a stack trace). Line is 1-based, but column is 0-based, due to legacy behavior in
- * `source-map` library.
- */
-let originalPositionFor;
-/**
- * Finds the generated line/column position of the provided source/line/column source position.
- */
-let generatedPositionFor;
 class TraceMap {
     constructor(map, mapUrl) {
         const isString = typeof map === 'string';
@@ -636,6 +624,7 @@ class TraceMap {
         this.sourceRoot = sourceRoot;
         this.sources = sources;
         this.sourcesContent = sourcesContent;
+        this.ignoreList = parsed.ignoreList || parsed.x_google_ignoreList || undefined;
         const from = resolve(sourceRoot || '', stripFilename(mapUrl));
         this.resolvedSources = sources.map((s) => resolve(s || '', from));
         const { mappings } = parsed;
@@ -652,60 +641,54 @@ class TraceMap {
         this._bySourceMemos = undefined;
     }
 }
-(() => {
-    decodedMappings = (map) => {
-        return (map._decoded || (map._decoded = decode(map._encoded)));
-    };
-    originalPositionFor = (map, { line, column, bias }) => {
-        line--;
-        if (line < 0)
-            throw new Error(LINE_GTR_ZERO);
-        if (column < 0)
-            throw new Error(COL_GTR_EQ_ZERO);
-        const decoded = decodedMappings(map);
-        // It's common for parent source maps to have pointers to lines that have no
-        // mapping (like a "//# sourceMappingURL=") at the end of the child file.
-        if (line >= decoded.length)
-            return OMapping(null, null, null, null);
-        const segments = decoded[line];
-        const index = traceSegmentInternal(segments, map._decodedMemo, line, column, bias || GREATEST_LOWER_BOUND);
-        if (index === -1)
-            return OMapping(null, null, null, null);
-        const segment = segments[index];
-        if (segment.length === 1)
-            return OMapping(null, null, null, null);
-        const { names, resolvedSources } = map;
-        return OMapping(resolvedSources[segment[SOURCES_INDEX]], segment[SOURCE_LINE] + 1, segment[SOURCE_COLUMN], segment.length === 5 ? names[segment[NAMES_INDEX]] : null);
-    };
-    generatedPositionFor = (map, { source, line, column, bias }) => {
-        return generatedPosition(map, source, line, column, bias || GREATEST_LOWER_BOUND, false);
-    };
-    function generatedPosition(map, source, line, column, bias, all) {
-        line--;
-        if (line < 0)
-            throw new Error(LINE_GTR_ZERO);
-        if (column < 0)
-            throw new Error(COL_GTR_EQ_ZERO);
-        const { sources, resolvedSources } = map;
-        let sourceIndex = sources.indexOf(source);
-        if (sourceIndex === -1)
-            sourceIndex = resolvedSources.indexOf(source);
-        if (sourceIndex === -1)
-            return all ? [] : GMapping(null, null);
-        const generated = (map._bySources || (map._bySources = buildBySources(decodedMappings(map), (map._bySourceMemos = sources.map(memoizedState)))));
-        const segments = generated[sourceIndex][line];
-        if (segments == null)
-            return all ? [] : GMapping(null, null);
-        const memo = map._bySourceMemos[sourceIndex];
-        if (all)
-            return sliceGeneratedPositions(segments, memo, line, column, bias);
-        const index = traceSegmentInternal(segments, memo, line, column, bias);
-        if (index === -1)
-            return GMapping(null, null);
-        const segment = segments[index];
-        return GMapping(segment[REV_GENERATED_LINE] + 1, segment[REV_GENERATED_COLUMN]);
-    }
-})();
+/**
+ * Typescript doesn't allow friend access to private fields, so this just casts the map into a type
+ * with public access modifiers.
+ */
+function cast(map) {
+    return map;
+}
+/**
+ * Returns the decoded (array of lines of segments) form of the SourceMap's mappings field.
+ */
+function decodedMappings(map) {
+    var _a;
+    return ((_a = cast(map))._decoded || (_a._decoded = decode(cast(map)._encoded)));
+}
+/**
+ * A higher-level API to find the source/line/column associated with a generated line/column
+ * (think, from a stack trace). Line is 1-based, but column is 0-based, due to legacy behavior in
+ * `source-map` library.
+ */
+function originalPositionFor(map, needle) {
+    let { line, column, bias } = needle;
+    line--;
+    if (line < 0)
+        throw new Error(LINE_GTR_ZERO);
+    if (column < 0)
+        throw new Error(COL_GTR_EQ_ZERO);
+    const decoded = decodedMappings(map);
+    // It's common for parent source maps to have pointers to lines that have no
+    // mapping (like a "//# sourceMappingURL=") at the end of the child file.
+    if (line >= decoded.length)
+        return OMapping(null, null, null, null);
+    const segments = decoded[line];
+    const index = traceSegmentInternal(segments, cast(map)._decodedMemo, line, column, bias || GREATEST_LOWER_BOUND);
+    if (index === -1)
+        return OMapping(null, null, null, null);
+    const segment = segments[index];
+    if (segment.length === 1)
+        return OMapping(null, null, null, null);
+    const { names, resolvedSources } = map;
+    return OMapping(resolvedSources[segment[SOURCES_INDEX]], segment[SOURCE_LINE] + 1, segment[SOURCE_COLUMN], segment.length === 5 ? names[segment[NAMES_INDEX]] : null);
+}
+/**
+ * Finds the generated line/column position of the provided source/line/column source position.
+ */
+function generatedPositionFor(map, needle) {
+    const { source, line, column, bias } = needle;
+    return generatedPosition(map, source, line, column, bias || GREATEST_LOWER_BOUND, false);
+}
 function OMapping(source, line, column, name) {
     return { source, line, column, name };
 }
@@ -750,6 +733,32 @@ function sliceGeneratedPositions(segments, memo, line, column, bias) {
     }
     return result;
 }
+function generatedPosition(map, source, line, column, bias, all) {
+    var _a;
+    line--;
+    if (line < 0)
+        throw new Error(LINE_GTR_ZERO);
+    if (column < 0)
+        throw new Error(COL_GTR_EQ_ZERO);
+    const { sources, resolvedSources } = map;
+    let sourceIndex = sources.indexOf(source);
+    if (sourceIndex === -1)
+        sourceIndex = resolvedSources.indexOf(source);
+    if (sourceIndex === -1)
+        return all ? [] : GMapping(null, null);
+    const generated = ((_a = cast(map))._bySources || (_a._bySources = buildBySources(decodedMappings(map), (cast(map)._bySourceMemos = sources.map(memoizedState)))));
+    const segments = generated[sourceIndex][line];
+    if (segments == null)
+        return all ? [] : GMapping(null, null);
+    const memo = cast(map)._bySourceMemos[sourceIndex];
+    if (all)
+        return sliceGeneratedPositions(segments, memo, line, column, bias);
+    const index = traceSegmentInternal(segments, memo, line, column, bias);
+    if (index === -1)
+        return GMapping(null, null);
+    const segment = segments[index];
+    return GMapping(segment[REV_GENERATED_LINE] + 1, segment[REV_GENERATED_COLUMN]);
+}
 
 const CHROME_IE_STACK_REGEXP = /^\s*at .*(\S+:\d+|\(native\))/m;
 const SAFARI_NATIVE_CODE_REGEXP = /^(eval@)?(\[native code])?$/;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/utils",
   "type": "module",
-  "version": "1.6.0",
+  "version": "2.0.0-beta.2",
   "description": "Shared Vitest utility functions",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -59,11 +59,11 @@
   "dependencies": {
     "diff-sequences": "^29.6.3",
     "estree-walker": "^3.0.3",
-    "loupe": "^2.3.7",
+    "loupe": "^3.1.0",
     "pretty-format": "^29.7.0"
   },
   "devDependencies": {
-    "@jridgewell/trace-mapping": "^0.3.22",
+    "@jridgewell/trace-mapping": "^0.3.25",
     "@types/estree": "^1.0.5",
     "tinyhighlight": "^0.3.2"
   },