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

package/dist/query-filter/commit-is-descendant-of.test.js

@@ -0,0 +1,325 @@
+import { test, expect } from "vitest";
+import { openLix } from "../lix/open-lix.js";
+import { createChangeSet } from "../change-set/create-change-set.js";
+import { commitIsDescendantOf } from "./commit-is-descendant-of.js";
+import { commitIsAncestorOf } from "./commit-is-ancestor-of.js";
+import { uuidV7 } from "../deterministic/uuid-v7.js";
+// Utility function to create a commit with optional parent
+async function createCommitWithParent(args) {
+    const commitId = uuidV7({ lix: args.lix });
+    const versionId = args.versionId || "global";
+    // Create the commit
+    await args.lix.db
+        .insertInto("commit_all")
+        .values({
+        id: commitId,
+        change_set_id: args.changeSetId,
+        lixcol_version_id: versionId,
+    })
+        .execute();
+    // Create edge if parent is provided
+    if (args.parentCommitId) {
+        await args.lix.db
+            .insertInto("commit_edge_all")
+            .values({
+            parent_id: args.parentCommitId,
+            child_id: commitId,
+            lixcol_version_id: versionId,
+        })
+            .execute();
+    }
+    return commitId;
+}
+test("selects all descendants excluding the current commit", async () => {
+    const lix = await openLix({});
+    // Create a linear chain of commits: c0 <- c1 <- c2
+    const cs0 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c0Id = await createCommitWithParent({ lix, changeSetId: cs0.id });
+    const cs1 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c1Id = await createCommitWithParent({
+        lix,
+        changeSetId: cs1.id,
+        parentCommitId: c0Id,
+    });
+    const cs2 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c2Id = await createCommitWithParent({
+        lix,
+        changeSetId: cs2.id,
+        parentCommitId: c1Id,
+    });
+    // Should select c1, c2 as descendants of c0
+    const results = await lix.db
+        .selectFrom("commit")
+        .where(commitIsDescendantOf({ id: c0Id }))
+        .select("id")
+        .execute();
+    expect(results.map((r) => r.id).sort()).toEqual([c1Id, c2Id].sort());
+});
+test("respects the optional depth limit", async () => {
+    const lix = await openLix({});
+    // c0 <- c1 <- c2
+    const cs0 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c0Id = uuidV7({ lix });
+    await lix.db
+        .insertInto("commit_all")
+        .values({
+        id: c0Id,
+        change_set_id: cs0.id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    const cs1 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c1Id = uuidV7({ lix });
+    await lix.db
+        .insertInto("commit_all")
+        .values({
+        id: c1Id,
+        change_set_id: cs1.id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    await lix.db
+        .insertInto("commit_edge_all")
+        .values({
+        parent_id: c0Id,
+        child_id: c1Id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    const cs2 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c2Id = uuidV7({ lix });
+    await lix.db
+        .insertInto("commit_all")
+        .values({
+        id: c2Id,
+        change_set_id: cs2.id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    await lix.db
+        .insertInto("commit_edge_all")
+        .values({
+        parent_id: c1Id,
+        child_id: c2Id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    // With depth: 1 starting from c0, we expect c1 only
+    const results = await lix.db
+        .selectFrom("commit")
+        .where(commitIsDescendantOf({ id: c0Id }, { depth: 1 }))
+        .select("id")
+        .execute();
+    expect(results.map((r) => r.id).sort()).toEqual([c1Id].sort());
+});
+test("can be combined with ancestor filter to select commits between two points", async () => {
+    const lix = await openLix({});
+    // Create a linear chain: c0 <- c1 <- c2 <- c3
+    const cs0 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c0Id = await createCommitWithParent({ lix, changeSetId: cs0.id });
+    const cs1 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c1Id = await createCommitWithParent({
+        lix,
+        changeSetId: cs1.id,
+        parentCommitId: c0Id,
+    });
+    const cs2 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c2Id = await createCommitWithParent({
+        lix,
+        changeSetId: cs2.id,
+        parentCommitId: c1Id,
+    });
+    const cs3 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c3Id = await createCommitWithParent({
+        lix,
+        changeSetId: cs3.id,
+        parentCommitId: c2Id,
+    });
+    // Select commits that are descendants of c1 AND ancestors of c3
+    const results = await lix.db
+        .selectFrom("commit")
+        .where(commitIsDescendantOf({ id: c1Id }))
+        .where(commitIsAncestorOf({ id: c3Id }))
+        .select("id")
+        .execute();
+    expect(results.map((r) => r.id).sort()).toEqual([c2Id].sort());
+});
+test("selects descendants including the current commit when includeSelf is true", async () => {
+    const lix = await openLix({});
+    // Setup: c0 <- c1 <- c2
+    const cs0 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c0Id = uuidV7({ lix });
+    await lix.db
+        .insertInto("commit_all")
+        .values({
+        id: c0Id,
+        change_set_id: cs0.id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    const cs1 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c1Id = uuidV7({ lix });
+    await lix.db
+        .insertInto("commit_all")
+        .values({
+        id: c1Id,
+        change_set_id: cs1.id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    await lix.db
+        .insertInto("commit_edge_all")
+        .values({
+        parent_id: c0Id,
+        child_id: c1Id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    const cs2 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c2Id = uuidV7({ lix });
+    await lix.db
+        .insertInto("commit_all")
+        .values({
+        id: c2Id,
+        change_set_id: cs2.id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    await lix.db
+        .insertInto("commit_edge_all")
+        .values({
+        parent_id: c1Id,
+        child_id: c2Id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    // Should select c0, c1, c2 when includeSelf: true starting from c0
+    const results = await lix.db
+        .selectFrom("commit")
+        .where(commitIsDescendantOf({ id: c0Id }, { includeSelf: true }))
+        .select("id")
+        .execute();
+    expect(results.map((r) => r.id).sort()).toEqual([c0Id, c1Id, c2Id].sort());
+});
+test("respects depth limit when includeSelf is true", async () => {
+    const lix = await openLix({});
+    // Setup: c0 <- c1 <- c2
+    const cs0 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c0Id = uuidV7({ lix });
+    await lix.db
+        .insertInto("commit_all")
+        .values({
+        id: c0Id,
+        change_set_id: cs0.id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    const cs1 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c1Id = uuidV7({ lix });
+    await lix.db
+        .insertInto("commit_all")
+        .values({
+        id: c1Id,
+        change_set_id: cs1.id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    await lix.db
+        .insertInto("commit_edge_all")
+        .values({
+        parent_id: c0Id,
+        child_id: c1Id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    const cs2 = await createChangeSet({
+        lix,
+        lixcol_version_id: "global",
+        elements: [],
+    });
+    const c2Id = uuidV7({ lix });
+    await lix.db
+        .insertInto("commit_all")
+        .values({
+        id: c2Id,
+        change_set_id: cs2.id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    await lix.db
+        .insertInto("commit_edge_all")
+        .values({
+        parent_id: c1Id,
+        child_id: c2Id,
+        lixcol_version_id: "global",
+    })
+        .execute();
+    // With depth: 1 and includeSelf: true starting from c0, we expect c0 and c1
+    const results = await lix.db
+        .selectFrom("commit")
+        .where(commitIsDescendantOf({ id: c0Id }, { depth: 1, includeSelf: true }))
+        .select("id")
+        .execute();
+    expect(results.map((r) => r.id).sort()).toEqual([c0Id, c1Id].sort());
+});
+//# sourceMappingURL=commit-is-descendant-of.test.js.map

package/dist/query-filter/commit-is-descendant-of.test.js.map

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

package/dist/query-filter/index.d.ts

@@ -1,8 +1,6 @@
-export { changeHasLabel } from "./change-has-label.js";
 export { changeSetElementInAncestryOf } from "./change-set-element-in-ancestry-of.js";
-export { changeSetHasLabel } from "./change-set-has-label.js";
-export { changeSetIsAncestorOf } from "./change-set-is-ancestor-of.js";
-export { changeSetIsDescendantOf } from "./change-set-is-descendant-of.js";
 export { changeSetElementIsLeafOf } from "./change-set-element-is-leaf-of.js";
 export { changeSetElementInSymmetricDifference } from "./change-set-element-in-symmetric-difference.js";
+export { commitIsAncestorOf } from "./commit-is-ancestor-of.js";
+export { commitIsDescendantOf } from "./commit-is-descendant-of.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/query-filter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query-filter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query-filter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AACxG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/query-filter/index.js

@@ -1,8 +1,6 @@
-export { changeHasLabel } from "./change-has-label.js";
 export { changeSetElementInAncestryOf } from "./change-set-element-in-ancestry-of.js";
-export { changeSetHasLabel } from "./change-set-has-label.js";
-export { changeSetIsAncestorOf } from "./change-set-is-ancestor-of.js";
-export { changeSetIsDescendantOf } from "./change-set-is-descendant-of.js";
 export { changeSetElementIsLeafOf } from "./change-set-element-is-leaf-of.js";
 export { changeSetElementInSymmetricDifference } from "./change-set-element-in-symmetric-difference.js";
+export { commitIsAncestorOf } from "./commit-is-ancestor-of.js";
+export { commitIsDescendantOf } from "./commit-is-descendant-of.js";
 //# sourceMappingURL=index.js.map

package/dist/query-filter/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query-filter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query-filter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AACxG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/query-filter/version-change-in-difference.d.ts

@@ -3,6 +3,8 @@ import type { Version, LixDatabaseSchema } from "../database/schema.js";
 /**
  * Returns the difference between two versions for the version_change table.
  *
+ * @deprecated Use `changeSetElementInAncestryOf` instead
+ *
  * The difference is the set of changes that exist in version `a` but not in version `b`.
  * Modeled after https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set/difference
  *

package/dist/query-filter/version-change-in-difference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-change-in-difference.d.ts","sourceRoot":"","sources":["../../src/query-filter/version-change-in-difference.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAExE;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CACxC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EACtB,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAGrB,IAAI,iBAAiB,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,KACxD,iBAAiB,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAalE"}
+{"version":3,"file":"version-change-in-difference.d.ts","sourceRoot":"","sources":["../../src/query-filter/version-change-in-difference.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAExE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,yBAAyB,CACxC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EACtB,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAGjB,iBAAiB,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,KACxD,iBAAiB,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAalE"}

package/dist/query-filter/version-change-in-difference.js

@@ -1,6 +1,8 @@
 /**
  * Returns the difference between two versions for the version_change table.
  *
+ * @deprecated Use `changeSetElementInAncestryOf` instead
+ *
  * The difference is the set of changes that exist in version `a` but not in version `b`.
  * Modeled after https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set/difference
  *

package/dist/query-filter/version-change-in-difference.js.map

@@ -1 +1 @@
-{"version":3,"file":"version-change-in-difference.js","sourceRoot":"","sources":["../../src/query-filter/version-change-in-difference.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,yBAAyB,CACxC,CAAsB,EACtB,CAAsB;IAEtB,OAAO,CACN,EAA0D,EACQ,EAAE,CACpE,EAAE,CAAC,0BAA0B,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CACjD,QAAQ;SACN,UAAU,CAAC,qBAAqB,CAAC;SACjC,QAAQ,CAAC,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE,CACzC,IAAI;SACF,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,aAAa,CAAC;SACxC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAC/B;SACA,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;SAChC,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC;SAChC,MAAM,CAAC,aAAa,CAAC,CACvB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"version-change-in-difference.js","sourceRoot":"","sources":["../../src/query-filter/version-change-in-difference.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,yBAAyB,CACxC,CAAsB,EACtB,CAAsB;IAEtB,OAAO,CACN,EAA0D,EACQ,EAAE,CACpE,EAAE,CAAC,0BAA0B,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CACjD,QAAQ;SACN,UAAU,CAAC,qBAAqB,CAAC;SACjC,QAAQ,CAAC,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE,CACzC,IAAI;SACF,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,aAAa,CAAC;SACxC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAC/B;SACA,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;SAChC,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC;SAChC,MAAM,CAAC,aAAa,CAAC,CACvB,CAAC;AACJ,CAAC"}

package/dist/query-filter/version-change-in-symmetric-difference.d.ts

@@ -3,6 +3,8 @@ import type { Version, LixDatabaseSchema } from "../database/schema.js";
 /**
  * Returns the symmetric difference between two versions for the version_change table.
  *
+ * @deprecated Use `changeSetElementInSymmetricDifferenceOf` instead
+ *
  * The symmetric difference is the set of changes
  * that exist in either one version but not both.
  * Modeled after https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set/symmetricDifference

package/dist/query-filter/version-change-in-symmetric-difference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-change-in-symmetric-difference.d.ts","sourceRoot":"","sources":["../../src/query-filter/version-change-in-symmetric-difference.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAExE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kCAAkC,CACjD,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EACtB,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAGrB,IAAI,iBAAiB,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,KACxD,iBAAiB,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,OAAO,CAAC,CA2BlE"}
+{"version":3,"file":"version-change-in-symmetric-difference.d.ts","sourceRoot":"","sources":["../../src/query-filter/version-change-in-symmetric-difference.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAExE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,kCAAkC,CACjD,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EACtB,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAGjB,iBAAiB,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,KACxD,iBAAiB,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,OAAO,CAAC,CA2BlE"}

package/dist/query-filter/version-change-in-symmetric-difference.js

@@ -1,6 +1,8 @@
 /**
  * Returns the symmetric difference between two versions for the version_change table.
  *
+ * @deprecated Use `changeSetElementInSymmetricDifferenceOf` instead
+ *
  * The symmetric difference is the set of changes
  * that exist in either one version but not both.
  * Modeled after https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set/symmetricDifference

package/dist/query-filter/version-change-in-symmetric-difference.js.map

@@ -1 +1 @@
-{"version":3,"file":"version-change-in-symmetric-difference.js","sourceRoot":"","sources":["../../src/query-filter/version-change-in-symmetric-difference.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,kCAAkC,CACjD,CAAsB,EACtB,CAAsB;IAEtB,OAAO,CACN,EAA0D,EACQ,EAAE,CACpE,EAAE,CAAC,EAAE,CAAC;QACL,EAAE,CAAC,0BAA0B,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CACjD,QAAQ;aACN,UAAU,CAAC,qBAAqB,CAAC;aACjC,QAAQ,CAAC,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE,CACzC,IAAI;aACF,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,aAAa,CAAC;aACxC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAC/B;aACA,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;aAChC,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC;aAChC,MAAM,CAAC,aAAa,CAAC,CACvB;QACD,EAAE,CAAC,0BAA0B,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CACjD,QAAQ;aACN,UAAU,CAAC,qBAAqB,CAAC;aACjC,QAAQ,CAAC,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE,CACzC,IAAI;aACF,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,aAAa,CAAC;aACxC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAC/B;aACA,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;aAChC,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC;aAChC,MAAM,CAAC,aAAa,CAAC,CACvB;KACD,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"version-change-in-symmetric-difference.js","sourceRoot":"","sources":["../../src/query-filter/version-change-in-symmetric-difference.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,kCAAkC,CACjD,CAAsB,EACtB,CAAsB;IAEtB,OAAO,CACN,EAA0D,EACQ,EAAE,CACpE,EAAE,CAAC,EAAE,CAAC;QACL,EAAE,CAAC,0BAA0B,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CACjD,QAAQ;aACN,UAAU,CAAC,qBAAqB,CAAC;aACjC,QAAQ,CAAC,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE,CACzC,IAAI;aACF,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,aAAa,CAAC;aACxC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAC/B;aACA,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;aAChC,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC;aAChC,MAAM,CAAC,aAAa,CAAC,CACvB;QACD,EAAE,CAAC,0BAA0B,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CACjD,QAAQ;aACN,UAAU,CAAC,qBAAqB,CAAC;aACjC,QAAQ,CAAC,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE,CACzC,IAAI;aACF,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,aAAa,CAAC;aACxC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAC/B;aACA,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;aAChC,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC;aAChC,MAAM,CAAC,aAAa,CAAC,CACvB;KACD,CAAC,CAAC;AACL,CAAC"}

package/dist/schema-definition/definition.d.ts

@@ -1,4 +1,31 @@
 import type { FromSchema, JSONSchema } from "json-schema-to-ts";
+/**
+ * Foreign key constraint definition
+ */
+export type LixForeignKey = {
+    /**
+     * Local JSON-schema property names that participate in the FK.
+     * Must have at least one property.
+     */
+    properties: readonly string[] | string[];
+    /**
+     * Where they point to.
+     */
+    references: {
+        /**
+         * The x-lix-key of the referenced schema
+         */
+        schemaKey: string;
+        /**
+         * Remote property names (must have same length as local properties)
+         */
+        properties: readonly string[] | string[];
+        /**
+         * Optional version of the referenced schema
+         */
+        schemaVersion?: string;
+    };
+};
 export declare const LixSchemaDefinition: {
     readonly $schema: "http://json-schema.org/draft-07/schema#";
     readonly title: "Lix Change Schema";
@@ -24,25 +51,43 @@ export declare const LixSchemaDefinition: {
                 };
             };
             readonly "x-lix-foreign-keys": {
-                readonly type: "object";
-                readonly additionalProperties: {
+                readonly type: "array";
+                readonly items: {
                     readonly type: "object";
+                    readonly required: readonly ["properties", "references"];
                     readonly properties: {
-                        readonly schemaKey: {
-                            readonly type: "string";
-                            readonly description: "The x-lix-key of the referenced schema";
-                        };
-                        readonly property: {
-                            readonly type: "string";
-                            readonly description: "The property name in the referenced schema";
+                        readonly properties: {
+                            readonly type: "array";
+                            readonly minItems: 1;
+                            readonly items: {
+                                readonly type: "string";
+                            };
+                            readonly description: "Local JSON-schema property names that participate in the FK";
                         };
-                        readonly schemaVersion: {
-                            readonly type: "string";
-                            readonly pattern: "^\\d+\\.\\d+$";
-                            readonly description: "Optional version of the referenced schema";
+                        readonly references: {
+                            readonly type: "object";
+                            readonly required: readonly ["schemaKey", "properties"];
+                            readonly properties: {
+                                readonly schemaKey: {
+                                    readonly type: "string";
+                                    readonly description: "The x-lix-key of the referenced schema";
+                                };
+                                readonly properties: {
+                                    readonly type: "array";
+                                    readonly minItems: 1;
+                                    readonly items: {
+                                        readonly type: "string";
+                                    };
+                                    readonly description: "Remote property names (same length as local properties)";
+                                };
+                                readonly schemaVersion: {
+                                    readonly type: "string";
+                                    readonly pattern: "^\\d+\\.\\d+$";
+                                    readonly description: "Optional version of the referenced schema";
+                                };
+                            };
                         };
                     };
-                    readonly required: readonly ["schemaKey", "property"];
                 };
             };
             readonly "x-lix-key": {
@@ -138,26 +183,24 @@ export type LixSchemaDefinition = JSONSchema & {
      * Foreign key constraints referencing other schemas.
      *
      * @example
-     *   {
-     *     "x-lix-foreign-keys": {
-     *       "author_id": {
+     *   [
+     *     {
+     *       "properties": ["author_id"],
+     *       "references": {
      *         "schemaKey": "user_profile",
-     *         "property": "id"
-     *       },
-     *       "category_id": {
-     *         "schemaKey": "post_category",
-     *         "property": "id"
+     *         "properties": ["id"]
+     *       }
+     *     },
+     *     {
+     *       "properties": ["entity_id", "schema_key", "file_id"],
+     *       "references": {
+     *         "schemaKey": "state",
+     *         "properties": ["entity_id", "schema_key", "file_id"]
      *       }
      *     }
-     *   }
+     *   ]
      */
-    "x-lix-foreign-keys"?: {
-        [localProperty: string]: {
-            schemaKey: string;
-            property: string;
-            schemaVersion?: string;
-        };
-    };
+    "x-lix-foreign-keys"?: LixForeignKey[] | readonly LixForeignKey[];
     type: "object";
     properties?: {
         [key: string]: LixPropertySchema;

package/dist/schema-definition/definition.d.ts.map

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