@wandzai/utils 1.0.43-flow-analytics-1 → 1.0.43-test-time-range

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wandzai/utils",
-  "version": "1.0.43-flow-analytics-1",
+  "version": "1.0.43-test-time-range",
   "description": "Common used utilities library",
   "main": "src/index",
   "scripts": {

package/src/date.d.ts

@@ -1,6 +1,6 @@
 import { DaysRanges, TimeUnits } from '@wandzai/wandz-interfaces';
 export declare const formatDateYearMonthDay: (date: string | Date) => string;
-export declare const calcDatesRange: (range: DaysRanges) => {
+export declare const calcDatesRange: (range: DaysRanges, delta?: number) => {
     startDate: string;
     endDate: string;
 };

package/src/date.js

@@ -4,13 +4,15 @@ exports.getTimeDifference = exports.calcDatesRange = exports.formatDateYearMonth
 const wandz_interfaces_1 = require("@wandzai/wandz-interfaces");
 const formatDateYearMonthDay = (date) => new Date(date).toLocaleDateString('en-CA', { year: 'numeric', month: '2-digit', day: '2-digit' });
 exports.formatDateYearMonthDay = formatDateYearMonthDay;
-const calcDatesRange = (range) => {
+const calcDatesRange = (range, delta = 0) => {
     const today = new Date();
-    const startDate = new Date(today);
-    startDate.setDate(today.getDate() - range);
+    const startDate = new Date();
+    startDate.setDate(today.getDate() - range - delta);
+    const endDate = new Date();
+    endDate.setDate(today.getDate() - delta);
     return {
         startDate: (0, exports.formatDateYearMonthDay)(startDate),
-        endDate: (0, exports.formatDateYearMonthDay)(today),
+        endDate: (0, exports.formatDateYearMonthDay)(endDate),
     };
 };
 exports.calcDatesRange = calcDatesRange;

package/src/date.js.map

@@ -1 +1 @@
-{"version":3,"file":"date.js","sourceRoot":"","sources":["../../../../libs/utils/src/date.ts"],"names":[],"mappings":";;;AAAA,gEAAgE;AAEzD,MAAM,sBAAsB,GAAG,CAAC,IAAmB,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;AAApJ,QAAA,sBAAsB,0BAA8H;AAE1J,MAAM,cAAc,GAAG,CAC1B,KAAiB,EACnB,EAAE;IACA,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;IACzB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IAClC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IAE3C,OAAO;QACH,SAAS,EAAE,IAAA,8BAAsB,EAAC,SAAS,CAAC;QAC5C,OAAO,EAAE,IAAA,8BAAsB,EAAC,KAAK,CAAC;KACzC,CAAC;AACN,CAAC,CAAA;AAXY,QAAA,cAAc,kBAW1B;AAEM,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,QAAmB,EAAU,EAAE;IAEzE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAGvB,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAGtD,QAAQ,QAAQ,EAAE,CAAC;QACf,KAAK,4BAAS,CAAC,KAAK;YAChB,OAAO,cAAc,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7C,KAAK,4BAAS,CAAC,OAAO;YAClB,OAAO,cAAc,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;QACxC,KAAK,4BAAS,CAAC,OAAO;YAClB,OAAO,cAAc,GAAG,IAAI,CAAC;QACjC;YACI,OAAO,cAAc,CAAC;IAC9B,CAAC;AACL,CAAC,CAAA;AAlBY,QAAA,iBAAiB,qBAkB7B"}
+{"version":3,"file":"date.js","sourceRoot":"","sources":["../../../../libs/utils/src/date.ts"],"names":[],"mappings":";;;AAAA,gEAAgE;AAEzD,MAAM,sBAAsB,GAAG,CAAC,IAAmB,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;AAApJ,QAAA,sBAAsB,0BAA8H;AAE1J,MAAM,cAAc,GAAG,CAC1B,KAAiB,EACjB,QAAgB,CAAC,EACnB,EAAE;IACA,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;IAEzB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,GAAG,KAAK,CAAC,CAAC;IAEnD,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;IAC3B,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IAEzC,OAAO;QACH,SAAS,EAAE,IAAA,8BAAsB,EAAC,SAAS,CAAC;QAC5C,OAAO,EAAE,IAAA,8BAAsB,EAAC,OAAO,CAAC;KAC3C,CAAC;AACN,CAAC,CAAA;AAhBY,QAAA,cAAc,kBAgB1B;AAEM,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,QAAmB,EAAU,EAAE;IAEzE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAGvB,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAGtD,QAAQ,QAAQ,EAAE,CAAC;QACf,KAAK,4BAAS,CAAC,KAAK;YAChB,OAAO,cAAc,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7C,KAAK,4BAAS,CAAC,OAAO;YAClB,OAAO,cAAc,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;QACxC,KAAK,4BAAS,CAAC,OAAO;YAClB,OAAO,cAAc,GAAG,IAAI,CAAC;QACjC;YACI,OAAO,cAAc,CAAC;IAC9B,CAAC;AACL,CAAC,CAAA;AAlBY,QAAA,iBAAiB,qBAkB7B"}

package/src/http.d.ts

@@ -2,4 +2,3 @@ import { Request } from 'express';
 export declare function getIpFromHttpRequest(req: Request): string;
 export declare function buildUriBodyString(queryParams: Record<string, any>): string;
 export declare function getEncodedQueryParams(fullUrl: string): object;
-export declare function buildQueryString(params: Record<string, any>): string;

package/src/http.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildQueryString = exports.getEncodedQueryParams = exports.buildUriBodyString = exports.getIpFromHttpRequest = void 0;
+exports.getEncodedQueryParams = exports.buildUriBodyString = exports.getIpFromHttpRequest = void 0;
 const querystring = require("querystring");
 function getIpFromHttpRequest(req) {
     return req.headers['x-forwarded-for']
@@ -8,12 +8,14 @@ function getIpFromHttpRequest(req) {
         : req.socket.remoteAddress;
 }
 exports.getIpFromHttpRequest = getIpFromHttpRequest;
+;
 function buildUriBodyString(queryParams) {
     return Object.keys(queryParams)
         .map((key) => `${encodeURIComponent(key)}=${encodeURIComponent(JSON.stringify(queryParams[key]))}`)
         .join('&');
 }
 exports.buildUriBodyString = buildUriBodyString;
+;
 function getEncodedQueryParams(fullUrl) {
     const queryStringStartIndex = fullUrl.indexOf('?');
     if (queryStringStartIndex === -1) {
@@ -32,13 +34,4 @@ function getEncodedQueryParams(fullUrl) {
     }, {});
 }
 exports.getEncodedQueryParams = getEncodedQueryParams;
-function buildQueryString(params) {
-    const queryItems = Object.entries(params).map(([key, value]) => {
-        const encodedKey = encodeURIComponent(key);
-        const encodedValue = encodeURIComponent(Array.isArray(value) ? JSON.stringify(value) : value);
-        return `${encodedKey}=${encodedValue}`;
-    });
-    return queryItems.join('&');
-}
-exports.buildQueryString = buildQueryString;
 //# sourceMappingURL=http.js.map

package/src/http.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../libs/utils/src/http.ts"],"names":[],"mappings":";;;AACA,2CAA2C;AAM3C,SAAgB,oBAAoB,CAAC,GAAY;IAChD,OAAO,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;QACpC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QAC7D,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;AAC7B,CAAC;AAJD,oDAIC;AAED,SAAgB,kBAAkB,CAAC,WAAgC;IAClE,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SAC7B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;SAClG,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC;AAJD,gDAIC;AAQD,SAAgB,qBAAqB,CAAC,OAAe;IACpD,MAAM,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnD,IAAI,qBAAqB,KAAK,CAAC,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE5C,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5C,IAAI,CAAC;YACJ,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAW,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAE,CAAC,CAAC;AACR,CAAC;AAjBD,sDAiBC;AAQD,SAAgB,gBAAgB,CAAC,MAA2B;IAC3D,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9D,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC3C,MAAM,YAAY,GAAG,kBAAkB,CACtC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CACpD,CAAC;QACF,OAAO,GAAG,UAAU,IAAI,YAAY,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAVD,4CAUC"}
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../libs/utils/src/http.ts"],"names":[],"mappings":";;;AACA,2CAA2C;AAM3C,SAAgB,oBAAoB,CAAC,GAAY;IAChD,OAAO,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;QACpC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QAC7D,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;AAC7B,CAAC;AAJD,oDAIC;AAAA,CAAC;AAEF,SAAgB,kBAAkB,CAAC,WAAgC;IAClE,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SAC7B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;SAClG,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC;AAJD,gDAIC;AAAA,CAAC;AAQF,SAAgB,qBAAqB,CAAC,OAAe;IACpD,MAAM,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnD,IAAI,qBAAqB,KAAK,CAAC,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE5C,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5C,IAAI,CAAC;YACJ,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAW,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAE,CAAC,CAAC;AACR,CAAC;AAjBD,sDAiBC"}

package/src/logger.d.ts

@@ -0,0 +1,12 @@
+import { Logger } from 'winston';
+export interface IMeta {
+    clientTag?: string;
+    domain?: string;
+    campaignId?: string;
+    userId?: string;
+    trackingGuid?: string;
+}
+export interface IEnrichedLogger extends Logger {
+    createChildLogger(meta?: IMeta): Logger;
+}
+export declare function customLogger(serviceName: string): IEnrichedLogger;

package/src/logger.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.customLogger = void 0;
+const uuid_1 = require("uuid");
+const winston = require("winston");
+const { createLogger, format, transports } = winston;
+const createEnrichedLogger = (serviceName) => {
+    const logger = createLogger({
+        level: 'debug',
+        defaultMeta: { service: serviceName },
+        transports: [
+            process.env.NX_LOG_READABLE === 'true'
+                ? new transports.Console({
+                    format: format.simple(),
+                })
+                : new transports.Console({
+                    format: format.json(),
+                }),
+        ],
+    });
+    return {
+        getLogger: () => {
+            return logger;
+        },
+        createChildLogger: (meta) => {
+            let combinedMeta = { trackingGuid: (0, uuid_1.v4)() };
+            if (meta)
+                combinedMeta = { ...combinedMeta, ...meta };
+            return logger.child(combinedMeta);
+        },
+    };
+};
+function customLogger(serviceName) {
+    const enrichedLogger = createEnrichedLogger(serviceName);
+    const handler = {
+        get: function (target, prop, receiver) {
+            if (prop === 'createChildLogger') {
+                return target.createChildLogger;
+            }
+            return target.getLogger()[prop];
+        },
+    };
+    return new Proxy(enrichedLogger, handler);
+}
+exports.customLogger = customLogger;
+//# sourceMappingURL=logger.js.map

package/src/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../libs/utils/src/logger.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAClC,mCAAmC;AAGnC,MAAM,EAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAC,GAAG,OAAO,CAAC;AAcnD,MAAM,oBAAoB,GAAG,CAAC,WAAmB,EAAE,EAAE;IACjD,MAAM,MAAM,GAAG,YAAY,CAAC;QACxB,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,EAAC,OAAO,EAAE,WAAW,EAAC;QACnC,UAAU,EAAE;YACR,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM;gBAClC,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC;oBACrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;iBAC1B,CAAC;gBACF,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC;oBACrB,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;iBACxB,CAAC;SACT;KACJ,CAAC,CAAC;IAEH,OAAO;QACH,SAAS,EAAE,GAAG,EAAE;YACZ,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,iBAAiB,EAAE,CAAC,IAAY,EAAE,EAAE;YAChC,IAAI,YAAY,GAAG,EAAC,YAAY,EAAE,IAAA,SAAM,GAAE,EAAC,CAAC;YAC5C,IAAI,IAAI;gBAAE,YAAY,GAAG,EAAC,GAAG,YAAY,EAAE,GAAG,IAAI,EAAC,CAAC;YACpD,OAAO,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC;KACJ,CAAC;AACN,CAAC,CAAC;AAEF,SAAgB,YAAY,CAAC,WAAmB;IAC5C,MAAM,cAAc,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG;QACZ,GAAG,EAAE,UAAU,MAAM,EAAE,IAAI,EAAE,QAAQ;YACjC,IAAI,IAAI,KAAK,mBAAmB,EAAE,CAAC;gBAC/B,OAAO,MAAM,CAAC,iBAAiB,CAAC;YACpC,CAAC;YAED,OAAO,MAAM,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KACJ,CAAC;IAEF,OAAO,IAAI,KAAK,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAbD,oCAaC"}