drapcode-utility 1.3.5 → 1.3.7

package/build/utils/query-parser.js

@@ -252,7 +252,7 @@ var modifyQuery = function (obj, hasAndQueryConjunction) {
     return arr;
 };
 var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
     var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone);
@@ -369,31 +369,32 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         };
     if (key == drapcode_constant_1.EQUALS) {
         console.log("I am query parser");
-        return _x = {},
-            // TODO:Handle Based of Field Type
-            _x[field] = fieldType === "boolean" && fieldValue
-                ? JSON.parse(fieldValue)
-                : // : !isNaN(fieldValue)
-                    // ? +fieldValue
-                    fieldValue,
-            _x;
+        console.log("fieldType", fieldType);
+        if (fieldType === "boolean") {
+            return _x = {}, _x[field] = !!fieldValue, _x;
+        }
+        if (fieldType === "number") {
+            return _y = {}, _y[field] = +fieldValue, _y;
+        }
+        console.log("Nothing match");
+        return _z = {}, _z[field] = "".concat(fieldValue), _z;
     }
     if (key == drapcode_constant_1.NOT_EQUAL)
-        return _y = {},
-            _y[field] = {
+        return _0 = {},
+            _0[field] = {
                 $ne: fieldType === "boolean" && fieldValue
                     ? JSON.parse(fieldValue)
                     : fieldValue,
             },
-            _y;
+            _0;
     if (key == drapcode_constant_1.BETWEEN) {
-        var _0 = (0, exports.getMinMaxValue)(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
-        return _z = {},
-            _z[field] = {
+        var _2 = (0, exports.getMinMaxValue)(fieldValue), startValue = _2.startValue, endValue = _2.endValue, isInteger = _2.isInteger;
+        return _1 = {},
+            _1[field] = {
                 $gte: isInteger ? +startValue : startValue,
                 $lte: isInteger ? +endValue : endValue,
             },
-            _z;
+            _1;
     }
 };
 var isEntityInCondition = function (value) {

package/build/utils/query-paser-new.js

@@ -354,7 +354,7 @@ var modifyQuery = function (obj, hasAndQueryConjunction) {
     return arr;
 };
 var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
     if (currentUser === void 0) { currentUser = {}; }
     var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser);
     var isDate = checkDate(fieldValue);
@@ -446,31 +446,31 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         };
     if (key == drapcode_constant_1.EQUALS) {
         console.log("I am query parser new");
-        return _y = {},
-            // TODO:Handle Based of Field Type
-            _y[field] = fieldType === "boolean" && fieldValue
-                ? JSON.parse(fieldValue)
-                : // : !isNaN(fieldValue)
-                    // ? +fieldValue
-                    fieldValue,
-            _y;
+        if (fieldType === "boolean") {
+            return _y = {}, _y[field] = !!fieldValue, _y;
+        }
+        if (fieldType === "number") {
+            return _z = {}, _z[field] = +fieldValue, _z;
+        }
+        console.log("Nothing match");
+        return _0 = {}, _0[field] = "".concat(fieldValue), _0;
     }
     if (key == drapcode_constant_1.NOT_EQUAL)
-        return _z = {},
-            _z[field] = {
+        return _1 = {},
+            _1[field] = {
                 $ne: fieldType === "boolean" && fieldValue
                     ? JSON.parse(fieldValue)
                     : fieldValue,
             },
-            _z;
+            _1;
     if (key == drapcode_constant_1.BETWEEN) {
-        var _1 = getMinMaxValue(fieldValue), startValue = _1.startValue, endValue = _1.endValue, isInteger = _1.isInteger;
-        return _0 = {},
-            _0[field] = {
+        var _3 = getMinMaxValue(fieldValue), startValue = _3.startValue, endValue = _3.endValue, isInteger = _3.isInteger;
+        return _2 = {},
+            _2[field] = {
                 $gte: isInteger ? +startValue : startValue,
                 $lte: isInteger ? +endValue : endValue,
             },
-            _0;
+            _2;
     }
 };
 var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",