add naïve support for conflicts and increments

Author: chee

package.json

@@ -49,7 +49,7 @@
 	},
 	"dependencies": {
 		"@solid-primitives/utils": "^6.3.0",
-		"cabbages": "^0.1.0"
+		"cabbages": "^0.2.2"
 	},
 	"repository": {
 		"type": "git",

pnpm-lock.yaml

@@ -1,4 +1,4 @@
-import type {Patch} from "@automerge/automerge-repo/slim"
+import type {DocHandleChangePayload} from "@automerge/automerge-repo/slim"
 import {apply, fromAutomerge} from "cabbages"
 
 /**
@@ -10,11 +10,10 @@ import {apply, fromAutomerge} from "cabbages"
  * [Solid
  * Stores](https://docs.solidjs.com/reference/store-utilities/create-store)
  */
-export default function autoproduce<T>(patches: Patch[]) {
+export default function autoproduce<T>(payload: DocHandleChangePayload<T>) {
 	return (doc: T) => {
-		for (let patch of patches) {
-			const [path, range, val] = fromAutomerge(patch)
-			apply(path, doc, range, val)
+		for (let patch of payload.patches) {
+			apply(doc, ...fromAutomerge(patch, payload))
 		}
 	}
 }

src/autoproduce.ts

@@ -44,7 +44,7 @@ export default function makeDocumentProjection<T>(handle: DocHandle<T>) {
 	})
 
 	function patch(payload: DocHandleChangePayload<T>) {
-		set(produce(autoproduce(payload.patches)))
+		set(produce(autoproduce(payload)))
 	}
 
 	function ondelete() {

src/makeDocumentProjection.ts

@@ -141,6 +141,25 @@ describe("makeDocumentProjection", () => {
 		})
 	})
 
+	it.only("should be handle conflict well", async () => {
+		const {repo} = setup()
+		const handle1 = repo.create({a: true})
+		const promise = new Promise<void>(resolve => {
+			handle1.on("change", payload => {
+				console.log(payload.patches.map(p => p.action))
+				expect(payload.patches[0].action).toBe("conflict")
+				resolve()
+			})
+			const handle2 = repo.create({
+				a: {b: {c: {d: {e: {f: [1, 2, 3, {g: 4}]}}}}},
+			})
+			handle1.merge(handle2)
+		})
+
+		// expect(handle1.doc().a).toEqual(true)
+		return promise
+	})
+
 	it("should not clean up when it should not clean up", async () => {
 		const {handle} = setup()