Skip to content

Commit f40e0fc

Browse files
Trotttargos
authored andcommitted
lib: replace 'assert' with 'internal/assert' for many built-ins
Replace large 'assert' module with tiny 'internal/assert' module for many built-in uses. PR-URL: #25956 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
1 parent 8ade433 commit f40e0fc

18 files changed

+22
-21
lines changed

lib/_http_client.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
const util = require('util');
2525
const net = require('net');
2626
const url = require('url');
27-
const assert = require('assert').ok;
27+
const assert = require('internal/assert');
2828
const {
2929
_checkIsHttpToken: checkIsHttpToken,
3030
debug,

lib/_http_outgoing.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
'use strict';
2323

24-
const assert = require('assert').ok;
24+
const assert = require('internal/assert');
2525
const Stream = require('stream');
2626
const util = require('util');
2727
const internalUtil = require('internal/util');

lib/_http_server.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
const util = require('util');
2525
const net = require('net');
26-
const assert = require('assert').ok;
26+
const assert = require('internal/assert');
2727
const {
2828
parsers,
2929
freeParser,

lib/_tls_wrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
require('internal/util').assertCrypto();
2525

26-
const assert = require('assert');
26+
const assert = require('internal/assert');
2727
const crypto = require('crypto');
2828
const net = require('net');
2929
const tls = require('tls');

lib/internal/child_process.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const EventEmitter = require('events');
1919
const net = require('net');
2020
const dgram = require('dgram');
2121
const util = require('util');
22-
const assert = require('assert');
22+
const assert = require('internal/assert');
2323

2424
const { Process } = internalBinding('process_wrap');
2525
const {

lib/internal/cluster/child.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
const assert = require('assert');
2+
const assert = require('internal/assert');
33
const path = require('path');
44
const EventEmitter = require('events');
55
const { owner_symbol } = require('internal/async_hooks').symbols;

lib/internal/cluster/master.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
const assert = require('assert');
2+
const assert = require('internal/assert');
33
const { fork } = require('child_process');
44
const path = require('path');
55
const EventEmitter = require('events');

lib/internal/cluster/shared_handle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
const assert = require('assert');
2+
const assert = require('internal/assert');
33
const dgram = require('internal/dgram');
44
const net = require('net');
55

lib/internal/crypto/cipher.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const {
3434
publicEncrypt: _publicEncrypt
3535
} = internalBinding('crypto');
3636

37-
const assert = require('assert');
37+
const assert = require('internal/assert');
3838
const LazyTransform = require('internal/streams/lazy_transform');
3939

4040
const { inherits } = require('util');

lib/internal/errors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ function getMessage(key, args) {
208208
const msg = messages.get(key);
209209

210210
if (util === undefined) util = require('util');
211-
if (assert === undefined) assert = require('assert');
211+
if (assert === undefined) assert = require('internal/assert');
212212

213213
if (typeof msg === 'function') {
214214
assert(

lib/internal/fs/watchers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const { toNamespacedPath } = require('path');
2020
const { validateUint32 } = require('internal/validators');
2121
const { toPathIfFileURL } = require('internal/url');
2222
const util = require('util');
23-
const assert = require('assert');
23+
const assert = require('internal/assert');
2424

2525
const kOldStatus = Symbol('kOldStatus');
2626
const kUseBigint = Symbol('kUseBigint');

lib/internal/http2/compat.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const assert = require('assert');
3+
const assert = require('internal/assert');
44
const Stream = require('stream');
55
const Readable = Stream.Readable;
66
const binding = internalBinding('http2');

lib/internal/modules/cjs/loader.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const { NativeModule } = require('internal/bootstrap/loaders');
2525
const { pathToFileURL } = require('internal/url');
2626
const util = require('util');
2727
const vm = require('vm');
28-
const assert = require('assert').ok;
28+
const assert = require('internal/assert');
2929
const fs = require('fs');
3030
const internalFS = require('internal/fs/utils');
3131
const path = require('path');

lib/internal/modules/esm/module_job.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const {
77
} = primordials;
88

99
const { decorateErrorStack } = require('internal/util');
10-
const assert = require('assert');
10+
const assert = require('internal/assert');
1111
const resolvedPromise = SafePromise.resolve();
1212

1313
function noop() {}

lib/internal/process/main_thread_only.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function createSignalHandlers() {
153153
}
154154

155155
function setupChildProcessIpcChannel() {
156-
const assert = require('assert').strict;
156+
const assert = require('internal/assert');
157157

158158
const fd = parseInt(process.env.NODE_CHANNEL_FD, 10);
159159
assert(fd >= 0);

lib/internal/test/heap.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ process.emitWarning(
55
'internal/test/heap');
66

77
const { createHeapDump, buildEmbedderGraph } = internalBinding('heap_utils');
8-
const assert = require('assert');
8+
const assert = require('internal/assert');
99

1010
// This is not suitable for production code. It creates a full V8 heap dump,
1111
// parses it as JSON, and then creates complex objects from it, leading
@@ -44,9 +44,10 @@ function createJSHeapDump() {
4444
edgeIndex++;
4545
}
4646

47-
for (const node of nodes)
48-
assert.strictEqual(node.edge_count, node.outgoingEdges.length);
49-
47+
for (const node of nodes) {
48+
assert(node.edge_count === node.outgoingEdges.length,
49+
`${node.edge_count} !== ${node.outgoingEdges.length}`);
50+
}
5051
return nodes;
5152
}
5253

lib/net.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const {
3333
normalizedArgsSymbol,
3434
makeSyncWrite
3535
} = require('internal/net');
36-
const assert = require('assert');
36+
const assert = require('internal/assert');
3737
const {
3838
UV_EADDRINUSE,
3939
UV_EINVAL

lib/zlib.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const {
3838
}
3939
} = require('util');
4040
const binding = internalBinding('zlib');
41-
const assert = require('assert').ok;
41+
const assert = require('internal/assert');
4242
const {
4343
Buffer,
4444
kMaxLength

0 commit comments

Comments
 (0)