@comapeo/core-react 9.0.2 → 10.0.1

package/dist/commonjs/hooks/projects.js

@@ -31,7 +31,7 @@ exports.useExportGeoJSON = useExportGeoJSON;
 exports.useExportZipFile = useExportZipFile;
 const react_query_1 = require("@tanstack/react-query");
 const react_1 = require("react");
-const projects_js_1 = require("../lib/react-query/projects.js");
+const react_query_js_1 = require("../lib/react-query.js");
 const sync_js_1 = require("../lib/sync.js");
 const urls_js_1 = require("../lib/urls.js");
 const client_js_1 = require("./client.js");
@@ -49,16 +49,15 @@ const client_js_1 = require("./client.js");
  * }
  * ```
  */
-function useProjectSettings({ projectId }) {
-    const clientApi = (0, client_js_1.useClientApi)();
-    const { data: projectApi } = (0, react_query_1.useSuspenseQuery)((0, projects_js_1.projectByIdQueryOptions)({
-        projectId,
-        clientApi,
-    }));
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, projects_js_1.projectSettingsQueryOptions)({
-        projectApi,
-        projectId,
-    }));
+function useProjectSettings({ projectId, }) {
+    const { data: projectApi } = useSingleProject({ projectId });
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getProjectSettingsQueryKey)({ projectId }),
+        queryFn: async () => {
+            return projectApi.$getProjectSettings();
+        },
+    });
     return { data, error, isRefetching };
 }
 /**
@@ -75,13 +74,14 @@ function useProjectSettings({ projectId }) {
  * }
  * ```
  */
-function useSingleProject({ projectId }) {
+function useSingleProject({ projectId, }) {
     const clientApi = (0, client_js_1.useClientApi)();
     const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
-        ...(0, projects_js_1.projectByIdQueryOptions)({
-            clientApi,
-            projectId,
-        }),
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getProjectByIdQueryKey)({ projectId }),
+        queryFn: async () => {
+            return clientApi.getProject(projectId);
+        },
         // Keep project instances around indefinitely - shouldn't be a memory
         // problem because these are only lightweight proxy objects, and project
         // references are kept indefinitely on the backend anyway once they are
@@ -105,9 +105,13 @@ function useSingleProject({ projectId }) {
  */
 function useManyProjects() {
     const clientApi = (0, client_js_1.useClientApi)();
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, projects_js_1.projectsQueryOptions)({
-        clientApi,
-    }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getProjectsQueryKey)(),
+        queryFn: async () => {
+            return clientApi.listProjects();
+        },
+    });
     return { data, error, isRefetching };
 }
 /**
@@ -127,11 +131,13 @@ function useManyProjects() {
  */
 function useSingleMember({ projectId, deviceId, }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, projects_js_1.projectMemberByIdQueryOptions)({
-        projectApi,
-        projectId,
-        deviceId,
-    }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getMemberByIdQueryKey)({ projectId, deviceId }),
+        queryFn: async () => {
+            return projectApi.$member.getById(deviceId);
+        },
+    });
     return { data, error, isRefetching };
 }
 /**
@@ -142,15 +148,22 @@ function useSingleMember({ projectId, deviceId, }) {
  * @example
  * ```tsx
  * function BasicExample() {
- *   const { data } = useManyMembers({ projectId: '...' })
+ *   const activeMembers1 = useManyMembers({ projectId: '...' })
+ *   const activeMembers2 = useManyMembers({ projectId: '...', includeLeft: false })
  *
- *   console.log(data.role)
+ *   const allMembers = useManyMembers({ projectId: '...', includeLeft: true })
  * }
  * ```
  */
-function useManyMembers({ projectId }) {
+function useManyMembers({ projectId, includeLeft, }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, projects_js_1.projectMembersQueryOptions)({ projectApi, projectId }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getMembersQueryKey)({ projectId, includeLeft }),
+        queryFn: async () => {
+            return projectApi.$member.getMany({ includeLeft });
+        },
+    });
     return { data, error, isRefetching };
 }
 /**
@@ -256,14 +269,32 @@ function useAttachmentUrl({ projectId, blobId, }) {
     const blobUrl = (0, urls_js_1.getBlobUrl)({ serverOrigin, projectId, blobId });
     return { data: blobUrl, error, isRefetching };
 }
+// Used as a placeholder so that we can read the server port from the $blobs.getUrl() method
+const FAKE_BLOB_ID = {
+    type: 'photo',
+    variant: 'original',
+    name: 'name',
+    driveId: 'drive-id',
+};
 /**
  * @internal
  * Hack to retrieve the media server origin (protocol + host).
  */
 function useMediaServerOrigin({ projectApi }) {
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, projects_js_1.mediaServerOriginQueryOptions)({
-        projectApi,
-    }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        // HACK: The server doesn't yet expose a method to get its origin, so we use
+        // the existing $blobs.getUrl() to get the origin with a fake BlobId. The origin
+        // is the same regardless of the blobId, so it's not necessary to include it
+        // as a dep for the query key.
+        queryKey: (0, react_query_js_1.getMediaServerOriginQueryKey)(),
+        queryFn: async () => {
+            const url = await projectApi.$blobs.getUrl(FAKE_BLOB_ID);
+            return new URL(url).origin;
+        },
+        staleTime: 'static',
+        gcTime: Infinity,
+    });
     return { data, error, isRefetching };
 }
 // TODO: Eventually remove in favor of this information being provided by the backend when retrieving documents
@@ -287,7 +318,18 @@ function useMediaServerOrigin({ projectApi }) {
  */
 function useDocumentCreatedBy({ projectId, originalVersionId, }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, projects_js_1.documentCreatedByQueryOptions)({ projectApi, projectId, originalVersionId }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getDocumentCreatedByQueryKey)({
+            projectId,
+            originalVersionId,
+        }),
+        queryFn: async () => {
+            return projectApi.$originalVersionIdToDeviceId(originalVersionId);
+        },
+        staleTime: 'static',
+        gcTime: Infinity,
+    });
     return { data, error, isRefetching };
 }
 /**
@@ -305,26 +347,50 @@ function useDocumentCreatedBy({ projectId, originalVersionId, }) {
  * }
  * ```
  */
-function useOwnRoleInProject({ projectId }) {
+function useOwnRoleInProject({ projectId, }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, projects_js_1.projectOwnRoleQueryOptions)({ projectApi, projectId }));
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)({
+        ...(0, react_query_js_1.baseQueryOptions)(),
+        queryKey: (0, react_query_js_1.getProjectRoleQueryKey)({ projectId }),
+        queryFn: async () => {
+            return projectApi.$getOwnRole();
+        },
+    });
     return { data, error, isRefetching };
 }
 function useAddServerPeer({ projectId }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.addServerPeerMutationOptions)({ 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 ({ baseUrl, dangerouslyAllowInsecureConnections, }) => {
+            return projectApi.$member.addServerPeer(baseUrl, {
+                dangerouslyAllowInsecureConnections,
+            });
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getMembersQueryKey)({ projectId }),
+            });
+        },
+    }));
 }
 function useRemoveServerPeer({ projectId }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.removeServerPeerMutationOptions)({ 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 ({ serverDeviceId, dangerouslyAllowInsecureConnections, }) => {
+            return projectApi.$member.removeServerPeer(serverDeviceId, {
+                dangerouslyAllowInsecureConnections,
+            });
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getMembersQueryKey)({ projectId }),
+            });
+        },
+    }));
 }
 /**
  * Create a new project.
@@ -332,10 +398,19 @@ function useRemoveServerPeer({ projectId }) {
 function useCreateProject() {
     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, projects_js_1.createProjectMutationOptions)({ 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 (opts) => {
+            // Have to avoid passing `undefined` explicitly
+            // See https://github.com/digidem/rpc-reflector/issues/21
+            return opts ? clientApi.createProject(opts) : clientApi.createProject();
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getProjectsQueryKey)(),
+            });
+        },
+    }));
 }
 /**
  * Leave an existing project.
@@ -343,10 +418,17 @@ function useCreateProject() {
 function useLeaveProject() {
     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, projects_js_1.leaveProjectMutationOptions)({ 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 ({ projectId }) => {
+            return clientApi.leaveProject(projectId);
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getProjectsQueryKey)(),
+            });
+        },
+    }));
 }
 /**
  * Update the categories of a project using an external file.
@@ -356,14 +438,17 @@ function useLeaveProject() {
 function useImportProjectCategories({ projectId, }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.importProjectCategoriesMutationOptions)({
-        queryClient,
-        projectApi,
-        projectId,
+    return (0, react_query_js_1.filterMutationResult)((0, react_query_1.useMutation)({
+        ...(0, react_query_js_1.baseMutationOptions)(),
+        mutationFn: ({ filePath }) => {
+            return projectApi.$importCategories({ filePath });
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getProjectByIdQueryKey)({ projectId }),
+            });
+        },
     }));
-    return status === 'error'
-        ? { error, mutate, mutateAsync, reset, status }
-        : { error: null, mutate, mutateAsync, reset, status };
 }
 /**
  * Update the configuration of a project using an external file.
@@ -374,23 +459,37 @@ function useImportProjectCategories({ projectId, }) {
 function useImportProjectConfig({ projectId }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.importProjectConfigMutationOptions)({ queryClient, projectApi, projectId }));
-    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: ({ configPath }) => {
+            return projectApi.importConfig({ configPath });
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getProjectByIdQueryKey)({ projectId }),
+            });
+        },
+    }));
 }
 /**
  * Update the settings of a project.
  *
  * @param opts.projectId Public ID of the project to apply changes to.
  */
-function useUpdateProjectSettings({ projectId }) {
+function useUpdateProjectSettings({ projectId, }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.updateProjectSettingsMutationOptions)({ 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 (value) => {
+            return projectApi.$setProjectSettings(value);
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getProjectsQueryKey)(),
+            });
+        },
+    }));
 }
 /**
  * Change a project member's role.
@@ -409,10 +508,20 @@ function useUpdateProjectSettings({ projectId }) {
 function useChangeMemberRole({ projectId }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.changeMemberRoleMutationOptions)({ 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, roleId, }) => {
+            return projectApi.$member.assignRole(deviceId, roleId);
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getMembersQueryKey)({ projectId }),
+            });
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getProjectRoleQueryKey)({ projectId }),
+            });
+        },
+    }));
 }
 /**
  * Remove a member from a project, providing an optional reason for removal.
@@ -436,48 +545,64 @@ function useChangeMemberRole({ projectId }) {
 function useRemoveMember({ projectId }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.removeProjectMemberMutationOptions)({ projectId, 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, reason, }) => {
+            // Have to avoid passing `undefined` explicitly
+            // See https://github.com/digidem/rpc-reflector/issues/21
+            return reason
+                ? projectApi.$member.remove(deviceId, { reason })
+                : projectApi.$member.remove(deviceId);
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: (0, react_query_js_1.getMembersQueryKey)({ projectId }),
+            });
+        },
+    }));
 }
 /**
  * Set up listener for changes to your own role in a project.
  * It is necessary to use this if you want the project role-related read hooks to update
  * based on role change events that are received in the background.
  *
- * @param opts.listener Optional listener to invoke when role changes
+ *
  *
  * @example
  * ```tsx
- * function SomeComponent({ projectId }: { projectId: string }) {
+ * function ListenerComponent({ projectId }: { projectId: string }) {
+ *   // Set up the listener
  *   useProjectOwnRoleChangeListener({ projectId })
  * }
- * ```
  *
- * @example
- * ```tsx
- * function ComponentWithListener({ projectId }: { projectId: string }) {
- *   useProjectOwnRoleChangeListener({
- *     projectId,
- *     listener: (event) => {
- *       // Handle role change, e.g., navigate to default project
- *       console.log('New role:', event.role)
+ * // Handle role change events separately
+ * function EventHandlerComponent() {
+ *   const { data: projectApi } = useSingleProject({ projectId })
+ *
+ *   useEffect(() => {
+ *     function handleRoleChangeEvent(event) {
+ * 	     // Do something with event...
  *     }
- *   })
+ *
+ *     projectApi.addListener('own-role-change', handleRoleChangeEvent)
+ *
+ *     return () => {
+ *       projectApi.removeListener('own-role-change', handleRoleChangeEvent)
+ *     }
+ *   }, [projectApi])
  * }
  * ```
  */
-function useProjectOwnRoleChangeListener({ projectId, listener, }) {
+function useProjectOwnRoleChangeListener({ projectId, }) {
     const queryClient = (0, react_query_1.useQueryClient)();
     const { data: projectApi } = useSingleProject({ projectId });
     (0, react_1.useEffect)(() => {
         function invalidateCache() {
             queryClient.invalidateQueries({
-                queryKey: (0, projects_js_1.getMembersQueryKey)({ projectId }),
+                queryKey: (0, react_query_js_1.getMembersQueryKey)({ projectId }),
             });
             queryClient.invalidateQueries({
-                queryKey: (0, projects_js_1.getProjectRoleQueryKey)({ projectId }),
+                queryKey: (0, react_query_js_1.getProjectRoleQueryKey)({ projectId }),
             });
         }
         projectApi.addListener('own-role-change', invalidateCache);
@@ -485,16 +610,6 @@ function useProjectOwnRoleChangeListener({ projectId, listener, }) {
             projectApi.removeListener('own-role-change', invalidateCache);
         };
     }, [projectApi, queryClient, projectId]);
-    (0, react_1.useEffect)(() => {
-        if (listener) {
-            projectApi.addListener('own-role-change', listener);
-        }
-        return () => {
-            if (listener) {
-                projectApi.removeListener('own-role-change', listener);
-            }
-        };
-    }, [projectApi, listener]);
 }
 /**
  * Create a blob for a project.
@@ -503,10 +618,12 @@ function useProjectOwnRoleChangeListener({ projectId, listener, }) {
  */
 function useCreateBlob({ projectId }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.createBlobMutationOptions)({ projectApi }));
-    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 ({ original, preview, thumbnail, metadata, }) => {
+            return projectApi.$blobs.create({ original, preview, thumbnail }, metadata);
+        },
+    }));
 }
 const PROJECT_SYNC_STORE_MAP = new WeakMap();
 function useSyncStore({ projectId }) {
@@ -556,38 +673,50 @@ function useDataSyncProgress({ projectId, }) {
 }
 function useStartSync({ projectId }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.startSyncMutationOptions)({ projectApi }));
-    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 (opts) => {
+            // Have to avoid passing `undefined` explicitly
+            // See https://github.com/digidem/rpc-reflector/issues/21
+            return opts ? projectApi.$sync.start(opts) : projectApi.$sync.start();
+        },
+    }));
 }
 function useStopSync({ projectId }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.stopSyncMutationOptions)({ projectApi }));
-    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 () => {
+            return projectApi.$sync.stop();
+        },
+    }));
 }
 function useConnectSyncServers({ projectId }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.connectSyncServersMutationOptions)({ projectApi }));
-    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 () => {
+            return projectApi.$sync.connectServers();
+        },
+    }));
 }
 function useDisconnectSyncServers({ projectId }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.disconnectSyncServersMutationOptions)({ projectApi }));
-    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 () => {
+            return projectApi.$sync.disconnectServers();
+        },
+    }));
 }
 function useSetAutostopDataSyncTimeout({ projectId, }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.setAutostopDataSyncTimeoutMutationOptions)({ projectApi }));
-    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 ({ after }) => {
+            return projectApi.$sync.setAutostopDataSyncTimeout(after);
+        },
+    }));
 }
 /**
  * Creates a GeoJson file with all the observations and/or tracks in the project.
@@ -596,10 +725,12 @@ function useSetAutostopDataSyncTimeout({ projectId, }) {
  */
 function useExportGeoJSON({ projectId }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.exportGeoJSONMutationOptions)({ projectApi }));
-    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 (opts) => {
+            return projectApi.exportGeoJSONFile(opts.path, opts.exportOptions);
+        },
+    }));
 }
 /**
  * Creates a zip file containing a GeoJson file with all the observations and/or tracks in the project and all associated attachments (photos and audio).
@@ -608,8 +739,10 @@ function useExportGeoJSON({ projectId }) {
  */
 function useExportZipFile({ projectId }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { error, mutate, mutateAsync, reset, status } = (0, react_query_1.useMutation)((0, projects_js_1.exportZipFileMutationOptions)({ projectApi }));
-    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 (opts) => {
+            return projectApi.exportZipFile(opts.path, opts.exportOptions);
+        },
+    }));
 }

package/dist/commonjs/index.d.ts

@@ -6,6 +6,6 @@ export { useMapStyleUrl, useImportCustomMapFile, useRemoveCustomMapFile, useGetC
 export type { SentMapShareState, ReceivedMapShareState, AbortMapShareOptions, CancelMapShareOptions, DeclineMapShareOptions, DownloadMapShareOptions, CreateAndSendMapShareOptions, } from './lib/map-shares-stores.js';
 export { DeclineReason } from './lib/map-shares-stores.js';
 export { useAddServerPeer, useAttachmentUrl, useConnectSyncServers, useCreateBlob, useCreateProject, useDataSyncProgress, useDisconnectSyncServers, useDocumentCreatedBy, useIconUrl, useImportProjectCategories, useImportProjectConfig, useLeaveProject, useManyMembers, useManyProjects, useOwnRoleInProject, useProjectOwnRoleChangeListener, useProjectSettings, useRemoveServerPeer, useRemoveMember, useSetAutostopDataSyncTimeout, useSingleMember, useSingleProject, useStartSync, useStopSync, useSyncState, useUpdateProjectSettings, useChangeMemberRole, useExportGeoJSON, useExportZipFile, } from './hooks/projects.js';
-export { type SyncState } from './lib/sync.js';
-export { type WriteableDocument, type WriteableDocumentType, type WriteableValue, } from './lib/types.js';
+export type { SyncState } from './lib/sync.js';
+export type { WriteableDocument, WriteableDocumentType, WriteableValue, } from './lib/types.js';
 export { HTTPError, isHTTPError } from './lib/http.js';

package/dist/commonjs/lib/map-shares-stores.d.ts

@@ -1,7 +1,7 @@
 import type { MapShare } from '@comapeo/core';
 import type { MapeoClientApi } from '@comapeo/ipc';
 import { type MapShareState as ServerMapShareState } from '@comapeo/map-server';
-import { type QueryClient } from '@tanstack/react-query';
+import type { QueryClient } from '@tanstack/react-query';
 import type { Simplify } from 'type-fest';
 import type { MapServerApi } from '../contexts/MapServer.js';
 type DistributedIntersection<T, U> = U extends unknown ? Simplify<T & U> : never;

package/dist/commonjs/lib/map-shares-stores.js

@@ -9,7 +9,7 @@ exports.createSentMapSharesStore = createSentMapSharesStore;
 const constants_js_1 = require("@comapeo/map-server/constants.js");
 const errors_js_1 = require("@comapeo/map-server/errors.js");
 const ensure_error_1 = __importDefault(require("ensure-error"));
-const maps_js_1 = require("./react-query/maps.js");
+const react_query_js_1 = require("./react-query.js");
 // ============================================
 // ACTION OPTIONS TYPES
 // These are defined here so that VSCode tooltips work for the mutation
@@ -169,7 +169,7 @@ function createReceivedMapSharesStore({ clientApi, mapServerApi, queryClient, })
                     downloads.delete(shareId);
                     // Invalidate map queries when download completes to trigger reload of map
                     if (stateUpdate.status === 'completed') {
-                        return (0, maps_js_1.invalidateMapQueries)(queryClient, {
+                        return (0, react_query_js_1.invalidateMapQueries)(queryClient, {
                             mapId: mapShare.mapId,
                         });
                     }

package/dist/commonjs/lib/presets.d.ts

@@ -1,4 +1,2 @@
-import type { Preset } from '@comapeo/schema' with {
-    'resolution-mode': 'import'
-};
+import type { Preset } from '@comapeo/core/schema.js';
 export declare function getPresetsSelection(presets: Array<Preset>, orderedPresetIds?: Array<string>): Array<Preset>;