@midwayjs/swagger 3.20.6 → 4.0.0-beta.1

package/dist/common/enum.utils.js

@@ -49,6 +49,6 @@ const isEnumArray = (obj) => obj.isArray && obj.enum;
 exports.isEnumArray = isEnumArray;
 const isEnumDefined = (obj) => obj.enum;
 exports.isEnumDefined = isEnumDefined;
-const isEnumMetadata = (metadata) => { var _a; return metadata.enum || (metadata.isArray && ((_a = metadata.items) === null || _a === void 0 ? void 0 : _a['enum'])); };
+const isEnumMetadata = (metadata) => metadata.enum || (metadata.isArray && metadata.items?.['enum']);
 exports.isEnumMetadata = isEnumMetadata;
 //# sourceMappingURL=enum.utils.js.map

package/dist/common/httpStatus.js

@@ -51,5 +51,5 @@ var HttpStatus;
     HttpStatus[HttpStatus["SERVICE_UNAVAILABLE"] = 503] = "SERVICE_UNAVAILABLE";
     HttpStatus[HttpStatus["GATEWAY_TIMEOUT"] = 504] = "GATEWAY_TIMEOUT";
     HttpStatus[HttpStatus["HTTP_VERSION_NOT_SUPPORTED"] = 505] = "HTTP_VERSION_NOT_SUPPORTED";
-})(HttpStatus = exports.HttpStatus || (exports.HttpStatus = {}));
+})(HttpStatus || (exports.HttpStatus = HttpStatus = {}));
 //# sourceMappingURL=httpStatus.js.map

package/dist/configuration.js

@@ -41,6 +41,7 @@ let SwaggerConfiguration = class SwaggerConfiguration {
         }
     }
 };
+exports.SwaggerConfiguration = SwaggerConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayApplicationManager)
@@ -49,7 +50,7 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayConfigService)
 ], SwaggerConfiguration.prototype, "configService", void 0);
-SwaggerConfiguration = __decorate([
+exports.SwaggerConfiguration = SwaggerConfiguration = __decorate([
     (0, core_1.Configuration)({
         importConfigs: [
             {
@@ -59,5 +60,4 @@ SwaggerConfiguration = __decorate([
         namespace: 'swagger',
     })
 ], SwaggerConfiguration);
-exports.SwaggerConfiguration = SwaggerConfiguration;
 //# sourceMappingURL=configuration.js.map

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

@@ -10,7 +10,7 @@ var BodyContentType;
     BodyContentType["Multipart"] = "multipart/form-data";
     BodyContentType["MultipartMixed"] = "multipart/mixed";
     BodyContentType["OctetStream"] = "application/octet-stream";
-})(BodyContentType = exports.BodyContentType || (exports.BodyContentType = {}));
+})(BodyContentType || (exports.BodyContentType = BodyContentType = {}));
 const defaultBodyMetadata = {
     type: String,
     required: true,

package/dist/decorators/api-exclude-controller.decorator.js

@@ -5,7 +5,7 @@ const core_1 = require("@midwayjs/core");
 const constants_1 = require("../constants");
 function ApiExcludeController(disable = true) {
     return (target) => {
-        (0, core_1.saveClassMetadata)(constants_1.DECORATORS.API_EXCLUDE_CONTROLLER, { disable }, target);
+        core_1.MetadataManager.defineMetadata(constants_1.DECORATORS.API_EXCLUDE_CONTROLLER, { disable }, target);
     };
 }
 exports.ApiExcludeController = ApiExcludeController;

package/dist/decorators/helpers.js

@@ -4,20 +4,20 @@ exports.getSchemaPath = exports.getTypeIsArrayTuple = exports.createParamDecorat
 const core_1 = require("@midwayjs/core");
 const constants_1 = require("../constants");
 function createPropertyDecorator(metakey, metadata) {
-    return (0, core_1.createCustomPropertyDecorator)(metakey, metadata, false);
+    return core_1.DecoratorManager.createCustomPropertyDecorator(metakey, metadata, false);
 }
 exports.createPropertyDecorator = createPropertyDecorator;
 function createMixedDecorator(metakey, metadata) {
     return (target, methodName) => {
         if (methodName) {
-            (0, core_1.attachPropertyDataToClass)(constants_1.DECORATORS_METHOD_METADATA, {
+            core_1.MetadataManager.attachMetadata(constants_1.DECORATORS_METHOD_METADATA, {
                 key: metakey,
                 propertyName: methodName,
                 metadata,
             }, target, methodName);
         }
         else {
-            (0, core_1.attachClassMetadata)(constants_1.DECORATORS_CLASS_METADATA, {
+            core_1.MetadataManager.attachMetadata(constants_1.DECORATORS_CLASS_METADATA, {
                 key: metakey,
                 metadata,
             }, target);

package/dist/documentBuilder.js

@@ -68,9 +68,8 @@ class DocumentBuilder {
         return this;
     }
     getSchema(name) {
-        var _a, _b;
-        if ((_a = this.document.components) === null || _a === void 0 ? void 0 : _a.schemas) {
-            return (_b = this.document.components) === null || _b === void 0 ? void 0 : _b.schemas[name];
+        if (this.document.components?.schemas) {
+            return this.document.components?.schemas[name];
         }
         return undefined;
     }
@@ -151,7 +150,7 @@ class DocumentBuilder {
         this.addSecurity(name, {
             type: 'oauth2',
             flows: {
-                ...options === null || options === void 0 ? void 0 : options.flows,
+                ...options?.flows,
             },
         });
         return this;

package/dist/swaggerExplorer.js

@@ -22,48 +22,47 @@ let SwaggerExplorer = class SwaggerExplorer {
         this.operationIdFactory = (controllerKey, webRouter) => `${controllerKey.toLowerCase()}_${webRouter.method.toLocaleLowerCase()}`;
     }
     async init() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _2, _3, _4, _5, _6, _7;
         this.documentBuilder.setTitle(this.swaggerConfig.title);
         this.documentBuilder.setVersion(this.swaggerConfig.version);
         this.documentBuilder.setDescription(this.swaggerConfig.description);
-        if (((_a = this.swaggerConfig) === null || _a === void 0 ? void 0 : _a.contact) &&
-            typeof ((_b = this.swaggerConfig) === null || _b === void 0 ? void 0 : _b.contact) === 'object') {
-            this.documentBuilder.setContact((_d = (_c = this.swaggerConfig) === null || _c === void 0 ? void 0 : _c.contact) === null || _d === void 0 ? void 0 : _d.name, (_f = (_e = this.swaggerConfig) === null || _e === void 0 ? void 0 : _e.contact) === null || _f === void 0 ? void 0 : _f.url, (_h = (_g = this.swaggerConfig) === null || _g === void 0 ? void 0 : _g.contact) === null || _h === void 0 ? void 0 : _h.email);
+        if (this.swaggerConfig?.contact &&
+            typeof this.swaggerConfig?.contact === 'object') {
+            this.documentBuilder.setContact(this.swaggerConfig?.contact?.name, this.swaggerConfig?.contact?.url, this.swaggerConfig?.contact?.email);
         }
-        if (((_j = this.swaggerConfig) === null || _j === void 0 ? void 0 : _j.license) &&
-            typeof ((_k = this.swaggerConfig) === null || _k === void 0 ? void 0 : _k.license) === 'object') {
-            this.documentBuilder.setLicense((_m = (_l = this.swaggerConfig) === null || _l === void 0 ? void 0 : _l.license) === null || _m === void 0 ? void 0 : _m.name, (_p = (_o = this.swaggerConfig) === null || _o === void 0 ? void 0 : _o.license) === null || _p === void 0 ? void 0 : _p.url);
+        if (this.swaggerConfig?.license &&
+            typeof this.swaggerConfig?.license === 'object') {
+            this.documentBuilder.setLicense(this.swaggerConfig?.license?.name, this.swaggerConfig?.license?.url);
         }
         if (this.swaggerConfig.termsOfService) {
             this.documentBuilder.setTermsOfService(this.swaggerConfig.termsOfService);
         }
-        if (((_q = this.swaggerConfig) === null || _q === void 0 ? void 0 : _q.externalDocs) &&
-            typeof ((_r = this.swaggerConfig) === null || _r === void 0 ? void 0 : _r.externalDocs) === 'object') {
-            this.documentBuilder.setExternalDoc((_t = (_s = this.swaggerConfig) === null || _s === void 0 ? void 0 : _s.externalDocs) === null || _t === void 0 ? void 0 : _t.description, (_v = (_u = this.swaggerConfig) === null || _u === void 0 ? void 0 : _u.externalDocs) === null || _v === void 0 ? void 0 : _v.url);
+        if (this.swaggerConfig?.externalDocs &&
+            typeof this.swaggerConfig?.externalDocs === 'object') {
+            this.documentBuilder.setExternalDoc(this.swaggerConfig?.externalDocs?.description, this.swaggerConfig?.externalDocs?.url);
         }
-        if (((_w = this.swaggerConfig) === null || _w === void 0 ? void 0 : _w.servers) &&
-            Array.isArray((_x = this.swaggerConfig) === null || _x === void 0 ? void 0 : _x.servers)) {
-            for (const serv of (_y = this.swaggerConfig) === null || _y === void 0 ? void 0 : _y.servers) {
-                this.documentBuilder.addServer(serv === null || serv === void 0 ? void 0 : serv.url, serv === null || serv === void 0 ? void 0 : serv.description, serv === null || serv === void 0 ? void 0 : serv.variables);
+        if (this.swaggerConfig?.servers &&
+            Array.isArray(this.swaggerConfig?.servers)) {
+            for (const serv of this.swaggerConfig?.servers) {
+                this.documentBuilder.addServer(serv?.url, serv?.description, serv?.variables);
             }
         }
-        if (((_z = this.swaggerConfig) === null || _z === void 0 ? void 0 : _z.tags) && Array.isArray((_0 = this.swaggerConfig) === null || _0 === void 0 ? void 0 : _0.tags)) {
-            for (const t of (_2 = this.swaggerConfig) === null || _2 === void 0 ? void 0 : _2.tags) {
+        if (this.swaggerConfig?.tags && Array.isArray(this.swaggerConfig?.tags)) {
+            for (const t of this.swaggerConfig?.tags) {
                 this.documentBuilder.addTag(t.name, t.description, t.externalDocs);
             }
         }
-        if ((_4 = (_3 = this.swaggerConfig) === null || _3 === void 0 ? void 0 : _3.documentOptions) === null || _4 === void 0 ? void 0 : _4.operationIdFactory) {
+        if (this.swaggerConfig?.documentOptions?.operationIdFactory) {
             this.operationIdFactory =
                 this.swaggerConfig.documentOptions.operationIdFactory;
         }
         // 设置 auth 类型
-        if (Array.isArray((_5 = this.swaggerConfig) === null || _5 === void 0 ? void 0 : _5.auth)) {
-            for (const a of (_6 = this.swaggerConfig) === null || _6 === void 0 ? void 0 : _6.auth) {
+        if (Array.isArray(this.swaggerConfig?.auth)) {
+            for (const a of this.swaggerConfig?.auth) {
                 this.setAuth(a);
             }
         }
         else {
-            this.setAuth((_7 = this.swaggerConfig) === null || _7 === void 0 ? void 0 : _7.auth);
+            this.setAuth(this.swaggerConfig?.auth);
         }
     }
     addGlobalPrefix(globalPrefix) {
@@ -85,12 +84,11 @@ let SwaggerExplorer = class SwaggerExplorer {
         this.documentBuilder.setPaths(newPaths);
     }
     scanApp() {
-        var _a;
-        const routes = (0, core_1.listModule)(core_1.CONTROLLER_KEY);
+        const routes = core_1.DecoratorManager.listModule(core_1.CONTROLLER_KEY);
         for (const route of routes) {
             this.generatePath(route);
         }
-        if ((_a = this.swaggerConfig) === null || _a === void 0 ? void 0 : _a.tagSortable) {
+        if (this.swaggerConfig?.tagSortable) {
             this.documentBuilder.sortTags();
         }
     }
@@ -101,21 +99,20 @@ let SwaggerExplorer = class SwaggerExplorer {
         return this.documentBuilder;
     }
     generatePath(target) {
-        var _a;
         // 获取控制器元数据
-        const excludeClassMeta = (0, core_1.getClassMetadata)(constants_1.DECORATORS.API_EXCLUDE_CONTROLLER, target);
+        const excludeClassMeta = core_1.MetadataManager.getOwnMetadata(constants_1.DECORATORS.API_EXCLUDE_CONTROLLER, target);
         if (excludeClassMeta && excludeClassMeta.disable) {
             // 如果存在需要排除的控制器，则直接返回
             return;
         }
-        const isGenerateTagForController = (_a = this.swaggerConfig.isGenerateTagForController) !== null && _a !== void 0 ? _a : true;
+        const isGenerateTagForController = this.swaggerConfig.isGenerateTagForController ?? true;
         // 解析额外的模型
         this.parseExtraModel(target);
-        const metaForClass = (0, core_1.getClassMetadata)(constants_1.DECORATORS_CLASS_METADATA, target) || [];
+        const metaForClass = core_1.MetadataManager.getOwnMetadata(constants_1.DECORATORS_CLASS_METADATA, target) || [];
         // 获取参数的元数据
-        const metaForParams = (0, core_1.getClassMetadata)(core_1.INJECT_CUSTOM_PARAM, target) || [];
+        const metaForParams = core_1.MetadataManager.getPropertiesWithMetadata(core_1.CUSTOM_PARAM_INJECT_KEY, target) || {};
         // 获取控制器选项
-        const controllerOption = (0, core_1.getClassMetadata)(core_1.CONTROLLER_KEY, target);
+        const controllerOption = core_1.MetadataManager.getOwnMetadata(core_1.CONTROLLER_KEY, target);
         // 获取前缀
         const prefix = controllerOption.prefix;
         // 过滤出标签
@@ -135,15 +132,15 @@ let SwaggerExplorer = class SwaggerExplorer {
                 const tag = { name: '', description: '' };
                 if (prefix !== '/') {
                     tag.name =
-                        (controllerOption === null || controllerOption === void 0 ? void 0 : controllerOption.routerOptions.tagName) ||
+                        controllerOption?.routerOptions.tagName ||
                             (/^\//.test(prefix) ? prefix.split('/')[1] : prefix);
                     tag.description =
-                        (controllerOption === null || controllerOption === void 0 ? void 0 : controllerOption.routerOptions.description) || tag.name;
+                        controllerOption?.routerOptions.description || tag.name;
                 }
                 else {
-                    tag.name = controllerOption === null || controllerOption === void 0 ? void 0 : controllerOption.routerOptions.tagName;
+                    tag.name = controllerOption?.routerOptions.tagName;
                     tag.description =
-                        (controllerOption === null || controllerOption === void 0 ? void 0 : controllerOption.routerOptions.description) || tag.name;
+                        controllerOption?.routerOptions.description || tag.name;
                 }
                 // 如果标签名存在，则将其添加到文档构建器中
                 if (tag.name) {
@@ -156,7 +153,7 @@ let SwaggerExplorer = class SwaggerExplorer {
             }
         }
         // 获取路由信息
-        const webRouterInfo = (0, core_1.getClassMetadata)(core_1.WEB_ROUTER_KEY, target);
+        const webRouterInfo = core_1.MetadataManager.getMetadata(core_1.WEB_ROUTER_KEY, target);
         // 过滤出头部信息
         let headers = metaForClass.filter(item => item.key === constants_1.DECORATORS.API_HEADERS);
         if (headers.length > 0) {
@@ -173,7 +170,7 @@ let SwaggerExplorer = class SwaggerExplorer {
                 let url = (prefix + webRouter.path).replace('//', '/');
                 url = replaceUrl(url, parseParamsInPath(url));
                 // 方法元数据
-                const metaForMethods = (0, core_1.getPropertyDataFromClass)(constants_1.DECORATORS_METHOD_METADATA, target, webRouter.method) || [];
+                const metaForMethods = core_1.MetadataManager.getMetadata(constants_1.DECORATORS_METHOD_METADATA, target, webRouter.method) || [];
                 const methodSecurity = metaForMethods.filter(item => item.key === constants_1.DECORATORS.API_SECURITY);
                 // 判断是否忽略当前路由
                 const endpoints = metaForMethods.filter(item => item.key === constants_1.DECORATORS.API_EXCLUDE_ENDPOINT &&
@@ -192,11 +189,8 @@ let SwaggerExplorer = class SwaggerExplorer {
                 // 获取路由参数
                 const routerArgs = metaForParams[webRouter.method] || [];
                 // 过滤出主体参数
-                const bds = routerArgs.filter(item => {
-                    var _a;
-                    return item.key === core_1.WEB_ROUTER_PARAM_KEY &&
-                        ((_a = item === null || item === void 0 ? void 0 : item.metadata) === null || _a === void 0 ? void 0 : _a.type) === core_1.RouteParamTypes.BODY;
-                });
+                const bds = routerArgs.filter(item => item.key === core_1.WEB_ROUTER_PARAM_KEY &&
+                    item?.metadata?.type === core_1.RouteParamTypes.BODY);
                 // 如果存在多个主体参数，则跳过当前循环，因为swagger不支持多个@Body
                 if (bds.length > 1) {
                     continue;
@@ -263,7 +257,6 @@ 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, _p, _q, _r, _s, _t, _u;
         const operMeta = metaForMethods.filter(item => item.key === constants_1.DECORATORS.API_OPERATION &&
             item.propertyName === webRouter.method)[0];
         const routerTagsMeta = metaForMethods.filter(item => item.key === constants_1.DECORATORS.API_TAGS &&
@@ -275,27 +268,24 @@ let SwaggerExplorer = class SwaggerExplorer {
         }
         const parameters = [];
         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: ((_c = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _c === void 0 ? void 0 : _c.operationId) ||
+            summary: getNotEmptyValue(operMeta?.metadata?.summary, webRouter.summary),
+            description: getNotEmptyValue(operMeta?.metadata?.description, webRouter.description),
+            operationId: operMeta?.metadata?.operationId ||
                 this.getOperationId(target.name, webRouter),
-            tags: routerTags.length ? routerTags : (_e = (_d = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _d === void 0 ? void 0 : _d.tags) !== null && _e !== void 0 ? _e : [],
+            tags: routerTags.length ? routerTags : operMeta?.metadata?.tags ?? [],
         };
-        if (((_f = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _f === void 0 ? void 0 : _f.deprecated) != null) {
+        if (operMeta?.metadata?.deprecated != null) {
             opts[webRouter.requestMethod].deprecated =
-                !!((_g = operMeta === null || operMeta === void 0 ? void 0 : operMeta.metadata) === null || _g === void 0 ? void 0 : _g.deprecated);
+                !!operMeta?.metadata?.deprecated;
         }
         /**
          * [{"key":"web:router_param","parameterIndex":1,"propertyName":"create","metadata":{"type":2}},
          * {"key":"web:router_param","parameterIndex":0,"propertyName":"create","metadata":{"type":1,"propertyData":"createCatDto"}}]
          */
         // WEB_ROUTER_PARAM_KEY
-        const args = routerArgs.filter(item => {
-            var _a;
-            return item.key === core_1.WEB_ROUTER_PARAM_KEY &&
-                ((_a = item === null || item === void 0 ? void 0 : item.metadata) === null || _a === void 0 ? void 0 : _a.type) !== core_1.RouteParamTypes.CUSTOM;
-        });
-        const types = (0, core_1.getMethodParamTypes)(target, webRouter.method);
+        const args = routerArgs.filter(item => item.key === core_1.WEB_ROUTER_PARAM_KEY &&
+            item?.metadata?.type !== core_1.RouteParamTypes.CUSTOM);
+        const types = core_1.MetadataManager.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
@@ -331,9 +321,9 @@ let SwaggerExplorer = class SwaggerExplorer {
                 parameters.push(p);
             }
             else if (p.in === 'body') {
-                p.content = (_h = p.content) !== null && _h !== void 0 ? _h : {};
+                p.content = p.content ?? {};
                 if (Object.keys(p.content).length === 0) {
-                    p.content[p.contentType || 'application/json'] = (_j = p.content[p.contentType || 'application/json']) !== null && _j !== void 0 ? _j : {
+                    p.content[p.contentType || 'application/json'] = p.content[p.contentType || 'application/json'] ?? {
                         schema: p.schema,
                     };
                 }
@@ -343,25 +333,25 @@ let SwaggerExplorer = class SwaggerExplorer {
                 }
                 // if requestBody is already set, skip
                 opts[webRouter.requestMethod].requestBody =
-                    (_k = opts[webRouter.requestMethod].requestBody) !== null && _k !== void 0 ? _k : {};
+                    opts[webRouter.requestMethod].requestBody ?? {};
                 opts[webRouter.requestMethod].requestBody.description =
-                    (_l = opts[webRouter.requestMethod].requestBody.description) !== null && _l !== void 0 ? _l : p.description;
+                    opts[webRouter.requestMethod].requestBody.description ??
+                        p.description;
                 opts[webRouter.requestMethod].requestBody.content =
-                    (_m = opts[webRouter.requestMethod].requestBody.content) !== null && _m !== void 0 ? _m : p.content;
+                    opts[webRouter.requestMethod].requestBody.content ?? p.content;
                 opts[webRouter.requestMethod].requestBody.required =
-                    (_o = opts[webRouter.requestMethod].requestBody.required) !== null && _o !== void 0 ? _o : p.required;
+                    opts[webRouter.requestMethod].requestBody.required ?? p.required;
             }
         }
         for (const arg of args) {
             const currentType = types[arg.parameterIndex];
             const p = {
-                name: (_p = arg === null || arg === void 0 ? void 0 : arg.metadata) === null || _p === void 0 ? void 0 : _p.propertyData,
-                in: convertTypeToString((_q = arg.metadata) === null || _q === void 0 ? void 0 : _q.type),
+                name: arg?.metadata?.propertyData,
+                in: convertTypeToString(arg.metadata?.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;
+                return item.name === arg?.metadata?.propertyData && item.in === p.in;
             });
             // if exists same param from @ApiQuery and other decorator, just skip
             if (existsParam) {
@@ -381,13 +371,13 @@ let SwaggerExplorer = class SwaggerExplorer {
                     // 如果@Query()装饰的 是一个对象，则把该对象的子属性作为多个@Query参数
                     const schema = this.documentBuilder.getSchema(currentType.name);
                     Object.keys(schema.properties).forEach(pName => {
-                        var _a, _b;
                         const pp = {
                             name: pName,
                             in: p.in,
-                            description: (_a = schema.properties[pName]) === null || _a === void 0 ? void 0 : _a.description,
+                            description: schema.properties[pName]
+                                ?.description,
                             schema: schema.properties[pName],
-                            required: ((_b = schema.required) === null || _b === void 0 ? void 0 : _b.includes(pName)) || false,
+                            required: schema.required?.includes(pName) || false,
                         };
                         parameters.push(pp);
                     });
@@ -398,7 +388,7 @@ let SwaggerExplorer = class SwaggerExplorer {
                         continue;
                     }
                     p.schema = {
-                        type: convertSchemaType((_r = currentType === null || currentType === void 0 ? void 0 : currentType.name) !== null && _r !== void 0 ? _r : currentType),
+                        type: convertSchemaType(currentType?.name ?? currentType),
                     };
                 }
             }
@@ -411,7 +401,7 @@ let SwaggerExplorer = class SwaggerExplorer {
                     continue;
                 }
                 // 这里兼容一下 @File()、@Files()、@Fields() 装饰器
-                if (((_s = arg.metadata) === null || _s === void 0 ? void 0 : _s.type) === core_1.RouteParamTypes.FILESSTREAM) {
+                if (arg.metadata?.type === core_1.RouteParamTypes.FILESSTREAM) {
                     p.content = {};
                     p.content[_1.BodyContentType.Multipart] = {
                         schema: {
@@ -429,7 +419,7 @@ let SwaggerExplorer = class SwaggerExplorer {
                         },
                     };
                 }
-                else if (((_t = arg.metadata) === null || _t === void 0 ? void 0 : _t.type) === core_1.RouteParamTypes.FILESTREAM) {
+                else if (arg.metadata?.type === core_1.RouteParamTypes.FILESTREAM) {
                     p.content = {};
                     p.content[_1.BodyContentType.Multipart] = {
                         schema: {
@@ -459,7 +449,7 @@ let SwaggerExplorer = class SwaggerExplorer {
                         p.content = {
                             'text/plain': {
                                 schema: {
-                                    type: convertSchemaType((_u = currentType === null || currentType === void 0 ? void 0 : currentType.name) !== null && _u !== void 0 ? _u : currentType),
+                                    type: convertSchemaType(currentType?.name ?? currentType),
                                 },
                             },
                         };
@@ -565,7 +555,7 @@ let SwaggerExplorer = class SwaggerExplorer {
      * @param clzz
      */
     parseExtraModel(clzz) {
-        const metaForClass = (0, core_1.getClassMetadata)(constants_1.DECORATORS_CLASS_METADATA, clzz) || [];
+        const metaForClass = core_1.MetadataManager.getOwnMetadata(constants_1.DECORATORS_CLASS_METADATA, clzz) || [];
         const extraModels = metaForClass.filter(item => item.key === constants_1.DECORATORS.API_EXTRA_MODEL);
         for (const m of extraModels) {
             if (Array.isArray(m.metadata)) {
@@ -579,46 +569,45 @@ let SwaggerExplorer = class SwaggerExplorer {
         }
     }
     parseSubPropertyType(metadata) {
-        var _a, _b, _c;
         let typeMeta;
-        if (metadata === null || metadata === void 0 ? void 0 : metadata.enum) {
+        if (metadata?.enum) {
             typeMeta = {
-                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,
+                type: metadata?.type,
+                enum: metadata?.enum,
+                default: metadata?.default,
             };
-            if (metadata === null || metadata === void 0 ? void 0 : metadata.description) {
-                typeMeta.description = metadata === null || metadata === void 0 ? void 0 : metadata.description;
+            if (metadata?.description) {
+                typeMeta.description = metadata?.description;
             }
             return typeMeta;
         }
-        if ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.items) === null || _a === void 0 ? void 0 : _a.enum) {
+        if (metadata?.items?.enum) {
             typeMeta = {
-                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,
+                type: metadata?.type,
+                items: metadata?.items,
+                default: metadata?.default,
             };
-            if (metadata === null || metadata === void 0 ? void 0 : metadata.description) {
-                typeMeta.description = metadata === null || metadata === void 0 ? void 0 : metadata.description;
+            if (metadata?.description) {
+                typeMeta.description = metadata?.description;
             }
             return typeMeta;
         }
         let isArray = false;
-        let currentType = parseTypeSchema(metadata === null || metadata === void 0 ? void 0 : metadata.type);
-        metadata === null || metadata === void 0 ? true : delete metadata.type;
+        let currentType = parseTypeSchema(metadata?.type);
+        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;
+            currentType = parseTypeSchema(metadata?.items?.type);
+            delete metadata?.items.type;
         }
-        if (metadata === null || metadata === void 0 ? void 0 : metadata.oneOf) {
+        if (metadata?.oneOf) {
             typeMeta = {
                 oneOf: [],
             };
-            metadata === null || metadata === void 0 ? void 0 : metadata.oneOf.forEach((item) => {
+            metadata?.oneOf.forEach((item) => {
                 typeMeta.push(this.parseSubPropertyType(item));
             });
-            metadata === null || metadata === void 0 ? true : delete metadata.oneOf;
+            delete metadata?.oneOf;
         }
         if (core_1.Types.isClass(currentType)) {
             this.parseClzz(currentType);
@@ -626,13 +615,13 @@ let SwaggerExplorer = class SwaggerExplorer {
                 typeMeta = {
                     type: 'array',
                     items: {
-                        $ref: '#/components/schemas/' + (currentType === null || currentType === void 0 ? void 0 : currentType.name),
+                        $ref: '#/components/schemas/' + currentType?.name,
                     },
                 };
             }
             else {
                 typeMeta = {
-                    $ref: '#/components/schemas/' + (currentType === null || currentType === void 0 ? void 0 : currentType.name),
+                    $ref: '#/components/schemas/' + currentType?.name,
                 };
             }
             delete metadata.items;
@@ -641,19 +630,19 @@ 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']) {
+                    if (metadata?.items?.['$ref']) {
                         metadata.items['$ref'] = parseTypeSchema(metadata.items['$ref']);
                     }
                     typeMeta = {
                         type: 'array',
-                        items: metadata === null || metadata === void 0 ? void 0 : metadata.items,
+                        items: metadata?.items,
                     };
                 }
                 else {
                     typeMeta = {
                         type: 'array',
                         items: {
-                            type: convertSchemaType((currentType === null || currentType === void 0 ? void 0 : currentType.name) || currentType),
+                            type: convertSchemaType(currentType?.name || currentType),
                         },
                     };
                 }
@@ -662,7 +651,7 @@ let SwaggerExplorer = class SwaggerExplorer {
             else {
                 typeMeta = {
                     type: currentType,
-                    format: metadata === null || metadata === void 0 ? void 0 : metadata.format,
+                    format: metadata?.format,
                 };
                 // Date 类型支持
                 if (typeMeta.type === 'Date') {
@@ -780,7 +769,11 @@ let SwaggerExplorer = class SwaggerExplorer {
         this.parseExtraModel(clzz);
         // 解析类上的 ApiProperty
         // TODO 这里后面不能用这个方法
-        const props = (0, core_1.getClassExtendedMetadata)(core_1.INJECT_CUSTOM_PROPERTY, clzz);
+        const props = core_1.MetadataManager.getPropertiesWithMetadata(core_1.CUSTOM_PROPERTY_INJECT_KEY, clzz) || {};
+        // 这里属性值唯一，取数组最后一个
+        for (const key in props) {
+            props[key] = props[key][props[key].length - 1];
+        }
         const tt = {
             type: 'object',
             properties: {},
@@ -794,7 +787,7 @@ let SwaggerExplorer = class SwaggerExplorer {
                 const metadata = props[key].metadata || {};
                 if (!metadata.type) {
                     // 推导类型
-                    metadata.type = (0, core_1.getPropertyType)(clzz.prototype, key).name;
+                    metadata.type = core_1.MetadataManager.transformTypeFromTSDesign(core_1.MetadataManager.getPropertyType(clzz.prototype, key)).name;
                 }
                 tt.properties[key] = tt.properties[key] || {};
                 // loop metadata
@@ -898,6 +891,7 @@ let SwaggerExplorer = class SwaggerExplorer {
         }
     }
 };
+exports.SwaggerExplorer = SwaggerExplorer;
 __decorate([
     (0, core_1.Config)('swagger'),
     __metadata("design:type", Object)
@@ -908,11 +902,10 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], SwaggerExplorer.prototype, "init", null);
-SwaggerExplorer = __decorate([
+exports.SwaggerExplorer = SwaggerExplorer = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], SwaggerExplorer);
-exports.SwaggerExplorer = SwaggerExplorer;
 /**
  * 解释路由上的参数
  * @param url

package/dist/swaggerMiddleware.js

@@ -75,6 +75,7 @@ let SwaggerMiddleware = class SwaggerMiddleware {
         return 'swagger';
     }
 };
+exports.SwaggerMiddleware = SwaggerMiddleware;
 __decorate([
     (0, core_1.Config)('swagger'),
     __metadata("design:type", Object)
@@ -93,9 +94,8 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], SwaggerMiddleware.prototype, "init", null);
-SwaggerMiddleware = __decorate([
+exports.SwaggerMiddleware = SwaggerMiddleware = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], SwaggerMiddleware);
-exports.SwaggerMiddleware = SwaggerMiddleware;
 //# sourceMappingURL=swaggerMiddleware.js.map

package/dist/ui/render.js

@@ -43,7 +43,7 @@ function renderSwaggerUIDist(swaggerConfig, swaggerExplorer) {
         }
         let content = (0, fs_1.readFileSync)((0, path_1.join)(swaggerUiAssetPath, lastName));
         if (lastName === 'swagger-initializer.js' &&
-            (swaggerRenderOptions === null || swaggerRenderOptions === void 0 ? void 0 : swaggerRenderOptions.customInitializer)) {
+            swaggerRenderOptions?.customInitializer) {
             return { ext: 'js', content: swaggerRenderOptions.customInitializer };
         }
         if (lastName === 'index.html' || lastName === 'swagger-initializer.js') {
@@ -71,7 +71,7 @@ function renderJSON(swaggerConfig, swaggerExplorer) {
 exports.renderJSON = renderJSON;
 function renderSwaggerUIRemote(swaggerConfig, swaggerExplorer) {
     const swaggerRenderOptions = swaggerConfig.swaggerUIRenderOptions || {};
-    const indexPagePath = (swaggerRenderOptions === null || swaggerRenderOptions === void 0 ? void 0 : swaggerRenderOptions.indexPagePath) || (0, path_1.join)(__dirname, '../../index.html');
+    const indexPagePath = swaggerRenderOptions?.indexPagePath || (0, path_1.join)(__dirname, '../../index.html');
     return async (pathname) => {
         if (pathname.indexOf(swaggerConfig.swaggerPath) === -1) {
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/swagger",
-  "version": "3.20.6",
+  "version": "4.0.0-beta.1",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -11,22 +11,23 @@
   ],
   "devDependencies": {
     "@apidevtools/swagger-parser": "11.0.1",
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/koa": "^3.20.5",
-    "@midwayjs/mock": "^3.20.4",
-    "@midwayjs/validate": "^3.20.5",
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/koa": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1",
+    "@midwayjs/validate": "^4.0.0-beta.1",
     "swagger-ui-dist": "5.18.3"
   },
   "author": "Kurten Chan <chinkurten@gmail.com>",
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "test": "../../node_modules/.bin/jest --runInBand",
-    "cov": "../../node_modules/.bin/jest --runInBand --coverage --forceExit"
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
+    "ci": "npm run test"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "3bfa0c5d058250a16f4ef304c2c0d10dc060b95c"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.