drapcode-utility 1.0.5 → 1.0.7

package/build/encryption/index.js

@@ -83,23 +83,25 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
 exports.crypt = crypt;
 var cryptItem = function (item, fields, encryption, decrypt) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
-        Object.keys(item).forEach(function (fieldName) { return __awaiter(void 0, void 0, void 0, function () {
-            var field, _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        field = fields.find(function (field) { return field.fieldName === fieldName; });
-                        if (!(field && field.encrypted)) return [3 /*break*/, 2];
-                        _a = item;
-                        _b = fieldName;
-                        return [4 /*yield*/, cryptData(item[fieldName], encryption, decrypt)];
-                    case 1:
-                        _a[_b] = _c.sent();
-                        _c.label = 2;
-                    case 2: return [2 /*return*/];
-                }
-            });
-        }); });
+        if (item && typeof item === "object") {
+            Object.keys(item).forEach(function (fieldName) { return __awaiter(void 0, void 0, void 0, function () {
+                var field, _a, _b;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            field = fields.find(function (field) { return field.fieldName === fieldName; });
+                            if (!(field && field.encrypted)) return [3 /*break*/, 2];
+                            _a = item;
+                            _b = fieldName;
+                            return [4 /*yield*/, cryptData(item[fieldName], encryption, decrypt)];
+                        case 1:
+                            _a[_b] = _c.sent();
+                            _c.label = 2;
+                        case 2: return [2 /*return*/];
+                    }
+                });
+            }); });
+        }
         return [2 /*return*/, item];
     });
 }); };

package/build/errors/app-error.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/errors/bad-request-error.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/errors/custom-error.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/errors/not-found.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/utils/check-error.js

@@ -35,12 +35,10 @@ 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 __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -183,7 +181,7 @@ var nestedValue = function (data, messages) {
             messages.push(value);
         }
         else if (Array.isArray(value)) {
-            messages = __spreadArrays(messages, value);
+            messages = __spreadArray(__spreadArray([], messages), value);
         }
         else {
             if (Object.keys(value).length) {

package/build/utils/date-util.js

@@ -87,22 +87,24 @@ var timezoneDateParse = function (value, nextDay, prevDay) {
 };
 exports.timezoneDateParse = timezoneDateParse;
 var formatItemDates = function (item, fields, dateFormat, reverse) {
-    var dateFormat1 = reverse ? dateFormat : "YYYY-MM-DD";
-    var dateFormat2 = reverse ? "YYYY-MM-DD" : dateFormat;
-    Object.keys(item).forEach(function (fieldName) {
-        var _a;
-        var field = fields.find(function (field) { return field.fieldName === fieldName; });
-        if (field && (field === null || field === void 0 ? void 0 : field.type) === "date") {
-            if (moment(item[fieldName]).isValid()) {
-                item[fieldName] =
-                    ((_a = field === null || field === void 0 ? void 0 : field.extraFieldSetting) === null || _a === void 0 ? void 0 : _a.dateDisplayType) === "datetime-local"
-                        ? item[fieldName]
-                        : moment(item[fieldName], dateFormat1).format(dateFormat2);
+    if (item && typeof item === "object") {
+        var dateFormat1_1 = reverse ? dateFormat : "YYYY-MM-DD";
+        var dateFormat2_1 = reverse ? "YYYY-MM-DD" : dateFormat;
+        Object.keys(item).forEach(function (fieldName) {
+            var _a;
+            var field = fields.find(function (field) { return field.fieldName === fieldName; });
+            if (field && (field === null || field === void 0 ? void 0 : field.type) === "date") {
+                if (moment(item[fieldName]).isValid()) {
+                    item[fieldName] =
+                        ((_a = field === null || field === void 0 ? void 0 : field.extraFieldSetting) === null || _a === void 0 ? void 0 : _a.dateDisplayType) === "datetime-local"
+                            ? item[fieldName]
+                            : moment(item[fieldName], dateFormat1_1).format(dateFormat2_1);
+                }
+                else
+                    item[fieldName] = "";
             }
-            else
-                item[fieldName] = "";
-        }
-    });
+        });
+    }
     return item;
 };
 var formatProjectDates = function (item, dateFormat, fields, reverse) {

package/build/utils/query-parser.js

@@ -35,12 +35,10 @@ 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 __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -87,7 +85,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 = __spreadArrays(aggregateQuery, searchAggregateQuery);
+                            aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
                             console.log("likeQuery after getSearchObjQuery", JSON.stringify(likeQuery));
                             if (likeQuery && likeQuery.length > 0) {
                                 searchQueryObj = likeQuery;
@@ -105,7 +103,7 @@ 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 = __spreadArrays(aggregateQuery, searchAggregateQuery);
+                        aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
                         if (likeQuery.length) {
                             // aggregateQuery.push({ $match: { $or: likeQuery } });
                             aggregateQuery.push({ $match: { $and: likeQuery } });
@@ -510,7 +508,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             endValue_1 = "" + externalParams[endValue_1];
         }
         else {
-            if (__spreadArrays([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
                 startValue_1 = getValueOfProjectConstant(startValue_1, currentUser, timezone);
@@ -518,7 +516,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             else {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
-            if (__spreadArrays([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).some(function (cnst) { return endValue_1.includes(cnst); })) {
                 endValue_1 = getValueOfProjectConstant(endValue_1, currentUser, timezone);
             }
             else {

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

@@ -35,12 +35,10 @@ 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 __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+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;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryParserNew = void 0;
@@ -569,7 +567,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             endValue_1 = "" + externalParams[endValue_1];
         }
         else {
-            if (__spreadArrays([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
                 startValue_1 = getValueOfProjectConstant(startValue_1, currentUser);
@@ -577,7 +575,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             else {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
-            if (__spreadArrays([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).some(function (cnst) { return endValue_1.includes(cnst); })) {
                 endValue_1 = getValueOfProjectConstant(endValue_1, currentUser);
             }
             else {

package/build/utils/util.d.ts

@@ -25,3 +25,4 @@ export declare const parseJsonString: (str: string) => any;
 export declare const parseValueFromData: (data: any, fieldName: string) => any;
 export declare const unflattenObject: (obj: any) => {};
 export declare const replaceTransferObjectValueIntoExpression: (expression: string, transferObject: any) => string;
+export declare const removeMongoDbId: (result: any[]) => any[];

package/build/utils/util.js

@@ -1,9 +1,31 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceTransferObjectValueIntoExpression = exports.unflattenObject = exports.parseValueFromData = exports.parseJsonString = exports.replaceDataValueIntoExpression = exports.formatCustomCSSClasses = exports.validateAlphanumericString = exports.convertItemToArray = exports.arraysEqual = exports.checkAndCompareValue = exports.restructureData = exports.formatCollectionAndFieldName = exports.cleanCollectionAndFieldName = exports.stringToExpression = exports.expressionToString = exports.getSpecialCharectorReplacedExpression = exports.validateUuidString = exports.validateEmail = exports.snakeCaseToTitleCase = exports.dynamicSort = exports.checkValidArray = exports.isObject = exports.isEmptyObject = exports.isEmpty = exports.clearSpaceAndReformat = exports.camelize = exports.validateString = void 0;
+exports.removeMongoDbId = exports.replaceTransferObjectValueIntoExpression = exports.unflattenObject = exports.parseValueFromData = exports.parseJsonString = exports.replaceDataValueIntoExpression = exports.formatCustomCSSClasses = exports.validateAlphanumericString = exports.convertItemToArray = exports.arraysEqual = exports.checkAndCompareValue = exports.restructureData = exports.formatCollectionAndFieldName = exports.cleanCollectionAndFieldName = exports.stringToExpression = exports.expressionToString = exports.getSpecialCharectorReplacedExpression = exports.validateUuidString = exports.validateEmail = exports.snakeCaseToTitleCase = exports.dynamicSort = exports.checkValidArray = exports.isObject = exports.isEmptyObject = exports.isEmpty = exports.clearSpaceAndReformat = exports.camelize = exports.validateString = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var validateString = function (str) {
     var specialChar = /[`!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/;
@@ -373,3 +395,27 @@ var replaceTransferObjectValueIntoExpression = function (expression, transferObj
     return expression;
 };
 exports.replaceTransferObjectValueIntoExpression = replaceTransferObjectValueIntoExpression;
+var removeMongoDbId = function (result) {
+    var removeIdRecursively = function (obj) {
+        if (Array.isArray(obj)) {
+            return obj.map(removeIdRecursively);
+        }
+        if (typeof obj === "object" && obj !== null) {
+            for (var key in obj) {
+                if (key === "_id") {
+                    delete obj[key];
+                }
+                else {
+                    obj[key] = removeIdRecursively(obj[key]);
+                }
+            }
+        }
+        return obj;
+    };
+    var moveUuidToTopLevel = function (obj) {
+        var uuid = obj.uuid, rest = __rest(obj, ["uuid"]);
+        return __assign({ uuid: uuid }, removeIdRecursively(rest));
+    };
+    return result.map(moveUuidToTopLevel);
+};
+exports.removeMongoDbId = removeMongoDbId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -31,7 +31,7 @@
     "@types/voca": "^1.4.2",
     "aws-sdk": "^2.1324.0",
     "axios": "^1.1.2",
-    "drapcode-constant": "^1.1.2",
+    "drapcode-constant": "^1.1.3",
     "drapcode-logger": "^1.0.0",
     "drapcode-redis": "^1.0.0",
     "express": "^4.17.1",