Merge pull request #21 from AckeeCZ/update-deps-3719

Update pino and typescript packages

Author: smolijar

package.json

@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@types/express": "^4.16.0",
-    "@types/pino": "^4.16.1",
+    "@types/pino": "^5.8.10",
     "lodash.foreach": "^4.5.0",
     "lodash.isempty": "^4.4.0",
     "lodash.isobject": "^3.0.2",
@@ -41,8 +41,8 @@
     "on-finished": "^2.3.0",
     "on-headers": "^1.0.1",
     "pick-deep": "^1.0.0",
-    "pino": "^4.17.6",
-    "pino-multi-stream": "^3.1.2"
+    "pino": "^5.13.2",
+    "pino-multi-stream": "^4.2.0"
   },
   "devDependencies": {
     "@types/jest": "^24.0.13",
@@ -65,7 +65,7 @@
     "ts-jest": "^24.0.0",
     "tslint": "^5.11.0",
     "tslint-config-ackee": "^0.3.0",
-    "typescript": "^3.3.3333"
+    "typescript": "^3.5.3"
   },
   "husky": {
     "hooks": {

src/index.ts

@@ -25,22 +25,25 @@ export interface AckeeLoggerFactory extends AckeeLogger {
 }
 
 // This is a custom slightly edited version of pino-multistream's write method, which adds support for maximum log level
-// The original version was pino-multistream 3.1.2 (commit 71d98ae) - https://github.com/pinojs/pino-multi-stream/blob/71d98ae191e02c56e39e849d2c30d59c8c6db1b9/multistream.js#L43
+// The original version was pino-multistream 4.2.0 (commit bf7941f) - https://github.com/pinojs/pino-multi-stream/blob/bf7941f77661b6c14dd40840ff4a4db6897f08eb/multistream.js#L43
 const maxLevelWrite: pino.WriteFn = function(this: any, data: object): void {
     let stream;
-    const needsMetadata = Symbol.for('needsMetadata');
+    const metadata = Symbol.for('pino.metadata');
     const level = this.lastLevel;
     const streams = this.streams;
     for (const dest of streams) {
         stream = dest.stream;
         // tslint:disable-next-line:early-exit
         if (dest.level <= level) {
             if (!dest.maxLevel || (dest.maxLevel && level < dest.maxLevel)) {
-                if (stream[needsMetadata]) {
+                if (stream[metadata]) {
+                    // tslint:disable-next-line:no-this-assignment
+                    const { lastTime, lastMsg, lastObj, lastLogger } = this;
                     stream.lastLevel = level;
-                    stream.lastMsg = this.lastMsg;
-                    stream.lastObj = this.lastObj;
-                    stream.lastLogger = this.lastLogger;
+                    stream.lastTime = lastTime;
+                    stream.lastMsg = lastMsg;
+                    stream.lastObj = lastObj;
+                    stream.lastLogger = lastLogger;
                 }
                 stream.write(data);
             }
@@ -78,8 +81,9 @@ const defaultLogger = (options: AckeeLoggerOptions & { loggerName?: string } = {
 
     // Add maxLevel support to pino-multi-stream
     // This could be replaced with custom pass-through stream being passed to multistream, which would filter the messages
-    const streamMaxLevelWrite = maxLevelWrite.bind(logger.stream);
-    logger.stream.write = (chunk: any) => {
+    const loggerStream = (logger as any)[(pino as any).symbols.streamSym] as any;
+    const streamMaxLevelWrite = maxLevelWrite.bind(loggerStream);
+    loggerStream.write = (chunk: any) => {
         streamMaxLevelWrite(chunk);
         return true;
     };

src/streams.ts

@@ -56,13 +56,21 @@ const initLoggerStreams = (
     if (options.streams) {
         streams = options.streams.map(stream => Object.assign({ level: defaultLevel }, stream));
     } else if (options.pretty) {
-        const pretty = pino.pretty();
+        const pretty = pino({
+            prettyPrint: {
+                levelFirst: true,
+            },
+        });
         pretty.pipe(process.stdout);
-        const prettyErr = pino.pretty();
+        const prettyErr = pino({
+            prettyPrint: {
+                levelFirst: true,
+            },
+        });
         prettyErr.pipe(process.stderr);
         streams = [
-            { level: defaultLevel, maxLevel: levels.warn, stream: pretty },
-            { level: 'warn', stream: prettyErr },
+            { level: defaultLevel, maxLevel: levels.warn, stream: pretty as any },
+            { level: 'warn', stream: prettyErr as any },
         ];
     } else {
         streams = [