api-core-lib 12.0.20 → 12.0.22

package/dist/client.cjs

@@ -717,25 +717,20 @@ function useApiActionState(actionConfig, cacheKey, execute, input, enabled) {
   const refetch = (0, import_react4.useCallback)(() => {
     execute(inputRef.current);
   }, [execute]);
-  const previousInput = (0, import_react4.useRef)(JSON.stringify(input));
+  const prevCacheKeyRef = (0, import_react4.useRef)(cacheKey);
   (0, import_react4.useEffect)(() => {
-    const currentInputString = JSON.stringify(input);
-    if (previousInput.current === currentInputString) {
-      return;
-    }
-    if (enabled && state.called) {
-      console.log("[Query Changed] Input changed, refetching...");
+    if (prevCacheKeyRef.current !== cacheKey && enabled && state.called) {
+      console.log(`[Cache Key Changed] from ${prevCacheKeyRef.current} to ${cacheKey}. Refetching...`);
       refetch();
-    }
-    previousInput.current = currentInputString;
-  }, [input, enabled, state.called, refetch]);
-  (0, import_react4.useEffect)(() => {
-    if (enabled && actionConfig.autoFetch && !state.called && !state.loading) {
+    } else if (enabled && actionConfig.autoFetch && !state.called && !state.loading) {
+      console.log(`[Auto Fetch] for ${cacheKey}. Fetching...`);
       refetch();
     } else if (enabled && state.isStale && !state.loading) {
+      console.log(`[Stale State] for ${cacheKey}. Refetching...`);
       refetch();
     }
-  }, [enabled, state.isStale, state.loading, state.called, actionConfig.autoFetch, refetch]);
+    prevCacheKeyRef.current = cacheKey;
+  }, [cacheKey, enabled, state.isStale, state.loading, state.called, actionConfig.autoFetch, refetch]);
   return state;
 }
 function useModuleContext() {
@@ -850,19 +845,21 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
     const builtQueries = {};
     for (const actionName in moduleConfig.actions) {
       if (moduleConfig.actions[actionName]?.hasQuery) {
-        const setActionQueryOptions = (updater) => {
+        const setActionQueryOptions = (0, import_react4.useCallback)((updater) => {
           setQueryOptions((prev) => ({ ...prev, [actionName]: typeof updater === "function" ? updater(prev[actionName] || {}) : updater }));
-        };
+        }, []);
         builtQueries[actionName] = {
+          // `options` ستتغير، وهذا صحيح
           options: queryOptions[actionName] || {},
+          // `setOptions` والدوال الأخرى ستكون الآن مستقرة
           setOptions: setActionQueryOptions,
-          setPage: (page) => setActionQueryOptions((p) => ({ ...p, page })),
-          setLimit: (limit) => setActionQueryOptions((p) => ({ ...p, limit, page: 1 })),
-          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 })),
-          reset: () => setActionQueryOptions({})
+          setPage: (0, import_react4.useCallback)((page) => setActionQueryOptions((p) => ({ ...p, page })), [setActionQueryOptions]),
+          setLimit: (0, import_react4.useCallback)((limit) => setActionQueryOptions((p) => ({ ...p, limit, page: 1 })), [setActionQueryOptions]),
+          setSearchTerm: (0, import_react4.useCallback)((search) => setActionQueryOptions((p) => ({ ...p, search, page: 1 })), [setActionQueryOptions]),
+          setFilters: (0, import_react4.useCallback)((filter) => setActionQueryOptions((p) => ({ ...p, filter, page: 1 })), [setActionQueryOptions]),
+          setSorting: (0, import_react4.useCallback)((sortBy) => setActionQueryOptions((p) => ({ ...p, sortBy })), [setActionQueryOptions]),
+          setQueryParam: (0, import_react4.useCallback)((key, value) => setActionQueryOptions((p) => ({ ...p, [key]: value, page: key !== "page" ? value : p.page })), [setActionQueryOptions]),
+          reset: (0, import_react4.useCallback)(() => setActionQueryOptions({}), [setActionQueryOptions])
         };
       }
     }

package/dist/client.js

@@ -678,25 +678,20 @@ function useApiActionState(actionConfig, cacheKey, execute, input, enabled) {
   const refetch = useCallback3(() => {
     execute(inputRef.current);
   }, [execute]);
-  const previousInput = useRef4(JSON.stringify(input));
+  const prevCacheKeyRef = useRef4(cacheKey);
   useEffect4(() => {
-    const currentInputString = JSON.stringify(input);
-    if (previousInput.current === currentInputString) {
-      return;
-    }
-    if (enabled && state.called) {
-      console.log("[Query Changed] Input changed, refetching...");
+    if (prevCacheKeyRef.current !== cacheKey && enabled && state.called) {
+      console.log(`[Cache Key Changed] from ${prevCacheKeyRef.current} to ${cacheKey}. Refetching...`);
       refetch();
-    }
-    previousInput.current = currentInputString;
-  }, [input, enabled, state.called, refetch]);
-  useEffect4(() => {
-    if (enabled && actionConfig.autoFetch && !state.called && !state.loading) {
+    } else if (enabled && actionConfig.autoFetch && !state.called && !state.loading) {
+      console.log(`[Auto Fetch] for ${cacheKey}. Fetching...`);
       refetch();
     } else if (enabled && state.isStale && !state.loading) {
+      console.log(`[Stale State] for ${cacheKey}. Refetching...`);
       refetch();
     }
-  }, [enabled, state.isStale, state.loading, state.called, actionConfig.autoFetch, refetch]);
+    prevCacheKeyRef.current = cacheKey;
+  }, [cacheKey, enabled, state.isStale, state.loading, state.called, actionConfig.autoFetch, refetch]);
   return state;
 }
 function useModuleContext() {
@@ -811,19 +806,21 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
     const builtQueries = {};
     for (const actionName in moduleConfig.actions) {
       if (moduleConfig.actions[actionName]?.hasQuery) {
-        const setActionQueryOptions = (updater) => {
+        const setActionQueryOptions = useCallback3((updater) => {
           setQueryOptions((prev) => ({ ...prev, [actionName]: typeof updater === "function" ? updater(prev[actionName] || {}) : updater }));
-        };
+        }, []);
         builtQueries[actionName] = {
+          // `options` ستتغير، وهذا صحيح
           options: queryOptions[actionName] || {},
+          // `setOptions` والدوال الأخرى ستكون الآن مستقرة
           setOptions: setActionQueryOptions,
-          setPage: (page) => setActionQueryOptions((p) => ({ ...p, page })),
-          setLimit: (limit) => setActionQueryOptions((p) => ({ ...p, limit, page: 1 })),
-          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 })),
-          reset: () => setActionQueryOptions({})
+          setPage: useCallback3((page) => setActionQueryOptions((p) => ({ ...p, page })), [setActionQueryOptions]),
+          setLimit: useCallback3((limit) => setActionQueryOptions((p) => ({ ...p, limit, page: 1 })), [setActionQueryOptions]),
+          setSearchTerm: useCallback3((search) => setActionQueryOptions((p) => ({ ...p, search, page: 1 })), [setActionQueryOptions]),
+          setFilters: useCallback3((filter) => setActionQueryOptions((p) => ({ ...p, filter, page: 1 })), [setActionQueryOptions]),
+          setSorting: useCallback3((sortBy) => setActionQueryOptions((p) => ({ ...p, sortBy })), [setActionQueryOptions]),
+          setQueryParam: useCallback3((key, value) => setActionQueryOptions((p) => ({ ...p, [key]: value, page: key !== "page" ? value : p.page })), [setActionQueryOptions]),
+          reset: useCallback3(() => setActionQueryOptions({}), [setActionQueryOptions])
         };
       }
     }

package/package.json

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