@midwayjs/swagger 3.14.4 → 3.14.7

package/dist/configuration.js

@@ -22,18 +22,19 @@ let SwaggerConfiguration = class SwaggerConfiguration {
             'faas',
         ]);
         if (apps.length) {
+            const explorer = await container.getAsync(_1.SwaggerExplorer);
+            explorer.scanApp();
+            // 添加统一前缀
             let globalPrefix = this.configService.getConfiguration('globalPrefix') ||
                 this.configService.getConfiguration('koa.globalPrefix') ||
                 this.configService.getConfiguration('express.globalPrefix') ||
                 this.configService.getConfiguration('egg.globalPrefix');
-            const explorer = await container.getAsync(_1.SwaggerExplorer);
             if (globalPrefix) {
                 if (!/^\//.test(globalPrefix)) {
                     globalPrefix = '/' + globalPrefix;
                 }
                 explorer.addGlobalPrefix(globalPrefix);
             }
-            explorer.scanApp();
             apps.forEach(app => {
                 app.useMiddleware(_1.SwaggerMiddleware);
             });

package/dist/documentBuilder.d.ts

@@ -1,4 +1,4 @@
-import { OpenAPIObject, ExternalDocumentationObject, SecurityRequirementObject, SecuritySchemeObject, ServerVariableObject, PathItemObject, SchemaObject } from './interfaces';
+import { OpenAPIObject, ExternalDocumentationObject, SecurityRequirementObject, SecuritySchemeObject, ServerVariableObject, PathItemObject, SchemaObject, PathsObject } from './interfaces';
 export declare class DocumentBuilder {
     private readonly document;
     setTitle(title: string): this;
@@ -10,6 +10,7 @@ export declare class DocumentBuilder {
     addServer(url: string, description?: string, variables?: Record<string, ServerVariableObject>): this;
     setExternalDoc(description: string, url: string): this;
     addPaths(paths: Record<string, PathItemObject>): this;
+    getPaths(): PathsObject;
     addSchema(schema: Record<string, SchemaObject>): this;
     getSchema(name: string): SchemaObject;
     addTag(name: string, description?: string, externalDocs?: ExternalDocumentationObject): this;

package/dist/documentBuilder.js

@@ -53,6 +53,9 @@ class DocumentBuilder {
         Object.assign(this.document.paths, paths);
         return this;
     }
+    getPaths() {
+        return this.document.paths;
+    }
     addSchema(schema) {
         if (!this.document.components.schemas) {
             this.document.components.schemas = {};

package/dist/swaggerExplorer.d.ts

@@ -5,7 +5,7 @@ export declare class SwaggerExplorer {
     private documentBuilder;
     private operationIdFactory;
     init(): Promise<void>;
-    addGlobalPrefix(prefix: string): void;
+    addGlobalPrefix(globalPrefix: string): void;
     scanApp(): void;
     getData(): Omit<import("./interfaces").OpenAPIObject, "paths">;
     protected generatePath(target: Type): void;

package/dist/swaggerExplorer.js

@@ -64,11 +64,23 @@ let SwaggerExplorer = class SwaggerExplorer {
             this.setAuth((_7 = this.swaggerConfig) === null || _7 === void 0 ? void 0 : _7.auth);
         }
     }
-    addGlobalPrefix(prefix) {
-        if (!prefix) {
+    addGlobalPrefix(globalPrefix) {
+        if (!globalPrefix) {
             return;
         }
-        this.documentBuilder.addServer(prefix);
+        const paths = this.documentBuilder.getPaths();
+        // 添加统一前缀后的接口地址
+        const newPaths = {};
+        for (const [routerUrl, value] of Object.entries(paths)) {
+            // 处理路由
+            if (!/^\//.test(routerUrl)) {
+                newPaths[`${globalPrefix}/${routerUrl}`] = value;
+            }
+            else {
+                newPaths[`${globalPrefix}${routerUrl}`] = value;
+            }
+        }
+        this.documentBuilder.addPaths(newPaths);
     }
     scanApp() {
         var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/swagger",
-  "version": "3.14.4",
+  "version": "3.14.7",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -11,9 +11,9 @@
   ],
   "devDependencies": {
     "@midwayjs/core": "^3.14.4",
-    "@midwayjs/koa": "^3.14.4",
-    "@midwayjs/mock": "^3.14.4",
-    "@midwayjs/validate": "^3.14.4",
+    "@midwayjs/koa": "^3.14.7",
+    "@midwayjs/mock": "^3.14.7",
+    "@midwayjs/validate": "^3.14.7",
     "swagger-ui-dist": "4.19.1"
   },
   "author": "Kurten Chan <chinkurten@gmail.com>",
@@ -28,5 +28,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "72aacdfd87ef730f100690557de48dcbd4d806a7"
+  "gitHead": "148356ccd4b97404dde43d4a06edd51da039828a"
 }