Skip to content

Commit 7e4b0a4

Browse files
committed
util: make util binding internal
Refs: #22160 PR-URL: #22675 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>
1 parent 04195ad commit 7e4b0a4

18 files changed

+37
-23
lines changed

benchmark/util/type-check.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ function main({ type, argument, version, n }) {
3838
// For testing, if supplied with an empty type, default to ArrayBufferView.
3939
type = type || 'ArrayBufferView';
4040

41-
const util = process.binding('util');
41+
const { internalBinding } = require('internal/test/binding');
42+
const util = internalBinding('util');
4243
const types = require('internal/util/types');
4344

4445
const func = { native: util, js: types }[version][`is${type}`];

lib/console.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ const {
2929
ERR_INVALID_ARG_VALUE,
3030
},
3131
} = require('internal/errors');
32-
const { previewEntries } = process.binding('util');
32+
const { internalBinding } = require('internal/bootstrap/loaders');
33+
const { previewEntries } = internalBinding('util');
3334
const { Buffer: { isBuffer } } = require('buffer');
3435
const util = require('util');
3536
const {

lib/internal/bootstrap/node.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
// TODO(addaleax): Turn into a full runtime deprecation.
177177
const { pendingDeprecation } = process.binding('config');
178178
const { deprecate } = NativeModule.require('internal/util');
179-
const utilBinding = process.binding('util');
179+
const utilBinding = internalBinding('util');
180180
const types = internalBinding('types');
181181
for (const name of [
182182
'isArrayBuffer', 'isArrayBufferView', 'isAsyncFunction',
@@ -374,6 +374,7 @@
374374
'contextify',
375375
'tcp_wrap',
376376
'tls_wrap',
377+
'util',
377378
'async_wrap']);
378379
process.binding = function binding(name) {
379380
return internalBindingWhitelist.has(name) ?

lib/internal/modules/cjs/loader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
'use strict';
2323

24-
const { NativeModule } = require('internal/bootstrap/loaders');
24+
const { internalBinding, NativeModule } = require('internal/bootstrap/loaders');
2525
const util = require('util');
2626
const vm = require('vm');
2727
const assert = require('assert').ok;
@@ -32,7 +32,7 @@ const {
3232
internalModuleReadJSON,
3333
internalModuleStat
3434
} = process.binding('fs');
35-
const { safeGetenv } = process.binding('util');
35+
const { safeGetenv } = internalBinding('util');
3636
const {
3737
makeRequireFunction,
3838
requireDepth,

lib/internal/process/promises.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22

3-
const { safeToString } = process.binding('util');
3+
const { internalBinding } = require('internal/bootstrap/loaders');
4+
const { safeToString } = internalBinding('util');
45

56
const maybeUnhandledPromises = new WeakMap();
67
const pendingUnhandledRejections = [];

lib/internal/util.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ const {
66
ERR_UNKNOWN_SIGNAL
77
} = require('internal/errors').codes;
88
const { signals } = process.binding('constants').os;
9-
9+
const { internalBinding } = require('internal/bootstrap/loaders');
1010
const {
1111
getHiddenValue,
1212
setHiddenValue,
1313
arrow_message_private_symbol: kArrowMessagePrivateSymbolIndex,
1414
decorated_private_symbol: kDecoratedPrivateSymbolIndex
15-
} = process.binding('util');
15+
} = internalBinding('util');
1616

17-
const { internalBinding } = require('internal/bootstrap/loaders');
1817
const { errmap } = internalBinding('uv');
1918

2019
const noCrypto = !process.versions.openssl;

lib/internal/util/comparisons.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const {
1515
propertyFilter: {
1616
ONLY_ENUMERABLE
1717
}
18-
} = process.binding('util');
18+
} = internalBinding('util');
1919

2020
const ReflectApply = Reflect.apply;
2121

lib/os.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121

2222
'use strict';
2323

24-
const { pushValToArrayMax, safeGetenv } = process.binding('util');
24+
const { internalBinding } = require('internal/bootstrap/loaders');
25+
const { pushValToArrayMax, safeGetenv } = internalBinding('util');
2526
const constants = process.binding('constants').os;
2627
const { deprecate } = require('internal/util');
2728
const isWindows = process.platform === 'win32';

lib/repl.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ const {
5353
} = require('internal/deps/acorn/dist/acorn');
5454
const internalUtil = require('internal/util');
5555
const util = require('util');
56-
const utilBinding = process.binding('util');
56+
const { internalBinding } = require('internal/bootstrap/loaders');
57+
const utilBinding = internalBinding('util');
5758
const { inherits } = util;
5859
const Stream = require('stream');
5960
const vm = require('vm');
@@ -79,7 +80,7 @@ const {
7980
ALL_PROPERTIES,
8081
SKIP_SYMBOLS
8182
}
82-
} = process.binding('util');
83+
} = internalBinding('util');
8384

8485
// Lazy-loaded.
8586
let processTopLevelAwait;

lib/stream.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ try {
4949
} else {
5050
// This throws for Node < 4.2.0 because there's no util binding and
5151
// returns undefined for Node < 7.4.0.
52-
Stream._isUint8Array = process.binding('util').isUint8Array;
52+
const { internalBinding } = require('internal/bootstrap/loaders');
53+
Stream._isUint8Array = internalBinding('util').isUint8Array;
5354
}
5455
} catch (e) {
5556
}

0 commit comments

Comments
 (0)