aptechka 0.11.6 → 0.11.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aptechka",
-  "version": "0.11.6",
+  "version": "0.11.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/denisavitski/aptechka.git"

package/server-lib/optimizer/index.js

@@ -234,6 +234,7 @@ async function inputFiles({
               quality: 80,
               scale: 1,
               webp: false,
+              forceJPG: false,
               destinationPath,
               ...(_d = settings == null ? void 0 : settings.image) == null ? void 0 : _d.call(settings, { destinationPath })
             }
@@ -273,7 +274,6 @@ function getNumberSetting(value, min, max) {
 async function optimizeImage(source) {
   const { settings } = source;
   const content = await getBuffer(source.content);
-  const ext = extname(settings.destinationPath).toLowerCase();
   const image = sharp(content);
   const meta = await image.metadata();
   const width = meta.width;
@@ -281,6 +281,8 @@ async function optimizeImage(source) {
   const output = [];
   const scale = getNumberSetting(settings.scale, 0, 1);
   const quality = getNumberSetting(settings.quality, 0, 100);
+  let destinationPath = settings.destinationPath;
+  let ext = extname(destinationPath).toLowerCase();
   if (width && height) {
     if (scale) {
       image.resize(Math.floor(width * scale), Math.floor(height * scale));
@@ -292,17 +294,26 @@ async function optimizeImage(source) {
       quality
     });
   } else if (ext === ".png") {
-    image.png({
-      compressionLevel: 9,
-      adaptiveFiltering: true,
-      quality,
-      effort: 8
-    });
+    if (settings.forceJPG) {
+      const bg = typeof settings.forceJPG === "string" ? settings.forceJPG : "#ffffff";
+      image.jpeg({
+        mozjpeg: true
+      }).flatten({ background: bg });
+      destinationPath = replaceExtension(settings.destinationPath, "jpg");
+      ext = ".jpg";
+    } else {
+      image.png({
+        compressionLevel: 9,
+        adaptiveFiltering: true,
+        quality,
+        effort: 8
+      });
+    }
   }
   const buffer = await image.toBuffer();
   output.push({
     data: buffer,
-    destinationPath: settings.destinationPath
+    destinationPath
   });
   if (settings == null ? void 0 : settings.webp) {
     const buffer2 = await image.webp({
@@ -311,17 +322,14 @@ async function optimizeImage(source) {
     }).toBuffer();
     output.push({
       data: buffer2,
-      destinationPath: replaceExtension(settings.destinationPath, "webp")
+      destinationPath: replaceExtension(destinationPath, "webp")
     });
   }
   if (settings == null ? void 0 : settings.placeholder) {
     const buffer2 = await image.resize(20, 20).blur(10).toBuffer();
     output.push({
       data: buffer2,
-      destinationPath: replaceExtension(
-        settings.destinationPath,
-        `placeholder${ext}`
-      )
+      destinationPath: replaceExtension(destinationPath, `placeholder${ext}`)
     });
   }
   return output;

package/server-lib/optimizer/types.d.ts

@@ -20,6 +20,7 @@ export type ImageSource = Source<Buffer | File, 'image', {
     scale?: number;
     placeholder?: boolean;
     webp?: boolean;
+    forceJPG?: boolean | string;
 }>;
 export type VideoSource = Source<Buffer | File, 'video', {
     destinationPath: string;