@midwayjs/core 3.14.11 → 3.15.0

package/dist/baseFramework.js

@@ -92,28 +92,24 @@ class BaseFramework {
         return this.app;
     }
     createContextLogger(ctx, name) {
-        const appLogger = this.getLogger(name !== null && name !== void 0 ? name : this.contextLoggerApplyLogger);
-        if (name) {
+        if (name && name !== 'appLogger') {
+            const appLogger = this.getLogger(name);
             let ctxLoggerCache = ctx.getAttr(constants_1.REQUEST_CTX_LOGGER_CACHE_KEY);
             if (!ctxLoggerCache) {
                 ctxLoggerCache = new Map();
                 ctx.setAttr(constants_1.REQUEST_CTX_LOGGER_CACHE_KEY, ctxLoggerCache);
             }
-            if (!name) {
-                name = 'appLogger';
-            }
             // if logger exists
             if (ctxLoggerCache.has(name)) {
                 return ctxLoggerCache.get(name);
             }
             // create new context logger
-            const ctxLogger = this.loggerService.createContextLogger(ctx, appLogger, {
-                contextFormat: this.contextLoggerFormat,
-            });
+            const ctxLogger = this.loggerService.createContextLogger(ctx, appLogger);
             ctxLoggerCache.set(name, ctxLogger);
             return ctxLogger;
         }
         else {
+            const appLogger = this.getLogger(name !== null && name !== void 0 ? name : this.contextLoggerApplyLogger);
             // avoid maximum call stack size exceeded
             if (ctx['_logger']) {
                 return ctx['_logger'];
@@ -379,11 +375,5 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], BaseFramework.prototype, "init", null);
-__decorate([
-    (0, decorator_1.Destroy)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], BaseFramework.prototype, "stop", null);
 exports.BaseFramework = BaseFramework;
 //# sourceMappingURL=baseFramework.js.map

package/dist/common/loggerFactory.d.ts

@@ -28,7 +28,7 @@ export declare class DefaultConsoleLoggerFactory implements LoggerFactory<ILogge
             };
         };
     };
-    createContextLogger(ctx: any, appLogger: ILogger): ILogger;
+    createContextLogger(ctx: any, appLogger: ILogger, contextOptions?: any): ILogger;
     getClients(): Map<string, ILogger>;
     getClientKeys(): string[];
 }

package/dist/common/loggerFactory.js

@@ -28,7 +28,7 @@ class DefaultConsoleLoggerFactory {
             },
         };
     }
-    createContextLogger(ctx, appLogger) {
+    createContextLogger(ctx, appLogger, contextOptions) {
         return appLogger;
     }
     getClients() {

package/dist/common/serviceFactory.d.ts

@@ -14,7 +14,7 @@ export declare abstract class ServiceFactory<T> implements IServiceFactory<T> {
     createInstance(config: any, clientName?: any): Promise<T | undefined>;
     abstract getName(): string;
     protected abstract createClient(config: any, clientName: any): Promise<T | void> | (T | void);
-    protected destroyClient(client: T): Promise<void>;
+    protected destroyClient(client: T, clientName?: string): Promise<void>;
     stop(): Promise<void>;
     getDefaultClientName(): string;
     getClients(): Map<string, T>;

package/dist/common/serviceFactory.js

@@ -55,10 +55,10 @@ class ServiceFactory {
             return client;
         }
     }
-    async destroyClient(client) { }
+    async destroyClient(client, clientName) { }
     async stop() {
-        for (const value of this.clients.values()) {
-            await this.destroyClient(value);
+        for (const [name, value] of this.clients.entries()) {
+            await this.destroyClient(value, name);
         }
     }
     getDefaultClientName() {

package/dist/decorator/web/paramMapping.js

@@ -19,18 +19,16 @@ var RouteParamTypes;
     RouteParamTypes["CUSTOM"] = "custom";
 })(RouteParamTypes = exports.RouteParamTypes || (exports.RouteParamTypes = {}));
 const createParamMapping = function (type) {
-    return (propertyOrPipes, pipes) => {
+    return (propertyOrPipes, options = {}) => {
         let propertyData = propertyOrPipes;
-        if (Array.isArray(propertyOrPipes) && pipes === undefined) {
-            pipes = propertyOrPipes;
+        if (Array.isArray(propertyOrPipes) && options.pipes === undefined) {
+            options.pipes = propertyOrPipes;
             propertyData = undefined;
         }
         return (0, __1.createCustomParamDecorator)(__1.WEB_ROUTER_PARAM_KEY, {
             type,
             propertyData,
-        }, {
-            pipes,
-        });
+        }, options);
     };
 };
 const createRequestParamDecorator = function (transform, pipesOrOptions) {
@@ -40,29 +38,29 @@ const createRequestParamDecorator = function (transform, pipesOrOptions) {
             pipes: pipesOrOptions,
         };
     }
-    return createParamMapping(RouteParamTypes.CUSTOM)(transform, pipesOrOptions.pipes);
+    return createParamMapping(RouteParamTypes.CUSTOM)(transform, pipesOrOptions);
 };
 exports.createRequestParamDecorator = createRequestParamDecorator;
-const Session = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.SESSION)(propertyOrPipes, pipes);
+const Session = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.SESSION)(propertyOrPipes, { pipes });
 exports.Session = Session;
-const Body = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.BODY)(propertyOrPipes, pipes);
+const Body = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.BODY)(propertyOrPipes, { pipes });
 exports.Body = Body;
-const Query = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.QUERY)(propertyOrPipes, pipes);
+const Query = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.QUERY)(propertyOrPipes, { pipes });
 exports.Query = Query;
-const Param = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.PARAM)(propertyOrPipes, pipes);
+const Param = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.PARAM)(propertyOrPipes, { pipes });
 exports.Param = Param;
-const Headers = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.HEADERS)(propertyOrPipes, pipes);
+const Headers = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.HEADERS)(propertyOrPipes, { pipes });
 exports.Headers = Headers;
-const File = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.FILESTREAM)(propertyOrPipes, pipes);
+const File = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.FILESTREAM)(propertyOrPipes, { pipes });
 exports.File = File;
-const Files = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.FILESSTREAM)(propertyOrPipes, pipes);
+const Files = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.FILESSTREAM)(propertyOrPipes, { pipes });
 exports.Files = Files;
-const RequestPath = (pipes) => createParamMapping(RouteParamTypes.REQUEST_PATH)(undefined, pipes);
+const RequestPath = (pipes) => createParamMapping(RouteParamTypes.REQUEST_PATH)(undefined, { pipes });
 exports.RequestPath = RequestPath;
-const RequestIP = (pipes) => createParamMapping(RouteParamTypes.REQUEST_IP)(undefined, pipes);
+const RequestIP = (pipes) => createParamMapping(RouteParamTypes.REQUEST_IP)(undefined, { pipes });
 exports.RequestIP = RequestIP;
-const Queries = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.QUERIES)(propertyOrPipes, pipes);
+const Queries = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.QUERIES)(propertyOrPipes, { pipes });
 exports.Queries = Queries;
-const Fields = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.FIELDS)(propertyOrPipes, pipes);
+const Fields = (propertyOrPipes, pipes) => createParamMapping(RouteParamTypes.FIELDS)(propertyOrPipes, { pipes });
 exports.Fields = Fields;
 //# sourceMappingURL=paramMapping.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.14.11",
+  "version": "3.15.0",
   "description": "midway core",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "a24b455e0b55cda9563236b35f9b49b600920642"
+  "gitHead": "be0a091f940aa60965d9fabfbdcbf0fe2830e9c4"
 }