Merge pull request #152 from minggangw/fix-issue-149

Minggang Wang · web-flow · commit b23af44be1c7 · 2017-10-20T19:36:22.000+08:00
Implement function expandTopicName()
diff --git a/docs/Client.html b/docs/Client.html
@@ -334,7 +334,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:44 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/Node.html b/docs/Node.html
@@ -1309,7 +1309,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:44 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/Publisher.html b/docs/Publisher.html
@@ -376,7 +376,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:44 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/QoS.html b/docs/QoS.html
@@ -2611,7 +2611,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:44 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/Service.html b/docs/Service.html
@@ -147,7 +147,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:44 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/Subscription.html b/docs/Subscription.html
@@ -147,7 +147,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:44 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/Timer.html b/docs/Timer.html
@@ -863,7 +863,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:44 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/global.html b/docs/global.html
@@ -1076,7 +1076,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:44 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/index.html b/docs/index.html
@@ -56,7 +56,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:44 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/index.js.html b/docs/index.js.html
@@ -195,6 +195,17 @@ <h1 class="page-title">Source: index.js</h1>
       if (arr[i].startsWith('_')) return true;
     }
     return false;
+  },
+
+  /**
+   * Expand a given topic name using given node name and namespace as well.
+   * @param {string} topicName - Topic name to be expanded.
+   * @param {string} nodeName - Name of the node that this topic is associated with.
+   * @param {string} nodeNamespace - Namespace that the topic is within.
+   * @return {string} Expanded topic name which is fully qualified.
+   */
+  expandTopicName(topicName, nodeName, nodeNamespace) {
+    return rclnodejs.expandTopicName(topicName, nodeName, nodeNamespace);
   }
 };
 
@@ -215,7 +226,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:43 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/lib_client.js.html b/docs/lib_client.js.html
@@ -128,7 +128,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:43 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/lib_node.js.html b/docs/lib_node.js.html
@@ -300,7 +300,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:43 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/lib_publisher.js.html b/docs/lib_publisher.js.html
@@ -111,7 +111,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:43 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/lib_qos.js.html b/docs/lib_qos.js.html
@@ -338,7 +338,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:43 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/lib_service.js.html b/docs/lib_service.js.html
@@ -94,7 +94,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:43 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/lib_subscription.js.html b/docs/lib_subscription.js.html
@@ -91,7 +91,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:43 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/lib_timer.js.html b/docs/lib_timer.js.html
@@ -133,7 +133,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:43 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/module-rclnodejs.html b/docs/module-rclnodejs.html
@@ -320,6 +320,209 @@ <h5>Returns:</h5>
     
 
     
+    <h4 class="name" id=".expandTopicName"><span class="type-signature">(static) </span>expandTopicName<span class="signature">(topicName, nodeName, nodeNamespace)</span><span class="type-signature"> &rarr; {string}</span></h4>
+    
+
+    
+
+
+
+<div class="description">
+    Expand a given topic name using given node name and namespace as well.
+</div>
+
+
+
+
+
+
+
+
+
+    <h5>Parameters:</h5>
+    
+
+<table class="params">
+    <thead>
+    <tr>
+        
+        <th>Name</th>
+        
+
+        <th>Type</th>
+
+        
+
+        
+
+        <th class="last">Description</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    
+
+        <tr>
+            
+                <td class="name"><code>topicName</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">Topic name to be expanded.</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>nodeName</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">Name of the node that this topic is associated with.</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>nodeNamespace</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">Namespace that the topic is within.</td>
+        </tr>
+
+    
+    </tbody>
+</table>
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="index.js.html">index.js</a>, <a href="index.js.html#line179">line 179</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+<div class="param-desc">
+    Expanded topic name which is fully qualified.
+</div>
+
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">string</span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
     <h4 class="name" id=".init"><span class="type-signature">(static) </span>init<span class="signature">(args)</span><span class="type-signature"> &rarr; {Promise.&lt;undefined>}</span></h4>
     
 
@@ -1197,7 +1400,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-rc
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Oct 19 2017 17:17:51 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Oct 20 2017 17:08:44 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/index.js b/index.js
diff --git a/src/rcl_bindings.cpp b/src/rcl_bindings.cpp
