@midwayjs/swagger 3.15.11 → 3.16.1

package/dist/decorators/api-header.decorator.js

@@ -27,7 +27,7 @@ function ApiHeader(options) {
     }
     return (target, key, descriptor) => {
         if (descriptor) {
-            return (0, helpers_1.createParamDecorator)(param, defaultHeaderOptions)(target, key, descriptor);
+            return (0, helpers_1.createMixedDecorator)(constants_1.DECORATORS.API_HEADERS, param)(target, key, descriptor);
         }
         return (0, helpers_1.createMixedDecorator)(constants_1.DECORATORS.API_HEADERS, param)(target, undefined, undefined);
     };

package/dist/swaggerExplorer.d.ts

@@ -14,19 +14,43 @@ export declare class SwaggerExplorer {
      */
     private generateRouteMethod;
     getOperationId(controllerKey: string, webRouter: RouterOption): string;
-    private expandSchemaRef;
     /**
      * 提取参数
      * @param params
      * @param p
      */
-    private parseFromParamsToP;
+    protected parseFromParamsToP(paramMeta: any, p: any): void;
     /**
      * 解析 ApiExtraModel
      * @param clzz
      */
     private parseExtraModel;
     protected parseSubPropertyType(metadata: any): any;
+    protected formatType(metadata: {
+        type: any;
+        items?: any;
+        format?: string;
+        oneOf?: any[];
+        allOf?: any[];
+        anyOf?: any[];
+        not?: any;
+        enum?: any[];
+        properties?: any;
+        additionalProperties?: any;
+        $ref?: any;
+    }): {
+        type: any;
+        items?: any;
+        format?: string;
+        oneOf?: any[];
+        allOf?: any[];
+        anyOf?: any[];
+        not?: any;
+        enum?: any[];
+        properties?: any;
+        additionalProperties?: any;
+        $ref?: any;
+    };
     /**
      * 解析类型的 ApiProperty
      * @param clzz

package/dist/swaggerExplorer.js

@@ -242,7 +242,7 @@ let SwaggerExplorer = class SwaggerExplorer {
      * 构造 router 提取方法
      */
     generateRouteMethod(url, webRouter, paths, metaForMethods, routerArgs, headers, target) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         const operMeta = metaForMethods.filter(item => item.key === constants_1.DECORATORS.API_OPERATION &&
             item.propertyName === webRouter.method)[0];
         let opts = paths[url];
@@ -253,12 +253,13 @@ let SwaggerExplorer = class SwaggerExplorer {
         opts[webRouter.requestMethod] = {
             summary: getNotEmptyValue((_a = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _a === void 0 ? void 0 : _a.summary, webRouter.summary),
             description: getNotEmptyValue((_b = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _b === void 0 ? void 0 : _b.description, webRouter.description),
-            operationId: this.getOperationId(target.name, webRouter),
-            tags: ((_c = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _c === void 0 ? void 0 : _c.tags) || [],
+            operationId: ((_c = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _c === void 0 ? void 0 : _c.operationId) ||
+                this.getOperationId(target.name, webRouter),
+            tags: ((_d = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _d === void 0 ? void 0 : _d.tags) || [],
         };
-        if (((_d = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _d === void 0 ? void 0 : _d.deprecated) != null) {
+        if (((_e = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _e === void 0 ? void 0 : _e.deprecated) != null) {
             opts[webRouter.requestMethod].deprecated =
-                !!((_e = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _e === void 0 ? void 0 : _e.deprecated);
+                !!((_f = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _f === void 0 ? void 0 : _f.deprecated);
         }
         /**
          * [{"key":"web:router_param","parameterIndex":1,"propertyName":"create","metadata":{"type":2}},
@@ -273,13 +274,75 @@ let SwaggerExplorer = class SwaggerExplorer {
         const types = (0, core_1.getMethodParamTypes)(target, webRouter.method);
         const params = metaForMethods.filter(item => item.key === constants_1.DECORATORS.API_PARAMETERS &&
             item.propertyName === webRouter.method);
+        // set params information from @ApiQuery() to parameters
+        for (const param of params) {
+            // rebuild query param to swagger format
+            if (param.metadata.schema === undefined) {
+                param.metadata.schema = {};
+                if (param.metadata.type) {
+                    param.metadata.schema['type'] = param.metadata.type;
+                    delete param.metadata.type;
+                }
+                if (param.metadata.isArray !== undefined) {
+                    param.metadata.schema['items'] = {
+                        type: param.metadata.schema['type'],
+                    };
+                    param.metadata.schema['type'] = 'array';
+                    delete param.metadata.isArray;
+                }
+                if (param.metadata.enum !== undefined) {
+                    param.metadata.schema.enum = param.metadata.enum;
+                    delete param.metadata.enum;
+                }
+            }
+            else {
+                // if schema is defined, then type is not needed
+                delete param.metadata.type;
+                delete param.metadata.isArray;
+                delete param.metadata.enum;
+            }
+            const p = param.metadata;
+            p.schema = this.formatType(param.metadata.schema);
+            if (p.in === 'query' || p.in === 'path' || p.in === 'header') {
+                parameters.push(p);
+            }
+            else if (p.in === 'body') {
+                p.content = (_g = p.content) !== null && _g !== void 0 ? _g : {};
+                if (Object.keys(p.content).length === 0) {
+                    p.content[p.contentType || 'application/json'] = (_h = p.content[p.contentType || 'application/json']) !== null && _h !== void 0 ? _h : {
+                        schema: p.schema,
+                    };
+                }
+                // format schema
+                for (const key in p.content) {
+                    p.content[key].schema = this.formatType(p.content[key].schema);
+                }
+                // if requestBody is already set, skip
+                opts[webRouter.requestMethod].requestBody =
+                    (_j = opts[webRouter.requestMethod].requestBody) !== null && _j !== void 0 ? _j : {};
+                opts[webRouter.requestMethod].requestBody.description =
+                    (_k = opts[webRouter.requestMethod].requestBody.description) !== null && _k !== void 0 ? _k : p.description;
+                opts[webRouter.requestMethod].requestBody.content =
+                    (_l = opts[webRouter.requestMethod].requestBody.content) !== null && _l !== void 0 ? _l : p.content;
+                opts[webRouter.requestMethod].requestBody.required =
+                    (_m = opts[webRouter.requestMethod].requestBody.required) !== null && _m !== void 0 ? _m : p.required;
+            }
+        }
         for (const arg of args) {
             const currentType = types[arg.parameterIndex];
             const p = {
-                name: (_g = (_f = arg === null || arg === void 0 ? void 0 : arg.metadata) === null || _f === void 0 ? void 0 : _f.propertyData) !== null && _g !== void 0 ? _g : '',
-                in: convertTypeToString((_h = arg.metadata) === null || _h === void 0 ? void 0 : _h.type),
+                name: (_o = arg === null || arg === void 0 ? void 0 : arg.metadata) === null || _o === void 0 ? void 0 : _o.propertyData,
+                in: convertTypeToString((_p = arg.metadata) === null || _p === void 0 ? void 0 : _p.type),
                 required: false,
             };
+            const existsParam = parameters.find(item => {
+                var _a;
+                return item.name === ((_a = arg === null || arg === void 0 ? void 0 : arg.metadata) === null || _a === void 0 ? void 0 : _a.propertyData) && item.in === p.in;
+            });
+            // if exists same param from @ApiQuery and other decorator, just skip
+            if (existsParam) {
+                continue;
+            }
             if (p.in === 'path') {
                 p.required = true;
                 if (url.indexOf('{' + p.name + '}') === -1) {
@@ -288,100 +351,112 @@ let SwaggerExplorer = class SwaggerExplorer {
             }
             if (core_1.Types.isClass(currentType)) {
                 this.parseClzz(currentType);
-                if (p.in === 'query') {
+            }
+            if (p.in === 'query' || p.in === 'path') {
+                if (core_1.Types.isClass(currentType)) {
                     // 如果@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,
+                            schema: schema.properties[pName],
                         };
-                        this.parseFromParamsToP({ metadata: ppt }, pp);
                         parameters.push(pp);
                     });
                     continue;
                 }
                 else {
+                    if (!p.name) {
+                        continue;
+                    }
                     p.schema = {
-                        $ref: '#/components/schemas/' + currentType.name,
+                        type: convertSchemaType((_q = currentType === null || currentType === void 0 ? void 0 : currentType.name) !== null && _q !== void 0 ? _q : currentType),
                     };
                 }
             }
-            else {
-                p.schema = {
-                    type: convertSchemaType((_j = currentType === null || currentType === void 0 ? void 0 : currentType.name) !== null && _j !== void 0 ? _j : currentType),
-                };
-            }
-            this.parseFromParamsToP(params[params.length - 1 - arg.parameterIndex], p);
-            if (p.in === 'body') {
+            else if (p.in === 'body') {
                 if (webRouter.requestMethod === core_1.RequestMethod.GET) {
                     continue;
                 }
+                // if requestBody is already set, skip
+                if (opts[webRouter.requestMethod].requestBody) {
+                    continue;
+                }
                 // 这里兼容一下 @File()、@Files()、@Fields() 装饰器
-                if (((_k = arg.metadata) === null || _k === void 0 ? void 0 : _k.type) === core_1.RouteParamTypes.FILESSTREAM) {
-                    p.schema = {
-                        type: 'object',
-                        properties: {
-                            files: {
-                                type: 'array',
-                                items: {
-                                    type: 'string',
-                                    format: 'binary',
+                if (((_r = arg.metadata) === null || _r === void 0 ? void 0 : _r.type) === core_1.RouteParamTypes.FILESSTREAM) {
+                    p.content = {};
+                    p.content[_1.BodyContentType.Multipart] = {
+                        schema: {
+                            type: 'object',
+                            properties: {
+                                files: {
+                                    type: 'array',
+                                    items: {
+                                        type: 'string',
+                                        format: 'binary',
+                                    },
+                                    description: p.description,
                                 },
-                                description: p.description,
                             },
                         },
                     };
-                    p.contentType = _1.BodyContentType.Multipart;
                 }
-                if (((_l = arg.metadata) === null || _l === void 0 ? void 0 : _l.type) === core_1.RouteParamTypes.FILESTREAM) {
-                    p.schema = {
-                        type: 'object',
-                        properties: {
-                            file: {
-                                type: 'string',
-                                format: 'binary',
-                                description: p.description,
+                else if (((_s = arg.metadata) === null || _s === void 0 ? void 0 : _s.type) === core_1.RouteParamTypes.FILESTREAM) {
+                    p.content = {};
+                    p.content[_1.BodyContentType.Multipart] = {
+                        schema: {
+                            type: 'object',
+                            properties: {
+                                file: {
+                                    type: 'string',
+                                    format: 'binary',
+                                    description: p.description,
+                                },
                             },
                         },
                     };
-                    p.contentType = _1.BodyContentType.Multipart;
-                }
-                if (((_m = arg.metadata) === null || _m === void 0 ? void 0 : _m.type) === core_1.RouteParamTypes.FIELDS) {
-                    this.expandSchemaRef(p);
-                    p.contentType = _1.BodyContentType.Multipart;
-                }
-                if (!p.content) {
-                    p.content = {};
-                    p.content[p.contentType || 'application/json'] = {
-                        schema: p.schema,
-                    };
-                }
-                if (!opts[webRouter.requestMethod].requestBody) {
-                    const requestBody = {
-                        required: true,
-                        description: p.description || p.name,
-                        content: p.content,
-                    };
-                    opts[webRouter.requestMethod].requestBody = requestBody;
                 }
                 else {
-                    // 这里拼 schema properties 时肯定存在
-                    Object.assign({}, (_o = opts[webRouter.requestMethod].requestBody.content[p.contentType]
-                        .schema) === null || _o === void 0 ? void 0 : _o.properties, p.schema.properties);
+                    if (core_1.Types.isClass(currentType)) {
+                        p.content = {
+                            'application/json': {
+                                schema: {
+                                    $ref: '#/components/schemas/' + currentType.name,
+                                },
+                            },
+                        };
+                    }
+                    else {
+                        // base type
+                        p.content = {
+                            'text/plain': {
+                                schema: {
+                                    type: convertSchemaType((_t = currentType === null || currentType === void 0 ? void 0 : currentType.name) !== null && _t !== void 0 ? _t : currentType),
+                                },
+                            },
+                        };
+                    }
                 }
-                delete p.contentType;
-                delete p.content;
+                opts[webRouter.requestMethod].requestBody = {
+                    required: true,
+                    description: p.description || p.name,
+                    content: p.content,
+                };
                 // in body 不需要处理
                 continue;
             }
             parameters.push(p);
         }
         // class header 需要使用 ApiHeader 装饰器
-        if (headers) {
+        if (headers && headers.length) {
             headers.forEach(header => parameters.unshift(header));
         }
+        // 获取方法上的 @ApiHeader
+        const methodHeaders = metaForMethods.filter(item => item.key === constants_1.DECORATORS.API_HEADERS);
+        if (methodHeaders.length > 0) {
+            methodHeaders.forEach(item => parameters.unshift(item.metadata));
+        }
         opts[webRouter.requestMethod].parameters = parameters;
         const responses = metaForMethods.filter(item => item.key === constants_1.DECORATORS.API_RESPONSE &&
             item.propertyName === webRouter.method);
@@ -449,25 +524,6 @@ let SwaggerExplorer = class SwaggerExplorer {
     getOperationId(controllerKey, webRouter) {
         return this.operationIdFactory(controllerKey, webRouter);
     }
-    expandSchemaRef(p, name) {
-        let schemaName = name;
-        if (p.schema['$ref']) {
-            // 展开各个字段属性
-            schemaName = p.schema['$ref'].replace('#/components/schemas/', '');
-            delete p.schema['$ref'];
-        }
-        if (schemaName) {
-            const schema = this.documentBuilder.getSchema(schemaName);
-            const ss = JSON.parse(JSON.stringify(schema));
-            if (p.schema.properties) {
-                Object.assign(p.schema.properties, ss.properties);
-            }
-            else {
-                p.schema = JSON.parse(JSON.stringify(schema));
-            }
-        }
-        return p;
-    }
     /**
      * 提取参数
      * @param params
@@ -674,18 +730,104 @@ let SwaggerExplorer = class SwaggerExplorer {
         }
         return Object.assign(typeMeta, metadata);
     }
+    formatType(metadata) {
+        if (metadata === null) {
+            return null;
+        }
+        // 如果有枚举，单独处理
+        if (metadata.enum) {
+            // enum 不需要处理
+            metadata.enum.map(item => this.formatType(item));
+        }
+        if (metadata.not) {
+            metadata.not = this.formatType(metadata.not);
+        }
+        if (metadata['$ref'] && typeof metadata['$ref'] === 'function') {
+            metadata['$ref'] = metadata['$ref']();
+        }
+        if (metadata.oneOf) {
+            metadata.oneOf = metadata.oneOf.map(item => this.formatType(item));
+        }
+        else if (metadata.anyOf) {
+            metadata.anyOf = metadata.anyOf.map(item => this.formatType(item));
+        }
+        else if (metadata.allOf) {
+            metadata.allOf = metadata.allOf.map(item => this.formatType(item));
+        }
+        // 有下面的这些属性，就不需要 type 了
+        ['not', '$ref', 'oneOf', 'anyOf', 'allOf'].forEach(key => {
+            if (metadata[key]) {
+                delete metadata['type'];
+            }
+        });
+        if (metadata.properties) {
+            const properties = {};
+            for (const key in metadata.properties) {
+                properties[key] = this.formatType(metadata.properties[key]);
+            }
+            metadata.properties = properties;
+        }
+        if (metadata.additionalProperties) {
+            metadata.additionalProperties = this.formatType(metadata.additionalProperties);
+        }
+        // 处理类型
+        if (['string', 'number', 'boolean', 'integer'].includes(metadata.type)) {
+            // 不做处理
+        }
+        else if (metadata.type === Number) {
+            metadata.type = 'number';
+        }
+        else if (metadata.type === String) {
+            metadata.type = 'string';
+        }
+        else if (metadata.type === Boolean) {
+            metadata.type = 'boolean';
+        }
+        else if (metadata.type === 'date' ||
+            metadata.type === 'Date' ||
+            metadata.type === Date) {
+            metadata.type = 'string';
+            metadata.format = 'date-time';
+        }
+        else if (metadata.type === Array || metadata.type === 'array') {
+            // Array => { type: 'array' }
+            metadata.type = 'array';
+            if (metadata.items) {
+                metadata.items = this.formatType(metadata.items);
+            }
+        }
+        else if (Array.isArray(metadata.type)) {
+            // [String] => { type: 'array', items: { type: 'string' } }
+            metadata.items = this.formatType({ type: metadata.type[0] });
+            metadata.type = 'array';
+        }
+        else if (metadata.type === Object || metadata.type === 'object') {
+            metadata.type = 'object';
+        }
+        else if (core_1.Types.isClass(metadata.type)) {
+            this.parseClzz(metadata.type);
+            metadata['$ref'] = '#/components/schemas/' + metadata.type.name;
+            delete metadata['type'];
+        }
+        else if (metadata.type instanceof Function) {
+            // () => String => { type: 'string' }
+            metadata.type = metadata.type();
+            this.formatType(metadata);
+        }
+        return metadata;
+    }
     /**
      * 解析类型的 ApiProperty
      * @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
+        // TODO 这里后面不能用这个方法
         const props = (0, core_1.getClassExtendedMetadata)(core_1.INJECT_CUSTOM_PROPERTY, clzz);
         const tt = {
             type: 'object',
@@ -697,115 +839,62 @@ let SwaggerExplorer = class SwaggerExplorer {
         });
         if (props) {
             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) {
+                const metadata = props[key].metadata || {};
+                if (!metadata.type) {
+                    // 推导类型
+                    metadata.type = (0, core_1.getPropertyType)(clzz.prototype, key).name;
+                }
+                tt.properties[key] = tt.properties[key] || {};
+                // loop metadata
+                for (const metadataKey in metadata) {
+                    if (metadataKey === 'required' && metadata['required']) {
+                        // required 需要加到 schema 上
                         if (!tt.required) {
                             tt.required = [];
                         }
                         tt.required.push(key);
                     }
-                    delete metadata.required;
-                }
-                if (metadata === null || metadata === void 0 ? void 0 : metadata.enum) {
-                    tt.properties[key] = {
-                        type: metadata === null || metadata === void 0 ? void 0 : metadata.type,
-                        enum: metadata === null || metadata === void 0 ? void 0 : metadata.enum,
-                        default: metadata === null || metadata === void 0 ? void 0 : metadata.default,
-                    };
-                    if (metadata === null || metadata === void 0 ? void 0 : metadata.description) {
-                        tt.properties[key].description = metadata === null || metadata === void 0 ? void 0 : metadata.description;
+                    else if (['oneOf', 'anyOf', 'allOf'].includes(metadataKey)) {
+                        tt.properties[key][metadataKey] = [];
+                        metadata[metadataKey].forEach((meta) => {
+                            tt.properties[key][metadataKey].push(this.formatType(meta));
+                        });
                     }
-                    continue;
-                }
-                if ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.items) === null || _a === void 0 ? void 0 : _a.enum) {
-                    tt.properties[key] = {
-                        type: metadata === null || metadata === void 0 ? void 0 : metadata.type,
-                        items: metadata === null || metadata === void 0 ? void 0 : metadata.items,
-                        default: metadata === null || metadata === void 0 ? void 0 : metadata.default,
-                    };
-                    if (metadata === null || metadata === void 0 ? void 0 : metadata.description) {
-                        tt.properties[key].description = metadata === null || metadata === void 0 ? void 0 : metadata.description;
+                    else if (metadataKey === 'not') {
+                        tt.properties[key][metadataKey] = this.formatType(metadata[metadataKey]);
                     }
-                    continue;
-                }
-                let isArray = false;
-                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;
-                    currentType = parseTypeSchema((_b = metadata === null || metadata === void 0 ? void 0 : metadata.items) === null || _b === void 0 ? void 0 : _b.type);
-                    metadata === null || metadata === void 0 ? true : delete metadata.items.type;
-                }
-                if (metadata === null || metadata === void 0 ? void 0 : metadata.oneOf) {
-                    tt.properties[key] = {
-                        oneOf: [],
-                    };
-                    metadata === null || metadata === void 0 ? void 0 : metadata.oneOf.forEach((meta) => {
-                        tt.properties[key].oneOf.push(this.parseSubPropertyType(meta));
-                    });
-                    metadata === null || metadata === void 0 ? true : delete metadata.oneOf;
-                    continue;
-                }
-                if (core_1.Types.isClass(currentType)) {
-                    this.parseClzz(currentType);
-                    if (isArray) {
-                        tt.properties[key] = {
-                            type: 'array',
-                            items: {
-                                $ref: '#/components/schemas/' + (currentType === null || currentType === void 0 ? void 0 : currentType.name),
-                            },
-                        };
-                    }
-                    else {
-                        tt.properties[key] = {
-                            $ref: '#/components/schemas/' + (currentType === null || currentType === void 0 ? void 0 : currentType.name),
-                        };
-                    }
-                    delete metadata.items;
-                }
-                else {
-                    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,
-                            };
+                    else if (metadataKey === 'type') {
+                        this.formatType(metadata);
+                        if (metadata.type) {
+                            tt.properties[key].type = metadata.type;
                         }
-                        else {
-                            tt.properties[key] = {
-                                type: 'array',
-                                items: {
-                                    type: convertSchemaType((currentType === null || currentType === void 0 ? void 0 : currentType.name) || currentType),
-                                },
-                            };
+                        if (metadata['$ref']) {
+                            tt.properties[key].$ref = metadata['$ref'];
+                        }
+                        if (metadata.items) {
+                            tt.properties[key].items = metadata.items;
+                        }
+                        if (metadata.format) {
+                            tt.properties[key].format = metadata.format;
+                        }
+                        if (metadata.pattern) {
+                            tt.properties[key].pattern = metadata.pattern;
+                        }
+                        if (metadata.enum) {
+                            tt.properties[key].enum = metadata.enum;
                         }
-                        delete metadata.items;
                     }
-                    else if (metadata.$ref) {
-                        tt.properties[key] = {};
+                    else if (metadataKey === 'items' ||
+                        metadataKey === 'pattern' ||
+                        metadataKey === 'format' ||
+                        metadataKey === 'enum' ||
+                        metadataKey === '$ref') {
+                        // type 中已经处理
                     }
                     else {
-                        tt.properties[key] = {
-                            type: currentType !== null && currentType !== void 0 ? currentType : (0, core_1.getPropertyType)(clzz.prototype, key).name,
-                            format: metadata === null || metadata === void 0 ? void 0 : metadata.format,
-                        };
-                        // Date 类型支持
-                        if (tt.properties[key].type === 'Date') {
-                            tt.properties[key].type = 'string';
-                            if (!tt.properties[key].format) {
-                                tt.properties[key].format = 'date';
-                            }
-                        }
-                        delete metadata.format;
+                        tt.properties[key][metadataKey] = metadata[metadataKey];
                     }
                 }
-                Object.assign(tt.properties[key], metadata);
             }
         }
         // just for test
@@ -937,7 +1026,7 @@ function convertSchemaType(value) {
         case 'String':
             return 'string';
         default:
-            return value;
+            return 'object';
     }
 }
 function getNotEmptyValue(...args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/swagger",
-  "version": "3.15.11",
+  "version": "3.16.1",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -10,23 +10,22 @@
     "index.html"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.15.8",
-    "@midwayjs/koa": "^3.15.11",
-    "@midwayjs/mock": "^3.15.8",
-    "@midwayjs/validate": "^3.15.11",
-    "swagger-ui-dist": "5.17.1"
+    "@midwayjs/core": "^3.16.0",
+    "@midwayjs/koa": "^3.16.1",
+    "@midwayjs/mock": "^3.16.0",
+    "@midwayjs/validate": "^3.16.1",
+    "swagger-ui-dist": "5.17.6"
   },
   "author": "Kurten Chan <chinkurten@gmail.com>",
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "jest": "node --require=ts-node/register ../../node_modules/jest/bin/jest.js",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
+    "test": "../../node_modules/.bin/jest --runInBand",
+    "cov": "../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "5bf318ca3f6d27e46db173fe4af3a859a40a6c88"
+  "gitHead": "14376294fb13a90c926f5fbd27b84150a47cf3f2"
 }