@finema/core 1.4.15 → 1.4.17

package/dist/module.d.mts

@@ -6,6 +6,7 @@ declare const core: {
     date_format: string;
     date_time_format: string;
     time_format: string;
+    is_thai_year: boolean;
 };
 
 declare const config_core: typeof core;

package/dist/module.d.ts

@@ -6,6 +6,7 @@ declare const core: {
     date_format: string;
     date_time_format: string;
     time_format: string;
+    is_thai_year: boolean;
 };
 
 declare const config_core: typeof core;

package/dist/module.json

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

package/dist/module.mjs

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

package/dist/runtime/components/Modal/index.vue

@@ -15,11 +15,11 @@
       v-if="title"
       :class="[ui.header, { 'flex items-center justify-between': !isHideCloseBtn }]"
     >
-      <h1 class="text-xl font-medium">{{ title }}</h1>
+      <h1 class="text-lg font-semibold">{{ title }}</h1>
       <Icon
         v-if="!isHideCloseBtn"
         name="i-heroicons-x-mark"
-        class="h-6 w-6 cursor-pointer"
+        class="h-6 w-6 cursor-pointer opacity-50"
         @click="close"
       />
     </div>
@@ -31,7 +31,7 @@
       <Icon
         v-if="!isHideCloseBtn"
         name="i-heroicons-x-mark"
-        class="h-6 w-6 cursor-pointer"
+        class="h-6 w-6 cursor-pointer opacity-50"
         @click="close"
       />
     </div>

package/dist/runtime/core.config.d.ts

@@ -4,4 +4,5 @@ export declare const core: {
     date_format: string;
     date_time_format: string;
     time_format: string;
+    is_thai_year: boolean;
 };

package/dist/runtime/core.config.mjs

@@ -3,5 +3,6 @@ export const core = {
   default_primary_key: "id",
   date_format: "dd-MM-yyyy",
   date_time_format: "dd-MM-yyyy HH:mm",
-  time_format: "HH:mm"
+  time_format: "HH:mm",
+  is_thai_year: false
 };

package/dist/runtime/ui.config/modal.mjs

@@ -1,18 +1,20 @@
 import { modal as inheritModal } from "#ui/ui.config";
 export const modal = {
   ...inheritModal,
-  header: "px-4 py-2 border-b",
-  innerWrapper: "p-4",
+  header: "px-6 py-4 border-b",
+  innerWrapper: "px-6 py-4",
+  padding: "p-6",
+  margin: "my-0",
   size: {
-    sm: "sm:max-w-sm",
-    md: "sm:max-w-lg",
-    lg: "sm:max-w-2xl",
-    xl: "sm:max-w-4xl"
+    sm: "w-full lg:max-w-sm",
+    md: "w-full lg:max-w-lg",
+    lg: "w-full lg:max-w-2xl",
+    xl: "w-full lg:max-w-4xl"
   },
   position: {
-    top: "flex min-h-full items-end sm:items-start justify-center text-center",
-    center: "flex min-h-full items-end sm:items-center  justify-center text-center",
-    bottom: "flex min-h-full items-end sm:items-end justify-center text-center"
+    top: "flex min-h-full items-start justify-center text-center",
+    center: "flex min-h-full items-start lg:items-center  justify-center text-center",
+    bottom: "flex min-h-full items-start lg:items-end justify-center text-center"
   },
   overlay: {
     background: "bg-gray-500/75 dark:bg-gray-800/75 backdrop-blur-sm"

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

@@ -1,4 +1,7 @@
 export declare class TimeHelper {
+    static thaiFormat: (dateStr: Date, formatStr: string) => string;
+    static displayDate: (time: string | Date) => string;
+    static displayDateTime: (time: string | Date) => string;
     static toUTC: (time: string | Date) => string;
     static toLocal: (time: string | Date) => string;
     static getCurrentDate: () => string;

package/dist/runtime/utils/TimeHelper.mjs

@@ -1,9 +1,33 @@
-import { addHours, format, formatISO, isDate, isValid, parse, subHours } from "date-fns";
+import { addHours, format, formatISO, isDate, isValid, parse, subHours, addYears } from "date-fns";
 import { useCoreConfig } from "#core/composables/useConfig";
 const dateFormat = useCoreConfig().date_format;
 const dateTimeFormat = useCoreConfig().date_time_format;
 const timeFormat = useCoreConfig().time_format;
+const isThaiYear = useCoreConfig().is_thai_year;
 export class TimeHelper {
+  static thaiFormat = (dateStr, formatStr) => {
+    let newDateStr = dateStr;
+    if (isThaiYear) {
+      newDateStr = addYears(dateStr, 543);
+    }
+    return format(newDateStr, formatStr);
+  };
+  static displayDate = (time) => {
+    if (!time) {
+      return time;
+    }
+    const parsedTime = isDate(time) ? time : new Date(time);
+    const newTime = TimeHelper.thaiFormat(parsedTime, dateFormat);
+    return isValid(parsedTime) ? newTime : time;
+  };
+  static displayDateTime = (time) => {
+    if (!time) {
+      return time;
+    }
+    const parsedTime = isDate(time) ? time : new Date(time);
+    const newTime = TimeHelper.thaiFormat(parsedTime, dateTimeFormat);
+    return isValid(parsedTime) ? newTime : time;
+  };
   static toUTC = (time) => {
     if (!time) {
       return time;

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

@@ -4,7 +4,8 @@ vi.mock("#core/composables/useConfig", () => ({
   useCoreConfig: () => ({
     date_format: "yyyy-MM-dd",
     date_time_format: "yyyy-MM-dd HH:mm",
-    time_format: "HH:mm"
+    time_format: "HH:mm",
+    is_thai_year: false
   })
 }));
 describe("TimeHelper", async () => {
@@ -20,6 +21,12 @@ describe("TimeHelper", async () => {
     const result = TimeHelper.toLocal(inputTime);
     assert.equal(result, expectedOutput);
   });
+  it("[thai year ]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);
+  });
   it("getCurrentDate should return the current date in yyyy-MM-dd format", () => {
     const expectedOutputRegex = /^\d{4}-\d{2}-\d{2}$/;
     const result = TimeHelper.getCurrentDate();

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

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

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

@@ -0,0 +1,30 @@
+import { assert, describe, it, vi } from "vitest";
+import { TimeHelper } from "./TimeHelper.mjs";
+vi.mock("#core/composables/useConfig", () => ({
+  useCoreConfig: () => ({
+    date_format: "yyyy-MM-dd",
+    date_time_format: "yyyy-MM-dd HH:mm",
+    time_format: "HH:mm",
+    is_thai_year: true
+  })
+}));
+describe("TimeHelper", async () => {
+  it("displayDate", () => {
+    const inputTime = "2023-12-19 12:00";
+    const expectedOutput = "2566-12-19";
+    const result = TimeHelper.displayDate(inputTime);
+    assert.equal(result, expectedOutput);
+  });
+  it("displayDateTime", () => {
+    const inputTime = "2023-12-19 12:00";
+    const expectedOutput = "2566-12-19 12:00";
+    const result = TimeHelper.displayDateTime(inputTime);
+    assert.equal(result, expectedOutput);
+  });
+  it("displayDateTime - iso", () => {
+    const inputTime = "2023-01-16T22:00:00Z";
+    const expectedOutput = "2566-01-17 05:00";
+    const result = TimeHelper.displayDateTime(inputTime);
+    assert.equal(result, expectedOutput);
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finema/core",
-  "version": "1.4.15",
+  "version": "1.4.17",
   "repository": "https://gitlab.finema.co/finema/ui-kit",
   "license": "MIT",
   "author": "Finema Dev Core Team",
@@ -25,8 +25,8 @@
     "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",
+    "lint": "eslint . --cache",
+    "lint:fix": "eslint . --fix --cache",
     "test": "vitest run",
     "test:watch": "vitest watch",
     "release": "release-it --ci",
@@ -34,21 +34,21 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.7.4",
-    "@nuxt/ui": "^2.11.1",
+    "@nuxt/ui": "^2.12.0",
     "@pinia/nuxt": "^0.5.1",
-    "@vee-validate/nuxt": "^4.12.3",
-    "@vee-validate/zod": "^4.12.3",
-    "@vuepic/vue-datepicker": "^7.4.0",
-    "axios": "^1.6.2",
-    "date-fns": "^3.0.6",
-    "i18next": "^23.7.11",
+    "@vee-validate/nuxt": "^4.12.4",
+    "@vee-validate/zod": "^4.12.4",
+    "@vuepic/vue-datepicker": "^7.4.1",
+    "axios": "^1.6.5",
+    "date-fns": "^3.2.0",
+    "i18next": "^23.7.16",
     "lodash-es": "^4.17.21",
     "nuxt-security": "^1.0.0",
     "pinia": "^2.1.7",
     "qrcode.vue": "^3.4.1",
     "url-join": "^5.0.0",
     "zod": "^3.22.4",
-    "zod-i18n-map": "^2.23.0"
+    "zod-i18n-map": "^2.25.0"
   },
   "devDependencies": {
     "@finema/eslint-config": "^1.2.0",
@@ -59,25 +59,25 @@
     "@nuxt/test-utils": "^3.9.0",
     "@release-it/conventional-changelog": "^8.0.1",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^18.18.1",
+    "@types/node": "^20.10.8",
     "@vue/test-utils": "^2.4.3",
     "changelogen": "^0.5.5",
     "eslint": "^8.56.0",
-    "happy-dom": "^12.10.3",
+    "happy-dom": "^13.0.0",
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0",
-    "nuxt": "^3.8.2",
+    "nuxt": "^3.9.1",
     "playwright-core": "^1.40.1",
     "prettier": "^3.1.1",
     "release-it": "^17.0.1",
     "sass": "^1.69.5",
-    "stylelint": "^16.0.2",
+    "stylelint": "^16.1.0",
     "stylelint-config-prettier-scss": "^1.0.0",
-    "stylelint-config-standard-scss": "^12.0.0",
-    "vitest": "^1.1.0"
+    "stylelint-config-standard-scss": "^13.0.0",
+    "vitest": "^1.1.3"
   },
   "lint-staged": {
-    "*.{ts,vue,tsx,js}": "eslint --fix",
+    "*.{ts,vue,tsx,js}": "eslint --fix --cache",
     "*.{html,json}": "prettier --write"
   }
 }