From 80496a55708967d1fb124cdbaf296b86eca31ff3 Mon Sep 17 00:00:00 2001 From: Teddy Katz Date: Sun, 24 Jun 2018 00:20:17 -0700 Subject: [PATCH] util: add inspect suffix to BigInt64Array elements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit updates `util.inspect` to add an `n` suffix to BigInts that appear in BigInt64Arrays. BigInts are formatted with an `n` suffix in most cases, but this did not occur in BigInt64Arrays due to an apparent oversight where the implementation of `inspect` for typed arrays assumed that all typed array elements are numbers. PR-URL: https://github.com/nodejs/node/pull/21499 Reviewed-By: Michaƫl Zasso Reviewed-By: Gus Caplan Reviewed-By: Ruben Bridgewater Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Colin Ihrig Reviewed-By: Benjamin Gruenbaum Reviewed-By: James M Snell Reviewed-By: Yuta Hiroto --- lib/util.js | 11 +++++++++-- test/parallel/test-util-inspect-bigint.js | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/util.js b/lib/util.js index f24430d791f7c6..afd3cae724a6a7 100644 --- a/lib/util.js +++ b/lib/util.js @@ -739,6 +739,10 @@ function formatNumber(fn, value) { return fn(`${value}`, 'number'); } +function formatBigInt(fn, value) { + return fn(`${value}n`, 'bigint'); +} + function formatPrimitive(fn, value, ctx) { if (typeof value === 'string') { if (ctx.compact === false && @@ -779,7 +783,7 @@ function formatPrimitive(fn, value, ctx) { return formatNumber(fn, value); // eslint-disable-next-line valid-typeof if (typeof value === 'bigint') - return fn(`${value}n`, 'bigint'); + return formatBigInt(fn, value); if (typeof value === 'boolean') return fn(`${value}`, 'boolean'); if (typeof value === 'undefined') @@ -915,8 +919,11 @@ function formatTypedArray(ctx, value, recurseTimes, keys) { const maxLength = Math.min(Math.max(0, ctx.maxArrayLength), value.length); const remaining = value.length - maxLength; const output = new Array(maxLength + (remaining > 0 ? 1 : 0)); + const elementFormatter = value.length > 0 && typeof value[0] === 'number' ? + formatNumber : + formatBigInt; for (var i = 0; i < maxLength; ++i) - output[i] = formatNumber(ctx.stylize, value[i]); + output[i] = elementFormatter(ctx.stylize, value[i]); if (remaining > 0) output[i] = `... ${remaining} more item${remaining > 1 ? 's' : ''}`; if (ctx.showHidden) { diff --git a/test/parallel/test-util-inspect-bigint.js b/test/parallel/test-util-inspect-bigint.js index 5e0233640e8313..92ddd6669007f4 100644 --- a/test/parallel/test-util-inspect-bigint.js +++ b/test/parallel/test-util-inspect-bigint.js @@ -10,3 +10,5 @@ const { inspect } = require('util'); assert.strictEqual(inspect(1n), '1n'); assert.strictEqual(inspect(Object(-1n)), '[BigInt: -1n]'); assert.strictEqual(inspect(Object(13n)), '[BigInt: 13n]'); +assert.strictEqual(inspect(new BigInt64Array([0n])), 'BigInt64Array [ 0n ]'); +assert.strictEqual(inspect(new BigUint64Array([0n])), 'BigUint64Array [ 0n ]');