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

package/dist/version-v2/swich-version.d.ts

@@ -0,0 +1,27 @@
+import type { Lix } from "../lix/open-lix.js";
+import type { VersionV2 } from "./database-schema.js";
+/**
+ * Switches the current Version to the given Version.
+ *
+ * The Version must already exist before calling this function.
+ *
+ * @example
+ *   ```ts
+ *   await switchVersion({ lix, to: otherVersion });
+ *   ```
+ *
+ * @example
+ *   Switching Versiones to a newly created Version.
+ *
+ *   ```ts
+ *   await lix.db.transaction().execute(async (trx) => {
+ *      const newVersion = await createVersion({ lix: { db: trx }, parent: currentVersion });
+ *      await switchVersion({ lix: { db: trx }, to: newVersion });
+ *   });
+ *   ```
+ */
+export declare function switchVersionV2(args: {
+    lix: Lix;
+    to: Pick<VersionV2, "id" | "change_set_id">;
+}): Promise<void>;
+//# sourceMappingURL=swich-version.d.ts.map

package/dist/version-v2/swich-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"swich-version.d.ts","sourceRoot":"","sources":["../../src/version-v2/swich-version.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAG9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,GAAG,CAAC;IACT,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,GAAG,eAAe,CAAC,CAAC;CAC5C,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBhB"}

package/dist/version-v2/swich-version.js

@@ -0,0 +1,46 @@
+import { withSkipFileQueue } from "../file-queue/with-skip-file-queue.js";
+import { withSkipOwnChangeControl } from "../own-change-control/with-skip-own-change-control.js";
+import { applyChangeSet } from "../change-set/apply-change-set.js";
+/**
+ * Switches the current Version to the given Version.
+ *
+ * The Version must already exist before calling this function.
+ *
+ * @example
+ *   ```ts
+ *   await switchVersion({ lix, to: otherVersion });
+ *   ```
+ *
+ * @example
+ *   Switching Versiones to a newly created Version.
+ *
+ *   ```ts
+ *   await lix.db.transaction().execute(async (trx) => {
+ *      const newVersion = await createVersion({ lix: { db: trx }, parent: currentVersion });
+ *      await switchVersion({ lix: { db: trx }, to: newVersion });
+ *   });
+ *   ```
+ */
+export async function switchVersionV2(args) {
+    const executeInTransaction = async (trx) => {
+        return await withSkipOwnChangeControl(trx, async (trx) => {
+            return await withSkipFileQueue(trx, async (trx) => {
+                await trx
+                    .updateTable("active_version")
+                    .set({ version_id: args.to.id })
+                    .execute();
+                await applyChangeSet({
+                    lix: { ...args.lix, db: trx },
+                    changeSet: { id: args.to.change_set_id },
+                });
+            });
+        });
+    };
+    if (args.lix.db.isTransaction) {
+        return executeInTransaction(args.lix.db);
+    }
+    else {
+        return args.lix.db.transaction().execute(executeInTransaction);
+    }
+}
+//# sourceMappingURL=swich-version.js.map

package/dist/version-v2/swich-version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"swich-version.js","sourceRoot":"","sources":["../../src/version-v2/swich-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAC;AACjG,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAGnE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAGrC;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,OAAO,MAAM,wBAAwB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACxD,OAAO,MAAM,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBACjD,MAAM,GAAG;qBACP,WAAW,CAAC,gBAAgB,CAAC;qBAC7B,GAAG,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;qBAC/B,OAAO,EAAE,CAAC;gBAEZ,MAAM,cAAc,CAAC;oBACpB,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;oBAC7B,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE;iBACxC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,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/version-v2/switch-version.d.ts

@@ -0,0 +1,27 @@
+import type { Lix } from "../lix/open-lix.js";
+import type { VersionV2 } from "./database-schema.js";
+/**
+ * Switches the current Version to the given Version.
+ *
+ * The Version must already exist before calling this function.
+ *
+ * @example
+ *   ```ts
+ *   await switchVersion({ lix, to: otherVersion });
+ *   ```
+ *
+ * @example
+ *   Switching Versiones to a newly created Version.
+ *
+ *   ```ts
+ *   await lix.db.transaction().execute(async (trx) => {
+ *      const newVersion = await createVersion({ lix: { db: trx }, parent: currentVersion });
+ *      await switchVersion({ lix: { db: trx }, to: newVersion });
+ *   });
+ *   ```
+ */
+export declare function switchVersionV2(args: {
+    lix: Lix;
+    to: Pick<VersionV2, "id">;
+}): Promise<void>;
+//# sourceMappingURL=switch-version.d.ts.map

package/dist/version-v2/switch-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"switch-version.d.ts","sourceRoot":"","sources":["../../src/version-v2/switch-version.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAI9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAItD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,GAAG,CAAC;IACT,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;CAC1B,GAAG,OAAO,CAAC,IAAI,CAAC,CAmFhB"}

package/dist/version-v2/switch-version.js

@@ -0,0 +1,91 @@
+import { applyChangeSet } from "../change-set/apply-change-set.js";
+import { withSkipFileQueue } from "../file-queue/with-skip-file-queue.js";
+import { withSkipOwnChangeControl } from "../own-change-control/with-skip-own-change-control.js";
+import { createTransitionChangeSet } from "../change-set/create-transition-change-set.js";
+import { sql } from "kysely";
+/**
+ * Switches the current Version to the given Version.
+ *
+ * The Version must already exist before calling this function.
+ *
+ * @example
+ *   ```ts
+ *   await switchVersion({ lix, to: otherVersion });
+ *   ```
+ *
+ * @example
+ *   Switching Versiones to a newly created Version.
+ *
+ *   ```ts
+ *   await lix.db.transaction().execute(async (trx) => {
+ *      const newVersion = await createVersion({ lix: { db: trx }, parent: currentVersion });
+ *      await switchVersion({ lix: { db: trx }, to: newVersion });
+ *   });
+ *   ```
+ */
+export async function switchVersionV2(args) {
+    const executeInTransaction = async (trx) => {
+        return await withSkipOwnChangeControl(trx, async (trx) => {
+            return await withSkipFileQueue(trx, async (trx) => {
+                const activeVersion = await trx
+                    .selectFrom("active_version")
+                    .innerJoin("version_v2", "active_version.version_id", "version_v2.id")
+                    .selectAll("version_v2")
+                    .executeTakeFirstOrThrow();
+                const targetVersion = await trx
+                    .selectFrom("version_v2")
+                    .where("id", "=", args.to.id)
+                    .selectAll()
+                    .executeTakeFirstOrThrow();
+                await trx
+                    .insertInto("key_value")
+                    .values({ key: "lix_skip_update_working_change_set", value: "true" })
+                    .execute();
+                console.log(`Switching from Version ID: ${activeVersion.id} to Target Version ID: ${targetVersion.id}`);
+                const transitionChangeSet = await createTransitionChangeSet({
+                    lix: { ...args.lix, db: trx },
+                    sourceChangeSet: { id: activeVersion.change_set_id },
+                    targetChangeSet: { id: targetVersion.change_set_id },
+                });
+                console.log(`Applying transition change set ${transitionChangeSet.id}`);
+                await applyChangeSet({
+                    lix: { ...args.lix, db: trx },
+                    changeSet: transitionChangeSet,
+                    updateVersion: false,
+                });
+                // Update the active version pointer MANUALLY
+                console.log(`Updating active_version.version_id to: ${targetVersion.id}`);
+                await trx
+                    .updateTable("active_version")
+                    .set({ version_id: targetVersion.id })
+                    .executeTakeFirstOrThrow();
+                // Check for foreign key violations before committing
+                const fkErrorsAfterUpdate = await sql `PRAGMA foreign_key_check`.execute(trx);
+                if (Array.isArray(fkErrorsAfterUpdate.rows) &&
+                    fkErrorsAfterUpdate.rows.length > 0) {
+                    console.error("FOREIGN KEY VIOLATIONS DETECTED (after active_version update):", fkErrorsAfterUpdate.rows);
+                }
+                else {
+                    console.log("No FK violations detected after active_version update.");
+                }
+                // Clean up the temporary skip flag
+                await trx
+                    .deleteFrom("key_value")
+                    .where("key", "=", "lix_skip_update_working_change_set")
+                    .execute();
+                // Check for foreign key violations before committing
+                const fkErrors = await sql `PRAGMA foreign_key_check`.execute(trx);
+                if (Array.isArray(fkErrors.rows) && fkErrors.rows.length > 0) {
+                    console.error("FOREIGN KEY VIOLATIONS DETECTED:", fkErrors.rows);
+                }
+            });
+        });
+    };
+    if (args.lix.db.isTransaction) {
+        return executeInTransaction(args.lix.db);
+    }
+    else {
+        return args.lix.db.transaction().execute(executeInTransaction);
+    }
+}
+//# sourceMappingURL=switch-version.js.map

package/dist/version-v2/switch-version.js.map

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

package/dist/version-v2/switch-version.test.d.ts

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

package/dist/version-v2/switch-version.test.d.ts.map

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

package/dist/version-v2/switch-version.test.js

@@ -0,0 +1,110 @@
+import { expect, test } from "vitest";
+import { openLixInMemory } from "../lix/open-lix-in-memory.js";
+import { createVersionV2 } from "./create-version.js";
+import { switchVersionV2 } from "./switch-version.js";
+import { createChange } from "../change/create-change.js";
+import { createChangeSet } from "../change-set/create-change-set.js";
+test("switching versiones should update the active_version", async () => {
+    const lix = await openLixInMemory({});
+    const activeVersion = await lix.db
+        .selectFrom("active_version")
+        .innerJoin("version_v2", "active_version.version_id", "version_v2.id")
+        .selectAll("version_v2")
+        .executeTakeFirstOrThrow();
+    const newVersion = await lix.db.transaction().execute(async (trx) => {
+        const newVersion = await createVersionV2({
+            lix: { ...lix, db: trx },
+            changeSet: { id: activeVersion.change_set_id },
+        });
+        await switchVersionV2({ lix: { ...lix, db: trx }, to: newVersion });
+        return newVersion;
+    });
+    const activeVersionAfterSwitch = await lix.db
+        .selectFrom("active_version")
+        .innerJoin("version_v2", "active_version.version_id", "version_v2.id")
+        .selectAll("version_v2")
+        .executeTakeFirstOrThrow();
+    expect(activeVersionAfterSwitch.id).toBe(newVersion?.id);
+});
+test.todo("switching a version does not lead to duplicate changes", async () => {
+    const lix = await openLixInMemory({});
+    const account0 = await lix.db
+        .insertInto("account")
+        .values({ name: "account0" })
+        .returningAll()
+        .executeTakeFirstOrThrow();
+    const activeVersion = await lix.db
+        .selectFrom("active_version")
+        .innerJoin("version_v2", "active_version.version_id", "version_v2.id")
+        .selectAll("version_v2")
+        .executeTakeFirstOrThrow();
+    const change0 = await createChange({
+        lix,
+        authors: [account0],
+        entityId: "entity0",
+        fileId: "file0",
+        schemaKey: "schema0",
+        snapshotContent: null,
+        pluginKey: "plugin0",
+    });
+    const newVersion = await createVersionV2({
+        lix: lix,
+        changeSet: { id: activeVersion.change_set_id },
+    });
+    const changesBefore = await lix.db
+        .selectFrom("change")
+        .selectAll()
+        .execute();
+    expect(changesBefore).toEqual(expect.arrayContaining([change0]));
+    await switchVersionV2({ lix, to: newVersion });
+    const changesAfter = await lix.db
+        .selectFrom("change")
+        .selectAll()
+        .execute();
+    expect(changesAfter).toEqual(changesBefore);
+});
+test.todo("switch version applies the changes of the switched to version", async () => {
+    const lix = await openLixInMemory({});
+    const versionA = await createVersionV2({
+        lix,
+        changeSet: await createChangeSet({ lix }),
+    });
+    const versionB = await createVersionV2({
+        lix,
+        changeSet: await createChangeSet({ lix }),
+    });
+    await switchVersionV2({ lix, to: versionA });
+    // version A has value foo
+    await lix.db
+        .insertInto("key_value")
+        .values({ key: "foo", value: "bar" })
+        .execute();
+    let keyValues = await lix.db
+        .selectFrom("key_value")
+        .where("key", "=", "foo")
+        .selectAll()
+        .execute();
+    expect(keyValues).toMatchObject([{ key: "foo", value: "bar" }]);
+    await switchVersionV2({ lix, to: versionB });
+    // version B should have no value foo
+    keyValues = await lix.db
+        .selectFrom("key_value")
+        .where("key", "=", "foo")
+        .selectAll()
+        .execute();
+    expect(keyValues).toHaveLength(0);
+    // version B has value foo
+    await lix.db
+        .insertInto("key_value")
+        .values({ key: "foo", value: "baz" })
+        .execute();
+    await switchVersionV2({ lix, to: versionA });
+    keyValues = await lix.db
+        .selectFrom("key_value")
+        .where("key", "=", "foo")
+        .selectAll()
+        .execute();
+    // expecting to see the value from version A again
+    expect(keyValues).toMatchObject([{ key: "foo", value: "bar" }]);
+});
+//# sourceMappingURL=switch-version.test.js.map

package/dist/version-v2/switch-version.test.js.map

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

package/dist/version-v2/with-skip-update-working-change-set.d.ts

@@ -0,0 +1,3 @@
+import type { Lix } from "../lix/open-lix.js";
+export declare function withSkipUpdateWorkingChangeSet<T>(db: Lix["db"], operation: (trx: Lix["db"]) => Promise<T>): Promise<T>;
+//# sourceMappingURL=with-skip-update-working-change-set.d.ts.map

package/dist/version-v2/with-skip-update-working-change-set.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"with-skip-update-working-change-set.d.ts","sourceRoot":"","sources":["../../src/version-v2/with-skip-update-working-change-set.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C,wBAAsB,8BAA8B,CAAC,CAAC,EACrD,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EACb,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GACvC,OAAO,CAAC,CAAC,CAAC,CAmDZ"}

package/dist/version-v2/with-skip-update-working-change-set.js

@@ -0,0 +1,50 @@
+export async function withSkipUpdateWorkingChangeSet(db, operation) {
+    const executeInTransaction = async (trx) => {
+        const nestingLevel = await trx
+            .selectFrom("key_value")
+            .select("value")
+            .where("key", "=", "lix_skip_update_working_change_set")
+            .executeTakeFirst();
+        const currentLevel = nestingLevel ? parseInt(nestingLevel.value) : 0;
+        await trx
+            .insertInto("key_value")
+            .values({
+            key: "lix_skip_update_working_change_set",
+            value: `${currentLevel + 1}`,
+            skip_change_control: true,
+        })
+            .onConflict((oc) => oc.doUpdateSet({ value: `${currentLevel + 1}` }))
+            .execute();
+        // Perform the user's operation
+        const result = await operation(trx);
+        // Remove the skip flag if this is the outermost transaction
+        if (currentLevel === 0) {
+            await trx
+                .deleteFrom("key_value")
+                .where("key", "=", "lix_skip_update_working_change_set")
+                .execute();
+        }
+        else {
+            // Decrement the nesting level
+            //
+            // The current level is already the decremented level given that
+            // the initial increment is 0 + 1.
+            await trx
+                .updateTable("key_value")
+                .set({
+                value: `${currentLevel}`,
+            })
+                .where("key", "=", "lix_skip_update_working_change_set")
+                .execute();
+        }
+        // Return the result of the operation
+        return result;
+    };
+    if (db.isTransaction) {
+        return executeInTransaction(db);
+    }
+    else {
+        return db.transaction().execute(executeInTransaction);
+    }
+}
+//# sourceMappingURL=with-skip-update-working-change-set.js.map

package/dist/version-v2/with-skip-update-working-change-set.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"with-skip-update-working-change-set.js","sourceRoot":"","sources":["../../src/version-v2/with-skip-update-working-change-set.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,8BAA8B,CACnD,EAAa,EACb,SAAyC;IAEzC,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,MAAM,YAAY,GAAG,MAAM,GAAG;aAC5B,UAAU,CAAC,WAAW,CAAC;aACvB,MAAM,CAAC,OAAO,CAAC;aACf,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,oCAAoC,CAAC;aACvD,gBAAgB,EAAE,CAAC;QAErB,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAErE,MAAM,GAAG;aACP,UAAU,CAAC,WAAW,CAAC;aACvB,MAAM,CAAC;YACP,GAAG,EAAE,oCAAoC;YACzC,KAAK,EAAE,GAAG,YAAY,GAAG,CAAC,EAAE;YAC5B,mBAAmB,EAAE,IAAI;SACzB,CAAC;aACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,GAAG,YAAY,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;aACpE,OAAO,EAAE,CAAC;QAEZ,+BAA+B;QAC/B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;QAEpC,4DAA4D;QAC5D,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACxB,MAAM,GAAG;iBACP,UAAU,CAAC,WAAW,CAAC;iBACvB,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,oCAAoC,CAAC;iBACvD,OAAO,EAAE,CAAC;QACb,CAAC;aAAM,CAAC;YACP,8BAA8B;YAC9B,EAAE;YACF,gEAAgE;YAChE,kCAAkC;YAClC,MAAM,GAAG;iBACP,WAAW,CAAC,WAAW,CAAC;iBACxB,GAAG,CAAC;gBACJ,KAAK,EAAE,GAAG,YAAY,EAAE;aACxB,CAAC;iBACD,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,oCAAoC,CAAC;iBACvD,OAAO,EAAE,CAAC;QACb,CAAC;QAED,qCAAqC;QACrC,OAAO,MAAM,CAAC;IACf,CAAC,CAAC;IACF,IAAI,EAAE,CAAC,aAAa,EAAE,CAAC;QACtB,OAAO,oBAAoB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;SAAM,CAAC;QACP,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACvD,CAAC;AACF,CAAC"}

package/dist/version-v2/with-skip-update-working-change-set.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=with-skip-update-working-change-set.test.d.ts.map

package/dist/version-v2/with-skip-update-working-change-set.test.d.ts.map

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

package/dist/version-v2/with-skip-update-working-change-set.test.js

@@ -0,0 +1,49 @@
+import { expect, test } from "vitest";
+import { openLixInMemory } from "../lix/open-lix-in-memory.js";
+import { withSkipUpdateWorkingChangeSet } from "./with-skip-update-working-change-set.js";
+import { createChange } from "../change/create-change.js";
+test("skipping works", async () => {
+    const lix = await openLixInMemory({});
+    await withSkipUpdateWorkingChangeSet(lix.db, async (trx) => {
+        const change = await createChange({
+            lix: { db: trx, sqlite: lix.sqlite },
+            authors: [],
+            schemaKey: "mock",
+            fileId: "mock",
+            entityId: "mock",
+            snapshotContent: null,
+            pluginKey: "mock",
+        });
+        const newCs = await createChangeSet({
+            lix: { db: trx, sqlite: lix.sqlite },
+            id: "new-cs",
+            elements: [
+                {
+                    change_id: change.id,
+                    entity_id: change.entity_id,
+                    schema_key: change.schema_key,
+                    file_id: change.file_id,
+                },
+            ],
+            parents: [initialChangeSetId],
+        });
+    });
+    const activeVersion = await lix.db
+        .selectFrom("active_version")
+        .innerJoin("version_v2", "version_v2.id", "active_version.version_id")
+        .selectAll("version_v2")
+        .executeTakeFirstOrThrow();
+    const csElements = await lix.db
+        .selectFrom("change_set_element")
+        .where("change_set_id", "=", activeVersion.change_set_id)
+        .selectAll()
+        .execute();
+    const workingCsElements = await lix.db
+        .selectFrom("change_set_element")
+        .where("change_set_id", "=", activeVersion.working_change_set_id)
+        .selectAll()
+        .execute();
+    expect(csElements).toHaveLength(0);
+    expect(workingCsElements).toHaveLength(0);
+});
+//# sourceMappingURL=with-skip-update-working-change-set.test.js.map

package/dist/version-v2/with-skip-update-working-change-set.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"with-skip-update-working-change-set.test.js","sourceRoot":"","sources":["../../src/version-v2/with-skip-update-working-change-set.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;IACjC,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,8BAA8B,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAC1D,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;YACjC,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE;YACpC,OAAO,EAAE,EAAE;YACX,SAAS,EAAE,MAAM;YACjB,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,MAAM;YAChB,eAAe,EAAE,IAAI;YACrB,SAAS,EAAE,MAAM;SACjB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC;YACnC,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE;YACpC,EAAE,EAAE,QAAQ;YACZ,QAAQ,EAAE;gBACT;oBACC,SAAS,EAAE,MAAM,CAAC,EAAE;oBACpB,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;iBACvB;aACD;YACD,OAAO,EAAE,CAAC,kBAAkB,CAAC;SAC7B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,EAAE;SAChC,UAAU,CAAC,gBAAgB,CAAC;SAC5B,SAAS,CAAC,YAAY,EAAE,eAAe,EAAE,2BAA2B,CAAC;SACrE,SAAS,CAAC,YAAY,CAAC;SACvB,uBAAuB,EAAE,CAAC;IAE5B,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,EAAE;SAC7B,UAAU,CAAC,oBAAoB,CAAC;SAChC,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,aAAa,CAAC,aAAa,CAAC;SACxD,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,MAAM,iBAAiB,GAAG,MAAM,GAAG,CAAC,EAAE;SACpC,UAAU,CAAC,oBAAoB,CAAC;SAChC,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,aAAa,CAAC,qBAAqB,CAAC;SAChE,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,MAAM,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,iBAAiB,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lix-js/sdk",
   "type": "module",
-  "version": "0.5.0-preview.0",
+  "version": "0.5.0-preview.1",
   "license": "Apache-2.0",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -23,9 +23,9 @@
     "human-id": "^4.1.1",
     "kysely": "^0.27.4",
     "uuid": "^10.0.0",
-    "@lix-js/server-protocol-schema": "0.1.1",
     "@opral/zettel-ast": "0.1.0",
-    "sqlite-wasm-kysely": "0.3.0"
+    "sqlite-wasm-kysely": "0.3.0",
+    "@lix-js/server-protocol-schema": "0.1.1"
   },
   "devDependencies": {
     "@eslint/js": "^9.12.0",

package/src/account/create-account.ts

@@ -1,6 +1,6 @@
+import { uuidV7 } from "../deterministic/uuid-v7.js";
 import type { Lix } from "../lix/open-lix.js";
-import type { Account } from "./schema.js";
-import { v7 as uuid_v7 } from "uuid";
+import type { LixAccount } from "./schema.js";
 
 /**
  * Inserts a new account into the Lix database.
@@ -16,14 +16,14 @@ import { v7 as uuid_v7 } from "uuid";
  */
 
 export async function createAccount(args: {
-	lix: Pick<Lix, "db">;
-	id?: Account["id"];
-	name: Account["name"];
+	lix: Pick<Lix, "db" | "sqlite">;
+	id?: LixAccount["id"];
+	name: LixAccount["name"];
 	lixcol_version_id?: string;
-}): Promise<Account> {
+}): Promise<LixAccount> {
 	const executeInTransaction = async (trx: Lix["db"]) => {
 		// Generate ID if not provided (views handle this, but we need it for querying back)
-		const accountId = args.id || uuid_v7();
+		const accountId = args.id || uuidV7({ lix: args.lix });
 
 		// Insert the account (views don't support returningAll)
 		await trx

package/src/account/index.ts

@@ -2,6 +2,6 @@ export { createAccount } from "./create-account.js";
 export { switchAccount } from "./switch-account.js";
 export {
 	LixAccountSchema,
-	type Account,
-	type ActiveAccount,
+	type LixAccount as Account,
+	type LixActiveAccount as ActiveAccount,
 } from "./schema.js";