@finema/core 3.19.0 → 3.20.1

package/dist/runtime/helpers/apiPageHelper.js

@@ -3,23 +3,26 @@ import { _get } from "../utils/lodash.js";
 import { bindParamsToUrl } from "./apiBaseHelper.js";
 import {
   checkExpiration,
+  createErrorOptions,
+  createSuccessOptions,
   handleApiRequest,
-  omitLoaderSignal,
-  prepareRequestOptions,
-  toSerializableRequestOptions,
+  prepareLoaderRequestOptions,
+  toSerializableLoaderOptions,
   updateLoaderState
 } from "./apiBaseHelper.js";
 import { _findIndex, _shuffle } from "#imports";
 export const apiAddHelper = async (state, onUpdateStatus, onUpdateOptions, onUpdateData, onUpdateItems, data, opts) => {
   onUpdateStatus(updateLoaderState.setLoading(state().status));
   onUpdateOptions({});
-  const requestOptions = prepareRequestOptions(
+  const {
+    requestOptions,
+    stateRequestOptions
+  } = prepareLoaderRequestOptions(
     opts.getBaseRequestOptions?.() || {},
     opts.add?.getRequestOptions?.(data, opts),
     opts.params,
     opts.signal
   );
-  const serializableRequestOptions = toSerializableRequestOptions(requestOptions);
   const url = bindParamsToUrl(opts.add?.getURL ? opts.add.getURL(data, opts) : opts.baseURL, opts.pathBind);
   await handleApiRequest(
     {
@@ -33,18 +36,11 @@ export const apiAddHelper = async (state, onUpdateStatus, onUpdateOptions, onUpd
       onSuccess: (item, status) => {
         onUpdateData(item);
         onUpdateStatus(updateLoaderState.setSuccess(state().status));
-        onUpdateOptions({
-          _timestamp: Date.now(),
-          _status: status,
-          request: serializableRequestOptions
-        });
+        onUpdateOptions(createSuccessOptions(status, stateRequestOptions));
       },
       onError: (error) => {
         onUpdateStatus(updateLoaderState.setError(state().status, error));
-        onUpdateOptions({
-          _status: error.response?.status,
-          request: serializableRequestOptions
-        });
+        onUpdateOptions(createErrorOptions(error, stateRequestOptions));
       },
       onComplete: () => {
         onUpdateStatus(updateLoaderState.setComplete(state().status));
@@ -57,13 +53,15 @@ export const apiDeleteHelper = async (state, onUpdateStatus, onUpdateOptions, _o
   const getPrimaryKey = (item) => _get(item, primaryKey, "");
   onUpdateStatus(updateLoaderState.setLoading(state().status));
   onUpdateOptions({});
-  const requestOptions = prepareRequestOptions(
+  const {
+    requestOptions,
+    stateRequestOptions
+  } = prepareLoaderRequestOptions(
     opts.getBaseRequestOptions?.() || {},
     opts.delete?.getRequestOptions?.(id, opts),
     opts.params,
     opts.signal
   );
-  const serializableRequestOptions = toSerializableRequestOptions(requestOptions);
   const url = bindParamsToUrl(opts.delete?.getURL ? opts.delete.getURL(id, opts) : `${opts.baseURL}/${id}`, opts.pathBind);
   await handleApiRequest(
     {
@@ -81,18 +79,11 @@ export const apiDeleteHelper = async (state, onUpdateStatus, onUpdateOptions, _o
           );
         }
         onUpdateStatus(updateLoaderState.setSuccess(state().status));
-        onUpdateOptions({
-          _timestamp: Date.now(),
-          _status: status,
-          request: serializableRequestOptions
-        });
+        onUpdateOptions(createSuccessOptions(status, stateRequestOptions));
       },
       onError: (error) => {
         onUpdateStatus(updateLoaderState.setError(state().status, error));
-        onUpdateOptions({
-          _status: error.response?.status,
-          request: serializableRequestOptions
-        });
+        onUpdateOptions(createErrorOptions(error, stateRequestOptions));
       },
       onComplete: () => {
         onUpdateStatus(updateLoaderState.setComplete(state().status));
@@ -106,10 +97,11 @@ export const apiFetchHelper = async (state, onUpdateStatus, onUpdateOptions, onU
     onUpdateStatus(updateLoaderState.setComplete(state().status));
     return;
   }
-  const loaderStateOptions = omitLoaderSignal(opts);
+  const loaderStateOptions = toSerializableLoaderOptions(opts);
+  const currentStateOptions = toSerializableLoaderOptions(state().options);
   onUpdateStatus(updateLoaderState.setLoading(state().status));
   onUpdateOptions({
-    ...state().options,
+    ...currentStateOptions,
     ...loaderStateOptions,
     currentPage: page,
     search: query,
@@ -124,7 +116,7 @@ export const apiFetchHelper = async (state, onUpdateStatus, onUpdateOptions, onU
       ...more
     } = data;
     return {
-      ...state().options,
+      ...toSerializableLoaderOptions(state().options),
       ...more,
       currentPageCount: state().items?.length || 0,
       currentPage: page2,
@@ -139,7 +131,10 @@ export const apiFetchHelper = async (state, onUpdateStatus, onUpdateOptions, onU
     ...opts.fetch?.getRequestOptions?.(page, query, opts) || {}
   };
   const limit = Number(state().options.limit || baseRequestOptions.params?.limit || config.limit_per_page);
-  const requestOptions = prepareRequestOptions(
+  const {
+    requestOptions,
+    stateRequestOptions
+  } = prepareLoaderRequestOptions(
     baseRequestOptions,
     {
       params: {
@@ -151,7 +146,6 @@ export const apiFetchHelper = async (state, onUpdateStatus, onUpdateOptions, onU
     opts.params,
     opts.signal
   );
-  const serializableRequestOptions = toSerializableRequestOptions(requestOptions);
   const url = bindParamsToUrl(opts.fetch?.getURL ? opts.fetch.getURL(page, query, opts) : opts.baseURL, opts.pathBind);
   await handleApiRequest(
     {
@@ -171,21 +165,18 @@ export const apiFetchHelper = async (state, onUpdateStatus, onUpdateOptions, onU
           ...moreOptions
         } = response;
         onUpdateItems(items);
-        onUpdateOptions(JSON.parse(JSON.stringify({
+        onUpdateOptions({
           ...getOptions(moreOptions),
-          _timestamp: Date.now(),
-          _status: status,
-          request: serializableRequestOptions
-        })));
+          ...createSuccessOptions(status, stateRequestOptions)
+        });
         onUpdateStatus(updateLoaderState.setSuccess(state().status));
       },
       onError: (error) => {
         onUpdateStatus(updateLoaderState.setError(state().status, error));
-        onUpdateOptions(JSON.parse(JSON.stringify({
-          ...state().options,
-          _status: error.response?.status,
-          request: serializableRequestOptions
-        })));
+        onUpdateOptions({
+          ...toSerializableLoaderOptions(state().options),
+          ...createErrorOptions(error, stateRequestOptions)
+        });
       },
       onComplete: () => {
         onUpdateStatus(updateLoaderState.setComplete(state().status));
@@ -200,13 +191,15 @@ export const apiFindHelper = async (state, onUpdateStatus, onUpdateOptions, onUp
   }
   onUpdateStatus(updateLoaderState.setLoading(state().status));
   onUpdateOptions({});
-  const requestOptions = prepareRequestOptions(
+  const {
+    requestOptions,
+    stateRequestOptions
+  } = prepareLoaderRequestOptions(
     opts.getBaseRequestOptions?.() || {},
     opts.find?.getRequestOptions?.(id, opts),
     opts.params,
     opts.signal
   );
-  const serializableRequestOptions = toSerializableRequestOptions(requestOptions);
   const url = bindParamsToUrl(opts.find?.getURL ? opts.find.getURL(id, opts) : `${opts.baseURL}/${id}`, opts.pathBind);
   await handleApiRequest(
     {
@@ -219,18 +212,11 @@ export const apiFindHelper = async (state, onUpdateStatus, onUpdateOptions, onUp
       onSuccess: (item, status) => {
         onUpdateData(item);
         onUpdateStatus(updateLoaderState.setSuccess(state().status));
-        onUpdateOptions({
-          _timestamp: Date.now(),
-          _status: status,
-          request: serializableRequestOptions
-        });
+        onUpdateOptions(createSuccessOptions(status, stateRequestOptions));
       },
       onError: (error) => {
         onUpdateStatus(updateLoaderState.setError(state().status, error));
-        onUpdateOptions({
-          _status: error.response?.status,
-          request: serializableRequestOptions
-        });
+        onUpdateOptions(createErrorOptions(error, stateRequestOptions));
       },
       onComplete: () => {
         onUpdateStatus(updateLoaderState.setComplete(state().status));
@@ -245,13 +231,15 @@ export const updateHelper = async (state, onUpdateStatus, onUpdateOptions, onUpd
   }
   onUpdateStatus(updateLoaderState.setLoading(state().status));
   onUpdateOptions({});
-  const requestOptions = prepareRequestOptions(
+  const {
+    requestOptions,
+    stateRequestOptions
+  } = prepareLoaderRequestOptions(
     opts.getBaseRequestOptions?.() || {},
     opts.update?.getRequestOptions?.(id, data, opts),
     opts.params,
     opts.signal
   );
-  const serializableRequestOptions = toSerializableRequestOptions(requestOptions);
   const url = bindParamsToUrl(opts.update?.getURL ? opts.update.getURL(id, data, opts) : `${opts.baseURL}/${id}`, opts.pathBind);
   await handleApiRequest(
     {
@@ -278,18 +266,11 @@ export const updateHelper = async (state, onUpdateStatus, onUpdateOptions, onUpd
           }
         }
         onUpdateStatus(updateLoaderState.setSuccess(state().status));
-        onUpdateOptions({
-          _timestamp: Date.now(),
-          _status: status,
-          request: serializableRequestOptions
-        });
+        onUpdateOptions(createSuccessOptions(status, stateRequestOptions));
       },
       onError: (error) => {
         onUpdateStatus(updateLoaderState.setError(state().status, error));
-        onUpdateOptions({
-          _status: error.response?.status,
-          request: serializableRequestOptions
-        });
+        onUpdateOptions(createErrorOptions(error, stateRequestOptions));
       },
       onComplete: () => {
         onUpdateStatus(updateLoaderState.setComplete(state().status));

package/dist/runtime/server/tsconfig.json

@@ -1,3 +1,3 @@
-{
-  "extends": "../../../.nuxt/tsconfig.server.json",
-}
+{
+  "extends": "../../../.nuxt/tsconfig.server.json",
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finema/core",
-  "version": "3.19.0",
+  "version": "3.20.1",
   "repository": "https://gitlab.finema.co/finema/ui-kit",
   "license": "MIT",
   "author": "Finema Dev Core Team",
@@ -43,8 +43,8 @@
     "@iconify-json/heroicons": "^1.2.2",
     "@iconify-json/ph": "^1.2.2",
     "@iconify-json/svg-spinners": "^1.2.2",
-    "@nuxt/kit": "^4.1.3",
-    "@nuxt/ui": "^4.5.0",
+    "@nuxt/kit": "^4.4.8",
+    "@nuxt/ui": "^4.8.2",
     "@pinia/nuxt": "^0.11.0",
     "@tailwindcss/typography": "^0.5.0-alpha.3",
     "@tiptap/extension-text-align": "^3.18.0",
@@ -63,18 +63,18 @@
     "url-join": "^5.0.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.26.0",
+    "@eslint/js": "^10.0.1",
     "@finema/eslint-config": "^2.0.4",
-    "@nuxt/devtools": "^2.6.0",
+    "@nuxt/devtools": "^3.2.4",
     "@nuxt/eslint-config": "^1.4.1",
     "@nuxt/module-builder": "^1.0.2",
-    "@nuxt/schema": "^4.1.3",
-    "@nuxt/test-utils": "^3.19.0",
+    "@nuxt/schema": "^4.4.8",
+    "@nuxt/test-utils": "^4.0.3",
     "@types/node": "latest",
     "changelogen": "^0.6.1",
     "husky": "^9.1.7",
-    "lint-staged": "^16.0.0",
-    "nuxt": "^4.1.3",
+    "lint-staged": "^17.0.7",
+    "nuxt": "^4.4.8",
     "typescript": "~5.9.3",
     "typescript-eslint": "^8.18.0",
     "vitest": "^4.0.2",
@@ -83,4 +83,4 @@
   "lint-staged": {
     "*": "eslint"
   }
-}
+}