From cf1b9d395dfbde4a0a4c50e2b72fcede9d899704 Mon Sep 17 00:00:00 2001
From: dnlup <dwon.dnl@gmail.com>
Date: Tue, 19 Mar 2019 14:24:24 +0100
Subject: lib: remove usage of require('util')

Remove usage of public `require('util').inspect` and
`require('util').formatWithOptions`.

PR-URL: https://github.com/nodejs/node/pull/26777
Refs: https://github.com/nodejs/node/issues/26546
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/internal/console/constructor.js | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'lib/internal/console')

diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js
index 0b73d38426..b00707d1fd 100644
--- a/lib/internal/console/constructor.js
+++ b/lib/internal/console/constructor.js
@@ -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';
@@ -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 = {
@@ -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
@@ -406,7 +409,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) &&
@@ -416,10 +419,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;
@@ -436,14 +439,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++;
         }
       }
@@ -465,7 +468,7 @@ const consoleMethods = {
       const values = [];
       let length = 0;
       for (const v of tabularData) {
-        values.push(inspect(v));
+        values.push(_inspect(v));
         length++;
       }
       return final([iterKey, valuesKey], [getIndexArray(length), values]);
@@ -482,7 +485,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) {
@@ -491,7 +494,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]);
         }
       }
     }
-- 
cgit v1.2.3