@midwayjs/swagger 3.9.0 → 3.9.8

package/dist/interfaces/index.d.ts

@@ -159,7 +159,7 @@ export interface TagObject {
 }
 export declare type ExamplesObject = Record<string, ExampleObject | ReferenceObject>;
 export interface ReferenceObject {
-    $ref: string;
+    $ref: string | (() => string);
 }
 export interface SchemaObject {
     nullable?: boolean;

package/dist/swaggerExplorer.js

@@ -216,9 +216,25 @@ let SwaggerExplorer = class SwaggerExplorer {
             }
             if (core_1.Types.isClass(currentType)) {
                 this.parseClzz(currentType);
-                p.schema = {
-                    $ref: '#/components/schemas/' + currentType.name,
-                };
+                if (p.in === 'query') {
+                    // 如果@Query()装饰的 是一个对象，则把该对象的子属性作为多个@Query参数
+                    const schema = this.documentBuilder.getSchema(currentType.name);
+                    Object.keys(schema.properties).forEach(pName => {
+                        const ppt = schema.properties[pName];
+                        const pp = {
+                            name: pName,
+                            in: p.in,
+                        };
+                        this.parseFromParamsToP({ metadata: ppt }, pp);
+                        parameters.push(pp);
+                    });
+                    continue;
+                }
+                else {
+                    p.schema = {
+                        $ref: '#/components/schemas/' + currentType.name,
+                    };
+                }
             }
             else {
                 p.schema = {
@@ -489,7 +505,7 @@ let SwaggerExplorer = class SwaggerExplorer {
      */
     parseClzz(clzz) {
         if (this.documentBuilder.getSchema(clzz.name)) {
-            return;
+            return this.documentBuilder.getSchema(clzz.name);
         }
         this.parseExtraModel(clzz);
         const props = (0, core_1.getClassExtendedMetadata)(core_1.INJECT_CUSTOM_PROPERTY, clzz);
@@ -499,7 +515,7 @@ let SwaggerExplorer = class SwaggerExplorer {
         };
         if (props) {
             Object.keys(props).forEach(key => {
-                var _a, _b;
+                var _a, _b, _c;
                 const 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) {
@@ -533,7 +549,7 @@ let SwaggerExplorer = class SwaggerExplorer {
                     return;
                 }
                 let isArray = false;
-                let currentType = metadata === null || metadata === void 0 ? void 0 : metadata.type;
+                let currentType = parseTypeSchema(metadata === null || metadata === void 0 ? void 0 : metadata.type);
                 metadata === null || metadata === void 0 ? true : delete metadata.type;
                 if (currentType === 'array') {
                     isArray = true;
@@ -561,6 +577,9 @@ let SwaggerExplorer = class SwaggerExplorer {
                     if (isArray) {
                         // 没有配置类型则认为自己配置了 items 内容
                         if (!currentType) {
+                            if ((_c = metadata === null || metadata === void 0 ? void 0 : metadata.items) === null || _c === void 0 ? void 0 : _c['$ref']) {
+                                metadata.items['$ref'] = parseTypeSchema(metadata.items['$ref']);
+                            }
                             tt.properties[key] = {
                                 type: 'array',
                                 items: metadata === null || metadata === void 0 ? void 0 : metadata.items,
@@ -736,4 +755,10 @@ function getNotEmptyValue(...args) {
         }
     }
 }
+function parseTypeSchema(ref) {
+    if (typeof ref === 'function' && !core_1.Types.isClass(ref)) {
+        ref = ref();
+    }
+    return ref;
+}
 //# sourceMappingURL=swaggerExplorer.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/swagger",
-  "version": "3.9.0",
+  "version": "3.9.8",
   "main": "dist/index",
   "typings": "index.d.ts",
   "files": [
@@ -27,5 +27,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "5f6603d2c9606fc6fc7ece71f956e89e394efeee"
+  "gitHead": "19ca43f7cefa3698bec2c7c2d04c4dd8bfdff781"
 }