npm - @marcoappio/marco-config - Versions diffs - 2.0.460 → 2.0.461 - Mend

@marcoappio/marco-config 2.0.460 → 2.0.461

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

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

	@@ -1 +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;AACnF,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;AAED,eAAO,MAAM,cAAc,OACrB,WAAW,CAAC,eAAe,CAAC,YACtB,MAAM,oBACE,eAAe,KAChC,OAAO,CAAC,kBAAkB,EAAE,CAoE9B,CAAA;AAED,eAAO,MAAM,oBAAoB,cACpB,QAAQ,GAAG,SAAS,cACnB,sBAAsB,KACjC,UAAU,CAAC,kBAAkB,CAAC,QAAQ,CAAC,~~CAoKxC~~,CAAA"}
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;AACnF,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;AAED,eAAO,MAAM,cAAc,OACrB,WAAW,CAAC,eAAe,CAAC,YACtB,MAAM,oBACE,eAAe,KAChC,OAAO,CAAC,kBAAkB,EAAE,CAoE9B,CAAA;AAED,eAAO,MAAM,oBAAoB,cACpB,QAAQ,GAAG,SAAS,cACnB,sBAAsB,KACjC,UAAU,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAqLxC,CAAA"}

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

@@ -167,6 +167,19 @@ export const createThreadMutators = (_authData, callbacks) => ({
         callbacks?.setInbox?.({ ...args, sourceLocations: allSourceLocations });
     },
     setSeen: async (tx, args) => {
+        const threadLabels = await tx.query.threadLabel.where('threadId', 'IN', args.threadIds).run();
+        const uniqueLabelIds = [...new Set(threadLabels.map(x => x.labelId))];
+        if (uniqueLabelIds.length > 0) {
+            const labels = await tx.query.accountLabel.where('id', 'IN', uniqueLabelIds).run();
+            const delta = args.seen ? -1 : 1;
+            for (const label of labels.filter(x => x.specialUse === 'INBOX')) {
+                const threadCount = new Set(threadLabels.filter(x => x.labelId === label.id).map(x => x.threadId)).size;
+                await tx.mutate.accountLabel.update({
+                    id: label.id,
+                    unreadCount: Math.max(0, (label.unreadCount ?? 0) + delta * threadCount),
+                });
+            }
+        }
         for (const threadId of args.threadIds) {
             await tx.mutate.thread.update({
                 id: threadId,

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

@@ -322,15 +322,35 @@ describe('threadMutators', () => {
         });
     });
     describe('setSeen', () => {
-        it('sets thread seen status', async () => {
+        it('sets thread seen status and updates unread count', async () => {
             const threadUpdate = mock(async () => { });
+            const labelUpdate = mock(async () => { });
+            const threadLabels = [
+                { labelId: 'test-inbox-label-id', threadId: 'test-thread-id-1' },
+                { labelId: 'test-inbox-label-id', threadId: 'test-thread-id-2' },
+            ];
+            const labels = [{ id: 'test-inbox-label-id', specialUse: 'INBOX', unreadCount: 5 }];
+            const runThreadLabels = mock(async () => threadLabels);
+            const whereThreadLabel = mock(() => ({ run: runThreadLabels }));
+            const runLabels = mock(async () => labels);
+            const whereLabel = mock(() => ({ run: runLabels }));
             const transaction = {
                 mutate: {
+                    accountLabel: {
+                        update: labelUpdate,
+                    },
                     thread: {
                         update: threadUpdate,
                     },
                 },
-                query: {},
+                query: {
+                    accountLabel: {
+                        where: whereLabel,
+                    },
+                    threadLabel: {
+                        where: whereThreadLabel,
+                    },
+                },
             };
             const mutators = createMutators();
             await mutators.thread.setSeen(transaction, {
@@ -346,6 +366,38 @@ describe('threadMutators', () => {
                 id: 'test-thread-id-2',
                 seen: true,
             });
+            expect(labelUpdate).toHaveBeenCalledWith({
+                id: 'test-inbox-label-id',
+                unreadCount: 3,
+            });
+        });
+        it('skips label update when threads have no labels', async () => {
+            const threadUpdate = mock(async () => { });
+            const labelUpdate = mock(async () => { });
+            const runThreadLabels = mock(async () => []);
+            const whereThreadLabel = mock(() => ({ run: runThreadLabels }));
+            const transaction = {
+                mutate: {
+                    accountLabel: {
+                        update: labelUpdate,
+                    },
+                    thread: {
+                        update: threadUpdate,
+                    },
+                },
+                query: {
+                    threadLabel: {
+                        where: whereThreadLabel,
+                    },
+                },
+            };
+            const mutators = createMutators();
+            await mutators.thread.setSeen(transaction, {
+                seen: true,
+                threadIds: ['test-thread-id-1'],
+            });
+            expect(threadUpdate).toHaveBeenCalledTimes(1);
+            expect(labelUpdate).not.toHaveBeenCalled();
         });
     });
     describe('setSpam', () => {

package/package.json CHANGED Viewed

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