pg-mvc-service 2.0.7 → 2.0.9

package/dist/clients/Base64Client.js

@@ -17,7 +17,10 @@ const pdf_lib_1 = require("pdf-lib");
 const sharp_1 = __importDefault(require("sharp"));
 const type_utils_n_daira_1 = require("type-utils-n-daira");
 class Base64Client {
-    constructor() { }
+    constructor() {
+        this.PREFIX_JPEG_DATA = '/9j/';
+        this.PREFIX_PNG_DATA = 'iVBORw0KGgo';
+    }
     // public encode(text: string): string {
     //     return Buffer.from(text).toString('base64');
     // }
@@ -151,7 +154,7 @@ class Base64Client {
             return Buffer.from(pdfBytes);
         });
     }
-    static isJpeg(value) {
+    isJpeg(value) {
         if (type_utils_n_daira_1.ValidateStringUtil.isBase64(value) === false) {
             return false;
         }
@@ -167,7 +170,7 @@ class Base64Client {
         }
         return value.startsWith(this.PREFIX_JPEG_DATA);
     }
-    static isPng(value) {
+    isPng(value) {
         if (type_utils_n_daira_1.ValidateStringUtil.isBase64(value) === false) {
             return false;
         }
@@ -183,7 +186,7 @@ class Base64Client {
         }
         return value.startsWith(this.PREFIX_PNG_DATA);
     }
-    static tryConvertToPng(base64Value) {
+    tryConvertToPng(base64Value) {
         return __awaiter(this, void 0, void 0, function* () {
             if (type_utils_n_daira_1.ValidateStringUtil.isBase64(base64Value) === false) {
                 return false;
@@ -206,7 +209,59 @@ class Base64Client {
             return false;
         });
     }
+    resizeImage(base64Data, toSize) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (type_utils_n_daira_1.ValidateStringUtil.isBase64(base64Data) === false) {
+                throw new Error("The specified data is not in base64 format");
+            }
+            const imageBuffer = Buffer.from(base64Data, 'base64');
+            const metadata = yield (0, sharp_1.default)(imageBuffer).metadata();
+            const { width, height, format } = metadata;
+            if (width === undefined || height === undefined) {
+                throw new Error("Failed to retrieve image dimensions");
+            }
+            let rate = 1;
+            if ('rate' in toSize) {
+                rate = toSize.rate;
+            }
+            else if ('w' in toSize && 'h' in toSize) {
+                const wRate = toSize.w / width;
+                const hRate = toSize.h / height;
+                rate = Math.max(wRate, hRate);
+            }
+            else if ('w' in toSize) {
+                rate = toSize.w / width;
+            }
+            else if ('h' in toSize) {
+                rate = toSize.h / height;
+            }
+            // 画像は1倍より大きくできないので
+            if (rate >= 1) {
+                return base64Data;
+            }
+            let resizedImage;
+            // フォーマットに応じて処理を分岐
+            if (format === 'png') {
+                resizedImage = yield (0, sharp_1.default)(imageBuffer)
+                    .resize(width * rate, height * rate, {
+                    fit: 'inside',
+                    withoutEnlargement: true
+                })
+                    .png({ quality: 90 })
+                    .toBuffer();
+            }
+            else {
+                // JPEG、その他のフォーマット
+                resizedImage = yield (0, sharp_1.default)(imageBuffer)
+                    .resize(width * rate, height * rate, {
+                    fit: 'inside',
+                    withoutEnlargement: true
+                })
+                    .jpeg({ quality: 90 })
+                    .toBuffer();
+            }
+            return resizedImage.toString('base64');
+        });
+    }
 }
 exports.Base64Client = Base64Client;
-Base64Client.PREFIX_JPEG_DATA = '/9j/';
-Base64Client.PREFIX_PNG_DATA = 'iVBORw0KGgo';

package/dist/models/TableModel.js

@@ -334,7 +334,7 @@ class TableModel {
         let message = this.errorMessages[type];
         const name = (column.alias === undefined || column.alias === '') ? columnName : column.alias;
         message = message.replace('{name}', name);
-        if (message.includes("{length}") && (column.type === 'string' || column.type !== 'string[]')) {
+        if (message.includes("{length}") && (column.type === 'string' || column.type === 'string[]')) {
             message = message.replace('{length}', ((_a = column.length) !== null && _a !== void 0 ? _a : '未設定').toString());
         }
         throw new Exception_1.UnprocessableException(code, message);

package/package.json

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

package/src/clients/Base64Client.ts

@@ -11,8 +11,8 @@ export type TPdf = 'application/pdf';
 export type TJson = 'application/json';
 
 export class Base64Client {
-    public static readonly PREFIX_JPEG_DATA = '/9j/';
-    public static readonly PREFIX_PNG_DATA = 'iVBORw0KGgo';
+    public readonly PREFIX_JPEG_DATA = '/9j/';
+    public readonly PREFIX_PNG_DATA = 'iVBORw0KGgo';
 
     constructor() { }
 
@@ -157,7 +157,7 @@ export class Base64Client {
         return Buffer.from(pdfBytes);
     }
 
-    public static isJpeg(value: any): value is string {
+    public isJpeg(value: any): value is string {
         if (ValidateStringUtil.isBase64(value) === false) {
             return false
         }
@@ -178,7 +178,7 @@ export class Base64Client {
         return value.startsWith(this.PREFIX_JPEG_DATA);
     }
 
-    public static isPng(value: any): value is string {
+    public isPng(value: any): value is string {
         if (ValidateStringUtil.isBase64(value) === false) {
             return false
         }
@@ -199,7 +199,7 @@ export class Base64Client {
         return value.startsWith(this.PREFIX_PNG_DATA);
     }
 
-    public static async tryConvertToPng(base64Value: any): Promise<string | false> {
+    public async tryConvertToPng(base64Value: any): Promise<string | false> {
         if (ValidateStringUtil.isBase64(base64Value) === false) {
             return false;
         }
@@ -220,4 +220,59 @@ export class Base64Client {
 
         return false;
     }
+
+    public async resizeImage(base64Data: string, toSize: {w: number} | {h: number} | {w: number; h: number}| {rate: number}): Promise<string> {
+        if (ValidateStringUtil.isBase64(base64Data) === false) {
+            throw new Error("The specified data is not in base64 format");
+        }
+
+        const imageBuffer = Buffer.from(base64Data, 'base64');
+        const metadata = await sharp(imageBuffer).metadata();
+        const { width, height, format } = metadata;
+        if (width === undefined || height === undefined) {
+            throw new Error("Failed to retrieve image dimensions");
+        }
+        
+        let rate = 1;
+        if ('rate' in toSize) {
+            rate = toSize.rate;
+        } else if ('w' in toSize && 'h' in toSize) {
+            const wRate = toSize.w / width;
+            const hRate = toSize.h / height;
+            rate = Math.max(wRate, hRate);
+        } else if ('w' in toSize) {
+            rate = toSize.w / width;
+        } else if ('h' in toSize) {
+            rate = toSize.h / height;
+        }
+
+        // 画像は1倍より大きくできないので
+        if (rate >= 1) {
+            return base64Data;
+        }
+
+        let resizedImage: Buffer;
+
+        // フォーマットに応じて処理を分岐
+        if (format === 'png') {
+            resizedImage = await sharp(imageBuffer)
+                .resize(width * rate, height * rate, {
+                    fit: 'inside',
+                    withoutEnlargement: true
+                })
+                .png({ quality: 90 })
+                .toBuffer();
+        } else {
+            // JPEG、その他のフォーマット
+            resizedImage = await sharp(imageBuffer)
+                .resize(width * rate, height * rate, {
+                    fit: 'inside',
+                    withoutEnlargement: true
+                })
+                .jpeg({ quality: 90 })
+                .toBuffer();
+        }
+
+        return resizedImage.toString('base64');
+    }
 }

package/src/models/TableModel.ts

@@ -393,7 +393,7 @@ export class TableModel {
 
         const name = (column.alias === undefined || column.alias === '') ? columnName : column.alias;
         message = message.replace('{name}', name);
-        if (message.includes("{length}") && (column.type === 'string' || column.type !== 'string[]')) {
+        if (message.includes("{length}") && (column.type === 'string' || column.type === 'string[]')) {
             message = message.replace('{length}', (column.length ?? '未設定').toString());
         }