rclnodejs 0.23.0 → 0.23.2

package/binding.gyp

@@ -90,6 +90,7 @@
                     "<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/:/g, '/include/lifecycle_msgs/ ') + '/include/lifecycle_msgs/')\")",
                     "<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/:/g, '/include/rosidl_runtime_c/ ') + '/include/rosidl_runtime_c/')\")",
                     "<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/:/g, '/include/rosidl_dynamic_typesupport/ ') + '/include/rosidl_dynamic_typesupport/')\")",
+                    "<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/:/g, '/include/type_description_interfaces/ ') + '/include/type_description_interfaces/')\")",
                   ],
                 }
               ],
@@ -138,6 +139,7 @@
                     "<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/;/g, '/include/rcl_lifecycle ').replace(/\\\/g, '/') + '/include/rcl_lifecycle')\")",
                     "<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/;/g, '/include/lifecycle_msgs ').replace(/\\\/g, '/') + '/include/lifecycle_msgs')\")",
                     "<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/;/g, '/include/rosidl_dynamic_typesupport ').replace(/\\\/g, '/') + '/include/rosidl_dynamic_typesupport')\")",
+                    "<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/;/g, '/include/type_description_interfaces/ ').replace(/\\\/g, '/') + '/include/type_description_interfaces/')\")",
                   ],
                 }
               ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rclnodejs",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "description": "ROS2.0 JavaScript client with Node.js",
   "main": "index.js",
   "types": "types/index.d.ts",

package/rosidl_gen/idl_generator.js

@@ -43,7 +43,11 @@ async function writeGeneratedCode(dir, fileName, code) {
   await fse.writeFile(path.join(dir, fileName), code);
 }
 
-async function generateServiceJSStruct(serviceInfo, dir) {
+async function generateServiceJSStruct(
+  serviceInfo,
+  dir,
+  isActionService = true
+) {
   dir = path.join(dir, `${serviceInfo.pkgName}`);
   const fileName =
     serviceInfo.pkgName +
@@ -55,26 +59,67 @@ async function generateServiceJSStruct(serviceInfo, dir) {
   const generatedSrvCode = removeEmptyLines(
     dots.service({ serviceInfo: serviceInfo })
   );
-  let result = writeGeneratedCode(dir, fileName, generatedSrvCode);
 
-  if (DistroUtils.getDistroId() <= DistroUtils.getDistroId('humble')) {
-    return result;
+  // We are going to only generate the service JavaScript file if it meets one
+  // of the followings:
+  // 1. It's a action's request/response service.
+  // 2. For pre-Humble ROS 2 releases, because it doesn't support service
+  //    introspection.
+  if (
+    isActionService ||
+    DistroUtils.getDistroId() <= DistroUtils.getDistroId('humble')
+  ) {
+    return writeGeneratedCode(dir, fileName, generatedSrvCode);
   }
 
-  // Otherwise, for post-Humble ROS 2 releases generate service_event msgs
-  await result;
+  return writeGeneratedCode(dir, fileName, generatedSrvCode).then(() => {
+    return generateServiceEventMsg(serviceInfo, dir);
+  });
+}
+
+async function generateServiceEventMsg(serviceInfo, dir) {
+  const fileName = serviceInfo.interfaceName + '.msg';
+  const generatedEvent = removeEmptyLines(
+    dots.service_event({ serviceInfo: serviceInfo })
+  );
+
+  return writeGeneratedCode(dir, fileName, generatedEvent).then(() => {
+    serviceInfo.interfaceName += '_Event';
+    serviceInfo.filePath = path.join(dir, fileName);
+    return generateServiceEventJSStruct(serviceInfo, dir);
+  });
+}
+
+async function generateServiceEventJSStruct(msgInfo, dir) {
+  const spec = await parser.parseMessageFile(msgInfo.pkgName, msgInfo.filePath);
+
+  // Remove the `.msg` files generated in `generateServiceEventMsg()` to avoid
+  // being found later.
+  fse.removeSync(msgInfo.filePath);
   const eventFileName =
-    serviceInfo.pkgName +
+    msgInfo.pkgName +
     '__' +
-    serviceInfo.subFolder +
+    msgInfo.subFolder +
     '__' +
-    serviceInfo.interfaceName +
-    '_Event.js';
-  const generatedSrvEventCode = removeEmptyLines(
-    dots.service_event({ serviceInfo: serviceInfo })
+    msgInfo.interfaceName +
+    '.js';
+
+  // Set `msgInfo.isServiceEvent` to true, so when generating the JavaScript
+  // message files for the service event leveraging message.dot, it will use
+  // "__srv__" to require the JS files for the request/response of a specific
+  // service, e.g.,
+  // const AddTwoInts_RequestWrapper = require('../../generated/example_interfaces/example_interfaces__srv__AddTwoInts_Request.js');
+  // const AddTwoInts_ResponseWrapper = require('../../generated/example_interfaces/example_interfaces__srv__AddTwoInts_Response.js');
+  msgInfo.isServiceEvent = true;
+  const generatedCode = removeEmptyLines(
+    dots.message({
+      messageInfo: msgInfo,
+      spec: spec,
+      json: JSON.stringify(spec, null, '  '),
+    })
   );
 
-  return writeGeneratedCode(dir, eventFileName, generatedSrvEventCode);
+  return writeGeneratedCode(dir, eventFileName, generatedCode);
 }
 
 async function generateMessageJSStruct(messageInfo, dir) {
@@ -258,15 +303,19 @@ async function generateActionJSStruct(actionInfo, dir) {
 }
 
 async function generateJSStructFromIDL(pkg, dir) {
-  await Promise.all([
-    ...pkg.messages.map((messageInfo) =>
-      generateMessageJSStruct(messageInfo, dir)
-    ),
-    ...pkg.services.map((serviceInfo) =>
-      generateServiceJSStruct(serviceInfo, dir)
-    ),
-    ...pkg.actions.map((actionInfo) => generateActionJSStruct(actionInfo, dir)),
-  ]);
+  const results = [];
+  pkg.messages.forEach((messageInfo) => {
+    results.push(generateMessageJSStruct(messageInfo, dir));
+  });
+  pkg.services.forEach((serviceInfo) => {
+    results.push(
+      generateServiceJSStruct(serviceInfo, dir, /*isActionService=*/ false)
+    );
+  });
+  pkg.actions.forEach((actionInfo) => {
+    results.push(generateActionJSStruct(actionInfo, dir));
+  });
+  await Promise.all(results);
 }
 
 module.exports = generateJSStructFromIDL;

package/rosidl_gen/packages.js

@@ -63,7 +63,8 @@ function grabInterfaceInfo(filePath, amentExecuted) {
   let pkgName = getPackageName(filePath, amentExecuted);
   let interfaceName = path.parse(filePath).name;
   let subFolder = getSubFolder(filePath, amentExecuted);
-  return { pkgName, interfaceName, subFolder, filePath };
+  const isServiceEvent = false;
+  return { pkgName, interfaceName, subFolder, filePath, isServiceEvent };
 }
 
 function addInterfaceInfo(info, type, pkgMap) {

package/rosidl_gen/templates/message.dot

@@ -196,6 +196,10 @@ function getModulePathByType(type, messageInfo) {
     return type.pkgName + '__action__' + type.type + '.js';
   }
 
+  /* We should use '__msg__' to require "service_msgs/msg/ServiceEventInfo.msg" for service event message. */
+  if (messageInfo && messageInfo.isServiceEvent && (type.type !== 'ServiceEventInfo')) {
+    return type.pkgName + '__srv__' + type.type + '.js';
+  }
   return type.pkgName + '__msg__' + type.type + '.js';
 }
 

package/rosidl_gen/templates/service_event.dot

@@ -1,304 +1,10 @@
-// This file is automatically generated by Intel rclnodejs
-//
-// *** DO NOT EDIT directly
-//
-'use strict';
+# This file is automatically generated by rosidl_gen
+#
+# *** DO NOT EDIT directly
+#
 
-{{
-  const interfaceName = it.serviceInfo.interfaceName;
-  const pkgName = it.serviceInfo.pkgName;
-  const subFolder = it.serviceInfo.subFolder;
+service_msgs/ServiceEventInfo info
 
-  const baseName = it.serviceInfo.pkgName + '__' + it.serviceInfo.subFolder + '__' + it.serviceInfo.interfaceName;
-}}
-
-const ref = require('@rclnodejs/ref-napi');
-const StructType = require('@rclnodejs/ref-struct-di')(ref);
-const ArrayType = require('@rclnodejs/ref-array-di')(ref);
-const primitiveTypes = require('../../rosidl_gen/primitive_types.js');
-const deallocator = require('../../rosidl_gen/deallocator.js');
-const translator = require('../../rosidl_gen/message_translator.js');
-const ServiceEventInfoWrapper = require('../service_msgs/service_msgs__msg__ServiceEventInfo.js');
-const {{=interfaceName}}_RequestWrapper = require('./{{=pkgName}}__{{=subFolder}}__{{=interfaceName}}_Request.js');
-const {{=interfaceName}}_ResponseWrapper = require('./{{=pkgName}}__{{=subFolder}}__{{=interfaceName}}_Response.js');
-const {{=interfaceName}}_EventRefStruct = StructType({
-  info: ServiceEventInfoWrapper.refObjectType,
-  request: {{=interfaceName}}_RequestWrapper.refObjectArrayType,
-  response: {{=interfaceName}}_ResponseWrapper.refObjectArrayType,
-});
-const {{=interfaceName}}_EventRefArray = ArrayType({{=interfaceName}}_EventRefStruct);
-const {{=interfaceName}}_EventRefStructArray = StructType({
-  data: {{=interfaceName}}_EventRefArray,
-  size: ref.types.size_t,
-  capacity: ref.types.size_t
-});
-// Define the wrapper class.
-class {{=interfaceName}}_EventWrapper {
-  constructor(other) {
-    this._wrapperFields = {};
-    if (typeof other === 'object' && other._refObject) {
-      this._refObject = new {{=interfaceName}}_EventRefStruct(other._refObject.toObject());
-      this._wrapperFields.info =  new ServiceEventInfoWrapper(other._wrapperFields.info);
-      this._wrapperFields.request = {{=interfaceName}}_RequestWrapper.createArray();
-      this._wrapperFields.request.copy(other._wrapperFields.request);
-      this._wrapperFields.response = {{=interfaceName}}_ResponseWrapper.createArray();
-      this._wrapperFields.response.copy(other._wrapperFields.response);
-    } else if (typeof other !== 'undefined') {
-      this._initMembers();
-      translator.constructFromPlanObject(this, other);
-    } else {
-      this._initMembers();
-    }
-    this.freeze();
-  }
-  _initMembers() {
-    this._refObject = new {{=interfaceName}}_EventRefStruct();
-    this._wrapperFields.info = new ServiceEventInfoWrapper();
-    this._wrapperFields.request = {{=interfaceName}}_RequestWrapper.createArray();
-    this._wrapperFields.response = {{=interfaceName}}_ResponseWrapper.createArray();
-  }
-  static createFromRefObject(refObject) {
-    let self = new {{=interfaceName}}_EventWrapper();
-    self.copyRefObject(refObject);
-    return self;
-  }
-  static createArray() {
-    return new {{=interfaceName}}_EventArrayWrapper;
-  }
-  static get ArrayType() {
-    return {{=interfaceName}}_EventArrayWrapper;
-  }
-  static get refObjectArrayType() {
-    return {{=interfaceName}}_EventRefStructArray
-  }
-  static get refObjectType() {
-    return {{=interfaceName}}_EventRefStruct;
-  }
-  toRawROS() {
-    this.freeze(true);
-    return this._refObject.ref();
-  }
-  freeze(own = false, checkConsistency = false) {
-    if (checkConsistency) {
-    }
-    this._wrapperFields.info.freeze(own, checkConsistency);
-    this._refObject.info = this._wrapperFields.info.refObject;
-    this._wrapperFields.request.freeze(own, checkConsistency);
-    this._refObject.request = this._wrapperFields.request.refObject;
-    this._wrapperFields.response.freeze(own, checkConsistency);
-    this._refObject.response = this._wrapperFields.response.refObject;
-  }
-  serialize() {
-    this.freeze(false, true);
-    return this._refObject.ref();
-  }
-  deserialize(refObject) {
-    this._wrapperFields.info.copyRefObject(refObject.info);
-    this._wrapperFields.request.copyRefObject(refObject.request);
-    this._wrapperFields.response.copyRefObject(refObject.response);
-  }
-  toPlainObject(enableTypedArray) {
-    return translator.toPlainObject(this, enableTypedArray);
-  }
-  static freeStruct(refObject) {
-    ServiceEventInfoWrapper.freeStruct(refObject.info);
-    if (refObject.request.size != 0) {
-      {{=interfaceName}}_RequestWrapper.ArrayType.freeArray(refObject.request);
-      if ({{=interfaceName}}_RequestWrapper.ArrayType.useTypedArray) {
-        // Do nothing, the v8 will take the ownership of the ArrayBuffer used by the typed array.
-      } else {
-        deallocator.freeStructMember(refObject.request, {{=interfaceName}}_RequestWrapper.refObjectArrayType, 'data');
-      }
-    }
-    if (refObject.response.size != 0) {
-      {{=interfaceName}}_ResponseWrapper.ArrayType.freeArray(refObject.response);
-      if ({{=interfaceName}}_ResponseWrapper.ArrayType.useTypedArray) {
-        // Do nothing, the v8 will take the ownership of the ArrayBuffer used by the typed array.
-      } else {
-        deallocator.freeStructMember(refObject.response, {{=interfaceName}}_ResponseWrapper.refObjectArrayType, 'data');
-      }
-    }
-  }
-  static destoryRawROS(msg) {
-    {{=interfaceName}}_EventWrapper.freeStruct(msg.refObject);
-  }
-  static type() {
-    return {pkgName: '{{=pkgName}}', subFolder: '{{=subFolder}}', interfaceName: '{{=interfaceName}}_Event'};
-  }
-  static isPrimitive() {
-    return false;
-  }
-  static get isROSArray() {
-    return false;
-  }
-  get refObject() {
-    return this._refObject;
-  }
-  get info() {
-    return this._wrapperFields.info;
-  }
-  set info(value) {
-    if (value instanceof ServiceEventInfoWrapper) {
-      this._wrapperFields.info.copy(value);
-    } else {
-      this._wrapperFields.info.copy(new ServiceEventInfoWrapper(value));
-    }
-  }
-  get request() {
-    return this._wrapperFields.request;
-  }
-  set request(value) {
-    if (value.length > 1) {
-      throw new RangeError('The length of array request must be <= 1.');
-    }
-    this._wrapperFields.request.fill(value);
-  }
-  get response() {
-    return this._wrapperFields.response;
-  }
-  set response(value) {
-    if (value.length > 1) {
-      throw new RangeError('The length of array response must be <= 1.');
-    }
-    this._wrapperFields.response.fill(value);
-  }
-  copyRefObject(refObject) {
-    this._refObject = new {{=interfaceName}}_EventRefStruct(refObject.toObject());
-    this._wrapperFields.info.copyRefObject(this._refObject.info);
-    this._wrapperFields.request.copyRefObject(this._refObject.request);
-    this._wrapperFields.response.copyRefObject(this._refObject.response);
-  }
-  copy(other) {
-    this._refObject = new {{=interfaceName}}_EventRefStruct(other._refObject.toObject());
-    this._wrapperFields.info.copy(other._wrapperFields.info);
-    this._wrapperFields.request.copy(other._wrapperFields.request);
-    this._wrapperFields.response.copy(other._wrapperFields.response);
-  }
-  static get classType() {
-    return {{=interfaceName}}_EventWrapper;
-  }
-  static get ROSMessageDef() {
-    return {"constants":[],"fields":[{"name":"info","type":{"isArray":false,"arraySize":null,"isUpperBound":false,"isDynamicArray":false,"isFixedSizeArray":false,"pkgName":"service_msgs","type":"ServiceEventInfo","stringUpperBound":null,"isPrimitiveType":false},"default_value":null},{"name":"request","type":{"isArray":true,"arraySize":1,"isUpperBound":true,"isDynamicArray":true,"isFixedSizeArray":false,"pkgName":"{{=pkgName}}","type":"{{=interfaceName}}_Request","stringUpperBound":null,"isPrimitiveType":false},"default_value":null},{"name":"response","type":{"isArray":true,"arraySize":1,"isUpperBound":true,"isDynamicArray":true,"isFixedSizeArray":false,"pkgName":"{{=pkgName}}","type":"{{=interfaceName}}_Response","stringUpperBound":null,"isPrimitiveType":false},"default_value":null}],"baseType":{"pkgName":"{{=pkgName}}","type":"{{=interfaceName}}_Event","stringUpperBound":null,"isPrimitiveType":false},"msgName":"{{=interfaceName}}_Event"};
-  }
-  hasMember(name) {
-    let memberNames = ["info","request","response"];
-    return memberNames.indexOf(name) !== -1;
-  }
-}
-// Define the wrapper of array class.
-class {{=interfaceName}}_EventArrayWrapper {
-  constructor(size = 0) {
-    this._resize(size);
-  }
-  toRawROS() {
-    return this._refObject.ref();
-  }
-  fill(values) {
-    const length = values.length;
-    this._resize(length);
-    values.forEach((value, index) => {
-      if (value instanceof {{=interfaceName}}_EventWrapper) {
-        this._wrappers[index].copy(value);
-      } else {
-        this._wrappers[index] = new {{=interfaceName}}_EventWrapper(value);
-      }
-    });
-  }
-  // Put all data currently stored in `this._wrappers` into `this._refObject`
-  freeze(own) {
-    this._wrappers.forEach((wrapper, index) => {
-      wrapper.freeze(own);
-      this._refArray[index] = wrapper.refObject;
-    });
-    this._refObject.size = this._wrappers.length;
-    this._refObject.capacity = this._wrappers.length;
-    if (this._refObject.capacity === 0) {
-      this._refObject.data = null
-    } else {
-    this._refObject.data = this._refArray.buffer;
-    }
-  }
-  get refObject() {
-    return this._refObject;
-  }
-  get data() {
-    return this._wrappers;
-  }
-  get size() {
-    return this._wrappers.length;
-  }
-  set size(value) {
-    if (typeof value != 'number') {
-      throw new TypeError('Invalid argument: should provide a number to {{=interfaceName}}_EventArrayWrapper.size setter');
-      return;
-    }
-    return this._resize(value);
-  }
-  get capacity() {
-    return this._wrappers.length;
-  }
-  set capacity(value) {
-    if (typeof value != 'number') {
-      throw new TypeError('Invalid argument: should provide a number to {{=interfaceName}}_EventArrayWrapper.capacity setter');
-    }
-    return this._resize(value);
-  }
-  get refObject() {
-    return this._refObject;
-  }
-  _resize(size) {
-    if (size < 0) {
-      throw new RangeError('Invalid argument: should provide a positive number');
-      return;
-    }
-    this._refArray = new {{=interfaceName}}_EventRefArray(size);
-    this._refObject = new {{=interfaceName}}_EventRefStructArray();
-    this._refObject.size = size;
-    this._refObject.capacity = size;
-    this._wrappers = new Array();
-    for (let i = 0; i < size; i++) {
-      this._wrappers.push(new {{=interfaceName}}_EventWrapper());
-    }
-  }
-  // Copy all data from `this._refObject` into `this._wrappers`
-  copyRefObject(refObject) {
-    this._refObject = refObject;
-    let refObjectArray = this._refObject.data;
-    refObjectArray.length = this._refObject.size;
-    this._resize(this._refObject.size);
-    for (let index = 0; index < this._refObject.size; index++) {
-      this._wrappers[index].copyRefObject(refObjectArray[index]);
-    }
-  }
-  copy(other) {
-    if (! (other instanceof {{=interfaceName}}_EventArrayWrapper)) {
-      throw new TypeError('Invalid argument: should provide "{{=interfaceName}}_EventArrayWrapper".');
-    }
-    this._resize(other.size);
-    // Array deep copy
-    other._wrappers.forEach((wrapper, index) => {
-      this._wrappers[index].copy(wrapper);
-    });
-  }
-  static freeArray(refObject) {
-    let refObjectArray = refObject.data;
-    refObjectArray.length = refObject.size;
-    for (let index = 0; index < refObject.size; index++) {
-      {{=interfaceName}}_EventWrapper.freeStruct(refObjectArray[index]);
-    }
-  }
-  static get elementType() {
-    return {{=interfaceName}}_EventWrapper;
-  }
-  static get isROSArray() {
-    return true;
-  }
-  static get useTypedArray() {
-    return false;
-  }
-  get classType() {
-    return {{=interfaceName}}_EventArrayWrapper;
-  }
-}
-module.exports = {{=interfaceName}}_EventWrapper;
+{{=it.serviceInfo.pkgName}}/{{=it.serviceInfo.interfaceName}}_Request[<=1] request
 
+{{=it.serviceInfo.pkgName}}/{{=it.serviceInfo.interfaceName}}_Response[<=1] response

package/types/interfaces.d.ts

@@ -91,14 +91,6 @@ declare module 'rclnodejs' {
         readonly Request: Fibonacci_GetResult_RequestConstructor;
         readonly Response: Fibonacci_GetResult_ResponseConstructor;
       }
-      export interface Fibonacci_GetResult_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: action_tutorials_interfaces.action.Fibonacci_GetResult_Request[];
-        response: action_tutorials_interfaces.action.Fibonacci_GetResult_Response[];
-      }
-      export interface Fibonacci_GetResult_EventConstructor {
-        new(other?: Fibonacci_GetResult_Event): Fibonacci_GetResult_Event;
-      }
       export interface Fibonacci_GetResult_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
       }
@@ -128,14 +120,6 @@ declare module 'rclnodejs' {
         readonly Request: Fibonacci_SendGoal_RequestConstructor;
         readonly Response: Fibonacci_SendGoal_ResponseConstructor;
       }
-      export interface Fibonacci_SendGoal_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: action_tutorials_interfaces.action.Fibonacci_SendGoal_Request[];
-        response: action_tutorials_interfaces.action.Fibonacci_SendGoal_Response[];
-      }
-      export interface Fibonacci_SendGoal_EventConstructor {
-        new(other?: Fibonacci_SendGoal_Event): Fibonacci_SendGoal_Event;
-      }
       export interface Fibonacci_SendGoal_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
         goal: action_tutorials_interfaces.action.Fibonacci_Goal;
@@ -406,14 +390,6 @@ declare module 'rclnodejs' {
         readonly Request: Fibonacci_GetResult_RequestConstructor;
         readonly Response: Fibonacci_GetResult_ResponseConstructor;
       }
-      export interface Fibonacci_GetResult_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: example_interfaces.action.Fibonacci_GetResult_Request[];
-        response: example_interfaces.action.Fibonacci_GetResult_Response[];
-      }
-      export interface Fibonacci_GetResult_EventConstructor {
-        new(other?: Fibonacci_GetResult_Event): Fibonacci_GetResult_Event;
-      }
       export interface Fibonacci_GetResult_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
       }
@@ -443,14 +419,6 @@ declare module 'rclnodejs' {
         readonly Request: Fibonacci_SendGoal_RequestConstructor;
         readonly Response: Fibonacci_SendGoal_ResponseConstructor;
       }
-      export interface Fibonacci_SendGoal_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: example_interfaces.action.Fibonacci_SendGoal_Request[];
-        response: example_interfaces.action.Fibonacci_SendGoal_Response[];
-      }
-      export interface Fibonacci_SendGoal_EventConstructor {
-        new(other?: Fibonacci_SendGoal_Event): Fibonacci_SendGoal_Event;
-      }
       export interface Fibonacci_SendGoal_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
         goal: example_interfaces.action.Fibonacci_Goal;
@@ -1926,14 +1894,6 @@ declare module 'rclnodejs' {
         readonly Request: ShortVariedMultiNested_GetResult_RequestConstructor;
         readonly Response: ShortVariedMultiNested_GetResult_ResponseConstructor;
       }
-      export interface ShortVariedMultiNested_GetResult_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: ros2cli_test_interfaces.action.ShortVariedMultiNested_GetResult_Request[];
-        response: ros2cli_test_interfaces.action.ShortVariedMultiNested_GetResult_Response[];
-      }
-      export interface ShortVariedMultiNested_GetResult_EventConstructor {
-        new(other?: ShortVariedMultiNested_GetResult_Event): ShortVariedMultiNested_GetResult_Event;
-      }
       export interface ShortVariedMultiNested_GetResult_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
       }
@@ -1963,14 +1923,6 @@ declare module 'rclnodejs' {
         readonly Request: ShortVariedMultiNested_SendGoal_RequestConstructor;
         readonly Response: ShortVariedMultiNested_SendGoal_ResponseConstructor;
       }
-      export interface ShortVariedMultiNested_SendGoal_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: ros2cli_test_interfaces.action.ShortVariedMultiNested_SendGoal_Request[];
-        response: ros2cli_test_interfaces.action.ShortVariedMultiNested_SendGoal_Response[];
-      }
-      export interface ShortVariedMultiNested_SendGoal_EventConstructor {
-        new(other?: ShortVariedMultiNested_SendGoal_Event): ShortVariedMultiNested_SendGoal_Event;
-      }
       export interface ShortVariedMultiNested_SendGoal_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
         goal: ros2cli_test_interfaces.action.ShortVariedMultiNested_Goal;
@@ -3140,14 +3092,6 @@ declare module 'rclnodejs' {
         readonly Request: Fibonacci_GetResult_RequestConstructor;
         readonly Response: Fibonacci_GetResult_ResponseConstructor;
       }
-      export interface Fibonacci_GetResult_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: test_msgs.action.Fibonacci_GetResult_Request[];
-        response: test_msgs.action.Fibonacci_GetResult_Response[];
-      }
-      export interface Fibonacci_GetResult_EventConstructor {
-        new(other?: Fibonacci_GetResult_Event): Fibonacci_GetResult_Event;
-      }
       export interface Fibonacci_GetResult_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
       }
@@ -3177,14 +3121,6 @@ declare module 'rclnodejs' {
         readonly Request: Fibonacci_SendGoal_RequestConstructor;
         readonly Response: Fibonacci_SendGoal_ResponseConstructor;
       }
-      export interface Fibonacci_SendGoal_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: test_msgs.action.Fibonacci_SendGoal_Request[];
-        response: test_msgs.action.Fibonacci_SendGoal_Response[];
-      }
-      export interface Fibonacci_SendGoal_EventConstructor {
-        new(other?: Fibonacci_SendGoal_Event): Fibonacci_SendGoal_Event;
-      }
       export interface Fibonacci_SendGoal_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
         goal: test_msgs.action.Fibonacci_Goal;
@@ -3223,14 +3159,6 @@ declare module 'rclnodejs' {
         readonly Request: NestedMessage_GetResult_RequestConstructor;
         readonly Response: NestedMessage_GetResult_ResponseConstructor;
       }
-      export interface NestedMessage_GetResult_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: test_msgs.action.NestedMessage_GetResult_Request[];
-        response: test_msgs.action.NestedMessage_GetResult_Response[];
-      }
-      export interface NestedMessage_GetResult_EventConstructor {
-        new(other?: NestedMessage_GetResult_Event): NestedMessage_GetResult_Event;
-      }
       export interface NestedMessage_GetResult_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
       }
@@ -3264,14 +3192,6 @@ declare module 'rclnodejs' {
         readonly Request: NestedMessage_SendGoal_RequestConstructor;
         readonly Response: NestedMessage_SendGoal_ResponseConstructor;
       }
-      export interface NestedMessage_SendGoal_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: test_msgs.action.NestedMessage_SendGoal_Request[];
-        response: test_msgs.action.NestedMessage_SendGoal_Response[];
-      }
-      export interface NestedMessage_SendGoal_EventConstructor {
-        new(other?: NestedMessage_SendGoal_Event): NestedMessage_SendGoal_Event;
-      }
       export interface NestedMessage_SendGoal_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
         goal: test_msgs.action.NestedMessage_Goal;
@@ -3734,14 +3654,6 @@ declare module 'rclnodejs' {
         readonly Request: LookupTransform_GetResult_RequestConstructor;
         readonly Response: LookupTransform_GetResult_ResponseConstructor;
       }
-      export interface LookupTransform_GetResult_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: tf2_msgs.action.LookupTransform_GetResult_Request[];
-        response: tf2_msgs.action.LookupTransform_GetResult_Response[];
-      }
-      export interface LookupTransform_GetResult_EventConstructor {
-        new(other?: LookupTransform_GetResult_Event): LookupTransform_GetResult_Event;
-      }
       export interface LookupTransform_GetResult_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
       }
@@ -3778,14 +3690,6 @@ declare module 'rclnodejs' {
         readonly Request: LookupTransform_SendGoal_RequestConstructor;
         readonly Response: LookupTransform_SendGoal_ResponseConstructor;
       }
-      export interface LookupTransform_SendGoal_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: tf2_msgs.action.LookupTransform_SendGoal_Request[];
-        response: tf2_msgs.action.LookupTransform_SendGoal_Response[];
-      }
-      export interface LookupTransform_SendGoal_EventConstructor {
-        new(other?: LookupTransform_SendGoal_Event): LookupTransform_SendGoal_Event;
-      }
       export interface LookupTransform_SendGoal_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
         goal: tf2_msgs.action.LookupTransform_Goal;
@@ -3914,14 +3818,6 @@ declare module 'rclnodejs' {
         readonly Request: RotateAbsolute_GetResult_RequestConstructor;
         readonly Response: RotateAbsolute_GetResult_ResponseConstructor;
       }
-      export interface RotateAbsolute_GetResult_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: turtlesim.action.RotateAbsolute_GetResult_Request[];
-        response: turtlesim.action.RotateAbsolute_GetResult_Response[];
-      }
-      export interface RotateAbsolute_GetResult_EventConstructor {
-        new(other?: RotateAbsolute_GetResult_Event): RotateAbsolute_GetResult_Event;
-      }
       export interface RotateAbsolute_GetResult_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
       }
@@ -3951,14 +3847,6 @@ declare module 'rclnodejs' {
         readonly Request: RotateAbsolute_SendGoal_RequestConstructor;
         readonly Response: RotateAbsolute_SendGoal_ResponseConstructor;
       }
-      export interface RotateAbsolute_SendGoal_Event {
-        info: service_msgs.msg.ServiceEventInfo;
-        request: turtlesim.action.RotateAbsolute_SendGoal_Request[];
-        response: turtlesim.action.RotateAbsolute_SendGoal_Response[];
-      }
-      export interface RotateAbsolute_SendGoal_EventConstructor {
-        new(other?: RotateAbsolute_SendGoal_Event): RotateAbsolute_SendGoal_Event;
-      }
       export interface RotateAbsolute_SendGoal_Request {
         goal_id: unique_identifier_msgs.msg.UUID;
         goal: turtlesim.action.RotateAbsolute_Goal;
@@ -4533,12 +4421,10 @@ declare module 'rclnodejs' {
     'action_msgs/srv/CancelGoal_Response': action_msgs.srv.CancelGoal_Response,
     'action_tutorials_interfaces/action/Fibonacci_Feedback': action_tutorials_interfaces.action.Fibonacci_Feedback,
     'action_tutorials_interfaces/action/Fibonacci_FeedbackMessage': action_tutorials_interfaces.action.Fibonacci_FeedbackMessage,
-    'action_tutorials_interfaces/action/Fibonacci_GetResult_Event': action_tutorials_interfaces.action.Fibonacci_GetResult_Event,
     'action_tutorials_interfaces/action/Fibonacci_GetResult_Request': action_tutorials_interfaces.action.Fibonacci_GetResult_Request,
     'action_tutorials_interfaces/action/Fibonacci_GetResult_Response': action_tutorials_interfaces.action.Fibonacci_GetResult_Response,
     'action_tutorials_interfaces/action/Fibonacci_Goal': action_tutorials_interfaces.action.Fibonacci_Goal,
     'action_tutorials_interfaces/action/Fibonacci_Result': action_tutorials_interfaces.action.Fibonacci_Result,
-    'action_tutorials_interfaces/action/Fibonacci_SendGoal_Event': action_tutorials_interfaces.action.Fibonacci_SendGoal_Event,
     'action_tutorials_interfaces/action/Fibonacci_SendGoal_Request': action_tutorials_interfaces.action.Fibonacci_SendGoal_Request,
     'action_tutorials_interfaces/action/Fibonacci_SendGoal_Response': action_tutorials_interfaces.action.Fibonacci_SendGoal_Response,
     'actionlib_msgs/msg/GoalID': actionlib_msgs.msg.GoalID,
@@ -4566,12 +4452,10 @@ declare module 'rclnodejs' {
     'diagnostic_msgs/srv/SelfTest_Response': diagnostic_msgs.srv.SelfTest_Response,
     'example_interfaces/action/Fibonacci_Feedback': example_interfaces.action.Fibonacci_Feedback,
     'example_interfaces/action/Fibonacci_FeedbackMessage': example_interfaces.action.Fibonacci_FeedbackMessage,
-    'example_interfaces/action/Fibonacci_GetResult_Event': example_interfaces.action.Fibonacci_GetResult_Event,
     'example_interfaces/action/Fibonacci_GetResult_Request': example_interfaces.action.Fibonacci_GetResult_Request,
     'example_interfaces/action/Fibonacci_GetResult_Response': example_interfaces.action.Fibonacci_GetResult_Response,
     'example_interfaces/action/Fibonacci_Goal': example_interfaces.action.Fibonacci_Goal,
     'example_interfaces/action/Fibonacci_Result': example_interfaces.action.Fibonacci_Result,
-    'example_interfaces/action/Fibonacci_SendGoal_Event': example_interfaces.action.Fibonacci_SendGoal_Event,
     'example_interfaces/action/Fibonacci_SendGoal_Request': example_interfaces.action.Fibonacci_SendGoal_Request,
     'example_interfaces/action/Fibonacci_SendGoal_Response': example_interfaces.action.Fibonacci_SendGoal_Response,
     'example_interfaces/msg/Bool': example_interfaces.msg.Bool,
@@ -4744,12 +4628,10 @@ declare module 'rclnodejs' {
     'rmw_dds_common/msg/ParticipantEntitiesInfo': rmw_dds_common.msg.ParticipantEntitiesInfo,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_Feedback': ros2cli_test_interfaces.action.ShortVariedMultiNested_Feedback,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_FeedbackMessage': ros2cli_test_interfaces.action.ShortVariedMultiNested_FeedbackMessage,
-    'ros2cli_test_interfaces/action/ShortVariedMultiNested_GetResult_Event': ros2cli_test_interfaces.action.ShortVariedMultiNested_GetResult_Event,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_GetResult_Request': ros2cli_test_interfaces.action.ShortVariedMultiNested_GetResult_Request,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_GetResult_Response': ros2cli_test_interfaces.action.ShortVariedMultiNested_GetResult_Response,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_Goal': ros2cli_test_interfaces.action.ShortVariedMultiNested_Goal,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_Result': ros2cli_test_interfaces.action.ShortVariedMultiNested_Result,
-    'ros2cli_test_interfaces/action/ShortVariedMultiNested_SendGoal_Event': ros2cli_test_interfaces.action.ShortVariedMultiNested_SendGoal_Event,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_SendGoal_Request': ros2cli_test_interfaces.action.ShortVariedMultiNested_SendGoal_Request,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_SendGoal_Response': ros2cli_test_interfaces.action.ShortVariedMultiNested_SendGoal_Response,
     'ros2cli_test_interfaces/msg/ShortVaried': ros2cli_test_interfaces.msg.ShortVaried,
@@ -4880,22 +4762,18 @@ declare module 'rclnodejs' {
     'stereo_msgs/msg/DisparityImage': stereo_msgs.msg.DisparityImage,
     'test_msgs/action/Fibonacci_Feedback': test_msgs.action.Fibonacci_Feedback,
     'test_msgs/action/Fibonacci_FeedbackMessage': test_msgs.action.Fibonacci_FeedbackMessage,
-    'test_msgs/action/Fibonacci_GetResult_Event': test_msgs.action.Fibonacci_GetResult_Event,
     'test_msgs/action/Fibonacci_GetResult_Request': test_msgs.action.Fibonacci_GetResult_Request,
     'test_msgs/action/Fibonacci_GetResult_Response': test_msgs.action.Fibonacci_GetResult_Response,
     'test_msgs/action/Fibonacci_Goal': test_msgs.action.Fibonacci_Goal,
     'test_msgs/action/Fibonacci_Result': test_msgs.action.Fibonacci_Result,
-    'test_msgs/action/Fibonacci_SendGoal_Event': test_msgs.action.Fibonacci_SendGoal_Event,
     'test_msgs/action/Fibonacci_SendGoal_Request': test_msgs.action.Fibonacci_SendGoal_Request,
     'test_msgs/action/Fibonacci_SendGoal_Response': test_msgs.action.Fibonacci_SendGoal_Response,
     'test_msgs/action/NestedMessage_Feedback': test_msgs.action.NestedMessage_Feedback,
     'test_msgs/action/NestedMessage_FeedbackMessage': test_msgs.action.NestedMessage_FeedbackMessage,
-    'test_msgs/action/NestedMessage_GetResult_Event': test_msgs.action.NestedMessage_GetResult_Event,
     'test_msgs/action/NestedMessage_GetResult_Request': test_msgs.action.NestedMessage_GetResult_Request,
     'test_msgs/action/NestedMessage_GetResult_Response': test_msgs.action.NestedMessage_GetResult_Response,
     'test_msgs/action/NestedMessage_Goal': test_msgs.action.NestedMessage_Goal,
     'test_msgs/action/NestedMessage_Result': test_msgs.action.NestedMessage_Result,
-    'test_msgs/action/NestedMessage_SendGoal_Event': test_msgs.action.NestedMessage_SendGoal_Event,
     'test_msgs/action/NestedMessage_SendGoal_Request': test_msgs.action.NestedMessage_SendGoal_Request,
     'test_msgs/action/NestedMessage_SendGoal_Response': test_msgs.action.NestedMessage_SendGoal_Response,
     'test_msgs/msg/Arrays': test_msgs.msg.Arrays,
@@ -4922,12 +4800,10 @@ declare module 'rclnodejs' {
     'test_msgs/srv/Empty_Response': test_msgs.srv.Empty_Response,
     'tf2_msgs/action/LookupTransform_Feedback': tf2_msgs.action.LookupTransform_Feedback,
     'tf2_msgs/action/LookupTransform_FeedbackMessage': tf2_msgs.action.LookupTransform_FeedbackMessage,
-    'tf2_msgs/action/LookupTransform_GetResult_Event': tf2_msgs.action.LookupTransform_GetResult_Event,
     'tf2_msgs/action/LookupTransform_GetResult_Request': tf2_msgs.action.LookupTransform_GetResult_Request,
     'tf2_msgs/action/LookupTransform_GetResult_Response': tf2_msgs.action.LookupTransform_GetResult_Response,
     'tf2_msgs/action/LookupTransform_Goal': tf2_msgs.action.LookupTransform_Goal,
     'tf2_msgs/action/LookupTransform_Result': tf2_msgs.action.LookupTransform_Result,
-    'tf2_msgs/action/LookupTransform_SendGoal_Event': tf2_msgs.action.LookupTransform_SendGoal_Event,
     'tf2_msgs/action/LookupTransform_SendGoal_Request': tf2_msgs.action.LookupTransform_SendGoal_Request,
     'tf2_msgs/action/LookupTransform_SendGoal_Response': tf2_msgs.action.LookupTransform_SendGoal_Response,
     'tf2_msgs/msg/TF2Error': tf2_msgs.msg.TF2Error,
@@ -4941,12 +4817,10 @@ declare module 'rclnodejs' {
     'trajectory_msgs/msg/MultiDOFJointTrajectoryPoint': trajectory_msgs.msg.MultiDOFJointTrajectoryPoint,
     'turtlesim/action/RotateAbsolute_Feedback': turtlesim.action.RotateAbsolute_Feedback,
     'turtlesim/action/RotateAbsolute_FeedbackMessage': turtlesim.action.RotateAbsolute_FeedbackMessage,
-    'turtlesim/action/RotateAbsolute_GetResult_Event': turtlesim.action.RotateAbsolute_GetResult_Event,
     'turtlesim/action/RotateAbsolute_GetResult_Request': turtlesim.action.RotateAbsolute_GetResult_Request,
     'turtlesim/action/RotateAbsolute_GetResult_Response': turtlesim.action.RotateAbsolute_GetResult_Response,
     'turtlesim/action/RotateAbsolute_Goal': turtlesim.action.RotateAbsolute_Goal,
     'turtlesim/action/RotateAbsolute_Result': turtlesim.action.RotateAbsolute_Result,
-    'turtlesim/action/RotateAbsolute_SendGoal_Event': turtlesim.action.RotateAbsolute_SendGoal_Event,
     'turtlesim/action/RotateAbsolute_SendGoal_Request': turtlesim.action.RotateAbsolute_SendGoal_Request,
     'turtlesim/action/RotateAbsolute_SendGoal_Response': turtlesim.action.RotateAbsolute_SendGoal_Response,
     'turtlesim/msg/Color': turtlesim.msg.Color,
@@ -5006,12 +4880,10 @@ declare module 'rclnodejs' {
     'action_msgs/srv/CancelGoal_Response': action_msgs.srv.CancelGoal_ResponseConstructor,
     'action_tutorials_interfaces/action/Fibonacci_Feedback': action_tutorials_interfaces.action.Fibonacci_FeedbackConstructor,
     'action_tutorials_interfaces/action/Fibonacci_FeedbackMessage': action_tutorials_interfaces.action.Fibonacci_FeedbackMessageConstructor,
-    'action_tutorials_interfaces/action/Fibonacci_GetResult_Event': action_tutorials_interfaces.action.Fibonacci_GetResult_EventConstructor,
     'action_tutorials_interfaces/action/Fibonacci_GetResult_Request': action_tutorials_interfaces.action.Fibonacci_GetResult_RequestConstructor,
     'action_tutorials_interfaces/action/Fibonacci_GetResult_Response': action_tutorials_interfaces.action.Fibonacci_GetResult_ResponseConstructor,
     'action_tutorials_interfaces/action/Fibonacci_Goal': action_tutorials_interfaces.action.Fibonacci_GoalConstructor,
     'action_tutorials_interfaces/action/Fibonacci_Result': action_tutorials_interfaces.action.Fibonacci_ResultConstructor,
-    'action_tutorials_interfaces/action/Fibonacci_SendGoal_Event': action_tutorials_interfaces.action.Fibonacci_SendGoal_EventConstructor,
     'action_tutorials_interfaces/action/Fibonacci_SendGoal_Request': action_tutorials_interfaces.action.Fibonacci_SendGoal_RequestConstructor,
     'action_tutorials_interfaces/action/Fibonacci_SendGoal_Response': action_tutorials_interfaces.action.Fibonacci_SendGoal_ResponseConstructor,
     'actionlib_msgs/msg/GoalID': actionlib_msgs.msg.GoalIDConstructor,
@@ -5039,12 +4911,10 @@ declare module 'rclnodejs' {
     'diagnostic_msgs/srv/SelfTest_Response': diagnostic_msgs.srv.SelfTest_ResponseConstructor,
     'example_interfaces/action/Fibonacci_Feedback': example_interfaces.action.Fibonacci_FeedbackConstructor,
     'example_interfaces/action/Fibonacci_FeedbackMessage': example_interfaces.action.Fibonacci_FeedbackMessageConstructor,
-    'example_interfaces/action/Fibonacci_GetResult_Event': example_interfaces.action.Fibonacci_GetResult_EventConstructor,
     'example_interfaces/action/Fibonacci_GetResult_Request': example_interfaces.action.Fibonacci_GetResult_RequestConstructor,
     'example_interfaces/action/Fibonacci_GetResult_Response': example_interfaces.action.Fibonacci_GetResult_ResponseConstructor,
     'example_interfaces/action/Fibonacci_Goal': example_interfaces.action.Fibonacci_GoalConstructor,
     'example_interfaces/action/Fibonacci_Result': example_interfaces.action.Fibonacci_ResultConstructor,
-    'example_interfaces/action/Fibonacci_SendGoal_Event': example_interfaces.action.Fibonacci_SendGoal_EventConstructor,
     'example_interfaces/action/Fibonacci_SendGoal_Request': example_interfaces.action.Fibonacci_SendGoal_RequestConstructor,
     'example_interfaces/action/Fibonacci_SendGoal_Response': example_interfaces.action.Fibonacci_SendGoal_ResponseConstructor,
     'example_interfaces/msg/Bool': example_interfaces.msg.BoolConstructor,
@@ -5217,12 +5087,10 @@ declare module 'rclnodejs' {
     'rmw_dds_common/msg/ParticipantEntitiesInfo': rmw_dds_common.msg.ParticipantEntitiesInfoConstructor,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_Feedback': ros2cli_test_interfaces.action.ShortVariedMultiNested_FeedbackConstructor,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_FeedbackMessage': ros2cli_test_interfaces.action.ShortVariedMultiNested_FeedbackMessageConstructor,
-    'ros2cli_test_interfaces/action/ShortVariedMultiNested_GetResult_Event': ros2cli_test_interfaces.action.ShortVariedMultiNested_GetResult_EventConstructor,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_GetResult_Request': ros2cli_test_interfaces.action.ShortVariedMultiNested_GetResult_RequestConstructor,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_GetResult_Response': ros2cli_test_interfaces.action.ShortVariedMultiNested_GetResult_ResponseConstructor,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_Goal': ros2cli_test_interfaces.action.ShortVariedMultiNested_GoalConstructor,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_Result': ros2cli_test_interfaces.action.ShortVariedMultiNested_ResultConstructor,
-    'ros2cli_test_interfaces/action/ShortVariedMultiNested_SendGoal_Event': ros2cli_test_interfaces.action.ShortVariedMultiNested_SendGoal_EventConstructor,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_SendGoal_Request': ros2cli_test_interfaces.action.ShortVariedMultiNested_SendGoal_RequestConstructor,
     'ros2cli_test_interfaces/action/ShortVariedMultiNested_SendGoal_Response': ros2cli_test_interfaces.action.ShortVariedMultiNested_SendGoal_ResponseConstructor,
     'ros2cli_test_interfaces/msg/ShortVaried': ros2cli_test_interfaces.msg.ShortVariedConstructor,
@@ -5353,22 +5221,18 @@ declare module 'rclnodejs' {
     'stereo_msgs/msg/DisparityImage': stereo_msgs.msg.DisparityImageConstructor,
     'test_msgs/action/Fibonacci_Feedback': test_msgs.action.Fibonacci_FeedbackConstructor,
     'test_msgs/action/Fibonacci_FeedbackMessage': test_msgs.action.Fibonacci_FeedbackMessageConstructor,
-    'test_msgs/action/Fibonacci_GetResult_Event': test_msgs.action.Fibonacci_GetResult_EventConstructor,
     'test_msgs/action/Fibonacci_GetResult_Request': test_msgs.action.Fibonacci_GetResult_RequestConstructor,
     'test_msgs/action/Fibonacci_GetResult_Response': test_msgs.action.Fibonacci_GetResult_ResponseConstructor,
     'test_msgs/action/Fibonacci_Goal': test_msgs.action.Fibonacci_GoalConstructor,
     'test_msgs/action/Fibonacci_Result': test_msgs.action.Fibonacci_ResultConstructor,
-    'test_msgs/action/Fibonacci_SendGoal_Event': test_msgs.action.Fibonacci_SendGoal_EventConstructor,
     'test_msgs/action/Fibonacci_SendGoal_Request': test_msgs.action.Fibonacci_SendGoal_RequestConstructor,
     'test_msgs/action/Fibonacci_SendGoal_Response': test_msgs.action.Fibonacci_SendGoal_ResponseConstructor,
     'test_msgs/action/NestedMessage_Feedback': test_msgs.action.NestedMessage_FeedbackConstructor,
     'test_msgs/action/NestedMessage_FeedbackMessage': test_msgs.action.NestedMessage_FeedbackMessageConstructor,
-    'test_msgs/action/NestedMessage_GetResult_Event': test_msgs.action.NestedMessage_GetResult_EventConstructor,
     'test_msgs/action/NestedMessage_GetResult_Request': test_msgs.action.NestedMessage_GetResult_RequestConstructor,
     'test_msgs/action/NestedMessage_GetResult_Response': test_msgs.action.NestedMessage_GetResult_ResponseConstructor,
     'test_msgs/action/NestedMessage_Goal': test_msgs.action.NestedMessage_GoalConstructor,
     'test_msgs/action/NestedMessage_Result': test_msgs.action.NestedMessage_ResultConstructor,
-    'test_msgs/action/NestedMessage_SendGoal_Event': test_msgs.action.NestedMessage_SendGoal_EventConstructor,
     'test_msgs/action/NestedMessage_SendGoal_Request': test_msgs.action.NestedMessage_SendGoal_RequestConstructor,
     'test_msgs/action/NestedMessage_SendGoal_Response': test_msgs.action.NestedMessage_SendGoal_ResponseConstructor,
     'test_msgs/msg/Arrays': test_msgs.msg.ArraysConstructor,
@@ -5395,12 +5259,10 @@ declare module 'rclnodejs' {
     'test_msgs/srv/Empty_Response': test_msgs.srv.Empty_ResponseConstructor,
     'tf2_msgs/action/LookupTransform_Feedback': tf2_msgs.action.LookupTransform_FeedbackConstructor,
     'tf2_msgs/action/LookupTransform_FeedbackMessage': tf2_msgs.action.LookupTransform_FeedbackMessageConstructor,
-    'tf2_msgs/action/LookupTransform_GetResult_Event': tf2_msgs.action.LookupTransform_GetResult_EventConstructor,
     'tf2_msgs/action/LookupTransform_GetResult_Request': tf2_msgs.action.LookupTransform_GetResult_RequestConstructor,
     'tf2_msgs/action/LookupTransform_GetResult_Response': tf2_msgs.action.LookupTransform_GetResult_ResponseConstructor,
     'tf2_msgs/action/LookupTransform_Goal': tf2_msgs.action.LookupTransform_GoalConstructor,
     'tf2_msgs/action/LookupTransform_Result': tf2_msgs.action.LookupTransform_ResultConstructor,
-    'tf2_msgs/action/LookupTransform_SendGoal_Event': tf2_msgs.action.LookupTransform_SendGoal_EventConstructor,
     'tf2_msgs/action/LookupTransform_SendGoal_Request': tf2_msgs.action.LookupTransform_SendGoal_RequestConstructor,
     'tf2_msgs/action/LookupTransform_SendGoal_Response': tf2_msgs.action.LookupTransform_SendGoal_ResponseConstructor,
     'tf2_msgs/msg/TF2Error': tf2_msgs.msg.TF2ErrorConstructor,
@@ -5414,12 +5276,10 @@ declare module 'rclnodejs' {
     'trajectory_msgs/msg/MultiDOFJointTrajectoryPoint': trajectory_msgs.msg.MultiDOFJointTrajectoryPointConstructor,
     'turtlesim/action/RotateAbsolute_Feedback': turtlesim.action.RotateAbsolute_FeedbackConstructor,
     'turtlesim/action/RotateAbsolute_FeedbackMessage': turtlesim.action.RotateAbsolute_FeedbackMessageConstructor,
-    'turtlesim/action/RotateAbsolute_GetResult_Event': turtlesim.action.RotateAbsolute_GetResult_EventConstructor,
     'turtlesim/action/RotateAbsolute_GetResult_Request': turtlesim.action.RotateAbsolute_GetResult_RequestConstructor,
     'turtlesim/action/RotateAbsolute_GetResult_Response': turtlesim.action.RotateAbsolute_GetResult_ResponseConstructor,
     'turtlesim/action/RotateAbsolute_Goal': turtlesim.action.RotateAbsolute_GoalConstructor,
     'turtlesim/action/RotateAbsolute_Result': turtlesim.action.RotateAbsolute_ResultConstructor,
-    'turtlesim/action/RotateAbsolute_SendGoal_Event': turtlesim.action.RotateAbsolute_SendGoal_EventConstructor,
     'turtlesim/action/RotateAbsolute_SendGoal_Request': turtlesim.action.RotateAbsolute_SendGoal_RequestConstructor,
     'turtlesim/action/RotateAbsolute_SendGoal_Response': turtlesim.action.RotateAbsolute_SendGoal_ResponseConstructor,
     'turtlesim/msg/Color': turtlesim.msg.ColorConstructor,