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

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

@@ -1 +1 @@
-{"version":3,"file":"merge-version.d.ts","sourceRoot":"","sources":["../../src/version/merge-version.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,uBAAuB,CAAC;AACpE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAG9C,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACxC,GAAG,EAAE,GAAG,CAAC;IACT,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4EhB"}
+{"version":3,"file":"merge-version.d.ts","sourceRoot":"","sources":["../../src/version/merge-version.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,uBAAuB,CAAC;AACpE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAG9C;;GAEG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACxC,GAAG,EAAE,GAAG,CAAC;IACT,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4EhB"}

package/dist/version/merge-version.js

@@ -2,6 +2,9 @@ import { createChangeConflict } from "../change-conflict/create-change-conflict.
 import { detectChangeConflicts } from "../change-conflict/detect-change-conflicts.js";
 import { applyChanges } from "../change/apply-changes.js";
 import { versionChangeInSymmetricDifference } from "../query-filter/version-change-in-symmetric-difference.js";
+/**
+ * @deprecated Use `createMergeChangeSet()` instead.
+ */
 export async function mergeVersion(args) {
     const executeInTransaction = async (trx) => {
         const symmetricDifference = await trx

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

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

package/dist/version/merge-version.test.js

@@ -4,7 +4,9 @@ import { mergeVersion } from "./merge-version.js";
 import { updateChangesInVersion } from "./update-changes-in-version.js";
 import { createVersion } from "./create-version.js";
 import { switchVersion } from "./switch-version.js";
-test("it should update the version pointers in target that are not conflicting", async () => {
+// commented out for lix v0.5
+// version_v1 is deprecated
+test.skip("it should update the version pointers in target that are not conflicting", async () => {
     const lix = await openLixInMemory({});
     const sourceVersion = await createVersion({ lix });
     const targetVersion = await createVersion({ lix });
@@ -31,7 +33,8 @@ test("it should update the version pointers in target that are not conflicting",
     expect(sourceChanges.map((vc) => vc.change_id)).toEqual(targetChanges.map((vc) => vc.change_id));
 });
 // edge case scenario
-test("if a previously undetected conflict is detected during merge, the conflict should be inserted and the target version change pointers updated (if the target version does not point to the entity yet) ", async () => {
+// commented out for lix v0.5
+test.skip("if a previously undetected conflict is detected during merge, the conflict should be inserted and the target version change pointers updated (if the target version does not point to the entity yet) ", async () => {
     const lix = await openLixInMemory({});
     const sourceVersion = await createVersion({ lix, name: "source-version" });
     const targetVersion = await createVersion({ lix, name: "target-version" });
@@ -127,7 +130,7 @@ test("if a previously undetected conflict is detected during merge, the conflict
         change3?.id,
     ]);
 });
-test("it should not update the target version pointers of a conflicting change", async () => {
+test.skip("it should not update the target version pointers of a conflicting change", async () => {
     const lix = await openLixInMemory({});
     const sourceVersion = await createVersion({ lix, name: "source-version" });
     const targetVersion = await createVersion({ lix, name: "target-version" });
@@ -227,7 +230,7 @@ test("it should not update the target version pointers of a conflicting change",
 });
 // it is reasonable to assume that a conflict exists if the same (entity, file, type) change is updated in both versiones.
 // in case a plugin does not detect a conflict, the system should automatically detect it.
-test("it should automatically detect a diverging entity conflict", async () => {
+test.skip("it should automatically detect a diverging entity conflict", async () => {
     const lix = await openLixInMemory({});
     const sourceVersion = await createVersion({ lix, name: "source-version" });
     const targetVersion = await createVersion({ lix, name: "target-version" });
@@ -413,7 +416,9 @@ test("re-curring merges should not create a new conflict if the conflict already
         .execute();
     expect(conflictsAfter2Merge.length).toBe(1);
 });
-test("it should apply the changes from the source version to the target version", async () => {
+// commented out for lix v0.5
+// version_v1 is deprecated
+test.skip("it should apply the changes from the source version to the target version", async () => {
     const lix = await openLixInMemory({});
     const sourceVersion = await createVersion({ lix });
     const targetVersion = await createVersion({ lix });

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

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

package/dist/version/schema.d.ts

@@ -1,25 +1,30 @@
-import type { SqliteWasmDatabase } from "sqlite-wasm-kysely";
 import type { FromLixSchemaDefinition } from "../schema-definition/definition.js";
-export declare function applyVersionDatabaseSchema(sqlite: SqliteWasmDatabase): void;
+import type { Lix } from "../lix/open-lix.js";
+export declare function applyVersionDatabaseSchema(lix: Pick<Lix, "sqlite" | "db">): void;
 export declare const LixVersionSchema: {
     readonly "x-lix-key": "lix_version";
     readonly "x-lix-version": "1.0";
     readonly "x-lix-primary-key": readonly ["id"];
-    readonly "x-lix-unique": readonly [readonly ["working_change_set_id"]];
-    readonly "x-lix-foreign-keys": {
-        readonly change_set_id: {
-            readonly schemaKey: "lix_change_set";
-            readonly property: "id";
+    readonly "x-lix-unique": readonly [readonly ["working_commit_id"]];
+    readonly "x-lix-foreign-keys": readonly [{
+        readonly properties: readonly ["commit_id"];
+        readonly references: {
+            readonly schemaKey: "lix_commit";
+            readonly properties: readonly ["id"];
         };
-        readonly working_change_set_id: {
-            readonly schemaKey: "lix_change_set";
-            readonly property: "id";
+    }, {
+        readonly properties: readonly ["working_commit_id"];
+        readonly references: {
+            readonly schemaKey: "lix_commit";
+            readonly properties: readonly ["id"];
         };
-        readonly inherits_from_version_id: {
+    }, {
+        readonly properties: readonly ["inherits_from_version_id"];
+        readonly references: {
             readonly schemaKey: "lix_version";
-            readonly property: "id";
+            readonly properties: readonly ["id"];
         };
-    };
+    }];
     readonly type: "object";
     readonly properties: {
         readonly id: {
@@ -30,35 +35,35 @@ export declare const LixVersionSchema: {
             readonly type: "string";
             readonly "x-lix-generated": true;
         };
-        readonly change_set_id: {
+        readonly commit_id: {
             readonly type: "string";
         };
-        readonly working_change_set_id: {
+        readonly working_commit_id: {
             readonly type: "string";
             readonly "x-lix-generated": true;
         };
         readonly inherits_from_version_id: {
             readonly type: readonly ["string", "null"];
-            readonly "x-lix-generated": true;
         };
         readonly hidden: {
             readonly type: "boolean";
             readonly "x-lix-generated": true;
         };
     };
-    readonly required: readonly ["id", "name", "change_set_id", "working_change_set_id"];
+    readonly required: readonly ["id", "name", "commit_id", "working_commit_id"];
     readonly additionalProperties: false;
 };
 export declare const LixActiveVersionSchema: {
     readonly "x-lix-key": "lix_active_version";
     readonly "x-lix-version": "1.0";
     readonly "x-lix-primary-key": readonly ["version_id"];
-    readonly "x-lix-foreign-keys": {
-        readonly version_id: {
+    readonly "x-lix-foreign-keys": readonly [{
+        readonly properties: readonly ["version_id"];
+        readonly references: {
             readonly schemaKey: "lix_version";
-            readonly property: "id";
+            readonly properties: readonly ["id"];
         };
-    };
+    }];
     readonly type: "object";
     readonly properties: {
         readonly version_id: {
@@ -68,6 +73,6 @@ export declare const LixActiveVersionSchema: {
     readonly required: readonly ["version_id"];
     readonly additionalProperties: false;
 };
-export type Version = FromLixSchemaDefinition<typeof LixVersionSchema>;
-export type ActiveVersion = FromLixSchemaDefinition<typeof LixActiveVersionSchema>;
+export type LixVersion = FromLixSchemaDefinition<typeof LixVersionSchema>;
+export type LixActiveVersion = FromLixSchemaDefinition<typeof LixActiveVersionSchema>;
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/version/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAEX,uBAAuB,EACvB,MAAM,oCAAoC,CAAC;AAK5C,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CA8E3E;AAED,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiCnB,CAAC;AAGX,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;CAgBzB,CAAC;AAIX,MAAM,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,gBAAgB,CAAC,CAAC;AACvE,MAAM,MAAM,aAAa,GAAG,uBAAuB,CAClD,OAAO,sBAAsB,CAC7B,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/version/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEX,uBAAuB,EACvB,MAAM,oCAAoC,CAAC;AAG5C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C,wBAAgB,0BAA0B,CACzC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC,GAC7B,IAAI,CAgFN;AAED,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyCnB,CAAC;AAGX,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;CAmBzB,CAAC;AAIX,MAAM,MAAM,UAAU,GAAG,uBAAuB,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC1E,MAAM,MAAM,gBAAgB,GAAG,uBAAuB,CACrD,OAAO,sBAAsB,CAC7B,CAAC"}

package/dist/version/schema.js

@@ -1,25 +1,26 @@
 import { createEntityViewsIfNotExists } from "../entity-views/entity-view-builder.js";
-import { nanoid } from "../database/nano-id.js";
-import { humanId } from "human-id";
-export function applyVersionDatabaseSchema(sqlite) {
+import { nanoId, generateHumanId } from "../deterministic/index.js";
+export function applyVersionDatabaseSchema(lix) {
     // Create both primary and _all views for version with global version constraint
     createEntityViewsIfNotExists({
-        lix: { sqlite },
+        lix,
         schema: LixVersionSchema,
         overrideName: "version",
         pluginKey: "lix_own_entity",
         hardcodedFileId: "lix",
         hardcodedVersionId: "global",
         defaultValues: {
-            id: () => nanoid(),
-            name: () => humanId(),
-            working_change_set_id: () => nanoid(),
-            inherits_from_version_id: () => "global",
+            id: () => nanoId({ lix }),
+            name: () => generateHumanId({ lix }),
+            working_commit_id: () => nanoId({ lix }),
+            // Note: inherits_from_version_id default is handled in createVersion
+            // to allow explicit null values
+            // inherits_from_version_id: () => "global",
             hidden: () => false,
         },
     });
     // Create active_version as an entity view manually with untracked state
-    sqlite.exec(`
+    lix.sqlite.exec(`
 		CREATE VIEW IF NOT EXISTS active_version AS
 		SELECT
 			json_extract(snapshot_content, '$.version_id') AS version_id,
@@ -83,34 +84,42 @@ export const LixVersionSchema = {
     "x-lix-key": "lix_version",
     "x-lix-version": "1.0",
     "x-lix-primary-key": ["id"],
-    "x-lix-unique": [["working_change_set_id"]],
-    "x-lix-foreign-keys": {
-        change_set_id: {
-            schemaKey: "lix_change_set",
-            property: "id",
+    "x-lix-unique": [["working_commit_id"]],
+    "x-lix-foreign-keys": [
+        {
+            properties: ["commit_id"],
+            references: {
+                schemaKey: "lix_commit",
+                properties: ["id"],
+            },
         },
-        working_change_set_id: {
-            schemaKey: "lix_change_set",
-            property: "id",
+        {
+            properties: ["working_commit_id"],
+            references: {
+                schemaKey: "lix_commit",
+                properties: ["id"],
+            },
         },
-        inherits_from_version_id: {
-            schemaKey: "lix_version",
-            property: "id",
+        {
+            properties: ["inherits_from_version_id"],
+            references: {
+                schemaKey: "lix_version",
+                properties: ["id"],
+            },
         },
-    },
+    ],
     type: "object",
     properties: {
         id: { type: "string", "x-lix-generated": true },
         name: { type: "string", "x-lix-generated": true },
-        change_set_id: { type: "string" },
-        working_change_set_id: { type: "string", "x-lix-generated": true },
+        commit_id: { type: "string" },
+        working_commit_id: { type: "string", "x-lix-generated": true },
         inherits_from_version_id: {
             type: ["string", "null"],
-            "x-lix-generated": true,
         },
         hidden: { type: "boolean", "x-lix-generated": true },
     },
-    required: ["id", "name", "change_set_id", "working_change_set_id"],
+    required: ["id", "name", "commit_id", "working_commit_id"],
     additionalProperties: false,
 };
 LixVersionSchema;
@@ -118,12 +127,15 @@ export const LixActiveVersionSchema = {
     "x-lix-key": "lix_active_version",
     "x-lix-version": "1.0",
     "x-lix-primary-key": ["version_id"],
-    "x-lix-foreign-keys": {
-        version_id: {
-            schemaKey: "lix_version",
-            property: "id",
+    "x-lix-foreign-keys": [
+        {
+            properties: ["version_id"],
+            references: {
+                schemaKey: "lix_version",
+                properties: ["id"],
+            },
         },
-    },
+    ],
     type: "object",
     properties: {
         version_id: { type: "string" },

package/dist/version/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/version/schema.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,MAAM,UAAU,0BAA0B,CAAC,MAA0B;IACpE,gFAAgF;IAChF,4BAA4B,CAAC;QAC5B,GAAG,EAAE,EAAE,MAAM,EAAE;QACf,MAAM,EAAE,gBAAgB;QACxB,YAAY,EAAE,SAAS;QACvB,SAAS,EAAE,gBAAgB;QAC3B,eAAe,EAAE,KAAK;QACtB,kBAAkB,EAAE,QAAQ;QAC5B,aAAa,EAAE;YACd,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE;YAClB,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE;YACrB,qBAAqB,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE;YACrC,wBAAwB,EAAE,GAAG,EAAE,CAAC,QAAQ;YACxC,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK;SACnB;KACD,CAAC,CAAC;IAEH,wEAAwE;IACxE,MAAM,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0DX,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC/B,WAAW,EAAE,aAAa;IAC1B,eAAe,EAAE,KAAK;IACtB,mBAAmB,EAAE,CAAC,IAAI,CAAC;IAC3B,cAAc,EAAE,CAAC,CAAC,uBAAuB,CAAC,CAAC;IAC3C,oBAAoB,EAAE;QACrB,aAAa,EAAE;YACd,SAAS,EAAE,gBAAgB;YAC3B,QAAQ,EAAE,IAAI;SACd;QACD,qBAAqB,EAAE;YACtB,SAAS,EAAE,gBAAgB;YAC3B,QAAQ,EAAE,IAAI;SACd;QACD,wBAAwB,EAAE;YACzB,SAAS,EAAE,aAAa;YACxB,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,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE;QACjD,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACjC,qBAAqB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE;QAClE,wBAAwB,EAAE;YACzB,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;YACxB,iBAAiB,EAAE,IAAI;SACvB;QACD,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE;KACpD;IACD,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,uBAAuB,CAAC;IAClE,oBAAoB,EAAE,KAAK;CAClB,CAAC;AACX,gBAA8C,CAAC;AAE/C,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACrC,WAAW,EAAE,oBAAoB;IACjC,eAAe,EAAE,KAAK;IACtB,mBAAmB,EAAE,CAAC,YAAY,CAAC;IACnC,oBAAoB,EAAE;QACrB,UAAU,EAAE;YACX,SAAS,EAAE,aAAa;YACxB,QAAQ,EAAE,IAAI;SACd;KACD;IACD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACX,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC9B;IACD,QAAQ,EAAE,CAAC,YAAY,CAAC;IACxB,oBAAoB,EAAE,KAAK;CAClB,CAAC;AACX,sBAAoD,CAAC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/version/schema.ts"],"names":[],"mappings":"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"}