vitest-plugin-vis 2.3.0 → 2.3.1

package/esm/client/ctx.d.ts

@@ -1,6 +1,6 @@
 export declare const ctx: {
     autoEnabled: boolean | undefined;
-    getCurrentTest: () => import("../index.ts").CurrentTest;
+    getCurrentTest: () => import("./vitest_suite_proxy.ts").CurrentTest;
     getCurrentSuite: () => import("vitest").SuiteCollector<object>;
     __test__reset(): void;
 };

package/esm/client/image_snapshot_matcher.d.ts

@@ -1,7 +1,8 @@
 import type { ImageSnapshotNextIndexCommand } from '../commands.ts';
 import type { PrepareImageSnapshotComparisonCommand } from '../server/commands/prepare_image_snapshot_comparison.ts';
 import type { WriteImageSnapshotCommand } from '../server/commands/write_image_snapshot.ts';
-import type { CurrentTest, ToMatchImageSnapshotOptions } from '../shared/types.ts';
+import type { ToMatchImageSnapshotOptions } from '../shared/types.ts';
+import type { CurrentTest } from './vitest_suite_proxy.ts';
 export declare function imageSnapshotMatcher(commands: PrepareImageSnapshotComparisonCommand & WriteImageSnapshotCommand & ImageSnapshotNextIndexCommand): (test: CurrentTest & {}, subject: any, options?: ToMatchImageSnapshotOptions<any>) => Promise<void>;
 /**
  * @deprecated internalized. Use `matchImageSnapshot` directly instead.

package/esm/client/image_snapshot_matcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image_snapshot_matcher.d.ts","sourceRoot":"","sources":["../../src/client/image_snapshot_matcher.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAA;AACnE,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,yDAAyD,CAAA;AACpH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAA;AAG3F,OAAO,KAAK,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAA;AAQlF,wBAAgB,oBAAoB,CACnC,QAAQ,EAAE,qCAAqC,GAAG,yBAAyB,GAAG,6BAA6B,UAGpG,WAAW,GAAG,EAAE,WACb,GAAG,YACF,2BAA2B,CAAC,GAAG,CAAC,mBAoE3C;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,GAAG,OAOrD"}
+{"version":3,"file":"image_snapshot_matcher.d.ts","sourceRoot":"","sources":["../../src/client/image_snapshot_matcher.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAA;AACnE,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,yDAAyD,CAAA;AACpH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAA;AAG3F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAA;AAOrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAE1D,wBAAgB,oBAAoB,CACnC,QAAQ,EAAE,qCAAqC,GAAG,yBAAyB,GAAG,6BAA6B,UAGpG,WAAW,GAAG,EAAE,WACb,GAAG,YACF,2BAA2B,CAAC,GAAG,CAAC,mBAqE3C;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,GAAG,OAOrD"}

package/esm/client/image_snapshot_matcher.js

@@ -1,3 +1,4 @@
+import { isA } from '@vitest/expect';
 import dedent from 'dedent';
 import { resolve } from 'pathe';
 import { isBase64String } from "../shared/base64.js";
@@ -12,7 +13,7 @@ export function imageSnapshotMatcher(commands) {
     return async function matchImageSnapshot(test, subject, options) {
         const isAutoSnapshot = !!test.meta.vis?.isAutoSnapshot;
         const taskId = toTaskId(test);
-        const info = await commands.prepareImageSnapshotComparison(taskId, parseImageSnapshotSubject(subject), options?.customizeSnapshotId
+        const info = await commands.prepareImageSnapshotComparison(taskId, parseImageSnapshotSubject(subject), isAutoSnapshot, options?.customizeSnapshotId
             ? await parseImageSnapshotOptions(commands, taskId, isAutoSnapshot, options)
             : options);
         if (!info)

package/esm/client/page/has_image_snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"has_image_snapshot.d.ts","sourceRoot":"","sources":["../../../src/client/page/has_image_snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAY,MAAM,yBAAyB,CAAA;AACpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAInE,MAAM,WAAW,sBAAsB;IACtC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CACnG;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,SAAS,oBAyB/F"}
+{"version":3,"file":"has_image_snapshot.d.ts","sourceRoot":"","sources":["../../../src/client/page/has_image_snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAY,MAAM,yBAAyB,CAAA;AACpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAInE,MAAM,WAAW,sBAAsB;IACtC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CACnG;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,SAAS,oBA2B/F"}

package/esm/client/page/has_image_snapshot.js

@@ -14,10 +14,11 @@ export function hasImageSnapshot(options) {
             "concurrent tests run at the same time in the same iframe and affect each other's environment. ");
     }
     const taskId = toTaskId(test);
+    const isAutoSnapshot = !!test.meta.vis?.isAutoSnapshot;
     if (options?.customizeSnapshotId) {
         return commands
             .imageSnapshotNextIndex(taskId)
-            .then((index) => commands.hasImageSnapshot(taskId, options.customizeSnapshotId({ id: taskId, index, isAutoSnapshot: !!test.meta.vis?.isAutoSnapshot })));
+            .then((index) => commands.hasImageSnapshot(taskId, options.customizeSnapshotId({ id: taskId, index, isAutoSnapshot }), isAutoSnapshot));
     }
-    return commands.hasImageSnapshot(taskId);
+    return commands.hasImageSnapshot(taskId, undefined, isAutoSnapshot);
 }

package/esm/client/vitest_suite_proxy.d.ts

@@ -1,4 +1,14 @@
-import type { CurrentTest } from '../shared/types.ts';
+import type { NAME } from '../shared/constants.ts';
+import type { SnapshotMeta } from '../shared/types.ts';
+declare let vitestSuite: Awaited<typeof import('vitest/suite')>;
+export type CurrentTest = ReturnType<typeof vitestSuite.getCurrentTest> & {
+    meta: {
+        [NAME]?: SnapshotMeta<'pixel' | 'ssim'> & {
+            isAutoSnapshot?: boolean | undefined;
+        };
+    };
+};
 export declare const getCurrentTest: () => CurrentTest;
 export declare const getCurrentSuite: () => import("vitest").SuiteCollector<object>;
+export {};
 //# sourceMappingURL=vitest_suite_proxy.d.ts.map

package/esm/client/vitest_suite_proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vitest_suite_proxy.d.ts","sourceRoot":"","sources":["../../src/client/vitest_suite_proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAUrD,eAAO,MAAM,cAAc,QAA0C,WAAW,CAAA;AAChF,eAAO,MAAM,eAAe,+CAAuC,CAAA"}
+{"version":3,"file":"vitest_suite_proxy.d.ts","sourceRoot":"","sources":["../../src/client/vitest_suite_proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,QAAA,IAAI,WAAW,EAAE,OAAO,CAAC,cAAc,cAAc,CAAC,CAAC,CAAA;AAQvD,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,cAAc,CAAC,GAAG;IACzE,IAAI,EAAE;QAAE,CAAC,IAAI,CAAC,CAAC,EAAE,YAAY,CAAC,OAAO,GAAG,MAAM,CAAC,GAAG;YAAE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;SAAE,CAAA;KAAE,CAAA;CAC5F,CAAA;AAED,eAAO,MAAM,cAAc,QAA0C,WAAW,CAAA;AAChF,eAAO,MAAM,eAAe,+CAAuC,CAAA"}

package/esm/config/vis.d.ts

@@ -15,9 +15,9 @@ export declare function vis<M extends ComparisonMethod = 'pixel'>(options?: VisO
                 commands: {
                     setupVisSuite: import("vitest/node").BrowserCommand<[]>;
                     imageSnapshotNextIndex: import("vitest/node").BrowserCommand<[taskId: string]>;
-                    hasImageSnapshot: import("vitest/node").BrowserCommand<[taskId: string, snapshotId?: string | undefined]>;
-                    matchImageSnapshot: import("vitest/node").BrowserCommand<[taskId: string, subject: string, options?: import("../commands.ts").MatchImageSnapshotOptions | undefined]>;
-                    prepareImageSnapshotComparison: import("vitest/node").BrowserCommand<[taskId: string, snapshotId: string, options?: import("../commands.ts").MatchImageSnapshotOptions | undefined]>;
+                    hasImageSnapshot: import("vitest/node").BrowserCommand<[taskId: string, snapshotId: string | undefined, isAutoSnapshot: boolean]>;
+                    matchImageSnapshot: import("vitest/node").BrowserCommand<[taskId: string, subject: string, isAutoSnapshot: boolean, options?: import("../commands.ts").MatchImageSnapshotOptions | undefined]>;
+                    prepareImageSnapshotComparison: import("vitest/node").BrowserCommand<[taskId: string, snapshotId: string, isAutoSnapshot: boolean, options?: import("../commands.ts").MatchImageSnapshotOptions | undefined]>;
                     writeImageSnapshot: import("vitest/node").BrowserCommand<[relativeFilePath: string, imageBase64: string]>;
                 };
             };

package/esm/server/commands/extend.d.ts

@@ -11,9 +11,9 @@ declare module '@vitest/browser/context' {
 export declare const commands: {
     setupVisSuite: import("vitest/node").BrowserCommand<[]>;
     imageSnapshotNextIndex: import("vitest/node").BrowserCommand<[taskId: string]>;
-    hasImageSnapshot: import("vitest/node").BrowserCommand<[taskId: string, snapshotId?: string | undefined]>;
-    matchImageSnapshot: import("vitest/node").BrowserCommand<[taskId: string, subject: string, options?: import("./match_image_snapshot.ts").MatchImageSnapshotOptions | undefined]>;
-    prepareImageSnapshotComparison: import("vitest/node").BrowserCommand<[taskId: string, snapshotId: string, options?: import("./match_image_snapshot.ts").MatchImageSnapshotOptions | undefined]>;
+    hasImageSnapshot: import("vitest/node").BrowserCommand<[taskId: string, snapshotId: string | undefined, isAutoSnapshot: boolean]>;
+    matchImageSnapshot: import("vitest/node").BrowserCommand<[taskId: string, subject: string, isAutoSnapshot: boolean, options?: import("./match_image_snapshot.ts").MatchImageSnapshotOptions | undefined]>;
+    prepareImageSnapshotComparison: import("vitest/node").BrowserCommand<[taskId: string, snapshotId: string, isAutoSnapshot: boolean, options?: import("./match_image_snapshot.ts").MatchImageSnapshotOptions | undefined]>;
     writeImageSnapshot: import("vitest/node").BrowserCommand<[relativeFilePath: string, imageBase64: string]>;
 };
 //# sourceMappingURL=extend.d.ts.map

package/esm/server/commands/has_image_snapshot.d.ts

@@ -1,6 +1,10 @@
 import type { BrowserCommand } from 'vitest/node';
 export interface HasImageSnapshotCommand {
-    hasImageSnapshot(taskId: string, snapshotId?: string | undefined): Promise<boolean>;
+    hasImageSnapshot(taskId: string, snapshotId: string | undefined, isAutoSnapshot: boolean): Promise<boolean>;
 }
-export declare const hasImageSnapshot: BrowserCommand<[taskId: string, snapshotId?: string | undefined]>;
+export declare const hasImageSnapshot: BrowserCommand<[
+    taskId: string,
+    snapshotId: string | undefined,
+    isAutoSnapshot: boolean
+]>;
 //# sourceMappingURL=has_image_snapshot.d.ts.map

package/esm/server/commands/has_image_snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"has_image_snapshot.d.ts","sourceRoot":"","sources":["../../../src/server/commands/has_image_snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAIjD,MAAM,WAAW,uBAAuB;IACvC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CACnF;AAED,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,CAQ9F,CAAA"}
+{"version":3,"file":"has_image_snapshot.d.ts","sourceRoot":"","sources":["../../../src/server/commands/has_image_snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAIjD,MAAM,WAAW,uBAAuB;IACvC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC3G;AAED,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAC5C;IAAC,MAAM,EAAE,MAAM;IAAE,UAAU,EAAE,MAAM,GAAG,SAAS;IAAE,cAAc,EAAE,OAAO;CAAC,CAKzE,CAAA"}

package/esm/server/commands/has_image_snapshot.js

@@ -1,6 +1,6 @@
 import { visContext } from "../vis_context.js";
 import { assertTestPathDefined } from "./_assertions.js";
-export const hasImageSnapshot = async (context, taskId, snapshotId) => {
+export const hasImageSnapshot = async (context, taskId, snapshotId, isAutoSnapshot) => {
     assertTestPathDefined(context, 'hasImageSnapshot');
-    return visContext.hasImageSnapshot(context.testPath, taskId, snapshotId);
+    return visContext.hasImageSnapshot(context.testPath, taskId, snapshotId, isAutoSnapshot);
 };

package/esm/server/commands/match_image_snapshot.d.ts

@@ -1,7 +1,7 @@
 import type { BrowserCommand } from 'vitest/node';
 import type { ImageSnapshotCompareOptions, ImageSnapshotIdOptions, ImageSnapshotTimeoutOptions } from '../../shared/types.ts';
 export interface MatchImageSnapshotCommand {
-    matchImageSnapshot: (taskId: string | undefined, subject: string, options?: MatchImageSnapshotOptions | undefined) => Promise<void>;
+    matchImageSnapshot: (taskId: string | undefined, subject: string, isAutoSnapshot: boolean, options?: MatchImageSnapshotOptions | undefined) => Promise<void>;
 }
 export type MatchImageSnapshotOptions = ImageSnapshotTimeoutOptions & ImageSnapshotIdOptions & ImageSnapshotCompareOptions<any> & {
     /**
@@ -12,6 +12,7 @@ export type MatchImageSnapshotOptions = ImageSnapshotTimeoutOptions & ImageSnaps
 export declare const matchImageSnapshot: BrowserCommand<[
     taskId: string,
     subject: string,
+    isAutoSnapshot: boolean,
     options?: MatchImageSnapshotOptions | undefined
 ]>;
 //# sourceMappingURL=match_image_snapshot.d.ts.map

package/esm/server/commands/match_image_snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"match_image_snapshot.d.ts","sourceRoot":"","sources":["../../../src/server/commands/match_image_snapshot.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAKjD,OAAO,KAAK,EACX,2BAA2B,EAC3B,sBAAsB,EACtB,2BAA2B,EAC3B,MAAM,uBAAuB,CAAA;AAM9B,MAAM,WAAW,yBAAyB;IACzC,kBAAkB,EAAE,CACnB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,yBAAyB,GAAG,SAAS,KAC3C,OAAO,CAAC,IAAI,CAAC,CAAA;CAClB;AAED,MAAM,MAAM,yBAAyB,GAAG,2BAA2B,GAClE,sBAAsB,GACtB,2BAA2B,CAAC,GAAG,CAAC,GAAG;IAClC;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC,CAAA;AAEF,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAC9C;IAAC,MAAM,EAAE,MAAM;IAAE,OAAO,EAAE,MAAM;IAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,SAAS;CAAC,CAuElF,CAAA"}
+{"version":3,"file":"match_image_snapshot.d.ts","sourceRoot":"","sources":["../../../src/server/commands/match_image_snapshot.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAKjD,OAAO,KAAK,EACX,2BAA2B,EAC3B,sBAAsB,EACtB,2BAA2B,EAC3B,MAAM,uBAAuB,CAAA;AAM9B,MAAM,WAAW,yBAAyB;IACzC,kBAAkB,EAAE,CACnB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,OAAO,EACvB,OAAO,CAAC,EAAE,yBAAyB,GAAG,SAAS,KAC3C,OAAO,CAAC,IAAI,CAAC,CAAA;CAClB;AAED,MAAM,MAAM,yBAAyB,GAAG,2BAA2B,GAClE,sBAAsB,GACtB,2BAA2B,CAAC,GAAG,CAAC,GAAG;IAClC;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC,CAAA;AAEF,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAC9C;IAAC,MAAM,EAAE,MAAM;IAAE,OAAO,EAAE,MAAM;IAAE,cAAc,EAAE,OAAO;IAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,SAAS;CAAC,CAuE3G,CAAA"}

package/esm/server/commands/match_image_snapshot.js

@@ -9,13 +9,13 @@ import { file } from "../file.js";
 import { takeSnapshot, takeSnapshotByBrowser, writeSnapshot, writeSnapshotBuffer } from "../snapshot.js";
 import { visContext } from "../vis_context.js";
 import { assertTestPathDefined } from "./_assertions.js";
-export const matchImageSnapshot = async (context, taskId, subject, options) => {
+export const matchImageSnapshot = async (context, taskId, subject, isAutoSnapshot, options) => {
     assertTestPathDefined(context, 'matchImageSnapshot');
     // vitest:browser passes in `null` when not defined
     if (!options)
         options = {};
     options.timeout = options.timeout ?? 30000;
-    const info = visContext.getSnapshotInfo(context.testPath, taskId, options);
+    const info = visContext.getSnapshotInfo(context.testPath, taskId, isAutoSnapshot, options);
     const baselineBuffer = await file.tryReadFile(info.baselinePath);
     if (!baselineBuffer) {
         if (isBase64String(subject)) {

package/esm/server/commands/prepare_image_snapshot_comparison.d.ts

@@ -10,11 +10,12 @@ type ImageSnapshotComparisonInfo = {
     result: string;
 } & ImageSnapshotTimeoutOptions & FailureThresholdOptions & (SsimComparisonOptions | PixelComparisonOptions);
 export interface PrepareImageSnapshotComparisonCommand {
-    prepareImageSnapshotComparison: (taskId: string | undefined, subject: string, options?: MatchImageSnapshotOptions | undefined) => Promise<ImageSnapshotComparisonInfo | undefined>;
+    prepareImageSnapshotComparison: (taskId: string | undefined, subject: string, isAutoSnapshot: boolean, options?: MatchImageSnapshotOptions | undefined) => Promise<ImageSnapshotComparisonInfo | undefined>;
 }
 export declare const prepareImageSnapshotComparison: BrowserCommand<[
     taskId: string,
     snapshotId: string,
+    isAutoSnapshot: boolean,
     options?: MatchImageSnapshotOptions | undefined
 ]>;
 export {};

package/esm/server/commands/prepare_image_snapshot_comparison.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare_image_snapshot_comparison.d.ts","sourceRoot":"","sources":["../../../src/server/commands/prepare_image_snapshot_comparison.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD,OAAO,KAAK,EACX,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,qBAAqB,EACrB,MAAM,uBAAuB,CAAA;AAK9B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAA;AAE1E,KAAK,2BAA2B,GAAG;IAClC,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACd,GAAG,2BAA2B,GAC9B,uBAAuB,GACvB,CAAC,qBAAqB,GAAG,sBAAsB,CAAC,CAAA;AAEjD,MAAM,WAAW,qCAAqC;IACrD,8BAA8B,EAAE,CAC/B,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,yBAAyB,GAAG,SAAS,KAC3C,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAAA;CACrD;AAED,eAAO,MAAM,8BAA8B,EAAE,cAAc,CAC1D;IAAC,MAAM,EAAE,MAAM;IAAE,UAAU,EAAE,MAAM;IAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,SAAS;CAAC,CA0BrF,CAAA"}
+{"version":3,"file":"prepare_image_snapshot_comparison.d.ts","sourceRoot":"","sources":["../../../src/server/commands/prepare_image_snapshot_comparison.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD,OAAO,KAAK,EACX,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,qBAAqB,EACrB,MAAM,uBAAuB,CAAA;AAK9B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAA;AAE1E,KAAK,2BAA2B,GAAG;IAClC,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACd,GAAG,2BAA2B,GAC9B,uBAAuB,GACvB,CAAC,qBAAqB,GAAG,sBAAsB,CAAC,CAAA;AAEjD,MAAM,WAAW,qCAAqC;IACrD,8BAA8B,EAAE,CAC/B,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,OAAO,EACvB,OAAO,CAAC,EAAE,yBAAyB,GAAG,SAAS,KAC3C,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAAA;CACrD;AAED,eAAO,MAAM,8BAA8B,EAAE,cAAc,CAC1D;IAAC,MAAM,EAAE,MAAM;IAAE,UAAU,EAAE,MAAM;IAAE,cAAc,EAAE,OAAO;IAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,SAAS;CAAC,CA0B9G,CAAA"}

package/esm/server/commands/prepare_image_snapshot_comparison.js

@@ -3,13 +3,13 @@ import { file } from "../file.js";
 import { takeSnapshot, takeSnapshotByBrowser, writeSnapshot } from "../snapshot.js";
 import { visContext } from "../vis_context.js";
 import { assertTestPathDefined } from "./_assertions.js";
-export const prepareImageSnapshotComparison = async (context, taskId, subject, options) => {
+export const prepareImageSnapshotComparison = async (context, taskId, subject, isAutoSnapshot, options) => {
     assertTestPathDefined(context, 'prepareImageSnapshotComparison');
     // vitest:browser passes in `null` when not defined
     if (!options)
         options = {};
     options.timeout = options.timeout ?? 30000;
-    const info = visContext.getSnapshotInfo(context.testPath, taskId, options);
+    const info = visContext.getSnapshotInfo(context.testPath, taskId, isAutoSnapshot, options);
     const baselineBuffer = await file.tryReadFile(info.baselinePath);
     if (!baselineBuffer) {
         if (isBase64String(subject)) {

package/esm/server/vis_context.d.ts

@@ -4,7 +4,7 @@ export declare const visContext: {
     __test__reset(): void;
     __test__getState(): import("./vis_context.types.ts").VisState;
     setupSuite(context: import("./vis_context.types.ts").PartialBrowserCommandContext): Promise<import("type-plus").Pick._<import("./vis_context.types.ts").VisState, "subjectDataTestId">>;
-    getSnapshotInfo(testPath: string, name: string, options?: {
+    getSnapshotInfo(testPath: string, name: string, isAutoSnapshot: boolean, options?: {
         snapshotFileId?: string | undefined;
     }): {
         baselinePath: string;
@@ -34,13 +34,13 @@ export declare const visContext: {
         } | undefined;
     };
     getTaskCount(testPath: string, taskId: string): number;
-    hasImageSnapshot(testPath: string, taskId: string, snapshotFileId: string | undefined): Promise<boolean>;
+    hasImageSnapshot(testPath: string, taskId: string, snapshotFileId: string | undefined, isAutoSnapshot: boolean): Promise<boolean>;
     getSnapshotFilename(info: {
         taskId: string;
         task: {
             count: number;
         };
-    }, snapshotFileId: string | undefined): string;
+    }, snapshotFileId: string | undefined, isAutoSnapshot: boolean): string;
     getSuiteInfo(testPath: string, taskId: string): {
         suiteId: string;
         taskId: string;

package/esm/server/vis_context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vis_context.d.ts","sourceRoot":"","sources":["../../src/server/vis_context.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU;;;;;;;sBACikD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAD7iD,CAAA"}
+{"version":3,"file":"vis_context.d.ts","sourceRoot":"","sources":["../../src/server/vis_context.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU;;;;;;;sBACmgD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAD/+C,CAAA"}

package/esm/server/vis_context.logic.d.ts

@@ -11,7 +11,7 @@ export declare function createVisContext(): {
      * It needs to make sure there is no race condition between the test files.
      */
     setupSuite(context: PartialBrowserCommandContext): Promise<import("type-plus").Pick._<VisState, "subjectDataTestId">>;
-    getSnapshotInfo(testPath: string, name: string, options?: {
+    getSnapshotInfo(testPath: string, name: string, isAutoSnapshot: boolean, options?: {
         snapshotFileId?: string | undefined;
     }): {
         baselinePath: string;
@@ -41,13 +41,13 @@ export declare function createVisContext(): {
         } | undefined;
     };
     getTaskCount(testPath: string, taskId: string): number;
-    hasImageSnapshot(testPath: string, taskId: string, snapshotFileId: string | undefined): Promise<boolean>;
+    hasImageSnapshot(testPath: string, taskId: string, snapshotFileId: string | undefined, isAutoSnapshot: boolean): Promise<boolean>;
     getSnapshotFilename(info: {
         taskId: string;
         task: {
             count: number;
         };
-    }, snapshotFileId: string | undefined): string;
+    }, snapshotFileId: string | undefined, isAutoSnapshot: boolean): string;
     getSuiteInfo(testPath: string, taskId: string): {
         suiteId: string;
         taskId: string;

package/esm/server/vis_context.logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vis_context.logic.d.ts","sourceRoot":"","sources":["../../src/server/vis_context.logic.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAMpD,OAAO,KAAK,EAAE,4BAA4B,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAEpF,wBAAgB,gBAAgB;eAMnB,CAAC,SAAS,OAAO,GAAG,MAAM,YAAW,UAAU,CAAC,CAAC,CAAC;;;;IAY7D;;;;OAIG;wBACuB,4BAA4B;8BAa5B,MAAM,QAAQ,MAAM,YAAY;QAAE,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;2BAkB1E,MAAM,UAAU,MAAM;+BAGlB,MAAM,UAAU,MAAM,kBAAkB,MAAM,GAAG,SAAS;8BAI3D;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,kBAAkB,MAAM,GAAG,SAAS;2BAWlF,MAAM,UAAU,MAAM;;;;;;;;;;EAe9C;AAyBD,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,0BAA0B,CAAC;;;;;;;;EAWnH;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,0BAA0B,CAAC,UAElH"}
+{"version":3,"file":"vis_context.logic.d.ts","sourceRoot":"","sources":["../../src/server/vis_context.logic.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAKpD,OAAO,KAAK,EAAE,4BAA4B,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAEpF,wBAAgB,gBAAgB;eAMnB,CAAC,SAAS,OAAO,GAAG,MAAM,YAAW,UAAU,CAAC,CAAC,CAAC;;;;IAY7D;;;;OAIG;wBACuB,4BAA4B;8BAc3C,MAAM,QACV,MAAM,kBACI,OAAO,YACb;QAAE,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;2BAmB3B,MAAM,UAAU,MAAM;+BAGlB,MAAM,UAAU,MAAM,kBAAkB,MAAM,GAAG,SAAS,kBAAkB,OAAO;8BAKvG;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,kBAEjC,MAAM,GAAG,SAAS,kBAClB,OAAO;2BAUD,MAAM,UAAU,MAAM;;;;;;;;;;EAe9C;AAyBD,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,0BAA0B,CAAC;;;;;;;;EAWnH;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,0BAA0B,CAAC,UAElH"}

package/esm/server/vis_context.logic.js

@@ -1,6 +1,5 @@
 import { join, relative } from 'pathe';
 import { pick } from 'type-plus';
-import { getCurrentTest } from 'vitest/suite';
 import { BASELINE_DIR, DIFF_DIR, RESULT_DIR } from "../shared/constants.js";
 import { file } from "./file.js";
 import { getSnapshotSubpath, resolveSnapshotRootDir } from "./snapshot_path.js";
@@ -40,10 +39,10 @@ export function createVisContext() {
             await Promise.allSettled([ctx.rimraf(suite.diffDir), ctx.rimraf(suite.resultDir)]);
             return pick(state, 'subjectDataTestId');
         },
-        getSnapshotInfo(testPath, name, options) {
-            const info = context.getSuiteInfo(testPath, name);
-            const snapshotFilename = context.getSnapshotFilename(info, options?.snapshotFileId);
-            const { baselineDir, resultDir, diffDir, task } = info;
+        getSnapshotInfo(testPath, name, isAutoSnapshot, options) {
+            const suiteInfo = context.getSuiteInfo(testPath, name);
+            const snapshotFilename = context.getSnapshotFilename(suiteInfo, options?.snapshotFileId, isAutoSnapshot);
+            const { baselineDir, resultDir, diffDir, task } = suiteInfo;
             task.count = task.count + 1;
             const baselinePath = join(baselineDir, snapshotFilename);
             const resultPath = join(resultDir, snapshotFilename);
@@ -58,15 +57,13 @@ export function createVisContext() {
         getTaskCount(testPath, taskId) {
             return context.getSuiteInfo(testPath, taskId).task.count;
         },
-        hasImageSnapshot(testPath, taskId, snapshotFileId) {
+        hasImageSnapshot(testPath, taskId, snapshotFileId, isAutoSnapshot) {
             const info = context.getSuiteInfo(testPath, taskId);
-            return file.existFile(join(info.baselineDir, context.getSnapshotFilename(info, snapshotFileId)));
+            return file.existFile(join(info.baselineDir, context.getSnapshotFilename(info, snapshotFileId, isAutoSnapshot)));
         },
-        getSnapshotFilename(info, snapshotFileId) {
+        getSnapshotFilename(info, snapshotFileId, isAutoSnapshot) {
             if (snapshotFileId)
                 return `${snapshotFileId}.png`;
-            const test = getCurrentTest();
-            const isAutoSnapshot = !!test?.meta.vis?.isAutoSnapshot;
             const customizeSnapshotId = visOptions.customizeSnapshotId ?? (({ id, index }) => `${id}-${index}`);
             return `${customizeSnapshotId({
                 id: info.taskId,

package/esm/shared/types.d.ts

@@ -1,7 +1,5 @@
 import type pixelMatch from 'pixelmatch';
 import type { Options as SsimOptions } from 'ssim.js';
-import type { getCurrentTest } from 'vitest/suite';
-import type { NAME } from './constants.ts';
 export interface ImageSnapshotTimeoutOptions {
     /**
      * Timeout for taking the snapshot.
@@ -73,11 +71,4 @@ export type SnapshotMeta<M extends ComparisonMethod> = ToMatchImageSnapshotOptio
     enable?: boolean | undefined;
     [key: string]: unknown;
 };
-export type CurrentTest = ReturnType<typeof getCurrentTest> & {
-    meta: {
-        [NAME]?: SnapshotMeta<'pixel' | 'ssim'> & {
-            isAutoSnapshot?: boolean | undefined;
-        };
-    };
-};
 //# sourceMappingURL=types.d.ts.map

package/esm/shared/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,SAAS,CAAA;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAE1C,MAAM,WAAW,2BAA2B;IAC3C;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACtC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE;QAC/B,EAAE,EAAE,MAAM,CAAA;QACV,KAAK,EAAE,MAAM,CAAA;QACb,cAAc,EAAE,OAAO,CAAA;KACvB,KAAK,MAAM,CAAA;CACZ;AAED,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,MAAM,CAAA;AAE/C,MAAM,MAAM,uBAAuB,GAAG;IACrC;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAA;IACtD;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACrC,CAAA;AAED,MAAM,MAAM,qBAAqB,CAAC,CAAC,GAAG,MAAM,IAAI;IAC/C,gBAAgB,EAAE,CAAC,CAAA;IACnB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,CAAA;CAC9C,CAAA;AACD,MAAM,MAAM,sBAAsB,CAAC,CAAC,GAAG,OAAO,IAAI;IACjD,gBAAgB,CAAC,EAAE,CAAC,GAAG,SAAS,CAAA;IAChC;;OAEG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;CAC1D,CAAA;AAED,MAAM,MAAM,2BAA2B,CAAC,CAAC,SAAS,gBAAgB,GAAG,OAAO,IAAI,CAAC,CAAC,SAAS,MAAM,GAC9F,qBAAqB,CAAC,CAAC,CAAC,GACxB,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAC5B,uBAAuB,CAAA;AAExB,MAAM,MAAM,mBAAmB,GAAG;IACjC;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACtC,CAAA;AACD,MAAM,MAAM,2BAA2B,CAAC,CAAC,SAAS,gBAAgB,GAAG,OAAO,IAAI,2BAA2B,GAC1G,sBAAsB,GACtB,2BAA2B,CAAC,CAAC,CAAC,GAAG;IAChC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAClC,CAAA;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,gBAAgB,IAAI,2BAA2B,CAAC,CAAC,CAAC,GACpF,mBAAmB,GAAG;IACrB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACtB,CAAA;AAEF,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,GAAG;IAC7D,IAAI,EAAE;QAAE,CAAC,IAAI,CAAC,CAAC,EAAE,YAAY,CAAC,OAAO,GAAG,MAAM,CAAC,GAAG;YAAE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;SAAE,CAAA;KAAE,CAAA;CAC5F,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,SAAS,CAAA;AAIrD,MAAM,WAAW,2BAA2B;IAC3C;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACtC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE;QAC/B,EAAE,EAAE,MAAM,CAAA;QACV,KAAK,EAAE,MAAM,CAAA;QACb,cAAc,EAAE,OAAO,CAAA;KACvB,KAAK,MAAM,CAAA;CACZ;AAED,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,MAAM,CAAA;AAE/C,MAAM,MAAM,uBAAuB,GAAG;IACrC;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAA;IACtD;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACrC,CAAA;AAED,MAAM,MAAM,qBAAqB,CAAC,CAAC,GAAG,MAAM,IAAI;IAC/C,gBAAgB,EAAE,CAAC,CAAA;IACnB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,CAAA;CAC9C,CAAA;AACD,MAAM,MAAM,sBAAsB,CAAC,CAAC,GAAG,OAAO,IAAI;IACjD,gBAAgB,CAAC,EAAE,CAAC,GAAG,SAAS,CAAA;IAChC;;OAEG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;CAC1D,CAAA;AAED,MAAM,MAAM,2BAA2B,CAAC,CAAC,SAAS,gBAAgB,GAAG,OAAO,IAAI,CAAC,CAAC,SAAS,MAAM,GAC9F,qBAAqB,CAAC,CAAC,CAAC,GACxB,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAC5B,uBAAuB,CAAA;AAExB,MAAM,MAAM,mBAAmB,GAAG;IACjC;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACtC,CAAA;AACD,MAAM,MAAM,2BAA2B,CAAC,CAAC,SAAS,gBAAgB,GAAG,OAAO,IAAI,2BAA2B,GAC1G,sBAAsB,GACtB,2BAA2B,CAAC,CAAC,CAAC,GAAG;IAChC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAClC,CAAA;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,gBAAgB,IAAI,2BAA2B,CAAC,CAAC,CAAC,GACpF,mBAAmB,GAAG;IACrB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACtB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest-plugin-vis",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Vitest visual testing plugin",
   "keywords": [
     "image-snapshot",

package/src/client/image_snapshot_matcher.ts

@@ -1,3 +1,4 @@
+import { isA } from '@vitest/expect'
 import dedent from 'dedent'
 import { resolve } from 'pathe'
 import type { ImageSnapshotNextIndexCommand } from '../commands.ts'
@@ -5,13 +6,14 @@ import type { PrepareImageSnapshotComparisonCommand } from '../server/commands/p
 import type { WriteImageSnapshotCommand } from '../server/commands/write_image_snapshot.ts'
 import { isBase64String } from '../shared/base64.ts'
 import { compareImage } from '../shared/compare_image.ts'
-import type { CurrentTest, ToMatchImageSnapshotOptions } from '../shared/types.ts'
+import type { ToMatchImageSnapshotOptions } from '../shared/types.ts'
 import { alignImagesToSameSize } from './align_images.ts'
 import { toDataURL, toImageData } from './image_data.ts'
 import { prettifyOptions } from './image_snapshot_matcher.logic.ts'
 import { convertElementToCssSelector } from './selector.ts'
 import { toTaskId } from './task_id.ts'
 import { server } from './vitest_browser_context_proxy.ts'
+import type { CurrentTest } from './vitest_suite_proxy.ts'
 
 export function imageSnapshotMatcher(
 	commands: PrepareImageSnapshotComparisonCommand & WriteImageSnapshotCommand & ImageSnapshotNextIndexCommand,
@@ -26,6 +28,7 @@ export function imageSnapshotMatcher(
 		const info = await commands.prepareImageSnapshotComparison(
 			taskId,
 			parseImageSnapshotSubject(subject),
+			isAutoSnapshot,
 			options?.customizeSnapshotId
 				? await parseImageSnapshotOptions(commands, taskId, isAutoSnapshot, options)
 				: options,

package/src/client/page/has_image_snapshot.ts

@@ -23,16 +23,18 @@ export function hasImageSnapshot(this: BrowserPage, options?: ImageSnapshotIdOpt
 		)
 	}
 	const taskId = toTaskId(test)
+	const isAutoSnapshot = !!test.meta.vis?.isAutoSnapshot
 	if (options?.customizeSnapshotId) {
 		return commands
 			.imageSnapshotNextIndex(taskId)
 			.then((index) =>
 				commands.hasImageSnapshot(
 					taskId,
-					options.customizeSnapshotId!({ id: taskId, index, isAutoSnapshot: !!test.meta.vis?.isAutoSnapshot }),
+					options.customizeSnapshotId!({ id: taskId, index, isAutoSnapshot }),
+					isAutoSnapshot,
 				),
 			)
 	}
 
-	return commands.hasImageSnapshot(taskId)
+	return commands.hasImageSnapshot(taskId, undefined, isAutoSnapshot)
 }

package/src/client/vitest_suite_proxy.ts

@@ -1,4 +1,5 @@
-import type { CurrentTest } from '../shared/types.ts'
+import type { NAME } from '../shared/constants.ts'
+import type { SnapshotMeta } from '../shared/types.ts'
 
 let vitestSuite: Awaited<typeof import('vitest/suite')>
 
@@ -8,5 +9,9 @@ if ((globalThis as any).__vitest_browser__) {
 	})
 }
 
+export type CurrentTest = ReturnType<typeof vitestSuite.getCurrentTest> & {
+	meta: { [NAME]?: SnapshotMeta<'pixel' | 'ssim'> & { isAutoSnapshot?: boolean | undefined } }
+}
+
 export const getCurrentTest = () => vitestSuite?.getCurrentTest() as CurrentTest
 export const getCurrentSuite = () => vitestSuite?.getCurrentSuite()

package/src/server/commands/has_image_snapshot.ts

@@ -3,15 +3,13 @@ import { visContext } from '../vis_context.ts'
 import { assertTestPathDefined } from './_assertions.ts'
 
 export interface HasImageSnapshotCommand {
-	hasImageSnapshot(taskId: string, snapshotId?: string | undefined): Promise<boolean>
+	hasImageSnapshot(taskId: string, snapshotId: string | undefined, isAutoSnapshot: boolean): Promise<boolean>
 }
 
-export const hasImageSnapshot: BrowserCommand<[taskId: string, snapshotId?: string | undefined]> = async (
-	context,
-	taskId,
-	snapshotId,
-) => {
+export const hasImageSnapshot: BrowserCommand<
+	[taskId: string, snapshotId: string | undefined, isAutoSnapshot: boolean]
+> = async (context, taskId, snapshotId, isAutoSnapshot) => {
 	assertTestPathDefined(context, 'hasImageSnapshot')
 
-	return visContext.hasImageSnapshot(context.testPath, taskId, snapshotId)
+	return visContext.hasImageSnapshot(context.testPath, taskId, snapshotId, isAutoSnapshot)
 }

package/src/server/commands/match_image_snapshot.ts

@@ -20,6 +20,7 @@ export interface MatchImageSnapshotCommand {
 	matchImageSnapshot: (
 		taskId: string | undefined,
 		subject: string,
+		isAutoSnapshot: boolean,
 		options?: MatchImageSnapshotOptions | undefined,
 	) => Promise<void>
 }
@@ -34,15 +35,15 @@ export type MatchImageSnapshotOptions = ImageSnapshotTimeoutOptions &
 	}
 
 export const matchImageSnapshot: BrowserCommand<
-	[taskId: string, subject: string, options?: MatchImageSnapshotOptions | undefined]
-> = async (context, taskId, subject, options) => {
+	[taskId: string, subject: string, isAutoSnapshot: boolean, options?: MatchImageSnapshotOptions | undefined]
+> = async (context, taskId, subject, isAutoSnapshot, options) => {
 	assertTestPathDefined(context, 'matchImageSnapshot')
 
 	// vitest:browser passes in `null` when not defined
 	if (!options) options = {}
 	options.timeout = options.timeout ?? 30000
 
-	const info = visContext.getSnapshotInfo(context.testPath, taskId, options)
+	const info = visContext.getSnapshotInfo(context.testPath, taskId, isAutoSnapshot, options)
 	const baselineBuffer = await file.tryReadFile(info.baselinePath)
 	if (!baselineBuffer) {
 		if (isBase64String(subject)) {

package/src/server/commands/prepare_image_snapshot_comparison.ts

@@ -27,20 +27,21 @@ export interface PrepareImageSnapshotComparisonCommand {
 	prepareImageSnapshotComparison: (
 		taskId: string | undefined,
 		subject: string,
+		isAutoSnapshot: boolean,
 		options?: MatchImageSnapshotOptions | undefined,
 	) => Promise<ImageSnapshotComparisonInfo | undefined>
 }
 
 export const prepareImageSnapshotComparison: BrowserCommand<
-	[taskId: string, snapshotId: string, options?: MatchImageSnapshotOptions | undefined]
-> = async (context, taskId, subject, options) => {
+	[taskId: string, snapshotId: string, isAutoSnapshot: boolean, options?: MatchImageSnapshotOptions | undefined]
+> = async (context, taskId, subject, isAutoSnapshot, options) => {
 	assertTestPathDefined(context, 'prepareImageSnapshotComparison')
 
 	// vitest:browser passes in `null` when not defined
 	if (!options) options = {}
 	options.timeout = options.timeout ?? 30000
 
-	const info = visContext.getSnapshotInfo(context.testPath, taskId, options)
+	const info = visContext.getSnapshotInfo(context.testPath, taskId, isAutoSnapshot, options)
 	const baselineBuffer = await file.tryReadFile(info.baselinePath)
 	if (!baselineBuffer) {
 		if (isBase64String(subject)) {

package/src/server/vis_context.logic.ts

@@ -1,9 +1,7 @@
 import { join, relative } from 'pathe'
 import { pick } from 'type-plus'
-import { getCurrentTest } from 'vitest/suite'
 import type { VisOptions } from '../config/types.ts'
 import { BASELINE_DIR, DIFF_DIR, RESULT_DIR } from '../shared/constants.ts'
-import type { CurrentTest } from '../shared/types.ts'
 import { file } from './file.ts'
 import { getSnapshotSubpath, resolveSnapshotRootDir } from './snapshot_path.ts'
 import { ctx } from './vis_context.ctx.ts'
@@ -45,11 +43,16 @@ export function createVisContext() {
 			await Promise.allSettled([ctx.rimraf(suite.diffDir), ctx.rimraf(suite.resultDir)])
 			return pick(state, 'subjectDataTestId')
 		},
-		getSnapshotInfo(testPath: string, name: string, options?: { snapshotFileId?: string | undefined }) {
-			const info = context.getSuiteInfo(testPath, name)
-			const snapshotFilename = context.getSnapshotFilename(info, options?.snapshotFileId)
+		getSnapshotInfo(
+			testPath: string,
+			name: string,
+			isAutoSnapshot: boolean,
+			options?: { snapshotFileId?: string | undefined },
+		) {
+			const suiteInfo = context.getSuiteInfo(testPath, name)
+			const snapshotFilename = context.getSnapshotFilename(suiteInfo, options?.snapshotFileId, isAutoSnapshot)
 
-			const { baselineDir, resultDir, diffDir, task } = info
+			const { baselineDir, resultDir, diffDir, task } = suiteInfo
 
 			task.count = task.count + 1
 			const baselinePath = join(baselineDir, snapshotFilename)
@@ -66,14 +69,17 @@ export function createVisContext() {
 		getTaskCount(testPath: string, taskId: string) {
 			return context.getSuiteInfo(testPath, taskId).task.count
 		},
-		hasImageSnapshot(testPath: string, taskId: string, snapshotFileId: string | undefined) {
+		hasImageSnapshot(testPath: string, taskId: string, snapshotFileId: string | undefined, isAutoSnapshot: boolean) {
 			const info = context.getSuiteInfo(testPath, taskId)
-			return file.existFile(join(info.baselineDir, context.getSnapshotFilename(info, snapshotFileId)))
+			return file.existFile(join(info.baselineDir, context.getSnapshotFilename(info, snapshotFileId, isAutoSnapshot)))
 		},
-		getSnapshotFilename(info: { taskId: string; task: { count: number } }, snapshotFileId: string | undefined) {
+		getSnapshotFilename(
+			info: { taskId: string; task: { count: number } },
+
+			snapshotFileId: string | undefined,
+			isAutoSnapshot: boolean,
+		) {
 			if (snapshotFileId) return `${snapshotFileId}.png`
-			const test = getCurrentTest() as CurrentTest
-			const isAutoSnapshot = !!test?.meta.vis?.isAutoSnapshot
 			const customizeSnapshotId = visOptions.customizeSnapshotId ?? (({ id, index }) => `${id}-${index}`)
 			return `${customizeSnapshotId({
 				id: info.taskId,

package/src/shared/types.ts

@@ -87,7 +87,3 @@ export type SnapshotMeta<M extends ComparisonMethod> = ToMatchImageSnapshotOptio
 		enable?: boolean | undefined
 		[key: string]: unknown
 	}
-
-export type CurrentTest = ReturnType<typeof getCurrentTest> & {
-	meta: { [NAME]?: SnapshotMeta<'pixel' | 'ssim'> & { isAutoSnapshot?: boolean | undefined } }
-}