events: use internal/validators in event_target.js

PR-URL: #34015 Reviewed-By: Denys Otrishko <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
nodejs · Jun 27, 2020 · 6ce3293 · 6ce3293
1 parent 5dca04e
commit 6ce3293
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/lib/internal/event_target.js b/lib/internal/event_target.js
@@ -7,18 +7,17 @@ const {
   Object,
   Set,
   Symbol,
-  NumberIsNaN,
   SymbolToStringTag,
 } = primordials;
 
 const {
   codes: {
     ERR_INVALID_ARG_TYPE,
     ERR_EVENT_RECURSION,
-    ERR_OUT_OF_RANGE,
     ERR_MISSING_ARGS
   }
 } = require('internal/errors');
+const { validateInteger, validateObject } = require('internal/validators');
 
 const { customInspectSymbol } = require('internal/util');
 const { inspect } = require('util');
@@ -54,11 +53,10 @@ class Event {
 
 
   constructor(type, options) {
-    if (arguments.length === 0) {
+    if (arguments.length === 0)
       throw new ERR_MISSING_ARGS('type');
-    }
-    if (options != null && typeof options !== 'object')
-      throw new ERR_INVALID_ARG_TYPE('options', 'object', options);
+    if (options != null)
+      validateObject(options, 'options');
     const { cancelable, bubbles, composed } = { ...options };
     this.#cancelable = !!cancelable;
     this.#bubbles = !!bubbles;
@@ -350,9 +348,7 @@ class NodeEventTarget extends EventTarget {
   }
 
   setMaxListeners(n) {
-    if (typeof n !== 'number' || n < 0 || NumberIsNaN(n)) {
-      throw new ERR_OUT_OF_RANGE('n', 'a non-negative number', n);
-    }
+    validateInteger(n, 'n', 0);
     this.#maxListeners = n;
     return this;
   }
@@ -430,11 +426,9 @@ function validateListener(listener) {
 }
 
 function validateEventListenerOptions(options) {
-  if (typeof options === 'boolean') {
-    options = { capture: options };
-  }
-  if (options == null || typeof options !== 'object')
-    throw new ERR_INVALID_ARG_TYPE('options', 'object', options);
+  if (typeof options === 'boolean')
+    return { capture: options };
+  validateObject(options, 'options');
   const {
     once = false,
     capture = false,