drapcode-utility 1.1.4 → 1.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/build/encryption/index.d.ts +2 -2
  2. package/build/encryption/index.js +2 -2
  3. package/build/index.js +1 -5
  4. package/build/middlewares/api-limiter.js +1 -1
  5. package/build/middlewares/error-logger.js +6 -6
  6. package/build/middlewares/interceptor-logger-new.js +6 -6
  7. package/build/middlewares/interceptor-logger.js +3 -3
  8. package/build/middlewares/redis/request-log.js +4 -4
  9. package/build/utils/check-error.js +8 -12
  10. package/build/utils/date-util.js +4 -4
  11. package/build/utils/query-parser.js +53 -57
  12. package/build/utils/query-paser-new.js +48 -52
  13. package/build/utils/util.d.ts +1 -1
  14. package/build/utils/util.js +11 -11
  15. package/build/utils/uuid-generator.js +2 -2
  16. package/package.json +4 -4
package/build/encryption/index.d.ts CHANGED
@@ -1,9 +1,9 @@
1
- type AwsConfig = {
1
+ declare type AwsConfig = {
2
2
  accessKeyId: string;
3
3
  secretAccessKey: string;
4
4
  region: string;
5
5
  };
6
- type Encryption = {
6
+ declare type Encryption = {
7
7
  encryptionType: string;
8
8
  algorithm: string;
9
9
  key: string;
package/build/encryption/index.js CHANGED
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
17
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
17
+ while (_) try {
18
18
  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;
19
19
  if (y = 0, t) op = [op[0] & 2, t.value];
20
20
  switch (op[0]) {
@@ -58,7 +58,7 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
58
58
  secretAccessKey: secretAccessKey,
59
59
  },
60
60
  };
61
- return [4 /*yield*/, (0, exports.decryptDataKey)(encryption.key, config)];
61
+ return [4 /*yield*/, exports.decryptDataKey(encryption.key, config)];
62
62
  case 1:
63
63
  key = _b.sent();
64
64
  encryption.key = key.toString("base64");
package/build/index.js CHANGED
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
9
5
  }) : (function(o, m, k, k2) {
10
6
  if (k2 === undefined) k2 = k;
11
7
  o[k2] = m[k];
package/build/middlewares/api-limiter.js CHANGED
@@ -14,7 +14,7 @@ exports.apiLimiter = rateLimit({
14
14
  req.socket.remoteAddress ||
15
15
  (req.connection.socket ? req.connection.socket.remoteAddress : null);
16
16
  var key = Array.isArray(subdomains) && subdomains.length
17
- ? "".concat(ip, "-").concat(subdomains[1])
17
+ ? ip + "-" + subdomains[1]
18
18
  : ip;
19
19
  return key;
20
20
  },
package/build/middlewares/error-logger.js CHANGED
@@ -32,16 +32,16 @@ var errorLogger = function (err, req, res, next) {
32
32
  var originalUrl = req.originalUrl, method = req.method, body = req.body, params = req.params, query = req.query, db = req.db, projectName = req.projectName, projectId = req.projectId, ip = req.ip;
33
33
  var PreviouseFilePath;
34
34
  if (projectName) {
35
- loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
36
- PreviouseFilePath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
35
+ loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat() + "/output";
36
+ PreviouseFilePath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
37
37
  }
38
38
  else if (projectId) {
39
- loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
40
- PreviouseFilePath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
39
+ loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat() + "/output";
40
+ PreviouseFilePath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
41
41
  }
42
42
  else {
43
- loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
44
- PreviouseFilePath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
43
+ loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat() + "/output";
44
+ PreviouseFilePath = loggerPath + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
45
45
  }
46
46
  if (fs_1.default.existsSync(PreviouseFilePath)) {
47
47
  fs_1.default.rmSync(PreviouseFilePath, { recursive: true, force: true });
package/build/middlewares/interceptor-logger-new.js CHANGED
@@ -28,16 +28,16 @@ var interceptLoggerNew = function (req, res, next) {
28
28
  }
29
29
  var PreviouseFilePath;
30
30
  if (projectName) {
31
- loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
32
- PreviouseFilePath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
31
+ loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat() + "/output";
32
+ PreviouseFilePath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
33
33
  }
34
34
  else if (projectId) {
35
- loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
36
- PreviouseFilePath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
35
+ loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat() + "/output";
36
+ PreviouseFilePath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
37
37
  }
38
38
  else {
39
- loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
40
- PreviouseFilePath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
39
+ loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat() + "/output";
40
+ PreviouseFilePath = loggerPath + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
41
41
  }
42
42
  if (fs_1.default.existsSync(PreviouseFilePath)) {
43
43
  fs_1.default.rmSync(PreviouseFilePath, { recursive: true, force: true });
package/build/middlewares/interceptor-logger.js CHANGED
@@ -22,13 +22,13 @@ var interceptLogger = function (req, res, next) {
22
22
  reqObject["dbName"] = db.name;
23
23
  }
24
24
  if (projectName) {
25
- loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)());
25
+ loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat();
26
26
  }
27
27
  else if (projectId) {
28
- loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)());
28
+ loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat();
29
29
  }
30
30
  else {
31
- loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)());
31
+ loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat();
32
32
  }
33
33
  var logger = new drapcode_logger_1.FileLogger(loggerPath).createLogger();
34
34
  var oldSend = res.send;
package/build/middlewares/redis/request-log.js CHANGED
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
17
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
17
+ while (_) try {
18
18
  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;
19
19
  if (y = 0, t) op = [op[0] & 2, t.value];
20
20
  switch (op[0]) {
@@ -47,7 +47,7 @@ var saveRequest = function (req, res) {
47
47
  return __generator(this, function (_a) {
48
48
  switch (_a.label) {
49
49
  case 0:
50
- req.body = (0, util_1.isEmpty)(req.body) ? req.query : req.body;
50
+ req.body = util_1.isEmpty(req.body) ? req.query : req.body;
51
51
  ip = req.headers["x-forwarded-for"] ||
52
52
  req.connection.remoteAddress ||
53
53
  req.socket.remoteAddress ||
@@ -62,13 +62,13 @@ var saveRequest = function (req, res) {
62
62
  response: JSON.stringify(res),
63
63
  ipAddress: ip,
64
64
  };
65
- return [4 /*yield*/, (0, drapcode_redis_1.redis_get_method)("requestLog")];
65
+ return [4 /*yield*/, drapcode_redis_1.redis_get_method("requestLog")];
66
66
  case 1:
67
67
  redisData = _a.sent();
68
68
  if (!redisData)
69
69
  redisData = [];
70
70
  redisData.push(respObj);
71
- return [4 /*yield*/, (0, drapcode_redis_1.redis_set_method)("requestLog", redisData)];
71
+ return [4 /*yield*/, drapcode_redis_1.redis_set_method("requestLog", redisData)];
72
72
  case 2:
73
73
  _a.sent();
74
74
  return [2 /*return*/];
package/build/utils/check-error.js CHANGED
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
17
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
17
+ while (_) try {
18
18
  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;
19
19
  if (y = 0, t) op = [op[0] & 2, t.value];
20
20
  switch (op[0]) {
@@ -35,14 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
35
35
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
36
  }
37
37
  };
38
- var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
39
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
40
- if (ar || !(i in from)) {
41
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
42
- ar[i] = from[i];
43
- }
44
- }
45
- return to.concat(ar || Array.prototype.slice.call(from));
38
+ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
39
+ for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
40
+ to[j] = from[i];
41
+ return to;
46
42
  };
47
43
  var __importDefault = (this && this.__importDefault) || function (mod) {
48
44
  return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -118,7 +114,7 @@ var handleMultErrorConfig = function (error, result, status) {
118
114
  var apiErrorMessage;
119
115
  var apiErrorValue;
120
116
  if (result && result !== "undefined" && result !== "null") {
121
- console.log("handleMultErrorConfig result :>> ".concat(Object.keys(result)));
117
+ console.log("handleMultErrorConfig result :>> " + Object.keys(result));
122
118
  apiErrorMessage = lodash_1.default.get(result, message);
123
119
  if (apiErrorMessage) {
124
120
  console.log("*** utility 3 ***");
@@ -148,7 +144,7 @@ var handleMultErrorConfig = function (error, result, status) {
148
144
  apiErrorValue = status;
149
145
  }
150
146
  console.log("apiErrorValue", apiErrorValue);
151
- apiErrorValue = "".concat(apiErrorValue);
147
+ apiErrorValue = "" + apiErrorValue;
152
148
  console.log("apiErrorMessage", apiErrorMessage);
153
149
  console.log("apiErrorValue", apiErrorValue);
154
150
  if (value && apiErrorValue == value) {
@@ -185,7 +181,7 @@ var nestedValue = function (data, messages) {
185
181
  messages.push(value);
186
182
  }
187
183
  else if (Array.isArray(value)) {
188
- messages = __spreadArray(__spreadArray([], messages, true), value, true);
184
+ messages = __spreadArray(__spreadArray([], messages), value);
189
185
  }
190
186
  else {
191
187
  if (Object.keys(value).length) {
package/build/utils/date-util.js CHANGED
@@ -29,11 +29,11 @@ exports.createLogsDateFormat = createLogsDateFormat;
29
29
  var getDateValue = function (value, timezone) {
30
30
  if (timezone === void 0) { timezone = ""; }
31
31
  if (!value)
32
- return (0, exports.createLogsDateFormat)(timezone);
32
+ return exports.createLogsDateFormat(timezone);
33
33
  var dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
34
34
  var _a = value.split(":"), type = _a[0], number = _a[1], unit = _a[2];
35
35
  if (!["ADD", "SUB"].includes(type))
36
- return (0, exports.createLogsDateFormat)(timezone);
36
+ return exports.createLogsDateFormat(timezone);
37
37
  var dateUnit = getDateUnit(unit);
38
38
  var result;
39
39
  if (type === "ADD") {
@@ -80,7 +80,7 @@ var timezoneDateParse = function (value, nextDay, prevDay) {
80
80
  if (prevDay && value.length <= 10) {
81
81
  timeZoneDate = timeZoneDate.subtract(1, "days");
82
82
  }
83
- console.log("If it was for end date ".concat(nextDay, " then"), timeZoneDate);
83
+ console.log("If it was for end date " + nextDay + " then", timeZoneDate);
84
84
  timeZoneDate = timeZoneDate.format("YYYY-MM-DDTHH:mm:ss");
85
85
  console.log("Format Date into date string", timeZoneDate);
86
86
  return new Date(timeZoneDate);
@@ -94,7 +94,7 @@ var formatItemDates = function (item, fields, dateFormat, reverse) {
94
94
  var _a;
95
95
  var field = fields.find(function (field) { return field.fieldName === fieldName; });
96
96
  if (field && (field === null || field === void 0 ? void 0 : field.type) === "date") {
97
- if (moment(item[fieldName]).isValid()) {
97
+ if (moment(item[fieldName], dateFormat1_1).isValid()) {
98
98
  item[fieldName] =
99
99
  ((_a = field === null || field === void 0 ? void 0 : field.extraFieldSetting) === null || _a === void 0 ? void 0 : _a.dateDisplayType) === "datetime-local"
100
100
  ? item[fieldName]
package/build/utils/query-parser.js CHANGED
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
17
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
17
+ while (_) try {
18
18
  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;
19
19
  if (y = 0, t) op = [op[0] & 2, t.value];
20
20
  switch (op[0]) {
@@ -35,14 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
35
35
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
36
  }
37
37
  };
38
- var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
39
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
40
- if (ar || !(i in from)) {
41
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
42
- ar[i] = from[i];
43
- }
44
- }
45
- return to.concat(ar || Array.prototype.slice.call(from));
38
+ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
39
+ for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
40
+ to[j] = from[i];
41
+ return to;
46
42
  };
47
43
  var __importDefault = (this && this.__importDefault) || function (mod) {
48
44
  return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -89,7 +85,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
89
85
  searchQueryObj = null;
90
86
  if (searchObj) {
91
87
  _a = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _a.searchAggregateQuery, likeQuery = _a.likeQuery;
92
- aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
88
+ aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
93
89
  console.log("likeQuery after getSearchObjQuery", JSON.stringify(likeQuery));
94
90
  if (likeQuery && likeQuery.length > 0) {
95
91
  searchQueryObj = likeQuery;
@@ -107,7 +103,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
107
103
  else if (searchObj) {
108
104
  console.log("I donot have filter query");
109
105
  _b = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _b.searchAggregateQuery, likeQuery = _b.likeQuery;
110
- aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
106
+ aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
111
107
  if (likeQuery.length) {
112
108
  // aggregateQuery.push({ $match: { $or: likeQuery } });
113
109
  aggregateQuery.push({ $match: { $and: likeQuery } });
@@ -128,7 +124,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
128
124
  if (field.type === "belongsTo") {
129
125
  aggregateQuery.push({
130
126
  $lookup: {
131
- from: "".concat(collectionName_1),
127
+ from: "" + collectionName_1,
132
128
  localField: field.fieldName,
133
129
  foreignField: "uuid",
134
130
  as: field.fieldName,
@@ -143,8 +139,8 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
143
139
  else {
144
140
  aggregateQuery.push({
145
141
  $lookup: {
146
- from: "".concat(collectionName_1),
147
- let: (_b = {}, _b["".concat(field.fieldName)] = "$".concat(field.fieldName), _b),
142
+ from: "" + collectionName_1,
143
+ let: (_b = {}, _b["" + field.fieldName] = "$" + field.fieldName, _b),
148
144
  pipeline: [
149
145
  {
150
146
  $match: {
@@ -154,10 +150,10 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
154
150
  {
155
151
  $cond: {
156
152
  if: {
157
- $in: ["$$".concat(field.fieldName), ["", null]],
153
+ $in: ["$$" + field.fieldName, ["", null]],
158
154
  },
159
155
  then: [],
160
- else: { $ifNull: ["$$".concat(field.fieldName), []] },
156
+ else: { $ifNull: ["$$" + field.fieldName, []] },
161
157
  },
162
158
  },
163
159
  ],
@@ -190,10 +186,10 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
190
186
  aggregateQuery.push({
191
187
  $lookup: {
192
188
  from: "user",
193
- let: (_c = {}, _c["".concat(field.fieldName)] = "$".concat(field.fieldName), _c),
189
+ let: (_c = {}, _c["" + field.fieldName] = "$" + field.fieldName, _c),
194
190
  pipeline: [
195
191
  {
196
- $match: { $expr: { $eq: ["$uuid", "$$".concat(field.fieldName)] } },
192
+ $match: { $expr: { $eq: ["$uuid", "$$" + field.fieldName] } },
197
193
  },
198
194
  { $project: { _id: 0, password: 0 } },
199
195
  ],
@@ -205,7 +201,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
205
201
  _e.sent();
206
202
  _e.label = 2;
207
203
  case 2:
208
- if (finder != "COUNT" && !(0, util_1.isEmpty)(projection)) {
204
+ if (finder != "COUNT" && !util_1.isEmpty(projection)) {
209
205
  aggregateQuery.push({ $project: projection });
210
206
  }
211
207
  if (finder === "COUNT") {
@@ -226,8 +222,8 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
226
222
  }
227
223
  console.log("==> aggregateQuery", aggregateQuery);
228
224
  console.log("==> aggregateQuery", JSON.stringify(aggregateQuery));
229
- queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" } })");
230
- str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
225
+ queryStr = ".aggregate(" + JSON.stringify(aggregateQuery) + ", { collation: { locale: \"en\" } })";
226
+ str = "req.db.collection('" + collectionName + "')" + queryStr;
231
227
  str += ".toArray()";
232
228
  return [2 /*return*/, str];
233
229
  }
@@ -267,7 +263,7 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser,
267
263
  filterQuery[lastKey].push(mongoQuery);
268
264
  }
269
265
  else {
270
- filterQuery["$or".concat(index)] = [mongoQuery];
266
+ filterQuery["$or" + index] = [mongoQuery];
271
267
  }
272
268
  }
273
269
  else if (queryObj.conjunctionType == "AND") {
@@ -276,11 +272,11 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser,
276
272
  filterQuery[lastKey].push(mongoQuery);
277
273
  }
278
274
  else {
279
- filterQuery["$and".concat(index)] = [mongoQuery];
275
+ filterQuery["$and" + index] = [mongoQuery];
280
276
  }
281
277
  }
282
278
  else {
283
- filterQuery["$or".concat(index)] = [mongoQuery];
279
+ filterQuery["$or" + index] = [mongoQuery];
284
280
  }
285
281
  });
286
282
  console.log("==> *** filterQuery mongoFilterQuery :>> ", filterQuery);
@@ -299,13 +295,13 @@ var mongoSelectQuery = function (query) {
299
295
  if (fieldsInclude[0] === "*") {
300
296
  fieldsExclude.map(function (field) {
301
297
  if (field)
302
- return (projection["".concat(field)] = 0);
298
+ return (projection["" + field] = 0);
303
299
  });
304
300
  }
305
301
  else {
306
302
  fieldsInclude.map(function (field) {
307
303
  if (field)
308
- return (projection["".concat(field)] = 1);
304
+ return (projection["" + field] = 1);
309
305
  });
310
306
  }
311
307
  return projection;
@@ -337,7 +333,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
337
333
  //TODO: In case of this, we assign some random string to avoid resulting all values
338
334
  //TODO: This is use case in Spot Factor Project, where a new user with blank value able to see all records
339
335
  //TODO: Discussed on meet
340
- fieldValue = "random_string_since_field_not_present_".concat((0, moment_1.default)(1318874398806).valueOf());
336
+ fieldValue = "random_string_since_field_not_present_" + moment_1.default(1318874398806).valueOf();
341
337
  }
342
338
  console.log("fieldValue queryToMongo 1", fieldValue);
343
339
  var isDate = checkDate(fieldValue);
@@ -405,7 +401,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
405
401
  return _q = {},
406
402
  _q[field] = {
407
403
  $gte: fieldValue,
408
- $lt: (0, date_util_1.nextDayDate)(fieldValue),
404
+ $lt: date_util_1.nextDayDate(fieldValue),
409
405
  },
410
406
  _q;
411
407
  // Todo: Remove this if works properly
@@ -461,7 +457,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
461
457
  },
462
458
  _y;
463
459
  if (key == drapcode_constant_1.BETWEEN) {
464
- var _0 = (0, exports.getMinMaxValue)(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
460
+ var _0 = exports.getMinMaxValue(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
465
461
  return _z = {},
466
462
  _z[field] = {
467
463
  $gte: isInteger ? +startValue : startValue,
@@ -511,13 +507,13 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
511
507
  return valueList_1;
512
508
  }
513
509
  if (key === drapcode_constant_1.BETWEEN) {
514
- var _a = (0, exports.getMinMaxValue)(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
510
+ var _a = exports.getMinMaxValue(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
515
511
  if (requiredExternal) {
516
- startValue_1 = "".concat(externalParams[startValue_1]);
517
- endValue_1 = "".concat(externalParams[endValue_1]);
512
+ startValue_1 = "" + externalParams[startValue_1];
513
+ endValue_1 = "" + externalParams[endValue_1];
518
514
  }
519
515
  else {
520
- if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) {
516
+ if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
521
517
  return startValue_1.includes(cnst);
522
518
  })) {
523
519
  startValue_1 = getValueOfProjectConstant(startValue_1, currentUser, timezone);
@@ -525,7 +521,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
525
521
  else {
526
522
  startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
527
523
  }
528
- if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) { return endValue_1.includes(cnst); })) {
524
+ if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
529
525
  endValue_1 = getValueOfProjectConstant(endValue_1, currentUser, timezone);
530
526
  }
531
527
  else {
@@ -541,10 +537,10 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
541
537
  }
542
538
  //TODO: Need to figure out the params should be treated as number/string
543
539
  if (!isNaN(startValue_1)) {
544
- return "".concat(startValue_1, "---").concat(endValue_1, "^");
540
+ return startValue_1 + "---" + endValue_1 + "^";
545
541
  }
546
542
  else
547
- return "".concat(startValue_1, "---").concat(endValue_1);
543
+ return startValue_1 + "---" + endValue_1;
548
544
  }
549
545
  console.log("==> value", value);
550
546
  console.log("==> currentUser", currentUser);
@@ -640,18 +636,18 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
640
636
  if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
641
637
  return getValueOfProjectConstant(value, {}, timezone);
642
638
  }
643
- if ((0, exports.isEntityInCondition)(value)) {
639
+ if (exports.isEntityInCondition(value)) {
644
640
  var key_1 = value.replace("ENTITY::", "");
645
641
  return externalParams[key_1] ? externalParams[key_1] : "";
646
642
  }
647
643
  //TODO: This is just to confirm if external then it should be get from externalParams
648
644
  if (requiredExternal) {
649
645
  //TODO: Value returns from here undefined.
650
- var externalParamValue = externalParams["".concat(value)];
646
+ var externalParamValue = externalParams["" + value];
651
647
  if (!isNaN(externalParamValue)) {
652
648
  return +externalParamValue;
653
649
  }
654
- return externalParams["".concat(value)];
650
+ return externalParams["" + value];
655
651
  }
656
652
  var constantArr = constants.filter(function (constant) { return constant.name == value; });
657
653
  return constantArr.length ? "" + constantArr[0].value : "";
@@ -682,11 +678,11 @@ var getValueOfProjectConstant = function (value, currentUser, timezone) {
682
678
  if (value === drapcode_constant_1.CURRENT_USER)
683
679
  return currentUser["uuid"];
684
680
  if (value === drapcode_constant_1.CURRENT_DATE)
685
- result = (0, date_util_1.createLoggerDateFormat)(timezone);
681
+ result = date_util_1.createLoggerDateFormat(timezone);
686
682
  if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
687
- result = (0, date_util_1.createLogsDateFormat)(timezone);
683
+ result = date_util_1.createLogsDateFormat(timezone);
688
684
  if (drapcode_constant_1.DateTimeUnit.some(function (cnst) { return value.includes(cnst); }))
689
- result = (0, date_util_1.getDateValue)(value, timezone);
685
+ result = date_util_1.getDateValue(value, timezone);
690
686
  return result;
691
687
  };
692
688
  var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
@@ -702,11 +698,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
702
698
  // if input is string and db field type is boolean
703
699
  searchAggregateQuery.push({
704
700
  $addFields: (_b = {},
705
- _b["_".concat(key)] = "$".concat(key),
701
+ _b["_" + key] = "$" + key,
706
702
  _b),
707
703
  });
708
704
  likeQuery.push((_c = {},
709
- _c["_".concat(key)] = toBoolean(value),
705
+ _c["_" + key] = toBoolean(value),
710
706
  _c));
711
707
  }
712
708
  else if ([
@@ -718,22 +714,22 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
718
714
  // if input is string and db field type is array
719
715
  searchAggregateQuery.push({
720
716
  $addFields: (_d = {},
721
- _d["_".concat(key)] = "$".concat(key),
717
+ _d["_" + key] = "$" + key,
722
718
  _d),
723
719
  });
724
720
  likeQuery.push((_e = {},
725
- _e["_".concat(key)] = { $all: [value] },
721
+ _e["_" + key] = { $all: [value] },
726
722
  _e));
727
723
  }
728
724
  else if (searchQueryTypeKey === "tel") {
729
725
  // handling value when db field type is tel
730
726
  searchAggregateQuery.push({
731
727
  $addFields: (_f = {},
732
- _f["_".concat(key)] = { $toString: "$".concat(key) },
728
+ _f["_" + key] = { $toString: "$" + key },
733
729
  _f),
734
730
  });
735
731
  likeQuery.push((_g = {},
736
- _g["_".concat(key)] = {
732
+ _g["_" + key] = {
737
733
  $regex: value.startsWith("+") ? value.replace("+", "") : value,
738
734
  $options: "i",
739
735
  },
@@ -743,11 +739,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
743
739
  // handling value when db field type is Double/Int
744
740
  searchAggregateQuery.push({
745
741
  $addFields: (_h = {},
746
- _h["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
742
+ _h["_" + key] = { $toString: { $toLong: "$" + key } },
747
743
  _h),
748
744
  });
749
745
  likeQuery.push((_j = {},
750
- _j["_".concat(key)] = {
746
+ _j["_" + key] = {
751
747
  $regex: value,
752
748
  $options: "i",
753
749
  },
@@ -759,20 +755,20 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
759
755
  fieldKey = fieldKey.replace("end_", "");
760
756
  searchAggregateQuery.push({
761
757
  $addFields: (_k = {},
762
- _k["_".concat(key)] = { $toString: "$".concat(fieldKey) },
758
+ _k["_" + key] = { $toString: "$" + fieldKey },
763
759
  _k),
764
760
  });
765
761
  if (key.startsWith("start_")) {
766
762
  likeQuery.push((_l = {},
767
- _l["_".concat(key)] = {
768
- $gte: (0, date_util_1.timezoneDateParse)(value, false, true),
763
+ _l["_" + key] = {
764
+ $gte: date_util_1.timezoneDateParse(value, false, true),
769
765
  },
770
766
  _l));
771
767
  }
772
768
  else if (key.startsWith("end_")) {
773
769
  likeQuery.push((_m = {},
774
- _m["_".concat(key)] = {
775
- $lt: (0, date_util_1.timezoneDateParse)(value, true),
770
+ _m["_" + key] = {
771
+ $lt: date_util_1.timezoneDateParse(value, true),
776
772
  },
777
773
  _m));
778
774
  }
@@ -783,11 +779,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
783
779
  // converting db field to string first
784
780
  searchAggregateQuery.push({
785
781
  $addFields: (_o = {},
786
- _o["_".concat(key)] = { $toString: "$".concat(key) },
782
+ _o["_" + key] = { $toString: "$" + key },
787
783
  _o),
788
784
  });
789
785
  likeQuery.push((_p = {},
790
- _p["_".concat(key)] = {
786
+ _p["_" + key] = {
791
787
  $regex: value,
792
788
  $options: "i",
793
789
  },
package/build/utils/query-paser-new.js CHANGED
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
17
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
17
+ while (_) try {
18
18
  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;
19
19
  if (y = 0, t) op = [op[0] & 2, t.value];
20
20
  switch (op[0]) {
@@ -35,14 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
35
35
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
36
  }
37
37
  };
38
- var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
39
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
40
- if (ar || !(i in from)) {
41
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
42
- ar[i] = from[i];
43
- }
44
- }
45
- return to.concat(ar || Array.prototype.slice.call(from));
38
+ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
39
+ for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
40
+ to[j] = from[i];
41
+ return to;
46
42
  };
47
43
  Object.defineProperty(exports, "__esModule", { value: true });
48
44
  exports.queryParserNew = void 0;
@@ -85,11 +81,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
85
81
  if (searchQueryTypeObj[key]) {
86
82
  aggregateQuery.push({
87
83
  $addFields: (_b = {},
88
- _b["_".concat(key)] = { $toString: "$".concat(key) },
84
+ _b["_" + key] = { $toString: "$" + key },
89
85
  _b),
90
86
  });
91
87
  searchQueryObj_1.push((_c = {},
92
- _c["_".concat(key)] = {
88
+ _c["_" + key] = {
93
89
  $regex: value,
94
90
  $options: "i",
95
91
  },
@@ -123,11 +119,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
123
119
  // if input is string and db field type is boolean
124
120
  aggregateQuery.push({
125
121
  $addFields: (_b = {},
126
- _b["_".concat(key)] = "$".concat(key),
122
+ _b["_" + key] = "$" + key,
127
123
  _b),
128
124
  });
129
125
  likeQuery_1.push((_c = {},
130
- _c["_".concat(key)] = toBoolean(value),
126
+ _c["_" + key] = toBoolean(value),
131
127
  _c));
132
128
  }
133
129
  else if ([
@@ -139,22 +135,22 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
139
135
  // if input is string and db field type is array
140
136
  aggregateQuery.push({
141
137
  $addFields: (_d = {},
142
- _d["_".concat(key)] = "$".concat(key),
138
+ _d["_" + key] = "$" + key,
143
139
  _d),
144
140
  });
145
141
  likeQuery_1.push((_e = {},
146
- _e["_".concat(key)] = { $all: [value] },
142
+ _e["_" + key] = { $all: [value] },
147
143
  _e));
148
144
  }
149
145
  else if (searchQueryTypeObj[key] === "tel") {
150
146
  // handling value when db field type is tel
151
147
  aggregateQuery.push({
152
148
  $addFields: (_f = {},
153
- _f["_".concat(key)] = { $toString: "$".concat(key) },
149
+ _f["_" + key] = { $toString: "$" + key },
154
150
  _f),
155
151
  });
156
152
  likeQuery_1.push((_g = {},
157
- _g["_".concat(key)] = {
153
+ _g["_" + key] = {
158
154
  $regex: value.startsWith("+") ? value.replace("+", "") : value,
159
155
  $options: "i",
160
156
  },
@@ -164,11 +160,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
164
160
  // handling value when db field type is Double/Int
165
161
  aggregateQuery.push({
166
162
  $addFields: (_h = {},
167
- _h["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
163
+ _h["_" + key] = { $toString: { $toLong: "$" + key } },
168
164
  _h),
169
165
  });
170
166
  likeQuery_1.push((_j = {},
171
- _j["_".concat(key)] = {
167
+ _j["_" + key] = {
172
168
  $regex: value,
173
169
  $options: "i",
174
170
  },
@@ -179,11 +175,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
179
175
  // converting db field to string first
180
176
  aggregateQuery.push({
181
177
  $addFields: (_k = {},
182
- _k["_".concat(key)] = { $toString: "$".concat(key) },
178
+ _k["_" + key] = { $toString: "$" + key },
183
179
  _k),
184
180
  });
185
181
  likeQuery_1.push((_l = {},
186
- _l["_".concat(key)] = {
182
+ _l["_" + key] = {
187
183
  $regex: value,
188
184
  $options: "i",
189
185
  },
@@ -218,7 +214,7 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
218
214
  if (field.type === "belongsTo") {
219
215
  aggregateQuery.push({
220
216
  $lookup: {
221
- from: "".concat(collectionName_1),
217
+ from: "" + collectionName_1,
222
218
  localField: field.fieldName,
223
219
  foreignField: "uuid",
224
220
  as: field.fieldName,
@@ -233,8 +229,8 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
233
229
  else {
234
230
  aggregateQuery.push({
235
231
  $lookup: {
236
- from: "".concat(collectionName_1),
237
- let: (_b = {}, _b["".concat(field.fieldName)] = "$".concat(field.fieldName), _b),
232
+ from: "" + collectionName_1,
233
+ let: (_b = {}, _b["" + field.fieldName] = "$" + field.fieldName, _b),
238
234
  pipeline: [
239
235
  {
240
236
  $match: {
@@ -244,10 +240,10 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
244
240
  {
245
241
  $cond: {
246
242
  if: {
247
- $in: ["$$".concat(field.fieldName), ["", null]],
243
+ $in: ["$$" + field.fieldName, ["", null]],
248
244
  },
249
245
  then: [],
250
- else: { $ifNull: ["$$".concat(field.fieldName), []] },
246
+ else: { $ifNull: ["$$" + field.fieldName, []] },
251
247
  },
252
248
  },
253
249
  ],
@@ -280,10 +276,10 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
280
276
  aggregateQuery.push({
281
277
  $lookup: {
282
278
  from: "user",
283
- let: (_c = {}, _c["".concat(field.fieldName)] = "$".concat(field.fieldName), _c),
279
+ let: (_c = {}, _c["" + field.fieldName] = "$" + field.fieldName, _c),
284
280
  pipeline: [
285
281
  {
286
- $match: { $expr: { $eq: ["$uuid", "$$".concat(field.fieldName)] } },
282
+ $match: { $expr: { $eq: ["$uuid", "$$" + field.fieldName] } },
287
283
  },
288
284
  { $project: { _id: 0, password: 0 } },
289
285
  ],
@@ -296,7 +292,7 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
296
292
  _b.label = 2;
297
293
  case 2:
298
294
  if (!["COUNT", "SUM", "AVG", "MIN", "MAX"].includes(finder) &&
299
- !(0, util_1.isEmpty)(projection)) {
295
+ !util_1.isEmpty(projection)) {
300
296
  aggregateQuery.push({ $project: projection });
301
297
  }
302
298
  if (finder === "COUNT") {
@@ -304,22 +300,22 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
304
300
  }
305
301
  else if (finder === "SUM") {
306
302
  aggregateQuery.push({
307
- $group: { _id: null, total: { $sum: "$".concat(aggregateFunctionField) } },
303
+ $group: { _id: null, total: { $sum: "$" + aggregateFunctionField } },
308
304
  });
309
305
  }
310
306
  else if (finder === "AVG") {
311
307
  aggregateQuery.push({
312
- $group: { _id: null, average: { $avg: "$".concat(aggregateFunctionField) } },
308
+ $group: { _id: null, average: { $avg: "$" + aggregateFunctionField } },
313
309
  });
314
310
  }
315
311
  else if (finder === "MIN") {
316
312
  aggregateQuery.push({
317
- $group: { _id: null, minimum: { $min: "$".concat(aggregateFunctionField) } },
313
+ $group: { _id: null, minimum: { $min: "$" + aggregateFunctionField } },
318
314
  });
319
315
  }
320
316
  else if (finder === "MAX") {
321
317
  aggregateQuery.push({
322
- $group: { _id: null, maximum: { $max: "$".concat(aggregateFunctionField) } },
318
+ $group: { _id: null, maximum: { $max: "$" + aggregateFunctionField } },
323
319
  });
324
320
  }
325
321
  offset = externalParams.offset || 0;
@@ -335,8 +331,8 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
335
331
  if (finder != "COUNT" && limit) {
336
332
  aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
337
333
  }
338
- queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" } })");
339
- str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
334
+ queryStr = ".aggregate(" + JSON.stringify(aggregateQuery) + ", { collation: { locale: \"en\" } })";
335
+ str = "req.db.collection('" + collectionName + "')" + queryStr;
340
336
  str += ".toArray()";
341
337
  return [2 /*return*/, str];
342
338
  }
@@ -373,7 +369,7 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser)
373
369
  filterQuery[lastKey].push(mongoQuery);
374
370
  }
375
371
  else {
376
- filterQuery["$or".concat(index)] = [mongoQuery];
372
+ filterQuery["$or" + index] = [mongoQuery];
377
373
  }
378
374
  }
379
375
  else if (queryObj.conjunctionType == "AND") {
@@ -382,11 +378,11 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser)
382
378
  filterQuery[lastKey].push(mongoQuery);
383
379
  }
384
380
  else {
385
- filterQuery["$and".concat(index)] = [mongoQuery];
381
+ filterQuery["$and" + index] = [mongoQuery];
386
382
  }
387
383
  }
388
384
  else {
389
- filterQuery["$or".concat(index)] = [mongoQuery];
385
+ filterQuery["$or" + index] = [mongoQuery];
390
386
  }
391
387
  });
392
388
  console.log("==> *** filterQuery #2 :>> ", filterQuery);
@@ -402,13 +398,13 @@ var mongoSelectQuery = function (query) {
402
398
  if (fieldsInclude[0] === "*") {
403
399
  fieldsExclude.map(function (field) {
404
400
  if (field)
405
- return (projection["".concat(field)] = 0);
401
+ return (projection["" + field] = 0);
406
402
  });
407
403
  }
408
404
  else {
409
405
  fieldsInclude.map(function (field) {
410
406
  if (field)
411
- return (projection["".concat(field)] = 1);
407
+ return (projection["" + field] = 1);
412
408
  });
413
409
  }
414
410
  return projection;
@@ -499,7 +495,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
499
495
  return _r = {},
500
496
  _r[field] = {
501
497
  $gte: fieldValue,
502
- $lt: new Date((0, date_util_1.nextDayDate)(fieldValue)),
498
+ $lt: new Date(date_util_1.nextDayDate(fieldValue)),
503
499
  },
504
500
  _r;
505
501
  }
@@ -577,11 +573,11 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
577
573
  if (key === drapcode_constant_1.BETWEEN) {
578
574
  var _a = getMinMaxValue(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
579
575
  if (requiredExternal) {
580
- startValue_1 = "".concat(externalParams[startValue_1]);
581
- endValue_1 = "".concat(externalParams[endValue_1]);
576
+ startValue_1 = "" + externalParams[startValue_1];
577
+ endValue_1 = "" + externalParams[endValue_1];
582
578
  }
583
579
  else {
584
- if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) {
580
+ if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
585
581
  return startValue_1.includes(cnst);
586
582
  })) {
587
583
  startValue_1 = getValueOfProjectConstant(startValue_1, currentUser);
@@ -589,7 +585,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
589
585
  else {
590
586
  startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
591
587
  }
592
- if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) { return endValue_1.includes(cnst); })) {
588
+ if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
593
589
  endValue_1 = getValueOfProjectConstant(endValue_1, currentUser);
594
590
  }
595
591
  else {
@@ -606,10 +602,10 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
606
602
  //TODO: Need to figure out the params should be treated as number/string
607
603
  if (!isNaN(startValue_1)) {
608
604
  console.log("I am Number");
609
- return "".concat(startValue_1, "---").concat(endValue_1, "^");
605
+ return startValue_1 + "---" + endValue_1 + "^";
610
606
  }
611
607
  else
612
- return "".concat(startValue_1, "---").concat(endValue_1);
608
+ return startValue_1 + "---" + endValue_1;
613
609
  }
614
610
  if (value.includes(drapcode_constant_1.CURRENT_USER)) {
615
611
  if (value === drapcode_constant_1.CURRENT_USER) {
@@ -647,11 +643,11 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
647
643
  //TODO: This is just to confirm if external then it should be get from externalParams
648
644
  if (requiredExternal) {
649
645
  //TODO: Value returns from here undefined.
650
- var externalParamValue = externalParams["".concat(value)];
646
+ var externalParamValue = externalParams["" + value];
651
647
  if (!isNaN(externalParamValue)) {
652
648
  return +externalParamValue;
653
649
  }
654
- return externalParams["".concat(value)];
650
+ return externalParams["" + value];
655
651
  }
656
652
  var constantArr = constants.filter(function (constant) { return constant.name == value; });
657
653
  return constantArr.length ? "" + constantArr[0].value : "";
@@ -678,9 +674,9 @@ var getValueOfProjectConstant = function (value, currentUser) {
678
674
  if (value === drapcode_constant_1.CURRENT_USER)
679
675
  return currentUser["uuid"];
680
676
  if (value === drapcode_constant_1.CURRENT_DATE)
681
- return (0, date_util_1.createLoggerDateFormat)();
677
+ return date_util_1.createLoggerDateFormat();
682
678
  if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
683
- return (0, date_util_1.createLogsDateFormat)();
679
+ return date_util_1.createLogsDateFormat();
684
680
  if (drapcode_constant_1.DateTimeUnit.some(function (cnst) { return value.includes(cnst); }))
685
- return (0, date_util_1.getDateValue)(value);
681
+ return date_util_1.getDateValue(value);
686
682
  };
package/build/utils/util.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  export declare const validateString: (str: string) => false | "String should not contain special characters" | "String should not contain any number";
2
2
  export declare const camelize: (str: string) => string;
3
- export declare const clearSpaceAndReformat: (text: string, separator?: string) => string;
3
+ export declare const clearSpaceAndReformat: (text: string, separator?: string | undefined) => string;
4
4
  export declare const isEmpty: (obj: any) => boolean;
5
5
  export declare const isEmptyObject: (object: any) => boolean;
6
6
  export declare const isObject: (item: any) => any;
package/build/utils/util.js CHANGED
@@ -38,7 +38,7 @@ var validateString = function (str) {
38
38
  };
39
39
  exports.validateString = validateString;
40
40
  var camelize = function (str) {
41
- str = (0, exports.clearSpaceAndReformat)(str);
41
+ str = exports.clearSpaceAndReformat(str);
42
42
  return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function (word, index) {
43
43
  return index === 0 ? word.toLowerCase() : word.toUpperCase();
44
44
  });
@@ -165,8 +165,8 @@ var cleanCollectionAndFieldName = function (str) {
165
165
  };
166
166
  exports.cleanCollectionAndFieldName = cleanCollectionAndFieldName;
167
167
  var formatCollectionAndFieldName = function (str) {
168
- var updateString = (0, exports.cleanCollectionAndFieldName)(str);
169
- return (0, exports.clearSpaceAndReformat)(updateString.trim(), "_");
168
+ var updateString = exports.cleanCollectionAndFieldName(str);
169
+ return exports.clearSpaceAndReformat(updateString.trim(), "_");
170
170
  };
171
171
  exports.formatCollectionAndFieldName = formatCollectionAndFieldName;
172
172
  var restructureData = function (data) {
@@ -197,7 +197,7 @@ var restructureData = function (data) {
197
197
  exports.restructureData = restructureData;
198
198
  var checkAndCompareValue = function (input1, input2) {
199
199
  return Array.isArray(input2)
200
- ? (0, exports.arraysEqual)(input1, input2.map(function (key) { return key.value; }))
200
+ ? exports.arraysEqual(input1, input2.map(function (key) { return key.value; }))
201
201
  : input1 === input2.value;
202
202
  };
203
203
  exports.checkAndCompareValue = checkAndCompareValue;
@@ -207,7 +207,7 @@ var arraysEqual = function (array1, array2) {
207
207
  return false;
208
208
  for (var i = 0; i < array1.length; i++ // assert each element equal
209
209
  )
210
- if (!(0, exports.arraysEqual)(array1[i], array2[i]))
210
+ if (!exports.arraysEqual(array1[i], array2[i]))
211
211
  return false;
212
212
  return true;
213
213
  }
@@ -242,7 +242,7 @@ var formatCustomCSSClasses = function (projectCustomCSSClasses) {
242
242
  .replace(/"([^"]+)"/g, "$1")
243
243
  .split(",")
244
244
  .join(";");
245
- projectCustomCSSClassesData += "".concat(element.class.startsWith(".") ? element.class : "." + element.class).concat(element.pseudoClass ? ":" + element.pseudoClass : "").concat(unquotedClassWithProp, " ");
245
+ projectCustomCSSClassesData += "" + (element.class.startsWith(".") ? element.class : "." + element.class) + (element.pseudoClass ? ":" + element.pseudoClass : "") + unquotedClassWithProp + " ";
246
246
  }
247
247
  });
248
248
  return projectCustomCSSClassesData;
@@ -253,18 +253,18 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, s
253
253
  var contentList = (_a = expression
254
254
  .match(/{{(.*?)}}/g)) === null || _a === void 0 ? void 0 : _a.map(function (b) { return b.replace(/{{(.*?)}}/g, "$1"); });
255
255
  contentList === null || contentList === void 0 ? void 0 : contentList.forEach(function (prop) {
256
- var needle = "{{".concat(prop, "}}");
256
+ var needle = "{{" + prop + "}}";
257
257
  var dataOfItem = "";
258
258
  if (prop.includes("current_user")) {
259
259
  prop = prop.replace("current_user.", "");
260
260
  if (Object.keys(user).length > 0) {
261
- dataOfItem = (0, exports.parseValueFromData)(user, prop);
261
+ dataOfItem = exports.parseValueFromData(user, prop);
262
262
  }
263
263
  }
264
264
  else if (prop.includes("current_tenant")) {
265
265
  prop = prop.replace("current_tenant.", "");
266
266
  if (Object.keys(tenant).length > 0) {
267
- dataOfItem = (0, exports.parseValueFromData)(tenant, prop);
267
+ dataOfItem = exports.parseValueFromData(tenant, prop);
268
268
  }
269
269
  }
270
270
  else if (prop.includes("current_session")) {
@@ -290,7 +290,7 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, s
290
290
  }
291
291
  else {
292
292
  if (Object.keys(data).length > 0) {
293
- dataOfItem = (0, exports.parseValueFromData)(data, prop);
293
+ dataOfItem = exports.parseValueFromData(data, prop);
294
294
  //TODO: Need better way
295
295
  delete data[prop];
296
296
  }
@@ -390,7 +390,7 @@ var replaceTransferObjectValueIntoExpression = function (expression, transferObj
390
390
  var contentList = (_a = expression
391
391
  .match(/{{(.*?)}}/g)) === null || _a === void 0 ? void 0 : _a.map(function (b) { return b.replace(/{{(.*?)}}/g, "$1"); });
392
392
  contentList === null || contentList === void 0 ? void 0 : contentList.forEach(function (prop) {
393
- var needle = "{{".concat(prop, "}}");
393
+ var needle = "{{" + prop + "}}";
394
394
  var dataOfItem = "";
395
395
  dataOfItem = transferObject[prop] ? transferObject[prop] : "";
396
396
  expression = dataOfItem
package/build/utils/uuid-generator.js CHANGED
@@ -38,10 +38,10 @@ var nextGeneratedString = function (str, prepend, minLength, append, algorithm)
38
38
  finalValue = voca_1.default.padLeft(finalValue, minLength, "0");
39
39
  }
40
40
  if (prepend) {
41
- finalValue = "".concat(prepend).concat(finalValue);
41
+ finalValue = "" + prepend + finalValue;
42
42
  }
43
43
  if (append) {
44
- finalValue = "".concat(finalValue).concat(append);
44
+ finalValue = "" + finalValue + append;
45
45
  }
46
46
  return finalValue;
47
47
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "drapcode-utility",
3
- "version": "1.1.4",
3
+ "version": "1.1.6",
4
4
  "description": "",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -31,9 +31,9 @@
31
31
  "@types/voca": "^1.4.2",
32
32
  "aws-sdk": "^2.1324.0",
33
33
  "axios": "^1.1.2",
34
- "drapcode-constant": "^1.2.3",
35
- "drapcode-logger": "^1.0.3",
36
- "drapcode-redis": "^1.0.3",
34
+ "drapcode-constant": "^1.2.4",
35
+ "drapcode-logger": "^1.0.4",
36
+ "drapcode-redis": "^1.0.4",
37
37
  "express": "^4.17.1",
38
38
  "express-rate-limit": "^5.1.3",
39
39
  "express-validator": "^6.6.1",