@lix-js/sdk 0.4.6 → 0.5.0-preview.0

package/src/change-author/schema.ts

@@ -0,0 +1,48 @@
+import type {
+	LixSchemaDefinition,
+	FromLixSchemaDefinition,
+} from "../schema-definition/definition.js";
+import type { SqliteWasmDatabase } from "sqlite-wasm-kysely";
+import { createEntityViewsIfNotExists } from "../entity-views/entity-view-builder.js";
+
+export function applyChangeAuthorDatabaseSchema(
+	sqlite: SqliteWasmDatabase
+): void {
+	// Create change_author view using the generalized entity view builder
+	createEntityViewsIfNotExists({
+		lix: { sqlite },
+		schema: LixChangeAuthorSchema,
+		overrideName: "change_author",
+		pluginKey: "lix_own_entity",
+		hardcodedFileId: "lix",
+	});
+}
+
+export const LixChangeAuthorSchema = {
+	"x-lix-key": "lix_change_author",
+	"x-lix-version": "1.0",
+	"x-lix-primary-key": ["change_id", "account_id"],
+	"x-lix-foreign-keys": {
+		change_id: {
+			schemaKey: "lix_change",
+			property: "id",
+		},
+		account_id: {
+			schemaKey: "lix_account",
+			property: "id",
+		},
+	},
+	type: "object",
+	properties: {
+		change_id: { type: "string" },
+		account_id: { type: "string" },
+	},
+	required: ["change_id", "account_id"],
+	additionalProperties: false,
+} as const;
+LixChangeAuthorSchema satisfies LixSchemaDefinition;
+
+// Pure business logic type (inferred from schema)
+export type ChangeAuthor = FromLixSchemaDefinition<
+	typeof LixChangeAuthorSchema
+>;

package/src/change-conflict/create-change-conflict.test.ts

@@ -1,10 +1,12 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import { expect, test } from "vitest";
-import { openLixInMemory } from "../lix/open-lix-in-memory.js";
+import { openLix } from "../lix/open-lix.js";
 import { createChangeConflict } from "./create-change-conflict.js";
-import { createVersion } from "../version/create-version.js";
 
-test("conflicts should be de-duplicated based on the change_conflict.key and version", async () => {
-	const lix = await openLixInMemory({});
+test.skip("conflicts should be de-duplicated based on the change_conflict.key and version", async () => {
+	const lix = await openLix({});
 
 	const version0 = await createVersion({ lix, name: "version0" });
 
@@ -17,7 +19,7 @@ test("conflicts should be de-duplicated based on the change_conflict.key and ver
 				schema_key: "mock",
 				file_id: "mock",
 				entity_id: "value0",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 			{
 				id: "change1",
@@ -25,7 +27,7 @@ test("conflicts should be de-duplicated based on the change_conflict.key and ver
 				file_id: "mock",
 				entity_id: "value1",
 				schema_key: "mock",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 		])
 		.execute();
@@ -68,8 +70,9 @@ test("conflicts should be de-duplicated based on the change_conflict.key and ver
 	expect(conflictsAfter2Creation[0]?.key).toBe("mock-conflict");
 });
 
-test("if a conflict contains the same changes for a given key and version, no new conflict should be created", async () => {
-	const lix = await openLixInMemory({});
+// commented out because of https://github.com/opral/lix-sdk/issues/285#issuecomment-2755409022
+test.skip("if a conflict contains the same changes for a given key and version, no new conflict should be created", async () => {
+	const lix = await openLix({});
 
 	const version0 = await createVersion({ lix, name: "version0" });
 
@@ -82,7 +85,7 @@ test("if a conflict contains the same changes for a given key and version, no ne
 				schema_key: "mock",
 				file_id: "mock",
 				entity_id: "value0",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 			{
 				id: "change1",
@@ -90,7 +93,7 @@ test("if a conflict contains the same changes for a given key and version, no ne
 				file_id: "mock",
 				entity_id: "value1",
 				schema_key: "mock",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 			{
 				id: "change2",
@@ -98,7 +101,7 @@ test("if a conflict contains the same changes for a given key and version, no ne
 				file_id: "mock",
 				entity_id: "value1",
 				schema_key: "mock",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 		])
 		.execute();

package/src/change-conflict/create-change-conflict.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import type { Version, Change, ChangeConflict } from "../database/schema.js";
 import type { Lix } from "../lix/open-lix.js";
 
@@ -75,16 +78,36 @@ export async function createChangeConflict(args: {
 			.returningAll()
 			.executeTakeFirstOrThrow();
 
+		// Insert elements linking the new conflict change set to the conflicting changes
+		// Fetch the change records to get entity_id, schema_key, file_id
+		const conflictingChanges = await trx
+			.selectFrom("change")
+			.where("id", "in", [...args.conflictingChangeIds])
+			.select(["id", "entity_id", "schema_key", "file_id"])
+			.execute();
+
+		const conflictingChangeMap = new Map(
+			conflictingChanges.map((c) => [c.id, c])
+		);
+
 		await trx
 			.insertInto("change_set_element")
 			.values(
-				Array.from(args.conflictingChangeIds).map((id) => ({
-					change_id: id,
-					change_set_id: newConflict.change_set_id,
-				}))
+				Array.from(args.conflictingChangeIds).map((id) => {
+					const change = conflictingChangeMap.get(id);
+					if (!change) {
+						// Should not happen if FK constraints work
+						throw new Error(`Conflicting change record not found: ${id}`);
+					}
+					return {
+						change_id: id,
+						change_set_id: newConflict.change_set_id,
+						entity_id: change.entity_id,
+						schema_key: change.schema_key,
+						file_id: change.file_id,
+					};
+				})
 			)
-			// Ignore if the conflict element already exists
-			.onConflict((oc) => oc.doNothing())
 			.execute();
 
 		await trx

package/src/change-conflict/detect-change-conflicts.test.ts

@@ -1,11 +1,14 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import { test, expect, vi } from "vitest";
-import { openLixInMemory } from "../lix/open-lix-in-memory.js";
-import type { Change } from "../database/schema.js";
-import { detectChangeConflicts } from "./detect-change-conflicts.js";
-import type { LixPlugin } from "../plugin/lix-plugin.js";
+// import { openLix } from "../lix/open-lix.js";
+// import type { Change } from "../database/schema.js";
+// import { detectChangeConflicts } from "./detect-change-conflicts.js";
+// import type { LixPlugin } from "../plugin/lix-plugin.js";
 
-test("should detect conflicts using plugins", async () => {
-	const lix = await openLixInMemory({});
+test.skip("should detect conflicts using plugins", async () => {
+	const lix = await openLix({});
 
 	const mockPlugin: LixPlugin = {
 		key: "mock-plugin",
@@ -51,8 +54,8 @@ test("should detect conflicts using plugins", async () => {
 	});
 });
 
-test("should handle no conflicts detected by plugins", async () => {
-	const lix = await openLixInMemory({});
+test.skip("should handle no conflicts detected by plugins", async () => {
+	const lix = await openLix({});
 
 	const mockPlugin: LixPlugin = {
 		key: "mock-plugin",
@@ -89,8 +92,8 @@ test("should handle no conflicts detected by plugins", async () => {
 	});
 });
 
-test("should handle multiple plugins detecting conflicts", async () => {
-	const lix = await openLixInMemory({});
+test.skip("should handle multiple plugins detecting conflicts", async () => {
+	const lix = await openLix({});
 
 	const mockPlugin1: LixPlugin = {
 		key: "mock-plugin1",
@@ -160,8 +163,8 @@ test("should handle multiple plugins detecting conflicts", async () => {
 	});
 });
 
-test("it should auto detect diverging entity conflicts", async () => {
-	const lix = await openLixInMemory({});
+test.skip("it should auto detect diverging entity conflicts", async () => {
+	const lix = await openLix({});
 
 	const changes = await lix.db
 		.insertInto("change")
@@ -172,7 +175,7 @@ test("it should auto detect diverging entity conflicts", async () => {
 				schema_key: "mock",
 				file_id: "file0",
 				entity_id: "entity0",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 			{
 				id: "change1",
@@ -180,7 +183,7 @@ test("it should auto detect diverging entity conflicts", async () => {
 				schema_key: "mock",
 				file_id: "file0",
 				entity_id: "entity0",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 			{
 				id: "change2",
@@ -188,7 +191,7 @@ test("it should auto detect diverging entity conflicts", async () => {
 				file_id: "file0",
 				entity_id: "entity0",
 				schema_key: "mock",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 		])
 		.returningAll()

package/src/change-conflict/detect-change-conflicts.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import type { Change } from "../database/schema.js";
 import type { DetectedConflict, LixReadonly } from "../plugin/lix-plugin.js";
 import { detectDivergingEntityConflict } from "./detect-diverging-entity-conflict.js";

package/src/change-conflict/detect-diverging-entity-conflict.test.ts

@@ -1,14 +1,17 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import { expect, test } from "vitest";
 import type { Change } from "../database/schema.js";
-import { openLixInMemory } from "../lix/open-lix-in-memory.js";
+import { openLix } from "../lix/open-lix.js";
 import {
 	detectDivergingEntityConflict,
 	LIX_DIVERGING_ENTITY_CONFLICT_KEY,
 } from "./detect-diverging-entity-conflict.js";
 import type { DetectedConflict } from "../plugin/lix-plugin.js";
 
-test("it should detect a diverging entity conflict", async () => {
-	const lix = await openLixInMemory({});
+test.skip("it should detect a diverging entity conflict", async () => {
+	const lix = await openLix({});
 
 	const mockChanges = [
 		{
@@ -18,7 +21,7 @@ test("it should detect a diverging entity conflict", async () => {
 			schema_key: "mock",
 			file_id: "mock",
 			entity_id: "value1",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 		{
 			id: "change1",
@@ -27,7 +30,7 @@ test("it should detect a diverging entity conflict", async () => {
 			file_id: "mock",
 			entity_id: "value1",
 			schema_key: "mock",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 		{
 			id: "change2",
@@ -36,7 +39,7 @@ test("it should detect a diverging entity conflict", async () => {
 			file_id: "mock",
 			entity_id: "value1",
 			schema_key: "mock",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 	] as const satisfies Change[];
 
@@ -65,8 +68,8 @@ test("it should detect a diverging entity conflict", async () => {
 	} satisfies DetectedConflict);
 });
 
-test("it should return a conflict if no common ancestor is found (two clients created different entities without being aware of it (aka distributed system))", async () => {
-	const lix = await openLixInMemory({});
+test.skip("it should return a conflict if no common ancestor is found (two clients created different entities without being aware of it (aka distributed system))", async () => {
+	const lix = await openLix({});
 
 	const mockChanges = [
 		{
@@ -76,7 +79,7 @@ test("it should return a conflict if no common ancestor is found (two clients cr
 			schema_key: "mock",
 			file_id: "mock",
 			entity_id: "value1",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 		{
 			id: "change1",
@@ -85,7 +88,7 @@ test("it should return a conflict if no common ancestor is found (two clients cr
 			schema_key: "mock",
 			file_id: "mock",
 			entity_id: "value1",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 		{
 			id: "change2",
@@ -94,7 +97,7 @@ test("it should return a conflict if no common ancestor is found (two clients cr
 			schema_key: "mock",
 			file_id: "mock",
 			entity_id: "value2",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 	] as const satisfies Change[];
 
@@ -115,8 +118,8 @@ test("it should return a conflict if no common ancestor is found (two clients cr
 	} satisfies DetectedConflict);
 });
 
-test("it should return undefined if one of either change is the lowest common ancestor", async () => {
-	const lix = await openLixInMemory({});
+test.skip("it should return undefined if one of either change is the lowest common ancestor", async () => {
+	const lix = await openLix({});
 
 	const mockChanges = [
 		{
@@ -126,7 +129,7 @@ test("it should return undefined if one of either change is the lowest common an
 			schema_key: "mock",
 			file_id: "mock",
 			entity_id: "value1",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 		{
 			id: "change1",
@@ -135,7 +138,7 @@ test("it should return undefined if one of either change is the lowest common an
 			file_id: "mock",
 			entity_id: "value1",
 			schema_key: "mock",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 	] as const satisfies Change[];
 
@@ -161,8 +164,8 @@ test("it should return undefined if one of either change is the lowest common an
 	expect(result).toBeUndefined();
 });
 
-test("it should detect a diverging entity conflict with multiple divering entity changes", async () => {
-	const lix = await openLixInMemory({});
+test.skip("it should detect a diverging entity conflict with multiple divering entity changes", async () => {
+	const lix = await openLix({});
 
 	const mockChanges = [
 		{
@@ -172,7 +175,7 @@ test("it should detect a diverging entity conflict with multiple divering entity
 			schema_key: "mock",
 			file_id: "mock",
 			entity_id: "value1",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 		{
 			id: "change1",
@@ -181,7 +184,7 @@ test("it should detect a diverging entity conflict with multiple divering entity
 			file_id: "mock",
 			entity_id: "value1",
 			schema_key: "mock",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 		{
 			id: "change2",
@@ -190,7 +193,7 @@ test("it should detect a diverging entity conflict with multiple divering entity
 			file_id: "mock",
 			entity_id: "value1",
 			schema_key: "mock",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 		{
 			id: "change3",
@@ -199,7 +202,7 @@ test("it should detect a diverging entity conflict with multiple divering entity
 			file_id: "mock",
 			entity_id: "value1",
 			schema_key: "mock",
-			snapshot_id: "no-content",
+			snapshot_content: null,
 		},
 	] as const satisfies Change[];
 

package/src/change-conflict/detect-diverging-entity-conflict.ts

@@ -1,6 +1,9 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import type { Change } from "../database/schema.js";
 import type { DetectedConflict, LixReadonly } from "../plugin/lix-plugin.js";
-import { changeIsLowestCommonAncestorOf } from "../query-filter/change-is-lowest-common-ancestor-of.js";
+// import { changeIsLowestCommonAncestorOf } from "../query-filter/change-is-lowest-common-ancestor-of.js";
 
 export const LIX_DIVERGING_ENTITY_CONFLICT_KEY =
 	"lix-diverging-entity-conflict";

package/src/change-conflict/garbage-collect-change-conflicts.test.ts

@@ -1,13 +1,14 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import { test, expect } from "vitest";
-import { openLixInMemory } from "../lix/open-lix-in-memory.js";
+import { openLix } from "../lix/open-lix.js";
 import { garbageCollectChangeConflicts } from "./garbage-collect-change-conflicts.js";
 import { createChangeConflict } from "./create-change-conflict.js";
-import { createVersion } from "../version/create-version.js";
-import { updateChangesInVersion } from "../version/update-changes-in-version.js";
 
 // garbage collection is not used atm
 test.skip("should garbage collect conflicts that contain one or more changes that no version change pointer references (anymore)", async () => {
-	const lix = await openLixInMemory({});
+	const lix = await openLix({});
 
 	const version0 = await createVersion({ lix, name: "version0" });
 
@@ -20,7 +21,7 @@ test.skip("should garbage collect conflicts that contain one or more changes tha
 				schema_key: "mock",
 				file_id: "mock",
 				entity_id: "value0",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 			{
 				id: "change1",
@@ -28,7 +29,7 @@ test.skip("should garbage collect conflicts that contain one or more changes tha
 				schema_key: "mock",
 				file_id: "mock",
 				entity_id: "value1",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 			{
 				id: "change2",
@@ -36,7 +37,7 @@ test.skip("should garbage collect conflicts that contain one or more changes tha
 				schema_key: "mock",
 				file_id: "mock",
 				entity_id: "value2",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 		])
 		.returningAll()
@@ -105,8 +106,8 @@ test.skip("should garbage collect conflicts that contain one or more changes tha
 	);
 });
 
-test("should garbage collect conflicts that no version references", async () => {
-	const lix = await openLixInMemory({});
+test.skip("should garbage collect conflicts that no version references", async () => {
+	const lix = await openLix({});
 
 	const changes = await lix.db
 		.insertInto("change")
@@ -117,7 +118,7 @@ test("should garbage collect conflicts that no version references", async () =>
 				schema_key: "mock",
 				file_id: "mock",
 				entity_id: "value0",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 			{
 				id: "change1",
@@ -125,7 +126,7 @@ test("should garbage collect conflicts that no version references", async () =>
 				schema_key: "mock",
 				file_id: "mock",
 				entity_id: "value1",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 		])
 		.returningAll()
@@ -162,8 +163,8 @@ test("should garbage collect conflicts that no version references", async () =>
 	expect(gc0.deletedChangeConflicts[0]?.id).toBe(mockConflict0.id);
 });
 
-test("should NOT garbage collect conflicts that a version change conflict pointer references and where each change is referenced by a version change pointer", async () => {
-	const lix = await openLixInMemory({});
+test.skip("should NOT garbage collect conflicts that a version change conflict pointer references and where each change is referenced by a version change pointer", async () => {
+	const lix = await openLix({});
 
 	const changes = await lix.db
 		.insertInto("change")
@@ -174,7 +175,7 @@ test("should NOT garbage collect conflicts that a version change conflict pointe
 				schema_key: "mock",
 				file_id: "mock",
 				entity_id: "value0",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 			{
 				id: "change1",
@@ -182,7 +183,7 @@ test("should NOT garbage collect conflicts that a version change conflict pointe
 				schema_key: "mock",
 				file_id: "mock",
 				entity_id: "value1",
-				snapshot_id: "no-content",
+				snapshot_content: null,
 			},
 		])
 		.returningAll()

package/src/change-conflict/garbage-collect-change-conflicts.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import { sql } from "kysely";
 import type { ChangeConflict } from "../database/schema.js";
 import type { Lix } from "../lix/open-lix.js";

package/src/change-conflict/resolve-conflict-by-selecting.test.ts

@@ -1,19 +1,29 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import { test, expect, vi } from "vitest";
-import { openLixInMemory } from "../lix/open-lix-in-memory.js";
+import { openLix } from "../lix/open-lix.js";
 import { newLixFile } from "../lix/new-lix.js";
 import type { NewChange, Snapshot } from "../database/schema.js";
 import type { LixPlugin } from "../plugin/lix-plugin.js";
-import { mockJsonSnapshot } from "../snapshot/mock-json-snapshot.js";
 import { resolveChangeConflictBySelecting } from "./resolve-conflict-by-selecting.js";
 
-test("it should resolve a conflict and apply the changes", async () => {
+test.skip("it should resolve a conflict and apply the changes", async () => {
 	const mockSnapshots: Snapshot[] = [
-		mockJsonSnapshot({
+		{
 			id: "value1",
-		}),
-		mockJsonSnapshot({
+			content: {
+				key: "test-key-1",
+				value: "test-value-1",
+			},
+		},
+		{
 			id: "value2",
-		}),
+			content: {
+				key: "test-key-2",
+				value: "test-value-2",
+			},
+		},
 	];
 
 	const mockChanges: NewChange[] = [
@@ -42,7 +52,7 @@ test("it should resolve a conflict and apply the changes", async () => {
 		}),
 	};
 
-	const lix = await openLixInMemory({
+	const lix = await openLix({
 		blob: await newLixFile(),
 		providePlugins: [mockPlugin],
 	});

package/src/change-conflict/resolve-conflict-by-selecting.ts

@@ -1,7 +1,8 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import type { Change, ChangeConflict } from "../database/schema.js";
 import type { Lix } from "../lix/open-lix.js";
-import { applyChanges } from "../change/apply-changes.js";
-import { updateChangesInVersion } from "../version/update-changes-in-version.js";
 
 /**
  * Resolves a conflict by selecting one of the two