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

package/dist/observe/determine-schema-keys.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Maps table names to their corresponding schema keys.
+ * Uses LixSchemaViewMap to derive the mappings dynamically.
+ */
+export declare function determineSchemaKeys(compiledQuery: any): string[];
+//# sourceMappingURL=determine-schema-keys.d.ts.map

package/dist/observe/determine-schema-keys.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"determine-schema-keys.d.ts","sourceRoot":"","sources":["../../src/observe/determine-schema-keys.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,GAAG,GAAG,MAAM,EAAE,CAqEhE"}

package/dist/observe/determine-schema-keys.js

@@ -0,0 +1,145 @@
+import { LixSchemaViewMap } from "../database/schema.js";
+/**
+ * Maps table names to their corresponding schema keys.
+ * Uses LixSchemaViewMap to derive the mappings dynamically.
+ */
+export function determineSchemaKeys(compiledQuery) {
+    const tableNames = new Set();
+    // Extract table names from the compiled query
+    try {
+        // The compiled query has a 'query' property that contains the actual AST
+        const queryNode = compiledQuery.query || compiledQuery;
+        // Get table names from FROM clause
+        if (queryNode.from) {
+            extractTableNamesFromQueryNode(queryNode.from, tableNames);
+        }
+        // Get table names from JOIN clauses
+        if (queryNode.joins) {
+            for (const join of queryNode.joins) {
+                extractTableNamesFromQueryNode(join, tableNames);
+            }
+        }
+        // Get table names from WHERE clause subqueries
+        if (queryNode.where) {
+            extractTableNamesFromQueryNode(queryNode.where, tableNames);
+        }
+        // Get table names from SELECT clause subqueries
+        if (queryNode.selections) {
+            for (const selection of queryNode.selections) {
+                extractTableNamesFromQueryNode(selection, tableNames);
+            }
+        }
+    }
+    catch (error) {
+        console.warn("Failed to extract table names from compiled query:", error);
+        return []; // Return empty array to fall back to always re-executing
+    }
+    // Build table to schema key mapping from LixSchemaViewMap
+    const tableToSchemaMap = {};
+    // Add mappings from LixSchemaViewMap
+    for (const [schemaKey, schemaDefinition] of Object.entries(LixSchemaViewMap)) {
+        const lixKey = schemaDefinition["x-lix-key"];
+        if (lixKey) {
+            tableToSchemaMap[schemaKey] = lixKey;
+        }
+    }
+    // Add special tables that don't have direct schema mappings but are important
+    const specialMappings = {
+        change: "change", // Special case for change table
+        state: "state", // Virtual state table - could include multiple schema keys
+        state_all: "state_all", // Virtual state_all table - includes all versions
+        active_version: "lix_version", // Maps to version schema
+        active_account: "lix_account", // Maps to account schema
+    };
+    Object.assign(tableToSchemaMap, specialMappings);
+    const schemaKeys = [];
+    for (const tableName of tableNames) {
+        const schemaKey = tableToSchemaMap[tableName];
+        if (schemaKey) {
+            schemaKeys.push(schemaKey);
+        }
+    }
+    return schemaKeys;
+}
+/**
+ * Extracts table names from Kysely AST nodes recursively.
+ */
+function extractTableNamesFromQueryNode(node, tableNames) {
+    if (!node)
+        return;
+    // Handle different Kysely AST node types
+    switch (node.kind) {
+        case "TableNode": {
+            // Extract table name from TableNode
+            if (node.table && node.table.identifier && node.table.identifier.name) {
+                tableNames.add(node.table.identifier.name);
+            }
+            break;
+        }
+        case "FromNode": {
+            // Process all tables in FROM clause
+            if (node.froms && Array.isArray(node.froms)) {
+                for (const from of node.froms) {
+                    extractTableNamesFromQueryNode(from, tableNames);
+                }
+            }
+            break;
+        }
+        case "JoinNode": {
+            // Process the joined table
+            if (node.table) {
+                extractTableNamesFromQueryNode(node.table, tableNames);
+            }
+            break;
+        }
+        case "SelectQueryNode": {
+            // Process subqueries recursively
+            if (node.from) {
+                extractTableNamesFromQueryNode(node.from, tableNames);
+            }
+            if (node.joins) {
+                for (const join of node.joins) {
+                    extractTableNamesFromQueryNode(join, tableNames);
+                }
+            }
+            if (node.where) {
+                extractTableNamesFromQueryNode(node.where, tableNames);
+            }
+            if (node.selections) {
+                for (const selection of node.selections) {
+                    extractTableNamesFromQueryNode(selection, tableNames);
+                }
+            }
+            break;
+        }
+        case "AliasNode": {
+            // Look inside the aliased node
+            if (node.node) {
+                extractTableNamesFromQueryNode(node.node, tableNames);
+            }
+            break;
+        }
+        default: {
+            // For other node types, recursively check all properties
+            if (typeof node === "object") {
+                for (const key in node) {
+                    const value = node[key];
+                    if (value && typeof value === "object") {
+                        if (Array.isArray(value)) {
+                            for (const item of value) {
+                                if (item && typeof item === "object" && item.kind) {
+                                    extractTableNamesFromQueryNode(item, tableNames);
+                                }
+                            }
+                        }
+                        else if (value.kind) {
+                            extractTableNamesFromQueryNode(value, tableNames);
+                        }
+                    }
+                }
+            }
+            break;
+        }
+    }
+}
+//# sourceMappingURL=determine-schema-keys.js.map

package/dist/observe/determine-schema-keys.js.map

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

package/dist/observe/determine-schema-keys.test.d.ts

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

package/dist/observe/determine-schema-keys.test.d.ts.map

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

package/dist/observe/determine-schema-keys.test.js

@@ -0,0 +1,266 @@
+import { test, expect } from "vitest";
+import { openLix } from "../lix/open-lix.js";
+import { determineSchemaKeys } from "./determine-schema-keys.js";
+/**
+ * Tests for the determineSchemaKeys function using real queries from md-app.
+ *
+ * This test suite verifies that the schema key extraction logic correctly
+ * identifies the tables involved in queries and maps them to their schema keys.
+ */
+test("should extract schema keys from simple table queries", async () => {
+    const lix = await openLix({});
+    // Test selectActiveVersion query from md-app
+    const activeVersionQuery = lix.db
+        .selectFrom("active_version")
+        .innerJoin("version", "active_version.version_id", "version.id")
+        .selectAll("version");
+    const schemaKeys = determineSchemaKeys(activeVersionQuery.compile());
+    // Should include schema keys for both active_version and version tables
+    expect(schemaKeys).toContain("lix_version");
+    // Note: active_version might not have a direct schema key mapping
+    await lix.close();
+});
+test("should extract schema keys from key_value queries", async () => {
+    const lix = await openLix({});
+    // Test selectCurrentLixName query from md-app
+    const currentLixNameQuery = lix.db
+        .selectFrom("key_value")
+        .where("key", "=", "lix_name")
+        .select("value");
+    const schemaKeys = determineSchemaKeys(currentLixNameQuery.compile());
+    expect(schemaKeys).toContain("lix_key_value");
+    await lix.close();
+});
+test("should extract schema keys from state table queries", async () => {
+    const lix = await openLix({});
+    // Test selectMdAstRoot query from md-app (this uses "state" table)
+    const mdAstRootQuery = lix.db
+        .selectFrom("state")
+        .where("schema_key", "=", "markdown_root_v1")
+        .where("file_id", "=", "test_file_id")
+        .selectAll();
+    const schemaKeys = determineSchemaKeys(mdAstRootQuery.compile());
+    // "state" is a virtual table that should map to appropriate schema keys
+    expect(schemaKeys).toContain("state");
+    await lix.close();
+});
+test("should extract schema keys from state_all table queries", async () => {
+    const lix = await openLix({});
+    // Test query using "state_all" table (includes all versions)
+    const stateAllQuery = lix.db
+        .selectFrom("state_all")
+        .where("schema_key", "=", "lix_version")
+        .where("version_id", "=", "test_version_id")
+        .selectAll();
+    const schemaKeys = determineSchemaKeys(stateAllQuery.compile());
+    // "state_all" should be detected as a special schema key
+    expect(schemaKeys).toContain("state_all");
+    await lix.close();
+});
+test("should extract schema keys from complex join queries", async () => {
+    const lix = await openLix({});
+    // Test selectCheckpoints query from md-app (complex with multiple joins)
+    const checkpointsQuery = lix.db
+        .selectFrom("change_set")
+        .leftJoin("change_set_element", "change_set.id", "change_set_element.change_set_id")
+        .leftJoin("change_set_label", "change_set.id", "change_set_label.change_set_id")
+        .leftJoin("label", "label.id", "change_set_label.label_id")
+        .where("label.name", "=", "checkpoint")
+        .selectAll("change_set");
+    const schemaKeys = determineSchemaKeys(checkpointsQuery.compile());
+    // Should include schema keys for all joined tables
+    expect(schemaKeys).toContain("lix_change_set");
+    expect(schemaKeys).toContain("lix_change_set_element");
+    expect(schemaKeys).toContain("lix_change_set_label");
+    expect(schemaKeys).toContain("lix_label");
+    await lix.close();
+});
+test("should extract schema keys from subquery queries", async () => {
+    const lix = await openLix({});
+    // Test selectActiveFile query from md-app (has subquery)
+    const activeFileQuery = lix.db
+        .selectFrom("file")
+        .where("id", "=", lix.db
+        .selectFrom("key_value")
+        .where("key", "=", "flashtype_active_file")
+        .select("value"))
+        .select(["id", "path", "metadata"]);
+    const schemaKeys = determineSchemaKeys(activeFileQuery.compile());
+    // Should include schema keys for both main query and subquery tables
+    expect(schemaKeys).toContain("lix_file_descriptor");
+    expect(schemaKeys).toContain("lix_key_value");
+    await lix.close();
+});
+test("should handle queries with aliases", async () => {
+    const lix = await openLix({});
+    // Test query with table aliases using key_value (has schema key lix_key_value)
+    const aliasQuery = lix.db
+        .selectFrom("key_value as kv1")
+        .innerJoin("key_value as kv2", "kv1.key", "kv2.value")
+        .selectAll("kv1");
+    const schemaKeys = determineSchemaKeys(aliasQuery.compile());
+    // Should recognize the underlying table despite aliases
+    // Since both aliases point to key_value, should contain lix_key_value
+    expect(schemaKeys).toContain("lix_key_value");
+    await lix.close();
+});
+test("should handle empty results gracefully", async () => {
+    const lix = await openLix({});
+    // Test with a table that doesn't exist in our mapping
+    const unknownTableQuery = lix.db
+        .selectFrom("unknown_table")
+        .selectAll();
+    const schemaKeys = determineSchemaKeys(unknownTableQuery.compile());
+    // Should return empty array for unknown tables
+    expect(Array.isArray(schemaKeys)).toBe(true);
+    expect(schemaKeys.length).toBe(0);
+    await lix.close();
+});
+test("should handle complex working changes query", async () => {
+    const lix = await openLix({});
+    // Test selectWorkingChanges query from md-app (very complex with multiple subqueries)
+    const workingChangesQuery = lix.db
+        .selectFrom("change")
+        .innerJoin("change_set_element", "change_set_element.change_id", "change.id")
+        .where("change_set_element.change_set_id", "=", lix.db
+        .selectFrom("active_version")
+        .innerJoin("version", "active_version.version_id", "version.id")
+        .select("version.working_commit_id"))
+        .where("change.file_id", "=", lix.db
+        .selectFrom("key_value")
+        .where("key", "=", "flashtype_active_file")
+        .select("value"))
+        .select([
+        "change.id",
+        "change.entity_id",
+        "change.file_id",
+        "change.plugin_key",
+        "change.schema_key",
+        "change.created_at",
+    ]);
+    const schemaKeys = determineSchemaKeys(workingChangesQuery.compile());
+    // Should include schema keys for all tables involved
+    expect(schemaKeys).toContain("change"); // change table
+    expect(schemaKeys).toContain("lix_change_set_element");
+    expect(schemaKeys).toContain("lix_version");
+    expect(schemaKeys).toContain("lix_key_value");
+    await lix.close();
+});
+test("should handle thread queries with json aggregation", async () => {
+    const lix = await openLix({});
+    // Test selectThreads query updated to use entity_thread for universal commenting
+    const threadsQuery = lix.db
+        .selectFrom("thread")
+        .leftJoin("entity_thread", "thread.id", "entity_thread.thread_id")
+        .leftJoin("thread_comment", "thread_comment.thread_id", "thread.id")
+        .leftJoin("change_author", "thread_comment.lixcol_change_id", "change_author.change_id")
+        .leftJoin("account", "account.id", "change_author.account_id")
+        .where("entity_thread.entity_id", "=", "test_changeset")
+        .where("entity_thread.schema_key", "=", "lix_change_set")
+        .selectAll("thread");
+    const schemaKeys = determineSchemaKeys(threadsQuery.compile());
+    // Should include all joined tables
+    expect(schemaKeys).toContain("lix_thread");
+    expect(schemaKeys).toContain("lix_entity_thread");
+    expect(schemaKeys).toContain("lix_thread_comment");
+    expect(schemaKeys).toContain("lix_change_author");
+    expect(schemaKeys).toContain("lix_account");
+    await lix.close();
+});
+test("should correctly extract schema keys from real md-app queries", async () => {
+    const lix = await openLix({});
+    // Test cases based on actual queries from md-app
+    const testCases = [
+        {
+            name: "selectActiveVersion",
+            query: lix.db
+                .selectFrom("active_version")
+                .innerJoin("version", "active_version.version_id", "version.id")
+                .selectAll("version"),
+            expectedKeys: ["lix_version"],
+        },
+        {
+            name: "selectCurrentLixName",
+            query: lix.db
+                .selectFrom("key_value")
+                .where("key", "=", "lix_name")
+                .select("value"),
+            expectedKeys: ["lix_key_value"],
+        },
+        {
+            name: "selectMdAstRoot",
+            query: lix.db
+                .selectFrom("state")
+                .where("schema_key", "=", "markdown_root_v1")
+                .selectAll(),
+            expectedKeys: ["state"],
+        },
+        {
+            name: "selectActiveFile (with subquery)",
+            query: lix.db
+                .selectFrom("file")
+                .where("id", "=", lix.db
+                .selectFrom("key_value")
+                .where("key", "=", "flashtype_active_file")
+                .select("value"))
+                .select(["id", "path"]),
+            expectedKeys: ["lix_file_descriptor", "lix_key_value"],
+        },
+    ];
+    for (const testCase of testCases) {
+        const schemaKeys = determineSchemaKeys(testCase.query.compile());
+        for (const expectedKey of testCase.expectedKeys) {
+            expect(schemaKeys, `${testCase.name} should include ${expectedKey}`).toContain(expectedKey);
+        }
+    }
+    await lix.close();
+});
+test("should debug log compiled query structure", async () => {
+    const lix = await openLix({});
+    // Test a simple query to see its compiled structure
+    const simpleQuery = lix.db
+        .selectFrom("key_value")
+        .where("key", "=", "test")
+        .select("value");
+    const compiled = simpleQuery.compile();
+    const schemaKeys = determineSchemaKeys(compiled);
+    expect(schemaKeys).toContain("lix_key_value");
+    await lix.close();
+});
+test("should observe key value and handle untracked insertions", async () => {
+    const lix = await openLix({});
+    const values = [];
+    // Listen to a specific key value
+    const subscription = lix
+        .observe(lix.db
+        .selectFrom("key_value")
+        .selectAll()
+        .where("key", "=", "untracked_test_key"))
+        .subscribe({ next: (rows) => values.push(rows) });
+    // Wait for initial emission
+    await new Promise((resolve) => setTimeout(resolve, 10));
+    expect(values).toHaveLength(1);
+    expect(values[0]).toEqual([]);
+    // Insert a key value with lixcol_untracked: true
+    await lix.db
+        .insertInto("key_value")
+        .values({
+        key: "untracked_test_key",
+        value: "untracked_value",
+        lixcol_untracked: true,
+    })
+        .execute();
+    // Wait for update
+    await new Promise((resolve) => setTimeout(resolve, 10));
+    // Should have received an update with the untracked value
+    expect(values).toHaveLength(2);
+    expect(values[1]).toHaveLength(1);
+    expect(values[1][0]).toMatchObject({
+        key: "untracked_test_key",
+        value: "untracked_value",
+        lixcol_untracked: 1, // SQLite stores boolean as integer
+    });
+    subscription.unsubscribe();
+    await lix.close();
+});
+//# sourceMappingURL=determine-schema-keys.test.js.map

package/dist/observe/determine-schema-keys.test.js.map

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

package/dist/own-change-control/apply-own-change.d.ts

@@ -1,10 +1,14 @@
 import type { Change } from "../database/schema.js";
 import type { Lix } from "../lix/open-lix.js";
+import type { LixFile } from "../file/database-schema.js";
 /**
  * Applies own changes to lix itself.
  */
 export declare function applyOwnChanges(args: {
     lix: Pick<Lix, "db">;
     changes: Change[];
-}): Promise<void>;
+}): Promise<{
+    deletedFileIds: Set<string>;
+    insertedFiles: Map<string, Omit<LixFile, "data">>;
+}>;
 //# sourceMappingURL=apply-own-change.d.ts.map

package/dist/own-change-control/apply-own-change.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply-own-change.d.ts","sourceRoot":"","sources":["../../src/own-change-control/apply-own-change.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAqB,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAO9C;;GAEG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwFhB"}
+{"version":3,"file":"apply-own-change.d.ts","sourceRoot":"","sources":["../../src/own-change-control/apply-own-change.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAqB,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAM9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAE1D;;GAEG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,GAAG,OAAO,CAAC;IACX,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;CAClD,CAAC,CAiGD"}

package/dist/own-change-control/apply-own-change.js

@@ -6,7 +6,9 @@ import { withSkipOwnChangeControl } from "./with-skip-own-change-control.js";
  */
 export async function applyOwnChanges(args) {
     const executeInTransaction = async (trx) => {
-        await withSkipOwnChangeControl(trx, async (trx) => {
+        return withSkipOwnChangeControl(trx, async (trx) => {
+            const deletedFileIds = new Set();
+            const insertedFiles = new Map();
             // defer foreign keys to avoid constraint violations
             // until the end of the transaction. otherwise, we would
             // need to apply the changes in the correct order.
@@ -27,36 +29,48 @@ export async function applyOwnChanges(args) {
                     .replace(/^lix_/, "")
                     .replace(/_table$/, "");
                 const primaryKeys = primaryKeysForEntityId(tableName, change.entity_id);
-                let query;
                 // deletion
                 if (snapshot.content === null) {
-                    query = trx.deleteFrom(tableName);
+                    if (tableName === "file") {
+                        deletedFileIds.add(change.entity_id);
+                    }
+                    let query = trx.deleteFrom(tableName);
                     for (const [key, value] of primaryKeys) {
                         query = query.where(key, "=", value);
                     }
+                    return await query.execute();
                 }
                 // upsert
                 else {
                     // take the current file data if the table is `file`
                     // (can be optimized later to adjust the query instead)
                     if (tableName === "file") {
-                        const data = await trx
+                        const file = await trx
                             .selectFrom("file")
                             .where("id", "=", change.entity_id)
-                            .select("data")
+                            .select("id")
                             .executeTakeFirst();
-                        snapshot.content.data =
-                            data?.data ??
-                                // empty uint8array will trigger applyChanges() to pass an empty file to the plugin
-                                new Uint8Array();
+                        // applyChangeSet() needs to handle the file insert together with
+                        // the file.data from plugins
+                        if (!file) {
+                            return insertedFiles.set(change.entity_id, snapshot.content);
+                        }
+                        else {
+                            return trx
+                                .updateTable("file")
+                                .set(snapshot.content)
+                                .where("id", "=", change.entity_id)
+                                .execute();
+                        }
                     }
-                    query = trx
+                    return await trx
                         .insertInto(tableName)
                         .values(snapshot.content)
-                        .onConflict((oc) => oc.doUpdateSet(snapshot.content));
+                        .onConflict((oc) => oc.doUpdateSet(snapshot.content))
+                        .execute();
                 }
-                await query.execute();
             }));
+            return { deletedFileIds, insertedFiles };
         });
     };
     if (args.lix.db.isTransaction) {

package/dist/own-change-control/apply-own-change.js.map

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