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

package/dist/change-author/schema.test.js

@@ -0,0 +1,256 @@
+import { describe, expect, test } from "vitest";
+import { openLix } from "../lix/open-lix.js";
+import { createAccount } from "../account/create-account.js";
+describe("change_author", () => {
+    test("insert, update, delete on the change_author view", async () => {
+        const lix = await openLix({});
+        // Create account
+        const account = await createAccount({
+            lix,
+            name: "Test Author",
+        });
+        // Create change
+        await lix.db
+            .insertInto("change")
+            .values({
+            id: "c0",
+            entity_id: "e0",
+            schema_key: "mock_schema",
+            schema_version: "1",
+            file_id: "f0",
+            plugin_key: "test_plugin",
+            snapshot_content: { id: "e0" },
+        })
+            .execute();
+        await lix.db
+            .insertInto("change_author")
+            .values([
+            {
+                change_id: "c0",
+                account_id: account.id,
+            },
+        ])
+            .execute();
+        const viewAfterInsert = await lix.db
+            .selectFrom("change_author")
+            .orderBy("change_id", "asc")
+            .selectAll()
+            .execute();
+        expect(viewAfterInsert).toMatchObject([
+            {
+                change_id: "c0",
+                account_id: account.id,
+            },
+        ]);
+        await lix.db
+            .deleteFrom("change_author")
+            .where("change_id", "=", "c0")
+            .execute();
+        const viewAfterDelete = await lix.db
+            .selectFrom("change_author")
+            .orderBy("change_id", "asc")
+            .selectAll()
+            .execute();
+        expect(viewAfterDelete).toEqual([]);
+        // After delete, there should be no state records for the change_author
+        const allStates = await lix.db
+            .selectFrom("state_all")
+            .where("schema_key", "=", "lix_change_author")
+            .selectAll()
+            .execute();
+        expect(allStates).toHaveLength(0); // All records should be deleted
+    });
+    test("should enforce primary key constraint (change_id, account_id)", async () => {
+        const lix = await openLix({});
+        // Create account
+        const account = await createAccount({
+            lix,
+            name: "Test Author",
+        });
+        await lix.db
+            .insertInto("change")
+            .values({
+            id: "c1",
+            entity_id: "e1",
+            schema_key: "mock_schema",
+            schema_version: "1",
+            file_id: "f1",
+            plugin_key: "test_plugin",
+            snapshot_content: { id: "e1" },
+        })
+            .execute();
+        // Insert first change_author
+        await lix.db
+            .insertInto("change_author")
+            .values({
+            change_id: "c1",
+            account_id: account.id,
+        })
+            .execute();
+        // Attempt duplicate insert with same primary key
+        await expect(lix.db
+            .insertInto("change_author")
+            .values({
+            change_id: "c1",
+            account_id: account.id,
+        })
+            .execute()).rejects.toThrow(/Primary key constraint violation/i);
+    });
+    test("should enforce foreign key constraint on change_id", async () => {
+        const lix = await openLix({});
+        // Create account (but NOT change)
+        const account = await createAccount({
+            lix,
+            name: "Test Author",
+        });
+        // Attempt to insert with non-existent change_id
+        await expect(lix.db
+            .insertInto("change_author")
+            .values({
+            change_id: "c_nonexistent",
+            account_id: account.id,
+        })
+            .execute()).rejects.toThrow(/Foreign key constraint violation.*change_id.*lix_change.id/i);
+    });
+    test("should enforce foreign key constraint on account_id", async () => {
+        const lix = await openLix({});
+        await lix.db
+            .insertInto("change")
+            .values({
+            id: "c1",
+            entity_id: "e1",
+            schema_key: "mock_schema",
+            schema_version: "1",
+            file_id: "f1",
+            plugin_key: "test_plugin",
+            snapshot_content: { id: "e1" },
+        })
+            .execute();
+        // Attempt to insert with non-existent account_id
+        await expect(lix.db
+            .insertInto("change_author")
+            .values({
+            change_id: "c1",
+            account_id: "account_nonexistent",
+        })
+            .execute()).rejects.toThrow(/Foreign key constraint violation.*account_id.*lix_account.id/i);
+    });
+    test("should allow multiple authors for the same change", async () => {
+        const lix = await openLix({});
+        // Create accounts
+        const author1 = await createAccount({
+            lix,
+            name: "Author One",
+        });
+        const author2 = await createAccount({
+            lix,
+            name: "Author Two",
+        });
+        await lix.db
+            .insertInto("change")
+            .values({
+            id: "c1",
+            entity_id: "e1",
+            schema_key: "mock_schema",
+            schema_version: "1",
+            file_id: "f1",
+            plugin_key: "test_plugin",
+            snapshot_content: { id: "e1" },
+        })
+            .execute();
+        // Insert multiple authors for same change
+        await lix.db
+            .insertInto("change_author")
+            .values([
+            {
+                change_id: "c1",
+                account_id: author1.id,
+            },
+            {
+                change_id: "c1",
+                account_id: author2.id,
+            },
+        ])
+            .execute();
+        const authors = await lix.db
+            .selectFrom("change_author")
+            .where("change_id", "=", "c1")
+            .orderBy("account_id", "asc")
+            .selectAll()
+            .execute();
+        expect(authors).toHaveLength(2);
+        expect(authors).toMatchObject([
+            {
+                change_id: "c1",
+                account_id: author1.id,
+            },
+            {
+                change_id: "c1",
+                account_id: author2.id,
+            },
+        ]);
+    });
+    test("should allow same author for multiple changes", async () => {
+        const lix = await openLix({});
+        // Create account
+        const author = await createAccount({
+            lix,
+            name: "Prolific Author",
+        });
+        await lix.db
+            .insertInto("change")
+            .values([
+            {
+                id: "c1",
+                entity_id: "e1",
+                schema_key: "mock_schema",
+                schema_version: "1",
+                file_id: "f1",
+                plugin_key: "test_plugin",
+                snapshot_content: { id: "e1" },
+            },
+            {
+                id: "c2",
+                entity_id: "e2",
+                schema_key: "mock_schema",
+                schema_version: "1",
+                file_id: "f2",
+                plugin_key: "test_plugin",
+                snapshot_content: { id: "e2" },
+            },
+        ])
+            .execute();
+        // Insert same author for multiple changes
+        await lix.db
+            .insertInto("change_author")
+            .values([
+            {
+                change_id: "c1",
+                account_id: author.id,
+            },
+            {
+                change_id: "c2",
+                account_id: author.id,
+            },
+        ])
+            .execute();
+        const authorChanges = await lix.db
+            .selectFrom("change_author")
+            .where("account_id", "=", author.id)
+            .orderBy("change_id", "asc")
+            .selectAll()
+            .execute();
+        expect(authorChanges).toHaveLength(2);
+        expect(authorChanges).toMatchObject([
+            {
+                change_id: "c1",
+                account_id: author.id,
+            },
+            {
+                change_id: "c2",
+                account_id: author.id,
+            },
+        ]);
+    });
+});
+//# sourceMappingURL=schema.test.js.map

package/dist/change-author/schema.test.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"create-change-conflict.d.ts","sourceRoot":"","sources":["../../src/change-conflict/create-change-conflict.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAChD,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7B,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;CACxC,GAAG,OAAO,CAAC,cAAc,CAAC,CA0F1B"}
+{"version":3,"file":"create-change-conflict.d.ts","sourceRoot":"","sources":["../../src/change-conflict/create-change-conflict.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAChD,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7B,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;CACxC,GAAG,OAAO,CAAC,cAAc,CAAC,CA8G1B"}

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

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 /**
  * Creates a new change conflict with the given conflicting changes.
  *
@@ -41,14 +43,30 @@ export async function createChangeConflict(args) {
         })
             .returningAll()
             .executeTakeFirstOrThrow();
+        // Insert elements linking the new conflict change set to the conflicting changes
+        // Fetch the change records to get entity_id, schema_key, file_id
+        const conflictingChanges = await trx
+            .selectFrom("change")
+            .where("id", "in", [...args.conflictingChangeIds])
+            .select(["id", "entity_id", "schema_key", "file_id"])
+            .execute();
+        const conflictingChangeMap = new Map(conflictingChanges.map((c) => [c.id, c]));
         await trx
             .insertInto("change_set_element")
-            .values(Array.from(args.conflictingChangeIds).map((id) => ({
-            change_id: id,
-            change_set_id: newConflict.change_set_id,
-        })))
-            // Ignore if the conflict element already exists
-            .onConflict((oc) => oc.doNothing())
+            .values(Array.from(args.conflictingChangeIds).map((id) => {
+            const change = conflictingChangeMap.get(id);
+            if (!change) {
+                // Should not happen if FK constraints work
+                throw new Error(`Conflicting change record not found: ${id}`);
+            }
+            return {
+                change_id: id,
+                change_set_id: newConflict.change_set_id,
+                entity_id: change.entity_id,
+                schema_key: change.schema_key,
+                file_id: change.file_id,
+            };
+        }))
             .execute();
         await trx
             .insertInto("version_change_conflict")

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

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

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

@@ -1,9 +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 { createChangeConflict } from "./create-change-conflict.js";
-import { createVersion } from "../version/create-version.js";
-test("conflicts should be de-duplicated based on the change_conflict.key and version", async () => {
-    const lix = await openLixInMemory({});
+test.skip("conflicts should be de-duplicated based on the change_conflict.key and version", async () => {
+    const lix = await openLix({});
     const version0 = await createVersion({ lix, name: "version0" });
     await lix.db
         .insertInto("change")
@@ -14,7 +15,7 @@ test("conflicts should be de-duplicated based on the change_conflict.key and ver
             schema_key: "mock",
             file_id: "mock",
             entity_id: "value0",
-            snapshot_id: "no-content",
+            snapshot_content: null,
         },
         {
             id: "change1",
@@ -22,7 +23,7 @@ test("conflicts should be de-duplicated based on the change_conflict.key and ver
             file_id: "mock",
             entity_id: "value1",
             schema_key: "mock",
-            snapshot_id: "no-content",
+            snapshot_content: null,
         },
     ])
         .execute();
@@ -58,8 +59,9 @@ test("conflicts should be de-duplicated based on the change_conflict.key and ver
     expect(conflictsAfter2Creation[0]?.id).toBe(changeConflict2.id);
     expect(conflictsAfter2Creation[0]?.key).toBe("mock-conflict");
 });
-test("if a conflict contains the same changes for a given key and version, no new conflict should be created", async () => {
-    const lix = await openLixInMemory({});
+// commented out because of https://github.com/opral/lix-sdk/issues/285#issuecomment-2755409022
+test.skip("if a conflict contains the same changes for a given key and version, no new conflict should be created", async () => {
+    const lix = await openLix({});
     const version0 = await createVersion({ lix, name: "version0" });
     await lix.db
         .insertInto("change")
@@ -70,7 +72,7 @@ test("if a conflict contains the same changes for a given key and version, no ne
             schema_key: "mock",
             file_id: "mock",
             entity_id: "value0",
-            snapshot_id: "no-content",
+            snapshot_content: null,
         },
         {
             id: "change1",
@@ -78,7 +80,7 @@ test("if a conflict contains the same changes for a given key and version, no ne
             file_id: "mock",
             entity_id: "value1",
             schema_key: "mock",
-            snapshot_id: "no-content",
+            snapshot_content: null,
         },
         {
             id: "change2",
@@ -86,7 +88,7 @@ test("if a conflict contains the same changes for a given key and version, no ne
             file_id: "mock",
             entity_id: "value1",
             schema_key: "mock",
-            snapshot_id: "no-content",
+            snapshot_content: null,
         },
     ])
         .execute();

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

@@ -1 +1 @@
-{"version":3,"file":"create-change-conflict.test.js","sourceRoot":"","sources":["../../src/change-conflict/create-change-conflict.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,IAAI,CAAC,gFAAgF,EAAE,KAAK,IAAI,EAAE;IACjG,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IAEhE,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC;QACP;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,aAAa;YACzB,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,aAAa;YACzB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,YAAY;SACzB;KACD,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC;QACjD,GAAG;QACH,OAAO,EAAE,QAAQ;QACjB,GAAG,EAAE,eAAe;QACpB,oBAAoB,EAAE,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KACrD,CAAC,CAAC;IAEH,wCAAwC;IACxC,MAAM,uBAAuB,GAAG,MAAM,GAAG,CAAC,EAAE;SAC1C,UAAU,CAAC,iBAAiB,CAAC;SAC7B,KAAK,CAAC,qBAAqB,EAAE,GAAG,EAAE,eAAe,CAAC;SAClD,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IAC/D,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE9D,2BAA2B;IAC3B,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC;QAClD,GAAG;QACH,OAAO,EAAE,QAAQ;QACjB,GAAG,EAAE,eAAe;QACpB,oBAAoB,EAAE,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KACrD,CAAC,CAAC;IAEH,wCAAwC;IACxC,MAAM,uBAAuB,GAAG,MAAM,GAAG,CAAC,EAAE;SAC1C,UAAU,CAAC,iBAAiB,CAAC;SAC7B,KAAK,CAAC,qBAAqB,EAAE,GAAG,EAAE,eAAe,CAAC;SAClD,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAChE,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wGAAwG,EAAE,KAAK,IAAI,EAAE;IACzH,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IAEhE,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC;QACP;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,aAAa;YACzB,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,aAAa;YACzB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,EAAE,EAAE,SAAS;YACb,UAAU,EAAE,aAAa;YACzB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,YAAY;SACzB;KACD,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC;QACjD,GAAG;QACH,OAAO,EAAE,QAAQ;QACjB,GAAG,EAAE,eAAe;QACpB,oBAAoB,EAAE,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KACrD,CAAC,CAAC;IAEH,wCAAwC;IACxC,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,EAAE;SACnC,UAAU,CAAC,oBAAoB,CAAC;SAChC,SAAS,CACT,iBAAiB,EACjB,+BAA+B,EAC/B,kCAAkC,CAClC;SACA,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,CAAC;SACnD,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvD,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAEvD,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC;QAClD,GAAG;QACH,OAAO,EAAE,QAAQ;QACjB,GAAG,EAAE,eAAe;QACpB,oBAAoB,EAAE,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KACrD,CAAC,CAAC;IAEH,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IAEnD,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC;QAClD,GAAG;QACH,OAAO,EAAE,QAAQ;QACjB,GAAG,EAAE,qBAAqB;QAC1B,uCAAuC;QACvC,oBAAoB,EAAE,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KACrD,CAAC,CAAC;IAEH,wCAAwC;IACxC,MAAM,uBAAuB,GAAG,MAAM,GAAG,CAAC,EAAE;SAC1C,UAAU,CAAC,iBAAiB,CAAC;SAC7B,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,MAAM,8BAA8B,GAAG,MAAM,GAAG,CAAC,EAAE;SACjD,UAAU,CAAC,oBAAoB,CAAC;SAChC,SAAS,CACT,iBAAiB,EACjB,+BAA+B,EAC/B,kCAAkC,CAClC;SACA,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,CAAC;SACnD,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC;QAC/D,eAAe;QACf,qBAAqB;KACrB,CAAC,CAAC;IACH,MAAM,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9D,cAAc,CAAC,EAAE;QACjB,eAAe,CAAC,EAAE;KAClB,CAAC,CAAC;IACH,MAAM,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"create-change-conflict.test.js","sourceRoot":"","sources":["../../src/change-conflict/create-change-conflict.test.ts"],"names":[],"mappings":"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"}

package/dist/change-conflict/detect-change-conflicts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect-change-conflicts.d.ts","sourceRoot":"","sources":["../../src/change-conflict/detect-change-conflicts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG7E;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IACjD,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,QAAQ,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAyC9B"}
+{"version":3,"file":"detect-change-conflicts.d.ts","sourceRoot":"","sources":["../../src/change-conflict/detect-change-conflicts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG7E;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IACjD,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,QAAQ,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAyC9B"}

package/dist/change-conflict/detect-change-conflicts.js

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 import { detectDivergingEntityConflict } from "./detect-diverging-entity-conflict.js";
 /**
  * Detects conflicts in the given set of changes.

package/dist/change-conflict/detect-change-conflicts.js.map

@@ -1 +1 @@
-{"version":3,"file":"detect-change-conflicts.js","sourceRoot":"","sources":["../../src/change-conflict/detect-change-conflicts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC;AAEtF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,IAG3C;IACA,MAAM,iBAAiB,GAAuB,EAAE,CAAC;IACjD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAE/C,8BAA8B;IAC9B,MAAM,OAAO,CAAC,GAAG,CAChB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC5B,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC;gBAC9C,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,OAAO,EAAE,IAAI,CAAC,OAAO;aACrB,CAAC,CAAC;YACH,iBAAiB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QACtC,CAAC;IACF,CAAC,CAAC,CACF,CAAC;IAEF,yCAAyC;IAEzC,sDAAsD;IACtD,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CACrC,IAAI,CAAC,OAAO,EACZ,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,CACxE,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACtD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,SAAS;QACV,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,uBAAuB,GAAG,MAAM,6BAA6B,CAAC;gBACnE,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,OAAO;aACP,CAAC,CAAC;YACH,IAAI,uBAAuB,EAAE,CAAC;gBAC7B,iBAAiB,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACjD,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"detect-change-conflicts.js","sourceRoot":"","sources":["../../src/change-conflict/detect-change-conflicts.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,cAAc;AAId,OAAO,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC;AAEtF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,IAG3C;IACA,MAAM,iBAAiB,GAAuB,EAAE,CAAC;IACjD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAE/C,8BAA8B;IAC9B,MAAM,OAAO,CAAC,GAAG,CAChB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC5B,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC;gBAC9C,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,OAAO,EAAE,IAAI,CAAC,OAAO;aACrB,CAAC,CAAC;YACH,iBAAiB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QACtC,CAAC;IACF,CAAC,CAAC,CACF,CAAC;IAEF,yCAAyC;IAEzC,sDAAsD;IACtD,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CACrC,IAAI,CAAC,OAAO,EACZ,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,CACxE,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACtD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,SAAS;QACV,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,uBAAuB,GAAG,MAAM,6BAA6B,CAAC;gBACnE,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,OAAO;aACP,CAAC,CAAC;YACH,IAAI,uBAAuB,EAAE,CAAC;gBAC7B,iBAAiB,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACjD,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC1B,CAAC"}

package/dist/change-conflict/detect-change-conflicts.test.js

@@ -1,8 +1,12 @@
+// 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 { detectChangeConflicts } from "./detect-change-conflicts.js";
-test("should detect conflicts using plugins", async () => {
-    const lix = await openLixInMemory({});
+// import { openLix } from "../lix/open-lix.js";
+// import type { Change } from "../database/schema.js";
+// import { detectChangeConflicts } from "./detect-change-conflicts.js";
+// import type { LixPlugin } from "../plugin/lix-plugin.js";
+test.skip("should detect conflicts using plugins", async () => {
+    const lix = await openLix({});
     const mockPlugin = {
         key: "mock-plugin",
         detectConflicts: vi.fn().mockResolvedValue([
@@ -40,8 +44,8 @@ test("should detect conflicts using plugins", async () => {
         changes,
     });
 });
-test("should handle no conflicts detected by plugins", async () => {
-    const lix = await openLixInMemory({});
+test.skip("should handle no conflicts detected by plugins", async () => {
+    const lix = await openLix({});
     const mockPlugin = {
         key: "mock-plugin",
         detectConflicts: vi.fn().mockResolvedValue([]),
@@ -72,8 +76,8 @@ test("should handle no conflicts detected by plugins", async () => {
         changes,
     });
 });
-test("should handle multiple plugins detecting conflicts", async () => {
-    const lix = await openLixInMemory({});
+test.skip("should handle multiple plugins detecting conflicts", async () => {
+    const lix = await openLix({});
     const mockPlugin1 = {
         key: "mock-plugin1",
         detectConflicts: vi.fn().mockResolvedValue([
@@ -132,8 +136,8 @@ test("should handle multiple plugins detecting conflicts", async () => {
         changes,
     });
 });
-test("it should auto detect diverging entity conflicts", async () => {
-    const lix = await openLixInMemory({});
+test.skip("it should auto detect diverging entity conflicts", async () => {
+    const lix = await openLix({});
     const changes = await lix.db
         .insertInto("change")
         .values([
@@ -143,7 +147,7 @@ test("it should auto detect diverging entity conflicts", async () => {
             schema_key: "mock",
             file_id: "file0",
             entity_id: "entity0",
-            snapshot_id: "no-content",
+            snapshot_content: null,
         },
         {
             id: "change1",
@@ -151,7 +155,7 @@ test("it should auto detect diverging entity conflicts", async () => {
             schema_key: "mock",
             file_id: "file0",
             entity_id: "entity0",
-            snapshot_id: "no-content",
+            snapshot_content: null,
         },
         {
             id: "change2",
@@ -159,7 +163,7 @@ test("it should auto detect diverging entity conflicts", async () => {
             file_id: "file0",
             entity_id: "entity0",
             schema_key: "mock",
-            snapshot_id: "no-content",
+            snapshot_content: null,
         },
     ])
         .returningAll()

package/dist/change-conflict/detect-change-conflicts.test.js.map

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

package/dist/change-conflict/detect-diverging-entity-conflict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect-diverging-entity-conflict.d.ts","sourceRoot":"","sources":["../../src/change-conflict/detect-diverging-entity-conflict.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG7E,eAAO,MAAM,iCAAiC,kCACd,CAAC;AAEjC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,6BAA6B,CAAC,IAAI,EAAE;IACzD,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC7B,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,SAAS,GAAG,YAAY,CAAC,EAAE,CAAC;CACvE,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CA+CxC"}
+{"version":3,"file":"detect-diverging-entity-conflict.d.ts","sourceRoot":"","sources":["../../src/change-conflict/detect-diverging-entity-conflict.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG7E,eAAO,MAAM,iCAAiC,kCACd,CAAC;AAEjC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,6BAA6B,CAAC,IAAI,EAAE;IACzD,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC7B,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,SAAS,GAAG,YAAY,CAAC,EAAE,CAAC;CACvE,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CA+CxC"}

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

@@ -1,4 +1,6 @@
-import { changeIsLowestCommonAncestorOf } from "../query-filter/change-is-lowest-common-ancestor-of.js";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+// import { changeIsLowestCommonAncestorOf } from "../query-filter/change-is-lowest-common-ancestor-of.js";
 export const LIX_DIVERGING_ENTITY_CONFLICT_KEY = "lix-diverging-entity-conflict";
 /**
  * Detects a diverging entity conflict between two changes.

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

@@ -1 +1 @@
-{"version":3,"file":"detect-diverging-entity-conflict.js","sourceRoot":"","sources":["../../src/change-conflict/detect-diverging-entity-conflict.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,8BAA8B,EAAE,MAAM,wDAAwD,CAAC;AAExG,MAAM,CAAC,MAAM,iCAAiC,GAC7C,+BAA+B,CAAC;AAEjC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,IAGnD;IACA,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/C,oCAAoC;IACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAEhC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBACpD,SAAS;YACV,CAAC;YAED,0DAA0D;YAC1D,+CAA+C;YAC/C,IACC,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS;gBACvC,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO;gBACnC,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU,EACxC,CAAC;gBACF,SAAS;YACV,CAAC;YAED,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;iBAC5C,UAAU,CAAC,QAAQ,CAAC;iBACpB,KAAK,CAAC,8BAA8B,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;iBACzD,MAAM,CAAC,IAAI,CAAC;iBACZ,gBAAgB,EAAE,CAAC;YAErB,iEAAiE;YACjE,IACC,OAAO,CAAC,EAAE,KAAK,oBAAoB,EAAE,EAAE;gBACvC,OAAO,CAAC,EAAE,KAAK,oBAAoB,EAAE,EAAE,EACtC,CAAC;gBACF,SAAS;YACV,CAAC;YACD,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACrC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC;IACF,CAAC;IACD,IAAI,oBAAoB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,OAAO;QACN,GAAG,EAAE,iCAAiC;QACtC,oBAAoB;KACpB,CAAC;AACH,CAAC"}
+{"version":3,"file":"detect-diverging-entity-conflict.js","sourceRoot":"","sources":["../../src/change-conflict/detect-diverging-entity-conflict.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,cAAc;AAId,2GAA2G;AAE3G,MAAM,CAAC,MAAM,iCAAiC,GAC7C,+BAA+B,CAAC;AAEjC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,IAGnD;IACA,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/C,oCAAoC;IACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAEhC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBACpD,SAAS;YACV,CAAC;YAED,0DAA0D;YAC1D,+CAA+C;YAC/C,IACC,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS;gBACvC,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO;gBACnC,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU,EACxC,CAAC;gBACF,SAAS;YACV,CAAC;YAED,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;iBAC5C,UAAU,CAAC,QAAQ,CAAC;iBACpB,KAAK,CAAC,8BAA8B,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;iBACzD,MAAM,CAAC,IAAI,CAAC;iBACZ,gBAAgB,EAAE,CAAC;YAErB,iEAAiE;YACjE,IACC,OAAO,CAAC,EAAE,KAAK,oBAAoB,EAAE,EAAE;gBACvC,OAAO,CAAC,EAAE,KAAK,oBAAoB,EAAE,EAAE,EACtC,CAAC;gBACF,SAAS;YACV,CAAC;YACD,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACrC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC;IACF,CAAC;IACD,IAAI,oBAAoB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,OAAO;QACN,GAAG,EAAE,iCAAiC;QACtC,oBAAoB;KACpB,CAAC;AACH,CAAC"}