@divriots/jampack 0.7.0 → 0.7.2

package/dist/index.js

@@ -62,7 +62,7 @@ program
     }
     printSummary();
     printIssues();
-    if (options.failOnIssues && $state.issues.size > 0) {
+    if (options.fail && $state.issues.size > 0) {
         exit(1);
     }
 });

package/dist/optimize.js

@@ -273,27 +273,33 @@ async function processImage(htmlfile, $, imgElement, isAboveTheFold) {
             while (valueW > config.image.srcset_min_width) {
                 const src = imageSrc(`@${valueW}w`);
                 const absoluteFilename = translateSrc($state.dir, path.dirname(htmlfile), src);
+                let doAddToSrcSet = true;
                 // Don't generate srcset file twice
                 if (!$state.compressedFiles.has(absoluteFilename)) {
-                    // Add file to list avoid recompression
-                    $state.compressedFiles.add(absoluteFilename);
                     const compressedImage = await compressImage(await originalImage.getData(), {
                         resize: { width: valueW, height: valueH },
                         toFormat: canBeProgressiveJpeg ? 'pjpg' : targetFormat,
                     });
                     if (!(compressedImage === null || compressedImage === void 0 ? void 0 : compressedImage.data) ||
                         compressedImage.data.length >= previousImageSize) {
-                        // jampack was not able to compress below the original image
-                        // Let's move on
-                        continue;
+                        // New image is not compressed or bigger than previous image in srcset
+                        // Don't add to srcset
+                        doAddToSrcSet = false;
                     }
-                    if (!$state.args.nowrite) {
-                        fs.writeFile(absoluteFilename, compressedImage.data);
+                    else {
+                        // Write file
+                        if (!$state.args.nowrite) {
+                            fs.writeFile(absoluteFilename, compressedImage.data);
+                        }
+                        // Set new previous size to beat
+                        previousImageSize = compressedImage.data.length;
+                        // Add file to list avoid recompression
+                        $state.compressedFiles.add(absoluteFilename);
                     }
-                    // Add previous smaller file size
-                    previousImageSize = compressedImage.data.length;
                 }
-                new_srcset += `, ${src} ${valueW}w`;
+                if (doAddToSrcSet) {
+                    new_srcset += `, ${src} ${valueW}w`;
+                }
                 // reduce size
                 valueW -= step;
                 valueH = Math.trunc(valueW / ratio);
@@ -322,7 +328,7 @@ async function setImageSize(htmlfile, img, image) {
         if (!isNumeric(width)) {
             $state.reportIssue(htmlfile, {
                 type: 'warn',
-                msg: `Invalid width attribute format: "${width}" - overriding`,
+                msg: `Invalid width attribute format: "${width}" - overriding for ${image.src}`,
             });
             width = undefined;
         }
@@ -331,7 +337,7 @@ async function setImageSize(htmlfile, img, image) {
         if (!isNumeric(height)) {
             $state.reportIssue(htmlfile, {
                 type: 'warn',
-                msg: `Invalid height attribute format: "${height}" - overriding`,
+                msg: `Invalid height attribute format: "${height}" - overriding for ${image.src}`,
             });
             height = undefined;
         }
@@ -349,15 +355,6 @@ async function setImageSize(htmlfile, img, image) {
         // Both are provided
         const w = parseInt(width, 10);
         const h = parseInt(height, 10);
-        // Is ratio equal?
-        const providedRatio = Math.round((w / h) * 10) / 10;
-        const imageRatio = Math.round(originalRatio * 10) / 10;
-        if (providedRatio !== imageRatio) {
-            $state.reportIssue(htmlfile, {
-                type: 'warn',
-                msg: `Image aspect ratio in HTML (${providedRatio}) differs from image aspect ratio (${imageRatio}) - fix width and height or let jampack fill them.`,
-            });
-        }
         return [w, h];
     }
     else if (width !== undefined && height === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Packer for static websites",
   "author": "Georges Gomes @georges-gomes",
   "bin": {