pg-mvc-service 2.0.128 → 2.1.0

package/dist/Service.js

@@ -41,7 +41,17 @@ class Service {
                 description: 'サーバー内部エラー（予期せぬエラー）'
             }];
     }
-    constructor(request, response) {
+    setResponse(status, data) {
+        var _a, _b;
+        if (this.module === 'express') {
+            (_a = this.res) === null || _a === void 0 ? void 0 : _a.status(status).json(data);
+        }
+        else {
+            (_b = this.c) === null || _b === void 0 ? void 0 : _b.json(data, status);
+        }
+    }
+    constructor(param1, param2) {
+        this.module = 'express';
         this.method = 'GET';
         this.endpoint = '';
         this.apiCode = '';
@@ -49,9 +59,9 @@ class Service {
         this.apiUserAvailable = '';
         this.request = new RequestType_1.RequestType();
         this.response = new ResponseType_1.ResponseType();
-        this.isTest = process.env.NODE_ENV === 'test';
         this.tags = [];
         this.errorList = [];
+        // Context<{ Bindings: Bindings }>
         this.dbUser = process.env.DB_USER;
         this.dbHost = process.env.DB_HOST;
         this.dbName = process.env.DB_DATABASE;
@@ -59,12 +69,26 @@ class Service {
         this.dbPort = process.env.DB_PORT;
         this.dbIsSslConnect = process.env.DB_IS_SSL === 'true';
         this.isExecuteRollback = false;
-        this.req = request;
-        this.res = response;
+        if (param2 !== undefined) {
+            // Express の場合: (request, response)
+            this.module = 'express';
+            this.req = param1;
+            this.res = param2;
+        }
+        else {
+            // Hono の場合: (c)
+            this.module = 'hono';
+            this.c = param1;
+        }
     }
     inintialize() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.request.setRequest(this.req);
+            if (this.module === "express") {
+                yield this.request.setRequest(this.module, this.req);
+            }
+            else {
+                yield this.request.setRequest(this.module, this.c);
+            }
             yield this.checkMaintenance();
             yield this.middleware();
         });
@@ -99,7 +123,7 @@ class Service {
         return __awaiter(this, void 0, void 0, function* () { });
     }
     resSuccess() {
-        this.res.status(200).json(this.response.ResponseData);
+        this.setResponse(200, this.response.ResponseData);
     }
     outputErrorLog(ex) {
         return __awaiter(this, void 0, void 0, function* () { });
@@ -110,61 +134,54 @@ class Service {
             console.error(ex);
         });
         if (ex instanceof Exception_1.AuthException) {
-            this.res.status(401).json({
+            this.setResponse(401, {
                 message: "Authentication expired. Please login again."
             });
             return;
         }
         else if (ex instanceof Exception_1.ForbiddenException) {
-            this.res.status(403).json({
+            this.setResponse(403, {
                 message: 'Forbidden error'
             });
             return;
         }
         else if (ex instanceof Exception_1.InputErrorException) {
-            this.res.status(400).json({
+            this.setResponse(400, {
                 errorCode: `${this.apiCode}-${ex.ErrorId}`,
                 errorMessage: ex.message
             });
             return;
         }
         else if (ex instanceof Exception_1.DbConflictException) {
-            this.res.status(409).json({
+            this.setResponse(409, {
                 errorCode: `${this.apiCode}-${ex.ErrorId}`,
                 errorMessage: ex.message
             });
             return;
         }
         else if (ex instanceof Exception_1.UnprocessableException) {
-            this.res.status(422).json({
+            this.setResponse(422, {
                 errorCode: `${this.apiCode}-${ex.ErrorId}`,
                 errorMessage: ex.message
             });
             return;
         }
         else if (ex instanceof Exception_1.MaintenanceException) {
-            this.res.status(503).json({
+            this.setResponse(503, {
                 errorMessage: ex.message
             });
             return;
         }
         else if (ex instanceof Exception_1.NotFoundException) {
-            this.res.status(404).json({
+            this.setResponse(404, {
                 errorCode: `${this.apiCode}-${ex.ErrorId}`,
                 errorMessage: ex.message
             });
             return;
         }
-        if (this.isTest) {
-            this.res.status(500).json({
-                message: ex.stack
-            });
-        }
-        else {
-            this.res.status(500).json({
-                message: 'Internal server error'
-            });
-        }
+        this.setResponse(500, {
+            message: 'Internal server error'
+        });
         return;
     }
     get Pool() {

package/dist/models/SqlUtils/WhereExpression.js

@@ -388,32 +388,30 @@ class WhereExpression {
                 japanese: true
             };
         }
-        const objs = {};
+        let sql = expression;
+        // 1. ひらがな → カタカナ (TRANSLATEを使用)
+        // NORMALIZEはひらがなをカタカナにはしないので、これは残します
         if ((replaceOption === null || replaceOption === void 0 ? void 0 : replaceOption.hiraganaToKatakana) === true) {
-            objs['あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをんゔがぎぐげござじずぜぞだぢづでどばびぶべぼぱぴぷぺぽぁぃぅぇぉゃゅょっー、。・「」゛゜']
-                = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンヴガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォャュョッー、。・「」゛゜';
+            const from = 'あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをんゔがぎぐげござじずぜぞだぢづでどばびぶべぼぱぴぷぺぽぁぃぅぇぉゃゅょっー、。・「」゛゜';
+            const to = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンヴガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォャュョッー、。・「」゛゜';
+            sql = `TRANSLATE(${sql}, '${from}', '${to}')`;
         }
+        // 2. 漢数字 → 算用数字 (TRANSLATEを使用)
+        // これもNORMALIZEの管轄外なので残しますが、1つのTRANSLATEにまとめます（SQLが速くなります）
         if (((_a = replaceOption === null || replaceOption === void 0 ? void 0 : replaceOption.numeric) === null || _a === void 0 ? void 0 : _a.japanese) === true) {
-            objs['零〇'] = '00';
-            objs['一壱弌'] = '111';
-            objs['二弐'] = '22';
-            objs['三参'] = '33';
-            objs['四肆'] = '44';
-            objs['五伍'] = '55';
-            objs['六陸'] = '66';
-            objs['七漆'] = '77';
-            objs['八捌'] = '88';
-            objs['九玖'] = '99';
+            const from = '零〇一壱弌二弐三参四肆五伍六陸七漆八捌九玖';
+            const to = '001112233445566778899';
+            sql = `TRANSLATE(${sql}, '${from}', '${to}')`;
         }
+        // 3. 全角半角の統一 (ここを NORMALIZE に変更！)
+        // 元の halfToFull ブロックを削除し、この処理に置き換えます
         if ((replaceOption === null || replaceOption === void 0 ? void 0 : replaceOption.halfToFull) === true) {
-            objs['０１２３４５６７８９'] = '0123456789';
-            objs['アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンヴガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォャュョッー、。・「」゛゜']
-                = 'ｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜｦﾝｳﾞｶﾞｷﾞｸﾞｹﾞｺﾞｻﾞｼﾞｽﾞｾﾞｿﾞﾀﾞﾁﾞﾂﾞﾃﾞﾄﾞﾊﾊﾋﾞﾌﾞﾍﾞﾎﾞﾊﾟﾋﾟﾌﾟﾍﾟﾎﾟｧｨｩｪｫｬｭｮｯｰ､｡･｢｣ ﾞ ﾟ';
-            objs['ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ'] = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-            objs['ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖｗｘｙｚ'] = 'abcdefghijklmnopqrstuvwxyz';
+            // NORMALIZE(..., NFKC) は以下の処理を自動で行います
+            // - 全角英数字 → 半角英数字 (例: Ａ → A)
+            // - 半角カナ → 全角カナ (例: ｱ → ア)
+            // - 濁点の結合 (例: ｶ + ﾞ → ガ)
+            sql = `NORMALIZE(${sql}, NFKC)`;
         }
-        let sql = expression;
-        Object.keys(objs).forEach(key => sql = `TRANSLATE(${sql} ,'${key}','${objs[key]}')`);
         return sql;
     }
 }

package/dist/reqestResponse/RequestType.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -91,7 +100,6 @@ class RequestType extends ReqResType_1.default {
         }
         return this.headers;
     }
-    get RemoteAddress() { return this.remoteAddress; }
     get Authorization() {
         var _a;
         const authorization = (_a = this.Headers['authorization']) !== null && _a !== void 0 ? _a : '';
@@ -100,23 +108,41 @@ class RequestType extends ReqResType_1.default {
         }
         return authorization.replace(/^Bearer\s/, '');
     }
-    setRequest(request) {
-        var _a, _b, _c;
-        this.createBody(request);
-        this.params = {};
-        if (request.params !== undefined) {
-            for (const [key, value] of Object.entries(request.params)) {
-                const index = this.paramProperties.findIndex(property => property.key === key);
-                if (index === -1) {
-                    throw new Error(`${key} is not set in paramProperties.`);
+    setRequest(module, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
+            yield this.createBody(module, request);
+            this.params = {};
+            if (module === 'express') {
+                const req = request;
+                if (req.params !== undefined) {
+                    for (const [key, value] of Object.entries(req.params)) {
+                        const index = this.paramProperties.findIndex((p) => p.key === key);
+                        if (index === -1)
+                            throw new Error(`${key} is not set in paramProperties.`);
+                        const prop = this.paramProperties[index];
+                        this.params[key] = this.convertValue(prop, value, [key, `(pathIndex: ${index})`], false);
+                    }
                 }
-                const property = this.paramProperties[index];
-                this.params[key] = this.convertValue(property, value, [key, `(pathIndex: ${index})`], false);
+                this.params = (_a = req.params) !== null && _a !== void 0 ? _a : {};
+                this.headers = (_b = req.headers) !== null && _b !== void 0 ? _b : {};
             }
-        }
-        this.params = (_a = request.params) !== null && _a !== void 0 ? _a : {};
-        this.headers = (_b = request.headers) !== null && _b !== void 0 ? _b : {};
-        this.remoteAddress = (_c = request.socket) === null || _c === void 0 ? void 0 : _c.remoteAddress;
+            else {
+                const c = request;
+                for (let index = 0; index < this.paramProperties.length; index++) {
+                    const prop = this.paramProperties[index];
+                    const value = (_d = (_c = c.req).param) === null || _d === void 0 ? void 0 : _d.call(_c, prop.key); // hono の param()
+                    if (value !== undefined) {
+                        this.params[prop.key] = this.convertValue(prop, value, [prop.key, `(pathIndex: ${index})`], false);
+                    }
+                }
+                const headersObj = {};
+                c.req.raw.headers.forEach((v, k) => {
+                    headersObj[k.toLowerCase()] = v;
+                });
+                this.headers = headersObj;
+            }
+        });
     }
     createErrorMessage(code, keys, value) {
         var _a, _b, _c, _d, _e;
@@ -240,179 +266,198 @@ class RequestType extends ReqResType_1.default {
      * @param {Object} body - Request body object, リクエストボディオブジェクト
      * @throws {InputErrorException} Thrown when the input value is invalid, 入力値が不正な場合にスローされます
      */
-    createBody(request) {
-        if (request.method === 'GET' || request.method === 'DELETE') {
-            this.data = request.query;
-        }
-        else {
-            this.data = request.body;
-        }
-        if (this.data === undefined) {
-            this.data = {};
-        }
-        for (const key of Object.keys(this.properties)) {
-            // NULLチェック
-            if (key in this.data === false || this.data[key] === null || this.data[key] === "") {
-                if (this.properties[key].type === 'array' && ['GET', 'DELETE'].includes(request.method)) {
-                    // GET,DELETEメソッドの場合、?array=1&array=2で配列となるが、
-                    // ?array=1のみで終わる場合は配列にならないため、直接配列にしている
-                    // この処理で空文字やnullが入った場合の対処をここで行う
-                    const itemProperty = this.properties[key].item;
-                    if (itemProperty.type.endsWith('?')) {
-                        const tempValue = this.data[key];
-                        this.data[key] = [];
-                        if (tempValue !== undefined) {
-                            if (itemProperty.type === 'string?') {
-                                this.data[key][0] = tempValue;
-                            }
-                            else {
-                                this.data[key][0] = null;
-                            }
-                        }
-                        continue;
-                    }
-                    else {
-                        this.throwInputError("REQUIRE_00", [key, 0], "");
-                    }
+    createBody(module, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let method = '';
+            if (module === 'express') {
+                const req = request;
+                method = req.method;
+                if (method === 'GET' || method === 'DELETE') {
+                    this.data = req.query;
                 }
                 else {
-                    if (this.properties[key].type.endsWith('?')) {
-                        this.changeBody([key], null);
-                        continue;
-                    }
-                    else {
-                        this.throwInputError("REQUIRE_01", [key], "");
-                    }
+                    this.data = req.body;
                 }
             }
-            const value = this.data[key];
-            switch (this.properties[key].type) {
-                case 'object':
-                case 'object?':
-                    if (typeof value === 'object') {
-                        this.setObject([key], value);
-                    }
-                    else {
-                        this.throwInputError("OBJECT_01", [key], value);
-                    }
-                    break;
-                case 'array':
-                case 'array?':
-                    if (Array.isArray(value)) {
-                        this.setArray([key], value);
+            else {
+                const c = request;
+                method = c.req.method;
+                if (method === 'GET' || method === 'DELETE') {
+                    const url = new URL(c.req.url);
+                    this.data = Object.fromEntries(url.searchParams.entries());
+                }
+                else {
+                    // JSON を想定（form 等なら parseBody() を使う）
+                    this.data = yield c.req.json();
+                }
+            }
+            if (this.data === undefined) {
+                this.data = {};
+            }
+            for (const key of Object.keys(this.properties)) {
+                // NULLチェック
+                if (key in this.data === false || this.data[key] === null || this.data[key] === "") {
+                    if (this.properties[key].type === 'array' && ['GET', 'DELETE'].includes(method)) {
+                        // GET,DELETEメソッドの場合、?array=1&array=2で配列となるが、
+                        // ?array=1のみで終わる場合は配列にならないため、直接配列にしている
+                        // この処理で空文字やnullが入った場合の対処をここで行う
+                        const itemProperty = this.properties[key].item;
+                        if (itemProperty.type.endsWith('?')) {
+                            const tempValue = this.data[key];
+                            this.data[key] = [];
+                            if (tempValue !== undefined) {
+                                if (itemProperty.type === 'string?') {
+                                    this.data[key][0] = tempValue;
+                                }
+                                else {
+                                    this.data[key][0] = null;
+                                }
+                            }
+                            continue;
+                        }
+                        else {
+                            this.throwInputError("REQUIRE_00", [key, 0], "");
+                        }
                     }
                     else {
-                        if (request.method === 'GET' || request.method === 'DELETE') {
-                            // GET,DELETEメソッドの場合、?array=1&array=2で配列となるが、
-                            // ?array=1のみで終わる場合は配列にならないため、直接配列にしている
-                            const type = this.properties[key].item.type;
-                            if (type === 'object' || type === 'object?' || type === 'array' || type === 'array?' || type === 'map' || type === 'map?') {
-                                throw new Error("GETまたはDELETEメソッドでは配列型にobject, array, mapを使用することはできません。");
-                            }
-                            if (type === 'enum' || type === 'enum?') {
-                                const tempProp = {
-                                    type: type,
-                                    description: this.properties[key].item.description,
-                                    enumType: this.properties[key].item.enumType,
-                                    enums: this.properties[key].item.enums,
-                                };
-                                this.data[key] = [this.convertValue(tempProp, value, [key, 0], true)];
-                            }
-                            else if (type === 'string' || type === 'string?') {
-                                const tempProp = {
-                                    type: type,
-                                    description: this.properties[key].item.description,
-                                    maxLength: this.properties[key].item.maxLength,
-                                    regExp: this.properties[key].item.regExp
-                                };
-                                this.data[key] = [this.convertValue(tempProp, value, [key, 0], true)];
-                            }
-                            else if (type === 'number' || type === 'number?') {
-                                const tempProp = {
-                                    type: type,
-                                    description: this.properties[key].item.description,
-                                    max: this.properties[key].item.max,
-                                    min: this.properties[key].item.min,
-                                };
-                                this.data[key] = [this.convertValue(tempProp, value, [key, 0], true)];
-                            }
-                            else {
-                                const tempProp = {
-                                    type: type,
-                                    description: this.properties[key].item.description
-                                };
-                                this.data[key] = [this.convertValue(tempProp, value, [key, 0], true)];
-                            }
+                        if (this.properties[key].type.endsWith('?')) {
+                            this.changeBody([key], null);
+                            continue;
                         }
                         else {
-                            this.throwInputError("ARRAY_01", [key], value);
+                            this.throwInputError("REQUIRE_01", [key], "");
                         }
                     }
-                    break;
-                case 'map':
-                case 'map?':
-                    // tODO : ここは共通化したい
-                    const mapData = {};
-                    for (const [mapKey, mapValue] of Object.entries(value)) {
-                        switch (this.properties[key].mapType) {
-                            case 'number':
-                                if (this.isNumber(mapValue) === false) {
-                                    this.throwInputError("MAP_01", [key], value);
+                }
+                const value = this.data[key];
+                switch (this.properties[key].type) {
+                    case 'object':
+                    case 'object?':
+                        if (typeof value === 'object') {
+                            this.setObject([key], value);
+                        }
+                        else {
+                            this.throwInputError("OBJECT_01", [key], value);
+                        }
+                        break;
+                    case 'array':
+                    case 'array?':
+                        if (Array.isArray(value)) {
+                            this.setArray([key], value);
+                        }
+                        else {
+                            if (method === 'GET' || method === 'DELETE') {
+                                // GET,DELETEメソッドの場合、?array=1&array=2で配列となるが、
+                                // ?array=1のみで終わる場合は配列にならないため、直接配列にしている
+                                const type = this.properties[key].item.type;
+                                if (type === 'object' || type === 'object?' || type === 'array' || type === 'array?' || type === 'map' || type === 'map?') {
+                                    throw new Error("GETまたはDELETEメソッドでは配列型にobject, array, mapを使用することはできません。");
                                 }
-                                mapData[mapKey] = Number(mapValue);
-                                break;
-                            case 'string':
-                                switch (typeof mapValue) {
-                                    case 'number':
-                                        mapData[mapKey] = mapValue.toString();
-                                        break;
-                                    case 'string':
-                                        mapData[mapKey] = mapValue;
-                                        break;
-                                    default:
-                                        this.throwInputError("MAP_02", [key], value);
+                                if (type === 'enum' || type === 'enum?') {
+                                    const tempProp = {
+                                        type: type,
+                                        description: this.properties[key].item.description,
+                                        enumType: this.properties[key].item.enumType,
+                                        enums: this.properties[key].item.enums,
+                                    };
+                                    this.data[key] = [this.convertValue(tempProp, value, [key, 0], true)];
                                 }
-                                break;
-                            case 'bool':
-                                switch (typeof mapValue) {
-                                    case 'boolean':
-                                        mapData[mapKey] = mapValue;
-                                        break;
-                                    case 'number':
-                                        if (mapValue !== 0 && mapValue !== 1) {
-                                            this.throwInputError("MAP_03", [key], mapValue);
-                                        }
-                                        mapData[mapKey] = mapValue === 1;
-                                        break;
-                                    case 'string':
-                                        if (mapValue !== 'true' && mapValue !== 'false') {
-                                            this.throwInputError("MAP_04", [key], mapValue);
-                                        }
-                                        mapData[mapKey] = mapValue === 'true';
-                                        break;
-                                    default:
-                                        this.throwInputError("MAP_05", [key], mapValue);
+                                else if (type === 'string' || type === 'string?') {
+                                    const tempProp = {
+                                        type: type,
+                                        description: this.properties[key].item.description,
+                                        maxLength: this.properties[key].item.maxLength,
+                                        regExp: this.properties[key].item.regExp
+                                    };
+                                    this.data[key] = [this.convertValue(tempProp, value, [key, 0], true)];
                                 }
-                                break;
+                                else if (type === 'number' || type === 'number?') {
+                                    const tempProp = {
+                                        type: type,
+                                        description: this.properties[key].item.description,
+                                        max: this.properties[key].item.max,
+                                        min: this.properties[key].item.min,
+                                    };
+                                    this.data[key] = [this.convertValue(tempProp, value, [key, 0], true)];
+                                }
+                                else {
+                                    const tempProp = {
+                                        type: type,
+                                        description: this.properties[key].item.description
+                                    };
+                                    this.data[key] = [this.convertValue(tempProp, value, [key, 0], true)];
+                                }
+                            }
+                            else {
+                                this.throwInputError("ARRAY_01", [key], value);
+                            }
                         }
-                    }
-                    this.changeBody([key], mapData);
-                    break;
-                case 'enum':
-                case 'enum?':
-                    this.setEnum([key], value);
-                    break;
-                default:
-                    this.convertInput([key], value);
-                    break;
+                        break;
+                    case 'map':
+                    case 'map?':
+                        // tODO : ここは共通化したい
+                        const mapData = {};
+                        for (const [mapKey, mapValue] of Object.entries(value)) {
+                            switch (this.properties[key].mapType) {
+                                case 'number':
+                                    if (this.isNumber(mapValue) === false) {
+                                        this.throwInputError("MAP_01", [key], value);
+                                    }
+                                    mapData[mapKey] = Number(mapValue);
+                                    break;
+                                case 'string':
+                                    switch (typeof mapValue) {
+                                        case 'number':
+                                            mapData[mapKey] = mapValue.toString();
+                                            break;
+                                        case 'string':
+                                            mapData[mapKey] = mapValue;
+                                            break;
+                                        default:
+                                            this.throwInputError("MAP_02", [key], value);
+                                    }
+                                    break;
+                                case 'bool':
+                                    switch (typeof mapValue) {
+                                        case 'boolean':
+                                            mapData[mapKey] = mapValue;
+                                            break;
+                                        case 'number':
+                                            if (mapValue !== 0 && mapValue !== 1) {
+                                                this.throwInputError("MAP_03", [key], mapValue);
+                                            }
+                                            mapData[mapKey] = mapValue === 1;
+                                            break;
+                                        case 'string':
+                                            if (mapValue !== 'true' && mapValue !== 'false') {
+                                                this.throwInputError("MAP_04", [key], mapValue);
+                                            }
+                                            mapData[mapKey] = mapValue === 'true';
+                                            break;
+                                        default:
+                                            this.throwInputError("MAP_05", [key], mapValue);
+                                    }
+                                    break;
+                            }
+                        }
+                        this.changeBody([key], mapData);
+                        break;
+                    case 'enum':
+                    case 'enum?':
+                        this.setEnum([key], value);
+                        break;
+                    default:
+                        this.convertInput([key], value);
+                        break;
+                }
             }
-        }
-        // 不要項目チェック
-        for (const [key, value] of Object.entries(this.data)) {
-            if (key in this.properties === false) {
-                this.throwInputError("UNNECESSARY_01", [key], value);
+            // 不要項目チェック
+            for (const [key, value] of Object.entries(this.data)) {
+                if (key in this.properties === false) {
+                    this.throwInputError("UNNECESSARY_01", [key], value);
+                }
             }
-        }
+        });
     }
     /**
      * Sets the value for an enum type based on the specified keys.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "2.0.128",
+  "version": "2.1.0",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {
@@ -31,6 +31,7 @@
     "@types/express": "5.0.1",
     "axios": "1.10.0",
     "crypto": "1.0.1",
+    "hono": "4.11.2",
     "node-cron": "4.2.1",
     "pdf-lib": "1.17.1",
     "sharp": "0.34.1",

package/src/Service.ts

@@ -1,5 +1,6 @@
 import axios, { AxiosResponse } from "axios";
 import { Request, Response } from 'express';
+import { Hono, Context } from 'hono' // Context を追加
 import { Pool, type PoolClient } from 'pg';
 import { MaintenanceException, AuthException, InputErrorException, ForbiddenException, DbConflictException, UnprocessableException, NotFoundException } from './exceptions/Exception';
 import { RequestType } from './reqestResponse/RequestType';
@@ -10,14 +11,18 @@ import { StringClient } from './clients/StringClient';
 import { EncryptClient } from './clients/EncryptClient';
 import PoolManager from './PoolManager';
 
+type TStatusCode = 200 | 201 | 400 | 401 | 403 | 404 | 409 | 422 | 500 | 503;
+
 export type MethodType = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
 export interface IError {
-    status: 400 | 401 | 404 | 409 | 422 | 500, 
+    status: TStatusCode, 
     code: string;
     description: string; 
 }
 
+
 export class Service {
+    protected readonly module: 'express' | 'hono' = 'express';
     protected readonly method: MethodType = 'GET';
     get Method(): MethodType { return this.method; }
     protected readonly endpoint: string = '';
@@ -33,7 +38,6 @@ export class Service {
     get AuthToken(): string { return this.request.Authorization ?? ''; }
     protected readonly response: ResponseType = new ResponseType();
     get Response(): ResponseType { return this.response }; // swaggerで必要なので、ここだけ宣言
-    protected readonly isTest: boolean = process.env.NODE_ENV === 'test';
     protected readonly tags: Array<string> = [];
     get Tags(): Array<string> { return this.tags; }
     protected readonly errorList: Array<IError> = [];
@@ -45,18 +49,43 @@ export class Service {
         }];
     }
 
-    protected readonly req: Request;
-    protected readonly res: Response;
-    constructor(request: Request, response: Response) {
-        this.req = request;
-        this.res = response;
+    protected readonly req?: Request;
+    protected readonly res?: Response;
+    protected readonly c?: Context;
+    protected setResponse(status: TStatusCode, data: any) {
+        if (this.module === 'express') {
+            this.res?.status(status).json(data);
+        } else {
+            this.c?.json(data, status)
+        }
+    }
+
+    constructor(request: Request, response: Response);
+    constructor(c: Context);
+    constructor(param1: Request | Context, param2?: Response) {
+        if (param2 !== undefined) {
+            // Express の場合: (request, response)
+            this.module = 'express';
+            this.req = param1 as Request;
+            this.res = param2;
+        } else {
+            // Hono の場合: (c)
+            this.module = 'hono';
+            this.c = param1 as Context;
+        }
     }
 
     public async inintialize(): Promise<void> {
-        this.request.setRequest(this.req);
+        if (this.module === "express") {
+            await this.request.setRequest(this.module, this.req as Request);
+        } else {
+            await this.request.setRequest(this.module, this.c as Context);
+        }
+
         await this.checkMaintenance();
         await this.middleware();
     }
+    // Context<{ Bindings: Bindings }>
 
     protected dbUser?: string = process.env.DB_USER;
     protected dbHost?: string = process.env.DB_HOST;
@@ -91,7 +120,7 @@ export class Service {
     protected async middleware(): Promise<void>{ }
 
     public resSuccess(): void {
-        this.res.status(200).json(this.response.ResponseData);
+        this.setResponse(200, this.response.ResponseData);
     }
 
     protected async outputErrorLog(ex: any): Promise<void>{ }
@@ -102,55 +131,49 @@ export class Service {
         });
 
         if (ex instanceof AuthException) {
-            this.res.status(401).json({
+            this.setResponse(401, {
                 message : "Authentication expired. Please login again."
             });
             return;
         } else if (ex instanceof ForbiddenException) {
-            this.res.status(403).json({
+            this.setResponse(403, {
                 message : 'Forbidden error'
             });
             return;
         } else if (ex instanceof InputErrorException) {
-            this.res.status(400).json({
+            this.setResponse(400, {
                 errorCode : `${this.apiCode}-${ex.ErrorId}`,
                 errorMessage : ex.message
             });
             return;
         } else if (ex instanceof DbConflictException) {
-            this.res.status(409).json({
+            this.setResponse(409, {
                 errorCode : `${this.apiCode}-${ex.ErrorId}`,
                 errorMessage : ex.message
             });
             return;
         } else if (ex instanceof UnprocessableException) {
-            this.res.status(422).json({
+            this.setResponse(422, {
                 errorCode : `${this.apiCode}-${ex.ErrorId}`,
                 errorMessage : ex.message
             });
             return;
         } else if (ex instanceof MaintenanceException) {
-            this.res.status(503).json({
+            this.setResponse(503, {
                 errorMessage : ex.message
             });
             return;
         } else if (ex instanceof NotFoundException) {
-            this.res.status(404).json({
+            this.setResponse(404, {
                 errorCode : `${this.apiCode}-${ex.ErrorId}`,
                 errorMessage : ex.message
             });
             return;
         }
 
-        if (this.isTest) {
-            this.res.status(500).json({
-                message : ex.stack
-            });
-        } else {
-            this.res.status(500).json({
-                message : 'Internal server error'
-            });
-        }
+        this.setResponse(500, {
+            message : 'Internal server error'
+        });
 
         return;
     }

package/src/models/SqlUtils/WhereExpression.ts

@@ -423,36 +423,33 @@ export class WhereExpression {
             }
         }
 
-        const objs: { [key: string]: string } = {}
+        let sql = expression;
+        // 1. ひらがな → カタカナ (TRANSLATEを使用)
+        // NORMALIZEはひらがなをカタカナにはしないので、これは残します
         if (replaceOption?.hiraganaToKatakana === true) {
-            objs['あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをんゔがぎぐげござじずぜぞだぢづでどばびぶべぼぱぴぷぺぽぁぃぅぇぉゃゅょっー、。・「」゛゜']
-                = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンヴガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォャュョッー、。・「」゛゜';
+            const from = 'あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをんゔがぎぐげござじずぜぞだぢづでどばびぶべぼぱぴぷぺぽぁぃぅぇぉゃゅょっー、。・「」゛゜';
+            const to   = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンヴガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォャュョッー、。・「」゛゜';
+            sql = `TRANSLATE(${sql}, '${from}', '${to}')`;
         }
 
+        // 2. 漢数字 → 算用数字 (TRANSLATEを使用)
+        // これもNORMALIZEの管轄外なので残しますが、1つのTRANSLATEにまとめます（SQLが速くなります）
         if (replaceOption?.numeric?.japanese === true) {
-            objs['零〇'] = '00';
-            objs['一壱弌'] = '111';
-            objs['二弐'] = '22';
-            objs['三参'] = '33';
-            objs['四肆'] = '44';
-            objs['五伍'] = '55';
-            objs['六陸'] = '66';
-            objs['七漆'] = '77';
-            objs['八捌'] = '88';
-            objs['九玖'] = '99';
+            const from = '零〇一壱弌二弐三参四肆五伍六陸七漆八捌九玖';
+            const to   = '001112233445566778899';
+            sql = `TRANSLATE(${sql}, '${from}', '${to}')`;
         }
 
+        // 3. 全角半角の統一 (ここを NORMALIZE に変更！)
+        // 元の halfToFull ブロックを削除し、この処理に置き換えます
         if (replaceOption?.halfToFull === true) {
-            objs['０１２３４５６７８９'] = '0123456789';
-            objs['アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンヴガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォャュョッー、。・「」゛゜'] 
-                = 'ｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜｦﾝｳﾞｶﾞｷﾞｸﾞｹﾞｺﾞｻﾞｼﾞｽﾞｾﾞｿﾞﾀﾞﾁﾞﾂﾞﾃﾞﾄﾞﾊﾊﾋﾞﾌﾞﾍﾞﾎﾞﾊﾟﾋﾟﾌﾟﾍﾟﾎﾟｧｨｩｪｫｬｭｮｯｰ､｡･｢｣ ﾞ ﾟ';
-            objs['ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ'] = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-            objs['ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖｗｘｙｚ'] = 'abcdefghijklmnopqrstuvwxyz';
+            // NORMALIZE(..., NFKC) は以下の処理を自動で行います
+            // - 全角英数字 → 半角英数字 (例: Ａ → A)
+            // - 半角カナ → 全角カナ (例: ｱ → ア)
+            // - 濁点の結合 (例: ｶ + ﾞ → ガ)
+            sql = `NORMALIZE(${sql}, NFKC)`;
         }
 
-        let sql = expression;
-        Object.keys(objs).forEach(key => sql = `TRANSLATE(${sql} ,'${key}','${objs[key]}')`);
-
         return sql;
     }
 }

package/src/reqestResponse/RequestType.ts

@@ -4,6 +4,7 @@ import { InputErrorException } from '../exceptions/Exception';
 import StringUtil from '../Utils/StringUtil';
 import { ValidateStringUtil } from 'type-utils-n-daira';
 import { IError } from '../Service';
+import { Context } from 'hono';
 
 // エラーメッセージの型定義
 export interface ErrorMessageType {
@@ -115,8 +116,7 @@ export class RequestType extends ReqResType {
         }
         return this.headers;
     }
-    private remoteAddress: string | undefined;
-    get RemoteAddress(): string | undefined { return this.remoteAddress; }
+
     get Authorization(): string | null { 
         const authorization = this.Headers['authorization'] ?? '';
         if (authorization.startsWith('Bearer ') === false) {
@@ -125,24 +125,39 @@ export class RequestType extends ReqResType {
         return authorization.replace(/^Bearer\s/, '');
     }
 
-    public setRequest(request: Request) {
-        this.createBody(request);
+    public async setRequest(module: 'express' | 'hono', request: Request | Context): Promise<void> {
+        await this.createBody(module, request);
 
         this.params = {};
-        if (request.params !== undefined) {
-            for (const [key, value] of Object.entries(request.params)) {
-                const index = this.paramProperties.findIndex(property => property.key === key);
-                if (index === -1) {
-                    throw new Error(`${key} is not set in paramProperties.`);                  
+        if (module === 'express') {
+            const req = request as Request;
+            if (req.params !== undefined) {
+              for (const [key, value] of Object.entries(req.params)) {
+                const index = this.paramProperties.findIndex((p) => p.key === key);
+                if (index === -1) throw new Error(`${key} is not set in paramProperties.`);
+                const prop = this.paramProperties[index];
+                this.params[key] = this.convertValue(prop, value, [key, `(pathIndex: ${index})`], false);
+              }
+            }
+
+            this.params = req.params ?? {};
+            this.headers = req.headers ?? {};
+        } else {
+            const c = request as Context;
+            for (let index = 0; index < this.paramProperties.length; index++) {
+                const prop = this.paramProperties[index];
+                const value = (c.req as any).param?.(prop.key); // hono の param()
+                if (value !== undefined) {
+                this.params[prop.key] = this.convertValue(prop, value, [prop.key, `(pathIndex: ${index})`], false);
                 }
-                const property = this.paramProperties[index];
-                this.params[key] = this.convertValue(property, value, [key, `(pathIndex: ${index})`], false);
             }
-        }
-        this.params = request.params ?? {};
-        this.headers = request.headers ?? {};
 
-        this.remoteAddress = request.socket?.remoteAddress;
+            const headersObj: Record<string, string> = {};
+            c.req.raw.headers.forEach((v, k) => {
+                headersObj[k.toLowerCase()] = v;
+            });
+            this.headers = headersObj as any;
+        }
     }
 
     private createErrorMessage(code: 
@@ -296,13 +311,29 @@ export class RequestType extends ReqResType {
      * @param {Object} body - Request body object, リクエストボディオブジェクト
      * @throws {InputErrorException} Thrown when the input value is invalid, 入力値が不正な場合にスローされます
      */
-    private createBody(request: Request) {
-        if (request.method === 'GET' || request.method === 'DELETE') {
-            this.data = request.query;
+    private async createBody(module: 'express' | 'hono', request: Request | Context): Promise<void> {
+        let method = '';
+        if (module === 'express') {
+            const req = request as Request;
+            method = req.method;
+            if (method === 'GET' || method === 'DELETE') {
+                this.data = req.query;
+            } else {
+                this.data = req.body;
+            }            
         } else {
-            this.data = request.body;
+            const c = request as Context;
+            method = c.req.method;
+            if (method === 'GET' || method === 'DELETE') {
+                const url = new URL(c.req.url);
+                this.data = Object.fromEntries(url.searchParams.entries());
+            } else {
+                // JSON を想定（form 等なら parseBody() を使う）
+                this.data = await c.req.json();
+            }
         }
 
+
         if (this.data === undefined) {
             this.data = {};
         }
@@ -311,7 +342,7 @@ export class RequestType extends ReqResType {
 
             // NULLチェック
             if (key in this.data === false || this.data[key] === null || this.data[key] === "") {
-                if (this.properties[key].type === 'array' && ['GET', 'DELETE'].includes(request.method)) {
+                if (this.properties[key].type === 'array' && ['GET', 'DELETE'].includes(method)) {
                     // GET,DELETEメソッドの場合、?array=1&array=2で配列となるが、
                     // ?array=1のみで終わる場合は配列にならないため、直接配列にしている
                     // この処理で空文字やnullが入った場合の対処をここで行う
@@ -355,7 +386,7 @@ export class RequestType extends ReqResType {
                     if (Array.isArray(value)) {
                         this.setArray([key], value);
                     } else {
-                        if (request.method === 'GET' || request.method === 'DELETE') {
+                        if (method === 'GET' || method === 'DELETE') {
                             // GET,DELETEメソッドの場合、?array=1&array=2で配列となるが、
                             // ?array=1のみで終わる場合は配列にならないため、直接配列にしている
                             const type = this.properties[key].item.type;