drapcode-utility 2.6.2 → 2.6.4

package/build/query/queryBuilder.js

@@ -326,8 +326,12 @@ const conditionToQuery = (query, requiredExternal, externalParams, constants, ti
             const { startValue, endValue, isInteger } = (0, query_utils_1.getMinMaxValue)(fieldValue);
             return {
                 [field]: {
-                    $gte: isInteger ? +startValue : startValue,
-                    $lte: isInteger ? +endValue : endValue,
+                    $gte: isInteger
+                        ? +startValue
+                        : prepareBetweenValues(startValue, fieldType),
+                    $lte: isInteger
+                        ? +endValue
+                        : prepareBetweenValues(endValue, fieldType),
                 },
             };
         }
@@ -461,7 +465,7 @@ const changeExternalParams = (query, requiredExternal, externalParams, constants
         else {
             const resolveValue = (val) => {
                 if ([drapcode_constant_1.CURRENT_USER, ...drapcode_constant_1.DateConstant].some((cnst) => val.includes?.(cnst))) {
-                    return (0, query_utils_1.getValueOfProjectConstant)(val, user, timezone);
+                    return (0, query_utils_1.getValueOfProjectConstant)(val, user, timezone, fieldType);
                 }
                 else if (!isFixedValue) {
                     const found = constants.find((constant) => constant.name === val);
@@ -575,3 +579,8 @@ const prepareBooleanQuery = (field, fieldValue) => {
             $or: [{ [field]: boolVal }, { [field]: { $exists: false } }],
         };
 };
+const prepareBetweenValues = (value, fieldType) => {
+    if (["createdat", "updatedat", ...drapcode_constant_1.systemDateField].includes(fieldType))
+        return new Date(value);
+    return value;
+};

package/build/utils/date-util.d.ts

@@ -23,7 +23,7 @@ export declare const DATE_REGEX: RegExp;
 export declare const createLoggerDateFormat: (timezone?: string) => string;
 export declare const createLoggerPreviousDateFormat: () => string;
 export declare const createLogsDateFormat: (timezone?: string) => string;
-export declare const getDateValue: (value: string, timezone?: string) => string;
+export declare const getDateValue: (value: string, timezone?: string, fieldType?: string) => string;
 export declare const getDateRangeValue: (key: string, field: string, value: string) => DateRangeValue;
 export declare const nextDayDate: (date: string | Date) => string;
 export declare const timezoneDateParse: (value: string, nextDay?: boolean, prevDay?: boolean) => Date;

package/build/utils/date-util.js

@@ -47,11 +47,11 @@ const createLogsDateFormat = (timezone) => {
     }
 };
 exports.createLogsDateFormat = createLogsDateFormat;
-const getDateValue = (value, timezone) => {
+const getDateValue = (value, timezone, fieldType = "datetime-local") => {
     try {
         if (!value)
             return (0, exports.createLogsDateFormat)(timezone);
-        const dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
+        const dateFormat = fieldType === "date" ? "YYYY-MM-DD" : "YYYY-MM-DDTHH:mm:ss.SSS";
         const [type, number, unit] = value.split(":");
         if (!["ADD", "SUB"].includes(type)) {
             return (0, exports.createLogsDateFormat)(timezone);

package/build/utils/query-utils.d.ts

@@ -17,4 +17,4 @@ export declare const getMinMaxValue: (value: any) => {
     isInteger?: undefined;
 };
 export declare const isFixedValueQuery: (value: any) => boolean;
-export declare const getValueOfProjectConstant: (value: any, currentUser: any, timezone: string) => any;
+export declare const getValueOfProjectConstant: (value: any, currentUser: any, timezone: string, fieldType?: string) => any;

package/build/utils/query-utils.js

@@ -242,7 +242,7 @@ const isFixedValueQuery = (value) => {
     return isFixeValue;
 };
 exports.isFixedValueQuery = isFixedValueQuery;
-const getValueOfProjectConstant = (value, currentUser, timezone) => {
+const getValueOfProjectConstant = (value, currentUser, timezone, fieldType = "datetime-local") => {
     if (!timezone)
         timezone = "(GMT+5:30)";
     timezone = timezone.substring(4, 10);
@@ -254,7 +254,7 @@ const getValueOfProjectConstant = (value, currentUser, timezone) => {
     if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
         result = (0, date_util_1.createLogsDateFormat)(timezone);
     if (drapcode_constant_1.DateTimeUnit.some((cnst) => value.includes(cnst)))
-        result = (0, date_util_1.getDateValue)(value, timezone);
+        result = (0, date_util_1.getDateValue)(value, timezone, fieldType);
     return result;
 };
 exports.getValueOfProjectConstant = getValueOfProjectConstant;

package/build/utils/util.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -12,7 +45,7 @@ const format_fields_1 = require("../format-fields");
 const uuid_1 = require("uuid");
 const voca_1 = __importDefault(require("voca"));
 const numeral_1 = __importDefault(require("numeral"));
-const mathjs_1 = __importDefault(require("mathjs"));
+const math = __importStar(require("mathjs"));
 const moment_1 = __importDefault(require("moment"));
 const mime_types_1 = __importDefault(require("mime-types"));
 const uuid_2 = require("uuid");
@@ -935,7 +968,7 @@ const addition = function (formatType, { numbers }) {
         }
         numbers = numbers.map((number) => (isNaN(number) ? 0 : number));
         const allNumbers = (0, exports.validateNumbers)(numbers);
-        return (0, numeral_1.default)(mathjs_1.default.sum(allNumbers)).format(formatType ? formatType : "00.00");
+        return (0, numeral_1.default)(math.sum(allNumbers)).format(formatType ? formatType : "00.00");
     }
     catch (err) {
         console.log("🚀 ~ file: util.js:89 ~ addition ~ error:", err);
@@ -946,12 +979,12 @@ exports.addition = addition;
 const substraction = function (formatType, { numbers1, numbers2 }) {
     try {
         const actNumber1 = Array.isArray(numbers1)
-            ? mathjs_1.default.sum(...numbers1)
+            ? math.sum(...numbers1)
             : numbers1;
         const actNumber2 = Array.isArray(numbers2)
-            ? mathjs_1.default.sum(...numbers2)
+            ? math.sum(...numbers2)
             : numbers2;
-        return (0, numeral_1.default)(mathjs_1.default.subtract(actNumber1, actNumber2)).format(formatType ? formatType : "00.00");
+        return (0, numeral_1.default)(math.subtract(actNumber1, actNumber2)).format(formatType ? formatType : "00.00");
     }
     catch (err) {
         console.log("🚀 ~ file: util.js:202 ~ substraction ~ error:", err);
@@ -966,7 +999,7 @@ const average = function (formatType, { numbers }) {
         }
         numbers = numbers.map((number) => (isNaN(number) ? 0 : number));
         const allNumbers = (0, exports.validateNumbers)(numbers);
-        return (0, numeral_1.default)(mathjs_1.default.mean(...allNumbers)).format(formatType ? formatType : "00.00");
+        return (0, numeral_1.default)(math.mean(...allNumbers)).format(formatType ? formatType : "00.00");
     }
     catch (err) {
         console.log("🚀 ~ file: util.js:98 ~ average ~ error:", err);
@@ -981,7 +1014,7 @@ const multiply = function (formatType, { numbers }) {
         }
         numbers = numbers.map((number) => (isNaN(number) ? 1 : number));
         const allNumbers = (0, exports.validateNumbers)(numbers);
-        return (0, numeral_1.default)(mathjs_1.default.prod(...allNumbers)).format(formatType ? formatType : "00.00");
+        return (0, numeral_1.default)(math.prod(...allNumbers)).format(formatType ? formatType : "00.00");
     }
     catch (err) {
         console.log("🚀 ~ file: util.js:106 ~ multiply ~ error:", err);
@@ -993,7 +1026,7 @@ const divide = function (formatType, { number1, number2 }) {
     try {
         const num1 = (0, exports.checkAndConvertNumber)(number1);
         const num2 = (0, exports.checkAndConvertNumber)(number2);
-        return (0, numeral_1.default)(mathjs_1.default.divide(num1, num2)).format(formatType ? formatType : "00.00");
+        return (0, numeral_1.default)(math.divide(num1, num2)).format(formatType ? formatType : "00.00");
     }
     catch (err) {
         console.log("🚀 ~ file: util.js:114 ~ divide ~ error:", err);
@@ -1007,7 +1040,7 @@ const evaluateExpression = function (expression, data, user, formatType, envCons
         : " ";
     const replacedExpression = (0, exports.replaceDataValueIntoExpression)(expression, data, user, {}, {}, {}, {}, envConstants, {}, {}, {});
     try {
-        return (0, numeral_1.default)(mathjs_1.default.evaluate(replacedExpression)).format(formatType ? formatType : "00.00");
+        return (0, numeral_1.default)(math.evaluate(replacedExpression)).format(formatType ? formatType : "00.00");
     }
     catch (err) {
         return "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.6.2",
+  "version": "2.6.4",
   "description": "DrapCode Utility",
   "main": "build/index.js",
   "types": "build/index.d.ts",