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

package/dist/change-set-v2/create-merge-change-set.js

@@ -0,0 +1,68 @@
+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 "./create-change-set.js";
+/**
+ * Merges two change sets using a "source wins" strategy (until lix models conflicts).
+ *
+ * Creates a new change set containing the merged result. If an element
+ * (identified by entity_id, file_id, schema_key) exists in both the source
+ * and target change sets (considering their respective histories), the element
+ * from the source change set's history takes precedence.
+ *
+ * @param args - The arguments for the merge operation.
+ * @param args.lix - The Lix instance.
+ * @param args.source - The source change set (only `id` is needed).
+ * @param args.target - The target change set (only `id` is needed).
+ *
+ * @returns A Promise resolving to the newly created ChangeSet representing the merged state.
+ */
+export async function createMergeChangeSet(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,
+            })),
+            parents: [args.source, args.target],
+        });
+        return newChangeSet;
+    };
+    // Restore transaction handling
+    if (args.lix.db.isTransaction) {
+        return executeInTransaction(args.lix.db);
+    }
+    else {
+        return args.lix.db.transaction().execute(executeInTransaction);
+    }
+}
+//# sourceMappingURL=create-merge-change-set.js.map

package/dist/change-set-v2/create-merge-change-set.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-merge-change-set.js","sourceRoot":"","sources":["../../src/change-set-v2/create-merge-change-set.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAE,wBAAwB,EAAE,MAAM,kDAAkD,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,IAI1C;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,kEAAkE;QAClE,MAAM,cAAc,GAAG,MAAM,GAAG;aAC9B,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE,CAC5B,EAAE;aACA,UAAU,CAAC,oBAAoB,CAAC;aAChC,KAAK,CAAC,4BAA4B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aAClD,KAAK,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aAC9C,SAAS,CAAC,oBAAoB,CAAC,CACjC;aACA,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE,CAC5B,EAAE;aACA,UAAU,CAAC,oBAAoB,CAAC;aAChC,KAAK,CAAC,4BAA4B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aAClD,KAAK,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aAC9C,SAAS,CAAC,oBAAoB,CAAC,CACjC;aACA,UAAU,CAAC,cAAc,CAAC,CAAC,6CAA6C;aACxE,SAAS,EAAE;aACX,KAAK,CACL,CAAC,EAAE,EAAE,EAAE,CACN,EAAE;aACA,UAAU,CAAC,cAAc,CAAC,CAAC,0BAA0B;aACrD,SAAS,EAAE;aACX,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CACtC,GAAG,CACF,MAAM;QACL,6DAA6D;QAC7D,UAAU,CAAC,cAAc,CAAC;aACxB,MAAM,CAAC,wBAAwB,CAAC,CAAC,yBAAyB;aAC1D,QAAQ,CACR,wBAAwB,EACxB,GAAG,EACH,wBAAwB,CACxB;aACA,QAAQ,CACR,sBAAsB,EACtB,GAAG,EACH,sBAAsB,CACtB;aACA,QAAQ,CACR,yBAAyB,EACzB,GAAG,EACH,yBAAyB,CACzB,CACF,CACD,CACD,CAAC,uBAAuB;SAC3B,CAAC,YAAY;aACb,OAAO,EAAE,CAAC;QAEZ,yCAAyC;QACzC,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC;YAC1C,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;YAC7B,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACrC,SAAS,EAAE,EAAE,CAAC,SAAS;gBACvB,SAAS,EAAE,EAAE,CAAC,SAAS;gBACvB,UAAU,EAAE,EAAE,CAAC,UAAU;gBACzB,OAAO,EAAE,EAAE,CAAC,OAAO;aACnB,CAAC,CAAC;YACH,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;SACnC,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC;IACrB,CAAC,CAAC;IAEF,+BAA+B;IAC/B,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC;QAC/B,OAAO,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC;SAAM,CAAC;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAChE,CAAC;AACF,CAAC"}

package/dist/change-set-v2/create-merge-change-set.test.d.ts

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

package/dist/change-set-v2/create-merge-change-set.test.d.ts.map

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

package/dist/change-set-v2/create-merge-change-set.test.js

@@ -0,0 +1,223 @@
+import { expect, test } from "vitest";
+import { openLixInMemory } from "../lix/open-lix-in-memory.js";
+import { createMergeChangeSet } from "./create-merge-change-set.js";
+import { createChangeSet } from "./create-change-set.js";
+test("it should merge non-conflicting changes", async () => {
+    const lix = await openLixInMemory({});
+    await lix.db
+        .insertInto("stored_schema")
+        .values({
+        value: {
+            "x-lix-key": "test_schema",
+            "x-lix-version": "1.0",
+            type: "object",
+            properties: {
+                id: { type: "string" },
+            },
+            required: ["id"],
+        },
+    })
+        .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_id: "no-content",
+        },
+        {
+            id: "c1",
+            schema_key: "test_schema",
+            schema_version: "1.0",
+            entity_id: "e1",
+            file_id: "file0",
+            plugin_key: "mock_plugin",
+            snapshot_id: "no-content",
+        },
+        {
+            id: "c2",
+            schema_key: "test_schema",
+            schema_version: "1.0",
+            entity_id: "e2",
+            file_id: "file0",
+            plugin_key: "mock_plugin",
+            snapshot_id: "no-content",
+        },
+    ])
+        .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,
+        })),
+    });
+    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,
+        })),
+    });
+    // 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,
+        })),
+        parents: [cs1],
+    });
+    const merged = await createMergeChangeSet({
+        lix,
+        source: cs0,
+        target: cs2,
+    });
+    const mergedElements = await lix.db
+        .selectFrom("change_set_element")
+        .where("change_set_element.change_set_id", "=", merged.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 openLixInMemory({});
+    await lix.db
+        .insertInto("stored_schema")
+        .values({
+        value: {
+            "x-lix-key": "s1",
+            "x-lix-version": "1.0",
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                text: { type: "string" },
+            },
+            required: ["id"],
+        },
+    })
+        .execute();
+    // Create initial snapshots with different content
+    await lix.db
+        .insertInto("snapshot")
+        .values([
+        { id: "snap1", content: { text: "base" } },
+        { id: "snap2", content: { text: "target mod" } },
+        { id: "snap3", content: { text: "source mod" } },
+    ])
+        .execute();
+    const snapshots = [
+        { id: "snap1" },
+        { id: "snap2" },
+        { id: "snap3" },
+    ];
+    // 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_id: snapshots[0].id,
+        },
+        {
+            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_id: snapshots[1].id,
+        },
+        {
+            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_id: snapshots[2].id,
+        },
+    ])
+        .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,
+        })),
+    });
+    // 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,
+        })),
+        parents: [cs_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,
+        })),
+        parents: [cs_base],
+    });
+    // 4. Merge source into target
+    const merged = await createMergeChangeSet({
+        lix,
+        source: cs_source,
+        target: cs_target,
+    });
+    // 5. Verify merged change set elements
+    const mergedElements = await lix.db
+        .selectFrom("change_set_element")
+        .where("change_set_element.change_set_id", "=", merged.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.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
+    const edges = await lix.db
+        .selectFrom("change_set_edge")
+        .where("child_id", "=", merged.id)
+        .selectAll()
+        .execute();
+    expect(edges).toHaveLength(2);
+    expect(edges.map((e) => e.parent_id).sort()).toEqual([cs_source.id, cs_target.id].sort());
+});
+//# sourceMappingURL=create-merge-change-set.test.js.map

package/dist/change-set-v2/create-merge-change-set.test.js.map

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

package/dist/change-set-v2/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./schema.js";
+export { createChangeSet } from "./create-change-set.js";
+export { applyChangeSet } from "./apply-change-set.js";
+export { createMergeChangeSet } from "./create-merge-change-set.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/change-set-v2/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/change-set-v2/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/change-set-v2/index.js

@@ -0,0 +1,5 @@
+export * from "./schema.js";
+export { createChangeSet } from "./create-change-set.js";
+export { applyChangeSet } from "./apply-change-set.js";
+export { createMergeChangeSet } from "./create-merge-change-set.js";
+//# sourceMappingURL=index.js.map

package/dist/change-set-v2/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/change-set-v2/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/change-set-v2/schema.d.ts

@@ -0,0 +1,50 @@
+import type { Generated, Insertable, Selectable, Updateable } from "kysely";
+import type { SqliteWasmDatabase } from "sqlite-wasm-kysely";
+import type { LixSchemaDefinition, FromLixSchemaDefinition } from "../schema-definition/definition.js";
+import type { Version } from "../version/schema.js";
+export declare function applyChangeSetDatabaseSchema(sqlite: SqliteWasmDatabase): SqliteWasmDatabase;
+export declare const LixChangeSetSchema: LixSchemaDefinition;
+export type LixChangeSet = FromLixSchemaDefinition<typeof LixChangeSetSchema>;
+export type ChangeSetView = {
+    id: Generated<string>;
+    metadata: Record<string, any> | null;
+    version_id: Generated<Version["id"]>;
+};
+export type ChangeSet = Selectable<ChangeSetView>;
+export type NewChangeSet = Insertable<ChangeSetView>;
+export type ChangeSetUpdate = Updateable<ChangeSetView>;
+export declare const LixChangeSetElementSchema: LixSchemaDefinition;
+export type LixChangeSetElement = FromLixSchemaDefinition<typeof LixChangeSetElementSchema>;
+export type ChangeSetElementView = {
+    change_set_id: string;
+    change_id: string;
+    entity_id: string;
+    schema_key: string;
+    file_id: string;
+    version_id: Generated<string>;
+};
+export type ChangeSetElement = Selectable<ChangeSetElementView>;
+export type NewChangeSetElement = Insertable<ChangeSetElementView>;
+export type ChangeSetElementUpdate = Updateable<ChangeSetElementView>;
+export declare const LixChangeSetEdgeSchema: LixSchemaDefinition;
+export type LixChangeSetEdge = FromLixSchemaDefinition<typeof LixChangeSetEdgeSchema>;
+export type ChangeSetEdgeView = {
+    parent_id: string;
+    child_id: string;
+    version_id: Generated<string>;
+};
+export type ChangeSetEdge = Selectable<ChangeSetEdgeView>;
+export type NewChangeSetEdge = Insertable<ChangeSetEdgeView>;
+export type ChangeSetEdgeUpdate = Updateable<ChangeSetEdgeView>;
+export declare const LixChangeSetLabelSchema: LixSchemaDefinition;
+export type LixChangeSetLabel = FromLixSchemaDefinition<typeof LixChangeSetLabelSchema>;
+export type ChangeSetLabelView = {
+    change_set_id: string;
+    label_id: string;
+    metadata: Record<string, any> | null;
+    version_id: Generated<string>;
+};
+export type ChangeSetLabel = Selectable<ChangeSetLabelView>;
+export type NewChangeSetLabel = Insertable<ChangeSetLabelView>;
+export type ChangeSetLabelUpdate = Updateable<ChangeSetLabelView>;
+//# sourceMappingURL=schema.d.ts.map

package/dist/change-set-v2/schema.d.ts.map

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