@lix-js/sdk 0.0.1

package/dist/change/mock-change.d.ts

@@ -0,0 +1,10 @@
+import type { Change, NewChange } from "../database/schema.js";
+/**
+ * Creates a mock change object with the given properties.
+ *
+ * @example
+ *   const change = mockChange({ id: "change1" });
+ *   await lix.db.insertInto("change").values(change).execute();
+ */
+export declare function mockChange(args: Partial<NewChange>): Change;
+//# sourceMappingURL=mock-change.d.ts.map

package/dist/change/mock-change.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-change.d.ts","sourceRoot":"","sources":["../../src/change/mock-change.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE/D;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,MAAM,CAW3D"}

package/dist/change/mock-change.js

@@ -0,0 +1,20 @@
+/**
+ * Creates a mock change object with the given properties.
+ *
+ * @example
+ *   const change = mockChange({ id: "change1" });
+ *   await lix.db.insertInto("change").values(change).execute();
+ */
+export function mockChange(args) {
+    return {
+        id: "mock",
+        created_at: "mock",
+        plugin_key: "mock",
+        file_id: "mock",
+        entity_id: "mock",
+        schema_key: "mock",
+        snapshot_id: "no-content",
+        ...args,
+    };
+}
+//# sourceMappingURL=mock-change.js.map

package/dist/change/mock-change.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-change.js","sourceRoot":"","sources":["../../src/change/mock-change.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CAAC,IAAwB;IAClD,OAAO;QACN,EAAE,EAAE,MAAM;QACV,UAAU,EAAE,MAAM;QAClB,UAAU,EAAE,MAAM;QAClB,OAAO,EAAE,MAAM;QACf,SAAS,EAAE,MAAM;QACjB,UAAU,EAAE,MAAM;QAClB,WAAW,EAAE,YAAY;QACzB,GAAG,IAAI;KACP,CAAC;AACH,CAAC"}

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

@@ -0,0 +1,15 @@
+import type { Version, Change, ChangeConflict } from "../database/schema.js";
+import type { Lix } from "../lix/open-lix.js";
+/**
+ * Creates a new change conflict with the given conflicting changes.
+ *
+ * @param args.key - The key of the change conflict.
+ * @param args.conflictingChanges - The conflicting changes.
+ */
+export declare function createChangeConflict(args: {
+    lix: Pick<Lix, "db">;
+    key: string;
+    version: Pick<Version, "id">;
+    conflictingChangeIds: Set<Change["id"]>;
+}): Promise<ChangeConflict>;
+//# sourceMappingURL=create-change-conflict.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,67 @@
+/**
+ * Creates a new change conflict with the given conflicting changes.
+ *
+ * @param args.key - The key of the change conflict.
+ * @param args.conflictingChanges - The conflicting changes.
+ */
+export async function createChangeConflict(args) {
+    const executeInTransaction = async (trx) => {
+        // Check if a conflict with the same key and identical change IDs already exists
+        const existingConflict = await trx
+            .selectFrom("change_conflict")
+            .innerJoin("version_change_conflict", "version_change_conflict.change_conflict_id", "change_conflict.id")
+            // the version should point to the conflict
+            .where("version_change_conflict.version_id", "=", args.version.id)
+            // which has the identical key
+            .where("change_conflict.key", "=", args.key)
+            // and same set of changes
+            .where((eb) => eb.exists(trx
+            .selectFrom("change_set_element")
+            .innerJoin("change_conflict", (join) => join.onRef("change_conflict.change_set_id", "=", "change_set_element.change_set_id"))
+            .where("change_set_element.change_id", "in", Array.from(args.conflictingChangeIds))
+            .groupBy("change_set_element.change_set_id")
+            .having(trx.fn.count("change_set_element.change_id"), "=", args.conflictingChangeIds.size)
+            .select("change_set_element.change_set_id")))
+            .selectAll()
+            .executeTakeFirst();
+        if (existingConflict) {
+            // Return the existing conflict if it already exists
+            return existingConflict;
+        }
+        const newChangeSet = await trx
+            .insertInto("change_set")
+            .defaultValues()
+            .returning("id")
+            .executeTakeFirstOrThrow();
+        const newConflict = await trx
+            .insertInto("change_conflict")
+            .values({
+            key: args.key,
+            change_set_id: newChangeSet.id,
+        })
+            .returningAll()
+            .executeTakeFirstOrThrow();
+        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())
+            .execute();
+        await trx
+            .insertInto("version_change_conflict")
+            .values({
+            version_id: args.version.id,
+            change_conflict_id: newConflict.id,
+        })
+            .execute();
+        return newConflict;
+    };
+    if (args.lix.db.isTransaction) {
+        return executeInTransaction(args.lix.db);
+    }
+    return args.lix.db.transaction().execute(executeInTransaction);
+}
+//# sourceMappingURL=create-change-conflict.js.map

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

@@ -0,0 +1 @@
+{"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.d.ts

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

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

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

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

@@ -0,0 +1,145 @@
+import { expect, test } from "vitest";
+import { openLixInMemory } from "../lix/open-lix-in-memory.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({});
+    const version0 = await createVersion({ lix, name: "version0" });
+    await lix.db
+        .insertInto("change")
+        .values([
+        {
+            id: "change0",
+            plugin_key: "mock-plugin",
+            schema_key: "mock",
+            file_id: "mock",
+            entity_id: "value0",
+            snapshot_id: "no-content",
+        },
+        {
+            id: "change1",
+            plugin_key: "mock-plugin",
+            file_id: "mock",
+            entity_id: "value1",
+            schema_key: "mock",
+            snapshot_id: "no-content",
+        },
+    ])
+        .execute();
+    const changeConflict = await createChangeConflict({
+        lix,
+        version: version0,
+        key: "mock-conflict",
+        conflictingChangeIds: new Set(["change0", "change1"]),
+    });
+    // Check that no new conflict is created
+    const conflictsAfter1Creation = await lix.db
+        .selectFrom("change_conflict")
+        .where("change_conflict.key", "=", "mock-conflict")
+        .selectAll()
+        .execute();
+    expect(conflictsAfter1Creation.length).toBe(1);
+    expect(conflictsAfter1Creation[0]?.id).toBe(changeConflict.id);
+    expect(conflictsAfter1Creation[0]?.key).toBe("mock-conflict");
+    // Create a second conflict
+    const changeConflict2 = await createChangeConflict({
+        lix,
+        version: version0,
+        key: "mock-conflict",
+        conflictingChangeIds: new Set(["change0", "change1"]),
+    });
+    // Check that no new conflict is created
+    const conflictsAfter2Creation = await lix.db
+        .selectFrom("change_conflict")
+        .where("change_conflict.key", "=", "mock-conflict")
+        .selectAll()
+        .execute();
+    expect(conflictsAfter2Creation.length).toBe(1);
+    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({});
+    const version0 = await createVersion({ lix, name: "version0" });
+    await lix.db
+        .insertInto("change")
+        .values([
+        {
+            id: "change0",
+            plugin_key: "mock-plugin",
+            schema_key: "mock",
+            file_id: "mock",
+            entity_id: "value0",
+            snapshot_id: "no-content",
+        },
+        {
+            id: "change1",
+            plugin_key: "mock-plugin",
+            file_id: "mock",
+            entity_id: "value1",
+            schema_key: "mock",
+            snapshot_id: "no-content",
+        },
+        {
+            id: "change2",
+            plugin_key: "mock-plugin",
+            file_id: "mock",
+            entity_id: "value1",
+            schema_key: "mock",
+            snapshot_id: "no-content",
+        },
+    ])
+        .execute();
+    const changeConflict = await createChangeConflict({
+        lix,
+        version: version0,
+        key: "mock-conflict",
+        conflictingChangeIds: new Set(["change0", "change1"]),
+    });
+    // Check that no new conflict is created
+    const conflictElements = await lix.db
+        .selectFrom("change_set_element")
+        .innerJoin("change_conflict", "change_conflict.change_set_id", "change_set_element.change_set_id")
+        .where("change_conflict.id", "=", changeConflict.id)
+        .selectAll()
+        .execute();
+    expect(conflictElements.length).toBe(2);
+    expect(conflictElements[0]?.change_id).toBe("change0");
+    expect(conflictElements[1]?.change_id).toBe("change1");
+    const changeConflict2 = await createChangeConflict({
+        lix,
+        version: version0,
+        key: "mock-conflict",
+        conflictingChangeIds: new Set(["change0", "change1"]),
+    });
+    expect(changeConflict2.id).toBe(changeConflict.id);
+    const changeConflict3 = await createChangeConflict({
+        lix,
+        version: version0,
+        key: "mock-conflict-other",
+        // 2 was preivously not in the conflict
+        conflictingChangeIds: new Set(["change1", "change2"]),
+    });
+    // Check that no new conflict is created
+    const conflictsAfter3Creation = await lix.db
+        .selectFrom("change_conflict")
+        .selectAll()
+        .execute();
+    const conflictElementsAfter3Creation = await lix.db
+        .selectFrom("change_set_element")
+        .innerJoin("change_conflict", "change_conflict.change_set_id", "change_set_element.change_set_id")
+        .where("change_conflict.id", "=", changeConflict.id)
+        .selectAll()
+        .execute();
+    expect(conflictsAfter3Creation.length).toBe(2);
+    expect(conflictsAfter3Creation.map((c) => c.key)).toStrictEqual([
+        "mock-conflict",
+        "mock-conflict-other",
+    ]);
+    expect(conflictsAfter3Creation.map((c) => c.id)).toStrictEqual([
+        changeConflict.id,
+        changeConflict3.id,
+    ]);
+    expect(conflictElementsAfter3Creation.length).toBe(2);
+});
+//# sourceMappingURL=create-change-conflict.test.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,23 @@
+import type { Change } from "../database/schema.js";
+import type { DetectedConflict, LixReadonly } from "../plugin/lix-plugin.js";
+/**
+ * Detects conflicts in the given set of changes.
+ *
+ * The caller is responsible for filtering out changes
+ * that should not lead to conflicts before calling this function.
+ *
+ * For example, detecting conflicts between two versiones should
+ * only include changes that are different between the two versiones
+ * when calling this function.
+ *
+ * @example
+ *   const detectedConflicts = await detectChangeConflicts({
+ *        lix: lix,
+ *        changes: diffingChages,
+ *   });
+ */
+export declare function detectChangeConflicts(args: {
+    lix: Pick<LixReadonly, "db" | "plugin">;
+    changes: Change[];
+}): Promise<DetectedConflict[]>;
+//# sourceMappingURL=detect-change-conflicts.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,50 @@
+import { detectDivergingEntityConflict } from "./detect-diverging-entity-conflict.js";
+/**
+ * Detects conflicts in the given set of changes.
+ *
+ * The caller is responsible for filtering out changes
+ * that should not lead to conflicts before calling this function.
+ *
+ * For example, detecting conflicts between two versiones should
+ * only include changes that are different between the two versiones
+ * when calling this function.
+ *
+ * @example
+ *   const detectedConflicts = await detectChangeConflicts({
+ *        lix: lix,
+ *        changes: diffingChages,
+ *   });
+ */
+export async function detectChangeConflicts(args) {
+    const detectedConflicts = [];
+    const plugins = await args.lix.plugin.getAll();
+    // let plugin detect conflicts
+    await Promise.all(plugins.map(async (plugin) => {
+        if (plugin.detectConflicts) {
+            const conflicts = await plugin.detectConflicts({
+                lix: args.lix,
+                changes: args.changes,
+            });
+            detectedConflicts.push(...conflicts);
+        }
+    }));
+    // auto detect diverging entity conflicts
+    // group by the primary key (entity_id, file_id, type)
+    const groupedByEntity = Object.groupBy(args.changes, (change) => `${change.entity_id}_${change.file_id}_${change.schema_key}`);
+    for (const changes of Object.values(groupedByEntity)) {
+        if (changes === undefined) {
+            continue;
+        }
+        if (changes.length > 1) {
+            const divergingEntityConflict = await detectDivergingEntityConflict({
+                lix: args.lix,
+                changes,
+            });
+            if (divergingEntityConflict) {
+                detectedConflicts.push(divergingEntityConflict);
+            }
+        }
+    }
+    return detectedConflicts;
+}
+//# sourceMappingURL=detect-change-conflicts.js.map

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

@@ -0,0 +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"}

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

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

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

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

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

@@ -0,0 +1,182 @@
+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({});
+    const mockPlugin = {
+        key: "mock-plugin",
+        detectConflicts: vi.fn().mockResolvedValue([
+            {
+                key: "mock-conflict",
+                conflictingChangeIds: new Set(["change0", "change1"]),
+            },
+        ]),
+    };
+    // Mock the plugin.getAll method to return the mock plugin
+    lix.plugin.getAll = vi.fn().mockResolvedValue([mockPlugin]);
+    const changes = [
+        {
+            id: "change0",
+            entity_id: "entity0",
+            file_id: "file0",
+            schema_key: "type0",
+        },
+        {
+            id: "change1",
+            entity_id: "entity1",
+            file_id: "file1",
+            schema_key: "type1",
+        },
+    ];
+    const detectedConflicts = await detectChangeConflicts({
+        lix,
+        changes: changes,
+    });
+    expect(detectedConflicts.length).toBe(1);
+    expect(detectedConflicts[0]?.key).toBe("mock-conflict");
+    expect(detectedConflicts[0]?.conflictingChangeIds).toEqual(new Set(["change0", "change1"]));
+    expect(mockPlugin.detectConflicts).toHaveBeenCalledWith({
+        lix,
+        changes,
+    });
+});
+test("should handle no conflicts detected by plugins", async () => {
+    const lix = await openLixInMemory({});
+    const mockPlugin = {
+        key: "mock-plugin",
+        detectConflicts: vi.fn().mockResolvedValue([]),
+    };
+    // Mock the plugin.getAll method to return the mock plugin
+    lix.plugin.getAll = vi.fn().mockResolvedValue([mockPlugin]);
+    const changes = [
+        {
+            id: "change0",
+            entity_id: "entity0",
+            file_id: "file0",
+            schema_key: "type0",
+        },
+        {
+            id: "change1",
+            entity_id: "entity1",
+            file_id: "file1",
+            schema_key: "type1",
+        },
+    ];
+    const detectedConflicts = await detectChangeConflicts({
+        lix,
+        changes: changes,
+    });
+    expect(detectedConflicts.length).toBe(0);
+    expect(mockPlugin.detectConflicts).toHaveBeenCalledWith({
+        lix,
+        changes,
+    });
+});
+test("should handle multiple plugins detecting conflicts", async () => {
+    const lix = await openLixInMemory({});
+    const mockPlugin1 = {
+        key: "mock-plugin1",
+        detectConflicts: vi.fn().mockResolvedValue([
+            {
+                key: "mock-conflict1",
+                conflictingChangeIds: new Set(["change0", "change1"]),
+            },
+        ]),
+    };
+    const mockPlugin2 = {
+        key: "mock-plugin2",
+        detectConflicts: vi.fn().mockResolvedValue([
+            {
+                key: "mock-conflict2",
+                conflictingChangeIds: new Set(["change1", "change2"]),
+            },
+        ]),
+    };
+    // Mock the plugin.getAll method to return the mock plugins
+    lix.plugin.getAll = vi.fn().mockResolvedValue([mockPlugin1, mockPlugin2]);
+    const changes = [
+        {
+            id: "change0",
+            entity_id: "entity0",
+            file_id: "file0",
+            schema_key: "type0",
+        },
+        {
+            id: "change1",
+            entity_id: "entity1",
+            file_id: "file1",
+            schema_key: "type1",
+        },
+        {
+            id: "change2",
+            entity_id: "entity2",
+            file_id: "file2",
+            schema_key: "type2",
+        },
+    ];
+    const detectedConflicts = await detectChangeConflicts({
+        lix,
+        changes: changes,
+    });
+    expect(detectedConflicts.length).toBe(2);
+    expect(detectedConflicts[0]?.key).toBe("mock-conflict1");
+    expect(detectedConflicts[0]?.conflictingChangeIds).toEqual(new Set(["change0", "change1"]));
+    expect(detectedConflicts[1]?.key).toBe("mock-conflict2");
+    expect(detectedConflicts[1]?.conflictingChangeIds).toEqual(new Set(["change1", "change2"]));
+    expect(mockPlugin1.detectConflicts).toHaveBeenCalledWith({
+        lix,
+        changes,
+    });
+    expect(mockPlugin2.detectConflicts).toHaveBeenCalledWith({
+        lix,
+        changes,
+    });
+});
+test("it should auto detect diverging entity conflicts", async () => {
+    const lix = await openLixInMemory({});
+    const changes = await lix.db
+        .insertInto("change")
+        .values([
+        {
+            id: "change0",
+            plugin_key: "plugin1",
+            schema_key: "mock",
+            file_id: "file0",
+            entity_id: "entity0",
+            snapshot_id: "no-content",
+        },
+        {
+            id: "change1",
+            plugin_key: "plugin1",
+            schema_key: "mock",
+            file_id: "file0",
+            entity_id: "entity0",
+            snapshot_id: "no-content",
+        },
+        {
+            id: "change2",
+            plugin_key: "plugin1",
+            file_id: "file0",
+            entity_id: "entity0",
+            schema_key: "mock",
+            snapshot_id: "no-content",
+        },
+    ])
+        .returningAll()
+        .execute();
+    await lix.db
+        .insertInto("change_edge")
+        .values([
+        { parent_id: "change0", child_id: "change1" },
+        { parent_id: "change0", child_id: "change2" },
+    ])
+        .execute();
+    const detectedConflicts = await detectChangeConflicts({
+        lix,
+        changes,
+    });
+    expect(detectedConflicts.length).toBe(1);
+    expect(detectedConflicts[0]?.key).toBe("lix-diverging-entity-conflict");
+    expect(detectedConflicts[0]?.conflictingChangeIds).toEqual(new Set(["change1", "change2"]));
+});
+//# sourceMappingURL=detect-change-conflicts.test.js.map

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

@@ -0,0 +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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"}

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

@@ -0,0 +1,32 @@
+import type { Change } from "../database/schema.js";
+import type { DetectedConflict, LixReadonly } from "../plugin/lix-plugin.js";
+export declare const LIX_DIVERGING_ENTITY_CONFLICT_KEY = "lix-diverging-entity-conflict";
+/**
+ * Detects a diverging entity conflict between two changes.
+ *
+ * When two changes are diverging, it means that they are
+ * based on the same entity state, but have different
+ * changes to the entity.
+ *
+ * A diverging entity conflict usually happens when two users
+ * are working on the same entity and both have made changes
+ * to the entity but are not in sync.
+ *
+ * @note
+ *   Filter out changes that are not based on the same entity
+ *   before calling this function to reduce the number of
+ *   comparisons.
+ *
+ * @example
+ *   const detectedConflict = await detectDivergingEntityConflict({
+ *      	lix: lix,
+ * 				changes: [changeA, changeB],
+ *   });
+ *
+ * @returns The detected conflict or undefined if no conflict was detected.
+ */
+export declare function detectDivergingEntityConflict(args: {
+    lix: Pick<LixReadonly, "db">;
+    changes: Pick<Change, "id" | "entity_id" | "file_id" | "schema_key">[];
+}): Promise<DetectedConflict | undefined>;
+//# sourceMappingURL=detect-diverging-entity-conflict.d.ts.map

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

@@ -0,0 +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"}