rclnodejs 0.26.0 → 0.26.1

package/package.json

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

package/rosidl_gen/generator.json

@@ -1,6 +1,6 @@
 {
   "name": "rosidl-generator",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Generate JavaScript object from ROS IDL(.msg) files",
   "main": "index.js",
   "authors": [

package/rosidl_gen/idl_generator.js

@@ -92,6 +92,9 @@ async function generateServiceEventMsg(serviceInfo, dir) {
 
 async function generateServiceEventJSStruct(msgInfo, dir) {
   const spec = await parser.parseMessageFile(msgInfo.pkgName, msgInfo.filePath);
+  // Pass `msgInfo.subFolder` to the `spec`, because some .srv files of the
+  // package may not be put under srv/ folder, e.g., slam_toolbox.
+  spec.subFolder = msgInfo.subFolder;
 
   // Remove the `.msg` files generated in `generateServiceEventMsg()` to avoid
   // being found later.

package/rosidl_gen/templates/message.dot

@@ -198,7 +198,7 @@ function getModulePathByType(type, messageInfo) {
 
   /* 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 + `__${it.spec.subFolder}__` + type.type + '.js';
   }
   return type.pkgName + '__msg__' + type.type + '.js';
 }