@celljs/logger 3.6.4 → 3.6.6

package/lib/common/winston-logger.d.ts

@@ -10,6 +10,6 @@ export declare class WinstonLogger extends AbstractLogger {
     warn(message: string, context?: string): void;
     info(message: string, context?: string): void;
     debug(message: string, context?: string): void;
-    protected call(logFn: (...args: any[]) => void, message: any, context?: string): void;
+    protected log(message: any, context?: string, logFn?: (...args: any[]) => void): void;
 }
 //# sourceMappingURL=winston-logger.d.ts.map

package/lib/common/winston-logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"winston-logger.d.ts","sourceRoot":"","sources":["../../src/common/winston-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgE,cAAc,EAAwB,MAAM,cAAc,CAAC;AAClI,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG5E,qBACa,aAAc,SAAQ,cAAc;IAG7C,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IAIjD,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;IAIlD,SAAS,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAGnC,SAAS,CAAC,IAAI;IAed,SAAS;IAIT,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAIvC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAItC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAItC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;cAIpB,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;CAOjG"}
+{"version":3,"file":"winston-logger.d.ts","sourceRoot":"","sources":["../../src/common/winston-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgE,cAAc,EAAwB,MAAM,cAAc,CAAC;AAClI,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG5E,qBACa,aAAc,SAAQ,cAAc;IAG7C,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IAIjD,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;IAIlD,SAAS,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAGnC,SAAS,CAAC,IAAI;IAed,SAAS;IAIT,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAIvC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAItC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAItC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;cAIpB,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,IAAI;CAGjG"}

package/lib/common/winston-logger.js

@@ -29,24 +29,19 @@ let WinstonLogger = class WinstonLogger extends core_1.AbstractLogger {
         return this.logger;
     }
     error(message, context) {
-        this.call(this.logger.error.bind(this.logger), message, context);
+        this.log(message, context, this.logger.error.bind(this.logger));
     }
     warn(message, context) {
-        this.call(this.logger.warn.bind(this.logger), message, context);
+        this.log(message, context, this.logger.warn.bind(this.logger));
     }
     info(message, context) {
-        this.call(this.logger.info.bind(this.logger), message, context);
+        this.log(message, context, this.logger.info.bind(this.logger));
     }
     debug(message, context) {
-        this.call(this.logger.debug.bind(this.logger), message, context);
+        this.log(message, context, this.logger.debug.bind(this.logger));
     }
-    call(logFn, message, context) {
-        var _a;
-        context = context !== null && context !== void 0 ? context : this.context;
-        const traceId = (_a = this.traceIdProvider) === null || _a === void 0 ? void 0 : _a.provide();
-        const traceStr = traceId ? ` [trace: ${traceId}]` : '';
-        const contextStr = this.context ? ` [${this.context}]` : '';
-        logFn(`${traceStr}${contextStr} ${message}`);
+    log(message, context, logFn) {
+        super.log(message, context, logFn !== null && logFn !== void 0 ? logFn : this.logger.info.bind(this.logger));
     }
 };
 exports.WinstonLogger = WinstonLogger;

package/lib/common/winston-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../../src/common/winston-logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../../src/common/winston-logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAkI;AAClI,uEAA4E;AAC5E,qCAA2D;AAGpD,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,qBAAc;IAcnC,IAAI;QACV,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,GAAG,IAAA,sBAAY,EAAC;gBACvB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,KAAK,KAAK,KAAK,OAAO,EAAE,CAAC,CACzF;gBACD,UAAU,EAAE,CAAC,IAAI,oBAAU,CAAC,OAAO,EAAE,CAAC;gBACtC,GAAG,IAAI,CAAC,aAAa;gBACrB,GAAG,IAAI,CAAC,cAAc;aACzB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,OAAgB;QACnC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,OAAgB;QAClC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,OAAgB;QAClC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,OAAgB;QACnC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACpE,CAAC;IAEkB,GAAG,CAAC,OAAY,EAAE,OAAgB,EAAE,KAAgC;QACnF,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7E,CAAC;CACJ,CAAA;AApDY,sCAAa;AAGH;IADlB,IAAA,YAAK,EAAC,GAAG,oBAAa,gBAAgB,CAAC;;oDACS;AAI9B;IAFlB,IAAA,gBAAS,EAAC,uCAAa,CAAC;IACxB,IAAA,eAAQ,GAAE;;qDACuC;AAIxC;IAFT,IAAA,gBAAS,EAAC,0CAAgB,CAAC;IAC3B,IAAA,eAAQ,GAAE;;6CACwB;AAGzB;IADT,IAAA,oBAAa,GAAE;;;;yCAcf;wBA3BQ,aAAa;IADzB,IAAA,gBAAS,EAAC,EAAE,EAAE,EAAE,aAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,YAAK,CAAC,SAAS,EAAE,CAAC;GACnD,aAAa,CAoDzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celljs/logger",
-  "version": "3.6.4",
+  "version": "3.6.6",
   "description": "logger component for pino",
   "keywords": [
     "cell-component"
@@ -30,16 +30,16 @@
     "watch": "cell-component watch"
   },
   "dependencies": {
-    "@celljs/core": "3.6.4",
-    "@celljs/web": "3.6.4",
+    "@celljs/core": "3.6.6",
+    "@celljs/web": "3.6.6",
     "tslib": "^2.8.0",
     "winston": "^3.10.0"
   },
   "devDependencies": {
-    "@celljs/component": "3.6.4"
+    "@celljs/component": "3.6.6"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "136649727fd8ca2c3c982dce6c5066805c88ac56"
+  "gitHead": "d07565d0b4ef172b52bbdfb9c780fdf73015feac"
 }

package/src/common/winston-logger.ts

@@ -37,26 +37,22 @@ export class WinstonLogger extends AbstractLogger {
     }
 
     error(message: string, context?: string) {
-        this.call(this.logger.error.bind(this.logger), message, context);
+        this.log(message, context, this.logger.error.bind(this.logger));
     }
 
     warn(message: string, context?: string) {
-        this.call(this.logger.warn.bind(this.logger), message, context);
+        this.log(message, context, this.logger.warn.bind(this.logger));
     }
 
     info(message: string, context?: string) {
-        this.call(this.logger.info.bind(this.logger), message, context);
+        this.log(message, context, this.logger.info.bind(this.logger));
     }
 
     debug(message: string, context?: string) {
-        this.call(this.logger.debug.bind(this.logger), message, context);
+        this.log(message, context, this.logger.debug.bind(this.logger));
     }
 
-    protected override call(logFn: (...args: any[]) => void, message: any, context?: string): void {
-        context = context ?? this.context;
-        const traceId = this.traceIdProvider?.provide();
-        const traceStr = traceId ? ` [trace: ${traceId}]` : '';
-        const contextStr = this.context ? ` [${this.context}]` : '';
-        logFn(`${traceStr}${contextStr} ${message}`);
+    protected override log(message: any, context?: string, logFn?: (...args: any[]) => void): void {
+        super.log(message, context, logFn ?? this.logger.info.bind(this.logger));
     }
 }