drapcode-utility 1.0.0 → 1.0.1

package/build/errors/app-error.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/errors/axios-error.d.ts

@@ -8,6 +8,3 @@ export declare const parseAxiosError: (error: AxiosError) => {
     error: any;
     status: number;
 };
-export declare const parseXanoConfigError: (error: any) => string;
-export declare const parseAirtableConfigError: (error: any) => string;
-export declare const parseSupabaseConfigError: (error: any) => string;

package/build/errors/axios-error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSupabaseConfigError = exports.parseAirtableConfigError = exports.parseXanoConfigError = exports.parseAxiosError = void 0;
+exports.parseAxiosError = void 0;
 var parseAxiosError = function (error) {
     if (!error) {
         return {};
@@ -29,50 +29,3 @@ var parseAxiosError = function (error) {
     return { success: false, error: errData, status: errStatus };
 };
 exports.parseAxiosError = parseAxiosError;
-var parseXanoConfigError = function (error) {
-    if (!error || !error.code) {
-        return "Failed from Xano";
-    }
-    var errorMessage = "";
-    switch (error.code) {
-        case "ERROR_CODE_UNAUTHORIZED":
-            errorMessage = "Developer API Key is wrong";
-            break;
-        default:
-            errorMessage = "Failed from Xano";
-            break;
-    }
-    return errorMessage;
-};
-exports.parseXanoConfigError = parseXanoConfigError;
-var parseAirtableConfigError = function (error) {
-    if (!error || !error.error || !error.error.type) {
-        return "Failed from Airtable";
-    }
-    var errorMessage = "";
-    switch (error.error.type) {
-        case "AUTHENTICATION_REQUIRED":
-            errorMessage = "Authorization is missing/wrong.";
-            break;
-        default:
-            errorMessage = "Failed from Airtable";
-            break;
-    }
-    return errorMessage;
-};
-exports.parseAirtableConfigError = parseAirtableConfigError;
-var parseSupabaseConfigError = function (error) {
-    if (!error) {
-        return "Failed from Supabase";
-    }
-    var errorMessage = "";
-    switch (error) {
-        case "ENOTFOUND":
-            errorMessage = "Given Supabase URL does not exists/API Key is wrong";
-            break;
-        default:
-            break;
-    }
-    return errorMessage;
-};
-exports.parseSupabaseConfigError = parseSupabaseConfigError;

package/build/errors/bad-request-error.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/errors/custom-error.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/errors/not-found.js

@@ -7,6 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/build/utils/check-error.js

@@ -35,12 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -176,7 +174,7 @@ var nestedValue = function (data, messages) {
             messages.push(value);
         }
         else if (Array.isArray(value)) {
-            messages = __spreadArrays(messages, value);
+            messages = __spreadArray(__spreadArray([], messages), value);
         }
         else {
             if (Object.keys(value).length) {

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

@@ -1,8 +1,8 @@
 export declare const DATE_REGEX: RegExp;
-export declare const createLoggerDateFormat: () => any;
+export declare const createLoggerDateFormat: (timezone?: string) => any;
 export declare const createLoggerPreviouseDateFormat: () => any;
-export declare const createLogsDateFormat: () => any;
-export declare const getDateValue: (value: string) => any;
+export declare const createLogsDateFormat: (timezone?: string) => any;
+export declare const getDateValue: (value: string, timezone?: string) => any;
 export declare const nextDayDate: (date: any) => any;
 export declare const timezoneDateParse: (value: string, nextDay?: boolean, prevDay?: boolean) => Date;
 export declare const formatProjectDates: (item: any, dateFormat: string, fields: Array<object>, reverse: boolean) => any;

package/build/utils/date-util.js

@@ -4,32 +4,46 @@ exports.formatProjectDates = exports.timezoneDateParse = exports.nextDayDate = e
 var drapcode_constant_1 = require("drapcode-constant");
 var moment = require("moment");
 exports.DATE_REGEX = /^[12]\d{3}(-(0[1-9]|1[0-2])(-(0[1-9]|[12][0-9]|3[01]))?)(T| )?(([01][0-9]|2[0-3]):[0-5]\d(:[0-5]\d(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?)?$/;
-var createLoggerDateFormat = function () {
-    return moment().format("YYYY-MM-DD");
+var createLoggerDateFormat = function (timezone) {
+    if (timezone === void 0) { timezone = ""; }
+    var result = moment();
+    console.log("\n result 1 :>> ", result);
+    result = timezone ? result.utcOffset(timezone) : result;
+    console.log("\n result 2 :>> ", result);
+    return result.format("YYYY-MM-DD");
 };
 exports.createLoggerDateFormat = createLoggerDateFormat;
 var createLoggerPreviouseDateFormat = function () {
     return moment().subtract(10, "days").format("YYYY-MM-DD");
 };
 exports.createLoggerPreviouseDateFormat = createLoggerPreviouseDateFormat;
-var createLogsDateFormat = function () {
-    return moment().format("YYYY-MM-DDTHH:mm:ss.SSS");
+var createLogsDateFormat = function (timezone) {
+    if (timezone === void 0) { timezone = ""; }
+    var result = moment();
+    console.log("\n result 1 :>> ", result);
+    result = timezone ? result.utcOffset(timezone) : result;
+    console.log("\n result 2 :>> ", result);
+    return result.format("YYYY-MM-DDTHH:mm:ss.SSS");
 };
 exports.createLogsDateFormat = createLogsDateFormat;
-var getDateValue = function (value) {
+var getDateValue = function (value, timezone) {
+    if (timezone === void 0) { timezone = ""; }
     if (!value)
-        return exports.createLogsDateFormat();
+        return exports.createLogsDateFormat(timezone);
     var dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
     var _a = value.split(":"), type = _a[0], number = _a[1], unit = _a[2];
+    if (!["ADD", "SUB"].includes(type))
+        return exports.createLogsDateFormat(timezone);
     var dateUnit = getDateUnit(unit);
+    var result;
     if (type === "ADD") {
-        return moment().add(number, dateUnit).format(dateFormat);
+        result = moment().add(number, dateUnit);
     }
     else if (type === "SUB") {
-        return moment().subtract(number, dateUnit).format(dateFormat);
+        result = moment().subtract(number, dateUnit);
     }
-    else
-        return exports.createLogsDateFormat();
+    result = timezone ? result.utcOffset(timezone) : result;
+    return result.format(dateFormat);
 };
 exports.getDateValue = getDateValue;
 var getDateUnit = function (unit) {

package/build/utils/query-parser.js

@@ -35,12 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -68,7 +66,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     if (!query)
                         return [2 /*return*/, ""];
                     console.log("***1*** queryParser ***");
-                    filterQuery = mongoFilterQuery(query, externalParams, constants, currentUser, currentTenant);
+                    filterQuery = mongoFilterQuery(query, externalParams, constants, currentUser, currentTenant, timezone);
                     console.log("**************************");
                     console.log("filterQuery", JSON.stringify(filterQuery));
                     console.log("==> searchQueryTypeObj :>>", searchQueryTypeObj);
@@ -80,7 +78,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         searchQueryObj = null;
                         if (searchObj) {
                             _a = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _a.searchAggregateQuery, likeQuery = _a.likeQuery;
-                            aggregateQuery = __spreadArrays(aggregateQuery, searchAggregateQuery);
+                            aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
                             if (likeQuery && likeQuery.length > 0) {
                                 searchQueryObj = likeQuery;
                             }
@@ -93,7 +91,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     }
                     else if (searchObj) {
                         _b = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _b.searchAggregateQuery, likeQuery = _b.likeQuery;
-                        aggregateQuery = __spreadArrays(aggregateQuery, searchAggregateQuery);
+                        aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
                         if (likeQuery.length) {
                             // aggregateQuery.push({ $match: { $or: likeQuery } });
                             aggregateQuery.push({ $match: { $and: likeQuery } });
@@ -233,7 +231,7 @@ var toBoolean = function (value) {
             return false;
     }
 };
-var mongoFilterQuery = function (query, externalParams, constants, currentUser, currentTenant) {
+var mongoFilterQuery = function (query, externalParams, constants, currentUser, currentTenant, timezone) {
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
     var filterQuery = { $or0: [] };
@@ -242,7 +240,7 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser,
     conditions.forEach(function (queryObj, index) {
         var query = queryObj.query, requiredExternal = queryObj.requiredExternal;
         console.log("query :>> ", JSON.stringify(query));
-        var mongoQuery = queryToMongo(query, requiredExternal, externalParams, constants, currentUser, currentTenant);
+        var mongoQuery = queryToMongo(query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone);
         console.log(":::::::::mongoQuery::::", JSON.stringify(mongoQuery));
         queryConjunctions.push(queryObj.conjunctionType);
         if (queryObj.conjunctionType == "OR") {
@@ -311,11 +309,11 @@ var modifyQuery = function (obj, hasAndQueryConjunction) {
     console.log("🚀 ~ file: query-parser.ts:303 ~ Object.entries ~ arr:", arr);
     return arr;
 };
-var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant) {
+var queryToMongo = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone) {
     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;
     if (currentUser === void 0) { currentUser = {}; }
     if (currentTenant === void 0) { currentTenant = {}; }
-    var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant);
+    var fieldValue = replaceExternalParams(query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone);
     if (["undefined", "null", null, undefined, ""].includes(fieldValue)) {
         //TODO: In case field is not present in old record then fieldValue is undefined
         //TODO: In case of this, we assign some random string to avoid resulting all values
@@ -327,8 +325,8 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
     var isDate = checkDate(fieldValue);
     console.log("isDate queryToMongo 2", isDate);
     var key = query.key, field = query.field, value = query.value, fieldType = query.fieldType;
-    if (isDate)
-        fieldValue = new Date(fieldValue);
+    // Todo: Remove if it's working properly
+    // if (isDate) fieldValue = new Date(fieldValue);
     console.log("fieldValue queryToMongo 1", fieldValue);
     var condition = [
         "dynamic_option",
@@ -458,7 +456,7 @@ var isEntityInCondition = function (value) {
     return isEntity;
 };
 exports.isEntityInCondition = isEntityInCondition;
-var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant) {
+var replaceExternalParams = function (query, requiredExternal, externalParams, constants, currentUser, currentTenant, timezone) {
     var key = query.key, value = query.value, fieldType = query.fieldType;
     if (fieldType &&
         !requiredExternal &&
@@ -490,16 +488,16 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             endValue_1 = "" + externalParams[endValue_1];
         }
         else {
-            if (__spreadArrays([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
-                startValue_1 = getValueOfProjectConstant(startValue_1, currentUser);
+                startValue_1 = getValueOfProjectConstant(startValue_1, currentUser, timezone);
             }
             else {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
-            if (__spreadArrays([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
-                endValue_1 = getValueOfProjectConstant(endValue_1, currentUser);
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
+                endValue_1 = getValueOfProjectConstant(endValue_1, currentUser, timezone);
             }
             else {
                 endValue_1 = constants.filter(function (constant) { return constant.name == endValue_1; });
@@ -611,7 +609,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         return currentTenant["uuid"];
     }
     if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
-        return getValueOfProjectConstant(value, {});
+        return getValueOfProjectConstant(value, {}, timezone);
     }
     if (exports.isEntityInCondition(value)) {
         var key_1 = value.replace("ENTITY::", "");
@@ -647,15 +645,20 @@ var getMinMaxValue = function (value) {
     }
 };
 exports.getMinMaxValue = getMinMaxValue;
-var getValueOfProjectConstant = function (value, currentUser) {
+var getValueOfProjectConstant = function (value, currentUser, timezone) {
+    if (!timezone)
+        timezone = "(GMT+5:30)";
+    timezone = timezone.substring(4, 10);
+    var result;
     if (value === drapcode_constant_1.CURRENT_USER)
         return currentUser["uuid"];
     if (value === drapcode_constant_1.CURRENT_DATE)
-        return date_util_1.createLoggerDateFormat();
+        result = date_util_1.createLoggerDateFormat(timezone);
     if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
-        return date_util_1.createLogsDateFormat();
+        result = date_util_1.createLogsDateFormat(timezone);
     if (drapcode_constant_1.DateTimeUnit.some(function (cnst) { return value.includes(cnst); }))
-        return date_util_1.getDateValue(value);
+        result = date_util_1.getDateValue(value, timezone);
+    return result;
 };
 var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
     var searchAggregateQuery = [];

package/build/utils/query-paser-new.js

@@ -35,12 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryParserNew = void 0;
@@ -573,7 +571,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             endValue_1 = "" + externalParams[endValue_1];
         }
         else {
-            if (__spreadArrays([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
                 startValue_1 = getValueOfProjectConstant(startValue_1, currentUser);
@@ -581,7 +579,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             else {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
-            if (__spreadArrays([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
                 endValue_1 = getValueOfProjectConstant(endValue_1, currentUser);
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",