Skip to content

Commit a310038

Browse files
authored
[Breaking] Change patch event signature to match automerge's patchCallback (#110)
* Change patch event signature to match automerge * Update to latest Automerge * Update deps * Update readme
1 parent 5b9f265 commit a310038

File tree

11 files changed

+26
-43
lines changed

11 files changed

+26
-43
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
"arrowParens": "avoid"
5353
},
5454
"dependencies": {
55-
"@automerge/automerge": "2.1.0-alpha.7"
55+
"@automerge/automerge": "2.1.0-alpha.8"
5656
}
5757
}

packages/automerge-repo-demo-counter-svelte/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"check": "svelte-check --tsconfig ./tsconfig.json"
1010
},
1111
"dependencies": {
12-
"@automerge/automerge": "^2.1.0-alpha.7",
12+
"@automerge/automerge": "^2.1.0-alpha.8",
1313
"@automerge/automerge-repo": "^0.1.2",
1414
"@automerge/automerge-repo-network-broadcastchannel": "^0.1.2",
1515
"@automerge/automerge-repo-network-websocket": "^0.1.2",

packages/automerge-repo-demo-counter/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"@automerge/automerge": "^2.1.0-alpha.7",
11+
"@automerge/automerge": "^2.1.0-alpha.8",
1212
"@automerge/automerge-repo": "^0.1.2",
1313
"@automerge/automerge-repo-network-messagechannel": "^0.1.2",
1414
"@automerge/automerge-repo-network-websocket": "^0.1.2",

packages/automerge-repo-demo-todo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"@automerge/automerge": "^2.1.0-alpha.7",
11+
"@automerge/automerge": "^2.1.0-alpha.8",
1212
"@automerge/automerge-repo": "^0.1.2",
1313
"@automerge/automerge-repo-network-broadcastchannel": "^0.1.2",
1414
"@automerge/automerge-repo-network-websocket": "^0.1.2",

packages/automerge-repo-react-hooks/src/useDocument.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function useDocument<T>(documentId?: DocumentId) {
1414

1515
handle.value().then(v => setDoc(v))
1616

17-
const onPatch = (h: DocHandlePatchPayload<T>) => setDoc(h.after)
17+
const onPatch = (h: DocHandlePatchPayload<T>) => setDoc(h.patchInfo.after)
1818
handle.on("patch", onPatch)
1919
const cleanup = () => {
2020
handle.removeListener("patch", onPatch)

packages/automerge-repo-svelte-store/src/index.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import type { Doc, ChangeFn } from "@automerge/automerge"
22
import { setContext, getContext } from "svelte"
33
import { writable } from "svelte/store"
4-
import { Repo, DocumentId, DocHandlePatchPayload } from "@automerge/automerge-repo"
4+
import {
5+
Repo,
6+
DocumentId,
7+
DocHandlePatchPayload,
8+
} from "@automerge/automerge-repo"
59

610
const ContextRepoKey = Symbol("svelte-context-automerge-repo")
711

@@ -17,7 +21,7 @@ export function document<T>(documentId: DocumentId) {
1721
const repo = getContextRepo()
1822
const handle = repo.find<T>(documentId)
1923
const { set, subscribe } = writable<Doc<T>>(null, () => {
20-
const onPatch = (h: DocHandlePatchPayload<T>) => set(h.after)
24+
const onPatch = (h: DocHandlePatchPayload<T>) => set(h.patchInfo.after)
2125
handle.addListener("patch", onPatch)
2226
return () => handle.removeListener("patch", onPatch)
2327
})

packages/automerge-repo-sync-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test": "mocha --no-warnings --experimental-specifier-resolution=node --exit"
1010
},
1111
"dependencies": {
12-
"@automerge/automerge": "^2.1.0-alpha.7",
12+
"@automerge/automerge": "^2.1.0-alpha.8",
1313
"@automerge/automerge-repo": "^0.1.2",
1414
"@automerge/automerge-repo-network-websocket": "^0.1.2",
1515
"@automerge/automerge-repo-storage-nodefs": "^0.1.2",

packages/automerge-repo/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ A `DocHandle` also emits these events:
8181
- `change({handle: DocHandle, doc: Doc<T>})`
8282
Called any time changes are created or received on the document. Request the `value()` from the
8383
handle.
84-
- `patch({handle: DocHandle, before: Doc, after: Doc, patches: Patch[]})`
84+
- `patch({handle: DocHandle, patches: Patch[], patchInfo: PatchInfo})`
8585
Useful for manual increment maintenance of a video, most notably for text editors.
8686
- `delete`
8787
Called when the document is deleted locally.

packages/automerge-repo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"http-server": "^14.1.0"
3030
},
3131
"peerDependencies": {
32-
"@automerge/automerge": "^2.1.0-alpha.7"
32+
"@automerge/automerge": "^2.1.0-alpha.8"
3333
},
3434
"dependencies": {
3535
"cbor-x": "^1.3.0",

packages/automerge-repo/src/DocHandle.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ export class DocHandle<T> //
3838

3939
// initial doc
4040
const doc = A.init<T>({
41-
patchCallback: (patches, { before, after }) =>
42-
this.emit("patch", { handle: this, patches, before, after }),
41+
patchCallback: (patches, patchInfo) =>
42+
this.emit("patch", { handle: this, patches, patchInfo }),
4343
})
4444

4545
/**
@@ -288,8 +288,7 @@ export interface DocHandleDeletePayload<T> {
288288
export interface DocHandlePatchPayload<T> {
289289
handle: DocHandle<T>
290290
patches: A.Patch[]
291-
before: A.Doc<T>
292-
after: A.Doc<T>
291+
patchInfo: A.PatchInfo<T>
293292
}
294293

295294
export interface DocHandleEvents<T> {

0 commit comments

Comments
 (0)