@thejob/util 1.0.17 → 1.0.19

package/dist/cjs/common/utils.js

@@ -270,7 +270,7 @@ const displayNameLabel = (name, type = "full", onEmptyLabel = "Not available") =
     }
     return (sequence
         .filter(Boolean)
-        .filter((fragment) => fragment !== schema_1.EmptyString)
+        .filter((fragment) => fragment !== schema_1.EMPTY_STRING)
         .join(" ") || onEmptyLabel);
 };
 exports.displayNameLabel = displayNameLabel;

package/dist/cjs/date/utils.d.ts

@@ -1,12 +1,18 @@
 import { DateRangeOption } from "@thejob/schema";
 import dayjs, { Dayjs } from "dayjs";
+export type DateAgoUnit = "seconds" | "minutes" | "hours" | "days" | "weeks" | "months" | "years";
+export interface DateAgoResult {
+    value: number;
+    unit: DateAgoUnit;
+    isPast: boolean;
+}
 export declare const toDayJS: ({ date, dateFormat, strict, utc, }?: {
     date?: string | number | Dayjs;
     dateFormat?: string;
     strict?: boolean;
     utc?: boolean;
 }) => dayjs.Dayjs;
-export declare const dateAgo: (value: number | string | Date) => string;
+export declare const dateAgo: (value: number | string | Date) => DateAgoResult;
 export declare const dateRangeOptionToDateRange: (option: DateRangeOption) => {
     startDate: string | undefined;
     endDate: string | undefined;

package/dist/cjs/date/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/date/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAoB,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAQrC,eAAO,MAAM,OAAO,GAAI,qCAKrB;IACD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;CACV,gBASL,CAAC;AAEF,eAAO,MAAM,OAAO,GAAI,OAAO,MAAM,GAAG,MAAM,GAAG,IAAI,WAEpD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,QAAQ,eAAe;;;CA4CjE,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/date/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAsB,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAQrC,MAAM,MAAM,WAAW,GACnB,SAAS,GACT,SAAS,GACT,OAAO,GACP,MAAM,GACN,OAAO,GACP,QAAQ,GACR,OAAO,CAAC;AAEZ,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,eAAO,MAAM,OAAO,GAAI,qCAKrB;IACD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;CACV,gBASL,CAAC;AAEF,eAAO,MAAM,OAAO,GAAI,OAAO,MAAM,GAAG,MAAM,GAAG,IAAI,KAAG,aA6BvD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,QAAQ,eAAe;;;CA4CjE,CAAC"}

package/dist/cjs/date/utils.js

@@ -12,7 +12,7 @@ const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFor
 dayjs_1.default.extend(relativeTime_1.default);
 dayjs_1.default.extend(localizedFormat_1.default);
 dayjs_1.default.extend(customParseFormat_1.default);
-const toDayJS = ({ date, dateFormat = schema_1.SystemDateFormat, strict = false, utc = false, } = {}) => {
+const toDayJS = ({ date, dateFormat = schema_1.SYSTEM_DATE_FORMAT, strict = false, utc = false, } = {}) => {
     return (0, dayjs_1.default)(date, {
         utc,
         format: dateFormat,
@@ -20,7 +20,38 @@ const toDayJS = ({ date, dateFormat = schema_1.SystemDateFormat, strict = false,
 };
 exports.toDayJS = toDayJS;
 const dateAgo = (value) => {
-    return (0, dayjs_1.default)(value).fromNow();
+    const now = (0, dayjs_1.default)();
+    const date = (0, dayjs_1.default)(value);
+    const isPast = date.isBefore(now);
+    const diff = isPast ? now.diff(date) : date.diff(now);
+    const seconds = Math.floor(diff / 1000);
+    const minutes = Math.floor(seconds / 60);
+    const hours = Math.floor(minutes / 60);
+    const days = Math.floor(hours / 24);
+    const weeks = Math.floor(days / 7);
+    const months = Math.floor(days / 30);
+    const years = Math.floor(days / 365);
+    if (years > 0) {
+        return { value: years, unit: "years", isPast };
+    }
+    else if (months > 0) {
+        return { value: months, unit: "months", isPast };
+    }
+    else if (weeks > 0) {
+        return { value: weeks, unit: "weeks", isPast };
+    }
+    else if (days > 0) {
+        return { value: days, unit: "days", isPast };
+    }
+    else if (hours > 0) {
+        return { value: hours, unit: "hours", isPast };
+    }
+    else if (minutes > 0) {
+        return { value: minutes, unit: "minutes", isPast };
+    }
+    else {
+        return { value: seconds, unit: "seconds", isPast };
+    }
 };
 exports.dateAgo = dateAgo;
 const dateRangeOptionToDateRange = (option) => {
@@ -63,8 +94,8 @@ const dateRangeOptionToDateRange = (option) => {
             break;
     }
     return {
-        startDate: dateRange.startDate?.format(schema_1.SystemDateFormat),
-        endDate: dateRange.endDate?.format(schema_1.SystemDateFormat),
+        startDate: dateRange.startDate?.format(schema_1.SYSTEM_DATE_FORMAT),
+        endDate: dateRange.endDate?.format(schema_1.SYSTEM_DATE_FORMAT),
     };
 };
 exports.dateRangeOptionToDateRange = dateRangeOptionToDateRange;

package/dist/esm/common/utils.js

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { EmptyString, ExperienceLevel, ProficiencyLevel, UserCompletenessSchema, } from "@thejob/schema";
+import { EMPTY_STRING, ExperienceLevel, ProficiencyLevel, UserCompletenessSchema, } from "@thejob/schema";
 import { customAlphabet } from "nanoid";
 export const removeEmpty = (obj) => {
     // Check if the value is an object and not null
@@ -249,7 +249,7 @@ export const displayNameLabel = (name, type = "full", onEmptyLabel = "Not availa
     }
     return (sequence
         .filter(Boolean)
-        .filter((fragment) => fragment !== EmptyString)
+        .filter((fragment) => fragment !== EMPTY_STRING)
         .join(" ") || onEmptyLabel);
 };
 export const displayMobileNumberLabel = (mobileNumber, options) => {

package/dist/esm/date/utils.d.ts

@@ -1,12 +1,18 @@
 import { DateRangeOption } from "@thejob/schema";
 import dayjs, { Dayjs } from "dayjs";
+export type DateAgoUnit = "seconds" | "minutes" | "hours" | "days" | "weeks" | "months" | "years";
+export interface DateAgoResult {
+    value: number;
+    unit: DateAgoUnit;
+    isPast: boolean;
+}
 export declare const toDayJS: ({ date, dateFormat, strict, utc, }?: {
     date?: string | number | Dayjs;
     dateFormat?: string;
     strict?: boolean;
     utc?: boolean;
 }) => dayjs.Dayjs;
-export declare const dateAgo: (value: number | string | Date) => string;
+export declare const dateAgo: (value: number | string | Date) => DateAgoResult;
 export declare const dateRangeOptionToDateRange: (option: DateRangeOption) => {
     startDate: string | undefined;
     endDate: string | undefined;

package/dist/esm/date/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/date/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAoB,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAQrC,eAAO,MAAM,OAAO,GAAI,qCAKrB;IACD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;CACV,gBASL,CAAC;AAEF,eAAO,MAAM,OAAO,GAAI,OAAO,MAAM,GAAG,MAAM,GAAG,IAAI,WAEpD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,QAAQ,eAAe;;;CA4CjE,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/date/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAsB,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAQrC,MAAM,MAAM,WAAW,GACnB,SAAS,GACT,SAAS,GACT,OAAO,GACP,MAAM,GACN,OAAO,GACP,QAAQ,GACR,OAAO,CAAC;AAEZ,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,eAAO,MAAM,OAAO,GAAI,qCAKrB;IACD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;CACV,gBASL,CAAC;AAEF,eAAO,MAAM,OAAO,GAAI,OAAO,MAAM,GAAG,MAAM,GAAG,IAAI,KAAG,aA6BvD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,QAAQ,eAAe;;;CA4CjE,CAAC"}

package/dist/esm/date/utils.js

@@ -1,4 +1,4 @@
-import { DateRangeOption, SystemDateFormat } from "@thejob/schema";
+import { DateRangeOption, SYSTEM_DATE_FORMAT } from "@thejob/schema";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import relativeTime from "dayjs/plugin/relativeTime";
@@ -6,14 +6,45 @@ import customParseFormat from "dayjs/plugin/customParseFormat";
 dayjs.extend(relativeTime);
 dayjs.extend(localizedFormat);
 dayjs.extend(customParseFormat);
-export const toDayJS = ({ date, dateFormat = SystemDateFormat, strict = false, utc = false, } = {}) => {
+export const toDayJS = ({ date, dateFormat = SYSTEM_DATE_FORMAT, strict = false, utc = false, } = {}) => {
     return dayjs(date, {
         utc,
         format: dateFormat,
     }, strict);
 };
 export const dateAgo = (value) => {
-    return dayjs(value).fromNow();
+    const now = dayjs();
+    const date = dayjs(value);
+    const isPast = date.isBefore(now);
+    const diff = isPast ? now.diff(date) : date.diff(now);
+    const seconds = Math.floor(diff / 1000);
+    const minutes = Math.floor(seconds / 60);
+    const hours = Math.floor(minutes / 60);
+    const days = Math.floor(hours / 24);
+    const weeks = Math.floor(days / 7);
+    const months = Math.floor(days / 30);
+    const years = Math.floor(days / 365);
+    if (years > 0) {
+        return { value: years, unit: "years", isPast };
+    }
+    else if (months > 0) {
+        return { value: months, unit: "months", isPast };
+    }
+    else if (weeks > 0) {
+        return { value: weeks, unit: "weeks", isPast };
+    }
+    else if (days > 0) {
+        return { value: days, unit: "days", isPast };
+    }
+    else if (hours > 0) {
+        return { value: hours, unit: "hours", isPast };
+    }
+    else if (minutes > 0) {
+        return { value: minutes, unit: "minutes", isPast };
+    }
+    else {
+        return { value: seconds, unit: "seconds", isPast };
+    }
 };
 export const dateRangeOptionToDateRange = (option) => {
     const today = toDayJS({ utc: true });
@@ -55,7 +86,7 @@ export const dateRangeOptionToDateRange = (option) => {
             break;
     }
     return {
-        startDate: dateRange.startDate?.format(SystemDateFormat),
-        endDate: dateRange.endDate?.format(SystemDateFormat),
+        startDate: dateRange.startDate?.format(SYSTEM_DATE_FORMAT),
+        endDate: dateRange.endDate?.format(SYSTEM_DATE_FORMAT),
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thejob/util",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
@@ -34,7 +34,7 @@
     "typescript": "^5.7.3"
   },
   "dependencies": {
-    "@thejob/schema": "^1.0.67",
+    "@thejob/schema": "^1.0.69",
     "dayjs": "^1.11.13",
     "mongoose": "^8.11.0",
     "nanoid": "3.3.5",