Merge pull request #3197 from opral/lixdk-206-plugindetectconflicts-s…

…hould-return-detectedconflict

Lixdk-206-plugindetectconflicts-should-return-detectedconflict

packages/lix-plugin-csv/src/detectConflicts.ts

@@ -2,14 +2,14 @@ import {
 	getLowestCommonAncestor,
 	getLeafChange,
 	type LixPlugin,
-	type Conflict,
 	getLeafChangesOnlyInSource,
+	type DetectedConflict,
 } from "@lix-js/sdk";
 
 export const detectConflicts: NonNullable<
 	LixPlugin["detectConflicts"]
 > = async ({ sourceLix, targetLix }) => {
-	const result: Conflict[] = [];
+	const result: DetectedConflict[] = [];
 
 	const leafChangesOnlyInSource = await getLeafChangesOnlyInSource({
 		sourceLix,
@@ -67,8 +67,6 @@ export const detectConflicts: NonNullable<
 			conflicting_change_id: change.id,
 			reason:
 				"The snapshots of the change do not match. More sophisticated reasoning will be added later.",
-			metadata: null,
-			resolved_change_id: null,
 		});
 	}
 

packages/lix-sdk/src/plugin.ts

@@ -1,9 +1,4 @@
-import type {
-	Change,
-	LixFile,
-	NewConflict,
-	Snapshot,
-} from "./database/schema.js";
+import type { Change, LixFile, Snapshot } from "./database/schema.js";
 import type { LixReadonly } from "./types.js";
 
 // named lixplugin to avoid conflict with built-in plugin type
@@ -41,7 +36,7 @@ export type LixPlugin = {
 	detectConflicts?: (args: {
 		sourceLix: LixReadonly;
 		targetLix: LixReadonly;
-	}) => Promise<NewConflict[]>;
+	}) => Promise<DetectedConflict[]>;
 	applyChanges?: (args: {
 		lix: LixReadonly;
 		file: LixFile;
@@ -71,3 +66,9 @@ export type DetectedChange = {
 	 */
 	snapshot?: Snapshot["content"];
 };
+
+export type DetectedConflict = {
+	change_id: string;
+	conflicting_change_id: string;
+	reason?: string;
+};