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

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

@@ -0,0 +1,38 @@
+import type { Lix } from "../lix/index.js";
+import type { LixCommit } from "./schema.js";
+import type { LixChangeSet } from "../change-set/schema.js";
+/**
+ * Creates a commit that points to a change set and optionally has parent commits.
+ *
+ * This function only creates the commit record and edges - it does NOT apply the commit
+ * to any version. To update a version to point to this commit, use applyCommit().
+ *
+ * @example
+ * ```ts
+ * // Create a commit with no parents (root commit)
+ * const commit = await createCommit({
+ *   lix,
+ *   changeSet: myChangeSet
+ * });
+ *
+ * // Create a commit with one parent
+ * const childCommit = await createCommit({
+ *   lix,
+ *   changeSet: newChangeSet,
+ *   parentCommits: [parentCommit]
+ * });
+ *
+ * // Create a merge commit with multiple parents
+ * const mergeCommit = await createCommit({
+ *   lix,
+ *   changeSet: mergedChangeSet,
+ *   parentCommits: [commit1, commit2]
+ * });
+ * ```
+ */
+export declare function createCommit(args: {
+    lix: Lix;
+    changeSet: Pick<LixChangeSet, "id">;
+    parentCommits?: Array<Pick<LixCommit, "id">>;
+}): Promise<LixCommit>;
+//# sourceMappingURL=create-commit.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"create-commit.d.ts","sourceRoot":"","sources":["../../src/commit/create-commit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAG5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACxC,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IACpC,aAAa,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;CAC7C,GAAG,OAAO,CAAC,SAAS,CAAC,CAyCrB"}

package/dist/commit/create-commit.js

@@ -0,0 +1,68 @@
+import { uuidV7 } from "../deterministic/uuid-v7.js";
+/**
+ * Creates a commit that points to a change set and optionally has parent commits.
+ *
+ * This function only creates the commit record and edges - it does NOT apply the commit
+ * to any version. To update a version to point to this commit, use applyCommit().
+ *
+ * @example
+ * ```ts
+ * // Create a commit with no parents (root commit)
+ * const commit = await createCommit({
+ *   lix,
+ *   changeSet: myChangeSet
+ * });
+ *
+ * // Create a commit with one parent
+ * const childCommit = await createCommit({
+ *   lix,
+ *   changeSet: newChangeSet,
+ *   parentCommits: [parentCommit]
+ * });
+ *
+ * // Create a merge commit with multiple parents
+ * const mergeCommit = await createCommit({
+ *   lix,
+ *   changeSet: mergedChangeSet,
+ *   parentCommits: [commit1, commit2]
+ * });
+ * ```
+ */
+export async function createCommit(args) {
+    const executeInTransaction = async (trx) => {
+        const commitId = uuidV7({ lix: args.lix });
+        // Create the commit
+        await trx
+            .insertInto("commit_all")
+            .values({
+            id: commitId,
+            change_set_id: args.changeSet.id,
+            lixcol_version_id: "global",
+        })
+            .execute();
+        // Create commit edges to parents
+        if (args.parentCommits && args.parentCommits.length > 0) {
+            const edges = args.parentCommits.map((parent) => ({
+                parent_id: parent.id,
+                child_id: commitId,
+                lixcol_version_id: "global",
+            }));
+            await trx.insertInto("commit_edge_all").values(edges).execute();
+        }
+        // Return the created commit
+        const commit = await trx
+            .selectFrom("commit_all")
+            .where("id", "=", commitId)
+            .where("lixcol_version_id", "=", "global")
+            .selectAll()
+            .executeTakeFirstOrThrow();
+        return commit;
+    };
+    if (args.lix.db.isTransaction) {
+        return executeInTransaction(args.lix.db);
+    }
+    else {
+        return args.lix.db.transaction().execute(executeInTransaction);
+    }
+}
+//# sourceMappingURL=create-commit.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"create-commit.js","sourceRoot":"","sources":["../../src/commit/create-commit.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAErD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAIlC;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAE3C,oBAAoB;QACpB,MAAM,GAAG;aACP,UAAU,CAAC,YAAY,CAAC;aACxB,MAAM,CAAC;YACP,EAAE,EAAE,QAAQ;YACZ,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE;YAChC,iBAAiB,EAAE,QAAQ;SAC3B,CAAC;aACD,OAAO,EAAE,CAAC;QAEZ,iCAAiC;QACjC,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACjD,SAAS,EAAE,MAAM,CAAC,EAAE;gBACpB,QAAQ,EAAE,QAAQ;gBAClB,iBAAiB,EAAE,QAAQ;aAC3B,CAAC,CAAC,CAAC;YAEJ,MAAM,GAAG,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QACjE,CAAC;QAED,4BAA4B;QAC5B,MAAM,MAAM,GAAG,MAAM,GAAG;aACtB,UAAU,CAAC,YAAY,CAAC;aACxB,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC;aAC1B,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE,QAAQ,CAAC;aACzC,SAAS,EAAE;aACX,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/commit/create-merge-commit.d.ts

@@ -0,0 +1,24 @@
+import type { Lix } from "../lix/open-lix.js";
+import type { LixCommit } from "./schema.js";
+/**
+ * Merges two commits using a "source wins" strategy (until lix models conflicts).
+ *
+ * Creates a new change set containing the merged result and a commit that
+ * points to both source and target commits. If an element (identified by
+ * entity_id, file_id, schema_key) exists in both the source and target
+ * commits (considering their respective histories), the element from the
+ * source commit's history takes precedence.
+ *
+ * @param args - The arguments for the merge operation.
+ * @param args.lix - The Lix instance.
+ * @param args.source - The source commit (only `id` is needed).
+ * @param args.target - The target commit (only `id` is needed).
+ *
+ * @returns A Promise resolving to the newly created Commit representing the merged state.
+ */
+export declare function createMergeCommit(args: {
+    lix: Lix;
+    source: Pick<LixCommit, "id">;
+    target: Pick<LixCommit, "id">;
+}): Promise<LixCommit>;
+//# sourceMappingURL=create-merge-commit.d.ts.map

package/dist/commit/create-merge-commit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-merge-commit.d.ts","sourceRoot":"","sources":["../../src/commit/create-merge-commit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAI9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAG7C;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9B,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC,SAAS,CAAC,CA8GrB"}

package/dist/commit/create-merge-commit.js

@@ -0,0 +1,103 @@
+import { changeSetElementInAncestryOf } from "../query-filter/change-set-element-in-ancestry-of.js";
+import { changeSetElementIsLeafOf } from "../query-filter/change-set-element-is-leaf-of.js";
+import { createChangeSet } from "../change-set/create-change-set.js";
+import { uuidV7 } from "../deterministic/uuid-v7.js";
+/**
+ * Merges two commits using a "source wins" strategy (until lix models conflicts).
+ *
+ * Creates a new change set containing the merged result and a commit that
+ * points to both source and target commits. If an element (identified by
+ * entity_id, file_id, schema_key) exists in both the source and target
+ * commits (considering their respective histories), the element from the
+ * source commit's history takes precedence.
+ *
+ * @param args - The arguments for the merge operation.
+ * @param args.lix - The Lix instance.
+ * @param args.source - The source commit (only `id` is needed).
+ * @param args.target - The target commit (only `id` is needed).
+ *
+ * @returns A Promise resolving to the newly created Commit representing the merged state.
+ */
+export async function createMergeCommit(args) {
+    const executeInTransaction = async (trx) => {
+        // --- Calculate the merged elements using "source wins" logic ---
+        const mergedElements = await trx
+            .with("SourceLeaves", (db) => db
+            .selectFrom("change_set_element")
+            .where(changeSetElementInAncestryOf([args.source]))
+            .where(changeSetElementIsLeafOf([args.source]))
+            .selectAll("change_set_element"))
+            .with("TargetLeaves", (db) => db
+            .selectFrom("change_set_element")
+            .where(changeSetElementInAncestryOf([args.target]))
+            .where(changeSetElementIsLeafOf([args.target]))
+            .selectAll("change_set_element"))
+            .selectFrom("SourceLeaves") // Select all source leaves (they always win)
+            .selectAll()
+            .union((db) => db
+            .selectFrom("TargetLeaves") // Select target leaves...
+            .selectAll()
+            .where(({ not, exists, selectFrom }) => not(exists(
+        // ...that do NOT have a corresponding entity in SourceLeaves
+        selectFrom("SourceLeaves")
+            .select("SourceLeaves.entity_id") // Select something small
+            .whereRef("SourceLeaves.entity_id", "=", "TargetLeaves.entity_id")
+            .whereRef("SourceLeaves.file_id", "=", "TargetLeaves.file_id")
+            .whereRef("SourceLeaves.schema_key", "=", "TargetLeaves.schema_key")))) // End WHERE NOT EXISTS
+        ) // End UNION
+            .execute();
+        // Create the new merge change set record
+        const newChangeSet = await createChangeSet({
+            lix: { ...args.lix, db: trx },
+            elements: mergedElements.map((ce) => ({
+                change_id: ce.change_id,
+                entity_id: ce.entity_id,
+                schema_key: ce.schema_key,
+                file_id: ce.file_id,
+            })),
+            lixcol_version_id: "global",
+        });
+        // Create a commit for the merged change set
+        const commitId = uuidV7({ lix: args.lix });
+        // Insert the commit
+        await trx
+            .insertInto("commit_all")
+            .values({
+            id: commitId,
+            change_set_id: newChangeSet.id,
+            lixcol_version_id: "global",
+        })
+            .execute();
+        // Create commit edges to both parents
+        await trx
+            .insertInto("commit_edge_all")
+            .values([
+            {
+                parent_id: args.source.id,
+                child_id: commitId,
+                lixcol_version_id: "global",
+            },
+            {
+                parent_id: args.target.id,
+                child_id: commitId,
+                lixcol_version_id: "global",
+            },
+        ])
+            .execute();
+        // Return the commit
+        const commit = await trx
+            .selectFrom("commit")
+            .where("id", "=", commitId)
+            .selectAll()
+            .executeTakeFirstOrThrow();
+        return commit;
+    };
+    // Restore transaction handling
+    if (args.lix.db.isTransaction) {
+        return executeInTransaction(args.lix.db);
+    }
+    else {
+        return args.lix.db.transaction().execute(executeInTransaction);
+    }
+}
+//# sourceMappingURL=create-merge-commit.js.map

package/dist/commit/create-merge-commit.js.map

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

package/dist/commit/create-merge-commit.test.d.ts

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

package/dist/commit/create-merge-commit.test.d.ts.map

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

package/dist/commit/create-merge-commit.test.js

@@ -0,0 +1,242 @@
+import { expect, test } from "vitest";
+import { openLix } from "../lix/open-lix.js";
+import { createMergeCommit } from "./create-merge-commit.js";
+import { createChangeSet } from "../change-set/create-change-set.js";
+import { createCommit } from "./create-commit.js";
+test("it should merge non-conflicting changes", async () => {
+    const lix = await openLix({});
+    await lix.db
+        .insertInto("stored_schema_all")
+        .values({
+        key: "test_schema",
+        version: "1.0",
+        value: {
+            "x-lix-key": "test_schema",
+            "x-lix-version": "1.0",
+            type: "object",
+            additionalProperties: false,
+            properties: {
+                id: { type: "string" },
+            },
+            required: ["id"],
+        },
+        lixcol_version_id: "global",
+    })
+        .execute();
+    const changes = await lix.db
+        .insertInto("change")
+        .values([
+        {
+            id: "c0",
+            schema_key: "test_schema",
+            schema_version: "1.0",
+            entity_id: "e0",
+            file_id: "file0",
+            plugin_key: "mock_plugin",
+            snapshot_content: null,
+        },
+        {
+            id: "c1",
+            schema_key: "test_schema",
+            schema_version: "1.0",
+            entity_id: "e1",
+            file_id: "file0",
+            plugin_key: "mock_plugin",
+            snapshot_content: null,
+        },
+        {
+            id: "c2",
+            schema_key: "test_schema",
+            schema_version: "1.0",
+            entity_id: "e2",
+            file_id: "file0",
+            plugin_key: "mock_plugin",
+            snapshot_content: null,
+        },
+    ])
+        .returningAll()
+        .execute();
+    const cs0 = await createChangeSet({
+        lix,
+        elements: [changes[0]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+        lixcol_version_id: "global",
+    });
+    const commit0 = await createCommit({ lix, changeSet: cs0 });
+    const cs1 = await createChangeSet({
+        lix,
+        elements: [changes[1]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+        lixcol_version_id: "global",
+    });
+    const commit1 = await createCommit({ lix, changeSet: cs1 });
+    // simulating graph relation
+    const cs2 = await createChangeSet({
+        lix,
+        elements: [changes[2]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+        lixcol_version_id: "global",
+    });
+    const commit2 = await createCommit({
+        lix,
+        changeSet: cs2,
+        parentCommits: [commit1],
+    });
+    const merged = await createMergeCommit({
+        lix,
+        source: commit0,
+        target: commit2,
+    });
+    const mergedElements = await lix.db
+        .selectFrom("change_set_element")
+        .where("change_set_element.change_set_id", "=", merged.change_set_id)
+        .selectAll()
+        .execute();
+    expect(mergedElements).toHaveLength(3);
+    expect(mergedElements.map((e) => e.change_id).sort()).toEqual([changes[0].id, changes[1].id, changes[2].id].sort());
+});
+test("should handle conflicting elements with source winning (until conflicts are modeled in lix)", async () => {
+    const lix = await openLix({});
+    await lix.db
+        .insertInto("stored_schema_all")
+        .values({
+        key: "s1",
+        version: "1.0",
+        value: {
+            "x-lix-key": "s1",
+            "x-lix-version": "1.0",
+            additionalProperties: false,
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                text: { type: "string" },
+            },
+            required: ["id"],
+        },
+        lixcol_version_id: "global",
+    })
+        .execute();
+    // Create changes for the different states of the same entity
+    const changes = await lix.db
+        .insertInto("change")
+        .values([
+        {
+            id: "c_base",
+            schema_key: "s1",
+            schema_version: "1.0",
+            entity_id: "e1",
+            file_id: "file1",
+            plugin_key: "mock_plugin",
+            snapshot_content: { text: "base" },
+        },
+        {
+            id: "c_target",
+            schema_key: "s1",
+            schema_version: "1.0",
+            entity_id: "e1", // Same entity as base, different content
+            file_id: "file1",
+            plugin_key: "mock_plugin",
+            snapshot_content: { text: "target mod" },
+        },
+        {
+            id: "c_source",
+            schema_key: "s1",
+            schema_version: "1.0",
+            entity_id: "e1", // Same entity as base, different content
+            file_id: "file1",
+            plugin_key: "mock_plugin",
+            snapshot_content: { text: "source mod" },
+        },
+    ])
+        .returningAll()
+        .execute();
+    // 1. Base change set with initial content
+    const cs_base = await createChangeSet({
+        lix,
+        elements: [changes[0]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+        lixcol_version_id: "global",
+    });
+    const commit_base = await createCommit({
+        lix,
+        changeSet: cs_base,
+    });
+    // 2. Target branch - modifies e1
+    const cs_target = await createChangeSet({
+        lix,
+        elements: [changes[1]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+        lixcol_version_id: "global",
+    });
+    const commit_target = await createCommit({
+        lix,
+        changeSet: cs_target,
+        parentCommits: [commit_base],
+    });
+    // 3. Source branch - modifies e1 differently
+    const cs_source = await createChangeSet({
+        lix,
+        elements: [changes[2]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+        lixcol_version_id: "global",
+    });
+    const commit_source = await createCommit({
+        lix,
+        changeSet: cs_source,
+        parentCommits: [commit_base],
+    });
+    // 4. Merge source into target
+    const merged = await createMergeCommit({
+        lix,
+        source: commit_source,
+        target: commit_target,
+    });
+    // 5. Verify merged change set elements
+    const mergedElements = await lix.db
+        .selectFrom("change_set_element")
+        .where("change_set_element.change_set_id", "=", merged.change_set_id)
+        .selectAll()
+        .execute();
+    // The merge should only contain the element from the source change set due to "source wins"
+    expect(mergedElements).toHaveLength(1);
+    expect(mergedElements[0]).toEqual(expect.objectContaining({
+        change_set_id: merged.change_set_id,
+        change_id: changes[2].id,
+        entity_id: changes[2].entity_id,
+        schema_key: changes[2].schema_key,
+        file_id: changes[2].file_id,
+    }));
+    // 6. Verify graph structure - the merged commit should have edges pointing to both source and target
+    const edges = await lix.db
+        .selectFrom("commit_edge")
+        .where("child_id", "=", merged.id)
+        .selectAll()
+        .execute();
+    expect(edges).toHaveLength(2);
+    expect(edges.map((e) => e.parent_id).sort()).toEqual([commit_source.id, commit_target.id].sort());
+});
+//# sourceMappingURL=create-merge-commit.test.js.map

package/dist/commit/create-merge-commit.test.js.map

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

package/dist/commit/create-transition-commit.d.ts

@@ -0,0 +1,18 @@
+import type { Lix } from "../lix/index.js";
+import type { LixCommit } from "./schema.js";
+/**
+ * Creates a commit that enables a transition from a source state
+ * (defined by `sourceCommit`) to a target state (defined by `targetCommit`).
+ *
+ * Applying the returned commit to the source state will result in a state
+ * that matches the target state.
+ *
+ * - switch between state (switching versions, checkpoints, etc.)
+ * - restore old state (applying the transition commit on top of current state)
+ */
+export declare function createTransitionCommit(args: {
+    lix: Lix;
+    sourceCommit: Pick<LixCommit, "id">;
+    targetCommit: Pick<LixCommit, "id">;
+}): Promise<LixCommit>;
+//# sourceMappingURL=create-transition-commit.d.ts.map

package/dist/commit/create-transition-commit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-transition-commit.d.ts","sourceRoot":"","sources":["../../src/commit/create-transition-commit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IAClD,GAAG,EAAE,GAAG,CAAC;IACT,YAAY,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACpC,YAAY,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;CACpC,GAAG,OAAO,CAAC,SAAS,CAAC,CAqKrB"}