Skip to content

Commit 9eaf19a

Browse files
itu2n1i8wgoto-bus-stop
authored andcommitted
Use util.inspect.custom symbol if available.
Ports the `buffer-inspect` test from Node core. Adds a `Buffer.prototype[util.inspect.custom]` method, which is an alias to `Buffer.prototype.inspect`. Node already doesn't have an `.inspect` method on Buffers anymore, but since this module has to work in browsers that do not have Symbols, it seems better to keep it around. In Node, this will use the builtin `util.inspect.custom` symbol. In the browser, it will use `Symbol.for('util.inspect.custom')`. The browser version of `util` will also use the `inspect-custom-symbol` module in the near future. If nodejs/node#20857 gets merged, `Symbol.for('util.inspect.custom')` will be used everywhere and the dependency on `inspect-custom-symbol` could probably be dropped. The motivation for this is API parity and the fact that Node is removing support for the old `.inspect` method: nodejs/node#20722
1 parent b4e2222 commit 9eaf19a

File tree

3 files changed

+66
-1
lines changed

3 files changed

+66
-1
lines changed

index.js

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
var base64 = require('base64-js')
1212
var ieee754 = require('ieee754')
13+
var customInspectSymbol = typeof Symbol === 'function' ? require('inspect-custom-symbol') : null
1314

1415
exports.Buffer = Buffer
1516
exports.SlowBuffer = SlowBuffer
@@ -604,6 +605,9 @@ Buffer.prototype.inspect = function inspect () {
604605
if (this.length > max) str += ' ... '
605606
return '<Buffer ' + str + '>'
606607
}
608+
if (customInspectSymbol) {
609+
Buffer.prototype[customInspectSymbol] = Buffer.prototype.inspect
610+
}
607611

608612
Buffer.prototype.compare = function compare (target, start, end, thisStart, thisEnd) {
609613
if (isInstance(target, Uint8Array)) {

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
],
1717
"dependencies": {
1818
"base64-js": "^1.0.2",
19-
"ieee754": "^1.1.4"
19+
"ieee754": "^1.1.4",
20+
"inspect-custom-symbol": "^1.1.0"
2021
},
2122
"devDependencies": {
2223
"airtap": "0.0.5",

test/node/test-buffer-inspect.js

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
'use strict';
23+
var Buffer = require('../../').Buffer;
24+
25+
require('./common');
26+
const assert = require('assert');
27+
const util = require('util');
28+
const buffer = require('../../');
29+
30+
buffer.INSPECT_MAX_BYTES = 2;
31+
32+
let b = Buffer.allocUnsafe(4);
33+
b.fill('1234');
34+
35+
let s = buffer.SlowBuffer(4);
36+
s.fill('1234');
37+
38+
let expected = '<Buffer 31 32 ... >';
39+
40+
assert.strictEqual(util.inspect(b), expected);
41+
assert.strictEqual(util.inspect(s), expected);
42+
43+
b = Buffer.allocUnsafe(2);
44+
b.fill('12');
45+
46+
s = buffer.SlowBuffer(2);
47+
s.fill('12');
48+
49+
expected = '<Buffer 31 32>';
50+
51+
assert.strictEqual(util.inspect(b), expected);
52+
assert.strictEqual(util.inspect(s), expected);
53+
54+
buffer.INSPECT_MAX_BYTES = Infinity;
55+
56+
assert.strictEqual(util.inspect(b), expected);
57+
assert.strictEqual(util.inspect(s), expected);
58+
59+
b.inspect = undefined;
60+
assert.strictEqual(util.inspect(b), expected);

0 commit comments

Comments
 (0)