From 5cc9d512c6c1d288593e70e068fb29fc5d2ebcc7 Mon Sep 17 00:00:00 2001 From: Piotr Roszatycki Date: Mon, 18 Nov 2019 22:45:41 +0100 Subject: [PATCH] bunyan-format: reverted back to old syntax (#40455) * bunyan-format: reverted back to old syntax * bunyan-format: tslint:disable-next-line --- types/bunyan-format/bunyan-format-tests.ts | 9 +++++---- types/bunyan-format/index.d.ts | 15 +++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/types/bunyan-format/bunyan-format-tests.ts b/types/bunyan-format/bunyan-format-tests.ts index 159c3cde17..6467fccc7b 100644 --- a/types/bunyan-format/bunyan-format-tests.ts +++ b/types/bunyan-format/bunyan-format-tests.ts @@ -1,9 +1,10 @@ import BunyanFormatWritable = require('bunyan-format'); +import { Writable } from 'stream'; -const formatOut = new BunyanFormatWritable({ outputMode: 'short' }); +const formatOut: Writable = new BunyanFormatWritable({ outputMode: 'short' }); -const formatOut2 = new BunyanFormatWritable({ outputMode: 'bunyan', levelInString: true }); +const formatOut2: NodeJS.WritableStream = new BunyanFormatWritable({ outputMode: 'bunyan', levelInString: true }); -const formatOut3 = BunyanFormatWritable({ outputMode: 'short' }); +const formatOut3: Writable = BunyanFormatWritable({ outputMode: 'short' }); -const formatOut4 = BunyanFormatWritable({ outputMode: 'bunyan', levelInString: true }); +const formatOut4: NodeJS.WritableStream = BunyanFormatWritable({ outputMode: 'bunyan', levelInString: true }); diff --git a/types/bunyan-format/index.d.ts b/types/bunyan-format/index.d.ts index 867e724785..13cec4d397 100644 --- a/types/bunyan-format/index.d.ts +++ b/types/bunyan-format/index.d.ts @@ -3,7 +3,7 @@ // Definitions by: Piotr Roszatycki // Ashley Abbott // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 3.6 +// TypeScript Version: 2.1 /// @@ -23,11 +23,14 @@ declare namespace BunyanFormatWritable { } } -declare class BunyanFormatWritable extends Writable { - /** Creates a writable stream that formats bunyan records written to it. */ - constructor(options: BunyanFormatWritable.Options, output?: Writable); -} +// tslint:disable-next-line no-empty-interface +interface BunyanFormatWritable extends Writable {} -declare function BunyanFormatWritable(options: BunyanFormatWritable.Options, output?: Writable): BunyanFormatWritable; +declare var BunyanFormatWritable: { + /** Creates a writable stream that formats bunyan records written to it. */ + (options: BunyanFormatWritable.Options, output?: Writable): BunyanFormatWritable; + /** Creates a writable stream that formats bunyan records written to it. */ + new (options: BunyanFormatWritable.Options, output?: Writable): BunyanFormatWritable; +}; export = BunyanFormatWritable;