pg-mvc-service 2.0.9 → 2.0.10

package/dist/clients/Base64Client.js

@@ -224,10 +224,17 @@ class Base64Client {
             if ('rate' in toSize) {
                 rate = toSize.rate;
             }
-            else if ('w' in toSize && 'h' in toSize) {
+            else if ('w' in toSize && 'h' in toSize && 'func' in toSize) {
                 const wRate = toSize.w / width;
                 const hRate = toSize.h / height;
-                rate = Math.max(wRate, hRate);
+                switch (toSize.func) {
+                    case 'max':
+                        rate = Math.max(wRate, hRate);
+                        break;
+                    case 'min':
+                        rate = Math.min(wRate, hRate);
+                        break;
+                }
             }
             else if ('w' in toSize) {
                 rate = toSize.w / width;
@@ -236,14 +243,16 @@ class Base64Client {
                 rate = toSize.h / height;
             }
             // 画像は1倍より大きくできないので
-            if (rate >= 1) {
+            if (rate >= 1 || rate <= 0) {
                 return base64Data;
             }
             let resizedImage;
             // フォーマットに応じて処理を分岐
+            const targetWidth = Math.round(width * rate);
+            const targetHeight = Math.round(height * rate);
             if (format === 'png') {
                 resizedImage = yield (0, sharp_1.default)(imageBuffer)
-                    .resize(width * rate, height * rate, {
+                    .resize(targetWidth, targetHeight, {
                     fit: 'inside',
                     withoutEnlargement: true
                 })
@@ -253,7 +262,7 @@ class Base64Client {
             else {
                 // JPEG、その他のフォーマット
                 resizedImage = yield (0, sharp_1.default)(imageBuffer)
-                    .resize(width * rate, height * rate, {
+                    .resize(targetWidth, targetHeight, {
                     fit: 'inside',
                     withoutEnlargement: true
                 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {

package/src/clients/Base64Client.ts

@@ -221,7 +221,7 @@ export class Base64Client {
         return false;
     }
 
-    public async resizeImage(base64Data: string, toSize: {w: number} | {h: number} | {w: number; h: number}| {rate: number}): Promise<string> {
+    public async resizeImage(base64Data: string, toSize: {w: number} | {h: number} | {w: number; h: number; func: 'max' | 'min'}| {rate: number}): Promise<string> {
         if (ValidateStringUtil.isBase64(base64Data) === false) {
             throw new Error("The specified data is not in base64 format");
         }
@@ -236,10 +236,18 @@ export class Base64Client {
         let rate = 1;
         if ('rate' in toSize) {
             rate = toSize.rate;
-        } else if ('w' in toSize && 'h' in toSize) {
+        } else if ('w' in toSize && 'h' in toSize && 'func' in toSize) {
             const wRate = toSize.w / width;
             const hRate = toSize.h / height;
-            rate = Math.max(wRate, hRate);
+            switch (toSize.func) {
+                case 'max':
+                    rate = Math.max(wRate, hRate);
+                    break;
+                case 'min':
+                    rate = Math.min(wRate, hRate);
+                    break;
+            }
+
         } else if ('w' in toSize) {
             rate = toSize.w / width;
         } else if ('h' in toSize) {
@@ -247,16 +255,18 @@ export class Base64Client {
         }
 
         // 画像は1倍より大きくできないので
-        if (rate >= 1) {
+        if (rate >= 1 || rate <= 0) {
             return base64Data;
         }
 
         let resizedImage: Buffer;
 
         // フォーマットに応じて処理を分岐
+        const targetWidth = Math.round(width * rate);
+        const targetHeight = Math.round(height * rate);
         if (format === 'png') {
             resizedImage = await sharp(imageBuffer)
-                .resize(width * rate, height * rate, {
+                .resize(targetWidth, targetHeight, {
                     fit: 'inside',
                     withoutEnlargement: true
                 })
@@ -265,7 +275,7 @@ export class Base64Client {
         } else {
             // JPEG、その他のフォーマット
             resizedImage = await sharp(imageBuffer)
-                .resize(width * rate, height * rate, {
+                .resize(targetWidth, targetHeight, {
                     fit: 'inside',
                     withoutEnlargement: true
                 })