@automerge/automerge-repo 1.0.0-alpha.0 → 1.0.0-alpha.2

package/dist/DocHandle.d.ts

@@ -50,8 +50,6 @@ export declare class DocHandle<T>//
      * @returns the current document, or undefined if the document is not ready
      */
     docSync(): A.Doc<T> | undefined;
-    /** `load` is called by the repo when the document is found in storage */
-    load(binary: Uint8Array): void;
     /** `update` is called by the repo when we receive changes from the network */
     update(callback: (doc: A.Doc<T>) => A.Doc<T>): void;
     /** `change` is called by the repo when the document is changed locally  */
@@ -100,7 +98,6 @@ export declare const HandleState: {
 export type HandleState = (typeof HandleState)[keyof typeof HandleState];
 export declare const Event: {
     readonly CREATE: "CREATE";
-    readonly LOAD: "LOAD";
     readonly FIND: "FIND";
     readonly REQUEST: "REQUEST";
     readonly REQUEST_COMPLETE: "REQUEST_COMPLETE";

package/dist/DocHandle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DocHandle.d.ts","sourceRoot":"","sources":["../src/DocHandle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DocHandle.d.ts","sourceRoot":"","sources":["../src/DocHandle.ts"],"names":[],"mappings":"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"}

package/dist/DocHandle.js

@@ -54,8 +54,8 @@ export class DocHandle//
                 },
                 loading: {
                     on: {
-                        // LOAD is called by the Repo if the document is found in storage
-                        LOAD: { actions: "onLoad", target: READY },
+                        // UPDATE is called by the Repo if the document is found in storage
+                        UPDATE: { actions: "onUpdate", target: READY },
                         // REQUEST is called by the Repo if the document is not found in storage
                         REQUEST: { target: REQUESTING },
                         DELETE: { actions: "onDelete", target: DELETED },
@@ -98,14 +98,7 @@ export class DocHandle//
             },
         }, {
             actions: {
-                /** Apply the binary changes from storage and put the updated doc on context */
-                onLoad: assign((context, { payload }) => {
-                    const { binary } = payload;
-                    const { doc } = context;
-                    const newDoc = A.loadIncremental(doc, binary);
-                    return { doc: newDoc };
-                }),
-                /** Put the updated doc on context; if it's different, emit a `change` event */
+                /** Put the updated doc on context */
                 onUpdate: assign((context, { payload }) => {
                     const { doc: oldDoc } = context;
                     const { callback } = payload;
@@ -121,8 +114,8 @@ export class DocHandle//
             .onTransition(({ value: state, history, context }, event) => {
             const oldDoc = history?.context?.doc;
             const newDoc = context.doc;
-            this.#log(`${event} → ${state}`, newDoc);
-            const docChanged = newDoc && oldDoc && !headsAreSame(newDoc, oldDoc);
+            console.log(`${event} → ${state}`, newDoc);
+            const docChanged = newDoc && oldDoc && !headsAreSame(A.getHeads(newDoc), A.getHeads(oldDoc));
             if (docChanged) {
                 this.emit("heads-changed", { handle: this, doc: newDoc });
                 const patches = A.diff(newDoc, A.getHeads(oldDoc), A.getHeads(newDoc));
@@ -225,12 +218,6 @@ export class DocHandle//
         }
         return this.#doc;
     }
-    /** `load` is called by the repo when the document is found in storage */
-    load(binary) {
-        if (binary.length && binary.length > 0) {
-            this.#machine.send(LOAD, { payload: { binary } });
-        }
-    }
     /** `update` is called by the repo when we receive changes from the network */
     update(callback) {
         this.#machine.send(UPDATE, {
@@ -285,7 +272,6 @@ export const HandleState = {
 // events
 export const Event = {
     CREATE: "CREATE",
-    LOAD: "LOAD",
     FIND: "FIND",
     REQUEST: "REQUEST",
     REQUEST_COMPLETE: "REQUEST_COMPLETE",
@@ -295,4 +281,4 @@ export const Event = {
 };
 // CONSTANTS
 export const { IDLE, LOADING, REQUESTING, READY, FAILED, DELETED } = HandleState;
-const { CREATE, LOAD, FIND, REQUEST, UPDATE, TIMEOUT, DELETE, REQUEST_COMPLETE, } = Event;
+const { CREATE, FIND, REQUEST, UPDATE, TIMEOUT, DELETE, REQUEST_COMPLETE } = Event;

package/dist/Repo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Repo.d.ts","sourceRoot":"","sources":["../src/Repo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAI/C,oFAAoF;AACpF,qBAAa,IAAK,SAAQ,aAAa;;IAGrC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,aAAa,EAAE,aAAa,CAAA;gBAEhB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,UAAU;CA8GlE;AAED,MAAM,WAAW,UAAU;IACzB,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,gDAAgD;IAChD,OAAO,CAAC,EAAE,cAAc,CAAA;IAExB,oDAAoD;IACpD,OAAO,EAAE,cAAc,EAAE,CAAA;IAEzB;;;OAGG;IACH,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;AAED,MAAM,MAAM,WAAW,GAAG,CACxB,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,KACpB,OAAO,CAAC,OAAO,CAAC,CAAA"}
+{"version":3,"file":"Repo.d.ts","sourceRoot":"","sources":["../src/Repo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAI/C,oFAAoF;AACpF,qBAAa,IAAK,SAAQ,aAAa;;IAGrC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,aAAa,EAAE,aAAa,CAAA;gBAEhB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,UAAU;CAgHlE;AAED,MAAM,WAAW,UAAU;IACzB,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,gDAAgD;IAChD,OAAO,CAAC,EAAE,cAAc,CAAA;IAExB,oDAAoD;IACpD,OAAO,EAAE,cAAc,EAAE,CAAA;IAEzB;;;OAGG;IACH,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;AAED,MAAM,MAAM,WAAW,GAAG,CACxB,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,KACpB,OAAO,CAAC,OAAO,CAAC,CAAA"}

package/dist/Repo.js

@@ -21,11 +21,13 @@ export class Repo extends DocCollection {
             if (storageSubsystem) {
                 // Save when the document changes
                 handle.on("heads-changed", async ({ handle, doc }) => {
-                    await storageSubsystem.save(handle.documentId, doc);
+                    await storageSubsystem.saveDoc(handle.documentId, doc);
                 });
                 // Try to load from disk
-                const binary = await storageSubsystem.loadBinary(handle.documentId);
-                handle.load(binary);
+                const loadedDoc = await storageSubsystem.loadDoc(handle.documentId);
+                if (loadedDoc) {
+                    handle.update(() => loadedDoc);
+                }
             }
             handle.request();
             // Register the document with the synchronizer. This advertises our interest in the document.

package/dist/helpers/headsAreSame.d.ts

@@ -1,3 +1,3 @@
-import * as A from "@automerge/automerge";
-export declare const headsAreSame: <T>(a: A.next.Doc<T>, b: A.next.Doc<T>) => boolean;
+import { Heads } from "@automerge/automerge";
+export declare const headsAreSame: (a: Heads, b: Heads) => boolean;
 //# sourceMappingURL=headsAreSame.d.ts.map

package/dist/helpers/headsAreSame.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"headsAreSame.d.ts","sourceRoot":"","sources":["../../src/helpers/headsAreSame.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,sBAAsB,CAAA;AAGzC,eAAO,MAAM,YAAY,oDAIxB,CAAA"}
+{"version":3,"file":"headsAreSame.d.ts","sourceRoot":"","sources":["../../src/helpers/headsAreSame.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,sBAAsB,CAAA;AAG1C,eAAO,MAAM,YAAY,iCAExB,CAAA"}

package/dist/helpers/headsAreSame.js

@@ -1,7 +1,4 @@
-import * as A from "@automerge/automerge";
 import { arraysAreEqual } from "./arraysAreEqual.js";
 export const headsAreSame = (a, b) => {
-    const aHeads = A.getHeads(a);
-    const bHeads = A.getHeads(b);
-    return arraysAreEqual(aHeads, bHeads);
+    return arraysAreEqual(a, b);
 };

package/dist/storage/StorageSubsystem.d.ts

@@ -5,8 +5,8 @@ export type ChunkType = "snapshot" | "incremental";
 export declare class StorageSubsystem {
     #private;
     constructor(storageAdapter: StorageAdapter);
-    loadBinary(documentId: DocumentId): Promise<Uint8Array>;
-    save(documentId: DocumentId, doc: A.Doc<unknown>): Promise<void>;
+    loadDoc(documentId: DocumentId): Promise<A.Doc<unknown> | null>;
+    saveDoc(documentId: DocumentId, doc: A.Doc<unknown>): Promise<void>;
     remove(documentId: DocumentId): Promise<void>;
 }
 //# sourceMappingURL=StorageSubsystem.d.ts.map

package/dist/storage/StorageSubsystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageSubsystem.d.ts","sourceRoot":"","sources":["../../src/storage/StorageSubsystem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,sBAAsB,CAAA;AACzC,OAAO,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAA;AAEhE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAW7C,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,aAAa,CAAA;AAelD,qBAAa,gBAAgB;;gBAIf,cAAc,EAAE,cAAc;IA6CpC,UAAU,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAoBvD,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE,MAAM,CAAC,UAAU,EAAE,UAAU;CAkBpC"}
+{"version":3,"file":"StorageSubsystem.d.ts","sourceRoot":"","sources":["../../src/storage/StorageSubsystem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,sBAAsB,CAAA;AACzC,OAAO,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAA;AAEhE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAa7C,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,aAAa,CAAA;AAelD,qBAAa,gBAAgB;;gBAMf,cAAc,EAAE,cAAc;IAqDpC,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IA0B/D,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAanE,MAAM,CAAC,UAAU,EAAE,UAAU;CAgCpC"}

package/dist/storage/StorageSubsystem.js

@@ -1,6 +1,8 @@
 import * as A from "@automerge/automerge";
 import * as sha256 from "fast-sha256";
 import { mergeArrays } from "../helpers/mergeArrays.js";
+import debug from "debug";
+import { headsAreSame } from "../helpers/headsAreSame.js";
 function keyHash(binary) {
     const hash = sha256.hash(binary);
     const hashArray = Array.from(new Uint8Array(hash)); // convert buffer to byte array
@@ -15,13 +17,16 @@ function headsHash(heads) {
 export class StorageSubsystem {
     #storageAdapter;
     #chunkInfos = new Map();
+    #storedHeads = new Map();
+    #log = debug(`automerge-repo:storage-subsystem`);
     constructor(storageAdapter) {
         this.#storageAdapter = storageAdapter;
     }
     async #saveIncremental(documentId, doc) {
-        const binary = A.saveIncremental(doc);
+        const binary = A.saveSince(doc, this.#storedHeads.get(documentId) ?? []);
         if (binary && binary.length > 0) {
             const key = [documentId, "incremental", keyHash(binary)];
+            this.#log(`Saving incremental ${key} for document ${documentId}`);
             await this.#storageAdapter.save(key, binary);
             if (!this.#chunkInfos.has(documentId)) {
                 this.#chunkInfos.set(documentId, []);
@@ -31,6 +36,7 @@ export class StorageSubsystem {
                 type: "incremental",
                 size: binary.length,
             });
+            this.#storedHeads.set(documentId, A.getHeads(doc));
         }
         else {
             return Promise.resolve();
@@ -38,8 +44,11 @@ export class StorageSubsystem {
     }
     async #saveTotal(documentId, doc, sourceChunks) {
         const binary = A.save(doc);
-        const key = [documentId, "snapshot", headsHash(A.getHeads(doc))];
-        const oldKeys = new Set(sourceChunks.map(c => c.key));
+        const snapshotHash = headsHash(A.getHeads(doc));
+        const key = [documentId, "snapshot", snapshotHash];
+        const oldKeys = new Set(sourceChunks.map(c => c.key).filter(k => k[2] !== snapshotHash));
+        this.#log(`Saving snapshot ${key} for document ${documentId}`);
+        this.#log(`deleting old chunks ${Array.from(oldKeys)}`);
         await this.#storageAdapter.save(key, binary);
         for (const key of oldKeys) {
             await this.#storageAdapter.remove(key);
@@ -48,7 +57,7 @@ export class StorageSubsystem {
         newChunkInfos.push({ key, type: "snapshot", size: binary.length });
         this.#chunkInfos.set(documentId, newChunkInfos);
     }
-    async loadBinary(documentId) {
+    async loadDoc(documentId) {
         const loaded = await this.#storageAdapter.loadRange([documentId]);
         const binaries = [];
         const chunkInfos = [];
@@ -65,9 +74,18 @@ export class StorageSubsystem {
             binaries.push(chunk.data);
         }
         this.#chunkInfos.set(documentId, chunkInfos);
-        return mergeArrays(binaries);
+        const binary = mergeArrays(binaries);
+        if (binary.length === 0) {
+            return null;
+        }
+        const newDoc = A.loadIncremental(A.init(), binary);
+        this.#storedHeads.set(documentId, A.getHeads(newDoc));
+        return newDoc;
     }
-    async save(documentId, doc) {
+    async saveDoc(documentId, doc) {
+        if (!this.#shouldSave(documentId, doc)) {
+            return;
+        }
         let sourceChunks = this.#chunkInfos.get(documentId) ?? [];
         if (this.#shouldCompact(sourceChunks)) {
             this.#saveTotal(documentId, doc, sourceChunks);
@@ -75,11 +93,23 @@ export class StorageSubsystem {
         else {
             this.#saveIncremental(documentId, doc);
         }
+        this.#storedHeads.set(documentId, A.getHeads(doc));
     }
     async remove(documentId) {
         this.#storageAdapter.remove([documentId, "snapshot"]);
         this.#storageAdapter.removeRange([documentId, "incremental"]);
     }
+    #shouldSave(documentId, doc) {
+        const oldHeads = this.#storedHeads.get(documentId);
+        if (!oldHeads) {
+            return true;
+        }
+        const newHeads = A.getHeads(doc);
+        if (headsAreSame(newHeads, oldHeads)) {
+            return false;
+        }
+        return true;
+    }
     #shouldCompact(sourceChunks) {
         // compact if the incremental size is greater than the snapshot size
         let snapshotSize = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.2",
   "description": "A repository object to manage a collection of automerge documents",
   "repository": "https://github.com/automerge/automerge-repo",
   "author": "Peter van Hardenberg <pvh@pvh.ca>",
@@ -31,7 +31,7 @@
     "typescript": "^5.1.6"
   },
   "peerDependencies": {
-    "@automerge/automerge": "^2.1.0-alpha.9"
+    "@automerge/automerge": "^2.1.0-alpha.10"
   },
   "dependencies": {
     "bs58check": "^3.0.1",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "38c0c32796ddca5f86a2e55ab0f1202a2ce107c8"
+  "gitHead": "b5830dde8f135b694809698aaad2a9fdc79a9898"
 }

package/src/DocHandle.ts

@@ -17,14 +17,8 @@ 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 {
-  BinaryDocumentId,
-  ChannelId,
-  DocumentId,
-  PeerId,
-  AutomergeUrl,
-} from "./types.js"
-import { binaryToDocumentId, stringifyAutomergeUrl } from "./DocUrl.js"
+import type { ChannelId, DocumentId, PeerId, AutomergeUrl } from "./types.js"
+import { stringifyAutomergeUrl } from "./DocUrl.js"
 
 /** DocHandle is a wrapper around a single Automerge document that lets us listen for changes. */
 export class DocHandle<T> //
@@ -83,8 +77,8 @@ export class DocHandle<T> //
             },
             loading: {
               on: {
-                // LOAD is called by the Repo if the document is found in storage
-                LOAD: { actions: "onLoad", target: READY },
+                // UPDATE is called by the Repo if the document is found in storage
+                UPDATE: { actions: "onUpdate", target: READY },
                 // REQUEST is called by the Repo if the document is not found in storage
                 REQUEST: { target: REQUESTING },
                 DELETE: { actions: "onDelete", target: DELETED },
@@ -129,15 +123,7 @@ export class DocHandle<T> //
 
         {
           actions: {
-            /** Apply the binary changes from storage and put the updated doc on context */
-            onLoad: assign((context, { payload }: LoadEvent) => {
-              const { binary } = payload
-              const { doc } = context
-              const newDoc = A.loadIncremental(doc, binary)
-              return { doc: newDoc }
-            }),
-
-            /** Put the updated doc on context; if it's different, emit a `change` event */
+            /** Put the updated doc on context */
             onUpdate: assign((context, { payload }: UpdateEvent<T>) => {
               const { doc: oldDoc } = context
 
@@ -158,9 +144,9 @@ export class DocHandle<T> //
         const oldDoc = history?.context?.doc
         const newDoc = context.doc
 
-        this.#log(`${event} → ${state}`, newDoc)
+        console.log(`${event} → ${state}`, newDoc)
 
-        const docChanged = newDoc && oldDoc && !headsAreSame(newDoc, oldDoc)
+        const docChanged = newDoc && oldDoc && !headsAreSame(A.getHeads(newDoc), A.getHeads(oldDoc))
         if (docChanged) {
           this.emit("heads-changed", { handle: this, doc: newDoc })
 
@@ -280,13 +266,6 @@ export class DocHandle<T> //
     return this.#doc
   }
 
-  /** `load` is called by the repo when the document is found in storage */
-  load(binary: Uint8Array) {
-    if (binary.length && binary.length > 0) {
-      this.#machine.send(LOAD, { payload: { binary } })
-    }
-  }
-
   /** `update` is called by the repo when we receive changes from the network */
   update(callback: (doc: A.Doc<T>) => A.Doc<T>) {
     this.#machine.send(UPDATE, {
@@ -407,7 +386,6 @@ interface DocHandleContext<T> {
 
 export const Event = {
   CREATE: "CREATE",
-  LOAD: "LOAD",
   FIND: "FIND",
   REQUEST: "REQUEST",
   REQUEST_COMPLETE: "REQUEST_COMPLETE",
@@ -418,7 +396,6 @@ export const Event = {
 type Event = (typeof Event)[keyof typeof Event]
 
 type CreateEvent = { type: typeof CREATE; payload: { documentId: string } }
-type LoadEvent = { type: typeof LOAD; payload: { binary: Uint8Array } }
 type FindEvent = { type: typeof FIND; payload: { documentId: string } }
 type RequestEvent = { type: typeof REQUEST }
 type RequestCompleteEvent = { type: typeof REQUEST_COMPLETE }
@@ -431,7 +408,6 @@ type TimeoutEvent = { type: typeof TIMEOUT }
 
 type DocHandleEvent<T> =
   | CreateEvent
-  | LoadEvent
   | FindEvent
   | RequestEvent
   | RequestCompleteEvent
@@ -458,13 +434,5 @@ type DocHandleXstateMachine<T> = Interpreter<
 // CONSTANTS
 
 export const { IDLE, LOADING, REQUESTING, READY, FAILED, DELETED } = HandleState
-const {
-  CREATE,
-  LOAD,
-  FIND,
-  REQUEST,
-  UPDATE,
-  TIMEOUT,
-  DELETE,
-  REQUEST_COMPLETE,
-} = Event
+const { CREATE, FIND, REQUEST, UPDATE, TIMEOUT, DELETE, REQUEST_COMPLETE } =
+  Event

package/src/Repo.ts

@@ -30,12 +30,14 @@ export class Repo extends DocCollection {
       if (storageSubsystem) {
         // Save when the document changes
         handle.on("heads-changed", async ({ handle, doc }) => {
-          await storageSubsystem.save(handle.documentId, doc)
+          await storageSubsystem.saveDoc(handle.documentId, doc)
         })
 
         // Try to load from disk
-        const binary = await storageSubsystem.loadBinary(handle.documentId)
-        handle.load(binary)
+        const loadedDoc = await storageSubsystem.loadDoc(handle.documentId)
+        if (loadedDoc) {
+          handle.update(() => loadedDoc)
+        }
       }
 
       handle.request()

package/src/helpers/headsAreSame.ts

@@ -1,8 +1,6 @@
-import * as A from "@automerge/automerge"
+import {Heads} from "@automerge/automerge"
 import { arraysAreEqual } from "./arraysAreEqual.js"
 
-export const headsAreSame = <T>(a: A.Doc<T>, b: A.Doc<T>) => {
-  const aHeads = A.getHeads(a)
-  const bHeads = A.getHeads(b)
-  return arraysAreEqual(aHeads, bHeads)
+export const headsAreSame = (a: Heads, b: Heads) => {
+  return arraysAreEqual(a, b)
 }

package/src/storage/StorageSubsystem.ts

@@ -3,6 +3,8 @@ import { StorageAdapter, StorageKey } from "./StorageAdapter.js"
 import * as sha256 from "fast-sha256"
 import { type DocumentId } from "../types.js"
 import { mergeArrays } from "../helpers/mergeArrays.js"
+import debug from "debug"
+import { headsAreSame } from "../helpers/headsAreSame.js"
 
 // Metadata about a chunk of data loaded from storage. This is stored on the
 // StorageSubsystem so when we are compacting we know what chunks we can safely delete
@@ -30,6 +32,8 @@ function headsHash(heads: A.Heads): string {
 export class StorageSubsystem {
   #storageAdapter: StorageAdapter
   #chunkInfos: Map<DocumentId, StorageChunkInfo[]> = new Map()
+  #storedHeads: Map<DocumentId, A.Heads> = new Map()
+  #log = debug(`automerge-repo:storage-subsystem`)
 
   constructor(storageAdapter: StorageAdapter) {
     this.#storageAdapter = storageAdapter
@@ -39,9 +43,10 @@ export class StorageSubsystem {
     documentId: DocumentId,
     doc: A.Doc<unknown>
   ): Promise<void> {
-    const binary = A.saveIncremental(doc)
+    const binary = A.saveSince(doc, this.#storedHeads.get(documentId) ?? [])
     if (binary && binary.length > 0) {
       const key = [documentId, "incremental", keyHash(binary)]
+      this.#log(`Saving incremental ${key} for document ${documentId}`)
       await this.#storageAdapter.save(key, binary)
       if (!this.#chunkInfos.has(documentId)) {
         this.#chunkInfos.set(documentId, [])
@@ -51,6 +56,7 @@ export class StorageSubsystem {
         type: "incremental",
         size: binary.length,
       })
+      this.#storedHeads.set(documentId, A.getHeads(doc))
     } else {
       return Promise.resolve()
     }
@@ -62,8 +68,14 @@ export class StorageSubsystem {
     sourceChunks: StorageChunkInfo[]
   ): Promise<void> {
     const binary = A.save(doc)
-    const key = [documentId, "snapshot", headsHash(A.getHeads(doc))]
-    const oldKeys = new Set(sourceChunks.map(c => c.key))
+    const snapshotHash = headsHash(A.getHeads(doc))
+    const key = [documentId, "snapshot", snapshotHash]
+    const oldKeys = new Set(
+      sourceChunks.map(c => c.key).filter(k => k[2] !== snapshotHash)
+    )
+
+    this.#log(`Saving snapshot ${key} for document ${documentId}`)
+    this.#log(`deleting old chunks ${Array.from(oldKeys)}`)
 
     await this.#storageAdapter.save(key, binary)
 
@@ -76,7 +88,7 @@ export class StorageSubsystem {
     this.#chunkInfos.set(documentId, newChunkInfos)
   }
 
-  async loadBinary(documentId: DocumentId): Promise<Uint8Array> {
+  async loadDoc(documentId: DocumentId): Promise<A.Doc<unknown> | null> {
     const loaded = await this.#storageAdapter.loadRange([documentId])
     const binaries = []
     const chunkInfos: StorageChunkInfo[] = []
@@ -93,16 +105,26 @@ export class StorageSubsystem {
       binaries.push(chunk.data)
     }
     this.#chunkInfos.set(documentId, chunkInfos)
-    return mergeArrays(binaries)
+    const binary = mergeArrays(binaries)
+    if (binary.length === 0) {
+      return null
+    }
+    const newDoc = A.loadIncremental(A.init(), binary)
+    this.#storedHeads.set(documentId, A.getHeads(newDoc))
+    return newDoc
   }
 
-  async save(documentId: DocumentId, doc: A.Doc<unknown>): Promise<void> {
+  async saveDoc(documentId: DocumentId, doc: A.Doc<unknown>): Promise<void> {
+    if (!this.#shouldSave(documentId, doc)) {
+      return
+    }
     let sourceChunks = this.#chunkInfos.get(documentId) ?? []
     if (this.#shouldCompact(sourceChunks)) {
       this.#saveTotal(documentId, doc, sourceChunks)
     } else {
       this.#saveIncremental(documentId, doc)
     }
+    this.#storedHeads.set(documentId, A.getHeads(doc))
   }
 
   async remove(documentId: DocumentId) {
@@ -110,6 +132,20 @@ export class StorageSubsystem {
     this.#storageAdapter.removeRange([documentId, "incremental"])
   }
 
+  #shouldSave(documentId: DocumentId, doc: A.Doc<unknown>): boolean {
+    const oldHeads = this.#storedHeads.get(documentId)
+    if (!oldHeads) {
+      return true
+    }
+
+    const newHeads = A.getHeads(doc)
+    if (headsAreSame(newHeads, oldHeads)) {
+      return false
+    }
+
+    return true
+  }
+
   #shouldCompact(sourceChunks: StorageChunkInfo[]) {
     // compact if the incremental size is greater than the snapshot size
     let snapshotSize = 0

package/test/DocHandle.test.ts

@@ -1,7 +1,7 @@
 import * as A from "@automerge/automerge"
 import assert from "assert"
 import { it } from "mocha"
-import { DocHandle, DocHandleChangePayload, BinaryDocumentId } from "../src"
+import { DocHandle, DocHandleChangePayload } from "../src"
 import { pause } from "../src/helpers/pause"
 import { TestDoc } from "./types.js"
 import { generateAutomergeUrl, parseAutomergeUrl } from "../src/DocUrl"
@@ -10,10 +10,8 @@ describe("DocHandle", () => {
   const TEST_ID = parseAutomergeUrl(generateAutomergeUrl()).encodedDocumentId
   const BOGUS_ID = parseAutomergeUrl(generateAutomergeUrl()).encodedDocumentId
 
-  const binaryFromMockStorage = () => {
-    const doc = A.change<{ foo: string }>(A.init(), d => (d.foo = "bar"))
-    const binary = A.save(doc)
-    return binary
+  const docFromMockStorage = (doc: A.Doc<{ foo: string }>) => {
+    return A.change<{ foo: string }>(doc, d => (d.foo = "bar"))
   }
 
   it("should take the UUID passed into it", () => {
@@ -26,10 +24,11 @@ describe("DocHandle", () => {
     assert.equal(handle.isReady(), false)
 
     // simulate loading from storage
-    handle.load(binaryFromMockStorage())
+    handle.update(doc => docFromMockStorage(doc))
 
     assert.equal(handle.isReady(), true)
     const doc = await handle.doc()
+    console.log("DOC", JSON.stringify(doc))
     assert.equal(doc.foo, "bar")
   })
 
@@ -38,7 +37,7 @@ describe("DocHandle", () => {
     assert.equal(handle.isReady(), false)
 
     // simulate loading from storage
-    handle.load(binaryFromMockStorage())
+    handle.update(doc => docFromMockStorage(doc))
 
     assert.equal(handle.isReady(), true)
     const doc = await handle.doc()
@@ -56,7 +55,7 @@ describe("DocHandle", () => {
     assert.equal(handle.isReady(), false)
 
     // simulate loading from storage
-    handle.load(binaryFromMockStorage())
+    handle.update(doc => docFromMockStorage(doc))
 
     const doc = await handle.doc()
 
@@ -72,7 +71,7 @@ describe("DocHandle", () => {
     assert.throws(() => handle.change(d => (d.foo = "baz")))
 
     // simulate loading from storage
-    handle.load(binaryFromMockStorage())
+    handle.update(doc => docFromMockStorage(doc))
 
     // now we're in READY state so we can make changes
     assert.equal(handle.isReady(), true)
@@ -229,7 +228,7 @@ describe("DocHandle", () => {
     const handle = new DocHandle<TestDoc>(TEST_ID, { timeoutDelay: 5 })
 
     // simulate loading from storage before the timeout expires
-    handle.load(binaryFromMockStorage())
+    handle.update(doc => docFromMockStorage(doc))
 
     // now it should not time out
     const doc = await handle.doc()

package/test/Repo.test.ts

@@ -55,6 +55,7 @@ describe("Repo", () => {
         d.foo = "bar"
       })
       const v = await handle.doc()
+      console.log("V is ", v)
       assert.equal(handle.isReady(), true)
 
       assert.equal(v.foo, "bar")
@@ -180,6 +181,64 @@ describe("Repo", () => {
 
       repo.delete(handle.documentId)
     })
+
+    it("storage state doesn't change across reloads when the document hasn't changed", async () => {
+      const storage = new DummyStorageAdapter()
+
+      const repo = new Repo({
+        storage,
+        network: [],
+      })
+
+      const handle = repo.create<{ count: number }>()
+
+      handle.change(d => {
+        d.count = 0
+      })
+      handle.change(d => {
+        d.count = 1
+      })
+
+      const initialKeys = storage.keys()
+
+      const repo2 = new Repo({
+        storage,
+        network: [],
+      })
+      const handle2 = repo2.find(handle.url)
+      await handle2.doc()
+
+      assert.deepEqual(storage.keys(), initialKeys)
+    })
+
+    it("doesn't delete a document from storage when we refresh", async () => {
+      const storage = new DummyStorageAdapter()
+
+      const repo = new Repo({
+        storage,
+        network: [],
+      })
+
+      const handle = repo.create<{ count: number }>()
+
+      handle.change(d => {
+        d.count = 0
+      })
+      handle.change(d => {
+        d.count = 1
+      })
+
+      for (let i = 0; i < 3; i++) {
+        const repo2 = new Repo({
+          storage,
+          network: [],
+        })
+        const handle2 = repo2.find(handle.url)
+        await handle2.doc()
+
+        assert(storage.keys().length !== 0)
+      }
+    })
   })
 
   describe("sync", async () => {
@@ -412,5 +471,4 @@ describe("Repo", () => {
       teardown()
     })
   })
-
 })

package/test/StorageSubsystem.test.ts

@@ -32,11 +32,10 @@ describe("StorageSubsystem", () => {
 
         // save it to storage
         const key = parseAutomergeUrl(generateAutomergeUrl()).encodedDocumentId
-        await storage.save(key, doc)
+        await storage.saveDoc(key, doc)
 
         // reload it from storage
-        const reloadedDocBinary = await storage.loadBinary(key)
-        const reloadedDoc = A.load<TestDoc>(reloadedDocBinary)
+        const reloadedDoc = await storage.loadDoc(key)
 
         // check that it's the same doc
         assert.deepStrictEqual(reloadedDoc, doc)
@@ -54,14 +53,15 @@ describe("StorageSubsystem", () => {
 
     // save it to storage
     const key = parseAutomergeUrl(generateAutomergeUrl()).encodedDocumentId
-    storage.save(key, doc)
+    storage.saveDoc(key, doc)
 
     // create new storage subsystem to simulate a new process
     const storage2 = new StorageSubsystem(adapter)
 
     // reload it from storage
-    const reloadedDocBinary = await storage2.loadBinary(key)
-    const reloadedDoc = A.load<TestDoc>(reloadedDocBinary)
+    const reloadedDoc = await storage2.loadDoc(key)
+
+    assert(reloadedDoc, "doc should be loaded")
 
     // make a change
     const changedDoc = A.change<any>(reloadedDoc, "test 2", d => {
@@ -69,7 +69,7 @@ describe("StorageSubsystem", () => {
     })
 
     // save it to storage
-    storage2.save(key, changedDoc)
+    storage2.saveDoc(key, changedDoc)
 
     // check that the storage adapter contains the correct keys
     assert(adapter.keys().some(k => k.startsWith(`${key}.incremental.`)))