drapcode-utility 1.8.1 → 1.8.3
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/crypt.js +4 -0
- package/build/utils/date-util.js +14 -1
- package/build/utils/query-parser.js +93 -36
- package/build/utils/query-paser-new.js +102 -37
- package/build/utils/util.js +5 -5
- package/package.json +4 -4
|
@@ -85,6 +85,9 @@ var decryptData = function (data, key) { return __awaiter(void 0, void 0, void 0
|
|
|
85
85
|
exports.decryptData = decryptData;
|
|
86
86
|
var handleExtraString = function (key, append) {
|
|
87
87
|
if (append === void 0) { append = true; }
|
|
88
|
+
if (!key || key === "undefined") {
|
|
89
|
+
return key;
|
|
90
|
+
}
|
|
88
91
|
if (append) {
|
|
89
92
|
var start = crypto_1.default.randomBytes(2).toString("hex");
|
|
90
93
|
var end = crypto_1.default.randomBytes(2).toString("hex");
|
|
@@ -92,6 +95,7 @@ var handleExtraString = function (key, append) {
|
|
|
92
95
|
return key;
|
|
93
96
|
}
|
|
94
97
|
else {
|
|
98
|
+
key = key.toString();
|
|
95
99
|
key = key.substring(4, key.length);
|
|
96
100
|
key = key.substring(0, key.length - 4);
|
|
97
101
|
return key;
|
package/build/utils/date-util.js
CHANGED
|
@@ -47,7 +47,7 @@ var getDateValue = function (value, timezone) {
|
|
|
47
47
|
};
|
|
48
48
|
exports.getDateValue = getDateValue;
|
|
49
49
|
var getDateRangeValue = function (key, field, value) {
|
|
50
|
-
var _a, _b, _c;
|
|
50
|
+
var _a, _b, _c, _d;
|
|
51
51
|
var dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
|
|
52
52
|
var finalValue = "";
|
|
53
53
|
var startValue = "";
|
|
@@ -84,6 +84,19 @@ var getDateRangeValue = function (key, field, value) {
|
|
|
84
84
|
],
|
|
85
85
|
};
|
|
86
86
|
}
|
|
87
|
+
else if (key === drapcode_constant_1.EQUALS_OR_IGNORE) {
|
|
88
|
+
if (startValue && endValue) {
|
|
89
|
+
finalValue = (_d = {},
|
|
90
|
+
_d[field] = {
|
|
91
|
+
$gte: startValue.format(dateFormat),
|
|
92
|
+
$lte: endValue.format(dateFormat),
|
|
93
|
+
},
|
|
94
|
+
_d);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
finalValue = {};
|
|
98
|
+
}
|
|
99
|
+
}
|
|
87
100
|
return finalValue;
|
|
88
101
|
};
|
|
89
102
|
exports.getDateRangeValue = getDateRangeValue;
|
|
@@ -272,12 +272,12 @@ var modifyQuery = function (obj, hasAndQueryConjunction) {
|
|
|
272
272
|
return arr;
|
|
273
273
|
};
|
|
274
274
|
var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone) {
|
|
275
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
|
|
275
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13;
|
|
276
276
|
if (currentUser === void 0) { currentUser = {}; }
|
|
277
277
|
if (currentTenant === void 0) { currentTenant = {}; }
|
|
278
278
|
if (currentUserSetting === void 0) { currentUserSetting = {}; }
|
|
279
279
|
var key = query.key, field = query.field, value = query.value, fieldType = query.fieldType;
|
|
280
|
-
if ([drapcode_constant_1.EQUALS, drapcode_constant_1.NOT_EQUAL].includes(key) &&
|
|
280
|
+
if ([drapcode_constant_1.EQUALS, drapcode_constant_1.NOT_EQUAL, drapcode_constant_1.EQUALS_OR_IGNORE].includes(key) &&
|
|
281
281
|
typeof value === "string" &&
|
|
282
282
|
drapcode_constant_1.DateRangeConstant.some(function (cnst) { return value.includes(cnst); })) {
|
|
283
283
|
var final = (0, date_util_1.getDateRangeValue)(key, field, value);
|
|
@@ -316,50 +316,60 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
|
|
|
316
316
|
}
|
|
317
317
|
return _b = {}, _b[field] = { $nin: fieldValue || [] }, _b;
|
|
318
318
|
}
|
|
319
|
+
if (condition && key === drapcode_constant_1.EQUALS_OR_IGNORE && !isDate) {
|
|
320
|
+
if (typeof fieldValue === "string" && fieldValue.startsWith("CURRENT_")) {
|
|
321
|
+
fieldValue = "random_string_since_field_not_present_1318874398806";
|
|
322
|
+
} //Doing this because when Current Logged In Tenant/Settings/User have no data in that specific field then they return the fieldValue as CURRENT_SETTINGS:field not blank
|
|
323
|
+
if (!Array.isArray(fieldValue)) {
|
|
324
|
+
fieldValue = [fieldValue];
|
|
325
|
+
}
|
|
326
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
327
|
+
? (_c = {}, _c[field] = { $in: fieldValue || [] }, _c) : {};
|
|
328
|
+
}
|
|
319
329
|
if (condition && key === drapcode_constant_1.IS_NULL) {
|
|
320
330
|
return {
|
|
321
331
|
$or: [
|
|
322
|
-
(
|
|
323
|
-
(
|
|
332
|
+
(_d = {}, _d[field] = { $exists: false }, _d),
|
|
333
|
+
(_e = {}, _e[field] = { $type: "array", $eq: [] }, _e),
|
|
324
334
|
],
|
|
325
335
|
};
|
|
326
336
|
}
|
|
327
337
|
if (condition && key === drapcode_constant_1.IS_NOT_NULL) {
|
|
328
|
-
return
|
|
338
|
+
return _f = {}, _f[field] = { $exists: true, $type: "array", $ne: [] }, _f;
|
|
329
339
|
}
|
|
330
340
|
if (key === drapcode_constant_1.IS_NOT_NULL)
|
|
331
|
-
return
|
|
341
|
+
return _g = {}, _g[field] = { $nin: [null, ""] }, _g;
|
|
332
342
|
if (key === drapcode_constant_1.IS_NULL)
|
|
333
|
-
return
|
|
343
|
+
return _h = {}, _h[field] = { $in: [null, ""] }, _h;
|
|
334
344
|
if (key === drapcode_constant_1.LIKE)
|
|
335
|
-
return
|
|
345
|
+
return _j = {}, _j[field] = { $regex: fieldValue, $options: "i" }, _j;
|
|
336
346
|
if (key === drapcode_constant_1.GREATER_THAN_EQUALS_TO)
|
|
337
|
-
return
|
|
347
|
+
return _k = {}, _k[field] = { $gte: isDate ? fieldValue : +fieldValue }, _k;
|
|
338
348
|
if (key === drapcode_constant_1.LESS_THAN_EQUALS_TO)
|
|
339
|
-
return
|
|
349
|
+
return _l = {}, _l[field] = { $lte: isDate ? fieldValue : +fieldValue }, _l;
|
|
340
350
|
if (key === drapcode_constant_1.LESS_THAN)
|
|
341
|
-
return
|
|
351
|
+
return _m = {}, _m[field] = { $lt: isDate ? fieldValue : +fieldValue }, _m;
|
|
342
352
|
if (key === drapcode_constant_1.GREATER_THAN)
|
|
343
|
-
return
|
|
353
|
+
return _o = {}, _o[field] = { $gt: isDate ? fieldValue : +fieldValue }, _o;
|
|
344
354
|
if (key === drapcode_constant_1.IN_LIST) {
|
|
345
355
|
if (!Array.isArray(fieldValue)) {
|
|
346
356
|
fieldValue = [fieldValue];
|
|
347
357
|
}
|
|
348
|
-
return
|
|
358
|
+
return _p = {}, _p[field] = { $in: fieldValue || [] }, _p;
|
|
349
359
|
}
|
|
350
360
|
if (key === drapcode_constant_1.NOT_IN_LIST) {
|
|
351
361
|
if (!Array.isArray(fieldValue)) {
|
|
352
362
|
fieldValue = [fieldValue];
|
|
353
363
|
}
|
|
354
|
-
return
|
|
364
|
+
return _q = {}, _q[field] = { $nin: fieldValue || [] }, _q;
|
|
355
365
|
}
|
|
356
366
|
if (key === drapcode_constant_1.EQUALS && isDate) {
|
|
357
|
-
return
|
|
358
|
-
|
|
367
|
+
return _r = {},
|
|
368
|
+
_r[field] = {
|
|
359
369
|
$gte: fieldValue,
|
|
360
370
|
$lt: (0, date_util_1.nextDayDate)(fieldValue),
|
|
361
371
|
},
|
|
362
|
-
|
|
372
|
+
_r;
|
|
363
373
|
// Todo: Remove this if works properly
|
|
364
374
|
// if (DateConstant.some((cnst) => value.includes(cnst))) {
|
|
365
375
|
// return {
|
|
@@ -377,56 +387,103 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
|
|
|
377
387
|
// };
|
|
378
388
|
// }
|
|
379
389
|
}
|
|
390
|
+
if (key === drapcode_constant_1.EQUALS_OR_IGNORE && isDate) {
|
|
391
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
392
|
+
? (_s = {},
|
|
393
|
+
_s[field] = {
|
|
394
|
+
$gte: fieldValue,
|
|
395
|
+
$lt: (0, date_util_1.nextDayDate)(fieldValue),
|
|
396
|
+
},
|
|
397
|
+
_s) : {};
|
|
398
|
+
}
|
|
380
399
|
if (key == drapcode_constant_1.EQUALS && field === "createdBy")
|
|
381
400
|
return {
|
|
382
401
|
$and: [
|
|
383
|
-
(
|
|
384
|
-
(
|
|
385
|
-
(
|
|
402
|
+
(_t = {}, _t[field] = { $ne: null }, _t),
|
|
403
|
+
(_u = {}, _u[field] = { $ne: "" }, _u),
|
|
404
|
+
(_v = {}, _v[field] = { $eq: fieldValue }, _v),
|
|
386
405
|
],
|
|
387
406
|
};
|
|
407
|
+
if (key === drapcode_constant_1.EQUALS_OR_IGNORE && field === "createdBy") {
|
|
408
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
409
|
+
? {
|
|
410
|
+
$and: [
|
|
411
|
+
(_w = {}, _w[field] = { $ne: null }, _w),
|
|
412
|
+
(_x = {}, _x[field] = { $ne: "" }, _x),
|
|
413
|
+
(_y = {}, _y[field] = { $eq: fieldValue }, _y),
|
|
414
|
+
],
|
|
415
|
+
}
|
|
416
|
+
: {};
|
|
417
|
+
}
|
|
388
418
|
if (key == drapcode_constant_1.EQUALS && fieldType === "boolean" && fieldValue)
|
|
389
419
|
return JSON.parse(fieldValue)
|
|
390
|
-
? (
|
|
391
|
-
|
|
392
|
-
|
|
420
|
+
? (_z = {},
|
|
421
|
+
_z[field] = JSON.parse(fieldValue),
|
|
422
|
+
_z) : {
|
|
393
423
|
$or: [
|
|
394
|
-
(
|
|
395
|
-
(
|
|
424
|
+
(_0 = {}, _0[field] = JSON.parse(fieldValue), _0),
|
|
425
|
+
(_1 = {}, _1[field] = { $exists: false }, _1),
|
|
396
426
|
],
|
|
397
427
|
};
|
|
428
|
+
if (key === drapcode_constant_1.EQUALS_OR_IGNORE && fieldType === "boolean") {
|
|
429
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
430
|
+
? JSON.parse(fieldValue)
|
|
431
|
+
? (_2 = {},
|
|
432
|
+
_2[field] = JSON.parse(fieldValue),
|
|
433
|
+
_2) : {
|
|
434
|
+
$or: [
|
|
435
|
+
(_3 = {}, _3[field] = JSON.parse(fieldValue), _3),
|
|
436
|
+
(_4 = {}, _4[field] = { $exists: false }, _4),
|
|
437
|
+
],
|
|
438
|
+
}
|
|
439
|
+
: {};
|
|
440
|
+
}
|
|
398
441
|
if (key == drapcode_constant_1.EQUALS) {
|
|
399
442
|
console.log("I am query parser");
|
|
400
443
|
console.log("fieldType", fieldType);
|
|
401
444
|
if (fieldType === "boolean") {
|
|
402
|
-
return
|
|
445
|
+
return _5 = {}, _5[field] = !!fieldValue, _5;
|
|
403
446
|
}
|
|
404
447
|
if (fieldType === "number") {
|
|
405
|
-
return
|
|
448
|
+
return _6 = {}, _6[field] = +fieldValue, _6;
|
|
406
449
|
}
|
|
407
450
|
console.log("Nothing match");
|
|
408
|
-
return
|
|
451
|
+
return _7 = {}, _7[field] = "".concat(fieldValue), _7;
|
|
452
|
+
}
|
|
453
|
+
if (key === drapcode_constant_1.EQUALS_OR_IGNORE) {
|
|
454
|
+
if (fieldType === "boolean") {
|
|
455
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
456
|
+
? (_8 = {}, _8[field] = !!fieldValue, _8) : {};
|
|
457
|
+
}
|
|
458
|
+
if (fieldType === "number") {
|
|
459
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
460
|
+
? (_9 = {}, _9[field] = +fieldValue, _9) : {};
|
|
461
|
+
}
|
|
462
|
+
else {
|
|
463
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
464
|
+
? (_10 = {}, _10[field] = fieldValue, _10) : {};
|
|
465
|
+
}
|
|
409
466
|
}
|
|
410
467
|
if (key == drapcode_constant_1.NOT_EQUAL)
|
|
411
468
|
if (fieldType === "number") {
|
|
412
|
-
return
|
|
469
|
+
return _11 = {}, _11[field] = { $ne: +fieldValue }, _11;
|
|
413
470
|
}
|
|
414
471
|
else
|
|
415
|
-
return
|
|
416
|
-
|
|
472
|
+
return _12 = {},
|
|
473
|
+
_12[field] = {
|
|
417
474
|
$ne: fieldType === "boolean" && fieldValue
|
|
418
475
|
? JSON.parse(fieldValue)
|
|
419
476
|
: fieldValue,
|
|
420
477
|
},
|
|
421
|
-
|
|
478
|
+
_12;
|
|
422
479
|
if (key == drapcode_constant_1.BETWEEN) {
|
|
423
|
-
var
|
|
424
|
-
return
|
|
425
|
-
|
|
480
|
+
var _14 = (0, exports.getMinMaxValue)(fieldValue), startValue = _14.startValue, endValue = _14.endValue, isInteger = _14.isInteger;
|
|
481
|
+
return _13 = {},
|
|
482
|
+
_13[field] = {
|
|
426
483
|
$gte: isInteger ? +startValue : startValue,
|
|
427
484
|
$lte: isInteger ? +endValue : endValue,
|
|
428
485
|
},
|
|
429
|
-
|
|
486
|
+
_13;
|
|
430
487
|
}
|
|
431
488
|
};
|
|
432
489
|
var isEntityInCondition = function (value) {
|
|
@@ -354,7 +354,7 @@ var modifyQuery = function (obj, hasAndQueryConjunction) {
|
|
|
354
354
|
return arr;
|
|
355
355
|
};
|
|
356
356
|
var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser) {
|
|
357
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
|
|
357
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
|
|
358
358
|
if (currentUser === void 0) { currentUser = {}; }
|
|
359
359
|
var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser);
|
|
360
360
|
var isDate = checkDate(fieldValue);
|
|
@@ -374,103 +374,168 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
|
|
|
374
374
|
}
|
|
375
375
|
return _b = {}, _b[field] = { $nin: fieldValue || [] }, _b;
|
|
376
376
|
}
|
|
377
|
+
if (condition && key === drapcode_constant_1.EQUALS_OR_IGNORE && !isDate) {
|
|
378
|
+
if (typeof fieldValue === "string" && fieldValue.startsWith("CURRENT_")) {
|
|
379
|
+
fieldValue = "random_string_since_field_not_present_1318874398806";
|
|
380
|
+
} //Doing this because when Current Logged In Tenant/Settings/User have no data in that specific field then they return the fieldValue as CURRENT_SETTINGS:field not blank
|
|
381
|
+
if (!Array.isArray(fieldValue)) {
|
|
382
|
+
fieldValue = [fieldValue];
|
|
383
|
+
}
|
|
384
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
385
|
+
? (_c = {}, _c[field] = { $in: fieldValue || [] }, _c) : {};
|
|
386
|
+
}
|
|
377
387
|
if (condition && key === drapcode_constant_1.IS_NULL) {
|
|
378
388
|
return {
|
|
379
389
|
$or: [
|
|
380
|
-
(
|
|
381
|
-
(
|
|
390
|
+
(_d = {}, _d[field] = { $exists: false }, _d),
|
|
391
|
+
(_e = {}, _e[field] = { $type: "array", $eq: [] }, _e),
|
|
382
392
|
],
|
|
383
393
|
};
|
|
384
394
|
}
|
|
385
395
|
if (condition && key === drapcode_constant_1.IS_NOT_NULL) {
|
|
386
|
-
return
|
|
396
|
+
return _f = {}, _f[field] = { $exists: true, $type: "array", $ne: [] }, _f;
|
|
387
397
|
}
|
|
388
398
|
if (key === drapcode_constant_1.IS_NOT_NULL)
|
|
389
|
-
return
|
|
399
|
+
return _g = {}, _g[field] = { $nin: [null, ""] }, _g;
|
|
390
400
|
if (key === drapcode_constant_1.IS_NULL)
|
|
391
|
-
return
|
|
401
|
+
return _h = {}, _h[field] = { $in: [null, ""] }, _h;
|
|
392
402
|
if (key === drapcode_constant_1.LIKE)
|
|
393
|
-
return
|
|
403
|
+
return _j = {}, _j[field] = { $regex: fieldValue, $options: "i" }, _j;
|
|
394
404
|
if (key === drapcode_constant_1.GREATER_THAN_EQUALS_TO)
|
|
395
|
-
return
|
|
405
|
+
return _k = {}, _k[field] = { $gte: isDate ? fieldValue : +fieldValue }, _k;
|
|
396
406
|
if (key === drapcode_constant_1.LESS_THAN_EQUALS_TO)
|
|
397
|
-
return
|
|
407
|
+
return _l = {}, _l[field] = { $lte: isDate ? fieldValue : +fieldValue }, _l;
|
|
398
408
|
if (key === drapcode_constant_1.LESS_THAN)
|
|
399
|
-
return
|
|
409
|
+
return _m = {}, _m[field] = { $lt: isDate ? fieldValue : +fieldValue }, _m;
|
|
400
410
|
if (key === drapcode_constant_1.GREATER_THAN)
|
|
401
|
-
return
|
|
411
|
+
return _o = {}, _o[field] = { $gt: isDate ? fieldValue : +fieldValue }, _o;
|
|
402
412
|
if (key === drapcode_constant_1.IN_LIST) {
|
|
403
413
|
if (!Array.isArray(fieldValue)) {
|
|
404
414
|
fieldValue = [fieldValue];
|
|
405
415
|
}
|
|
406
|
-
return
|
|
416
|
+
return _p = {}, _p[field] = { $in: fieldValue || [] }, _p;
|
|
407
417
|
}
|
|
408
418
|
if (key === drapcode_constant_1.NOT_IN_LIST) {
|
|
409
419
|
if (!Array.isArray(fieldValue)) {
|
|
410
420
|
fieldValue = [fieldValue];
|
|
411
421
|
}
|
|
412
|
-
return
|
|
422
|
+
return _q = {}, _q[field] = { $nin: fieldValue || [] }, _q;
|
|
413
423
|
}
|
|
414
424
|
if (key === drapcode_constant_1.EQUALS && isDate) {
|
|
415
425
|
if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); }))
|
|
416
|
-
return
|
|
417
|
-
|
|
426
|
+
return _r = {},
|
|
427
|
+
_r[field] = {
|
|
418
428
|
$gte: fieldValue,
|
|
419
429
|
},
|
|
420
|
-
|
|
430
|
+
_r;
|
|
421
431
|
else
|
|
422
|
-
return
|
|
423
|
-
|
|
432
|
+
return _s = {},
|
|
433
|
+
_s[field] = {
|
|
424
434
|
$gte: fieldValue,
|
|
425
435
|
$lt: new Date((0, date_util_1.nextDayDate)(fieldValue)),
|
|
426
436
|
},
|
|
427
|
-
|
|
437
|
+
_s;
|
|
438
|
+
}
|
|
439
|
+
if (key === drapcode_constant_1.EQUALS_OR_IGNORE && isDate) {
|
|
440
|
+
if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); }))
|
|
441
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
442
|
+
? (_t = {},
|
|
443
|
+
_t[field] = {
|
|
444
|
+
$gte: fieldValue,
|
|
445
|
+
},
|
|
446
|
+
_t) : {};
|
|
447
|
+
else
|
|
448
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
449
|
+
? (_u = {},
|
|
450
|
+
_u[field] = {
|
|
451
|
+
$gte: fieldValue,
|
|
452
|
+
$lt: new Date((0, date_util_1.nextDayDate)(fieldValue)),
|
|
453
|
+
},
|
|
454
|
+
_u) : {};
|
|
428
455
|
}
|
|
429
456
|
if (key == drapcode_constant_1.EQUALS && field === "createdBy")
|
|
430
457
|
return {
|
|
431
458
|
$and: [
|
|
432
|
-
(
|
|
433
|
-
(
|
|
434
|
-
(
|
|
459
|
+
(_v = {}, _v[field] = { $ne: null }, _v),
|
|
460
|
+
(_w = {}, _w[field] = { $ne: "" }, _w),
|
|
461
|
+
(_x = {}, _x[field] = { $eq: fieldValue }, _x),
|
|
435
462
|
],
|
|
436
463
|
};
|
|
464
|
+
if (key === drapcode_constant_1.EQUALS_OR_IGNORE && field === "createdBy") {
|
|
465
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
466
|
+
? {
|
|
467
|
+
$and: [
|
|
468
|
+
(_y = {}, _y[field] = { $ne: null }, _y),
|
|
469
|
+
(_z = {}, _z[field] = { $ne: "" }, _z),
|
|
470
|
+
(_0 = {}, _0[field] = { $eq: fieldValue }, _0),
|
|
471
|
+
],
|
|
472
|
+
}
|
|
473
|
+
: {};
|
|
474
|
+
}
|
|
437
475
|
if (key == drapcode_constant_1.EQUALS && fieldType === "boolean" && fieldValue)
|
|
438
476
|
return JSON.parse(fieldValue)
|
|
439
|
-
? (
|
|
440
|
-
|
|
441
|
-
|
|
477
|
+
? (_1 = {},
|
|
478
|
+
_1[field] = JSON.parse(fieldValue),
|
|
479
|
+
_1) : {
|
|
442
480
|
$or: [
|
|
443
|
-
(
|
|
444
|
-
(
|
|
481
|
+
(_2 = {}, _2[field] = JSON.parse(fieldValue), _2),
|
|
482
|
+
(_3 = {}, _3[field] = { $exists: false }, _3),
|
|
445
483
|
],
|
|
446
484
|
};
|
|
485
|
+
if (key === drapcode_constant_1.EQUALS_OR_IGNORE && fieldType === "boolean") {
|
|
486
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
487
|
+
? JSON.parse(fieldValue)
|
|
488
|
+
? (_4 = {},
|
|
489
|
+
_4[field] = JSON.parse(fieldValue),
|
|
490
|
+
_4) : {
|
|
491
|
+
$or: [
|
|
492
|
+
(_5 = {}, _5[field] = JSON.parse(fieldValue), _5),
|
|
493
|
+
(_6 = {}, _6[field] = { $exists: false }, _6),
|
|
494
|
+
],
|
|
495
|
+
}
|
|
496
|
+
: {};
|
|
497
|
+
}
|
|
447
498
|
if (key == drapcode_constant_1.EQUALS) {
|
|
448
499
|
console.log("I am query parser new");
|
|
449
500
|
if (fieldType === "boolean") {
|
|
450
|
-
return
|
|
501
|
+
return _7 = {}, _7[field] = !!fieldValue, _7;
|
|
451
502
|
}
|
|
452
503
|
if (fieldType === "number") {
|
|
453
|
-
return
|
|
504
|
+
return _8 = {}, _8[field] = +fieldValue, _8;
|
|
454
505
|
}
|
|
455
506
|
console.log("Nothing match");
|
|
456
|
-
return
|
|
507
|
+
return _9 = {}, _9[field] = "".concat(fieldValue), _9;
|
|
508
|
+
}
|
|
509
|
+
if (key === drapcode_constant_1.EQUALS_OR_IGNORE) {
|
|
510
|
+
if (fieldType === "boolean") {
|
|
511
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
512
|
+
? (_10 = {}, _10[field] = !!fieldValue, _10) : {};
|
|
513
|
+
}
|
|
514
|
+
if (fieldType === "number") {
|
|
515
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
516
|
+
? (_11 = {}, _11[field] = +fieldValue, _11) : {};
|
|
517
|
+
}
|
|
518
|
+
else {
|
|
519
|
+
return !fieldValue.includes("random_string_since_field_not_present_1318874398806")
|
|
520
|
+
? (_12 = {}, _12[field] = fieldValue, _12) : {};
|
|
521
|
+
}
|
|
457
522
|
}
|
|
458
523
|
if (key == drapcode_constant_1.NOT_EQUAL)
|
|
459
|
-
return
|
|
460
|
-
|
|
524
|
+
return _13 = {},
|
|
525
|
+
_13[field] = {
|
|
461
526
|
$ne: fieldType === "boolean" && fieldValue
|
|
462
527
|
? JSON.parse(fieldValue)
|
|
463
528
|
: fieldValue,
|
|
464
529
|
},
|
|
465
|
-
|
|
530
|
+
_13;
|
|
466
531
|
if (key == drapcode_constant_1.BETWEEN) {
|
|
467
|
-
var
|
|
468
|
-
return
|
|
469
|
-
|
|
532
|
+
var _15 = getMinMaxValue(fieldValue), startValue = _15.startValue, endValue = _15.endValue, isInteger = _15.isInteger;
|
|
533
|
+
return _14 = {},
|
|
534
|
+
_14[field] = {
|
|
470
535
|
$gte: isInteger ? +startValue : startValue,
|
|
471
536
|
$lte: isInteger ? +endValue : endValue,
|
|
472
537
|
},
|
|
473
|
-
|
|
538
|
+
_14;
|
|
474
539
|
}
|
|
475
540
|
};
|
|
476
541
|
var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser) {
|
package/build/utils/util.js
CHANGED
|
@@ -629,7 +629,7 @@ var validateData = function (fields, data) {
|
|
|
629
629
|
fieldValue.length <= 0) {
|
|
630
630
|
return;
|
|
631
631
|
}
|
|
632
|
-
var fieldTitle = field.fieldTitle.en;
|
|
632
|
+
var fieldTitle = field.fieldTitle.get("en");
|
|
633
633
|
if (field.type === "file" && typeof fieldValue === "string") {
|
|
634
634
|
try {
|
|
635
635
|
fieldValue = JSON.parse(fieldValue);
|
|
@@ -756,7 +756,7 @@ var validateUrl = function (url) {
|
|
|
756
756
|
exports.validateUrl = validateUrl;
|
|
757
757
|
var toggleConsoleLogs = function (enable) {
|
|
758
758
|
if (enable && CONSOLE_LOG_MODIFIED) {
|
|
759
|
-
console.log(
|
|
759
|
+
console.log("==> Enabling console log|info...");
|
|
760
760
|
if (OLD_CONSOLE_LOG && OLD_CONSOLE_INFO) {
|
|
761
761
|
console.log = OLD_CONSOLE_LOG;
|
|
762
762
|
console.info = OLD_CONSOLE_INFO;
|
|
@@ -767,7 +767,7 @@ var toggleConsoleLogs = function (enable) {
|
|
|
767
767
|
else if (!enable && !CONSOLE_LOG_MODIFIED) {
|
|
768
768
|
OLD_CONSOLE_LOG = console.log;
|
|
769
769
|
OLD_CONSOLE_INFO = console.info;
|
|
770
|
-
console.log(
|
|
770
|
+
console.log("==> Disabling console log|info...");
|
|
771
771
|
console.log = function () { };
|
|
772
772
|
console.info = function () { };
|
|
773
773
|
CONSOLE_LOG_MODIFIED = true;
|
|
@@ -777,11 +777,11 @@ var toggleConsoleLogs = function (enable) {
|
|
|
777
777
|
exports.toggleConsoleLogs = toggleConsoleLogs;
|
|
778
778
|
// Utility function to replace '/' with '____'
|
|
779
779
|
var replaceSlashWithUnderscore = function (value) {
|
|
780
|
-
return value && value.replace(/\//g,
|
|
780
|
+
return value && value.replace(/\//g, "____");
|
|
781
781
|
};
|
|
782
782
|
exports.replaceSlashWithUnderscore = replaceSlashWithUnderscore;
|
|
783
783
|
// Utility function to replace '____' with '/'
|
|
784
784
|
var replaceUnderscoreWithSlash = function (value) {
|
|
785
|
-
return value && value.replace(/____/g,
|
|
785
|
+
return value && value.replace(/____/g, "/");
|
|
786
786
|
};
|
|
787
787
|
exports.replaceUnderscoreWithSlash = replaceUnderscoreWithSlash;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "drapcode-utility",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -37,9 +37,9 @@
|
|
|
37
37
|
"@types/voca": "^1.4.2",
|
|
38
38
|
"axios": "^1.1.2",
|
|
39
39
|
"dompurify": "^3.1.7",
|
|
40
|
-
"drapcode-constant": "^1.6.
|
|
41
|
-
"drapcode-logger": "^1.
|
|
42
|
-
"drapcode-redis": "^1.1.
|
|
40
|
+
"drapcode-constant": "^1.6.3",
|
|
41
|
+
"drapcode-logger": "^1.3.0",
|
|
42
|
+
"drapcode-redis": "^1.1.9",
|
|
43
43
|
"exiftool-vendored": "^28.2.1",
|
|
44
44
|
"express": "^4.17.1",
|
|
45
45
|
"gm": "^1.25.0",
|