katanakit-js 4.0.2 → 4.0.3

package/dist/adapters/react/query.js

@@ -1,119 +1,62 @@
-import { useCallback, useEffect, useState } from "react";
-import { useQueryClient, } from "../../core/services/query.service.js";
-const IDLE_STATE = {
-    status: "idle",
-    data: null,
-    error: null,
-    isLoading: false,
-    isSuccess: false,
-    isError: false,
-    isStale: true,
-    dataUpdatedAt: 0,
-    errorUpdatedAt: 0,
-    fetchCount: 0,
-};
+import { MutationObserver, notifyManager, QueryObserver, } from "@tanstack/query-core";
+import { useCallback, useEffect, useState, useSyncExternalStore } from "react";
+import { useQueryClient } from "../../core/services/query.service.js";
 /**
- * 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 function useQuery(config, client) {
-    const qc = client ?? useQueryClient();
-    const [state, setState] = useState(IDLE_STATE);
-    // Serialize the key so React's dependency comparison tracks deep changes.
-    const keyHash = JSON.stringify(config.queryKey);
+export function useQuery(options, client) {
+    const queryClient = client ?? useQueryClient();
+    const defaultedOptions = queryClient.defaultQueryOptions(options);
+    const [observer] = useState(() => new QueryObserver(queryClient, defaultedOptions));
+    const subscribe = useCallback((onStoreChange) => {
+        const unsubscribe = observer.subscribe(notifyManager.batchCalls(onStoreChange));
+        // Sync the optimistic result with the store after subscribing.
+        observer.updateResult();
+        return unsubscribe;
+    }, [observer]);
+    const result = useSyncExternalStore(subscribe, () => observer.getCurrentResult(), () => observer.getCurrentResult());
+    // Keep the observer's options in sync on every render (TanStack's pattern).
     useEffect(() => {
-        let disposed = false;
-        const qKey = config.queryKey;
-        setState(IDLE_STATE);
-        const unsubscribe = qc.subscribe(qKey, (next) => {
-            if (!disposed)
-                setState(next);
-        });
-        const existing = qc.getQueryState(qKey);
-        if (existing)
-            setState(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.
-            });
-        }
-        return () => {
-            disposed = true;
-            unsubscribe();
-        };
-    }, [keyHash, config.enabled]);
-    const refetch = useCallback(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.
-        });
-    }, [qc, keyHash]);
-    return {
-        data: state.data,
-        error: state.error,
-        isLoading: state.isLoading,
-        isSuccess: state.isSuccess,
-        isError: state.isError,
-        isStale: state.isStale,
-        status: state.status,
-        refetch,
-    };
+        observer.setOptions(queryClient.defaultQueryOptions(options));
+    });
+    return result;
 }
-const IDLE_MUTATION_STATE = {
-    data: null,
-    error: null,
-    isLoading: false,
-    isSuccess: false,
-    isError: false,
-    status: "idle",
-};
 /**
- * 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
@@ -122,79 +65,22 @@ const IDLE_MUTATION_STATE = {
  *
  * 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 function useMutation(config) {
-    const [state, setState] = useState(IDLE_MUTATION_STATE);
-    const mutate = useCallback(async (variables) => {
-        setState((prev) => ({
-            ...prev,
-            isLoading: true,
-            isSuccess: false,
-            isError: false,
-            status: "loading",
-        }));
-        try {
-            const result = await config.mutationFn(variables);
-            if (result.ok) {
-                setState({
-                    data: result.data,
-                    error: null,
-                    isLoading: false,
-                    isSuccess: true,
-                    isError: false,
-                    status: "success",
-                });
-                config.onSuccess?.(result.data, variables);
-                config.onSettled?.(result.data, null, variables);
-            }
-            else {
-                setState({
-                    data: null,
-                    error: result.error,
-                    isLoading: false,
-                    isSuccess: false,
-                    isError: true,
-                    status: "error",
-                });
-                config.onError?.(result.error, variables);
-                config.onSettled?.(null, result.error, variables);
-            }
-        }
-        catch (error) {
-            const apiError = error instanceof Error
-                ? { message: error.message, status: 0 }
-                : { message: String(error), status: 0 };
-            setState({
-                data: null,
-                error: apiError,
-                isLoading: false,
-                isSuccess: false,
-                isError: true,
-                status: "error",
-            });
-            config.onError?.(apiError, variables);
-            config.onSettled?.(null, apiError, variables);
-        }
-    }, []);
-    const reset = useCallback(() => {
-        setState(IDLE_MUTATION_STATE);
-    }, []);
-    return {
-        data: state.data,
-        error: state.error,
-        isLoading: state.isLoading,
-        isSuccess: state.isSuccess,
-        isError: state.isError,
-        status: state.status,
-        mutate,
-        reset,
-    };
+export function useMutation(options, client) {
+    const queryClient = client ?? useQueryClient();
+    const [observer] = useState(() => new MutationObserver(queryClient, options));
+    const subscribe = useCallback((onStoreChange) => observer.subscribe(notifyManager.batchCalls(onStoreChange)), [observer]);
+    const result = useSyncExternalStore(subscribe, () => observer.getCurrentResult(), () => observer.getCurrentResult());
+    useEffect(() => {
+        observer.setOptions(options);
+    });
+    return result;
 }
 //# sourceMappingURL=query.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/adapters/react/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/adapters/react/query.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,gBAAgB,EAGhB,aAAa,EAEb,aAAa,GAGb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,UAAU,QAAQ,CACvB,OAA0D,EAC1D,MAAoB;IAEpB,MAAM,WAAW,GAAG,MAAM,IAAI,cAAc,EAAE,CAAC;IAC/C,MAAM,gBAAgB,GAAG,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAElE,MAAM,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,aAAa,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEpF,MAAM,SAAS,GAAG,WAAW,CAC5B,CAAC,aAAyB,EAAE,EAAE;QAC7B,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;QAChF,+DAA+D;QAC/D,QAAQ,CAAC,YAAY,EAAE,CAAC;QACxB,OAAO,WAAW,CAAC;IACpB,CAAC,EACD,CAAC,QAAQ,CAAC,CACV,CAAC;IAEF,MAAM,MAAM,GAAG,oBAAoB,CAClC,SAAS,EACT,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,EACjC,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CACjC,CAAC;IAEF,4EAA4E;IAC5E,SAAS,CAAC,GAAG,EAAE;QACd,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,WAAW,CAC1B,OAAqE,EACrE,MAAoB;IAEpB,MAAM,WAAW,GAAG,MAAM,IAAI,cAAc,EAAE,CAAC;IAE/C,MAAM,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAE9E,MAAM,SAAS,GAAG,WAAW,CAC5B,CAAC,aAAyB,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EAC1F,CAAC,QAAQ,CAAC,CACV,CAAC;IAEF,MAAM,MAAM,GAAG,oBAAoB,CAClC,SAAS,EACT,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,EACjC,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CACjC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACd,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC"}

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

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

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

@@ -1,87 +1,45 @@
-import { type Signal } from "solid-js";
-import { type QueryClient, type QueryKey, type QueryState } from "../../core/services/query.service.js";
-import type { ApiError, FetchResult } from "../../types/index.js";
-/** Configuration for `useQuery` (Solid primitive). */
-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` (Solid signals are accessors). */
-export interface UseQueryReturn<T = unknown> {
-    data: Signal<T | null>[0];
-    error: Signal<ApiError | null>[0];
-    isLoading: Signal<boolean>[0];
-    isSuccess: Signal<boolean>[0];
-    isError: Signal<boolean>[0];
-    isStale: Signal<boolean>[0];
-    status: Signal<QueryState<T>["status"]>[0];
-    /** 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: Signal<TData | null>[0];
-    error: Signal<ApiError | null>[0];
-    isLoading: Signal<boolean>[0];
-    isSuccess: Signal<boolean>[0];
-    isError: Signal<boolean>[0];
-    status: Signal<"idle" | "loading" | "success" | "error">[0];
-    /** 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";
+/** Options for the Solid binding: a plain object or a reactive getter. */
+export type SolidQueryOptions<TQueryFnData, TError, TData> = QueryObserverOptions<TQueryFnData, TError, TData> | (() => QueryObserverOptions<TQueryFnData, TError, TData>);
 /**
- * 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 declare function useQuery<T>(config: UseQueryConfig<T>, client?: QueryClient): UseQueryReturn<T>;
+export declare function useQuery<TQueryFnData = unknown, TError = Error, TData = TQueryFnData>(options: SolidQueryOptions<TQueryFnData, TError, TData>, client?: QueryClient): QueryObserverResult<TData, TError>;
 /**
- * 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
@@ -90,13 +48,13 @@ export declare function useQuery<T>(config: UseQueryConfig<T>, client?: QueryCli
  *
  * 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 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> | (() => MutationObserverOptions<TData, TError, TVariables, TContext>), client?: QueryClient): MutationObserverResult<TData, TError, TVariables, TContext>;
 //# sourceMappingURL=query.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/adapters/solid/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/adapters/solid/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;AAM9B,0EAA0E;AAC1E,MAAM,MAAM,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,IACtD,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,GACjD,CAAC,MAAM,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,QAAQ,CAAC,YAAY,GAAG,OAAO,EAAE,MAAM,GAAG,KAAK,EAAE,KAAK,GAAG,YAAY,EACpF,OAAO,EAAE,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EACvD,MAAM,CAAC,EAAE,WAAW,GAClB,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAsBpC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,WAAW,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,KAAK,EAAE,UAAU,GAAG,IAAI,EAAE,QAAQ,GAAG,OAAO,EACjG,OAAO,EACJ,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,GAC5D,CAAC,MAAM,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,EACvE,MAAM,CAAC,EAAE,WAAW,GAClB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,CAqB7D"}