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: https://github.com/nodejs/node/pull/25956
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
This commit is contained in:
Rich Trott 2019-02-05 21:45:46 -08:00
parent 5d609bb11c
commit 62942e9ad7
18 changed files with 22 additions and 21 deletions

View File

@ -23,7 +23,7 @@
const net = require('net'); const net = require('net');
const url = require('url'); const url = require('url');
const assert = require('assert').ok; const assert = require('internal/assert');
const { const {
_checkIsHttpToken: checkIsHttpToken, _checkIsHttpToken: checkIsHttpToken,
debug, debug,

View File

@ -21,7 +21,7 @@
'use strict'; 'use strict';
const assert = require('assert').ok; const assert = require('internal/assert');
const Stream = require('stream'); const Stream = require('stream');
const util = require('util'); const util = require('util');
const internalUtil = require('internal/util'); const internalUtil = require('internal/util');

View File

@ -23,7 +23,7 @@
const util = require('util'); const util = require('util');
const net = require('net'); const net = require('net');
const assert = require('assert').ok; const assert = require('internal/assert');
const { const {
parsers, parsers,
freeParser, freeParser,

View File

@ -23,7 +23,7 @@
require('internal/util').assertCrypto(); require('internal/util').assertCrypto();
const assert = require('assert'); const assert = require('internal/assert');
const crypto = require('crypto'); const crypto = require('crypto');
const net = require('net'); const net = require('net');
const tls = require('tls'); const tls = require('tls');

View File

@ -19,7 +19,7 @@ const EventEmitter = require('events');
const net = require('net'); const net = require('net');
const dgram = require('dgram'); const dgram = require('dgram');
const util = require('util'); const util = require('util');
const assert = require('assert'); const assert = require('internal/assert');
const { Process } = internalBinding('process_wrap'); const { Process } = internalBinding('process_wrap');
const { const {

View File

@ -1,5 +1,5 @@
'use strict'; 'use strict';
const assert = require('assert'); const assert = require('internal/assert');
const path = require('path'); const path = require('path');
const EventEmitter = require('events'); const EventEmitter = require('events');
const { owner_symbol } = require('internal/async_hooks').symbols; const { owner_symbol } = require('internal/async_hooks').symbols;

View File

@ -1,5 +1,5 @@
'use strict'; 'use strict';
const assert = require('assert'); const assert = require('internal/assert');
const { fork } = require('child_process'); const { fork } = require('child_process');
const path = require('path'); const path = require('path');
const EventEmitter = require('events'); const EventEmitter = require('events');

View File

@ -1,5 +1,5 @@
'use strict'; 'use strict';
const assert = require('assert'); const assert = require('internal/assert');
const dgram = require('internal/dgram'); const dgram = require('internal/dgram');
const net = require('net'); const net = require('net');

View File

@ -34,7 +34,7 @@ const {
publicEncrypt: _publicEncrypt publicEncrypt: _publicEncrypt
} = internalBinding('crypto'); } = internalBinding('crypto');
const assert = require('assert'); const assert = require('internal/assert');
const LazyTransform = require('internal/streams/lazy_transform'); const LazyTransform = require('internal/streams/lazy_transform');
const { deprecate, normalizeEncoding } = require('internal/util'); const { deprecate, normalizeEncoding } = require('internal/util');

View File

@ -208,7 +208,7 @@ function getMessage(key, args) {
const msg = messages.get(key); const msg = messages.get(key);
if (util === undefined) util = require('util'); if (util === undefined) util = require('util');
if (assert === undefined) assert = require('assert'); if (assert === undefined) assert = require('internal/assert');
if (typeof msg === 'function') { if (typeof msg === 'function') {
assert( assert(

View File

@ -19,7 +19,7 @@ const {
const { toNamespacedPath } = require('path'); const { toNamespacedPath } = require('path');
const { validateUint32 } = require('internal/validators'); const { validateUint32 } = require('internal/validators');
const { toPathIfFileURL } = require('internal/url'); const { toPathIfFileURL } = require('internal/url');
const assert = require('assert'); const assert = require('internal/assert');
const kOldStatus = Symbol('kOldStatus'); const kOldStatus = Symbol('kOldStatus');
const kUseBigint = Symbol('kUseBigint'); const kUseBigint = Symbol('kUseBigint');

View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
const assert = require('assert'); const assert = require('internal/assert');
const Stream = require('stream'); const Stream = require('stream');
const Readable = Stream.Readable; const Readable = Stream.Readable;
const binding = internalBinding('http2'); const binding = internalBinding('http2');

View File

@ -25,7 +25,7 @@ const { NativeModule } = require('internal/bootstrap/loaders');
const { pathToFileURL } = require('internal/url'); const { pathToFileURL } = require('internal/url');
const util = require('util'); const util = require('util');
const vm = require('vm'); const vm = require('vm');
const assert = require('assert').ok; const assert = require('internal/assert');
const fs = require('fs'); const fs = require('fs');
const internalFS = require('internal/fs/utils'); const internalFS = require('internal/fs/utils');
const path = require('path'); const path = require('path');

View File

@ -7,7 +7,7 @@ const {
} = primordials; } = primordials;
const { decorateErrorStack } = require('internal/util'); const { decorateErrorStack } = require('internal/util');
const assert = require('assert'); const assert = require('internal/assert');
const resolvedPromise = SafePromise.resolve(); const resolvedPromise = SafePromise.resolve();
function noop() {} function noop() {}

View File

@ -153,7 +153,7 @@ function createSignalHandlers() {
} }
function setupChildProcessIpcChannel() { function setupChildProcessIpcChannel() {
const assert = require('assert').strict; const assert = require('internal/assert');
const fd = parseInt(process.env.NODE_CHANNEL_FD, 10); const fd = parseInt(process.env.NODE_CHANNEL_FD, 10);
assert(fd >= 0); assert(fd >= 0);

View File

@ -5,7 +5,7 @@ process.emitWarning(
'internal/test/heap'); 'internal/test/heap');
const { createHeapDump, buildEmbedderGraph } = internalBinding('heap_utils'); const { createHeapDump, buildEmbedderGraph } = internalBinding('heap_utils');
const assert = require('assert'); const assert = require('internal/assert');
// This is not suitable for production code. It creates a full V8 heap dump, // This is not suitable for production code. It creates a full V8 heap dump,
// parses it as JSON, and then creates complex objects from it, leading // parses it as JSON, and then creates complex objects from it, leading
@ -44,9 +44,10 @@ function createJSHeapDump() {
edgeIndex++; edgeIndex++;
} }
for (const node of nodes) for (const node of nodes) {
assert.strictEqual(node.edge_count, node.outgoingEdges.length); assert(node.edge_count === node.outgoingEdges.length,
`${node.edge_count} !== ${node.outgoingEdges.length}`);
}
return nodes; return nodes;
} }

View File

@ -33,7 +33,7 @@ const {
normalizedArgsSymbol, normalizedArgsSymbol,
makeSyncWrite makeSyncWrite
} = require('internal/net'); } = require('internal/net');
const assert = require('assert'); const assert = require('internal/assert');
const { const {
UV_EADDRINUSE, UV_EADDRINUSE,
UV_EINVAL UV_EINVAL

View File

@ -37,7 +37,7 @@ const {
} }
} = require('util'); } = require('util');
const binding = internalBinding('zlib'); const binding = internalBinding('zlib');
const assert = require('assert').ok; const assert = require('internal/assert');
const { const {
Buffer, Buffer,
kMaxLength kMaxLength