drapcode-utility 1.1.9 → 1.2.0
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.
- package/build/encryption/KMS.d.ts +0 -5
- package/build/encryption/KMS.js +5 -35
- package/build/encryption/crypt.js +2 -2
- package/build/encryption/file.js +4 -4
- package/build/encryption/index.d.ts +2 -1
- package/build/encryption/index.js +47 -33
- package/build/encryption/model.d.ts +2 -2
- package/build/index.js +5 -1
- package/build/middlewares/error-logger.js +6 -6
- package/build/middlewares/interceptor-logger-new.js +6 -6
- package/build/middlewares/interceptor-logger.js +3 -3
- package/build/middlewares/redis/request-log.js +4 -4
- package/build/utils/check-error.js +12 -8
- package/build/utils/date-util.js +3 -3
- package/build/utils/query-parser.js +57 -53
- package/build/utils/query-paser-new.js +52 -48
- package/build/utils/s3-util.d.ts +4 -0
- package/build/utils/s3-util.js +45 -24
- package/build/utils/util.d.ts +1 -1
- package/build/utils/util.js +11 -11
- package/build/utils/uuid-generator.js +2 -2
- package/package.json +1 -1
|
@@ -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,
|
|
40
|
-
|
|
41
|
-
|
|
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: ""
|
|
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: ""
|
|
143
|
-
let: (_b = {}, _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: ["$$"
|
|
157
|
+
$in: ["$$".concat(field.fieldName), ["", null]],
|
|
154
158
|
},
|
|
155
159
|
then: [],
|
|
156
|
-
else: { $ifNull: ["$$"
|
|
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[""
|
|
193
|
+
let: (_c = {}, _c["".concat(field.fieldName)] = "$".concat(field.fieldName), _c),
|
|
190
194
|
pipeline: [
|
|
191
195
|
{
|
|
192
|
-
$match: { $expr: { $eq: ["$uuid", "$$"
|
|
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("
|
|
226
|
-
str = "req.db.collection('"
|
|
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"
|
|
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"
|
|
279
|
+
filterQuery["$and".concat(index)] = [mongoQuery];
|
|
276
280
|
}
|
|
277
281
|
}
|
|
278
282
|
else {
|
|
279
|
-
filterQuery["$or"
|
|
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[""
|
|
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[""
|
|
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_"
|
|
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 = ""
|
|
513
|
-
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
|
|
544
|
+
return "".concat(startValue_1, "---").concat(endValue_1, "^");
|
|
541
545
|
}
|
|
542
546
|
else
|
|
543
|
-
return startValue_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[""
|
|
650
|
+
var externalParamValue = externalParams["".concat(value)];
|
|
647
651
|
if (!isNaN(externalParamValue)) {
|
|
648
652
|
return +externalParamValue;
|
|
649
653
|
}
|
|
650
|
-
return externalParams[""
|
|
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["_"
|
|
705
|
+
_b["_".concat(key)] = "$".concat(key),
|
|
702
706
|
_b),
|
|
703
707
|
});
|
|
704
708
|
likeQuery.push((_c = {},
|
|
705
|
-
_c["_"
|
|
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["_"
|
|
721
|
+
_d["_".concat(key)] = "$".concat(key),
|
|
718
722
|
_d),
|
|
719
723
|
});
|
|
720
724
|
likeQuery.push((_e = {},
|
|
721
|
-
_e["_"
|
|
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["_"
|
|
732
|
+
_f["_".concat(key)] = { $toString: "$".concat(key) },
|
|
729
733
|
_f),
|
|
730
734
|
});
|
|
731
735
|
likeQuery.push((_g = {},
|
|
732
|
-
_g["_"
|
|
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["_"
|
|
746
|
+
_h["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
|
|
743
747
|
_h),
|
|
744
748
|
});
|
|
745
749
|
likeQuery.push((_j = {},
|
|
746
|
-
_j["_"
|
|
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["_"
|
|
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["_"
|
|
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["_"
|
|
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["_"
|
|
786
|
+
_o["_".concat(key)] = { $toString: "$".concat(key) },
|
|
783
787
|
_o),
|
|
784
788
|
});
|
|
785
789
|
likeQuery.push((_p = {},
|
|
786
|
-
_p["_"
|
|
790
|
+
_p["_".concat(key)] = {
|
|
787
791
|
$regex: value,
|
|
788
792
|
$options: "i",
|
|
789
793
|
},
|