@krymskyimaksym/react-api-client 2.0.0-beta.0 → 2.0.0-beta.1

package/dist/index.mjs

@@ -32,6 +32,52 @@ var ApiError = class _ApiError extends Error {
     Object.setPrototypeOf(this, _ApiError.prototype);
   }
 };
+var isObject = (v) => typeof v === "object" && v !== null;
+function toApiError(thrown) {
+  if (thrown instanceof ApiError) return thrown;
+  if (isObject(thrown) && "response" in thrown && isObject(thrown.response)) {
+    const r = thrown.response;
+    const status = typeof r.status === "number" ? r.status : 0;
+    const data = isObject(r.data) ? r.data : void 0;
+    const message = (data && typeof data.message === "string" ? data.message : void 0) ?? (thrown instanceof Error ? thrown.message : void 0) ?? `HTTP ${status}`;
+    return new ApiError({
+      message,
+      status,
+      code: data && typeof data.code === "string" ? data.code : void 0,
+      errors: data?.errors,
+      isNetworkError: status === 0,
+      isUnauthorized: status === 401,
+      isValidationError: status === 422 || data?.errors !== void 0,
+      raw: r.data ?? thrown
+    });
+  }
+  if (thrown instanceof Error) {
+    return new ApiError({
+      message: thrown.message,
+      status: 0,
+      isNetworkError: true,
+      raw: thrown
+    });
+  }
+  return new ApiError({
+    message: "Unknown error",
+    status: 0,
+    raw: thrown
+  });
+}
+function businessErrorToApiError(response) {
+  if (!isObject(response)) {
+    return new ApiError({ message: "Request failed", status: 200, raw: response });
+  }
+  return new ApiError({
+    message: typeof response.message === "string" ? response.message : "Request failed",
+    status: 200,
+    code: typeof response.code === "string" ? response.code : void 0,
+    errors: response.errors,
+    isValidationError: response.errors !== void 0,
+    raw: response
+  });
+}
 
 // src/utils.ts
 function buildEndpoint(endpoint, params) {
@@ -40,7 +86,7 @@ function buildEndpoint(endpoint, params) {
   }
   return endpoint;
 }
-async function executeRequest(endpoint, fetchConfig, params) {
+async function executeRequest(endpoint, fetchConfig, params, signal) {
   const url = buildEndpoint(endpoint, params);
   const config = getConfig();
   try {
@@ -51,7 +97,8 @@ async function executeRequest(endpoint, fetchConfig, params) {
         params: {
           ...requestConfig.requestParams,
           ...params
-        }
+        },
+        signal
       });
     } else {
       response = await config.httpClient.request(url, {
@@ -59,38 +106,29 @@ async function executeRequest(endpoint, fetchConfig, params) {
         data: {
           ...requestConfig.requestParams,
           ...params
-        }
+        },
+        signal
       });
     }
     const hasExplicitStatus = response && typeof response === "object" && "status" in response && typeof response.status === "boolean";
     if (config.throwOnError && hasExplicitStatus && response.status === false) {
-      const body = response;
-      throw new ApiError({
-        message: body.message ?? "Request failed",
-        status: 200,
-        errors: body.errors,
-        raw: response
-      });
+      throw businessErrorToApiError(response);
     }
     return { ...response, status: true };
   } catch (e) {
-    if (e instanceof ApiError) throw e;
+    if (e instanceof ApiError) {
+      if (e.status === 401 && config.onUnauthorized) {
+        await config.onUnauthorized();
+      }
+      throw e;
+    }
     const error = e;
     const httpStatus = error.response?.status;
     if (httpStatus === 401 && config.onUnauthorized) {
       await config.onUnauthorized();
     }
     if (config.throwOnError) {
-      const data = error.response?.data;
-      const isNetwork = httpStatus === void 0;
-      throw new ApiError({
-        message: data?.message ?? (e instanceof Error ? e.message : void 0) ?? (isNetwork ? "Network error" : "Request error"),
-        status: httpStatus ?? 0,
-        code: data?.code,
-        errors: data,
-        isNetworkError: isNetwork,
-        raw: e
-      });
+      throw toApiError(e);
     }
     if (error.response?.data) {
       return {
@@ -251,6 +289,21 @@ var DEFAULT_STALE_TIME = 0;
 var QueryCache = class {
   constructor() {
     this.entries = /* @__PURE__ */ new Map();
+    this.globalListeners = /* @__PURE__ */ new Set();
+  }
+  /**
+   * Подписка на любое изменение кэша: setData, invalidate, remove,
+   * успешный/ошибочный fetch. Используется persistQueryClient и
+   * devtools-подобными адаптерами. Не дублирует `subscribe(key, ...)`.
+   */
+  subscribeAll(listener) {
+    this.globalListeners.add(listener);
+    return () => {
+      this.globalListeners.delete(listener);
+    };
+  }
+  notifyGlobal() {
+    for (const listener of this.globalListeners) listener();
   }
   ensureEntry(key, staleTime, gcTime) {
     const hash = hashQueryKey(key);
@@ -267,6 +320,7 @@ var QueryCache = class {
         },
         subscribers: /* @__PURE__ */ new Set(),
         inflight: null,
+        inflightController: null,
         gcTimer: null,
         staleTime: staleTime ?? DEFAULT_STALE_TIME,
         gcTime: gcTime ?? DEFAULT_GC_TIME
@@ -315,6 +369,7 @@ var QueryCache = class {
   }
   notify(entry) {
     for (const listener of entry.subscribers) listener();
+    this.notifyGlobal();
   }
   scheduleGc(entry) {
     if (entry.gcTimer) clearTimeout(entry.gcTimer);
@@ -343,12 +398,14 @@ var QueryCache = class {
     if (entry.inflight) return entry.inflight;
     entry.state = { ...entry.state, status: "loading", error: null };
     this.notify(entry);
+    const controller = new AbortController();
     const token = Symbol("inflight");
     entry.inflightToken = token;
+    entry.inflightController = controller;
     const isCurrent = () => entry.inflightToken === token;
     const myPromise = (async () => {
       try {
-        const data = await queryFn();
+        const data = await queryFn({ signal: controller.signal });
         if (!isCurrent()) return data;
         entry.state = {
           data,
@@ -369,7 +426,10 @@ var QueryCache = class {
         this.notify(entry);
         throw err;
       } finally {
-        if (isCurrent()) entry.inflight = null;
+        if (isCurrent()) {
+          entry.inflight = null;
+          entry.inflightController = null;
+        }
       }
     })();
     entry.inflight = myPromise;
@@ -401,6 +461,8 @@ var QueryCache = class {
     const match = typeof predicate === "function" ? predicate : (k) => matchQueryKey(predicate, k);
     for (const entry of this.entries.values()) {
       if (match(entry.key) && entry.inflight) {
+        entry.inflightController?.abort();
+        entry.inflightController = null;
         entry.inflight = null;
         entry.inflightToken = void 0;
         if (entry.state.status === "loading") {
@@ -416,12 +478,15 @@ var QueryCache = class {
    */
   remove(predicate) {
     const match = typeof predicate === "function" ? predicate : (k) => matchQueryKey(predicate, k);
+    let removed = false;
     for (const [hash, entry] of [...this.entries]) {
       if (match(entry.key)) {
         if (entry.gcTimer) clearTimeout(entry.gcTimer);
         this.entries.delete(hash);
+        removed = true;
       }
     }
+    if (removed) this.notifyGlobal();
   }
   /** Только для тестов / DevTools. */
   _debugEntries() {
@@ -526,18 +591,26 @@ function createUseFetch(endpoint, fetchConfig) {
     }, [customKey ? hashQueryKey(customKey) : null, serializedParams]);
     const client = getQueryClient();
     const cache = client.cache;
-    const queryFn = useCallback(() => {
-      const parsedParams = serializedParams ? JSON.parse(serializedParams) : void 0;
-      return executeRequest(endpoint, fetchConfig, parsedParams);
-    }, [serializedParams]);
+    const queryFn = useCallback(
+      ({ signal }) => {
+        const parsedParams = serializedParams ? JSON.parse(serializedParams) : void 0;
+        return executeRequest(endpoint, fetchConfig, parsedParams, signal);
+      },
+      [serializedParams]
+    );
     const initialState = cache.getState(queryKey);
     const [, forceRender] = useState(0);
     const rerender = useCallback(() => forceRender((v) => v + 1), []);
     useEffect(() => {
-      if (!enabled) return;
       const unsub = cache.subscribe(queryKey, rerender);
-      return unsub;
-    }, [cache, enabled, hashQueryKey(queryKey), rerender]);
+      return () => {
+        unsub();
+        const state2 = cache._debugEntries().get(hashQueryKey(queryKey));
+        if (state2 && state2.subscribers.size === 0 && state2.inflight) {
+          cache.cancelQueries(queryKey);
+        }
+      };
+    }, [cache, hashQueryKey(queryKey), rerender]);
     const lastNotifiedRef = useRef({});
     const runFetch = useCallback(
       async (force) => {
@@ -797,14 +870,14 @@ function createUsePaginate(endpoint, fetchConfig, options) {
       [keyPrefix, limit]
     );
     const pageQueryFn = useCallback(
-      (page) => () => {
+      (page) => ({ signal }) => {
         const parsedParams = serializedParams ? JSON.parse(serializedParams) : {};
         const requestParams = {
           ...parsedParams,
           page,
           limit
         };
-        return executeRequest(endpoint, fetchConfig, requestParams);
+        return executeRequest(endpoint, fetchConfig, requestParams, signal);
       },
       [serializedParams, limit]
     );
@@ -935,19 +1008,26 @@ function persistQueryClient(options) {
     maxAge,
     version
   } = options;
-  let timer = null;
+  let pendingTimer = null;
   let lastSerialized = null;
+  let unsubscribed = false;
   const persist = async () => {
     const state = client.cache.dehydrate(allowList);
-    if (state.queries.length === 0) {
-      return;
-    }
+    if (state.queries.length === 0) return;
     const snap = { version, savedAt: Date.now(), state };
     const serialized = JSON.stringify(snap);
     if (serialized === lastSerialized) return;
     lastSerialized = serialized;
     await storage.setItem(storageKey, serialized);
   };
+  const scheduleWrite = () => {
+    if (unsubscribed) return;
+    if (pendingTimer) return;
+    pendingTimer = setTimeout(() => {
+      pendingTimer = null;
+      void persist();
+    }, throttleMs);
+  };
   const restore = async () => {
     const raw = await storage.getItem(storageKey);
     if (!raw) return;
@@ -966,15 +1046,17 @@ function persistQueryClient(options) {
       await storage.removeItem(storageKey);
     }
   };
-  timer = setInterval(() => {
-    void persist();
-  }, throttleMs);
+  const unsubscribeFromCache = client.cache.subscribeAll(scheduleWrite);
   return {
     restore,
     persist,
     unsubscribe: () => {
-      if (timer) clearInterval(timer);
-      timer = null;
+      unsubscribed = true;
+      unsubscribeFromCache();
+      if (pendingTimer) {
+        clearTimeout(pendingTimer);
+        pendingTimer = null;
+      }
     }
   };
 }
@@ -1075,6 +1157,6 @@ function apiPaginate(endpoint, fetchConfig = {}, options) {
 }
 var index_default = apiClient;
 
-export { ApiClientProvider, ApiError, QueryCache, QueryClient, apiMutation, apiPaginate, configureApiClient, index_default as default, focusManager, getConfig, getQueryClient, hashQueryKey, inspectCache, invalidateAll, isConfigured, matchQueryKey, onlineManager, persistQueryClient, setQueryClient, summarizeCache, useQueryClient };
+export { ApiClientProvider, ApiError, QueryCache, QueryClient, apiMutation, apiPaginate, businessErrorToApiError, configureApiClient, index_default as default, focusManager, getConfig, getQueryClient, hashQueryKey, inspectCache, invalidateAll, isConfigured, matchQueryKey, onlineManager, persistQueryClient, setQueryClient, summarizeCache, toApiError, useQueryClient };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map