@lix-js/sdk 0.0.1 → 0.1.0

package/src/{own-entity-change-control/apply-own-entity-change.test.ts → own-change-control/apply-own-change.test.ts}

@@ -5,9 +5,9 @@ import type {
 	ChangeSet,
 	ChangeSetElement,
 } from "../database/schema.js";
-import { applyOwnEntityChanges } from "./apply-own-entity-change.js";
+import { applyOwnChanges } from "./apply-own-change.js";
 import { mockJsonSnapshot } from "../snapshot/mock-json-snapshot.js";
-import { type KeyValue } from "../key-value/database-schema.js";
+import { type NewKeyValue } from "../key-value/database-schema.js";
 
 test("it should apply insert changes correctly", async () => {
 	const lix = await openLixInMemory({});
@@ -21,8 +21,8 @@ test("it should apply insert changes correctly", async () => {
 		id: "change1",
 		entity_id: "key1",
 		schema_key: "lix_key_value_table",
-		plugin_key: "lix_own_entity",
-		file_id: "null",
+		plugin_key: "lix_own_change_control",
+		file_id: "lix_own_change_control",
 		snapshot_id: snapshot.id,
 		created_at: "2021-01-01T00:00:00.000Z",
 	};
@@ -32,7 +32,7 @@ test("it should apply insert changes correctly", async () => {
 		.values({ content: snapshot.content })
 		.execute();
 
-	await applyOwnEntityChanges({ lix, changes: [change] });
+	await applyOwnChanges({ lix, changes: [change] });
 
 	const result = await lix.db
 		.selectFrom("key_value")
@@ -40,7 +40,7 @@ test("it should apply insert changes correctly", async () => {
 		.selectAll()
 		.executeTakeFirst();
 
-	expect(result).toEqual({ key: "key1", value: "value1" });
+	expect(result).toMatchObject({ key: "key1", value: "value1" });
 });
 
 test("it should apply update changes correctly", async () => {
@@ -60,9 +60,9 @@ test("it should apply update changes correctly", async () => {
 		id: "change1",
 		schema_key: "lix_key_value_table",
 		entity_id: "key1",
-		file_id: "null",
+		file_id: "lix_own_change_control",
 		created_at: "2021-01-01T00:00:00.000Z",
-		plugin_key: "lix_own_entity",
+		plugin_key: "lix_own_change_control",
 		snapshot_id: snapshot.id,
 	};
 
@@ -73,7 +73,7 @@ test("it should apply update changes correctly", async () => {
 		})
 		.execute();
 
-	await applyOwnEntityChanges({ lix, changes: [change] });
+	await applyOwnChanges({ lix, changes: [change] });
 
 	const result = await lix.db
 		.selectFrom("key_value")
@@ -81,7 +81,7 @@ test("it should apply update changes correctly", async () => {
 		.selectAll()
 		.executeTakeFirst();
 
-	expect(result).toEqual({ key: "key1", value: "new_value" });
+	expect(result).toMatchObject({ key: "key1", value: "new_value" });
 });
 
 test("it should apply delete changes correctly", async () => {
@@ -95,14 +95,14 @@ test("it should apply delete changes correctly", async () => {
 	const change: Change = {
 		id: "change1",
 		schema_key: "lix_key_value_table",
-		file_id: "null",
+		file_id: "lix_own_change_control",
 		created_at: "2021-01-01T00:00:00.000Z",
 		entity_id: "key1",
-		plugin_key: "lix_own_entity",
+		plugin_key: "lix_own_change_control",
 		snapshot_id: "no-content",
 	};
 
-	await applyOwnEntityChanges({ lix, changes: [change] });
+	await applyOwnChanges({ lix, changes: [change] });
 
 	const result = await lix.db
 		.selectFrom("key_value")
@@ -120,7 +120,7 @@ test("it should throw an error for invalid plugin key", async () => {
 		id: "change1",
 		schema_key: "lix_key_value_table",
 		entity_id: "key1",
-		file_id: "null",
+		file_id: "lix_own_change_control",
 		created_at: "2021-01-01T00:00:00.000Z",
 		plugin_key: "invalid-plugin",
 		snapshot_id: "snapshot1",
@@ -138,10 +138,8 @@ test("it should throw an error for invalid plugin key", async () => {
 		})
 		.execute();
 
-	await expect(
-		applyOwnEntityChanges({ lix, changes: [change] })
-	).rejects.toThrow(
-		"Expected 'lix_own_entity' as plugin key but received invalid-plugin"
+	await expect(applyOwnChanges({ lix, changes: [change] })).rejects.toThrow(
+		"Expected 'lix_own_change_control' as plugin key but received invalid-plugin"
 	);
 });
 
@@ -189,13 +187,13 @@ test("file.data is not changed by applyOwnEntityChanges", async () => {
 		id: "change1",
 		entity_id: file.id,
 		schema_key: "lix_file_table",
-		plugin_key: "lix_own_entity",
+		plugin_key: "lix_own_change_control",
 		file_id: "null",
 		snapshot_id: snapshot.id,
 		created_at: "2021-01-01T00:00:00.000Z",
 	};
 
-	await applyOwnEntityChanges({ lix, changes: [mockChange] });
+	await applyOwnChanges({ lix, changes: [mockChange] });
 
 	const result = await lix.db
 		.selectFrom("file")
@@ -230,7 +228,7 @@ test("foreign key constraints are deferred to make the order of applying changes
 			id: "change2",
 			entity_id: "change-set-1,change0",
 			schema_key: "lix_change_set_element_table",
-			plugin_key: "lix_own_entity",
+			plugin_key: "lix_own_change_control",
 			file_id: "null",
 			snapshot_id: snapshots[1].id,
 			created_at: "2021-01-01T00:00:00.000Z",
@@ -239,7 +237,7 @@ test("foreign key constraints are deferred to make the order of applying changes
 			id: "change1",
 			entity_id: "change-set-1",
 			schema_key: "lix_change_set_table",
-			plugin_key: "lix_own_entity",
+			plugin_key: "lix_own_change_control",
 			file_id: "null",
 			snapshot_id: snapshots[0].id,
 			created_at: "2021-01-01T00:00:00.000Z",
@@ -270,7 +268,7 @@ test("foreign key constraints are deferred to make the order of applying changes
 		.execute();
 
 	await expect(
-		applyOwnEntityChanges({ lix, changes: mockChanges })
+		applyOwnChanges({ lix, changes: mockChanges })
 	).resolves.toBeUndefined();
 });
 
@@ -291,8 +289,8 @@ test("foreign key constraints are obeyed", async () => {
 			// the change set for this change does not exist
 			entity_id: "change-set-1,change0",
 			schema_key: "lix_change_set_element_table",
-			plugin_key: "lix_own_entity",
-			file_id: "null",
+			plugin_key: "lix_own_change_control",
+			file_id: "lix_own_change_control",
 			snapshot_id: snapshots[0].id,
 			created_at: "2021-01-01T00:00:00.000Z",
 		},
@@ -321,9 +319,7 @@ test("foreign key constraints are obeyed", async () => {
 		})
 		.execute();
 
-	expect(
-		applyOwnEntityChanges({ lix, changes: mockChanges })
-	).rejects.toThrow();
+	expect(applyOwnChanges({ lix, changes: mockChanges })).rejects.toThrow();
 });
 
 // https://github.com/opral/lix-sdk/issues/185
@@ -333,7 +329,7 @@ test("applying own entity changes doesn't lead to the creation of new changes",
 	const snapshot = mockJsonSnapshot({
 		key: "mock-key",
 		value: "1+1=2",
-	} satisfies KeyValue);
+	} satisfies NewKeyValue);
 
 	await lix.db
 		.insertInto("snapshot")
@@ -344,14 +340,14 @@ test("applying own entity changes doesn't lead to the creation of new changes",
 
 	const changesBefore = await lix.db.selectFrom("change").selectAll().execute();
 
-	await applyOwnEntityChanges({
+	await applyOwnChanges({
 		lix,
 		changes: [
 			{
 				id: "change0",
 				entity_id: "mock-key",
 				file_id: "null",
-				plugin_key: "lix_own_entity",
+				plugin_key: "lix_own_change_control",
 				schema_key: "lix_key_value_table",
 				snapshot_id: snapshot.id,
 				created_at: "2021-01-01T00:00:00Z",

package/src/{own-entity-change-control/apply-own-entity-change.ts → own-change-control/apply-own-change.ts}

@@ -16,7 +16,7 @@ import { withSkipOwnChangeControl } from "./with-skip-own-change-control.js";
 /**
  * Applies own changes to lix itself.
  */
-export async function applyOwnEntityChanges(args: {
+export async function applyOwnChanges(args: {
 	lix: Pick<Lix, "db">;
 	changes: Change[];
 }): Promise<void> {
@@ -31,9 +31,9 @@ export async function applyOwnEntityChanges(args: {
 
 			await Promise.all(
 				args.changes.map(async (change) => {
-					if (change.plugin_key !== "lix_own_entity") {
+					if (change.plugin_key !== "lix_own_change_control") {
 						throw new Error(
-							"Expected 'lix_own_entity' as plugin key but received " +
+							"Expected 'lix_own_change_control' as plugin key but received " +
 								change.plugin_key
 						);
 					}

package/src/{own-entity-change-control → own-change-control}/change-controlled-tables.ts

@@ -5,7 +5,6 @@ export const changeControlledTableIds = {
 	change_author: ["change_id", "account_id"],
 	change_set_element: ["change_set_id", "change_id"],
 	change_set_label: ["label_id", "change_set_id"],
-	change_set_label_author: ["label_id", "change_set_id", "account_id"],
 	discussion: ["id"],
 	file: ["id"],
 	key_value: ["key"],

package/src/{own-entity-change-control → own-change-control}/database-triggers.test.ts

@@ -35,12 +35,12 @@ test("it works for inserts, updates and deletions", async () => {
 
 	for (const change of changes) {
 		expect(change.entity_id).toBe("key1");
-		expect(change.file_id).toBe("null");
-		expect(change.plugin_key).toBe("lix_own_entity");
+		expect(change.file_id).toBe("lix_own_change_control");
+		expect(change.plugin_key).toBe("lix_own_change_control");
 		expect(change.schema_key).toBe("lix_key_value_table");
 	}
 
-	expect(snapshots).toStrictEqual([
+	expect(snapshots).toMatchObject([
 		// insert
 		{ key: "key1", value: "value1" },
 		// update
@@ -125,23 +125,23 @@ test("if the trigger throws, the transaction is rolled back", async () => {
 	expect(deleteChange).toBeUndefined();
 });
 
-test("skips change control of key values if the key begins with `#`", async () => {
+test("skips change control of key values if `skip_change_control` is set to true", async () => {
 	const lix = await openLixInMemory({});
 
 	await lix.db
 		.insertInto("key_value")
-		.values({ key: "#key1", value: "value1" })
+		.values({ key: "key1", value: "value1", skip_change_control: true })
 		.execute();
 
 	const key1 = await lix.db
 		.selectFrom("key_value")
-		.where("key", "=", "#key1")
+		.where("key", "=", "key1")
 		.selectAll()
 		.executeTakeFirst();
 
 	const key1Change = await lix.db
 		.selectFrom("change")
-		.where("entity_id", "=", "#key1")
+		.where("entity_id", "=", "key1")
 		.selectAll()
 		.executeTakeFirst();
 

package/src/{own-entity-change-control → own-change-control}/database-triggers.ts

@@ -9,7 +9,7 @@ import {
 import { createChange } from "../change/create-change.js";
 import { executeSync } from "../database/execute-sync.js";
 
-export function applyOwnEntityChangeControlTriggers(
+export function applyOwnChangeControlTriggers(
 	sqlite: SqliteDatabase,
 	db: Kysely<LixDatabaseSchema>
 ): void {
@@ -24,7 +24,7 @@ export function applyOwnEntityChangeControlTriggers(
 	}
 
 	sqlite.createFunction({
-		name: "handle_lix_own_entity_change",
+		name: "handle_lix_own_change_control",
 		arity: -1,
 		// @ts-expect-error - dynamic function
 		xFunc: (
@@ -51,7 +51,7 @@ export function applyOwnEntityChangeControlTriggers(
       CREATE TEMP TRIGGER IF NOT EXISTS ${table}_change_control_insert
       AFTER INSERT ON ${table}
       BEGIN
-        SELECT handle_lix_own_entity_change('${table}', 'insert', ${tableInfo.map((c) => "NEW." + c.name).join(", ")});
+        SELECT handle_lix_own_change_control('${table}', 'insert', ${tableInfo.map((c) => "NEW." + c.name).join(", ")});
       END;
       
       CREATE TEMP TRIGGER IF NOT EXISTS ${table}_change_control_update
@@ -69,13 +69,13 @@ export function applyOwnEntityChangeControlTriggers(
 					: ""
 			}
       BEGIN
-        SELECT handle_lix_own_entity_change('${table}', 'update', ${tableInfo.map((c) => "NEW." + c.name).join(", ")});
+        SELECT handle_lix_own_change_control('${table}', 'update', ${tableInfo.map((c) => "NEW." + c.name).join(", ")});
       END;
 
       CREATE TEMP TRIGGER IF NOT EXISTS ${table}_change_control_delete
       AFTER DELETE ON ${table}
       BEGIN
-        SELECT handle_lix_own_entity_change('${table}', 'delete', ${tableInfo.map((c) => "OLD." + c.name).join(", ")});
+        SELECT handle_lix_own_change_control('${table}', 'delete', ${tableInfo.map((c) => "OLD." + c.name).join(", ")});
       END;
       `;
 
@@ -93,8 +93,8 @@ function handleLixOwnEntityChange(
 ): void {
 	const lix = { db, sqlite };
 
-	// keys starting with `#` are not change controlled
-	if (tableName === "key_value" && values[0].startsWith("#")) {
+	// key values that have skip_change_control set to true should not be change controlled
+	if (tableName === "key_value" && values[2]) {
 		return;
 	}
 
@@ -103,7 +103,7 @@ function handleLixOwnEntityChange(
 			lix,
 			query: db
 				.selectFrom("key_value")
-				.where("key", "=", "#lix_skip_own_change_control")
+				.where("key", "=", "lix_skip_own_change_control")
 				.select("value"),
 		})[0]?.value === "true";
 
@@ -120,7 +120,7 @@ function handleLixOwnEntityChange(
 			.select("plugin_key"),
 	})[0];
 
-	if (change?.plugin_key === "lix_own_entity") {
+	if (change?.plugin_key === "lix_own_change_control") {
 		return;
 	}
 
@@ -177,8 +177,8 @@ function handleLixOwnEntityChange(
 			authors: authors,
 			version: currentVersion,
 			entityId,
-			fileId: "null",
-			pluginKey: "lix_own_entity",
+			fileId: "lix_own_change_control",
+			pluginKey: "lix_own_change_control",
 			schemaKey: `lix_${tableName}_table`,
 			snapshotContent,
 		},

package/src/{own-entity-change-control → own-change-control}/with-skip-own-change-control.ts

@@ -7,7 +7,11 @@ export async function withSkipOwnChangeControl<T>(
 	const executeInTransaction = async (trx: Lix["db"]) => {
 		await trx
 			.insertInto("key_value")
-			.values({ key: "#lix_skip_own_change_control", value: "true" })
+			.values({
+				key: "lix_skip_own_change_control",
+				value: "true",
+				skip_change_control: true,
+			})
 			.onConflict((oc) => oc.doUpdateSet({ value: "true" }))
 			.execute();
 
@@ -16,7 +20,7 @@ export async function withSkipOwnChangeControl<T>(
 
 		await trx
 			.deleteFrom("key_value")
-			.where("key", "=", "#lix_skip_own_change_control")
+			.where("key", "=", "lix_skip_own_change_control")
 			.execute();
 
 		// Return the result of the operation

package/src/query-filter/version-change-in-difference.test.ts

@@ -4,6 +4,7 @@ import type { VersionChange } from "../database/schema.js";
 import { mockChange } from "../change/mock-change.js";
 import { createVersion } from "../version/create-version.js";
 import { versionChangeInDifference } from "./version-change-in-difference.js";
+import { updateChangesInVersion } from "../version/update-changes-in-version.js";
 
 test("should return the difference between two versions", async () => {
 	const lix = await openLixInMemory({});
@@ -11,42 +12,42 @@ test("should return the difference between two versions", async () => {
 	const versionA = await createVersion({ lix });
 	const versionB = await createVersion({ lix });
 
+	const mockChanges = [
+		mockChange({ id: "change0", entity_id: "entity0" }),
+		mockChange({ id: "change1", entity_id: "entity1" }),
+		mockChange({ id: "change2", entity_id: "entity2" }),
+		mockChange({ id: "change3", entity_id: "entity3" }),
+	] as const;
+
 	await lix.db
 		.insertInto("change")
-		.values([
-			mockChange({ id: "change1" }),
-			mockChange({ id: "change2" }),
-			mockChange({ id: "change3" }),
-			mockChange({ id: "change4" }),
-		])
+		.values(mockChanges)
 		.returningAll()
 		.execute();
 
-	const changesA: VersionChange[] = [
-		{ version_id: versionA.id, change_id: "change1" },
-		{ version_id: versionA.id, change_id: "change2" },
-	];
-
-	const changesB: VersionChange[] = [
-		{ version_id: versionB.id, change_id: "change2" },
-		{ version_id: versionB.id, change_id: "change3" },
-	];
+	await updateChangesInVersion({
+		lix,
+		version: versionA,
+		changes: [mockChanges[0], mockChanges[1]],
+	});
 
-	await lix.db
-		.insertInto("version_change")
-		.values([...changesA, ...changesB])
-		.execute();
+	await updateChangesInVersion({
+		lix,
+		version: versionB,
+		changes: [mockChanges[1], mockChanges[2]],
+	});
 
 	const result = await lix.db
 		.selectFrom("version_change")
 		.where(versionChangeInDifference(versionA, versionB))
-		.selectAll()
+		.select("version_id")
+		.select("change_id")
 		.execute();
 
 	expect(result).toEqual([
-		// change1 is in A but not in B
-		{ version_id: versionA.id, change_id: "change1" },
-	] satisfies VersionChange[]);
+		// change0 is in A but not in B
+		expect.objectContaining({ version_id: versionA.id, change_id: "change0" }),
+	] satisfies Partial<VersionChange>[]);
 });
 
 test("should return an empty array if there are no differences", async () => {
@@ -55,20 +56,28 @@ test("should return an empty array if there are no differences", async () => {
 	const versionA = await createVersion({ lix });
 	const versionB = await createVersion({ lix });
 
+	const mockChanges = [
+		mockChange({ id: "change0" }),
+		mockChange({ id: "change1" }),
+	];
+
 	await lix.db
 		.insertInto("change")
-		.values([mockChange({ id: "change1" }), mockChange({ id: "change2" })])
+		.values(mockChanges)
 		.returningAll()
 		.execute();
 
-	const changes: VersionChange[] = [
-		{ version_id: versionA.id, change_id: "change1" },
-		{ version_id: versionA.id, change_id: "change2" },
-		{ version_id: versionB.id, change_id: "change1" },
-		{ version_id: versionB.id, change_id: "change2" },
-	];
-
-	await lix.db.insertInto("version_change").values(changes).execute();
+	await updateChangesInVersion({
+		lix,
+		version: versionA,
+		changes: mockChanges,
+	});
+
+	await updateChangesInVersion({
+		lix,
+		version: versionB,
+		changes: mockChanges,
+	});
 
 	const result = await lix.db
 		.selectFrom("version_change")

package/src/query-filter/version-change-in-symmetric-difference.test.ts

@@ -4,6 +4,7 @@ import type { VersionChange } from "../database/schema.js";
 import { mockChange } from "../change/mock-change.js";
 import { createVersion } from "../version/create-version.js";
 import { versionChangeInSymmetricDifference } from "./version-change-in-symmetric-difference.js";
+import { updateChangesInVersion } from "../version/update-changes-in-version.js";
 
 test("should return the symmetric difference between two versions", async () => {
 	const lix = await openLixInMemory({});
@@ -11,31 +12,26 @@ test("should return the symmetric difference between two versions", async () =>
 	const versionA = await createVersion({ lix });
 	const versionB = await createVersion({ lix });
 
-	await lix.db
-		.insertInto("change")
-		.values([
-			mockChange({ id: "change1" }),
-			mockChange({ id: "change2" }),
-			mockChange({ id: "change3" }),
-			mockChange({ id: "change4" }),
-		])
-		.returningAll()
-		.execute();
+	const mockChanges = [
+		mockChange({ id: "change0", entity_id: "entity0" }),
+		mockChange({ id: "change1", entity_id: "entity1" }),
+		mockChange({ id: "change2", entity_id: "entity2" }),
+		mockChange({ id: "change3", entity_id: "entity3" }),
+	] as const;
 
-	const changesA: VersionChange[] = [
-		{ version_id: versionA.id, change_id: "change1" },
-		{ version_id: versionA.id, change_id: "change2" },
-	];
+	await lix.db.insertInto("change").values(mockChanges).execute();
 
-	const changesB: VersionChange[] = [
-		{ version_id: versionB.id, change_id: "change2" },
-		{ version_id: versionB.id, change_id: "change3" },
-	];
+	await updateChangesInVersion({
+		lix,
+		version: versionA,
+		changes: [mockChanges[0], mockChanges[1]],
+	});
 
-	await lix.db
-		.insertInto("version_change")
-		.values([...changesA, ...changesB])
-		.execute();
+	await updateChangesInVersion({
+		lix,
+		version: versionB,
+		changes: [mockChanges[1], mockChanges[2]],
+	});
 
 	const result = await lix.db
 		.selectFrom("version_change")
@@ -44,13 +40,13 @@ test("should return the symmetric difference between two versions", async () =>
 		.execute();
 
 	expect(result).toEqual([
-		// change 1 is in A but not in B
-		{ version_id: versionA.id, change_id: "change1" },
-		// change 3 is in B but not in A
-		{ version_id: versionB.id, change_id: "change3" },
-		// change 4 is in neither A nor B
+		// change 0 is in A but not in B
+		expect.objectContaining({ version_id: versionA.id, change_id: "change0" }),
+		// change 2 is in B but not in A
+		expect.objectContaining({ version_id: versionB.id, change_id: "change2" }),
+		// change 3 is in neither A nor B
 		// hence not in the symmetric difference
-	] satisfies VersionChange[]);
+	] satisfies Partial<VersionChange>[]);
 });
 
 test("should return an empty array if there are no differences", async () => {
@@ -59,25 +55,28 @@ test("should return an empty array if there are no differences", async () => {
 	const versionA = await createVersion({ lix });
 	const versionB = await createVersion({ lix });
 
+	const mockChanges = [
+		mockChange({ id: "change0", entity_id: "entity0" }),
+		mockChange({ id: "change1", entity_id: "entity1" }),
+	] as const;
+
 	await lix.db
 		.insertInto("change")
-		.values([
-			mockChange({ id: "change1" }),
-			mockChange({ id: "change2" }),
-			mockChange({ id: "change3" }),
-			mockChange({ id: "change4" }),
-		])
+		.values(mockChanges)
 		.returningAll()
 		.execute();
 
-	const changes: VersionChange[] = [
-		{ version_id: versionA.id, change_id: "change1" },
-		{ version_id: versionA.id, change_id: "change2" },
-		{ version_id: versionB.id, change_id: "change1" },
-		{ version_id: versionB.id, change_id: "change2" },
-	];
-
-	await lix.db.insertInto("version_change").values(changes).execute();
+	await updateChangesInVersion({
+		lix,
+		version: versionA,
+		changes: [mockChanges[0], mockChanges[1]],
+	});
+
+	await updateChangesInVersion({
+		lix,
+		version: versionB,
+		changes: [mockChanges[0], mockChanges[1]],
+	});
 
 	const result = await lix.db
 		.selectFrom("version_change")

package/src/server-api-handler/environment/create-in-memory-environment.test.ts

@@ -1,6 +1,7 @@
 import { test, expect } from "vitest";
 import { createLsaInMemoryEnvironment } from "./create-in-memory-environment.js";
 import { openLixInMemory } from "../../lix/open-lix-in-memory.js";
+import { toBlob } from "../../lix/to-blob.js";
 
 test("opening a lix works", async () => {
 	const environment = createLsaInMemoryEnvironment();
@@ -14,7 +15,7 @@ test("opening a lix works", async () => {
 		.executeTakeFirstOrThrow();
 
 	// initialize the env with the lix file
-	environment.setLix({ id: lixId, blob: await mockLix.toBlob() });
+	environment.setLix({ id: lixId, blob: await toBlob({ lix: mockLix }) });
 
 	const open0 = await environment.openLix({ id: lixId });
 
@@ -24,7 +25,7 @@ test("opening a lix works", async () => {
 		.returningAll()
 		.executeTakeFirstOrThrow();
 
-	expect(mockInsert).toEqual({
+	expect(mockInsert).toMatchObject({
 		key: "foo",
 		value: "bar",
 	});
@@ -44,7 +45,7 @@ test("opening a lix works", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	expect(mockSelect).toEqual({ key: "foo", value: "bar" });
+	expect(mockSelect).toMatchObject({ key: "foo", value: "bar" });
 
 	await environment.closeLix({ id: lixId, connectionId: open1.connectionId });
 });
@@ -61,7 +62,7 @@ test("it handles concurrent connections", async () => {
 		.executeTakeFirstOrThrow();
 
 	// initialize the env with the lix file
-	environment.setLix({ id: lixId, blob: await mockLix.toBlob() });
+	environment.setLix({ id: lixId, blob: await toBlob({ lix: mockLix }) });
 
 	const open0 = await environment.openLix({ id: lixId });
 	const open1 = await environment.openLix({ id: lixId });
@@ -72,7 +73,7 @@ test("it handles concurrent connections", async () => {
 		.returningAll()
 		.executeTakeFirstOrThrow();
 
-	expect(mockInsert).toEqual({
+	expect(mockInsert).toMatchObject({
 		key: "foo",
 		value: "bar",
 	});
@@ -83,7 +84,7 @@ test("it handles concurrent connections", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	expect(mockSelect).toEqual({ key: "foo", value: "bar" });
+	expect(mockSelect).toMatchObject({ key: "foo", value: "bar" });
 
 	// test both writing at the same time
 
@@ -124,7 +125,7 @@ test("it handles concurrent connections", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	expect(mockSelect2).toEqual({ key: "foo", value: "bar3" });
+	expect(mockSelect2).toMatchObject({ key: "foo", value: "bar3" });
 
 	await environment.closeLix({ id: lixId, connectionId: open2.connectionId });
 });