From bda5344c411e1315a796af573f0617f362a24789 Mon Sep 17 00:00:00 2001 From: Jeff Kenney Date: Thu, 13 Dec 2018 20:54:14 -0800 Subject: [PATCH 1/3] [node] add/fix console methods for 8.x --- types/node/v8/index.d.ts | 19 +++++++++++++- types/node/v8/node-tests.ts | 51 +++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts index 6a2ca10859..e0e901fea6 100644 --- a/types/node/v8/index.d.ts +++ b/types/node/v8/index.d.ts @@ -32,15 +32,32 @@ interface Console { Console: NodeJS.ConsoleConstructor; assert(value: any, message?: string, ...optionalParams: any[]): void; - dir(obj: any, options?: NodeJS.InspectOptions): void; + clear(): void; + count(label?: string): void; + countReset(label?: string): void; debug(message?: any, ...optionalParams: any[]): void; + dir(obj: any, options?: NodeJS.InspectOptions): void; error(message?: any, ...optionalParams: any[]): void; + group(...label: any[]): void; + groupCollapsed(): void; + groupEnd(): void; info(message?: any, ...optionalParams: any[]): void; log(message?: any, ...optionalParams: any[]): void; time(label: string): void; timeEnd(label: string): void; trace(message?: any, ...optionalParams: any[]): void; warn(message?: any, ...optionalParams: any[]): void; + + // --- Inspector mode only --- + /** @deprecated Use console.timeStamp() instead. */ + markTimeline(label?: string): void; + profile(label?: string): void; + profileEnd(label?: string): void; + timeStamp(label?: string): void; + /** @deprecated Use console.time() instead. */ + timeline(label?: string): void; + /** @deprecated Use console.timeEnd() instead. */ + timelineEnd(label?: string): void; } interface Error { diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts index aa67464043..76f2ef380e 100644 --- a/types/node/v8/node-tests.ts +++ b/types/node/v8/node-tests.ts @@ -2700,6 +2700,57 @@ namespace console_tests { var writeStream = fs.createWriteStream('./index.d.ts'); var consoleInstance = new console.Console(writeStream); } + { + console.assert('value'); + console.assert('value', 'message'); + console.assert('value', 'message', 'foo', 'bar'); + console.clear(); + console.count(); + console.count('label'); + console.countReset(); + console.countReset('label'); + console.debug(); + console.debug('message'); + console.debug('message', 'foo', 'bar'); + console.dir('obj'); + console.dir('obj', { depth: 1 }); + console.error(); + console.error('message'); + console.error('message', 'foo', 'bar'); + console.group(); + console.group('label'); + console.group('label1', 'label2'); + console.groupCollapsed(); + console.groupEnd(); + console.info(); + console.info('message'); + console.info('message', 'foo', 'bar'); + console.log(); + console.log('message'); + console.log('message', 'foo', 'bar'); + console.time('label'); + console.timeEnd('label'); + console.trace(); + console.trace('message'); + console.trace('message', 'foo', 'bar'); + console.warn(); + console.warn('message'); + console.warn('message', 'foo', 'bar'); + + // --- Inspector mode only --- + console.markTimeline(); + console.markTimeline('label'); + console.profile(); + console.profile('label'); + console.profileEnd(); + console.profileEnd('label'); + console.timeStamp(); + console.timeStamp('label'); + console.timeline(); + console.timeline('label'); + console.timelineEnd(); + console.timelineEnd('label'); + } } /////////////////////////////////////////////////// From 9f88ee6e80eda8e40529cfa97bd5c09d23d7aaa3 Mon Sep 17 00:00:00 2001 From: Jeff Kenney Date: Thu, 13 Dec 2018 21:39:58 -0800 Subject: [PATCH 2/3] [node] add/fix console methods for 9.x --- types/node/v9/index.d.ts | 23 +++++++++++++++- types/node/v9/node-tests.ts | 54 +++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts index 3660d87725..5bafe1ec47 100644 --- a/types/node/v9/index.d.ts +++ b/types/node/v9/index.d.ts @@ -109,6 +109,13 @@ interface Console { warn(message?: any, ...optionalParams: any[]): void; // --- Inspector mode only --- + /** + * This method does not display anything unless used in the inspector. + * The console.markTimeline() method is the deprecated form of console.timeStamp(). + * + * @deprecated Use console.timeStamp() instead. + */ + markTimeline(label?: string): void; /** * This method does not display anything unless used in the inspector. * Starts a JavaScript CPU profile with an optional label. @@ -118,7 +125,7 @@ interface Console { * This method does not display anything unless used in the inspector. * Stops the current JavaScript CPU profiling session if one has been started and prints the report to the Profiles panel of the inspector. */ - profileEnd(): void; + profileEnd(label?: string): void; /** * This method does not display anything unless used in the inspector. * Prints to `stdout` the array `array` formatted as a table. @@ -129,6 +136,20 @@ interface Console { * Adds an event with the label `label` to the Timeline panel of the inspector. */ timeStamp(label?: string): void; + /** + * This method does not display anything unless used in the inspector. + * The console.timeline() method is the deprecated form of console.time(). + * + * @deprecated Use console.time() instead. + */ + timeline(label?: string): void; + /** + * This method does not display anything unless used in the inspector. + * The console.timelineEnd() method is the deprecated form of console.timeEnd(). + * + * @deprecated Use console.timeEnd() instead. + */ + timelineEnd(label?: string): void; } interface Error { diff --git a/types/node/v9/node-tests.ts b/types/node/v9/node-tests.ts index c93079b39f..e9c4f70ebb 100644 --- a/types/node/v9/node-tests.ts +++ b/types/node/v9/node-tests.ts @@ -2735,6 +2735,60 @@ namespace console_tests { var writeStream = fs.createWriteStream('./index.d.ts'); var consoleInstance = new console.Console(writeStream); } + { + console.assert('value'); + console.assert('value', 'message'); + console.assert('value', 'message', 'foo', 'bar'); + console.clear(); + console.count(); + console.count('label'); + console.countReset(); + console.countReset('label'); + console.debug(); + console.debug('message'); + console.debug('message', 'foo', 'bar'); + console.dir('obj'); + console.dir('obj', { depth: 1 }); + console.error(); + console.error('message'); + console.error('message', 'foo', 'bar'); + console.group(); + console.group('label'); + console.group('label1', 'label2'); + console.groupCollapsed(); + console.groupEnd(); + console.info(); + console.info('message'); + console.info('message', 'foo', 'bar'); + console.log(); + console.log('message'); + console.log('message', 'foo', 'bar'); + console.time('label'); + console.timeEnd('label'); + console.trace(); + console.trace('message'); + console.trace('message', 'foo', 'bar'); + console.warn(); + console.warn('message'); + console.warn('message', 'foo', 'bar'); + + // --- Inspector mode only --- + console.markTimeline(); + console.markTimeline('label'); + console.profile(); + console.profile('label'); + console.profileEnd(); + console.profileEnd('label'); + console.table({ foo: 'bar' }); + console.table([{ foo: 'bar' }]); + console.table([{ foo: 'bar' }], ['foo']); + console.timeStamp(); + console.timeStamp('label'); + console.timeline(); + console.timeline('label'); + console.timelineEnd(); + console.timelineEnd('label'); + } } /////////////////////////////////////////////////// From 967265a2ce6c5cc334ddf9d1ddcfd06826c940d0 Mon Sep 17 00:00:00 2001 From: Jeff Kenney Date: Thu, 13 Dec 2018 21:00:01 -0800 Subject: [PATCH 3/3] [node] add/fix console methods for 10.x --- types/node/index.d.ts | 25 +++++++++++++++-- types/node/node-tests.ts | 59 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/types/node/index.d.ts b/types/node/index.d.ts index f484e48703..ed0e4b9f0c 100644 --- a/types/node/index.d.ts +++ b/types/node/index.d.ts @@ -113,7 +113,7 @@ interface Console { /** * For a timer that was previously started by calling {@link console.time()}, prints the elapsed time and other `data` arguments to `stdout`. */ - timeLog(label: string, ...data: any[]): void; + timeLog(label?: string, ...data: any[]): void; /** * Prints to `stderr` the string 'Trace :', followed by the {@link util.format()} formatted message and stack trace to the current position in the code. */ @@ -124,6 +124,13 @@ interface Console { warn(message?: any, ...optionalParams: any[]): void; // --- Inspector mode only --- + /** + * This method does not display anything unless used in the inspector. + * The console.markTimeline() method is the deprecated form of console.timeStamp(). + * + * @deprecated Use console.timeStamp() instead. + */ + markTimeline(label?: string): void; /** * This method does not display anything unless used in the inspector. * Starts a JavaScript CPU profile with an optional label. @@ -133,12 +140,26 @@ interface Console { * This method does not display anything unless used in the inspector. * Stops the current JavaScript CPU profiling session if one has been started and prints the report to the Profiles panel of the inspector. */ - profileEnd(): void; + profileEnd(label?: string): void; /** * This method does not display anything unless used in the inspector. * Adds an event with the label `label` to the Timeline panel of the inspector. */ timeStamp(label?: string): void; + /** + * This method does not display anything unless used in the inspector. + * The console.timeline() method is the deprecated form of console.time(). + * + * @deprecated Use console.time() instead. + */ + timeline(label?: string): void; + /** + * This method does not display anything unless used in the inspector. + * The console.timelineEnd() method is the deprecated form of console.timeEnd(). + * + * @deprecated Use console.timeEnd() instead. + */ + timelineEnd(label?: string): void; } interface Error { diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts index e2e24dad68..ad240b9513 100644 --- a/types/node/node-tests.ts +++ b/types/node/node-tests.ts @@ -3369,6 +3369,65 @@ import * as p from "process"; stdout: writeStream }); } + { + console.assert('value'); + console.assert('value', 'message'); + console.assert('value', 'message', 'foo', 'bar'); + console.clear(); + console.count(); + console.count('label'); + console.countReset(); + console.countReset('label'); + console.debug(); + console.debug('message'); + console.debug('message', 'foo', 'bar'); + console.dir('obj'); + console.dir('obj', { depth: 1 }); + console.error(); + console.error('message'); + console.error('message', 'foo', 'bar'); + console.group(); + console.group('label'); + console.group('label1', 'label2'); + console.groupCollapsed(); + console.groupEnd(); + console.info(); + console.info('message'); + console.info('message', 'foo', 'bar'); + console.log(); + console.log('message'); + console.log('message', 'foo', 'bar'); + console.table({ foo: 'bar' }); + console.table([{ foo: 'bar' }]); + console.table([{ foo: 'bar' }], ['foo']); + console.time(); + console.time('label'); + console.timeEnd(); + console.timeEnd('label'); + console.timeLog(); + console.timeLog('label'); + console.timeLog('label', 'foo', 'bar'); + console.trace(); + console.trace('message'); + console.trace('message', 'foo', 'bar'); + console.warn(); + console.warn('message'); + console.warn('message', 'foo', 'bar'); + + // --- Inspector mode only --- + console.markTimeline(); + console.markTimeline('label'); + console.profile(); + console.profile('label'); + console.profileEnd(); + console.profileEnd('label'); + console.timeStamp(); + console.timeStamp('label'); + console.timeline(); + console.timeline('label'); + console.timelineEnd(); + console.timelineEnd('label'); + } } ///////////////////////////////////////////////////