@remit/web-client 0.0.186 → 0.0.187

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.186",
+  "version": "0.0.187",
   "type": "module",
   "description": "Remit web client, published as composable primitives — the app shell, auth shells, and runtime config. A distributor imports what it composes and bundles it.",
   "exports": {

package/src/components/mail/MessageActionMenu.tsx

@@ -2,7 +2,6 @@ import {
 	messageBulkOperationsUpdateFlagsMutation,
 	threadDetailOperationsListThreadMessagesQueryKey,
 } from "@remit/api-http-client/@tanstack/react-query.gen.ts";
-import type { RemitImapThreadMessageResponse } from "@remit/api-http-client/types.gen.ts";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useNavigate } from "@tanstack/react-router";
 import {
@@ -32,29 +31,13 @@ import {
 	patchThreadListQueries,
 	restoreThreadListQueries,
 	snapshotThreadListQueries,
-	type ThreadListSnapshotEntry,
+	type ThreadMessagesData,
+	type ThreadMutationContext,
 	threadListCacheKeys,
 } from "@/lib/thread-list-cache";
 import { useOpenThreadPath, useRetainOpenPanels } from "@/routing";
 import { MoveToTrigger } from "./MoveToTrigger";
 
-interface ThreadMessagesData {
-	items: RemitImapThreadMessageResponse[];
-	[key: string]: unknown;
-}
-
-interface SnapshotEntry<T> {
-	queryKey: readonly unknown[];
-	data: T;
-}
-
-interface MarkUnreadContext {
-	threadMessagesPrefix: readonly unknown[];
-	listPrefixes: ReadonlyArray<readonly unknown[]>;
-	previousThreadMessages: SnapshotEntry<ThreadMessagesData>[];
-	previousThreadsList: ThreadListSnapshotEntry[];
-}
-
 interface MessageActionMenuProps {
 	messageId: string;
 	threadId: string;
@@ -109,7 +92,7 @@ export const MessageActionMenu = ({
 
 	const { mutate: updateFlags, isPending: isUpdatingFlags } = useMutation({
 		...messageBulkOperationsUpdateFlagsMutation(),
-		onMutate: async (variables): Promise<MarkUnreadContext> => {
+		onMutate: async (variables): Promise<ThreadMutationContext> => {
 			const isReadNext = variables.body.isRead ?? true;
 			const targetIds = new Set(variables.body.messageIds ?? []);
 

package/src/hooks/useDeleteMessages.ts

@@ -16,7 +16,8 @@ import {
 	patchThreadListQueries,
 	restoreThreadListQueries,
 	snapshotThreadListQueries,
-	type ThreadListSnapshotEntry,
+	type ThreadMessagesData,
+	type ThreadMutationContext,
 	threadListCacheKeys,
 } from "@/lib/thread-list-cache";
 
@@ -39,23 +40,6 @@ interface UseDeleteMessagesOptions {
 	onAfterOptimisticRemove?: (messageIds: string[]) => void;
 }
 
-interface ThreadMessagesData {
-	items: RemitImapThreadMessageResponse[];
-	[key: string]: unknown;
-}
-
-interface SnapshotEntry<T> {
-	queryKey: readonly unknown[];
-	data: T;
-}
-
-interface DeleteContext {
-	threadMessagesPrefix: readonly unknown[];
-	listPrefixes: ReadonlyArray<readonly unknown[]>;
-	previousThreadMessages: SnapshotEntry<ThreadMessagesData>[];
-	previousThreadsList: ThreadListSnapshotEntry[];
-}
-
 /**
  * Pure helper: drop the messages in `messageIds` from a single page's items.
  *
@@ -94,7 +78,7 @@ export const useDeleteMessages = ({
 
 	const { mutateAsync, isPending } = useMutation({
 		...messageBulkOperationsDeleteMessagesMutation(),
-		onMutate: async (variables): Promise<DeleteContext> => {
+		onMutate: async (variables): Promise<ThreadMutationContext> => {
 			const messageIds = new Set(variables.body.messageIds ?? []);
 
 			const threadMessagesPrefix = threadId

package/src/hooks/useMarkAsRead.ts

@@ -16,7 +16,8 @@ import {
 	patchThreadListQueries,
 	restoreThreadListQueries,
 	snapshotThreadListQueries,
-	type ThreadListSnapshotEntry,
+	type ThreadMessagesData,
+	type ThreadMutationContext,
 	threadListCacheKeys,
 } from "@/lib/thread-list-cache";
 
@@ -28,23 +29,6 @@ interface UseMarkAsReadOptions {
 	accountId?: string;
 }
 
-interface ThreadMessagesData {
-	items: RemitImapThreadMessageResponse[];
-	[key: string]: unknown;
-}
-
-interface SnapshotEntry<T> {
-	queryKey: readonly unknown[];
-	data: T;
-}
-
-interface MarkAsReadContext {
-	threadMessagesPrefix: readonly unknown[];
-	listPrefixes: ReadonlyArray<readonly unknown[]>;
-	previousThreadMessages: SnapshotEntry<ThreadMessagesData>[];
-	previousThreadsList: ThreadListSnapshotEntry[];
-}
-
 /**
  * Dwell before a message the user is viewing is marked read. A glance closed
  * within this window leaves it unread (#140). Applied by the single shared
@@ -145,7 +129,7 @@ export const useMarkAsRead = ({
 	const { mutate: markAsRead } = useMutation({
 		...messageBulkOperationsUpdateFlagsMutation(),
 		meta: softErrorMeta,
-		onMutate: async (variables): Promise<MarkAsReadContext> => {
+		onMutate: async (variables): Promise<ThreadMutationContext> => {
 			const messageIds = new Set(variables.body.messageIds ?? []);
 			const isRead = variables.body.isRead ?? true;
 

package/src/hooks/useMoveMessages.ts

@@ -15,7 +15,8 @@ import {
 	patchThreadListQueries,
 	restoreThreadListQueries,
 	snapshotThreadListQueries,
-	type ThreadListSnapshotEntry,
+	type ThreadMessagesData,
+	type ThreadMutationContext,
 	threadListCacheKeys,
 } from "@/lib/thread-list-cache";
 
@@ -31,23 +32,6 @@ interface UseMoveMessagesOptions {
 	onAfterOptimisticRemove?: (messageIds: string[]) => void;
 }
 
-interface ThreadMessagesData {
-	items: RemitImapThreadMessageResponse[];
-	[key: string]: unknown;
-}
-
-interface SnapshotEntry<T> {
-	queryKey: readonly unknown[];
-	data: T;
-}
-
-interface MoveContext {
-	threadMessagesPrefix: readonly unknown[];
-	listPrefixes: ReadonlyArray<readonly unknown[]>;
-	previousThreadMessages: SnapshotEntry<ThreadMessagesData>[];
-	previousThreadsList: ThreadListSnapshotEntry[];
-}
-
 /**
  * Pure helper: drop the messages in `messageIds` from a single page's items.
  *
@@ -73,7 +57,7 @@ export const useMoveMessages = ({
 
 	const { mutateAsync, isPending, isError } = useMutation({
 		...messageBulkOperationsMoveMessagesMutation(),
-		onMutate: async (variables): Promise<MoveContext> => {
+		onMutate: async (variables): Promise<ThreadMutationContext> => {
 			const messageIds = new Set(variables.body.messageIds ?? []);
 
 			const threadMessagesPrefix = threadId

package/src/hooks/useToggleStar.ts

@@ -13,7 +13,8 @@ import {
 	patchThreadListQueries,
 	restoreThreadListQueries,
 	snapshotThreadListQueries,
-	type ThreadListSnapshotEntry,
+	type ThreadMessagesData,
+	type ThreadMutationContext,
 	threadListCacheKeys,
 } from "@/lib/thread-list-cache";
 
@@ -48,23 +49,6 @@ export const resolveMailboxForMessage = (
 	messages?.find((message) => message.messageId === messageId)?.mailboxId ??
 	fallbackMailboxId;
 
-interface ThreadMessagesData {
-	items: RemitImapThreadMessageResponse[];
-	[key: string]: unknown;
-}
-
-interface SnapshotEntry<T> {
-	queryKey: readonly unknown[];
-	data: T;
-}
-
-interface ToggleStarContext {
-	threadMessagesPrefix: readonly unknown[];
-	listPrefixes: ReadonlyArray<readonly unknown[]>;
-	previousThreadMessages: SnapshotEntry<ThreadMessagesData>[];
-	previousThreadsList: ThreadListSnapshotEntry[];
-}
-
 export const toggleStarsInItems = (
 	items: RemitImapThreadMessageResponse[],
 	messageId: string,
@@ -84,7 +68,7 @@ export const useToggleStar = ({
 
 	const { mutate, isPending, variables } = useMutation({
 		...messageOperationsUpdateMessageFlagsMutation(),
-		onMutate: async (vars): Promise<ToggleStarContext> => {
+		onMutate: async (vars): Promise<ThreadMutationContext> => {
 			const messageId = vars.path.messageId;
 			const nextStarred = vars.body.isStarred ?? false;
 

package/src/hooks/useToggleTrusted.ts

@@ -11,19 +11,15 @@ import type {
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useErrorBanners } from "@/components/ui/ErrorBannerProvider";
 import { buildMutationErrorBanner } from "@/components/ui/error-banners";
+import type { SnapshotEntry } from "@/lib/thread-list-cache";
 
 interface UseToggleTrustedOptions {
 	messageId: string;
 }
 
-interface SnapshotEntry {
-	queryKey: readonly unknown[];
-	data: RemitImapDescribeMessageResponse;
-}
-
 interface ToggleTrustedContext {
 	describePrefix: readonly unknown[];
-	previous: SnapshotEntry[];
+	previous: SnapshotEntry<RemitImapDescribeMessageResponse>[];
 }
 
 export const buildTrustedFlag = (

package/src/lib/thread-list-cache.ts

@@ -7,9 +7,31 @@ import type { RemitImapThreadMessageResponse } from "@remit/api-http-client/type
 import type { QueryClient } from "@tanstack/react-query";
 import { patchThreadListCache, type ThreadListCache } from "./thread-cache.js";
 
-export interface ThreadListSnapshotEntry {
+export interface SnapshotEntry<T> {
 	queryKey: readonly unknown[];
-	data: ThreadListCache;
+	data: T;
+}
+
+export type ThreadListSnapshotEntry = SnapshotEntry<ThreadListCache>;
+
+/** A cached page of one thread's messages, as the thread-detail endpoint serves it. */
+export interface ThreadMessagesData {
+	items: RemitImapThreadMessageResponse[];
+	[key: string]: unknown;
+}
+
+/**
+ * The rollback state an optimistic thread mutation captures in `onMutate`.
+ *
+ * The shape belongs to the snapshot/restore helpers below rather than to any
+ * one mutation, so mark-read, star, delete and move all carry the same one
+ * (#868).
+ */
+export interface ThreadMutationContext {
+	threadMessagesPrefix: readonly unknown[];
+	listPrefixes: ReadonlyArray<readonly unknown[]>;
+	previousThreadMessages: SnapshotEntry<ThreadMessagesData>[];
+	previousThreadsList: ThreadListSnapshotEntry[];
 }
 
 /**