@classytic/arc-next 0.3.1 → 0.4.1

package/dist/hooks.js

@@ -1,11 +1,11 @@
 "use client";
 
-import { getAuthContext, getAuthMode } from "./client.js";
+import { getAuthMode, getClientAuthContext } from "./client.js";
 import { isKeysetPagination, isOffsetPagination } from "./api.js";
 import { DEFAULT_QUERY_CONFIG, createCacheUtils, createQueryKeys, extractItem, getItemId, updateListCache, useDetailQuery, useInfiniteListQuery, useListQuery } from "./query.js";
 import { useMutationWithTransition, useOptimisticMutation } from "./mutation.js";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useCallback, useMemo, useRef } from "react";
+import { useQueryClient } from "@tanstack/react-query";
+import { useCallback, useRef } from "react";
 
 //#region src/hooks.ts
 let useRouterHook = null;
@@ -21,11 +21,27 @@ let useRouterHook = null;
 function configureNavigation(hook) {
 	useRouterHook = hook;
 }
-function createEnabledRule(token, options, authMode = getAuthMode()) {
+function createEnabledRule(token, options, authMode = getAuthMode(), hasStaticAuth = false) {
 	if (authMode === "cookie" || options.public) return options.enabled ?? true;
+	if (hasStaticAuth) return options.enabled ?? true;
 	return options.enabled !== void 0 ? options.enabled && !!token : !!token;
 }
-function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks = {}, client }) {
+function createCrudHooks({ api, entityKey, singular, plural, idField, defaults = {}, callbacks = {}, client }) {
+	const pluralName = plural ?? `${singular}s`;
+	/** Resolve auth context — per-client auth takes priority over global */
+	const resolveAuth = () => getClientAuthContext(client);
+	/** Whether auth is provided via static config (headers, internalApiKey, per-client auth) — no token needed for enablement */
+	const hasStaticAuth = !!(client?.config?.defaultHeaders || client?.config?.internalApiKey || client?.auth);
+	/** Extract ID from an item using configured idField, falling back to _id → id */
+	function resolveItemId(item) {
+		if (!item || typeof item !== "object") return null;
+		const obj = item;
+		if (idField) {
+			const val = obj[idField];
+			if (val != null) return String(val);
+		}
+		return getItemId(item);
+	}
 	const KEYS = createQueryKeys(entityKey);
 	const cache = createCacheUtils(KEYS);
 	const instanceToast = client?.toast;
@@ -49,12 +65,12 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 		let token;
 		let params;
 		let options;
-		if (tokenOrParams === null || typeof tokenOrParams === "string") {
+		if (typeof tokenOrParams === "string" || tokenOrParams === null && maybeOptions !== void 0) {
 			token = tokenOrParams;
 			params = paramsOrOptions ?? {};
 			options = maybeOptions ?? {};
 		} else {
-			const auth = getAuthContext();
+			const auth = resolveAuth();
 			token = auth.token;
 			params = tokenOrParams ?? {};
 			options = paramsOrOptions ?? {};
@@ -80,7 +96,7 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 					...requestOpts
 				}
 			}),
-			enabled: createEnabledRule(token, queryOpts, resolveAuthMode()),
+			enabled: createEnabledRule(token, queryOpts, resolveAuthMode(), hasStaticAuth),
 			options: {
 				staleTime: queryOpts.staleTime ?? config.staleTime,
 				gcTime: queryOpts.gcTime ?? config.gcTime,
@@ -90,18 +106,19 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 				refetchIntervalInBackground: queryOpts.refetchIntervalInBackground
 			},
 			prefillDetailCache: queryOpts.prefillDetailCache ?? true,
-			detailKeyBuilder: (id) => KEYS.detail(id),
+			detailKeyBuilder: (id) => KEYS.scopedDetail(id, organizationId ?? null),
+			itemIdResolver: resolveItemId,
 			select: queryOpts.select
 		});
 	}
 	function useDetail(id, tokenOrOptions, maybeOptions) {
 		let token;
 		let options;
-		if (tokenOrOptions === null || typeof tokenOrOptions === "string") {
+		if (typeof tokenOrOptions === "string" || tokenOrOptions === null && maybeOptions !== void 0) {
 			token = tokenOrOptions;
 			options = maybeOptions ?? {};
 		} else {
-			const auth = getAuthContext();
+			const auth = resolveAuth();
 			token = auth.token;
 			options = tokenOrOptions ?? {};
 			if (auth.organizationId && !options.organizationId) options = {
@@ -110,8 +127,9 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 			};
 		}
 		const { organizationId, params: queryParams, request: requestOpts, ...restOptions } = options;
+		const detailKey = KEYS.scopedDetail(id || "", organizationId ?? null);
 		return useDetailQuery({
-			queryKey: queryParams ? [...KEYS.detail(id || ""), queryParams] : KEYS.detail(id || ""),
+			queryKey: queryParams ? [...detailKey, queryParams] : detailKey,
 			queryFn: ({ signal }) => api.getById({
 				id,
 				token,
@@ -122,7 +140,7 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 					...requestOpts
 				}
 			}),
-			enabled: !!id && createEnabledRule(token, restOptions, resolveAuthMode()),
+			enabled: !!id && createEnabledRule(token, restOptions, resolveAuthMode(), hasStaticAuth),
 			options: {
 				staleTime: restOptions.staleTime ?? config.staleTime,
 				gcTime: restOptions.gcTime ?? config.gcTime,
@@ -151,7 +169,7 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 				const optimisticItem = {
 					...data,
 					_optimistic: true,
-					[getItemId(data) ? "id" : "_id"]: getItemId(data) ?? `temp-${Date.now()}`
+					[idField ?? (resolveItemId(data) ? "id" : "_id")]: resolveItemId(data) ?? `temp-${Date.now()}`
 				};
 				return updateListCache(oldData, (arr) => [optimisticItem, ...arr || []]);
 			},
@@ -181,17 +199,20 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 			queryKeys: [KEYS.lists(), KEYS.details()],
 			shouldToast,
 			optimisticUpdate: (oldData, { id, data }) => {
-				const updated = updateListCache(oldData, (arr) => (arr || []).map((item) => getItemId(item) === id ? {
+				const updated = updateListCache(oldData, (arr) => (arr || []).map((item) => resolveItemId(item) === id ? {
 					...item,
 					...data
 				} : item));
-				queryClient.setQueryData(KEYS.detail(id), (current) => current ? {
+				const detailUpdater = (current) => current ? {
 					...current,
 					data: {
 						...current.data || {},
 						...data
 					}
-				} : current);
+				} : current;
+				queryClient.getQueriesData({ queryKey: KEYS.detail(id) }).forEach(([qKey, qData]) => {
+					if (qData) queryClient.setQueryData(qKey, detailUpdater);
+				});
 				return updated;
 			},
 			onSuccess: (raw, { id, data: updateData }) => {
@@ -229,7 +250,7 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 			queryKeys: [KEYS.lists()],
 			shouldToast,
 			optimisticUpdate: (oldData, { id }) => {
-				return updateListCache(oldData, (arr) => (arr || []).filter((item) => getItemId(item) !== id));
+				return updateListCache(oldData, (arr) => (arr || []).filter((item) => resolveItemId(item) !== id));
 			},
 			onSuccess: (data, { id }) => {
 				queryClient.removeQueries({ queryKey: KEYS.detail(id) });
@@ -247,8 +268,25 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 			},
 			toastHandler: instanceToast
 		});
-		const resolveAuth = useCallback((params) => {
-			const auth = getAuthContext();
+		const restoreMutation = useMutationWithTransition({
+			mutationFn: ({ token, organizationId, id }) => {
+				if (!api.restore) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define a restore method`));
+				return api.restore({
+					token,
+					organizationId,
+					id
+				});
+			},
+			invalidateQueries: [KEYS.lists(), KEYS.custom("deleted")],
+			shouldToast,
+			messages: {
+				success: `${singular} restored successfully`,
+				error: `Failed to restore ${singular.toLowerCase()}`
+			},
+			toastHandler: instanceToast
+		});
+		const resolveActionAuth = useCallback((params) => {
+			const auth = resolveAuth();
 			return {
 				...params,
 				token: params.token ?? auth.token,
@@ -259,7 +297,7 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 			create: useCallback(async (params, options) => {
 				silentRef.current = options?.silent ?? false;
 				try {
-					const entity = extractItem(await createMutation.mutateAsync(resolveAuth(params)));
+					const entity = extractItem(await createMutation.mutateAsync(resolveActionAuth(params)));
 					options?.onSuccess?.(entity);
 					options?.onSettled?.(entity, null);
 					return entity;
@@ -270,11 +308,11 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 				} finally {
 					silentRef.current = false;
 				}
-			}, [createMutation, resolveAuth]),
+			}, [createMutation, resolveActionAuth]),
 			update: useCallback(async (params, options) => {
 				silentRef.current = options?.silent ?? false;
 				try {
-					const entity = extractItem(await updateMutation.mutateAsync(resolveAuth(params)));
+					const entity = extractItem(await updateMutation.mutateAsync(resolveActionAuth(params)));
 					options?.onSuccess?.(entity);
 					options?.onSettled?.(entity, null);
 					return entity;
@@ -285,11 +323,11 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 				} finally {
 					silentRef.current = false;
 				}
-			}, [updateMutation, resolveAuth]),
+			}, [updateMutation, resolveActionAuth]),
 			remove: useCallback(async (params, options) => {
 				silentRef.current = options?.silent ?? false;
 				try {
-					const result = await deleteMutation.mutateAsync(resolveAuth(params));
+					const result = await deleteMutation.mutateAsync(resolveActionAuth(params));
 					options?.onSuccess?.(result);
 					options?.onSettled?.(result, null);
 					return result;
@@ -300,23 +338,39 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 				} finally {
 					silentRef.current = false;
 				}
-			}, [deleteMutation, resolveAuth]),
+			}, [deleteMutation, resolveActionAuth]),
+			restore: useCallback(async (params, options) => {
+				silentRef.current = options?.silent ?? false;
+				try {
+					const entity = extractItem(await restoreMutation.mutateAsync(resolveActionAuth(params)));
+					options?.onSuccess?.(entity);
+					options?.onSettled?.(entity, null);
+					return entity;
+				} catch (error) {
+					options?.onError?.(error);
+					options?.onSettled?.(void 0, error);
+					throw error;
+				} finally {
+					silentRef.current = false;
+				}
+			}, [restoreMutation, resolveActionAuth]),
 			isCreating: createMutation.isPending,
 			isUpdating: updateMutation.isPending,
 			isDeleting: deleteMutation.isPending,
-			isMutating: createMutation.isPending || updateMutation.isPending || deleteMutation.isPending
+			isRestoring: restoreMutation.isPending,
+			isMutating: createMutation.isPending || updateMutation.isPending || deleteMutation.isPending || restoreMutation.isPending
 		};
 	}
 	function useInfiniteList(tokenOrParams, paramsOrOptions, maybeOptions) {
 		let token;
 		let params;
 		let options;
-		if (tokenOrParams === null || typeof tokenOrParams === "string") {
+		if (typeof tokenOrParams === "string" || tokenOrParams === null && maybeOptions !== void 0) {
 			token = tokenOrParams;
 			params = paramsOrOptions ?? {};
 			options = maybeOptions ?? {};
 		} else {
-			const auth = getAuthContext();
+			const auth = resolveAuth();
 			token = auth.token;
 			params = tokenOrParams ?? {};
 			options = paramsOrOptions ?? {};
@@ -348,7 +402,7 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 					}
 				});
 			},
-			enabled: createEnabledRule(token, queryOpts, resolveAuthMode()),
+			enabled: createEnabledRule(token, queryOpts, resolveAuthMode(), hasStaticAuth),
 			initialPageParam: restParams.after ? restParams.after : 1,
 			getNextPageParam: (lastPage) => {
 				const page = lastPage;
@@ -357,6 +411,13 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 				const p = page;
 				if (typeof p.hasNext === "boolean" && typeof p.page === "number") return p.hasNext ? p.page + 1 : void 0;
 			},
+			getPreviousPageParam: queryOpts.maxPages != null ? (firstPage) => {
+				const page = firstPage;
+				if (isOffsetPagination(page)) return page.hasPrev ? page.page - 1 : void 0;
+				const p = page;
+				if (typeof p.hasPrev === "boolean" && typeof p.page === "number") return p.hasPrev ? p.page - 1 : void 0;
+			} : void 0,
+			maxPages: queryOpts.maxPages,
 			options: {
 				staleTime: queryOpts.staleTime ?? config.staleTime,
 				gcTime: queryOpts.gcTime ?? config.gcTime,
@@ -371,7 +432,7 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 		return useMutationWithTransition({
 			mutationFn: ({ data, id, path }) => {
 				if (!api.upload) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define an upload method`));
-				const auth = getAuthContext();
+				const auth = resolveAuth();
 				return api.upload({
 					token: auth.token,
 					organizationId: auth.organizationId,
@@ -392,9 +453,7 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 		});
 	}
 	function useSearch(query, params, options) {
-		if (!api.search) throw new Error(`[arc-next] "${entityKey}" api does not define a search method`);
-		const searchApi = api.search;
-		const auth = getAuthContext();
+		const auth = resolveAuth();
 		const token = params?.token ?? auth.token;
 		const organizationId = params?.organizationId ?? auth.organizationId;
 		const { organizationId: _, token: _t, ...restParams } = params ?? {};
@@ -413,16 +472,19 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 				"search",
 				searchKeyParams
 			],
-			queryFn: ({ signal }) => searchApi({
-				token,
-				organizationId,
-				params: searchParams,
-				options: {
-					signal,
-					...requestOpts
-				}
-			}),
-			enabled: query.length > 0 && createEnabledRule(token, queryOpts, resolveAuthMode()),
+			queryFn: ({ signal }) => {
+				if (!api.search) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define a search method`));
+				return api.search({
+					token,
+					organizationId,
+					params: searchParams,
+					options: {
+						signal,
+						...requestOpts
+					}
+				});
+			},
+			enabled: !!api.search && query.length > 0 && createEnabledRule(token, queryOpts, resolveAuthMode(), hasStaticAuth),
 			options: {
 				staleTime: queryOpts.staleTime ?? config.staleTime,
 				gcTime: queryOpts.gcTime ?? config.gcTime
@@ -441,6 +503,248 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 			toastHandler: instanceToast
 		});
 	}
+	function useDeleted(params, options) {
+		const auth = resolveAuth();
+		const token = auth.token;
+		const mergedParams = params ?? {};
+		const organizationId = mergedParams.organizationId ?? auth.organizationId;
+		const { organizationId: _, ...restParams } = mergedParams;
+		const { request: requestOpts, ...queryOpts } = options ?? {};
+		return useListQuery({
+			queryKey: KEYS.custom("deleted", {
+				organizationId,
+				...restParams
+			}),
+			queryFn: ({ signal }) => {
+				if (!api.getDeleted) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define a getDeleted method`));
+				return api.getDeleted({
+					token,
+					organizationId,
+					params: restParams,
+					options: {
+						signal,
+						...requestOpts
+					}
+				});
+			},
+			enabled: !!api.getDeleted && createEnabledRule(token, queryOpts, resolveAuthMode(), hasStaticAuth),
+			options: {
+				staleTime: queryOpts.staleTime ?? config.staleTime,
+				gcTime: queryOpts.gcTime ?? config.gcTime
+			},
+			select: queryOpts.select
+		});
+	}
+	function useDetailBySlug(slug, options) {
+		const auth = resolveAuth();
+		const token = auth.token;
+		const resolvedOptions = options ?? {};
+		const organizationId = resolvedOptions.organizationId ?? auth.organizationId;
+		const { params: queryParams, request: requestOpts, ...restOptions } = resolvedOptions;
+		return useDetailQuery({
+			queryKey: queryParams ? KEYS.custom("slug", slug, queryParams) : KEYS.custom("slug", slug),
+			queryFn: ({ signal }) => {
+				if (!api.getBySlug) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define a getBySlug method`));
+				return api.getBySlug({
+					slug,
+					token,
+					organizationId,
+					params: queryParams,
+					options: {
+						signal,
+						...requestOpts
+					}
+				});
+			},
+			enabled: !!api.getBySlug && !!slug && createEnabledRule(token, restOptions, resolveAuthMode(), hasStaticAuth),
+			options: {
+				staleTime: restOptions.staleTime ?? config.staleTime,
+				gcTime: restOptions.gcTime ?? config.gcTime,
+				refetchOnWindowFocus: restOptions.refetchOnWindowFocus ?? config.refetchOnWindowFocus,
+				structuralSharing: restOptions.structuralSharing ?? config.structuralSharing
+			},
+			select: restOptions.select
+		});
+	}
+	function useTree(params, options) {
+		const auth = resolveAuth();
+		const token = auth.token;
+		const mergedParams = params ?? {};
+		const organizationId = mergedParams.organizationId ?? auth.organizationId;
+		const { organizationId: _, ...restParams } = mergedParams;
+		const { request: requestOpts, ...queryOpts } = options ?? {};
+		return useListQuery({
+			queryKey: KEYS.custom("tree", {
+				organizationId,
+				...restParams
+			}),
+			queryFn: ({ signal }) => {
+				if (!api.getTree) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define a getTree method`));
+				return api.getTree({
+					token,
+					organizationId,
+					params: restParams,
+					options: {
+						signal,
+						...requestOpts
+					}
+				});
+			},
+			enabled: !!api.getTree && createEnabledRule(token, queryOpts, resolveAuthMode(), hasStaticAuth),
+			options: {
+				staleTime: queryOpts.staleTime ?? config.staleTime,
+				gcTime: queryOpts.gcTime ?? config.gcTime
+			},
+			select: queryOpts.select
+		});
+	}
+	function useChildren(parentId, params, options) {
+		const auth = resolveAuth();
+		const token = auth.token;
+		const mergedParams = params ?? {};
+		const organizationId = mergedParams.organizationId ?? auth.organizationId;
+		const { organizationId: _, ...restParams } = mergedParams;
+		const { request: requestOpts, ...queryOpts } = options ?? {};
+		return useListQuery({
+			queryKey: KEYS.custom("children", parentId, {
+				organizationId,
+				...restParams
+			}),
+			queryFn: ({ signal }) => {
+				if (!api.getChildren) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define a getChildren method`));
+				return api.getChildren({
+					token,
+					organizationId,
+					parentId,
+					params: restParams,
+					options: {
+						signal,
+						...requestOpts
+					}
+				});
+			},
+			enabled: !!api.getChildren && !!parentId && createEnabledRule(token, queryOpts, resolveAuthMode(), hasStaticAuth),
+			options: {
+				staleTime: queryOpts.staleTime ?? config.staleTime,
+				gcTime: queryOpts.gcTime ?? config.gcTime
+			},
+			prefillDetailCache: queryOpts.prefillDetailCache ?? true,
+			detailKeyBuilder: (id) => KEYS.scopedDetail(id, organizationId ?? null),
+			itemIdResolver: resolveItemId,
+			select: queryOpts.select
+		});
+	}
+	function useFindBy(field, value, options) {
+		const auth = resolveAuth();
+		const token = auth.token;
+		const organizationId = auth.organizationId;
+		const { operator, request: requestOpts, ...queryOpts } = options ?? {};
+		return useListQuery({
+			queryKey: KEYS.custom("findBy", {
+				field,
+				value,
+				operator,
+				organizationId
+			}),
+			queryFn: ({ signal }) => {
+				if (!api.findBy) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define a findBy method`));
+				return api.findBy({
+					token,
+					organizationId,
+					field,
+					value,
+					operator,
+					options: {
+						signal,
+						...requestOpts
+					}
+				});
+			},
+			enabled: !!api.findBy && value !== void 0 && value !== null && createEnabledRule(token, queryOpts, resolveAuthMode(), hasStaticAuth),
+			options: {
+				staleTime: queryOpts.staleTime ?? config.staleTime,
+				gcTime: queryOpts.gcTime ?? config.gcTime
+			},
+			prefillDetailCache: queryOpts.prefillDetailCache ?? true,
+			detailKeyBuilder: (id) => KEYS.scopedDetail(id, organizationId ?? null),
+			itemIdResolver: resolveItemId,
+			select: queryOpts.select
+		});
+	}
+	function useBulkActions() {
+		const bulkCreateMutation = useMutationWithTransition({
+			mutationFn: (vars) => {
+				if (!api.bulkCreate) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define a bulkCreate method`));
+				const auth = resolveAuth();
+				return api.bulkCreate({
+					token: vars.token ?? auth.token,
+					organizationId: vars.organizationId ?? auth.organizationId,
+					data: vars.data
+				});
+			},
+			invalidateQueries: [KEYS.lists()],
+			messages: {
+				success: `${pluralName} created successfully`,
+				error: `Failed to create ${pluralName.toLowerCase()}`
+			},
+			toastHandler: instanceToast
+		});
+		const bulkUpdateMutation = useMutationWithTransition({
+			mutationFn: (vars) => {
+				if (!api.bulkUpdate) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define a bulkUpdate method`));
+				const auth = resolveAuth();
+				return api.bulkUpdate({
+					token: vars.token ?? auth.token,
+					organizationId: vars.organizationId ?? auth.organizationId,
+					filter: vars.filter,
+					data: vars.data
+				});
+			},
+			invalidateQueries: [KEYS.lists(), KEYS.details()],
+			messages: {
+				success: `${pluralName} updated successfully`,
+				error: `Failed to update ${pluralName.toLowerCase()}`
+			},
+			toastHandler: instanceToast
+		});
+		const bulkDeleteMutation = useMutationWithTransition({
+			mutationFn: (vars) => {
+				if (!api.bulkDelete) return Promise.reject(/* @__PURE__ */ new Error(`[arc-next] "${entityKey}" api does not define a bulkDelete method`));
+				const auth = resolveAuth();
+				return api.bulkDelete({
+					token: vars.token ?? auth.token,
+					organizationId: vars.organizationId ?? auth.organizationId,
+					filter: vars.filter
+				});
+			},
+			invalidateQueries: [KEYS.lists()],
+			messages: {
+				success: `${pluralName} deleted successfully`,
+				error: `Failed to delete ${pluralName.toLowerCase()}`
+			},
+			toastHandler: instanceToast
+		});
+		return {
+			bulkCreate: async (params, options) => {
+				const items = (await bulkCreateMutation.mutateAsync(params))?.data ?? [];
+				options?.onSuccess?.(items);
+				return items;
+			},
+			bulkUpdate: async (params, options) => {
+				const result = await bulkUpdateMutation.mutateAsync(params);
+				options?.onSuccess?.(result);
+				return result;
+			},
+			bulkRemove: async (params, options) => {
+				const result = await bulkDeleteMutation.mutateAsync(params);
+				options?.onSuccess?.(result);
+				return result;
+			},
+			isBulkCreating: bulkCreateMutation.isPending,
+			isBulkUpdating: bulkUpdateMutation.isPending,
+			isBulkDeleting: bulkDeleteMutation.isPending
+		};
+	}
 	const resolvedRouterHook = instanceNavigation ?? useRouterHook ?? (() => ({
 		push: () => {},
 		replace: () => {}
@@ -449,8 +753,12 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 		const queryClient = useQueryClient();
 		const router = resolvedRouterHook();
 		return useCallback((href, item, options = {}) => {
-			const id = getItemId(item);
-			if (id) queryClient.setQueryData(KEYS.detail(id), { data: item });
+			const id = resolveItemId(item);
+			if (id) {
+				const orgId = resolveAuth().organizationId;
+				queryClient.setQueryData(KEYS.scopedDetail(id, orgId), { data: item });
+				if (orgId) queryClient.setQueryData(KEYS.detail(id), { data: item });
+			}
 			if (!router) return;
 			const { scroll = true, replace = false } = options;
 			if (replace) router.replace(href, { scroll });
@@ -464,6 +772,12 @@ function createCrudHooks({ api, entityKey, singular, defaults = {}, callbacks =
 		useDetail,
 		useInfiniteList,
 		useActions,
+		useBulkActions,
+		useDeleted,
+		useDetailBySlug,
+		useTree,
+		useChildren,
+		useFindBy,
 		useUpload,
 		useSearch,
 		useCustomMutation,

package/dist/mutation.d.ts

@@ -1,5 +1,5 @@
 import { ToastHandler } from "./client.js";
-import * as _tanstack_react_query0 from "@tanstack/react-query";
+import * as _$_tanstack_react_query0 from "@tanstack/react-query";
 import { QueryClient, QueryKey, UseMutateAsyncFunction, UseMutateFunction } from "@tanstack/react-query";
 
 //#region src/mutation.d.ts
@@ -47,8 +47,8 @@ interface TransitionMutationConfig<TData, TVariables> {
   toastHandler?: ToastHandler;
 }
 declare function useMutationWithTransition<TData, TVariables>(config: TransitionMutationConfig<TData, TVariables>): {
-  mutate: UseMutateFunction<TData, Error, TVariables, unknown>;
-  mutateAsync: UseMutateAsyncFunction<TData, Error, TVariables, unknown>;
+  mutate: UseMutateFunction<TData, Error, TVariables, void>;
+  mutateAsync: UseMutateAsyncFunction<TData, Error, TVariables, void>;
   isPending: boolean;
   isSuccess: boolean;
   isError: boolean;
@@ -100,28 +100,11 @@ interface CreateOptimisticMutationConfig<TData, TVariables> {
   shouldToast?: () => boolean;
   toastHandler?: ToastHandler;
 }
-declare function useOptimisticMutation<TData, TVariables>(config: CreateOptimisticMutationConfig<TData, TVariables>): _tanstack_react_query0.UseMutationResult<TData, Error, TVariables, {
+declare function useOptimisticMutation<TData, TVariables>(config: CreateOptimisticMutationConfig<TData, TVariables>): _$_tanstack_react_query0.UseMutationResult<TData, Error, TVariables, {
   previous: {
     key: readonly unknown[];
     data: [readonly unknown[], unknown][];
   }[];
 }>;
-declare const QUERY_CONFIGS: {
-  readonly realtime: {
-    readonly staleTime: 20000;
-    readonly refetchInterval: 30000;
-  };
-  readonly frequent: {
-    readonly staleTime: 60000;
-  };
-  readonly stable: {
-    readonly staleTime: 300000;
-  };
-  readonly static: {
-    readonly staleTime: 600000;
-  };
-};
-/** @deprecated Use `useOptimisticMutation` */
-declare const createOptimisticMutation: typeof useOptimisticMutation;
 //#endregion
-export { CreateOptimisticMutationConfig, MutationCallbacks, MutationMessages, OptimisticMutationConfig, QUERY_CONFIGS, TransitionMutationConfig, TransitionMutationReturn, configureToast, createOptimisticMutation, useMutationWithOptimistic, useMutationWithTransition, useOptimisticMutation };
+export { CreateOptimisticMutationConfig, MutationCallbacks, MutationMessages, OptimisticMutationConfig, TransitionMutationConfig, TransitionMutationReturn, configureToast, useMutationWithOptimistic, useMutationWithTransition, useOptimisticMutation };