cojson 0.7.0-alpha.5 → 0.7.0

package/src/coValues/account.ts

@@ -2,25 +2,23 @@ import { CoValueCore, CoValueHeader } from "../coValueCore.js";
 import { CoID, RawCoValue } from "../coValue.js";
 import {
     AgentSecret,
+    CryptoProvider,
     SealerID,
     SealerSecret,
     SignerID,
     SignerSecret,
-    getAgentID,
-    getAgentSealerID,
-    getAgentSealerSecret,
-    getAgentSignerID,
-    getAgentSignerSecret,
-} from "../crypto.js";
+} from "../crypto/crypto.js";
 import { AgentID } from "../ids.js";
 import { RawCoMap } from "./coMap.js";
 import { RawGroup, InviteSecret } from "./group.js";
 import { LocalNode } from "../index.js";
+import { JsonObject } from "../jsonValue.js";
 
 export function accountHeaderForInitialAgentSecret(
-    agentSecret: AgentSecret
+    agentSecret: AgentSecret,
+    crypto: CryptoProvider,
 ): CoValueHeader {
-    const agent = getAgentID(agentSecret);
+    const agent = crypto.getAgentID(agentSecret);
     return {
         type: "comap",
         ruleset: { type: "group", initialAdmin: agent },
@@ -33,16 +31,16 @@ export function accountHeaderForInitialAgentSecret(
 }
 
 export class RawAccount<
-    Meta extends AccountMeta = AccountMeta
+    Meta extends AccountMeta = AccountMeta,
 > extends RawGroup<Meta> {
     currentAgentID(): AgentID {
         const agents = this.keys().filter((k): k is AgentID =>
-            k.startsWith("sealer_")
+            k.startsWith("sealer_"),
         );
 
         if (agents.length !== 1) {
             throw new Error(
-                "Expected exactly one agent in account, got " + agents.length
+                "Expected exactly one agent in account, got " + agents.length,
             );
         }
 
@@ -67,11 +65,13 @@ export class RawControlledAccount<Meta extends AccountMeta = AccountMeta>
     implements ControlledAccountOrAgent
 {
     agentSecret: AgentSecret;
+    crypto: CryptoProvider;
 
     constructor(core: CoValueCore, agentSecret: AgentSecret) {
         super(core);
 
         this.agentSecret = agentSecret;
+        this.crypto = core.node.crypto;
     }
 
     /**
@@ -84,62 +84,61 @@ export class RawControlledAccount<Meta extends AccountMeta = AccountMeta>
 
     async acceptInvite<T extends RawCoValue>(
         groupOrOwnedValueID: CoID<T>,
-        inviteSecret: InviteSecret
+        inviteSecret: InviteSecret,
     ): Promise<void> {
         return this.core.node.acceptInvite(groupOrOwnedValueID, inviteSecret);
     }
 
     currentAgentID(): AgentID {
-        return getAgentID(this.agentSecret);
+        return this.crypto.getAgentID(this.agentSecret);
     }
 
     currentSignerID(): SignerID {
-        return getAgentSignerID(this.currentAgentID());
+        return this.crypto.getAgentSignerID(this.currentAgentID());
     }
 
     currentSignerSecret(): SignerSecret {
-        return getAgentSignerSecret(this.agentSecret);
+        return this.crypto.getAgentSignerSecret(this.agentSecret);
     }
 
     currentSealerID(): SealerID {
-        return getAgentSealerID(this.currentAgentID());
+        return this.crypto.getAgentSealerID(this.currentAgentID());
     }
 
     currentSealerSecret(): SealerSecret {
-        return getAgentSealerSecret(this.agentSecret);
+        return this.crypto.getAgentSealerSecret(this.agentSecret);
     }
 }
 
 /** @hidden */
 export class ControlledAgent implements ControlledAccountOrAgent {
-    agentSecret: AgentSecret;
-
-    constructor(agentSecret: AgentSecret) {
-        this.agentSecret = agentSecret;
-    }
+    constructor(
+        public agentSecret: AgentSecret,
+        public crypto: CryptoProvider,
+    ) {}
 
     get id(): AgentID {
-        return getAgentID(this.agentSecret);
+        return this.crypto.getAgentID(this.agentSecret);
     }
 
     currentAgentID(): AgentID {
-        return getAgentID(this.agentSecret);
+        return this.crypto.getAgentID(this.agentSecret);
     }
 
     currentSignerID(): SignerID {
-        return getAgentSignerID(this.currentAgentID());
+        return this.crypto.getAgentSignerID(this.currentAgentID());
     }
 
     currentSignerSecret(): SignerSecret {
-        return getAgentSignerSecret(this.agentSecret);
+        return this.crypto.getAgentSignerSecret(this.agentSecret);
     }
 
     currentSealerID(): SealerID {
-        return getAgentSealerID(this.currentAgentID());
+        return this.crypto.getAgentSealerID(this.currentAgentID());
     }
 
     currentSealerSecret(): SealerSecret {
-        return getAgentSealerSecret(this.agentSecret);
+        return this.crypto.getAgentSealerSecret(this.agentSecret);
     }
 }
 
@@ -149,15 +148,14 @@ export type AccountID = CoID<RawAccount>;
 export type ProfileShape = {
     name: string;
 };
-export type ProfileMeta = { type: "profile" };
 
 export class RawProfile<
     Shape extends ProfileShape = ProfileShape,
-    Meta extends ProfileMeta = ProfileMeta
+    Meta extends JsonObject | null = JsonObject | null,
 > extends RawCoMap<Shape, Meta> {}
 
 export type RawAccountMigration<Meta extends AccountMeta = AccountMeta> = (
     account: RawControlledAccount<Meta>,
-    profile: RawCoMap,
-    localNode: LocalNode
+    localNode: LocalNode,
+    creationProps?: { name: string },
 ) => void | Promise<void>;

package/src/coValues/coList.ts

@@ -196,7 +196,7 @@ export class RawCoListView<
                 } else {
                     throw new Error(
                         "Unknown list operation " +
-                            (change as { op: unknown }).op
+                            (change as { op: unknown }).op,
                     );
                 }
             }
@@ -285,7 +285,7 @@ export class RawCoListView<
             value: Item;
             madeAt: number;
             opID: OpID;
-        }[]
+        }[],
     ) {
         const entry =
             this.insertions[opID.sessionID]?.[opID.txIndex]?.[opID.changeIdx];
@@ -372,7 +372,7 @@ export class RawCoListView<
                     for (const deletion of changeEntry || []) {
                         const madeAt = new Date(deletion.madeAt);
                         const by = accountOrAgentIDfromSessionID(
-                            deletion.deletionID.sessionID
+                            deletion.deletionID.sessionID,
                         );
                         edits.push({
                             by,
@@ -413,7 +413,7 @@ export class RawCoList<
     append(
         item: Item,
         after?: number,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ) {
         const entries = this.entries();
         after =
@@ -421,7 +421,7 @@ export class RawCoList<
                 ? entries.length > 0
                     ? entries.length - 1
                     : 0
-                : 0;
+                : after;
         let opIDBefore;
         if (entries.length > 0) {
             const entryBefore = entries[after];
@@ -443,7 +443,7 @@ export class RawCoList<
                     after: opIDBefore,
                 },
             ],
-            privacy
+            privacy,
         );
 
         const listAfter = new RawCoList(this.core) as this;
@@ -467,7 +467,7 @@ export class RawCoList<
     prepend(
         item: Item,
         before?: number,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ) {
         const entries = this.entries();
         before = before === undefined ? 0 : before;
@@ -496,7 +496,7 @@ export class RawCoList<
                     before: opIDAfter,
                 },
             ],
-            privacy
+            privacy,
         );
 
         const listAfter = new RawCoList(this.core) as this;
@@ -529,7 +529,7 @@ export class RawCoList<
                     insertion: entry.opID,
                 },
             ],
-            privacy
+            privacy,
         );
 
         const listAfter = new RawCoList(this.core) as this;
@@ -544,7 +544,7 @@ export class RawCoList<
     replace(
         at: number,
         newItem: Item,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ) {
         const entries = this.entries();
         const entry = entries[at];
@@ -564,7 +564,7 @@ export class RawCoList<
                     insertion: entry.opID,
                 },
             ],
-            privacy
+            privacy,
         );
         const listAfter = new RawCoList(this.core) as this;
 

package/src/coValues/coMap.ts

@@ -50,14 +50,14 @@ export class RawCoMapView<
     /** @internal */
     constructor(
         core: CoValueCore,
-        options?: { ignorePrivateTransactions: true }
+        options?: { ignorePrivateTransactions: true },
     ) {
         this.id = core.id as CoID<this>;
         this.core = core;
         this.ops = {};
 
         for (const { txID, changes, madeAt } of core.getValidSortedTransactions(
-            options
+            options,
         )) {
             for (const [changeIdx, changeUntyped] of changes.entries()) {
                 const change = changeUntyped as MapOpPayload<
@@ -105,11 +105,11 @@ export class RawCoMapView<
 
     /** @internal */
     timeFilteredOps<K extends keyof Shape & string>(
-        key: K
+        key: K,
     ): MapOp<K, Shape[K]>[] | undefined {
         if (this.atTimeFilter) {
             return this.ops[key]?.filter(
-                (op) => op.madeAt <= this.atTimeFilter!
+                (op) => op.madeAt <= this.atTimeFilter!,
             );
         } else {
             return this.ops[key];
@@ -121,13 +121,23 @@ export class RawCoMapView<
      *
      * @category 1. Reading */
     keys<K extends keyof Shape & string = keyof Shape & string>(): K[] {
-        const keys = Object.keys(this.ops) as K[];
+        return (Object.keys(this.ops) as K[]).filter((key) => {
+            const ops = this.ops[key];
+            if (!ops) {
+                return undefined;
+            }
 
-        if (this.atTimeFilter) {
-            return keys.filter((key) => this.timeFilteredOps(key)?.length);
-        } else {
-            return keys;
-        }
+            const includeUntil = this.atTimeFilter;
+            const lastEntry = includeUntil
+                ? ops.findLast((entry) => entry.madeAt <= includeUntil)
+                : ops[ops.length - 1]!;
+
+            if (lastEntry?.op === "del") {
+                return false;
+            } else {
+                return true;
+            }
+        });
     }
 
     /**
@@ -136,7 +146,7 @@ export class RawCoMapView<
      * @category 1. Reading
      **/
     get<K extends keyof Shape & string>(key: K): Shape[K] | undefined {
-        const ops = this.timeFilteredOps(key);
+        const ops = this.ops[key];
         if (!ops) {
             return undefined;
         }
@@ -183,7 +193,7 @@ export class RawCoMapView<
     /** @category 5. Edit history */
     nthEditAt<K extends keyof Shape & string>(
         key: K,
-        n: number
+        n: number,
     ):
         | {
               by: AccountID | AgentID;
@@ -213,7 +223,7 @@ export class RawCoMapView<
 
     /** @category 5. Edit history */
     lastEditAt<K extends keyof Shape & string>(
-        key: K
+        key: K,
     ):
         | {
               by: AccountID | AgentID;
@@ -270,7 +280,7 @@ export class RawCoMap<
     set<K extends keyof Shape & string>(
         key: K,
         value: Shape[K],
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ): void {
         this.core.makeTransaction(
             [
@@ -280,7 +290,7 @@ export class RawCoMap<
                     value: isCoValue(value) ? value.id : value,
                 },
             ],
-            privacy
+            privacy,
         );
 
         const after = new RawCoMap(this.core) as this;
@@ -298,7 +308,7 @@ export class RawCoMap<
      **/
     delete(
         key: keyof Shape & string,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ) {
         this.core.makeTransaction(
             [
@@ -307,7 +317,7 @@ export class RawCoMap<
                     key,
                 },
             ],
-            privacy
+            privacy,
         );
 
         const after = new RawCoMap(this.core) as this;

package/src/coValues/coStream.ts

@@ -43,7 +43,7 @@ export type CoStreamItem<Item extends JsonValue> = {
 
 export class RawCoStreamView<
     Item extends JsonValue = JsonValue,
-    Meta extends JsonObject | null = JsonObject | null
+    Meta extends JsonObject | null = JsonObject | null,
 > implements RawCoValue
 {
     id: CoID<this>;
@@ -100,7 +100,7 @@ export class RawCoStreamView<
             return undefined;
         } else if (Object.keys(this.items).length !== 1) {
             throw new Error(
-                "CoStream.getSingleStream() can only be called when there is exactly one stream"
+                "CoStream.getSingleStream() can only be called when there is exactly one stream",
             );
         }
 
@@ -115,13 +115,13 @@ export class RawCoStreamView<
         return new Set(
             this.sessions()
                 .map(accountOrAgentIDfromSessionID)
-                .filter(isAccountID)
+                .filter(isAccountID),
         );
     }
 
     nthItemIn(
         sessionID: SessionID,
-        n: number
+        n: number,
     ):
         | {
               by: AccountID | AgentID;
@@ -214,7 +214,7 @@ export class RawCoStreamView<
                           in: sessionID as SessionID,
                           ...item,
                       }))
-                    : []
+                    : [],
             ),
         ];
 
@@ -232,7 +232,7 @@ export class RawCoStreamView<
             Object.entries(this.items).map(([sessionID, items]) => [
                 sessionID,
                 items.map((item) => item.value),
-            ])
+            ]),
         );
     }
 
@@ -245,7 +245,7 @@ export class RawCoStreamView<
 
 export class RawCoStream<
         Item extends JsonValue = JsonValue,
-        Meta extends JsonObject | null = JsonObject | null
+        Meta extends JsonObject | null = JsonObject | null,
     >
     extends RawCoStreamView<Item, Meta>
     implements RawCoValue
@@ -259,13 +259,13 @@ export class RawCoStream<
 const binary_U_prefixLength = 8; // "binary_U".length;
 
 export class RawBinaryCoStreamView<
-        Meta extends BinaryCoStreamMeta = { type: "binary" }
+        Meta extends BinaryCoStreamMeta = { type: "binary" },
     >
     extends RawCoStreamView<BinaryStreamItem, Meta>
     implements RawCoValue
 {
     getBinaryChunks(
-        allowUnfinished?: boolean
+        allowUnfinished?: boolean,
     ):
         | (BinaryStreamInfo & { chunks: Uint8Array[]; finished: boolean })
         | undefined {
@@ -304,7 +304,7 @@ export class RawBinaryCoStreamView<
             }
 
             const chunk = base64URLtoBytes(
-                item.chunk.slice(binary_U_prefixLength)
+                item.chunk.slice(binary_U_prefixLength),
             );
             // totalLength += chunk.length;
             chunks.push(chunk);
@@ -331,7 +331,7 @@ export class RawBinaryCoStreamView<
 }
 
 export class RawBinaryCoStream<
-        Meta extends BinaryCoStreamMeta = { type: "binary" }
+        Meta extends BinaryCoStreamMeta = { type: "binary" },
     >
     extends RawBinaryCoStreamView<Meta>
     implements RawCoValue
@@ -340,7 +340,7 @@ export class RawBinaryCoStream<
     push(
         item: BinaryStreamItem,
         privacy: "private" | "trusting" = "private",
-        updateView: boolean = true
+        updateView: boolean = true,
     ): void {
         this.core.makeTransaction([item], privacy);
         if (updateView) {
@@ -350,7 +350,7 @@ export class RawBinaryCoStream<
 
     startBinaryStream(
         settings: BinaryStreamInfo,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ): void {
         this.push(
             {
@@ -358,13 +358,13 @@ export class RawBinaryCoStream<
                 ...settings,
             } satisfies BinaryStreamStart,
             privacy,
-            false
+            false,
         );
     }
 
     pushBinaryStreamChunk(
         chunk: Uint8Array,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ): void {
         // const before = performance.now();
         this.push(
@@ -373,7 +373,7 @@ export class RawBinaryCoStream<
                 chunk: `binary_U${bytesToBase64url(chunk)}`,
             } satisfies BinaryStreamChunk,
             privacy,
-            false
+            false,
         );
         // const after = performance.now();
         // console.log(
@@ -388,7 +388,7 @@ export class RawBinaryCoStream<
                 type: "end",
             } satisfies BinaryStreamEnd,
             privacy,
-            true
+            true,
         );
     }
 }