-
-
Notifications
You must be signed in to change notification settings - Fork 33.5k
console: allow per-stream inspectOptions
option
#60082
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
+46
−8
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,8 @@ const { | |
Boolean, | ||
ErrorCaptureStackTrace, | ||
FunctionPrototypeBind, | ||
MapPrototypeGet, | ||
MapPrototypeValues, | ||
ObjectDefineProperties, | ||
ObjectDefineProperty, | ||
ObjectKeys, | ||
|
@@ -139,12 +141,20 @@ function Console(options /* or: stdout, stderr, ignoreErrors = true */) { | |
if (inspectOptions !== undefined) { | ||
validateObject(inspectOptions, 'options.inspectOptions'); | ||
|
||
if (inspectOptions.colors !== undefined && | ||
options.colorMode !== undefined) { | ||
throw new ERR_INCOMPATIBLE_OPTION_PAIR( | ||
'options.inspectOptions.color', 'colorMode'); | ||
Comment on lines
-142
to
-145
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. -1 |
||
const inspectOptionsMap = isMap(inspectOptions) ? | ||
inspectOptions : new SafeMap([ | ||
[stdout, inspectOptions], | ||
[stderr, inspectOptions], | ||
]); | ||
|
||
for (const inspectOptions of MapPrototypeValues(inspectOptionsMap)) { | ||
ljharb marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if (inspectOptions.colors !== undefined && | ||
options.colorMode !== undefined) { | ||
throw new ERR_INCOMPATIBLE_OPTION_PAIR( | ||
'options.inspectOptions.color', 'colorMode'); | ||
} | ||
} | ||
optionsMap.set(this, inspectOptions); | ||
optionsMap.set(this, inspectOptionsMap); | ||
} | ||
|
||
// Bind the prototype functions to this Console instance | ||
|
@@ -316,7 +326,8 @@ ObjectDefineProperties(Console.prototype, { | |
color = lazyUtilColors().shouldColorize(stream); | ||
} | ||
|
||
const options = optionsMap.get(this); | ||
const inspectOptionsMap = optionsMap.get(this); | ||
const options = inspectOptionsMap ? MapPrototypeGet(inspectOptionsMap, stream) : undefined; | ||
if (options) { | ||
if (options.colors === undefined) { | ||
options.colors = color; | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
'use strict'; | ||
require('../common'); | ||
const { Console } = require('console'); | ||
const { PassThrough } = require('stream'); | ||
const { strict: assert } = require('assert'); | ||
|
||
const stdout = new PassThrough().setEncoding('utf8'); | ||
const stderr = new PassThrough().setEncoding('utf8'); | ||
|
||
const console = new Console({ | ||
stdout, | ||
stderr, | ||
inspectOptions: new Map([ | ||
[stdout, { colors: true }], | ||
[stderr, { colors: false }], | ||
]), | ||
}); | ||
|
||
console.log('Hello', 42); | ||
console.warn('Hello', 42); | ||
|
||
assert.strictEqual(stdout.read(), 'Hello \x1B[33m42\x1B[39m\n'); | ||
assert.strictEqual(stderr.read(), 'Hello 42\n'); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
0000