appflare 0.2.30 → 0.2.32

package/react/use-mutation.ts

@@ -1,89 +1,89 @@
-import {
-	type UseMutationOptions,
-	type UseMutationResult,
-	useMutation as useTanstackMutation,
-} from "@tanstack/react-query";
-
-type AppflareRequestErrorLike = {
-	message: string;
-	status?: number;
-};
-
-type AppflareRequestResultLike<TData> = {
-	data: TData | null;
-	error: AppflareRequestErrorLike | null;
-};
-
-type AppflareRequiredInputKeys<TInput extends Record<string, unknown>> = {
-	[K in keyof TInput]-?: undefined extends TInput[K] ? never : K;
-}[keyof TInput];
-
-type AppflareHasRequiredInputKeys<TInput extends Record<string, unknown>> = [
-	AppflareRequiredInputKeys<TInput>,
-] extends [never]
-	? false
-	: true;
-
-type AppflareRouteRunArgs<TInput extends Record<string, unknown>> =
-	AppflareHasRequiredInputKeys<TInput> extends true
-		? [args: TInput, options?: any]
-		: [args?: TInput, options?: any];
-
-type AppflareMutationVariables<TArgs extends Record<string, unknown>> =
-	AppflareHasRequiredInputKeys<TArgs> extends true ? TArgs : TArgs | void;
-
-type AppflareMutationLike<TArgs extends Record<string, unknown>, TData> = {
-	run: (
-		...params: AppflareRouteRunArgs<TArgs>
-	) => Promise<AppflareRequestResultLike<TData>>;
-};
-
-function toError(error: AppflareRequestErrorLike): Error {
-	const next = new Error(error.message);
-	if (error.status !== undefined) {
-		(next as Error & { status?: number }).status = error.status;
-	}
-	return next;
-}
-
-export function useMutation<
-	TArgs extends Record<string, unknown>,
-	TData,
-	TContext = unknown,
->(
-	mutation: AppflareMutationLike<TArgs, TData>,
-	mutationOptions?: Omit<
-		UseMutationOptions<
-			TData,
-			Error,
-			AppflareMutationVariables<TArgs>,
-			TContext
-		>,
-		"mutationFn"
-	>,
-): UseMutationResult<TData, Error, AppflareMutationVariables<TArgs>, TContext> {
-	return useTanstackMutation<
-		TData,
-		Error,
-		AppflareMutationVariables<TArgs>,
-		TContext
-	>({
-		...(mutationOptions as Omit<
-			UseMutationOptions<
-				TData,
-				Error,
-				AppflareMutationVariables<TArgs>,
-				TContext
-			>,
-			"mutationFn"
-		>),
-		mutationFn: async (args: AppflareMutationVariables<TArgs>) => {
-			const response = await mutation.run((args ?? {}) as TArgs);
-			if (response.error) {
-				throw toError(response.error);
-			}
-
-			return response.data as TData;
-		},
-	});
-}
+import {
+	type UseMutationOptions,
+	type UseMutationResult,
+	useMutation as useTanstackMutation,
+} from "@tanstack/react-query";
+
+type AppflareRequestErrorLike = {
+	message: string;
+	status?: number;
+};
+
+type AppflareRequestResultLike<TData> = {
+	data: TData | null;
+	error: AppflareRequestErrorLike | null;
+};
+
+type AppflareRequiredInputKeys<TInput extends Record<string, unknown>> = {
+	[K in keyof TInput]-?: undefined extends TInput[K] ? never : K;
+}[keyof TInput];
+
+type AppflareHasRequiredInputKeys<TInput extends Record<string, unknown>> = [
+	AppflareRequiredInputKeys<TInput>,
+] extends [never]
+	? false
+	: true;
+
+type AppflareRouteRunArgs<TInput extends Record<string, unknown>> =
+	AppflareHasRequiredInputKeys<TInput> extends true
+		? [args: TInput, options?: any]
+		: [args?: TInput, options?: any];
+
+type AppflareMutationVariables<TArgs extends Record<string, unknown>> =
+	AppflareHasRequiredInputKeys<TArgs> extends true ? TArgs : TArgs | void;
+
+type AppflareMutationLike<TArgs extends Record<string, unknown>, TData> = {
+	run: (
+		...params: AppflareRouteRunArgs<TArgs>
+	) => Promise<AppflareRequestResultLike<TData>>;
+};
+
+function toError(error: AppflareRequestErrorLike): Error {
+	const next = new Error(error.message);
+	if (error.status !== undefined) {
+		(next as Error & { status?: number }).status = error.status;
+	}
+	return next;
+}
+
+export function useMutation<
+	TArgs extends Record<string, unknown>,
+	TData,
+	TContext = unknown,
+>(
+	mutation: AppflareMutationLike<TArgs, TData>,
+	mutationOptions?: Omit<
+		UseMutationOptions<
+			TData,
+			Error,
+			AppflareMutationVariables<TArgs>,
+			TContext
+		>,
+		"mutationFn"
+	>,
+): UseMutationResult<TData, Error, AppflareMutationVariables<TArgs>, TContext> {
+	return useTanstackMutation<
+		TData,
+		Error,
+		AppflareMutationVariables<TArgs>,
+		TContext
+	>({
+		...(mutationOptions as Omit<
+			UseMutationOptions<
+				TData,
+				Error,
+				AppflareMutationVariables<TArgs>,
+				TContext
+			>,
+			"mutationFn"
+		>),
+		mutationFn: async (args: AppflareMutationVariables<TArgs>) => {
+			const response = await mutation.run((args ?? {}) as TArgs);
+			if (response.error) {
+				throw toError(response.error);
+			}
+
+			return response.data as TData;
+		},
+	});
+}

package/react/use-query.ts

@@ -1,207 +1,207 @@
-import {
-	hashKey,
-	type QueryKey,
-	type UseQueryOptions,
-	type UseQueryResult,
-	useQuery as useTanstackQuery,
-	useQueryClient,
-} from "@tanstack/react-query";
-import { useEffect, useMemo, useRef } from "react";
-
-type AppflareRequestErrorLike = {
-	message: string;
-	status?: number;
-};
-
-type AppflareRequestResultLike<TData> = {
-	data: TData | null;
-	error: AppflareRequestErrorLike | null;
-};
-
-type AppflareRealtimeSubscriptionLike = {
-	remove: () => void;
-};
-
-type AppflareRealtimeQueryUpdateLike<TData> = {
-	event: "query:update";
-	payload: {
-		queryName: string;
-		signature: string;
-		data: TData;
-	};
-};
-
-type AppflareRequiredInputKeys<TInput extends Record<string, unknown>> = {
-	[K in keyof TInput]-?: undefined extends TInput[K] ? never : K;
-}[keyof TInput];
-
-type AppflareHasRequiredInputKeys<TInput extends Record<string, unknown>> = [
-	AppflareRequiredInputKeys<TInput>,
-] extends [never]
-	? false
-	: true;
-
-type AppflareRouteRunArgs<TInput extends Record<string, unknown>> =
-	AppflareHasRequiredInputKeys<TInput> extends true
-		? [args: TInput, options?: any]
-		: [args?: TInput, options?: any];
-
-type AppflareQueryLike<TArgs extends Record<string, unknown>, TData> = {
-	run: (
-		...params: AppflareRouteRunArgs<TArgs>
-	) => Promise<AppflareRequestResultLike<TData>>;
-	subscribe?: (options: {
-		args?: TArgs;
-		authToken?: string;
-		requestOptions?: any;
-		signal?: AbortSignal;
-		onChange: (
-			data: TData,
-			update: AppflareRealtimeQueryUpdateLike<TData>,
-		) => void;
-		onError?: (error: unknown) => void;
-	}) => AppflareRealtimeSubscriptionLike;
-};
-
-export type UseAppflareQueryOptions<
-	TArgs extends Record<string, unknown>,
-	TData,
-	TSelected = TData,
-	TKey extends QueryKey = QueryKey,
-> = {
-	realtime?: {
-		enabled?: boolean;
-		authToken?: string;
-		requestOptions?: any;
-		onChange?: (
-			data: TData,
-			update: AppflareRealtimeQueryUpdateLike<TData>,
-		) => void;
-		onError?: (error: unknown) => void;
-	};
-	requestOptions?: any;
-	queryOptions?: Omit<
-		UseQueryOptions<TData, Error, TSelected, TKey>,
-		"queryFn" | "queryKey"
-	> & {
-		queryKey?: TKey;
-	};
-};
-
-type UseQueryCallParams<
-	TArgs extends Record<string, unknown>,
-	TData,
-	TSelected,
-	TKey extends QueryKey,
-> =
-	AppflareHasRequiredInputKeys<TArgs> extends true
-		? [
-				args: TArgs,
-				options?: UseAppflareQueryOptions<TArgs, TData, TSelected, TKey>,
-			]
-		: [
-				args?: TArgs,
-				options?: UseAppflareQueryOptions<TArgs, TData, TSelected, TKey>,
-			];
-
-function toError(error: AppflareRequestErrorLike): Error {
-	const next = new Error(error.message);
-	if (error.status !== undefined) {
-		(next as Error & { status?: number }).status = error.status;
-	}
-	return next;
-}
-
-export function useQuery<
-	TArgs extends Record<string, unknown>,
-	TData,
-	TSelected = TData,
-	TKey extends QueryKey = QueryKey,
->(
-	query: AppflareQueryLike<TArgs, TData>,
-	...params: UseQueryCallParams<TArgs, TData, TSelected, TKey>
-): UseQueryResult<TSelected, Error> {
-	const args = (params[0] ?? {}) as TArgs;
-	const options = params[1];
-	const queryClient = useQueryClient();
-	const realtimeOnChangeRef = useRef(options?.realtime?.onChange);
-	const realtimeOnErrorRef = useRef(options?.realtime?.onError);
-
-	useEffect(() => {
-		realtimeOnChangeRef.current = options?.realtime?.onChange;
-		realtimeOnErrorRef.current = options?.realtime?.onError;
-	}, [options?.realtime?.onChange, options?.realtime?.onError]);
-
-	const resolvedQueryKey = useMemo(() => {
-		return (
-			options?.queryOptions?.queryKey ??
-			(["appflare", "query", query, args] as unknown as TKey)
-		);
-	}, [args, options?.queryOptions?.queryKey, query]);
-
-	const resolvedQueryKeyHash = useMemo(
-		() => hashKey(resolvedQueryKey as QueryKey),
-		[resolvedQueryKey],
-	);
-
-	const realtimeArgsHash = useMemo(() => hashKey([args] as QueryKey), [args]);
-
-	const realtimeRequestOptionsHash = useMemo(
-		() => hashKey([options?.realtime?.requestOptions] as QueryKey),
-		[options?.realtime?.requestOptions],
-	);
-
-	const result = useTanstackQuery<TData, Error, TSelected, TKey>({
-		...(options?.queryOptions as Omit<
-			UseQueryOptions<TData, Error, TSelected, TKey>,
-			"queryFn" | "queryKey"
-		>),
-		queryKey: resolvedQueryKey,
-		queryFn: async () => {
-			const response = await query.run(args, options?.requestOptions);
-			if (response.error) {
-				throw toError(response.error);
-			}
-			return response.data as TData;
-		},
-	});
-
-	useEffect(() => {
-		if (options?.realtime?.enabled === false || !query.subscribe) {
-			return;
-		}
-
-		const controller = new AbortController();
-		const subscription = query.subscribe({
-			args,
-			authToken: options.realtime?.authToken,
-			requestOptions: options.realtime?.requestOptions,
-			signal: controller.signal,
-			onChange: (data, update) => {
-				queryClient.setQueryData<TData>(resolvedQueryKey, data as TData);
-				realtimeOnChangeRef.current?.(
-					data as TData,
-					update as AppflareRealtimeQueryUpdateLike<TData>,
-				);
-			},
-			onError: (error) => {
-				realtimeOnErrorRef.current?.(error);
-			},
-		});
-
-		return () => {
-			controller.abort();
-			subscription.remove();
-		};
-	}, [
-		realtimeArgsHash,
-		options?.realtime?.authToken,
-		options?.realtime?.enabled,
-		realtimeRequestOptionsHash,
-		query.subscribe,
-		queryClient,
-		resolvedQueryKeyHash,
-	]);
-
-	return result;
-}
+import {
+	hashKey,
+	type QueryKey,
+	type UseQueryOptions,
+	type UseQueryResult,
+	useQuery as useTanstackQuery,
+	useQueryClient,
+} from "@tanstack/react-query";
+import { useEffect, useMemo, useRef } from "react";
+
+type AppflareRequestErrorLike = {
+	message: string;
+	status?: number;
+};
+
+type AppflareRequestResultLike<TData> = {
+	data: TData | null;
+	error: AppflareRequestErrorLike | null;
+};
+
+type AppflareRealtimeSubscriptionLike = {
+	remove: () => void;
+};
+
+type AppflareRealtimeQueryUpdateLike<TData> = {
+	event: "query:update";
+	payload: {
+		queryName: string;
+		signature: string;
+		data: TData;
+	};
+};
+
+type AppflareRequiredInputKeys<TInput extends Record<string, unknown>> = {
+	[K in keyof TInput]-?: undefined extends TInput[K] ? never : K;
+}[keyof TInput];
+
+type AppflareHasRequiredInputKeys<TInput extends Record<string, unknown>> = [
+	AppflareRequiredInputKeys<TInput>,
+] extends [never]
+	? false
+	: true;
+
+type AppflareRouteRunArgs<TInput extends Record<string, unknown>> =
+	AppflareHasRequiredInputKeys<TInput> extends true
+		? [args: TInput, options?: any]
+		: [args?: TInput, options?: any];
+
+type AppflareQueryLike<TArgs extends Record<string, unknown>, TData> = {
+	run: (
+		...params: AppflareRouteRunArgs<TArgs>
+	) => Promise<AppflareRequestResultLike<TData>>;
+	subscribe?: (options: {
+		args?: TArgs;
+		authToken?: string;
+		requestOptions?: any;
+		signal?: AbortSignal;
+		onChange: (
+			data: TData,
+			update: AppflareRealtimeQueryUpdateLike<TData>,
+		) => void;
+		onError?: (error: unknown) => void;
+	}) => AppflareRealtimeSubscriptionLike;
+};
+
+export type UseAppflareQueryOptions<
+	TArgs extends Record<string, unknown>,
+	TData,
+	TSelected = TData,
+	TKey extends QueryKey = QueryKey,
+> = {
+	realtime?: {
+		enabled?: boolean;
+		authToken?: string;
+		requestOptions?: any;
+		onChange?: (
+			data: TData,
+			update: AppflareRealtimeQueryUpdateLike<TData>,
+		) => void;
+		onError?: (error: unknown) => void;
+	};
+	requestOptions?: any;
+	queryOptions?: Omit<
+		UseQueryOptions<TData, Error, TSelected, TKey>,
+		"queryFn" | "queryKey"
+	> & {
+		queryKey?: TKey;
+	};
+};
+
+type UseQueryCallParams<
+	TArgs extends Record<string, unknown>,
+	TData,
+	TSelected,
+	TKey extends QueryKey,
+> =
+	AppflareHasRequiredInputKeys<TArgs> extends true
+		? [
+				args: TArgs,
+				options?: UseAppflareQueryOptions<TArgs, TData, TSelected, TKey>,
+			]
+		: [
+				args?: TArgs,
+				options?: UseAppflareQueryOptions<TArgs, TData, TSelected, TKey>,
+			];
+
+function toError(error: AppflareRequestErrorLike): Error {
+	const next = new Error(error.message);
+	if (error.status !== undefined) {
+		(next as Error & { status?: number }).status = error.status;
+	}
+	return next;
+}
+
+export function useQuery<
+	TArgs extends Record<string, unknown>,
+	TData,
+	TSelected = TData,
+	TKey extends QueryKey = QueryKey,
+>(
+	query: AppflareQueryLike<TArgs, TData>,
+	...params: UseQueryCallParams<TArgs, TData, TSelected, TKey>
+): UseQueryResult<TSelected, Error> {
+	const args = (params[0] ?? {}) as TArgs;
+	const options = params[1];
+	const queryClient = useQueryClient();
+	const realtimeOnChangeRef = useRef(options?.realtime?.onChange);
+	const realtimeOnErrorRef = useRef(options?.realtime?.onError);
+
+	useEffect(() => {
+		realtimeOnChangeRef.current = options?.realtime?.onChange;
+		realtimeOnErrorRef.current = options?.realtime?.onError;
+	}, [options?.realtime?.onChange, options?.realtime?.onError]);
+
+	const resolvedQueryKey = useMemo(() => {
+		return (
+			options?.queryOptions?.queryKey ??
+			(["appflare", "query", query, args] as unknown as TKey)
+		);
+	}, [args, options?.queryOptions?.queryKey, query]);
+
+	const resolvedQueryKeyHash = useMemo(
+		() => hashKey(resolvedQueryKey as QueryKey),
+		[resolvedQueryKey],
+	);
+
+	const realtimeArgsHash = useMemo(() => hashKey([args] as QueryKey), [args]);
+
+	const realtimeRequestOptionsHash = useMemo(
+		() => hashKey([options?.realtime?.requestOptions] as QueryKey),
+		[options?.realtime?.requestOptions],
+	);
+
+	const result = useTanstackQuery<TData, Error, TSelected, TKey>({
+		...(options?.queryOptions as Omit<
+			UseQueryOptions<TData, Error, TSelected, TKey>,
+			"queryFn" | "queryKey"
+		>),
+		queryKey: resolvedQueryKey,
+		queryFn: async () => {
+			const response = await query.run(args, options?.requestOptions);
+			if (response.error) {
+				throw toError(response.error);
+			}
+			return response.data as TData;
+		},
+	});
+
+	useEffect(() => {
+		if (options?.realtime?.enabled === false || !query.subscribe) {
+			return;
+		}
+
+		const controller = new AbortController();
+		const subscription = query.subscribe({
+			args,
+			authToken: options.realtime?.authToken,
+			requestOptions: options.realtime?.requestOptions,
+			signal: controller.signal,
+			onChange: (data, update) => {
+				queryClient.setQueryData<TData>(resolvedQueryKey, data as TData);
+				realtimeOnChangeRef.current?.(
+					data as TData,
+					update as AppflareRealtimeQueryUpdateLike<TData>,
+				);
+			},
+			onError: (error) => {
+				realtimeOnErrorRef.current?.(error);
+			},
+		});
+
+		return () => {
+			controller.abort();
+			subscription.remove();
+		};
+	}, [
+		realtimeArgsHash,
+		options?.realtime?.authToken,
+		options?.realtime?.enabled,
+		realtimeRequestOptionsHash,
+		query.subscribe,
+		queryClient,
+		resolvedQueryKeyHash,
+	]);
+
+	return result;
+}