@midwayjs/swagger 3.18.0 → 3.18.2

package/dist/common/enum.utils.d.ts

@@ -3,7 +3,7 @@ export declare function getEnumValues(enumType: SwaggerEnumType): string[] | num
 export declare function getEnumType(values: (string | number)[]): 'string' | 'number';
 export declare function addEnumArraySchema(paramDefinition: Partial<Record<'schema' | 'isArray' | 'enumName', any>>, decoratorOptions: Partial<Record<'enum' | 'enumName', any>>): void;
 export declare function addEnumSchema(paramDefinition: Partial<Record<string, any>>, decoratorOptions: Partial<Record<string, any>>): void;
-export declare const isEnumArray: <T extends Partial<Record<"enum" | "isArray", any>>>(obj: Record<string, any>) => obj is T;
+export declare const isEnumArray: <T extends Partial<Record<"isArray" | "enum", any>>>(obj: Record<string, any>) => obj is T;
 export declare const isEnumDefined: <T extends Partial<Record<"enum", any>>>(obj: Record<string, any>) => obj is T;
 export declare const isEnumMetadata: (metadata: SchemaObjectMetadata) => any;
 //# sourceMappingURL=enum.utils.d.ts.map

package/dist/common/enum.utils.js

@@ -8,19 +8,10 @@ function getEnumValues(enumType) {
     if (typeof enumType !== 'object') {
         return [];
     }
-    const values = [];
-    const uniqueValues = {};
-    for (const key in enumType) {
-        const value = enumType[key];
-        /* eslint-disable no-prototype-builtins */
-        // filter out cases where enum key also becomes its value (A: B, B: A)
-        if (!uniqueValues.hasOwnProperty(value) &&
-            !uniqueValues.hasOwnProperty(key)) {
-            values.push(value);
-            uniqueValues[value] = value;
-        }
-    }
-    return values;
+    const values = Object.keys(enumType)
+        .filter(key => isNaN(Number(key)))
+        .map(key => enumType[key]);
+    return Array.from(new Set(values));
 }
 exports.getEnumValues = getEnumValues;
 function getEnumType(values) {

package/dist/decorators/api-exclude-controller.decorator.d.ts

@@ -1,2 +1,2 @@
-export declare function ApiExcludeController(disable?: boolean): any;
+export declare function ApiExcludeController(disable?: boolean): ClassDecorator;
 //# sourceMappingURL=api-exclude-controller.decorator.d.ts.map

package/dist/decorators/api-extra-model.decorator.d.ts

@@ -1,3 +1,3 @@
 import { Type } from '../interfaces';
-export declare function ApiExtraModel(models: Type | Type[]): ClassDecorator & MethodDecorator;
+export declare function ApiExtraModel(models: Type | Type[]): ClassDecorator;
 //# sourceMappingURL=api-extra-model.decorator.d.ts.map

package/dist/swaggerExplorer.js

@@ -14,6 +14,7 @@ const core_1 = require("@midwayjs/core");
 const constants_1 = require("./constants");
 const documentBuilder_1 = require("./documentBuilder");
 const _1 = require(".");
+const enum_utils_1 = require("./common/enum.utils");
 let SwaggerExplorer = class SwaggerExplorer {
     constructor() {
         this.swaggerConfig = {};
@@ -486,7 +487,16 @@ let SwaggerExplorer = class SwaggerExplorer {
             for (const k of keys) {
                 // 这里是引用，赋值可以直接更改
                 const tt = resp[k];
-                if (tt.type) {
+                if (tt.schema) {
+                    // response 的 schema 需要包含在 content 内
+                    tt.content = {
+                        'application/json': {
+                            schema: this.formatType(tt.schema),
+                        },
+                    };
+                    delete tt.schema;
+                }
+                else if (tt.type) {
                     if (core_1.Types.isClass(tt.type)) {
                         this.parseClzz(tt.type);
                         if (tt.isArray) {
@@ -665,8 +675,14 @@ let SwaggerExplorer = class SwaggerExplorer {
         }
         // 如果有枚举，单独处理
         if (metadata.enum) {
-            // enum 不需要处理
-            metadata.enum.map(item => this.formatType(item));
+            if (Array.isArray(metadata.enum)) {
+                // enum 不需要处理
+                metadata.enum.map(item => this.formatType(item));
+            }
+            else {
+                // 枚举类型需要处理
+                metadata.enum = (0, enum_utils_1.getEnumValues)(metadata.enum);
+            }
         }
         if (metadata.not) {
             metadata.not = this.formatType(metadata.not);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/swagger",
-  "version": "3.18.0",
+  "version": "3.18.2",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -11,9 +11,9 @@
   ],
   "devDependencies": {
     "@midwayjs/core": "^3.18.0",
-    "@midwayjs/koa": "^3.18.0",
-    "@midwayjs/mock": "^3.18.0",
-    "@midwayjs/validate": "^3.18.0",
+    "@midwayjs/koa": "^3.18.2",
+    "@midwayjs/mock": "^3.18.2",
+    "@midwayjs/validate": "^3.18.2",
     "swagger-ui-dist": "5.17.14"
   },
   "author": "Kurten Chan <chinkurten@gmail.com>",
@@ -27,5 +27,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "5e6180ba0fabe1acc6df112c68855129a534e941"
+  "gitHead": "0cf1ac5a107aa1de73ff184f403cba2be0a408f4"
 }