@finema/core 1.3.19 → 1.3.20

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@finema/core",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "configKey": "core",
   "compatibility": {
     "nuxt": "^3.7.4"

package/dist/module.mjs

@@ -2,7 +2,7 @@ import { defineNuxtModule, createResolver, installModule, addPlugin, addComponen
 import { merge } from 'lodash-es';
 
 const name = "@finema/core";
-const version = "1.3.19";
+const version = "1.3.20";
 
 const colors = {
   black: "#20243E",

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

@@ -1,11 +1,11 @@
 export declare class TimeHelper {
-    static toUTC: (time: string) => string;
-    static toLocal: (time: string) => string;
+    static toUTC: (time: string | Date) => string;
+    static toLocal: (time: string | Date) => string;
     static getCurrentDate: () => string;
-    static getDateFormTime: (time: string) => string;
-    static getDateFormTimeWithLocal: (time: string) => string;
-    static getISODateTimeFormTime: (time: string) => string;
-    static getDateTimeFormTime: (time: string) => string;
-    static getTimeFormTime: (time: string) => string;
+    static getDateFormTime: (time: string | Date) => string;
+    static getDateFormTimeWithLocal: (time: string | Date) => string;
+    static getISODateTimeFormTime: (time: string | Date) => string;
+    static getDateTimeFormTime: (time: string | Date) => string;
+    static getTimeFormTime: (time: string | Date) => string;
     static getCurrentDateTime: () => string;
 }

package/dist/runtime/utils/TimeHelper.mjs

@@ -1,14 +1,6 @@
-import dayjs from "dayjs";
-import relativeTime from "dayjs/plugin/relativeTime";
-import utc from "dayjs/plugin/utc";
-import duration from "dayjs/plugin/duration";
-dayjs.extend(relativeTime);
-dayjs.extend(utc);
-dayjs.extend(duration);
-const isTimeError = (time) => time === "Invalid Date";
-const timeWrapper = (time, defaultTime) => isTimeError(time) ? defaultTime : time;
-const dateFormat = "YYYY-MM-DD";
-const dateTimeFormat = "YYYY-MM-DD HH:mm:ss";
+import { addHours, format, formatISO, isDate, isValid, parse, subHours } from "date-fns";
+const dateFormat = "yyyy-MM-dd";
+const dateTimeFormat = "yyyy-MM-dd HH:mm";
 const timeFormat = "HH:mm";
 export class TimeHelper {
   static toUTC = (time) => {
@@ -16,8 +8,9 @@ export class TimeHelper {
       return time;
     }
     try {
-      const newTime = dayjs(time).subtract(7, "hour").format(dateTimeFormat);
-      return timeWrapper(newTime, time);
+      const parsedTime = isDate(time) ? time : parse(time, dateTimeFormat, /* @__PURE__ */ new Date());
+      const newTime = format(subHours(parsedTime, 7), dateTimeFormat);
+      return isValid(parsedTime) ? newTime : time;
     } catch (e) {
       return time.toString();
     }
@@ -27,57 +20,65 @@ export class TimeHelper {
       return time;
     }
     try {
-      const newTime = dayjs(time).add(7, "hour").format(dateTimeFormat);
-      return timeWrapper(newTime, time);
+      const parsedTime = isDate(time) ? time : parse(time, dateTimeFormat, /* @__PURE__ */ new Date());
+      const newTime = format(addHours(parsedTime, 7), dateTimeFormat);
+      return isValid(parsedTime) ? newTime : time;
     } catch (e) {
-      return time;
+      return time.toString();
     }
   };
   static getCurrentDate = () => {
-    const newTime = dayjs().format(dateFormat);
-    return timeWrapper(newTime, "");
+    return format(/* @__PURE__ */ new Date(), dateFormat);
   };
   static getDateFormTime = (time) => {
     if (!time) {
       return time;
     }
-    const newTime = dayjs(time).format(dateFormat);
-    return timeWrapper(newTime, time);
+    const parsedTime = isDate(time) ? time : parse(time, dateTimeFormat, /* @__PURE__ */ new Date());
+    const newTime = format(parsedTime, dateFormat);
+    return isValid(parsedTime) ? newTime : time;
   };
   static getDateFormTimeWithLocal = (time) => {
     if (!time) {
       return time;
     }
-    const newTime = dayjs(TimeHelper.toLocal(time)).format(dateFormat);
-    return timeWrapper(newTime, time);
+    const localTime = TimeHelper.toLocal(time);
+    const parsedTime = isDate(localTime) ? localTime : parse(localTime, dateTimeFormat, /* @__PURE__ */ new Date());
+    const newTime = format(parsedTime, dateFormat);
+    return isValid(parsedTime) ? newTime : time;
   };
   static getISODateTimeFormTime = (time) => {
     if (!time) {
       return time;
     }
-    const testTime = dayjs(time).format(dateTimeFormat);
-    if (isTimeError(testTime)) {
-      return time;
+    try {
+      const parsedTime = isDate(time) ? time : parse(time, dateTimeFormat, /* @__PURE__ */ new Date());
+      const testTime = format(parsedTime, dateTimeFormat);
+      if (!isValid(parsedTime) || testTime === "Invalid Date") {
+        return time;
+      }
+      return formatISO(parsedTime);
+    } catch (e) {
+      return time.toString();
     }
-    const newTime = dayjs(time).toISOString();
-    return isTimeError(newTime) || !newTime ? time : newTime;
   };
   static getDateTimeFormTime = (time) => {
     if (!time) {
       return time;
     }
-    const newTime = dayjs(time).format(dateTimeFormat);
-    return timeWrapper(newTime, time);
+    const parsedTime = isDate(time) ? time : parse(time, dateTimeFormat, /* @__PURE__ */ new Date());
+    const newTime = format(parsedTime, dateTimeFormat);
+    return isValid(parsedTime) ? newTime : time;
   };
   static getTimeFormTime = (time) => {
     if (!time) {
       return time;
     }
-    const newTime = dayjs(time).format(timeFormat);
-    return timeWrapper(newTime, time);
+    const parsedTime = isDate(time) ? time : parse(time, dateTimeFormat, /* @__PURE__ */ new Date());
+    const newTime = format(parsedTime, timeFormat);
+    return isValid(parsedTime) ? newTime : time;
   };
   static getCurrentDateTime = () => {
-    const newTime = dayjs().format(dateTimeFormat);
-    return timeWrapper(newTime, "");
+    return format(/* @__PURE__ */ new Date(), dateTimeFormat);
   };
 }

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

@@ -0,0 +1 @@
+export {};

package/dist/runtime/utils/TimeHelper.spec.mjs

@@ -0,0 +1,54 @@
+import { test, assert } from "vitest";
+import { TimeHelper } from "./TimeHelper.mjs";
+test("toUTC should convert time to UTC format", () => {
+  const inputTime = "2023-12-19 12:00";
+  const expectedOutput = "2023-12-19 05:00";
+  const result = TimeHelper.toUTC(inputTime);
+  assert.equal(result, expectedOutput);
+});
+test("toLocal should convert time to local format", () => {
+  const inputTime = "2023-12-19 12:00";
+  const expectedOutput = "2023-12-19 19:00";
+  const result = TimeHelper.toLocal(inputTime);
+  assert.equal(result, expectedOutput);
+});
+test("getCurrentDate should return the current date in yyyy-MM-dd format", () => {
+  const expectedOutputRegex = /^\d{4}-\d{2}-\d{2}$/;
+  const result = TimeHelper.getCurrentDate();
+  assert.match(result, expectedOutputRegex);
+});
+test("getDateFormTime should convert time to date format", () => {
+  const inputTime = "2023-12-19 12:00";
+  const expectedOutput = "2023-12-19";
+  const result = TimeHelper.getDateFormTime(inputTime);
+  assert.equal(result, expectedOutput);
+});
+test("getDateFormTimeWithLocal should convert time to date format with local time", () => {
+  const inputTime = "2023-12-19 12:00";
+  const expectedOutputRegex = /^\d{4}-\d{2}-\d{2}$/;
+  const result = TimeHelper.getDateFormTimeWithLocal(inputTime);
+  assert.match(result, expectedOutputRegex);
+});
+test("getISODateTimeFormTime should convert time to ISO date-time format", () => {
+  const inputTime = "2023-12-19 14:30";
+  const expectedOutput = "2023-12-19T14:30:00+07:00";
+  const result = TimeHelper.getISODateTimeFormTime(inputTime);
+  assert.equal(result, expectedOutput);
+});
+test("getDateTimeFormTime should convert time to date-time format", () => {
+  const inputTime = "2023-12-19 12:00";
+  const expectedOutputRegex = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/;
+  const result = TimeHelper.getDateTimeFormTime(inputTime);
+  assert.match(result, expectedOutputRegex);
+});
+test("getTimeFormTime should convert time to time format", () => {
+  const inputTime = "2023-12-19 12:00";
+  const expectedOutputRegex = /^\d{2}:\d{2}$/;
+  const result = TimeHelper.getTimeFormTime(inputTime);
+  assert.match(result, expectedOutputRegex);
+});
+test("getCurrentDateTime should return the current date and time in yyyy-MM-dd HH:mm format", () => {
+  const expectedOutputRegex = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/;
+  const result = TimeHelper.getCurrentDateTime();
+  assert.match(result, expectedOutputRegex);
+});

package/package.json

@@ -1,79 +1,79 @@
-{
-  "name": "@finema/core",
-  "version": "1.3.19",
-  "repository": "https://gitlab.finema.co/finema/ui-kit",
-  "license": "MIT",
-  "author": "Finema Development Team",
-  "type": "module",
-  "exports": {
-    ".": {
-      "types": "./dist/types.d.ts",
-      "import": "./dist/module.mjs",
-      "require": "./dist/module.cjs"
-    }
-  },
-  "main": "./dist/module.cjs",
-  "types": "./dist/types.d.ts",
-  "files": [
-    "dist"
-  ],
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "scripts": {
-    "prepack": "nuxt-module-build build",
-    "dev": "nuxi dev playground",
-    "dev:build": "nuxi build playground",
-    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "test": "vitest run",
-    "test:watch": "vitest watch",
-    "release": "release-it --ci",
-    "prepare": "husky install"
-  },
-  "dependencies": {
-    "@headlessui/vue": "^1.7.16",
-    "@iconify-json/mdi": "^1.1.54",
-    "@iconify-json/simple-icons": "^1.1.76",
-    "@nuxt/kit": "^3.7.4",
-    "@nuxt/ui": "^2.11.1",
-    "@pinia/nuxt": "^0.4.11",
-    "@vee-validate/nuxt": "^4.11.8",
-    "@vee-validate/zod": "^4.11.8",
-    "@vuepic/vue-datepicker": "^7.4.0",
-    "axios": "^1.5.1",
-    "dayjs": "^1.11.10",
-    "lodash-es": "^4.17.21",
-    "nuxt-security": "^0.14.4",
-    "pinia": "^2.1.6",
-    "url-join": "^5.0.0",
-    "zod": "^3.22.4"
-  },
-  "devDependencies": {
-    "@finema/eslint-config": "^1.2.0",
-    "@nuxt/devtools": "latest",
-    "@nuxt/eslint-config": "^0.2.0",
-    "@nuxt/module-builder": "^0.5.2",
-    "@nuxt/schema": "^3.7.4",
-    "@nuxt/test-utils": "^3.7.4",
-    "@release-it/conventional-changelog": "^7.0.2",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^18.18.1",
-    "changelogen": "^0.5.5",
-    "eslint": "^8.50.0",
-    "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
-    "nuxt": "^3.7.4",
-    "prettier": "^3.0.3",
-    "release-it": "^16.2.1",
-    "stylelint": "^15.10.3",
-    "stylelint-config-prettier-scss": "^1.0.0",
-    "stylelint-config-standard-scss": "^11.0.0",
-    "vitest": "^0.33.0"
-  },
-  "lint-staged": {
-    "*.{ts,vue,tsx,js}": "eslint --fix",
-    "*.{html,json}": "prettier --write"
-  }
-}
+{
+  "name": "@finema/core",
+  "version": "1.3.20",
+  "repository": "https://gitlab.finema.co/finema/ui-kit",
+  "license": "MIT",
+  "author": "Finema Development Team",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/types.d.ts",
+      "import": "./dist/module.mjs",
+      "require": "./dist/module.cjs"
+    }
+  },
+  "main": "./dist/module.cjs",
+  "types": "./dist/types.d.ts",
+  "files": [
+    "dist"
+  ],
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "scripts": {
+    "prepack": "nuxt-module-build build",
+    "dev": "nuxi dev playground",
+    "dev:build": "nuxi build playground",
+    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "test": "vitest run",
+    "test:watch": "vitest watch",
+    "release": "release-it --ci",
+    "prepare": "husky install"
+  },
+  "dependencies": {
+    "@headlessui/vue": "^1.7.16",
+    "@iconify-json/mdi": "^1.1.54",
+    "@iconify-json/simple-icons": "^1.1.76",
+    "@nuxt/kit": "^3.7.4",
+    "@nuxt/ui": "^2.11.1",
+    "@pinia/nuxt": "^0.4.11",
+    "@vee-validate/nuxt": "^4.11.8",
+    "@vee-validate/zod": "^4.11.8",
+    "@vuepic/vue-datepicker": "^7.4.0",
+    "axios": "^1.5.1",
+    "date-fns": "^3.0.0",
+    "lodash-es": "^4.17.21",
+    "nuxt-security": "^0.14.4",
+    "pinia": "^2.1.6",
+    "url-join": "^5.0.0",
+    "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "@finema/eslint-config": "^1.2.0",
+    "@nuxt/devtools": "latest",
+    "@nuxt/eslint-config": "^0.2.0",
+    "@nuxt/module-builder": "^0.5.2",
+    "@nuxt/schema": "^3.7.4",
+    "@nuxt/test-utils": "^3.7.4",
+    "@release-it/conventional-changelog": "^7.0.2",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^18.18.1",
+    "changelogen": "^0.5.5",
+    "eslint": "^8.50.0",
+    "husky": "^8.0.3",
+    "lint-staged": "^14.0.1",
+    "nuxt": "^3.7.4",
+    "prettier": "^3.0.3",
+    "release-it": "^16.2.1",
+    "stylelint": "^15.10.3",
+    "stylelint-config-prettier-scss": "^1.0.0",
+    "stylelint-config-standard-scss": "^11.0.0",
+    "vitest": "^0.33.0"
+  },
+  "lint-staged": {
+    "*.{ts,vue,tsx,js}": "eslint --fix",
+    "*.{html,json}": "prettier --write"
+  }
+}