homey-api 3.0.12 → 3.0.13

package/lib/HomeyAPI/HomeyAPIV2/ManagerFlow.js

@@ -22,7 +22,7 @@ class ManagerFlow extends ManagerFlowV3 {
     flow,
     ...props
   }) {
-    return this.__super__.createFlow({
+    return this.__super__createFlow({
       flow: Flow.transformSet(flow),
       ...props,
     });
@@ -32,7 +32,7 @@ class ManagerFlow extends ManagerFlowV3 {
     flow,
     ...props
   }) {
-    return this.__super__.updateFlow({
+    return this.__super__updateFlow({
       flow: Flow.transformSet(flow),
       ...props,
     });
@@ -42,7 +42,7 @@ class ManagerFlow extends ManagerFlowV3 {
     advancedflow,
     ...props
   }) {
-    return this.__super__.createAdvancedFlow({
+    return this.__super__createAdvancedFlow({
       advancedflow: AdvancedFlow.transformSet(advancedflow),
       ...props,
     });
@@ -52,7 +52,7 @@ class ManagerFlow extends ManagerFlowV3 {
     advancedflow,
     ...props
   }) {
-    return this.__super__.updateAdvancedFlow({
+    return this.__super__updateAdvancedFlow({
       advancedflow: AdvancedFlow.transformSet(advancedflow),
       ...props,
     });
@@ -122,6 +122,17 @@ class ManagerFlow extends ManagerFlowV3 {
     });
   }
 
+  async getFlowCardAutocomplete({
+    id,
+    ...props
+  }) {
+    return this.__super__getFlowCardAutocomplete({
+      id: id.split(':').reverse()[0],
+      uri: id.split(':', 3).join(':'),
+      ...props,
+    });
+  }
+
 }
 
 module.exports = ManagerFlow;

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -130,7 +130,7 @@ class Manager extends EventEmitter {
                   }
 
                   if (typeof value !== 'undefined') {
-                    if (parameter.type === 'string' && typeof value !== 'string') {
+                    if (parameter.in !== 'query' && parameter.type === 'string' && typeof value !== 'string') {
                       throw new Error(`Invalid Parameter Type: ${parameterId}. Got: ${typeof value}. Expected: string`);
                     }
 
@@ -160,10 +160,6 @@ class Manager extends EventEmitter {
                 if (typeof value !== 'undefined') {
                   switch (parameter.in) {
                     case 'path': {
-                      if (typeof value !== 'string') {
-                        throw new Error(`Invalid Parameter Type: ${parameterId}. Got: ${typeof value}. Expected: string`);
-                      }
-
                       path = path.replace(`:${parameterId}`, value);
                       break;
                     }
@@ -176,10 +172,6 @@ class Manager extends EventEmitter {
                       break;
                     }
                     case 'query': {
-                      if (typeof value !== 'string') {
-                        throw new Error(`Invalid Parameter Type: ${parameterId}. Got: ${typeof value}. Expected: string`);
-                      }
-
                       query[parameterId] = value;
                       break;
                     }
@@ -193,9 +185,7 @@ class Manager extends EventEmitter {
 
             // Append query to path
             if (Object.keys(query).length > 0) {
-              const queryString = Object.entries(query).map(([key, value]) => {
-                return `${key}=${encodeURIComponent(value)}`;
-              }).join('&');
+              const queryString = Util.serializeQueryObject(query);
               path = `${path}?${queryString}`;
             }
 

package/lib/Util.js

@@ -256,6 +256,59 @@ class Util {
     });
   }
 
+  static serializeQueryObject(queryObject) {
+    let prefix;
+    let querystring = [];
+    let rbracket = /\[\]$/;
+
+    function add(key, value) {
+      // If value is a function, invoke it and return its value.
+      value = (typeof value === 'function') ?
+        value() :
+        value === null ?
+          '' :
+          value;
+      querystring[querystring.length] = encodeURIComponent(key) +
+        '=' + encodeURIComponent(value);
+    }
+
+    function buildParams(prefix, obj, add) {
+      let name;
+      if (Array.isArray(obj)) {
+        // Serialize array item.
+        for (let index = 0; index < obj.length; index++) {
+          if (rbracket.test(prefix)) {
+            // Treat each array item as a scalar.
+            add(prefix, obj[index]);
+          } else {
+            // Item is non-scalar (array or object), encode its numeric index.
+            buildParams(prefix + '[' + (typeof (obj[index]) === 'object' ?
+              index :
+              ''
+            ) + ']', obj[index], add);
+          }
+        }
+      } else if (typeof obj === 'object') {
+        // Serialize object item.
+        for (name in obj) {
+          buildParams(prefix + '[' + name + ']', obj[name], add);
+        }
+      } else {
+        // Serialize scalar item.
+        add(prefix, obj);
+      }
+    }
+
+    // Encode params recursively.
+    for (prefix in queryObject) {
+      if (typeof queryObject[prefix] === 'undefined') continue;
+      buildParams(prefix, queryObject[prefix], add);
+    }
+
+    // Return the resulting serialization.
+    return querystring.join('&');
+  }
+
 }
 
 module.exports = Util;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "3.0.12",
+  "version": "3.0.13",
   "description": "Homey API",
   "main": "index.js",
   "files": [