@comapeo/core-react 9.0.2 → 10.0.0

package/dist/commonjs/hooks/documents.js

@@ -10,7 +10,7 @@ exports.usePresetsSelection = usePresetsSelection;
 const react_query_1 = require("@tanstack/react-query");
 const react_1 = require("react");
 const presets_js_1 = require("../lib/presets.js");
-const documents_js_1 = require("../lib/react-query/documents.js");
+const react_query_js_1 = require("../lib/react-query.js");
 const projects_js_1 = require("./projects.js");
 /**
  * Retrieve a single document from the database based on the document's document ID.
@@ -37,15 +37,25 @@ const projects_js_1 = require("./projects.js");
  */
 function useSingleDocByDocId({ projectId, docType, docId, lang, }) {
     const { data: projectApi } = (0, projects_js_1.useSingleProject)({ projectId });
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, documents_js_1.documentByDocumentIdQueryOptions)({
-        projectApi,
-        projectId,
-        docType,
-        docId,
-        lang,
-    }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getDocumentByDocIdQueryKey)({
+            projectId,
+            docType,
+            docId,
+            lang,
+        }),
+        queryFn: async () => {
+            return projectApi[docType].getByDocId(docId, {
+                lang,
+                // We want to make sure that this throws in the case that no match is found
+                mustBeFound: true,
+            });
+        },
+    });
     return {
-        data: data,
+        // @ts-expect-error Not smart enough
+        data,
         error,
         isRefetching,
     };
@@ -75,15 +85,21 @@ function useSingleDocByDocId({ projectId, docType, docId, lang, }) {
  */
 function useSingleDocByVersionId({ projectId, docType, versionId, lang, }) {
     const { data: projectApi } = (0, projects_js_1.useSingleProject)({ projectId });
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, documents_js_1.documentByVersionIdQueryOptions)({
-        projectApi,
-        projectId,
-        docType,
-        versionId,
-        lang,
-    }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getDocumentByVersionIdQueryKey)({
+            projectId,
+            docType,
+            versionId,
+            lang,
+        }),
+        queryFn: async () => {
+            return projectApi[docType].getByVersionId(versionId, { lang });
+        },
+    });
     return {
-        data: data,
+        // @ts-expect-error Not smart enough
+        data,
         error,
         isRefetching,
     };
@@ -124,15 +140,24 @@ function useSingleDocByVersionId({ projectId, docType, versionId, lang, }) {
  */
 function useManyDocs({ projectId, docType, includeDeleted, lang, }) {
     const { data: projectApi } = (0, projects_js_1.useSingleProject)({ projectId });
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, documents_js_1.documentsQueryOptions)({
-        projectApi,
-        projectId,
-        docType,
-        includeDeleted,
-        lang,
-    }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getManyDocumentsQueryKey)({
+            projectId,
+            docType,
+            includeDeleted,
+            lang,
+        }),
+        queryFn: async () => {
+            return projectApi[docType].getMany({
+                includeDeleted,
+                lang,
+            });
+        },
+    });
     return {
-        data: data,
+        // @ts-expect-error Not smart enough
+        data,
         error,
         isRefetching,
     };
@@ -146,15 +171,22 @@ function useManyDocs({ projectId, docType, includeDeleted, lang, }) {
 function useCreateDocument({ docType, projectId, }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = (0, projects_js_1.useSingleProject)({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, documents_js_1.createDocumentMutationOptions)({
-        docType,
-        projectApi,
-        projectId,
-        queryClient,
+    return (0, react_query_js_1.filterMutationResult)((0, react_query_1.useMutation)({
+        ...(0, react_query_js_1.baseMutationOptions)(),
+        mutationFn: async ({ value, }) => {
+            return (projectApi[docType]
+                // @ts-expect-error TS not handling this well
+                .create({ ...value, schemaName: docType }));
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getDocumentsQueryKey)({
+                    projectId,
+                    docType,
+                }),
+            });
+        },
     }));
-    return status === 'error'
-        ? { error, mutate, mutateAsync, reset, status }
-        : { error: null, mutate, mutateAsync, reset, status };
 }
 /**
  * Update a document within a project.
@@ -162,18 +194,28 @@ function useCreateDocument({ docType, projectId, }) {
  * @param opts.docType Document type to update.
  * @param opts.projectId Public ID of project document belongs to.
  */
-function useUpdateDocument({ docType, projectId, }) {
+function useUpdateDocument({ 
+// TODO: Make this a mutation parameter instead of a hook parameter
+docType, projectId, }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = (0, projects_js_1.useSingleProject)({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, documents_js_1.updateDocumentMutationOptions)({
-        docType,
-        projectApi,
-        projectId,
-        queryClient,
+    // @ts-expect-error Not sure why TS complains here
+    return (0, react_query_js_1.filterMutationResult)((0, react_query_1.useMutation)({
+        ...(0, react_query_js_1.baseMutationOptions)(),
+        mutationFn: async ({ versionId, value, }) => {
+            return (projectApi[docType]
+                // @ts-expect-error TS not handling this well
+                .update(versionId, value));
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getDocumentsQueryKey)({
+                    projectId,
+                    docType,
+                }),
+            });
+        },
     }));
-    return status === 'error'
-        ? { error, mutate, mutateAsync, reset, status }
-        : { error: null, mutate, mutateAsync, reset, status };
 }
 /**
  * Delete a document within a project.
@@ -181,18 +223,26 @@ function useUpdateDocument({ docType, projectId, }) {
  * @param opts.docType Document type to delete.
  * @param opts.projectId Public ID of project document belongs to.
  */
-function useDeleteDocument({ docType, projectId, }) {
+function useDeleteDocument({ 
+// TODO: Make this a mutation parameter instead of a hook parameter
+docType, projectId, }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = (0, projects_js_1.useSingleProject)({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, documents_js_1.deleteDocumentMutationOptions)({
-        docType,
-        projectApi,
-        projectId,
-        queryClient,
+    // @ts-expect-error Not sure why TS complains here
+    return (0, react_query_js_1.filterMutationResult)((0, react_query_1.useMutation)({
+        ...(0, react_query_js_1.baseMutationOptions)(),
+        mutationFn: async ({ docId }) => {
+            return projectApi[docType].delete(docId);
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getDocumentsQueryKey)({
+                    projectId,
+                    docType,
+                }),
+            });
+        },
     }));
-    return status === 'error'
-        ? { error, mutate, mutateAsync, reset, status }
-        : { error: null, mutate, mutateAsync, reset, status };
 }
 const dataTypeToGeometry = {
     observation: 'point',

package/dist/commonjs/hooks/invites.d.ts

@@ -1,3 +1,5 @@
+import type { InviteApi, MemberApi } from '@comapeo/core';
+import { type UseSuspenseQueryResult } from '@tanstack/react-query';
 /**
  * Get all invites that the device has received.
  *
@@ -8,11 +10,7 @@
  * }
  * ```
  */
-export declare function useManyInvites(): {
-    data: import("@comapeo/core/dist/invite/invite-api.js", { with: { "resolution-mode": "import" } }).Invite[];
-    error: Error | null;
-    isRefetching: boolean;
-};
+export declare function useManyInvites(): Pick<UseSuspenseQueryResult<Array<InviteApi.Invite>>, 'data' | 'error' | 'isRefetching'>;
 /**
  * Get a single invite based on its ID.
  *
@@ -25,61 +23,97 @@ export declare function useManyInvites(): {
  * }
  * ```
  */
-export declare function useSingleInvite({ inviteId }: {
+export declare function useSingleInvite({ inviteId, }: {
     inviteId: string;
-}): {
-    data: import("@comapeo/core/dist/invite/invite-api.js", { with: { "resolution-mode": "import" } }).Invite;
-    error: Error | null;
-    isRefetching: boolean;
-};
+}): Pick<UseSuspenseQueryResult<InviteApi.Invite>, 'data' | 'error' | 'isRefetching'>;
 /**
  * Accept an invite that has been received.
  */
-export declare function useAcceptInvite(): {
-    error: Error;
+export declare function useAcceptInvite(): Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverIdleResult<string, Error, {
+    inviteId: string;
+}, unknown>, {
+    mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
+        inviteId: string;
+    }, unknown>;
+}> & {
+    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
+        inviteId: string;
+    }, unknown>;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverLoadingResult<string, Error, {
+    inviteId: string;
+}, unknown>, {
+    mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
+        inviteId: string;
+    }, unknown>;
+}> & {
+    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
+        inviteId: string;
+    }, unknown>;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverErrorResult<string, Error, {
+    inviteId: string;
+}, unknown>, {
     mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
         inviteId: string;
     }, unknown>;
+}> & {
     mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
         inviteId: string;
     }, unknown>;
-    reset: () => void;
-    status: "error";
-} | {
-    error: null;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverSuccessResult<string, Error, {
+    inviteId: string;
+}, unknown>, {
     mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
         inviteId: string;
     }, unknown>;
+}> & {
     mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
         inviteId: string;
     }, unknown>;
-    reset: () => void;
-    status: "pending" | "success" | "idle";
-};
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync">;
 /**
  * Reject an invite that has been received.
  */
-export declare function useRejectInvite(): {
-    error: Error;
-    mutate: import("@tanstack/react-query").UseMutateFunction<void, Error, {
+export declare function useRejectInvite(): Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverIdleResult<string, Error, {
+    inviteId: string;
+}, unknown>, {
+    mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
         inviteId: string;
     }, unknown>;
-    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<void, Error, {
+}> & {
+    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
         inviteId: string;
     }, unknown>;
-    reset: () => void;
-    status: "error";
-} | {
-    error: null;
-    mutate: import("@tanstack/react-query").UseMutateFunction<void, Error, {
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverLoadingResult<string, Error, {
+    inviteId: string;
+}, unknown>, {
+    mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
         inviteId: string;
     }, unknown>;
-    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<void, Error, {
+}> & {
+    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
+        inviteId: string;
+    }, unknown>;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverErrorResult<string, Error, {
+    inviteId: string;
+}, unknown>, {
+    mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
+        inviteId: string;
+    }, unknown>;
+}> & {
+    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
+        inviteId: string;
+    }, unknown>;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverSuccessResult<string, Error, {
+    inviteId: string;
+}, unknown>, {
+    mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
         inviteId: string;
     }, unknown>;
-    reset: () => void;
-    status: "pending" | "success" | "idle";
-};
+}> & {
+    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
+        inviteId: string;
+    }, unknown>;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync">;
 /**
  * Send an invite for a project.
  *
@@ -87,39 +121,83 @@ export declare function useRejectInvite(): {
  */
 export declare function useSendInvite({ projectId }: {
     projectId: string;
-}): {
-    error: Error;
+}): Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverIdleResult<"ACCEPT" | "REJECT" | "ALREADY", Error, {
+    deviceId: string;
+    roleDescription?: string;
+    roleId: MemberApi.RoleIdForNewInvite;
+    roleName?: string;
+}, unknown>, {
+    mutate: import("@tanstack/react-query").UseMutateFunction<"ACCEPT" | "REJECT" | "ALREADY", Error, {
+        deviceId: string;
+        roleDescription?: string;
+        roleId: MemberApi.RoleIdForNewInvite;
+        roleName?: string;
+    }, unknown>;
+}> & {
+    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<"ACCEPT" | "REJECT" | "ALREADY", Error, {
+        deviceId: string;
+        roleDescription?: string;
+        roleId: MemberApi.RoleIdForNewInvite;
+        roleName?: string;
+    }, unknown>;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverLoadingResult<"ACCEPT" | "REJECT" | "ALREADY", Error, {
+    deviceId: string;
+    roleDescription?: string;
+    roleId: MemberApi.RoleIdForNewInvite;
+    roleName?: string;
+}, unknown>, {
+    mutate: import("@tanstack/react-query").UseMutateFunction<"ACCEPT" | "REJECT" | "ALREADY", Error, {
+        deviceId: string;
+        roleDescription?: string;
+        roleId: MemberApi.RoleIdForNewInvite;
+        roleName?: string;
+    }, unknown>;
+}> & {
+    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<"ACCEPT" | "REJECT" | "ALREADY", Error, {
+        deviceId: string;
+        roleDescription?: string;
+        roleId: MemberApi.RoleIdForNewInvite;
+        roleName?: string;
+    }, unknown>;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverErrorResult<"ACCEPT" | "REJECT" | "ALREADY", Error, {
+    deviceId: string;
+    roleDescription?: string;
+    roleId: MemberApi.RoleIdForNewInvite;
+    roleName?: string;
+}, unknown>, {
     mutate: import("@tanstack/react-query").UseMutateFunction<"ACCEPT" | "REJECT" | "ALREADY", Error, {
         deviceId: string;
         roleDescription?: string;
-        roleId: import("@comapeo/core", { with: { "resolution-mode": "import" } }).MemberApi.RoleIdForNewInvite;
+        roleId: MemberApi.RoleIdForNewInvite;
         roleName?: string;
     }, unknown>;
+}> & {
     mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<"ACCEPT" | "REJECT" | "ALREADY", Error, {
         deviceId: string;
         roleDescription?: string;
-        roleId: import("@comapeo/core", { with: { "resolution-mode": "import" } }).MemberApi.RoleIdForNewInvite;
+        roleId: MemberApi.RoleIdForNewInvite;
         roleName?: string;
     }, unknown>;
-    reset: () => void;
-    status: "error";
-} | {
-    error: null;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverSuccessResult<"ACCEPT" | "REJECT" | "ALREADY", Error, {
+    deviceId: string;
+    roleDescription?: string;
+    roleId: MemberApi.RoleIdForNewInvite;
+    roleName?: string;
+}, unknown>, {
     mutate: import("@tanstack/react-query").UseMutateFunction<"ACCEPT" | "REJECT" | "ALREADY", Error, {
         deviceId: string;
         roleDescription?: string;
-        roleId: import("@comapeo/core", { with: { "resolution-mode": "import" } }).MemberApi.RoleIdForNewInvite;
+        roleId: MemberApi.RoleIdForNewInvite;
         roleName?: string;
     }, unknown>;
+}> & {
     mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<"ACCEPT" | "REJECT" | "ALREADY", Error, {
         deviceId: string;
         roleDescription?: string;
-        roleId: import("@comapeo/core", { with: { "resolution-mode": "import" } }).MemberApi.RoleIdForNewInvite;
+        roleId: MemberApi.RoleIdForNewInvite;
         roleName?: string;
     }, unknown>;
-    reset: () => void;
-    status: "pending" | "success" | "idle";
-};
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync">;
 /**
  * Request a cancellation of an invite sent to another device.
  *
@@ -127,24 +205,44 @@ export declare function useSendInvite({ projectId }: {
  */
 export declare function useRequestCancelInvite({ projectId }: {
     projectId: string;
-}): {
-    error: Error;
+}): Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverIdleResult<void, Error, {
+    deviceId: string;
+}, unknown>, {
+    mutate: import("@tanstack/react-query").UseMutateFunction<void, Error, {
+        deviceId: string;
+    }, unknown>;
+}> & {
+    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<void, Error, {
+        deviceId: string;
+    }, unknown>;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverLoadingResult<void, Error, {
+    deviceId: string;
+}, unknown>, {
+    mutate: import("@tanstack/react-query").UseMutateFunction<void, Error, {
+        deviceId: string;
+    }, unknown>;
+}> & {
+    mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<void, Error, {
+        deviceId: string;
+    }, unknown>;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverErrorResult<void, Error, {
+    deviceId: string;
+}, unknown>, {
     mutate: import("@tanstack/react-query").UseMutateFunction<void, Error, {
         deviceId: string;
     }, unknown>;
+}> & {
     mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<void, Error, {
         deviceId: string;
     }, unknown>;
-    reset: () => void;
-    status: "error";
-} | {
-    error: null;
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync"> | Pick<import("@tanstack/react-query").Override<import("@tanstack/react-query").MutationObserverSuccessResult<void, Error, {
+    deviceId: string;
+}, unknown>, {
     mutate: import("@tanstack/react-query").UseMutateFunction<void, Error, {
         deviceId: string;
     }, unknown>;
+}> & {
     mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<void, Error, {
         deviceId: string;
     }, unknown>;
-    reset: () => void;
-    status: "pending" | "success" | "idle";
-};
+}, "error" | "status" | "mutate" | "reset" | "mutateAsync">;

package/dist/commonjs/hooks/invites.js

@@ -7,7 +7,7 @@ exports.useRejectInvite = useRejectInvite;
 exports.useSendInvite = useSendInvite;
 exports.useRequestCancelInvite = useRequestCancelInvite;
 const react_query_1 = require("@tanstack/react-query");
-const invites_js_1 = require("../lib/react-query/invites.js");
+const react_query_js_1 = require("../lib/react-query.js");
 const client_js_1 = require("./client.js");
 const projects_js_1 = require("./projects.js");
 /**
@@ -22,7 +22,13 @@ const projects_js_1 = require("./projects.js");
  */
 function useManyInvites() {
     const clientApi = (0, client_js_1.useClientApi)();
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, invites_js_1.getInvitesQueryOptions)({ clientApi }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getInvitesQueryKey)(),
+        queryFn: async () => {
+            return clientApi.invite.getMany();
+        },
+    });
     return { data, error, isRefetching };
 }
 /**
@@ -37,9 +43,15 @@ function useManyInvites() {
  * }
  * ```
  */
-function useSingleInvite({ inviteId }) {
+function useSingleInvite({ inviteId, }) {
     const clientApi = (0, client_js_1.useClientApi)();
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, invites_js_1.getInviteByIdQueryOptions)({ clientApi, inviteId }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getInvitesByIdQueryKey)({ inviteId }),
+        queryFn: async () => {
+            return clientApi.invite.getById(inviteId);
+        },
+    });
     return { data, error, isRefetching };
 }
 /**
@@ -48,10 +60,20 @@ function useSingleInvite({ inviteId }) {
 function useAcceptInvite() {
     const queryClient = (0, react_query_1.useQueryClient)();
     const clientApi = (0, client_js_1.useClientApi)();
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, invites_js_1.acceptInviteMutationOptions)({ clientApi, queryClient }));
-    return status === 'error'
-        ? { error, mutate, mutateAsync, reset, status }
-        : { error: null, mutate, mutateAsync, reset, status };
+    return (0, react_query_js_1.filterMutationResult)((0, react_query_1.useMutation)({
+        ...(0, react_query_js_1.baseMutationOptions)(),
+        mutationFn: async ({ inviteId }) => {
+            return clientApi.invite.accept({ inviteId });
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getInvitesQueryKey)(),
+            });
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getProjectsQueryKey)(),
+            });
+        },
+    }));
 }
 /**
  * Reject an invite that has been received.
@@ -59,10 +81,20 @@ function useAcceptInvite() {
 function useRejectInvite() {
     const queryClient = (0, react_query_1.useQueryClient)();
     const clientApi = (0, client_js_1.useClientApi)();
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, invites_js_1.rejectInviteMutationOptions)({ clientApi, queryClient }));
-    return status === 'error'
-        ? { error, mutate, mutateAsync, reset, status }
-        : { error: null, mutate, mutateAsync, reset, status };
+    return (0, react_query_js_1.filterMutationResult)((0, react_query_1.useMutation)({
+        ...(0, react_query_js_1.baseMutationOptions)(),
+        mutationFn: async ({ inviteId }) => {
+            return clientApi.invite.accept({ inviteId });
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getInvitesQueryKey)(),
+            });
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getProjectsQueryKey)(),
+            });
+        },
+    }));
 }
 /**
  * Send an invite for a project.
@@ -72,10 +104,20 @@ function useRejectInvite() {
 function useSendInvite({ projectId }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = (0, projects_js_1.useSingleProject)({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, invites_js_1.sendInviteMutationOptions)({ projectApi, projectId, queryClient }));
-    return status === 'error'
-        ? { error, mutate, mutateAsync, reset, status }
-        : { error: null, mutate, mutateAsync, reset, status };
+    return (0, react_query_js_1.filterMutationResult)((0, react_query_1.useMutation)({
+        ...(0, react_query_js_1.baseMutationOptions)(),
+        mutationFn: async ({ deviceId, ...role }) => {
+            return projectApi.$member.invite(deviceId, role);
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getInvitesQueryKey)(),
+            });
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getMembersQueryKey)({ projectId }),
+            });
+        },
+    }));
 }
 /**
  * Request a cancellation of an invite sent to another device.
@@ -85,8 +127,15 @@ function useSendInvite({ projectId }) {
 function useRequestCancelInvite({ projectId }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = (0, projects_js_1.useSingleProject)({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, invites_js_1.requestCancelInviteMutationOptions)({ projectApi, queryClient }));
-    return status === 'error'
-        ? { error, mutate, mutateAsync, reset, status }
-        : { error: null, mutate, mutateAsync, reset, status };
+    return (0, react_query_js_1.filterMutationResult)((0, react_query_1.useMutation)({
+        ...(0, react_query_js_1.baseMutationOptions)(),
+        mutationFn: async ({ deviceId }) => {
+            return projectApi.$member.requestCancelInvite(deviceId);
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getInvitesQueryKey)(),
+            });
+        },
+    }));
 }