drapcode-utility 1.3.0 → 1.3.1

package/build/utils/query-parser.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -35,10 +35,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -49,12 +53,14 @@ var moment_1 = __importDefault(require("moment"));
 var drapcode_constant_1 = require("drapcode-constant");
 var date_util_1 = require("./date-util");
 var util_1 = require("./util");
-var queryParser = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj, currentTenant) {
+var prepare_query_1 = require("./prepare-query");
+var queryParser = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj, currentTenant, lookupConfig) {
     if (currentUser === void 0) { currentUser = {}; }
     if (searchObj === void 0) { searchObj = null; }
     if (refCollectionFieldsInItems === void 0) { refCollectionFieldsInItems = null; }
     if (searchQueryTypeObj === void 0) { searchQueryTypeObj = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
+    if (lookupConfig === void 0) { lookupConfig = []; }
     return __awaiter(void 0, void 0, void 0, function () {
         var filterQuery, aggregateQuery, queryStr, searchQueryObj, _a, searchAggregateQuery, likeQuery, finalQuery, _b, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, offset, limit, direction, str;
         var _c, _d;
@@ -85,7 +91,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         searchQueryObj = null;
                         if (searchObj) {
                             _a = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _a.searchAggregateQuery, likeQuery = _a.likeQuery;
-                            aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
+                            aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
                             console.log("likeQuery after getSearchObjQuery", JSON.stringify(likeQuery));
                             if (likeQuery && likeQuery.length > 0) {
                                 searchQueryObj = likeQuery;
@@ -103,105 +109,25 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     else if (searchObj) {
                         console.log("I donot have filter query");
                         _b = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _b.searchAggregateQuery, likeQuery = _b.likeQuery;
-                        aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
+                        aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
                         if (likeQuery.length) {
-                            // aggregateQuery.push({ $match: { $or: likeQuery } });
                             aggregateQuery.push({ $match: { $and: likeQuery } });
                         }
                     }
                     console.log("aggregateQuery", JSON.stringify(aggregateQuery));
                     console.log("==> query", query);
+                    console.log("lookupConfig", lookupConfig);
                     projection = mongoSelectQuery(query);
                     finder = query.finder, sortBy = query.sortBy, orderBy = query.orderBy;
                     if (!(finder != "COUNT" && refCollectionFieldsInItems)) return [3 /*break*/, 2];
                     return [4 /*yield*/, Promise.all(refCollectionFieldsInItems.map(function (field) {
-                            var _a, _b, _c;
-                            if (["reference", "multi_reference", "belongsTo"].includes(field.type)) {
-                                var collectionName_1 = field.refCollection
-                                    ? field.refCollection["collectionName"]
-                                    : null;
-                                if (collectionName_1) {
-                                    if (field.type === "belongsTo") {
-                                        aggregateQuery.push({
-                                            $lookup: {
-                                                from: "" + collectionName_1,
-                                                localField: field.fieldName,
-                                                foreignField: "uuid",
-                                                as: field.fieldName,
-                                            },
-                                        });
-                                        aggregateQuery.push({
-                                            $addFields: (_a = {},
-                                                _a["_$belongsToMetaData"] = field,
-                                                _a),
-                                        });
-                                    }
-                                    else {
-                                        aggregateQuery.push({
-                                            $lookup: {
-                                                from: "" + collectionName_1,
-                                                let: (_b = {}, _b["" + field.fieldName] = "$" + field.fieldName, _b),
-                                                pipeline: [
-                                                    {
-                                                        $match: {
-                                                            $expr: {
-                                                                $in: [
-                                                                    "$uuid",
-                                                                    {
-                                                                        $cond: {
-                                                                            if: {
-                                                                                $in: ["$$" + field.fieldName, ["", null]],
-                                                                            },
-                                                                            then: [],
-                                                                            else: { $ifNull: ["$$" + field.fieldName, []] },
-                                                                        },
-                                                                    },
-                                                                ],
-                                                            },
-                                                        },
-                                                    },
-                                                    {
-                                                        $lookup: {
-                                                            from: "user",
-                                                            let: { createdBy: "$createdBy" },
-                                                            pipeline: [
-                                                                {
-                                                                    $match: {
-                                                                        $expr: { $eq: ["$uuid", "$$createdBy"] },
-                                                                    },
-                                                                },
-                                                                { $project: { _id: 0, password: 0 } },
-                                                            ],
-                                                            as: "createdBy",
-                                                        },
-                                                    },
-                                                ],
-                                                as: field.fieldName,
-                                            },
-                                        });
-                                    }
-                                }
-                            }
-                            if (field.type === "createdBy")
-                                aggregateQuery.push({
-                                    $lookup: {
-                                        from: "user",
-                                        let: (_c = {}, _c["" + field.fieldName] = "$" + field.fieldName, _c),
-                                        pipeline: [
-                                            {
-                                                $match: { $expr: { $eq: ["$uuid", "$$" + field.fieldName] } },
-                                            },
-                                            { $project: { _id: 0, password: 0 } },
-                                        ],
-                                        as: field.fieldName,
-                                    },
-                                });
+                            return (0, prepare_query_1.commonLookupSetting)(field, lookupConfig, aggregateQuery);
                         }))];
                 case 1:
                     _e.sent();
                     _e.label = 2;
                 case 2:
-                    if (finder != "COUNT" && !util_1.isEmpty(projection)) {
+                    if (finder != "COUNT" && !(0, util_1.isEmpty)(projection)) {
                         aggregateQuery.push({ $project: projection });
                     }
                     if (finder === "COUNT") {
@@ -222,8 +148,8 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     }
                     console.log("==> aggregateQuery", aggregateQuery);
                     console.log("==> aggregateQuery", JSON.stringify(aggregateQuery));
-                    queryStr = ".aggregate(" + JSON.stringify(aggregateQuery) + ", { collation: { locale: \"en\" } })";
-                    str = "req.db.collection('" + collectionName + "')" + queryStr;
+                    queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" } })");
+                    str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
                     str += ".toArray()";
                     return [2 /*return*/, str];
             }
@@ -263,7 +189,7 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser,
                 filterQuery[lastKey].push(mongoQuery);
             }
             else {
-                filterQuery["$or" + index] = [mongoQuery];
+                filterQuery["$or".concat(index)] = [mongoQuery];
             }
         }
         else if (queryObj.conjunctionType == "AND") {
@@ -272,11 +198,11 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser,
                 filterQuery[lastKey].push(mongoQuery);
             }
             else {
-                filterQuery["$and" + index] = [mongoQuery];
+                filterQuery["$and".concat(index)] = [mongoQuery];
             }
         }
         else {
-            filterQuery["$or" + index] = [mongoQuery];
+            filterQuery["$or".concat(index)] = [mongoQuery];
         }
     });
     console.log("==> *** filterQuery mongoFilterQuery :>> ", filterQuery);
@@ -295,15 +221,15 @@ var mongoSelectQuery = function (query) {
     if (fieldsInclude[0] === "*") {
         fieldsExclude.map(function (field) {
             if (field)
-                return (projection["" + field] = 0);
+                return (projection["".concat(field)] = 0);
         });
     }
     else {
         if (["FIND_ALL", "FIND"].includes(finder))
-            fieldsInclude = util_1.processFieldsInlcude(fieldsInclude);
+            fieldsInclude = (0, util_1.processFieldsInlcude)(fieldsInclude);
         fieldsInclude.map(function (field) {
             if (field)
-                return (projection["" + field] = 1);
+                return (projection["".concat(field)] = 1);
         });
     }
     return projection;
@@ -335,7 +261,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         //TODO: In case of this, we assign some random string to avoid resulting all values
         //TODO: This is use case in Spot Factor Project, where a new user with blank value able to see all records
         //TODO: Discussed on meet
-        fieldValue = "random_string_since_field_not_present_" + moment_1.default(1318874398806).valueOf();
+        fieldValue = "random_string_since_field_not_present_".concat((0, moment_1.default)(1318874398806).valueOf());
     }
     console.log("fieldValue queryToMongo 1", fieldValue);
     var isDate = checkDate(fieldValue);
@@ -403,7 +329,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         return _q = {},
             _q[field] = {
                 $gte: fieldValue,
-                $lt: date_util_1.nextDayDate(fieldValue),
+                $lt: (0, date_util_1.nextDayDate)(fieldValue),
             },
             _q;
         // Todo: Remove this if works properly
@@ -459,7 +385,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
             },
             _y;
     if (key == drapcode_constant_1.BETWEEN) {
-        var _0 = exports.getMinMaxValue(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
+        var _0 = (0, exports.getMinMaxValue)(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
         return _z = {},
             _z[field] = {
                 $gte: isInteger ? +startValue : startValue,
@@ -528,13 +454,13 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         return valueList_1;
     }
     if (key === drapcode_constant_1.BETWEEN) {
-        var _a = exports.getMinMaxValue(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
+        var _a = (0, exports.getMinMaxValue)(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
         if (requiredExternal) {
-            startValue_1 = "" + externalParams[startValue_1];
-            endValue_1 = "" + externalParams[endValue_1];
+            startValue_1 = "".concat(externalParams[startValue_1]);
+            endValue_1 = "".concat(externalParams[endValue_1]);
         }
         else {
-            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
                 startValue_1 = getValueOfProjectConstant(startValue_1, currentUser, timezone);
@@ -542,7 +468,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             else {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
-            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) { return endValue_1.includes(cnst); })) {
                 endValue_1 = getValueOfProjectConstant(endValue_1, currentUser, timezone);
             }
             else {
@@ -558,10 +484,10 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         }
         //TODO: Need to figure out the params should be treated as number/string
         if (!isNaN(startValue_1)) {
-            return startValue_1 + "---" + endValue_1 + "^";
+            return "".concat(startValue_1, "---").concat(endValue_1, "^");
         }
         else
-            return startValue_1 + "---" + endValue_1;
+            return "".concat(startValue_1, "---").concat(endValue_1);
     }
     if (value.includes(drapcode_constant_1.CURRENT_USER)) {
         if (value === drapcode_constant_1.CURRENT_USER) {
@@ -652,18 +578,18 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
         return getValueOfProjectConstant(value, {}, timezone);
     }
-    if (exports.isEntityInCondition(value)) {
+    if ((0, exports.isEntityInCondition)(value)) {
         var key_1 = value.replace("ENTITY::", "");
         return externalParams[key_1] ? externalParams[key_1] : "";
     }
     //TODO: This is just to confirm if external then it should be get from externalParams
     if (requiredExternal) {
         //TODO: Value returns from here undefined.
-        var externalParamValue = externalParams["" + value];
+        var externalParamValue = externalParams["".concat(value)];
         if (!isNaN(externalParamValue)) {
             return +externalParamValue;
         }
-        return externalParams["" + value];
+        return externalParams["".concat(value)];
     }
     var constantArr = constants.filter(function (constant) { return constant.name == value; });
     return constantArr.length ? "" + constantArr[0].value : "";
@@ -694,11 +620,11 @@ var getValueOfProjectConstant = function (value, currentUser, timezone) {
     if (value === drapcode_constant_1.CURRENT_USER)
         return currentUser["uuid"];
     if (value === drapcode_constant_1.CURRENT_DATE)
-        result = date_util_1.createLoggerDateFormat(timezone);
+        result = (0, date_util_1.createLoggerDateFormat)(timezone);
     if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
-        result = date_util_1.createLogsDateFormat(timezone);
+        result = (0, date_util_1.createLogsDateFormat)(timezone);
     if (drapcode_constant_1.DateTimeUnit.some(function (cnst) { return value.includes(cnst); }))
-        result = date_util_1.getDateValue(value, timezone);
+        result = (0, date_util_1.getDateValue)(value, timezone);
     return result;
 };
 var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
@@ -714,11 +640,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                     // if input is string and db field type is boolean
                     searchAggregateQuery.push({
                         $addFields: (_b = {},
-                            _b["_" + key] = "$" + key,
+                            _b["_".concat(key)] = "$".concat(key),
                             _b),
                     });
                     likeQuery.push((_c = {},
-                        _c["_" + key] = toBoolean(value),
+                        _c["_".concat(key)] = toBoolean(value),
                         _c));
                 }
                 else if ([
@@ -730,22 +656,22 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                     // if input is string and db field type is array
                     searchAggregateQuery.push({
                         $addFields: (_d = {},
-                            _d["_" + key] = "$" + key,
+                            _d["_".concat(key)] = "$".concat(key),
                             _d),
                     });
                     likeQuery.push((_e = {},
-                        _e["_" + key] = { $all: [value] },
+                        _e["_".concat(key)] = { $all: [value] },
                         _e));
                 }
                 else if (searchQueryTypeKey === "tel") {
                     // handling value when db field type is tel
                     searchAggregateQuery.push({
                         $addFields: (_f = {},
-                            _f["_" + key] = { $toString: "$" + key },
+                            _f["_".concat(key)] = { $toString: "$".concat(key) },
                             _f),
                     });
                     likeQuery.push((_g = {},
-                        _g["_" + key] = {
+                        _g["_".concat(key)] = {
                             $regex: value.startsWith("+") ? value.replace("+", "") : value,
                             $options: "i",
                         },
@@ -755,11 +681,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                     // handling value when db field type is Double/Int
                     searchAggregateQuery.push({
                         $addFields: (_h = {},
-                            _h["_" + key] = { $toString: { $toLong: "$" + key } },
+                            _h["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
                             _h),
                     });
                     likeQuery.push((_j = {},
-                        _j["_" + key] = {
+                        _j["_".concat(key)] = {
                             $regex: value,
                             $options: "i",
                         },
@@ -771,20 +697,20 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                         fieldKey = fieldKey.replace("end_", "");
                         searchAggregateQuery.push({
                             $addFields: (_k = {},
-                                _k["_" + key] = { $toString: "$" + fieldKey },
+                                _k["_".concat(key)] = { $toString: "$".concat(fieldKey) },
                                 _k),
                         });
                         if (key.startsWith("start_")) {
                             likeQuery.push((_l = {},
-                                _l["_" + key] = {
-                                    $gte: date_util_1.timezoneDateParse(value, false, true),
+                                _l["_".concat(key)] = {
+                                    $gte: (0, date_util_1.timezoneDateParse)(value, false, true),
                                 },
                                 _l));
                         }
                         else if (key.startsWith("end_")) {
                             likeQuery.push((_m = {},
-                                _m["_" + key] = {
-                                    $lt: date_util_1.timezoneDateParse(value, true),
+                                _m["_".concat(key)] = {
+                                    $lt: (0, date_util_1.timezoneDateParse)(value, true),
                                 },
                                 _m));
                         }
@@ -795,11 +721,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                     // converting db field to string first
                     searchAggregateQuery.push({
                         $addFields: (_o = {},
-                            _o["_" + key] = { $toString: "$" + key },
+                            _o["_".concat(key)] = { $toString: "$".concat(key) },
                             _o),
                     });
                     likeQuery.push((_p = {},
-                        _p["_" + key] = {
+                        _p["_".concat(key)] = {
                             $regex: value,
                             $options: "i",
                         },

package/build/utils/query-paser-new.d.ts

@@ -1 +1 @@
-export declare const queryParserNew: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj?: any, refCollectionFieldsInItems?: any, searchQueryTypeObj?: any) => Promise<string>;
+export declare const queryParserNew: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj?: any, refCollectionFieldsInItems?: any, searchQueryTypeObj?: any, lookupConfig?: any) => Promise<string>;