@remit/drizzle-service 0.0.25 → 0.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "description": "Drizzle ORM service parameterized by dialect (Postgres / SQLite)",
   "type": "module",
   "main": "src/index.ts",

package/src/repos/i4-mailbox.sqlite.test.ts

@@ -1,6 +1,7 @@
 import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 import { after, before, describe, test } from "node:test";
+import { MailboxSyncStatus } from "@remit/domain-enums";
 import Database from "better-sqlite3";
 import { drizzle } from "drizzle-orm/better-sqlite3";
 import { mailboxTable } from "../schema.js";
@@ -66,6 +67,33 @@ describe("MailboxRepo (sqlite)", () => {
 		const reread = await repo.get(accountId, created.mailboxId);
 		assert.equal(reread.highestModseq, "9007199254740993");
 	});
+
+	test("renameChildPaths marks each child pending along with its new path (#290)", async () => {
+		// A renamed parent is set pending by the caller; its children's new paths
+		// are equally absent from the server until MAILBOX_RENAME lands, so they
+		// must be pending too — otherwise a reconcile in that window reaps the
+		// child as server-deleted.
+		const accountId = randomUUID();
+		const parent = await repo.create({
+			...makeMailboxInput(accountId, "Work"),
+			syncStatus: MailboxSyncStatus.pending,
+		});
+		const child = await repo.create({
+			...makeMailboxInput(accountId, "Work/sub"),
+			syncStatus: MailboxSyncStatus.synced,
+		});
+
+		await repo.renameChildPaths(accountId, "Work", "Projects", "/");
+
+		const renamedChild = await repo.get(accountId, child.mailboxId);
+		assert.equal(renamedChild.fullPath, "Projects/sub");
+		assert.equal(renamedChild.syncStatus, MailboxSyncStatus.pending);
+
+		// The parent row is untouched by this call (its own path/status is the
+		// caller's job).
+		const parentRow = await repo.get(accountId, parent.mailboxId);
+		assert.equal(parentRow.fullPath, "Work");
+	});
 });
 
 /**

package/src/repos/i4-mailbox.ts

@@ -6,7 +6,7 @@ import type {
 	ResultList,
 	UpdateMailboxInput,
 } from "@remit/data-ports";
-import { MailboxCursorState } from "@remit/domain-enums";
+import { MailboxCursorState, MailboxSyncStatus } from "@remit/domain-enums";
 import { and, asc, eq, gt, inArray, or } from "drizzle-orm";
 import type { NodePgDatabase } from "drizzle-orm/node-postgres";
 import shortUuid from "short-uuid";
@@ -341,7 +341,13 @@ export class MailboxRepo implements IMailboxRepository {
 		const children = await this.findByPathPrefix(accountId, oldPath, delimiter);
 		for (const child of children) {
 			const newChildPath = child.fullPath.replace(oldPath, newPath);
-			await this.update(accountId, child.mailboxId, { fullPath: newChildPath });
+			// Mark the child pending, like the renamed parent: its new path is not
+			// on the server until MAILBOX_RENAME lands, so a reconcile running in
+			// that window must not reap it as server-deleted (#290).
+			await this.update(accountId, child.mailboxId, {
+				fullPath: newChildPath,
+				syncStatus: MailboxSyncStatus.pending,
+			});
 		}
 	}
 }

package/src/repos/thread-message.ts

@@ -122,6 +122,7 @@ function toItem(row: Row): ThreadMessageItem {
 		...(row.fromName !== null ? { fromName: row.fromName } : {}),
 		...(row.subject !== null ? { subject: row.subject } : {}),
 		...(row.snippet !== null ? { snippet: row.snippet } : {}),
+		...(row.listId !== null ? { listId: row.listId } : {}),
 	};
 }
 
@@ -237,6 +238,7 @@ export class DrizzleThreadMessageRepository
 			fromName: input.fromName ?? null,
 			subject: input.subject ?? null,
 			snippet: input.snippet ?? null,
+			listId: input.listId ?? null,
 			createdAt: now,
 			updatedAt: now,
 		};
@@ -321,6 +323,7 @@ export class DrizzleThreadMessageRepository
 		if (input.star !== undefined) set.star = input.star;
 		if (input.category !== undefined) set.category = input.category;
 		if (input.subject !== undefined) set.subject = input.subject;
+		if (input.listId !== undefined) set.listId = input.listId;
 		if (input.fromEmail !== undefined) set.fromEmail = input.fromEmail;
 		if (input.fromName !== undefined) set.fromName = input.fromName;
 		if (input.snippet !== undefined) set.snippet = input.snippet;