@lix-js/sdk 0.4.4 → 0.4.5

package/src/{server-api-handler → server-protocol-handler}/routes/pull-v1.test.ts

@@ -1,14 +1,14 @@
 import { test, expect } from "vitest";
-import * as LixServerApi from "@lix-js/server-api-schema";
+import type * as LixServerProtocol from "@lix-js/server-protocol-schema";
 import { openLixInMemory } from "../../lix/open-lix-in-memory.js";
-import { createServerApiHandler } from "../create-server-api-handler.js";
+import { createServerApiHandler } from "../create-server-protocol-handler.js";
 import { mockJsonSnapshot } from "../../snapshot/mock-json-snapshot.js";
 import { mockChange } from "../../change/mock-change.js";
-import { createLsaInMemoryEnvironment } from "../environment/create-in-memory-environment.js";
+import { createLspInMemoryEnvironment } from "../environment/create-in-memory-environment.js";
 import { toBlob } from "../../lix/to-blob.js";
 
 type RequestBody =
-	LixServerApi.paths["/lsa/pull-v1"]["post"]["requestBody"]["content"]["application/json"];
+	LixServerProtocol.paths["/lsp/pull-v1"]["post"]["requestBody"]["content"]["application/json"];
 
 test("it should pull rows successfully", async () => {
 	const lix = await openLixInMemory({});
@@ -26,14 +26,14 @@ test("it should pull rows successfully", async () => {
 
 	await lix.db.insertInto("change").values(mockChanges).execute();
 
-	const environment = createLsaInMemoryEnvironment();
+	const environment = createLspInMemoryEnvironment();
 
 	await environment.setLix({ id: id.value, blob: await toBlob({ lix }) });
 
 	const lsaHandler = await createServerApiHandler({ environment });
 
 	const response = await lsaHandler(
-		new Request("http://localhost:3000/lsa/pull-v1", {
+		new Request("http://localhost:3000/lsp/pull-v1", {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: id.value,
@@ -48,7 +48,7 @@ test("it should pull rows successfully", async () => {
 
 	expect(response.status).toBe(200);
 	const responseJson =
-		(await response.json()) as LixServerApi.paths["/lsa/pull-v1"]["post"]["responses"]["200"]["content"]["application/json"];
+		(await response.json()) as LixServerProtocol.paths["/lsp/pull-v1"]["post"]["responses"]["200"]["content"]["application/json"];
 
 	expect(responseJson.data).toBeDefined();
 
@@ -79,13 +79,13 @@ test("it should specifically be able to handle snapshots which use json binary a
 		.values([{ content: mockSnapshot.content }])
 		.execute();
 
-	const environment = createLsaInMemoryEnvironment();
+	const environment = createLspInMemoryEnvironment();
 	await environment.setLix({ id, blob: await toBlob({ lix }) });
 
 	const lsa = await createServerApiHandler({ environment });
 
 	const response = await lsa(
-		new Request("http://localhost:3000/lsa/pull-v1", {
+		new Request("http://localhost:3000/lsp/pull-v1", {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: id,
@@ -99,7 +99,7 @@ test("it should specifically be able to handle snapshots which use json binary a
 
 	expect(response.status).toBe(200);
 	const responseJson =
-		(await response.json()) as LixServerApi.paths["/lsa/pull-v1"]["post"]["responses"]["200"]["content"]["application/json"];
+		(await response.json()) as LixServerProtocol.paths["/lsp/pull-v1"]["post"]["responses"]["200"]["content"]["application/json"];
 
 	expect(responseJson.data).toBeDefined();
 
@@ -119,12 +119,12 @@ test("it should specifically be able to handle snapshots which use json binary a
 });
 
 test("it should return 404 if the Lix file is not found", async () => {
-	const environment = createLsaInMemoryEnvironment();
+	const environment = createLspInMemoryEnvironment();
 
 	const lsa = await createServerApiHandler({ environment });
 
 	const response = await lsa(
-		new Request("http://localhost:3000/lsa/pull-v1", {
+		new Request("http://localhost:3000/lsp/pull-v1", {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: "nonexistent-id",
@@ -140,7 +140,7 @@ test("it should return 404 if the Lix file is not found", async () => {
 });
 
 test("it should return 500 if the Lix file is invalid", async () => {
-	const environment = createLsaInMemoryEnvironment();
+	const environment = createLspInMemoryEnvironment();
 
 	await environment.setLix({
 		id: "invalid-lix",
@@ -150,7 +150,7 @@ test("it should return 500 if the Lix file is invalid", async () => {
 	const lsaHandler = await createServerApiHandler({ environment });
 
 	const response = await lsaHandler(
-		new Request("http://localhost:3000/lsa/pull-v1", {
+		new Request("http://localhost:3000/lsp/pull-v1", {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: "invalid-lix",
@@ -172,13 +172,13 @@ test("it should handle empty tables gracefully", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
+	const environment = createLspInMemoryEnvironment();
 	await environment.setLix({ id, blob: await toBlob({ lix }) });
 
 	const lsa = await createServerApiHandler({ environment });
 
 	const response = await lsa(
-		new Request("http://localhost:3000/lsa/pull-v1", {
+		new Request("http://localhost:3000/lsp/pull-v1", {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: id,

package/src/{server-api-handler → server-protocol-handler}/routes/pull-v1.ts

@@ -1,13 +1,14 @@
-import type * as LixServerApi from "@lix-js/server-api-schema";
-import type { LixServerApiHandlerRoute } from "../create-server-api-handler.js";
+import type * as LixServerProtocol from "@lix-js/server-protocol-schema";
+import type { LixServerProtocolHandlerRoute } from "../create-server-protocol-handler.js";
 import { getDiffingRows } from "../../sync/get-diffing-rows.js";
 
 type RequestBody =
-	LixServerApi.paths["/lsa/pull-v1"]["post"]["requestBody"]["content"]["application/json"];
+	LixServerProtocol.paths["/lsp/pull-v1"]["post"]["requestBody"]["content"]["application/json"];
 
-type ResponseBody = LixServerApi.paths["/lsa/pull-v1"]["post"]["responses"];
+type ResponseBody =
+	LixServerProtocol.paths["/lsp/pull-v1"]["post"]["responses"];
 
-export const route: LixServerApiHandlerRoute = async (context) => {
+export const route: LixServerProtocolHandlerRoute = async (context) => {
 	const body = (await context.request.json()) as RequestBody;
 	const exists = await context.environment.hasLix({ id: body.lix_id });
 

package/src/{server-api-handler → server-protocol-handler}/routes/push-v1.test.ts

@@ -1,14 +1,14 @@
 import { test, expect, vi } from "vitest";
-import * as LixServerApi from "@lix-js/server-api-schema";
+import type * as LixServerProtocol from "@lix-js/server-protocol-schema";
 import { openLixInMemory } from "../../lix/open-lix-in-memory.js";
-import { createServerApiHandler } from "../create-server-api-handler.js";
+import { createServerApiHandler } from "../create-server-protocol-handler.js";
 import type { Change } from "../../database/schema.js";
 import { mockChange } from "../../change/mock-change.js";
 import { getDiffingRows } from "../../sync/get-diffing-rows.js";
 import { createVersion } from "../../version/create-version.js";
 import { switchVersion } from "../../version/switch-version.js";
 import { pullFromServer } from "../../sync/pull-from-server.js";
-import { createLsaInMemoryEnvironment } from "../environment/create-in-memory-environment.js";
+import { createLspInMemoryEnvironment } from "../environment/create-in-memory-environment.js";
 import { toBlob } from "../../lix/to-blob.js";
 
 test("it should push data successfully", async () => {
@@ -19,7 +19,7 @@ test("it should push data successfully", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
+	const environment = createLspInMemoryEnvironment();
 	await environment.setLix({ id, blob: await toBlob({ lix }) });
 
 	const lsaHandler = await createServerApiHandler({ environment });
@@ -27,7 +27,7 @@ test("it should push data successfully", async () => {
 	const mockChange0 = mockChange({ id: "change0" });
 
 	const response = await lsaHandler(
-		new Request("http://localhost:3000/lsa/push-v1", {
+		new Request("http://localhost:3000/lsp/push-v1", {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: id,
@@ -50,7 +50,7 @@ test("it should push data successfully", async () => {
 					],
 					change: [mockChange0] satisfies Change[],
 				},
-			} satisfies LixServerApi.paths["/lsa/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
+			} satisfies LixServerProtocol.paths["/lsp/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
 			headers: {
 				"Content-Type": "application/json",
 			},
@@ -73,18 +73,18 @@ test("it should push data successfully", async () => {
 });
 
 test("it should return 404 if the Lix file is not found", async () => {
-	const environment = createLsaInMemoryEnvironment();
+	const environment = createLspInMemoryEnvironment();
 
 	const lsaHandler = await createServerApiHandler({ environment });
 
 	const response = await lsaHandler(
-		new Request("http://localhost:3000/lsa/push-v1", {
+		new Request("http://localhost:3000/lsp/push-v1", {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: "nonexistent-id",
 				vector_clock: [],
 				data: {},
-			} satisfies LixServerApi.paths["/lsa/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
+			} satisfies LixServerProtocol.paths["/lsp/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
 			headers: {
 				"Content-Type": "application/json",
 			},
@@ -95,7 +95,7 @@ test("it should return 404 if the Lix file is not found", async () => {
 });
 
 test("it should return 500 for an invalid Lix file", async () => {
-	const environment = createLsaInMemoryEnvironment();
+	const environment = createLspInMemoryEnvironment();
 
 	await environment.setLix({
 		id: `invalid-lix`,
@@ -105,13 +105,13 @@ test("it should return 500 for an invalid Lix file", async () => {
 	const lsa = await createServerApiHandler({ environment });
 
 	const response = await lsa(
-		new Request("http://localhost:3000/lsa/push-v1", {
+		new Request("http://localhost:3000/lsp/push-v1", {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: "invalid-lix",
 				vector_clock: [],
 				data: {},
-			} satisfies LixServerApi.paths["/lsa/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
+			} satisfies LixServerProtocol.paths["/lsp/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
 			headers: {
 				"Content-Type": "application/json",
 			},
@@ -129,14 +129,14 @@ test("it should return 400 for a failed insert operation", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
+	const environment = createLspInMemoryEnvironment();
 
 	environment.setLix({ id, blob: await toBlob({ lix }) });
 
 	const lsa = await createServerApiHandler({ environment });
 
 	const response = await lsa(
-		new Request("http://localhost:3000/lsa/push-v1", {
+		new Request("http://localhost:3000/lsp/push-v1", {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: id,
@@ -144,7 +144,7 @@ test("it should return 400 for a failed insert operation", async () => {
 				data: {
 					nonexistent_table: [{ key: "test", value: "test value" }],
 				},
-			} satisfies LixServerApi.paths["/lsa/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
+			} satisfies LixServerProtocol.paths["/lsp/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
 			headers: {
 				"Content-Type": "application/json",
 			},
@@ -179,7 +179,7 @@ test.skip("it should detect conflicts", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
+	const environment = createLspInMemoryEnvironment();
 
 	const lsaHandler = await createServerApiHandler({ environment });
 
@@ -208,13 +208,13 @@ test.skip("it should detect conflicts", async () => {
 	});
 
 	const response = await lsaHandler(
-		new Request("http://localhost:3000/lsa/push-v1", {
+		new Request("http://localhost:3000/lsp/push-v1", {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: lixId.value,
 				vector_clock: state,
 				data: tableRowsToPush,
-			} satisfies LixServerApi.paths["/lsa/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
+			} satisfies LixServerProtocol.paths["/lsp/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
 			headers: {
 				"Content-Type": "application/json",
 			},

package/src/{server-api-handler → server-protocol-handler}/routes/push-v1.ts

@@ -1,5 +1,5 @@
-import type * as LixServerApi from "@lix-js/server-api-schema";
-import type { LixServerApiHandlerRoute } from "../create-server-api-handler.js";
+import type * as LixServerProtocol from "@lix-js/server-protocol-schema";
+import type { LixServerProtocolHandlerRoute } from "../create-server-protocol-handler.js";
 import { mergeTheirState } from "../../sync/merge-state.js";
 import type { Change } from "../../database/schema.js";
 // import { detectChangeConflicts } from "../../change-conflict/detect-change-conflicts.js";
@@ -7,11 +7,12 @@ import type { Change } from "../../database/schema.js";
 import { CompiledQuery } from "kysely";
 
 type RequestBody =
-	LixServerApi.paths["/lsa/push-v1"]["post"]["requestBody"]["content"]["application/json"];
+	LixServerProtocol.paths["/lsp/push-v1"]["post"]["requestBody"]["content"]["application/json"];
 
-type ResponseBody = LixServerApi.paths["/lsa/push-v1"]["post"]["responses"];
+type ResponseBody =
+	LixServerProtocol.paths["/lsp/push-v1"]["post"]["responses"];
 
-export const route: LixServerApiHandlerRoute = async (context) => {
+export const route: LixServerProtocolHandlerRoute = async (context) => {
 	const body = (await context.request.json()) as RequestBody;
 	const exists = await context.environment.hasLix({ id: body.lix_id });
 

package/src/sync/pull-from-server.test.ts

@@ -1,9 +1,9 @@
 import { expect, test, vi } from "vitest";
-import { createServerApiHandler } from "../server-api-handler/create-server-api-handler.js";
+import { createServerProtocolHandler } from "../server-protocol-handler/create-server-protocol-handler.js";
 import { openLixInMemory } from "../lix/open-lix-in-memory.js";
 import { pullFromServer } from "./pull-from-server.js";
 import { mockJsonSnapshot } from "../snapshot/mock-json-snapshot.js";
-import { createLsaInMemoryEnvironment } from "../server-api-handler/environment/create-in-memory-environment.js";
+import { createLspInMemoryEnvironment } from "../server-protocol-handler/environment/create-in-memory-environment.js";
 import { toBlob } from "../lix/to-blob.js";
 
 test("pull rows of multiple tables from server successfully and applies them", async () => {
@@ -19,10 +19,10 @@ test("pull rows of multiple tables from server successfully and applies them", a
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
-	const lsaHandler = await createServerApiHandler({ environment });
+	const environment = createLspInMemoryEnvironment();
+	const lspHandler = await createServerProtocolHandler({ environment });
 
-	global.fetch = vi.fn((request) => lsaHandler(request));
+	global.fetch = vi.fn((request) => lspHandler(request));
 
 	await lixOnServer.db
 		.insertInto("account")
@@ -38,8 +38,8 @@ test("pull rows of multiple tables from server successfully and applies them", a
 		.execute();
 
 	// initialize the lix on the server with the mock data
-	await lsaHandler(
-		new Request("http://localhost:3000/lsa/new-v1", {
+	await lspHandler(
+		new Request("http://localhost:3000/lsp/new-v1", {
 			method: "POST",
 			body: await toBlob({ lix: lixOnServer }),
 			headers: {
@@ -85,10 +85,10 @@ test("it handles snapshot.content being json binary", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
-	const lsaHandler = await createServerApiHandler({ environment });
+	const environment = createLspInMemoryEnvironment();
+	const lspHandler = await createServerProtocolHandler({ environment });
 
-	global.fetch = vi.fn((request) => lsaHandler(request));
+	global.fetch = vi.fn((request) => lspHandler(request));
 
 	const mockSnapshot = mockJsonSnapshot({
 		location: "Berlin",
@@ -103,8 +103,8 @@ test("it handles snapshot.content being json binary", async () => {
 		.execute();
 
 	// initialize the lix on the server with the mock data
-	await lsaHandler(
-		new Request("http://localhost:3000/lsa/new-v1", {
+	await lspHandler(
+		new Request("http://localhost:3000/lsp/new-v1", {
 			method: "POST",
 			body: await toBlob({ lix: lixOnServer }),
 			headers: {
@@ -150,14 +150,14 @@ test("rows changed on the client more recently should not be updated", async ()
 		blob: await toBlob({ lix: lixOnServer }),
 	});
 
-	const environment = createLsaInMemoryEnvironment();
-	const lsaHandler = await createServerApiHandler({ environment });
+	const environment = createLspInMemoryEnvironment();
+	const lspHandler = await createServerProtocolHandler({ environment });
 
-	global.fetch = vi.fn((request) => lsaHandler(request));
+	global.fetch = vi.fn((request) => lspHandler(request));
 
 	// initialize the lix on the server with the mock data
-	await lsaHandler(
-		new Request("http://localhost:3000/lsa/new-v1", {
+	await lspHandler(
+		new Request("http://localhost:3000/lsp/new-v1", {
 			method: "POST",
 			body: await toBlob({ lix: lixOnServer }),
 			headers: {
@@ -195,10 +195,10 @@ test("rows changed on the client more recently should not be updated", async ()
 // the change table now models "change control". no more last edit wins needed
 test.skip("rows changed on the server more recently should be updated on the client", async () => {
 	// setup mock server
-	const environment = createLsaInMemoryEnvironment();
-	const lsaHandler = await createServerApiHandler({ environment });
+	const environment = createLspInMemoryEnvironment();
+	const lspHandler = await createServerProtocolHandler({ environment });
 
-	global.fetch = vi.fn((request) => lsaHandler(request));
+	global.fetch = vi.fn((request) => lspHandler(request));
 
 	// create a lix and clone it for the client - so they share the same lix id
 	const remoteLix = await openLixInMemory({});
@@ -243,8 +243,8 @@ test.skip("rows changed on the server more recently should be updated on the cli
 		.execute();
 
 	// initialize the lix on the server with the mock data
-	await lsaHandler(
-		new Request("http://localhost:3000/lsa/new-v1", {
+	await lspHandler(
+		new Request("http://localhost:3000/lsp/new-v1", {
 			method: "POST",
 			body: await toBlob({ lix: remoteLix }),
 			headers: {
@@ -302,14 +302,14 @@ test.skip("rows changed on the server more recently should be updated on the cli
 // 		.selectAll()
 // 		.executeTakeFirstOrThrow();
 
-// 	const environment = createLsaInMemoryEnvironment();
-// 	const lsaHandler = await createServerApiHandler({ environment });
+// 	const environment = createLspInMemoryEnvironment();
+// 	const lspHandler = await createServerProtocolHandler({ environment });
 
-// 	global.fetch = vi.fn((request) => lsaHandler(request));
+// 	global.fetch = vi.fn((request) => lspHandler(request));
 
 // 	// initialize the lix on the server
-// 	await lsaHandler(
-// 		new Request("http://localhost:3000/lsa/new", {
+// 	await lspHandler(
+// 		new Request("http://localhost:3000/lsp/new", {
 // 			method: "POST",
 // 			body: await lix.toBlob(),
 // 		})
@@ -354,10 +354,10 @@ test("non-conflicting changes from the server should for the same version should
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
-	const lsaHandler = await createServerApiHandler({ environment });
+	const environment = createLspInMemoryEnvironment();
+	const lspHandler = await createServerProtocolHandler({ environment });
 
-	global.fetch = vi.fn((request) => lsaHandler(request));
+	global.fetch = vi.fn((request) => lspHandler(request));
 
 	const lixOnServer = await openLixInMemory({ blob: await toBlob({ lix }) });
 
@@ -389,8 +389,8 @@ test("non-conflicting changes from the server should for the same version should
 		])
 	);
 
-	await lsaHandler(
-		new Request("http://localhost:3000/lsa/new-v1", {
+	await lspHandler(
+		new Request("http://localhost:3000/lsp/new-v1", {
 			method: "POST",
 			body: await toBlob({ lix: lixOnServer }),
 			headers: {

package/src/sync/pull-from-server.ts

@@ -1,5 +1,5 @@
 import type { Lix } from "../lix/open-lix.js";
-import * as LixServerApi from "@lix-js/server-api-schema";
+import type * as LixServerProtocol from "@lix-js/server-protocol-schema";
 import { mergeTheirState, type VectorClock } from "./merge-state.js";
 import { applyChanges } from "../change/apply-changes.js";
 import type { Change } from "../database/schema.js";
@@ -21,12 +21,12 @@ export async function pullFromServer(args: {
 
 	// 2. query the state from the server using the clients vector clock
 	const response = await fetch(
-		new Request(`${args.serverUrl}/lsa/pull-v1`, {
+		new Request(`${args.serverUrl}/lsp/pull-v1`, {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: args.id,
 				vector_clock: sessionStatesClient,
-			} satisfies LixServerApi.paths["/lsa/pull-v1"]["post"]["requestBody"]["content"]["application/json"]),
+			} satisfies LixServerProtocol.paths["/lsp/pull-v1"]["post"]["requestBody"]["content"]["application/json"]),
 			headers: {
 				"Content-Type": "application/json",
 			},
@@ -49,11 +49,11 @@ export async function pullFromServer(args: {
 	// 3. Client receives the data (added/changed rows + vector clock) from the server
 	//   - client could have moved forward in the meantime!
 	const data = (
-		body as LixServerApi.paths["/lsa/pull-v1"]["post"]["responses"]["200"]["content"]["application/json"]
+		body as LixServerProtocol.paths["/lsp/pull-v1"]["post"]["responses"]["200"]["content"]["application/json"]
 	).data;
 
 	const sessionStateServer = (
-		body as LixServerApi.paths["/lsa/pull-v1"]["post"]["responses"]["200"]["content"]["application/json"]
+		body as LixServerProtocol.paths["/lsp/pull-v1"]["post"]["responses"]["200"]["content"]["application/json"]
 	).vector_clock;
 
 	const changes = (data["change"] ?? []) as Change[];

package/src/sync/push-to-server.test.ts

@@ -1,5 +1,5 @@
 import { expect, test, vi } from "vitest";
-import { createServerApiHandler } from "../server-api-handler/create-server-api-handler.js";
+import { createServerProtocolHandler } from "../server-protocol-handler/create-server-protocol-handler.js";
 import { openLixInMemory } from "../lix/open-lix-in-memory.js";
 import { pushToServer } from "./push-to-server.js";
 import type { LixFile } from "../database/schema.js";
@@ -8,7 +8,7 @@ import { newLixFile } from "../lix/new-lix.js";
 import type { NewKeyValue } from "../key-value/database-schema.js";
 import { mockJsonSnapshot } from "../snapshot/mock-json-snapshot.js";
 import { pullFromServer } from "./pull-from-server.js";
-import { createLsaInMemoryEnvironment } from "../server-api-handler/environment/create-in-memory-environment.js";
+import { createLspInMemoryEnvironment } from "../server-protocol-handler/environment/create-in-memory-environment.js";
 import { toBlob } from "../lix/to-blob.js";
 
 test("push rows of multiple tables to server successfully", async () => {
@@ -22,14 +22,14 @@ test("push rows of multiple tables to server successfully", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
-	const lsaHandler = await createServerApiHandler({ environment });
+	const environment = createLspInMemoryEnvironment();
+	const lspHandler = await createServerProtocolHandler({ environment });
 
-	global.fetch = vi.fn((request) => lsaHandler(request));
+	global.fetch = vi.fn((request) => lspHandler(request));
 
 	// initialize the lix on the server
-	await lsaHandler(
-		new Request("http://localhost:3000/lsa/new-v1", {
+	await lspHandler(
+		new Request("http://localhost:3000/lsp/new-v1", {
 			method: "POST",
 			body: await toBlob({ lix }),
 		})
@@ -103,14 +103,14 @@ test("push-pull-push with two clients", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
-	const lsaHandler = await createServerApiHandler({ environment });
+	const environment = createLspInMemoryEnvironment();
+	const lspHandler = await createServerProtocolHandler({ environment });
 
-	global.fetch = vi.fn((request) => lsaHandler(request));
+	global.fetch = vi.fn((request) => lspHandler(request));
 
 	// Initialize the lix on the server
-	await lsaHandler(
-		new Request("http://localhost:3000/lsa/new-v1", {
+	await lspHandler(
+		new Request("http://localhost:3000/lsp/new-v1", {
 			method: "POST",
 			body: await toBlob({ lix: client1 }),
 		})
@@ -286,14 +286,14 @@ test("it should handle snapshots.content json binaries", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
-	const lsaHandler = await createServerApiHandler({ environment });
+	const environment = createLspInMemoryEnvironment();
+	const lspHandler = await createServerProtocolHandler({ environment });
 
-	global.fetch = vi.fn((request) => lsaHandler(request));
+	global.fetch = vi.fn((request) => lspHandler(request));
 
 	// initialize the lix on the server
-	await lsaHandler(
-		new Request("http://localhost:3000/lsa/new-v1", {
+	await lspHandler(
+		new Request("http://localhost:3000/lsp/new-v1", {
 			method: "POST",
 			body: await toBlob({ lix }),
 		})
@@ -340,14 +340,14 @@ test.todo("it should handle binary values", async () => {
 		.selectAll()
 		.executeTakeFirstOrThrow();
 
-	const environment = createLsaInMemoryEnvironment();
-	const lsaHandler = await createServerApiHandler({ environment });
+	const environment = createLspInMemoryEnvironment();
+	const lspHandler = await createServerProtocolHandler({ environment });
 
-	global.fetch = vi.fn((request) => lsaHandler(request));
+	global.fetch = vi.fn((request) => lspHandler(request));
 
 	// initialize the lix on the server
-	await lsaHandler(
-		new Request("http://localhost:3000/lsa/new", {
+	await lspHandler(
+		new Request("http://localhost:3000/lsp/new", {
 			method: "POST",
 			body: await toBlob({ lix }),
 		})

package/src/sync/push-to-server.ts

@@ -1,4 +1,4 @@
-import type * as LixServerProtocol from "../../../lix-server-api-schema/dist/schema.js";
+import type * as LixServerProtocol from "@lix-js/server-protocol-schema";
 import type { Lix } from "../lix/open-lix.js";
 import type { VectorClock } from "./merge-state.js";
 import { getDiffingRows } from "./get-diffing-rows.js";
@@ -28,13 +28,13 @@ export async function pushToServer(args: {
 	}
 
 	const response = await fetch(
-		new Request(`${args.serverUrl}/lsa/push-v1`, {
+		new Request(`${args.serverUrl}/lsp/push-v1`, {
 			method: "POST",
 			body: JSON.stringify({
 				lix_id: args.id,
 				vector_clock: state,
 				data: tableRowsToPush,
-			} satisfies LixServerProtocol.paths["/lsa/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
+			} satisfies LixServerProtocol.paths["/lsp/push-v1"]["post"]["requestBody"]["content"]["application/json"]),
 			headers: {
 				"Content-Type": "application/json",
 			},