drapcode-utility 1.0.7 → 1.0.8

package/build/format-fields/index.js

@@ -26,7 +26,7 @@ var formatField = function (itemData, fields) {
     return newItemData;
 };
 var getFormatFieldData = function (fieldData, fieldType) {
-    var createdAt = drapcode_constant_1.FieldTypes.createdAt, text = drapcode_constant_1.FieldTypes.text, large_text = drapcode_constant_1.FieldTypes.large_text, date = drapcode_constant_1.FieldTypes.date, password = drapcode_constant_1.FieldTypes.password, uuid = drapcode_constant_1.FieldTypes.uuid, custom_uuid = drapcode_constant_1.FieldTypes.custom_uuid, email = drapcode_constant_1.FieldTypes.email, url = drapcode_constant_1.FieldTypes.url, number = drapcode_constant_1.FieldTypes.number, unix_timestamp = drapcode_constant_1.FieldTypes.unix_timestamp, reference = drapcode_constant_1.FieldTypes.reference, belongsTo = drapcode_constant_1.FieldTypes.belongsTo, multi_reference = drapcode_constant_1.FieldTypes.multi_reference, dynamic_option = drapcode_constant_1.FieldTypes.dynamic_option, static_option = drapcode_constant_1.FieldTypes.static_option, boolean = drapcode_constant_1.FieldTypes.boolean, time_slot = drapcode_constant_1.FieldTypes.time_slot, slug = drapcode_constant_1.FieldTypes.slug;
+    var createdAt = drapcode_constant_1.FieldTypes.createdAt, text = drapcode_constant_1.FieldTypes.text, large_text = drapcode_constant_1.FieldTypes.large_text, date = drapcode_constant_1.FieldTypes.date, password = drapcode_constant_1.FieldTypes.password, uuid = drapcode_constant_1.FieldTypes.uuid, custom_uuid = drapcode_constant_1.FieldTypes.custom_uuid, email = drapcode_constant_1.FieldTypes.email, url = drapcode_constant_1.FieldTypes.url, number = drapcode_constant_1.FieldTypes.number, unix_timestamp = drapcode_constant_1.FieldTypes.unix_timestamp, reference = drapcode_constant_1.FieldTypes.reference, belongsTo = drapcode_constant_1.FieldTypes.belongsTo, multi_reference = drapcode_constant_1.FieldTypes.multi_reference, dynamic_option = drapcode_constant_1.FieldTypes.dynamic_option, static_option = drapcode_constant_1.FieldTypes.static_option, boolean = drapcode_constant_1.FieldTypes.boolean, time_slot = drapcode_constant_1.FieldTypes.time_slot, slug = drapcode_constant_1.FieldTypes.slug, json = drapcode_constant_1.FieldTypes.json;
     var stringType = [
         createdAt.id,
         text.id,
@@ -38,7 +38,8 @@ var getFormatFieldData = function (fieldData, fieldType) {
         email.id,
         url.id,
         time_slot.id,
-        slug.id
+        slug.id,
+        json.id,
     ];
     var numberType = [number.id, unix_timestamp.id];
     var arrayType = [

package/build/utils/query-parser.js

@@ -324,7 +324,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;
+    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;
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
     var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone);
@@ -361,44 +361,49 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         return _b = {}, _b[field] = { $nin: fieldValue || [] }, _b;
     }
     if (condition && key === drapcode_constant_1.IS_NULL) {
-        return _c = {}, _c[field] = { $type: "array", $eq: [] }, _c;
+        return {
+            $or: [
+                (_c = {}, _c[field] = { $exists: false }, _c),
+                (_d = {}, _d[field] = { $type: "array", $eq: [] }, _d),
+            ],
+        };
     }
     if (condition && key === drapcode_constant_1.IS_NOT_NULL) {
-        return _d = {}, _d[field] = { $exists: true, $type: "array", $ne: [] }, _d;
+        return _e = {}, _e[field] = { $exists: true, $type: "array", $ne: [] }, _e;
     }
     if (key === drapcode_constant_1.IS_NOT_NULL)
-        return _e = {}, _e[field] = { $nin: [null, ""] }, _e;
+        return _f = {}, _f[field] = { $nin: [null, ""] }, _f;
     if (key === drapcode_constant_1.IS_NULL)
-        return _f = {}, _f[field] = { $in: [null, ""] }, _f;
+        return _g = {}, _g[field] = { $in: [null, ""] }, _g;
     if (key === drapcode_constant_1.LIKE)
-        return _g = {}, _g[field] = { $regex: fieldValue, $options: "i" }, _g;
+        return _h = {}, _h[field] = { $regex: fieldValue, $options: "i" }, _h;
     if (key === drapcode_constant_1.GREATER_THAN_EQUALS_TO)
-        return _h = {}, _h[field] = { $gte: isDate ? fieldValue : +fieldValue }, _h;
+        return _j = {}, _j[field] = { $gte: isDate ? fieldValue : +fieldValue }, _j;
     if (key === drapcode_constant_1.LESS_THAN_EQUALS_TO)
-        return _j = {}, _j[field] = { $lte: isDate ? fieldValue : +fieldValue }, _j;
+        return _k = {}, _k[field] = { $lte: isDate ? fieldValue : +fieldValue }, _k;
     if (key === drapcode_constant_1.LESS_THAN)
-        return _k = {}, _k[field] = { $lt: isDate ? fieldValue : +fieldValue }, _k;
+        return _l = {}, _l[field] = { $lt: isDate ? fieldValue : +fieldValue }, _l;
     if (key === drapcode_constant_1.GREATER_THAN)
-        return _l = {}, _l[field] = { $gt: isDate ? fieldValue : +fieldValue }, _l;
+        return _m = {}, _m[field] = { $gt: isDate ? fieldValue : +fieldValue }, _m;
     if (key === drapcode_constant_1.IN_LIST) {
         if (!Array.isArray(fieldValue)) {
             fieldValue = [fieldValue];
         }
-        return _m = {}, _m[field] = { $in: fieldValue || [] }, _m;
+        return _o = {}, _o[field] = { $in: fieldValue || [] }, _o;
     }
     if (key === drapcode_constant_1.NOT_IN_LIST) {
         if (!Array.isArray(fieldValue)) {
             fieldValue = [fieldValue];
         }
-        return _o = {}, _o[field] = { $nin: fieldValue || [] }, _o;
+        return _p = {}, _p[field] = { $nin: fieldValue || [] }, _p;
     }
     if (key === drapcode_constant_1.EQUALS && isDate) {
-        return _p = {},
-            _p[field] = {
+        return _q = {},
+            _q[field] = {
                 $gte: fieldValue,
                 $lt: date_util_1.nextDayDate(fieldValue),
             },
-            _p;
+            _q;
         // Todo: Remove this if works properly
         // if (DateConstant.some((cnst) => value.includes(cnst))) {
         //   return {
@@ -419,46 +424,46 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
     if (key == drapcode_constant_1.EQUALS && field === "createdBy")
         return {
             $and: [
-                (_q = {}, _q[field] = { $ne: null }, _q),
-                (_r = {}, _r[field] = { $ne: "" }, _r),
-                (_s = {}, _s[field] = { $eq: fieldValue }, _s),
+                (_r = {}, _r[field] = { $ne: null }, _r),
+                (_s = {}, _s[field] = { $ne: "" }, _s),
+                (_t = {}, _t[field] = { $eq: fieldValue }, _t),
             ],
         };
     if (key == drapcode_constant_1.EQUALS && fieldType === "boolean" && fieldValue)
         return JSON.parse(fieldValue)
-            ? (_t = {},
-                _t[field] = JSON.parse(fieldValue),
-                _t) : {
+            ? (_u = {},
+                _u[field] = JSON.parse(fieldValue),
+                _u) : {
             $or: [
-                (_u = {}, _u[field] = JSON.parse(fieldValue), _u),
-                (_v = {}, _v[field] = { $exists: false }, _v),
+                (_v = {}, _v[field] = JSON.parse(fieldValue), _v),
+                (_w = {}, _w[field] = { $exists: false }, _w),
             ],
         };
     if (key == drapcode_constant_1.EQUALS) {
-        return _w = {},
-            _w[field] = fieldType === "boolean" && fieldValue
+        return _x = {},
+            _x[field] = fieldType === "boolean" && fieldValue
                 ? JSON.parse(fieldValue)
                 : !isNaN(fieldValue)
                     ? +fieldValue
                     : fieldValue,
-            _w;
+            _x;
     }
     if (key == drapcode_constant_1.NOT_EQUAL)
-        return _x = {},
-            _x[field] = {
+        return _y = {},
+            _y[field] = {
                 $ne: fieldType === "boolean" && fieldValue
                     ? JSON.parse(fieldValue)
                     : fieldValue,
             },
-            _x;
+            _y;
     if (key == drapcode_constant_1.BETWEEN) {
-        var _z = exports.getMinMaxValue(fieldValue), startValue = _z.startValue, endValue = _z.endValue, isInteger = _z.isInteger;
-        return _y = {},
-            _y[field] = {
+        var _0 = exports.getMinMaxValue(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
+        return _z = {},
+            _z[field] = {
                 $gte: isInteger ? +startValue : startValue,
                 $lte: isInteger ? +endValue : endValue,
             },
-            _y;
+            _z;
     }
 };
 var isEntityInCondition = function (value) {

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

@@ -126,7 +126,12 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                             _c["_" + key] = toBoolean(value),
                                             _c));
                                     }
-                                    else if (["static_option", "dynamic_option", "reference", "belongsTo"].includes(searchQueryTypeObj[key])) {
+                                    else if ([
+                                        "static_option",
+                                        "dynamic_option",
+                                        "reference",
+                                        "belongsTo",
+                                    ].includes(searchQueryTypeObj[key])) {
                                         // if input is string and db field type is array
                                         aggregateQuery.push({
                                             $addFields: (_d = {},
@@ -422,7 +427,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;
+    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;
     if (currentUser === void 0) { currentUser = {}; }
     var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser);
     var isDate = checkDate(fieldValue);
@@ -443,94 +448,99 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         return _b = {}, _b[field] = { $nin: fieldValue || [] }, _b;
     }
     if (condition && key === drapcode_constant_1.IS_NULL) {
-        return _c = {}, _c[field] = { $type: "array", $eq: [] }, _c;
+        return {
+            $or: [
+                (_c = {}, _c[field] = { $exists: false }, _c),
+                (_d = {}, _d[field] = { $type: "array", $eq: [] }, _d),
+            ],
+        };
     }
     if (condition && key === drapcode_constant_1.IS_NOT_NULL) {
-        return _d = {}, _d[field] = { $exists: true, $type: "array", $ne: [] }, _d;
+        return _e = {}, _e[field] = { $exists: true, $type: "array", $ne: [] }, _e;
     }
     if (key === drapcode_constant_1.IS_NOT_NULL)
-        return _e = {}, _e[field] = { $nin: [null, ""] }, _e;
+        return _f = {}, _f[field] = { $nin: [null, ""] }, _f;
     if (key === drapcode_constant_1.IS_NULL)
-        return _f = {}, _f[field] = { $in: [null, ""] }, _f;
+        return _g = {}, _g[field] = { $in: [null, ""] }, _g;
     if (key === drapcode_constant_1.LIKE)
-        return _g = {}, _g[field] = { $regex: fieldValue, $options: "i" }, _g;
+        return _h = {}, _h[field] = { $regex: fieldValue, $options: "i" }, _h;
     if (key === drapcode_constant_1.GREATER_THAN_EQUALS_TO)
-        return _h = {}, _h[field] = { $gte: isDate ? fieldValue : +fieldValue }, _h;
+        return _j = {}, _j[field] = { $gte: isDate ? fieldValue : +fieldValue }, _j;
     if (key === drapcode_constant_1.LESS_THAN_EQUALS_TO)
-        return _j = {}, _j[field] = { $lte: isDate ? fieldValue : +fieldValue }, _j;
+        return _k = {}, _k[field] = { $lte: isDate ? fieldValue : +fieldValue }, _k;
     if (key === drapcode_constant_1.LESS_THAN)
-        return _k = {}, _k[field] = { $lt: isDate ? fieldValue : +fieldValue }, _k;
+        return _l = {}, _l[field] = { $lt: isDate ? fieldValue : +fieldValue }, _l;
     if (key === drapcode_constant_1.GREATER_THAN)
-        return _l = {}, _l[field] = { $gt: isDate ? fieldValue : +fieldValue }, _l;
+        return _m = {}, _m[field] = { $gt: isDate ? fieldValue : +fieldValue }, _m;
     if (key === drapcode_constant_1.IN_LIST) {
         if (!Array.isArray(fieldValue)) {
             fieldValue = [fieldValue];
         }
-        return _m = {}, _m[field] = { $in: fieldValue || [] }, _m;
+        return _o = {}, _o[field] = { $in: fieldValue || [] }, _o;
     }
     if (key === drapcode_constant_1.NOT_IN_LIST) {
         if (!Array.isArray(fieldValue)) {
             fieldValue = [fieldValue];
         }
-        return _o = {}, _o[field] = { $nin: fieldValue || [] }, _o;
+        return _p = {}, _p[field] = { $nin: fieldValue || [] }, _p;
     }
     if (key === drapcode_constant_1.EQUALS && isDate) {
         if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); }))
-            return _p = {},
-                _p[field] = {
+            return _q = {},
+                _q[field] = {
                     $gte: fieldValue,
                 },
-                _p;
+                _q;
         else
-            return _q = {},
-                _q[field] = {
+            return _r = {},
+                _r[field] = {
                     $gte: fieldValue,
                     $lt: new Date(date_util_1.nextDayDate(fieldValue)),
                 },
-                _q;
+                _r;
     }
     if (key == drapcode_constant_1.EQUALS && field === "createdBy")
         return {
             $and: [
-                (_r = {}, _r[field] = { $ne: null }, _r),
-                (_s = {}, _s[field] = { $ne: "" }, _s),
-                (_t = {}, _t[field] = { $eq: fieldValue }, _t),
+                (_s = {}, _s[field] = { $ne: null }, _s),
+                (_t = {}, _t[field] = { $ne: "" }, _t),
+                (_u = {}, _u[field] = { $eq: fieldValue }, _u),
             ],
         };
     if (key == drapcode_constant_1.EQUALS && fieldType === "boolean" && fieldValue)
         return JSON.parse(fieldValue)
-            ? (_u = {},
-                _u[field] = JSON.parse(fieldValue),
-                _u) : {
+            ? (_v = {},
+                _v[field] = JSON.parse(fieldValue),
+                _v) : {
             $or: [
-                (_v = {}, _v[field] = JSON.parse(fieldValue), _v),
-                (_w = {}, _w[field] = { $exists: false }, _w),
+                (_w = {}, _w[field] = JSON.parse(fieldValue), _w),
+                (_x = {}, _x[field] = { $exists: false }, _x),
             ],
         };
     if (key == drapcode_constant_1.EQUALS)
-        return _x = {},
-            _x[field] = fieldType === "boolean" && fieldValue
+        return _y = {},
+            _y[field] = fieldType === "boolean" && fieldValue
                 ? JSON.parse(fieldValue)
                 : !isNaN(fieldValue)
                     ? +fieldValue
                     : fieldValue,
-            _x;
+            _y;
     if (key == drapcode_constant_1.NOT_EQUAL)
-        return _y = {},
-            _y[field] = {
+        return _z = {},
+            _z[field] = {
                 $ne: fieldType === "boolean" && fieldValue
                     ? JSON.parse(fieldValue)
                     : fieldValue,
             },
-            _y;
+            _z;
     if (key == drapcode_constant_1.BETWEEN) {
-        var _0 = getMinMaxValue(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
-        return _z = {},
-            _z[field] = {
+        var _1 = getMinMaxValue(fieldValue), startValue = _1.startValue, endValue = _1.endValue, isInteger = _1.isInteger;
+        return _0 = {},
+            _0[field] = {
                 $gte: isInteger ? +startValue : startValue,
                 $lte: isInteger ? +endValue : endValue,
             },
-            _z;
+            _0;
     }
 };
 var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser) {

package/package.json

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