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

package/src/version/schema.test.ts

@@ -16,22 +16,51 @@ test("insert, update, delete on the version view", async () => {
 		])
 		.execute();
 
+	// Create required commits
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{
+				id: "commit_id_0",
+				change_set_id: "change_set_id_0",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "commit_id_1",
+				change_set_id: "change_set_id_1",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "working_commit_0",
+				change_set_id: "working_cs_0",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "working_commit_1",
+				change_set_id: "working_cs_1",
+				lixcol_version_id: "global",
+			},
+		])
+		.execute();
+
 	await lix.db
 		.insertInto("version_all")
 		.values([
 			{
 				id: "version0",
 				name: "version0",
-				change_set_id: "change_set_id_0",
-				working_change_set_id: "working_cs_0",
+				commit_id: "commit_id_0",
+				working_commit_id: "working_commit_0",
 				lixcol_version_id: "global",
+				inherits_from_version_id: "global",
 			},
 			{
 				id: "version1",
 				name: "version1",
-				change_set_id: "change_set_id_1",
-				working_change_set_id: "working_cs_1",
+				commit_id: "commit_id_1",
+				working_commit_id: "working_commit_1",
 				lixcol_version_id: "global",
+				inherits_from_version_id: "global",
 			},
 		])
 		.execute();
@@ -46,18 +75,18 @@ test("insert, update, delete on the version view", async () => {
 	expect(viewAfterInsert).toMatchObject([
 		{
 			name: "version0",
-			change_set_id: "change_set_id_0",
+			commit_id: "commit_id_0",
 		},
 		{
 			name: "version1",
-			change_set_id: "change_set_id_1",
+			commit_id: "commit_id_1",
 		},
 	]);
 
 	await lix.db
 		.updateTable("version")
 		.where("name", "=", "version0")
-		.set({ change_set_id: "change_set_id_1" })
+		.set({ commit_id: "commit_id_1" })
 		.execute();
 
 	const viewAfterUpdate = await lix.db
@@ -70,11 +99,11 @@ test("insert, update, delete on the version view", async () => {
 	expect(viewAfterUpdate).toMatchObject([
 		{
 			name: "version0",
-			change_set_id: "change_set_id_1",
+			commit_id: "commit_id_1",
 		},
 		{
 			name: "version1",
-			change_set_id: "change_set_id_1",
+			commit_id: "commit_id_1",
 		},
 	]);
 
@@ -91,8 +120,8 @@ test("insert, update, delete on the version view", async () => {
 		{
 			id: "version1",
 			name: "version1",
-			change_set_id: "change_set_id_1",
-			working_change_set_id: "working_cs_1",
+			commit_id: "commit_id_1",
+			working_commit_id: "working_commit_1",
 			inherits_from_version_id: "global",
 		},
 	]);
@@ -111,17 +140,17 @@ test("insert, update, delete on the version view", async () => {
 		// version 0's insert
 		{
 			name: "version0",
-			change_set_id: "change_set_id_0",
+			commit_id: "commit_id_0",
 		},
-		// version 0's insert
+		// version 1's insert
 		{
 			name: "version1",
-			change_set_id: "change_set_id_1",
+			commit_id: "commit_id_1",
 		},
 		{
 			// version 0's update
 			name: "version0",
-			change_set_id: "change_set_id_1",
+			commit_id: "commit_id_1",
 		},
 		// version 0's delete
 		null,
@@ -142,20 +171,47 @@ test("querying by id", async () => {
 		])
 		.execute();
 
+	// Create required commits
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{
+				id: "commit_id_0",
+				change_set_id: "change_set_id_0",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "commit_id_1",
+				change_set_id: "change_set_id_1",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "working_commit_0",
+				change_set_id: "working_cs_0",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "working_commit_1",
+				change_set_id: "working_cs_1",
+				lixcol_version_id: "global",
+			},
+		])
+		.execute();
+
 	await lix.db
 		.insertInto("version")
 		.values([
 			{
 				id: "version0",
 				name: "version0",
-				change_set_id: "change_set_id_0",
-				working_change_set_id: "working_cs_0",
+				commit_id: "commit_id_0",
+				working_commit_id: "working_commit_0",
 			},
 			{
 				id: "version1",
 				name: "version1",
-				change_set_id: "change_set_id_1",
-				working_change_set_id: "working_cs_1",
+				commit_id: "commit_id_1",
+				working_commit_id: "working_commit_1",
 			},
 		])
 		.execute();
@@ -176,7 +232,23 @@ test("update active version view", async () => {
 	// Create required change sets and version first
 	await lix.db
 		.insertInto("change_set_all")
-		.values([{ id: "cs1", lixcol_version_id: "global" }])
+		.values([
+			{ id: "cs1", lixcol_version_id: "global" },
+			{ id: "working_cs1", lixcol_version_id: "global" },
+		])
+		.execute();
+
+	// Create required commits
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{ id: "commit_cs1", change_set_id: "cs1", lixcol_version_id: "global" },
+			{
+				id: "working_commit_1",
+				change_set_id: "working_cs1",
+				lixcol_version_id: "global",
+			},
+		])
 		.execute();
 
 	await lix.db
@@ -184,8 +256,8 @@ test("update active version view", async () => {
 		.values({
 			id: "version_id_1",
 			name: "test_version",
-			change_set_id: "cs1",
-			working_change_set_id: "cs1",
+			commit_id: "commit_cs1",
+			working_commit_id: "working_commit_1",
 		})
 		.execute();
 
@@ -243,12 +315,32 @@ test("should use default id and name if not provided", async () => {
 		.values([{ id: "cs1", lixcol_version_id: "global" }])
 		.execute();
 
-	// Insert a version providing only change_set_id
+	// Create required commit
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{ id: "commit_cs1", change_set_id: "cs1", lixcol_version_id: "global" },
+		])
+		.execute();
+
+	// Create working commit
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{
+				id: "working_commit_cs1",
+				change_set_id: "cs1",
+				lixcol_version_id: "global",
+			},
+		])
+		.execute();
+
+	// Insert a version providing only commit_id
 	await lix.db
 		.insertInto("version")
 		.values({
-			change_set_id: "cs1",
-			working_change_set_id: "cs1",
+			commit_id: "commit_cs1",
+			working_commit_id: "working_commit_cs1",
 		})
 		.execute();
 
@@ -256,14 +348,14 @@ test("should use default id and name if not provided", async () => {
 	const version = await lix.db
 		.selectFrom("version")
 		.selectAll()
-		.where("change_set_id", "=", "cs1")
+		.where("commit_id", "=", "commit_cs1")
 		.executeTakeFirstOrThrow();
 
 	expect(version?.id).toBeTypeOf("string");
 	expect(version?.id.length).toBeGreaterThan(0);
 	expect(version?.name).toBeTypeOf("string");
 	expect(version?.name?.length).toBeGreaterThan(0);
-	expect(version?.change_set_id).toBe("cs1");
+	expect(version?.commit_id).toBe("commit_cs1");
 
 	await lix.db
 		.updateTable("version")
@@ -282,47 +374,55 @@ test("should use default id and name if not provided", async () => {
 	expect(updatedVersion?.name).toBe("new_name");
 });
 
-test("should enforce foreign key constraint on change_set_id", async () => {
+test("should enforce foreign key constraint on commit_id", async () => {
 	const lix = await openLix({});
 
-	// Attempt to insert version with non-existent change_set_id
+	// Attempt to insert version with non-existent commit_id
 	await expect(
 		lix.db
 			.insertInto("version")
 			.values({
 				id: "version1",
 				name: "test_version",
-				change_set_id: "cs_nonexistent",
-				working_change_set_id: "cs_nonexistent",
+				commit_id: "commit_nonexistent",
+				working_commit_id: "cs_nonexistent",
 			})
 			.execute()
 	).rejects.toThrow(/Foreign key constraint violation/i);
 });
 
-test("should enforce foreign key constraint on working_change_set_id", async () => {
+test("should enforce foreign key constraint on working_commit_id", async () => {
 	const lix = await openLix({});
 
-	// Create valid change set for change_set_id
+	// Create valid change set for commit_id
 	await lix.db
 		.insertInto("change_set_all")
 		.values({ id: "cs1", lixcol_version_id: "global" })
 		.execute();
 
-	// Attempt to insert version with non-existent working_change_set_id
+	// Create required commit
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{ id: "commit_cs1", change_set_id: "cs1", lixcol_version_id: "global" },
+		])
+		.execute();
+
+	// Attempt to insert version with non-existent working_commit_id
 	await expect(
 		lix.db
 			.insertInto("version")
 			.values({
 				id: "version1",
 				name: "test_version",
-				change_set_id: "cs1",
-				working_change_set_id: "cs_nonexistent",
+				commit_id: "commit_cs1",
+				working_commit_id: "commit_nonexistent",
 			})
 			.execute()
 	).rejects.toThrow(/Foreign key constraint violation/i);
 });
 
-test("should allow version insertion with valid change set references", async () => {
+test("should allow version insertion with valid commit and change set references", async () => {
 	const lix = await openLix({});
 
 	// Create valid change sets
@@ -334,6 +434,19 @@ test("should allow version insertion with valid change set references", async ()
 		])
 		.execute();
 
+	// Create valid commits
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{ id: "commit_cs1", change_set_id: "cs1", lixcol_version_id: "global" },
+			{
+				id: "working_commit_cs2",
+				change_set_id: "cs2",
+				lixcol_version_id: "global",
+			},
+		])
+		.execute();
+
 	// This should succeed with valid foreign key references
 	await expect(
 		lix.db
@@ -341,8 +454,8 @@ test("should allow version insertion with valid change set references", async ()
 			.values({
 				id: "version1",
 				name: "test_version",
-				change_set_id: "cs1",
-				working_change_set_id: "cs2",
+				commit_id: "commit_cs1",
+				working_commit_id: "working_commit_cs2",
 			})
 			.execute()
 	).resolves.toBeDefined();
@@ -370,13 +483,33 @@ test("should allow active_version update with valid version_id", async () => {
 		.values({ id: "cs1", lixcol_version_id: "global" })
 		.execute();
 
+	// Create required commit
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{ id: "commit_cs1", change_set_id: "cs1", lixcol_version_id: "global" },
+		])
+		.execute();
+
+	// Create working commit
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{
+				id: "working_commit_cs1",
+				change_set_id: "cs1",
+				lixcol_version_id: "global",
+			},
+		])
+		.execute();
+
 	await lix.db
 		.insertInto("version")
 		.values({
 			id: "version1",
 			name: "test_version",
-			change_set_id: "cs1",
-			working_change_set_id: "cs1",
+			commit_id: "commit_cs1",
+			working_commit_id: "working_commit_cs1",
 		})
 		.execute();
 
@@ -402,6 +535,41 @@ test("versions should be globally accessible regardless of version context", asy
 		])
 		.execute();
 
+	// Create working change sets
+	await lix.db
+		.insertInto("change_set_all")
+		.values([
+			{ id: "working_cs_a", lixcol_version_id: "global" },
+			{ id: "working_cs_b", lixcol_version_id: "global" },
+			{ id: "working_cs_c", lixcol_version_id: "global" },
+		])
+		.execute();
+
+	// Create required commits
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{ id: "commit_a", change_set_id: "cs_a", lixcol_version_id: "global" },
+			{ id: "commit_b", change_set_id: "cs_b", lixcol_version_id: "global" },
+			{ id: "commit_c", change_set_id: "cs_c", lixcol_version_id: "global" },
+			{
+				id: "working_commit_a",
+				change_set_id: "working_cs_a",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "working_commit_b",
+				change_set_id: "working_cs_b",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "working_commit_c",
+				change_set_id: "working_cs_c",
+				lixcol_version_id: "global",
+			},
+		])
+		.execute();
+
 	// Create versions using the version view (simulating creation from different version contexts)
 	await lix.db
 		.insertInto("version")
@@ -409,20 +577,20 @@ test("versions should be globally accessible regardless of version context", asy
 			{
 				id: "version_a",
 				name: "Version A",
-				change_set_id: "cs_a",
-				working_change_set_id: "cs_a",
+				commit_id: "commit_a",
+				working_commit_id: "working_commit_a",
 			},
 			{
 				id: "version_b",
 				name: "Version B",
-				change_set_id: "cs_b",
-				working_change_set_id: "cs_b",
+				commit_id: "commit_b",
+				working_commit_id: "working_commit_b",
 			},
 			{
 				id: "version_c",
 				name: "Version C",
-				change_set_id: "cs_c",
-				working_change_set_id: "cs_c",
+				commit_id: "commit_c",
+				working_commit_id: "working_commit_c",
 			},
 		])
 		.execute();
@@ -458,7 +626,7 @@ test("mutation of a version's state should NOT lead to duplicate version entries
 		.selectFrom("version")
 		.where("id", "=", versionA.id)
 		.groupBy("id")
-		.select(["id", "name", "change_set_id", "working_change_set_id"])
+		.select(["id", "name", "commit_id", "working_commit_id"])
 		.execute();
 
 	expect(versionsBeforeMutation).toHaveLength(1);
@@ -466,8 +634,8 @@ test("mutation of a version's state should NOT lead to duplicate version entries
 	expect(versionsBeforeMutation[0]).toMatchObject({
 		id: versionA.id,
 		name: "versionA",
-		change_set_id: expect.any(String),
-		working_change_set_id: expect.any(String),
+		commit_id: expect.any(String),
+		working_commit_id: expect.any(String),
 	});
 
 	await lix.db
@@ -487,15 +655,13 @@ test("mutation of a version's state should NOT lead to duplicate version entries
 		.selectFrom("version")
 		.where("id", "=", versionA.id)
 		.groupBy("id")
-		.select(["id", "name", "change_set_id", "working_change_set_id"])
+		.select(["id", "name", "commit_id", "working_commit_id"])
 		.execute();
 
 	expect(versionAAfterMutation).toHaveLength(1);
 
 	// The changeset should have advanced due to the state mutation
-	expect(versionAAfterMutation[0]?.change_set_id).not.toEqual(
-		versionA.change_set_id
-	);
+	expect(versionAAfterMutation[0]?.commit_id).not.toEqual(versionA.commit_id);
 });
 
 test("direct mutation of a version shouldn't lead to duplicate entries", async () => {
@@ -523,8 +689,8 @@ test("direct mutation of a version shouldn't lead to duplicate entries", async (
 		{
 			id: versionA.id,
 			name: "versionA",
-			change_set_id: expect.any(String),
-			working_change_set_id: expect.any(String),
+			commit_id: expect.any(String),
+			working_commit_id: expect.any(String),
 		},
 	]);
 
@@ -552,24 +718,24 @@ test("direct mutation of a version shouldn't lead to duplicate entries", async (
 		{
 			id: versionA.id,
 			name: "new name",
-			change_set_id: expect.any(String),
-			working_change_set_id: expect.any(String),
+			commit_id: expect.any(String),
+			working_commit_id: expect.any(String),
 		},
 	]);
 
 	// the version was updated in the global version aka
 	// the versions change set did not change itself
-	expect(versionsAfterMutation[0]?.change_set_id).toEqual(
-		versionABeforeMutation[0]?.change_set_id
+	expect(versionsAfterMutation[0]?.commit_id).toEqual(
+		versionABeforeMutation[0]?.commit_id
 	);
 
-	// but the global version's change set id should have changed
-	expect(globalVersionAfterMutation.change_set_id).not.toEqual(
-		globalVersionBeforeMutation.change_set_id
+	// but the global version's commit id should have changed
+	expect(globalVersionAfterMutation.commit_id).not.toEqual(
+		globalVersionBeforeMutation.commit_id
 	);
 });
 
-test("should enforce UNIQUE constraint on working_change_set_id", async () => {
+test("should enforce UNIQUE constraint on working_commit_id", async () => {
 	const lix = await openLix({});
 
 	// Insert necessary change sets to satisfy foreign keys
@@ -583,14 +749,33 @@ test("should enforce UNIQUE constraint on working_change_set_id", async () => {
 		])
 		.execute();
 
-	// Insert first version referencing workingCs1
+	// Create required commits
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{ id: "commit_cs1", change_set_id: "cs1", lixcol_version_id: "global" },
+			{ id: "commit_cs2", change_set_id: "cs2", lixcol_version_id: "global" },
+			{
+				id: "working_commit_1",
+				change_set_id: "workingCs1",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "working_commit_2",
+				change_set_id: "workingCs2",
+				lixcol_version_id: "global",
+			},
+		])
+		.execute();
+
+	// Insert first version referencing working_commit_1
 	await lix.db
 		.insertInto("version")
 		.values({
 			id: "v1",
 			name: "version one",
-			change_set_id: "cs1",
-			working_change_set_id: "workingCs1",
+			commit_id: "commit_cs1",
+			working_commit_id: "working_commit_1",
 		})
 		.execute();
 
@@ -601,30 +786,30 @@ test("should enforce UNIQUE constraint on working_change_set_id", async () => {
 			.values({
 				id: "v2",
 				name: "version two",
-				change_set_id: "cs2", // Different historical point is fine
-				working_change_set_id: "workingCs1", // <<< Same working_change_set_id
+				commit_id: "commit_cs2", // Different historical point is fine
+				working_commit_id: "working_commit_1", // <<< Same working_commit_id
 			})
 			.execute()
 	).rejects.toThrow(
-		/Unique constraint violation.*working_change_set_id.*workingCs1/i
+		/Unique constraint violation.*working_commit_id.*working_commit_1/i
 	);
 
-	// Inserting another version with a DIFFERENT working_change_set_id should succeed
+	// Inserting another version with a DIFFERENT working_commit_id should succeed
 	await expect(
 		lix.db
 			.insertInto("version")
 			.values({
 				id: "v3",
 				name: "version three",
-				change_set_id: "cs1", // Can branch from same historical point
-				working_change_set_id: "workingCs2", // <<< Different working_change_set_id
+				commit_id: "commit_cs1", // Can branch from same historical point
+				working_commit_id: "working_commit_2", // <<< Different working_commit_id
 			})
 			.execute()
 	).resolves.toBeDefined();
 });
 
 // there was a bug that wiped the cache, leading to a missing change_set
-test("initial version's change_set_id and working_change_set_id should exist in the change_set table", async () => {
+test("initial version's commit_id and working_commit_id should exist in the tables", async () => {
 	const lix = await openLix({});
 
 	// Get the initial 'main' version
@@ -634,25 +819,25 @@ test("initial version's change_set_id and working_change_set_id should exist in
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	// Verify change_set_id exists in change_set table
-	const changeSet = await lix.db
-		.selectFrom("change_set")
-		.where("id", "=", mainVersion.change_set_id)
+	// Verify commit_id exists in commit table
+	const commit = await lix.db
+		.selectFrom("commit")
+		.where("id", "=", mainVersion.commit_id)
 		.selectAll()
 		.executeTakeFirst();
 
-	expect(changeSet).toBeDefined();
-	expect(changeSet?.id).toBe(mainVersion.change_set_id);
+	expect(commit).toBeDefined();
+	expect(commit?.id).toBe(mainVersion.commit_id);
 
-	// Verify working_change_set_id exists in change_set table
-	const workingChangeSet = await lix.db
-		.selectFrom("change_set")
-		.where("id", "=", mainVersion.working_change_set_id)
+	// Verify working_commit_id exists in commit table
+	const workingCommit = await lix.db
+		.selectFrom("commit")
+		.where("id", "=", mainVersion.working_commit_id)
 		.selectAll()
 		.executeTakeFirst();
 
-	expect(workingChangeSet).toBeDefined();
-	expect(workingChangeSet?.id).toBe(mainVersion.working_change_set_id);
+	expect(workingCommit).toBeDefined();
+	expect(workingCommit?.id).toBe(mainVersion.working_commit_id);
 });
 
 test("inherits_from_version_id should default to global", async () => {
@@ -667,13 +852,30 @@ test("inherits_from_version_id should default to global", async () => {
 		])
 		.execute();
 
+	// Create required commits
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{
+				id: "commit_1",
+				change_set_id: "change_set_1",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "working_commit_1",
+				change_set_id: "working_change_set_1",
+				lixcol_version_id: "global",
+			},
+		])
+		.execute();
+
 	await lix.db
 		.insertInto("version")
 		.values({
 			id: "test_version",
 			name: "Test Version",
-			change_set_id: "change_set_1",
-			working_change_set_id: "working_change_set_1",
+			commit_id: "commit_1",
+			working_commit_id: "working_commit_1",
 			inherits_from_version_id: undefined, // Should default to 'global'
 		})
 		.execute();
@@ -713,14 +915,31 @@ test("versions should have hidden property defaulting to false", async () => {
 		])
 		.execute();
 
+	// Create required commits
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{
+				id: "commit_test",
+				change_set_id: "cs_test",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "working_commit_test",
+				change_set_id: "working_cs_test",
+				lixcol_version_id: "global",
+			},
+		])
+		.execute();
+
 	// Insert a version without specifying hidden
 	await lix.db
 		.insertInto("version")
 		.values({
 			id: "test_version",
 			name: "Test Version",
-			change_set_id: "cs_test",
-			working_change_set_id: "working_cs_test",
+			commit_id: "commit_test",
+			working_commit_id: "working_commit_test",
 		})
 		.execute();
 
@@ -772,14 +991,31 @@ test("can explicitly set hidden to true", async () => {
 		])
 		.execute();
 
+	// Create required commits
+	await lix.db
+		.insertInto("commit_all")
+		.values([
+			{
+				id: "commit_hidden",
+				change_set_id: "cs_hidden",
+				lixcol_version_id: "global",
+			},
+			{
+				id: "working_commit_hidden",
+				change_set_id: "working_cs_hidden",
+				lixcol_version_id: "global",
+			},
+		])
+		.execute();
+
 	// Insert a version with hidden explicitly set to true
 	await lix.db
 		.insertInto("version")
 		.values({
 			id: "hidden_version",
 			name: "Hidden Version",
-			change_set_id: "cs_hidden",
-			working_change_set_id: "working_cs_hidden",
+			commit_id: "commit_hidden",
+			working_commit_id: "working_commit_hidden",
 			hidden: true,
 		})
 		.execute();