cojson 0.3.7 → 0.4.0

package/dist/{group.js → coValues/group.js}

@@ -1,11 +1,18 @@
-import { createdNowUnique, newRandomKeySecret, seal, encryptKeySecret, getAgentSealerID, newRandomSecretSeed, agentSecretFromSecretSeed, getAgentID, } from "./crypto.js";
-import { isAgentID } from "./ids.js";
+import { expectMap } from "../coValue.js";
+import { CoMap } from "./coMap.js";
+import { createdNowUnique, newRandomKeySecret, seal, encryptKeySecret, getAgentSealerID, newRandomSecretSeed, agentSecretFromSecretSeed, getAgentID, } from "../crypto.js";
+import { isAgentID } from "../ids.js";
 import { base58 } from "@scure/base";
-export function expectGroupContent(content) {
-    if (content.type !== "comap") {
-        throw new Error("Expected map");
+export const EVERYONE = "everyone";
+export function expectGroup(content) {
+    const map = expectMap(content);
+    if (map.core.header.ruleset.type !== "group") {
+        throw new Error("Expected group ruleset in group");
     }
-    return content;
+    if (!(map instanceof Group)) {
+        throw new Error("Expected group");
+    }
+    return map;
 }
 /** A `Group` is a scope for permissions of its members (`"reader" | "writer" | "admin"`), applying to objects owned by that group.
  *
@@ -28,20 +35,7 @@ export function expectGroupContent(content) {
  *  const localNode.createGroup();
  *  ```
  * */
-export class Group {
-    /** @internal */
-    constructor(underlyingMap, node) {
-        this.underlyingMap = underlyingMap;
-        this.node = node;
-    }
-    /**
-     * Returns the `CoID` of the `Group`.
-     *
-     * @category 4. Underlying CoMap
-     */
-    get id() {
-        return this.underlyingMap.id;
-    }
+export class Group extends CoMap {
     /**
      * Returns the current role of a given account.
      *
@@ -52,7 +46,7 @@ export class Group {
     }
     /** @internal */
     roleOfInternal(accountID) {
-        return this.underlyingMap.get(accountID);
+        return this.get(accountID);
     }
     /**
      * Returns the role of the current account in the group.
@@ -60,7 +54,7 @@ export class Group {
      * @category 1. Role reading
      */
     myRole() {
-        return this.roleOfInternal(this.node.account.id);
+        return this.roleOfInternal(this.core.node.account.id);
     }
     /**
      * Directly grants a new member a role in the group. The current account must be an
@@ -69,47 +63,55 @@ export class Group {
      * @category 2. Role changing
      */
     addMember(accountID, role) {
-        this.addMemberInternal(accountID, role);
+        return this.addMemberInternal(accountID, role);
     }
     /** @internal */
     addMemberInternal(accountID, role) {
-        this.underlyingMap = this.underlyingMap.mutate((map) => {
-            const currentReadKey = this.underlyingMap.core.getCurrentReadKey();
+        return this.mutate((mutable) => {
+            const currentReadKey = this.core.getCurrentReadKey();
             if (!currentReadKey.secret) {
                 throw new Error("Can't add member without read key secret");
             }
-            const agent = this.node.resolveAccountAgent(accountID, "Expected to know agent to add them to group");
-            map.set(accountID, role, "trusting");
-            if (map.get(accountID) !== role) {
-                throw new Error("Failed to set role");
+            if (accountID === EVERYONE) {
+                if (!(role === "reader" || role === "writer")) {
+                    throw new Error("Can't make everyone something other than reader or writer");
+                }
+                mutable.set(accountID, role, "trusting");
+                if (mutable.get(accountID) !== role) {
+                    throw new Error("Failed to set role");
+                }
+                mutable.set(`${currentReadKey.id}_for_${EVERYONE}`, currentReadKey.secret, "trusting");
+            }
+            else {
+                const agent = this.core.node.resolveAccountAgent(accountID, "Expected to know agent to add them to group");
+                mutable.set(accountID, role, "trusting");
+                if (mutable.get(accountID) !== role) {
+                    throw new Error("Failed to set role");
+                }
+                mutable.set(`${currentReadKey.id}_for_${accountID}`, seal({
+                    message: currentReadKey.secret,
+                    from: this.core.node.account.currentSealerSecret(),
+                    to: getAgentSealerID(agent),
+                    nOnceMaterial: {
+                        in: this.id,
+                        tx: this.core.nextTransactionID(),
+                    },
+                }), "trusting");
             }
-            map.set(`${currentReadKey.id}_for_${accountID}`, seal({
-                message: currentReadKey.secret,
-                from: this.underlyingMap.core.node.account.currentSealerSecret(),
-                to: getAgentSealerID(agent),
-                nOnceMaterial: {
-                    in: this.underlyingMap.core.id,
-                    tx: this.underlyingMap.core.nextTransactionID(),
-                },
-            }), "trusting");
         });
     }
     /** @internal */
     rotateReadKey() {
-        const currentlyPermittedReaders = this.underlyingMap
-            .keys()
-            .filter((key) => {
+        const currentlyPermittedReaders = this.keys().filter((key) => {
             if (key.startsWith("co_") || isAgentID(key)) {
-                const role = this.underlyingMap.get(key);
-                return (role === "admin" ||
-                    role === "writer" ||
-                    role === "reader");
+                const role = this.get(key);
+                return (role === "admin" || role === "writer" || role === "reader");
             }
             else {
                 return false;
             }
         });
-        const maybeCurrentReadKey = this.underlyingMap.core.getCurrentReadKey();
+        const maybeCurrentReadKey = this.core.getCurrentReadKey();
         if (!maybeCurrentReadKey.secret) {
             throw new Error("Can't rotate read key secret we don't have access to");
         }
@@ -118,24 +120,24 @@ export class Group {
             secret: maybeCurrentReadKey.secret,
         };
         const newReadKey = newRandomKeySecret();
-        this.underlyingMap = this.underlyingMap.mutate((map) => {
+        return this.mutate((mutable) => {
             for (const readerID of currentlyPermittedReaders) {
-                const reader = this.node.resolveAccountAgent(readerID, "Expected to know currently permitted reader");
-                map.set(`${newReadKey.id}_for_${readerID}`, seal({
+                const reader = this.core.node.resolveAccountAgent(readerID, "Expected to know currently permitted reader");
+                mutable.set(`${newReadKey.id}_for_${readerID}`, seal({
                     message: newReadKey.secret,
-                    from: this.underlyingMap.core.node.account.currentSealerSecret(),
+                    from: this.core.node.account.currentSealerSecret(),
                     to: getAgentSealerID(reader),
                     nOnceMaterial: {
-                        in: this.underlyingMap.core.id,
-                        tx: this.underlyingMap.core.nextTransactionID(),
+                        in: this.id,
+                        tx: this.core.nextTransactionID(),
                     },
                 }), "trusting");
             }
-            map.set(`${currentReadKey.id}_for_${newReadKey.id}`, encryptKeySecret({
+            mutable.set(`${currentReadKey.id}_for_${newReadKey.id}`, encryptKeySecret({
                 encrypting: newReadKey,
                 toEncrypt: currentReadKey,
             }).encrypted, "trusting");
-            map.set("readKey", newReadKey.id, "trusting");
+            mutable.set("readKey", newReadKey.id, "trusting");
         });
     }
     /**
@@ -146,14 +148,14 @@ export class Group {
      * @category 2. Role changing
      */
     removeMember(accountID) {
-        this.removeMemberInternal(accountID);
+        return this.removeMemberInternal(accountID);
     }
     /** @internal */
     removeMemberInternal(accountID) {
-        this.underlyingMap = this.underlyingMap.mutate((map) => {
+        const afterRevoke = this.mutate((map) => {
             map.set(accountID, "revoked", "trusting");
         });
-        this.rotateReadKey();
+        return afterRevoke.rotateReadKey();
     }
     /**
      * Creates an invite for new members to indirectly join the group,
@@ -175,13 +177,13 @@ export class Group {
      *
      * @category 3. Value creation
      */
-    createMap(init, meta, initPrivacy = "trusting") {
-        let map = this.node
+    createMap(init, meta, initPrivacy = "private") {
+        let map = this.core.node
             .createCoValue({
             type: "comap",
             ruleset: {
                 type: "ownedByGroup",
-                group: this.underlyingMap.id,
+                group: this.id,
             },
             meta: meta || null,
             ...createdNowUnique(),
@@ -200,13 +202,13 @@ export class Group {
      *
      * @category 3. Value creation
      */
-    createList(init, meta, initPrivacy = "trusting") {
-        let list = this.node
+    createList(init, meta, initPrivacy = "private") {
+        let list = this.core.node
             .createCoValue({
             type: "colist",
             ruleset: {
                 type: "ownedByGroup",
-                group: this.underlyingMap.id,
+                group: this.id,
             },
             meta: meta || null,
             ...createdNowUnique(),
@@ -221,12 +223,12 @@ export class Group {
     }
     /** @category 3. Value creation */
     createStream(meta) {
-        return this.node
+        return this.core.node
             .createCoValue({
             type: "costream",
             ruleset: {
                 type: "ownedByGroup",
-                group: this.underlyingMap.id,
+                group: this.id,
             },
             meta: meta || null,
             ...createdNowUnique(),
@@ -235,24 +237,18 @@ export class Group {
     }
     /** @category 3. Value creation */
     createBinaryStream(meta = { type: "binary" }) {
-        return this.node
+        return this.core.node
             .createCoValue({
             type: "costream",
             ruleset: {
                 type: "ownedByGroup",
-                group: this.underlyingMap.id,
+                group: this.id,
             },
             meta: meta,
             ...createdNowUnique(),
         })
             .getCurrentContent();
     }
-    /** @internal */
-    testWithDifferentAccount(account, sessionId) {
-        return new Group(expectGroupContent(this.underlyingMap.core
-            .testWithDifferentAccount(account, sessionId)
-            .getCurrentContent()), this.node);
-    }
 }
 function inviteSecretFromSecretSeed(secretSeed) {
     return `inviteSecret_z${base58.encode(secretSeed)}`;

package/dist/coValues/group.js.map

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

package/dist/ids.d.ts

@@ -1,4 +1,4 @@
-import { AccountID } from './account.js';
+import { AccountID } from './coValues/account.js';
 export type RawCoID = `co_z${string}`;
 export declare function rawCoIDtoBytes(id: RawCoID): Uint8Array;
 export declare function rawCoIDfromBytes(bytes: Uint8Array): RawCoID;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { CoValueCore, newRandomSessionID, MAX_RECOMMENDED_TX_SIZE } from "./coValueCore.js";
+import { CoValueCore, newRandomSessionID, MAX_RECOMMENDED_TX_SIZE, accountOrAgentIDfromSessionID } from "./coValueCore.js";
 import { LocalNode } from "./localNode.js";
 import type { CoValue } from "./coValue.js";
 import { CoMap, MutableCoMap } from "./coValues/coMap.js";
@@ -6,23 +6,26 @@ import { CoList, MutableCoList } from "./coValues/coList.js";
 import { CoStream, MutableCoStream, BinaryCoStream, MutableBinaryCoStream } from "./coValues/coStream.js";
 import { agentSecretFromBytes, agentSecretToBytes, getAgentID, newRandomAgentSecret, newRandomSecretSeed, agentSecretFromSecretSeed, cryptoReady } from "./crypto.js";
 import { connectedPeers } from "./streamUtils.js";
-import { AnonymousControlledAccount, ControlledAccount } from "./account.js";
+import { AnonymousControlledAccount, ControlledAccount } from "./coValues/account.js";
 import { rawCoIDtoBytes, rawCoIDfromBytes } from "./ids.js";
-import { Group, expectGroupContent } from "./group.js";
+import { Group, expectGroup, EVERYONE } from "./coValues/group.js";
 import { base64URLtoBytes, bytesToBase64url } from "./base64url.js";
 import { parseJSON } from "./jsonStringify.js";
+import { Account, Profile, isAccountID } from "./coValues/account.js";
 import type { SessionID, AgentID } from "./ids.js";
 import type { CoID, AnyCoValue } from "./coValue.js";
-import type { Queried } from "./queries.js";
+import type { Queried, QueryExtension } from "./queries.js";
 import type { QueriedCoStream } from "./queriedCoValues/queriedCoStream.js";
 import type { QueriedCoList } from "./queriedCoValues/queriedCoList.js";
 import type { QueriedCoMap } from "./queriedCoValues/queriedCoMap.js";
+import { QueriedAccount } from "./queriedCoValues/queriedAccount.js";
+import { QueriedGroup } from "./queriedCoValues/queriedGroup.js";
 import type { BinaryStreamInfo, BinaryCoStreamMeta } from "./coValues/coStream.js";
 import type { JsonValue } from "./jsonValue.js";
 import type { SyncMessage, Peer } from "./sync.js";
 import type { AgentSecret } from "./crypto.js";
-import type { AccountID, Account, Profile } from "./account.js";
-import type { InviteSecret } from "./group.js";
+import type { AccountID, AccountMeta, AccountMigration, ProfileMeta } from "./coValues/account.js";
+import type { InviteSecret } from "./coValues/group.js";
 import type * as Media from "./media.js";
 type Value = JsonValue | AnyCoValue;
 /** @hidden */
@@ -39,12 +42,14 @@ export declare const cojsonInternals: {
     agentSecretFromSecretSeed: typeof agentSecretFromSecretSeed;
     secretSeedLength: number;
     shortHashLength: number;
-    expectGroupContent: typeof expectGroupContent;
+    expectGroup: typeof expectGroup;
     base64URLtoBytes: typeof base64URLtoBytes;
     bytesToBase64url: typeof bytesToBase64url;
     parseJSON: typeof parseJSON;
+    accountOrAgentIDfromSessionID: typeof accountOrAgentIDfromSessionID;
+    isAccountID: typeof isAccountID;
 };
-export { LocalNode, Group, CoMap, MutableCoMap, CoList, MutableCoList, CoStream, MutableCoStream, BinaryCoStream, MutableBinaryCoStream, CoValue, CoID, AnyCoValue, Queried, QueriedCoMap, QueriedCoList, QueriedCoStream, AccountID, Account, Profile, SessionID, Media, CoValueCore, AnonymousControlledAccount, ControlledAccount, cryptoReady as cojsonReady, MAX_RECOMMENDED_TX_SIZE, Value, JsonValue, Peer, BinaryStreamInfo, BinaryCoStreamMeta, AgentID, AgentSecret, InviteSecret, SyncMessage, };
+export { LocalNode, Group, EVERYONE, CoMap, MutableCoMap, CoList, MutableCoList, CoStream, MutableCoStream, BinaryCoStream, MutableBinaryCoStream, CoValue, CoID, AnyCoValue, Queried, QueriedCoMap, QueriedCoList, QueriedCoStream, QueriedGroup, QueriedAccount, Account, AccountID, AccountMeta, AccountMigration, Profile, ProfileMeta, SessionID, Media, CoValueCore, AnonymousControlledAccount, ControlledAccount, cryptoReady as cojsonReady, MAX_RECOMMENDED_TX_SIZE, Value, JsonValue, Peer, BinaryStreamInfo, BinaryCoStreamMeta, AgentID, AgentSecret, InviteSecret, SyncMessage, QueryExtension, };
 export declare namespace CojsonInternalTypes {
     type CoValueKnownState = import("./sync.js").CoValueKnownState;
     type DoneMessage = import("./sync.js").DoneMessage;
@@ -55,9 +60,8 @@ export declare namespace CojsonInternalTypes {
     type Transaction = import("./coValueCore.js").Transaction;
     type Signature = import("./crypto.js").Signature;
     type RawCoID = import("./ids.js").RawCoID;
-    type AccountContent = import("./account.js").AccountContent;
-    type ProfileContent = import("./account.js").ProfileContent;
-    type ProfileMeta = import("./account.js").ProfileMeta;
+    type ProfileShape = import("./coValues/account.js").ProfileShape;
+    type ProfileMeta = import("./coValues/account.js").ProfileMeta;
     type SealerSecret = import("./crypto.js").SealerSecret;
     type SignerSecret = import("./crypto.js").SignerSecret;
 }

package/dist/index.js

@@ -1,15 +1,18 @@
-import { CoValueCore, newRandomSessionID, MAX_RECOMMENDED_TX_SIZE, } from "./coValueCore.js";
+import { CoValueCore, newRandomSessionID, MAX_RECOMMENDED_TX_SIZE, accountOrAgentIDfromSessionID } from "./coValueCore.js";
 import { LocalNode } from "./localNode.js";
 import { CoMap, MutableCoMap } from "./coValues/coMap.js";
 import { CoList, MutableCoList } from "./coValues/coList.js";
 import { CoStream, MutableCoStream, BinaryCoStream, MutableBinaryCoStream, } from "./coValues/coStream.js";
 import { agentSecretFromBytes, agentSecretToBytes, getAgentID, newRandomAgentSecret, newRandomSecretSeed, agentSecretFromSecretSeed, secretSeedLength, shortHashLength, cryptoReady, } from "./crypto.js";
 import { connectedPeers } from "./streamUtils.js";
-import { AnonymousControlledAccount, ControlledAccount } from "./account.js";
+import { AnonymousControlledAccount, ControlledAccount, } from "./coValues/account.js";
 import { rawCoIDtoBytes, rawCoIDfromBytes } from "./ids.js";
-import { Group, expectGroupContent } from "./group.js";
+import { Group, expectGroup, EVERYONE } from "./coValues/group.js";
 import { base64URLtoBytes, bytesToBase64url } from "./base64url.js";
 import { parseJSON } from "./jsonStringify.js";
+import { Account, Profile, isAccountID } from "./coValues/account.js";
+import { QueriedAccount } from "./queriedCoValues/queriedAccount.js";
+import { QueriedGroup } from "./queriedCoValues/queriedGroup.js";
 /** @hidden */
 export const cojsonInternals = {
     agentSecretFromBytes,
@@ -24,10 +27,12 @@ export const cojsonInternals = {
     agentSecretFromSecretSeed,
     secretSeedLength,
     shortHashLength,
-    expectGroupContent,
+    expectGroup,
     base64URLtoBytes,
     bytesToBase64url,
     parseJSON,
+    accountOrAgentIDfromSessionID,
+    isAccountID,
 };
-export { LocalNode, Group, CoMap, MutableCoMap, CoList, MutableCoList, CoStream, MutableCoStream, BinaryCoStream, MutableBinaryCoStream, CoValueCore, AnonymousControlledAccount, ControlledAccount, cryptoReady as cojsonReady, MAX_RECOMMENDED_TX_SIZE, };
+export { LocalNode, Group, EVERYONE, CoMap, MutableCoMap, CoList, MutableCoList, CoStream, MutableCoStream, BinaryCoStream, MutableBinaryCoStream, QueriedGroup, QueriedAccount, Account, Profile, CoValueCore, AnonymousControlledAccount, ControlledAccount, cryptoReady as cojsonReady, MAX_RECOMMENDED_TX_SIZE, };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EACX,kBAAkB,EAClB,uBAAuB,GAC1B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACH,QAAQ,EACR,eAAe,EACf,cAAc,EACd,qBAAqB,GACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACH,oBAAoB,EACpB,kBAAkB,EAClB,UAAU,EACV,oBAAoB,EACpB,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,EAChB,eAAe,EACf,WAAW,GACd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAqB/C,cAAc;AACd,MAAM,CAAC,MAAM,eAAe,GAAG;IAC3B,oBAAoB;IACpB,kBAAkB;IAClB,kBAAkB;IAClB,oBAAoB;IACpB,cAAc;IACd,UAAU;IACV,cAAc;IACd,gBAAgB;IAChB,mBAAmB;IACnB,yBAAyB;IACzB,gBAAgB;IAChB,eAAe;IACf,kBAAkB;IAClB,gBAAgB;IAChB,gBAAgB;IAChB,SAAS;CACZ,CAAC;AAEF,OAAO,EACH,SAAS,EACT,KAAK,EACL,KAAK,EACL,YAAY,EACZ,MAAM,EACN,aAAa,EACb,QAAQ,EACR,eAAe,EACf,cAAc,EACd,qBAAqB,EAarB,WAAW,EACX,0BAA0B,EAC1B,iBAAiB,EACjB,WAAW,IAAI,WAAW,EAC1B,uBAAuB,GAU1B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EACX,kBAAkB,EAClB,uBAAuB,EACvB,6BAA6B,EAChC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACH,QAAQ,EACR,eAAe,EACf,cAAc,EACd,qBAAqB,GACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACH,oBAAoB,EACpB,kBAAkB,EAClB,UAAU,EACV,oBAAoB,EACpB,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,EAChB,eAAe,EACf,WAAW,GACd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EACH,0BAA0B,EAC1B,iBAAiB,GACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAQtE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAcjE,cAAc;AACd,MAAM,CAAC,MAAM,eAAe,GAAG;IAC3B,oBAAoB;IACpB,kBAAkB;IAClB,kBAAkB;IAClB,oBAAoB;IACpB,cAAc;IACd,UAAU;IACV,cAAc;IACd,gBAAgB;IAChB,mBAAmB;IACnB,yBAAyB;IACzB,gBAAgB;IAChB,eAAe;IACf,WAAW;IACX,gBAAgB;IAChB,gBAAgB;IAChB,SAAS;IACT,6BAA6B;IAC7B,WAAW;CACd,CAAC;AAEF,OAAO,EACH,SAAS,EACT,KAAK,EACL,QAAQ,EACR,KAAK,EACL,YAAY,EACZ,MAAM,EACN,aAAa,EACb,QAAQ,EACR,eAAe,EACf,cAAc,EACd,qBAAqB,EAQrB,YAAY,EACZ,cAAc,EACd,OAAO,EAIP,OAAO,EAIP,WAAW,EACX,0BAA0B,EAC1B,iBAAiB,EACjB,WAAW,IAAI,WAAW,EAC1B,uBAAuB,GAW1B,CAAC"}

package/dist/localNode.d.ts

@@ -1,12 +1,14 @@
 import { AgentSecret } from "./crypto.js";
 import { CoValueCore, CoValueHeader } from "./coValueCore.js";
-import { InviteSecret, Group } from "./group.js";
+import { InviteSecret, Group } from "./coValues/group.js";
 import { Peer, SyncManager } from "./sync.js";
 import { AgentID, RawCoID, SessionID } from "./ids.js";
 import { CoID } from "./coValue.js";
 import { Queried } from "./queries.js";
-import { GeneralizedControlledAccount, ControlledAccount, AccountID, Profile } from "./account.js";
+import { Account, AccountMeta, GeneralizedControlledAccount, ControlledAccount, AccountID, Profile, AccountMigration } from "./coValues/account.js";
+import { CoMap } from "./coValues/coMap.js";
 import { CoValue } from "./index.js";
+import { QueriedAccount } from "./queriedCoValues/queriedAccount.js";
 /** A `LocalNode` represents a local view of a set of loaded `CoValue`s, from the perspective of a particular account (or primitive cryptographic agent).
 
 A `LocalNode` can have peers that it syncs to, for example some form of local persistence, or a sync server, such as `sync.jazz.tools` (Jazz Global Mesh).
@@ -32,14 +34,24 @@ export declare class LocalNode {
     /** @category 3. Low-level */
     constructor(account: GeneralizedControlledAccount, currentSessionID: SessionID);
     /** @category 2. Node Creation */
-    static withNewlyCreatedAccount(name: string, initialAgentSecret?: `sealerSecret_z${string}/signerSecret_z${string}`): {
+    static withNewlyCreatedAccount<P extends Profile = Profile, R extends CoMap = CoMap, Meta extends AccountMeta = AccountMeta>({ name, migration, initialAgentSecret, }: {
+        name: string;
+        migration?: AccountMigration<P, R, Meta>;
+        initialAgentSecret?: AgentSecret;
+    }): {
         node: LocalNode;
         accountID: AccountID;
         accountSecret: AgentSecret;
         sessionID: SessionID;
     };
     /** @category 2. Node Creation */
-    static withLoadedAccount(accountID: AccountID, accountSecret: AgentSecret, sessionID: SessionID, peersToLoadFrom: Peer[]): Promise<LocalNode>;
+    static withLoadedAccount<P extends Profile = Profile, R extends CoMap = CoMap, Meta extends AccountMeta = AccountMeta>({ accountID, accountSecret, sessionID, peersToLoadFrom, migration, }: {
+        accountID: AccountID;
+        accountSecret: AgentSecret;
+        sessionID: SessionID;
+        peersToLoadFrom: Peer[];
+        migration?: AccountMigration<P, R, Meta>;
+    }): Promise<LocalNode>;
     /** @internal */
     createCoValue(header: CoValueHeader): CoValueCore;
     /** @internal */
@@ -56,7 +68,9 @@ export declare class LocalNode {
     subscribe<T extends CoValue>(id: CoID<T>, callback: (update: T) => void): () => void;
     /** @category 1. High-level */
     query<T extends CoValue>(id: CoID<T>, callback: (update: Queried<T> | undefined) => void): () => void;
-    /** @category 1. High-level */
+    query<P extends Profile = Profile, R extends CoMap = CoMap, Meta extends AccountMeta = AccountMeta>(id: "me", callback: (update: QueriedAccount<Account<P, R, Meta>> | undefined) => void): () => void;
+    query(id: CoID<CoValue> | "me", callback: (update: Queried<CoValue> | QueriedAccount | undefined) => void): () => void;
+    /** @deprecated Use Account.acceptInvite instead */
     acceptInvite<T extends CoValue>(groupOrOwnedValueID: CoID<T>, inviteSecret: InviteSecret): Promise<void>;
     /** @internal */
     expectCoValueLoaded(id: RawCoID, expectation?: string): CoValueCore;
@@ -67,8 +81,7 @@ export declare class LocalNode {
     /** @internal */
     resolveAccountAgent(id: AccountID | AgentID, expectation?: string): AgentID;
     /**
-     * Creates a new group (with the current account as the group's first admin).
-     * @category 1. High-level
+     * @deprecated use Account.createGroup() instead
      */
     createGroup(): Group;
     /** @internal */