@lix-js/sdk 0.0.1 → 0.1.0

package/src/sync/sync-process.ts

@@ -1,27 +1,21 @@
 import type { Lix } from "../lix/open-lix.js";
 import { pushToServer } from "./push-to-server.js";
 import { pullFromServer } from "./pull-from-server.js";
+import { toBlob } from "../lix/to-blob.js";
 
 export async function initSyncProcess(args: {
-	lix: Pick<Lix, "db" | "plugin" | "toBlob">;
-}): Promise<
-	| {
-			stop: () => void;
-	  }
-	| undefined
-> {
+	lix: Pick<Lix, "db" | "plugin" | "sqlite">;
+}): Promise<void> {
 	const lixId = await args.lix.db
 		.selectFrom("key_value")
 		.where("key", "=", "lix_id")
 		.select("value")
 		.executeTakeFirstOrThrow();
 
-	let stoped = false;
-
 	const pullAndPush = async () => {
 		const shouldSync = await args.lix.db
 			.selectFrom("key_value")
-			.where("key", "=", "#lix_sync")
+			.where("key", "=", "lix_sync")
 			.select("value")
 			.executeTakeFirst();
 
@@ -64,7 +58,7 @@ export async function initSyncProcess(args: {
 			const response = await fetch(
 				new Request(url.value + "/lsa/new-v1", {
 					method: "POST",
-					body: await args.lix.toBlob(),
+					body: await toBlob({ lix: args.lix }),
 				})
 			);
 			if (!response.ok && response.status !== 409) {
@@ -77,7 +71,7 @@ export async function initSyncProcess(args: {
 	// naive implementation that syncs every second
 
 	function schedulePullAndPush() {
-		if (!stoped) {
+		if (args.lix.sqlite.isOpen()) {
 			pullAndPush().catch((e) => {
 				console.error("Error in sync process", e);
 			});
@@ -88,10 +82,4 @@ export async function initSyncProcess(args: {
 	}
 
 	schedulePullAndPush();
-
-	return {
-		stop: () => {
-			stoped = true;
-		},
-	};
 }

package/src/version/create-version.test.ts

@@ -42,7 +42,7 @@ test("it should copy the changes from the parent version", async () => {
 
 	const version1 = await createVersion({
 		lix,
-		parent: version0,
+		from: version0,
 	});
 
 	const changesInversion0 = await lix.db
@@ -132,7 +132,7 @@ test("it should copy change conflict pointers from the parent version", async ()
 
 	const version1 = await createVersion({
 		lix,
-		parent: version0,
+		from: version0,
 		name: "version1",
 	});
 

package/src/version/create-version.ts

@@ -4,25 +4,25 @@ import type { Lix } from "../lix/open-lix.js";
 /**
  * Creates a new Version.
  *
- * If parent is provided, the new Version will copy the change pointers from the parent version.
+ * If `from` is provided, the new version will be identical to the from version.
  *
  * @example
- *   _Without parent_
+ *   _Without from_
  *
  *   ```ts
  *   const version = await createVersion({ lix });
  *   ```
  *
  * @example
- *   _With parent_
+ *   _With from_
  *
  *   ```ts
- *   const version = await createVersion({ lix, parent: otherVersion });
+ *   const version = await createVersion({ lix, from: otherVersion });
  *   ```
  */
 export async function createVersion(args: {
 	lix: Pick<Lix, "db">;
-	parent?: Pick<Version, "id">;
+	from?: Pick<Version, "id">;
 	name?: Version["name"];
 }): Promise<Version> {
 	const executeInTransaction = async (trx: Lix["db"]) => {
@@ -36,20 +36,32 @@ export async function createVersion(args: {
 
 		const newVersion = await query.executeTakeFirstOrThrow();
 
-		// copy the change pointers from the parent Version
-		if (args.parent) {
+		// copy the change pointers from the from Version
+		if (args.from) {
 			await trx
 				.insertInto("version_change")
-				.columns(["version_id", "change_id"])
+				.columns([
+					"version_id",
+					"change_id",
+					"entity_id",
+					"schema_key",
+					"file_id",
+				])
 				.expression((eb) =>
 					eb
 						.selectFrom("version_change")
-						.select([eb.val(newVersion.id).as("version_id"), "change_id"])
-						.where("version_id", "=", args.parent!.id)
+						.select([
+							eb.val(newVersion.id).as("version_id"),
+							"change_id",
+							"entity_id",
+							"schema_key",
+							"file_id",
+						])
+						.where("version_id", "=", args.from!.id)
 				)
 				.execute();
 
-			// copy the change conflicts from the parent Version
+			// copy the change conflicts from the from Version
 			await trx
 				.insertInto("version_change_conflict")
 				.columns(["version_id", "change_conflict_id"])
@@ -60,7 +72,7 @@ export async function createVersion(args: {
 							eb.val(newVersion.id).as("version_id"),
 							"change_conflict_id",
 						])
-						.where("version_id", "=", args.parent!.id)
+						.where("version_id", "=", args.from!.id)
 				)
 				.execute();
 		}

package/src/version/merge-version.ts

@@ -1,7 +1,7 @@
 import { createChangeConflict } from "../change-conflict/create-change-conflict.js";
 import { detectChangeConflicts } from "../change-conflict/detect-change-conflicts.js";
 import { applyChanges } from "../change/apply-changes.js";
-import type { Version } from "../database/schema.js";
+import type { Version, VersionChange } from "../database/schema.js";
 import type { Lix } from "../lix/open-lix.js";
 import { versionChangeInSymmetricDifference } from "../query-filter/version-change-in-symmetric-difference.js";
 
@@ -33,42 +33,34 @@ export async function mergeVersion(args: {
 				conflict.conflictingChangeIds.has(change.id)
 			);
 
-			const existingTargetChange = await trx
-				.selectFrom("change")
-				.innerJoin("version_change", "change.id", "version_change.change_id")
+			const versionChange: VersionChange = {
+				version_id: args.targetVersion.id,
+				change_id: change.id,
+				entity_id: change.entity_id,
+				schema_key: change.schema_key,
+				file_id: change.file_id,
+			};
+
+			const existingTargetVersionChange = await trx
+				.selectFrom("version_change")
 				.where("version_change.version_id", "=", args.targetVersion.id)
 				.where("file_id", "=", change.file_id)
 				.where("entity_id", "=", change.entity_id)
 				.where("schema_key", "=", change.schema_key)
-				.select("id")
+				.select("change_id")
 				.executeTakeFirst();
 
 			// shouldn't update the pointer if there is a conflict
 			// and the change pointer already exists
-			if (hasConflict && existingTargetChange) {
+			if (hasConflict && existingTargetVersionChange) {
 				continue;
 			}
 
-			if (existingTargetChange) {
-				// update the existing change pointer
-				await trx
-					.updateTable("version_change")
-					.set({
-						change_id: change.id,
-					})
-					.where("change_id", "=", existingTargetChange.id)
-					.where("version_id", "=", args.targetVersion.id)
-					.execute();
-			} else {
-				// insert the new change pointer
-				await trx
-					.insertInto("version_change")
-					.values({
-						version_id: args.targetVersion.id,
-						change_id: change.id,
-					})
-					.execute();
-			}
+			await trx
+				.insertInto("version_change")
+				.values(versionChange)
+				.onConflict((oc) => oc.doUpdateSet(versionChange))
+				.execute();
 		}
 
 		// insert the detected conflicts

package/src/version/switch-version.test.ts

@@ -4,7 +4,7 @@ import { switchVersion } from "./switch-version.js";
 import { createVersion } from "./create-version.js";
 import { createChange } from "../change/create-change.js";
 import type { LixPlugin } from "../plugin/lix-plugin.js";
-import { changeQueueSettled } from "../change-queue/change-queue-settled.js";
+import { fileQueueSettled } from "../file-queue/file-queue-settled.js";
 
 test("switching versiones should update the current_version", async () => {
 	const lix = await openLixInMemory({});
@@ -18,7 +18,7 @@ test("switching versiones should update the current_version", async () => {
 	const newVersion = await lix.db.transaction().execute(async (trx) => {
 		const newVersion = await createVersion({
 			lix: { db: trx },
-			parent: currentVersion,
+			from: currentVersion,
 		});
 		await switchVersion({ lix: { ...lix, db: trx }, to: newVersion });
 		return newVersion;
@@ -60,7 +60,7 @@ test("switching a version does not lead to duplicate changes", async () => {
 
 	const newVersion = await createVersion({
 		lix: lix,
-		parent: currentVersion,
+		from: currentVersion,
 	});
 
 	const changesBefore = await lix.db.selectFrom("change").selectAll().execute();
@@ -95,7 +95,7 @@ test("switch version applies the changes of the switched to version", async () =
 		.selectAll()
 		.execute();
 
-	expect(keyValues).toEqual([{ key: "foo", value: "bar" }]);
+	expect(keyValues).toMatchObject([{ key: "foo", value: "bar" }]);
 
 	await switchVersion({ lix, to: versionB });
 
@@ -123,7 +123,7 @@ test("switch version applies the changes of the switched to version", async () =
 		.execute();
 
 	// expecting to see the value from version A again
-	expect(keyValues).toEqual([{ key: "foo", value: "bar" }]);
+	expect(keyValues).toMatchObject([{ key: "foo", value: "bar" }]);
 });
 
 // https://github.com/opral/lix-sdk/issues/209
@@ -177,11 +177,11 @@ test("a deleted file in one version does not impact a version which did not dele
 		})
 		.execute();
 
-	await changeQueueSettled({ lix });
+	await fileQueueSettled({ lix });
 
 	expect(mockTxtPlugin.detectChanges).toHaveBeenCalledTimes(1);
 
-	const versionB = await createVersion({ lix, parent: versionA });
+	const versionB = await createVersion({ lix, from: versionA });
 
 	await switchVersion({ lix, to: versionB });
 
@@ -191,7 +191,7 @@ test("a deleted file in one version does not impact a version which did not dele
 	// deleting the file in version B
 	await lix.db.deleteFrom("file").where("id", "=", "file0").execute();
 
-	await changeQueueSettled({ lix });
+	await fileQueueSettled({ lix });
 
 	// lix own change control handles file deletions
 	// expecting the plugin.detectChanges to not be invoked
@@ -231,7 +231,7 @@ test("a deleted file in one version does not impact a version which did not dele
 	expect(fileAfterSwitch).toBeUndefined();
 });
 
-test("doesn't trigger the change queue when switching versions which would lead to duplicate changes", async () => {
+test("doesn't trigger the file queue when switching versions which would lead to duplicate changes", async () => {
 	const mockTxtPlugin: LixPlugin = {
 		key: "mock_txt_plugin",
 		detectChangesGlob: "*.txt",
@@ -282,14 +282,11 @@ test("doesn't trigger the change queue when switching versions which would lead
 		})
 		.execute();
 
-	await changeQueueSettled({ lix });
+	await fileQueueSettled({ lix });
 
 	await switchVersion({ lix, to: versionB });
 
-	const changeQueue = await lix.db
-		.selectFrom("change_queue")
-		.selectAll()
-		.execute();
+	const fileQueue = await lix.db.selectFrom("file_queue").selectAll().execute();
 
-	expect(changeQueue).toHaveLength(0);
+	expect(fileQueue).toHaveLength(0);
 });

package/src/version/switch-version.ts

@@ -1,4 +1,4 @@
-import { withSkipChangeQueue } from "../change-queue/with-skip-change-queue.js";
+import { withSkipFileQueue } from "../file-queue/with-skip-file-queue.js";
 import { applyChanges } from "../change/apply-changes.js";
 import type { Change, Version } from "../database/schema.js";
 import type { Lix } from "../lix/open-lix.js";
@@ -29,7 +29,7 @@ export async function switchVersion(args: {
 	to: Pick<Version, "id">;
 }): Promise<void> {
 	const executeInTransaction = async (trx: Lix["db"]) => {
-		await withSkipChangeQueue(trx, async (trx) => {
+		await withSkipFileQueue(trx, async (trx) => {
 			const sourceVersion = await trx
 				.selectFrom("current_version")
 				.selectAll()
@@ -75,7 +75,7 @@ export async function switchVersion(args: {
 				// need to remove the entity when switching the version
 				else {
 					if (
-						change.plugin_key === "lix_own_entity" &&
+						change.plugin_key === "lix_own_change_control" &&
 						(change.schema_key === "lix_account_table" ||
 							change.schema_key === "lix_version_table")
 					) {

package/src/version/update-changes-in-version.ts

@@ -13,41 +13,22 @@ export async function updateChangesInVersion(args: {
 	changes: Change[];
 }): Promise<void> {
 	// const executeInTransaction = async (trx: Lix["db"]) => {
-
 	for (const change of args.changes ?? []) {
-		// Change for the same entity_id, schema_key and file_id should be unique
-		const existingEntityChange = executeSync({
+		executeSync({
 			lix: args.lix,
 			query: args.lix.db
-				.selectFrom("change")
-				.innerJoin("version_change", "change.id", "version_change.change_id")
-				.where("version_change.version_id", "=", args.version.id)
-				.where("change.schema_key", "=", change.schema_key)
-				.where("change.entity_id", "=", change.entity_id)
-				.where("change.file_id", "=", change.file_id)
-				.selectAll(),
-		})[0];
-
-		if (existingEntityChange) {
-			// update the existing pointer
-			executeSync({
-				lix: args.lix,
-				query: args.lix.db
-					.updateTable("version_change")
-					.set("change_id", change.id)
-					.where("change_id", "=", existingEntityChange.id)
-					.where("version_id", "=", args.version.id),
-			});
-		} else {
-			// create a new pointer
-			executeSync({
-				lix: args.lix,
-				query: args.lix.db.insertInto("version_change").values({
+				.insertInto("version_change")
+				.values({
 					version_id: args.version.id,
 					change_id: change.id,
-				}),
-			});
-		}
+					entity_id: change.entity_id,
+					schema_key: change.schema_key,
+					file_id: change.file_id,
+				})
+				.onConflict((oc) =>
+					oc.doUpdateSet((eb) => ({ change_id: eb.ref("excluded.change_id") }))
+				),
+		});
 	}
 
 	// await updateChangeConflicts({