Skip to content

lib: remove usage of require('util') #26777

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.

Sign up for GitHub

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
wants to merge 1 commit into from
Closed

lib: remove usage of require('util') #26777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions lib/internal/console/constructor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@ const {
} = require('internal/errors');
const { previewEntries } = internalBinding('util');
const { Buffer: { isBuffer } } = require('buffer');
const util = require('util');
const {
inspect,
formatWithOptions
} = require('internal/util/inspect');
const {
isTypedArray, isSet, isMap, isSetIterator, isMapIterator,
} = util.types;
} = require('internal/util/types');
const kCounts = Symbol('counts');

const kTraceConsoleCategory = 'node,node.console';
Expand Down Expand Up @@ -271,12 +274,12 @@ Console.prototype[kGetInspectOptions] = function(stream) {

Console.prototype[kFormatForStdout] = function(args) {
const opts = this[kGetInspectOptions](this._stdout);
return util.formatWithOptions(opts, ...args);
return formatWithOptions(opts, ...args);
};

Console.prototype[kFormatForStderr] = function(args) {
const opts = this[kGetInspectOptions](this._stderr);
return util.formatWithOptions(opts, ...args);
return formatWithOptions(opts, ...args);
};

const consoleMethods = {
Expand All @@ -291,7 +294,7 @@ const consoleMethods = {


dir(object, options) {
this[kWriteToConsole](kUseStdout, util.inspect(object, {
this[kWriteToConsole](kUseStdout, inspect(object, {
customInspect: false,
...this[kGetInspectOptions](this._stdout),
...options
Expand Down Expand Up @@ -405,7 +408,7 @@ const consoleMethods = {
if (cliTable === undefined) cliTable = require('internal/cli_table');
const final = (k, v) => this.log(cliTable(k, v));

const inspect = (v) => {
const _inspect = (v) => {
const depth = v !== null &&
typeof v === 'object' &&
!isArray(v) &&
Expand All @@ -415,10 +418,10 @@ const consoleMethods = {
maxArrayLength: 3,
...this[kGetInspectOptions](this._stdout)
};
return util.inspect(v, opt);
return inspect(v, opt);
};
const getIndexArray = (length) => ArrayFrom(
{ length }, (_, i) => inspect(i));
{ length }, (_, i) => _inspect(i));

const mapIter = isMapIterator(tabularData);
let isKeyValue = false;
Expand All @@ -435,14 +438,14 @@ const consoleMethods = {
let length = 0;
if (mapIter) {
for (; i < tabularData.length / 2; ++i) {
keys.push(inspect(tabularData[i * 2]));
values.push(inspect(tabularData[i * 2 + 1]));
keys.push(_inspect(tabularData[i * 2]));
values.push(_inspect(tabularData[i * 2 + 1]));
length++;
}
} else {
for (const [k, v] of tabularData) {
keys.push(inspect(k));
values.push(inspect(v));
keys.push(_inspect(k));
values.push(_inspect(v));
length++;
}
}
Expand All @@ -464,7 +467,7 @@ const consoleMethods = {
const values = [];
let length = 0;
for (const v of tabularData) {
values.push(inspect(v));
values.push(_inspect(v));
length++;
}
return final([setlike ? iterKey : indexKey, valuesKey], [
Expand All @@ -484,7 +487,7 @@ const consoleMethods = {
(typeof item !== 'function' && typeof item !== 'object');
if (properties === undefined && primitive) {
hasPrimitives = true;
valuesKeyArray[i] = inspect(item);
valuesKeyArray[i] = _inspect(item);
} else {
const keys = properties || ObjectKeys(item);
for (const key of keys) {
Expand All @@ -493,7 +496,7 @@ const consoleMethods = {
if ((primitive && properties) || !hasOwnProperty(item, key))
map[key][i] = '';
else
map[key][i] = item == null ? item : inspect(item[key]);
map[key][i] = item == null ? item : _inspect(item[key]);
}
}
}
Expand Down