Skip to content

Commit bf18fe1

Browse files
committed
lib: remove circular reference
1 parent cd9f81d commit bf18fe1

File tree

2 files changed

+7
-21
lines changed

2 files changed

+7
-21
lines changed

lib/assert.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
'use strict';
2222

2323
const { compare } = process.binding('buffer');
24-
const util = require('util');
25-
const { isSet, isMap } = process.binding('util');
24+
const { isSet, isMap, isDate, isRegExp } = process.binding('util');
2625
const { objectToString } = require('internal/util');
2726
const errors = require('internal/errors');
2827

@@ -186,11 +185,11 @@ function strictDeepEqual(actual, expected) {
186185
// Skip testing the part below and continue in the callee function.
187186
return;
188187
}
189-
if (util.isDate(actual)) {
188+
if (isDate(actual)) {
190189
if (actual.getTime() !== expected.getTime()) {
191190
return false;
192191
}
193-
} else if (util.isRegExp(actual)) {
192+
} else if (isRegExp(actual)) {
194193
if (!areSimilarRegExps(actual, expected)) {
195194
return false;
196195
}
@@ -219,10 +218,10 @@ function looseDeepEqual(actual, expected) {
219218
if (expected === null || typeof expected !== 'object') {
220219
return false;
221220
}
222-
if (util.isDate(actual) && util.isDate(expected)) {
221+
if (isDate(actual) && isDate(expected)) {
223222
return actual.getTime() === expected.getTime();
224223
}
225-
if (util.isRegExp(actual) && util.isRegExp(expected)) {
224+
if (isRegExp(actual) && isRegExp(expected)) {
226225
return areSimilarRegExps(actual, expected);
227226
}
228227
const actualTag = objectToString(actual);

lib/util.js

+2-15
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
const errors = require('internal/errors');
2525
const { TextDecoder, TextEncoder } = require('internal/encoding');
26+
const { isBuffer } = require('buffer').Buffer;
2627

2728
const { errname } = process.binding('uv');
2829

@@ -1131,6 +1132,7 @@ module.exports = exports = {
11311132
inspect,
11321133
isArray: Array.isArray,
11331134
isBoolean,
1135+
isBuffer,
11341136
isNull,
11351137
isNullOrUndefined,
11361138
isNumber,
@@ -1162,18 +1164,3 @@ module.exports = exports = {
11621164
'util.puts is deprecated. Use console.log instead.',
11631165
'DEP0027')
11641166
};
1165-
1166-
// Avoid a circular dependency
1167-
var isBuffer;
1168-
Object.defineProperty(exports, 'isBuffer', {
1169-
configurable: true,
1170-
enumerable: true,
1171-
get() {
1172-
if (!isBuffer)
1173-
isBuffer = require('buffer').Buffer.isBuffer;
1174-
return isBuffer;
1175-
},
1176-
set(val) {
1177-
isBuffer = val;
1178-
}
1179-
});

0 commit comments

Comments
 (0)