appflare 0.2.48 → 0.2.49

package/package.json

@@ -1,58 +1,58 @@
-{
-	"name": "appflare",
-	"version": "0.2.48",
-	"main": "./dist/index.js",
-	"module": "./dist/index.mjs",
-	"types": "./dist/index.d.ts",
-	"bin": {
-		"appflare": "./dist/cli/index.js"
-	},
-	"exports": {
-		".": {
-			"types": "./dist/index.d.ts",
-			"import": "./dist/index.mjs",
-			"require": "./dist/index.js"
-		},
-		"./react": {
-			"types": "./dist/react/index.d.ts",
-			"import": "./dist/react/index.mjs",
-			"require": "./dist/react/index.js"
-		},
-		"./*": "./dist/*.js"
-	},
-	"scripts": {
-		"build": "tsup",
-		"dev": "tsup --watch",
-		"lint": "tsc --noEmit",
-		"prepublishOnly": "bun run build"
-	},
-	"peerDependencies": {
-		"@tanstack/react-query": "^5.90.21",
-		"react": ">=18"
-	},
-	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20260219.0",
-		"@types/react": "^19.2.0",
-		"@tanstack/react-query": "^5.90.21",
-		"@types/bun": "^1.3.9",
-		"@types/node": "^25.3.0",
-		"npm-check-updates": "^19.4.0",
-		"tsup": "^8.3.6"
-	},
-	"dependencies": {
-		"@better-auth/cli": "^1.4.21",
-		"@hono/standard-validator": "0.2.2",
-		"better-auth": "^1.5.5",
-		"better-auth-cloudflare": "0.2.9",
-		"better-fetch": "1.1.2",
-		"bun": "1.3.9",
-		"chokidar": "5.0.0",
-		"commander": "14.0.3",
-		"drizzle-kit": "0.31.9",
-		"drizzle-orm": "0.45.1",
-		"hono": "4.12.0",
-		"typescript": "6.0.3",
-		"wrangler": "4.67.0",
-		"zod": "4.3.6"
-	}
-}
+{
+	"name": "appflare",
+	"version": "0.2.49",
+	"main": "./dist/index.js",
+	"module": "./dist/index.mjs",
+	"types": "./dist/index.d.ts",
+	"bin": {
+		"appflare": "./dist/cli/index.js"
+	},
+	"exports": {
+		".": {
+			"types": "./dist/index.d.ts",
+			"import": "./dist/index.mjs",
+			"require": "./dist/index.js"
+		},
+		"./react": {
+			"types": "./dist/react/index.d.ts",
+			"import": "./dist/react/index.mjs",
+			"require": "./dist/react/index.js"
+		},
+		"./*": "./dist/*.js"
+	},
+	"scripts": {
+		"build": "tsup",
+		"dev": "tsup --watch",
+		"lint": "tsc --noEmit",
+		"prepublishOnly": "bun run build"
+	},
+	"peerDependencies": {
+		"@tanstack/react-query": "^5.90.21",
+		"react": ">=18"
+	},
+	"devDependencies": {
+		"@cloudflare/workers-types": "^4.20260219.0",
+		"@types/react": "^19.2.0",
+		"@tanstack/react-query": "^5.90.21",
+		"@types/bun": "^1.3.9",
+		"@types/node": "^25.3.0",
+		"npm-check-updates": "^19.4.0",
+		"tsup": "^8.3.6"
+	},
+	"dependencies": {
+		"@better-auth/cli": "^1.4.21",
+		"@hono/standard-validator": "0.2.2",
+		"better-auth": "^1.5.5",
+		"better-auth-cloudflare": "0.2.9",
+		"better-fetch": "1.1.2",
+		"bun": "1.3.9",
+		"chokidar": "5.0.0",
+		"commander": "14.0.3",
+		"drizzle-kit": "0.31.9",
+		"drizzle-orm": "0.45.1",
+		"hono": "4.12.0",
+		"typescript": "6.0.3",
+		"wrangler": "4.67.0",
+		"zod": "4.3.6"
+	}
+}

package/react/index.ts

@@ -1,5 +1,5 @@
-export { useQuery } from "./use-query";
-export type { UseAppflareQueryOptions } from "./use-query";
-export { useInfiniteQuery } from "./use-infinite-query";
-export type { UseAppflareInfiniteQueryOptions } from "./use-infinite-query";
-export { useMutation } from "./use-mutation";
+export { useQuery } from "./use-query";
+export type { UseAppflareQueryOptions } from "./use-query";
+export { useInfiniteQuery } from "./use-infinite-query";
+export type { UseAppflareInfiniteQueryOptions } from "./use-infinite-query";
+export { useMutation } from "./use-mutation";

package/react/use-infinite-query.ts

@@ -1,255 +1,255 @@
-import {
-	hashKey,
-	type InfiniteData,
-	type QueryKey,
-	type UseInfiniteQueryOptions,
-	type UseInfiniteQueryResult,
-	useInfiniteQuery as useTanstackInfiniteQuery,
-	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;
-	queryKey?: (args?: TArgs) => QueryKey;
-};
-
-export type UseAppflareInfiniteQueryOptions<
-	TArgs extends Record<string, unknown>,
-	TData,
-	TPageParam,
-	TSelected = InfiniteData<TData, TPageParam>,
-	TKey extends QueryKey = QueryKey,
-> = {
-	realtime?: {
-		enabled?: boolean;
-		authToken?: string;
-		requestOptions?: any;
-		onChange?: (
-			data: TData,
-			update: AppflareRealtimeQueryUpdateLike<TData>,
-		) => void;
-		onError?: (error: unknown) => void;
-	};
-	requestOptions?: any;
-	pageParamToArgs?: (baseArgs: TArgs, pageParam: TPageParam) => TArgs;
-	queryOptions?: Omit<
-		UseInfiniteQueryOptions<TData, Error, TSelected, TKey, TPageParam>,
-		"queryFn" | "queryKey"
-	> & {
-		queryKey?: TKey;
-	};
-};
-
-type UseInfiniteQueryCallParams<
-	TArgs extends Record<string, unknown>,
-	TData,
-	TPageParam,
-	TSelected,
-	TKey extends QueryKey,
-> =
-	AppflareHasRequiredInputKeys<TArgs> extends true
-		? [
-				args: TArgs,
-				options?: UseAppflareInfiniteQueryOptions<
-					TArgs,
-					TData,
-					TPageParam,
-					TSelected,
-					TKey
-				>,
-			]
-		: [
-				args?: TArgs,
-				options?: UseAppflareInfiniteQueryOptions<
-					TArgs,
-					TData,
-					TPageParam,
-					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 useInfiniteQuery<
-	TArgs extends Record<string, unknown>,
-	TData,
-	TPageParam = unknown,
-	TSelected = InfiniteData<TData, TPageParam>,
-	TKey extends QueryKey = QueryKey,
->(
-	query: AppflareQueryLike<TArgs, TData>,
-	...params: UseInfiniteQueryCallParams<
-		TArgs,
-		TData,
-		TPageParam,
-		TSelected,
-		TKey
-	>
-): UseInfiniteQueryResult<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 ??
-			(query.queryKey
-				? query.queryKey(args)
-				: (["appflare", "infinite-query", query, args] as unknown as TKey))
-		) 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 = useTanstackInfiniteQuery<
-		TData,
-		Error,
-		TSelected,
-		TKey,
-		TPageParam
-	>({
-		...(options?.queryOptions as Omit<
-			UseInfiniteQueryOptions<TData, Error, TSelected, TKey, TPageParam>,
-			"queryFn" | "queryKey"
-		>),
-		queryKey: resolvedQueryKey,
-		queryFn: async ({ pageParam }) => {
-			const nextArgs =
-				pageParam === undefined || !options?.pageParamToArgs
-					? args
-					: options.pageParamToArgs(args, pageParam as TPageParam);
-			const response = await query.run(nextArgs, options?.requestOptions);
-			if (response.error) {
-				throw toError(response.error);
-			}
-			return response.data as TData;
-		},
-	});
-
-	useEffect(() => {
-		if (!options?.realtime?.enabled || !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<InfiniteData<TData, TPageParam>>(
-					resolvedQueryKey,
-					(previous) => {
-						if (!previous || previous.pages.length === 0) {
-							return previous;
-						}
-
-						return {
-							...previous,
-							pages: [data as TData, ...previous.pages.slice(1)],
-						};
-					},
-				);
-				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 InfiniteData,
+	type QueryKey,
+	type UseInfiniteQueryOptions,
+	type UseInfiniteQueryResult,
+	useInfiniteQuery as useTanstackInfiniteQuery,
+	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;
+	queryKey?: (args?: TArgs) => QueryKey;
+};
+
+export type UseAppflareInfiniteQueryOptions<
+	TArgs extends Record<string, unknown>,
+	TData,
+	TPageParam,
+	TSelected = InfiniteData<TData, TPageParam>,
+	TKey extends QueryKey = QueryKey,
+> = {
+	realtime?: {
+		enabled?: boolean;
+		authToken?: string;
+		requestOptions?: any;
+		onChange?: (
+			data: TData,
+			update: AppflareRealtimeQueryUpdateLike<TData>,
+		) => void;
+		onError?: (error: unknown) => void;
+	};
+	requestOptions?: any;
+	pageParamToArgs?: (baseArgs: TArgs, pageParam: TPageParam) => TArgs;
+	queryOptions?: Omit<
+		UseInfiniteQueryOptions<TData, Error, TSelected, TKey, TPageParam>,
+		"queryFn" | "queryKey"
+	> & {
+		queryKey?: TKey;
+	};
+};
+
+type UseInfiniteQueryCallParams<
+	TArgs extends Record<string, unknown>,
+	TData,
+	TPageParam,
+	TSelected,
+	TKey extends QueryKey,
+> =
+	AppflareHasRequiredInputKeys<TArgs> extends true
+		? [
+				args: TArgs,
+				options?: UseAppflareInfiniteQueryOptions<
+					TArgs,
+					TData,
+					TPageParam,
+					TSelected,
+					TKey
+				>,
+			]
+		: [
+				args?: TArgs,
+				options?: UseAppflareInfiniteQueryOptions<
+					TArgs,
+					TData,
+					TPageParam,
+					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 useInfiniteQuery<
+	TArgs extends Record<string, unknown>,
+	TData,
+	TPageParam = unknown,
+	TSelected = InfiniteData<TData, TPageParam>,
+	TKey extends QueryKey = QueryKey,
+>(
+	query: AppflareQueryLike<TArgs, TData>,
+	...params: UseInfiniteQueryCallParams<
+		TArgs,
+		TData,
+		TPageParam,
+		TSelected,
+		TKey
+	>
+): UseInfiniteQueryResult<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 ??
+			(query.queryKey
+				? query.queryKey(args)
+				: (["appflare", "infinite-query", query, args] as unknown as TKey))
+		) 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 = useTanstackInfiniteQuery<
+		TData,
+		Error,
+		TSelected,
+		TKey,
+		TPageParam
+	>({
+		...(options?.queryOptions as Omit<
+			UseInfiniteQueryOptions<TData, Error, TSelected, TKey, TPageParam>,
+			"queryFn" | "queryKey"
+		>),
+		queryKey: resolvedQueryKey,
+		queryFn: async ({ pageParam }) => {
+			const nextArgs =
+				pageParam === undefined || !options?.pageParamToArgs
+					? args
+					: options.pageParamToArgs(args, pageParam as TPageParam);
+			const response = await query.run(nextArgs, options?.requestOptions);
+			if (response.error) {
+				throw toError(response.error);
+			}
+			return response.data as TData;
+		},
+	});
+
+	useEffect(() => {
+		if (!options?.realtime?.enabled || !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<InfiniteData<TData, TPageParam>>(
+					resolvedQueryKey,
+					(previous) => {
+						if (!previous || previous.pages.length === 0) {
+							return previous;
+						}
+
+						return {
+							...previous,
+							pages: [data as TData, ...previous.pages.slice(1)],
+						};
+					},
+				);
+				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;
+}