@automerge/automerge-repo 0.1.1-alpha.0 → 0.1.3-alpha.0

package/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2019-2023, Ink & Switch LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -9,31 +9,28 @@ deciding which peers to connect to or when to write data out to storage.
 
 Other packages in this monorepo include:
 
-- [@automerge/automerge-repo-demo-counter](/packages/@automerge/automerge-repo-demo-counter/): A React-based demonstration
+- [@automerge/automerge-repo-demo-counter](/packages/automerge-repo-demo-counter/): A React-based demonstration
   application.
-- [@automerge/automerge-repo-react-hooks](/packages/@automerge/automerge-repo-react-hooks/): Example hooks for use with
+- [@automerge/automerge-repo-react-hooks](/packages/automerge-repo-react-hooks/): Example hooks for use with
   React.
-- [@automerge/automerge-repo-sync-server](/packages/@automerge/automerge-repo-sync-server/): A small synchronization
+- [@automerge/automerge-repo-sync-server](/packages/automerge-repo-sync-server/): A small synchronization
   server that facilitates asynchronous communication between peers
 
 #### Storage adapters
 
-- [automerge-repo-storage-localforage](/packages/automerge-repo-storage-localforage/): A storage
+- [@automerge/automerge-repo-storage-localforage](/packages/automerge-repo-storage-localforage/): A storage
   adapter to persist data in a browser
-- [automerge-repo-storage-nodefs](/packages/automerge-repo-storage-nodefs/): A storage adapter to
+- [@automerge/automerge-repo-storage-nodefs](/packages/automerge-repo-storage-nodefs/): A storage adapter to
   write changes to the filesystem
 
 #### Network adapters
 
-- [automerge-repo-network-websocket](/packages/automerge-repo-network-websocket/): Network adapters
+- [@automerge/automerge-repo-network-websocket](/packages/automerge-repo-network-websocket/): Network adapters
   for both sides of a client/server configuration over websocket
-- [automerge-repo-network-localfirstrelay](/packages/automerge-repo-network-localfirstrelay/): A
-  network client that uses [@localfirst/relay](https://github.com/local-first-web/relay) to relay
-  traffic between peers
-- [automerge-repo-network-messagechannel](/packages/automerge-repo-network-messagechannel/): A
+- [@automerge/automerge-repo-network-messagechannel](/packages/automerge-repo-network-messagechannel/): A
   network adapter that uses the [MessageChannel
   API](https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel) to communicate between tabs
-- [automerge-repo-network-broadcastchannel](/packages/automerge-repo-network-broadcastchannel/):
+- [@automerge/automerge-repo-network-broadcastchannel](/packages/automerge-repo-network-broadcastchannel/):
   Likely only useful for experimentation, but allows simple (inefficient) tab-to-tab data
   synchronization
 
@@ -84,7 +81,7 @@ A `DocHandle` also emits these events:
 - `change({handle: DocHandle, doc: Doc<T>})`  
   Called any time changes are created or received on the document. Request the `value()` from the
   handle.
-- `patch({handle: DocHandle, before: Doc, after: Doc, patches: Patch[]})`  
+- `patch({handle: DocHandle, patches: Patch[], patchInfo: PatchInfo})` 
   Useful for manual increment maintenance of a video, most notably for text editors.
 - `delete`  
   Called when the document is deleted locally.
@@ -139,7 +136,7 @@ yarn create vite
 
 cd hello-automerge-repo
 yarn
-yarn add @automerge/automerge automerge-repo automerge-repo-react-hooks automerge-repo-network-broadcastchannel automerge-repo-storage-localforage vite-plugin-wasm vite-plugin-top-level-await
+yarn add @automerge/automerge @automerge/automerge-repo-react-hooks @automerge/automerge-repo-network-broadcastchannel @automerge/automerge-repo-storage-localforage vite-plugin-wasm vite-plugin-top-level-await
 ```
 
 Edit the `vite.config.ts`. (This is all need to work around packaging hiccups due to WASM. We look

package/dist/DocHandle.d.ts

@@ -47,8 +47,7 @@ export interface DocHandleDeletePayload<T> {
 export interface DocHandlePatchPayload<T> {
     handle: DocHandle<T>;
     patches: A.Patch[];
-    before: A.Doc<T>;
-    after: A.Doc<T>;
+    patchInfo: A.PatchInfo<T>;
 }
 export interface DocHandleEvents<T> {
     change: (payload: DocHandleChangePayload<T>) => void;

package/dist/DocHandle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DocHandle.d.ts","sourceRoot":"","sources":["../src/DocHandle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,sBAAsB,CAAA;AAEzC,OAAO,YAAY,MAAM,eAAe,CAAA;AAgBxC,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAG/D,iGAAiG;AACjG,qBAAa,SAAS,CAAC,CAAC,CAAE,EAAE;AAC1B,SAAQ,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;;IAQ/B,UAAU,EAAE,UAAU;gBAAtB,UAAU,EAAE,UAAU,EAC7B,EAAE,KAAa,EAAE,YAAqB,EAAE,GAAE,gBAAqB;IAkHjE,IAAI,GAAG,sBAQN;IAwBD,OAAO,gBAA8B;IACrC,mBAAmB,gBACkC;IACrD,SAAS,gBAAgC;IAEzC;;OAEG;IACG,KAAK,CAAC,WAAW,GAAE,WAAW,EAAY;IAc1C,kBAAkB;IAIxB,yEAAyE;IACzE,IAAI,CAAC,MAAM,EAAE,UAAU;IAMvB,8EAA8E;IAC9E,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAI5C,2EAA2E;IAC3E,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,GAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAM;IAehE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,GAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAM;IAelF,gFAAgF;IAChF,OAAO;IAIP,kEAAkE;IAClE,MAAM;CAGP;AAID,UAAU,gBAAgB;IACxB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,IAAI,EAAE,UAAU,CAAA;CACjB;AAED,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACvC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;IACpB,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;CACd;AAED,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACvC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;CACrB;AAED,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;IACpB,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;IAClB,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IAChB,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;CAChB;AAED,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;IACpD,KAAK,EAAE,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;IAClD,MAAM,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;CACrD;AAMD,eAAO,MAAM,WAAW;;;;;;;CAOd,CAAA;AACV,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAA;AAkBxE,eAAO,MAAM,KAAK;;;;;;;;;CASR,CAAA"}
+{"version":3,"file":"DocHandle.d.ts","sourceRoot":"","sources":["../src/DocHandle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,sBAAsB,CAAA;AAEzC,OAAO,YAAY,MAAM,eAAe,CAAA;AAiBxC,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE/D,iGAAiG;AACjG,qBAAa,SAAS,CAAC,CAAC,CAAE,EAAE;AAC1B,SAAQ,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;;IAQ/B,UAAU,EAAE,UAAU;gBAAtB,UAAU,EAAE,UAAU,EAC7B,EAAE,KAAa,EAAE,YAAqB,EAAE,GAAE,gBAAqB;IAqHjE,IAAI,GAAG,sBAQN;IAwBD,OAAO,gBAA8B;IACrC,mBAAmB,gBACkC;IACrD,SAAS,gBAAgC;IAEzC;;OAEG;IACG,KAAK,CAAC,WAAW,GAAE,WAAW,EAAY;IAc1C,kBAAkB;IAIxB,yEAAyE;IACzE,IAAI,CAAC,MAAM,EAAE,UAAU;IAMvB,8EAA8E;IAC9E,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAI5C,2EAA2E;IAC3E,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,GAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAM;IAehE,QAAQ,CACN,KAAK,EAAE,CAAC,CAAC,KAAK,EACd,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EACvB,OAAO,GAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAM;IAgBlC,gFAAgF;IAChF,OAAO;IAIP,kEAAkE;IAClE,MAAM;CAGP;AAID,UAAU,gBAAgB;IACxB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,IAAI,EAAE,UAAU,CAAA;CACjB;AAED,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACvC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;IACpB,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;CACd;AAED,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACvC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;CACrB;AAED,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;IACpB,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;IAClB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;CAC1B;AAED,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;IACpD,KAAK,EAAE,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;IAClD,MAAM,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;CACrD;AAMD,eAAO,MAAM,WAAW;;;;;;;CAOd,CAAA;AACV,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAA;AAkBxE,eAAO,MAAM,KAAK;;;;;;;;;CASR,CAAA"}

package/dist/DocHandle.js

@@ -5,7 +5,7 @@ import { assign, createMachine, interpret, } from "xstate";
 import { waitFor } from "xstate/lib/waitFor.js";
 import { headsAreSame } from "./helpers/headsAreSame.js";
 import { pause } from "./helpers/pause.js";
-import { withTimeout, TimeoutError } from "./helpers/withTimeout.js";
+import { TimeoutError, withTimeout } from "./helpers/withTimeout.js";
 /** DocHandle is a wrapper around a single Automerge document that lets us listen for changes. */
 export class DocHandle//
  extends EventEmitter {
@@ -20,7 +20,7 @@ export class DocHandle//
         this.#log = debug(`automerge-repo:dochandle:${documentId.slice(0, 5)}`);
         // initial doc
         const doc = A.init({
-            patchCallback: (patches, { before, after }) => this.emit("patch", { handle: this, patches, before, after }),
+            patchCallback: (patches, patchInfo) => this.emit("patch", { handle: this, patches, patchInfo }),
         });
         /**
          * Internally we use a state machine to orchestrate document loading and/or syncing, in order to
@@ -91,13 +91,6 @@ export class DocHandle//
                     const { doc: oldDoc } = context;
                     const { callback } = payload;
                     const newDoc = callback(oldDoc);
-                    const docChanged = !headsAreSame(newDoc, oldDoc);
-                    if (docChanged) {
-                        this.emit("change", { handle: this, doc: newDoc });
-                        if (!this.isReady()) {
-                            this.#machine.send(REQUEST_COMPLETE);
-                        }
-                    }
                     return { doc: newDoc };
                 }),
                 onDelete: assign(() => {
@@ -106,7 +99,18 @@ export class DocHandle//
                 }),
             },
         }))
-            .onTransition(({ value: state }, { type: event }) => this.#log(`${event} → ${state}`, this.#doc))
+            .onTransition(({ value: state, history, context }, event) => {
+            const oldDoc = history?.context?.doc;
+            const newDoc = context.doc;
+            const docChanged = newDoc && oldDoc && !headsAreSame(newDoc, oldDoc);
+            if (docChanged) {
+                this.emit("change", { handle: this, doc: newDoc });
+                if (!this.isReady()) {
+                    this.#machine.send(REQUEST_COMPLETE);
+                }
+            }
+            this.#log(`${event} → ${state}`, this.#doc);
+        })
             .start();
         this.#machine.send(isNew ? CREATE : FIND);
     }

package/dist/{test-utilities/adapter-tests.d.ts → helpers/tests/network-adapter-tests.d.ts}

@@ -1,4 +1,4 @@
-import { type NetworkAdapter } from "../index.js";
+import { type NetworkAdapter } from "../../index.js";
 /**
  * Runs a series of tests against a set of three peers, each represented by one or more instantiated
  * network adapters.
@@ -18,4 +18,4 @@ export type SetupFn = () => Promise<{
     teardown?: () => void;
 }>;
 export {};
-//# sourceMappingURL=adapter-tests.d.ts.map
+//# sourceMappingURL=network-adapter-tests.d.ts.map

package/dist/helpers/tests/network-adapter-tests.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"network-adapter-tests.d.ts","sourceRoot":"","sources":["../../../src/helpers/tests/network-adapter-tests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,cAAc,EAAa,MAAM,gBAAgB,CAAA;AAK7E;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CA2HrE;AAID,KAAK,OAAO,GAAG,cAAc,GAAG,cAAc,EAAE,CAAA;AAEhD,MAAM,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;IAClC,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACtB,CAAC,CAAA"}

package/dist/{test-utilities/adapter-tests.js → helpers/tests/network-adapter-tests.js}

@@ -1,5 +1,5 @@
-import { Repo } from "../index.js";
-import { eventPromise, eventPromises, } from "../helpers/eventPromise.js";
+import { Repo } from "../../index.js";
+import { eventPromise, eventPromises } from "../eventPromise.js";
 import { assert } from "chai";
 import { describe, it } from "mocha";
 /**

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { DocCollection } from "./DocCollection.js";
 export { DocHandle, HandleState } from "./DocHandle.js";
-export type { DocHandleChangePayload, DocHandleMessagePayload, DocHandlePatchPayload, } from "./DocHandle.js";
+export type { DocHandleChangePayload, DocHandlePatchPayload, } from "./DocHandle.js";
 export { NetworkAdapter } from "./network/NetworkAdapter.js";
 export type { InboundMessagePayload, MessagePayload, OpenPayload, PeerCandidatePayload, PeerDisconnectedPayload, } from "./network/NetworkAdapter.js";
 export { NetworkSubsystem } from "./network/NetworkSubsystem.js";
@@ -9,5 +9,4 @@ export { StorageAdapter } from "./storage/StorageAdapter.js";
 export { StorageSubsystem } from "./storage/StorageSubsystem.js";
 export { CollectionSynchronizer } from "./synchronizer/CollectionSynchronizer.js";
 export * from "./types.js";
-export * from "./test-utilities/adapter-tests.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACvD,YAAY,EACV,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,YAAY,EACV,qBAAqB,EACrB,cAAc,EACd,WAAW,EACX,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,IAAI,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAA;AACjF,cAAc,YAAY,CAAA;AAC1B,cAAc,mCAAmC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACvD,YAAY,EACV,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,YAAY,EACV,qBAAqB,EACrB,cAAc,EACd,WAAW,EACX,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,IAAI,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAA;AACjF,cAAc,YAAY,CAAA"}

package/dist/index.js

@@ -7,4 +7,3 @@ export { StorageAdapter } from "./storage/StorageAdapter.js";
 export { StorageSubsystem } from "./storage/StorageSubsystem.js";
 export { CollectionSynchronizer } from "./synchronizer/CollectionSynchronizer.js";
 export * from "./types.js";
-export * from "./test-utilities/adapter-tests.js";

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@automerge/automerge-repo",
-  "version": "0.1.1-alpha.0",
+  "version": "0.1.3-alpha.0",
   "description": "A repository object to manage a collection of automerge documents",
-  "repository": "https://github.com/pvh/automerge-repo",
+  "repository": "https://github.com/automerge/automerge-repo",
   "author": "Peter van Hardenberg <pvh@pvh.ca>",
   "license": "MIT",
   "private": false,
@@ -29,7 +29,7 @@
     "http-server": "^14.1.0"
   },
   "peerDependencies": {
-    "@automerge/automerge": "^2.1.0-alpha.7"
+    "@automerge/automerge": "^2.1.0-alpha.8"
   },
   "dependencies": {
     "cbor-x": "^1.3.0",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b48a3db6a87942398290bcb69a216680fd2f31ae"
+  "gitHead": "5b1959b8a7c1834e5dbbddbce9681f6208024377"
 }

package/src/DocHandle.ts

@@ -16,8 +16,8 @@ import {
 import { waitFor } from "xstate/lib/waitFor.js"
 import { headsAreSame } from "./helpers/headsAreSame.js"
 import { pause } from "./helpers/pause.js"
+import { TimeoutError, withTimeout } from "./helpers/withTimeout.js"
 import type { ChannelId, DocumentId, PeerId } from "./types.js"
-import { withTimeout, TimeoutError } from "./helpers/withTimeout.js"
 
 /** DocHandle is a wrapper around a single Automerge document that lets us listen for changes. */
 export class DocHandle<T> //
@@ -38,8 +38,8 @@ export class DocHandle<T> //
 
     // initial doc
     const doc = A.init<T>({
-      patchCallback: (patches, { before, after }) =>
-        this.emit("patch", { handle: this, patches, before, after }),
+      patchCallback: (patches, patchInfo) =>
+        this.emit("patch", { handle: this, patches, patchInfo }),
     })
 
     /**
@@ -119,13 +119,6 @@ export class DocHandle<T> //
               const { callback } = payload
               const newDoc = callback(oldDoc)
 
-              const docChanged = !headsAreSame(newDoc, oldDoc)
-              if (docChanged) {
-                this.emit("change", { handle: this, doc: newDoc })
-                if (!this.isReady()) {
-                  this.#machine.send(REQUEST_COMPLETE)
-                }
-              }
               return { doc: newDoc }
             }),
             onDelete: assign(() => {
@@ -136,9 +129,19 @@ export class DocHandle<T> //
         }
       )
     )
-      .onTransition(({ value: state }, { type: event }) =>
+      .onTransition(({ value: state, history, context }, event) => {
+        const oldDoc = history?.context?.doc
+        const newDoc = context.doc
+
+        const docChanged = newDoc && oldDoc && !headsAreSame(newDoc, oldDoc)
+        if (docChanged) {
+          this.emit("change", { handle: this, doc: newDoc })
+          if (!this.isReady()) {
+            this.#machine.send(REQUEST_COMPLETE)
+          }
+        }
         this.#log(`${event} → ${state}`, this.#doc)
-      )
+      })
       .start()
 
     this.#machine.send(isNew ? CREATE : FIND)
@@ -230,7 +233,11 @@ export class DocHandle<T> //
     })
   }
 
-  changeAt(heads: A.Heads, callback: A.ChangeFn<T>, options: A.ChangeOptions<T> = {}) {
+  changeAt(
+    heads: A.Heads,
+    callback: A.ChangeFn<T>,
+    options: A.ChangeOptions<T> = {}
+  ) {
     if (!this.isReady()) {
       throw new Error(
         `DocHandle#${this.documentId} is not ready. Check \`handle.isReady()\` before accessing the document.`
@@ -281,8 +288,7 @@ export interface DocHandleDeletePayload<T> {
 export interface DocHandlePatchPayload<T> {
   handle: DocHandle<T>
   patches: A.Patch[]
-  before: A.Doc<T>
-  after: A.Doc<T>
+  patchInfo: A.PatchInfo<T>
 }
 
 export interface DocHandleEvents<T> {

package/src/{test-utilities/adapter-tests.ts → helpers/tests/network-adapter-tests.ts}

@@ -1,8 +1,5 @@
-import { PeerId, Repo, type NetworkAdapter, ChannelId } from "../index.js"
-import {
-  eventPromise,
-  eventPromises,
-} from "../helpers/eventPromise.js"
+import { PeerId, Repo, type NetworkAdapter, ChannelId } from "../../index.js"
+import { eventPromise, eventPromises } from "../eventPromise.js"
 import { assert } from "chai"
 import { describe, it } from "mocha"
 
@@ -143,7 +140,7 @@ export function runAdapterTests(_setup: SetupFn, title?: string): void {
   })
 }
 
-const NO_OP = () => { }
+const NO_OP = () => {}
 
 type Network = NetworkAdapter | NetworkAdapter[]
 

package/src/index.ts

@@ -2,7 +2,6 @@ export { DocCollection } from "./DocCollection.js"
 export { DocHandle, HandleState } from "./DocHandle.js"
 export type {
   DocHandleChangePayload,
-  DocHandleMessagePayload,
   DocHandlePatchPayload,
 } from "./DocHandle.js"
 export { NetworkAdapter } from "./network/NetworkAdapter.js"
@@ -19,4 +18,3 @@ export { StorageAdapter } from "./storage/StorageAdapter.js"
 export { StorageSubsystem } from "./storage/StorageSubsystem.js"
 export { CollectionSynchronizer } from "./synchronizer/CollectionSynchronizer.js"
 export * from "./types.js"
-export * from "./test-utilities/adapter-tests.js"

package/test/DocHandle.test.ts

@@ -137,6 +137,24 @@ describe("DocHandle", () => {
     })
   })
 
+  it("should update the internal doc prior to emitting the change message", async () => {
+    const handle = new DocHandle<TestDoc>(TEST_ID, { isNew: true })
+
+    const p = new Promise<void>(resolve =>
+      handle.once("change", ({ handle, doc }) => {
+        assert.equal(handle.doc.foo, doc.foo)
+
+        resolve()
+      })
+    )
+
+    handle.change(doc => {
+      doc.foo = "baz"
+    })
+
+    return p
+  })
+
   it("should emit distinct change messages when consecutive changes happen", async () => {
     const handle = new DocHandle<TestDoc>(TEST_ID, { isNew: true })
 

package/dist/test-utilities/adapter-tests.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapter-tests.d.ts","sourceRoot":"","sources":["../../src/test-utilities/adapter-tests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,cAAc,EAAa,MAAM,aAAa,CAAA;AAQ1E;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CA2HrE;AAID,KAAK,OAAO,GAAG,cAAc,GAAG,cAAc,EAAE,CAAA;AAEhD,MAAM,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;IAClC,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACtB,CAAC,CAAA"}