deep-squash: rename nullObject to kEmptyObject

nodejs · May 20, 2022 · 5e914f2 · 5e914f2
1 parent b6bfaf1
commit 5e914f2
Show file tree

Hide file tree

Showing 41 changed files with 134 additions and 134 deletions.
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -41,7 +41,7 @@ const {
 const {
   assertCrypto,
   deprecate,
-  nullObject,
+  kEmptyObject,
 } = require('internal/util');
 
 assertCrypto();
@@ -1182,9 +1182,9 @@ function Server(options, listener) {
 
   if (typeof options === 'function') {
     listener = options;
-    options = nullObject;
+    options = kEmptyObject;
   } else if (options == null || typeof options === 'object') {
-    options = options ?? nullObject;
+    options = options ?? kEmptyObject;
   } else {
     throw new ERR_INVALID_ARG_TYPE('options', 'Object', options);
   }

diff --git a/lib/async_hooks.js b/lib/async_hooks.js
@@ -20,7 +20,7 @@ const {
   ERR_ASYNC_TYPE,
   ERR_INVALID_ASYNC_ID
 } = require('internal/errors').codes;
-const { nullObject } = require('internal/util');
+const { kEmptyObject } = require('internal/util');
 const {
   validateFunction,
   validateString,
@@ -157,7 +157,7 @@ function createHook(fns) {
 const destroyedSymbol = Symbol('destroyed');
 
 class AsyncResource {
-  constructor(type, opts = nullObject) {
+  constructor(type, opts = kEmptyObject) {
     validateString(type, 'type');
 
     let triggerAsyncId = opts;

diff --git a/lib/child_process.js b/lib/child_process.js
@@ -46,7 +46,7 @@ const {
   convertToValidSignal,
   createDeferredPromise,
   getSystemErrorName,
-  nullObject,
+  kEmptyObject,
   promisify,
 } = require('internal/util');
 const { isArrayBufferView } = require('internal/util/types');
@@ -509,7 +509,7 @@ function normalizeSpawnArguments(file, args, options) {
   }
 
   if (options === undefined)
-    options = nullObject;
+    options = kEmptyObject;
   else
     validateObject(options, 'options');
 

diff --git a/lib/events.js b/lib/events.js
@@ -53,7 +53,7 @@ const {
 } = primordials;
 const kRejection = SymbolFor('nodejs.rejection');
 
-const { nullObject } = require('internal/util');
+const { kEmptyObject } = require('internal/util');
 
 const { inspect } = require('internal/util/inspect');
 
@@ -941,7 +941,7 @@ function getEventListeners(emitterOrTarget, type) {
  * @param {{ signal: AbortSignal; }} [options]
  * @returns {Promise}
  */
-async function once(emitter, name, options = nullObject) {
+async function once(emitter, name, options = kEmptyObject) {
   const signal = options?.signal;
   validateAbortSignal(signal, 'options.signal');
   if (signal?.aborted)

diff --git a/lib/fs.js b/lib/fs.js
@@ -86,7 +86,7 @@ const { toPathIfFileURL } = require('internal/url');
 const {
   customPromisifyArgs,
   deprecate,
-  nullObject,
+  kEmptyObject,
   promisify,
 } = require('internal/util');
 const {
@@ -627,7 +627,7 @@ function read(fd, buffer, offsetOrOptions, length, position, callback) {
       if (!isArrayBufferView(buffer)) {
         // This is fs.read(fd, params, callback)
         params = buffer;
-        ({ buffer = Buffer.alloc(16384) } = params ?? nullObject);
+        ({ buffer = Buffer.alloc(16384) } = params ?? kEmptyObject);
       }
       callback = offsetOrOptions;
     } else {
@@ -640,7 +640,7 @@ function read(fd, buffer, offsetOrOptions, length, position, callback) {
       offset = 0,
       length = buffer.byteLength - offset,
       position = null,
-    } = params ?? nullObject);
+    } = params ?? kEmptyObject);
   }
 
   validateBuffer(buffer);
@@ -705,7 +705,7 @@ function readSync(fd, buffer, offset, length, position) {
 
   if (arguments.length <= 3) {
     // Assume fs.readSync(fd, buffer, options)
-    const options = offset || nullObject;
+    const options = offset || kEmptyObject;
 
     ({
       offset = 0,
@@ -833,7 +833,7 @@ function write(fd, buffer, offsetOrOptions, length, position, callback) {
         offset = 0,
         length = buffer.byteLength - offset,
         position = null,
-      } = offsetOrOptions ?? nullObject);
+      } = offsetOrOptions ?? kEmptyObject);
     }
 
     if (offset == null || typeof offset === 'function') {
@@ -903,7 +903,7 @@ function writeSync(fd, buffer, offsetOrOptions, length, position) {
         offset = 0,
         length = buffer.byteLength - offset,
         position = null,
-      } = offsetOrOptions ?? nullObject);
+      } = offsetOrOptions ?? kEmptyObject);
     }
     if (position === undefined)
       position = null;
@@ -1461,7 +1461,7 @@ function readdirSync(path, options) {
 function fstat(fd, options = { bigint: false }, callback) {
   if (typeof options === 'function') {
     callback = options;
-    options = nullObject;
+    options = kEmptyObject;
   }
   fd = getValidatedFd(fd);
   callback = makeStatsCallback(callback);
@@ -1485,7 +1485,7 @@ function fstat(fd, options = { bigint: false }, callback) {
 function lstat(path, options = { bigint: false }, callback) {
   if (typeof options === 'function') {
     callback = options;
-    options = nullObject;
+    options = kEmptyObject;
   }
   callback = makeStatsCallback(callback);
   path = getValidatedPath(path);
@@ -1508,7 +1508,7 @@ function lstat(path, options = { bigint: false }, callback) {
 function stat(path, options = { bigint: false }, callback) {
   if (typeof options === 'function') {
     callback = options;
-    options = nullObject;
+    options = kEmptyObject;
   }
   callback = makeStatsCallback(callback);
   path = getValidatedPath(path);

diff --git a/lib/internal/blob.js b/lib/internal/blob.js
@@ -44,7 +44,7 @@ const {
 const {
   createDeferredPromise,
   customInspectSymbol: kInspect,
-  nullObject,
+  kEmptyObject,
 } = require('internal/util');
 const { inspect } = require('internal/util/inspect');
 
@@ -135,7 +135,7 @@ class Blob {
    * }} [options]
    * @constructs {Blob}
    */
-  constructor(sources = [], options = nullObject) {
+  constructor(sources = [], options = kEmptyObject) {
     if (sources === null ||
         typeof sources[SymbolIterator] !== 'function' ||
         typeof sources === 'string') {

diff --git a/lib/internal/cluster/worker.js b/lib/internal/cluster/worker.js
@@ -7,7 +7,7 @@ const {
 
 const EventEmitter = require('events');
 
-const { nullObject } = require('internal/util');
+const { kEmptyObject } = require('internal/util');
 
 module.exports = Worker;
 
@@ -19,7 +19,7 @@ function Worker(options) {
   ReflectApply(EventEmitter, this, []);
 
   if (options === null || typeof options !== 'object')
-    options = nullObject;
+    options = kEmptyObject;
 
   this.exitedAfterDisconnect = undefined;
 

diff --git a/lib/internal/crypto/keygen.js b/lib/internal/crypto/keygen.js
@@ -40,7 +40,7 @@ const {
 
 const {
   customPromisifyArgs,
-  nullObject,
+  kEmptyObject,
 } = require('internal/util');
 
 const {
@@ -121,7 +121,7 @@ function handleError(ret) {
   };
 }
 
-function parseKeyEncoding(keyType, options = nullObject) {
+function parseKeyEncoding(keyType, options = kEmptyObject) {
   const { publicKeyEncoding, privateKeyEncoding } = options;
 
   let publicFormat, publicType;

diff --git a/lib/internal/crypto/random.js b/lib/internal/crypto/random.js
@@ -27,7 +27,7 @@ const {
 
 const {
   lazyDOMException,
-  nullObject,
+  kEmptyObject,
 } = require('internal/util');
 
 const { Buffer, kMaxLength } = require('buffer');
@@ -400,7 +400,7 @@ function randomUUID(options) {
     validateObject(options, 'options');
   const {
     disableEntropyCache = false,
-  } = options || nullObject;
+  } = options || kEmptyObject;
 
   validateBoolean(disableEntropyCache, 'options.disableEntropyCache');
 
@@ -465,7 +465,7 @@ function generatePrime(size, options, callback) {
   validateInt32(size, 'size', 1);
   if (typeof options === 'function') {
     callback = options;
-    options = nullObject;
+    options = kEmptyObject;
   }
   validateFunction(callback, 'callback');
 
@@ -483,7 +483,7 @@ function generatePrime(size, options, callback) {
   job.run();
 }
 
-function generatePrimeSync(size, options = nullObject) {
+function generatePrimeSync(size, options = kEmptyObject) {
   validateInt32(size, 'size', 1);
 
   const job = createRandomPrimeJob(kCryptoJobSync, size, options);
@@ -507,7 +507,7 @@ function unsignedBigIntToBuffer(bigint, name) {
   return Buffer.from(padded, 'hex');
 }
 
-function checkPrime(candidate, options = nullObject, callback) {
+function checkPrime(candidate, options = kEmptyObject, callback) {
   if (typeof candidate === 'bigint')
     candidate = unsignedBigIntToBuffer(candidate, 'candidate');
   if (!isAnyArrayBuffer(candidate) && !isArrayBufferView(candidate)) {
@@ -525,7 +525,7 @@ function checkPrime(candidate, options = nullObject, callback) {
   }
   if (typeof options === 'function') {
     callback = options;
-    options = nullObject;
+    options = kEmptyObject;
   }
   validateFunction(callback, 'callback');
   validateObject(options, 'options');
@@ -540,7 +540,7 @@ function checkPrime(candidate, options = nullObject, callback) {
   job.run();
 }
 
-function checkPrimeSync(candidate, options = nullObject) {
+function checkPrimeSync(candidate, options = kEmptyObject) {
   if (typeof candidate === 'bigint')
     candidate = unsignedBigIntToBuffer(candidate, 'candidate');
   if (!isAnyArrayBuffer(candidate) && !isArrayBufferView(candidate)) {

diff --git a/lib/internal/crypto/x509.js b/lib/internal/crypto/x509.js
@@ -23,7 +23,7 @@ const {
 
 const {
   customInspectSymbol: kInspect,
-  nullObject,
+  kEmptyObject,
 } = require('internal/util');
 
 const {
@@ -65,7 +65,7 @@ function isX509Certificate(value) {
   return value[kInternalState] !== undefined;
 }
 
-function getFlags(options = nullObject) {
+function getFlags(options = kEmptyObject) {
   validateObject(options, 'options');
   const {
     subject = 'default',  // Can be 'default', 'always', or 'never'

diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
@@ -32,7 +32,7 @@ const {
   getConstructorOf,
   customInspectSymbol: inspect,
   kEnumerableProperty,
-  nullObject,
+  kEmptyObject,
 } = require('internal/util');
 
 const {
@@ -378,7 +378,7 @@ function makeTextDecoderICU() {
   } = internalBinding('icu');
 
   class TextDecoder {
-    constructor(encoding = 'utf-8', options = nullObject) {
+    constructor(encoding = 'utf-8', options = kEmptyObject) {
       encoding = `${encoding}`;
       validateObject(options, 'options', {
         nullable: true,
@@ -407,7 +407,7 @@ function makeTextDecoderICU() {
     }
 
 
-    decode(input = empty, options = nullObject) {
+    decode(input = empty, options = kEmptyObject) {
       validateDecoder(this);
       if (isAnyArrayBuffer(input)) {
         input = lazyBuffer().from(input);
@@ -452,7 +452,7 @@ function makeTextDecoderJS() {
   }
 
   class TextDecoder {
-    constructor(encoding = 'utf-8', options = nullObject) {
+    constructor(encoding = 'utf-8', options = kEmptyObject) {
       encoding = `${encoding}`;
       validateObject(options, 'options', {
         nullable: true,
@@ -480,7 +480,7 @@ function makeTextDecoderJS() {
       this[kBOMSeen] = false;
     }
 
-    decode(input = empty, options = nullObject) {
+    decode(input = empty, options = kEmptyObject) {
       validateDecoder(this);
       if (isAnyArrayBuffer(input)) {
         input = lazyBuffer().from(input);

diff --git a/lib/internal/event_target.js b/lib/internal/event_target.js
@@ -38,7 +38,7 @@ const { validateObject, validateString } = require('internal/validators');
 const {
   customInspectSymbol,
   kEnumerableProperty,
-  nullObject,
+  kEmptyObject,
 } = require('internal/util');
 const { inspect } = require('util');
 
@@ -455,7 +455,7 @@ class EventTarget {
    *   signal?: AbortSignal
    * }} [options]
    */
-  addEventListener(type, listener, options = nullObject) {
+  addEventListener(type, listener, options = kEmptyObject) {
     if (!isEventTarget(this))
       throw new ERR_INVALID_THIS('EventTarget');
     if (arguments.length < 2)
@@ -542,7 +542,7 @@ class EventTarget {
    *   capture?: boolean,
    * }} [options]
    */
-  removeEventListener(type, listener, options = nullObject) {
+  removeEventListener(type, listener, options = kEmptyObject) {
     if (!isEventTarget(this))
       throw new ERR_INVALID_THIS('EventTarget');
     if (!shouldAddListener(listener))
@@ -870,7 +870,7 @@ function validateEventListenerOptions(options) {
     return { capture: options };
 
   if (options === null)
-    return nullObject;
+    return kEmptyObject;
   validateObject(options, 'options', {
     allowArray: true, allowFunction: true,
   });