pg-mvc-service 2.0.105 → 2.0.108

package/dist/reqestResponse/ResponseType.js

@@ -382,16 +382,46 @@ class ResponseType extends ReqResType_1.default {
             code: '',
             description: 'サーバー内部エラー（予期せぬエラー）'
         });
-        for (const error of errorList) {
-            ymlString += `
-        '${error.code}':
-          description: 【エラー】${error.description}
+        // statusごとにグルーピング
+        const grouped = {};
+        for (const e of errorList) {
+            if (grouped[e.status] === undefined) {
+                grouped[e.status] = [];
+            }
+            grouped[e.status].push(e);
+        }
+        // 出力順（存在するものだけ出す）
+        const statusOrder = [400, 401, 404, 409, 422, 500];
+        for (const status of statusOrder) {
+            const list = grouped[status];
+            if (!list || list.length === 0) {
+                continue;
+            }
+            const descIndentJoin = '\n          ';
+            if (list.length === 1) {
+                // 単一エラーは1行説明
+                ymlString += `
+        '${status}':
+          description: 【エラー】${list[0].description}
           content:
             application/json:
               schema:
                 type: object
                 properties:`;
-            if ([400, 404, 409, 422].includes(error.status)) {
+            }
+            else {
+                // 複数エラーは箇条書き
+                const bullets = list.map(e => `- ${e.code !== '' ? `${e.code}: ` : ''}${e.description}`).join(descIndentJoin);
+                ymlString += `
+        '${status}':
+          description: |${descIndentJoin}【エラー】${descIndentJoin}${bullets}
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:`;
+            }
+            if ([400, 404, 409, 422].includes(status)) {
                 ymlString += `
                   errorCode:
                     type: string
@@ -400,13 +430,13 @@ class ResponseType extends ReqResType_1.default {
                     type: string
                     description: エラーメッセージ`;
             }
-            else if (error.status === 401) {
+            else if (status === 401) {
                 ymlString += `
                   message:
                     type: string
                     description: Authentication expired. Please login again.`;
             }
-            else if (error.status === 500) {
+            else if (status === 500) {
                 ymlString += `
                   message:
                     type: string

package/package.json

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

package/src/reqestResponse/ResponseType.ts

@@ -424,16 +424,49 @@ export class ResponseType extends ReqResType {
             code: '',
             description: 'サーバー内部エラー（予期せぬエラー）'
         })
-        for (const error of errorList) {
-            ymlString += `
-        '${error.code}':
-          description: 【エラー】${error.description}
+
+        // statusごとにグルーピング
+        const grouped: { [status: number]: IError[] } = {};
+        for (const e of errorList) {
+            if (grouped[e.status] === undefined) {
+                grouped[e.status] = [];
+            }
+            grouped[e.status].push(e);
+        }
+
+        // 出力順（存在するものだけ出す）
+        const statusOrder: Array<IError['status']> = [400, 401, 404, 409, 422, 500];
+
+        for (const status of statusOrder) {
+            const list = grouped[status];
+            if (!list || list.length === 0) { continue; }
+
+            const descIndentJoin = '\n          ';
+
+            if (list.length === 1) {
+                // 単一エラーは1行説明
+                ymlString += `
+        '${status}':
+          description: 【エラー】${list[0].description}
           content:
             application/json:
               schema:
                 type: object
                 properties:`;
-            if ([400, 404, 409, 422].includes(error.status)) {
+            } else {
+                // 複数エラーは箇条書き
+                const bullets = list.map(e => `- ${e.code !== '' ? `${e.code}: ` : ''}${e.description}`).join(descIndentJoin);
+                ymlString += `
+        '${status}':
+          description: |${descIndentJoin}【エラー】${descIndentJoin}${bullets}
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:`;
+            }
+
+            if ([400, 404, 409, 422].includes(status)) {
                 ymlString += `
                   errorCode:
                     type: string
@@ -441,12 +474,12 @@ export class ResponseType extends ReqResType {
                   errorMessage:
                     type: string
                     description: エラーメッセージ`;
-            } else if (error.status === 401) {
+            } else if (status === 401) {
                 ymlString += `
                   message:
                     type: string
                     description: Authentication expired. Please login again.`;
-            } else if (error.status === 500) {
+            } else if (status === 500) {
                 ymlString += `
                   message:
                     type: string