pg-mvc-service 2.0.3 → 2.0.5

package/dist/clients/Base64Client.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Base64Client = void 0;
 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() { }
     // public encode(text: string): string {
@@ -150,5 +151,62 @@ class Base64Client {
             return Buffer.from(pdfBytes);
         });
     }
+    static isJpeg(value) {
+        if (type_utils_n_daira_1.ValidateStringUtil.isBase64(value) === false) {
+            return false;
+        }
+        if (value.startsWith('data:')) {
+            if (value.startsWith('data:image/jpeg,') === false && value.startsWith('data:image/jpg,') === false) {
+                return false;
+            }
+            const valueParts = value.split(',');
+            if (valueParts.length !== 2) {
+                return false;
+            }
+            return valueParts[1].startsWith(this.PREFIX_JPEG_DATA);
+        }
+        return value.startsWith(this.PREFIX_JPEG_DATA);
+    }
+    static isPng(value) {
+        if (type_utils_n_daira_1.ValidateStringUtil.isBase64(value) === false) {
+            return false;
+        }
+        if (value.startsWith('data:')) {
+            if (value.startsWith('data:image/png,') === false) {
+                return false;
+            }
+            const valueParts = value.split(',');
+            if (valueParts.length !== 2) {
+                return false;
+            }
+            return valueParts[1].startsWith(this.PREFIX_PNG_DATA);
+        }
+        return value.startsWith(this.PREFIX_PNG_DATA);
+    }
+    static tryConvertToPng(base64Value) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (type_utils_n_daira_1.ValidateStringUtil.isBase64(base64Value) === false) {
+                return false;
+            }
+            const base64Data = base64Value.startsWith('data:') ? base64Value.split(',')[1] : base64Value;
+            if (this.isPng(base64Data)) {
+                return base64Data;
+            }
+            else if (this.isJpeg(base64Data)) {
+                const buffer = Buffer.from(base64Data, 'base64');
+                try {
+                    const pngBuffer = yield (0, sharp_1.default)(buffer)
+                        .ensureAlpha().png().toBuffer();
+                    return pngBuffer.toString('base64');
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            return false;
+        });
+    }
 }
 exports.Base64Client = Base64Client;
+Base64Client.PREFIX_JPEG_DATA = '/9j/';
+Base64Client.PREFIX_PNG_DATA = 'iVBORw0KGgo';

package/dist/models/SqlUtils/ValidateValueUtil.js

@@ -198,6 +198,52 @@ class ValidateValueUtil {
         }
         return true;
     }
+    static isErrorInteger(value) {
+        let numberValue;
+        if (typeof value === 'string') {
+            if (value.trim() === "" || isNaN(Number(value))) {
+                return true;
+            }
+            numberValue = Number(value);
+        }
+        else if (typeof value === 'number') {
+            numberValue = value;
+        }
+        else {
+            return true;
+        }
+        if (Number.isInteger(numberValue) === false) {
+            return true;
+        }
+        if (numberValue < -2147483648 || numberValue > 2147483647) {
+            return true;
+        }
+        return false;
+    }
+    static isErrorReal(value) {
+        let numberValue;
+        if (typeof value === 'string') {
+            if (value.trim() === "" || isNaN(Number(value))) {
+                return true;
+            }
+            numberValue = Number(value);
+        }
+        else if (typeof value === 'number') {
+            numberValue = value;
+        }
+        else {
+            return true;
+        }
+        // 特殊値チェック
+        if (isFinite(numberValue) === false) {
+            return true;
+        }
+        // 範囲チェック（real型の範囲）
+        if (numberValue < -3.4e38 || numberValue > 3.4e38) {
+            return true;
+        }
+        return false;
+    }
     static isErrorNumber(value) {
         if (typeof value === 'string') {
             if (value.trim() === "" || isNaN(Number(value))) {

package/dist/models/SqlUtils/WhereExpression.js

@@ -83,21 +83,21 @@ class WhereExpression {
         // Are the operators correct?
         const useableOperator = {
             integer: ["=", "!=", ">", ">=", "<", "<=", "in", "not in"],
-            'integer[]': [],
+            'integer[]': ["=", "any", "@>", "&&"],
             real: ["=", "!=", ">", ">=", "<", "<="],
-            'real[]': [],
+            'real[]': ["=", "any", "@>", "&&"],
             string: ["=", "!=", "like", "ilike", "h2f_like", "h2f_ilike", "in", "not in"],
-            'string[]': [],
+            'string[]': ["=", "any", "@>", "&&"],
             uuid: ["=", "!=", "in", "not in"],
-            'uuid[]': [],
+            'uuid[]': ["=", "any", "@>", "&&"],
             bool: ["=", "!=", "in", "not in"],
-            'bool[]': [],
+            'bool[]': ["=", "any", "@>", "&&"],
             date: ["=", "!=", ">", ">=", "<", "<="],
-            'date[]': [],
+            'date[]': ["=", "any", "@>", "&&"],
             time: ["=", "!=", ">", ">=", "<", "<="],
-            'time[]': [],
+            'time[]': ["=", "any", "@>", "&&"],
             timestamp: ["=", "!=", ">", ">=", "<", "<="],
-            'timestamp[]': [],
+            'timestamp[]': ["=", "any", "@>", "&&"],
             json: [],
             'json[]': [],
             jsonb: [],
@@ -124,8 +124,15 @@ class WhereExpression {
                 throw new Error(`When comparing with null, operators other than =, != cannot be used. (${operator})`);
             }
         }
-        if (leftColumn.type.endsWith("[]")) {
-            return this.createExpression(leftColumn, operator, right, varLength);
+        const isColumnRight = right !== null && typeof right === 'object' && 'model' in right && 'name' in right;
+        const isArrayColumnLeft = leftColumn.type.endsWith("[]");
+        if (isArrayColumnLeft) {
+            if (isColumnRight) {
+                return this.createExpressionArrayColumn(leftColumn, operator, right, varLength);
+            }
+            else {
+                return this.createExpressionArrayValue(leftColumn, operator, right, varLength);
+            }
         }
         else {
             return this.createExpression(leftColumn, operator, right, varLength);
@@ -156,8 +163,9 @@ class WhereExpression {
         // If the right side value is a column specification
         if (right !== null && typeof right === 'object' && 'model' in right && 'name' in right) {
             const rightColumn = right.model.getColumn(right.name);
+            // 型の不一致エラーメッセージを改善
             if (leftColumn.type !== rightColumn.type) {
-                throw new Error(`The types of [${leftColumn.tableName}].[${leftColumn.columnName}] and [${rightColumn.tableName}].[${rightColumn.columnName}] are different.`);
+                throw new Error(`Type mismatch: column [${leftColumn.tableName}].[${leftColumn.columnName}] (${leftColumn.type}) and [${rightColumn.tableName}].[${rightColumn.columnName}] (${rightColumn.type}) must be the same type.`);
             }
             // LIKE operators are different, so handle separately
             switch (operator) {
@@ -198,34 +206,157 @@ class WhereExpression {
         };
     }
     static createExpressionArrayValue(leftColumn, operator, right, varLength) {
-        // ValidateValueUtil.validateValue(leftColumn, right);
-        // LIKE operators are different, so handle separately
-        // switch (operator) {
-        //     case 'like':
-        //     case 'ilike':
-        //         return {
-        //             sql: `${leftColumn.expression} ${operator} $${varLength}`,
-        //             vars: [`%${right}%`]
-        //         }
-        //     case 'h2f_like': // half to full like
-        //     case 'h2f_ilike': // half to full ilike
-        //         return {
-        //             sql: `${this.makeSqlReplaceHalfToFull(leftColumn.expression)} ${operator.replace("h2f_", "")} ${this.makeSqlReplaceHalfToFull(`$${varLength}`)}`,
-        //             vars: [`%${right}%`]
-        //         }
-        // }
+        // バリデーションチェック
+        switch (operator) {
+            case 'any':
+                switch (leftColumn.type) {
+                    case 'integer[]':
+                        if (ValidateValueUtil_1.default.isErrorInteger(right)) {
+                            throw new Error(`Expected integer value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'real[]':
+                        if (ValidateValueUtil_1.default.isErrorReal(right)) {
+                            throw new Error(`Expected numeric value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'string[]':
+                        if (ValidateValueUtil_1.default.isErrorString(right)) {
+                            throw new Error(`Expected string value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'uuid[]':
+                        if (ValidateValueUtil_1.default.isErrorUUID(right)) {
+                            throw new Error(`Expected UUID value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'bool[]':
+                        if (ValidateValueUtil_1.default.isErrorBool(right)) {
+                            throw new Error(`Expected boolean value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'date[]':
+                        if (ValidateValueUtil_1.default.isErrorDate(right)) {
+                            throw new Error(`Expected date value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'time[]':
+                        if (ValidateValueUtil_1.default.isErrorTime(right)) {
+                            throw new Error(`Expected time value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'timestamp[]':
+                        if (ValidateValueUtil_1.default.isErrorTimestamp(right)) {
+                            throw new Error(`Expected timestamp value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                }
+                break;
+            case '=':
+            case '@>':
+            case '&&':
+                if (Array.isArray(right) === false) {
+                    throw new Error(`Expected array format for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                }
+                for (const value of right) {
+                    switch (leftColumn.type) {
+                        case 'integer[]':
+                            if (ValidateValueUtil_1.default.isErrorInteger(value)) {
+                                throw new Error(`Expected integer value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'real[]':
+                            if (ValidateValueUtil_1.default.isErrorReal(value)) {
+                                throw new Error(`Expected numeric value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'string[]':
+                            if (ValidateValueUtil_1.default.isErrorString(value)) {
+                                throw new Error(`Expected string value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'uuid[]':
+                            if (ValidateValueUtil_1.default.isErrorUUID(value)) {
+                                throw new Error(`Expected UUID value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'bool[]':
+                            if (ValidateValueUtil_1.default.isErrorBool(value)) {
+                                throw new Error(`Expected boolean value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'date[]':
+                            if (ValidateValueUtil_1.default.isErrorDate(value)) {
+                                throw new Error(`Expected date value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'time[]':
+                            if (ValidateValueUtil_1.default.isErrorTime(value)) {
+                                throw new Error(`Expected time value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'timestamp[]':
+                            if (ValidateValueUtil_1.default.isErrorTimestamp(value)) {
+                                throw new Error(`Expected timestamp value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                    }
+                }
+                break;
+            default:
+                throw new Error(`Unsupported operator '${operator}' for array column operations.`);
+        }
         switch (operator) {
             case '=':
-                // バリデーションチェックをする
+            case '@>':
+            case '&&':
                 return {
                     expression: `${leftColumn.expression} ${operator} $${varLength}`,
                     vars: [right]
                 };
+            case 'any':
+                return {
+                    expression: `$${varLength} = ANY(${leftColumn.expression})`,
+                    vars: [right]
+                };
+        }
+    }
+    static createExpressionArrayColumn(leftColumn, operator, right, varLength) {
+        const rightColumn = right.model.getColumn(right.name);
+        // バリデーションチェック
+        switch (operator) {
+            case 'any':
+                // any演算子の場合
+                if (leftColumn.type !== rightColumn.type.replace('[]', '')) {
+                    throw new Error(`Type mismatch: array column [${leftColumn.tableName}].[${leftColumn.columnName}] (${leftColumn.type}) and scalar column [${rightColumn.tableName}].[${rightColumn.columnName}] (${rightColumn.type}) are incompatible for ANY operation.`);
+                }
+                break;
+            case '=':
+            case '@>':
+            case '&&':
+                // 配列演算子の場合
+                if (leftColumn.type !== rightColumn.type) {
+                    throw new Error(`Type mismatch: array columns [${leftColumn.tableName}].[${leftColumn.columnName}] (${leftColumn.type}) and [${rightColumn.tableName}].[${rightColumn.columnName}] (${rightColumn.type}) must be the same type.`);
+                }
+                break;
+            default:
+                // サポートされていない演算子
+                throw new Error(`Operator '${operator}' is not supported for array column operations. Supported operators: =, @>, &&, ANY`);
+        }
+        switch (operator) {
+            case '=':
+            case '@>':
+            case '&&':
+                return {
+                    expression: `${leftColumn.expression} ${operator} $${rightColumn.expression}`,
+                    vars: []
+                };
+            case 'any':
+                return {
+                    expression: `$${rightColumn.expression} = ANY(${leftColumn.expression})`,
+                    vars: []
+                };
         }
-        return {
-            expression: `${leftColumn.expression} ${operator} $${varLength}`,
-            vars: [right]
-        };
     }
     /**
      * SQL statement to convert half-width characters to full-width

package/dist/reqestResponse/ReqResType.js

@@ -114,55 +114,6 @@ class ReqResType {
                 return false;
         }
     }
-    /**
-     * 値がメールアドレス形式であるかどうかを検証します
-     * Validates if the given value is in the format of an email address
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がメールアドレス形式であるかどうか, Whether the value is in the format of an email address
-     */
-    isMail(value) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-        const pattern = new RegExp('^[a-zA-Z0-9_%+-]+([.][a-zA-Z0-9_%+-]+)*@[a-zA-Z0-9]+([-.]?[a-zA-Z0-9]+)*\\.[a-zA-Z]{2,}$');
-        return pattern.test(value);
-    }
-    /**
-     * 値がHTTPS URLであるかどうかを検証します
-     * Validates if the given value is an HTTPS URL
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がHTTPS URLであるかどうか, Whether the value is an HTTPS URL
-     */
-    isHttps(value) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-        const urlPattern = new RegExp('^(https?:\\/\\/[^\\s/$.?#].[^\\s]*)$');
-        return urlPattern.test(value);
-    }
-    /**
-     * 値がBase64形式であるかどうかを検証します
-     * Validates if the given value is in Base64 format
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がBase64形式であるかどうか, Whether the value is in Base64 format
-     */
-    isBase64(value) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-        // base64は4倍の長さである必要がある
-        if (value.length % 4 !== 0) {
-            return false;
-        }
-        // 基本的なbase64パターン
-        // 使用可能な文字
-        // ・ アルファベット（A-Z, a-z）
-        // ・ 数字（0-9）
-        // ・ +と/（基本文字）
-        // ・ =（パディング文字）
-        const base64Pattern = /^[A-Za-z0-9+/]*={0,2}$/;
-        return base64Pattern.test(value);
-    }
     /**
      * プロパティの型をSwagger形式に変換します
      * Converts the property type to Swagger format

package/dist/reqestResponse/RequestType.js

@@ -7,6 +7,7 @@ exports.RequestType = void 0;
 const ReqResType_1 = __importDefault(require("./ReqResType"));
 const Exception_1 = require("../exceptions/Exception");
 const StringUtil_1 = __importDefault(require("../Utils/StringUtil"));
+const type_utils_n_daira_1 = require("type-utils-n-daira");
 class RequestType extends ReqResType_1.default {
     constructor() {
         super(...arguments);
@@ -532,7 +533,7 @@ class RequestType extends ReqResType_1.default {
                 this.throwInputError(isRequestBody ? "UUID_21" : "UUID_91", keys, value);
             case 'mail':
             case 'mail?':
-                if (this.isMail(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isMail(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "MAIL_21" : "MAIL_91", keys, value);
@@ -565,13 +566,13 @@ class RequestType extends ReqResType_1.default {
                 return value.replace('T', ' ');
             case 'https':
             case 'https?':
-                if (this.isHttps(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isHttps(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "HTTPS_21" : "HTTPS_91", keys, value);
             case 'base64':
             case 'base64?':
-                if (this.isBase64(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isBase64(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "BASE64_21" : "BASE64_91", keys, value);

package/dist/reqestResponse/ResponseType.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResponseType = void 0;
+const type_utils_n_daira_1 = require("type-utils-n-daira");
 const StringUtil_1 = __importDefault(require("../Utils/StringUtil"));
 const ReqResType_1 = __importDefault(require("./ReqResType"));
 class ResponseType extends ReqResType_1.default {
@@ -210,7 +211,7 @@ class ResponseType extends ReqResType_1.default {
                 return undefined;
             case 'mail':
             case 'mail?':
-                if (this.isMail(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isMail(value)) {
                     return value;
                 }
                 return undefined;
@@ -252,13 +253,13 @@ class ResponseType extends ReqResType_1.default {
                 return undefined;
             case 'https':
             case 'https?':
-                if (this.isHttps(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isHttps(value)) {
                     return value;
                 }
                 return undefined;
             case 'base64':
             case 'base64?':
-                if (this.isBase64(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isBase64(value)) {
                     return value;
                 }
                 return undefined;

package/index.d.ts

@@ -20,7 +20,6 @@ import ValidateClient from './src/models/ValidateClient';
 import { TableModel } from "./src/models/TableModel";
 export { TableModel } from "./src/models/TableModel";
 
-import { TColumnAttribute, TColumnType, TColumnArrayType, TColumn, TColumnDetail, TOperator, TColumnInfo, TQuery, TSelectExpression, TAggregateFuncType, TCondition, TNestedCondition, TSortKeyword, TKeyFormat } from './src/models/Type';
 export { TColumnAttribute, TColumnType, TColumnArrayType, TColumn, TColumnDetail, TOperator, TColumnInfo, TQuery, TSelectExpression, TAggregateFuncType, TCondition, TNestedCondition, TSortKeyword, TKeyFormat } from './src/models/Type';
 
 declare module 'pg-mvc-service' {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {
@@ -31,6 +31,7 @@
     "axios": "1.10.0",
     "crypto": "1.0.1",
     "pdf-lib": "1.17.1",
-    "sharp": "0.34.1"
+    "sharp": "0.34.1",
+    "type-utils-n-daira": "1.0.11"
   }
 }

package/src/clients/Base64Client.ts

@@ -1,5 +1,6 @@
 import { PDFDocument } from 'pdf-lib';
 import sharp from 'sharp';
+import { ValidateStringUtil } from 'type-utils-n-daira';
 
 export type TPng = 'image/png';
 export type TJpeg = 'image/jpeg';
@@ -10,6 +11,9 @@ 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';
+
     constructor() { }
 
     // public encode(text: string): string {
@@ -152,4 +156,68 @@ export class Base64Client {
         const pdfBytes = await pdfDoc.save();
         return Buffer.from(pdfBytes);
     }
+
+    public static isJpeg(value: any): value is string {
+        if (ValidateStringUtil.isBase64(value) === false) {
+            return false
+        }
+
+        if (value.startsWith('data:')) {
+            if (value.startsWith('data:image/jpeg,') === false && value.startsWith('data:image/jpg,') === false) {
+                return false;
+            }
+
+            const valueParts = value.split(',');
+            if (valueParts.length !== 2) {
+                return false;
+            }
+
+            return valueParts[1].startsWith(this.PREFIX_JPEG_DATA);
+        }
+
+        return value.startsWith(this.PREFIX_JPEG_DATA);
+    }
+
+    public static isPng(value: any): value is string {
+        if (ValidateStringUtil.isBase64(value) === false) {
+            return false
+        }
+
+        if (value.startsWith('data:')) {
+            if (value.startsWith('data:image/png,') === false) {
+                return false;
+            }
+
+            const valueParts = value.split(',');
+            if (valueParts.length !== 2) {
+                return false;
+            }
+
+            return valueParts[1].startsWith(this.PREFIX_PNG_DATA);
+        }
+
+        return value.startsWith(this.PREFIX_PNG_DATA);
+    }
+
+    public static async tryConvertToPng(base64Value: any): Promise<string | false> {
+        if (ValidateStringUtil.isBase64(base64Value) === false) {
+            return false;
+        }
+
+        const base64Data = base64Value.startsWith('data:') ? base64Value.split(',')[1] : base64Value;
+        if (this.isPng(base64Data)) {
+            return base64Data;
+        } else if (this.isJpeg(base64Data)) {
+            const buffer = Buffer.from(base64Data, 'base64');
+            try {
+                const pngBuffer = await sharp(buffer)
+                    .ensureAlpha().png().toBuffer();
+                return pngBuffer.toString('base64');
+            } catch (e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
 }

package/src/models/SqlUtils/ValidateValueUtil.ts

@@ -216,6 +216,58 @@ export default class ValidateValueUtil {
         return true;
     }
 
+    static isErrorInteger(value: any): boolean {
+        let numberValue: number;
+        if (typeof value === 'string') {
+            if (value.trim() === "" || isNaN(Number(value))) {
+                return true;
+            }
+
+            numberValue = Number(value);
+        } else if (typeof value === 'number') {
+            numberValue = value;
+        } else {
+            return true;
+        }
+
+        if (Number.isInteger(numberValue) === false) {
+            return true;
+        }
+
+        if (numberValue < -2147483648 || numberValue > 2147483647) {
+            return true;
+        }
+
+        return false;
+    }
+
+    static isErrorReal(value: any): boolean {
+        let numberValue: number;
+        if (typeof value === 'string') {
+            if (value.trim() === "" || isNaN(Number(value))) {
+                return true;
+            }
+
+            numberValue = Number(value);
+        } else if (typeof value === 'number') {
+            numberValue = value;
+        } else {
+            return true;
+        }
+
+        // 特殊値チェック
+        if (isFinite(numberValue) === false) {
+            return true;
+        }
+
+        // 範囲チェック（real型の範囲）
+        if (numberValue < -3.4e38 || numberValue > 3.4e38) {
+            return true;
+        }
+
+        return false;
+    }
+
     static isErrorNumber(value: any): boolean {
         if (typeof value === 'string') {
             if (value.trim() === "" || isNaN(Number(value))) {

package/src/models/SqlUtils/WhereExpression.ts

@@ -96,23 +96,23 @@ export default class WhereExpression {
         const leftColumn = left.model.getColumn(left.name);
 
         // Are the operators correct?
-        const useableOperator: { [key in TColumnType | TColumnArrayType]: string[] } = {
+        const useableOperator: { [key in TColumnType | TColumnArrayType]: TOperator[] } = {
             integer: ["=", "!=", ">", ">=", "<", "<=", "in", "not in"],
-            'integer[]': [],
+            'integer[]': ["=", "any", "@>", "&&"],
             real: ["=", "!=", ">", ">=", "<", "<="],
-            'real[]': [],
+            'real[]': ["=", "any", "@>", "&&"],
             string: ["=", "!=", "like", "ilike", "h2f_like", "h2f_ilike", "in", "not in"],
-            'string[]': [],
+            'string[]': ["=", "any", "@>", "&&"],
             uuid: ["=", "!=", "in", "not in"],
-            'uuid[]': [],
+            'uuid[]': ["=", "any", "@>", "&&"],
             bool: ["=", "!=", "in", "not in"],
-            'bool[]': [],
+            'bool[]': ["=", "any", "@>", "&&"],
             date: ["=", "!=", ">", ">=", "<", "<="],
-            'date[]': [],
+            'date[]': ["=", "any", "@>", "&&"],
             time: ["=", "!=", ">", ">=", "<", "<="],
-            'time[]': [],
+            'time[]': ["=", "any", "@>", "&&"],
             timestamp: ["=", "!=", ">", ">=", "<", "<="],
-            'timestamp[]': [],
+            'timestamp[]': ["=", "any", "@>", "&&"],
             json: [],
             'json[]': [],
             jsonb: [],
@@ -141,8 +141,14 @@ export default class WhereExpression {
             }
         }
 
-        if (leftColumn.type.endsWith("[]")) {
-            return this.createExpression(leftColumn, operator, right, varLength);
+        const isColumnRight = right !== null && typeof right === 'object' && 'model' in right && 'name' in right;
+        const isArrayColumnLeft = leftColumn.type.endsWith("[]");
+        if (isArrayColumnLeft) {
+            if (isColumnRight) {
+                return this.createExpressionArrayColumn(leftColumn, operator, right, varLength);
+            } else {
+                return this.createExpressionArrayValue(leftColumn, operator, right, varLength);
+            }
         } else {
             return this.createExpression(leftColumn, operator, right, varLength);
         }
@@ -176,8 +182,9 @@ export default class WhereExpression {
         if (right !== null && typeof right === 'object' && 'model' in right && 'name' in right) {
             const rightColumn = right.model.getColumn(right.name);
 
+            // 型の不一致エラーメッセージを改善
             if (leftColumn.type !== rightColumn.type) {
-                throw new Error(`The types of [${leftColumn.tableName}].[${leftColumn.columnName}] and [${rightColumn.tableName}].[${rightColumn.columnName}] are different.`);
+                throw new Error(`Type mismatch: column [${leftColumn.tableName}].[${leftColumn.columnName}] (${leftColumn.type}) and [${rightColumn.tableName}].[${rightColumn.columnName}] (${rightColumn.type}) must be the same type.`);
             }
 
             // LIKE operators are different, so handle separately
@@ -224,37 +231,162 @@ export default class WhereExpression {
 
     private static createExpressionArrayValue(leftColumn: TColumnDetail, operator: TOperator, right: any, varLength: number) : TQuery {
 
-        // ValidateValueUtil.validateValue(leftColumn, right);
-        // LIKE operators are different, so handle separately
-        // switch (operator) {
-        //     case 'like':
-        //     case 'ilike':
-        //         return {
-        //             sql: `${leftColumn.expression} ${operator} $${varLength}`,
-        //             vars: [`%${right}%`]
-        //         }
-        //     case 'h2f_like': // half to full like
-        //     case 'h2f_ilike': // half to full ilike
-        //         return {
-        //             sql: `${this.makeSqlReplaceHalfToFull(leftColumn.expression)} ${operator.replace("h2f_", "")} ${this.makeSqlReplaceHalfToFull(`$${varLength}`)}`,
-        //             vars: [`%${right}%`]
-        //         }
-        // }
+        // バリデーションチェック
+        switch (operator) {
+            case 'any':
+                switch (leftColumn.type) {
+                    case 'integer[]':
+                        if (ValidateValueUtil.isErrorInteger(right)) {
+                            throw new Error(`Expected integer value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'real[]':
+                        if (ValidateValueUtil.isErrorReal(right)) {
+                            throw new Error(`Expected numeric value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'string[]':
+                        if (ValidateValueUtil.isErrorString(right)) {
+                            throw new Error(`Expected string value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'uuid[]':
+                        if (ValidateValueUtil.isErrorUUID(right)) {
+                            throw new Error(`Expected UUID value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'bool[]':
+                        if (ValidateValueUtil.isErrorBool(right)) {
+                            throw new Error(`Expected boolean value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'date[]':
+                        if (ValidateValueUtil.isErrorDate(right)) {
+                            throw new Error(`Expected date value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'time[]':
+                        if (ValidateValueUtil.isErrorTime(right)) {
+                            throw new Error(`Expected time value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                    case 'timestamp[]':
+                        if (ValidateValueUtil.isErrorTimestamp(right)) {
+                            throw new Error(`Expected timestamp value for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                        }
+                        break;
+                }
+                break;
+            case '=':
+            case '@>':
+            case '&&':
+                if (Array.isArray(right) === false) {
+                    throw new Error(`Expected array format for array column (${leftColumn.type}), but received: ${JSON.stringify(right)}`);
+                }
+
+                for (const value of right) {
+                    switch (leftColumn.type) {
+                        case 'integer[]':
+                            if (ValidateValueUtil.isErrorInteger(value)) {
+                                throw new Error(`Expected integer value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'real[]':
+                            if (ValidateValueUtil.isErrorReal(value)) {
+                                throw new Error(`Expected numeric value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'string[]':
+                            if (ValidateValueUtil.isErrorString(value)) {
+                                throw new Error(`Expected string value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'uuid[]':
+                            if (ValidateValueUtil.isErrorUUID(value)) {
+                                throw new Error(`Expected UUID value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'bool[]':
+                            if (ValidateValueUtil.isErrorBool(value)) {
+                                throw new Error(`Expected boolean value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'date[]':
+                            if (ValidateValueUtil.isErrorDate(value)) {
+                                throw new Error(`Expected date value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'time[]':
+                            if (ValidateValueUtil.isErrorTime(value)) {
+                                throw new Error(`Expected time value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                        case 'timestamp[]':
+                            if (ValidateValueUtil.isErrorTimestamp(value)) {
+                                throw new Error(`Expected timestamp value in array element, but received: ${JSON.stringify(value)}`);
+                            }
+                            break;
+                    }
+                }
+                break;
+            default:
+                throw new Error(`Unsupported operator '${operator}' for array column operations.`);
+        }
 
         switch (operator) {
             case '=':
-                // バリデーションチェックをする
-                
+            case '@>':
+            case '&&':
                 return {
                     expression: `${leftColumn.expression} ${operator} $${varLength}`,
                     vars: [right]
                 }
+            case 'any':
+                return {
+                    expression: `$${varLength} = ANY(${leftColumn.expression})`,
+                    vars: [right]
+                }
         }
+    }
 
+    private static createExpressionArrayColumn(leftColumn: TColumnDetail, operator: TOperator, right: TColumnInfo, varLength: number) : TQuery {
 
-        return {
-            expression: `${leftColumn.expression} ${operator} $${varLength}`,
-            vars: [right]
+        const rightColumn = right.model.getColumn(right.name);
+
+        // バリデーションチェック
+        switch (operator) {
+            case 'any':
+                // any演算子の場合
+                if (leftColumn.type !== rightColumn.type.replace('[]', '')) {
+                    throw new Error(`Type mismatch: array column [${leftColumn.tableName}].[${leftColumn.columnName}] (${leftColumn.type}) and scalar column [${rightColumn.tableName}].[${rightColumn.columnName}] (${rightColumn.type}) are incompatible for ANY operation.`);
+                }
+                break;
+            case '=':
+            case '@>':
+            case '&&':
+                // 配列演算子の場合
+                if (leftColumn.type !== rightColumn.type) {
+                    throw new Error(`Type mismatch: array columns [${leftColumn.tableName}].[${leftColumn.columnName}] (${leftColumn.type}) and [${rightColumn.tableName}].[${rightColumn.columnName}] (${rightColumn.type}) must be the same type.`);
+                }
+                break;
+            default:
+                // サポートされていない演算子
+                throw new Error(`Operator '${operator}' is not supported for array column operations. Supported operators: =, @>, &&, ANY`);
+        }
+
+        switch (operator) {
+            case '=':
+            case '@>':
+            case '&&':
+                return {
+                    expression: `${leftColumn.expression} ${operator} $${rightColumn.expression}`,
+                    vars: []
+                }
+            case 'any':
+                return {
+                    expression: `$${rightColumn.expression} = ANY(${leftColumn.expression})`,
+                    vars: []
+                }
         }
     }
 

package/src/models/Type.ts

@@ -47,7 +47,7 @@ export type TColumnDetail = TColumn & {
     expression: string
 }
 
-export type TOperator = "=" | "!=" | ">" | ">=" | "<" | "<=" | "like" | "ilike" | "h2f_like" | "h2f_ilike" | "in" | "not in";
+export type TOperator = "=" | "!=" | ">" | ">=" | "<" | "<=" | "like" | "ilike" | "h2f_like" | "h2f_ilike" | "in" | "not in" | "any" | "@>" | "&&";
 export type TColumnInfo = { model: TableModel, name: string }
 export type TQuery = {expression: string, vars?: Array<any>};
 export type TSelectExpression = { expression: string, alias: string }

package/src/reqestResponse/ReqResType.ts

@@ -151,62 +151,6 @@ export default class ReqResType {
         }
     }
 
-    /**
-     * 値がメールアドレス形式であるかどうかを検証します
-     * Validates if the given value is in the format of an email address
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がメールアドレス形式であるかどうか, Whether the value is in the format of an email address
-     */
-    protected isMail(value: any) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-
-        const pattern = new RegExp('^[a-zA-Z0-9_%+-]+([.][a-zA-Z0-9_%+-]+)*@[a-zA-Z0-9]+([-.]?[a-zA-Z0-9]+)*\\.[a-zA-Z]{2,}$');
-        return pattern.test(value);
-    }
-
-    /**
-     * 値がHTTPS URLであるかどうかを検証します
-     * Validates if the given value is an HTTPS URL
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がHTTPS URLであるかどうか, Whether the value is an HTTPS URL
-     */
-    protected isHttps(value: any) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-
-        const urlPattern = new RegExp('^(https?:\\/\\/[^\\s/$.?#].[^\\s]*)$');
-        return urlPattern.test(value);
-    }
-
-    /**
-     * 値がBase64形式であるかどうかを検証します
-     * Validates if the given value is in Base64 format
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がBase64形式であるかどうか, Whether the value is in Base64 format
-     */
-    protected isBase64(value: any) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-        
-        // base64は4倍の長さである必要がある
-        if (value.length % 4 !== 0) {
-            return false;
-        }
-        
-        // 基本的なbase64パターン
-        // 使用可能な文字
-        // ・ アルファベット（A-Z, a-z）
-        // ・ 数字（0-9）
-        // ・ +と/（基本文字）
-        // ・ =（パディング文字）
-        const base64Pattern = /^[A-Za-z0-9+/]*={0,2}$/;
-        return base64Pattern.test(value);
-    }
-
     /**
      * プロパティの型をSwagger形式に変換します
      * Converts the property type to Swagger format

package/src/reqestResponse/RequestType.ts

@@ -2,6 +2,7 @@ import { Request } from 'express';
 import ReqResType, { EnumType, PrimitiveType, PropertyType } from "./ReqResType";
 import { InputErrorException } from '../exceptions/Exception';
 import StringUtil from '../Utils/StringUtil';
+import { ValidateStringUtil } from 'type-utils-n-daira';
 
 // エラーメッセージの型定義
 export interface ErrorMessageType {
@@ -575,7 +576,7 @@ export class RequestType extends ReqResType {
                 this.throwInputError(isRequestBody ? "UUID_21" : "UUID_91", keys, value);
             case 'mail':
             case 'mail?':
-                if (this.isMail(value)) {
+                if (ValidateStringUtil.isMail(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "MAIL_21" : "MAIL_91", keys, value);
@@ -611,13 +612,13 @@ export class RequestType extends ReqResType {
                 return value.replace('T', ' ');
             case 'https':
             case 'https?':
-                if (this.isHttps(value)) {
+                if (ValidateStringUtil.isHttps(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "HTTPS_21" : "HTTPS_91", keys, value);
             case 'base64':
             case 'base64?':
-                if (this.isBase64(value)) {
+                if (ValidateStringUtil.isBase64(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "BASE64_21" : "BASE64_91", keys, value);

package/src/reqestResponse/ResponseType.ts

@@ -1,3 +1,4 @@
+import { ValidateStringUtil } from "type-utils-n-daira";
 import StringUtil from "../Utils/StringUtil";
 import ReqResType from "./ReqResType";
 
@@ -226,7 +227,7 @@ export class ResponseType extends ReqResType {
                 return undefined;
             case 'mail':
             case 'mail?':
-                if (this.isMail(value)) {
+                if (ValidateStringUtil.isMail(value)) {
                     return value;
                 }
                 return undefined;
@@ -274,13 +275,13 @@ export class ResponseType extends ReqResType {
                 return undefined;
             case 'https':
             case 'https?':
-                if (this.isHttps(value)) {
+                if (ValidateStringUtil.isHttps(value)) {
                     return value;
                 }
                 return undefined;
             case 'base64':
             case 'base64?':
-                if (this.isBase64(value)) {
+                if (ValidateStringUtil.isBase64(value)) {
                     return value;
                 }
                 return undefined;