Skip to content

Commit

Permalink
lib: reduce usage of require('util')
Browse files Browse the repository at this point in the history
Replace `require('util').inspect` and `require('util').format` with
`require('util/internal/inspect').inspect` and
`require('util/internal/inspect').format` in `lib/internal/errors.js`.

PR-URL: #26782
Refs: #26546
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
dnlup authored and targos committed Mar 27, 2019
1 parent fef2a54 commit 5f3b850
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions lib/internal/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ function lazyInternalUtil() {
return internalUtil;
}

let internalUtilInspect = null;
function lazyInternalUtilInspect() {
if (!internalUtilInspect) {
internalUtilInspect = require('internal/util/inspect');
}
return internalUtilInspect;
}

let buffer;
function lazyBuffer() {
if (buffer === undefined)
Expand Down Expand Up @@ -220,7 +228,6 @@ function E(sym, val, def, ...otherClasses) {
function getMessage(key, args, self) {
const msg = messages.get(key);

if (util === undefined) util = require('util');
if (assert === undefined) assert = require('internal/assert');

if (typeof msg === 'function') {
Expand All @@ -242,7 +249,7 @@ function getMessage(key, args, self) {
return msg;

args.unshift(msg);
return util.format.apply(null, args);
return lazyInternalUtilInspect().format.apply(null, args);
}

let uvBinding;
Expand Down Expand Up @@ -773,7 +780,7 @@ E('ERR_INVALID_ARG_TYPE',
return msg;
}, TypeError);
E('ERR_INVALID_ARG_VALUE', (name, value, reason = 'is invalid') => {
let inspected = util.inspect(value);
let inspected = lazyInternalUtilInspect().inspect(value);
if (inspected.length > 128) {
inspected = `${inspected.slice(0, 128)}...`;
}
Expand Down

0 comments on commit 5f3b850

Please sign in to comment.