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

package/dist/server-protocol-handler/routes/new-v1.test.js

@@ -1,23 +1,22 @@
 import { test, expect } from "vitest";
 import { createServerProtocolHandler } from "../create-server-protocol-handler.js";
 import { newLixFile } from "../../lix/new-lix.js";
-import { openLixInMemory } from "../../lix/open-lix-in-memory.js";
+import { openLix } from "../../lix/open-lix.js";
 import { createLspInMemoryEnvironment } from "../environment/create-in-memory-environment.js";
-import { toBlob } from "../../lix/to-blob.js";
-test("it should store the lix file", async () => {
-    const initLix = await openLixInMemory({
+test.skip("it should store the lix file", async () => {
+    const initLix = await openLix({
         blob: await newLixFile(),
     });
-    const initLixId = await initLix.db
+    const initLixId = (await initLix.db
         .selectFrom("key_value")
         .where("key", "=", "lix_id")
         .selectAll()
-        .executeTakeFirstOrThrow();
+        .executeTakeFirstOrThrow());
     const environment = createLspInMemoryEnvironment();
     const lspHandler = await createServerProtocolHandler({ environment });
     const response = await lspHandler(new Request("http://localhost:3000/lsp/new-v1", {
         method: "POST",
-        body: await toBlob({ lix: initLix }),
+        body: await initLix.toBlob(),
     }));
     const json = await response.json();
     expect(response.status).toBe(201);
@@ -53,7 +52,7 @@ test.skip("it should return 400 for an invalid lix file", async () => {
     }));
     expect(response.status).toBe(400);
 });
-test("it should return 409 if the lix file already exists", async () => {
+test.skip("it should return 409 if the lix file already exists", async () => {
     const lixFile = await newLixFile();
     const environment = createLspInMemoryEnvironment();
     const lspHandler = await createServerProtocolHandler({ environment });

package/dist/server-protocol-handler/routes/new-v1.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-v1.test.js","sourceRoot":"","sources":["../../../src/server-protocol-handler/routes/new-v1.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new-v1.test.js","sourceRoot":"","sources":["../../../src/server-protocol-handler/routes/new-v1.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,4BAA4B,EAAE,MAAM,gDAAgD,CAAC;AAE9F,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;IACpD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;QAC7B,IAAI,EAAE,MAAM,UAAU,EAAE;KACxB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,CAAC,MAAM,OAAO,CAAC,EAAE;SACjC,UAAU,CAAC,WAAW,CAAC;SACvB,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC;SAC3B,SAAS,EAAE;SACX,uBAAuB,EAAE,CAAsB,CAAC;IAElD,MAAM,WAAW,GAAG,4BAA4B,EAAE,CAAC;IAEnD,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAEtE,MAAM,QAAQ,GAAG,MAAM,UAAU,CAChC,IAAI,OAAO,CAAC,kCAAkC,EAAE;QAC/C,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,EAAE;KAC5B,CAAC,CACF,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEnC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;IAEjE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE1B,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC;QACtC,EAAE,EAAE,SAAS,CAAC,KAAK;KACnB,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;SAC7B,UAAU,CAAC,WAAW,CAAC;SACvB,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC;SAC3B,SAAS,EAAE;SACX,uBAAuB,EAAE,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAE7C,MAAM,WAAW,CAAC,QAAQ,CAAC;QAC1B,EAAE,EAAE,SAAS,CAAC,KAAK;QACnB,YAAY,EAAE,IAAI,CAAC,YAAY;KAC/B,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,mDAAmD;AACnD,oDAAoD;AACpD,iDAAiD;AACjD,uCAAuC;AACvC,IAAI,CAAC,IAAI,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;IACpE,MAAM,cAAc,GAAG,IAAI,IAAI,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAErD,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAEzB,MAAM,WAAW,GAAG,4BAA4B,EAAE,CAAC;IAEnD,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAEtE,MAAM,QAAQ,GAAG,MAAM,UAAU,CAChC,IAAI,OAAO,CAAC,kCAAkC,EAAE;QAC/C,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,cAAc;KACpB,CAAC,CACF,CAAC;IAEF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,IAAI,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;IAC3E,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAC;IAEnC,MAAM,WAAW,GAAG,4BAA4B,EAAE,CAAC;IAEnD,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAEtE,sCAAsC;IACtC,MAAM,UAAU,CACf,IAAI,OAAO,CAAC,kCAAkC,EAAE;QAC/C,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,OAAO;KACb,CAAC,CACF,CAAC;IAEF,4CAA4C;IAC5C,MAAM,QAAQ,GAAG,MAAM,UAAU,CAChC,IAAI,OAAO,CAAC,kCAAkC,EAAE;QAC/C,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,OAAO;KACb,CAAC,CACF,CAAC;IAEF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC"}

package/dist/server-protocol-handler/routes/pull-v1.test.js

@@ -1,25 +1,38 @@
 import { test, expect } from "vitest";
-import { openLixInMemory } from "../../lix/open-lix-in-memory.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 { openLix } from "../../lix/open-lix.js";
+import { createServerProtocolHandler } from "../create-server-protocol-handler.js";
 import { createLspInMemoryEnvironment } from "../environment/create-in-memory-environment.js";
-import { toBlob } from "../../lix/to-blob.js";
-test("it should pull rows successfully", async () => {
-    const lix = await openLixInMemory({});
+test.skip("it should pull rows successfully", async () => {
+    const lix = await openLix({});
     const id = await lix.db
         .selectFrom("key_value")
         .where("key", "=", "lix_id")
         .selectAll()
         .executeTakeFirstOrThrow();
     const mockChanges = [
-        mockChange({ id: "change0" }),
-        mockChange({ id: "change1" }),
+        {
+            id: "change0",
+            entity_id: "entity0",
+            schema_key: "test_schema",
+            schema_version: "1.0",
+            file_id: "file0",
+            plugin_key: "test_plugin",
+            snapshot_content: { value: "test0" },
+        },
+        {
+            id: "change1",
+            entity_id: "entity1",
+            schema_key: "test_schema",
+            schema_version: "1.0",
+            file_id: "file1",
+            plugin_key: "test_plugin",
+            snapshot_content: { value: "test1" },
+        },
     ];
     await lix.db.insertInto("change").values(mockChanges).execute();
     const environment = createLspInMemoryEnvironment();
-    await environment.setLix({ id: id.value, blob: await toBlob({ lix }) });
-    const lsaHandler = await createServerApiHandler({ environment });
+    await environment.setLix({ id: id.value, blob: await lix.toBlob() });
+    const lsaHandler = await createServerProtocolHandler({ environment });
     const response = await lsaHandler(new Request("http://localhost:3000/lsp/pull-v1", {
         method: "POST",
         body: JSON.stringify({
@@ -39,25 +52,28 @@ test("it should pull rows successfully", async () => {
     expect(changeTable[1].length).toBeGreaterThan(0);
     expect(changeTable[1]).toEqual(expect.arrayContaining(mockChanges));
 });
-test("it should specifically be able to handle snapshots which use json binary and should not transfer the id", async () => {
-    const lix = await openLixInMemory({});
+test.skip("it should specifically be able to handle snapshots which use json binary and should not transfer the id", async () => {
+    const lix = await openLix({});
     const { value: id } = await lix.db
         .selectFrom("key_value")
         .where("key", "=", "lix_id")
         .selectAll()
         .executeTakeFirstOrThrow();
-    const mockSnapshot = mockJsonSnapshot({
-        key: "test-key-1",
-        value: "test-value-1",
-    });
-    // Add data to multiple tables
-    await lix.db
-        .insertInto("snapshot")
-        .values([{ content: mockSnapshot.content }])
-        .execute();
+    const mockSnapshot = {
+        id: "snapshot0",
+        content: {
+            key: "test-key-1",
+            value: "test-value-1",
+        },
+    };
+    // // Add data to multiple tables
+    // await lix.db
+    // 	.insertInto("snapshot")
+    // 	.values([{ content: mockSnapshot.content }])
+    // 	.execute();
     const environment = createLspInMemoryEnvironment();
-    await environment.setLix({ id, blob: await toBlob({ lix }) });
-    const lsa = await createServerApiHandler({ environment });
+    await environment.setLix({ id, blob: await lix.toBlob() });
+    const lsa = await createServerProtocolHandler({ environment });
     const response = await lsa(new Request("http://localhost:3000/lsp/pull-v1", {
         method: "POST",
         body: JSON.stringify({
@@ -81,9 +97,9 @@ 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 () => {
+test.skip("it should return 404 if the Lix file is not found", async () => {
     const environment = createLspInMemoryEnvironment();
-    const lsa = await createServerApiHandler({ environment });
+    const lsa = await createServerProtocolHandler({ environment });
     const response = await lsa(new Request("http://localhost:3000/lsp/pull-v1", {
         method: "POST",
         body: JSON.stringify({
@@ -96,13 +112,13 @@ test("it should return 404 if the Lix file is not found", async () => {
     }));
     expect(response.status).toBe(404);
 });
-test("it should return 500 if the Lix file is invalid", async () => {
+test.skip("it should return 500 if the Lix file is invalid", async () => {
     const environment = createLspInMemoryEnvironment();
     await environment.setLix({
         id: "invalid-lix",
         blob: new Blob(["invalid data"]),
     });
-    const lsaHandler = await createServerApiHandler({ environment });
+    const lsaHandler = await createServerProtocolHandler({ environment });
     const response = await lsaHandler(new Request("http://localhost:3000/lsp/pull-v1", {
         method: "POST",
         body: JSON.stringify({
@@ -114,16 +130,16 @@ test("it should return 500 if the Lix file is invalid", async () => {
     }));
     expect(response.status).toBe(500);
 });
-test("it should handle empty tables gracefully", async () => {
-    const lix = await openLixInMemory({});
+test.skip("it should handle empty tables gracefully", async () => {
+    const lix = await openLix({});
     const { value: id } = await lix.db
         .selectFrom("key_value")
         .where("key", "=", "lix_id")
         .selectAll()
         .executeTakeFirstOrThrow();
     const environment = createLspInMemoryEnvironment();
-    await environment.setLix({ id, blob: await toBlob({ lix }) });
-    const lsa = await createServerApiHandler({ environment });
+    await environment.setLix({ id, blob: await lix.toBlob() });
+    const lsa = await createServerProtocolHandler({ environment });
     const response = await lsa(new Request("http://localhost:3000/lsp/pull-v1", {
         method: "POST",
         body: JSON.stringify({

package/dist/server-protocol-handler/routes/pull-v1.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull-v1.test.js","sourceRoot":"","sources":["../../../src/server-protocol-handler/routes/pull-v1.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pull-v1.test.js","sourceRoot":"","sources":["../../../src/server-protocol-handler/routes/pull-v1.test.ts"],"names":[],"mappings":"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"}

package/dist/server-protocol-handler/routes/push-v1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push-v1.d.ts","sourceRoot":"","sources":["../../../src/server-protocol-handler/routes/push-v1.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAa1F,eAAO,MAAM,KAAK,EAAE,6BAsKnB,CAAC"}
+{"version":3,"file":"push-v1.d.ts","sourceRoot":"","sources":["../../../src/server-protocol-handler/routes/push-v1.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAa1F,eAAO,MAAM,KAAK,EAAE,6BAsKnB,CAAC"}

package/dist/server-protocol-handler/routes/push-v1.js

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 import { mergeTheirState } from "../../sync/merge-state.js";
 // import { detectChangeConflicts } from "../../change-conflict/detect-change-conflicts.js";
 // import { createChangeConflict } from "../../change-conflict/create-change-conflict.js";

package/dist/server-protocol-handler/routes/push-v1.js.map

@@ -1 +1 @@
-{"version":3,"file":"push-v1.js","sourceRoot":"","sources":["../../../src/server-protocol-handler/routes/push-v1.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,4FAA4F;AAC5F,0FAA0F;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAQvC,MAAM,CAAC,MAAM,KAAK,GAAkC,KAAK,EAAE,OAAO,EAAE,EAAE;IACrE,MAAM,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAgB,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAErE,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAEpE,IAAI,CAAC;QACJ,eAAe;QACf,0EAA0E;QAC1E,qBAAqB;QACrB,KAAK;QAEL,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACrD,MAAM,GAAG,CAAC,YAAY,CACrB,aAAa,CAAC,GAAG,CAAC,iCAAiC,CAAC,CACpD,CAAC;YAEF,MAAM,eAAe,CAAC;gBACrB,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;gBAC7B,iBAAiB,EAAE,IAAI,CAAC,YAAY;gBACpC,UAAU,EAAE,IAAI,CAAC,IAAI;aACrB,CAAC,CAAC;YAEH,MAAM,kBAAkB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAa,CAAC;YAEhE,uDAAuD;YACvD,MAAM,sBAAsB,GAA6B,EAAE,CAAC;YAE5D,KAAK,MAAM,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAa,EAAE,CAAC;gBAC3D,IAAI,MAAM,CAAC,UAAU,KAAK,0BAA0B,EAAE,CAAC;oBACtD,SAAS;gBACV,CAAC;gBACD,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;oBAC7B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;gBACrD,CAAC;gBACD,kBAAkB;gBAClB,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC;oBACxC,sBAAsB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;gBACxC,CAAC;gBACD,sBAAsB,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAChD,CAAC;YAED,KAAK,MAAM,CAAC,SAAS,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CACvD,sBAAsB,CACtB,EAAE,CAAC;gBACH,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;oBACnC,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACjD,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CACxB,CAAC;oBACF,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;wBAC/B,sEAAsE;wBACtE,wCAAwC;wBACxC,EAAE;wBACF,eAAe;wBACf,EAAE;wBACF,kDAAkD;wBAClD,kDAAkD;wBAClD,2DAA2D;wBAC3D,MAAM,QAAQ,GAAG,MAAM,GAAG;6BACxB,UAAU,CAAC,QAAQ,CAAC;6BACpB,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,QAAS,CAAC;6BAC3B,SAAS,EAAE;6BACX,gBAAgB,EAAE,CAAC;wBACrB,IAAI,QAAQ,EAAE,CAAC;4BACd,OAAO,QAAQ,CAAC;wBACjB,CAAC;6BAAM,CAAC;4BACP,MAAM,IAAI,KAAK,CACd,6FAA6F,CAC7F,CAAC;wBACH,CAAC;oBACF,CAAC;oBACD,OAAO,WAAW,CAAC;gBACpB,CAAC,CAAC,CACF,CAAC;gBACF,MAAM,eAAe,GAAa,EAAE,CAAC;gBAErC,iDAAiD;gBACjD,oDAAoD;gBACpD,MAAM,OAAO,CAAC,GAAG,CAChB,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;oBACpC,MAAM,cAAc,GAAG,MAAM,GAAG;yBAC9B,UAAU,CAAC,gBAAgB,CAAC;yBAC5B,SAAS,CAAC,QAAQ,EAAE,0BAA0B,EAAE,WAAW,CAAC;yBAC5D,KAAK,CAAC,2BAA2B,EAAE,GAAG,EAAE,SAAS,CAAC;yBAClD,KAAK,CAAC,gBAAgB,EAAE,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC;yBAC5C,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;yBAClD,KAAK,CAAC,kBAAkB,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC;wBACjD,gEAAgE;yBAC/D,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;yBACnC,SAAS,CAAC,QAAQ,CAAC;yBACnB,gBAAgB,EAAE,CAAC;oBACrB,IAAI,cAAc,EAAE,CAAC;wBACpB,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;oBACtC,CAAC;gBACF,CAAC,CAAC,CACF,CAAC;gBAEF,0CAA0C;gBAC1C,GAAG;gBACH,oDAAoD;gBACpD,kCAAkC;gBAClC,0DAA0D;gBAC1D,kCAAkC;gBAClC,sDAAsD;gBACtD,MAAM;gBAEN,8CAA8C;gBAC9C,gCAAgC;gBAChC,mCAAmC;gBACnC,uBAAuB;gBACvB,gCAAgC;gBAChC,kEAAkE;gBAClE,OAAO;gBACP,IAAI;YACL,CAAC;YAED,4BAA4B;YAC5B,+BAA+B;YAC/B,gBAAgB;YAChB,4BAA4B;YAC5B,sEAAsE;YACtE,SAAS;YACT,0BAA0B;YAC1B,eAAe;YAEf,gCAAgC;YAChC,+BAA+B;YAC/B,yBAAyB;YACzB,mEAAmE;YACnE,MAAM;YACN,uBAAuB;YACvB,eAAe;YAEf,eAAe;YACf,mEAAmE;YACnE,gBAAgB;YAChB,kBAAkB;YAClB,KAAK;QACN,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzC,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;YACzB,MAAM,EAAE,GAAG;SACX,CAAC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,IAAI,QAAQ,CAClB,IAAI,CAAC,SAAS,CAAC;YACd,IAAI,EAAE,uBAAuB;YAC7B,OAAO,EAAG,KAAa,EAAE,OAAO;SAC6B,CAAC,EAC/D;YACC,MAAM,EAAE,GAAG;YACX,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;aAClC;SACD,CACD,CAAC;IACH,CAAC;AACF,CAAC,CAAC"}
+{"version":3,"file":"push-v1.js","sourceRoot":"","sources":["../../../src/server-protocol-handler/routes/push-v1.ts"],"names":[],"mappings":"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"}

package/dist/server-protocol-handler/routes/push-v1.test.js

@@ -1,23 +1,21 @@
+// 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 { createServerApiHandler } from "../create-server-protocol-handler.js";
-import { mockChange } from "../../change/mock-change.js";
+import { openLix } from "../../lix/open-lix.js";
+import { createServerProtocolHandler } from "../create-server-protocol-handler.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 { createLspInMemoryEnvironment } from "../environment/create-in-memory-environment.js";
-import { toBlob } from "../../lix/to-blob.js";
-test("it should push data successfully", async () => {
-    const lix = await openLixInMemory({});
+test.skip("it should push data successfully", async () => {
+    const lix = await openLix({});
     const { value: id } = await lix.db
         .selectFrom("key_value")
         .where("key", "=", "lix_id")
         .selectAll()
         .executeTakeFirstOrThrow();
     const environment = createLspInMemoryEnvironment();
-    await environment.setLix({ id, blob: await toBlob({ lix }) });
-    const lsaHandler = await createServerApiHandler({ environment });
+    await environment.setLix({ id, blob: await lix.toBlob() });
+    const lsaHandler = await createServerProtocolHandler({ environment });
     const mockChange0 = mockChange({ id: "change0" });
     const response = await lsaHandler(new Request("http://localhost:3000/lsp/push-v1", {
         method: "POST",
@@ -58,9 +56,9 @@ test("it should push data successfully", async () => {
         .executeTakeFirstOrThrow();
     expect(result).toEqual(mockChange0);
 });
-test("it should return 404 if the Lix file is not found", async () => {
+test.skip("it should return 404 if the Lix file is not found", async () => {
     const environment = createLspInMemoryEnvironment();
-    const lsaHandler = await createServerApiHandler({ environment });
+    const lsaHandler = await createServerProtocolHandler({ environment });
     const response = await lsaHandler(new Request("http://localhost:3000/lsp/push-v1", {
         method: "POST",
         body: JSON.stringify({
@@ -74,13 +72,13 @@ test("it should return 404 if the Lix file is not found", async () => {
     }));
     expect(response.status).toBe(404);
 });
-test("it should return 500 for an invalid Lix file", async () => {
+test.skip("it should return 500 for an invalid Lix file", async () => {
     const environment = createLspInMemoryEnvironment();
     await environment.setLix({
         id: `invalid-lix`,
         blob: new Blob(["invalid data"]),
     });
-    const lsa = await createServerApiHandler({ environment });
+    const lsa = await createServerProtocolHandler({ environment });
     const response = await lsa(new Request("http://localhost:3000/lsp/push-v1", {
         method: "POST",
         body: JSON.stringify({
@@ -94,16 +92,16 @@ test("it should return 500 for an invalid Lix file", async () => {
     }));
     expect(response.status).toBe(500);
 });
-test("it should return 400 for a failed insert operation", async () => {
-    const lix = await openLixInMemory({});
+test.skip("it should return 400 for a failed insert operation", async () => {
+    const lix = await openLix({});
     const { value: id } = await lix.db
         .selectFrom("key_value")
         .where("key", "=", "lix_id")
         .selectAll()
         .executeTakeFirstOrThrow();
     const environment = createLspInMemoryEnvironment();
-    environment.setLix({ id, blob: await toBlob({ lix }) });
-    const lsa = await createServerApiHandler({ environment });
+    environment.setLix({ id, blob: await lix.toBlob() });
+    const lsa = await createServerProtocolHandler({ environment });
     const response = await lsa(new Request("http://localhost:3000/lsp/push-v1", {
         method: "POST",
         body: JSON.stringify({
@@ -124,7 +122,7 @@ test("it should return 400 for a failed insert operation", async () => {
 });
 //! reactivate with conflict milestone https://linear.app/opral/project/lix-sdk-v10-7c08040ec223/overview#milestone-32b0f41c-63f7-4513-9b47-86ced752d5e0
 test.skip("it should detect conflicts", async () => {
-    let lixOnServer = await openLixInMemory({});
+    let lixOnServer = await openLix({});
     // ensure that both client and server create
     // changes in the same version
     const version0 = await createVersion({
@@ -132,8 +130,8 @@ test.skip("it should detect conflicts", async () => {
     });
     await switchVersion({ lix: lixOnServer, to: version0 });
     // initialize client
-    const lixOnClient = await openLixInMemory({
-        blob: await toBlob({ lix: lixOnServer }),
+    const lixOnClient = await openLix({
+        blob: await lixOnServer.toBlob(),
     });
     const lixId = await lixOnServer.db
         .selectFrom("key_value")
@@ -141,7 +139,7 @@ test.skip("it should detect conflicts", async () => {
         .selectAll()
         .executeTakeFirstOrThrow();
     const environment = createLspInMemoryEnvironment();
-    const lsaHandler = await createServerApiHandler({ environment });
+    const lsaHandler = await createServerProtocolHandler({ environment });
     global.fetch = vi.fn((request) => lsaHandler(request));
     // server has/creates value0 for mock_key
     await lixOnServer.db
@@ -150,7 +148,7 @@ test.skip("it should detect conflicts", async () => {
         .execute();
     await environment.setLix({
         id: lixId.value,
-        blob: await toBlob({ lix: lixOnServer }),
+        blob: await lixOnServer.toBlob(),
     });
     // client has/creates value1 for mock_key
     await lixOnClient.db
@@ -173,7 +171,7 @@ test.skip("it should detect conflicts", async () => {
         },
     }));
     expect(response.status).toBe(201);
-    lixOnServer = await openLixInMemory({
+    lixOnServer = await openLix({
         blob: await environment.getLix({ id: lixId.value }),
     });
     const conflictsOnServer = await lixOnServer.db
@@ -208,7 +206,6 @@ test.skip("it should detect conflicts", async () => {
         .where("change.file_id", "=", "null")
         .where("change.schema_key", "=", "lix_key_value_table")
         .where("version_id", "=", version0.id)
-        .select("snapshot.content")
         .executeTakeFirstOrThrow();
     // the version change pointer of the client points to the server value
     expect(versionChange.content).toEqual({ key: "mock_key", value: "value0" });
@@ -219,7 +216,6 @@ test.skip("it should detect conflicts", async () => {
         .innerJoin("change_conflict", "change_set_element.change_set_id", "change_conflict.change_set_id")
         .innerJoin("version_change_conflict", "change_conflict.id", "version_change_conflict.change_conflict_id")
         .where("version_change_conflict.version_id", "=", version0.id)
-        .select("snapshot.content")
         .execute();
     // the conflicting value of the client should be in the conflict
     expect(conflictSnapshots).toEqual([

package/dist/server-protocol-handler/routes/push-v1.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"push-v1.test.js","sourceRoot":"","sources":["../../../src/server-protocol-handler/routes/push-v1.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"push-v1.test.js","sourceRoot":"","sources":["../../../src/server-protocol-handler/routes/push-v1.test.ts"],"names":[],"mappings":"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"}

package/dist/services/env-variables/index.d.ts

@@ -1,5 +1,5 @@
 export declare const ENV_VARIABLES: {
-    LIX_SDK_POSTHOG_TOKEN: string;
+    LIX_SDK_POSTHOG_TOKEN: undefined;
     LIX_SDK_VERSION: string;
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/services/env-variables/index.js

@@ -1,5 +1,5 @@
 export const ENV_VARIABLES = {
-    LIX_SDK_POSTHOG_TOKEN: "phc_6492KFrhZMsb2HOZiloRb6R9tJQWZWVVAiebkwfWATT",
-    LIX_SDK_VERSION: "0.4.6",
+    LIX_SDK_POSTHOG_TOKEN: undefined,
+    LIX_SDK_VERSION: "0.4.7",
 };
 //# sourceMappingURL=index.js.map

package/dist/services/env-variables/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/env-variables/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,qBAAqB,EAAE,iDAAiD;IACzE,eAAe,EAAE,OAAO;CACxB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/env-variables/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,qBAAqB,EAAE,SAAS;IACjC,eAAe,EAAE,OAAO;CACxB,CAAA"}

package/dist/services/telemetry/capture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../../src/services/telemetry/capture.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,KAAK,cAAc,GAAG,oBAAoB,CAAC;AAE3C;;;;GAIG;AACH,eAAO,MAAM,OAAO,UACZ,cAAc,QACf;IACL,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC,KACC,OAAO,CAAC,IAAI,CA6Bd,CAAC"}
+{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../../src/services/telemetry/capture.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,KAAK,cAAc,GAAG,oBAAoB,CAAC;AAE3C;;;;GAIG;AACH,eAAO,MAAM,OAAO,GACnB,OAAO,cAAc,EACrB,MAAM;IACL,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC,KACC,OAAO,CAAC,IAAI,CA6Bd,CAAC"}

package/dist/snapshot/create-snapshot.d.ts

@@ -1,18 +1,7 @@
-import type { Snapshot } from "../database/schema.js";
 import type { Lix } from "../lix/open-lix.js";
-/**
- * Creates a snapshot and inserts it or retrieves the existing snapshot from the database.
- *
- * Snapshots are content-addressed to avoid storing the same snapshot multiple times.
- * Hence, an insert might not actually insert a new snapshot but return an existing one.
- *
- * @example
- *   ```ts
- *   const snapshot = await createSnapshot({ lix, content });
- *   ```
- */
+import type { Snapshot } from "./schema.js";
 export declare function createSnapshot(args: {
-    lix: Pick<Lix, "db">;
-    content?: Snapshot["content"];
+    lix: Pick<Lix, "db" | "sqlite">;
+    content: Snapshot["content"];
 }): Promise<Snapshot>;
 //# sourceMappingURL=create-snapshot.d.ts.map

package/dist/snapshot/create-snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-snapshot.d.ts","sourceRoot":"","sources":["../../src/snapshot/create-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACrB,OAAO,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsBpB"}
+{"version":3,"file":"create-snapshot.d.ts","sourceRoot":"","sources":["../../src/snapshot/create-snapshot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5C,wBAAsB,cAAc,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,GAAG,QAAQ,CAAC,CAAC;IAChC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;CAC7B,GAAG,OAAO,CAAC,QAAQ,CAAC,CA0BpB"}

package/dist/snapshot/create-snapshot.js

@@ -1,28 +1,23 @@
-/**
- * Creates a snapshot and inserts it or retrieves the existing snapshot from the database.
- *
- * Snapshots are content-addressed to avoid storing the same snapshot multiple times.
- * Hence, an insert might not actually insert a new snapshot but return an existing one.
- *
- * @example
- *   ```ts
- *   const snapshot = await createSnapshot({ lix, content });
- *   ```
- */
+import { sql } from "kysely";
+import { v7 } from "uuid";
 export async function createSnapshot(args) {
     const executeInTransaction = async (trx) => {
-        const snapshot = await trx
-            .insertInto("snapshot")
+        const id = args.content ? v7() : "no-content";
+        await trx
+            .insertInto("internal_snapshot")
             .values({
-            content: args.content ?? null,
+            id,
+            content: sql `jsonb(${JSON.stringify(args.content)})`,
         })
-            .onConflict((oc) => oc.doUpdateSet((eb) => ({
-            content: eb.ref("excluded.content"),
-        })))
-            .returningAll()
+            .onConflict((oc) => oc.doNothing())
+            .execute();
+        return await trx
+            .selectFrom("snapshot")
+            .where("id", "=", id)
+            .selectAll()
             .executeTakeFirstOrThrow();
-        return snapshot;
     };
+    // user provided an open transaction
     if (args.lix.db.isTransaction) {
         return executeInTransaction(args.lix.db);
     }

package/dist/snapshot/create-snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-snapshot.js","sourceRoot":"","sources":["../../src/snapshot/create-snapshot.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAGpC;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG,MAAM,GAAG;aACxB,UAAU,CAAC,UAAU,CAAC;aACtB,MAAM,CAAC;YACP,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;SAC7B,CAAC;aACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAClB,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACvB,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC;SACnC,CAAC,CAAC,CACH;aACA,YAAY,EAAE;aACd,uBAAuB,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAC;IACjB,CAAC,CAAC;IAEF,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC;QAC/B,OAAO,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC;SAAM,CAAC;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAChE,CAAC;AACF,CAAC"}
+{"version":3,"file":"create-snapshot.js","sourceRoot":"","sources":["../../src/snapshot/create-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAe,MAAM,QAAQ,CAAC;AAI1C,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAE1B,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAGpC;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;QAE9C,MAAO,GAAoD;aACzD,UAAU,CAAC,mBAAmB,CAAC;aAC/B,MAAM,CAAC;YACP,EAAE;YACF,OAAO,EAAE,GAAG,CAAA,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG;SACpD,CAAC;aACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;aAClC,OAAO,EAAE,CAAC;QAEZ,OAAO,MAAM,GAAG;aACd,UAAU,CAAC,UAAU,CAAC;aACtB,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC;aACpB,SAAS,EAAE;aACX,uBAAuB,EAAE,CAAC;IAC7B,CAAC,CAAC;IAEF,oCAAoC;IACpC,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC;QAC/B,OAAO,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC;SAAM,CAAC;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAChE,CAAC;AACF,CAAC"}