lib: minor cleanup

lib/buffer.js

@@ -37,14 +37,14 @@ const {
   kMaxLength,
   kStringMaxLength
 } = internalBinding('buffer');
-const { isAnyArrayBuffer } = internalBinding('types');
 const {
   customInspectSymbol,
   isInsideNodeModules,
   normalizeEncoding,
   kIsEncodingSymbol
 } = require('internal/util');
 const {
+  isAnyArrayBuffer,
   isArrayBufferView,
   isUint8Array
 } = require('internal/util/types');

lib/internal/bootstrap/node.js

@@ -193,7 +193,7 @@ function startup() {
     // TODO(addaleax): Turn into a full runtime deprecation.
     const pendingDeprecation = getOptionValue('--pending-deprecation');
     const utilBinding = internalBinding('util');
-    const types = internalBinding('types');
+    const types = NativeModule.require('internal/util/types');
     for (const name of [
       'isArrayBuffer', 'isArrayBufferView', 'isAsyncFunction',
       'isDataView', 'isDate', 'isExternal', 'isMap', 'isMapIterator',

lib/internal/console/constructor.js

@@ -434,11 +434,15 @@ Console.prototype.table = function(tabularData, properties) {
   const final = (k, v) => this.log(cliTable(k, v));
 
   const inspect = (v) => {
-    const opt = { depth: 0, maxArrayLength: 3 };
-    if (v !== null && typeof v === 'object' &&
-      !isArray(v) && ObjectKeys(v).length > 2)
-      opt.depth = -1;
-    Object.assign(opt, this[kGetInspectOptions](this._stdout));
+    const depth = v !== null &&
+                  typeof v === 'object' &&
+                  !isArray(v) &&
+                  ObjectKeys(v).length > 2 ? -1 : 0;
+    const opt = {
+      depth,
+      maxArrayLength: 3,
+      ...this[kGetInspectOptions](this._stdout)
+    };
     return util.inspect(v, opt);
   };
   const getIndexArray = (length) => ArrayFrom({ length }, (_, i) => inspect(i));

lib/internal/encoding.js

@@ -21,11 +21,10 @@ const {
   customInspectSymbol: inspect
 } = require('internal/util');
 
-const { isArrayBufferView } = require('internal/util/types');
-
 const {
-  isArrayBuffer
-} = internalBinding('types');
+  isArrayBuffer,
+  isArrayBufferView
+} = require('internal/util/types');
 
 const {
   encodeUtf8String

lib/internal/util.js

@@ -14,7 +14,7 @@ const {
 } = internalBinding('util');
 const {
   isNativeError
-} = internalBinding('types');
+} = require('internal/util/types');
 
 const { errmap } = internalBinding('uv');
 

lib/internal/util/comparisons.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const { compare } = internalBinding('buffer');
-const { isArrayBufferView } = require('internal/util/types');
 const {
   isAnyArrayBuffer,
+  isArrayBufferView,
   isDate,
   isMap,
   isRegExp,
@@ -15,7 +15,7 @@ const {
   isBooleanObject,
   isBigIntObject,
   isSymbolObject
-} = internalBinding('types');
+} = require('internal/util/types');
 const {
   getOwnNonIndexProperties,
   propertyFilter: {

lib/internal/util/inspect.js

@@ -27,8 +27,6 @@ const {
   isStackOverflowError
 } = require('internal/errors');
 
-const types = internalBinding('types');
-Object.assign(types, require('internal/util/types'));
 const {
   isAnyArrayBuffer,
   isArrayBuffer,
@@ -38,6 +36,8 @@ const {
   isExternal,
   isMap,
   isMapIterator,
+  isModuleNamespaceObject,
+  isNativeError,
   isPromise,
   isSet,
   isSetIterator,
@@ -61,7 +61,7 @@ const {
   isFloat64Array,
   isBigInt64Array,
   isBigUint64Array
-} = types;
+} = require('internal/util/types');
 
 const ReflectApply = Reflect.apply;
 
@@ -385,9 +385,9 @@ function getKeys(value, showHidden) {
     try {
       keys = Object.keys(value);
     } catch (err) {
-      if (types.isNativeError(err) &&
+      if (isNativeError(err) &&
           err.name === 'ReferenceError' &&
-          types.isModuleNamespaceObject(value)) {
+          isModuleNamespaceObject(value)) {
         keys = Object.getOwnPropertyNames(value);
       } else {
         throw err;
@@ -690,7 +690,7 @@ function formatRaw(ctx, value, recurseTimes) {
     } else if (isWeakMap(value)) {
       braces[0] = `${getPrefix(constructor, tag, 'WeakMap')}{`;
       formatter = ctx.showHidden ? formatWeakMap : formatWeakCollection;
-    } else if (types.isModuleNamespaceObject(value)) {
+    } else if (isModuleNamespaceObject(value)) {
       braces[0] = `[${tag}] {`;
       formatter = formatNamespaceObject;
       skip = true;
@@ -877,7 +877,7 @@ function formatNamespaceObject(ctx, value, recurseTimes, keys) {
       output[i] = formatProperty(ctx, value, recurseTimes, keys[i],
                                  kObjectType);
     } catch (err) {
-      if (!(types.isNativeError(err) && err.name === 'ReferenceError')) {
+      if (!(isNativeError(err) && err.name === 'ReferenceError')) {
         throw err;
       }
       // Use the existing functionality. This makes sure the indentation and

lib/internal/util/types.js

@@ -70,6 +70,7 @@ function isBigUint64Array(value) {
 }
 
 module.exports = {
+  ...internalBinding('types'),
   isArrayBufferView,
   isTypedArray,
   isUint8Array,

lib/util.js

@@ -31,13 +31,7 @@ const {
 const { validateNumber } = require('internal/validators');
 const { TextDecoder, TextEncoder } = require('internal/encoding');
 const { isBuffer } = require('buffer').Buffer;
-
-const types = internalBinding('types');
-Object.assign(types, require('internal/util/types'));
-const {
-  isRegExp,
-  isDate,
-} = types;
+const types = require('internal/util/types');
 
 const {
   deprecate,
@@ -432,9 +426,9 @@ module.exports = exports = {
   isString,
   isSymbol,
   isUndefined,
-  isRegExp,
+  isRegExp: types.isRegExp,
   isObject,
-  isDate,
+  isDate: types.isDate,
   isError(e) {
     return objectToString(e) === '[object Error]' || e instanceof Error;
   },