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

package/dist/change-conflict/detect-diverging-entity-conflict.test.js

@@ -1,8 +1,10 @@
+// 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 { detectDivergingEntityConflict, LIX_DIVERGING_ENTITY_CONFLICT_KEY, } from "./detect-diverging-entity-conflict.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 = [
         {
             id: "change0",
@@ -11,7 +13,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",
@@ -20,7 +22,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",
@@ -29,7 +31,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,
         },
     ];
     await lix.db
@@ -53,8 +55,8 @@ test("it should detect a diverging entity conflict", async () => {
         conflictingChangeIds: new Set(["change1", "change2"]),
     });
 });
-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 = [
         {
             id: "change0",
@@ -63,7 +65,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",
@@ -72,7 +74,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",
@@ -81,7 +83,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,
         },
     ];
     await lix.db
@@ -98,8 +100,8 @@ test("it should return a conflict if no common ancestor is found (two clients cr
         conflictingChangeIds: new Set(["change0", "change1"]),
     });
 });
-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 = [
         {
             id: "change0",
@@ -108,7 +110,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",
@@ -117,7 +119,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,
         },
     ];
     await lix.db
@@ -138,8 +140,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 = [
         {
             id: "change0",
@@ -148,7 +150,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",
@@ -157,7 +159,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",
@@ -166,7 +168,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",
@@ -175,7 +177,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,
         },
     ];
     await lix.db.insertInto("change").values(mockChanges).execute();

package/dist/change-conflict/detect-diverging-entity-conflict.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"detect-diverging-entity-conflict.test.js","sourceRoot":"","sources":["../../src/change-conflict/detect-diverging-entity-conflict.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EACN,6BAA6B,EAC7B,iCAAiC,GACjC,MAAM,uCAAuC,CAAC;AAG/C,IAAI,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;IAC/D,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,WAAW,GAAG;QACnB;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,YAAY;SACzB;KAC2B,CAAC;IAE9B,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,WAAW,CAAC;SACnB,YAAY,EAAE;SACd,OAAO,EAAE,CAAC;IAEZ,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,aAAa,CAAC;SACzB,MAAM,CAAC;QACP,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE;QAC7C,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE;KAC7C,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;QAClD,GAAG,EAAE,GAAG;QACR,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;KACzC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;QACtB,GAAG,EAAE,iCAAiC;QACtC,oBAAoB,EAAE,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KAC1B,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wJAAwJ,EAAE,KAAK,IAAI,EAAE;IACzK,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,WAAW,GAAG;QACnB;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,YAAY;SACzB;KAC2B,CAAC;IAE9B,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,WAAW,CAAC;SACnB,YAAY,EAAE;SACd,OAAO,EAAE,CAAC;IAEZ,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;QAClD,GAAG,EAAE,GAAG;QACR,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;KACzC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;QACtB,GAAG,EAAE,iCAAiC;QACtC,oBAAoB,EAAE,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KAC1B,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;IACnG,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,WAAW,GAAG;QACnB;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,YAAY;SACzB;KAC2B,CAAC;IAE9B,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,WAAW,CAAC;SACnB,YAAY,EAAE;SACd,OAAO,EAAE,CAAC;IAEZ,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,aAAa,CAAC;SACzB,MAAM,CAAC;QACP,oDAAoD;QACpD,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE;KAC7C,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;QAClD,GAAG,EAAE,GAAG;QACR,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;KACzC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;AAChC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;IACrG,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,WAAW,GAAG;QACnB;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,YAAY;SACzB;KAC2B,CAAC;IAE9B,MAAM,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC;IAEhE,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,aAAa,CAAC;SACzB,MAAM,CAAC;QACP,0EAA0E;QAC1E,uCAAuC;QACvC,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE;QAC7C,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE;QAC7C,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE;KAC7C,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;QAClD,GAAG,EAAE,GAAG;QACR,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;KACzD,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;QACtB,GAAG,EAAE,iCAAiC;QACtC,oBAAoB,EAAE,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;KACrC,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"detect-diverging-entity-conflict.test.js","sourceRoot":"","sources":["../../src/change-conflict/detect-diverging-entity-conflict.test.ts"],"names":[],"mappings":"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"}

package/dist/change-conflict/garbage-collect-change-conflicts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"garbage-collect-change-conflicts.d.ts","sourceRoot":"","sources":["../../src/change-conflict/garbage-collect-change-conflicts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAsB,6BAA6B,CAAC,IAAI,EAAE;IACzD,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;CACrB,GAAG,OAAO,CAAC;IACX,sBAAsB,EAAE,cAAc,EAAE,CAAC;CACzC,CAAC,CAiFD"}
+{"version":3,"file":"garbage-collect-change-conflicts.d.ts","sourceRoot":"","sources":["../../src/change-conflict/garbage-collect-change-conflicts.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAsB,6BAA6B,CAAC,IAAI,EAAE;IACzD,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;CACrB,GAAG,OAAO,CAAC;IACX,sBAAsB,EAAE,cAAc,EAAE,CAAC;CACzC,CAAC,CAiFD"}

package/dist/change-conflict/garbage-collect-change-conflicts.js

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 import { sql } from "kysely";
 /**
  * Garbage collects change conflicts.

package/dist/change-conflict/garbage-collect-change-conflicts.js.map

@@ -1 +1 @@
-{"version":3,"file":"garbage-collect-change-conflicts.js","sourceRoot":"","sources":["../../src/change-conflict/garbage-collect-change-conflicts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAI7B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,IAEnD;IAGA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,0DAA0D;QAC1D,yEAAyE;QACzE,yBAAyB;QACzB,MAAM,2BAA2B,GAAG,MAAM,GAAG;aAC3C,UAAU,CAAC,iBAAiB,CAAC;aAC7B,QAAQ,CACR,yBAAyB,EACzB,oBAAoB,EACpB,4CAA4C,CAC5C;aACA,KAAK,CAAC,4CAA4C,EAAE,IAAI,EAAE,IAAI,CAAC;aAC/D,SAAS,EAAE;aACX,OAAO,EAAE,CAAC;QAEZ,sFAAsF;QACtF,MAAM,iBAAiB,GAAG,MAAM,GAAG;aACjC,UAAU,CAAC,iBAAiB,CAAC;aAC7B,QAAQ,CACR,yCAAyC,EACzC,+BAA+B,EAC/B,iCAAiC,CACjC;aACA,QAAQ,CACR,wCAAwC,EACxC,6BAA6B,EAC7B,4BAA4B,CAC5B;aACA,OAAO,CAAC,oBAAoB,CAAC;YAC9B,2EAA2E;YAC3E,6DAA6D;YAC7D,EAAE;YACF,4FAA4F;YAC5F,8FAA8F;YAC9F,2EAA2E;aAC1E,MAAM,CACN,GAAG,CAAA,mCAAmC;QACtC,0FAA0F;QAC1F,GAAG;QACH,+CAA+C;QAC/C,GAAG,CAAA,oCAAoC,CACvC;aACA,SAAS,CAAC,iBAAiB,CAAC;aAC5B,OAAO,EAAE,CAAC;QAEZ,MAAM,iBAAiB,GAAG;YACzB,GAAG,2BAA2B;YAC9B,GAAG,iBAAiB;SACpB,CAAC;QAEF,uEAAuE;QACvE,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACrE,MAAM,GAAG;iBACP,UAAU,CAAC,iBAAiB,CAAC;iBAC7B,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC;iBAC9B,OAAO,EAAE,CAAC;YAEZ,MAAM,GAAG;iBACP,UAAU,CAAC,oBAAoB,CAAC;iBAChC,KAAK,CACL,kCAAkC,EAClC,IAAI,EACJ,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAC3D;iBACA,OAAO,EAAE,CAAC;YAEZ,MAAM,GAAG;iBACP,UAAU,CAAC,yBAAyB,CAAC;iBACrC,KAAK,CAAC,oBAAoB,EAAE,IAAI,EAAE,WAAW,CAAC;iBAC9C,OAAO,EAAE,CAAC;QACb,CAAC;QACD,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,CAAC;IACtD,CAAC,CAAC;IAEF,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC;QAC/B,OAAO,MAAM,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACP,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACtE,CAAC;AACF,CAAC"}
+{"version":3,"file":"garbage-collect-change-conflicts.js","sourceRoot":"","sources":["../../src/change-conflict/garbage-collect-change-conflicts.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,cAAc;AAEd,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAI7B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,IAEnD;IAGA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,0DAA0D;QAC1D,yEAAyE;QACzE,yBAAyB;QACzB,MAAM,2BAA2B,GAAG,MAAM,GAAG;aAC3C,UAAU,CAAC,iBAAiB,CAAC;aAC7B,QAAQ,CACR,yBAAyB,EACzB,oBAAoB,EACpB,4CAA4C,CAC5C;aACA,KAAK,CAAC,4CAA4C,EAAE,IAAI,EAAE,IAAI,CAAC;aAC/D,SAAS,EAAE;aACX,OAAO,EAAE,CAAC;QAEZ,sFAAsF;QACtF,MAAM,iBAAiB,GAAG,MAAM,GAAG;aACjC,UAAU,CAAC,iBAAiB,CAAC;aAC7B,QAAQ,CACR,yCAAyC,EACzC,+BAA+B,EAC/B,iCAAiC,CACjC;aACA,QAAQ,CACR,wCAAwC,EACxC,6BAA6B,EAC7B,4BAA4B,CAC5B;aACA,OAAO,CAAC,oBAAoB,CAAC;YAC9B,2EAA2E;YAC3E,6DAA6D;YAC7D,EAAE;YACF,4FAA4F;YAC5F,8FAA8F;YAC9F,2EAA2E;aAC1E,MAAM,CACN,GAAG,CAAA,mCAAmC;QACtC,0FAA0F;QAC1F,GAAG;QACH,+CAA+C;QAC/C,GAAG,CAAA,oCAAoC,CACvC;aACA,SAAS,CAAC,iBAAiB,CAAC;aAC5B,OAAO,EAAE,CAAC;QAEZ,MAAM,iBAAiB,GAAG;YACzB,GAAG,2BAA2B;YAC9B,GAAG,iBAAiB;SACpB,CAAC;QAEF,uEAAuE;QACvE,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACrE,MAAM,GAAG;iBACP,UAAU,CAAC,iBAAiB,CAAC;iBAC7B,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC;iBAC9B,OAAO,EAAE,CAAC;YAEZ,MAAM,GAAG;iBACP,UAAU,CAAC,oBAAoB,CAAC;iBAChC,KAAK,CACL,kCAAkC,EAClC,IAAI,EACJ,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAC3D;iBACA,OAAO,EAAE,CAAC;YAEZ,MAAM,GAAG;iBACP,UAAU,CAAC,yBAAyB,CAAC;iBACrC,KAAK,CAAC,oBAAoB,EAAE,IAAI,EAAE,WAAW,CAAC;iBAC9C,OAAO,EAAE,CAAC;QACb,CAAC;QACD,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,CAAC;IACtD,CAAC,CAAC;IAEF,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC;QAC/B,OAAO,MAAM,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACP,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACtE,CAAC;AACF,CAAC"}

package/dist/change-conflict/garbage-collect-change-conflicts.test.js

@@ -1,12 +1,12 @@
+// 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" });
     const changes = await lix.db
         .insertInto("change")
@@ -17,7 +17,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",
@@ -25,7 +25,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",
@@ -33,7 +33,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()
@@ -85,8 +85,8 @@ test.skip("should garbage collect conflicts that contain one or more changes tha
     expect(remainingVersionChangeConflictPointers.length).toBe(1);
     expect(remainingVersionChangeConflictPointers[0]?.change_conflict_id).toBe(mockConflict0.id);
 });
-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")
         .values([
@@ -96,7 +96,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",
@@ -104,7 +104,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()
@@ -133,8 +133,8 @@ test("should garbage collect conflicts that no version references", async () =>
     expect(gc0.deletedChangeConflicts.length).toBe(1);
     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")
         .values([
@@ -144,7 +144,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",
@@ -152,7 +152,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/dist/change-conflict/garbage-collect-change-conflicts.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"garbage-collect-change-conflicts.test.js","sourceRoot":"","sources":["../../src/change-conflict/garbage-collect-change-conflicts.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"garbage-collect-change-conflicts.test.js","sourceRoot":"","sources":["../../src/change-conflict/garbage-collect-change-conflicts.test.ts"],"names":[],"mappings":"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"}

package/dist/change-conflict/resolve-conflict-by-selecting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-conflict-by-selecting.d.ts","sourceRoot":"","sources":["../../src/change-conflict/resolve-conflict-by-selecting.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAI9C;;;GAGG;AACH,wBAAsB,gCAAgC,CAAC,IAAI,EAAE;IAC5D,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDhB"}
+{"version":3,"file":"resolve-conflict-by-selecting.d.ts","sourceRoot":"","sources":["../../src/change-conflict/resolve-conflict-by-selecting.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,gCAAgC,CAAC,IAAI,EAAE;IAC5D,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDhB"}

package/dist/change-conflict/resolve-conflict-by-selecting.js

@@ -1,5 +1,5 @@
-import { applyChanges } from "../change/apply-changes.js";
-import { updateChangesInVersion } from "../version/update-changes-in-version.js";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 /**
  * Resolves a conflict by selecting one of the two
  * changes in the conflict.

package/dist/change-conflict/resolve-conflict-by-selecting.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-conflict-by-selecting.js","sourceRoot":"","sources":["../../src/change-conflict/resolve-conflict-by-selecting.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gCAAgC,CAAC,IAItD;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,MAAM,GAAG;aACP,UAAU,CAAC,4BAA4B,CAAC;aACxC,MAAM,CAAC;YACP,kBAAkB,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE;YACpC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;SAClC,CAAC;YACF,qCAAqC;aACpC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;aAClC,OAAO,EAAE,CAAC;QAEZ,gHAAgH;QAChH,MAAM,YAAY,CAAC;YAClB,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;YAC7B,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;SACtB,CAAC,CAAC;QAEH,MAAM,qBAAqB,GAAG,MAAM,GAAG;aACrC,UAAU,CAAC,SAAS,CAAC;aACrB,SAAS,CACT,yBAAyB,EACzB,oCAAoC,EACpC,YAAY,CACZ;aACA,KAAK,CACL,4CAA4C,EAC5C,GAAG,EACH,IAAI,CAAC,QAAQ,CAAC,EAAE,CAChB;aACA,SAAS,EAAE;aACX,OAAO,EAAE,CAAC;QAEZ,KAAK,MAAM,OAAO,IAAI,qBAAqB,EAAE,CAAC;YAC7C,MAAM,sBAAsB,CAAC;gBAC5B,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;gBAC7B,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;gBACtB,OAAO;aACP,CAAC,CAAC;YACH,8BAA8B;YAC9B,MAAM,GAAG;iBACP,UAAU,CAAC,yBAAyB,CAAC;iBACrC,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC;iBACpC,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;iBAClD,OAAO,EAAE,CAAC;QACb,CAAC;IACF,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;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"resolve-conflict-by-selecting.js","sourceRoot":"","sources":["../../src/change-conflict/resolve-conflict-by-selecting.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,cAAc;AAKd;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gCAAgC,CAAC,IAItD;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,MAAM,GAAG;aACP,UAAU,CAAC,4BAA4B,CAAC;aACxC,MAAM,CAAC;YACP,kBAAkB,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE;YACpC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;SAClC,CAAC;YACF,qCAAqC;aACpC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;aAClC,OAAO,EAAE,CAAC;QAEZ,gHAAgH;QAChH,MAAM,YAAY,CAAC;YAClB,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;YAC7B,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;SACtB,CAAC,CAAC;QAEH,MAAM,qBAAqB,GAAG,MAAM,GAAG;aACrC,UAAU,CAAC,SAAS,CAAC;aACrB,SAAS,CACT,yBAAyB,EACzB,oCAAoC,EACpC,YAAY,CACZ;aACA,KAAK,CACL,4CAA4C,EAC5C,GAAG,EACH,IAAI,CAAC,QAAQ,CAAC,EAAE,CAChB;aACA,SAAS,EAAE;aACX,OAAO,EAAE,CAAC;QAEZ,KAAK,MAAM,OAAO,IAAI,qBAAqB,EAAE,CAAC;YAC7C,MAAM,sBAAsB,CAAC;gBAC5B,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;gBAC7B,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;gBACtB,OAAO;aACP,CAAC,CAAC;YACH,8BAA8B;YAC9B,MAAM,GAAG;iBACP,UAAU,CAAC,yBAAyB,CAAC;iBACrC,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC;iBACpC,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;iBAClD,OAAO,EAAE,CAAC;QACb,CAAC;IACF,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;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAChE,CAAC"}

package/dist/change-conflict/resolve-conflict-by-selecting.test.js

@@ -1,16 +1,25 @@
+// 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 { 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 = [
-        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 = [
         {
@@ -34,7 +43,7 @@ test("it should resolve a conflict and apply the changes", async () => {
             fileData: new TextEncoder().encode(JSON.stringify(mockSnapshots[0]?.content)),
         }),
     };
-    const lix = await openLixInMemory({
+    const lix = await openLix({
         blob: await newLixFile(),
         providePlugins: [mockPlugin],
     });

package/dist/change-conflict/resolve-conflict-by-selecting.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-conflict-by-selecting.test.js","sourceRoot":"","sources":["../../src/change-conflict/resolve-conflict-by-selecting.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve-conflict-by-selecting.test.js","sourceRoot":"","sources":["../../src/change-conflict/resolve-conflict-by-selecting.test.ts"],"names":[],"mappings":"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"}

package/dist/change-proposal/create-change-proposal.d.ts

@@ -0,0 +1,16 @@
+import type { ChangeSet } from "../change-set/schema.js";
+import type { Lix } from "../lix/open-lix.js";
+import type { ChangeProposal } from "./database-schema.js";
+/**
+ * Creates a change proposal that represents the symmetric difference
+ * between the source and target change sets.
+ *
+ * The symmetric difference contains changes that are in either the source
+ * or target change set, but not in both.
+ */
+export declare function createChangeProposal(args: {
+    lix: Lix;
+    sourceChangeSet: Pick<ChangeSet, "id">;
+    targetChangeSet: Pick<ChangeSet, "id">;
+}): Promise<ChangeProposal>;
+//# sourceMappingURL=create-change-proposal.d.ts.map

package/dist/change-proposal/create-change-proposal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-change-proposal.d.ts","sourceRoot":"","sources":["../../src/change-proposal/create-change-proposal.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAChD,GAAG,EAAE,GAAG,CAAC;IACT,eAAe,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACvC,eAAe,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;CACvC,GAAG,OAAO,CAAC,cAAc,CAAC,CAkD1B"}

package/dist/change-proposal/create-change-proposal.js

@@ -0,0 +1,52 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+import { createChangeSet } from "../change-set/create-change-set.js";
+import { changeSetElementInSymmetricDifference } from "../query-filter/change-set-element-in-symmetric-difference.js";
+/**
+ * Creates a change proposal that represents the symmetric difference
+ * between the source and target change sets.
+ *
+ * The symmetric difference contains changes that are in either the source
+ * or target change set, but not in both.
+ */
+export async function createChangeProposal(args) {
+    const executeInTransaction = async (trx) => {
+        // Get the changes that are in the symmetric difference between the two change sets
+        const symmetricDifferenceChanges = await trx
+            .selectFrom("change_set_element")
+            .where(changeSetElementInSymmetricDifference(args.sourceChangeSet, args.targetChangeSet))
+            .select(["change_id as id", "entity_id", "schema_key", "file_id"])
+            .execute();
+        if (symmetricDifferenceChanges.length === 0) {
+            throw new Error("No changes in symmetric difference between source and target change sets.");
+        }
+        // Create a new change set with the symmetric difference changes
+        const newChangeSet = await createChangeSet({
+            lix: { ...args.lix, db: trx },
+            elements: symmetricDifferenceChanges.map((change) => ({
+                change_id: change.id,
+                entity_id: change.entity_id,
+                schema_key: change.schema_key,
+                file_id: change.file_id,
+            })),
+        });
+        // Create the change proposal
+        const result = await trx
+            .insertInto("change_proposal")
+            .values({
+            change_set_id: newChangeSet.id,
+            source_change_set_id: args.sourceChangeSet.id,
+            target_change_set_id: args.targetChangeSet.id,
+        })
+            .returningAll()
+            .executeTakeFirstOrThrow();
+        return result;
+    };
+    if (args.lix.db.isTransaction) {
+        return executeInTransaction(args.lix.db);
+    }
+    else {
+        return args.lix.db.transaction().execute(executeInTransaction);
+    }
+}
+//# sourceMappingURL=create-change-proposal.js.map

package/dist/change-proposal/create-change-proposal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-change-proposal.js","sourceRoot":"","sources":["../../src/change-proposal/create-change-proposal.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,cAAc;AAKd,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,qCAAqC,EAAE,MAAM,+DAA+D,CAAC;AAEtH;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,IAI1C;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,mFAAmF;QACnF,MAAM,0BAA0B,GAAG,MAAM,GAAG;aAC1C,UAAU,CAAC,oBAAoB,CAAC;aAChC,KAAK,CACL,qCAAqC,CACpC,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,eAAe,CACpB,CACD;aACA,MAAM,CAAC,CAAC,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;aACjE,OAAO,EAAE,CAAC;QAEZ,IAAI,0BAA0B,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CACd,2EAA2E,CAC3E,CAAC;QACH,CAAC;QAED,gEAAgE;QAChE,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC;YAC1C,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;YAC7B,QAAQ,EAAE,0BAA0B,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACrD,SAAS,EAAE,MAAM,CAAC,EAAE;gBACpB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;aACvB,CAAC,CAAC;SACH,CAAC,CAAC;QAEH,6BAA6B;QAC7B,MAAM,MAAM,GAAG,MAAM,GAAG;aACtB,UAAU,CAAC,iBAAiB,CAAC;aAC7B,MAAM,CAAC;YACP,aAAa,EAAE,YAAY,CAAC,EAAE;YAC9B,oBAAoB,EAAE,IAAI,CAAC,eAAe,CAAC,EAAE;YAC7C,oBAAoB,EAAE,IAAI,CAAC,eAAe,CAAC,EAAE;SAC7C,CAAC;aACD,YAAY,EAAE;aACd,uBAAuB,EAAE,CAAC;QAE5B,OAAO,MAAM,CAAC;IACf,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"}

package/dist/change-proposal/create-change-proposal.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=create-change-proposal.test.d.ts.map

package/dist/change-proposal/create-change-proposal.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-change-proposal.test.d.ts","sourceRoot":"","sources":["../../src/change-proposal/create-change-proposal.test.ts"],"names":[],"mappings":""}

package/dist/change-proposal/create-change-proposal.test.js

@@ -0,0 +1,91 @@
+import { test, expect } from "vitest";
+import { openLix } from "../lix/open-lix.js";
+import { createChangeSet } from "../change-set/create-change-set.js";
+import { createChangeProposal } from "./create-change-proposal.js";
+test.skip("creating a change proposal should compute the symmetric difference", async () => {
+    const lix = await openLix({});
+    // Create some changes for change sets
+    const mockChanges = await lix.db
+        .insertInto("change")
+        .values([
+        // Change 1 - only in source change set
+        {
+            schema_key: "file",
+            schema_version: "1.0",
+            entity_id: "value1",
+            file_id: "mock1",
+            plugin_key: "mock-plugin",
+            snapshot_content: null,
+        },
+        // Change 2 - in both source and target (so not in symmetric difference)
+        {
+            schema_key: "file",
+            schema_version: "1.0",
+            entity_id: "value2",
+            file_id: "mock2",
+            plugin_key: "mock-plugin",
+            snapshot_content: null,
+        },
+        // Change 3 - only in target change set
+        {
+            schema_key: "file",
+            entity_id: "value3",
+            file_id: "mock3",
+            schema_version: "1.0",
+            plugin_key: "mock-plugin",
+            snapshot_content: null,
+        },
+    ])
+        .returningAll()
+        .execute();
+    // Create source change set with changes 1 and 2
+    const sourceChangeSet = await createChangeSet({
+        lix: lix,
+        elements: mockChanges.slice(0, 2).map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+    });
+    // Create target change set with changes 2 and 3
+    const targetChangeSet = await createChangeSet({
+        lix: lix,
+        elements: mockChanges.slice(1, 3).map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+    });
+    // Create a change proposal
+    const proposal = await createChangeProposal({
+        lix: lix,
+        sourceChangeSet: sourceChangeSet,
+        targetChangeSet: targetChangeSet,
+    });
+    // Verify the change proposal was created with the correct data
+    expect(proposal).toMatchObject({
+        id: expect.any(String),
+        source_change_set_id: sourceChangeSet.id,
+        target_change_set_id: targetChangeSet.id,
+    });
+    // The change_set_id should be a new change set
+    expect(proposal.change_set_id).not.toBe(sourceChangeSet.id);
+    expect(proposal.change_set_id).not.toBe(targetChangeSet.id);
+    // Verify the new change set contains only the changes in the symmetric difference
+    const changeSetElements = await lix.db
+        .selectFrom("change_set_element")
+        .selectAll()
+        .where("change_set_id", "=", proposal.change_set_id)
+        .execute();
+    // Should have 2 changes: change1 and change3, but not change2 (which is in both sets)
+    expect(changeSetElements).toHaveLength(2);
+    // Expected change IDs: the first and third change
+    const expectedChangeIds = [mockChanges[0].id, mockChanges[2].id];
+    // Verify that both expected change IDs are in the result
+    expect(changeSetElements.map((el) => el.change_id)).toEqual(expect.arrayContaining(expectedChangeIds));
+    // Verify no other changes are included (particularly not the common change)
+    expect(changeSetElements.some((el) => el.change_id === mockChanges[1].id)).toBe(false);
+});
+//# sourceMappingURL=create-change-proposal.test.js.map

package/dist/change-proposal/create-change-proposal.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-change-proposal.test.js","sourceRoot":"","sources":["../../src/change-proposal/create-change-proposal.test.ts"],"names":[],"mappings":"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"}

package/dist/change-proposal/database-schema.d.ts

@@ -0,0 +1,13 @@
+import type { Generated, Insertable, Selectable, Updateable } from "kysely";
+import type { SqliteWasmDatabase } from "sqlite-wasm-kysely";
+export declare function applyChangeProposalDatabaseSchema(sqlite: SqliteWasmDatabase): SqliteWasmDatabase;
+export type ChangeProposal = Selectable<ChangeProposalTable>;
+export type NewChangeProposal = Insertable<ChangeProposalTable>;
+export type ChangeProposalUpdate = Updateable<ChangeProposalTable>;
+export type ChangeProposalTable = {
+    id: Generated<string>;
+    change_set_id: string;
+    source_change_set_id: string | null;
+    target_change_set_id: string | null;
+};
+//# sourceMappingURL=database-schema.d.ts.map

package/dist/change-proposal/database-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"database-schema.d.ts","sourceRoot":"","sources":["../../src/change-proposal/database-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,wBAAgB,iCAAiC,CAChD,MAAM,EAAE,kBAAkB,GACxB,kBAAkB,CAgBpB;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC;AAC7D,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC;AACnE,MAAM,MAAM,mBAAmB,GAAG;IACjC,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC,CAAC"}