@midwayjs/swagger 3.12.4 → 3.12.7

package/dist/swaggerExplorer.js

@@ -611,19 +611,26 @@ let SwaggerExplorer = class SwaggerExplorer {
      * @param clzz
      */
     parseClzz(clzz) {
+        var _a, _b, _c;
         if (this.documentBuilder.getSchema(clzz.name)) {
             return this.documentBuilder.getSchema(clzz.name);
         }
+        // 解析 ApiExtraModel
         this.parseExtraModel(clzz);
+        // 解析类上的 ApiProperty
         const props = (0, core_1.getClassExtendedMetadata)(core_1.INJECT_CUSTOM_PROPERTY, clzz);
         const tt = {
             type: 'object',
             properties: {},
         };
+        // 先添加到 schema，防止递归循环
+        this.documentBuilder.addSchema({
+            [clzz.name]: tt,
+        });
         if (props) {
-            Object.keys(props).forEach(key => {
-                var _a, _b, _c;
-                const metadata = props[key].metadata;
+            for (const key of Object.keys(props)) {
+                const metadata = {};
+                Object.assign(metadata, props[key].metadata);
                 if (typeof (metadata === null || metadata === void 0 ? void 0 : metadata.required) !== undefined) {
                     if (metadata === null || metadata === void 0 ? void 0 : metadata.required) {
                         if (!tt.required) {
@@ -642,7 +649,7 @@ let SwaggerExplorer = class SwaggerExplorer {
                     if (metadata === null || metadata === void 0 ? void 0 : metadata.description) {
                         tt.properties[key].description = metadata === null || metadata === void 0 ? void 0 : metadata.description;
                     }
-                    return;
+                    continue;
                 }
                 if ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.items) === null || _a === void 0 ? void 0 : _a.enum) {
                     tt.properties[key] = {
@@ -653,7 +660,7 @@ let SwaggerExplorer = class SwaggerExplorer {
                     if (metadata === null || metadata === void 0 ? void 0 : metadata.description) {
                         tt.properties[key].description = metadata === null || metadata === void 0 ? void 0 : metadata.description;
                     }
-                    return;
+                    continue;
                 }
                 let isArray = false;
                 let currentType = parseTypeSchema(metadata === null || metadata === void 0 ? void 0 : metadata.type);
@@ -671,7 +678,7 @@ let SwaggerExplorer = class SwaggerExplorer {
                         tt.properties[key].oneOf.push(this.parseSubPropertyType(meta));
                     });
                     metadata === null || metadata === void 0 ? true : delete metadata.oneOf;
-                    return;
+                    continue;
                 }
                 if (core_1.Types.isClass(currentType)) {
                     this.parseClzz(currentType);
@@ -728,11 +735,8 @@ let SwaggerExplorer = class SwaggerExplorer {
                     }
                 }
                 Object.assign(tt.properties[key], metadata);
-            });
+            }
         }
-        this.documentBuilder.addSchema({
-            [clzz.name]: tt,
-        });
         // just for test
         return tt;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/swagger",
-  "version": "3.12.4",
-  "main": "dist/index",
+  "version": "3.12.7",
+  "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
     "dist/**/*.js",
@@ -12,7 +12,7 @@
     "@midwayjs/core": "^3.12.3",
     "@midwayjs/koa": "^3.12.3",
     "@midwayjs/mock": "^3.12.3",
-    "@midwayjs/validate": "^3.12.3",
+    "@midwayjs/validate": "^3.12.7",
     "swagger-ui-dist": "4.19.1"
   },
   "author": "Kurten Chan <chinkurten@gmail.com>",
@@ -27,5 +27,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "580188456c81fb750921921e8d72906d2728cf6f"
+  "gitHead": "b6dd29791ad4118f53806023b73eb629e948d415"
 }