@marcoappio/marco-config 2.0.476 → 2.0.478

package/dist/marcoPublicConfig.js

@@ -46,7 +46,7 @@ const configMap = {
             },
             img: {
                 baseUrl: 'https://img.marcoapp.io',
-                bucketName: 'UNKNOWN',
+                bucketName: 'marco-image-bucket-s3-qjw',
             },
             ws: {
                 appId: 'marco-ws-production',

package/dist/zero/mutators/threadMutators/threadMutators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"threadMutators.d.ts","sourceRoot":"","sources":["../../../../src/zero/mutators/threadMutators/threadMutators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,KAAK,CAAC,MAAM,SAAS,CAAA;AAEjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAiB,MAAM,qBAAqB,CAAA;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAEhE,MAAM,MAAM,sBAAsB,GAAG;KAClC,CAAC,IAAI,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAC1C,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAC1D,OAAO,CAAC,IAAI,CAAC;CACnB,CAAA;AAKD,eAAO,MAAM,cAAc,OACrB,WAAW,CAAC,eAAe,CAAC,YACtB,MAAM,oBACE,eAAe,KAChC,OAAO,CAAC,kBAAkB,EAAE,CA0G9B,CAAA;AAED,eAAO,MAAM,oBAAoB,cACpB,QAAQ,GAAG,SAAS,cACnB,sBAAsB,KACjC,UAAU,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CA+OxC,CAAA"}
+{"version":3,"file":"threadMutators.d.ts","sourceRoot":"","sources":["../../../../src/zero/mutators/threadMutators/threadMutators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,KAAK,CAAC,MAAM,SAAS,CAAA;AAEjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAiB,MAAM,qBAAqB,CAAA;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAEhE,MAAM,MAAM,sBAAsB,GAAG;KAClC,CAAC,IAAI,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAC1C,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAC1D,OAAO,CAAC,IAAI,CAAC;CACnB,CAAA;AAKD,eAAO,MAAM,cAAc,OACrB,WAAW,CAAC,eAAe,CAAC,YACtB,MAAM,oBACE,eAAe,KAChC,OAAO,CAAC,kBAAkB,EAAE,CA0G9B,CAAA;AAED,eAAO,MAAM,oBAAoB,cACpB,QAAQ,GAAG,SAAS,cACnB,sBAAsB,KACjC,UAAU,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAkQxC,CAAA"}

package/dist/zero/mutators/threadMutators/threadMutators.js

@@ -155,9 +155,24 @@ export const createThreadMutators = (_authData, callbacks) => ({
     },
     delete: async (tx, args) => {
         for (const threadId of args.threadIds) {
-            await tx.mutate.thread.delete({
-                id: threadId,
-            });
+            const thread = await tx.query.thread.where('id', threadId).one().run();
+            if (thread) {
+                if (thread.seen === false) {
+                    const labelIds = threadsUtils.parseLabelIdList(thread.labelIdList);
+                    if (labelIds.length > 0) {
+                        const labels = await tx.query.accountLabel.where('id', 'IN', labelIds).run();
+                        for (const label of labels) {
+                            await tx.mutate.accountLabel.update({
+                                id: label.id,
+                                unreadCount: Math.max(0, (label.unreadCount ?? 0) - 1),
+                            });
+                        }
+                    }
+                }
+                await tx.mutate.thread.delete({
+                    id: threadId,
+                });
+            }
         }
         callbacks?.delete?.(args);
     },

package/dist/zero/mutators/threadMutators/threadMutators.test.js

@@ -100,27 +100,105 @@ describe('threadMutators', () => {
         });
     });
     describe('delete', () => {
-        it('deletes threads', async () => {
+        it('deletes threads and decrements unread counts for unread threads', async () => {
             const threadDelete = mock(async () => { });
+            const labelUpdate = mock(async () => { });
+            const threads = [
+                { id: 'test-thread-id-1', labelIdList: ' test-label-id-1 ', seen: false },
+                { id: 'test-thread-id-2', labelIdList: ' test-label-id-1 ', seen: true },
+            ];
+            const labels = [{ id: 'test-label-id-1', unreadCount: 5 }];
+            const runThread = mock(async (id) => threads.find(x => x.id === id));
+            const oneThread = mock(() => ({ run: () => runThread(whereThreadId) }));
+            let whereThreadId = '';
+            const whereThread = mock((_field, id) => {
+                whereThreadId = id;
+                return { one: oneThread };
+            });
+            const runLabels = mock(async () => labels);
+            const whereLabels = mock(() => ({ run: runLabels }));
             const transaction = {
                 mutate: {
+                    accountLabel: {
+                        update: labelUpdate,
+                    },
                     thread: {
                         delete: threadDelete,
                     },
                 },
-                query: {},
+                query: {
+                    accountLabel: {
+                        where: whereLabels,
+                    },
+                    thread: {
+                        where: whereThread,
+                    },
+                },
             };
             const mutators = createMutators();
             await mutators.thread.delete(transaction, {
                 threadIds: ['test-thread-id-1', 'test-thread-id-2'],
             });
             expect(threadDelete).toHaveBeenCalledTimes(2);
-            expect(threadDelete).toHaveBeenCalledWith({
-                id: 'test-thread-id-1',
+            expect(threadDelete).toHaveBeenCalledWith({ id: 'test-thread-id-1' });
+            expect(threadDelete).toHaveBeenCalledWith({ id: 'test-thread-id-2' });
+            expect(labelUpdate).toHaveBeenCalledTimes(1);
+            expect(labelUpdate).toHaveBeenCalledWith({
+                id: 'test-label-id-1',
+                unreadCount: 4,
+            });
+        });
+        it('does not update unread counts when deleting read threads', async () => {
+            const threadDelete = mock(async () => { });
+            const labelUpdate = mock(async () => { });
+            const thread = { id: 'test-thread-id-1', labelIdList: ' test-label-id-1 ', seen: true };
+            const runThread = mock(async () => thread);
+            const oneThread = mock(() => ({ run: runThread }));
+            const whereThread = mock(() => ({ one: oneThread }));
+            const transaction = {
+                mutate: {
+                    accountLabel: {
+                        update: labelUpdate,
+                    },
+                    thread: {
+                        delete: threadDelete,
+                    },
+                },
+                query: {
+                    thread: {
+                        where: whereThread,
+                    },
+                },
+            };
+            const mutators = createMutators();
+            await mutators.thread.delete(transaction, {
+                threadIds: ['test-thread-id-1'],
             });
-            expect(threadDelete).toHaveBeenCalledWith({
-                id: 'test-thread-id-2',
+            expect(threadDelete).toHaveBeenCalledTimes(1);
+            expect(labelUpdate).not.toHaveBeenCalled();
+        });
+        it('handles non-existent threads gracefully', async () => {
+            const threadDelete = mock(async () => { });
+            const runThread = mock(async () => null);
+            const oneThread = mock(() => ({ run: runThread }));
+            const whereThread = mock(() => ({ one: oneThread }));
+            const transaction = {
+                mutate: {
+                    thread: {
+                        delete: threadDelete,
+                    },
+                },
+                query: {
+                    thread: {
+                        where: whereThread,
+                    },
+                },
+            };
+            const mutators = createMutators();
+            await mutators.thread.delete(transaction, {
+                threadIds: ['non-existent-thread'],
             });
+            expect(threadDelete).not.toHaveBeenCalled();
         });
     });
     describe('removeLabel', () => {
@@ -451,12 +529,12 @@ describe('threadMutators', () => {
         });
     });
     describe('setSeen', () => {
-        it('sets thread seen status and updates unread count', async () => {
+        it('decrements unread count when marking unread threads as read', async () => {
             const threadUpdate = mock(async () => { });
             const labelUpdate = mock(async () => { });
             const threads = [
-                { id: 'test-thread-id-1', labelIdList: ' test-inbox-label-id ' },
-                { id: 'test-thread-id-2', labelIdList: ' test-inbox-label-id ' },
+                { id: 'test-thread-id-1', labelIdList: ' test-inbox-label-id ', seen: false },
+                { id: 'test-thread-id-2', labelIdList: ' test-inbox-label-id ', seen: false },
             ];
             const labels = [{ id: 'test-inbox-label-id', specialUse: 'INBOX', unreadCount: 5 }];
             const runThreads = mock(async () => threads);
@@ -487,23 +565,82 @@ describe('threadMutators', () => {
                 threadIds: ['test-thread-id-1', 'test-thread-id-2'],
             });
             expect(threadUpdate).toHaveBeenCalledTimes(2);
-            expect(threadUpdate).toHaveBeenCalledWith({
-                id: 'test-thread-id-1',
-                seen: true,
+            expect(labelUpdate).toHaveBeenCalledWith({
+                id: 'test-inbox-label-id',
+                unreadCount: 3,
             });
-            expect(threadUpdate).toHaveBeenCalledWith({
-                id: 'test-thread-id-2',
-                seen: true,
+        });
+        it('increments unread count when marking read threads as unread', async () => {
+            const threadUpdate = mock(async () => { });
+            const labelUpdate = mock(async () => { });
+            const threads = [{ id: 'test-thread-id-1', labelIdList: ' test-inbox-label-id ', seen: true }];
+            const labels = [{ id: 'test-inbox-label-id', specialUse: 'INBOX', unreadCount: 5 }];
+            const runThreads = mock(async () => threads);
+            const whereThread = mock(() => ({ run: runThreads }));
+            const runLabels = mock(async () => labels);
+            const whereLabel = mock(() => ({ run: runLabels }));
+            const transaction = {
+                mutate: {
+                    accountLabel: {
+                        update: labelUpdate,
+                    },
+                    thread: {
+                        update: threadUpdate,
+                    },
+                },
+                query: {
+                    accountLabel: {
+                        where: whereLabel,
+                    },
+                    thread: {
+                        where: whereThread,
+                    },
+                },
+            };
+            const mutators = createMutators();
+            await mutators.thread.setSeen(transaction, {
+                seen: false,
+                threadIds: ['test-thread-id-1'],
             });
+            expect(threadUpdate).toHaveBeenCalledTimes(1);
             expect(labelUpdate).toHaveBeenCalledWith({
                 id: 'test-inbox-label-id',
-                unreadCount: 3,
+                unreadCount: 6,
             });
         });
         it('skips label update when threads have no labels', async () => {
             const threadUpdate = mock(async () => { });
             const labelUpdate = mock(async () => { });
-            const threads = [{ id: 'test-thread-id-1', labelIdList: '' }];
+            const threads = [{ id: 'test-thread-id-1', labelIdList: '', seen: false }];
+            const runThreads = mock(async () => threads);
+            const whereThread = mock(() => ({ run: runThreads }));
+            const transaction = {
+                mutate: {
+                    accountLabel: {
+                        update: labelUpdate,
+                    },
+                    thread: {
+                        update: threadUpdate,
+                    },
+                },
+                query: {
+                    thread: {
+                        where: whereThread,
+                    },
+                },
+            };
+            const mutators = createMutators();
+            await mutators.thread.setSeen(transaction, {
+                seen: true,
+                threadIds: ['test-thread-id-1'],
+            });
+            expect(threadUpdate).toHaveBeenCalledTimes(1);
+            expect(labelUpdate).not.toHaveBeenCalled();
+        });
+        it('skips already-read threads when marking as read', async () => {
+            const threadUpdate = mock(async () => { });
+            const labelUpdate = mock(async () => { });
+            const threads = [{ id: 'test-thread-id-1', labelIdList: ' test-inbox-label-id ', seen: true }];
             const runThreads = mock(async () => threads);
             const whereThread = mock(() => ({ run: runThreads }));
             const transaction = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marcoappio/marco-config",
-  "version": "2.0.476",
+  "version": "2.0.478",
   "author": "team@marcoapp.io",
   "main": "dist/index.js",
   "repository": "git@github.com:marcoappio/marco-config.git",