vitest-plugin-vis 1.0.1 → 1.0.2

package/esm/server/commands/match_image_snapshot.js

@@ -32,7 +32,7 @@ export const matchImageSnapshot = async (context, taskId, subject, options) => {
         : alignImageSizes(baselineImage, resultImage);
     const { pass, diffAmount, diffImage } = compareImage(baselineAlignedImage, resultAlignedImage, options);
     if (pass) {
-        if (sizeNotChanged(baselineImage, baselineAlignedImage)) {
+        if (sizeNotChanged(baselineImage, baselineAlignedImage) && sizeNotChanged(resultImage, resultAlignedImage)) {
             return;
         }
         throw new Error(dedent `Snapshot \`${taskId}\` mismatched
@@ -75,13 +75,18 @@ async function writeSnapshot(subject, filePath) {
 }
 function alignImageSizes(baseline, result) {
     const size = getMaxSize(baseline, result);
-    const baselineAligned = new PNG(size);
-    const resultAligned = new PNG(size);
-    baselineAligned.data.fill(0);
-    resultAligned.data.fill(0);
-    PNG.bitblt(baseline, baselineAligned, 0, 0, baseline.width, baseline.height);
-    PNG.bitblt(result, resultAligned, 0, 0, result.width, result.height);
-    return [baselineAligned, resultAligned];
+    if (baseline.width !== size.width || baseline.height !== size.height) {
+        baseline = resizeImage(baseline, size);
+    }
+    if (result.width !== size.width || result.height !== size.height) {
+        result = resizeImage(result, size);
+    }
+    return [baseline, result];
+}
+function resizeImage(image, size) {
+    const resized = new PNG(size);
+    PNG.bitblt(image, resized, 0, 0, image.width, image.height);
+    return resized;
 }
 function sizeNotChanged(baselineImage, baselineAlignedImage) {
     return baselineImage === baselineAlignedImage;

package/package.json

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

package/src/server/commands/match_image_snapshot.ts

@@ -62,7 +62,7 @@ export const matchImageSnapshot: BrowserCommand<
 
 	const { pass, diffAmount, diffImage } = compareImage(baselineAlignedImage, resultAlignedImage, options)
 	if (pass) {
-		if (sizeNotChanged(baselineImage, baselineAlignedImage)) {
+		if (sizeNotChanged(baselineImage, baselineAlignedImage) && sizeNotChanged(resultImage, resultAlignedImage)) {
 			return
 		}
 		throw new Error(
@@ -123,17 +123,23 @@ async function writeSnapshot(subject: string, filePath: string) {
 function alignImageSizes(baseline: PNG, result: PNG) {
 	const size = getMaxSize(baseline, result)
 
-	const baselineAligned = new PNG(size)
-	const resultAligned = new PNG(size)
+	if (baseline.width !== size.width || baseline.height !== size.height) {
+		baseline = resizeImage(baseline, size)
+	}
 
-	baselineAligned.data.fill(0)
-	resultAligned.data.fill(0)
+	if (result.width !== size.width || result.height !== size.height) {
+		result = resizeImage(result, size)
+	}
 
-	PNG.bitblt(baseline, baselineAligned, 0, 0, baseline.width, baseline.height)
-	PNG.bitblt(result, resultAligned, 0, 0, result.width, result.height)
+	return [baseline, result] as const
+}
 
-	return [baselineAligned, resultAligned] as const
+function resizeImage(image: PNG, size: { width: number; height: number }) {
+	const resized = new PNG(size)
+	PNG.bitblt(image, resized, 0, 0, image.width, image.height)
+	return resized
 }
+
 function sizeNotChanged(baselineImage: PNG, baselineAlignedImage: PNG) {
 	return baselineImage === baselineAlignedImage
 }