From dfa678e14395f3e0739af90a17cf1c4e68619bf0 Mon Sep 17 00:00:00 2001
From: Kamforka <kamforka@hotmail.com>
Date: Tue, 4 Jun 2019 22:12:42 +0200
Subject: [PATCH] Add format property to logger options (#35924)

* Add format property to logger options

* Add tests for format property
---
 types/express-winston/express-winston-tests.ts | 3 +++
 types/express-winston/index.d.ts               | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/types/express-winston/express-winston-tests.ts b/types/express-winston/express-winston-tests.ts
index 285d6725e7..5008464ace 100644
--- a/types/express-winston/express-winston-tests.ts
+++ b/types/express-winston/express-winston-tests.ts
@@ -1,6 +1,7 @@
 import expressWinston = require('express-winston');
 import * as winston from 'winston';
 import express = require('express');
+import { Format } from 'logform';
 
 const app = express();
 
@@ -12,6 +13,7 @@ app.use(expressWinston.logger({
   colorize: true,
   dynamicMeta: (req, res, err) => ({ foo: 'bar' }),
   expressFormat: true,
+  format: new Format(),
   ignoreRoute: (req, res) => true,
   ignoredRoutes: ['foo'],
   level: (req, res) => 'level',
@@ -45,6 +47,7 @@ app.use(expressWinston.logger({
 app.use(expressWinston.errorLogger({
   baseMeta: { foo: 'foo', nested: { bar: 'baz' } },
   dynamicMeta: (req, res, err) => ({ foo: 'bar' }),
+  format: new Format(),
   level: (req, res) => 'level',
   metaField: 'metaField',
   msg: 'msg',
diff --git a/types/express-winston/index.d.ts b/types/express-winston/index.d.ts
index 1d9c42355f..c72bba00b6 100644
--- a/types/express-winston/index.d.ts
+++ b/types/express-winston/index.d.ts
@@ -5,6 +5,7 @@
 // TypeScript Version: 2.2
 
 import { ErrorRequestHandler, Handler, Request, Response } from 'express';
+import { Format } from 'logform';
 import * as winston from 'winston';
 import * as Transport from 'winston-transport';
 
@@ -30,6 +31,7 @@ export interface BaseLoggerOptions {
   colorize?: boolean;
   dynamicMeta?: DynamicMetaFunction;
   expressFormat?: boolean;
+  format?: Format;
   ignoreRoute?: RouteFilter;
   ignoredRoutes?: string[];
   level?: string | DynamicLevelFunction;
@@ -63,6 +65,7 @@ export function logger(options: LoggerOptions): Handler;
 export interface BaseErrorLoggerOptions {
   baseMeta?: object;
   dynamicMeta?: DynamicMetaFunction;
+  format?: Format;
   level?: string | DynamicLevelFunction;
   metaField?: string;
   msg?: MessageTemplate;