@remit/drizzle-service 0.0.58 → 0.0.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",

package/src/id.test.ts

@@ -0,0 +1,69 @@
+import assert from "node:assert/strict";
+import { describe, test } from "node:test";
+import {
+	bodyPartContentId,
+	bodyPartId,
+	bodyPartParameterId,
+	deterministicBase36Id,
+	envelopeAddressId,
+	envelopeId,
+	generateDeterministicId,
+	rootBodyPartId,
+} from "./id.js";
+
+const MESSAGE = "message-golden";
+
+describe("derived ids are stored primary keys: a changed value orphans every row already written and needs a migration, never a new expectation here", () => {
+	test("generateDeterministicId pins the namespace and the UUIDv5 encoding", () => {
+		assert.equal(
+			generateDeterministicId("golden-seed"),
+			"68dd8eea-ad03-5221-b37c-52bbf1772c30",
+		);
+	});
+
+	test("deterministicBase36Id pins the base36 encoding shared with the electrodb adapter", () => {
+		assert.equal(
+			deterministicBase36Id("golden-seed"),
+			"67hxxs95ofdk5frbprqyrgwmo",
+		);
+	});
+
+	test("bodyPartId pins the body_part primary key", () => {
+		assert.equal(
+			bodyPartId(MESSAGE, "1.2"),
+			"022d58cc-585c-5391-8106-f2d2c1c0b228",
+		);
+	});
+
+	test("rootBodyPartId pins the root MIME node's key, part path 0", () => {
+		assert.equal(
+			rootBodyPartId(MESSAGE),
+			"f15cb8cc-8e03-5d68-812a-70bac87e2261",
+		);
+	});
+
+	test("bodyPartParameterId pins the body_part_parameter primary key", () => {
+		assert.equal(
+			bodyPartParameterId(MESSAGE, "1.2", "charset"),
+			"fdac41cc-7cbf-5bf7-bfb3-48f66e2e7f0c",
+		);
+	});
+
+	test("envelopeId pins the envelope primary key", () => {
+		assert.equal(envelopeId(MESSAGE), "fdfd34a1-84fb-535f-a586-965338211e99");
+	});
+
+	test("envelopeAddressId pins the envelope_address primary key", () => {
+		assert.equal(
+			envelopeAddressId(MESSAGE, "to", 1),
+			"5f4e930e-e418-51a2-9402-657822f8688b",
+		);
+	});
+
+	test("bodyPartContentId pins the body_part_content primary key", () => {
+		assert.equal(
+			bodyPartContentId(MESSAGE, "bodypart-golden"),
+			"c0ee5f7d-1894-5957-9f65-d9aafdf306ab",
+		);
+	});
+});

package/src/repos/i4-address.test.ts

@@ -1,7 +1,6 @@
 import assert from "node:assert";
 import { randomUUID } from "node:crypto";
 import { after, before, describe, test } from "node:test";
-import { envelopeAddressId } from "../id.js";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
 import { AddressRepo } from "./i4-address.js";
 
@@ -140,7 +139,6 @@ describe("AddressRepo", () => {
 	test("createEnvelopeAddress and getEnvelopeAddress", async () => {
 		const messageId = randomUUID();
 		const addressId = randomUUID();
-		const envId = envelopeAddressId(messageId, "from", 0);
 
 		const addr = await repo.createAddress({
 			...makeAddressInput(randomId()),
@@ -148,7 +146,6 @@ describe("AddressRepo", () => {
 		});
 
 		const ea = await repo.createEnvelopeAddress({
-			envelopeAddressId: envId,
 			messageId,
 			addressId,
 			normalizedEmail: "test@example.com",
@@ -156,21 +153,20 @@ describe("AddressRepo", () => {
 			addressOrder: 0,
 		});
 
-		assert.equal(ea.envelopeAddressId, envId);
 		assert.equal(ea.messageId, messageId);
 		assert.equal(ea.addressRole, "from");
 
-		const fetched = await repo.getEnvelopeAddress(envId);
-		assert.equal(fetched.envelopeAddressId, envId);
+		const fetched = await repo.getEnvelopeAddress(ea.envelopeAddressId);
+		assert.equal(fetched.envelopeAddressId, ea.envelopeAddressId);
+		assert.equal(fetched.addressId, addressId);
 
-		await repo.deleteEnvelopeAddress(envId);
+		await repo.deleteEnvelopeAddress(ea.envelopeAddressId);
 		await repo.deleteAddress(addr.accountConfigId, addr.addressId);
 	});
 
-	test("upsertEnvelopeAddress is idempotent", async () => {
+	test("upsertEnvelopeAddress keys the row on messageId, role and order", async () => {
 		const messageId = randomUUID();
 		const input = {
-			envelopeAddressId: envelopeAddressId(messageId, "to", 1),
 			messageId,
 			addressId: randomUUID(),
 			normalizedEmail: "x@example.com",
@@ -178,16 +174,27 @@ describe("AddressRepo", () => {
 			addressOrder: 1,
 		};
 		const first = await repo.upsertEnvelopeAddress(input);
-		const second = await repo.upsertEnvelopeAddress(input);
-		assert.equal(first.envelopeAddressId, second.envelopeAddressId);
+		const second = await repo.upsertEnvelopeAddress({
+			...input,
+			addressId: randomUUID(),
+			normalizedEmail: "y@example.com",
+		});
+		assert.equal(second.envelopeAddressId, first.envelopeAddressId);
+		assert.equal(second.normalizedEmail, "x@example.com");
+
+		const reordered = await repo.upsertEnvelopeAddress({
+			...input,
+			addressOrder: 2,
+		});
+		assert.notEqual(reordered.envelopeAddressId, first.envelopeAddressId);
 
-		await repo.deleteEnvelopeAddress(input.envelopeAddressId);
+		await repo.deleteEnvelopeAddress(first.envelopeAddressId);
+		await repo.deleteEnvelopeAddress(reordered.envelopeAddressId);
 	});
 
 	test("deleteManyEnvelopeAddresses removes in batch", async () => {
 		const messageId = randomUUID();
 		const ea1 = {
-			envelopeAddressId: envelopeAddressId(messageId, "from", 0),
 			messageId,
 			addressId: randomUUID(),
 			normalizedEmail: "a@x.com",
@@ -196,22 +203,21 @@ describe("AddressRepo", () => {
 		};
 		const ea2 = {
 			...ea1,
-			envelopeAddressId: envelopeAddressId(messageId, "to", 1),
 			addressRole: "to" as const,
 			addressOrder: 1,
 		};
 
-		await repo.createEnvelopeAddress(ea1);
-		await repo.createEnvelopeAddress(ea2);
+		const created1 = await repo.createEnvelopeAddress(ea1);
+		const created2 = await repo.createEnvelopeAddress(ea2);
 
 		await repo.deleteManyEnvelopeAddresses([
-			ea1.envelopeAddressId,
-			ea2.envelopeAddressId,
+			created1.envelopeAddressId,
+			created2.envelopeAddressId,
 		]);
 
 		const results = await repo.getEnvelopeAddress([
-			ea1.envelopeAddressId,
-			ea2.envelopeAddressId,
+			created1.envelopeAddressId,
+			created2.envelopeAddressId,
 		]);
 		assert.equal(results.length, 0);
 	});

package/src/repos/i4-address.ts

@@ -23,7 +23,7 @@ import {
 } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
-import { envelopeAddressId as deriveEnvelopeAddressId } from "../id.js";
+import { envelopeAddressId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
 import {
 	JUNK_ONLY_FLAG,
@@ -744,15 +744,14 @@ export class AddressRepo implements IAddressRepository {
 		input: CreateEnvelopeAddressInput,
 	): Promise<EnvelopeAddressItem> {
 		const now = Date.now();
-		const envelopeAddressId = deriveEnvelopeAddressId(
-			input.messageId,
-			input.addressRole,
-			input.addressOrder,
-		);
 		const [row] = await this.db
 			.insert(envelopeAddressTable)
 			.values({
-				envelopeAddressId,
+				envelopeAddressId: envelopeAddressId(
+					input.messageId,
+					input.addressRole,
+					input.addressOrder,
+				),
 				messageId: input.messageId,
 				addressId: input.addressId,
 				displayName: input.displayName,
@@ -770,7 +769,7 @@ export class AddressRepo implements IAddressRepository {
 		input: CreateEnvelopeAddressInput,
 	): Promise<EnvelopeAddressItem> {
 		const now = Date.now();
-		const envelopeAddressId = deriveEnvelopeAddressId(
+		const rowId = envelopeAddressId(
 			input.messageId,
 			input.addressRole,
 			input.addressOrder,
@@ -778,7 +777,7 @@ export class AddressRepo implements IAddressRepository {
 		const [row] = await this.db
 			.insert(envelopeAddressTable)
 			.values({
-				envelopeAddressId,
+				envelopeAddressId: rowId,
 				messageId: input.messageId,
 				addressId: input.addressId,
 				displayName: input.displayName,
@@ -791,7 +790,7 @@ export class AddressRepo implements IAddressRepository {
 			.onConflictDoNothing()
 			.returning();
 		if (!row) {
-			return this.getEnvelopeAddress(envelopeAddressId);
+			return this.getEnvelopeAddress(rowId);
 		}
 		return rowToEnvelopeAddress(row);
 	}

package/src/repos/thread-message.test.ts

@@ -7,6 +7,7 @@ import { createSqliteTestDb } from "../test-db-sqlite.js";
 import {
 	clampThreadSearchLimit,
 	DrizzleThreadMessageRepository,
+	deriveThreadMessageId,
 	THREAD_SEARCH_MAX_LIMIT,
 } from "./thread-message.js";
 
@@ -936,3 +937,12 @@ describe("DrizzleThreadMessageRepository — core CRUD", () => {
 		assert.equal(await repo.countByThread(other, threadId), 0);
 	});
 });
+
+describe("derived ids are stored primary keys: a changed value orphans every row already written and needs a migration, never a new expectation here", () => {
+	test("deriveThreadMessageId pins the thread_message primary key", () => {
+		assert.equal(
+			deriveThreadMessageId("thread-golden", "message-golden"),
+			"agmlamuvd9feee9fmfvqxrb35",
+		);
+	});
+});