@remit/imap-worker 0.0.87 → 0.0.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/imap-worker",
-  "version": "0.0.87",
+  "version": "0.0.88",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/handlers/probe-message-id.sqlite.test.ts

@@ -8,15 +8,11 @@ import {
 	MailboxCursorState,
 } from "@remit/domain-enums";
 import {
-	AccountRepo,
-	AddressRepo,
-	DrizzleEnvelopeRepository,
-	DrizzleMessageRepository,
-	DrizzleThreadMessageRepository,
-	MailboxRepo,
-	MailboxSpecialUseRepo,
-	SearchIndex,
-	SyncWarningRepo,
+	createSqliteRepositories,
+	type DrizzleMessageRepository,
+	type DrizzleThreadMessageRepository,
+	type MailboxRepo,
+	type SqliteRepositories,
 } from "@remit/drizzle-service";
 import { createShippedSqliteDb } from "@remit/drizzle-service/test-sqlite";
 import {
@@ -81,7 +77,7 @@ const serverWithInbox = (message: ImapMessage): IImapConnection =>
 
 describe("the Message-ID the move, delete and copy probes ask with", () => {
 	let close: () => void;
-	let db: never;
+	let repos: SqliteRepositories;
 	let accountId: string;
 	let mailboxes: MailboxRepo;
 	let messages: DrizzleMessageRepository;
@@ -119,12 +115,12 @@ describe("the Message-ID the move, delete and copy probes ask with", () => {
 		await new MessageSyncService(
 			factory,
 			mailboxes,
-			new MailboxSpecialUseRepo(db, db),
+			repos.mailboxSpecialUse,
 			messages,
-			new DrizzleEnvelopeRepository(db),
-			new AddressRepo(db),
+			repos.envelope,
+			repos.address,
 			threadMessages,
-			new SyncWarningService(new SyncWarningRepo(db)),
+			new SyncWarningService(repos.syncWarning),
 		).syncMessages(inbox.mailboxId, accountId, ACCOUNT_CONFIG_ID);
 		const [synced] = await messages.listAllByMailbox(inbox.mailboxId);
 		if (!synced) throw new Error("sync stored no message");
@@ -137,14 +133,15 @@ describe("the Message-ID the move, delete and copy probes ask with", () => {
 	beforeEach(async () => {
 		const store = createShippedSqliteDb();
 		close = store.close;
-		db = store.db as never;
-		mailboxes = new MailboxRepo(db, new SearchIndex(db, db));
-		messages = new DrizzleMessageRepository(db, new SearchIndex(db, db));
-		threadMessages = new DrizzleThreadMessageRepository(
-			db,
-			new SearchIndex(db, db),
-		);
-		const account = await new AccountRepo(db, db).create({
+		repos = createSqliteRepositories({
+			app: store.db,
+			mail: store.db,
+			search: store.db,
+		});
+		mailboxes = repos.mailbox;
+		messages = repos.message;
+		threadMessages = repos.threadMessage;
+		const account = await repos.account.create({
 			accountConfigId: ACCOUNT_CONFIG_ID,
 			username: "person@example.com",
 			email: "person@example.com",
@@ -179,9 +176,9 @@ describe("the Message-ID the move, delete and copy probes ask with", () => {
 		const copyId = await new MessageMoveService({
 			messageService: messages,
 			mailboxService: mailboxes,
-			mailboxSpecialUseService: new MailboxSpecialUseRepo(db, db),
+			mailboxSpecialUseService: repos.mailboxSpecialUse,
 			threadMessageService: threadMessages,
-			addressService: new AddressRepo(db),
+			addressService: repos.address,
 			sqsQueueUrl: "https://queue.test/messages",
 		}).copyMessage(ACCOUNT_CONFIG_ID, sourceId, archive.mailboxId, accountId);
 

package/src/mail-sync-selection.sqlite.test.ts

@@ -15,11 +15,11 @@ import {
 	MailboxCursorState,
 } from "@remit/domain-enums";
 import {
-	AccountRepo,
-	DrizzleMessageRepository,
+	type AccountRepo,
+	createSqliteRepositories,
+	type DrizzleMessageRepository,
 	MailboxLockRepo,
-	MailboxRepo,
-	SearchIndex,
+	type MailboxRepo,
 } from "@remit/drizzle-service";
 import { createShippedSqliteDb } from "@remit/drizzle-service/test-sqlite";
 import type { Logger } from "@remit/logger";
@@ -53,12 +53,14 @@ let close: () => void;
 beforeEach(() => {
 	const store = createShippedSqliteDb();
 	close = store.close;
-	accounts = new AccountRepo(store.db, store.db);
-	mailboxes = new MailboxRepo(store.db, new SearchIndex(store.db, store.db));
-	messages = new DrizzleMessageRepository(
-		store.db as never,
-		new SearchIndex(store.db as never, store.db as never),
-	);
+	const repos = createSqliteRepositories({
+		app: store.db,
+		mail: store.db,
+		search: store.db,
+	});
+	accounts = repos.account;
+	mailboxes = repos.mailbox;
+	messages = repos.message;
 	locks = new MailboxLockRepo(store.db);
 	client = {
 		account: accounts,

package/src/scheduler/run-tick.sqlite.test.ts

@@ -7,7 +7,10 @@ import {
 	AccountService,
 	ConnectionState,
 } from "@remit/domain-enums";
-import { AccountRepo } from "@remit/drizzle-service";
+import {
+	type AccountRepo,
+	createSqliteRepositories,
+} from "@remit/drizzle-service";
 import { createShippedSqliteDb } from "@remit/drizzle-service/test-sqlite";
 import { capturingLogger, type LogLine } from "../test-helpers/test-world.js";
 import { runSchedulerTick } from "./run-tick.js";
@@ -22,7 +25,11 @@ let close: () => void;
 beforeEach(() => {
 	const store = createShippedSqliteDb();
 	close = store.close;
-	accounts = new AccountRepo(store.db, store.db);
+	accounts = createSqliteRepositories({
+		app: store.db,
+		mail: store.db,
+		search: store.db,
+	}).account;
 });
 
 afterEach(() => close());

package/src/thread-join.sqlite.test.ts

@@ -6,14 +6,7 @@ import type {
 	MailboxItem,
 } from "@remit/data-ports";
 import { deriveThreadId } from "@remit/data-ports/id";
-import {
-	AddressRepo,
-	DrizzleEnvelopeRepository,
-	DrizzleMessageRepository,
-	DrizzleThreadMessageRepository,
-	SearchIndex,
-	SyncWarningRepo,
-} from "@remit/drizzle-service";
+import { createSqliteRepositories } from "@remit/drizzle-service";
 import { createShippedSqliteDb } from "@remit/drizzle-service/test-sqlite";
 import { MessageSyncService, SyncWarningService } from "@remit/mailbox-service";
 import type { ImapMessage } from "@remit/mailbox-service/types";
@@ -63,18 +56,16 @@ const syncInOrder = async (
 	messages: ImapMessage[],
 ): Promise<{ threadIds: (messageId: string) => string[] }> => {
 	const { db, sqlite } = createShippedSqliteDb();
-	const typed = db as unknown as ConstructorParameters<
-		typeof DrizzleMessageRepository
-	>[0];
+	const repos = createSqliteRepositories({ app: db, mail: db, search: db });
 	const service = new MessageSyncService(
 		{} as never,
 		{} as IMailboxRepository,
 		{} as IMailboxSpecialUseRepository,
-		new DrizzleMessageRepository(typed, new SearchIndex(typed, typed)),
-		new DrizzleEnvelopeRepository(typed),
-		new AddressRepo(db as never),
-		new DrizzleThreadMessageRepository(db, new SearchIndex(db, db)),
-		new SyncWarningService(new SyncWarningRepo(db as never)),
+		repos.message,
+		repos.envelope,
+		repos.address,
+		repos.threadMessage,
+		new SyncWarningService(repos.syncWarning),
 	);
 	const save = (
 		service as unknown as {

package/src/with-oauth-lifecycle-deps.sqlite.test.ts

@@ -12,7 +12,10 @@ import assert from "node:assert/strict";
 import { after, before, describe, it } from "node:test";
 import type { AccountItem } from "@remit/data-ports";
 import { AccountAuthType, ConnectionState } from "@remit/domain-enums";
-import { AccountRepo } from "@remit/drizzle-service";
+import {
+	type AccountRepo,
+	createSqliteRepositories,
+} from "@remit/drizzle-service";
 import { createShippedSqliteDb } from "@remit/drizzle-service/test-sqlite";
 import { noopLogger } from "@remit/logger";
 import { RefreshTokenError } from "@remit/mail-oauth-service";
@@ -67,7 +70,11 @@ const account = async (): Promise<AccountItem> =>
 before(() => {
 	const db = createShippedSqliteDb();
 	close = db.close;
-	repo = new AccountRepo(db.db, db.db);
+	repo = createSqliteRepositories({
+		app: db.db,
+		mail: db.db,
+		search: db.db,
+	}).account;
 });
 
 after(() => {