katanakit-js 4.0.2 → 4.0.3

package/dist/adapters/angular/query.js

@@ -1,93 +1,65 @@
-import { DestroyRef, inject, signal } from "@angular/core";
-import { useQueryClient, } from "../../core/services/query.service.js";
+import { computed, DestroyRef, inject, signal } from "@angular/core";
+import { MutationObserver, QueryObserver, } from "@tanstack/query-core";
+import { useQueryClient } from "../../core/services/query.service.js";
 /**
- * Angular signal factory that wraps the {@link QueryClient}.
- * Integrates with the API manager — your `queryFn` typically calls `useGetApi`
- * or `useFetch` and returns the Safe Result.
+ * Angular signal factory for a cached query, backed by TanStack Query Core.
  *
- * Must be called within an injection context (component field initializer,
- * constructor, or a service) so the returned query can auto-cleanup via
- * `DestroyRef`. Requires Angular 16+ signals.
+ * Returns one signal per field — `query.data()`, `query.isPending()`,
+ * `query.isError()`, `query.status()`, etc.
  *
- * @param config - Query configuration.
- * @param client - Optional QueryClient instance (uses global singleton by default).
- * @returns Signals `{ data, error, isLoading, isSuccess, isError, isStale, status }` plus `refetch`.
+ * Must be called within an injection context (so it auto-cleans via `DestroyRef`).
+ *
+ * @param options - TanStack query options (`queryKey`, `queryFn`, `staleTime`, …).
+ * @param client - Optional {@link QueryClient} (defaults to the shared singleton).
+ * @returns An {@link AngularQueryResult} of signals.
  *
  * @example
  * ```ts
- * import { Component, inject } from "@angular/core";
- * import { useQuery } from "katanakit-js/adapters/angular";
+ * import { Component } from "@angular/core";
+ * import { useQuery, useSafeQueryFn } from "katanakit-js/adapters/angular";
  * import { useGetApi } from "katanakit-js";
  *
- * @Component({ selector: "app-pokemon", template: `@if (isLoading()) { Loading… } @else { {{ data()?.name }} }` })
+ * @Component({
+ *   selector: "app-pokemon",
+ *   template: `@if (query.isPending()) { Loading… } @else { {{ query.data()?.name }} }`,
+ * })
  * export class PokemonComponent {
- *   readonly data = useQuery({ queryKey: ["pokemon", 25], queryFn: () => useGetApi("pokeapi", "pokemonById", { params: { id: 25 } }) }).data;
+ *   readonly query = useQuery({
+ *     queryKey: ["pokemon", 25],
+ *     queryFn: useSafeQueryFn(() => useGetApi("pokeapi", "pokemonById", { params: { id: 25 } })),
+ *   });
  * }
  * ```
  */
-export function useQuery(config, client) {
-    const qc = client ?? useQueryClient();
+export function useQuery(options, client) {
+    const queryClient = client ?? useQueryClient();
     const destroyRef = inject(DestroyRef);
-    const data = signal(null);
-    const error = signal(null);
-    const isLoading = signal(false);
-    const isSuccess = signal(false);
-    const isError = signal(false);
-    const isStale = signal(true);
-    const status = signal("idle");
-    const sync = (state) => {
-        data.set(state.data);
-        error.set(state.error);
-        isLoading.set(state.isLoading);
-        isSuccess.set(state.isSuccess);
-        isError.set(state.isError);
-        isStale.set(state.isStale);
-        status.set(state.status);
-    };
-    const qKey = config.queryKey;
-    const unsubscribe = qc.subscribe(qKey, (next) => sync(next));
-    const existing = qc.getQueryState(qKey);
-    if (existing)
-        sync(existing);
-    if (config.enabled !== false) {
-        void qc
-            .fetchQuery({
-            queryKey: qKey,
-            queryFn: config.queryFn,
-            staleTime: config.staleTime,
-            cacheTime: config.cacheTime,
-            retry: config.retry,
-            retryDelay: config.retryDelay,
-        })
-            .catch(() => {
-            // Error is already reflected in the cache state.
-        });
-    }
+    const observer = new QueryObserver(queryClient, queryClient.defaultQueryOptions(options));
+    const result = signal(observer.getCurrentResult());
+    const unsubscribe = observer.subscribe((next) => result.set(next));
     destroyRef.onDestroy(unsubscribe);
-    const refetch = async () => {
-        await qc
-            .fetchQuery({
-            queryKey: config.queryKey,
-            queryFn: config.queryFn,
-            staleTime: 0,
-            cacheTime: config.cacheTime,
-            retry: config.retry,
-            retryDelay: config.retryDelay,
-        })
-            .catch(() => {
-            // Error is already reflected in the cache state.
-        });
+    return {
+        data: computed(() => result().data),
+        error: computed(() => result().error),
+        isPending: computed(() => result().isPending),
+        isFetching: computed(() => result().isFetching),
+        isLoading: computed(() => result().isLoading),
+        isSuccess: computed(() => result().isSuccess),
+        isError: computed(() => result().isError),
+        isStale: computed(() => result().isStale),
+        status: computed(() => result().status),
+        fetchStatus: computed(() => result().fetchStatus),
+        refetch: (refetchOptions) => observer.refetch(refetchOptions),
     };
-    return { data, error, isLoading, isSuccess, isError, isStale, status, refetch };
 }
 /**
- * Angular signal factory for mutations (POST/PUT/PATCH/DELETE).
- * Does not cache — returns a `mutate` function that executes the mutation.
+ * Angular signal factory for a mutation, backed by TanStack Query Core.
  *
- * Must be called within an injection context. Requires Angular 16+ signals.
+ * Must be called within an injection context (so it auto-cleans via `DestroyRef`).
  *
- * @param config - Mutation configuration.
- * @returns Signals plus `{ mutate, reset }`.
+ * @param options - TanStack mutation options (`mutationFn`, `onSuccess`, …).
+ * @param client - Optional {@link QueryClient} (defaults to the shared singleton).
+ * @returns An {@link AngularMutationResult} of signals.
  *
  * @example
  * ```ts
@@ -95,72 +67,37 @@ export function useQuery(config, client) {
  * import { useMutation, useQueryClient } from "katanakit-js/adapters/angular";
  * import { usePost } from "katanakit-js";
  *
- * @Component({ selector: "app-create", template: `<button [disabled]="isLoading()" (click)="mutate('Ada')">Create</button>` })
+ * @Component({
+ *   selector: "app-create",
+ *   template: `<button [disabled]="mutation.isPending()" (click)="mutation.mutate('Ada')">Create</button>`,
+ * })
  * export class CreateUserComponent {
  *   private readonly qc = useQueryClient();
- *   readonly result = useMutation({
+ *   readonly mutation = useMutation({
  *     mutationFn: (name: string) => usePost("api", "createUser", { name }),
  *     onSuccess: () => this.qc.invalidateQueries({ queryKey: ["users"] }),
  *   });
- *   readonly isLoading = this.result.isLoading;
- *   readonly mutate = this.result.mutate;
  * }
  * ```
  */
-export function useMutation(config) {
-    const data = signal(null);
-    const error = signal(null);
-    const isLoading = signal(false);
-    const isSuccess = signal(false);
-    const isError = signal(false);
-    const status = signal("idle");
-    const mutate = async (variables) => {
-        isLoading.set(true);
-        isSuccess.set(false);
-        isError.set(false);
-        status.set("loading");
-        try {
-            const result = await config.mutationFn(variables);
-            if (result.ok) {
-                data.set(result.data);
-                error.set(null);
-                isSuccess.set(true);
-                status.set("success");
-                config.onSuccess?.(result.data, variables);
-                config.onSettled?.(result.data, null, variables);
-            }
-            else {
-                data.set(null);
-                error.set(result.error);
-                isError.set(true);
-                status.set("error");
-                config.onError?.(result.error, variables);
-                config.onSettled?.(null, result.error, variables);
-            }
-        }
-        catch (caught) {
-            const apiError = caught instanceof Error
-                ? { message: caught.message, status: 0 }
-                : { message: String(caught), status: 0 };
-            data.set(null);
-            error.set(apiError);
-            isError.set(true);
-            status.set("error");
-            config.onError?.(apiError, variables);
-            config.onSettled?.(null, apiError, variables);
-        }
-        finally {
-            isLoading.set(false);
-        }
-    };
-    const reset = () => {
-        data.set(null);
-        error.set(null);
-        isLoading.set(false);
-        isSuccess.set(false);
-        isError.set(false);
-        status.set("idle");
+export function useMutation(options, client) {
+    const queryClient = client ?? useQueryClient();
+    const destroyRef = inject(DestroyRef);
+    const observer = new MutationObserver(queryClient, options);
+    const result = signal(observer.getCurrentResult());
+    const unsubscribe = observer.subscribe((next) => result.set(next));
+    destroyRef.onDestroy(unsubscribe);
+    return {
+        data: computed(() => result().data),
+        error: computed(() => result().error),
+        variables: computed(() => result().variables),
+        isPending: computed(() => result().isPending),
+        isSuccess: computed(() => result().isSuccess),
+        isError: computed(() => result().isError),
+        isIdle: computed(() => result().isIdle),
+        status: computed(() => result().status),
+        mutate: (variables) => observer.mutate(variables),
+        reset: () => observer.reset(),
     };
-    return { data, error, isLoading, isSuccess, isError, status, mutate, reset };
 }
 //# sourceMappingURL=query.js.map

package/dist/adapters/angular/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/adapters/angular/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/adapters/angular/query.ts"],"names":[],"mappings":"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"}

package/dist/adapters/react/index.d.ts

@@ -1,3 +1,4 @@
+export { useCreateQueryClient, useInitQueryClient, useQueryClient, useSafeQueryFn, } from "../../core/services/query.service.js";
 export * from "./fetch.js";
 export * from "./query.js";
 export * from "./watch.js";

package/dist/adapters/react/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/react/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/react/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,oBAAoB,EACpB,kBAAkB,EAClB,cAAc,EACd,cAAc,GACd,MAAM,sCAAsC,CAAC;AAC9C,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}

package/dist/adapters/react/index.js

@@ -1,3 +1,4 @@
+export { useCreateQueryClient, useInitQueryClient, useQueryClient, useSafeQueryFn, } from "../../core/services/query.service.js";
 export * from "./fetch.js";
 export * from "./query.js";
 export * from "./watch.js";

package/dist/adapters/react/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/react/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/react/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,oBAAoB,EACpB,kBAAkB,EAClB,cAAc,EACd,cAAc,GACd,MAAM,sCAAsC,CAAC;AAC9C,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}

package/dist/adapters/react/query.d.ts

@@ -1,89 +1,44 @@
-import { type QueryClient, type QueryKey, type QueryState } from "../../core/services/query.service.js";
-import type { ApiError, FetchResult } from "../../types/index.js";
-/** Configuration for `useQuery` (React hook). */
-export interface UseQueryConfig<T = unknown> {
-    /** Cache key — the query refetches when its serialized value changes. */
-    queryKey: QueryKey;
-    /** Fetcher function returning a Safe Result. */
-    queryFn: () => Promise<FetchResult<T>>;
-    /** Time in ms before cached data is stale (default: 0). */
-    staleTime?: number;
-    /** Time in ms to keep unused data (default: 5 min). */
-    cacheTime?: number;
-    /** Retry count on failure (default: 3). */
-    retry?: number;
-    /** Base delay for exponential backoff (default: 1000). */
-    retryDelay?: number;
-    /** Whether the query is enabled (default: true). */
-    enabled?: boolean;
-}
-/** Reactive return value of `useQuery`. */
-export interface UseQueryReturn<T = unknown> {
-    data: T | null;
-    error: ApiError | null;
-    isLoading: boolean;
-    isSuccess: boolean;
-    isError: boolean;
-    isStale: boolean;
-    status: QueryState<T>["status"];
-    /** Manually refetch the query. */
-    refetch: () => Promise<void>;
-}
-/** Configuration for `useMutation`. */
-export interface UseMutationConfig<TData = unknown, TVariables = unknown> {
-    mutationFn: (variables: TVariables) => Promise<FetchResult<TData>>;
-    onSuccess?: (data: TData, variables: TVariables) => void;
-    onError?: (error: ApiError, variables: TVariables) => void;
-    onSettled?: (data: TData | null, error: ApiError | null, variables: TVariables) => void;
-}
-/** Reactive return value of `useMutation`. */
-export interface UseMutationReturn<TData = unknown, TVariables = unknown> {
-    data: TData | null;
-    error: ApiError | null;
-    isLoading: boolean;
-    isSuccess: boolean;
-    isError: boolean;
-    status: "idle" | "loading" | "success" | "error";
-    /** Execute the mutation. */
-    mutate: (variables: TVariables) => Promise<void>;
-    /** Reset the mutation state. */
-    reset: () => void;
-}
+import { type MutationObserverOptions, type MutationObserverResult, type QueryClient, type QueryObserverOptions, type QueryObserverResult } from "@tanstack/query-core";
 /**
- * React hook that wraps the {@link QueryClient} with `useState` reactivity.
- * Integrates with the API manager — your `queryFn` typically calls `useGetApi`
- * or `useFetch` and returns the Safe Result.
+ * React hook for a cached query, backed by TanStack Query Core.
  *
- * Subscribes to the global query cache, refetches when the serialized
- * `queryKey` changes, and unsubscribes on unmount.
+ * Returns TanStack's native {@link QueryObserverResult}
+ * (`{ data, error, isPending, isFetching, isSuccess, isError, status, fetchStatus, refetch, … }`),
+ * with stale-while-revalidate, focus/reconnect refetch, retries and garbage
+ * collection handled by the engine.
  *
- * @param config - Query configuration.
- * @param client - Optional QueryClient instance (uses global singleton by default).
- * @returns `{ data, error, isLoading, isSuccess, isError, isStale, status, refetch }`.
+ * `client` is captured for the component's lifetime — pass a stable instance.
+ *
+ * @param options - TanStack query options (`queryKey`, `queryFn`, `staleTime`, …).
+ * @param client - Optional {@link QueryClient} (defaults to the shared singleton).
+ * @returns The TanStack {@link QueryObserverResult}.
  *
  * @example
  * ```tsx
- * import { useQuery } from "katanakit-js/adapters/react";
+ * import { useQuery, useSafeQueryFn } from "katanakit-js/adapters/react";
  * import { useGetApi } from "katanakit-js";
  *
  * function Pokemon({ id }: { id: number }) {
- *   const { data, isLoading, error } = useQuery({
+ *   const { data, isPending, isError, error } = useQuery({
  *     queryKey: ["pokemon", id],
- *     queryFn: () => useGetApi("pokeapi", "pokemonById", { params: { id } }),
+ *     queryFn: useSafeQueryFn(() => useGetApi("pokeapi", "pokemonById", { params: { id } })),
  *   });
- *   if (isLoading) return <div>Loading…</div>;
- *   if (error) return <div>{error.message}</div>;
+ *   if (isPending) return <div>Loading…</div>;
+ *   if (isError) return <div>{error.message}</div>;
  *   return <div>{data?.name}</div>;
  * }
  * ```
  */
-export declare function useQuery<T>(config: UseQueryConfig<T>, client?: QueryClient): UseQueryReturn<T>;
+export declare function useQuery<TQueryFnData = unknown, TError = Error, TData = TQueryFnData>(options: QueryObserverOptions<TQueryFnData, TError, TData>, client?: QueryClient): QueryObserverResult<TData, TError>;
 /**
- * React hook for mutations (POST/PUT/PATCH/DELETE).
- * Does not cache — returns a `mutate` function that executes the mutation.
+ * React hook for a mutation, backed by TanStack Query Core.
+ *
+ * Returns TanStack's native {@link MutationObserverResult}
+ * (`{ data, error, variables, isPending, isError, isSuccess, status, mutate, reset }`).
  *
- * @param config - Mutation configuration.
- * @returns `{ data, error, isLoading, isSuccess, isError, status, mutate, reset }`.
+ * @param options - TanStack mutation options (`mutationFn`, `onSuccess`, …).
+ * @param client - Optional {@link QueryClient} (defaults to the shared singleton).
+ * @returns The TanStack {@link MutationObserverResult}.
  *
  * @example
  * ```tsx
@@ -92,13 +47,13 @@ export declare function useQuery<T>(config: UseQueryConfig<T>, client?: QueryCli
  *
  * function CreateUser() {
  *   const qc = useQueryClient();
- *   const { mutate, isLoading } = useMutation({
+ *   const { mutate, isPending } = useMutation({
  *     mutationFn: (name: string) => usePost("api", "createUser", { name }),
  *     onSuccess: () => qc.invalidateQueries({ queryKey: ["users"] }),
  *   });
- *   return <button disabled={isLoading} onClick={() => mutate("Ada")}>Create</button>;
+ *   return <button disabled={isPending} onClick={() => mutate("Ada")}>Create</button>;
  * }
  * ```
  */
-export declare function useMutation<TData = unknown, TVariables = unknown>(config: UseMutationConfig<TData, TVariables>): UseMutationReturn<TData, TVariables>;
+export declare function useMutation<TData = unknown, TError = Error, TVariables = void, TContext = unknown>(options: MutationObserverOptions<TData, TError, TVariables, TContext>, client?: QueryClient): MutationObserverResult<TData, TError, TVariables, TContext>;
 //# sourceMappingURL=query.d.ts.map

package/dist/adapters/react/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/adapters/react/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/adapters/react/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAE3B,KAAK,WAAW,EAEhB,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,MAAM,sBAAsB,CAAC;AAK9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,QAAQ,CAAC,YAAY,GAAG,OAAO,EAAE,MAAM,GAAG,KAAK,EAAE,KAAK,GAAG,YAAY,EACpF,OAAO,EAAE,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAC1D,MAAM,CAAC,EAAE,WAAW,GAClB,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CA4BpC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,WAAW,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,KAAK,EAAE,UAAU,GAAG,IAAI,EAAE,QAAQ,GAAG,OAAO,EACjG,OAAO,EAAE,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,EACrE,MAAM,CAAC,EAAE,WAAW,GAClB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,CAqB7D"}