cojson 0.7.34 → 0.7.35-unique.2

package/src/coValues/account.ts

@@ -1,4 +1,4 @@
-import { CoValueCore, CoValueHeader } from "../coValueCore.js";
+import { CoValueCore, CoValueHeader, CoValueUniqueness } from "../coValueCore.js";
 import { CoID, RawCoValue } from "../coValue.js";
 import {
     AgentSecret,
@@ -63,7 +63,7 @@ export class RawAccount<
 }
 
 export interface ControlledAccountOrAgent {
-    id: AccountID | AgentID;
+    id: RawAccountID | AgentID;
     agentSecret: AgentSecret;
 
     currentAgentID: () => Result<AgentID, InvalidAccountAgentIDError>;
@@ -92,8 +92,8 @@ export class RawControlledAccount<Meta extends AccountMeta = AccountMeta>
      * Creates a new group (with the current account as the group's first admin).
      * @category 1. High-level
      */
-    createGroup() {
-        return this.core.node.createGroup();
+    createGroup(uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique()) {
+        return this.core.node.createGroup(uniqueness);
     }
 
     async acceptInvite<T extends RawCoValue>(
@@ -170,7 +170,7 @@ export class ControlledAgent implements ControlledAccountOrAgent {
 }
 
 export type AccountMeta = { type: "account" };
-export type AccountID = CoID<RawAccount>;
+export type RawAccountID = CoID<RawAccount>;
 
 export type ProfileShape = {
     name: string;

package/src/coValues/coList.ts

@@ -4,7 +4,7 @@ import { isCoValue } from "../typeUtils/isCoValue.js";
 import { CoValueCore } from "../coValueCore.js";
 import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
 import { AgentID, SessionID, TransactionID } from "../ids.js";
-import { AccountID } from "./account.js";
+import { RawAccountID } from "./account.js";
 import { RawGroup } from "./group.js";
 
 type OpID = TransactionID & { changeIdx: number };
@@ -325,7 +325,7 @@ export class RawCoListView<
     /** @category 5. Edit history */
     editAt(idx: number):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value: Item;
@@ -351,13 +351,13 @@ export class RawCoListView<
 
     /** @category 5. Edit history */
     deletionEdits(): {
-        by: AccountID | AgentID;
+        by: RawAccountID | AgentID;
         tx: TransactionID;
         at: Date;
         // TODO: add indices that are now before and after the deleted item
     }[] {
         const edits: {
-            by: AccountID | AgentID;
+            by: RawAccountID | AgentID;
             tx: TransactionID;
             at: Date;
         }[] = [];

package/src/coValues/coMap.ts

@@ -4,7 +4,7 @@ import { CoID, RawCoValue } from "../coValue.js";
 import { isCoValue } from "../typeUtils/isCoValue.js";
 import { CoValueCore } from "../coValueCore.js";
 import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
-import { AccountID } from "./account.js";
+import { RawAccountID } from "./account.js";
 import type { RawGroup } from "./group.js";
 
 type MapOp<K extends string, V extends JsonValue | undefined> = {
@@ -196,7 +196,7 @@ export class RawCoMapView<
         n: number,
     ):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value?: Shape[K];
@@ -226,7 +226,7 @@ export class RawCoMapView<
         key: K,
     ):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value?: Shape[K];

package/src/coValues/coStream.ts

@@ -7,7 +7,7 @@ import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfrom
 import { RawGroup } from "./group.js";
 import { AgentID, SessionID, TransactionID } from "../ids.js";
 import { base64URLtoBytes, bytesToBase64url } from "../base64url.js";
-import { AccountID } from "./account.js";
+import { RawAccountID } from "./account.js";
 
 export type BinaryStreamInfo = {
     mimeType: string;
@@ -111,7 +111,7 @@ export class RawCoStreamView<
         return Object.keys(this.items) as SessionID[];
     }
 
-    accounts(): Set<AccountID> {
+    accounts(): Set<RawAccountID> {
         return new Set(
             this.sessions()
                 .map(accountOrAgentIDfromSessionID)
@@ -124,7 +124,7 @@ export class RawCoStreamView<
         n: number,
     ):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value: Item;
@@ -146,7 +146,7 @@ export class RawCoStreamView<
 
     lastItemIn(sessionID: SessionID):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value: Item;
@@ -170,9 +170,9 @@ export class RawCoStreamView<
         }
     }
 
-    lastItemBy(account: AccountID | AgentID):
+    lastItemBy(account: RawAccountID | AgentID):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value: Item;
@@ -180,7 +180,7 @@ export class RawCoStreamView<
         | undefined {
         let latestItem:
             | {
-                  by: AccountID | AgentID;
+                  by: RawAccountID | AgentID;
                   tx: TransactionID;
                   at: Date;
                   value: Item;
@@ -205,7 +205,7 @@ export class RawCoStreamView<
         return latestItem;
     }
 
-    *itemsBy(account: AccountID | AgentID) {
+    *itemsBy(account: RawAccountID | AgentID) {
         // TODO: this can be made more lazy without a huge collect and sort
         const items = [
             ...Object.keys(this.items).flatMap((sessionID) =>

package/src/coValues/group.ts

@@ -5,9 +5,10 @@ import { JsonObject } from "../jsonValue.js";
 import { RawBinaryCoStream, RawCoStream } from "./coStream.js";
 import { Encrypted, KeyID, KeySecret, Sealed } from "../crypto/crypto.js";
 import { AgentID, isAgentID } from "../ids.js";
-import { RawAccount, AccountID, ControlledAccountOrAgent } from "./account.js";
+import { RawAccount, RawAccountID, ControlledAccountOrAgent } from "./account.js";
 import { Role } from "../permissions.js";
 import { base58 } from "@scure/base";
+import { CoValueUniqueness } from "../coValueCore.js";
 
 export const EVERYONE = "everyone" as const;
 export type Everyone = "everyone";
@@ -15,10 +16,10 @@ export type Everyone = "everyone";
 export type GroupShape = {
     profile: CoID<RawCoMap> | null;
     root: CoID<RawCoMap> | null;
-    [key: AccountID | AgentID]: Role;
+    [key: RawAccountID | AgentID]: Role;
     [EVERYONE]?: Role;
     readKey?: KeyID;
-    [revelationFor: `${KeyID}_for_${AccountID | AgentID}`]: Sealed<KeySecret>;
+    [revelationFor: `${KeyID}_for_${RawAccountID | AgentID}`]: Sealed<KeySecret>;
     [revelationFor: `${KeyID}_for_${Everyone}`]: KeySecret;
     [oldKeyForNewKey: `${KeyID}_for_${KeyID}`]: Encrypted<
         KeySecret,
@@ -55,12 +56,12 @@ export class RawGroup<
      *
      * @category 1. Role reading
      */
-    roleOf(accountID: AccountID): Role | undefined {
+    roleOf(accountID: RawAccountID): Role | undefined {
         return this.roleOfInternal(accountID);
     }
 
     /** @internal */
-    roleOfInternal(accountID: AccountID | AgentID): Role | undefined {
+    roleOfInternal(accountID: RawAccountID | AgentID): Role | undefined {
         return this.get(accountID);
     }
 
@@ -156,7 +157,7 @@ export class RawGroup<
             } else {
                 return false;
             }
-        }) as (AccountID | AgentID)[];
+        }) as (RawAccountID | AgentID)[];
 
         const maybeCurrentReadKey = this.core.getCurrentReadKey();
 
@@ -255,6 +256,7 @@ export class RawGroup<
         init?: M["_shape"],
         meta?: M["headerMeta"],
         initPrivacy: "trusting" | "private" = "private",
+        uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique()
     ): M {
         const map = this.core.node
             .createCoValue({
@@ -264,7 +266,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta || null,
-                ...this.core.crypto.createdNowUnique(),
+                ...uniqueness
             })
             .getCurrentContent() as M;
 
@@ -287,6 +289,7 @@ export class RawGroup<
         init?: L["_item"][],
         meta?: L["headerMeta"],
         initPrivacy: "trusting" | "private" = "private",
+        uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique()
     ): L {
         const list = this.core.node
             .createCoValue({
@@ -296,7 +299,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta || null,
-                ...this.core.crypto.createdNowUnique(),
+                ...uniqueness
             })
             .getCurrentContent() as L;
 
@@ -310,7 +313,7 @@ export class RawGroup<
     }
 
     /** @category 3. Value creation */
-    createStream<C extends RawCoStream>(meta?: C["headerMeta"]): C {
+    createStream<C extends RawCoStream>(meta?: C["headerMeta"], uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique()): C {
         return this.core.node
             .createCoValue({
                 type: "costream",
@@ -319,7 +322,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta || null,
-                ...this.core.crypto.createdNowUnique(),
+                ...uniqueness
             })
             .getCurrentContent() as C;
     }
@@ -327,6 +330,7 @@ export class RawGroup<
     /** @category 3. Value creation */
     createBinaryStream<C extends RawBinaryCoStream>(
         meta: C["headerMeta"] = { type: "binary" },
+        uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique()
     ): C {
         return this.core.node
             .createCoValue({
@@ -336,7 +340,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta,
-                ...this.core.crypto.createdNowUnique(),
+                ...uniqueness
             })
             .getCurrentContent() as C;
     }

package/src/ids.ts

@@ -1,4 +1,4 @@
-import { AccountID } from "./coValues/account.js";
+import { RawAccountID } from "./coValues/account.js";
 import { base58 } from "@scure/base";
 import { shortHashLength } from "./crypto/crypto.js";
 
@@ -28,4 +28,4 @@ export function isAgentID(id: string): id is AgentID {
     );
 }
 
-export type SessionID = `${AccountID | AgentID}_session_z${string}`;
+export type SessionID = `${RawAccountID | AgentID}_session_z${string}`;

package/src/index.ts

@@ -1,5 +1,6 @@
 import {
     CoValueCore,
+    type CoValueUniqueness,
     newRandomSessionID,
     MAX_RECOMMENDED_TX_SIZE,
     idforHeader,
@@ -50,7 +51,7 @@ import type {
 import { DisconnectedError, PingTimeoutError } from "./sync.js";
 import type { AgentSecret } from "./crypto/crypto.js";
 import type {
-    AccountID,
+    RawAccountID,
     AccountMeta,
     RawAccountMigration,
 } from "./coValues/account.js";
@@ -96,7 +97,7 @@ export {
     CoID,
     AnyRawCoValue,
     RawAccount,
-    AccountID,
+    RawAccountID,
     AccountMeta,
     RawAccountMigration,
     RawProfile as Profile,
@@ -130,6 +131,7 @@ export type {
     OutgoingSyncQueue,
     DisconnectedError,
     PingTimeoutError,
+    CoValueUniqueness
 };
 
 // eslint-disable-next-line @typescript-eslint/no-namespace

package/src/localNode.ts

@@ -2,6 +2,7 @@ import { AgentSecret, CryptoProvider } from "./crypto/crypto.js";
 import {
     CoValueCore,
     CoValueHeader,
+    CoValueUniqueness,
     newRandomSessionID,
 } from "./coValueCore.js";
 import {
@@ -19,7 +20,7 @@ import {
     ControlledAccountOrAgent,
     RawControlledAccount,
     ControlledAgent,
-    AccountID,
+    RawAccountID,
     RawProfile,
     RawAccountMigration,
     InvalidAccountAgentIDError,
@@ -81,7 +82,7 @@ export class LocalNode {
         initialAgentSecret?: AgentSecret;
     }): Promise<{
         node: LocalNode;
-        accountID: AccountID;
+        accountID: RawAccountID;
         accountSecret: AgentSecret;
         sessionID: SessionID;
     }> {
@@ -173,7 +174,7 @@ export class LocalNode {
         crypto,
         migration,
     }: {
-        accountID: AccountID;
+        accountID: RawAccountID;
         accountSecret: AgentSecret;
         sessionID: SessionID | undefined;
         peersToLoadFrom: Peer[];
@@ -470,7 +471,7 @@ export class LocalNode {
     }
 
     /** @internal */
-    expectProfileLoaded(id: AccountID, expectation?: string): RawProfile {
+    expectProfileLoaded(id: RawAccountID, expectation?: string): RawProfile {
         const account = this.expectCoValueLoaded(id, expectation);
         const profileID = expectGroup(account.getCurrentContent()).get(
             "profile",
@@ -533,7 +534,7 @@ export class LocalNode {
 
     /** @internal */
     resolveAccountAgent(
-        id: AccountID | AgentID,
+        id: RawAccountID | AgentID,
         expectation?: string,
     ): Result<AgentID, ResolveAccountAgentError> {
         if (isAgentID(id)) {
@@ -560,7 +561,7 @@ export class LocalNode {
     }
 
     resolveAccountAgentAsync(
-        id: AccountID | AgentID,
+        id: RawAccountID | AgentID,
         expectation?: string,
     ): ResultAsync<AgentID, ResolveAccountAgentError> {
         if (isAgentID(id)) {
@@ -606,12 +607,12 @@ export class LocalNode {
     /**
      * @deprecated use Account.createGroup() instead
      */
-    createGroup(): RawGroup {
+    createGroup(uniqueness: CoValueUniqueness = this.crypto.createdNowUnique()): RawGroup {
         const groupCoValue = this.createCoValue({
             type: "comap",
             ruleset: { type: "group", initialAdmin: this.account.id },
             meta: null,
-            ...this.crypto.createdNowUnique(),
+            ...uniqueness
         });
 
         const group = expectGroup(groupCoValue.getCurrentContent());
@@ -731,19 +732,19 @@ export type LoadCoValueCoreError = {
     type: "ErrorLoadingCoValueCore";
     error: unknown;
     expectation?: string;
-    id: AccountID;
+    id: RawAccountID;
 };
 
 export type AccountUnavailableFromAllPeersError = {
     type: "AccountUnavailableFromAllPeers";
     expectation?: string;
-    id: AccountID;
+    id: RawAccountID;
 };
 
 export type UnexpectedlyNotAccountError = {
     type: "UnexpectedlyNotAccount";
     expectation?: string;
-    id: AccountID;
+    id: RawAccountID;
 };
 
 export type ResolveAccountAgentError =

package/src/permissions.ts

@@ -5,13 +5,13 @@ import { KeyID } from "./crypto/crypto.js";
 import { CoValueCore, Transaction } from "./coValueCore.js";
 import { accountOrAgentIDfromSessionID } from "./typeUtils/accountOrAgentIDfromSessionID.js";
 import { AgentID, RawCoID, SessionID, TransactionID } from "./ids.js";
-import { RawAccount, AccountID, RawProfile } from "./coValues/account.js";
+import { RawAccount, RawAccountID, RawProfile } from "./coValues/account.js";
 import { parseJSON } from "./jsonStringify.js";
 import { EVERYONE, Everyone } from "./coValues/group.js";
 import { expectGroup } from "./typeUtils/expectGroup.js";
 
 export type PermissionsDef =
-    | { type: "group"; initialAdmin: AccountID | AgentID }
+    | { type: "group"; initialAdmin: RawAccountID | AgentID }
     | { type: "ownedByGroup"; group: RawCoID }
     | { type: "unsafeAllowAll" };
 
@@ -53,7 +53,7 @@ export function determineValidTransactions(
         }
 
         const memberState: {
-            [agent: AccountID | AgentID]: Role;
+            [agent: RawAccountID | AgentID]: Role;
             [EVERYONE]?: Role;
         } = {};
 
@@ -99,7 +99,7 @@ export function determineValidTransactions(
             }
 
             const change = changes[0] as
-                | MapOpPayload<AccountID | AgentID | Everyone, Role>
+                | MapOpPayload<RawAccountID | AgentID | Everyone, Role>
                 | MapOpPayload<"readKey", JsonValue>
                 | MapOpPayload<"profile", CoID<RawProfile>>;
             if (changes.length !== 1) {
@@ -303,7 +303,7 @@ export function isKeyForKeyField(co: string): co is `${KeyID}_for_${KeyID}` {
 
 export function isKeyForAccountField(
     co: string,
-): co is `${KeyID}_for_${AccountID | AgentID}` {
+): co is `${KeyID}_for_${RawAccountID | AgentID}` {
     return (
         (co.startsWith("key_") &&
             (co.includes("_for_sealer") || co.includes("_for_co"))) ||

package/src/tests/sync.test.ts

@@ -5,7 +5,7 @@ import { MapOpPayload } from "../coValues/coMap.js";
 import { RawGroup } from "../coValues/group.js";
 import { randomAnonymousAccountAndSessionID } from "./testUtils.js";
 import { connectedPeers, newQueuePair } from "../streamUtils.js";
-import { AccountID } from "../coValues/account.js";
+import { RawAccountID } from "../coValues/account.js";
 import { stableStringify } from "../jsonStringify.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { expectMap } from "../coValue.js";
@@ -1097,7 +1097,7 @@ function groupContentEx(group: RawGroup) {
     };
 }
 
-function _admContEx(adminID: AccountID) {
+function _admContEx(adminID: RawAccountID) {
     return {
         action: "content",
         id: adminID,
@@ -1111,7 +1111,7 @@ function groupStateEx(group: RawGroup) {
     };
 }
 
-function _admStateEx(adminID: AccountID) {
+function _admStateEx(adminID: RawAccountID) {
     return {
         action: "known",
         id: adminID,

package/src/typeUtils/accountOrAgentIDfromSessionID.ts

@@ -1,9 +1,9 @@
 import { AgentID, SessionID } from "../ids.js";
-import { AccountID } from "../coValues/account.js";
+import { RawAccountID } from "../coValues/account.js";
 
 export function accountOrAgentIDfromSessionID(
     sessionID: SessionID,
-): AccountID | AgentID {
+): RawAccountID | AgentID {
     const until = sessionID.indexOf("_session");
-    return sessionID.slice(0, until) as AccountID | AgentID;
+    return sessionID.slice(0, until) as RawAccountID | AgentID;
 }

package/src/typeUtils/isAccountID.ts

@@ -1,6 +1,6 @@
-import type { AccountID } from "../coValues/account.js";
+import type { RawAccountID } from "../coValues/account.js";
 import type { AgentID } from "../ids.js";
 
-export function isAccountID(id: AccountID | AgentID): id is AccountID {
+export function isAccountID(id: RawAccountID | AgentID): id is RawAccountID {
     return id.startsWith("co_");
 }