cojson 0.6.7 → 0.7.0-alpha.0

package/src/tests/sync.test.ts

@@ -1,9 +1,10 @@
+import { expect, test, beforeEach } from "vitest";
 import { newRandomSessionID } from "../coValueCore.js";
 import { LocalNode } from "../localNode.js";
 import { SyncMessage } from "../sync.js";
 import { expectMap } from "../coValue.js";
 import { MapOpPayload } from "../coValues/coMap.js";
-import { Group } from "../coValues/group.js";
+import { RawGroup } from "../coValues/group.js";
 import {
     randomAnonymousAccountAndSessionID,
     shouldNotResolve,
@@ -13,6 +14,12 @@ import { AccountID } from "../coValues/account.js";
 import { cojsonReady } from "../index.js";
 import { stableStringify } from "../jsonStringify.js";
 
+import { webcrypto } from "node:crypto";
+if (!("crypto" in globalThis)) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (globalThis as any).crypto = webcrypto;
+}
+
 beforeEach(async () => {
     await cojsonReady;
 });
@@ -25,9 +32,7 @@ test("Node replies with initial tx and header to empty subscribe", async () => {
 
     const map = group.createMap();
 
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
     const [inRx, inTx] = newStreamPair<SyncMessage>();
     const [outRx, outTx] = newStreamPair<SyncMessage>();
@@ -91,8 +96,8 @@ test("Node replies with initial tx and header to empty subscribe", async () => {
                         ]),
                     },
                 ],
-                lastSignature:
-                    map.core.sessionLogs.get(node.currentSessionID)!.lastSignature!,
+                lastSignature: map.core.sessionLogs.get(node.currentSessionID)!
+                    .lastSignature!,
             },
         },
     } satisfies SyncMessage);
@@ -106,10 +111,8 @@ test("Node replies with only new tx to subscribe with some known state", async (
 
     const map = group.createMap();
 
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-        editable.set("goodbye", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
+    map.set("goodbye", "world", "trusting");
 
     const [inRx, inTx] = newStreamPair<SyncMessage>();
     const [outRx, outTx] = newStreamPair<SyncMessage>();
@@ -169,8 +172,8 @@ test("Node replies with only new tx to subscribe with some known state", async (
                         ]),
                     },
                 ],
-                lastSignature:
-                    map.core.sessionLogs.get(node.currentSessionID)!.lastSignature!,
+                lastSignature: map.core.sessionLogs.get(node.currentSessionID)!
+                    .lastSignature!,
             },
         },
     } satisfies SyncMessage);
@@ -232,9 +235,7 @@ test("After subscribing, node sends own known state and new txs to peer", async
         new: {},
     } satisfies SyncMessage);
 
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
     const mapEditMsg1 = await reader.read();
 
@@ -258,15 +259,13 @@ test("After subscribing, node sends own known state and new txs to peer", async
                         ]),
                     },
                 ],
-                lastSignature:
-                    map.core.sessionLogs.get(node.currentSessionID)!.lastSignature!,
+                lastSignature: map.core.sessionLogs.get(node.currentSessionID)!
+                    .lastSignature!,
             },
         },
     } satisfies SyncMessage);
 
-    map.edit((editable) => {
-        editable.set("goodbye", "world", "trusting");
-    });
+    map.set("goodbye", "world", "trusting");
 
     const mapEditMsg2 = await reader.read();
 
@@ -290,8 +289,8 @@ test("After subscribing, node sends own known state and new txs to peer", async
                         ]),
                     },
                 ],
-                lastSignature:
-                    map.core.sessionLogs.get(node.currentSessionID)!.lastSignature!,
+                lastSignature: map.core.sessionLogs.get(node.currentSessionID)!
+                    .lastSignature!,
             },
         },
     } satisfies SyncMessage);
@@ -305,9 +304,7 @@ test("Client replies with known new content to tellKnownState from server", asyn
 
     const map = group.createMap();
 
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
     const [inRx, inTx] = newStreamPair<SyncMessage>();
     const [outRx, outTx] = newStreamPair<SyncMessage>();
@@ -369,8 +366,8 @@ test("Client replies with known new content to tellKnownState from server", asyn
                         ]),
                     },
                 ],
-                lastSignature:
-                    map.core.sessionLogs.get(node.currentSessionID)!.lastSignature!,
+                lastSignature: map.core.sessionLogs.get(node.currentSessionID)!
+                    .lastSignature!,
             },
         },
     } satisfies SyncMessage);
@@ -428,13 +425,9 @@ test("No matter the optimistic known state, node respects invalid known state me
         new: {},
     } satisfies SyncMessage);
 
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
-    map.edit((editable) => {
-        editable.set("goodbye", "world", "trusting");
-    });
+    map.set("goodbye", "world", "trusting");
 
     const _mapEditMsgs = await reader.read();
 
@@ -473,8 +466,8 @@ test("No matter the optimistic known state, node respects invalid known state me
                         ]),
                     },
                 ],
-                lastSignature:
-                    map.core.sessionLogs.get(node.currentSessionID)!.lastSignature!,
+                lastSignature: map.core.sessionLogs.get(node.currentSessionID)!
+                    .lastSignature!,
             },
         },
     } satisfies SyncMessage);
@@ -498,9 +491,7 @@ test("If we add a peer, but it never subscribes to a coValue, it won't get any m
         role: "peer",
     });
 
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
     const reader = outRx.getReader();
 
@@ -546,9 +537,7 @@ test("If we add a server peer, all updates to all coValues are sent to it, even
         sessions: {},
     } satisfies SyncMessage);
 
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
     // expect((await reader.read()).value).toMatchObject(admContEx(admin.id));
     expect((await reader.read()).value).toMatchObject(groupContentEx(group));
@@ -576,8 +565,8 @@ test("If we add a server peer, all updates to all coValues are sent to it, even
                         ]),
                     },
                 ],
-                lastSignature:
-                    map.core.sessionLogs.get(node.currentSessionID)!.lastSignature!,
+                lastSignature: map.core.sessionLogs.get(node.currentSessionID)!
+                    .lastSignature!,
             },
         },
     } satisfies SyncMessage);
@@ -769,9 +758,7 @@ test.skip("When replaying creation and transactions of a coValue as new content,
     expect(groupTellKnownStateMsg.value).toMatchObject(groupStateEx(group));
 
     expect(
-        node2.syncManager.peers["test1"]!.optimisticKnownStates[
-            group.core.id
-        ]
+        node2.syncManager.peers["test1"]!.optimisticKnownStates[group.core.id]
     ).toBeDefined();
 
     // await to1.write(adminTellKnownStateMsg.value!);
@@ -816,9 +803,7 @@ test.skip("When replaying creation and transactions of a coValue as new content,
 
     await to2.write(mapNewContentMsg.value!);
 
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
     const mapEditMsg = await from1.read();
 
@@ -842,9 +827,7 @@ test.skip("When loading a coValue on one node, the server node it is requested f
     const group = node1.createGroup();
 
     const map = group.createMap();
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
     const node2 = new LocalNode(admin, newRandomSessionID(admin.id));
 
@@ -870,9 +853,7 @@ test("Can sync a coValue through a server to another client", async () => {
     const group = client1.createGroup();
 
     const map = group.createMap();
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
     const [serverUser, serverSession] = randomAnonymousAccountAndSessionID();
 
@@ -880,7 +861,8 @@ test("Can sync a coValue through a server to another client", async () => {
 
     const [serverAsPeer, client1AsPeer] = connectedPeers("server", "client1", {
         peer1role: "server",
-        peer2role: "client", trace: true,
+        peer2role: "client",
+        trace: true,
     });
 
     client1.syncManager.addPeer(serverAsPeer);
@@ -891,7 +873,7 @@ test("Can sync a coValue through a server to another client", async () => {
     const [serverAsOtherPeer, client2AsPeer] = connectedPeers(
         "server",
         "client2",
-        { peer1role: "server", peer2role: "client", trace: true, }
+        { peer1role: "server", peer2role: "client", trace: true }
     );
 
     client2.syncManager.addPeer(serverAsOtherPeer);
@@ -915,9 +897,7 @@ test("Can sync a coValue with private transactions through a server to another c
     const group = client1.createGroup();
 
     const map = group.createMap();
-    map.edit((editable) => {
-        editable.set("hello", "world", "private");
-    });
+    map.set("hello", "world", "private");
 
     const [serverUser, serverSession] = randomAnonymousAccountAndSessionID();
 
@@ -1057,9 +1037,7 @@ test("When a peer's outgoing/writable stream closes, we remove the peer", async
     reader.releaseLock();
     await outRx.cancel();
 
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
     await new Promise((resolve) => setTimeout(resolve, 100));
 
@@ -1074,9 +1052,7 @@ test("If we start loading a coValue before connecting to a peer that has it, it
     const group = node1.createGroup();
 
     const map = group.createMap();
-    map.edit((editable) => {
-        editable.set("hello", "world", "trusting");
-    });
+    map.set("hello", "world", "trusting");
 
     const node2 = new LocalNode(admin, newRandomSessionID(admin.id));
 
@@ -1104,7 +1080,7 @@ test("If we start loading a coValue before connecting to a peer that has it, it
     );
 });
 
-function groupContentEx(group: Group) {
+function groupContentEx(group: RawGroup) {
     return {
         action: "content",
         id: group.core.id,
@@ -1118,7 +1094,7 @@ function admContEx(adminID: AccountID) {
     };
 }
 
-function groupStateEx(group: Group) {
+function groupStateEx(group: RawGroup) {
     return {
         action: "known",
         id: group.core.id,

package/src/tests/testUtils.ts

@@ -1,11 +1,10 @@
+import { expect } from "vitest";
 import { AgentSecret, createdNowUnique, getAgentID, newRandomAgentSecret  } from "../crypto.js";
 import { newRandomSessionID } from "../coValueCore.js";
 import { LocalNode } from "../localNode.js";
 import { expectGroup } from "../typeUtils/expectGroup.js";
 import { ControlledAgent } from "../coValues/account.js";
 import { SessionID } from "../ids.js";
-// @ts-ignore
-import { expect } from "bun:test";
 
 export function randomAnonymousAccountAndSessionID(): [ControlledAgent, SessionID] {
     const agentSecret = newRandomAgentSecret();
@@ -29,10 +28,8 @@ export function newGroup() {
 
     const group = expectGroup(groupCore.getCurrentContent());
 
-    group.mutate((editable) => {
-        editable.set(admin.id, "admin", "trusting");
-        expect(editable.get(admin.id)).toEqual("admin");
-    });
+    group.set(admin.id, "admin", "trusting");
+        expect(group.get(admin.id)).toEqual("admin");
 
     return { node, groupCore, admin };
 }
@@ -44,10 +41,8 @@ export function groupWithTwoAdmins() {
 
     let group = expectGroup(groupCore.getCurrentContent());
 
-    group = group.mutate((mutable) => {
-        mutable.set(otherAdmin.id, "admin", "trusting");
-        expect(mutable.get(otherAdmin.id)).toEqual("admin");
-    });
+        group.set(otherAdmin.id, "admin", "trusting");
+        expect(group.get(otherAdmin.id)).toEqual("admin");
 
     if (group.type !== "comap") {
         throw new Error("Expected map");
@@ -73,7 +68,7 @@ export function groupWithTwoAdminsHighLevel() {
 
     const otherAdmin = node.createAccount("otherAdmin");
 
-    group = group.addMember(otherAdmin, "admin");
+    group.addMember(otherAdmin, "admin");
 
     return { admin, node, group, otherAdmin };
 }

package/src/typeUtils/expectGroup.ts

@@ -1,13 +1,13 @@
-import { expectMap, type CoValue } from "../coValue.js";
-import { Group } from "../coValues/group.js";
+import { expectMap, type RawCoValue } from "../coValue.js";
+import { RawGroup } from "../coValues/group.js";
 
-export function expectGroup(content: CoValue): Group {
+export function expectGroup(content: RawCoValue): RawGroup {
     const map = expectMap(content);
     if (map.core.header.ruleset.type !== "group") {
         throw new Error("Expected group ruleset in group");
     }
 
-    if (!(map instanceof Group)) {
+    if (!(map instanceof RawGroup)) {
         throw new Error("Expected group");
     }
 

package/src/typeUtils/isCoValue.ts

@@ -1,18 +1,18 @@
-import { type CoValue } from "../coValue.js";
+import { type RawCoValue } from "../coValue.js";
 import type { JsonValue } from "../jsonValue.js";
-import { CoMap } from "../coValues/coMap.js";
-import { CoList } from "../coValues/coList.js";
-import { CoStream } from "../coValues/coStream.js";
-import { BinaryCoStream } from "../coValues/coStream.js";
+import { RawCoMap } from "../coValues/coMap.js";
+import { RawCoList } from "../coValues/coList.js";
+import { RawCoStream } from "../coValues/coStream.js";
+import { RawBinaryCoStream } from "../coValues/coStream.js";
 
 
 export function isCoValue(
-    value: JsonValue | CoValue | undefined
-): value is CoValue {
+    value: JsonValue | RawCoValue | undefined
+): value is RawCoValue {
     return (
-        value instanceof CoMap ||
-        value instanceof CoList ||
-        value instanceof CoStream ||
-        value instanceof BinaryCoStream
+        value instanceof RawCoMap ||
+        value instanceof RawCoList ||
+        value instanceof RawCoStream ||
+        value instanceof RawBinaryCoStream
     );
 }