From 9f90e7bb47e7a9db6652b7d35b28978de91d8b64 Mon Sep 17 00:00:00 2001
From: unknown <rosaxny@gmail.com>
Date: Fri, 20 Mar 2020 12:28:11 -0400
Subject: [PATCH 1/2] util: add `maxStrLength` option to `inspect` function

Refs: https://github.com/nodejs/node/issues/25478
---
 doc/api/util.md                    |  6 ++++++
 lib/internal/util/inspect.js       | 14 ++++++++++++--
 test/parallel/test-util-inspect.js |  9 +++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index e1dadbf65f299f..6cab40db100b4a 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -398,6 +398,9 @@ stream.write('With ES6');
 <!-- YAML
 added: v0.3.0
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/32392
+    description: The `maxStringLength` option is supported now.
   - version: v13.5.0
     pr-url: https://github.com/nodejs/node/pull/30768
     description: User defined prototype properties are inspected in case
@@ -483,6 +486,9 @@ changes:
     [`TypedArray`][], [`WeakMap`][] and [`WeakSet`][] elements to include when
     formatting. Set to `null` or `Infinity` to show all elements. Set to `0` or
     negative to show no elements. **Default:** `100`.
+  * `maxStringLength` {integer} Specifies the maximum number of characters to
+    include when formatting. Set to `null` or `Infinity` to show all elements.
+    Set to `0` or negative to show no characters. **Default:** `10000`.
   * `breakLength` {integer} The length at which input values are split across
     multiple lines. Set to `Infinity` to format the input as a single line
     (in combination with `compact` set to `true` or any number >= `1`).
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
index e25b599e8cc276..fe21854e16aa7f 100644
--- a/lib/internal/util/inspect.js
+++ b/lib/internal/util/inspect.js
@@ -146,6 +146,7 @@ const inspectDefaultOptions = ObjectSeal({
   customInspect: true,
   showProxy: false,
   maxArrayLength: 100,
+  maxStringLength: 10000,
   breakLength: 80,
   compact: 3,
   sorted: false,
@@ -215,6 +216,7 @@ function getUserOptions(ctx) {
     customInspect: ctx.customInspect,
     showProxy: ctx.showProxy,
     maxArrayLength: ctx.maxArrayLength,
+    maxStringLength: ctx.maxStringLength,
     breakLength: ctx.breakLength,
     compact: ctx.compact,
     sorted: ctx.sorted,
@@ -245,6 +247,7 @@ function inspect(value, opts) {
     customInspect: inspectDefaultOptions.customInspect,
     showProxy: inspectDefaultOptions.showProxy,
     maxArrayLength: inspectDefaultOptions.maxArrayLength,
+    maxStringLength: inspectDefaultOptions.maxStringLength,
     breakLength: inspectDefaultOptions.breakLength,
     compact: inspectDefaultOptions.compact,
     sorted: inspectDefaultOptions.sorted,
@@ -282,6 +285,7 @@ function inspect(value, opts) {
   }
   if (ctx.colors) ctx.stylize = stylizeWithColor;
   if (ctx.maxArrayLength === null) ctx.maxArrayLength = Infinity;
+  if (ctx.maxStringLength === null) ctx.maxStringLength = Infinity;
   return formatValue(ctx, value, 0);
 }
 inspect.custom = customInspectSymbol;
@@ -1301,6 +1305,12 @@ function formatBigInt(fn, value) {
 
 function formatPrimitive(fn, value, ctx) {
   if (typeof value === 'string') {
+    let trailer = '';
+    if (value.length > ctx.maxStringLength) {
+      const remaining = value.length - ctx.maxStringLength;
+      value = value.slice(0, ctx.maxStringLength);
+      trailer = `... ${remaining} more character${remaining > 1 ? 's' : ''}`;
+    }
     if (ctx.compact !== true &&
         // TODO(BridgeAR): Add unicode support. Use the readline getStringWidth
         // function.
@@ -1309,9 +1319,9 @@ function formatPrimitive(fn, value, ctx) {
       return value
         .split(/(?<=\n)/)
         .map((line) => fn(strEscape(line), 'string'))
-        .join(` +\n${' '.repeat(ctx.indentationLvl + 2)}`);
+        .join(` +\n${' '.repeat(ctx.indentationLvl + 2)}`) + trailer;
     }
-    return fn(strEscape(value), 'string');
+    return fn(strEscape(value), 'string') + trailer;
   }
   if (typeof value === 'number')
     return formatNumber(fn, value);
diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js
index 622171ea52206f..b4443984cbc263 100644
--- a/test/parallel/test-util-inspect.js
+++ b/test/parallel/test-util-inspect.js
@@ -2779,3 +2779,12 @@ assert.strictEqual(
   v8.setFlagsFromString('--no-allow-natives-syntax');
   assert.strictEqual(inspect(undetectable), '{}');
 }
+
+{
+  const x = 'a'.repeat(1e6);
+  assert(util.inspect(x).endsWith('... 990000 more characters'));
+  assert.strictEqual(
+    util.inspect(x, { maxStringLength: 4 }),
+    "'aaaa'... 999996 more characters"
+  );
+}

From 4836f8151ebbf5c979097bd0b5627c0ac834876e Mon Sep 17 00:00:00 2001
From: unknown <rosaxny@gmail.com>
Date: Fri, 3 Apr 2020 12:50:41 -0400
Subject: [PATCH 2/2] fixup! util: add `maxStrLength` option to `inspect`
 function

---
 doc/api/util.md                    | 2 +-
 lib/internal/util/inspect.js       | 2 +-
 test/parallel/test-util-inspect.js | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index 6cab40db100b4a..b702d5adba3a2c 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -488,7 +488,7 @@ changes:
     negative to show no elements. **Default:** `100`.
   * `maxStringLength` {integer} Specifies the maximum number of characters to
     include when formatting. Set to `null` or `Infinity` to show all elements.
-    Set to `0` or negative to show no characters. **Default:** `10000`.
+    Set to `0` or negative to show no characters. **Default:** `Infinity`.
   * `breakLength` {integer} The length at which input values are split across
     multiple lines. Set to `Infinity` to format the input as a single line
     (in combination with `compact` set to `true` or any number >= `1`).
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
index fe21854e16aa7f..f59e7db3a9782c 100644
--- a/lib/internal/util/inspect.js
+++ b/lib/internal/util/inspect.js
@@ -146,7 +146,7 @@ const inspectDefaultOptions = ObjectSeal({
   customInspect: true,
   showProxy: false,
   maxArrayLength: 100,
-  maxStringLength: 10000,
+  maxStringLength: Infinity,
   breakLength: 80,
   compact: 3,
   sorted: false,
diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js
index b4443984cbc263..fab2a12a00ddf7 100644
--- a/test/parallel/test-util-inspect.js
+++ b/test/parallel/test-util-inspect.js
@@ -2782,7 +2782,6 @@ assert.strictEqual(
 
 {
   const x = 'a'.repeat(1e6);
-  assert(util.inspect(x).endsWith('... 990000 more characters'));
   assert.strictEqual(
     util.inspect(x, { maxStringLength: 4 }),
     "'aaaa'... 999996 more characters"