@vitest/snapshot 2.1.0-beta.5 → 2.1.0-beta.7

package/dist/index.d.ts

@@ -37,6 +37,7 @@ declare class SnapshotState {
     private _snapshotData;
     private _initialData;
     private _inlineSnapshots;
+    private _inlineSnapshotStacks;
     private _rawSnapshots;
     private _uncheckedKeys;
     private _snapshotFormat;

package/dist/index.js

@@ -501,74 +501,92 @@ for (let i = 0; i < chars.length; i++) {
     intToChar[i] = c;
     charToInt[c] = i;
 }
+function decodeInteger(reader, relative) {
+    let value = 0;
+    let shift = 0;
+    let integer = 0;
+    do {
+        const c = reader.next();
+        integer = charToInt[c];
+        value |= (integer & 31) << shift;
+        shift += 5;
+    } while (integer & 32);
+    const shouldNegate = value & 1;
+    value >>>= 1;
+    if (shouldNegate) {
+        value = -0x80000000 | -value;
+    }
+    return relative + value;
+}
+function hasMoreVlq(reader, max) {
+    if (reader.pos >= max)
+        return false;
+    return reader.peek() !== comma;
+}
+class StringReader {
+    constructor(buffer) {
+        this.pos = 0;
+        this.buffer = buffer;
+    }
+    next() {
+        return this.buffer.charCodeAt(this.pos++);
+    }
+    peek() {
+        return this.buffer.charCodeAt(this.pos);
+    }
+    indexOf(char) {
+        const { buffer, pos } = this;
+        const idx = buffer.indexOf(char, pos);
+        return idx === -1 ? buffer.length : idx;
+    }
+}
+
 function decode(mappings) {
-    const state = new Int32Array(5);
+    const { length } = mappings;
+    const reader = new StringReader(mappings);
     const decoded = [];
-    let index = 0;
+    let genColumn = 0;
+    let sourcesIndex = 0;
+    let sourceLine = 0;
+    let sourceColumn = 0;
+    let namesIndex = 0;
     do {
-        const semi = indexOf(mappings, index);
+        const semi = reader.indexOf(';');
         const line = [];
         let sorted = true;
         let lastCol = 0;
-        state[0] = 0;
-        for (let i = index; i < semi; i++) {
+        genColumn = 0;
+        while (reader.pos < semi) {
             let seg;
-            i = decodeInteger(mappings, i, state, 0); // genColumn
-            const col = state[0];
-            if (col < lastCol)
+            genColumn = decodeInteger(reader, genColumn);
+            if (genColumn < lastCol)
                 sorted = false;
-            lastCol = col;
-            if (hasMoreVlq(mappings, i, semi)) {
-                i = decodeInteger(mappings, i, state, 1); // sourcesIndex
-                i = decodeInteger(mappings, i, state, 2); // sourceLine
-                i = decodeInteger(mappings, i, state, 3); // sourceColumn
-                if (hasMoreVlq(mappings, i, semi)) {
-                    i = decodeInteger(mappings, i, state, 4); // namesIndex
-                    seg = [col, state[1], state[2], state[3], state[4]];
+            lastCol = genColumn;
+            if (hasMoreVlq(reader, semi)) {
+                sourcesIndex = decodeInteger(reader, sourcesIndex);
+                sourceLine = decodeInteger(reader, sourceLine);
+                sourceColumn = decodeInteger(reader, sourceColumn);
+                if (hasMoreVlq(reader, semi)) {
+                    namesIndex = decodeInteger(reader, namesIndex);
+                    seg = [genColumn, sourcesIndex, sourceLine, sourceColumn, namesIndex];
                 }
                 else {
-                    seg = [col, state[1], state[2], state[3]];
+                    seg = [genColumn, sourcesIndex, sourceLine, sourceColumn];
                 }
             }
             else {
-                seg = [col];
+                seg = [genColumn];
             }
             line.push(seg);
+            reader.pos++;
         }
         if (!sorted)
             sort(line);
         decoded.push(line);
-        index = semi + 1;
-    } while (index <= mappings.length);
+        reader.pos = semi + 1;
+    } while (reader.pos <= length);
     return decoded;
 }
-function indexOf(mappings, index) {
-    const idx = mappings.indexOf(';', index);
-    return idx === -1 ? mappings.length : idx;
-}
-function decodeInteger(mappings, pos, state, j) {
-    let value = 0;
-    let shift = 0;
-    let integer = 0;
-    do {
-        const c = mappings.charCodeAt(pos++);
-        integer = charToInt[c];
-        value |= (integer & 31) << shift;
-        shift += 5;
-    } while (integer & 32);
-    const shouldNegate = value & 1;
-    value >>>= 1;
-    if (shouldNegate) {
-        value = -0x80000000 | -value;
-    }
-    state[j] += value;
-    return pos;
-}
-function hasMoreVlq(mappings, i, length) {
-    if (i >= length)
-        return false;
-    return mappings.charCodeAt(i) !== comma;
-}
 function sort(line) {
     line.sort(sortComparator$1);
 }
@@ -1376,6 +1394,7 @@ class SnapshotState {
     this._snapshotData = data;
     this._dirty = dirty;
     this._inlineSnapshots = [];
+    this._inlineSnapshotStacks = [];
     this._rawSnapshots = [];
     this._uncheckedKeys = new Set(Object.keys(this._snapshotData));
     this._counters = /* @__PURE__ */ new Map();
@@ -1398,6 +1417,7 @@ class SnapshotState {
   _snapshotData;
   _initialData;
   _inlineSnapshots;
+  _inlineSnapshotStacks;
   _rawSnapshots;
   _uncheckedKeys;
   _snapshotFormat;
@@ -1440,28 +1460,11 @@ class SnapshotState {
     return stackIndex !== -1 ? stacks[stackIndex + 2] : null;
   }
   _addSnapshot(key, receivedSerialized, options) {
-    var _a, _b;
     this._dirty = true;
-    if (options.isInline) {
-      const error = options.error || new Error("snapshot");
-      const stacks = parseErrorStacktrace(
-        error,
-        { ignoreStackEntries: [] }
-      );
-      const _stack = this._inferInlineSnapshotStack(stacks);
-      if (!_stack) {
-        throw new Error(
-          `@vitest/snapshot: Couldn't infer stack frame for inline snapshot.
-${JSON.stringify(
-            stacks
-          )}`
-        );
-      }
-      const stack = ((_b = (_a = this.environment).processStackTrace) == null ? void 0 : _b.call(_a, _stack)) || _stack;
-      stack.column--;
+    if (options.stack) {
       this._inlineSnapshots.push({
         snapshot: receivedSerialized,
-        ...stack
+        ...options.stack
       });
     } else if (options.rawSnapshot) {
       this._rawSnapshots.push({
@@ -1537,6 +1540,7 @@ ${JSON.stringify(
     error,
     rawSnapshot
   }) {
+    var _a, _b;
     this._counters.set(testName, (this._counters.get(testName) || 0) + 1);
     const count = Number(this._counters.get(testName));
     if (!key) {
@@ -1562,6 +1566,29 @@ ${JSON.stringify(
     if (pass && !isInline && !rawSnapshot) {
       this._snapshotData[key] = receivedSerialized;
     }
+    let stack;
+    if (isInline) {
+      const stacks = parseErrorStacktrace(
+        error || new Error("snapshot"),
+        { ignoreStackEntries: [] }
+      );
+      const _stack = this._inferInlineSnapshotStack(stacks);
+      if (!_stack) {
+        throw new Error(
+          `@vitest/snapshot: Couldn't infer stack frame for inline snapshot.
+${JSON.stringify(
+            stacks
+          )}`
+        );
+      }
+      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.");
+      }
+      this._inlineSnapshotStacks.push(stack);
+    }
     if (hasSnapshot && this._updateSnapshot === "all" || (!hasSnapshot || !snapshotIsPersisted) && (this._updateSnapshot === "new" || this._updateSnapshot === "all")) {
       if (this._updateSnapshot === "all") {
         if (!pass) {
@@ -1571,8 +1598,7 @@ ${JSON.stringify(
             this.added++;
           }
           this._addSnapshot(key, receivedSerialized, {
-            error,
-            isInline,
+            stack,
             rawSnapshot
           });
         } else {
@@ -1580,8 +1606,7 @@ ${JSON.stringify(
         }
       } else {
         this._addSnapshot(key, receivedSerialized, {
-          error,
-          isInline,
+          stack,
           rawSnapshot
         });
         this.added++;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/snapshot",
   "type": "module",
-  "version": "2.1.0-beta.5",
+  "version": "2.1.0-beta.7",
   "description": "Vitest snapshot manager",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -40,12 +40,12 @@
   "dependencies": {
     "magic-string": "^0.30.11",
     "pathe": "^1.1.2",
-    "@vitest/pretty-format": "2.1.0-beta.5"
+    "@vitest/pretty-format": "2.1.0-beta.7"
   },
   "devDependencies": {
     "@types/natural-compare": "^1.4.3",
     "natural-compare": "^1.4.0",
-    "@vitest/utils": "2.1.0-beta.5"
+    "@vitest/utils": "2.1.0-beta.7"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",