@finema/core 1.4.165 → 1.4.167

package/dist/module.json

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

package/dist/module.mjs

@@ -1,265 +1,8 @@
 import { defineNuxtModule, createResolver, installModule, addPlugin, addComponentsDir, addImportsDir } from '@nuxt/kit';
+import { defu } from 'defu';
 
 const name = "@finema/core";
-const version = "1.4.165";
-
-const colors = {
-  black: "#20243E",
-  white: "#FFFFFF",
-  dark: {
-    DEFAULT: "#20243E",
-    50: "#6D7280",
-    100: "#505050"
-  },
-  light: {
-    DEFAULT: "#FAFAFA"
-  },
-  gray: {
-    DEFAULT: "#9095A6",
-    disabled: "#C1C4D0",
-    border: "#E2E4EA",
-    fill: "#F4F5FA",
-    50: "#E0E0E0",
-    600: "#616161"
-  },
-  secondary: {
-    DEFAULT: "#EE8B36",
-    50: "#fdf1e7",
-    100: "#f9d6b8",
-    200: "#f5bb89",
-    300: "#f1a05a",
-    400: "#ed852b",
-    500: "#d46b12",
-    600: "#a5540e",
-    700: "#763c0a",
-    800: "#472406",
-    900: "#180c02"
-  },
-  info: {
-    DEFAULT: "#0D8CEE",
-    50: "#F3F9FE",
-    100: "#E7F4FD",
-    200: "#C3E2FB",
-    300: "#9ED1F8",
-    400: "#56AFF3",
-    500: "#0D8CEE",
-    600: "#0C7ED6",
-    700: "#08548F",
-    800: "#063F6B",
-    900: "#042A47"
-  },
-  danger: {
-    DEFAULT: "#F25555",
-    50: "#FEF7F7",
-    100: "#FEEEEE",
-    200: "#FCD5D5",
-    300: "#FABBBB",
-    400: "#F68888",
-    500: "#F25555",
-    600: "#DA4D4D",
-    700: "#913333",
-    800: "#6D2626",
-    900: "#491A1A"
-  },
-  success: {
-    DEFAULT: "#3FB061",
-    50: "#F5FBF7",
-    100: "#ECF7EF",
-    200: "#CFEBD8",
-    300: "#B2DFC0",
-    400: "#79C890",
-    500: "#3FB061",
-    600: "#399E57",
-    700: "#266A3A",
-    800: "#1C4F2C",
-    900: "#13351D"
-  },
-  warning: {
-    DEFAULT: "#FF9A35",
-    50: "#FFFAF5",
-    100: "#FFF5EB",
-    200: "#FFE6CD",
-    300: "#FFD7AE",
-    400: "#FFB872",
-    500: "#FF9A35",
-    600: "#E68B30",
-    700: "#995C20",
-    800: "#734518",
-    900: "#4D2E10"
-  }
-};
-
-const isObj = (item) => item && typeof item === "object" && !Array.isArray(item);
-const _deepMerge = (target, ...sources) => {
-  if (!sources.length)
-    return target;
-  const source = sources.shift();
-  if (isObj(target) && isObj(source)) {
-    for (const key in source) {
-      if (isObj(source[key])) {
-        if (!target[key])
-          Object.assign(target, { [key]: {} });
-        _deepMerge(target[key], source[key]);
-      } else {
-        Object.assign(target, { [key]: source[key] });
-      }
-    }
-  }
-  return _deepMerge(target, ...sources);
-};
-
-const pagination = {
-  wrapper: "flex items-center space-x-1",
-  default: {
-    size: "sm",
-    activeButton: {
-      color: "primary",
-      class: "rounded-md px-3"
-    },
-    inactiveButton: {
-      color: "primary",
-      variant: "ghost",
-      class: "rounded-md px-3 text-gray-500 hover:bg-primary-500 hover:text-white"
-    },
-    firstButton: {
-      color: "primary",
-      variant: "ghost",
-      class: "rtl:[&_span:first-child]:rotate-180 rounded-md px-2 text-gray-500 hover:bg-primary-500 hover:text-white"
-    },
-    lastButton: {
-      color: "primary",
-      variant: "ghost",
-      class: "rtl:[&_span:last-child]:rotate-180 rounded-md px-2 text-gray-500 hover:bg-primary-500 hover:text-white"
-    },
-    prevButton: {
-      color: "primary",
-      variant: "ghost",
-      icon: "i-heroicons-chevron-left-20-solid",
-      class: "rtl:[&_span:first-child]:rotate-180 rounded-md px-2 text-gray-500 hover:bg-primary-500 hover:text-white"
-    },
-    nextButton: {
-      color: "primary",
-      variant: "ghost",
-      icon: "i-heroicons-chevron-right-20-solid",
-      class: "rtl:[&_span:last-child]:rotate-180 rounded-md px-2 text-gray-500 hover:bg-primary-500 hover:text-white"
-    }
-  }
-};
-
-const table = {
-  wrapper: "relative overflow-x-auto bg-white rounded-lg",
-  base: "min-w-full table-fixed",
-  divide: "divide-y divide-y-2 divide-gray-300 dark:divide-gray-700",
-  thead: "",
-  tbody: "divide-y divide-gray-200 dark:divide-gray-800",
-  tr: {
-    base: "even:bg-gray-50",
-    selected: "bg-gray-50 dark:bg-gray-800/50",
-    active: "hover:bg-gray-50 dark:hover:bg-gray-800/50 cursor-pointer"
-  },
-  th: {
-    base: "text-left rtl:text-right",
-    padding: "px-3 py-3.5",
-    color: "text-gray-700 dark:text-white",
-    font: "font-normal",
-    size: "text-sm"
-  },
-  td: {
-    base: "whitespace-nowrap",
-    padding: "px-3 py-4",
-    color: "text-gray-500 dark:text-gray-400",
-    font: "",
-    size: "text-sm"
-  },
-  default: {
-    sortButton: {
-      icon: "i-heroicons-arrows-up-down-20-solid",
-      trailing: true,
-      square: true,
-      color: "gray",
-      variant: "ghost",
-      class: "-m-1.5 text-gray-700 font-normal"
-    },
-    loadingState: {
-      label: "\u0E01\u0E33\u0E25\u0E31\u0E07\u0E42\u0E2B\u0E25\u0E14..."
-    },
-    emptyState: {
-      label: "\u0E44\u0E21\u0E48\u0E1E\u0E1A\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25"
-    }
-  }
-};
-
-const alert = {
-  default: {
-    variant: "soft",
-    color: "primary"
-  }
-};
-
-const button = {
-  default: {
-    size: "md",
-    variant: "solid",
-    color: "primary",
-    loadingIcon: "i-svg-spinners:180-ring"
-  }
-};
-
-const buttonGroup = {};
-
-const formGroup = {
-  default: {
-    size: "lg"
-  }
-};
-
-const checkbox = {};
-
-const input = {
-  default: {
-    size: "lg"
-  }
-};
-
-const select = {
-  default: {
-    size: "lg"
-  }
-};
-
-const selectMenu = {
-  default: {
-    size: "lg"
-  }
-};
-
-const textarea = {
-  default: {
-    size: "lg"
-  }
-};
-
-const toggle = {
-  default: {
-    size: "lg"
-  }
-};
-
-const badge = {};
-
-const notification = {
-  ring: "ring-0",
-  progress: {
-    base: "hidden"
-  },
-  actionGroup: {
-    wrapper: "mt-5 flex justify-end space-x-4",
-    cancelColor: "primary",
-    cancelVariant: "outline",
-    confirmColor: "primary",
-    confirmVariant: "solid"
-  }
-};
+const version = "1.4.167";
 
 const colorModeOptions = {
   preference: "light"
@@ -357,6 +100,92 @@ const nuxtRunTimeConfigOptions = {
   }
 };
 
+const colors = {
+  black: "#20243E",
+  white: "#FFFFFF",
+  dark: {
+    DEFAULT: "#20243E",
+    50: "#6D7280",
+    100: "#505050"
+  },
+  light: {
+    DEFAULT: "#FAFAFA"
+  },
+  gray: {
+    DEFAULT: "#9095A6",
+    disabled: "#C1C4D0",
+    border: "#E2E4EA",
+    fill: "#F4F5FA",
+    50: "#E0E0E0",
+    600: "#616161"
+  },
+  secondary: {
+    DEFAULT: "#EE8B36",
+    50: "#fdf1e7",
+    100: "#f9d6b8",
+    200: "#f5bb89",
+    300: "#f1a05a",
+    400: "#ed852b",
+    500: "#d46b12",
+    600: "#a5540e",
+    700: "#763c0a",
+    800: "#472406",
+    900: "#180c02"
+  },
+  info: {
+    DEFAULT: "#0D8CEE",
+    50: "#F3F9FE",
+    100: "#E7F4FD",
+    200: "#C3E2FB",
+    300: "#9ED1F8",
+    400: "#56AFF3",
+    500: "#0D8CEE",
+    600: "#0C7ED6",
+    700: "#08548F",
+    800: "#063F6B",
+    900: "#042A47"
+  },
+  danger: {
+    DEFAULT: "#F25555",
+    50: "#FEF7F7",
+    100: "#FEEEEE",
+    200: "#FCD5D5",
+    300: "#FABBBB",
+    400: "#F68888",
+    500: "#F25555",
+    600: "#DA4D4D",
+    700: "#913333",
+    800: "#6D2626",
+    900: "#491A1A"
+  },
+  success: {
+    DEFAULT: "#3FB061",
+    50: "#F5FBF7",
+    100: "#ECF7EF",
+    200: "#CFEBD8",
+    300: "#B2DFC0",
+    400: "#79C890",
+    500: "#3FB061",
+    600: "#399E57",
+    700: "#266A3A",
+    800: "#1C4F2C",
+    900: "#13351D"
+  },
+  warning: {
+    DEFAULT: "#FF9A35",
+    50: "#FFFAF5",
+    100: "#FFF5EB",
+    200: "#FFE6CD",
+    300: "#FFD7AE",
+    400: "#FFB872",
+    500: "#FF9A35",
+    600: "#E68B30",
+    700: "#995C20",
+    800: "#734518",
+    900: "#4D2E10"
+  }
+};
+
 const module = defineNuxtModule({
   meta: {
     name,
@@ -375,26 +204,18 @@ const module = defineNuxtModule({
     nuxt.options.alias["#core"] = runtimeDir;
     nuxt.options.css.push(resolve(runtimeDir, "ui.css"));
     nuxt.hook("tailwindcss:config", (tailwindConfig) => {
-      tailwindConfig.safelist = [
-        ...tailwindConfig.safelist || [],
+      tailwindConfig.theme.extend.colors = defu(colors, tailwindConfig.theme.extend.colors);
+      tailwindConfig.content = defu(
         {
-          pattern: /bg-(primary|info|warning|success|danger)-(200)/
-        }
-      ];
-      tailwindConfig.content = {
-        ...tailwindConfig.content,
-        files: [
-          ...tailwindConfig.content.files || [],
-          resolve(runtimeDir, "components/**/*.{vue,mjs,ts}"),
-          resolve(runtimeDir, "composables/**/*.{vue,mjs,ts}"),
-          resolve(runtimeDir, "ui.config/**/*.{mjs,js,ts}"),
-          resolve(runtimeDir, "presets/**/*.{mjs,js,ts}")
-        ]
-      };
-      tailwindConfig.theme.extend.colors = {
-        ...tailwindConfig.theme.extend.colors,
-        ...colors
-      };
+          files: [
+            ...tailwindConfig.content.files || [],
+            resolve(runtimeDir, "components/**/*.{vue,mjs,ts}"),
+            resolve(runtimeDir, "composables/**/*.{vue,mjs,ts}"),
+            resolve(runtimeDir, "ui.config/**/*.{mjs,js,ts}")
+          ]
+        },
+        tailwindConfig.content
+      );
     });
     await installModule("@nuxt/ui", {
       safelistColors: ["secondary", "success", "info", "danger", "warning"]
@@ -403,50 +224,34 @@ const module = defineNuxtModule({
       prefix: "_",
       upperAfterPrefix: false
     });
-    nuxt.options.appConfig.ui = _deepMerge(
+    nuxt.options.app = defu(nuxtAppOptions, nuxt.options.app);
+    nuxt.options.colorMode = defu(colorModeOptions, nuxt.options.colorMode);
+    nuxt.options.devtools = defu({ enabled: true }, nuxt.options.devtools);
+    nuxt.options.runtimeConfig = defu(nuxtRunTimeConfigOptions, nuxt.options.runtimeConfig);
+    nuxt.options.build = defu(
       {
-        table,
-        pagination,
-        alert,
-        button,
-        buttonGroup,
-        formGroup,
-        checkbox,
-        input,
-        select,
-        selectMenu,
-        textarea,
-        toggle,
-        badge,
-        notification,
-        icons: {
-          dynamic: true
-        }
+        transpile: [
+          ...nuxt.options.build?.transpile || [],
+          "date-fns",
+          "@vuepic/vue-datepicker",
+          "defu"
+        ]
       },
-      nuxt.options.appConfig.ui
+      nuxt.options.build
     );
-    nuxt.options.appConfig.ui.strategy = "override";
-    nuxt.options.app = _deepMerge({}, nuxtAppOptions, nuxt.options.app);
-    nuxt.options.colorMode = _deepMerge({}, colorModeOptions, nuxt.options.colorMode);
-    nuxt.options.devtools = _deepMerge({}, { enabled: true }, nuxt.options.devtools);
-    nuxt.options.runtimeConfig = _deepMerge(
-      {},
-      nuxtRunTimeConfigOptions,
-      nuxt.options.runtimeConfig
+    nuxt.options.vite = defu(
+      {
+        optimizeDeps: {
+          include: [
+            ...nuxt.options.vite?.optimizeDeps?.include || [],
+            "quill",
+            "@vueup/vue-quill",
+            "@wdns/vue-code-block"
+          ]
+        }
+      },
+      nuxt.options.vite
     );
-    nuxt.options.build = _deepMerge({}, nuxt.options.build, {
-      transpile: [...nuxt.options.build?.transpile || [], "date-fns", "@vuepic/vue-datepicker"]
-    });
-    nuxt.options.vite = _deepMerge({}, nuxt.options.vite, {
-      optimizeDeps: {
-        include: [
-          ...nuxt.options.vite?.optimizeDeps?.include || [],
-          "quill",
-          "@vueup/vue-quill",
-          "@wdns/vue-code-block"
-        ]
-      }
-    });
     await installModule("@pinia/nuxt");
     await installModule("@vee-validate/nuxt", veeValidateNuxtOptions);
     if (!options.securityDisabled) {

package/dist/runtime/components/Form/InputNumber/index.vue

@@ -11,15 +11,15 @@
       :autofocus="!!autoFocus"
       :icon="icon"
       :readonly="isReadonly"
-      :ui="_deepMerge({}, ui, { icon: { trailing: { pointer: '' } } })"
+      :ui="defu(ui, { icon: { trailing: { pointer: '' } } })"
     />
   </FieldWrapper>
 </template>
 <script lang="ts" setup>
-import { _deepMerge } from '#imports'
 import { useFieldHOC } from '#core/composables/useForm'
 import FieldWrapper from '#core/components/Form/FieldWrapper.vue'
 import type { INumberFieldProps } from '#core/components/Form/InputNumber/types'
+import { defu } from 'defu'
 
 const props = withDefaults(defineProps<INumberFieldProps>(), {})
 

package/dist/runtime/components/Form/InputText/index.vue

@@ -18,7 +18,7 @@
       :autofocus="!!autoFocus"
       :icon="icon"
       :readonly="isReadonly"
-      :ui="_deepMerge({}, ui, { icon: { trailing: { pointer: '' } } })"
+      :ui="defu(ui, { icon: { trailing: { pointer: '' } } })"
     >
       <template #trailing>
         <UButton
@@ -53,11 +53,12 @@
   </FieldWrapper>
 </template>
 <script lang="ts" setup>
-import { _deepMerge, ref } from '#imports'
+import { ref } from '#imports'
 import { type ITextFieldProps } from '#core/components/Form/InputText/types'
 import { useFieldHOC } from '#core/composables/useForm'
 import FieldWrapper from '#core/components/Form/FieldWrapper.vue'
 import { vMaska } from 'maska'
+import { defu } from 'defu'
 
 const props = withDefaults(defineProps<ITextFieldProps>(), {})
 

package/dist/runtime/components/Table/Base.vue

@@ -1,5 +1,11 @@
 <template>
-  <UTable :loading="status.isLoading" :columns="columns" :rows="rawData" v-bind="$attrs">
+  <UTable
+    :loading="status.isLoading"
+    :columns="columns"
+    :rows="rawData"
+    :progress="null as unknown as any"
+    v-bind="$attrs"
+  >
     <template #loading-state>
       <div class="flex h-60 items-center justify-center">
         <Icon name="i-svg-spinners:180-ring-with-bg" class="text-primary size-8" />

package/dist/runtime/composables/useFlexDeck.d.ts

@@ -6,5 +6,5 @@ export interface IUseFlexDeck<T = object> {
     repo: IUsePageLoader<T> | Store<any, any>;
     options?: (() => Partial<IFlexDeckOptions<T>>) | Partial<IFlexDeckOptions<T>>;
 }
-export declare const createFlexDeckOptions: <T = object>(repo: IUsePageLoader<T>, options: IFlexDeckOptions<T>) => IFlexDeckOptions<T>;
+export declare const createFlexDeckOptions: <T = object>(repo: IUsePageLoader<T>, options: Partial<IFlexDeckOptions<T>>) => IFlexDeckOptions<T>;
 export declare const useFlexDeck: <T = object>(options: IUseFlexDeck<T>) => ComputedRef<IFlexDeckOptions<T>>;

package/dist/runtime/composables/useTable.d.ts

@@ -17,4 +17,4 @@ export interface IUseTableSimple<T = object> {
 }
 export declare const useTable: <T = object>(options: IUseTable<T>) => ComputedRef<ITableOptions<T>>;
 export declare const useTableSimple: <T = object>(options: IUseTableSimple<T>) => ComputedRef<ISimpleTableOptions<T>>;
-export declare const createTableOptions: <T = object>(repo: IUsePageLoader<T>, columns: IColumn[], options: Partial<ITableOptions<T>>, transformItems?: ((items: T[]) => T[]) | undefined) => ITableOptions<T>;
+export declare const createTableOptions: <T = object>(repo: IUsePageLoader<T>, columns: IColumn[], options: Partial<ITableOptions<T>>, transformItems?: (items: T[]) => T[]) => ITableOptions<T>;

package/dist/runtime/helpers/componentHelper.mjs

@@ -6,15 +6,13 @@ export const checkMaxSize = (file, acceptFileSize = 0) => {
   return true;
 };
 export const checkFileType = (file, acceptFileType) => {
-  if (!acceptFileType || Array.isArray(acceptFileType) && acceptFileType.length === 0)
-    return true;
+  if (!acceptFileType || Array.isArray(acceptFileType) && acceptFileType.length === 0) return true;
   const result = [];
   const acceptedTypes = Array.isArray(acceptFileType) ? acceptFileType : acceptFileType.split(",");
   for (const acceptedType of acceptedTypes) {
     if (acceptedType.startsWith(".")) {
       const fileExtension = `.${file.name.split(".").pop()}`;
-      if (fileExtension.toLowerCase() === acceptedType.toLowerCase())
-        result.push(true);
+      if (fileExtension.toLowerCase() === acceptedType.toLowerCase()) result.push(true);
     } else {
       const fileType = acceptedType.split("/");
       const fileExtension = file.type.split("/");

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

@@ -1,2 +1 @@
-export declare const _deepMerge: (target: any, ...sources: any[]) => any;
 export declare const _isEmpty: (value: any) => boolean;

package/dist/runtime/utils/lodash.mjs

@@ -1,21 +1,3 @@
-const isObj = (item) => item && typeof item === "object" && !Array.isArray(item);
-export const _deepMerge = (target, ...sources) => {
-  if (!sources.length)
-    return target;
-  const source = sources.shift();
-  if (isObj(target) && isObj(source)) {
-    for (const key in source) {
-      if (isObj(source[key])) {
-        if (!target[key])
-          Object.assign(target, { [key]: {} });
-        _deepMerge(target[key], source[key]);
-      } else {
-        Object.assign(target, { [key]: source[key] });
-      }
-    }
-  }
-  return _deepMerge(target, ...sources);
-};
 export const _isEmpty = (value) => {
   if (value === null || value === void 0) {
     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finema/core",
-  "version": "1.4.165",
+  "version": "1.4.167",
   "repository": "https://gitlab.finema.co/finema/ui-kit",
   "license": "MIT",
   "author": "Finema Dev Core Team",
@@ -35,8 +35,8 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.12.3",
-    "@nuxt/ui": "2.15.2",
+    "@nuxt/kit": "^3.12.4",
+    "@nuxt/ui": "2.18.0",
     "@pinia/nuxt": "^0.5.1",
     "@vee-validate/nuxt": "^4.13.2",
     "@vee-validate/zod": "^4.13.2",
@@ -45,6 +45,7 @@
     "@wdns/vue-code-block": "^2.3.2",
     "axios": "^1.7.2",
     "date-fns": "^3.3.1",
+    "defu": "^6.1.4",
     "i18next": "^23.11.5",
     "maska": "^2.1.11",
     "nuxt-lodash": "^2.5.3",
@@ -60,7 +61,7 @@
     "@nuxt/devtools": "^1.3.9",
     "@nuxt/eslint-config": "^0.2.0",
     "@nuxt/module-builder": "^0.5.5",
-    "@nuxt/schema": "^3.12.3",
+    "@nuxt/schema": "^3.12.4",
     "@nuxt/test-utils": "^3.13.1",
     "@release-it/conventional-changelog": "^8.0.1",
     "@types/node": "^20.10.17",
@@ -71,7 +72,7 @@
     "happy-dom": "^13.0.0",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.0",
-    "nuxt": "^3.12.3",
+    "nuxt": "^3.12.4",
     "playwright-core": "^1.42.1",
     "prettier": "^3.1.1",
     "release-it": "^17.0.1",
@@ -79,11 +80,8 @@
     "stylelint": "^16.1.0",
     "stylelint-config-prettier-scss": "^1.0.0",
     "stylelint-config-standard-scss": "^13.0.0",
-    "vitest": "^1.3.1",
-    "vue": "^3.4.31"
-  },
-  "resolutions": {
-    "@nuxtjs/tailwindcss": "6.11.4"
+    "vitest": "^2.0.4",
+    "vue": "^3.4.34"
   },
   "lint-staged": {
     "*.{ts,vue,tsx,js}": "eslint --fix --cache"