Patch subfolder regex to support hyphens

TimWendtMakino · TimWendtMakino · commit 8bde77d81eeb · 2026-02-11T09:59:34.000+09:00
diff --git a/rosidl_gen/packages.js b/rosidl_gen/packages.js
@@ -33,7 +33,7 @@ function getPackageName(filePath, amentExecuted) {
   }
 
   if (amentExecuted) {
-    return filePath.match(/\w+\/share\/(\w+)\//)[1];
+    return filePath.match(/[^/]+\/share\/([^/]+)\//)[1];
   }
 
   let folders = path.parse(filePath).dir.split('/');
@@ -52,7 +52,7 @@ function getSubFolder(filePath, amentExecuted) {
   }
 
   if (amentExecuted) {
-    return filePath.match(/\w+\/share\/\w+\/(\w+)\//)[1];
+    return filePath.match(/[^/]+\/share\/[^/]+\/([^/]+)\//)[1];
   }
   // If the |amentExecuted| equals to false, the file's extension will be assigned as
   // the name of sub folder.

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ function getPackageName(filePath, amentExecuted) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (amentExecuted) {`
`36`		`- return filePath.match(/\w+\/share\/(\w+)\//)[1];`
	`36`	`+ return filePath.match(/[^/]+\/share\/([^/]+)\//)[1];`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`let folders = path.parse(filePath).dir.split('/');`
`@@ -52,7 +52,7 @@ function getSubFolder(filePath, amentExecuted) {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if (amentExecuted) {`
`55`		`- return filePath.match(/\w+\/share\/\w+\/(\w+)\//)[1];`
	`55`	`+ return filePath.match(/[^/]+\/share\/[^/]+\/([^/]+)\//)[1];`
`56`	`56`	`}`
`57`	`57`	`// If the \|amentExecuted\| equals to false, the file's extension will be assigned as`
`58`	`58`	`// the name of sub folder.`