CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## v3.3.1 / 2020-06-21
+
+- [#1803], [#1807] Fix TypeScript bugs.
+- [#1740] Add space between `info.message` and `meta.message`.
+- [#1813] Avoid indirect storage-engine dependency.
+- [#1810] README updates.
+
 ## v3.3.0 / 2020-06-21
 
 - [#1779] Fix property name in rejection handler.

README.md

@@ -627,8 +627,8 @@ const myCustomLevels = {
   }
 };
 
-const customLevelLogger = winston.createLogger({ 
-  levels: myCustomLevels.levels 
+const customLevelLogger = winston.createLogger({
+  levels: myCustomLevels.levels
 });
 
 customLevelLogger.foobar('some foobar level-ed message');
@@ -1098,11 +1098,6 @@ you should handle or suppress if you don't want unhandled exceptions:
 // Handle errors
 //
 logger.on('error', function (err) { /* Do Something */ });
-
-//
-// Or just suppress them.
-//
-logger.emitErrs = false;
 ```
 
 ### Working with multiple Loggers in winston

index.d.ts

@@ -46,7 +46,7 @@ declare namespace winston {
 
   interface Profiler {
     logger: Logger;
-    start: Date;
+    start: Number;
     done(info?: any): boolean;
   }
 
@@ -58,7 +58,7 @@ declare namespace winston {
     [optionName: string]: any;
   }
 
-   interface LogMethod {
+  interface LogMethod {
     (level: string, message: string, callback: LogCallback): Logger;
     (level: string, message: string, meta: any, callback: LogCallback): Logger;
     (level: string, message: string, ...meta: any[]): Logger;
@@ -74,8 +74,8 @@ declare namespace winston {
     (infoObject: object): Logger;
   }
 
-  interface LoggerOptions {
-    levels?: Config.AbstractConfigSetLevels;
+  interface LoggerOptions<T extends Config.AbstractConfigSetLevels = Config.AbstractConfigSetLevels> {
+    levels?: T;
     silent?: boolean;
     format?: logform.Format;
     level?: string;
@@ -86,7 +86,29 @@ declare namespace winston {
     exceptionHandlers?: any;
   }
 
-  interface Logger extends NodeJSStream.Transform {
+  type DefaulLevels = {
+    // for cli and npm levels
+    error: number;
+    warn: number;
+    help: number;
+    data: number;
+    info: number;
+    debug: number;
+    prompt: number;
+    http: number;
+    verbose: number;
+    input: number;
+    silly: number;
+
+    // for syslog levels only
+    emerg: number;
+    alert: number;
+    crit: number;
+    warning: number;
+    notice: number;
+  }
+
+  type Logger<T extends Config.AbstractConfigSetLevels = DefaulLevels> = NodeJSStream.Transform & {
     silent: boolean;
     format: logform.Format;
     levels: Config.AbstractConfigSetLevels;
@@ -103,26 +125,6 @@ declare namespace winston {
     clear(): Logger;
     close(): Logger;
 
-    // for cli and npm levels
-    error: LeveledLogMethod;
-    warn: LeveledLogMethod;
-    help: LeveledLogMethod;
-    data: LeveledLogMethod;
-    info: LeveledLogMethod;
-    debug: LeveledLogMethod;
-    prompt: LeveledLogMethod;
-    http: LeveledLogMethod;
-    verbose: LeveledLogMethod;
-    input: LeveledLogMethod;
-    silly: LeveledLogMethod;
-
-    // for syslog levels only
-    emerg: LeveledLogMethod;
-    alert: LeveledLogMethod;
-    crit: LeveledLogMethod;
-    warning: LeveledLogMethod;
-    notice: LeveledLogMethod;
-
     query(options?: QueryOptions, callback?: (err: Error, results: any) => void): any;
     stream(options?: any): NodeJS.ReadableStream;
 
@@ -142,7 +144,7 @@ declare namespace winston {
     isSillyEnabled(): boolean;
 
     new(options?: LoggerOptions): Logger;
-  }
+  } & {[K in keyof T]: LeveledLogMethod;}
 
   interface Container {
     loggers: Map<string, Logger>;
@@ -162,7 +164,7 @@ declare namespace winston {
   let loggers: Container;
 
   let addColors: (target: Config.AbstractConfigSetColors) => any;
-  let createLogger: (options?: LoggerOptions) => Logger;
+  let createLogger: <T extends Config.AbstractConfigSetLevels = DefaulLevels>(options?: LoggerOptions<T>) => Logger<T>;
 
   // Pass-through npm level methods routed to the default logger.
   let error: LeveledLogMethod;

lib/winston/logger.js

@@ -238,7 +238,7 @@ class Logger extends Transform {
           message: msg
         });
 
-        if (meta.message) info.message += `${meta.message}`;
+        if (meta.message) info.message = `${info.message} ${meta.message}`;
         if (meta.stack) info.stack = meta.stack;
 
         this.write(info);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "winston",
   "description": "A logger for just about everything.",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "author": "Charlie Robbins <charlie.robbins@gmail.com>",
   "maintainers": [
     "Jarrett Cruger <jcrugzz@gmail.com>",
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "async": "^3.1.0",
-    "diagnostics": "^2.0.2",
+    "diagnostics": "DABH/diagnostics#master",
     "is-stream": "^2.0.0",
     "logform": "^2.2.0",
     "one-time": "^1.0.0",

test/formats/errors.test.js

@@ -110,7 +110,7 @@ describe('format.errors (integration)', function () {
       format.printf(info => info.message)
     ));
 
-    logger.log('info', 'Caught error: ', new Error('Errors lack .toJSON() lulz'));
+    logger.log('info', 'Caught error:', new Error('Errors lack .toJSON() lulz'));
   });
 
   it('logger.log(level, msg, meta<error>) [custom error properties]', (done) => {
@@ -132,7 +132,7 @@ describe('format.errors (integration)', function () {
       format.printf(info => info.message)
     ));
 
-    logger.log('info', 'Caught error: ', err);
+    logger.log('info', 'Caught error:', err);
   });
 
   it('logger.<level>(error)', (done) => {
@@ -209,7 +209,7 @@ describe('format.errors (integration)', function () {
       format.printf(info => info.message)
     ));
 
-    logger.info('Caught error: ', new Error('Errors lack .toJSON() lulz'));
+    logger.info('Caught error:', new Error('Errors lack .toJSON() lulz'));
   });
 
   it('logger.<level>(msg, meta<error>) [custom error properties]', (done) => {
@@ -231,7 +231,7 @@ describe('format.errors (integration)', function () {
       format.printf(info => info.message)
     ));
 
-    logger.info('Caught error: ', err);
+    logger.info('Caught error:', err);
   });
 
   it(`Promise.reject().catch(logger.<level>)`, (done) => {