@bee.js/node 0.0.87 → 0.0.89

package/beehive.js

@@ -253,38 +253,41 @@ module.exports = function hive(req = {}, res = {}, model = null) {
     },
 
     whereIf: function (condition, where, binds) {
-      if (condition) script[0]["where"].push(where);
+      if (!condition) return;
 
-      if (condition && binds)
+      script[0]["where"].push(typeof where == "function" ? where() : where);
+
+      if (binds)
         script[0]["binds"].push(typeof binds === "function" ? binds() : binds);
 
       return this;
     },
 
     whereIn: function (field, array = []) {
-      array = [
-        ...new Set(
-          array.map((row) => {
-            let val = row[field];
-
-            // TODO colocar escape para sql injection
-            switch (model.schema[field]?.type) {
-              case "char":
-              case "varchar":
-              case "text":
-              case "string":
-                return `'${val}'`;
-              case "guid":
-              case "uuid":
-                return val ? beeTools.guidToBin(val) : null;
-              default:
-                return val;
-            }
-          })
-        ),
-      ].join(",");
+      const values = {};
+
+      array.map((row) => {
+        const val = row[field];
+
+        if (!!!val) return;
+
+        switch (model.schema[field]?.type) {
+          case "char":
+          case "varchar":
+          case "text":
+          case "string":
+            return (values[`'${val}'`] = true);
+          case "guid":
+          case "uuid":
+            return (values[beeTools.guidToBin(val) ?? "null"] = true);
+          default:
+            return (values[val] = true);
+        }
+      });
 
-      script[0]["where"].push(`${model.table}.${field} IN(${array ?? "null"})`);
+      script[0]["where"].push(
+        `${model.table}.${field} IN(${Object.keys(values).join(",") ?? "null"})`
+      );
 
       return this;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bee.js/node",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "description": "A JavaScript framework for making Node.js API´s",
   "main": "index.js",
   "scripts": {