api-core-lib 12.0.89 → 12.0.91

package/dist/cli.cjs

@@ -447,10 +447,11 @@ import type { ${schemasToImport.join(", ")} } from './types';
   }
   const indexFilePath = import_path.default.join(moduleOutputPath, "index.ts");
   const initialIndexContent = `// This file is auto-generated. Do not edit directly.
+// This file is the main entry point for client-side code.
 
 ` + createdFileExports.map((e) => `export * from './${e}';`).join("\n");
   import_fs.default.writeFileSync(indexFilePath, initialIndexContent);
-  console.log(import_chalk.default.gray(`    \u2713 index.ts (Initial)`));
+  console.log(import_chalk.default.gray(`    \u2713 index.ts (Initial Client Entry Point)`));
   const moduleBaseName = module2.moduleName.replace(/Api$/, "");
   const camelCaseModuleName = toCamelCase(moduleBaseName);
   let endpointsContent = `// This file is auto-generated. Do not edit directly.
@@ -513,7 +514,6 @@ import { createApiModuleContext, useApiModule, UseApiModuleOptions } from 'api-c
 import { apiClient } from '@/lib/api-core/clientApi'; // Assuming a fixed path
 import { ${module2.moduleName}, ${module2.moduleName} as TModuleType } from './config';
 
-// 1. Create the strongly-typed context, provider, and consumer hook
 const { 
   Provider, 
   useContext: use${moduleBaseName}Context 
@@ -521,7 +521,6 @@ const {
 
 export { use${moduleBaseName}Context };
 
-// 2. Create a custom Provider that encapsulates the useApiModule logic
 type Options = Parameters<typeof useApiModule>[2];
 
 interface ${moduleBaseName}ProviderProps {
@@ -540,7 +539,7 @@ export function ${moduleBaseName}Provider({ children, options = {} }: ${moduleBa
   const contextFileName = `${camelCaseModuleName}.context.tsx`;
   import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, contextFileName), contextFileContent.trim());
   console.log(import_chalk.default.gray(`    \u2713 ${contextFileName} (Strongly-Typed Context & Provider)`));
-  const serverContent = `// This file is auto-generated. For server-side use only.
+  const serverHelperContent = `// This file is auto-generated. For server-side use only.
 
 import { createServerApi } from 'api-core-lib/server';
 import { serverApiClient } from '@/lib/api-core/serverApi'; // Assuming a fixed path
@@ -553,17 +552,25 @@ export const create${moduleBaseName}ServerApi = () => {
   return createServerApi(serverApiClient, ${module2.moduleName});
 };
 `;
-  import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, `${camelCaseModuleName}.server.ts`), serverContent.trim());
+  import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, `${camelCaseModuleName}.server.ts`), serverHelperContent.trim());
   console.log(import_chalk.default.gray(`    \u2713 ${camelCaseModuleName}.server.ts (Server-Side Helper)`));
-  const newExports = [
+  const clientExports = [
     `
-// Generated API helpers`,
+// Generated API client helpers`,
     `export * from './${camelCaseModuleName}.endpoints';`,
-    `export * from './${camelCaseModuleName}.context';`,
-    `export * from './${camelCaseModuleName}.server';`
+    `export * from './${camelCaseModuleName}.context';`
   ].join("\n");
-  import_fs.default.appendFileSync(indexFilePath, newExports);
-  console.log(import_chalk.default.gray(`    \u2713 index.ts (Updated with helpers)`));
+  import_fs.default.appendFileSync(indexFilePath, clientExports);
+  console.log(import_chalk.default.gray(`    \u2713 index.ts (Updated with client helpers)`));
+  const serverEntryPointContent = `// This file is auto-generated. For server-side use only.
+// It serves as the entry point for server-specific utilities.
+
+export * from './${camelCaseModuleName}.server';
+// Also exporting endpoints, as they are environment-agnostic and useful on the server.
+export * from './${camelCaseModuleName}.endpoints';
+`;
+  import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, "server.ts"), serverEntryPointContent);
+  console.log(import_chalk.default.gray(`    \u2713 server.ts (New Server Entry Point)`));
 }
 function _propToMock(prop) {
   if (prop.example) return prop.example;

package/dist/client.cjs

@@ -270,15 +270,19 @@ function useDeepCompareEffect(callback, dependencies) {
   _react.useEffect.call(void 0, callback, [currentDependenciesRef.current]);
 }
 
-// src/hooks/useApiModule/useApiModule.ts
+// src/hooks/useApiModule/useApiModule.v1.ts
 
 var ApiModuleContext = _react.createContext.call(void 0, null);
 var ApiModuleProvider = ApiModuleContext.Provider;
 var createInitialState = () => ({
   data: null,
   lastSuccessAt: void 0,
-  meta: [],
-  validationErrors: [],
+  meta: void 0,
+  // meta هو كائن، وليس مصفوفة
+  links: void 0,
+  // links هو كائن، وليس مصفوفة
+  validationErrors: void 0,
+  // validationErrors هو مصفوفة، ولكن يمكن أن يكون غير موجود
   error: null,
   loading: false,
   success: false,
@@ -287,34 +291,29 @@ var createInitialState = () => ({
   rawResponse: null
 });
 function useApiActionState(actionConfig, cacheKey, execute, input, enabled) {
-  const getClientSnapshot = () => _chunk25UFVV4Fcjs.globalStateManager.getSnapshot(cacheKey);
-  const getServerSnapshot = () => _chunk25UFVV4Fcjs.globalStateManager.getSnapshot(cacheKey);
+  const getClientSnapshot = _react.useCallback.call(void 0, () => _chunk25UFVV4Fcjs.globalStateManager.getSnapshot(cacheKey), [cacheKey]);
+  const getServerSnapshot = _react.useCallback.call(void 0, () => _chunk25UFVV4Fcjs.globalStateManager.getSnapshot(cacheKey), [cacheKey]);
   const state = _react.useSyncExternalStore.call(void 0, 
     (callback) => _chunk25UFVV4Fcjs.globalStateManager.subscribe(cacheKey, callback),
     getClientSnapshot,
     getServerSnapshot
   );
-  const inputRef = _react.useRef.call(void 0, input);
-  _react.useEffect.call(void 0, () => {
-    inputRef.current = input;
-  }, [input]);
   const refetch = _react.useCallback.call(void 0, () => {
-    execute(inputRef.current);
-  }, [execute]);
-  const prevCacheKeyRef = _react.useRef.call(void 0, cacheKey);
+    execute(input);
+  }, [execute, input]);
+  const prevStateRef = _react.useRef.call(void 0, );
   _react.useEffect.call(void 0, () => {
-    if (prevCacheKeyRef.current !== cacheKey && enabled && state.called) {
-      console.log(`[Cache Key Changed] from ${prevCacheKeyRef.current} to ${cacheKey}. Refetching...`);
+    const currentState = state || createInitialState();
+    const previousState = prevStateRef.current;
+    if (enabled && actionConfig.autoFetch && !currentState.called && !currentState.loading) {
       refetch();
-    } else if (enabled && actionConfig.autoFetch && !state.called && !state.loading) {
-      console.log(`[Auto Fetch] for ${cacheKey}. Fetching...`);
+    } else if (enabled && currentState.isStale && !currentState.loading) {
       refetch();
-    } else if (enabled && state.isStale && !state.loading) {
-      console.log(`[Stale State] for ${cacheKey}. Refetching...`);
+    } else if (enabled && _optionalChain([previousState, 'optionalAccess', _6 => _6.called]) && !currentState.loading && cacheKey !== _optionalChain([prevStateRef, 'access', _7 => _7.current, 'optionalAccess', _8 => _8.cacheKey])) {
       refetch();
     }
-    prevCacheKeyRef.current = cacheKey;
-  }, [cacheKey, enabled, state.isStale, state.loading, state.called, actionConfig.autoFetch, refetch]);
+    prevStateRef.current = { ...currentState, cacheKey };
+  }, [cacheKey, enabled, state, actionConfig.autoFetch, refetch]);
   return state;
 }
 function useModuleContext() {
@@ -340,15 +339,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
   _react.useEffect.call(void 0, () => {
     savedCallbacks.current = { onSuccess, onError };
   }, [onSuccess, onError]);
-  _react.useMemo.call(void 0, () => {
-    if (hydratedState) {
-      _chunk25UFVV4Fcjs.globalStateManager.rehydrate(hydratedState);
-    }
-  }, [hydratedState]);
   _react.useEffect.call(void 0, () => {
-    savedCallbacks.current = { onSuccess, onError };
-  }, [onSuccess, onError]);
-  _react.useMemo.call(void 0, () => {
     if (hydratedState) {
       _chunk25UFVV4Fcjs.globalStateManager.rehydrate(hydratedState);
     }
@@ -358,7 +349,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       const actionConfig = moduleConfig.actions[actionName];
       const shouldCache = actionConfig.cacheResponse !== false;
       const execute = async (input, options2 = {}) => {
-        const finalPathParams = { ...JSON.parse(pathParamsString), ...options2.pathParams };
+        const finalPathParams = { ...modulePathParams || {}, ...options2.pathParams };
         const cacheKey = shouldCache ? _chunk25UFVV4Fcjs.generateCacheKey.call(void 0, moduleConfig.baseEndpoint, actionName, input, { pathParams: finalPathParams }) : "";
         let mutationContext;
         try {
@@ -373,48 +364,41 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
             body: input,
             config: options2.config
           });
-          console.log("[API Result execute]", result);
           if (shouldCache) {
             _chunk25UFVV4Fcjs.globalStateManager.setState(cacheKey, (prev) => ({
               ...prev,
-              // احتفظ بالخصائص القديمة مثل 'called'
               loading: false,
               success: result.success,
-              // تحديث صريح
               error: result.success ? null : result.error || prev.error,
-              // تحديث صريح
-              data: result.data,
-              // تحديث صريح للبيانات
+              data: result.success ? result.data : prev.data,
+              // ✅ [تحسين] لا تمسح البيانات القديمة عند حدوث خطأ
               meta: result.meta,
-              // تحديث صريح
               links: result.links,
-              // تحديث صريح
               message: result.message,
-              validationErrors: result.validationErrors || [],
-              rawResponse: result.rawResponse
-              // isStale تم تعيينه إلى false في بداية execute، وسيظل كذلك
+              validationErrors: result.validationErrors,
+              rawResponse: result.rawResponse,
+              lastSuccessAt: result.success ? Date.now() : prev.lastSuccessAt
             }));
           }
           if (result.success) {
-            _optionalChain([savedCallbacks, 'access', _6 => _6.current, 'access', _7 => _7.onSuccess, 'optionalCall', _8 => _8(actionName, result.message || "Action successful", result.data)]);
-            _optionalChain([options2, 'access', _9 => _9.onSuccess, 'optionalCall', _10 => _10(result.data, mutationContext)]);
-            _optionalChain([actionConfig, 'access', _11 => _11.invalidates, 'optionalAccess', _12 => _12.forEach, 'call', _13 => _13((keyToInvalidate) => {
+            _optionalChain([savedCallbacks, 'access', _9 => _9.current, 'access', _10 => _10.onSuccess, 'optionalCall', _11 => _11(actionName, result.message || "Action successful", result.data)]);
+            _optionalChain([options2, 'access', _12 => _12.onSuccess, 'optionalCall', _13 => _13(result.data, mutationContext)]);
+            _optionalChain([actionConfig, 'access', _14 => _14.invalidates, 'optionalAccess', _15 => _15.forEach, 'call', _16 => _16((keyToInvalidate) => {
               const prefix = `${moduleConfig.baseEndpoint}/${keyToInvalidate}::`;
-              console.log(`[Invalidating] by prefix: ${prefix}`);
               _chunk25UFVV4Fcjs.globalStateManager.invalidateByPrefix(prefix);
             })]);
           } else {
-            _optionalChain([savedCallbacks, 'access', _14 => _14.current, 'access', _15 => _15.onError, 'optionalCall', _16 => _16(actionName, result.message || "Action failed", _nullishCoalesce(result.error, () => ( void 0)))]);
-            _optionalChain([options2, 'access', _17 => _17.onError, 'optionalCall', _18 => _18(result.error, mutationContext)]);
+            _optionalChain([savedCallbacks, 'access', _17 => _17.current, 'access', _18 => _18.onError, 'optionalCall', _19 => _19(actionName, result.message || "Action failed", _nullishCoalesce(result.error, () => ( void 0)))]);
+            _optionalChain([options2, 'access', _20 => _20.onError, 'optionalCall', _21 => _21(result.error, mutationContext)]);
           }
           return result;
         } catch (error) {
-          const apiError = _optionalChain([error, 'access', _19 => _19.response, 'optionalAccess', _20 => _20.data]) || { status: 500, message: error.message };
+          const apiError = _optionalChain([error, 'access', _22 => _22.response, 'optionalAccess', _23 => _23.data]) || { status: 500, message: error.message };
           if (shouldCache) {
             _chunk25UFVV4Fcjs.globalStateManager.setState(cacheKey, (prev) => ({ ...prev, error: apiError, loading: false, success: false }));
           }
-          _optionalChain([savedCallbacks, 'access', _21 => _21.current, 'access', _22 => _22.onError, 'optionalCall', _23 => _23(actionName, apiError.message, apiError)]);
-          _optionalChain([options2, 'access', _24 => _24.onError, 'optionalCall', _25 => _25(apiError, mutationContext)]);
+          _optionalChain([savedCallbacks, 'access', _24 => _24.current, 'access', _25 => _25.onError, 'optionalCall', _26 => _26(actionName, apiError.message, apiError)]);
+          _optionalChain([options2, 'access', _27 => _27.onError, 'optionalCall', _28 => _28(apiError, mutationContext)]);
           throw error;
         } finally {
           if (options2.onSettled) {
@@ -424,7 +408,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       };
       const reset = (input, options2 = {}) => {
         if (shouldCache) {
-          const finalPathParams = { ...JSON.parse(pathParamsString), ...options2.pathParams };
+          const finalPathParams = { ...modulePathParams || {}, ...options2.pathParams };
           const cacheKey = _chunk25UFVV4Fcjs.generateCacheKey.call(void 0, moduleConfig.baseEndpoint, actionName, input, { pathParams: finalPathParams });
           _chunk25UFVV4Fcjs.globalStateManager.setState(cacheKey, () => createInitialState());
         }
@@ -432,11 +416,11 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       acc[actionName] = { execute, reset };
       return acc;
     }, {});
-  }, [axiosInstance, moduleConfig, pathParamsString]);
+  }, [axiosInstance, moduleConfig, modulePathParams]);
   const queries = _react.useMemo.call(void 0, () => {
     const builtQueries = {};
     for (const actionName in moduleConfig.actions) {
-      if (_optionalChain([moduleConfig, 'access', _26 => _26.actions, 'access', _27 => _27[actionName], 'optionalAccess', _28 => _28.hasQuery])) {
+      if (_optionalChain([moduleConfig, 'access', _29 => _29.actions, 'access', _30 => _30[actionName], 'optionalAccess', _31 => _31.hasQuery])) {
         const setActionQueryOptions = (updater) => {
           setQueryOptions((prev) => ({ ...prev, [actionName]: typeof updater === "function" ? updater(prev[actionName] || {}) : updater }));
         };
@@ -448,50 +432,42 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
           setSearchTerm: (search) => setActionQueryOptions((p) => ({ ...p, search, page: 1 })),
           setFilters: (filter) => setActionQueryOptions((p) => ({ ...p, filter, page: 1 })),
           setSorting: (sortBy) => setActionQueryOptions((p) => ({ ...p, sortBy })),
-          setQueryParam: (key, value) => setActionQueryOptions((p) => ({ ...p, [key]: value, page: key !== "page" ? value : p.page })),
+          setQueryParam: (key, value) => setActionQueryOptions((p) => ({ ...p, [key]: value, page: key !== "page" ? 1 : value })),
           reset: () => setActionQueryOptions({})
         };
       }
     }
     return builtQueries;
   }, [queryOptions, moduleConfig.actions]);
-  const states = {};
-  function isActionWithQuery(key, actions2) {
-    return _optionalChain([actions2, 'access', _29 => _29[key], 'optionalAccess', _30 => _30.hasQuery]) === true;
-  }
-  for (const actionName in moduleConfig.actions) {
-    if (Object.prototype.hasOwnProperty.call(moduleConfig.actions, actionName)) {
-      const actionConfig = moduleConfig.actions[actionName];
-      if (actionConfig.cacheResponse !== false) {
-        let queryOptions2;
-        if (isActionWithQuery(actionName, moduleConfig.actions)) {
-          queryOptions2 = _optionalChain([queries, 'access', _31 => _31[actionName], 'optionalAccess', _32 => _32.options]);
+  const states = _react.useMemo.call(void 0, () => {
+    const builtStates = {};
+    for (const actionName in moduleConfig.actions) {
+      if (Object.prototype.hasOwnProperty.call(moduleConfig.actions, actionName)) {
+        const actionConfig = moduleConfig.actions[actionName];
+        if (actionConfig.cacheResponse !== false) {
+          const query = _optionalChain([queries, 'access', _32 => _32[actionName], 'optionalAccess', _33 => _33.options]);
+          const input = actionConfig.hasQuery ? query : void 0;
+          const cacheKey = _chunk25UFVV4Fcjs.generateCacheKey.call(void 0, moduleConfig.baseEndpoint, actionName, input, { pathParams: modulePathParams });
+          builtStates[actionName] = useApiActionState(
+            actionConfig,
+            cacheKey,
+            actions[actionName].execute,
+            input,
+            enabled
+          );
+        } else {
+          builtStates[actionName] = createInitialState();
         }
-        const input = queryOptions2;
-        const pathParams = JSON.parse(pathParamsString);
-        const cacheKey = _chunk25UFVV4Fcjs.generateCacheKey.call(void 0, 
-          moduleConfig.baseEndpoint,
-          actionName,
-          input,
-          { pathParams }
-        );
-        states[actionName] = useApiActionState(
-          actionConfig,
-          cacheKey,
-          actions[actionName].execute,
-          input,
-          enabled
-        );
-      } else {
-        states[actionName] = createInitialState();
       }
     }
-  }
+    return builtStates;
+  }, [moduleConfig, queries, actions, modulePathParams, enabled]);
   const lastBlurTimestamp = _react.useRef.call(void 0, Date.now());
   _react.useEffect.call(void 0, () => {
     if (!enabled || !refetchOnWindowFocus) return;
     const onFocus = () => {
-      if (Date.now() - lastBlurTimestamp.current > 1e4) {
+      if (Date.now() - lastBlurTimestamp.current > 3e4) {
+        console.log("[Refetch on Focus] Invalidating all called queries for this module.");
         const actionKeys = Object.keys(moduleConfig.actions);
         for (const actionName of actionKeys) {
           const state = states[actionName];
@@ -512,15 +488,16 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       window.removeEventListener("blur", onBlur);
     };
   }, [enabled, refetchOnWindowFocus, moduleConfig, states]);
-  const dehydrate = _react.useMemo.call(void 0, () => {
-    return () => _chunk25UFVV4Fcjs.globalStateManager.dehydrate();
+  const dehydrate = _react.useCallback.call(void 0, () => {
+    return _chunk25UFVV4Fcjs.globalStateManager.dehydrate();
   }, []);
-  const baseApiReturn = { actions, states, queries, dehydrate };
-  const finalApiReturn = _react.useMemo.call(void 0, () => ({
-    ...baseApiReturn,
+  return _react.useMemo.call(void 0, () => ({
+    actions,
+    states,
+    queries,
+    dehydrate,
     ...extraContextData || {}
-  }), [baseApiReturn, extraContextData]);
-  return finalApiReturn;
+  }), [actions, states, queries, dehydrate, extraContextData]);
 }
 
 // src/hooks/useApiModule/apiModuleContext.ts

package/dist/client.js

@@ -270,15 +270,19 @@ function useDeepCompareEffect(callback, dependencies) {
   useEffect3(callback, [currentDependenciesRef.current]);
 }
 
-// src/hooks/useApiModule/useApiModule.ts
+// src/hooks/useApiModule/useApiModule.v1.ts
 import { createContext, useCallback as useCallback3, useContext, useEffect as useEffect4, useMemo as useMemo3, useRef as useRef4, useState as useState3, useSyncExternalStore } from "react";
 var ApiModuleContext = createContext(null);
 var ApiModuleProvider = ApiModuleContext.Provider;
 var createInitialState = () => ({
   data: null,
   lastSuccessAt: void 0,
-  meta: [],
-  validationErrors: [],
+  meta: void 0,
+  // meta هو كائن، وليس مصفوفة
+  links: void 0,
+  // links هو كائن، وليس مصفوفة
+  validationErrors: void 0,
+  // validationErrors هو مصفوفة، ولكن يمكن أن يكون غير موجود
   error: null,
   loading: false,
   success: false,
@@ -287,34 +291,29 @@ var createInitialState = () => ({
   rawResponse: null
 });
 function useApiActionState(actionConfig, cacheKey, execute, input, enabled) {
-  const getClientSnapshot = () => globalStateManager.getSnapshot(cacheKey);
-  const getServerSnapshot = () => globalStateManager.getSnapshot(cacheKey);
+  const getClientSnapshot = useCallback3(() => globalStateManager.getSnapshot(cacheKey), [cacheKey]);
+  const getServerSnapshot = useCallback3(() => globalStateManager.getSnapshot(cacheKey), [cacheKey]);
   const state = useSyncExternalStore(
     (callback) => globalStateManager.subscribe(cacheKey, callback),
     getClientSnapshot,
     getServerSnapshot
   );
-  const inputRef = useRef4(input);
-  useEffect4(() => {
-    inputRef.current = input;
-  }, [input]);
   const refetch = useCallback3(() => {
-    execute(inputRef.current);
-  }, [execute]);
-  const prevCacheKeyRef = useRef4(cacheKey);
+    execute(input);
+  }, [execute, input]);
+  const prevStateRef = useRef4();
   useEffect4(() => {
-    if (prevCacheKeyRef.current !== cacheKey && enabled && state.called) {
-      console.log(`[Cache Key Changed] from ${prevCacheKeyRef.current} to ${cacheKey}. Refetching...`);
+    const currentState = state || createInitialState();
+    const previousState = prevStateRef.current;
+    if (enabled && actionConfig.autoFetch && !currentState.called && !currentState.loading) {
       refetch();
-    } else if (enabled && actionConfig.autoFetch && !state.called && !state.loading) {
-      console.log(`[Auto Fetch] for ${cacheKey}. Fetching...`);
+    } else if (enabled && currentState.isStale && !currentState.loading) {
       refetch();
-    } else if (enabled && state.isStale && !state.loading) {
-      console.log(`[Stale State] for ${cacheKey}. Refetching...`);
+    } else if (enabled && previousState?.called && !currentState.loading && cacheKey !== prevStateRef.current?.cacheKey) {
       refetch();
     }
-    prevCacheKeyRef.current = cacheKey;
-  }, [cacheKey, enabled, state.isStale, state.loading, state.called, actionConfig.autoFetch, refetch]);
+    prevStateRef.current = { ...currentState, cacheKey };
+  }, [cacheKey, enabled, state, actionConfig.autoFetch, refetch]);
   return state;
 }
 function useModuleContext() {
@@ -340,15 +339,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
   useEffect4(() => {
     savedCallbacks.current = { onSuccess, onError };
   }, [onSuccess, onError]);
-  useMemo3(() => {
-    if (hydratedState) {
-      globalStateManager.rehydrate(hydratedState);
-    }
-  }, [hydratedState]);
   useEffect4(() => {
-    savedCallbacks.current = { onSuccess, onError };
-  }, [onSuccess, onError]);
-  useMemo3(() => {
     if (hydratedState) {
       globalStateManager.rehydrate(hydratedState);
     }
@@ -358,7 +349,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       const actionConfig = moduleConfig.actions[actionName];
       const shouldCache = actionConfig.cacheResponse !== false;
       const execute = async (input, options2 = {}) => {
-        const finalPathParams = { ...JSON.parse(pathParamsString), ...options2.pathParams };
+        const finalPathParams = { ...modulePathParams || {}, ...options2.pathParams };
         const cacheKey = shouldCache ? generateCacheKey(moduleConfig.baseEndpoint, actionName, input, { pathParams: finalPathParams }) : "";
         let mutationContext;
         try {
@@ -373,26 +364,20 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
             body: input,
             config: options2.config
           });
-          console.log("[API Result execute]", result);
           if (shouldCache) {
             globalStateManager.setState(cacheKey, (prev) => ({
               ...prev,
-              // احتفظ بالخصائص القديمة مثل 'called'
               loading: false,
               success: result.success,
-              // تحديث صريح
               error: result.success ? null : result.error || prev.error,
-              // تحديث صريح
-              data: result.data,
-              // تحديث صريح للبيانات
+              data: result.success ? result.data : prev.data,
+              // ✅ [تحسين] لا تمسح البيانات القديمة عند حدوث خطأ
               meta: result.meta,
-              // تحديث صريح
               links: result.links,
-              // تحديث صريح
               message: result.message,
-              validationErrors: result.validationErrors || [],
-              rawResponse: result.rawResponse
-              // isStale تم تعيينه إلى false في بداية execute، وسيظل كذلك
+              validationErrors: result.validationErrors,
+              rawResponse: result.rawResponse,
+              lastSuccessAt: result.success ? Date.now() : prev.lastSuccessAt
             }));
           }
           if (result.success) {
@@ -400,7 +385,6 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
             options2.onSuccess?.(result.data, mutationContext);
             actionConfig.invalidates?.forEach((keyToInvalidate) => {
               const prefix = `${moduleConfig.baseEndpoint}/${keyToInvalidate}::`;
-              console.log(`[Invalidating] by prefix: ${prefix}`);
               globalStateManager.invalidateByPrefix(prefix);
             });
           } else {
@@ -424,7 +408,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       };
       const reset = (input, options2 = {}) => {
         if (shouldCache) {
-          const finalPathParams = { ...JSON.parse(pathParamsString), ...options2.pathParams };
+          const finalPathParams = { ...modulePathParams || {}, ...options2.pathParams };
           const cacheKey = generateCacheKey(moduleConfig.baseEndpoint, actionName, input, { pathParams: finalPathParams });
           globalStateManager.setState(cacheKey, () => createInitialState());
         }
@@ -432,7 +416,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       acc[actionName] = { execute, reset };
       return acc;
     }, {});
-  }, [axiosInstance, moduleConfig, pathParamsString]);
+  }, [axiosInstance, moduleConfig, modulePathParams]);
   const queries = useMemo3(() => {
     const builtQueries = {};
     for (const actionName in moduleConfig.actions) {
@@ -448,50 +432,42 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
           setSearchTerm: (search) => setActionQueryOptions((p) => ({ ...p, search, page: 1 })),
           setFilters: (filter) => setActionQueryOptions((p) => ({ ...p, filter, page: 1 })),
           setSorting: (sortBy) => setActionQueryOptions((p) => ({ ...p, sortBy })),
-          setQueryParam: (key, value) => setActionQueryOptions((p) => ({ ...p, [key]: value, page: key !== "page" ? value : p.page })),
+          setQueryParam: (key, value) => setActionQueryOptions((p) => ({ ...p, [key]: value, page: key !== "page" ? 1 : value })),
           reset: () => setActionQueryOptions({})
         };
       }
     }
     return builtQueries;
   }, [queryOptions, moduleConfig.actions]);
-  const states = {};
-  function isActionWithQuery(key, actions2) {
-    return actions2[key]?.hasQuery === true;
-  }
-  for (const actionName in moduleConfig.actions) {
-    if (Object.prototype.hasOwnProperty.call(moduleConfig.actions, actionName)) {
-      const actionConfig = moduleConfig.actions[actionName];
-      if (actionConfig.cacheResponse !== false) {
-        let queryOptions2;
-        if (isActionWithQuery(actionName, moduleConfig.actions)) {
-          queryOptions2 = queries[actionName]?.options;
+  const states = useMemo3(() => {
+    const builtStates = {};
+    for (const actionName in moduleConfig.actions) {
+      if (Object.prototype.hasOwnProperty.call(moduleConfig.actions, actionName)) {
+        const actionConfig = moduleConfig.actions[actionName];
+        if (actionConfig.cacheResponse !== false) {
+          const query = queries[actionName]?.options;
+          const input = actionConfig.hasQuery ? query : void 0;
+          const cacheKey = generateCacheKey(moduleConfig.baseEndpoint, actionName, input, { pathParams: modulePathParams });
+          builtStates[actionName] = useApiActionState(
+            actionConfig,
+            cacheKey,
+            actions[actionName].execute,
+            input,
+            enabled
+          );
+        } else {
+          builtStates[actionName] = createInitialState();
         }
-        const input = queryOptions2;
-        const pathParams = JSON.parse(pathParamsString);
-        const cacheKey = generateCacheKey(
-          moduleConfig.baseEndpoint,
-          actionName,
-          input,
-          { pathParams }
-        );
-        states[actionName] = useApiActionState(
-          actionConfig,
-          cacheKey,
-          actions[actionName].execute,
-          input,
-          enabled
-        );
-      } else {
-        states[actionName] = createInitialState();
       }
     }
-  }
+    return builtStates;
+  }, [moduleConfig, queries, actions, modulePathParams, enabled]);
   const lastBlurTimestamp = useRef4(Date.now());
   useEffect4(() => {
     if (!enabled || !refetchOnWindowFocus) return;
     const onFocus = () => {
-      if (Date.now() - lastBlurTimestamp.current > 1e4) {
+      if (Date.now() - lastBlurTimestamp.current > 3e4) {
+        console.log("[Refetch on Focus] Invalidating all called queries for this module.");
         const actionKeys = Object.keys(moduleConfig.actions);
         for (const actionName of actionKeys) {
           const state = states[actionName];
@@ -512,15 +488,16 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       window.removeEventListener("blur", onBlur);
     };
   }, [enabled, refetchOnWindowFocus, moduleConfig, states]);
-  const dehydrate = useMemo3(() => {
-    return () => globalStateManager.dehydrate();
+  const dehydrate = useCallback3(() => {
+    return globalStateManager.dehydrate();
   }, []);
-  const baseApiReturn = { actions, states, queries, dehydrate };
-  const finalApiReturn = useMemo3(() => ({
-    ...baseApiReturn,
+  return useMemo3(() => ({
+    actions,
+    states,
+    queries,
+    dehydrate,
     ...extraContextData || {}
-  }), [baseApiReturn, extraContextData]);
-  return finalApiReturn;
+  }), [actions, states, queries, dehydrate, extraContextData]);
 }
 
 // src/hooks/useApiModule/apiModuleContext.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-core-lib",
-  "version": "12.0.89",
+  "version": "12.0.91",
   "description": "A flexible and powerful API client library for modern web applications.",
   "type": "module",
   "exports": {