katanakit-js 4.0.2 → 4.0.4

package/dist/adapters/solid/query.js

@@ -1,93 +1,60 @@
-import { createEffect, createSignal, onCleanup } from "solid-js";
-import { useQueryClient, } from "../../core/services/query.service.js";
+import { MutationObserver, QueryObserver, } from "@tanstack/query-core";
+import { createEffect, onCleanup } from "solid-js";
+import { createStore } from "solid-js/store";
+import { useQueryClient } from "../../core/services/query.service.js";
 /**
- * Solid primitive that wraps the {@link QueryClient} with fine-grained signals.
- * Integrates with the API manager — your `queryFn` typically calls `useGetApi`
- * or `useFetch` and returns the Safe Result.
+ * Solid primitive for a cached query, backed by TanStack Query Core.
  *
- * @param config - Query configuration.
- * @param client - Optional QueryClient instance (uses global singleton by default).
- * @returns Signal accessors for `{ data, error, isLoading, isSuccess, isError, isStale, status }` plus `refetch`.
+ * Returns a reactive {@link QueryObserverResult} store — read `query.data`,
+ * `query.isPending`, `query.isError`, `query.status`, etc. directly. Pass a
+ * getter (`() => ({ queryKey, queryFn })`) to react to key changes.
+ *
+ * Call it inside a component or `createRoot` so `onCleanup` disposes the observer.
+ *
+ * @param options - TanStack query options, or a getter returning them.
+ * @param client - Optional {@link QueryClient} (defaults to the shared singleton).
+ * @returns A reactive {@link QueryObserverResult} store.
  *
  * @example
  * ```tsx
- * import { useQuery } from "katanakit-js/adapters/solid";
+ * import { Show } from "solid-js";
+ * import { useQuery, useSafeQueryFn } from "katanakit-js/adapters/solid";
  * import { useGetApi } from "katanakit-js";
  *
  * function Pokemon() {
- *   const { data, isLoading, error } = useQuery({
+ *   const query = useQuery(() => ({
  *     queryKey: ["pokemon", 25],
- *     queryFn: () => useGetApi("pokeapi", "pokemonById", { params: { id: 25 } }),
- *   });
- *   return <Show when={!isLoading() && !error()} fallback={<div>Loading…</div>}>
- *     <div>{data()?.name}</div>
- *   </Show>;
+ *     queryFn: useSafeQueryFn(() => useGetApi("pokeapi", "pokemonById", { params: { id: 25 } })),
+ *   }));
+ *   return (
+ *     <Show when={!query.isPending} fallback={<div>Loading…</div>}>
+ *       <div>{query.data?.name}</div>
+ *     </Show>
+ *   );
  * }
  * ```
  */
-export function useQuery(config, client) {
-    const qc = client ?? useQueryClient();
-    const [data, setData] = createSignal(null);
-    const [error, setError] = createSignal(null);
-    const [isLoading, setIsLoading] = createSignal(false);
-    const [isSuccess, setIsSuccess] = createSignal(false);
-    const [isError, setIsError] = createSignal(false);
-    const [isStale, setIsStale] = createSignal(true);
-    const [status, setStatus] = createSignal("idle");
-    const sync = (state) => {
-        // Updater form avoids Solid's "function as value" ambiguity for generic T.
-        setData(() => state.data);
-        setError(state.error);
-        setIsLoading(state.isLoading);
-        setIsSuccess(state.isSuccess);
-        setIsError(state.isError);
-        setIsStale(state.isStale);
-        setStatus(state.status);
-    };
+export function useQuery(options, client) {
+    const queryClient = client ?? useQueryClient();
+    const getOptions = typeof options === "function" ? options : () => options;
+    const observer = new QueryObserver(queryClient, queryClient.defaultQueryOptions(getOptions()));
+    const [state, setState] = createStore(observer.getCurrentResult());
+    const unsubscribe = observer.subscribe((result) => {
+        setState(result);
+    });
+    // Re-apply options whenever the reactive getter's dependencies change.
     createEffect(() => {
-        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.
-            });
-        }
-        onCleanup(unsubscribe);
+        observer.setOptions(queryClient.defaultQueryOptions(getOptions()));
     });
-    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, error, isLoading, isSuccess, isError, isStale, status, refetch };
+    onCleanup(unsubscribe);
+    return state;
 }
 /**
- * Solid primitive for mutations (POST/PUT/PATCH/DELETE).
- * Does not cache — returns a `mutate` function that executes the mutation.
+ * Solid primitive for a mutation, backed by TanStack Query Core.
  *
- * @param config - Mutation configuration.
- * @returns Signal accessors plus `{ mutate, reset }`.
+ * @param options - TanStack mutation options, or a getter returning them.
+ * @param client - Optional {@link QueryClient} (defaults to the shared singleton).
+ * @returns A reactive {@link MutationObserverResult} store.
  *
  * @example
  * ```tsx
@@ -96,68 +63,26 @@ export function useQuery(config, client) {
  *
  * function CreateUser() {
  *   const qc = useQueryClient();
- *   const { mutate, isLoading } = useMutation({
+ *   const mutation = 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={mutation.isPending} onClick={() => mutation.mutate("Ada")}>Create</button>;
  * }
  * ```
  */
-export function useMutation(config) {
-    const [data, setData] = createSignal(null);
-    const [error, setError] = createSignal(null);
-    const [isLoading, setIsLoading] = createSignal(false);
-    const [isSuccess, setIsSuccess] = createSignal(false);
-    const [isError, setIsError] = createSignal(false);
-    const [status, setStatus] = createSignal("idle");
-    const mutate = async (variables) => {
-        setIsLoading(true);
-        setIsSuccess(false);
-        setIsError(false);
-        setStatus("loading");
-        try {
-            const result = await config.mutationFn(variables);
-            if (result.ok) {
-                setData(() => result.data);
-                setError(null);
-                setIsSuccess(true);
-                setStatus("success");
-                config.onSuccess?.(result.data, variables);
-                config.onSettled?.(result.data, null, variables);
-            }
-            else {
-                setData(null);
-                setError(result.error);
-                setIsError(true);
-                setStatus("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 };
-            setData(null);
-            setError(apiError);
-            setIsError(true);
-            setStatus("error");
-            config.onError?.(apiError, variables);
-            config.onSettled?.(null, apiError, variables);
-        }
-        finally {
-            setIsLoading(false);
-        }
-    };
-    const reset = () => {
-        setData(null);
-        setError(null);
-        setIsLoading(false);
-        setIsSuccess(false);
-        setIsError(false);
-        setStatus("idle");
-    };
-    return { data, error, isLoading, isSuccess, isError, status, mutate, reset };
+export function useMutation(options, client) {
+    const queryClient = client ?? useQueryClient();
+    const getOptions = typeof options === "function" ? options : () => options;
+    const observer = new MutationObserver(queryClient, getOptions());
+    const [state, setState] = createStore(observer.getCurrentResult());
+    const unsubscribe = observer.subscribe((result) => {
+        setState(result);
+    });
+    createEffect(() => {
+        observer.setOptions(getOptions());
+    });
+    onCleanup(unsubscribe);
+    return state;
 }
 //# sourceMappingURL=query.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/adapters/solid/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/adapters/solid/query.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,gBAAgB,EAIhB,aAAa,GAGb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAOtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,UAAU,QAAQ,CACvB,OAAuD,EACvD,MAAoB;IAEpB,MAAM,WAAW,GAAG,MAAM,IAAI,cAAc,EAAE,CAAC;IAC/C,MAAM,UAAU,GAAG,OAAO,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAmB,EAAE,CAAC,OAAO,CAAC;IAE3F,MAAM,QAAQ,GAAG,IAAI,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC,mBAAmB,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAE/F,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,WAAW,CACpC,QAAQ,CAAC,gBAAgB,EAAE,CAC3B,CAAC;IAEF,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE;QACjD,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,uEAAuE;IACvE,YAAY,CAAC,GAAG,EAAE;QACjB,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,WAAW,CAAC,CAAC;IAEvB,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,WAAW,CAC1B,OAEuE,EACvE,MAAoB;IAEpB,MAAM,WAAW,GAAG,MAAM,IAAI,cAAc,EAAE,CAAC;IAC/C,MAAM,UAAU,GAAG,OAAO,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAmB,EAAE,CAAC,OAAO,CAAC;IAE3F,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;IAEjE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,WAAW,CACpC,QAAQ,CAAC,gBAAgB,EAAE,CAC3B,CAAC;IAEF,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE;QACjD,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,YAAY,CAAC,GAAG,EAAE;QACjB,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,WAAW,CAAC,CAAC;IAEvB,OAAO,KAAK,CAAC;AACd,CAAC"}

package/dist/adapters/svelte/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/svelte/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/svelte/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/svelte/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/svelte/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/svelte/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/svelte/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/svelte/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/svelte/query.d.ts

@@ -1,94 +1,44 @@
+import { type MutationObserverOptions, type MutationObserverResult, type QueryClient, type QueryObserverOptions, type QueryObserverResult } from "@tanstack/query-core";
 import { type Readable } from "svelte/store";
-import { type QueryClient, type QueryKey, type QueryState } from "../../core/services/query.service.js";
-import type { ApiError, FetchResult } from "../../types/index.js";
-/** Configuration for `useQuery` (Svelte store factory). */
-export interface UseQueryConfig<T = unknown> {
-    /** Cache key (stable array). */
-    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` (Svelte readable stores). */
-export interface UseQueryReturn<T = unknown> {
-    data: Readable<T | null>;
-    error: Readable<ApiError | null>;
-    isLoading: Readable<boolean>;
-    isSuccess: Readable<boolean>;
-    isError: Readable<boolean>;
-    isStale: Readable<boolean>;
-    status: Readable<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: Readable<TData | null>;
-    error: Readable<ApiError | null>;
-    isLoading: Readable<boolean>;
-    isSuccess: Readable<boolean>;
-    isError: Readable<boolean>;
-    status: Readable<"idle" | "loading" | "success" | "error">;
-    /** Execute the mutation. */
-    mutate: (variables: TVariables) => Promise<void>;
-    /** Reset the mutation state. */
-    reset: () => void;
-}
 /**
- * Svelte store factory that wraps the {@link QueryClient}.
- * Integrates with the API manager — your `queryFn` typically calls `useGetApi`
- * or `useFetch` and returns the Safe Result.
+ * Svelte store factory for a cached query, backed by TanStack Query Core.
  *
- * Unsubscribes automatically on component destroy when called during init.
+ * Returns a `Readable` of TanStack's {@link QueryObserverResult}. Subscribe
+ * with `$query` — `$query.data`, `$query.isPending`, `$query.isError`,
+ * `$query.status`, etc.
  *
- * @param config - Query configuration.
- * @param client - Optional QueryClient instance (uses global singleton by default).
- * @returns Readable stores `{ data, error, isLoading, isSuccess, isError, isStale, status }` plus `refetch`.
+ * @param options - TanStack query options (`queryKey`, `queryFn`, `staleTime`, …).
+ * @param client - Optional {@link QueryClient} (defaults to the shared singleton).
+ * @returns A `Readable` of the TanStack {@link QueryObserverResult}.
  *
  * @example
  * ```svelte
  * <script lang="ts">
- *   import { useQuery } from "katanakit-js/adapters/svelte";
+ *   import { useQuery, useSafeQueryFn } from "katanakit-js/adapters/svelte";
  *   import { useGetApi } from "katanakit-js";
  *
- *   const { data, isLoading, error } = useQuery({
+ *   const query = useQuery({
  *     queryKey: ["pokemon", 25],
- *     queryFn: () => useGetApi("pokeapi", "pokemonById", { params: { id: 25 } }),
+ *     queryFn: useSafeQueryFn(() => useGetApi("pokeapi", "pokemonById", { params: { id: 25 } })),
  *   });
  * </script>
  *
- * {#if $isLoading}
+ * {#if $query.isPending}
  *   <div>Loading…</div>
- * {:else if $error}
- *   <div>{$error.message}</div>
+ * {:else if $query.isError}
+ *   <div>{$query.error?.message}</div>
  * {:else}
- *   <div>{$data?.name}</div>
+ *   <div>{$query.data?.name}</div>
  * {/if}
  * ```
  */
-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): Readable<QueryObserverResult<TData, TError>>;
 /**
- * Svelte store factory for mutations (POST/PUT/PATCH/DELETE).
- * Does not cache — returns a `mutate` function that executes the mutation.
+ * Svelte store factory for a mutation, backed by TanStack Query Core.
  *
- * @param config - Mutation configuration.
- * @returns Readable stores plus `{ mutate, reset }`.
+ * @param options - TanStack mutation options (`mutationFn`, `onSuccess`, …).
+ * @param client - Optional {@link QueryClient} (defaults to the shared singleton).
+ * @returns A `Readable` of the TanStack {@link MutationObserverResult}.
  *
  * @example
  * ```svelte
@@ -97,12 +47,14 @@ export declare function useQuery<T>(config: UseQueryConfig<T>, client?: QueryCli
  *   import { usePost } from "katanakit-js";
  *
  *   const qc = useQueryClient();
- *   const { mutate, isLoading } = useMutation({
+ *   const mutation = useMutation({
  *     mutationFn: (name: string) => usePost("api", "createUser", { name }),
  *     onSuccess: () => qc.invalidateQueries({ queryKey: ["users"] }),
  *   });
  * </script>
+ *
+ * <button disabled={$mutation.isPending} on:click={() => $mutation.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): Readable<MutationObserverResult<TData, TError, TVariables, TContext>>;
 //# sourceMappingURL=query.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/adapters/svelte/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/adapters/svelte/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC3B,KAAK,WAAW,EAEhB,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,cAAc,CAAC;AAIvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;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,QAAQ,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAS9C;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;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,QAAQ,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAavE"}

package/dist/adapters/svelte/query.js

@@ -1,103 +1,53 @@
-import { onDestroy } from "svelte";
-import { writable } from "svelte/store";
-import { useQueryClient, } from "../../core/services/query.service.js";
+import { MutationObserver, QueryObserver, } from "@tanstack/query-core";
+import { readable } from "svelte/store";
+import { useQueryClient } from "../../core/services/query.service.js";
 /**
- * Svelte store factory that wraps the {@link QueryClient}.
- * Integrates with the API manager — your `queryFn` typically calls `useGetApi`
- * or `useFetch` and returns the Safe Result.
+ * Svelte store factory for a cached query, backed by TanStack Query Core.
  *
- * Unsubscribes automatically on component destroy when called during init.
+ * Returns a `Readable` of TanStack's {@link QueryObserverResult}. Subscribe
+ * with `$query` — `$query.data`, `$query.isPending`, `$query.isError`,
+ * `$query.status`, etc.
  *
- * @param config - Query configuration.
- * @param client - Optional QueryClient instance (uses global singleton by default).
- * @returns Readable stores `{ data, error, isLoading, isSuccess, isError, isStale, status }` plus `refetch`.
+ * @param options - TanStack query options (`queryKey`, `queryFn`, `staleTime`, …).
+ * @param client - Optional {@link QueryClient} (defaults to the shared singleton).
+ * @returns A `Readable` of the TanStack {@link QueryObserverResult}.
  *
  * @example
  * ```svelte
  * <script lang="ts">
- *   import { useQuery } from "katanakit-js/adapters/svelte";
+ *   import { useQuery, useSafeQueryFn } from "katanakit-js/adapters/svelte";
  *   import { useGetApi } from "katanakit-js";
  *
- *   const { data, isLoading, error } = useQuery({
+ *   const query = useQuery({
  *     queryKey: ["pokemon", 25],
- *     queryFn: () => useGetApi("pokeapi", "pokemonById", { params: { id: 25 } }),
+ *     queryFn: useSafeQueryFn(() => useGetApi("pokeapi", "pokemonById", { params: { id: 25 } })),
  *   });
  * </script>
  *
- * {#if $isLoading}
+ * {#if $query.isPending}
  *   <div>Loading…</div>
- * {:else if $error}
- *   <div>{$error.message}</div>
+ * {:else if $query.isError}
+ *   <div>{$query.error?.message}</div>
  * {:else}
- *   <div>{$data?.name}</div>
+ *   <div>{$query.data?.name}</div>
  * {/if}
  * ```
  */
-export function useQuery(config, client) {
-    const qc = client ?? useQueryClient();
-    const data = writable(null);
-    const error = writable(null);
-    const isLoading = writable(false);
-    const isSuccess = writable(false);
-    const isError = writable(false);
-    const isStale = writable(true);
-    const status = writable("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.
-        });
-    }
-    try {
-        onDestroy(unsubscribe);
-    }
-    catch {
-        // Not inside a component init — the caller owns teardown.
-    }
-    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, error, isLoading, isSuccess, isError, isStale, status, refetch };
+export function useQuery(options, client) {
+    const queryClient = client ?? useQueryClient();
+    const observer = new QueryObserver(queryClient, queryClient.defaultQueryOptions(options));
+    return readable(observer.getCurrentResult(), (set) => {
+        const unsubscribe = observer.subscribe((result) => set(result));
+        set(observer.getCurrentResult());
+        return () => unsubscribe();
+    });
 }
 /**
- * Svelte store factory for mutations (POST/PUT/PATCH/DELETE).
- * Does not cache — returns a `mutate` function that executes the mutation.
+ * Svelte store factory for a mutation, backed by TanStack Query Core.
  *
- * @param config - Mutation configuration.
- * @returns Readable stores plus `{ mutate, reset }`.
+ * @param options - TanStack mutation options (`mutationFn`, `onSuccess`, …).
+ * @param client - Optional {@link QueryClient} (defaults to the shared singleton).
+ * @returns A `Readable` of the TanStack {@link MutationObserverResult}.
  *
  * @example
  * ```svelte
@@ -106,67 +56,23 @@ export function useQuery(config, client) {
  *   import { usePost } from "katanakit-js";
  *
  *   const qc = useQueryClient();
- *   const { mutate, isLoading } = useMutation({
+ *   const mutation = useMutation({
  *     mutationFn: (name: string) => usePost("api", "createUser", { name }),
  *     onSuccess: () => qc.invalidateQueries({ queryKey: ["users"] }),
  *   });
  * </script>
+ *
+ * <button disabled={$mutation.isPending} on:click={() => $mutation.mutate("Ada")}>Create</button>
  * ```
  */
-export function useMutation(config) {
-    const data = writable(null);
-    const error = writable(null);
-    const isLoading = writable(false);
-    const isSuccess = writable(false);
-    const isError = writable(false);
-    const status = writable("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");
-    };
-    return { data, error, isLoading, isSuccess, isError, status, mutate, reset };
+export function useMutation(options, client) {
+    const queryClient = client ?? useQueryClient();
+    const observer = new MutationObserver(queryClient, options);
+    return readable(observer.getCurrentResult(), (set) => {
+        const unsubscribe = observer.subscribe((result) => set(result));
+        // Stores are lazy: re-sync the latest result on every (re)subscribe.
+        set(observer.getCurrentResult());
+        return () => unsubscribe();
+    });
 }
 //# sourceMappingURL=query.js.map