From 009b558381de953302aa347930ab162d9e72c6dc Mon Sep 17 00:00:00 2001 From: Michael Strobel Date: Tue, 8 Aug 2017 11:28:39 +0800 Subject: [PATCH 1/3] [bunyan] add levelFromName and nameFromLevel --- types/bunyan/bunyan-tests.ts | 3 +++ types/bunyan/index.d.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/types/bunyan/bunyan-tests.ts b/types/bunyan/bunyan-tests.ts index 657a59c3a8..8b8f88a60c 100644 --- a/types/bunyan/bunyan-tests.ts +++ b/types/bunyan/bunyan-tests.ts @@ -129,3 +129,6 @@ class MyLogger extends Logger { super(options); } } + +const nameLevel: number = Logger.levelFromName['warn']; +const levelName: string = Logger.nameFromLevel[10]; diff --git a/types/bunyan/index.d.ts b/types/bunyan/index.d.ts index bc1dca298d..c622f7777d 100644 --- a/types/bunyan/index.d.ts +++ b/types/bunyan/index.d.ts @@ -210,6 +210,9 @@ declare namespace Logger { const ERROR: number; const FATAL: number; + const levelFromName: { [name: string]: number }; + const nameFromLevel: { [level: number]: string }; + type LogLevel = 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal' | number; const stdSerializers: StdSerializers; From 07fef65e03a97bfb5eb096c08c6a85cd736c3aa5 Mon Sep 17 00:00:00 2001 From: Michael Strobel Date: Tue, 8 Aug 2017 13:06:12 +0800 Subject: [PATCH 2/3] [bunyan] Narrow types for levelFromName --- types/bunyan/bunyan-tests.ts | 4 +++- types/bunyan/index.d.ts | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/types/bunyan/bunyan-tests.ts b/types/bunyan/bunyan-tests.ts index 8b8f88a60c..d4c4f61e1c 100644 --- a/types/bunyan/bunyan-tests.ts +++ b/types/bunyan/bunyan-tests.ts @@ -130,5 +130,7 @@ class MyLogger extends Logger { } } -const nameLevel: number = Logger.levelFromName['warn']; +const logLevelString: Logger.LogLevelString = 'warn'; +const nameLevel: number = Logger.levelFromName[logLevelString]; +const nameLevel2: number = Logger.levelFromName['warn']; const levelName: string = Logger.nameFromLevel[10]; diff --git a/types/bunyan/index.d.ts b/types/bunyan/index.d.ts index c622f7777d..a59790ebc9 100644 --- a/types/bunyan/index.d.ts +++ b/types/bunyan/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/trentm/node-bunyan // Definitions by: Alex Mikhalev // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.1 /// @@ -210,10 +211,11 @@ declare namespace Logger { const ERROR: number; const FATAL: number; - const levelFromName: { [name: string]: number }; - const nameFromLevel: { [level: number]: string }; + type LogLevelString = 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal'; + type LogLevel = LogLevelString | number; - type LogLevel = 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal' | number; + const levelFromName: { [name in LogLevelString]: number }; + const nameFromLevel: { [level: number]: string }; const stdSerializers: StdSerializers; From cda63c85ed5a8b84393914a4f68a4772c8528d42 Mon Sep 17 00:00:00 2001 From: Michael Strobel Date: Wed, 9 Aug 2017 08:20:19 +0800 Subject: [PATCH 3/3] Add minimum TypeScript version 2.1 to types depending on bunyan --- types/bunyan-config/index.d.ts | 1 + types/bunyan-logentries/index.d.ts | 1 + types/easy-api-request/index.d.ts | 1 + types/easy-xapi-utils/index.d.ts | 2 +- types/easy-xapi/index.d.ts | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/types/bunyan-config/index.d.ts b/types/bunyan-config/index.d.ts index 0ff84fd9d2..ebcddcd50d 100644 --- a/types/bunyan-config/index.d.ts +++ b/types/bunyan-config/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/LSEducation/bunyan-config // Definitions by: Cyril Schumacher // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.1 /// diff --git a/types/bunyan-logentries/index.d.ts b/types/bunyan-logentries/index.d.ts index 9a2a5c3fb9..33057d768b 100644 --- a/types/bunyan-logentries/index.d.ts +++ b/types/bunyan-logentries/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/nemtsov/node-bunyan-logentries // Definitions by: Aymeric Beaumet // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.1 /// diff --git a/types/easy-api-request/index.d.ts b/types/easy-api-request/index.d.ts index f04b68be3a..1b3606ccb1 100644 --- a/types/easy-api-request/index.d.ts +++ b/types/easy-api-request/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/DeadAlready/easy-api-request // Definitions by: Karl Düüna // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.1 /// diff --git a/types/easy-xapi-utils/index.d.ts b/types/easy-xapi-utils/index.d.ts index a4e5f568e6..a4b219bf43 100644 --- a/types/easy-xapi-utils/index.d.ts +++ b/types/easy-xapi-utils/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/DeadAlready/easy-xapi-utils // Definitions by: Karl Düüna // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - +// TypeScript Version: 2.1 /// /// diff --git a/types/easy-xapi/index.d.ts b/types/easy-xapi/index.d.ts index f4a9e09391..aa4c0286cf 100644 --- a/types/easy-xapi/index.d.ts +++ b/types/easy-xapi/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/DeadAlready/easy-xapi // Definitions by: Karl Düüna // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - +// TypeScript Version: 2.1 /// ///