drapcode-utility 1.1.2 → 1.1.4

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