@finema/core 2.42.3 → 2.43.1

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@finema/core",
-  "version": "2.42.3",
+  "version": "2.43.1",
   "configKey": "core",
   "builder": {
     "@nuxt/module-builder": "1.0.2",

package/dist/module.mjs

@@ -4,7 +4,7 @@ import * as lodash from 'lodash-es';
 import * as theme from '../dist/runtime/theme/index.js';
 
 const name = "@finema/core";
-const version = "2.42.3";
+const version = "2.43.1";
 
 const nuxtAppOptions = {
   head: {
@@ -54,9 +54,9 @@ const core = {
   time_format: "HH:mm",
   date_format: "dd-MMM-yyyy",
   month_format: "MMM-yyyy",
-  date_time_format: "dd-MMM-yyyy HH:mm",
+  date_time_format: "dd-MMM-yyyy HH:mm:ss",
   date_format_system: "yyyy-MM-dd",
-  date_time_format_system: "yyyy-MM-dd HH:mm",
+  date_time_format_system: "yyyy-MM-dd HH:mm:ss",
   is_thai_year: false,
   is_thai_month: false,
   site_name: "",

package/dist/runtime/utils/TimeHelper.d.ts

@@ -1,20 +1,21 @@
 export declare class TimeHelper {
     static thaiFormat: (dateStr: Date, formatStr: string, forceThai?: boolean) => string;
-    static displayDate: (time: string | Date) => string;
-    static displayDateTime: (time: string | Date) => string;
-    static displayDateThai: (time: string | Date) => string;
-    static displayDateTimeThai: (time: string | Date) => string;
-    static displayDateRange: (startDate: Date | string, endDate: Date | string) => {
-        startDate: Date | string;
-        endDate: Date | string;
+    static displayDate: (time: string | Date | null | undefined) => string | null;
+    static displayDateTime: (time: string | Date | null | undefined) => string | null;
+    static displayDateThai: (time: string | Date | null | undefined) => string | null;
+    static displayDateTimeThai: (time: string | Date | null | undefined) => string | null;
+    static displayDateRange: (startDate: Date | string | null | undefined, endDate: Date | string | null | undefined) => {
+        startDate: Date | string | null;
+        endDate: Date | string | null;
     };
-    static toUTC: (time: string | Date) => string;
-    static toLocal: (time: string | Date) => string;
+    static toUTC: (time: string | Date | null | undefined) => string | null;
+    static toLocal: (time: string | Date | null | undefined) => string | null;
     static getCurrentDate: (customFormat?: string) => string;
-    static getDateFormTime: (time: string | Date, customFormat?: string) => string;
-    static getDateFormTimeWithLocal: (time: string | Date, customFormat?: string) => string;
-    static getISODateTimeFormTime: (time: string | Date) => string;
-    static getDateTimeFormTime: (time: string | Date) => string;
-    static getTimeFormTime: (time: string | Date) => string;
+    static getDateFormTime: (time: string | Date | null | undefined, customFormat?: string) => string | null;
+    static getDateFormTimeWithLocal: (time: string | Date | null | undefined, customFormat?: string) => string | null;
+    static getISODateTimeFormTime: (time: string | Date | null | undefined) => string | null;
+    static getDateTimeFormTime: (time: string | Date | null | undefined) => string | null;
+    static getTimeFormTime: (time: string | Date | null | undefined) => string | null;
     static getCurrentDateTime: () => string;
+    static toDate: (str: string | Date | null | undefined) => Date | null;
 }

package/dist/runtime/utils/TimeHelper.js

@@ -1,4 +1,4 @@
-import { addYears, format, formatISO, isDate, isValid, parse } from "date-fns";
+import { addYears, format, formatISO, isDate, isValid } from "date-fns";
 import * as locales from "date-fns/locale";
 import { formatInTimeZone } from "date-fns-tz";
 import { useCoreConfig } from "#core/composables/useConfig";
@@ -27,7 +27,7 @@ export class TimeHelper {
   };
   static displayDate = (time) => {
     if (!time) {
-      return time;
+      return null;
     }
     const parsedTime = getTime(time);
     const newTime = TimeHelper.thaiFormat(parsedTime, dateFormatDisplay);
@@ -35,7 +35,7 @@ export class TimeHelper {
   };
   static displayDateTime = (time) => {
     if (!time) {
-      return time;
+      return null;
     }
     const parsedTime = getTime(time);
     const newTime = TimeHelper.thaiFormat(parsedTime, dateTimeFormatDisplay);
@@ -43,7 +43,7 @@ export class TimeHelper {
   };
   static displayDateThai = (time) => {
     if (!time) {
-      return time;
+      return null;
     }
     const parsedTime = getTime(time);
     const newTime = TimeHelper.thaiFormat(parsedTime, dateFormat, true);
@@ -51,7 +51,7 @@ export class TimeHelper {
   };
   static displayDateTimeThai = (time) => {
     if (!time) {
-      return time;
+      return null;
     }
     const parsedTime = getTime(time);
     const newTime = TimeHelper.thaiFormat(parsedTime, dateTimeFormat, true);
@@ -60,8 +60,8 @@ export class TimeHelper {
   static displayDateRange = (startDate, endDate) => {
     if (!startDate || !endDate) {
       return {
-        startDate,
-        endDate
+        startDate: startDate || null,
+        endDate: endDate || null
       };
     }
     const parsedStartDate = getTime(startDate);
@@ -75,11 +75,11 @@ export class TimeHelper {
   };
   static toUTC = (time) => {
     if (!time) {
-      return time;
+      return null;
     }
     try {
       const parsedTime = getTime(time);
-      const newTime = formatInTimeZone(parsedTime, "Zulu", dateTimeFormat);
+      const newTime = formatInTimeZone(parsedTime, "UTC", dateTimeFormat);
       return isValid(parsedTime) ? newTime : time;
     } catch (e) {
       return time.toString();
@@ -87,7 +87,7 @@ export class TimeHelper {
   };
   static toLocal = (time) => {
     if (!time) {
-      return time;
+      return null;
     }
     try {
       const parsedTime = getTime(time);
@@ -102,27 +102,30 @@ export class TimeHelper {
   };
   static getDateFormTime = (time, customFormat = dateFormat) => {
     if (!time) {
-      return time;
+      return null;
     }
-    const parsedTime = isDate(time) ? time : parse(time, dateTimeFormat, /* @__PURE__ */ new Date());
+    const parsedTime = isDate(time) ? time : getTime(time);
     const newTime = format(parsedTime, customFormat);
     return isValid(parsedTime) ? newTime : time;
   };
   static getDateFormTimeWithLocal = (time, customFormat = dateFormat) => {
     if (!time) {
-      return time;
+      return null;
     }
     const localTime = TimeHelper.toLocal(time);
-    const parsedTime = isDate(localTime) ? localTime : parse(localTime, dateTimeFormat, /* @__PURE__ */ new Date());
+    if (!localTime) {
+      return null;
+    }
+    const parsedTime = isDate(localTime) ? localTime : getTime(time);
     const newTime = format(parsedTime, customFormat);
     return isValid(parsedTime) ? newTime : time;
   };
   static getISODateTimeFormTime = (time) => {
     if (!time) {
-      return time;
+      return null;
     }
     try {
-      const parsedTime = isDate(time) ? time : parse(time, dateTimeFormat, /* @__PURE__ */ new Date());
+      const parsedTime = isDate(time) ? time : new Date(time);
       const testTime = format(parsedTime, dateTimeFormat);
       if (!isValid(parsedTime) || testTime === "Invalid Date") {
         return time;
@@ -134,21 +137,31 @@ export class TimeHelper {
   };
   static getDateTimeFormTime = (time) => {
     if (!time) {
-      return time;
+      return null;
     }
-    const parsedTime = isDate(time) ? time : parse(time, dateTimeFormat, /* @__PURE__ */ new Date());
+    const parsedTime = isDate(time) ? time : getTime(time);
     const newTime = format(parsedTime, dateTimeFormat);
     return isValid(parsedTime) ? newTime : time;
   };
   static getTimeFormTime = (time) => {
     if (!time) {
-      return time;
+      return null;
     }
-    const parsedTime = isDate(time) ? time : parse(time, dateTimeFormat, /* @__PURE__ */ new Date());
+    const parsedTime = isDate(time) ? time : getTime(time);
     const newTime = format(parsedTime, timeFormat);
     return isValid(parsedTime) ? newTime : time;
   };
   static getCurrentDateTime = () => {
     return format(/* @__PURE__ */ new Date(), dateTimeFormat);
   };
+  static toDate = (str) => {
+    if (!str) {
+      return null;
+    }
+    if (isDate(str)) {
+      return str;
+    }
+    const parsedTime = new Date(str);
+    return isValid(parsedTime) ? parsedTime : null;
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finema/core",
-  "version": "2.42.3",
+  "version": "2.43.1",
   "repository": "https://gitlab.finema.co/finema/ui-kit",
   "license": "MIT",
   "author": "Finema Dev Core Team",