Merge pull request #207 from DavidVujic/children2_return_values

fix: handle multiple return values in promisified client

Author: DavidVujic

README.md

@@ -78,7 +78,10 @@ Check out the code in the [examples](./examples) folder: master,workers, tasks a
 * `stat = await exists(path, watch)`
 * `data = await get(path, watch)`
 * `children = await get_children(path, watch)`
-* `{children, stat} = await get_children2( path, watch)`
+* `[children, stat] = await get_children2( path, watch)`
+    * return value types:
+        * children is an array of strings
+        * stat is an object
 * `stat = await set(path, data, version)`
 * `val = await sync(path)`
 * `delete_ (path, version)`
@@ -92,7 +95,10 @@ Check out the code in the [examples](./examples) folder: master,workers, tasks a
 * `stat = await w_exists(path, watch_cb)`
 * `data = await w_get(path, watch_cb)`
 * `children = await w_get_children(path, watch_cb)`
-* `{children, stat} = await w_get_children2 (path, watch_cb)`
+* `[children, stat] = await w_get_children2 (path, watch_cb)`
+    * return value types:
+        * children is an array of strings
+        * stat is an object
 
 ### Methods: callbacks based client ###
 

lib/zk_promise.js

@@ -92,8 +92,8 @@ class ZooKeeperPromise extends ZooKeeper {
     /**
      * @param path {string}
      * @param watch {boolean}
-     * @fulfill {Array.<string>>,<stat>}
-     * @returns {Promise.<Array.<string>>,<stat>}
+     * @fulfill {Array} [children, stat] - children: an array of strings, stat: object
+     * @returns {Promise.<Array>} [children, stat] - children: an array of strings, stat: object
      */
     get_children2(path, watch) {
         return this.promisify(super.a_get_children2, [path, watch]);
@@ -102,8 +102,8 @@ class ZooKeeperPromise extends ZooKeeper {
     /**
      * @param path {string}
      * @param watchCb {function}
-     * @fulfill {Array.<string>>,<stat>}
-     * @returns {Promise.<Array.<string>>,<stat>}
+     * @fulfill {Array} [children, stat] - children: an array of strings, stat: object
+     * @returns {Promise.<Array>} [children, stat] - children: an array of strings, stat: object
      */
     w_get_children2(path, watchCb) {
         return this.promisify(super.aw_get_children2, [path, watchCb]);
@@ -166,16 +166,12 @@ class ZooKeeperPromise extends ZooKeeper {
      */
     promisify(fn, args) {
         return new ZkPromise((resolve, reject) => {
-            const callback = (rc, error, result) => {
-                if (rc) {
-                    reject(rc);
-                } else if (args.length > 3) {
-                    // if there are multiple success values, we return an array
-                    Array.prototype.shift.call(args, 1);
-                    Array.prototype.shift.call(args, 1);
-                    resolve(args);
+            const callback = (rc, error, ...result) => {
+                if (rc !== 0) {
+                    reject(new Error(`${rc} ${error}`));
                 } else {
-                    resolve(result);
+                    const toReturn = result.length === 1 ? result[0] : result;
+                    resolve(toReturn);
                 }
             };
             fn.bind(this)(...args, callback);