@lix-js/sdk 0.5.1 → 0.6.0-preview.0

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

@@ -1,203 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-import { expect, test } from "vitest";
-import { openLix } from "../lix/open-lix.js";
-import { detectDivergingEntityConflict, LIX_DIVERGING_ENTITY_CONFLICT_KEY, } from "./detect-diverging-entity-conflict.js";
-test.skip("it should detect a diverging entity conflict", async () => {
-    const lix = await openLix({});
-    const mockChanges = [
-        {
-            id: "change0",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value1",
-            snapshot_content: null,
-        },
-        {
-            id: "change1",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            file_id: "mock",
-            entity_id: "value1",
-            schema_key: "mock",
-            snapshot_content: null,
-        },
-        {
-            id: "change2",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            file_id: "mock",
-            entity_id: "value1",
-            schema_key: "mock",
-            snapshot_content: null,
-        },
-    ];
-    await lix.db
-        .insertInto("change")
-        .values(mockChanges)
-        .returningAll()
-        .execute();
-    await lix.db
-        .insertInto("change_edge")
-        .values([
-        { parent_id: "change0", child_id: "change1" },
-        { parent_id: "change0", child_id: "change2" },
-    ])
-        .execute();
-    const result = await detectDivergingEntityConflict({
-        lix: lix,
-        changes: [mockChanges[1], mockChanges[2]],
-    });
-    expect(result).toEqual({
-        key: LIX_DIVERGING_ENTITY_CONFLICT_KEY,
-        conflictingChangeIds: new Set(["change1", "change2"]),
-    });
-});
-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",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value1",
-            snapshot_content: null,
-        },
-        {
-            id: "change1",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value1",
-            snapshot_content: null,
-        },
-        {
-            id: "change2",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value2",
-            snapshot_content: null,
-        },
-    ];
-    await lix.db
-        .insertInto("change")
-        .values(mockChanges)
-        .returningAll()
-        .execute();
-    const result = await detectDivergingEntityConflict({
-        lix: lix,
-        changes: [mockChanges[0], mockChanges[1]],
-    });
-    expect(result).toEqual({
-        key: LIX_DIVERGING_ENTITY_CONFLICT_KEY,
-        conflictingChangeIds: new Set(["change0", "change1"]),
-    });
-});
-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",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value1",
-            snapshot_content: null,
-        },
-        {
-            id: "change1",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            file_id: "mock",
-            entity_id: "value1",
-            schema_key: "mock",
-            snapshot_content: null,
-        },
-    ];
-    await lix.db
-        .insertInto("change")
-        .values(mockChanges)
-        .returningAll()
-        .execute();
-    await lix.db
-        .insertInto("change_edge")
-        .values([
-        // change 1 is the lowest common ancestor of change2
-        { parent_id: "change0", child_id: "change1" },
-    ])
-        .execute();
-    const result = await detectDivergingEntityConflict({
-        lix: lix,
-        changes: [mockChanges[0], mockChanges[1]],
-    });
-    expect(result).toBeUndefined();
-});
-test.skip("it should detect a diverging entity conflict with multiple divering entity changes", async () => {
-    const lix = await openLix({});
-    const mockChanges = [
-        {
-            id: "change0",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value1",
-            snapshot_content: null,
-        },
-        {
-            id: "change1",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            file_id: "mock",
-            entity_id: "value1",
-            schema_key: "mock",
-            snapshot_content: null,
-        },
-        {
-            id: "change2",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            file_id: "mock",
-            entity_id: "value1",
-            schema_key: "mock",
-            snapshot_content: null,
-        },
-        {
-            id: "change3",
-            created_at: "mock",
-            plugin_key: "plugin1",
-            file_id: "mock",
-            entity_id: "value1",
-            schema_key: "mock",
-            snapshot_content: null,
-        },
-    ];
-    await lix.db.insertInto("change").values(mockChanges).execute();
-    await lix.db
-        .insertInto("change_edge")
-        .values([
-        // change 0 is the lowest common ancestor of change1, change2, and change3
-        // which means that 1,2,3 are diverging
-        { parent_id: "change0", child_id: "change1" },
-        { parent_id: "change0", child_id: "change2" },
-        { parent_id: "change0", child_id: "change3" },
-    ])
-        .execute();
-    const result = await detectDivergingEntityConflict({
-        lix: lix,
-        changes: [mockChanges[1], mockChanges[2], mockChanges[3]],
-    });
-    expect(result).toEqual({
-        key: LIX_DIVERGING_ENTITY_CONFLICT_KEY,
-        conflictingChangeIds: new Set(["change1", "change2", "change3"]),
-    });
-});
-//# sourceMappingURL=detect-diverging-entity-conflict.test.js.map

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

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

@@ -1,14 +0,0 @@
-import type { ChangeConflict } from "../database/schema.js";
-import type { Lix } from "../lix/open-lix.js";
-/**
- * Garbage collects change conflicts.
- *
- * A change conflict is considered garbage if the conflict
- * contains changes that no version change pointer points to.
- */
-export declare function garbageCollectChangeConflicts(args: {
-    lix: Pick<Lix, "db">;
-}): Promise<{
-    deletedChangeConflicts: ChangeConflict[];
-}>;
-//# sourceMappingURL=garbage-collect-change-conflicts.d.ts.map

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

@@ -1 +0,0 @@
-{"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,69 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-import { sql } from "kysely";
-/**
- * Garbage collects change conflicts.
- *
- * A change conflict is considered garbage if the conflict
- * contains changes that no version change pointer points to.
- */
-export async function garbageCollectChangeConflicts(args) {
-    const executeInTransaction = async (trx) => {
-        // no versions are pointing to the change conflict anymore
-        // this can happen if a version is deleted or if the conflict is outdated
-        // -> delete the conflict
-        const conflictsWithVersionPointer = await trx
-            .selectFrom("change_conflict")
-            .leftJoin("version_change_conflict", "change_conflict.id", "version_change_conflict.change_conflict_id")
-            .where("version_change_conflict.change_conflict_id", "is", null)
-            .selectAll()
-            .execute();
-        // Find change conflicts where no version change pointer points to any of its elements
-        const outdatedConflicts = await trx
-            .selectFrom("change_conflict")
-            .leftJoin("change_set_element as conflict_elements", "change_conflict.change_set_id", "conflict_elements.change_set_id")
-            .leftJoin("change_set_element as version_elements", "conflict_elements.change_id", "version_elements.change_id")
-            .groupBy("change_conflict.id")
-            // TODO assumes that each change conflict element is a unique entity change
-            // TODO watch out if this assumption holds true in the future
-            //
-            // if the number of changes in the conflict that have a corresponding version change pointer
-            // is less than the total number of changes in the conflict, then there is at least one change
-            // that no version change pointer references, aka the conflict is outdated.
-            .having(sql `count(version_elements.change_id)`, 
-        // the number of changes in the conflict that have a corresponding version change pointer.
-        "<", 
-        // the total number of changes in the conflict.
-        sql `count(conflict_elements.change_id)`)
-            .selectAll("change_conflict")
-            .execute();
-        const conflictsToDelete = [
-            ...conflictsWithVersionPointer,
-            ...outdatedConflicts,
-        ];
-        // Delete the identified change conflicts and their associated pointers
-        if (conflictsToDelete.length > 0) {
-            const conflictIds = conflictsToDelete.map((conflict) => conflict.id);
-            await trx
-                .deleteFrom("change_conflict")
-                .where("id", "in", conflictIds)
-                .execute();
-            await trx
-                .deleteFrom("change_set_element")
-                .where("change_set_element.change_set_id", "in", conflictsToDelete.map((conflict) => conflict.change_set_id))
-                .execute();
-            await trx
-                .deleteFrom("version_change_conflict")
-                .where("change_conflict_id", "in", conflictIds)
-                .execute();
-        }
-        return { deletedChangeConflicts: conflictsToDelete };
-    };
-    if (args.lix.db.isTransaction) {
-        return await executeInTransaction(args.lix.db);
-    }
-    else {
-        return await args.lix.db.transaction().execute(executeInTransaction);
-    }
-}
-//# sourceMappingURL=garbage-collect-change-conflicts.js.map

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

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

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

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

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

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

@@ -1,182 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-import { test, expect } from "vitest";
-import { openLix } from "../lix/open-lix.js";
-import { garbageCollectChangeConflicts } from "./garbage-collect-change-conflicts.js";
-import { createChangeConflict } from "./create-change-conflict.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 openLix({});
-    const version0 = await createVersion({ lix, name: "version0" });
-    const changes = await lix.db
-        .insertInto("change")
-        .values([
-        {
-            id: "change0",
-            plugin_key: "mock-plugin",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value0",
-            snapshot_content: null,
-        },
-        {
-            id: "change1",
-            plugin_key: "mock-plugin",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value1",
-            snapshot_content: null,
-        },
-        {
-            id: "change2",
-            plugin_key: "mock-plugin",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value2",
-            snapshot_content: null,
-        },
-    ])
-        .returningAll()
-        .execute();
-    // Create change conflicts
-    const mockConflict0 = await createChangeConflict({
-        lix,
-        version: version0,
-        key: "mock-conflict0",
-        conflictingChangeIds: new Set(["change0", "change1"]),
-    });
-    await createChangeConflict({
-        lix,
-        version: version0,
-        key: "mock-conflict1",
-        conflictingChangeIds: new Set(["change1", "change2"]),
-    });
-    // Insert version change pointers (only for change0 and change1)
-    // change2 is not referenced by any version change pointer
-    // and should be garbage collected
-    await updateChangesInVersion({
-        lix,
-        version: version0,
-        changes: [changes[0], changes[1]],
-    });
-    // Run garbage collection
-    await garbageCollectChangeConflicts({ lix });
-    // Check remaining conflicts
-    const remainingConflicts = await lix.db
-        .selectFrom("change_conflict")
-        .selectAll()
-        .execute();
-    expect(remainingConflicts.length).toBe(1);
-    expect(remainingConflicts[0]?.id).toBe(mockConflict0.id);
-    // Check remaining conflict elements
-    const remainingConflictElements = await lix.db
-        .selectFrom("change_set_element")
-        .innerJoin("change_conflict", "change_conflict.change_set_id", "change_set_element.change_set_id")
-        .selectAll()
-        .execute();
-    expect(remainingConflictElements.length).toBe(2);
-    expect(remainingConflictElements[0]?.change_id).toBe(mockConflict0.id);
-    expect(remainingConflictElements[1]?.change_id).toBe(mockConflict0.id);
-    // Check remaining version change conflict pointers
-    const remainingVersionChangeConflictPointers = await lix.db
-        .selectFrom("version_change_conflict")
-        .selectAll()
-        .execute();
-    expect(remainingVersionChangeConflictPointers.length).toBe(1);
-    expect(remainingVersionChangeConflictPointers[0]?.change_conflict_id).toBe(mockConflict0.id);
-});
-test.skip("should garbage collect conflicts that no version references", async () => {
-    const lix = await openLix({});
-    const changes = await lix.db
-        .insertInto("change")
-        .values([
-        {
-            id: "change0",
-            plugin_key: "mock-plugin",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value0",
-            snapshot_content: null,
-        },
-        {
-            id: "change1",
-            plugin_key: "mock-plugin",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value1",
-            snapshot_content: null,
-        },
-    ])
-        .returningAll()
-        .execute();
-    const version0 = await createVersion({ lix, name: "version0" });
-    const mockConflict0 = await createChangeConflict({
-        lix,
-        version: version0,
-        key: "mock-conflict0",
-        conflictingChangeIds: new Set(["change0", "change1"]),
-    });
-    // version points to changes 0 and 1
-    await updateChangesInVersion({
-        lix,
-        version: version0,
-        changes: [changes[0], changes[1]],
-    });
-    // delete the conflict pointers mockConflict0
-    await lix.db
-        .deleteFrom("version_change_conflict")
-        .where("change_conflict_id", "=", mockConflict0.id)
-        .execute();
-    // Run garbage collection
-    const gc0 = await garbageCollectChangeConflicts({ lix });
-    expect(gc0.deletedChangeConflicts.length).toBe(1);
-    expect(gc0.deletedChangeConflicts.length).toBe(1);
-    expect(gc0.deletedChangeConflicts[0]?.id).toBe(mockConflict0.id);
-});
-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([
-        {
-            id: "change0",
-            plugin_key: "mock-plugin",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value0",
-            snapshot_content: null,
-        },
-        {
-            id: "change1",
-            plugin_key: "mock-plugin",
-            schema_key: "mock",
-            file_id: "mock",
-            entity_id: "value1",
-            snapshot_content: null,
-        },
-    ])
-        .returningAll()
-        .execute();
-    const version0 = await createVersion({ lix, name: "version0" });
-    const mockConflict0 = await createChangeConflict({
-        lix,
-        version: version0,
-        key: "mock-conflict0",
-        conflictingChangeIds: new Set(["change0", "change1"]),
-    });
-    // version points to changes 0 and 1
-    await updateChangesInVersion({
-        lix,
-        version: version0,
-        changes: [changes[0], changes[1]],
-    });
-    // Run garbage collection
-    const gc0 = await garbageCollectChangeConflicts({ lix });
-    expect(gc0.deletedChangeConflicts.length).toBe(0);
-    // delete all version change pointers
-    await lix.db.deleteFrom("version_change_conflict").execute();
-    const gc1 = await garbageCollectChangeConflicts({ lix });
-    expect(gc1.deletedChangeConflicts.length).toBe(1);
-    expect(gc1.deletedChangeConflicts[0]?.id).toBe(mockConflict0.id);
-});
-//# sourceMappingURL=garbage-collect-change-conflicts.test.js.map

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

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

@@ -1,4 +0,0 @@
-export { createChangeConflict } from "./create-change-conflict.js";
-export { detectChangeConflicts } from "./detect-change-conflicts.js";
-export { resolveChangeConflictBySelecting } from "./resolve-conflict-by-selecting.js";
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/change-conflict/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC"}

package/dist/change-conflict/index.js

@@ -1,4 +0,0 @@
-export { createChangeConflict } from "./create-change-conflict.js";
-export { detectChangeConflicts } from "./detect-change-conflicts.js";
-export { resolveChangeConflictBySelecting } from "./resolve-conflict-by-selecting.js";
-//# sourceMappingURL=index.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/change-conflict/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC"}

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

@@ -1,12 +0,0 @@
-import type { Change, ChangeConflict } from "../database/schema.js";
-import type { Lix } from "../lix/open-lix.js";
-/**
- * Resolves a conflict by selecting one of the two
- * changes in the conflict.
- */
-export declare function resolveChangeConflictBySelecting(args: {
-    lix: Lix;
-    conflict: ChangeConflict;
-    select: Change;
-}): Promise<void>;
-//# sourceMappingURL=resolve-conflict-by-selecting.d.ts.map

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

@@ -1 +0,0 @@
-{"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,48 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-/**
- * Resolves a conflict by selecting one of the two
- * changes in the conflict.
- */
-export async function resolveChangeConflictBySelecting(args) {
-    const executeInTransaction = async (trx) => {
-        await trx
-            .insertInto("change_conflict_resolution")
-            .values({
-            change_conflict_id: args.conflict.id,
-            resolved_change_id: args.select.id,
-        })
-            // conflict resolution already exists
-            .onConflict((oc) => oc.doNothing())
-            .execute();
-        // TODO on-demand apply changes https://linear.app/opral/issue/LIXDK-219/on-demand-applychanges-on-filedata-read
-        await applyChanges({
-            lix: { ...args.lix, db: trx },
-            changes: [args.select],
-        });
-        const versionsWithConflicts = await trx
-            .selectFrom("version")
-            .innerJoin("version_change_conflict", "version_change_conflict.version_id", "version.id")
-            .where("version_change_conflict.change_conflict_id", "=", args.conflict.id)
-            .selectAll()
-            .execute();
-        for (const version of versionsWithConflicts) {
-            await updateChangesInVersion({
-                lix: { ...args.lix, db: trx },
-                changes: [args.select],
-                version,
-            });
-            // remove the conflict pointer
-            await trx
-                .deleteFrom("version_change_conflict")
-                .where("version_id", "=", version.id)
-                .where("change_conflict_id", "=", args.conflict.id)
-                .execute();
-        }
-    };
-    if (args.lix.db.isTransaction) {
-        return executeInTransaction(args.lix.db);
-    }
-    return args.lix.db.transaction().execute(executeInTransaction);
-}
-//# sourceMappingURL=resolve-conflict-by-selecting.js.map

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

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

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

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

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