resolveConflict() api

lix/packages/sdk/package.json

@@ -15,12 +15,14 @@
 	},
 	"dependencies": {
 		"kysely": "^0.27.4",
+		"lodash-es": "^4.17.21",
 		"minimatch": "^10.0.1",
 		"prettier": "^3.3.3",
 		"sqlite-wasm-kysely": "workspace: *",
 		"uuid": "^10.0.0"
 	},
 	"devDependencies": {
+		"@types/lodash-es": "^4.17.12",
 		"@types/papaparse": "^5.3.14",
 		"@types/uuid": "^10.0.0",
 		"@vitest/coverage-v8": "^2.0.5",

lix/packages/sdk/src/index.ts

@@ -5,5 +5,7 @@ export * from "./schema.js";
 export { jsonObjectFrom, jsonArrayFrom } from "kysely/helpers/sqlite";
 export { v4 as uuidv4 } from "uuid";
 export * from "./types.js";
+export * from "./query-utilities/index.js";
+export * from "./resolve-conflict/errors.js";
 export { merge } from "./merge/merge.js";
-export * from "./query-utilities/index.js";
+export { resolveConflict } from "./resolve-conflict/resolve-conflict.js";

lix/packages/sdk/src/newLix.ts

@@ -65,6 +65,7 @@ export async function newLixFile(): Promise<Blob> {
         conflicting_change_id TEXT NOT NULL,
         reason TEXT,
         meta TEXT,
+        resolved_with_change_id TEXT,
         PRIMARY KEY (change_id, conflicting_change_id)
       ) strict;
 

lix/packages/sdk/src/resolve-conflict/errors.ts

@@ -0,0 +1,33 @@
+export class ResolveConflictError extends Error {
+	constructor(message: string) {
+		super(message);
+		this.name = "ResolveConflictError";
+	}
+}
+
+export class ChangeDoesNotBelongToFileError extends ResolveConflictError {
+	constructor() {
+		super(
+			"The to be resolved change does not belong to the same file as the conflicting changes.",
+		);
+		this.name = "ChangeDoesNotBelongToFileError";
+	}
+}
+
+export class ChangeNotDirectChildOfConflictError extends ResolveConflictError {
+	constructor() {
+		super(
+			"The to be resolved change is not a direct child of the conflicting changes. The parent_id of the resolveWithChange must be the id of the conflict or the conflicting change.",
+		);
+		this.name = "ChangeNotDirectChildOfConflictError";
+	}
+}
+
+export class ChangeHasBeenMutatedError extends ResolveConflictError {
+	constructor() {
+		super(
+			"The to be resolved change already exists in the database and is not equal to the provided change. Changes are immutable. If you want to resolve a conflict by updating a change, create a new change.",
+		);
+		this.name = "ChangeHasBeenMutatedError";
+	}
+}