pg-mvc-service 2.0.129 → 2.1.1

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/dist/reqestResponse/ResponseType.d.ts

@@ -0,0 +1,85 @@
+import ReqResType from "./ReqResType";
+import { IError } from "../Service";
+export declare class ResponseType extends ReqResType {
+    /**
+     * Property to store response data
+     * レスポンスデータを格納するためのプロパティ
+     */
+    Data: {
+        [key: string]: any;
+    };
+    /**
+     * Convert and retrieve data according to the type definition
+     * 型定義に従ってデータを変換して取得
+     * @returns {Object.<string, any>} Converted data, 変換されたデータ
+     */
+    get ResponseData(): {
+        [key: string]: any;
+    };
+    /**
+     * Retrieve object type data
+     * オブジェクト型のデータを取得
+     * @param {Array.<string|number>} keys - Path to the property, プロパティへのパス
+     * @returns {Object.<string, any>} Retrieved object data, 取得されたオブジェクトデータ
+     */
+    private getObject;
+    /**
+     * Retrieve array type data
+     * 配列型のデータを取得
+     * @param {Array.<string|number>} keys - Path to the property, プロパティへのパス
+     * @returns {Array<any> | undefined} Retrieved array data, 取得された配列データ
+     */
+    private getArray;
+    /**
+ * Retrieve array type data
+ * 配列型のデータを取得
+ * @param {Array.<string|number>} keys - Path to the property, プロパティへのパス
+ * @returns {Array<any> | undefined} Retrieved array data, 取得された配列データ
+ */
+    private getMap;
+    /**
+     * Retrieve data based on the provided keys
+     * 指定されたキーに基づいてデータを取得
+     * @param {Array.<string|number>} keys - Path to the data, データへのパス
+     * @returns {any} Retrieved data, 取得されたデータ
+     */
+    private getData;
+    /**
+     * Retrieve value based on the provided keys
+     * 指定されたキーに基づいて値を取得
+     * @param {Array.<string|number>} keys - Path to the value, 値へのパス
+     * @returns {string | number | boolean | null | undefined} Retrieved value, 取得された値
+     */
+    private getValue;
+    /**
+     * Generates Swagger response definition
+     * Swaggerのレスポンス定義を生成します
+     * @returns {string} Swagger format response definition
+     * Swagger形式のレスポンス定義
+     */
+    createSwagger(errorList: Array<IError>, apiCode: string): string;
+    /**
+     * Generates Swagger properties from object type properties
+     * オブジェクト型のプロパティからSwaggerのプロパティを生成
+     * @param {Array.<string|number>} keys - Path to the properties
+     * プロパティへのパス
+     * @returns {string} Swagger format property definition
+     * Swagger形式のプロパティ定義
+     */
+    private makeSwaggerProperyFromObject;
+    /**
+     * Generates Swagger properties from array type properties
+     * 配列型のプロパティからSwaggerのプロパティを生成
+     * @param {Array.<string|number>} keys - Path to the properties, プロパティへのパス
+     * @returns {string} Swagger format property definition, Swagger形式のプロパティ定義
+     */
+    private makeSwaggerPropertyFromArray;
+    /**
+ * Generates Swagger properties from array type properties
+ * 配列型のプロパティからSwaggerのプロパティを生成
+ * @param {Array.<string|number>} keys - Path to the properties, プロパティへのパス
+ * @returns {string} Swagger format property definition, Swagger形式のプロパティ定義
+ */
+    private makeSwaggerPropertyFromDictionary;
+}
+//# sourceMappingURL=ResponseType.d.ts.map

package/dist/reqestResponse/ResponseType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResponseType.d.ts","sourceRoot":"","sources":["../../src/reqestResponse/ResponseType.ts"],"names":[],"mappings":"AAEA,OAAO,UAA4B,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAIpC,qBAAa,YAAa,SAAQ,UAAU;IAExC;;;OAGG;IACI,IAAI,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAM;IAEvC;;;;OAIG;IACH,IAAI,YAAY,IAAI;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAoCvC;IAED;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IA2CjB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;IAoCZ;;;;;GAKD;IACH,OAAO,CAAC,MAAM;IAqDd;;;;;OAKG;IACH,OAAO,CAAC,OAAO;IAef;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;IAmIhB;;;;;OAKG;IACI,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;IA6EvE;;;;;;;OAOG;IACH,OAAO,CAAC,4BAA4B;IAqCpC;;;;;OAKG;IACH,OAAO,CAAC,4BAA4B;IAgChC;;;;;GAKD;IACH,OAAO,CAAC,iCAAiC;CAU5C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "2.0.129",
+  "version": "2.1.1",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {
@@ -14,6 +14,12 @@
   "author": "Sho Nakadaira",
   "type": "commonjs",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/**/*",
+    "README.md",
+    "package.json"
+  ],
   "scripts": {
     "build": "rm -rf dist/* && tsc",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -31,6 +37,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",