@finema/core 3.22.0 → 3.24.0

package/dist/runtime/composables/loaderPage.js

@@ -20,36 +20,32 @@ export const initPageOptions = (options) => ({
 });
 export const usePageLoader = (loaderOptions) => {
   const config = useCoreConfig();
+  const createPageOptions = () => initPageOptions({
+    limit: config.limit_per_page,
+    primary: config.default_primary_key
+  });
   const fetch = reactive({
     status: ObjectHelper.createStatus(),
     statusNextPage: ObjectHelper.createStatus(),
     items: [],
-    options: initPageOptions({
-      limit: config.limit_per_page,
-      primary: config.default_primary_key
-    })
-  });
-  const find = reactive({
-    status: ObjectHelper.createStatus(),
-    item: null,
-    options: {}
+    options: createPageOptions()
   });
-  const add = reactive({
-    status: ObjectHelper.createStatus(),
-    item: null,
-    options: {}
-  });
-  const update = reactive({
-    status: ObjectHelper.createStatus(),
-    item: null,
-    options: {}
-  });
-  const del = reactive({
-    // Using 'del' as a variable name since 'delete' is a reserved keyword
+  const createItemState = () => reactive({
     status: ObjectHelper.createStatus(),
     item: null,
     options: {}
   });
+  const find = createItemState();
+  const add = createItemState();
+  const update = createItemState();
+  const del = createItemState();
+  const states = {
+    fetch,
+    find,
+    add,
+    update,
+    delete: del
+  };
   const requests = {
     fetch: null,
     find: null,
@@ -57,100 +53,46 @@ export const usePageLoader = (loaderOptions) => {
     update: null,
     delete: null
   };
-  const isActiveRequest = (key, currentRequest) => {
-    return requests[key] === currentRequest;
-  };
-  const canUpdateRequest = (key, currentRequest) => {
-    return isActiveRequest(key, currentRequest) || !currentRequest.signal.aborted;
-  };
-  const completeStatus = (status) => ObjectHelper.toCompleteStatus(status);
-  const cancelFetch = () => {
-    const currentRequest = requests.fetch;
-    if (!currentRequest) return;
-    currentRequest.controller.abort();
-    currentRequest.cleanup();
-    requests.fetch = null;
-    fetch.status = completeStatus(fetch.status);
-    fetch.statusNextPage = completeStatus(fetch.statusNextPage);
-  };
-  const cancelFind = () => {
-    const currentRequest = requests.find;
+  const cancel = (key) => {
+    const currentRequest = requests[key];
     if (!currentRequest) return;
     currentRequest.controller.abort();
     currentRequest.cleanup();
-    requests.find = null;
-    find.status = completeStatus(find.status);
-  };
-  const cancelAdd = () => {
-    const currentRequest = requests.add;
-    if (!currentRequest) return;
-    currentRequest.controller.abort();
-    currentRequest.cleanup();
-    requests.add = null;
-    add.status = completeStatus(add.status);
-  };
-  const cancelUpdate = () => {
-    const currentRequest = requests.update;
-    if (!currentRequest) return;
-    currentRequest.controller.abort();
-    currentRequest.cleanup();
-    requests.update = null;
-    update.status = completeStatus(update.status);
-  };
-  const cancelDelete = () => {
-    const currentRequest = requests.delete;
-    if (!currentRequest) return;
-    currentRequest.controller.abort();
-    currentRequest.cleanup();
-    requests.delete = null;
-    del.status = completeStatus(del.status);
+    requests[key] = null;
+    states[key].status = ObjectHelper.toCompleteStatus(states[key].status);
+    if (key === "fetch") {
+      fetch.statusNextPage = ObjectHelper.toCompleteStatus(fetch.statusNextPage);
+    }
   };
   const cancelAll = () => {
-    cancelFetch();
-    cancelFind();
-    cancelAdd();
-    cancelUpdate();
-    cancelDelete();
+    ;
+    Object.keys(requests).forEach(cancel);
   };
-  const cancelRequestByKey = (key) => {
-    if (key === "fetch") cancelFetch();
-    if (key === "find") cancelFind();
-    if (key === "add") cancelAdd();
-    if (key === "update") cancelUpdate();
-    if (key === "delete") cancelDelete();
-  };
-  const startRequest = (key, externalSignal, autoCancel = true) => {
-    if (autoCancel) cancelRequestByKey(key);
+  const withRequest = async (key, externalSignal, autoCancel, run) => {
+    if (autoCancel) cancel(key);
     const currentRequest = createCancelableRequest(externalSignal);
     requests[key] = currentRequest;
-    return currentRequest;
-  };
-  const finishRequest = (key, currentRequest) => {
-    currentRequest.cleanup();
-    if (!isActiveRequest(key, currentRequest)) return;
-    requests[key] = null;
+    const canUpdate = () => requests[key] === currentRequest || !currentRequest.signal.aborted;
+    try {
+      await run(currentRequest.signal, (set) => (value) => {
+        if (canUpdate()) set(value);
+      });
+    } finally {
+      currentRequest.cleanup();
+      if (requests[key] === currentRequest) requests[key] = null;
+    }
   };
   const clearAll = () => {
     cancelAll();
-    find.status = ObjectHelper.createStatus();
-    del.status = ObjectHelper.createStatus();
-    add.status = ObjectHelper.createStatus();
-    update.status = ObjectHelper.createStatus();
     fetch.status = ObjectHelper.createStatus();
     fetch.statusNextPage = ObjectHelper.createStatus();
-    find.item = null;
-    del.item = null;
-    update.item = null;
-    add.item = null;
     fetch.items = [];
-    fetch.options = initPageOptions({
-      limit: config.limit_per_page,
-      primary: config.default_primary_key
-    });
-    find.options = {};
-    add.options = {};
-    update.options = {};
-    del.options = {};
+    fetch.options = createPageOptions();
+    for (const state of [find, add, update, del]) {
+      state.status = ObjectHelper.createStatus();
+      state.item = null;
+      state.options = {};
+    }
   };
   const fetchSetLoading = () => {
     fetch.items = [];
@@ -159,261 +101,192 @@ export const usePageLoader = (loaderOptions) => {
   const findSetLoading = () => {
     find.status = ObjectHelper.toLoadingStatus(find.status);
   };
-  const fetchPage = async (page = 1, query = "", opts) => {
-    const currentRequest = startRequest("fetch", opts?.signal);
-    try {
-      await apiFetchHelper(
-        () => ({
-          status: fetch.status,
-          items: fetch.items,
-          options: fetch.options
-        }),
-        (data) => {
-          if (canUpdateRequest("fetch", currentRequest)) fetch.status = data;
-        },
-        (data) => {
-          if (canUpdateRequest("fetch", currentRequest)) fetch.options = data;
-        },
-        (data) => {
-          if (canUpdateRequest("fetch", currentRequest)) fetch.items = data;
-        },
-        page,
-        query,
-        {
-          ...loaderOptions,
-          ...opts,
-          signal: currentRequest.signal
-        }
-      );
-    } finally {
-      finishRequest("fetch", currentRequest);
-    }
-  };
-  const fetchAll = async (query = "", opts = {}) => {
-    opts.params = {
+  const runFetch = (page, query, opts, mode = "replace") => withRequest(
+    "fetch",
+    opts?.signal,
+    true,
+    (signal, guard) => apiFetchHelper(
+      () => ({
+        status: fetch.status,
+        items: fetch.items,
+        options: fetch.options
+      }),
+      guard((data) => {
+        if (mode === "append") fetch.statusNextPage = data;
+        else fetch.status = data;
+      }),
+      guard((data) => {
+        fetch.options = data;
+      }),
+      guard((data) => {
+        fetch.items = mode === "append" ? [...fetch.items, ...data] : data;
+      }),
+      page,
+      query,
+      {
+        ...loaderOptions,
+        ...opts,
+        signal
+      }
+    )
+  );
+  const fetchPage = (page = 1, query = "", opts) => runFetch(page, query, opts);
+  const fetchAll = (query = "", opts = {}) => runFetch(1, query, {
+    ...opts,
+    params: {
       ...opts.params,
       limit: 99999
-    };
-    const currentRequest = startRequest("fetch", opts.signal);
-    try {
-      await apiFetchHelper(
-        () => ({
-          status: fetch.status,
-          items: fetch.items,
-          options: fetch.options
-        }),
-        (data) => {
-          if (canUpdateRequest("fetch", currentRequest)) fetch.status = data;
-        },
-        (data) => {
-          if (canUpdateRequest("fetch", currentRequest)) fetch.options = data;
-        },
-        (data) => {
-          if (canUpdateRequest("fetch", currentRequest)) fetch.items = data;
-        },
-        1,
-        query,
-        {
-          ...loaderOptions,
-          ...opts,
-          signal: currentRequest.signal
-        }
-      );
-    } finally {
-      finishRequest("fetch", currentRequest);
-    }
-  };
-  const findRun = async (id, opts) => {
-    const currentRequest = startRequest("find", opts?.signal);
-    try {
-      await apiFindHelper(
-        () => ({
-          status: find.status,
-          data: find.item,
-          options: find.options
-        }),
-        (data) => {
-          if (canUpdateRequest("find", currentRequest)) find.status = data;
-        },
-        (data) => {
-          if (canUpdateRequest("find", currentRequest)) find.options = data;
-        },
-        (data) => {
-          if (canUpdateRequest("find", currentRequest)) find.item = data;
-        },
-        id,
-        {
-          ...loaderOptions,
-          ...opts,
-          signal: currentRequest.signal
-        }
-      );
-    } finally {
-      finishRequest("find", currentRequest);
-    }
-  };
-  const addRun = async (payload) => {
-    const currentRequest = startRequest("add", payload.signal, false);
-    try {
-      await apiAddHelper(
-        () => ({
-          items: fetch.items,
-          status: add.status,
-          data: add.item,
-          options: add.options
-        }),
-        (data) => {
-          if (canUpdateRequest("add", currentRequest)) add.status = data;
-        },
-        (data) => {
-          if (canUpdateRequest("add", currentRequest)) add.options = data;
-        },
-        (data) => {
-          if (canUpdateRequest("add", currentRequest)) add.item = data;
-        },
-        (data) => {
-          if (canUpdateRequest("add", currentRequest)) fetch.items = data;
-        },
-        payload.data,
-        {
-          ...loaderOptions,
-          ...payload,
-          signal: currentRequest.signal
-        }
-      );
-    } finally {
-      finishRequest("add", currentRequest);
-    }
-  };
-  const updateRun = async (id, payload) => {
-    const currentRequest = startRequest("update", payload.signal, false);
-    try {
-      await updateHelper(
-        () => ({
-          items: fetch.items,
-          status: update.status,
-          data: update.item,
-          oldData: find.item,
-          options: update.options
-        }),
-        (data) => {
-          if (canUpdateRequest("update", currentRequest)) update.status = data;
-        },
-        (data) => {
-          if (canUpdateRequest("update", currentRequest)) update.options = data;
-        },
-        (data) => {
-          if (canUpdateRequest("update", currentRequest)) update.item = data;
-        },
-        (data) => {
-          if (canUpdateRequest("update", currentRequest)) fetch.items = data;
-        },
-        (data) => {
-          if (canUpdateRequest("update", currentRequest)) find.item = data;
-        },
-        id,
-        payload.data,
-        {
-          ...loaderOptions,
-          ...payload,
-          signal: currentRequest.signal
-        }
-      );
-    } finally {
-      finishRequest("update", currentRequest);
-    }
-  };
-  const fetchSearch = async (query = "", opts) => {
-    await fetchPage(1, query, opts);
-  };
-  const fetchNextPage = async (opts) => {
-    const {
-      page: _page,
-      ...params
-    } = fetch.options?.request?.params || {};
-    const currentRequest = startRequest("fetch", opts?.signal);
-    try {
-      await apiFetchHelper(
-        () => ({
-          status: fetch.status,
-          items: fetch.items,
-          options: fetch.options
-        }),
-        (data) => {
-          if (canUpdateRequest("fetch", currentRequest)) fetch.statusNextPage = data;
-        },
-        (data) => {
-          if (canUpdateRequest("fetch", currentRequest)) fetch.options = data;
-        },
-        (data) => {
-          if (canUpdateRequest("fetch", currentRequest)) {
-            fetch.items = [...fetch.items, ...data];
-          }
-        },
-        fetch.options.currentPage + 1,
-        fetch.options.search || "",
-        {
-          ...loaderOptions,
-          params,
-          ...opts,
-          signal: currentRequest.signal
-        }
-      );
-    } finally {
-      finishRequest("fetch", currentRequest);
     }
+  });
+  const fetchSearch = (query = "", opts) => fetchPage(1, query, opts);
+  const lastFetchParams = () => {
+    const { page: _page, ...params } = fetch.options?.request?.params || {};
+    return params;
   };
-  const fetchPageChange = async (page, opts) => {
-    const {
-      page: _page,
-      ...params
-    } = fetch.options?.request?.params || {};
-    await fetchPage(page, "", {
-      params,
+  const fetchNextPage = (opts) => runFetch(
+    fetch.options.currentPage + 1,
+    fetch.options.search || "",
+    {
+      params: lastFetchParams(),
       ...opts
-    });
-  };
-  const deleteRun = async (id, opts) => {
-    const currentRequest = startRequest("delete", opts?.signal, false);
-    try {
-      await apiDeleteHelper(
-        () => ({
-          status: del.status,
-          data: del.item,
-          items: fetch.items,
-          options: del.options
-        }),
-        (data) => {
-          if (canUpdateRequest("delete", currentRequest)) del.status = data;
-        },
-        (data) => {
-          if (canUpdateRequest("delete", currentRequest)) del.options = data;
-        },
-        (data) => {
-          if (canUpdateRequest("delete", currentRequest)) del.item = data;
-        },
-        (data) => {
-          if (canUpdateRequest("delete", currentRequest)) fetch.items = data;
-        },
-        id,
-        {
-          ...loaderOptions,
-          ...opts,
-          signal: currentRequest.signal
-        }
-      );
-    } finally {
-      finishRequest("delete", currentRequest);
-    }
-  };
+    },
+    "append"
+  );
+  const fetchPageChange = (page, opts) => fetchPage(page, "", {
+    params: lastFetchParams(),
+    ...opts
+  });
+  const findRun = (id, opts) => withRequest(
+    "find",
+    opts?.signal,
+    true,
+    (signal, guard) => apiFindHelper(
+      () => ({
+        status: find.status,
+        data: find.item,
+        options: find.options
+      }),
+      guard((data) => {
+        find.status = data;
+      }),
+      guard((data) => {
+        find.options = data;
+      }),
+      guard((data) => {
+        find.item = data;
+      }),
+      id,
+      {
+        ...loaderOptions,
+        ...opts,
+        signal
+      }
+    )
+  );
+  const addRun = (payload) => withRequest(
+    "add",
+    payload.signal,
+    false,
+    (signal, guard) => apiAddHelper(
+      () => ({
+        items: fetch.items,
+        status: add.status,
+        data: add.item,
+        options: add.options
+      }),
+      guard((data) => {
+        add.status = data;
+      }),
+      guard((data) => {
+        add.options = data;
+      }),
+      guard((data) => {
+        add.item = data;
+      }),
+      guard((data) => {
+        fetch.items = data;
+      }),
+      payload.data,
+      {
+        ...loaderOptions,
+        ...payload,
+        signal
+      }
+    )
+  );
+  const updateRun = (id, payload) => withRequest(
+    "update",
+    payload.signal,
+    false,
+    (signal, guard) => updateHelper(
+      () => ({
+        items: fetch.items,
+        status: update.status,
+        data: update.item,
+        oldData: find.item,
+        options: update.options
+      }),
+      guard((data) => {
+        update.status = data;
+      }),
+      guard((data) => {
+        update.options = data;
+      }),
+      guard((data) => {
+        update.item = data;
+      }),
+      guard((data) => {
+        fetch.items = data;
+      }),
+      guard((data) => {
+        find.item = data;
+      }),
+      id,
+      payload.data,
+      {
+        ...loaderOptions,
+        ...payload,
+        signal
+      }
+    )
+  );
+  const deleteRun = (id, opts) => withRequest(
+    "delete",
+    opts?.signal,
+    false,
+    (signal, guard) => apiDeleteHelper(
+      () => ({
+        status: del.status,
+        data: del.item,
+        items: fetch.items,
+        options: del.options
+      }),
+      guard((data) => {
+        del.status = data;
+      }),
+      guard((data) => {
+        del.options = data;
+      }),
+      guard((data) => {
+        del.item = data;
+      }),
+      guard((data) => {
+        fetch.items = data;
+      }),
+      id,
+      {
+        ...loaderOptions,
+        ...opts,
+        signal
+      }
+    )
+  );
   return {
-    // State and methods
     fetch,
     find,
     add,
     update,
     delete: del,
-    // Rename del to delete in the return object
     fetchPage,
     fetchAll,
     fetchSearch,
@@ -425,11 +298,11 @@ export const usePageLoader = (loaderOptions) => {
     addRun,
     updateRun,
     deleteRun,
-    cancelFetch,
-    cancelFind,
-    cancelAdd,
-    cancelUpdate,
-    cancelDelete,
+    cancelFetch: () => cancel("fetch"),
+    cancelFind: () => cancel("find"),
+    cancelAdd: () => cancel("add"),
+    cancelUpdate: () => cancel("update"),
+    cancelDelete: () => cancel("delete"),
     cancelAll,
     clearAll
   };

package/dist/runtime/composables/useConfig.js

@@ -1,17 +1,18 @@
 import { tv } from "tailwind-variants";
 import appConfig from "#build/app.config";
+const uiConfig = () => appConfig.ui;
 export const useCoreConfig = () => {
   return appConfig.core;
 };
 export const useUiConfig = (config, name) => {
   return tv({
     extend: tv(config),
-    ...appConfig.ui[name] || {}
+    ...uiConfig()[name]
   });
 };
 export const useUiIconConfig = (name) => {
-  return appConfig.ui[name].icons;
+  return uiConfig()[name].icons;
 };
 export const useUiStaticConfig = (name) => {
-  return appConfig.ui[name].slots;
+  return uiConfig()[name].slots;
 };

package/dist/runtime/composables/useDialog.js

@@ -1,4 +1,5 @@
 import Dialog from "../components/Dialog/index.vue";
+import { useCoreMessages } from "./useMessages.js";
 import { useOverlay } from "#imports";
 export var DialogType = /* @__PURE__ */ ((DialogType2) => {
   DialogType2["ERROR"] = "error";
@@ -10,6 +11,7 @@ export var DialogType = /* @__PURE__ */ ((DialogType2) => {
 })(DialogType || {});
 export const useDialog = () => {
   const overlay = useOverlay();
+  const { messages } = useCoreMessages();
   const modalLoading = overlay.create(Dialog);
   const openDialog = async (payload) => {
     const modal = overlay.create(Dialog);
@@ -57,7 +59,7 @@ export const useDialog = () => {
   const loading = async (payload = {}) => {
     modalLoading.open({
       ...payload,
-      title: payload.title || "\u0E01\u0E33\u0E25\u0E31\u0E07\u0E42\u0E2B\u0E25\u0E14...",
+      title: payload.title || messages.value.common.loading,
       type: "loading" /* LOADING */
     });
   };

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

@@ -6,7 +6,7 @@ interface IFieldContext<TValue> extends FieldContext<TValue> {
 }
 export declare const useFieldHOC: <TValue = unknown>(newFormProps: IFieldProps, opts?: Partial<FieldOptions<TValue>>) => IFieldContext<TValue>;
 export declare const createFormFields: (fields: () => IFormField[]) => ComputedRef<IFormField[]>;
-export declare const moveToError: ({ errors, }: {
-    errors: any;
+export declare const moveToError: ({ errors }: {
+    errors: Record<string, unknown>;
 }) => void;
 export {};