@vitest/utils 2.0.0-beta.1 → 2.0.0-beta.11

package/dist/helpers.js

@@ -4,8 +4,11 @@ function notNullish(v) {
 function assertTypes(value, name, types) {
   const receivedType = typeof value;
   const pass = types.includes(receivedType);
-  if (!pass)
-    throw new TypeError(`${name} value must be ${types.join(" or ")}, received "${receivedType}"`);
+  if (!pass) {
+    throw new TypeError(
+      `${name} value must be ${types.join(" or ")}, received "${receivedType}"`
+    );
+  }
 }
 function isPrimitive(value) {
   return value === null || typeof value !== "function" && typeof value !== "object";
@@ -15,17 +18,21 @@ function slash(path) {
 }
 function parseRegexp(input) {
   const m = input.match(/(\/?)(.+)\1([a-z]*)/i);
-  if (!m)
+  if (!m) {
     return /$^/;
-  if (m[3] && !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3]))
+  }
+  if (m[3] && !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3])) {
     return RegExp(input);
+  }
   return new RegExp(m[2], m[3]);
 }
 function toArray(array) {
-  if (array === null || array === void 0)
+  if (array === null || array === void 0) {
     array = [];
-  if (Array.isArray(array))
+  }
+  if (Array.isArray(array)) {
     return array;
+  }
   return [array];
 }
 function isObject(item) {
@@ -44,8 +51,9 @@ function collectOwnProperties(obj, collector) {
 }
 function getOwnProperties(obj) {
   const ownProps = /* @__PURE__ */ new Set();
-  if (isFinalObj(obj))
+  if (isFinalObj(obj)) {
     return [];
+  }
   collectOwnProperties(obj, ownProps);
   return Array.from(ownProps);
 }
@@ -56,12 +64,15 @@ function deepClone(val, options = defaultCloneOptions) {
 }
 function clone(val, seen, options = defaultCloneOptions) {
   let k, out;
-  if (seen.has(val))
+  if (seen.has(val)) {
     return seen.get(val);
+  }
   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]") {
@@ -70,8 +81,9 @@ function clone(val, seen, options = defaultCloneOptions) {
     const props = getOwnProperties(val);
     for (const k2 of props) {
       const descriptor = Object.getOwnPropertyDescriptor(val, k2);
-      if (!descriptor)
+      if (!descriptor) {
         continue;
+      }
       const cloned = clone(val[k2], seen, options);
       if (options.forceWritable) {
         Object.defineProperty(out, k2, {
@@ -105,8 +117,9 @@ function objectAttr(source, path, defaultValue = void 0) {
   let result = source;
   for (const p of paths) {
     result = Object(result)[p];
-    if (result === void 0)
+    if (result === void 0) {
       return defaultValue;
+    }
   }
   return result;
 }
@@ -133,21 +146,35 @@ function getCallLastIndex(code) {
     const char = code[charIndex];
     const isCharString = char === '"' || char === "'" || char === "`";
     if (isCharString && beforeChar !== "\\") {
-      if (inString === char)
+      if (inString === char) {
         inString = null;
-      else if (!inString)
+      } else if (!inString) {
         inString = char;
+      }
     }
     if (!inString) {
-      if (char === "(")
+      if (char === "(") {
         startedBracers++;
-      if (char === ")")
+      }
+      if (char === ")") {
         endedBracers++;
+      }
     }
-    if (startedBracers && endedBracers && startedBracers === endedBracers)
+    if (startedBracers && endedBracers && startedBracers === endedBracers) {
       return charIndex;
+    }
   }
   return null;
 }
+function isNegativeNaN(val) {
+  if (!Number.isNaN(val)) {
+    return false;
+  }
+  const f64 = new Float64Array(1);
+  f64[0] = val;
+  const u32 = new Uint32Array(f64.buffer);
+  const isNegative = u32[1] >>> 31 === 1;
+  return isNegative;
+}
 
-export { assertTypes, clone, createDefer, deepClone, getCallLastIndex, getOwnProperties, getType, isObject, isPrimitive, noop, notNullish, objectAttr, parseRegexp, slash, toArray };
+export { assertTypes, clone, createDefer, deepClone, getCallLastIndex, getOwnProperties, getType, isNegativeNaN, isObject, isPrimitive, noop, notNullish, objectAttr, parseRegexp, slash, toArray };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { DeferPromise, assertTypes, clone, createDefer, deepClone, getCallLastIndex, getOwnProperties, getType, isObject, isPrimitive, noop, notNullish, objectAttr, parseRegexp, slash, toArray } from './helpers.js';
+export { DeferPromise, assertTypes, clone, createDefer, deepClone, getCallLastIndex, getOwnProperties, getType, isNegativeNaN, isObject, isPrimitive, noop, notNullish, objectAttr, parseRegexp, slash, toArray } from './helpers.js';
 export { ArgumentsType, Arrayable, Awaitable, Constructable, DeepMerge, ErrorWithDiff, MergeInsertions, MutableArray, Nullable, ParsedStack } from './types.js';
 import { PrettyFormatOptions } from 'pretty-format';
 

package/dist/index.js

@@ -1,4 +1,4 @@
-export { assertTypes, clone, createDefer, deepClone, getCallLastIndex, getOwnProperties, getType, isObject, isPrimitive, noop, notNullish, objectAttr, parseRegexp, slash, toArray } from './helpers.js';
+export { assertTypes, clone, createDefer, deepClone, getCallLastIndex, getOwnProperties, getType, isNegativeNaN, isObject, isPrimitive, noop, notNullish, objectAttr, parseRegexp, slash, toArray } from './helpers.js';
 export { f as format, i as inspect, o as objDisplay, s as stringify } from './chunk-display.js';
 import { S as SAFE_TIMERS_SYMBOL, g as getColors } from './chunk-colors.js';
 export { a as SAFE_COLORS_SYMBOL, c as createColors, b as getDefaultColors, s as setupColors } from './chunk-colors.js';
@@ -14,9 +14,7 @@ function getSafeTimers() {
     setImmediate: safeSetImmediate,
     clearImmediate: safeClearImmediate
   } = globalThis[SAFE_TIMERS_SYMBOL] || globalThis;
-  const {
-    nextTick: safeNextTick
-  } = globalThis[SAFE_TIMERS_SYMBOL] || globalThis.process || { nextTick: (cb) => cb() };
+  const { nextTick: safeNextTick } = globalThis[SAFE_TIMERS_SYMBOL] || globalThis.process || { nextTick: (cb) => cb() };
   return {
     nextTick: safeNextTick,
     setTimeout: safeSetTimeout,
@@ -36,9 +34,9 @@ function setSafeTimers() {
     setImmediate: safeSetImmediate,
     clearImmediate: safeClearImmediate
   } = globalThis;
-  const {
-    nextTick: safeNextTick
-  } = globalThis.process || { nextTick: (cb) => cb() };
+  const { nextTick: safeNextTick } = globalThis.process || {
+    nextTick: (cb) => cb()
+  };
   const timers = {
     nextTick: safeNextTick,
     setTimeout: safeSetTimeout,
@@ -69,7 +67,7 @@ function shuffle(array, seed = RealDate.now()) {
 }
 
 function createSimpleStackTrace(options) {
-  const { message = "error", stackTraceLimit = 1 } = options || {};
+  const { message = "$$stack trace error", stackTraceLimit = 1 } = options || {};
   const limit = Error.stackTraceLimit;
   const prepareStackTrace = Error.prepareStackTrace;
   Error.stackTraceLimit = stackTraceLimit;
@@ -86,10 +84,12 @@ function positionToOffset(source, lineNumber, columnNumber) {
   const lines = source.split(lineSplitRE);
   const nl = /\r\n/.test(source) ? 2 : 1;
   let start = 0;
-  if (lineNumber > lines.length)
+  if (lineNumber > lines.length) {
     return source.length;
-  for (let i = 0; i < lineNumber - 1; i++)
+  }
+  for (let i = 0; i < lineNumber - 1; i++) {
     start += lines[i].length + nl;
+  }
   return start + columnNumber;
 }
 function offsetToLineNumber(source, offset) {
@@ -104,8 +104,9 @@ function offsetToLineNumber(source, offset) {
   let line = 0;
   for (; line < lines.length; line++) {
     const lineLength = lines[line].length + nl;
-    if (counted + lineLength >= offset)
+    if (counted + lineLength >= offset) {
       break;
+    }
     counted += lineLength;
   }
   return line + 1;

package/dist/source-map.js

@@ -760,8 +760,8 @@ function generatedPosition(map, source, line, column, bias, all) {
     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])?$/;
+const CHROME_IE_STACK_REGEXP = /^\s*at .*(?:\S:\d+|\(native\))/m;
+const SAFARI_NATIVE_CODE_REGEXP = /^(?:eval@)?(?:\[native code\])?$/;
 const stackIgnorePatterns = [
   "node:internal",
   /\/packages\/\w+\/dist\//,
@@ -773,40 +773,59 @@ const stackIgnorePatterns = [
   "/node_modules/chai/",
   "/node_modules/tinypool/",
   "/node_modules/tinyspy/",
-  "/deps/chai.js",
-  /__vitest_browser__/
+  // browser related deps
+  "/deps/",
+  /node:\w+/,
+  /__vitest_test__/,
+  /__vitest_browser__/,
+  /\/deps\/vitest_/
 ];
 function extractLocation(urlLike) {
-  if (!urlLike.includes(":"))
+  if (!urlLike.includes(":")) {
     return [urlLike];
+  }
   const regExp = /(.+?)(?::(\d+))?(?::(\d+))?$/;
   const parts = regExp.exec(urlLike.replace(/^\(|\)$/g, ""));
-  if (!parts)
+  if (!parts) {
     return [urlLike];
+  }
   let url = parts[1];
+  if (url.startsWith("async ")) {
+    url = url.slice(6);
+  }
   if (url.startsWith("http:") || url.startsWith("https:")) {
     const urlObj = new URL(url);
     url = urlObj.pathname;
   }
   if (url.startsWith("/@fs/")) {
-    url = url.slice(typeof process !== "undefined" && process.platform === "win32" ? 5 : 4);
+    const isWindows = /^\/@fs\/[a-zA-Z]:\//.test(url);
+    url = url.slice(isWindows ? 5 : 4);
   }
   return [url, parts[2] || void 0, parts[3] || void 0];
 }
 function parseSingleFFOrSafariStack(raw) {
   let line = raw.trim();
-  if (SAFARI_NATIVE_CODE_REGEXP.test(line))
+  if (SAFARI_NATIVE_CODE_REGEXP.test(line)) {
     return null;
-  if (line.includes(" > eval"))
-    line = line.replace(/ line (\d+)(?: > eval line \d+)* > eval:\d+:\d+/g, ":$1");
-  if (!line.includes("@") && !line.includes(":"))
+  }
+  if (line.includes(" > eval")) {
+    line = line.replace(
+      / line (\d+)(?: > eval line \d+)* > eval:\d+:\d+/g,
+      ":$1"
+    );
+  }
+  if (!line.includes("@") && !line.includes(":")) {
     return null;
-  const functionNameRegex = /((.*".+"[^@]*)?[^@]*)(?:@)/;
+  }
+  const functionNameRegex = /((.*".+"[^@]*)?[^@]*)(@)/;
   const matches = line.match(functionNameRegex);
   const functionName = matches && matches[1] ? matches[1] : void 0;
-  const [url, lineNumber, columnNumber] = extractLocation(line.replace(functionNameRegex, ""));
-  if (!url || !lineNumber || !columnNumber)
+  const [url, lineNumber, columnNumber] = extractLocation(
+    line.replace(functionNameRegex, "")
+  );
+  if (!url || !lineNumber || !columnNumber) {
     return null;
+  }
   return {
     file: url,
     method: functionName || "",
@@ -816,31 +835,40 @@ function parseSingleFFOrSafariStack(raw) {
 }
 function parseSingleStack(raw) {
   const line = raw.trim();
-  if (!CHROME_IE_STACK_REGEXP.test(line))
+  if (!CHROME_IE_STACK_REGEXP.test(line)) {
     return parseSingleFFOrSafariStack(line);
+  }
   return parseSingleV8Stack(line);
 }
 function parseSingleV8Stack(raw) {
   let line = raw.trim();
-  if (!CHROME_IE_STACK_REGEXP.test(line))
+  if (!CHROME_IE_STACK_REGEXP.test(line)) {
     return null;
-  if (line.includes("(eval "))
+  }
+  if (line.includes("(eval ")) {
     line = line.replace(/eval code/g, "eval").replace(/(\(eval at [^()]*)|(,.*$)/g, "");
+  }
   let sanitizedLine = line.replace(/^\s+/, "").replace(/\(eval code/g, "(").replace(/^.*?\s+/, "");
   const location = sanitizedLine.match(/ (\(.+\)$)/);
   sanitizedLine = location ? sanitizedLine.replace(location[0], "") : sanitizedLine;
-  const [url, lineNumber, columnNumber] = extractLocation(location ? location[1] : sanitizedLine);
+  const [url, lineNumber, columnNumber] = extractLocation(
+    location ? location[1] : sanitizedLine
+  );
   let method = location && sanitizedLine || "";
   let file = url && ["eval", "<anonymous>"].includes(url) ? void 0 : url;
-  if (!file || !lineNumber || !columnNumber)
+  if (!file || !lineNumber || !columnNumber) {
     return null;
-  if (method.startsWith("async "))
+  }
+  if (method.startsWith("async ")) {
     method = method.slice(6);
-  if (file.startsWith("file://"))
+  }
+  if (file.startsWith("file://")) {
     file = file.slice(7);
+  }
   file = resolve$2(file);
-  if (method)
+  if (method) {
     method = method.replace(/__vite_ssr_import_\d+__\./g, "");
+  }
   return {
     method,
     file,
@@ -851,17 +879,22 @@ 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)));
+  if (ignoreStackEntries.length) {
+    stacks = stacks.filter(
+      (stack2) => !ignoreStackEntries.some((p) => stack2.file.match(p))
+    );
+  }
   return stacks.map((stack2) => {
     var _a;
     const map = (_a = options.getSourceMap) == null ? void 0 : _a.call(options, stack2.file);
-    if (!map || typeof map !== "object" || !map.version)
+    if (!map || typeof map !== "object" || !map.version) {
       return stack2;
+    }
     const traceMap = new TraceMap(map);
     const { line, column } = originalPositionFor(traceMap, stack2);
-    if (line != null && column != null)
+    if (line != null && column != null) {
       return { ...stack2, line, column };
+    }
     return stack2;
   });
 }
@@ -872,14 +905,19 @@ function parseV8Stacktrace(stack) {
   return stack.split("\n").map((line) => parseSingleV8Stack(line)).filter(notNullish);
 }
 function parseErrorStacktrace(e, options = {}) {
-  if (!e || isPrimitive(e))
+  if (!e || isPrimitive(e)) {
     return [];
-  if (e.stacks)
+  }
+  if (e.stacks) {
     return e.stacks;
+  }
   const stackStr = e.stack || e.stackStr || "";
   let stackFrames = parseStacktrace(stackStr, options);
-  if (options.frameFilter)
-    stackFrames = stackFrames.filter((f) => options.frameFilter(e, f) !== false);
+  if (options.frameFilter) {
+    stackFrames = stackFrames.filter(
+      (f) => options.frameFilter(e, f) !== false
+    );
+  }
   e.stacks = stackFrames;
   return stackFrames;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/utils",
   "type": "module",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.11",
   "description": "Shared Vitest utility functions",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -47,6 +47,9 @@
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
+      "ast": [
+        "dist/ast.d.ts"
+      ],
       "source-map": [
         "dist/source-map.d.ts"
       ]
@@ -59,7 +62,7 @@
   "dependencies": {
     "diff-sequences": "^29.6.3",
     "estree-walker": "^3.0.3",
-    "loupe": "^3.1.0",
+    "loupe": "^3.1.1",
     "pretty-format": "^29.7.0"
   },
   "devDependencies": {