@krymskyimaksym/react-api-client 2.0.0-beta.2 → 2.1.0

package/dist/index.js

@@ -114,6 +114,19 @@ async function executeRequest(endpoint, fetchConfig, params, signal) {
         signal
       });
     }
+    if (config.responseAdapter) {
+      const adapter = config.responseAdapter;
+      if (adapter.isBusinessError?.(response)) {
+        const err = adapter.toError?.(response, 200) ?? new ApiError({
+          message: "Business error",
+          status: 200,
+          raw: response
+        });
+        throw err;
+      }
+      const unwrapped = adapter.unwrap ? adapter.unwrap(response) : response;
+      return unwrapped;
+    }
     const hasExplicitStatus = response && typeof response === "object" && "status" in response && typeof response.status === "boolean";
     if (config.throwOnError && hasExplicitStatus && response.status === false) {
       throw businessErrorToApiError(response);
@@ -131,6 +144,13 @@ async function executeRequest(endpoint, fetchConfig, params, signal) {
     if (httpStatus === 401 && config.onUnauthorized) {
       await config.onUnauthorized();
     }
+    if (config.responseAdapter) {
+      const adapter = config.responseAdapter;
+      const body = error.response?.data ?? void 0;
+      const status = httpStatus ?? 0;
+      const err = adapter.toError?.(body, status) ?? toApiError(e);
+      throw err;
+    }
     if (config.throwOnError) {
       throw toApiError(e);
     }
@@ -370,6 +390,7 @@ var QueryCache = class {
       isStale: false
     };
     this.notify(entry);
+    return next;
   }
   /**
    * Подписка на изменения ключа. Возвращает unsubscribe.
@@ -493,10 +514,16 @@ var QueryCache = class {
     return Promise.all(promises).then(() => void 0);
   }
   /**
-   * Отменяет «привязку» inflight-промиса к ключу. Сам HTTP-запрос
-   * продолжит исполняться (executeRequest не использует AbortSignal),
-   * но его результат больше не попадёт в кэш и не уведомит подписчиков.
-   * Полезно при размонтировании / при переключении страниц.
+   * Отменяет inflight-запрос: пробрасывает abort через `AbortSignal`
+   * в `queryFn` (т.е. в `executeRequest` → `httpClient`) и отвязывает
+   * результат от ключа.
+   *
+   * Если `httpClient` уважает `signal` (`fetch` нативный, axios v1+
+   * с `signal`, и т.п.) — HTTP-запрос реально прерывается. Если
+   * игнорирует — поведение деградирует: запрос продолжит исполняться,
+   * но его ответ уже не попадёт в кэш и подписчиков не уведомит.
+   *
+   * Полезно при размонтировании / переключении страниц / logout'е.
    */
   cancelQueries(predicate) {
     const match = typeof predicate === "function" ? predicate : (k) => matchQueryKey(predicate, k);
@@ -584,6 +611,63 @@ var QueryCache = class {
   }
 };
 
+// src/query/mutation-counter.ts
+var MutationCounter = class {
+  constructor() {
+    this.active = /* @__PURE__ */ new Map();
+    this.listeners = /* @__PURE__ */ new Set();
+  }
+  start(scope, controller) {
+    const id = Symbol("mutation");
+    this.active.set(id, { scope, controller: controller ?? new AbortController() });
+    this.notify();
+    return id;
+  }
+  stop(id) {
+    if (this.active.delete(id)) this.notify();
+  }
+  /**
+   * Отменяет inflight-мутации. Без predicate — все.
+   * С predicate (префикс QueryKey или функция-предикат scope'а) —
+   * только матчинг.
+   */
+  cancel(predicate) {
+    for (const rec of this.active.values()) {
+      if (!predicate) {
+        rec.controller.abort();
+        continue;
+      }
+      if (typeof predicate === "function") {
+        if (predicate(rec.scope)) rec.controller.abort();
+      } else if (rec.scope && matchQueryKey(predicate, rec.scope)) {
+        rec.controller.abort();
+      }
+    }
+  }
+  count(predicate) {
+    if (!predicate) return this.active.size;
+    let n = 0;
+    for (const rec of this.active.values()) {
+      if (typeof predicate === "function") {
+        if (predicate(rec.scope)) n++;
+      } else {
+        if (rec.scope && matchQueryKey(predicate, rec.scope)) n++;
+      }
+    }
+    return n;
+  }
+  subscribe(listener) {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+  notify() {
+    for (const l of this.listeners) l();
+  }
+};
+var mutationCounter = new MutationCounter();
+
 // src/query/client.ts
 var QueryClient = class {
   constructor(cache) {
@@ -592,8 +676,12 @@ var QueryClient = class {
   getQueryData(key) {
     return this.cache.getData(key);
   }
+  /**
+   * Точечно патчит данные под ключом. Возвращает новое значение —
+   * удобно для «пропатчил → передал дальше».
+   */
   setQueryData(key, updater) {
-    this.cache.setData(key, updater);
+    return this.cache.setData(key, updater);
   }
   fetchQuery(key, queryFn, options) {
     return this.cache.fetch(key, queryFn, options);
@@ -608,12 +696,37 @@ var QueryClient = class {
   cancelQueries(predicate) {
     this.cache.cancelQueries(predicate);
   }
+  /**
+   * Отменяет inflight-мутации через `AbortSignal`. Без аргумента — все.
+   * С префиксом QueryKey или функцией-предикатом — только матчинг
+   * (scope мутации = первый ключ из её `invalidateKeys`, если задан массив).
+   *
+   * Если `httpClient` уважает `signal` — HTTP-запрос реально прерывается;
+   * иначе результат отменённой мутации просто не повлияет на UI
+   * (`useMutation` останется в текущем состоянии).
+   *
+   * Типичный кейс — logout: `client.cancelMutations()` перед очисткой
+   * сессии, чтобы поздние ответы не сработали.
+   */
+  cancelMutations(predicate) {
+    mutationCounter.cancel(predicate);
+  }
   refetchQueries(predicate) {
     return this.cache.refetchQueries(predicate);
   }
   /**
-   * Кладёт запрос в кэш, не пробрасывая ошибки. Подходит для оптимистичной
-   * подгрузки следующего экрана при наведении / долгом тапе.
+   * Кладёт запрос в кэш, не пробрасывая ошибки. Подходит для
+   * оптимистичной подгрузки следующего экрана при наведении / долгом тапе.
+   *
+   * Поведение:
+   * - **`staleTime`**: учитывается. Если данные ещё свежие — запрос не
+   *   отправляется, promise резолвится сразу.
+   * - **`inflight`**: если по ключу уже идёт запрос, prefetch присоединяется
+   *   к нему (dedupe). Не создаёт второй HTTP-вызов.
+   * - **Подписчики**: если на ключ подписан `useFetch`, успешный prefetch
+   *   обновит его `data` (через notify подписчиков). При ошибке — статус
+   *   подписчика тоже обновится (`error`).
+   * - **Возвращаемый promise**: всегда успешный — ошибки не пробрасываются.
    */
   prefetchQuery(key, queryFn, options) {
     return this.cache.fetch(key, queryFn, options).then(
@@ -640,11 +753,12 @@ function createUseFetch(endpoint, fetchConfig) {
       refetchOnFocus = false,
       refetchOnAppActive = false,
       refetchOnReconnect = false,
-      staleTime = 0,
+      staleTime = isConfigured() ? getConfig().defaultStaleTime ?? 0 : 0,
       gcTime,
       pollingInterval,
       queryKey: customKey,
       select,
+      selectIsEqual,
       onSuccess,
       onError
     } = options;
@@ -761,11 +875,19 @@ function createUseFetch(endpoint, fetchConfig) {
     }, [enabled, pollingInterval, runFetch]);
     const state = cache.getState(queryKey) ?? initialState;
     const rawData = state?.data ?? null;
+    const lastSelectedRef = react.useRef(null);
     const selectedData = react.useMemo(() => {
-      if (rawData === null) return null;
-      if (!select) return rawData;
-      return select(rawData);
-    }, [rawData, select]);
+      if (rawData === null) {
+        lastSelectedRef.current = null;
+        return null;
+      }
+      const next = select ? select(rawData) : rawData;
+      const prev = lastSelectedRef.current;
+      const isEqual = selectIsEqual ?? Object.is;
+      if (prev !== null && isEqual(prev, next)) return prev;
+      lastSelectedRef.current = next;
+      return next;
+    }, [rawData, select, selectIsEqual]);
     const status = state?.status ?? "idle";
     const hasData = rawData !== null;
     const isLoading = status === "loading" && !hasData;
@@ -783,47 +905,6 @@ function createUseFetch(endpoint, fetchConfig) {
     };
   };
 }
-
-// src/query/mutation-counter.ts
-var MutationCounter = class {
-  constructor() {
-    this.active = /* @__PURE__ */ new Map();
-    this.listeners = /* @__PURE__ */ new Set();
-  }
-  start(scope) {
-    const id = Symbol("mutation");
-    this.active.set(id, scope);
-    this.notify();
-    return id;
-  }
-  stop(id) {
-    if (this.active.delete(id)) this.notify();
-  }
-  count(predicate) {
-    if (!predicate) return this.active.size;
-    let n = 0;
-    for (const scope of this.active.values()) {
-      if (typeof predicate === "function") {
-        if (predicate(scope)) n++;
-      } else {
-        if (scope && matchQueryKey(predicate, scope)) n++;
-      }
-    }
-    return n;
-  }
-  subscribe(listener) {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  }
-  notify() {
-    for (const l of this.listeners) l();
-  }
-};
-var mutationCounter = new MutationCounter();
-
-// src/hooks/use-mutation.ts
 function createUseMutation(endpoint, fetchConfig) {
   return (options = {}) => {
     const {
@@ -876,7 +957,8 @@ function createUseMutation(endpoint, fetchConfig) {
         setIsError(false);
         setError(null);
         const scope = Array.isArray(invalidateKeys) && invalidateKeys.length > 0 ? invalidateKeys[0] : void 0;
-        const mutationId = mutationCounter.start(scope);
+        const controller = new AbortController();
+        const mutationId = mutationCounter.start(scope, controller);
         const endpointId = buildEndpoint(endpoint, variables);
         callLogger("onMutationStart", endpointId, variables);
         let context;
@@ -885,7 +967,7 @@ function createUseMutation(endpoint, fetchConfig) {
             const ctx = await onMutate(variables);
             context = ctx;
           }
-          const result = await executeRequest(endpoint, fetchConfig, variables);
+          const result = await executeRequest(endpoint, fetchConfig, variables, controller.signal);
           setData(result);
           if (result.status) {
             setIsSuccess(true);
@@ -961,10 +1043,12 @@ function createUsePaginate(endpoint, fetchConfig, options) {
       enabled = true,
       initialPage = 1,
       initialLimit = 20,
-      staleTime = 0,
+      staleTime = isConfigured() ? getConfig().defaultStaleTime ?? 0 : 0,
       gcTime,
       keepPreviousData = false,
       queryKey: customKey,
+      select,
+      selectIsEqual,
       onSuccess,
       onError
     } = hookOptions;
@@ -1065,7 +1149,16 @@ function createUsePaginate(endpoint, fetchConfig, options) {
     const currentResult = currentState?.data;
     const usingPlaceholder = keepPreviousData && !currentResult && previousPageKeyRef.current !== null;
     const effectiveResult = usingPlaceholder ? cache.getData(previousPageKeyRef.current) : currentResult;
-    const data = effectiveResult && effectiveResult.status ? dataExtractor(effectiveResult) : [];
+    const rawData = effectiveResult && effectiveResult.status ? dataExtractor(effectiveResult) : [];
+    const lastSelectedRef = react.useRef(null);
+    const data = react.useMemo(() => {
+      const next = select ? select(rawData) : rawData;
+      const prev = lastSelectedRef.current;
+      const isEqual = selectIsEqual ?? Object.is;
+      if (prev !== null && isEqual(prev, next)) return prev;
+      lastSelectedRef.current = next;
+      return next;
+    }, [rawData, select, selectIsEqual]);
     const totalCount = effectiveResult && effectiveResult.status ? totalExtractor(effectiveResult) : null;
     const total = totalCount;
     const totalPages = totalCount !== null ? Math.ceil(totalCount / limit) : null;
@@ -1154,6 +1247,226 @@ function useIsMutating(predicate) {
   }, [get]);
   return count;
 }
+function useQuery(queryKey, queryFn, options = {}) {
+  const {
+    enabled = true,
+    refetchOnMount = true,
+    refetchOnFocus = false,
+    refetchOnAppActive = false,
+    refetchOnReconnect = false,
+    staleTime = 0,
+    gcTime,
+    pollingInterval,
+    select,
+    selectIsEqual
+  } = options;
+  const client = getQueryClient();
+  const cache = client.cache;
+  const [, forceRender] = react.useState(0);
+  const rerender = react.useCallback(() => forceRender((v) => v + 1), []);
+  react.useEffect(() => {
+    const unsub = cache.subscribe(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 runFetch = react.useCallback(
+    async (force) => {
+      callLogger("onFetchStart", queryKey);
+      try {
+        const data = await cache.fetch(queryKey, queryFn, {
+          staleTime,
+          gcTime,
+          force
+        });
+        callLogger("onFetchSuccess", queryKey, data);
+      } catch (err) {
+        callLogger("onFetchError", queryKey, err);
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [cache, hashQueryKey(queryKey), queryFn, staleTime, gcTime]
+  );
+  react.useEffect(() => {
+    if (!enabled || !refetchOnMount) return;
+    void runFetch(false);
+  }, [enabled, refetchOnMount, runFetch]);
+  const stateForEffect = cache.getState(queryKey);
+  const isStale = stateForEffect?.isStale ?? false;
+  const hasFetchedData = stateForEffect?.data !== void 0;
+  react.useEffect(() => {
+    if (!enabled) return;
+    if (isStale && hasFetchedData) void runFetch(true);
+  }, [enabled, isStale, hasFetchedData, runFetch]);
+  react.useEffect(() => {
+    if (!enabled) return;
+    if (!refetchOnFocus && !refetchOnAppActive) return;
+    const unsub = focusManager.subscribe((focused) => {
+      if (focused) void runFetch(false);
+    });
+    return unsub;
+  }, [enabled, refetchOnFocus, refetchOnAppActive, runFetch]);
+  react.useEffect(() => {
+    if (!enabled || !refetchOnReconnect) return;
+    const unsub = onlineManager.subscribe((online) => {
+      if (online) void runFetch(false);
+    });
+    return unsub;
+  }, [enabled, refetchOnReconnect, runFetch]);
+  react.useEffect(() => {
+    if (!enabled || !pollingInterval || pollingInterval <= 0) return;
+    let timer = null;
+    const start = () => {
+      if (timer) return;
+      timer = setInterval(() => {
+        if (focusManager.isFocused()) void runFetch(true);
+      }, pollingInterval);
+    };
+    const stop = () => {
+      if (timer) clearInterval(timer);
+      timer = null;
+    };
+    start();
+    const unsub = focusManager.subscribe((focused) => {
+      if (focused) start();
+      else stop();
+    });
+    return () => {
+      stop();
+      unsub();
+    };
+  }, [enabled, pollingInterval, runFetch]);
+  const state = cache.getState(queryKey);
+  const rawData = state?.data ?? null;
+  const lastSelectedRef = react.useRef(null);
+  const selectedData = react.useMemo(() => {
+    if (rawData === null) {
+      lastSelectedRef.current = null;
+      return null;
+    }
+    const next = select ? select(rawData) : rawData;
+    const prev = lastSelectedRef.current;
+    const isEqual = selectIsEqual ?? Object.is;
+    if (prev !== null && isEqual(prev, next)) return prev;
+    lastSelectedRef.current = next;
+    return next;
+  }, [rawData, select, selectIsEqual]);
+  const status = state?.status ?? "idle";
+  const hasData = rawData !== null;
+  const isLoading = status === "loading" && !hasData;
+  const isRefetching = status === "loading" && hasData;
+  const error = state?.error ?? null;
+  const refetch = react.useCallback(async () => {
+    await runFetch(true);
+  }, [runFetch]);
+  return {
+    data: selectedData,
+    isLoading: enabled ? isLoading : false,
+    isRefetching,
+    error,
+    refetch
+  };
+}
+function useQueriesData(keys) {
+  const client = getQueryClient();
+  const get = react.useCallback(
+    () => keys.map((k) => client.getQueryData(k)),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [client, keys.map((k) => JSON.stringify(k)).join("|")]
+  );
+  const [snapshot, setSnapshot] = react.useState(get);
+  react.useEffect(() => {
+    setSnapshot(get());
+    const unsubs = keys.map(
+      (k) => client.cache.subscribe(k, () => setSnapshot(get()))
+    );
+    return () => {
+      for (const u of unsubs) u();
+    };
+  }, [client, get]);
+  return snapshot;
+}
+
+// src/adapters.ts
+var isObject2 = (v) => typeof v === "object" && v !== null;
+var laravelAdapter = {
+  isBusinessError: (r) => isObject2(r) && r.status === false,
+  toError: (r, http) => {
+    const body = isObject2(r) ? r : void 0;
+    return new ApiError({
+      message: (body && typeof body.message === "string" ? body.message : void 0) ?? `HTTP ${http}`,
+      status: http,
+      code: body && typeof body.code === "string" ? body.code : void 0,
+      errors: body?.errors,
+      isUnauthorized: http === 401,
+      isValidationError: http === 422 || body?.errors !== void 0,
+      raw: r
+    });
+  }
+};
+var jsonApiAdapter = {
+  unwrap: (r) => isObject2(r) ? r.data : r,
+  isBusinessError: (r) => isObject2(r) && Array.isArray(r.errors) && r.errors.length > 0,
+  toError: (r, http) => {
+    const errors = isObject2(r) && Array.isArray(r.errors) ? r.errors : [];
+    const first = isObject2(errors[0]) ? errors[0] : void 0;
+    return new ApiError({
+      message: (first && typeof first.detail === "string" ? first.detail : void 0) ?? (first && typeof first.title === "string" ? first.title : void 0) ?? `HTTP ${http}`,
+      status: http,
+      code: first && typeof first.code === "string" ? first.code : void 0,
+      errors,
+      isUnauthorized: http === 401,
+      isValidationError: http === 422,
+      raw: r
+    });
+  }
+};
+var graphqlAdapter = {
+  unwrap: (r) => isObject2(r) ? r.data : r,
+  isBusinessError: (r) => isObject2(r) && Array.isArray(r.errors) && r.errors.length > 0,
+  toError: (r, http) => {
+    const errors = isObject2(r) && Array.isArray(r.errors) ? r.errors : [];
+    const first = isObject2(errors[0]) ? errors[0] : void 0;
+    return new ApiError({
+      message: (first && typeof first.message === "string" ? first.message : void 0) ?? `HTTP ${http}`,
+      status: http,
+      errors,
+      isUnauthorized: http === 401,
+      raw: r
+    });
+  }
+};
+var problemJsonAdapter = {
+  isBusinessError: () => false,
+  toError: (r, http) => {
+    const body = isObject2(r) ? r : void 0;
+    return new ApiError({
+      message: (body && typeof body.title === "string" ? body.title : void 0) ?? (body && typeof body.detail === "string" ? body.detail : void 0) ?? `HTTP ${http}`,
+      status: http,
+      code: body && typeof body.type === "string" ? body.type : void 0,
+      isUnauthorized: http === 401,
+      isValidationError: http === 422,
+      raw: r
+    });
+  }
+};
+var plainAdapter = {
+  isBusinessError: () => false,
+  toError: (r, http) => {
+    const body = isObject2(r) ? r : void 0;
+    return new ApiError({
+      message: (body && typeof body.message === "string" ? body.message : void 0) ?? `HTTP ${http}`,
+      status: http,
+      isUnauthorized: http === 401,
+      isNetworkError: http === 0,
+      raw: r
+    });
+  }
+};
 
 // src/query/persist.ts
 function persistQueryClient(options) {
@@ -1327,18 +1640,25 @@ exports.default = index_default;
 exports.focusManager = focusManager;
 exports.getConfig = getConfig;
 exports.getQueryClient = getQueryClient;
+exports.graphqlAdapter = graphqlAdapter;
 exports.hashQueryKey = hashQueryKey;
 exports.inspectCache = inspectCache;
 exports.invalidateAll = invalidateAll;
 exports.isConfigured = isConfigured;
+exports.jsonApiAdapter = jsonApiAdapter;
+exports.laravelAdapter = laravelAdapter;
 exports.matchQueryKey = matchQueryKey;
 exports.onlineManager = onlineManager;
 exports.persistQueryClient = persistQueryClient;
+exports.plainAdapter = plainAdapter;
+exports.problemJsonAdapter = problemJsonAdapter;
 exports.setQueryClient = setQueryClient;
 exports.summarizeCache = summarizeCache;
 exports.toApiError = toApiError;
 exports.useIsFetching = useIsFetching;
 exports.useIsMutating = useIsMutating;
+exports.useQueriesData = useQueriesData;
+exports.useQuery = useQuery;
 exports.useQueryClient = useQueryClient;
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map