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

package/dist/change-set/get-before-after-of-file.js

@@ -0,0 +1,189 @@
+import { changeSetElementIsLeafOf } from "../query-filter/change-set-element-is-leaf-of.js";
+import { createVersion } from "../version/create-version.js";
+import { applyChangeSet } from "./apply-change-set.js";
+import { createChangeSet } from "./create-change-set.js";
+/**
+ * Interim utility function until https://github.com/opral/lix-sdk/issues/252 arrives.
+ *
+ * Use this function to get the file contents before and after for diffing purposes.
+ *
+ * @example
+ *   const { before, after } = await diffForFile({
+ *     lix,
+ *     changeSetBefore,
+ *     changeSetAfter,
+ *     file: { id: "XYZ" },
+ *   });
+ *
+ *   console.log("Before:", before);
+ *   console.log("After:", after);
+ *
+ *   renderDiff(before, after);
+ */
+export async function getBeforeAfterOfFile(args) {
+    if (!args.changeSetBefore && !args.changeSetAfter) {
+        throw new Error("At least one change set is required. Both changeSetBefore and changeSetAfter are undefined.");
+    }
+    const executeInTransaction = async (trx) => {
+        // TODO #3558 we should have one "withSkipChangeControl" that handles both
+        // it requires deeper knowledge to know that both are needed to "fully" skip change control
+        return await withSkipFileQueue(trx, async (trx) => {
+            return await withSkipOwnChangeControl(trx, async (trx) => {
+                // If the change sets are working change sets,
+                // we must avoid edges in the graph because
+                // working change sets are mutable, and not
+                // insertable into the graph.
+                const afterIsWorkingCs = args.changeSetAfter
+                    ? await trx
+                        .selectFrom("version")
+                        .where("version.working_change_set_id", "=", args.changeSetAfter.id)
+                        .selectAll()
+                        .executeTakeFirst()
+                    : undefined;
+                // need to disable the trigger to avoid
+                // duplicate working change set updates
+                await trx
+                    .insertInto("key_value")
+                    .values({
+                    key: "lix_skip_update_working_change_set",
+                    value: "true",
+                    skip_change_control: true,
+                })
+                    .execute();
+                const currentFile = await trx
+                    .selectFrom("file")
+                    .where("id", "=", args.file.id)
+                    .selectAll()
+                    .executeTakeFirst();
+                const currentChangeSets = await trx
+                    .selectFrom("change_set")
+                    .selectAll()
+                    .execute();
+                await trx.deleteFrom("file").where("id", "=", args.file.id).execute();
+                const leafChangesOfFileBefore = args.changeSetBefore
+                    ? await trx
+                        .selectFrom("change")
+                        .innerJoin("change_set_element", "change.id", "change_set_element.change_id")
+                        .where((eb) => eb.or([
+                        eb("change.file_id", "=", args.file.id),
+                        eb.and([
+                            eb("change.schema_key", "=", "lix_file_table"),
+                            eb("change.entity_id", "=", args.file.id),
+                        ]),
+                    ]))
+                        .where(changeSetElementIsLeafOf([args.changeSetBefore]))
+                        .selectAll("change")
+                        .execute()
+                    : [];
+                const leafChangesOfFileAfter = args.changeSetAfter
+                    ? await trx
+                        .selectFrom("change")
+                        .innerJoin("change_set_element", "change.id", "change_set_element.change_id")
+                        // need to get the insert changes for the file as well to apply the plugins changes
+                        .where((eb) => eb.or([
+                        eb("change.file_id", "=", args.file.id),
+                        eb.and([
+                            eb("change.schema_key", "=", "lix_file_table"),
+                            eb("change.entity_id", "=", args.file.id),
+                        ]),
+                    ]))
+                        .where(changeSetElementIsLeafOf([
+                        afterIsWorkingCs
+                            ? // we need to take the versions change set, not working change set to
+                                // get all leaf changes by traversing the graph
+                                { id: afterIsWorkingCs.change_set_id }
+                            : { id: args.changeSetAfter.id },
+                    ]))
+                        .selectAll("change")
+                        .execute()
+                    : [];
+                const beforeCs = await createChangeSet({
+                    lix: { ...args.lix, db: trx },
+                    elements: leafChangesOfFileBefore.map((change) => ({
+                        change_id: change.id,
+                        entity_id: change.entity_id,
+                        schema_key: change.schema_key,
+                        file_id: change.file_id,
+                    })),
+                });
+                const afterCs = await createChangeSet({
+                    lix: { ...args.lix, db: trx },
+                    elements: leafChangesOfFileAfter.map((change) => ({
+                        change_id: change.id,
+                        entity_id: change.entity_id,
+                        schema_key: change.schema_key,
+                        file_id: change.file_id,
+                    })),
+                });
+                const interimVersion = await createVersion({
+                    lix: { ...args.lix, db: trx },
+                    changeSet: beforeCs,
+                    name: null,
+                });
+                await applyChangeSet({
+                    lix: { ...args.lix, db: trx },
+                    changeSet: beforeCs,
+                    version: interimVersion,
+                });
+                const fileBefore = await trx
+                    .selectFrom("file")
+                    .where("id", "=", args.file.id)
+                    .selectAll()
+                    .executeTakeFirst();
+                await trx.deleteFrom("file").where("id", "=", args.file.id).execute();
+                await applyChangeSet({
+                    lix: { ...args.lix, db: trx },
+                    changeSet: afterCs,
+                    version: interimVersion,
+                });
+                const fileAfter = await trx
+                    .selectFrom("file")
+                    .where("id", "=", args.file.id)
+                    .selectAll()
+                    .executeTakeFirst();
+                // restore the original file
+                if (currentFile) {
+                    await trx
+                        .updateTable("file")
+                        .set(currentFile)
+                        .where("id", "=", args.file.id)
+                        .execute();
+                }
+                // clean up
+                await trx
+                    .deleteFrom("change_set")
+                    .where("id", "=", beforeCs.id)
+                    .execute();
+                await trx
+                    .deleteFrom("change_set")
+                    .where("id", "=", afterCs.id)
+                    .execute();
+                await trx
+                    .deleteFrom("version")
+                    .where("id", "=", interimVersion.id)
+                    .execute();
+                // currently facing unexpected behavior because the change sets are
+                // two more than before from apply changes i suspect that the flush
+                // pending changes trigger might interfere.
+                //
+                // took this shortcut to deliver a tight deadline
+                await trx
+                    .deleteFrom("change_set")
+                    .where("id", "not in", currentChangeSets.map((cs) => cs.id))
+                    .execute();
+                await trx
+                    .deleteFrom("key_value")
+                    .where("key", "=", "lix_skip_update_working_change_set")
+                    .execute();
+                return { before: fileBefore, after: fileAfter };
+            });
+        });
+    };
+    if (args.lix.db.isTransaction) {
+        return executeInTransaction(args.lix.db);
+    }
+    else {
+        return args.lix.db.transaction().execute(executeInTransaction);
+    }
+}
+//# sourceMappingURL=get-before-after-of-file.js.map

package/dist/change-set/get-before-after-of-file.js.map

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

package/dist/change-set/get-before-after-of-file.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=get-before-after-of-file.test.d.ts.map

package/dist/change-set/get-before-after-of-file.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-before-after-of-file.test.d.ts","sourceRoot":"","sources":["../../src/change-set/get-before-after-of-file.test.ts"],"names":[],"mappings":""}

package/dist/change-set/get-before-after-of-file.test.js

@@ -0,0 +1,220 @@
+import { expect, test } from "vitest";
+import { openLixInMemory } from "../lix/open-lix-in-memory.js";
+import { mockJsonPlugin } from "../plugin/mock-json-plugin.js";
+import { createCheckpoint } from "./create-checkpoint.js";
+import { getBeforeAfterOfFile } from "./get-before-after-of-file.js";
+test.skip("gives the before and after state without altering the current state", async () => {
+    // Create a Lix instance with the mock JSON plugin
+    const lix = await openLixInMemory({
+        providePlugins: [mockJsonPlugin],
+    });
+    // Create a file
+    const file = await lix.db
+        .insertInto("file")
+        .values({
+        id: "file1",
+        data: new TextEncoder().encode("{}"),
+        path: "/test.json",
+    })
+        .returningAll()
+        .executeTakeFirstOrThrow();
+    // Create states and checkpoints using a loop
+    const updates = [
+        // Initial state (cs0)
+        {
+            l0: "Value 0",
+            l1: "Value 1",
+            l2: "Value 2",
+        },
+        // Modified state (cs1)
+        {
+            l0: "Value 0",
+            l1: "Value 1 Modified",
+            l2: "Value 2 Modified",
+        },
+        // Final state with additional fields (cs2)
+        {
+            l0: "Value 0 Modified",
+            l1: "Value 1 Modified",
+            l2: "Value 2 Modified",
+            l3: "Value 3",
+        },
+    ];
+    const checkpoints = [];
+    for (const update of updates) {
+        // Update file with the current state
+        await lix.db
+            .updateTable("file")
+            .set({
+            data: new TextEncoder().encode(JSON.stringify(update)),
+        })
+            .where("id", "=", file.id)
+            .execute();
+        // Wait for file queue to process changes
+        // await fileQueueSettled({ lix });
+        // Create checkpoint for the current state
+        const checkpoint = await createCheckpoint({ lix });
+        checkpoints.push(checkpoint);
+    }
+    // Destructure checkpoints for clarity
+    const [cs0, cs1, cs2] = checkpoints;
+    // Ensure checkpoints were created successfully
+    expect(cs0).toBeDefined();
+    expect(cs1).toBeDefined();
+    expect(cs2).toBeDefined();
+    // Capture the current state of the file before using beforeAfterOfFile
+    const originalFile = await lix.db
+        .selectFrom("file")
+        .where("id", "=", file.id)
+        .selectAll()
+        .executeTakeFirstOrThrow();
+    const originalState = JSON.parse(new TextDecoder().decode(originalFile.data));
+    // Verify the original state matches the latest update
+    expect(originalState).toEqual(updates[2]);
+    const activeVersionBefore = await lix.db
+        .selectFrom("active_version")
+        .innerJoin("version", "active_version.version_id", "version.id")
+        .selectAll("version")
+        .executeTakeFirstOrThrow();
+    const versionsBeforeDiffing = await lix.db
+        .selectFrom("version")
+        .selectAll()
+        .execute();
+    const changeSetsBeforeDiffing = await lix.db
+        .selectFrom("change_set")
+        .selectAll()
+        .execute();
+    // Test case 1: Compare cs0 and cs1
+    const result1 = await getBeforeAfterOfFile({
+        lix,
+        changeSetBefore: cs0,
+        changeSetAfter: cs1,
+        file: { id: file.id },
+    });
+    // Verify the before state matches cs0
+    const beforeState1 = JSON.parse(new TextDecoder().decode(result1.before.data));
+    expect(beforeState1).toEqual(updates[0]);
+    // Verify the after state matches cs1
+    const afterState1 = JSON.parse(new TextDecoder().decode(result1.after.data));
+    expect(afterState1).toEqual(updates[1]);
+    // Test case 3: Compare cs0 and cs2 (skipping cs1)
+    const result3 = await getBeforeAfterOfFile({
+        lix,
+        changeSetBefore: cs0,
+        changeSetAfter: cs2,
+        file: { id: file.id },
+    });
+    // Verify the before state matches cs0
+    const beforeState3 = JSON.parse(new TextDecoder().decode(result3.before.data));
+    expect(beforeState3).toEqual(updates[0]);
+    // Verify the after state matches cs2
+    const afterState3 = JSON.parse(new TextDecoder().decode(result3.after.data));
+    expect(afterState3).toEqual(updates[2]);
+    // Verify the current state of the file is unchanged after all operations
+    const currentFile = await lix.db
+        .selectFrom("file")
+        .where("id", "=", file.id)
+        .selectAll()
+        .executeTakeFirstOrThrow();
+    const currentState = JSON.parse(new TextDecoder().decode(currentFile.data));
+    // The current state should still match the original state (updates[2])
+    expect(currentState).toEqual(originalState);
+    expect(currentState).toEqual(updates[2]);
+    // Verify file properties are preserved
+    expect(currentFile.id).toBe(originalFile.id);
+    expect(currentFile.path).toBe(originalFile.path);
+    const activeVersionAfter = await lix.db
+        .selectFrom("active_version")
+        .innerJoin("version", "active_version.version_id", "version.id")
+        .selectAll("version")
+        .executeTakeFirstOrThrow();
+    expect(activeVersionAfter).toEqual(activeVersionBefore);
+    const versionsAfterDiffing = await lix.db
+        .selectFrom("version")
+        .selectAll()
+        .execute();
+    // Verify that no new versions were created
+    expect(versionsAfterDiffing.length).toBe(versionsBeforeDiffing.length);
+    const changeSetsAfterDiffing = await lix.db
+        .selectFrom("change_set")
+        .selectAll()
+        .execute();
+    // Verify that no new change sets were created
+    expect(changeSetsAfterDiffing.length).toBe(changeSetsBeforeDiffing.length);
+});
+test.skip("returns before: undefined when the file has no before state", async () => {
+    // Create a Lix instance with the mock JSON plugin
+    const lix = await openLixInMemory({
+        providePlugins: [mockJsonPlugin],
+    });
+    // Create two checkpoints
+    // First checkpoint (cs0) - file doesn't exist yet
+    const cs0 = await createCheckpoint({ lix });
+    // Create a file
+    const file = await lix.db
+        .insertInto("file")
+        .values({
+        id: "file1",
+        data: new TextEncoder().encode(JSON.stringify({ key: "value" })),
+        path: "/test.json",
+    })
+        .returningAll()
+        .executeTakeFirstOrThrow();
+    // Wait for file queue to process changes
+    // await fileQueueSettled({ lix });
+    // Second checkpoint (cs1) - file exists with content
+    const cs1 = await createCheckpoint({ lix });
+    // Test the beforeAfterOfFile function
+    const result = await getBeforeAfterOfFile({
+        lix,
+        changeSetBefore: cs0,
+        changeSetAfter: cs1,
+        file: { id: file.id },
+    });
+    // Verify that before is an empty file (file didn't exist in cs0)
+    expect(result.before).toBeUndefined();
+    // Verify that after contains the expected state
+    expect(result.after).toBeDefined();
+    const afterState = JSON.parse(new TextDecoder().decode(result.after.data));
+    expect(afterState).toEqual({ key: "value" });
+});
+test.skip("returns after: undefined when the file has no after state", async () => {
+    // Create a Lix instance with the mock JSON plugin
+    const lix = await openLixInMemory({
+        providePlugins: [mockJsonPlugin],
+    });
+    // Create a file
+    const file = await lix.db
+        .insertInto("file")
+        .values({
+        id: "file1",
+        data: new TextEncoder().encode(JSON.stringify({ key: "value" })),
+        path: "/test.json",
+    })
+        .returningAll()
+        .executeTakeFirstOrThrow();
+    // Wait for file queue to process changes
+    // await fileQueueSettled({ lix });
+    // First checkpoint (cs0) - file exists
+    const cs0 = await createCheckpoint({ lix });
+    // Delete the file
+    await lix.db.deleteFrom("file").where("id", "=", file.id).execute();
+    // Wait for file queue to process changes
+    // await fileQueueSettled({ lix });
+    // Second checkpoint (cs1) - file is deleted
+    const cs1 = await createCheckpoint({ lix });
+    // Test the beforeAfterOfFile function
+    const result = await getBeforeAfterOfFile({
+        lix,
+        changeSetBefore: cs0,
+        changeSetAfter: cs1,
+        file: { id: file.id },
+    });
+    // Verify that before contains the expected state
+    expect(result.before).toBeDefined();
+    const beforeState = JSON.parse(new TextDecoder().decode(result.before.data));
+    expect(beforeState).toEqual({ key: "value" });
+    // Verify that after is undefined (file doesn't exist in cs1)
+    expect(result.after).toBeUndefined();
+});
+//# sourceMappingURL=get-before-after-of-file.test.js.map

package/dist/change-set/get-before-after-of-file.test.js.map

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

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

@@ -1,3 +1,4 @@
-export { changeSetElementInSymmetricDifference } from "./change-set-element-in-symmetric-difference.js";
+export { LixChangeSetSchema, LixChangeSetElementSchema, LixChangeSetLabelSchema, type LixChangeSet, type LixChangeSetElement, type LixChangeSetLabel, } from "./schema.js";
 export { createChangeSet } from "./create-change-set.js";
+export { applyChangeSet } from "./apply-change-set.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/change-set/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AACxG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/change-set/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kBAAkB,EAClB,yBAAyB,EACzB,uBAAuB,EACvB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,GACtB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/change-set/index.js

@@ -1,3 +1,4 @@
-export { changeSetElementInSymmetricDifference } from "./change-set-element-in-symmetric-difference.js";
+export { LixChangeSetSchema, LixChangeSetElementSchema, LixChangeSetLabelSchema, } from "./schema.js";
 export { createChangeSet } from "./create-change-set.js";
+export { applyChangeSet } from "./apply-change-set.js";
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/change-set/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AACxG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/change-set/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kBAAkB,EAClB,yBAAyB,EACzB,uBAAuB,GAIvB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/change-set/merge-change-sets.d.ts

@@ -0,0 +1,23 @@
+import type { Lix } from "../lix/open-lix.js";
+import type { ChangeSet } from "./database-schema.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 declare function mergeChangeSets(args: {
+    lix: Lix;
+    source: Pick<ChangeSet, "id">;
+    target: Pick<ChangeSet, "id">;
+}): Promise<ChangeSet>;
+//# sourceMappingURL=merge-change-sets.d.ts.map

package/dist/change-set/merge-change-sets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-change-sets.d.ts","sourceRoot":"","sources":["../../src/change-set/merge-change-sets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAI9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC3C,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,CA2ErB"}

package/dist/change-set/merge-change-sets.js

@@ -0,0 +1,69 @@
+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 mergeChangeSets(args) {
+    const executeInTransaction = async (trx) => {
+        // Create edges from source and target parents to the new merge change set
+        // --- 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=merge-change-sets.js.map

package/dist/change-set/merge-change-sets.js.map

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

package/dist/change-set/merge-change-sets.test.d.ts

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

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

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