@lix-js/sdk 0.0.1

package/dist/lix/merge.js

@@ -0,0 +1,195 @@
+import { getLeafChangesOnlyInSource } from "./merge.get-leaf-changes-only-in-source.js";
+import { withSkipChangeQueue } from "../change-queue/with-skip-change-queue.js";
+/**
+ * Combined the changes of the source lix into the target lix.
+ */
+export async function merge(args) {
+    // TODO increase performance by using attach mode
+    //      and only get the changes that are not in target.
+    const sourceChangesWithSnapshot = await args.sourceLix.db
+        .selectFrom("change")
+        .innerJoin("snapshot", "snapshot.id", "change.snapshot_id")
+        .selectAll("change")
+        .select("snapshot.content")
+        .execute();
+    // TODO don't query the changes again. inefficient.
+    const leafChangesOnlyInSource = await getLeafChangesOnlyInSource({
+        sourceLix: args.sourceLix,
+        targetLix: args.targetLix,
+    });
+    // 2. Let the plugin detect conflicts
+    const plugins = await args.sourceLix.plugin.getAll();
+    const plugin = plugins[0];
+    // TODO function assumes that all changes belong to the same file
+    if (plugins.length > 1) {
+        throw new Error("Unimplemented. Only one plugin is supported for now");
+    }
+    const conflicts = 
+    // (await plugin?.detectConflicts?.({
+    // 	sourceLix: args.sourceLix,
+    // 	targetLix: args.targetLix,
+    // })) ??
+    [];
+    const changesPerFile = {};
+    const fileIds = new Set(sourceChangesWithSnapshot.map((c) => c.file_id));
+    for (const fileId of fileIds) {
+        // 3. apply non conflicting leaf changes
+        // TODO inefficient double looping
+        const nonConflictingLeafChangesInSourceForFile = leafChangesOnlyInSource
+            .filter((sourceChange) => conflicts.every((conflict) => conflict.conflictingChangeIds.has(sourceChange.id) === false))
+            .filter((c) => c.file_id === fileId);
+        let file = await args.targetLix.db
+            .selectFrom("file")
+            .selectAll()
+            .where("id", "=", fileId)
+            .executeTakeFirst();
+        // If the file does not exist in the target lix - we just copy the whole file over
+        if (!file) {
+            file = await args.sourceLix.db
+                .selectFrom("file")
+                .selectAll()
+                .where("id", "=", fileId)
+                .executeTakeFirst();
+            if (file) {
+                const fileToInsert = {
+                    id: file.id,
+                    path: file.path,
+                    data: file.data,
+                    metadata: file.metadata,
+                };
+                await withSkipChangeQueue(args.targetLix.db, async (trx) => {
+                    await trx
+                        .insertInto("file")
+                        .values({ ...fileToInsert })
+                        .executeTakeFirst();
+                });
+            }
+        }
+        if (!plugin?.applyChanges) {
+            throw new Error("Plugin does not support applying changes");
+        }
+        const { fileData } = await plugin.applyChanges({
+            changes: nonConflictingLeafChangesInSourceForFile,
+            // @ts-expect-error - TODO apply changes can be an undefined file
+            file,
+            lix: args.targetLix,
+        });
+        changesPerFile[fileId] = fileData;
+    }
+    // DISCUSSIONS
+    /**
+     * NOTE:
+     * this is a naiv implementation that selects just all discussions
+     * and passes them to the target
+     **/
+    // selecting all discussion related entries for later upsert
+    const sourceDiscussions = await args.sourceLix.db
+        .selectFrom("discussion")
+        .selectAll()
+        .execute();
+    const sourceComments = await args.sourceLix.db
+        .selectFrom("comment")
+        .selectAll()
+        .execute();
+    // change graph
+    const sourceEdges = await args.sourceLix.db
+        .selectFrom("change_edge")
+        .selectAll()
+        .execute();
+    // change sets
+    const sourceChangeSets = await args.sourceLix.db
+        .selectFrom("change_set")
+        .selectAll()
+        .execute();
+    const sourceChangeSetItems = await args.sourceLix.db
+        .selectFrom("change_set_element")
+        .selectAll()
+        .execute();
+    await args.targetLix.db.transaction().execute(async (trx) => {
+        if (sourceChangesWithSnapshot.length > 0) {
+            // copy the snapshots from source
+            await trx
+                .insertInto("snapshot")
+                .values(
+            // https://github.com/opral/inlang-message-sdk/issues/123
+            sourceChangesWithSnapshot.map((change) => ({
+                content: change.content,
+            })))
+                // ignore if already exists
+                .onConflict((oc) => oc.doNothing())
+                .execute();
+            await trx
+                .insertInto("change")
+                .values(sourceChangesWithSnapshot.map((c) => ({
+                ...c,
+                content: undefined,
+            })))
+                // ignore if already exists
+                .onConflict((oc) => oc.doNothing())
+                .execute();
+        }
+        // insert the conflicts of those changes
+        if (conflicts.length > 0) {
+            // await trx
+            // 	.insertInto("conflict")
+            // 	.values(conflicts)
+            // 	// ignore if already exists
+            // 	.onConflict((oc) => oc.doNothing())
+            // 	.execute();
+        }
+        for (const [fileId, fileData] of Object.entries(changesPerFile)) {
+            // update the file data with the applied changes
+            await withSkipChangeQueue(trx, async (trx) => {
+                await trx
+                    .updateTable("file")
+                    .set("data", fileData)
+                    .where("id", "=", fileId)
+                    .execute();
+            });
+        }
+        // copy edges
+        if (sourceEdges.length > 0) {
+            await trx
+                .insertInto("change_edge")
+                .values(sourceEdges)
+                // ignore if already exists
+                .onConflict((oc) => oc.doNothing())
+                .execute();
+        }
+        // add change sets and change_set_memberships
+        if (sourceChangeSets.length > 0) {
+            await trx
+                .insertInto("change_set")
+                .values(sourceChangeSets)
+                // ignore if already exists
+                .onConflict((oc) => oc.doNothing())
+                .execute();
+        }
+        if (sourceChangeSetItems.length > 0) {
+            await trx
+                .insertInto("change_set_element")
+                .values(sourceChangeSetItems)
+                // ignore if already exists
+                .onConflict((oc) => oc.doNothing())
+                .execute();
+        }
+        // add discussions, comments and discsussion_change_mappings
+        if (sourceDiscussions.length > 0) {
+            await trx
+                .insertInto("discussion")
+                .values(sourceDiscussions)
+                // ignore if already exists
+                .onConflict((oc) => oc.doNothing())
+                .execute();
+        }
+        if (sourceComments.length > 0) {
+            await trx
+                .insertInto("comment")
+                .values(sourceComments)
+                // ignore if already exists
+                .onConflict((oc) => oc.doNothing())
+                .execute();
+        }
+    });
+}
+//# sourceMappingURL=merge.js.map

package/dist/lix/merge.js.map

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

package/dist/lix/merge.test.d.ts

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

package/dist/lix/merge.test.d.ts.map

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