api-core-lib 16.12.133 → 16.12.135

package/dist/client.cjs

@@ -352,6 +352,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
   const lastCallRef = _react.useRef.call(void 0, {});
   const initialFetchRef = _react.useRef.call(void 0, false);
   const stableActionsRef = _react.useRef.call(void 0, {});
+  const isSyncingFromUrlRef = _react.useRef.call(void 0, false);
   const savedCallbacks = _react.useRef.call(void 0, { onSuccess, onError });
   _react.useEffect.call(void 0, () => {
     savedCallbacks.current = { onSuccess, onError };
@@ -378,20 +379,31 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       }
     });
     if (Object.keys(queryFromUrl).length > 0) {
+      isSyncingFromUrlRef.current = true;
       setQueryOptions((prev) => {
         const newState = { ...prev };
+        let hasChanged = false;
         for (const actionName in queryFromUrl) {
-          newState[actionName] = { ...newState[actionName], ...queryFromUrl[actionName] };
+          const newOpts = { ...newState[actionName], ...queryFromUrl[actionName] };
+          if (JSON.stringify(newState[actionName]) !== JSON.stringify(newOpts)) {
+            newState[actionName] = newOpts;
+            hasChanged = true;
+          }
         }
-        return newState;
+        return hasChanged ? newState : prev;
       });
     }
-  }, [urlSync]);
+  }, [_optionalChain([urlSync, 'optionalAccess', _6 => _6.searchParams]), _optionalChain([urlSync, 'optionalAccess', _7 => _7.actionsToSync]), _optionalChain([urlSync, 'optionalAccess', _8 => _8.defaultSyncAction])]);
   _react.useEffect.call(void 0, () => {
     if (!urlSync) return;
+    if (isSyncingFromUrlRef.current) {
+      isSyncingFromUrlRef.current = false;
+      return;
+    }
     const { searchParams, updateUrl, actionsToSync, defaultSyncAction } = urlSync;
     const currentParams = new URLSearchParams(searchParams);
     let hasChanged = false;
+    const newParams = new URLSearchParams();
     for (const actionName in queryOptions) {
       if (actionsToSync.some((a) => a === actionName)) {
         const params = queryOptions[actionName];
@@ -399,19 +411,16 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
         for (const key in params) {
           const fullKey = isDefaultAction ? key : `${actionName}.${key}`;
           const value = params[key];
-          const stringValue = value !== void 0 && value !== null ? String(value) : "";
-          if (currentParams.get(fullKey) !== stringValue) {
-            if (stringValue) currentParams.set(fullKey, stringValue);
-            else currentParams.delete(fullKey);
-            hasChanged = true;
+          if (value !== void 0 && value !== null && value !== "") {
+            newParams.set(fullKey, String(value));
           }
         }
       }
     }
-    if (hasChanged) {
-      updateUrl(currentParams.toString());
+    if (newParams.toString() !== currentParams.toString()) {
+      updateUrl(newParams.toString());
     }
-  }, [queryOptions, urlSync]);
+  }, [queryOptions, _optionalChain([urlSync, 'optionalAccess', _9 => _9.updateUrl]), _optionalChain([urlSync, 'optionalAccess', _10 => _10.actionsToSync]), _optionalChain([urlSync, 'optionalAccess', _11 => _11.defaultSyncAction])]);
   _react.useMemo.call(void 0, () => {
     for (const actionName in moduleConfig.actions) {
       const actionConfig = moduleConfig.actions[actionName];
@@ -423,7 +432,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
         let requestConfig = options2.config || {};
         if (actionConfig.method === "GET") {
           const currentQueryOptions = queryOptions[actionName];
-          bodyForCall = { ...actionConfig._input, ...currentQueryOptions, ..._optionalChain([options2, 'access', _6 => _6.config, 'optionalAccess', _7 => _7.params]), ...input };
+          bodyForCall = { ...actionConfig._input, ...currentQueryOptions, ..._optionalChain([options2, 'access', _12 => _12.config, 'optionalAccess', _13 => _13.params]), ...input };
         } else if (actionConfig.upload && input) {
           bodyForCall = new FormData();
           for (const key in input) {
@@ -460,24 +469,24 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
             }));
           }
           if (result.success) {
-            _optionalChain([savedCallbacks, 'access', _8 => _8.current, 'access', _9 => _9.onSuccess, 'optionalCall', _10 => _10(actionName, result.message || "Action successful", result.data)]);
-            _optionalChain([options2, 'access', _11 => _11.onSuccess, 'optionalCall', _12 => _12(result.data, mutationContext)]);
-            _optionalChain([actionConfig, 'access', _13 => _13.invalidates, 'optionalAccess', _14 => _14.forEach, 'call', _15 => _15((keyToInvalidate) => {
+            _optionalChain([savedCallbacks, 'access', _14 => _14.current, 'access', _15 => _15.onSuccess, 'optionalCall', _16 => _16(actionName, result.message || "Action successful", result.data)]);
+            _optionalChain([options2, 'access', _17 => _17.onSuccess, 'optionalCall', _18 => _18(result.data, mutationContext)]);
+            _optionalChain([actionConfig, 'access', _19 => _19.invalidates, 'optionalAccess', _20 => _20.forEach, 'call', _21 => _21((keyToInvalidate) => {
               const prefix = `${moduleConfig.baseEndpoint}/${keyToInvalidate}::`;
               _chunkJAMEOM7Tcjs.globalStateManager.invalidateByPrefix(prefix);
             })]);
           } else {
-            _optionalChain([savedCallbacks, 'access', _16 => _16.current, 'access', _17 => _17.onError, 'optionalCall', _18 => _18(actionName, result.message || "Action failed", _nullishCoalesce(result.error, () => ( void 0)))]);
-            _optionalChain([options2, 'access', _19 => _19.onError, 'optionalCall', _20 => _20(result.error, mutationContext)]);
+            _optionalChain([savedCallbacks, 'access', _22 => _22.current, 'access', _23 => _23.onError, 'optionalCall', _24 => _24(actionName, result.message || "Action failed", _nullishCoalesce(result.error, () => ( void 0)))]);
+            _optionalChain([options2, 'access', _25 => _25.onError, 'optionalCall', _26 => _26(result.error, mutationContext)]);
           }
           return result;
         } catch (error) {
-          const apiError = _optionalChain([error, 'access', _21 => _21.response, 'optionalAccess', _22 => _22.data]) || { status: 500, message: error.message };
+          const apiError = _optionalChain([error, 'access', _27 => _27.response, 'optionalAccess', _28 => _28.data]) || { status: 500, message: error.message };
           if (shouldCache) {
             _chunkJAMEOM7Tcjs.globalStateManager.setState(cacheKey, (prev) => ({ ...prev, error: apiError, loading: false, success: false }));
           }
-          _optionalChain([savedCallbacks, 'access', _23 => _23.current, 'access', _24 => _24.onError, 'optionalCall', _25 => _25(actionName, apiError.message, apiError)]);
-          _optionalChain([options2, 'access', _26 => _26.onError, 'optionalCall', _27 => _27(apiError, mutationContext)]);
+          _optionalChain([savedCallbacks, 'access', _29 => _29.current, 'access', _30 => _30.onError, 'optionalCall', _31 => _31(actionName, apiError.message, apiError)]);
+          _optionalChain([options2, 'access', _32 => _32.onError, 'optionalCall', _33 => _33(apiError, mutationContext)]);
           throw error;
         } finally {
           if (options2.onSettled) {
@@ -504,11 +513,11 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
     actionsToRun.forEach((actionName) => {
       const key = actionName;
       const hydratedData = hydratedState ? JSON.parse(hydratedState) : {};
-      if (_optionalChain([hydratedData, 'access', _28 => _28[actionName], 'optionalAccess', _29 => _29.data])) {
+      if (_optionalChain([hydratedData, 'access', _34 => _34[actionName], 'optionalAccess', _35 => _35.data])) {
         return;
       }
       const actionConfig = moduleConfig.actions[key];
-      const executeAction = _optionalChain([actions, 'access', _30 => _30[key], 'optionalAccess', _31 => _31.execute]);
+      const executeAction = _optionalChain([actions, 'access', _36 => _36[key], 'optionalAccess', _37 => _37.execute]);
       if (typeof executeAction === "function") {
         const input = actionConfig.hasQuery ? queryOptions[actionName] : void 0;
         executeAction(input);
@@ -519,7 +528,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
   const queries = _react.useMemo.call(void 0, () => {
     return Object.keys(moduleConfig.actions).reduce((acc, actionName) => {
       const actionConfig = moduleConfig.actions[actionName];
-      if (_optionalChain([actionConfig, 'optionalAccess', _32 => _32.hasQuery])) {
+      if (_optionalChain([actionConfig, 'optionalAccess', _38 => _38.hasQuery])) {
         const setActionQueryOptions = (updater) => {
           const key = actionName;
           setQueryOptions((prev) => ({ ...prev, [key]: typeof updater === "function" ? updater(prev[key] || {}) : updater }));
@@ -546,7 +555,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
   }, [actions, queryOptions, moduleConfig.actions]);
   const states = {};
   function isActionWithQuery(key, actions2) {
-    return _optionalChain([actions2, 'access', _33 => _33[key], 'optionalAccess', _34 => _34.hasQuery]) === true;
+    return _optionalChain([actions2, 'access', _39 => _39[key], 'optionalAccess', _40 => _40.hasQuery]) === true;
   }
   for (const actionName in moduleConfig.actions) {
     if (Object.prototype.hasOwnProperty.call(moduleConfig.actions, actionName)) {
@@ -555,7 +564,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       if (actionConfig.cacheResponse !== false) {
         let currentQueryOptions;
         if (isActionWithQuery(key, moduleConfig.actions)) {
-          currentQueryOptions = _optionalChain([queries, 'access', _35 => _35[key], 'optionalAccess', _36 => _36.options]);
+          currentQueryOptions = _optionalChain([queries, 'access', _41 => _41[key], 'optionalAccess', _42 => _42.options]);
         }
         const input = currentQueryOptions;
         const pathParams = JSON.parse(pathParamsString);

package/dist/client.js

@@ -352,6 +352,7 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
   const lastCallRef = useRef4({});
   const initialFetchRef = useRef4(false);
   const stableActionsRef = useRef4({});
+  const isSyncingFromUrlRef = useRef4(false);
   const savedCallbacks = useRef4({ onSuccess, onError });
   useEffect4(() => {
     savedCallbacks.current = { onSuccess, onError };
@@ -378,20 +379,31 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
       }
     });
     if (Object.keys(queryFromUrl).length > 0) {
+      isSyncingFromUrlRef.current = true;
       setQueryOptions((prev) => {
         const newState = { ...prev };
+        let hasChanged = false;
         for (const actionName in queryFromUrl) {
-          newState[actionName] = { ...newState[actionName], ...queryFromUrl[actionName] };
+          const newOpts = { ...newState[actionName], ...queryFromUrl[actionName] };
+          if (JSON.stringify(newState[actionName]) !== JSON.stringify(newOpts)) {
+            newState[actionName] = newOpts;
+            hasChanged = true;
+          }
         }
-        return newState;
+        return hasChanged ? newState : prev;
       });
     }
-  }, [urlSync]);
+  }, [urlSync?.searchParams, urlSync?.actionsToSync, urlSync?.defaultSyncAction]);
   useEffect4(() => {
     if (!urlSync) return;
+    if (isSyncingFromUrlRef.current) {
+      isSyncingFromUrlRef.current = false;
+      return;
+    }
     const { searchParams, updateUrl, actionsToSync, defaultSyncAction } = urlSync;
     const currentParams = new URLSearchParams(searchParams);
     let hasChanged = false;
+    const newParams = new URLSearchParams();
     for (const actionName in queryOptions) {
       if (actionsToSync.some((a) => a === actionName)) {
         const params = queryOptions[actionName];
@@ -399,19 +411,16 @@ function useApiModule(axiosInstance, moduleConfig, options = {}) {
         for (const key in params) {
           const fullKey = isDefaultAction ? key : `${actionName}.${key}`;
           const value = params[key];
-          const stringValue = value !== void 0 && value !== null ? String(value) : "";
-          if (currentParams.get(fullKey) !== stringValue) {
-            if (stringValue) currentParams.set(fullKey, stringValue);
-            else currentParams.delete(fullKey);
-            hasChanged = true;
+          if (value !== void 0 && value !== null && value !== "") {
+            newParams.set(fullKey, String(value));
           }
         }
       }
     }
-    if (hasChanged) {
-      updateUrl(currentParams.toString());
+    if (newParams.toString() !== currentParams.toString()) {
+      updateUrl(newParams.toString());
     }
-  }, [queryOptions, urlSync]);
+  }, [queryOptions, urlSync?.updateUrl, urlSync?.actionsToSync, urlSync?.defaultSyncAction]);
   useMemo3(() => {
     for (const actionName in moduleConfig.actions) {
       const actionConfig = moduleConfig.actions[actionName];

package/package.json

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