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

package/dist/thread/database-schema.test.js

@@ -0,0 +1,59 @@
+import { expect, test } from "vitest";
+import { openLixInMemory } from "../lix/open-lix-in-memory.js";
+import { fromPlainText } from "@opral/zettel-ast";
+test("thread.id should default to nano_id", async () => {
+    const lix = await openLixInMemory({});
+    const result = await lix.db
+        .insertInto("thread")
+        .defaultValues()
+        .returningAll()
+        .executeTakeFirstOrThrow();
+    expect(result.id).toBeDefined();
+});
+test("an invalid thread comment content should throw an error", async () => {
+    const lix = await openLixInMemory({});
+    const thread = await lix.db
+        .insertInto("thread")
+        .defaultValues()
+        .returningAll()
+        .executeTakeFirstOrThrow();
+    await expect(async () => await lix.db
+        .insertInto("thread_comment")
+        .values({
+        thread_id: thread.id,
+        parent_id: null,
+        body: {
+            type: "zettel_doc",
+            content: [
+                // @ts-expect-error - missing _key prop
+                {
+                    _type: "zettel.textBlock",
+                    style: "zettel.normal",
+                    markDefs: [],
+                    children: [{ _type: "zettel.span", text: "Hello world" }],
+                },
+            ],
+        },
+    })
+        .returningAll()
+        .executeTakeFirstOrThrow()).rejects.toThrowError();
+});
+test("valid thread comment content should pass", async () => {
+    const lix = await openLixInMemory({});
+    const thread = await lix.db
+        .insertInto("thread")
+        .defaultValues()
+        .returningAll()
+        .executeTakeFirstOrThrow();
+    const comment = await lix.db
+        .insertInto("thread_comment")
+        .values({
+        thread_id: thread.id,
+        parent_id: null,
+        body: fromPlainText("Hello world"),
+    })
+        .returningAll()
+        .executeTakeFirstOrThrow();
+    expect(comment).toBeDefined();
+});
+//# sourceMappingURL=database-schema.test.js.map

package/dist/thread/database-schema.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"database-schema.test.js","sourceRoot":"","sources":["../../src/thread/database-schema.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,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;IACtD,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;SACzB,UAAU,CAAC,QAAQ,CAAC;SACpB,aAAa,EAAE;SACf,YAAY,EAAE;SACd,uBAAuB,EAAE,CAAC;IAE5B,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;IAC1E,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;SACzB,UAAU,CAAC,QAAQ,CAAC;SACpB,aAAa,EAAE;SACf,YAAY,EAAE;SACd,uBAAuB,EAAE,CAAC;IAE5B,MAAM,MAAM,CACX,KAAK,IAAI,EAAE,CACV,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,gBAAgB,CAAC;SAC5B,MAAM,CAAC;QACP,SAAS,EAAE,MAAM,CAAC,EAAE;QACpB,SAAS,EAAE,IAAI;QACf,IAAI,EAAE;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE;gBACR,uCAAuC;gBACvC;oBACC,KAAK,EAAE,kBAAkB;oBACzB,KAAK,EAAE,eAAe;oBACtB,QAAQ,EAAE,EAAE;oBACZ,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;iBACzD;aACD;SACD;KACD,CAAC;SACD,YAAY,EAAE;SACd,uBAAuB,EAAE,CAC5B,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;IAC3D,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;SACzB,UAAU,CAAC,QAAQ,CAAC;SACpB,aAAa,EAAE;SACf,YAAY,EAAE;SACd,uBAAuB,EAAE,CAAC;IAE5B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,EAAE;SAC1B,UAAU,CAAC,gBAAgB,CAAC;SAC5B,MAAM,CAAC;QACP,SAAS,EAAE,MAAM,CAAC,EAAE;QACpB,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,aAAa,CAAC,aAAa,CAAC;KAClC,CAAC;SACD,YAAY,EAAE;SACd,uBAAuB,EAAE,CAAC;IAE5B,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;AAC/B,CAAC,CAAC,CAAC"}

package/dist/thread/index.d.ts

@@ -1,4 +1,5 @@
-export { LixThreadSchema, LixThreadCommentSchema, type Thread, type ThreadComment, } from "./schema.js";
+export { LixThreadSchema, LixThreadCommentSchema, type LixThread as Thread, type LixThreadComment as ThreadComment, } from "./schema.js";
 export { createThread } from "./create-thread.js";
 export { createThreadComment } from "./create-thread-comment.js";
+export type { LixEntityThread } from "../entity/thread/schema.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/thread/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/thread/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,eAAe,EACf,sBAAsB,EACtB,KAAK,MAAM,EACX,KAAK,aAAa,GAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/thread/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,eAAe,EACf,sBAAsB,EACtB,KAAK,SAAS,IAAI,MAAM,EACxB,KAAK,gBAAgB,IAAI,aAAa,GACtC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/thread/schema.d.ts

@@ -1,7 +1,7 @@
-import type { SqliteWasmDatabase } from "sqlite-wasm-kysely";
 import type { FromLixSchemaDefinition } from "../schema-definition/definition.js";
 import { type ZettelDoc } from "@opral/zettel-ast";
-export declare function applyThreadDatabaseSchema(sqlite: SqliteWasmDatabase): SqliteWasmDatabase;
+import type { Lix } from "../lix/open-lix.js";
+export declare function applyThreadDatabaseSchema(lix: Pick<Lix, "sqlite" | "db">): void;
 export declare const LixThreadSchema: {
     readonly "x-lix-key": "lix_thread";
     readonly "x-lix-version": "1.0";
@@ -24,16 +24,19 @@ export declare const LixThreadCommentSchema: {
     readonly "x-lix-key": "lix_thread_comment";
     readonly "x-lix-version": "1.0";
     readonly "x-lix-primary-key": readonly ["id"];
-    readonly "x-lix-foreign-keys": {
-        readonly thread_id: {
+    readonly "x-lix-foreign-keys": readonly [{
+        readonly properties: readonly ["thread_id"];
+        readonly references: {
             readonly schemaKey: "lix_thread";
-            readonly property: "id";
+            readonly properties: readonly ["id"];
         };
-        readonly parent_id: {
+    }, {
+        readonly properties: readonly ["parent_id"];
+        readonly references: {
             readonly schemaKey: "lix_thread_comment";
-            readonly property: "id";
+            readonly properties: readonly ["id"];
         };
-    };
+    }];
     readonly type: "object";
     readonly properties: {
         readonly id: {
@@ -52,8 +55,8 @@ export declare const LixThreadCommentSchema: {
     readonly required: readonly ["id", "thread_id", "body"];
     readonly additionalProperties: false;
 };
-export type Thread = FromLixSchemaDefinition<typeof LixThreadSchema>;
-export type ThreadComment = FromLixSchemaDefinition<typeof LixThreadCommentSchema> & {
+export type LixThread = FromLixSchemaDefinition<typeof LixThreadSchema>;
+export type LixThreadComment = FromLixSchemaDefinition<typeof LixThreadCommentSchema> & {
     body: ZettelDoc;
 };
 //# sourceMappingURL=schema.d.ts.map

package/dist/thread/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/thread/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAEX,uBAAuB,EACvB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAuB,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGxE,wBAAgB,yBAAyB,CACxC,MAAM,EAAE,kBAAkB,GACxB,kBAAkB,CA0BpB;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;CAWlB,CAAC;AAGX,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAmBJ,GAAG;;;;CAIxB,CAAC;AAIX,MAAM,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,eAAe,CAAC,CAAC;AACrE,MAAM,MAAM,aAAa,GAAG,uBAAuB,CAClD,OAAO,sBAAsB,CAC7B,GAAG;IACH,IAAI,EAAE,SAAS,CAAC;CAChB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/thread/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEX,uBAAuB,EACvB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAuB,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGxE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C,wBAAgB,yBAAyB,CACxC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC,GAC7B,IAAI,CAwBN;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;CAWlB,CAAC;AAGX,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAyBJ,GAAG;;;;CAIxB,CAAC;AAIX,MAAM,MAAM,SAAS,GAAG,uBAAuB,CAAC,OAAO,eAAe,CAAC,CAAC;AACxE,MAAM,MAAM,gBAAgB,GAAG,uBAAuB,CACrD,OAAO,sBAAsB,CAC7B,GAAG;IACH,IAAI,EAAE,SAAS,CAAC;CAChB,CAAC"}

package/dist/thread/schema.js

@@ -1,29 +1,29 @@
 import { ZettelDocJsonSchema } from "@opral/zettel-ast";
 import { createEntityViewsIfNotExists } from "../entity-views/entity-view-builder.js";
-export function applyThreadDatabaseSchema(sqlite) {
+import { nanoId } from "../deterministic/index.js";
+export function applyThreadDatabaseSchema(lix) {
     // Create both primary and _all views for thread with default ID generation
     createEntityViewsIfNotExists({
-        lix: { sqlite },
+        lix,
         schema: LixThreadSchema,
         overrideName: "thread",
         pluginKey: "lix_own_entity",
         hardcodedFileId: "lix",
         defaultValues: {
-            id: () => "nano_id()",
+            id: () => nanoId({ lix }),
         },
     });
     // Create both primary and _all views for thread_comment with default ID generation
     createEntityViewsIfNotExists({
-        lix: { sqlite },
+        lix,
         schema: LixThreadCommentSchema,
         overrideName: "thread_comment",
         pluginKey: "lix_own_entity",
         hardcodedFileId: "lix",
         defaultValues: {
-            id: () => "nano_id()",
+            id: () => nanoId({ lix }),
         },
     });
-    return sqlite;
 }
 export const LixThreadSchema = {
     "x-lix-key": "lix_thread",
@@ -42,16 +42,22 @@ export const LixThreadCommentSchema = {
     "x-lix-key": "lix_thread_comment",
     "x-lix-version": "1.0",
     "x-lix-primary-key": ["id"],
-    "x-lix-foreign-keys": {
-        thread_id: {
-            schemaKey: "lix_thread",
-            property: "id",
+    "x-lix-foreign-keys": [
+        {
+            properties: ["thread_id"],
+            references: {
+                schemaKey: "lix_thread",
+                properties: ["id"],
+            },
         },
-        parent_id: {
-            schemaKey: "lix_thread_comment",
-            property: "id",
+        {
+            properties: ["parent_id"],
+            references: {
+                schemaKey: "lix_thread_comment",
+                properties: ["id"],
+            },
         },
-    },
+    ],
     type: "object",
     properties: {
         id: { type: "string", "x-lix-generated": true },

package/dist/thread/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/thread/schema.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAkB,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF,MAAM,UAAU,yBAAyB,CACxC,MAA0B;IAE1B,2EAA2E;IAC3E,4BAA4B,CAAC;QAC5B,GAAG,EAAE,EAAE,MAAM,EAAE;QACf,MAAM,EAAE,eAAe;QACvB,YAAY,EAAE,QAAQ;QACtB,SAAS,EAAE,gBAAgB;QAC3B,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE;YACd,EAAE,EAAE,GAAG,EAAE,CAAC,WAAW;SACrB;KACD,CAAC,CAAC;IAEH,mFAAmF;IACnF,4BAA4B,CAAC;QAC5B,GAAG,EAAE,EAAE,MAAM,EAAE;QACf,MAAM,EAAE,sBAAsB;QAC9B,YAAY,EAAE,gBAAgB;QAC9B,SAAS,EAAE,gBAAgB;QAC3B,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE;YACd,EAAE,EAAE,GAAG,EAAE,CAAC,WAAW;SACrB;KACD,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG;IAC9B,WAAW,EAAE,YAAY;IACzB,eAAe,EAAE,KAAK;IACtB,mBAAmB,EAAE,CAAC,IAAI,CAAC;IAC3B,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACX,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE;QAC/C,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC5C;IACD,QAAQ,EAAE,CAAC,IAAI,CAAC;IAChB,oBAAoB,EAAE,KAAK;CAClB,CAAC;AACX,eAA6C,CAAC;AAE9C,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACrC,WAAW,EAAE,oBAAoB;IACjC,eAAe,EAAE,KAAK;IACtB,mBAAmB,EAAE,CAAC,IAAI,CAAC;IAC3B,oBAAoB,EAAE;QACrB,SAAS,EAAE;YACV,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,IAAI;SACd;QACD,SAAS,EAAE;YACV,SAAS,EAAE,oBAAoB;YAC/B,QAAQ,EAAE,IAAI;SACd;KACD;IACD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACX,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE;QAC/C,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC7B,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC7C,IAAI,EAAE,mBAA0B;KAChC;IACD,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC;IACrC,oBAAoB,EAAE,KAAK;CAClB,CAAC;AACX,sBAAoD,CAAC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/thread/schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAkB,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAGnD,MAAM,UAAU,yBAAyB,CACxC,GAA+B;IAE/B,2EAA2E;IAC3E,4BAA4B,CAAC;QAC5B,GAAG;QACH,MAAM,EAAE,eAAe;QACvB,YAAY,EAAE,QAAQ;QACtB,SAAS,EAAE,gBAAgB;QAC3B,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE;YACd,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;SACzB;KACD,CAAC,CAAC;IAEH,mFAAmF;IACnF,4BAA4B,CAAC;QAC5B,GAAG;QACH,MAAM,EAAE,sBAAsB;QAC9B,YAAY,EAAE,gBAAgB;QAC9B,SAAS,EAAE,gBAAgB;QAC3B,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE;YACd,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;SACzB;KACD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG;IAC9B,WAAW,EAAE,YAAY;IACzB,eAAe,EAAE,KAAK;IACtB,mBAAmB,EAAE,CAAC,IAAI,CAAC;IAC3B,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACX,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE;QAC/C,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC5C;IACD,QAAQ,EAAE,CAAC,IAAI,CAAC;IAChB,oBAAoB,EAAE,KAAK;CAClB,CAAC;AACX,eAA6C,CAAC;AAE9C,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACrC,WAAW,EAAE,oBAAoB;IACjC,eAAe,EAAE,KAAK;IACtB,mBAAmB,EAAE,CAAC,IAAI,CAAC;IAC3B,oBAAoB,EAAE;QACrB;YACC,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,UAAU,EAAE;gBACX,SAAS,EAAE,YAAY;gBACvB,UAAU,EAAE,CAAC,IAAI,CAAC;aAClB;SACD;QACD;YACC,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,UAAU,EAAE;gBACX,SAAS,EAAE,oBAAoB;gBAC/B,UAAU,EAAE,CAAC,IAAI,CAAC;aAClB;SACD;KACD;IACD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACX,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE;QAC/C,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC7B,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC7C,IAAI,EAAE,mBAA0B;KAChC;IACD,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC;IACrC,oBAAoB,EAAE,KAAK;CAClB,CAAC;AACX,sBAAoD,CAAC"}

package/dist/thread/schema.test.js

@@ -1,6 +1,7 @@
 import { expect, test } from "vitest";
 import { openLix } from "../lix/open-lix.js";
 import { fromPlainText } from "@opral/zettel-ast";
+import { switchAccount } from "../account/switch-account.js";
 test("thread.id should default to nano_id", async () => {
     const lix = await openLix({});
     await lix.db.insertInto("thread").defaultValues().execute();
@@ -57,4 +58,68 @@ test("valid thread comment content should pass", async () => {
         .executeTakeFirstOrThrow();
     expect(comment).toBeDefined();
 });
+test("creating a thread should create a change author", async () => {
+    const lix = await openLix({});
+    // Create an account first
+    await lix.db
+        .insertInto("account")
+        .values({
+        id: "test-account",
+        name: "Test User",
+    })
+        .execute();
+    // Switch to the test account
+    await switchAccount({ lix, to: [{ id: "test-account", name: "Test User" }] });
+    await lix.db.insertInto("thread").defaultValues().execute();
+    const thread = await lix.db
+        .selectFrom("thread")
+        .selectAll()
+        .executeTakeFirstOrThrow();
+    // Check that a change author was created for the thread
+    const threadChangeAuthor = await lix.db
+        .selectFrom("change_author")
+        .where("change_author.change_id", "=", thread.lixcol_change_id)
+        .selectAll()
+        .executeTakeFirstOrThrow();
+    expect(threadChangeAuthor).toBeDefined();
+    expect(threadChangeAuthor.account_id).toBe("test-account");
+});
+test("creating a thread comment should create a change author", async () => {
+    const lix = await openLix({});
+    // Create an account first
+    await lix.db
+        .insertInto("account")
+        .values({
+        id: "test-account",
+        name: "Test User",
+    })
+        .execute();
+    // Switch to the test account
+    await switchAccount({ lix, to: [{ id: "test-account", name: "Test User" }] });
+    await lix.db.insertInto("thread").defaultValues().execute();
+    const thread = await lix.db
+        .selectFrom("thread")
+        .selectAll()
+        .executeTakeFirstOrThrow();
+    await lix.db
+        .insertInto("thread_comment")
+        .values({
+        thread_id: thread.id,
+        parent_id: null,
+        body: fromPlainText("Test comment"),
+    })
+        .execute();
+    const comment = await lix.db
+        .selectFrom("thread_comment")
+        .selectAll()
+        .executeTakeFirstOrThrow();
+    // Check that a change author was created for the comment
+    const commentChangeAuthor = await lix.db
+        .selectFrom("change_author")
+        .where("change_author.change_id", "=", comment.lixcol_change_id)
+        .selectAll()
+        .executeTakeFirstOrThrow();
+    expect(commentChangeAuthor).toBeDefined();
+    expect(commentChangeAuthor.account_id).toBe("test-account");
+});
 //# sourceMappingURL=schema.test.js.map

package/dist/thread/schema.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.test.js","sourceRoot":"","sources":["../../src/thread/schema.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;IACtD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5D,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;SACzB,UAAU,CAAC,QAAQ,CAAC;SACpB,SAAS,EAAE;SACX,uBAAuB,EAAE,CAAC;IAE5B,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;IAC1E,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5D,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;SACzB,UAAU,CAAC,QAAQ,CAAC;SACpB,SAAS,EAAE;SACX,uBAAuB,EAAE,CAAC;IAE5B,MAAM,MAAM,CACX,KAAK,IAAI,EAAE,CACV,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,gBAAgB,CAAC;SAC5B,MAAM,CAAC;QACP,SAAS,EAAE,MAAM,CAAC,EAAE;QACpB,SAAS,EAAE,IAAI;QACf,IAAI,EAAE;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE;gBACR,6CAA6C;gBAC7C;oBACC,IAAI,EAAE,mBAAmB;oBACzB,KAAK,EAAE,eAAe;oBACtB,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;iBACxD;aACD;SACD;KACD,CAAC;SACD,OAAO,EAAE,CACZ,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;IAC3D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5D,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;SACzB,UAAU,CAAC,QAAQ,CAAC;SACpB,SAAS,EAAE;SACX,uBAAuB,EAAE,CAAC;IAE5B,MAAM,GAAG,CAAC,EAAE;SACV,UAAU,CAAC,gBAAgB,CAAC;SAC5B,MAAM,CAAC;QACP,SAAS,EAAE,MAAM,CAAC,EAAE;QACpB,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,aAAa,CAAC,aAAa,CAAC;KAClC,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,EAAE;SAC1B,UAAU,CAAC,gBAAgB,CAAC;SAC5B,SAAS,EAAE;SACX,uBAAuB,EAAE,CAAC;IAE5B,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;AAC/B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"schema.test.js","sourceRoot":"","sources":["../../src/thread/schema.test.ts"],"names":[],"mappings":"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"}

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

@@ -1,19 +1,24 @@
-import type { ChangeSet } from "../change-set/schema.js";
 import type { Lix } from "../lix/open-lix.js";
-import type { Version } from "./schema.js";
+import type { LixVersion } from "./schema.js";
 /**
  * Creates a new version.
  *
- * The changeSet can be any change set e.g. another version, a checkpoint, etc.
+ * If `commit_id` is provided, the new version will point to that commit.
+ * Otherwise, defaults to the active version's commit_id.
  *
  * @example
- *   const version = await createVersion({ lix, changeSet: otherVersion.change_set_id });
+ *   // Create a version branching from the current active version
+ *   const version = await createVersion({ lix, name: "feature-branch" });
+ *
+ * @example
+ *   // Create a version pointing to a specific commit
+ *   const version = await createVersion({ lix, commit_id: existingCommitId });
  */
 export declare function createVersion(args: {
     lix: Lix;
-    id?: Version["id"];
-    changeSet?: Pick<ChangeSet, "id">;
-    name?: Version["name"];
-    inherits_from_version_id?: Version["inherits_from_version_id"];
-}): Promise<Version>;
+    id?: LixVersion["id"];
+    commit_id?: LixVersion["commit_id"];
+    name?: LixVersion["name"];
+    inherits_from_version_id?: LixVersion["inherits_from_version_id"] | null;
+}): Promise<LixVersion>;
 //# sourceMappingURL=create-version.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"create-version.d.ts","sourceRoot":"","sources":["../../src/version/create-version.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACzC,GAAG,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,SAAS,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAClC,IAAI,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACvB,wBAAwB,CAAC,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;CAC/D,GAAG,OAAO,CAAC,OAAO,CAAC,CAwCnB"}
+{"version":3,"file":"create-version.d.ts","sourceRoot":"","sources":["../../src/version/create-version.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C;;;;;;;;;;;;;GAaG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACzC,GAAG,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IACtB,SAAS,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IACpC,IAAI,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1B,wBAAwB,CAAC,EAAE,UAAU,CAAC,0BAA0B,CAAC,GAAG,IAAI,CAAC;CACzE,GAAG,OAAO,CAAC,UAAU,CAAC,CAgEtB"}

package/dist/version/create-version.js

@@ -1,12 +1,19 @@
 import { createChangeSet } from "../change-set/create-change-set.js";
-import { nanoid } from "../database/nano-id.js";
+import { nanoId } from "../deterministic/index.js";
+import { uuidV7 } from "../deterministic/uuid-v7.js";
 /**
  * Creates a new version.
  *
- * The changeSet can be any change set e.g. another version, a checkpoint, etc.
+ * If `commit_id` is provided, the new version will point to that commit.
+ * Otherwise, defaults to the active version's commit_id.
  *
  * @example
- *   const version = await createVersion({ lix, changeSet: otherVersion.change_set_id });
+ *   // Create a version branching from the current active version
+ *   const version = await createVersion({ lix, name: "feature-branch" });
+ *
+ * @example
+ *   // Create a version pointing to a specific commit
+ *   const version = await createVersion({ lix, commit_id: existingCommitId });
  */
 export async function createVersion(args) {
     const executeInTransaction = async (trx) => {
@@ -14,20 +21,41 @@ export async function createVersion(args) {
             lix: { ...args.lix, db: trx },
             lixcol_version_id: "global",
         });
-        const cs = args.changeSet ??
-            (await createChangeSet({
-                lix: { ...args.lix, db: trx },
-                lixcol_version_id: "global",
-            }));
-        const versionId = args.id ?? nanoid();
+        let commitId;
+        if (args.commit_id) {
+            // Use the provided commit
+            commitId = args.commit_id;
+        }
+        else {
+            // Default to active version's commit_id
+            const activeVersion = await trx
+                .selectFrom("active_version")
+                .innerJoin("version", "version.id", "active_version.version_id")
+                .select("version.commit_id")
+                .executeTakeFirstOrThrow();
+            commitId = activeVersion.commit_id;
+        }
+        // Create a working commit for the new version
+        const workingCommitId = uuidV7({ lix: args.lix });
+        await trx
+            .insertInto("commit_all")
+            .values({
+            id: workingCommitId,
+            change_set_id: workingCs.id,
+            lixcol_version_id: "global",
+        })
+            .execute();
+        const versionId = args.id ?? nanoId({ lix: args.lix });
         await trx
             .insertInto("version")
             .values({
             id: versionId,
             name: args.name,
-            change_set_id: cs.id,
-            working_change_set_id: workingCs.id,
-            inherits_from_version_id: args.inherits_from_version_id ?? "global",
+            commit_id: commitId,
+            working_commit_id: workingCommitId,
+            inherits_from_version_id: args.inherits_from_version_id === undefined
+                ? "global"
+                : args.inherits_from_version_id,
         })
             .execute();
         const newVersion = await trx

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

@@ -1 +1 @@
-{"version":3,"file":"create-version.js","sourceRoot":"","sources":["../../src/version/create-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIhD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAMnC;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;YACvC,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;YAC7B,iBAAiB,EAAE,QAAQ;SAC3B,CAAC,CAAC;QACH,MAAM,EAAE,GACP,IAAI,CAAC,SAAS;YACd,CAAC,MAAM,eAAe,CAAC;gBACtB,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;gBAC7B,iBAAiB,EAAE,QAAQ;aAC3B,CAAC,CAAC,CAAC;QAEL,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;QAEtC,MAAM,GAAG;aACP,UAAU,CAAC,SAAS,CAAC;aACrB,MAAM,CAAC;YACP,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,aAAa,EAAE,EAAE,CAAC,EAAE;YACpB,qBAAqB,EAAE,SAAS,CAAC,EAAE;YACnC,wBAAwB,EAAE,IAAI,CAAC,wBAAwB,IAAI,QAAQ;SACnE,CAAC;aACD,OAAO,EAAE,CAAC;QAEZ,MAAM,UAAU,GAAG,MAAM,GAAG;aAC1B,UAAU,CAAC,SAAS,CAAC;aACrB,SAAS,EAAE;aACX,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC;aAC3B,uBAAuB,EAAE,CAAC;QAE5B,OAAO,UAAU,CAAC;IACnB,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"}
+{"version":3,"file":"create-version.js","sourceRoot":"","sources":["../../src/version/create-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAIrD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAMnC;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;YACvC,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;YAC7B,iBAAiB,EAAE,QAAQ;SAC3B,CAAC,CAAC;QAEH,IAAI,QAAgB,CAAC;QAErB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,0BAA0B;YAC1B,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAC3B,CAAC;aAAM,CAAC;YACP,wCAAwC;YACxC,MAAM,aAAa,GAAG,MAAM,GAAG;iBAC7B,UAAU,CAAC,gBAAgB,CAAC;iBAC5B,SAAS,CAAC,SAAS,EAAE,YAAY,EAAE,2BAA2B,CAAC;iBAC/D,MAAM,CAAC,mBAAmB,CAAC;iBAC3B,uBAAuB,EAAE,CAAC;YAE5B,QAAQ,GAAG,aAAa,CAAC,SAAS,CAAC;QACpC,CAAC;QAED,8CAA8C;QAC9C,MAAM,eAAe,GAAG,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAClD,MAAM,GAAG;aACP,UAAU,CAAC,YAAY,CAAC;aACxB,MAAM,CAAC;YACP,EAAE,EAAE,eAAe;YACnB,aAAa,EAAE,SAAS,CAAC,EAAE;YAC3B,iBAAiB,EAAE,QAAQ;SAC3B,CAAC;aACD,OAAO,EAAE,CAAC;QAEZ,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,IAAI,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAEvD,MAAM,GAAG;aACP,UAAU,CAAC,SAAS,CAAC;aACrB,MAAM,CAAC;YACP,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,SAAS,EAAE,QAAQ;YACnB,iBAAiB,EAAE,eAAe;YAClC,wBAAwB,EACvB,IAAI,CAAC,wBAAwB,KAAK,SAAS;gBAC1C,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,IAAI,CAAC,wBAAwB;SACjC,CAAC;aACD,OAAO,EAAE,CAAC;QAEZ,MAAM,UAAU,GAAG,MAAM,GAAG;aAC1B,UAAU,CAAC,SAAS,CAAC;aACrB,SAAS,EAAE;aACX,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC;aAC3B,uBAAuB,EAAE,CAAC;QAE5B,OAAO,UAAU,CAAC;IACnB,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/create-version.test.js

@@ -1,55 +1,59 @@
 import { test, expect } from "vitest";
 import { openLix } from "../lix/open-lix.js";
 import { createVersion } from "./create-version.js";
-import { createChangeSet } from "../change-set/create-change-set.js";
-test("should create a version linked to the provided change_set_id", async () => {
+test("should create a version with the provided commit_id", async () => {
     const lix = await openLix({});
-    // Setup: Create a change_set to link to (must be in global version for version graph)
-    const changeSet = await createChangeSet({ lix, lixcol_version_id: "global" });
-    const newVersion = await createVersion({ lix, changeSet });
-    expect(newVersion.change_set_id).toBe(changeSet.id);
+    // Create a source version to get a commit_id
+    const sourceVersion = await createVersion({ lix, name: "source-version" });
+    const newVersion = await createVersion({
+        lix,
+        commit_id: sourceVersion.commit_id,
+    });
+    // The new version should have the same commit as the source version
+    expect(newVersion.commit_id).toBe(sourceVersion.commit_id);
     expect(newVersion.id).toBeDefined();
-    // Check if default name is assigned (assuming schema has a default or generated name)
+    expect(newVersion.id).not.toBe(sourceVersion.id);
+    // Check if default name is assigned
     expect(newVersion.name).toBeDefined();
 });
 test("should create a version with the specified name", async () => {
     const lix = await openLix({});
-    const changeSet = await createChangeSet({ lix, lixcol_version_id: "global" });
+    const sourceVersion = await createVersion({ lix, name: "source-version" });
     const versionName = "My Test Version";
     const newVersion = await createVersion({
         lix,
-        changeSet,
+        commit_id: sourceVersion.commit_id,
         name: versionName,
     });
-    expect(newVersion.change_set_id).toBe(changeSet.id);
+    expect(newVersion.commit_id).toBe(sourceVersion.commit_id);
     expect(newVersion.name).toBe(versionName);
     expect(newVersion.id).toBeDefined();
 });
 test("should create a version with the specified id", async () => {
     const lix = await openLix({});
-    const changeSet = await createChangeSet({ lix, lixcol_version_id: "global" });
+    const sourceVersion = await createVersion({ lix, name: "source-version" });
     const newVersion = await createVersion({
         lix,
-        changeSet,
+        commit_id: sourceVersion.commit_id,
         id: "hello world",
     });
-    expect(newVersion.change_set_id).toBe(changeSet.id);
+    expect(newVersion.commit_id).toBe(sourceVersion.commit_id);
     expect(newVersion.id).toBe("hello world");
     // Check default name assignment
     expect(newVersion.name).toBeDefined();
 });
 test("should work within an existing transaction", async () => {
     const lix = await openLix({});
-    const changeSet = await createChangeSet({ lix, lixcol_version_id: "global" });
+    const sourceVersion = await createVersion({ lix, name: "source-version" });
     const versionName = "Transaction Test Version";
     const newVersion = await lix.db.transaction().execute(async (trx) => {
         return createVersion({
             lix: { ...lix, db: trx }, // Pass the transaction object
-            changeSet,
+            commit_id: sourceVersion.commit_id,
             name: versionName,
         });
     });
-    expect(newVersion.change_set_id).toBe(changeSet.id);
+    expect(newVersion.commit_id).toBe(sourceVersion.commit_id);
     expect(newVersion.name).toBe(versionName);
     expect(newVersion.id).toBeDefined();
     // Verify it's actually in the database outside the transaction
@@ -60,24 +64,75 @@ test("should work within an existing transaction", async () => {
         .executeTakeFirstOrThrow();
     expect(dbVersion.name).toBe(versionName);
 });
-test("should fail if the 'from' change_set_id does not exist", async () => {
+test("should fail if the provided commit_id does not exist", async () => {
     const lix = await openLix({});
-    const nonExistentChangeSet = {
-        id: "hello world", // ID that won't exist
-    };
-    await expect(createVersion({ lix, changeSet: nonExistentChangeSet })
-    // Check for foreign key constraint error
-    // The specific error message might vary based on the db driver
-    ).rejects.toThrow(/Foreign key constraint violation/i);
+    const nonExistentCommitId = "non-existent-commit-id";
+    await expect(createVersion({ lix, commit_id: nonExistentCommitId })
+    // Should fail when trying to use non-existent commit
+    ).rejects.toThrow();
 });
 test("should automatically create inheritance from global version", async () => {
     const lix = await openLix({});
-    // Create a new version (should automatically inherit from global)
+    // Create a new version without commit_id (should inherit from active version)
     const newVersion = await createVersion({
         lix,
         name: "test-version",
     });
     // Check that inheritance column was set correctly
     expect(newVersion.inherits_from_version_id).toBe("global");
+    // Should have a commit_id from the active version
+    expect(newVersion.commit_id).toBeDefined();
+});
+test("should default to active version's commit_id when no commit_id is provided", async () => {
+    const lix = await openLix({});
+    // Get the active version
+    const activeVersion = await lix.db
+        .selectFrom("active_version")
+        .innerJoin("version", "version.id", "active_version.version_id")
+        .selectAll("version")
+        .executeTakeFirstOrThrow();
+    // Create a new version without commit_id
+    const newVersion = await createVersion({
+        lix,
+        name: "branched-version",
+    });
+    // The new version should have the same commit_id as the active version
+    expect(newVersion.commit_id).toBe(activeVersion.commit_id);
+    expect(newVersion.id).not.toBe(activeVersion.id);
+    expect(newVersion.name).toBe("branched-version");
+});
+test("multiple versions created without commit_id should all point to active version's commit", async () => {
+    const lix = await openLix({});
+    // Get the active version's commit_id
+    const activeVersion = await lix.db
+        .selectFrom("active_version")
+        .innerJoin("version", "version.id", "active_version.version_id")
+        .selectAll("version")
+        .executeTakeFirstOrThrow();
+    // Create two versions without commit_id
+    const version1 = await createVersion({
+        lix,
+        name: "version-1",
+    });
+    const version2 = await createVersion({
+        lix,
+        name: "version-2",
+    });
+    // Both should have the same commit_id as the active version
+    expect(version1.commit_id).toBe(activeVersion.commit_id);
+    expect(version2.commit_id).toBe(activeVersion.commit_id);
+    // But different version IDs
+    expect(version1.id).not.toBe(version2.id);
+});
+test("should allow explicit null for inherits_from_version_id", async () => {
+    const lix = await openLix({});
+    // Create a version with explicit null inheritance
+    const version = await createVersion({
+        lix,
+        name: "standalone-version",
+        inherits_from_version_id: null,
+    });
+    // Should be null, not "global"
+    expect(version.inherits_from_version_id).toBeNull();
 });
 //# sourceMappingURL=create-version.test.js.map

package/dist/version/create-version.test.js.map

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