@vitest/snapshot 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/index.js

@@ -310,7 +310,7 @@ function serialize(val, indent = 2, formatOverrides = {}) {
   );
 }
 function escapeBacktickString(str) {
-  return str.replace(/`|\\|\${/g, "\\$&");
+  return str.replace(/`|\\|\$\{/g, "\\$&");
 }
 function printBacktickString(str) {
   return `\`${escapeBacktickString(str)}\``;
@@ -338,7 +338,7 @@ ${snapshots.join("\n\n")}
 function prepareExpected(expected) {
   function findStartIndent() {
     var _a, _b;
-    const matchObject = /^( +)}\s+$/m.exec(expected || "");
+    const matchObject = /^( +)\}\s+$/m.exec(expected || "");
     const objectIndent = (_a = matchObject == null ? void 0 : matchObject[1]) == null ? void 0 : _a.length;
     if (objectIndent)
       return objectIndent;
@@ -348,7 +348,7 @@ function prepareExpected(expected) {
   const startIndent = findStartIndent();
   let expectedTrimmed = expected == null ? void 0 : expected.trim();
   if (startIndent) {
-    expectedTrimmed = expectedTrimmed == null ? void 0 : expectedTrimmed.replace(new RegExp(`^${" ".repeat(startIndent)}`, "gm"), "").replace(/ +}$/, "}");
+    expectedTrimmed = expectedTrimmed == null ? void 0 : expectedTrimmed.replace(new RegExp(`^${" ".repeat(startIndent)}`, "gm"), "").replace(/ +\}$/, "}");
   }
   return expectedTrimmed;
 }
@@ -945,8 +945,8 @@ function traceSegmentInternal(segments, memo, line, column, bias) {
     return index;
 }
 
-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\//,
@@ -958,7 +958,12 @@ const stackIgnorePatterns = [
   "/node_modules/chai/",
   "/node_modules/tinypool/",
   "/node_modules/tinyspy/",
+  // browser related deps
   "/deps/chai.js",
+  "/deps/vitest___chai.js",
+  "/deps/p-limit.js",
+  /node:\w+/,
+  /__vitest_test__/,
   /__vitest_browser__/
 ];
 function extractLocation(urlLike) {
@@ -974,7 +979,8 @@ function extractLocation(urlLike) {
     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];
 }
@@ -986,7 +992,7 @@ function parseSingleFFOrSafariStack(raw) {
     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, ""));
@@ -1079,7 +1085,7 @@ async function saveInlineSnapshots(environment, snapshots) {
       await environment.saveSnapshotFile(file, transformed);
   }));
 }
-const startObjectRegex = /(?:toMatchInlineSnapshot|toThrowErrorMatchingInlineSnapshot)\s*\(\s*(?:\/\*[\S\s]*\*\/\s*|\/\/.*\s+)*\s*({)/m;
+const startObjectRegex = /(?:toMatchInlineSnapshot|toThrowErrorMatchingInlineSnapshot)\s*\(\s*(?:\/\*[\s\S]*\*\/\s*|\/\/.*(?:[\n\r\u2028\u2029]\s*|[\t\v\f \xA0\u1680\u2000-\u200A\u202F\u205F\u3000\uFEFF]))*\{/;
 function replaceObjectSnap(code, s, index, newSnap) {
   let _code = code.slice(index);
   const startMatch = startObjectRegex.exec(_code);
@@ -1121,12 +1127,12 @@ function prepareSnapString(snap, source, index) {
   const isOneline = lines.length <= 1;
   const quote = "`";
   if (isOneline)
-    return `${quote}${lines.join("\n").replace(/`/g, "\\`").replace(/\${/g, "\\${")}${quote}`;
+    return `${quote}${lines.join("\n").replace(/`/g, "\\`").replace(/\$\{/g, "\\${")}${quote}`;
   return `${quote}
-${lines.map((i) => i ? indentNext + i : "").join("\n").replace(/`/g, "\\`").replace(/\${/g, "\\${")}
+${lines.map((i) => i ? indentNext + i : "").join("\n").replace(/`/g, "\\`").replace(/\$\{/g, "\\${")}
 ${indent}${quote}`;
 }
-const startRegex = /(?:toMatchInlineSnapshot|toThrowErrorMatchingInlineSnapshot)\s*\(\s*(?:\/\*[\S\s]*\*\/\s*|\/\/.*\s+)*\s*[\w_$]*(['"`\)])/m;
+const startRegex = /(?:toMatchInlineSnapshot|toThrowErrorMatchingInlineSnapshot)\s*\(\s*(?:\/\*[\s\S]*\*\/\s*|\/\/.*(?:[\n\r\u2028\u2029]\s*|[\t\v\f \xA0\u1680\u2000-\u200A\u202F\u205F\u3000\uFEFF]))*[\w$]*(['"`)])/;
 function replaceInlineSnap(code, s, index, newSnap) {
   const codeStartingAtIndex = code.slice(index);
   const startMatch = startRegex.exec(codeStartingAtIndex);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/snapshot",
   "type": "module",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "description": "Vitest snapshot manager",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@types/natural-compare": "^1.4.3",
     "natural-compare": "^1.4.0",
-    "@vitest/utils": "2.0.0-beta.2"
+    "@vitest/utils": "2.0.0-beta.4"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",