Allow absolute namespaces

Add missing string template Add missing EOF newline
RobotWebTools · Feb 7, 2025 · a453e31 · a453e31
1 parent 7e3283c
commit a453e31
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/core/Param.js b/src/core/Param.js
@@ -36,7 +36,7 @@ export default class Param {
   get(callback, failedCallback) {
     var paramClient = new Service({
       ros: this.ros,
-      name: this.ros.namespace + 'rosapi/get_param',
+      name: `${this.ros.namespace}rosapi/get_param`,
       serviceType: 'rosapi/GetParam'
     });
 

diff --git a/src/core/Ros.js b/src/core/Ros.js
@@ -46,9 +46,9 @@ export default class Ros extends EventEmitter {
     this.groovyCompatibility = options.groovyCompatibility ?? true;
     this.namespace = options.namespace || '';
 
-    // Normalize namespace format: no leading slash, with trailing slash
+    // Normalize namespace format: with trailing slash
     if (this.namespace) {
-      this.namespace = this.namespace.replace(/^\//, '').replace(/\/?$/, '/');
+      this.namespace = this.namespace.replace(/\/?$/, '/');
     }
 
     // begin by checking if a URL was given

diff --git a/test/namespaces.test.js b/test/namespaces.test.js
@@ -125,4 +125,4 @@ describe('Namespaces', () => {
         expect(topics).not.hasLength(0);
     })
 
-})
+})
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,4 +125,4 @@ describe('Namespaces', () => { @@
             expect(topics).not.hasLength(0);
         })
-    })
+    })