jd_platform_sdk 0.2.5 → 0.3.1

package/dist/sdk/utilities/dateUtils.js

@@ -7,35 +7,62 @@ export class DateUtils {
     //////////////////////////////////////////////////////////////////////////////////
     static formatPrettyDate(date) {
         const now = new Date();
-        // console.log(`${now} : ${date}`);
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        const diff = Math.floor((now - date) / 1000); // Calculate time difference in seconds
-        if (diff < 5) {
-            return 'just now';
-        }
-        else if (diff < 60) {
-            return `${diff} seconds ago`;
-        }
-        else if (diff < 3600) {
-            const minutes = Math.floor(diff / 60);
-            return `${minutes} ${minutes === 1 ? 'minute' : 'minutes'} ago`;
-        }
-        else if (diff < 86400) {
-            const hours = Math.floor(diff / 3600);
-            return `${hours} ${hours === 1 ? 'hour' : 'hours'} ago`;
-        }
-        else if (diff < 2592000) {
-            const days = Math.floor(diff / 86400);
-            return `${days} ${days === 1 ? 'day' : 'days'} ago`;
-        }
-        else if (diff < 31536000) {
-            const months = Math.floor(diff / 2592000);
-            return `${months} ${months === 1 ? 'month' : 'months'} ago`;
+        const diffSeconds = Math.floor((now.getTime() - date.getTime()) / 1000);
+        // Past dates (diffSeconds is positive)
+        if (diffSeconds >= 0) {
+            if (diffSeconds < 5) {
+                return 'just now';
+            }
+            else if (diffSeconds < 60) {
+                return `${diffSeconds} seconds`;
+            }
+            else if (diffSeconds < 3600) {
+                const minutes = Math.floor(diffSeconds / 60);
+                return `${minutes} ${minutes === 1 ? 'minute' : 'minutes'}`;
+            }
+            else if (diffSeconds < 86400) {
+                const hours = Math.floor(diffSeconds / 3600);
+                return `${hours} ${hours === 1 ? 'hour' : 'hours'}`;
+            }
+            else if (diffSeconds < 2592000) {
+                const days = Math.floor(diffSeconds / 86400);
+                return `${days} ${days === 1 ? 'day' : 'days'}`;
+            }
+            else if (diffSeconds < 31536000) {
+                const months = Math.floor(diffSeconds / 2592000);
+                return `${months} ${months === 1 ? 'month' : 'months'}`;
+            }
+            else {
+                const years = Math.floor(diffSeconds / 31536000);
+                return `${years} ${years === 1 ? 'year' : 'years'}`;
+            }
         }
+        // Future dates (diffSeconds is negative)
         else {
-            const years = Math.floor(diff / 31536000);
-            return `${years} ${years === 1 ? 'year' : 'years'} ago`;
+            const futureDiffSeconds = Math.abs(diffSeconds);
+            if (futureDiffSeconds < 60) {
+                return `in ${futureDiffSeconds} seconds`;
+            }
+            else if (futureDiffSeconds < 3600) {
+                const minutes = Math.floor(futureDiffSeconds / 60);
+                return `in ${minutes} ${minutes === 1 ? 'minute' : 'minutes'}`;
+            }
+            else if (futureDiffSeconds < 86400) {
+                const hours = Math.floor(futureDiffSeconds / 3600);
+                return `in ${hours} ${hours === 1 ? 'hour' : 'hours'}`;
+            }
+            else if (futureDiffSeconds < 2592000) {
+                const days = Math.floor(futureDiffSeconds / 86400);
+                return `in ${days} ${days === 1 ? 'day' : 'days'}`;
+            }
+            else if (futureDiffSeconds < 31536000) {
+                const months = Math.floor(futureDiffSeconds / 2592000);
+                return `in ${months} ${months === 1 ? 'month' : 'months'}`;
+            }
+            else {
+                const years = Math.floor(futureDiffSeconds / 31536000);
+                return `in ${years} ${years === 1 ? 'year' : 'years'}`;
+            }
         }
     }
     //Get Time stamp with random to avoid API call cachings

package/dist/sdk/utilities/utils.d.ts

@@ -4,6 +4,8 @@ export declare class Utils {
         value: string;
         label: string;
     }[];
+    static getSdkVersion(): string;
+    static getTimeStamp(): string;
     static nl2br(str: string, is_xhtml: boolean): string;
     static hasField(data: Record<string, any>, field: string): boolean;
     static getString(data: Record<string, any>, field: string, defaultVal?: string): string;
@@ -23,6 +25,7 @@ export declare class Utils {
     static stringToArray(strData: string): any[];
     static objectToString(data: object): string;
     static arrayToString(dataArray: object): string;
+    static simpleArrayToString(dataArray: any[], separator?: string): string;
     static allFieldsToNumber(fields: Record<string, any>): Record<string, number>;
     static parseServerValidationErrors(error: Record<string, any>, message?: string): Record<string, string>;
     static slugify(text: string): string;

package/dist/sdk/utilities/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/sdk/utilities/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/sdk/utilities/utils.ts"],"names":[],"mappings":"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"}

package/dist/sdk/utilities/utils.js

@@ -11,6 +11,13 @@ export class Utils {
         { value: "500", label: "500" },
         { value: "1000", label: "1000" }
     ];
+    static getSdkVersion() {
+        return "0.3.0";
+    }
+    //Get linux timestamp for random value
+    static getTimeStamp() {
+        return (Date.now() + Math.floor(Math.random() * 10000)).toString();
+    }
     static nl2br(str, is_xhtml) {
         const breakTag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br ' + '/>' : '<br>'; // Adjust comment to avoid issue on phpjs.org display
         return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + breakTag + '$2');
@@ -46,7 +53,12 @@ export class Utils {
     }
     static getDate(data, field) {
         const strMongoDate = this.getString(data, field).replace('000', 'Z');
-        return new Date(strMongoDate);
+        const date = new Date(strMongoDate);
+        if (isNaN(date.getTime())) { // Check if the date is invalid
+            // console.log(`Default date given: ${field} - ${strMongoDate}`);
+            return new Date(); // Return current date as a fallback
+        }
+        return date;
     }
     static isMongoDateExpiredFromField(data, field) {
         const oldDate = this.getDate(data, field);
@@ -97,6 +109,21 @@ export class Utils {
             return "[]";
         }
     }
+    static simpleArrayToString(dataArray, separator = ', ') {
+        // Check if the input is an array
+        if (!Array.isArray(dataArray)) {
+            console.log("Input must be an array");
+            return "";
+        }
+        let strValue = '';
+        for (const contentData of dataArray) {
+            let val = contentData.toString();
+            if (val != '') {
+                strValue += val + separator;
+            }
+        }
+        return strValue;
+    }
     static allFieldsToNumber(fields) {
         const newFields = {};
         Object.keys(fields).forEach((key) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jd_platform_sdk",
-  "version": "0.2.5",
+  "version": "0.3.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/readme.md

@@ -43,6 +43,7 @@ node --import=tsx .\test-script.ts
 
 ### Linking project
 ````
+#This step is important for newly created server, otherwise, the module will be missing 
 cd /path/to/my-utils-package
 npm link
 ````