vona-module-a-logger 5.0.11 → 5.0.13

package/dist/.metadata/index.d.ts

@@ -1,24 +1,7 @@
-import type { BeanScopeUtil } from 'vona';
-import type { IDecoratorBroadcastOptions } from 'vona-module-a-broadcast';
-import type { IAopMethodOptionsLog } from '../bean/aopMethod.log.ts';
-/** bean: end */
-/** bean: begin */
-import type { BeanLogger } from '../bean/bean.logger.ts';
-/** broadcast: end */
-/** broadcast: begin */
-import type { BroadcastSetLevel } from '../bean/broadcast.setLevel.ts';
-/** middlewareSystem: end */
-/** aopMethod: begin */
+/** middlewareSystem: begin */
+export * from '../bean/middlewareSystem.httpLog.ts';
 import type { IMiddlewareSystemOptionsHttpLog } from '../bean/middlewareSystem.httpLog.ts';
-/** broadcast: end */
-/** scope: begin */
-import { BeanScopeBase } from 'vona';
-import 'vona';
-import 'vona';
 import 'vona';
-import 'vona';
-import 'vona';
-export * from '../bean/aopMethod.log.ts';
 declare module 'vona-module-a-aspect' {
     interface IMiddlewareSystemRecord {
         'a-logger:httpLog': IMiddlewareSystemOptionsHttpLog;
@@ -28,9 +11,11 @@ declare module 'vona-module-a-logger' {
     interface MiddlewareSystemHttpLog {
     }
 }
-/** aopMethod: end */
-/** bean: begin */
-export * from '../bean/bean.logger.ts';
+/** middlewareSystem: end */
+/** aopMethod: begin */
+export * from '../bean/aopMethod.log.ts';
+import type { IAopMethodOptionsLog } from '../bean/aopMethod.log.ts';
+import 'vona';
 declare module 'vona-module-a-aspect' {
     interface IAopMethodRecord {
         'a-logger:log': IAopMethodOptionsLog;
@@ -40,22 +25,29 @@ declare module 'vona-module-a-logger' {
     interface AopMethodLog {
     }
 }
-/** bean: end */
-/** broadcast: begin */
-export * from '../bean/broadcast.setLevel.ts';
+/** aopMethod: end */
+/** bean: begin */
+export * from '../bean/bean.logger.ts';
+import 'vona';
 declare module 'vona' {
 }
 declare module 'vona-module-a-logger' {
     interface BeanLogger {
     }
 }
+/** bean: end */
+/** bean: begin */
+import type { BeanLogger } from '../bean/bean.logger.ts';
+import 'vona';
 declare module 'vona' {
     interface IBeanRecordGlobal {
-        logger: BeanLogger;
+        'logger': BeanLogger;
     }
 }
-/** middlewareSystem: begin */
-export * from '../bean/middlewareSystem.httpLog.ts';
+/** bean: end */
+/** broadcast: begin */
+export * from '../bean/broadcast.setLevel.ts';
+import { type IDecoratorBroadcastOptions } from 'vona-module-a-broadcast';
 declare module 'vona-module-a-broadcast' {
     interface IBroadcastRecord {
         'a-logger:setLevel': IDecoratorBroadcastOptions;
@@ -65,15 +57,22 @@ declare module 'vona-module-a-logger' {
     interface BroadcastSetLevel {
     }
 }
+/** broadcast: end */
+/** broadcast: begin */
+import type { BroadcastSetLevel } from '../bean/broadcast.setLevel.ts';
 export interface IModuleBroadcast {
-    setLevel: BroadcastSetLevel;
+    'setLevel': BroadcastSetLevel;
 }
+/** broadcast: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil } from 'vona';
 export declare class ScopeModuleALogger extends BeanScopeBase {
 }
 export interface ScopeModuleALogger {
     util: BeanScopeUtil;
     broadcast: IModuleBroadcast;
 }
+import 'vona';
 declare module 'vona' {
     interface IBeanScopeRecord {
         'a-logger': ScopeModuleALogger;

package/dist/bean/aopMethod.log.d.ts

@@ -15,7 +15,7 @@ export declare class AopMethodLog extends BeanAopMethodBase implements IAopMetho
     get(options: IAopMethodOptionsLog, next: NextSync, receiver: any, prop: string): any;
     set(options: IAopMethodOptionsLog, value: any, next: NextSync, receiver: any, prop: string): boolean;
     execute(options: IAopMethodOptionsLog, _args: [], next: Next | NextSync, receiver: any, prop: string): Promise<any> | any;
-    _getContext(options: IAopMethodOptionsLog, receiver: any): unknown;
+    _getContext(options: IAopMethodOptionsLog, receiver: any): any;
     _logResult(profiler: winston.Profiler, context: any, res: any, options: IAopMethodOptionsLog, message: string): void;
     _logError(profiler: winston.Profiler, context: any, err: Error, _options: IAopMethodOptionsLog, message: string): void;
 }

package/dist/index.js

@@ -1,16 +1,41 @@
-import { BeanInfo, BeanAopMethodBase, SymbolBeanFullName, BeanBase, BeanScopeBase } from 'vona';
-import { Bean, Scope } from 'vona-module-a-bean';
+import { BeanInfo, BeanBase, BeanAopMethodBase, SymbolBeanFullName, BeanScopeBase } from 'vona';
+import StdSerializers from 'pino-std-serializers';
+import { MiddlewareSystem, AopMethod, Aspect } from 'vona-module-a-aspect';
 import { evaluateExpressions } from '@cabloy/utils';
-import { AopMethod, MiddlewareSystem, Aspect } from 'vona-module-a-aspect';
+import { Bean, Scope } from 'vona-module-a-bean';
 import { Broadcast, BeanBroadcastBase } from 'vona-module-a-broadcast';
-import StdSerializers from 'pino-std-serializers';
 
 var _dec$4, _dec2$4, _class$4;
-let AopMethodLog = (_dec$4 = AopMethod({
+let MiddlewareSystemHttpLog = (_dec$4 = MiddlewareSystem(), _dec2$4 = BeanInfo({
+  module: "a-logger"
+}), _dec$4(_class$4 = _dec2$4(_class$4 = class MiddlewareSystemHttpLog extends BeanBase {
+  async execute(_options, next) {
+    const ctx = this.ctx;
+    // start
+    const req = StdSerializers.req(ctx.req);
+    this.$loggerChild('req').http(JSON.stringify(req));
+    const profiler = this.$loggerChild('res').startTimer();
+    // next
+    await next();
+    // end
+    const res = {
+      url: ctx.req.url,
+      statusCode: ctx.res.statusCode,
+      headers: ctx.res.getHeaders()
+    };
+    profiler.done({
+      level: 'http',
+      message: JSON.stringify(res)
+    });
+  }
+}) || _class$4) || _class$4);
+
+var _dec$3, _dec2$3, _class$3;
+let AopMethodLog = (_dec$3 = AopMethod({
   level: 'info'
-}), _dec2$4 = BeanInfo({
+}), _dec2$3 = BeanInfo({
   module: "a-logger"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class AopMethodLog extends BeanAopMethodBase {
+}), _dec$3(_class$3 = _dec2$3(_class$3 = class AopMethodLog extends BeanAopMethodBase {
   get(options, next, receiver, prop) {
     const context = this._getContext(options, receiver);
     const message = `${receiver[SymbolBeanFullName]}#${prop}(get)`;
@@ -78,7 +103,9 @@ let AopMethodLog = (_dec$4 = AopMethod({
     }
   }
   _getContext(options, receiver) {
-    return evaluateExpressions(options.context, receiver);
+    return evaluateExpressions(options.context, {
+      self: receiver
+    });
   }
   _logResult(profiler, context, res, options, message) {
     const textResult = res !== undefined ? ` result: ${JSON.stringify(res)}` : '';
@@ -98,12 +125,12 @@ let AopMethodLog = (_dec$4 = AopMethod({
     if (context) info.context = context;
     profiler.done(info);
   }
-}) || _class$4) || _class$4);
+}) || _class$3) || _class$3);
 
-var _dec$3, _dec2$3, _class$3;
-let BeanLogger = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
+var _dec$2, _dec2$2, _class$2;
+let BeanLogger = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
   module: "a-logger"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class BeanLogger extends BeanBase {
+}), _dec$2(_class$2 = _dec2$2(_class$2 = class BeanLogger extends BeanBase {
   getLevel(clientName) {
     return this.app.meta.logger.getLevel(clientName);
   }
@@ -114,42 +141,17 @@ let BeanLogger = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
       clientName
     });
   }
-}) || _class$3) || _class$3);
+}) || _class$2) || _class$2);
 
-var _dec$2, _dec2$2, _class$2;
-let BroadcastSetLevel = (_dec$2 = Broadcast(), _dec2$2 = BeanInfo({
+var _dec$1, _dec2$1, _class$1;
+let BroadcastSetLevel = (_dec$1 = Broadcast(), _dec2$1 = BeanInfo({
   module: "a-logger"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class BroadcastSetLevel extends BeanBroadcastBase {
+}), _dec$1(_class$1 = _dec2$1(_class$1 = class BroadcastSetLevel extends BeanBroadcastBase {
   async execute(data, isEmitter) {
     if (!isEmitter) {
       this.app.meta.logger.setLevel(data.level, data.clientName);
     }
   }
-}) || _class$2) || _class$2);
-
-var _dec$1, _dec2$1, _class$1;
-let MiddlewareSystemHttpLog = (_dec$1 = MiddlewareSystem(), _dec2$1 = BeanInfo({
-  module: "a-logger"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class MiddlewareSystemHttpLog extends BeanBase {
-  async execute(_options, next) {
-    const ctx = this.ctx;
-    // start
-    const req = StdSerializers.req(ctx.req);
-    this.$loggerChild('req').http(JSON.stringify(req));
-    const profiler = this.$loggerChild('res').startTimer();
-    // next
-    await next();
-    // end
-    const res = {
-      url: ctx.req.url,
-      statusCode: ctx.res.statusCode,
-      headers: ctx.res.getHeaders()
-    };
-    profiler.done({
-      level: 'http',
-      message: JSON.stringify(res)
-    });
-  }
 }) || _class$1) || _class$1);
 
 var _dec, _dec2, _class;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-logger",
   "type": "module",
-  "version": "5.0.11",
+  "version": "5.0.13",
   "title": "a-logger",
   "vonaModule": {
     "dependencies": {}