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

package/dist/DocUrl.js

@@ -1,28 +1,67 @@
-import Base58 from "bs58";
-import { crc16 } from "js-crc";
-export const linkForDocumentId = id => withCrc("automerge://" + encode(id));
-export const documentIdFromShareLink = link => {
-    const { key } = parts(link);
-    return key;
+import { v4 as uuid } from "uuid";
+import bs58check from "bs58check";
+export const urlPrefix = "automerge:";
+/**
+ * given an Automerge URL, return a decoded DocumentId (and the encoded DocumentId)
+ *
+ * @param url
+ * @returns { documentId: Uint8Array(16), encodedDocumentId: bs58check.encode(documentId) }
+ */
+export const parseAutomergeUrl = (url) => {
+    const { binaryDocumentId: binaryDocumentId, encodedDocumentId } = parts(url);
+    if (!binaryDocumentId)
+        throw new Error("Invalid document URL: " + url);
+    return { binaryDocumentId, encodedDocumentId };
 };
-export const isValidShareLink = str => {
-    const { nonCrc, crc } = parts(str);
-    return Boolean(nonCrc) && Boolean(crc) && crc16(nonCrc) === crc;
+/**
+ * Given a documentId in either canonical form, return an Automerge URL
+ * Throws on invalid input.
+ * Note: this is an object because we anticipate adding fields in the future.
+ * @param { documentId: EncodedDocumentId | DocumentId }
+ * @returns AutomergeUrl
+ */
+export const stringifyAutomergeUrl = ({ documentId, }) => {
+    if (documentId instanceof Uint8Array)
+        return (urlPrefix +
+            binaryToDocumentId(documentId));
+    else if (typeof documentId === "string") {
+        return (urlPrefix + documentId);
+    }
+    throw new Error("Invalid documentId: " + documentId);
 };
-export const parts = str => {
-    const p = encodedParts(str);
-    return {
-        key: p.key && decode(p.key),
-        nonCrc: p.nonCrc,
-        crc: p.crc && decode(p.crc),
-    };
+/**
+ * Given a string, return true if it is a valid Automerge URL
+ * also acts as a type discriminator in Typescript.
+ * @param str: URL candidate
+ * @returns boolean
+ */
+export const isValidAutomergeUrl = (str) => {
+    if (!str.startsWith(urlPrefix))
+        return false;
+    const { binaryDocumentId: documentId } = parts(str);
+    return documentId ? true : false;
 };
-export const encodedParts = str => {
-    const [m, nonCrc, key, crc] = str.match(/^(pxlpshr:\/\/(\w+))\/(\w{1,4})$/) || [];
-    return { nonCrc, key, crc };
+/**
+ * generateAutomergeUrl produces a new AutomergeUrl.
+ * generally only called by create(), but used in tests as well.
+ * @returns a new Automerge URL with a random UUID documentId
+ */
+export const generateAutomergeUrl = () => stringifyAutomergeUrl({
+    documentId: uuid(null, new Uint8Array(16)),
+});
+export const documentIdToBinary = (docId) => bs58check.decodeUnsafe(docId);
+export const binaryToDocumentId = (docId) => bs58check.encode(docId);
+/**
+ * parts breaks up the URL into constituent pieces,
+ * eventually this could include things like heads, so we use this structure
+ * we return both a binary & string-encoded version of the document ID
+ * @param str
+ * @returns { binaryDocumentId, encodedDocumentId }
+ */
+const parts = (str) => {
+    const regex = new RegExp(`^${urlPrefix}(\\w+)$`);
+    const [m, docMatch] = str.match(regex) || [];
+    const encodedDocumentId = docMatch;
+    const binaryDocumentId = documentIdToBinary(encodedDocumentId);
+    return { binaryDocumentId, encodedDocumentId };
 };
-export const withCrc = str => str + `/` + encode(crc16(str));
-export const encode = str => Base58.encode(hexToBuffer(str));
-export const decode = str => bufferToHex(Base58.decode(str));
-export const hexToBuffer = key => Buffer.isBuffer(key) ? key : Buffer.from(key, "hex");
-export const bufferToHex = key => Buffer.isBuffer(key) ? key.toString("hex") : key;

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,EAAa,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAM1D,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;CA+GlE;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

@@ -4,7 +4,6 @@ import { NetworkSubsystem } from "./network/NetworkSubsystem.js";
 import { StorageSubsystem } from "./storage/StorageSubsystem.js";
 import { CollectionSynchronizer } from "./synchronizer/CollectionSynchronizer.js";
 import debug from "debug";
-const SYNC_CHANNEL = "sync_channel";
 /** A Repo is a DocCollection with networking, syncing, and storage capabilities. */
 export class Repo extends DocCollection {
     #log;
@@ -21,23 +20,24 @@ export class Repo extends DocCollection {
         this.on("document", async ({ handle }) => {
             if (storageSubsystem) {
                 // Save when the document changes
-                handle.on("change", async ({ handle }) => {
-                    const doc = await handle.value();
-                    await storageSubsystem.save(handle.documentId, doc);
+                handle.on("heads-changed", async ({ handle, 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.
             synchronizer.addDocument(handle.documentId);
         });
-        this.on("delete-document", ({ documentId }) => {
+        this.on("delete-document", ({ encodedDocumentId }) => {
             // TODO Pass the delete on to the network
             // synchronizer.removeDocument(documentId)
             if (storageSubsystem) {
-                storageSubsystem.remove(documentId);
+                storageSubsystem.remove(encodedDocumentId);
             }
         });
         // SYNCHRONIZER
@@ -82,7 +82,7 @@ export class Repo extends DocCollection {
             }
         });
         // We establish a special channel for sync messages
-        networkSubsystem.join(SYNC_CHANNEL);
+        networkSubsystem.join();
         // EPHEMERAL DATA
         // The ephemeral data subsystem uses the network to send and receive messages that are not
         // persisted to storage, e.g. cursor position, presence, etc.

package/dist/helpers/headsAreSame.d.ts

@@ -1,3 +1,3 @@
-import * as A from "@automerge/automerge";
-export declare const headsAreSame: <T>(a: A.unstable.Doc<T>, b: A.unstable.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,4DAIxB,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/helpers/tests/network-adapter-tests.js

@@ -31,21 +31,21 @@ export function runAdapterTests(_setup, title) {
                 const aliceHandle = aliceRepo.create();
                 // Bob receives the document
                 await eventPromise(bobRepo, "document");
-                const bobHandle = bobRepo.find(aliceHandle.documentId);
+                const bobHandle = bobRepo.find(aliceHandle.url);
                 // Alice changes the document
                 aliceHandle.change(d => {
                     d.foo = "bar";
                 });
                 // Bob receives the change
                 await eventPromise(bobHandle, "change");
-                assert.equal((await bobHandle.value()).foo, "bar");
+                assert.equal((await bobHandle.doc()).foo, "bar");
                 // Bob changes the document
                 bobHandle.change(d => {
                     d.foo = "baz";
                 });
                 // Alice receives the change
                 await eventPromise(aliceHandle, "change");
-                assert.equal((await aliceHandle.value()).foo, "baz");
+                assert.equal((await aliceHandle.doc()).foo, "baz");
             };
             // Run the test in both directions, in case they're different types of adapters
             {
@@ -69,27 +69,27 @@ export function runAdapterTests(_setup, title) {
             const charlieRepo = new Repo({ network: c, peerId: charlie });
             // Alice creates a document
             const aliceHandle = aliceRepo.create();
-            const documentId = aliceHandle.documentId;
+            const docUrl = aliceHandle.url;
             // Bob and Charlie receive the document
             await eventPromises([bobRepo, charlieRepo], "document");
-            const bobHandle = bobRepo.find(documentId);
-            const charlieHandle = charlieRepo.find(documentId);
+            const bobHandle = bobRepo.find(docUrl);
+            const charlieHandle = charlieRepo.find(docUrl);
             // Alice changes the document
             aliceHandle.change(d => {
                 d.foo = "bar";
             });
             // Bob and Charlie receive the change
             await eventPromises([bobHandle, charlieHandle], "change");
-            assert.equal((await bobHandle.value()).foo, "bar");
-            assert.equal((await charlieHandle.value()).foo, "bar");
+            assert.equal((await bobHandle.doc()).foo, "bar");
+            assert.equal((await charlieHandle.doc()).foo, "bar");
             // Charlie changes the document
             charlieHandle.change(d => {
                 d.foo = "baz";
             });
             // Alice and Bob receive the change
             await eventPromises([aliceHandle, bobHandle], "change");
-            assert.equal((await bobHandle.value()).foo, "baz");
-            assert.equal((await charlieHandle.value()).foo, "baz");
+            assert.equal((await bobHandle.doc()).foo, "baz");
+            assert.equal((await charlieHandle.doc()).foo, "baz");
             teardown();
         });
         // TODO: with BroadcastChannel, this test never ends, because it goes into an infinite loop,

package/dist/index.d.ts

@@ -1,12 +1,13 @@
 export { DocCollection } from "./DocCollection.js";
 export { DocHandle, HandleState } from "./DocHandle.js";
-export type { DocHandleChangePayload, DocHandlePatchPayload, } from "./DocHandle.js";
+export type { DocHandleChangePayload } 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";
 export { Repo, type SharePolicy } from "./Repo.js";
-export { StorageAdapter } from "./storage/StorageAdapter.js";
+export { StorageAdapter, type StorageKey } from "./storage/StorageAdapter.js";
 export { StorageSubsystem } from "./storage/StorageSubsystem.js";
 export { CollectionSynchronizer } from "./synchronizer/CollectionSynchronizer.js";
+export { parseAutomergeUrl, isValidAutomergeUrl, stringifyAutomergeUrl as generateAutomergeUrl, } from "./DocUrl.js";
 export * from "./types.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,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"}
+{"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,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAC5D,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,KAAK,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAA;AACjF,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,IAAI,oBAAoB,GAC9C,MAAM,aAAa,CAAA;AACpB,cAAc,YAAY,CAAA"}

package/dist/index.js

@@ -6,4 +6,5 @@ export { Repo } from "./Repo.js";
 export { StorageAdapter } from "./storage/StorageAdapter.js";
 export { StorageSubsystem } from "./storage/StorageSubsystem.js";
 export { CollectionSynchronizer } from "./synchronizer/CollectionSynchronizer.js";
+export { parseAutomergeUrl, isValidAutomergeUrl, stringifyAutomergeUrl as generateAutomergeUrl, } from "./DocUrl.js";
 export * from "./types.js";

package/dist/network/NetworkAdapter.d.ts

@@ -4,8 +4,8 @@ export declare abstract class NetworkAdapter extends EventEmitter<NetworkAdapter
     peerId?: PeerId;
     abstract connect(url?: string): void;
     abstract sendMessage(peerId: PeerId, channelId: ChannelId, message: Uint8Array, broadcast: boolean): void;
-    abstract join(channelId: ChannelId): void;
-    abstract leave(channelId: ChannelId): void;
+    abstract join(): void;
+    abstract leave(): void;
 }
 export interface NetworkAdapterEvents {
     open: (payload: OpenPayload) => void;
@@ -19,7 +19,6 @@ export interface OpenPayload {
 }
 export interface PeerCandidatePayload {
     peerId: PeerId;
-    channelId: ChannelId;
 }
 export interface MessagePayload {
     targetId: PeerId;

package/dist/network/NetworkAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkAdapter.d.ts","sourceRoot":"","sources":["../../src/network/NetworkAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE/C,8BAAsB,cAAe,SAAQ,YAAY,CAAC,oBAAoB,CAAC;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAEpC,QAAQ,CAAC,WAAW,CAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,OAAO,GACjB,IAAI;IAEP,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAEzC,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;CAC3C;AAID,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IACpC,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,gBAAgB,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IACzD,mBAAmB,EAAE,CAAC,OAAO,EAAE,uBAAuB,KAAK,IAAI,CAAA;IAC/D,OAAO,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAA;CAClD;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,cAAc,CAAA;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;IACpB,OAAO,EAAE,UAAU,CAAA;IACnB,SAAS,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAC3D,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,MAAM,CAAA;CACf"}
+{"version":3,"file":"NetworkAdapter.d.ts","sourceRoot":"","sources":["../../src/network/NetworkAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE/C,8BAAsB,cAAe,SAAQ,YAAY,CAAC,oBAAoB,CAAC;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAEpC,QAAQ,CAAC,WAAW,CAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,OAAO,GACjB,IAAI;IAEP,QAAQ,CAAC,IAAI,IAAI,IAAI;IAErB,QAAQ,CAAC,KAAK,IAAI,IAAI;CACvB;AAID,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IACpC,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,gBAAgB,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IACzD,mBAAmB,EAAE,CAAC,OAAO,EAAE,uBAAuB,KAAK,IAAI,CAAA;IAC/D,OAAO,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAA;CAClD;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,cAAc,CAAA;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;IACpB,OAAO,EAAE,UAAU,CAAA;IACnB,SAAS,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAC3D,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,MAAM,CAAA;CACf"}

package/dist/network/NetworkSubsystem.d.ts

@@ -8,8 +8,8 @@ export declare class NetworkSubsystem extends EventEmitter<NetworkSubsystemEvent
     constructor(adapters: NetworkAdapter[], peerId?: PeerId);
     addNetworkAdapter(networkAdapter: NetworkAdapter): void;
     sendMessage(peerId: PeerId, channelId: ChannelId, message: Uint8Array, broadcast: boolean): void;
-    join(channelId: ChannelId): void;
-    leave(channelId: ChannelId): void;
+    join(): void;
+    leave(): void;
 }
 export interface NetworkSubsystemEvents {
     peer: (payload: PeerPayload) => void;
@@ -18,6 +18,5 @@ export interface NetworkSubsystemEvents {
 }
 export interface PeerPayload {
     peerId: PeerId;
-    channelId: ChannelId;
 }
 //# sourceMappingURL=NetworkSubsystem.d.ts.map

package/dist/network/NetworkSubsystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkSubsystem.d.ts","sourceRoot":"","sources":["../../src/network/NetworkSubsystem.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EACL,qBAAqB,EACrB,cAAc,EACd,uBAAuB,EACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAI/C,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,sBAAsB,CAAC;;IAMtE,OAAO,CAAC,QAAQ;IACT,MAAM;gBADL,QAAQ,EAAE,cAAc,EAAE,EAC3B,MAAM,SAAiB;IAQhC,iBAAiB,CAAC,cAAc,EAAE,cAAc;IAsDhD,WAAW,CACT,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,OAAO;IAkBpB,IAAI,CAAC,SAAS,EAAE,SAAS;IAMzB,KAAK,CAAC,SAAS,EAAE,SAAS;CAK3B;AAQD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IACpC,mBAAmB,EAAE,CAAC,OAAO,EAAE,uBAAuB,KAAK,IAAI,CAAA;IAC/D,OAAO,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAA;CAClD;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;CACrB"}
+{"version":3,"file":"NetworkSubsystem.d.ts","sourceRoot":"","sources":["../../src/network/NetworkSubsystem.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EACL,qBAAqB,EACrB,cAAc,EACd,uBAAuB,EACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAI/C,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,sBAAsB,CAAC;;IAKtE,OAAO,CAAC,QAAQ;IACT,MAAM;gBADL,QAAQ,EAAE,cAAc,EAAE,EAC3B,MAAM,SAAiB;IAOhC,iBAAiB,CAAC,cAAc,EAAE,cAAc;IAsDhD,WAAW,CACT,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,OAAO;IAkBpB,IAAI;IAKJ,KAAK;CAIN;AAQD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IACpC,mBAAmB,EAAE,CAAC,OAAO,EAAE,uBAAuB,KAAK,IAAI,CAAA;IAC/D,OAAO,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAA;CAClD;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAA;CACf"}

package/dist/network/NetworkSubsystem.js

@@ -5,25 +5,23 @@ export class NetworkSubsystem extends EventEmitter {
     peerId;
     #log;
     #adaptersByPeer = {};
-    #channels;
     constructor(adapters, peerId = randomPeerId()) {
         super();
         this.adapters = adapters;
         this.peerId = peerId;
         this.#log = debug(`automerge-repo:network:${this.peerId}`);
-        this.#channels = [];
         this.adapters.forEach(a => this.addNetworkAdapter(a));
     }
     addNetworkAdapter(networkAdapter) {
         networkAdapter.connect(this.peerId);
-        networkAdapter.on("peer-candidate", ({ peerId, channelId }) => {
+        networkAdapter.on("peer-candidate", ({ peerId }) => {
             this.#log(`peer candidate: ${peerId} `);
             // TODO: This is where authentication would happen
             if (!this.#adaptersByPeer[peerId]) {
                 // TODO: handle losing a server here
                 this.#adaptersByPeer[peerId] = networkAdapter;
             }
-            this.emit("peer", { peerId, channelId });
+            this.emit("peer", { peerId });
         });
         networkAdapter.on("peer-disconnected", ({ peerId }) => {
             this.#log(`peer disconnected: ${peerId} `);
@@ -54,7 +52,7 @@ export class NetworkSubsystem extends EventEmitter {
                 }
             });
         });
-        this.#channels.forEach(c => networkAdapter.join(c));
+        networkAdapter.join();
     }
     sendMessage(peerId, channelId, message, broadcast) {
         if (broadcast) {
@@ -73,15 +71,13 @@ export class NetworkSubsystem extends EventEmitter {
             peer.sendMessage(peerId, channelId, message, false);
         }
     }
-    join(channelId) {
-        this.#log(`Joining channel ${channelId}`);
-        this.#channels.push(channelId);
-        this.adapters.forEach(a => a.join(channelId));
+    join() {
+        this.#log(`Joining network`);
+        this.adapters.forEach(a => a.join());
     }
-    leave(channelId) {
-        this.#log(`Leaving channel ${channelId}`);
-        this.#channels = this.#channels.filter(c => c !== channelId);
-        this.adapters.forEach(a => a.leave(channelId));
+    leave() {
+        this.#log(`Leaving network`);
+        this.adapters.forEach(a => a.leave());
     }
 }
 function randomPeerId() {

package/dist/storage/StorageAdapter.d.ts

@@ -1,8 +1,12 @@
 export declare abstract class StorageAdapter {
-    abstract load(key: string[]): Promise<Uint8Array | undefined>;
-    abstract save(key: string[], data: Uint8Array): Promise<void>;
-    abstract remove(key: string[]): Promise<void>;
-    abstract loadRange(keyPrefix: string[]): Promise<Uint8Array[]>;
-    abstract removeRange(keyPrefix: string[]): Promise<void>;
+    abstract load(key: StorageKey): Promise<Uint8Array | undefined>;
+    abstract save(key: StorageKey, data: Uint8Array): Promise<void>;
+    abstract remove(key: StorageKey): Promise<void>;
+    abstract loadRange(keyPrefix: StorageKey): Promise<{
+        key: StorageKey;
+        data: Uint8Array;
+    }[]>;
+    abstract removeRange(keyPrefix: StorageKey): Promise<void>;
 }
+export type StorageKey = string[];
 //# sourceMappingURL=StorageAdapter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"StorageAdapter.d.ts","sourceRoot":"","sources":["../../src/storage/StorageAdapter.ts"],"names":[],"mappings":"AAAA,8BAAsB,cAAc;IAMlC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAC7D,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAC7D,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,QAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAC9D,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CACzD"}
+{"version":3,"file":"StorageAdapter.d.ts","sourceRoot":"","sources":["../../src/storage/StorageAdapter.ts"],"names":[],"mappings":"AAAA,8BAAsB,cAAc;IAMlC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAC/D,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAC/D,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,QAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC;QAAC,GAAG,EAAE,UAAU,CAAC;QAAC,IAAI,EAAE,UAAU,CAAA;KAAC,EAAE,CAAC;IACzF,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAC3D;AAED,MAAM,MAAO,UAAU,GAAG,MAAM,EAAE,CAAA"}

package/dist/storage/StorageSubsystem.d.ts

@@ -1,12 +1,12 @@
 import * as A from "@automerge/automerge";
-import { DocumentId } from "../types.js";
 import { StorageAdapter } from "./StorageAdapter.js";
+import { type DocumentId } from "../types.js";
+export type ChunkType = "snapshot" | "incremental";
 export declare class StorageSubsystem {
     #private;
     constructor(storageAdapter: StorageAdapter);
-    loadBinary(documentId: DocumentId): Promise<Uint8Array>;
-    load<T>(documentId: DocumentId, prevDoc?: A.Doc<T>): Promise<A.Doc<T>>;
-    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,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAWpD,qBAAa,gBAAgB;;gBAGf,cAAc,EAAE,cAAc;IAwBpC,UAAU,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAUvD,IAAI,CAAC,CAAC,EACV,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAe,GAC9B,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAMd,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;IAQhD,MAAM,CAAC,UAAU,EAAE,UAAU;CAUpC"}
+{"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,62 +1,140 @@
 import * as A from "@automerge/automerge";
-import { mergeArrays } from "../helpers/mergeArrays.js";
 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
     const hashHex = hashArray.map(b => ("00" + b.toString(16)).slice(-2)).join(""); // convert bytes to hex string
     return hashHex;
 }
+function headsHash(heads) {
+    let encoder = new TextEncoder();
+    let headsbinary = mergeArrays(heads.map(h => encoder.encode(h)));
+    return keyHash(headsbinary);
+}
 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)];
-            return await this.#storageAdapter.save(key, binary);
+            this.#log(`Saving incremental ${key} for document ${documentId}`);
+            await this.#storageAdapter.save(key, binary);
+            if (!this.#chunkInfos.has(documentId)) {
+                this.#chunkInfos.set(documentId, []);
+            }
+            this.#chunkInfos.get(documentId).push({
+                key,
+                type: "incremental",
+                size: binary.length,
+            });
+            this.#storedHeads.set(documentId, A.getHeads(doc));
         }
         else {
-            Promise.resolve();
+            return Promise.resolve();
         }
     }
-    async #saveTotal(documentId, doc) {
+    async #saveTotal(documentId, doc, sourceChunks) {
         const binary = A.save(doc);
-        // TODO: this is still racy if two nodes are both writing to the store
-        await this.#storageAdapter.save([documentId, "snapshot"], binary);
-        // don't start deleting the incremental keys until save is done!
-        return this.#storageAdapter.removeRange([documentId, "incremental"]);
-    }
-    async loadBinary(documentId) {
-        // it would probably be best to ensure .snapshot comes back first
-        // prevent the race condition with saveIncremental
-        const binaries = await this.#storageAdapter.loadRange([
-            documentId,
-        ]);
-        return mergeArrays(binaries);
-    }
-    async load(documentId, prevDoc = A.init()) {
-        const doc = A.loadIncremental(prevDoc, await this.loadBinary(documentId));
-        A.saveIncremental(doc);
-        return doc;
-    }
-    async save(documentId, doc) {
-        if (this.#shouldCompact(documentId)) {
-            return this.#saveTotal(documentId, doc);
+        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);
+        }
+        const newChunkInfos = this.#chunkInfos.get(documentId)?.filter(c => !oldKeys.has(c.key)) ?? [];
+        newChunkInfos.push({ key, type: "snapshot", size: binary.length });
+        this.#chunkInfos.set(documentId, newChunkInfos);
+    }
+    async loadDoc(documentId) {
+        const loaded = await this.#storageAdapter.loadRange([documentId]);
+        const binaries = [];
+        const chunkInfos = [];
+        for (const chunk of loaded) {
+            const chunkType = chunkTypeFromKey(chunk.key);
+            if (chunkType == null) {
+                continue;
+            }
+            chunkInfos.push({
+                key: chunk.key,
+                type: chunkType,
+                size: chunk.data.length,
+            });
+            binaries.push(chunk.data);
+        }
+        this.#chunkInfos.set(documentId, chunkInfos);
+        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 saveDoc(documentId, doc) {
+        if (!this.#shouldSave(documentId, doc)) {
+            return;
+        }
+        let sourceChunks = this.#chunkInfos.get(documentId) ?? [];
+        if (this.#shouldCompact(sourceChunks)) {
+            this.#saveTotal(documentId, doc, sourceChunks);
         }
         else {
-            return this.#saveIncremental(documentId, doc);
+            this.#saveIncremental(documentId, doc);
         }
+        this.#storedHeads.set(documentId, A.getHeads(doc));
     }
     async remove(documentId) {
         this.#storageAdapter.remove([documentId, "snapshot"]);
         this.#storageAdapter.removeRange([documentId, "incremental"]);
     }
-    // TODO: make this, you know, good.
-    // this is probably fine
-    #shouldCompact(documentId) {
-        return Math.random() < 0.05; // this.#changeCount[documentId] >= 20
+    #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;
+        let incrementalSize = 0;
+        for (const chunk of sourceChunks) {
+            if (chunk.type === "snapshot") {
+                snapshotSize += chunk.size;
+            }
+            else {
+                incrementalSize += chunk.size;
+            }
+        }
+        return incrementalSize > snapshotSize;
+    }
+}
+function chunkTypeFromKey(key) {
+    if (key.length < 2) {
+        return null;
+    }
+    const chunkTypeStr = key[key.length - 2];
+    if (chunkTypeStr === "snapshot" || chunkTypeStr === "incremental") {
+        const chunkType = chunkTypeStr;
+        return chunkType;
+    }
+    else {
+        return null;
     }
 }

package/dist/synchronizer/CollectionSynchronizer.d.ts

@@ -1,5 +1,5 @@
 import { DocCollection } from "../DocCollection.js";
-import { ChannelId, DocumentId, PeerId } from "../types.js";
+import { ChannelId, PeerId, DocumentId } from "../types.js";
 import { Synchronizer } from "./Synchronizer.js";
 /** A CollectionSynchronizer is responsible for synchronizing a DocCollection with peers. */
 export declare class CollectionSynchronizer extends Synchronizer {

package/dist/synchronizer/CollectionSynchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CollectionSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/CollectionSynchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAKhD,4FAA4F;AAC5F,qBAAa,sBAAuB,SAAQ,YAAY;;IAO1C,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,aAAa;IAiCvC;;;OAGG;IACG,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU;IAgBrB;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,UAAU;IAUlC,cAAc,CAAC,UAAU,EAAE,UAAU;IAIrC,2DAA2D;IAC3D,OAAO,CAAC,MAAM,EAAE,MAAM;IAWtB,uDAAuD;IACvD,UAAU,CAAC,MAAM,EAAE,MAAM;CAQ1B"}
+{"version":3,"file":"CollectionSynchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/CollectionSynchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAOnD,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7E,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAKhD,4FAA4F;AAC5F,qBAAa,sBAAuB,SAAQ,YAAY;;IAO1C,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,aAAa;IAiCvC;;;OAGG;IACG,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU;IAmBrB;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,UAAU;IAUlC,cAAc,CAAC,UAAU,EAAE,UAAU;IAIrC,2DAA2D;IAC3D,OAAO,CAAC,MAAM,EAAE,MAAM;IAWtB,uDAAuD;IACvD,UAAU,CAAC,MAAM,EAAE,MAAM;CAQ1B"}