ismx-nexo-node-app 0.4.24 → 0.4.26

package/dist/js/business/utils/DateUtils.js

@@ -68,6 +68,29 @@ class DateUtils {
             result += ":" + `${final.getSeconds()}`.padStart(2, "0");
         return result;
     }
+    static isIsoDate(value) {
+        return typeof value === 'string' && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/.test(value);
+    }
+    static reviveDate(value) {
+        return DateUtils.isIsoDate(value) ? new Date(value) : value;
+    }
+    static reviveDates(obj) {
+        const isIsoDate = (str) => typeof str === 'string' && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/.test(str);
+        const recursivelyRevive = (input) => {
+            if (Array.isArray(input))
+                return input.map(recursivelyRevive);
+            if (input && typeof input === 'object') {
+                for (const key in input) {
+                    if (isIsoDate(input[key]))
+                        input[key] = new Date(input[key]);
+                    else
+                        input[key] = recursivelyRevive(input[key]);
+                }
+            }
+            return input;
+        };
+        return recursivelyRevive(obj);
+    }
 }
 DateUtils.MILLIS = 1;
 DateUtils.SECONDS = 1000 * DateUtils.MILLIS;

package/dist/js/repository/RepositoryRest.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Repository_1 = __importDefault(require("./Repository"));
 const QueryUtils_1 = __importDefault(require("./utils/QueryUtils"));
+const DateUtils_1 = __importDefault(require("../business/utils/DateUtils"));
 class RepositoryRest extends Repository_1.default {
     constructor(baseUrl, options = {}) {
         super();
@@ -42,20 +43,29 @@ class RepositoryRest extends Repository_1.default {
                 let headers = {};
                 res.headers.forEach((value, key) => headers[key] = value);
                 let rawResponse = yield res.text();
-                (_b = (_a = this.options).onRawResponse) === null || _b === void 0 ? void 0 : _b.call(_a, rawResponse);
+                (_b = (_a = this.options).onRawResponse) === null || _b === void 0 ? void 0 : _b.call(_a, request, rawResponse);
                 let response = {
                     httpCode: res.status,
-                    content: JSON.stringify(rawResponse),
+                    content: JSON.parse(rawResponse, this.reviver),
                     headers
                 };
-                (_d = (_c = this.options) === null || _c === void 0 ? void 0 : _c.onResponse) === null || _d === void 0 ? void 0 : _d.call(_c, response);
+                (_d = (_c = this.options) === null || _c === void 0 ? void 0 : _c.onResponse) === null || _d === void 0 ? void 0 : _d.call(_c, request, response);
                 return response;
             })).catch((error) => {
                 var _a, _b;
-                (_b = (_a = this.options).onError) === null || _b === void 0 ? void 0 : _b.call(_a, error);
+                (_b = (_a = this.options).onError) === null || _b === void 0 ? void 0 : _b.call(_a, request, error);
                 throw error;
             });
         });
     }
+    reviver(key, value) {
+        var _a, _b;
+        let revived = (_b = (_a = this.options).jsonReviver) === null || _b === void 0 ? void 0 : _b.call(_a, key, value);
+        if (revived)
+            return revived;
+        if (DateUtils_1.default.isIsoDate(value))
+            return new Date(value);
+        return value;
+    }
 }
 exports.default = RepositoryRest;

package/dist/types/business/utils/DateUtils.d.ts

@@ -14,4 +14,7 @@ export default abstract class DateUtils {
     static toIsoDate(date: Date): string;
     static sum(date: Date, value: number, component: number): Date;
     static sumTime(date: string, value: number, component: number): string;
+    static isIsoDate(value: string): boolean;
+    static reviveDate(value: string): string | Date;
+    static reviveDates<T>(obj: T): T;
 }

package/dist/types/repository/RepositoryRest.d.ts

@@ -2,13 +2,15 @@ import Repository from "./Repository";
 import { HttpRequest, HttpResponse } from "../api/Service";
 export interface RestOptions {
     interceptor?: (endpoint: string, request: HttpRequest) => HttpRequest | undefined;
-    onResponse?: (response: HttpResponse) => void;
-    onRawResponse?: (response: string) => void;
-    onError?: (error: Error) => void;
+    jsonReviver?: (key: string, value: string) => any;
+    onResponse?: (request: HttpRequest, response: HttpResponse) => void;
+    onRawResponse?: (request: HttpRequest, response: string) => void;
+    onError?: (request: HttpRequest, error: Error) => void;
 }
 export default class RepositoryRest<Body = any, Res = any> extends Repository {
     private readonly baseUrl;
     private readonly options;
     constructor(baseUrl: string, options?: RestOptions);
     call<B = Body, E = Res>(method?: string, endpoint?: string, request?: HttpRequest<B>): Promise<HttpResponse<E>>;
+    private reviver;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ismx-nexo-node-app",
-  "version": "0.4.24",
+  "version": "0.4.26",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && npx tsc",

package/src/main/node/business/utils/DateUtils.ts

@@ -90,4 +90,29 @@ export default abstract class DateUtils {
         return result;
     }
 
-}
+    static isIsoDate(value: string) {
+       return typeof value === 'string' && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/.test(value);
+    }
+
+    static reviveDate(value: string): string | Date {
+        return DateUtils.isIsoDate(value) ? new Date(value) : value;
+    }
+
+    static reviveDates<T>(obj: T): T
+    {
+        const isIsoDate = (str: any) => typeof str === 'string' && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/.test(str);
+
+        const recursivelyRevive = (input: any): any => {
+            if (Array.isArray(input)) return input.map(recursivelyRevive);
+            if (input && typeof input === 'object') {
+                for (const key in input) {
+                    if (isIsoDate(input[key])) input[key] = new Date(input[key]);
+                    else input[key] = recursivelyRevive(input[key]);
+                }
+            }
+            return input;
+        };
+
+        return recursivelyRevive(obj);
+    }
+}

package/src/main/node/repository/RepositoryRest.ts

@@ -1,12 +1,14 @@
 import Repository from "./Repository";
 import {HttpRequest, HttpResponse} from "../api/Service";
 import QueryUtils from "./utils/QueryUtils";
+import DateUtils from "../business/utils/DateUtils";
 
 export interface RestOptions {
     interceptor?: (endpoint: string, request: HttpRequest) => HttpRequest | undefined
-    onResponse?: (response: HttpResponse) => void;
-    onRawResponse?: (response: string) => void;
-    onError?: (error: Error) => void
+    jsonReviver?: (key: string, value: string) => any
+    onResponse?: (request: HttpRequest, response: HttpResponse) => void;
+    onRawResponse?: (request: HttpRequest, response: string) => void;
+    onError?: (request: HttpRequest, error: Error) => void
 }
 
 export default class RepositoryRest<Body=any,Res=any> extends Repository
@@ -52,19 +54,27 @@ export default class RepositoryRest<Body=any,Res=any> extends Repository
         return call.then(async (res: Response) => {
             let headers: any = {}; res.headers.forEach((value, key) => headers[key] = value);
             let rawResponse = await res.text();
-            this.options.onRawResponse?.(rawResponse);
+            this.options.onRawResponse?.(request, rawResponse);
             let response: HttpResponse<E> = {
                 httpCode: res.status,
-                content: JSON.stringify(rawResponse) as E,
+                content: JSON.parse(rawResponse, this.reviver) as E,
                 headers
             };
-            this.options?.onResponse?.(response);
+            this.options?.onResponse?.(request, response);
             return response;
         }).catch((error) => {
-            this.options.onError?.(error);
+            this.options.onError?.(request, error);
             throw error;
         });
     }
 
+    private reviver(key: string, value: string) {
+        let revived = this.options.jsonReviver?.(key, value);
+        if (revived) return revived;
+
+        if (DateUtils.isIsoDate(value)) return new Date(value);
+        return value;
+    }
+
 
 }