@lix-js/sdk 0.4.7 → 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

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1 @@
+{"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/index.js

@@ -0,0 +1,4 @@
+export { LixThreadSchema, LixThreadCommentSchema, } from "./schema.js";
+export { createThread } from "./create-thread.js";
+export { createThreadComment } from "./create-thread-comment.js";
+//# sourceMappingURL=index.js.map

package/dist/thread/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/thread/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,eAAe,EACf,sBAAsB,GAGtB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/thread/schema.d.ts

@@ -0,0 +1,62 @@
+import type { FromLixSchemaDefinition } from "../schema-definition/definition.js";
+import { type ZettelDoc } from "@opral/zettel-ast";
+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";
+    readonly "x-lix-primary-key": readonly ["id"];
+    readonly type: "object";
+    readonly properties: {
+        readonly id: {
+            readonly type: "string";
+            readonly "x-lix-generated": true;
+        };
+        readonly metadata: {
+            readonly type: "object";
+            readonly nullable: true;
+        };
+    };
+    readonly required: readonly ["id"];
+    readonly additionalProperties: false;
+};
+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 [{
+        readonly properties: readonly ["thread_id"];
+        readonly references: {
+            readonly schemaKey: "lix_thread";
+            readonly properties: readonly ["id"];
+        };
+    }, {
+        readonly properties: readonly ["parent_id"];
+        readonly references: {
+            readonly schemaKey: "lix_thread_comment";
+            readonly properties: readonly ["id"];
+        };
+    }];
+    readonly type: "object";
+    readonly properties: {
+        readonly id: {
+            readonly type: "string";
+            readonly "x-lix-generated": true;
+        };
+        readonly thread_id: {
+            readonly type: "string";
+        };
+        readonly parent_id: {
+            readonly type: "string";
+            readonly nullable: true;
+        };
+        readonly body: any;
+    };
+    readonly required: readonly ["id", "thread_id", "body"];
+    readonly additionalProperties: false;
+};
+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

@@ -0,0 +1 @@
+{"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

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

package/dist/thread/schema.js.map

@@ -0,0 +1 @@
+{"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.d.ts

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

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

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

package/dist/thread/schema.test.js

@@ -0,0 +1,125 @@
+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();
+    const result = await lix.db
+        .selectFrom("thread")
+        .selectAll()
+        .executeTakeFirstOrThrow();
+    expect(result.id).toBeDefined();
+});
+test("an invalid thread comment content should throw an error", async () => {
+    const lix = await openLix({});
+    await lix.db.insertInto("thread").defaultValues().execute();
+    const thread = await lix.db
+        .selectFrom("thread")
+        .selectAll()
+        .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 zettel_key prop
+                {
+                    type: "zettel_text_block",
+                    style: "zettel_normal",
+                    children: [{ type: "zettel_span", text: "Hello world" }],
+                },
+            ],
+        },
+    })
+        .execute()).rejects.toThrowError();
+});
+test("valid thread comment content should pass", async () => {
+    const lix = await openLix({});
+    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("Hello world"),
+    })
+        .execute();
+    const comment = await lix.db
+        .selectFrom("thread_comment")
+        .selectAll()
+        .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

@@ -0,0 +1 @@
+{"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,27 +1,24 @@
-import type { Version } from "../database/schema.js";
 import type { Lix } from "../lix/open-lix.js";
+import type { LixVersion } from "./schema.js";
 /**
- * Creates a new Version.
+ * Creates a new version.
  *
- * If `from` is provided, the new version will be identical to the from version.
+ * If `commit_id` is provided, the new version will point to that commit.
+ * Otherwise, defaults to the active version's commit_id.
  *
  * @example
- *   _Without from_
- *
- *   ```ts
- *   const version = await createVersion({ lix });
- *   ```
+ *   // Create a version branching from the current active version
+ *   const version = await createVersion({ lix, name: "feature-branch" });
  *
  * @example
- *   _With from_
- *
- *   ```ts
- *   const version = await createVersion({ lix, from: otherVersion });
- *   ```
+ *   // Create a version pointing to a specific commit
+ *   const version = await createVersion({ lix, commit_id: existingCommitId });
  */
 export declare function createVersion(args: {
-    lix: Pick<Lix, "db">;
-    from?: Pick<Version, "id">;
-    name?: Version["name"];
-}): Promise<Version>;
+    lix: Lix;
+    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":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACzC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACrB,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CACvB,GAAG,OAAO,CAAC,OAAO,CAAC,CA6DnB"}
+{"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,67 +1,68 @@
+import { createChangeSet } from "../change-set/create-change-set.js";
+import { nanoId } from "../deterministic/index.js";
+import { uuidV7 } from "../deterministic/uuid-v7.js";
 /**
- * Creates a new Version.
+ * Creates a new version.
  *
- * If `from` is provided, the new version will be identical to the from version.
+ * If `commit_id` is provided, the new version will point to that commit.
+ * Otherwise, defaults to the active version's commit_id.
  *
  * @example
- *   _Without from_
- *
- *   ```ts
- *   const version = await createVersion({ lix });
- *   ```
+ *   // Create a version branching from the current active version
+ *   const version = await createVersion({ lix, name: "feature-branch" });
  *
  * @example
- *   _With from_
- *
- *   ```ts
- *   const version = await createVersion({ lix, from: otherVersion });
- *   ```
+ *   // 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) => {
-        let query = trx.insertInto("version").returningAll();
-        if (args.name) {
-            query = query.values({ name: args.name });
+        const workingCs = await createChangeSet({
+            lix: { ...args.lix, db: trx },
+            lixcol_version_id: "global",
+        });
+        let commitId;
+        if (args.commit_id) {
+            // Use the provided commit
+            commitId = args.commit_id;
         }
         else {
-            query = query.defaultValues();
-        }
-        const newVersion = await query.executeTakeFirstOrThrow();
-        // copy the change pointers from the from Version
-        if (args.from) {
-            await trx
-                .insertInto("version_change")
-                .columns([
-                "version_id",
-                "change_id",
-                "entity_id",
-                "schema_key",
-                "file_id",
-            ])
-                .expression((eb) => eb
-                .selectFrom("version_change")
-                .select([
-                eb.val(newVersion.id).as("version_id"),
-                "change_id",
-                "entity_id",
-                "schema_key",
-                "file_id",
-            ])
-                .where("version_id", "=", args.from.id))
-                .execute();
-            // copy the change conflicts from the from Version
-            await trx
-                .insertInto("version_change_conflict")
-                .columns(["version_id", "change_conflict_id"])
-                .expression((eb) => eb
-                .selectFrom("version_change_conflict")
-                .select([
-                eb.val(newVersion.id).as("version_id"),
-                "change_conflict_id",
-            ])
-                .where("version_id", "=", args.from.id))
-                .execute();
+            // 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,
+            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
+            .selectFrom("version")
+            .selectAll()
+            .where("id", "=", versionId)
+            .executeTakeFirstOrThrow();
         return newVersion;
     };
     if (args.lix.db.isTransaction) {

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

@@ -1 +1 @@
-{"version":3,"file":"create-version.js","sourceRoot":"","sources":["../../src/version/create-version.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAInC;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,IAAI,KAAK,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,YAAY,EAAE,CAAC;QAErD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACP,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;QAC/B,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,uBAAuB,EAAE,CAAC;QAEzD,iDAAiD;QACjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,GAAG;iBACP,UAAU,CAAC,gBAAgB,CAAC;iBAC5B,OAAO,CAAC;gBACR,YAAY;gBACZ,WAAW;gBACX,WAAW;gBACX,YAAY;gBACZ,SAAS;aACT,CAAC;iBACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAClB,EAAE;iBACA,UAAU,CAAC,gBAAgB,CAAC;iBAC5B,MAAM,CAAC;gBACP,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC;gBACtC,WAAW;gBACX,WAAW;gBACX,YAAY;gBACZ,SAAS;aACT,CAAC;iBACD,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,IAAI,CAAC,IAAK,CAAC,EAAE,CAAC,CACzC;iBACA,OAAO,EAAE,CAAC;YAEZ,kDAAkD;YAClD,MAAM,GAAG;iBACP,UAAU,CAAC,yBAAyB,CAAC;iBACrC,OAAO,CAAC,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;iBAC7C,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAClB,EAAE;iBACA,UAAU,CAAC,yBAAyB,CAAC;iBACrC,MAAM,CAAC;gBACP,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC;gBACtC,oBAAoB;aACpB,CAAC;iBACD,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,IAAI,CAAC,IAAK,CAAC,EAAE,CAAC,CACzC;iBACA,OAAO,EAAE,CAAC;QACb,CAAC;QAED,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"}