Address comments

Author: minggangw

lib/event_handler.js

@@ -16,7 +16,11 @@
 
 const rclnodejs = require('./native_loader.js');
 const DistroUtils = require('./distro.js');
-const { OperationError } = require('./errors.js');
+const {
+  OperationError,
+  RangeValidationError,
+  TypeValidationError,
+} = require('./errors.js');
 const Entity = require('./entity.js');
 
 /**
@@ -64,8 +68,10 @@ const SubscriptionEventType = {
  * @param {number} eventType - A {@link PublisherEventType} value.
  * @return {boolean} True if the event type is supported by the active RMW
  *   implementation, false otherwise.
- * @throws {OperationError} if invoked on a ROS distro older than Rolling, or
- *   if eventType is not a valid {@link PublisherEventType} value.
+ * @throws {OperationError} if invoked on a ROS distro older than Rolling.
+ * @throws {TypeValidationError} if eventType is not a number.
+ * @throws {RangeValidationError} if eventType is not a valid
+ *   {@link PublisherEventType} value.
  */
 function isPublisherEventTypeSupported(eventType) {
   if (typeof rclnodejs.isPublisherEventTypeSupported !== 'function') {
@@ -81,15 +87,19 @@ function isPublisherEventTypeSupported(eventType) {
       }
     );
   }
-  if (
-    typeof eventType !== 'number' ||
-    !Object.values(PublisherEventType).includes(eventType)
-  ) {
-    throw new OperationError(`Invalid PublisherEventType value: ${eventType}`, {
-      code: 'INVALID_ARGUMENT',
+  if (typeof eventType !== 'number') {
+    throw new TypeValidationError('eventType', eventType, 'number', {
       entityType: 'publisher event type',
     });
   }
+  if (!Object.values(PublisherEventType).includes(eventType)) {
+    throw new RangeValidationError(
+      'eventType',
+      eventType,
+      'one of PublisherEventType values',
+      { entityType: 'publisher event type' }
+    );
+  }
   return rclnodejs.isPublisherEventTypeSupported(eventType);
 }
 
@@ -102,8 +112,10 @@ function isPublisherEventTypeSupported(eventType) {
  * @param {number} eventType - A {@link SubscriptionEventType} value.
  * @return {boolean} True if the event type is supported by the active RMW
  *   implementation, false otherwise.
- * @throws {OperationError} if invoked on a ROS distro older than Rolling, or
- *   if eventType is not a valid {@link SubscriptionEventType} value.
+ * @throws {OperationError} if invoked on a ROS distro older than Rolling.
+ * @throws {TypeValidationError} if eventType is not a number.
+ * @throws {RangeValidationError} if eventType is not a valid
+ *   {@link SubscriptionEventType} value.
  */
 function isSubscriptionEventTypeSupported(eventType) {
   if (typeof rclnodejs.isSubscriptionEventTypeSupported !== 'function') {
@@ -119,16 +131,17 @@ function isSubscriptionEventTypeSupported(eventType) {
       }
     );
   }
-  if (
-    typeof eventType !== 'number' ||
-    !Object.values(SubscriptionEventType).includes(eventType)
-  ) {
-    throw new OperationError(
-      `Invalid SubscriptionEventType value: ${eventType}`,
-      {
-        code: 'INVALID_ARGUMENT',
-        entityType: 'subscription event type',
-      }
+  if (typeof eventType !== 'number') {
+    throw new TypeValidationError('eventType', eventType, 'number', {
+      entityType: 'subscription event type',
+    });
+  }
+  if (!Object.values(SubscriptionEventType).includes(eventType)) {
+    throw new RangeValidationError(
+      'eventType',
+      eventType,
+      'one of SubscriptionEventType values',
+      { entityType: 'subscription event type' }
     );
   }
   return rclnodejs.isSubscriptionEventTypeSupported(eventType);

test/test-event-handle.js

@@ -113,19 +113,19 @@ describe('Event type is supported - native binding available', function () {
   it('isPublisherEventTypeSupported rejects invalid event types', function () {
     assert.throws(() => {
       isPublisherEventTypeSupported(-1);
-    }, /Invalid PublisherEventType value/);
+    }, /Value '-1' for 'eventType' is out of range: one of PublisherEventType values/);
     assert.throws(() => {
       isPublisherEventTypeSupported('matched');
-    }, /Invalid PublisherEventType value/);
+    }, /Invalid type for 'eventType': expected number, got string/);
   });
 
   it('isSubscriptionEventTypeSupported rejects invalid event types', function () {
     assert.throws(() => {
       isSubscriptionEventTypeSupported(999);
-    }, /Invalid SubscriptionEventType value/);
+    }, /Value '999' for 'eventType' is out of range: one of SubscriptionEventType values/);
     assert.throws(() => {
       isSubscriptionEventTypeSupported(undefined);
-    }, /Invalid SubscriptionEventType value/);
+    }, /Invalid type for 'eventType': expected number, got undefined/);
   });
 });