jazz-tools 0.13.16 → 0.13.18

package/dist/subscribe/index.d.ts

@@ -0,0 +1,21 @@
+import type { CoValue, RefEncoded } from "../internal.js";
+import { SubscriptionScope } from "./SubscriptionScope.js";
+export declare function getSubscriptionScope<D extends CoValue>(value: D): SubscriptionScope<D>;
+/** Autoload internals */
+/**
+ * Given a coValue, access a child coValue by key
+ *
+ * By subscribing to a given key, the subscription will automatically react to the id changes
+ * on that key (e.g. deleting the key value will result on unsubscribing from the id)
+ */
+export declare function accessChildByKey<D extends CoValue>(parent: D, childId: string, key: string): any;
+/**
+ * Given a coValue, access a child coValue by id
+ *
+ * By subscribing to a given id, the subscription becomes permanent and will unsubscribe
+ * only when the root subscription scope is destroyed.
+ *
+ * Used for refs that never change (e.g. CoFeed entries, CoMap edits)
+ */
+export declare function accessChildById<D extends CoValue>(parent: D, childId: string, schema: RefEncoded<CoValue>): any;
+//# sourceMappingURL=index.d.ts.map

package/dist/subscribe/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/subscribe/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAgB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,OAAO,EAAE,KAAK,EAAE,CAAC,wBAwB/D;AAED,yBAAyB;AAEzB;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,OAAO,EAChD,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,OAeZ;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,CAAC,SAAS,OAAO,EAC/C,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,OAa5B"}

package/dist/subscribe/types.d.ts

@@ -0,0 +1,12 @@
+import type { CoValue, RefsToResolve, Resolved } from "../internal.js";
+import type { JazzError } from "./JazzError.js";
+export type SubscriptionValue<D extends CoValue, R extends RefsToResolve<D>> = {
+    type: "loaded";
+    value: Resolved<D, R>;
+    id: string;
+} | JazzError;
+export type Unloaded = {
+    type: "unloaded";
+    id: string;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/subscribe/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/subscribe/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,IACvE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GACrD,SAAS,CAAC;AACd,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/dist/subscribe/utils.d.ts

@@ -0,0 +1,10 @@
+import { RawCoValue } from "cojson";
+import { CoValue, RefEncoded } from "../internal.js";
+import { SubscriptionScope } from "./SubscriptionScope.js";
+export declare function getOwnerFromRawValue(raw: RawCoValue): import("../exports.js").Account | import("../exports.js").Group;
+export declare function createCoValue<D extends CoValue>(ref: RefEncoded<D>, raw: RawCoValue, subscriptionScope: SubscriptionScope<D>): {
+    type: "loaded";
+    value: D;
+    id: import("../internal.js").ID<D>;
+};
+//# sourceMappingURL=utils.d.ts.map

package/dist/subscribe/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/subscribe/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAY,MAAM,QAAQ,CAAC;AAE1D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAyB,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,mEAQnD;AAED,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,EAC7C,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,EAClB,GAAG,EAAE,UAAU,EACf,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;EAgBxC"}

package/dist/testing.js

@@ -5,7 +5,7 @@ import {
   createAnonymousJazzContext,
   createJazzContext,
   randomSessionProvider
-} from "./chunk-GIZWJXSR.js";
+} from "./chunk-ITSHLDQB.js";
 
 // src/testing.ts
 import { LocalNode } from "cojson";
@@ -110,7 +110,7 @@ var TestJazzContextManager = class _TestJazzContextManager extends JazzContextMa
     const node = account._raw.core.node;
     const credentials = {
       accountID: account.id,
-      accountSecret: node.account.agentSecret,
+      accountSecret: node.getCurrentAgent().agentSecret,
       secretSeed: SecretSeedMap.get(account.id),
       provider
     };

package/dist/testing.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/testing.ts"],"sourcesContent":["import { AgentSecret, CryptoProvider, LocalNode, Peer } from \"cojson\";\nimport { cojsonInternals } from \"cojson\";\nimport { PureJSCrypto } from \"cojson/dist/crypto/PureJSCrypto\";\nimport {\n  Account,\n  AccountClass,\n  AuthCredentials,\n  JazzContextManagerAuthProps,\n} from \"./exports.js\";\nimport {\n  JazzContextManager,\n  JazzContextManagerBaseProps,\n} from \"./implementation/ContextManager.js\";\nimport { activeAccountContext } from \"./implementation/activeAccountContext.js\";\nimport {\n  type AnonymousJazzAgent,\n  type CoValueClass,\n  createAnonymousJazzContext,\n  createJazzContext,\n  randomSessionProvider,\n} from \"./internal.js\";\n\nconst syncServer: { current: LocalNode | null } = { current: null };\n\ntype TestAccountSchema<Acc extends Account> = CoValueClass<Acc> & {\n  fromNode: (typeof Account)[\"fromNode\"];\n  create: (options: {\n    creationProps: { name: string };\n    initialAgentSecret?: AgentSecret;\n    peersToLoadFrom?: Peer[];\n    crypto: CryptoProvider;\n  }) => Promise<Acc>;\n};\n\nexport class TestJSCrypto extends PureJSCrypto {\n  static async create() {\n    if (\"navigator\" in globalThis && navigator.userAgent?.includes(\"jsdom\")) {\n      // Mocking crypto seal & encrypt to make it work with JSDom. Getting \"Error: Uint8Array expected\" there\n      const crypto = new PureJSCrypto();\n\n      crypto.seal = (options) =>\n        `sealed_U${cojsonInternals.stableStringify(options.message)}` as any;\n      crypto.unseal = (sealed) =>\n        JSON.parse(sealed.substring(\"sealed_U\".length));\n      crypto.encrypt = (message) =>\n        `encrypted_U${cojsonInternals.stableStringify(message)}` as any;\n      crypto.decryptRaw = (encrypted) =>\n        encrypted.substring(\"encrypted_U\".length) as any;\n\n      return crypto;\n    }\n\n    // For non-jsdom environments, we use the real crypto\n    return new PureJSCrypto();\n  }\n}\n\nexport function getPeerConnectedToTestSyncServer() {\n  if (!syncServer.current) {\n    throw new Error(\"Sync server not initialized\");\n  }\n\n  const [aPeer, bPeer] = cojsonInternals.connectedPeers(\n    Math.random().toString(),\n    Math.random().toString(),\n    {\n      peer1role: \"server\",\n      peer2role: \"server\",\n    },\n  );\n  syncServer.current.syncManager.addPeer(aPeer);\n\n  return bPeer;\n}\n\nconst SecretSeedMap = new Map<string, Uint8Array>();\nlet isMigrationActive = false;\n\nexport async function createJazzTestAccount<Acc extends Account>(options?: {\n  isCurrentActiveAccount?: boolean;\n  AccountSchema?: CoValueClass<Acc>;\n  creationProps?: Record<string, unknown>;\n}): Promise<Acc> {\n  const AccountSchema = (options?.AccountSchema ??\n    Account) as unknown as TestAccountSchema<Acc>;\n  const peers = [];\n  if (syncServer.current) {\n    peers.push(getPeerConnectedToTestSyncServer());\n  }\n\n  const crypto = await TestJSCrypto.create();\n  const secretSeed = crypto.newRandomSecretSeed();\n\n  const { node } = await LocalNode.withNewlyCreatedAccount({\n    creationProps: {\n      name: \"Test Account\",\n      ...options?.creationProps,\n    },\n    initialAgentSecret: crypto.agentSecretFromSecretSeed(secretSeed),\n    crypto,\n    peersToLoadFrom: peers,\n    migration: async (rawAccount, _node, creationProps) => {\n      if (isMigrationActive) {\n        throw new Error(\n          \"It is not possible to create multiple accounts in parallel inside the test environment.\",\n        );\n      }\n\n      isMigrationActive = true;\n\n      const account = new AccountSchema({\n        fromRaw: rawAccount,\n      });\n\n      // We need to set the account as current because the migration\n      // will probably rely on the global me\n      const prevActiveAccount = activeAccountContext.maybeGet();\n      activeAccountContext.set(account);\n\n      await account.applyMigration?.(creationProps);\n\n      if (!options?.isCurrentActiveAccount) {\n        activeAccountContext.set(prevActiveAccount);\n      }\n\n      isMigrationActive = false;\n    },\n  });\n\n  const account = AccountSchema.fromNode(node);\n  SecretSeedMap.set(account.id, secretSeed);\n\n  if (options?.isCurrentActiveAccount) {\n    activeAccountContext.set(account);\n  }\n\n  return account;\n}\n\nexport function setActiveAccount(account: Account) {\n  activeAccountContext.set(account);\n}\n\nexport async function createJazzTestGuest() {\n  const ctx = await createAnonymousJazzContext({\n    crypto: await PureJSCrypto.create(),\n    peersToLoadFrom: [],\n  });\n\n  return {\n    guest: ctx.agent,\n  };\n}\n\nexport type TestJazzContextManagerProps<Acc extends Account> =\n  JazzContextManagerBaseProps<Acc> & {\n    defaultProfileName?: string;\n    AccountSchema?: AccountClass<Acc>;\n    isAuthenticated?: boolean;\n  };\n\nexport class TestJazzContextManager<\n  Acc extends Account,\n> extends JazzContextManager<Acc, TestJazzContextManagerProps<Acc>> {\n  static fromAccountOrGuest<Acc extends Account>(\n    account?: Acc | { guest: AnonymousJazzAgent },\n    props?: TestJazzContextManagerProps<Acc>,\n  ) {\n    if (account && \"guest\" in account) {\n      return this.fromGuest<Acc>(account, props);\n    }\n\n    return this.fromAccount<Acc>(account ?? (Account.getMe() as Acc), props);\n  }\n\n  static fromAccount<Acc extends Account>(\n    account: Acc,\n    props?: TestJazzContextManagerProps<Acc>,\n  ) {\n    const context = new TestJazzContextManager<Acc>();\n\n    const provider = props?.isAuthenticated ? \"testProvider\" : \"anonymous\";\n    const storage = context.getAuthSecretStorage();\n    const node = account._raw.core.node;\n\n    const credentials = {\n      accountID: account.id,\n      accountSecret: node.account.agentSecret,\n      secretSeed: SecretSeedMap.get(account.id),\n      provider,\n    } satisfies AuthCredentials;\n\n    storage.set(credentials);\n\n    context.updateContext(\n      {\n        AccountSchema: account.constructor as AccountClass<Acc>,\n        ...props,\n      },\n      {\n        me: account,\n        node,\n        done: () => {\n          node.gracefulShutdown();\n        },\n        logOut: async () => {\n          await storage.clear();\n          node.gracefulShutdown();\n        },\n      },\n      {\n        credentials,\n      },\n    );\n\n    return context;\n  }\n\n  static fromGuest<Acc extends Account>(\n    { guest }: { guest: AnonymousJazzAgent },\n    props: TestJazzContextManagerProps<Acc> = {},\n  ) {\n    const context = new TestJazzContextManager<Acc>();\n    const node = guest.node;\n\n    context.updateContext(props, {\n      guest,\n      node,\n      done: () => {\n        node.gracefulShutdown();\n      },\n      logOut: async () => {\n        node.gracefulShutdown();\n      },\n    });\n\n    return context;\n  }\n\n  async getNewContext(\n    props: TestJazzContextManagerProps<Acc>,\n    authProps?: JazzContextManagerAuthProps,\n  ) {\n    if (!syncServer.current) {\n      throw new Error(\n        \"You need to setup a test sync server with setupJazzTestSync to use the Auth functions\",\n      );\n    }\n\n    const context = await createJazzContext<Acc>({\n      credentials: authProps?.credentials,\n      defaultProfileName: props.defaultProfileName,\n      newAccountProps: authProps?.newAccountProps,\n      peersToLoadFrom: [getPeerConnectedToTestSyncServer()],\n      crypto: await TestJSCrypto.create(),\n      sessionProvider: randomSessionProvider,\n      authSecretStorage: this.getAuthSecretStorage(),\n      AccountSchema: props.AccountSchema,\n    });\n\n    return {\n      me: context.account,\n      node: context.node,\n      done: () => {\n        context.done();\n      },\n      logOut: () => {\n        return context.logOut();\n      },\n    };\n  }\n}\n\nexport async function linkAccounts(\n  a: Account,\n  b: Account,\n  aRole: \"server\" | \"client\" = \"server\",\n  bRole: \"server\" | \"client\" = \"server\",\n) {\n  const [aPeer, bPeer] = cojsonInternals.connectedPeers(b.id, a.id, {\n    peer1role: aRole,\n    peer2role: bRole,\n  });\n\n  a._raw.core.node.syncManager.addPeer(aPeer);\n  b._raw.core.node.syncManager.addPeer(bPeer);\n\n  await a.waitForAllCoValuesSync();\n  await b.waitForAllCoValuesSync();\n}\n\nexport async function setupJazzTestSync() {\n  if (syncServer.current) {\n    syncServer.current.gracefulShutdown();\n  }\n\n  const account = await Account.create({\n    creationProps: {\n      name: \"Test Account\",\n    },\n    crypto: await TestJSCrypto.create(),\n  });\n\n  syncServer.current = account._raw.core.node;\n\n  return account;\n}\n"],"mappings":"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","names":["account"]}
+{"version":3,"sources":["../src/testing.ts"],"sourcesContent":["import { AgentSecret, CryptoProvider, LocalNode, Peer } from \"cojson\";\nimport { cojsonInternals } from \"cojson\";\nimport { PureJSCrypto } from \"cojson/dist/crypto/PureJSCrypto\";\nimport {\n  Account,\n  AccountClass,\n  AuthCredentials,\n  JazzContextManagerAuthProps,\n} from \"./exports.js\";\nimport {\n  JazzContextManager,\n  JazzContextManagerBaseProps,\n} from \"./implementation/ContextManager.js\";\nimport { activeAccountContext } from \"./implementation/activeAccountContext.js\";\nimport {\n  type AnonymousJazzAgent,\n  type CoValueClass,\n  createAnonymousJazzContext,\n  createJazzContext,\n  randomSessionProvider,\n} from \"./internal.js\";\n\nconst syncServer: { current: LocalNode | null } = { current: null };\n\ntype TestAccountSchema<Acc extends Account> = CoValueClass<Acc> & {\n  fromNode: (typeof Account)[\"fromNode\"];\n  create: (options: {\n    creationProps: { name: string };\n    initialAgentSecret?: AgentSecret;\n    peersToLoadFrom?: Peer[];\n    crypto: CryptoProvider;\n  }) => Promise<Acc>;\n};\n\nexport class TestJSCrypto extends PureJSCrypto {\n  static async create() {\n    if (\"navigator\" in globalThis && navigator.userAgent?.includes(\"jsdom\")) {\n      // Mocking crypto seal & encrypt to make it work with JSDom. Getting \"Error: Uint8Array expected\" there\n      const crypto = new PureJSCrypto();\n\n      crypto.seal = (options) =>\n        `sealed_U${cojsonInternals.stableStringify(options.message)}` as any;\n      crypto.unseal = (sealed) =>\n        JSON.parse(sealed.substring(\"sealed_U\".length));\n      crypto.encrypt = (message) =>\n        `encrypted_U${cojsonInternals.stableStringify(message)}` as any;\n      crypto.decryptRaw = (encrypted) =>\n        encrypted.substring(\"encrypted_U\".length) as any;\n\n      return crypto;\n    }\n\n    // For non-jsdom environments, we use the real crypto\n    return new PureJSCrypto();\n  }\n}\n\nexport function getPeerConnectedToTestSyncServer() {\n  if (!syncServer.current) {\n    throw new Error(\"Sync server not initialized\");\n  }\n\n  const [aPeer, bPeer] = cojsonInternals.connectedPeers(\n    Math.random().toString(),\n    Math.random().toString(),\n    {\n      peer1role: \"server\",\n      peer2role: \"server\",\n    },\n  );\n  syncServer.current.syncManager.addPeer(aPeer);\n\n  return bPeer;\n}\n\nconst SecretSeedMap = new Map<string, Uint8Array>();\nlet isMigrationActive = false;\n\nexport async function createJazzTestAccount<Acc extends Account>(options?: {\n  isCurrentActiveAccount?: boolean;\n  AccountSchema?: CoValueClass<Acc>;\n  creationProps?: Record<string, unknown>;\n}): Promise<Acc> {\n  const AccountSchema = (options?.AccountSchema ??\n    Account) as unknown as TestAccountSchema<Acc>;\n  const peers = [];\n  if (syncServer.current) {\n    peers.push(getPeerConnectedToTestSyncServer());\n  }\n\n  const crypto = await TestJSCrypto.create();\n  const secretSeed = crypto.newRandomSecretSeed();\n\n  const { node } = await LocalNode.withNewlyCreatedAccount({\n    creationProps: {\n      name: \"Test Account\",\n      ...options?.creationProps,\n    },\n    initialAgentSecret: crypto.agentSecretFromSecretSeed(secretSeed),\n    crypto,\n    peersToLoadFrom: peers,\n    migration: async (rawAccount, _node, creationProps) => {\n      if (isMigrationActive) {\n        throw new Error(\n          \"It is not possible to create multiple accounts in parallel inside the test environment.\",\n        );\n      }\n\n      isMigrationActive = true;\n\n      const account = new AccountSchema({\n        fromRaw: rawAccount,\n      });\n\n      // We need to set the account as current because the migration\n      // will probably rely on the global me\n      const prevActiveAccount = activeAccountContext.maybeGet();\n      activeAccountContext.set(account);\n\n      await account.applyMigration?.(creationProps);\n\n      if (!options?.isCurrentActiveAccount) {\n        activeAccountContext.set(prevActiveAccount);\n      }\n\n      isMigrationActive = false;\n    },\n  });\n\n  const account = AccountSchema.fromNode(node);\n  SecretSeedMap.set(account.id, secretSeed);\n\n  if (options?.isCurrentActiveAccount) {\n    activeAccountContext.set(account);\n  }\n\n  return account;\n}\n\nexport function setActiveAccount(account: Account) {\n  activeAccountContext.set(account);\n}\n\nexport async function createJazzTestGuest() {\n  const ctx = await createAnonymousJazzContext({\n    crypto: await PureJSCrypto.create(),\n    peersToLoadFrom: [],\n  });\n\n  return {\n    guest: ctx.agent,\n  };\n}\n\nexport type TestJazzContextManagerProps<Acc extends Account> =\n  JazzContextManagerBaseProps<Acc> & {\n    defaultProfileName?: string;\n    AccountSchema?: AccountClass<Acc>;\n    isAuthenticated?: boolean;\n  };\n\nexport class TestJazzContextManager<\n  Acc extends Account,\n> extends JazzContextManager<Acc, TestJazzContextManagerProps<Acc>> {\n  static fromAccountOrGuest<Acc extends Account>(\n    account?: Acc | { guest: AnonymousJazzAgent },\n    props?: TestJazzContextManagerProps<Acc>,\n  ) {\n    if (account && \"guest\" in account) {\n      return this.fromGuest<Acc>(account, props);\n    }\n\n    return this.fromAccount<Acc>(account ?? (Account.getMe() as Acc), props);\n  }\n\n  static fromAccount<Acc extends Account>(\n    account: Acc,\n    props?: TestJazzContextManagerProps<Acc>,\n  ) {\n    const context = new TestJazzContextManager<Acc>();\n\n    const provider = props?.isAuthenticated ? \"testProvider\" : \"anonymous\";\n    const storage = context.getAuthSecretStorage();\n    const node = account._raw.core.node;\n\n    const credentials = {\n      accountID: account.id,\n      accountSecret: node.getCurrentAgent().agentSecret,\n      secretSeed: SecretSeedMap.get(account.id),\n      provider,\n    } satisfies AuthCredentials;\n\n    storage.set(credentials);\n\n    context.updateContext(\n      {\n        AccountSchema: account.constructor as AccountClass<Acc>,\n        ...props,\n      },\n      {\n        me: account,\n        node,\n        done: () => {\n          node.gracefulShutdown();\n        },\n        logOut: async () => {\n          await storage.clear();\n          node.gracefulShutdown();\n        },\n      },\n      {\n        credentials,\n      },\n    );\n\n    return context;\n  }\n\n  static fromGuest<Acc extends Account>(\n    { guest }: { guest: AnonymousJazzAgent },\n    props: TestJazzContextManagerProps<Acc> = {},\n  ) {\n    const context = new TestJazzContextManager<Acc>();\n    const node = guest.node;\n\n    context.updateContext(props, {\n      guest,\n      node,\n      done: () => {\n        node.gracefulShutdown();\n      },\n      logOut: async () => {\n        node.gracefulShutdown();\n      },\n    });\n\n    return context;\n  }\n\n  async getNewContext(\n    props: TestJazzContextManagerProps<Acc>,\n    authProps?: JazzContextManagerAuthProps,\n  ) {\n    if (!syncServer.current) {\n      throw new Error(\n        \"You need to setup a test sync server with setupJazzTestSync to use the Auth functions\",\n      );\n    }\n\n    const context = await createJazzContext<Acc>({\n      credentials: authProps?.credentials,\n      defaultProfileName: props.defaultProfileName,\n      newAccountProps: authProps?.newAccountProps,\n      peersToLoadFrom: [getPeerConnectedToTestSyncServer()],\n      crypto: await TestJSCrypto.create(),\n      sessionProvider: randomSessionProvider,\n      authSecretStorage: this.getAuthSecretStorage(),\n      AccountSchema: props.AccountSchema,\n    });\n\n    return {\n      me: context.account,\n      node: context.node,\n      done: () => {\n        context.done();\n      },\n      logOut: () => {\n        return context.logOut();\n      },\n    };\n  }\n}\n\nexport async function linkAccounts(\n  a: Account,\n  b: Account,\n  aRole: \"server\" | \"client\" = \"server\",\n  bRole: \"server\" | \"client\" = \"server\",\n) {\n  const [aPeer, bPeer] = cojsonInternals.connectedPeers(b.id, a.id, {\n    peer1role: aRole,\n    peer2role: bRole,\n  });\n\n  a._raw.core.node.syncManager.addPeer(aPeer);\n  b._raw.core.node.syncManager.addPeer(bPeer);\n\n  await a.waitForAllCoValuesSync();\n  await b.waitForAllCoValuesSync();\n}\n\nexport async function setupJazzTestSync() {\n  if (syncServer.current) {\n    syncServer.current.gracefulShutdown();\n  }\n\n  const account = await Account.create({\n    creationProps: {\n      name: \"Test Account\",\n    },\n    crypto: await TestJSCrypto.create(),\n  });\n\n  syncServer.current = account._raw.core.node;\n\n  return account;\n}\n"],"mappings":"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","names":["account"]}

package/dist/tests/coMap.record.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=coMap.record.test.d.ts.map

package/dist/tests/coMap.record.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"coMap.record.test.d.ts","sourceRoot":"","sources":["../../src/tests/coMap.record.test.ts"],"names":[],"mappings":""}

package/dist/tests/utils.d.ts

@@ -4,7 +4,7 @@ export declare function setupAccount(): Promise<{
     me: Account & {
         isLocalNodeOwner: true;
         sessionID: import("cojson").SessionID;
-        _raw: import("cojson").RawControlledAccount;
+        _raw: import("cojson").RawAccount;
     };
     meOnSecondPeer: Account;
 }>;
@@ -16,6 +16,6 @@ export declare function setupTwoNodes(options?: {
     clientAccount: Account;
     serverAccount: Account;
 }>;
-export declare function waitFor(callback: () => boolean | void): Promise<void>;
+export declare function waitFor(callback: () => boolean | void | Promise<boolean | void>): Promise<void>;
 export declare function loadCoValueOrFail<V extends RawCoValue>(node: LocalNode, id: CoID<V>): Promise<V>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/tests/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/tests/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGrD,OAAO,EACL,OAAO,EAGR,MAAM,UAAU,CAAC;AAIlB,wBAAsB,YAAY;;;;;;;GA+BjC;AAED,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE;IAC5C,mBAAmB,CAAC,EAAE,OAAO,OAAO,CAAC;CACtC;;;;;GAgDA;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,MAAM,OAAO,GAAG,IAAI,iBA0BrD;AAED,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,UAAU,EAC1D,IAAI,EAAE,SAAS,EACf,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,GACV,OAAO,CAAC,CAAC,CAAC,CAMZ"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/tests/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGrD,OAAO,EACL,OAAO,EAGR,MAAM,UAAU,CAAC;AAIlB,wBAAsB,YAAY;;;;;;;GA+BjC;AAED,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE;IAC5C,mBAAmB,CAAC,EAAE,OAAO,OAAO,CAAC;CACtC;;;;;GAgDA;AAED,wBAAgB,OAAO,CACrB,QAAQ,EAAE,MAAM,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,iBA2BzD;AAED,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,UAAU,EAC1D,IAAI,EAAE,SAAS,EACf,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,GACV,OAAO,CAAC,CAAC,CAAC,CAMZ"}

package/package.json

@@ -17,11 +17,11 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.13.16",
+  "version": "0.13.18",
   "dependencies": {
     "@scure/bip39": "^1.3.0",
     "fast-myers-diff": "^3.2.0",
-    "cojson": "0.13.16"
+    "cojson": "0.13.18"
   },
   "devDependencies": {
     "tsup": "8.3.5",

package/src/coValues/account.ts

@@ -1,6 +1,7 @@
 import {
   AgentSecret,
   CoID,
+  ControlledAccount,
   CryptoProvider,
   Everyone,
   InviteSecret,
@@ -9,7 +10,6 @@ import {
   RawAccount,
   RawCoMap,
   RawCoValue,
-  RawControlledAccount,
   Role,
   SessionID,
   cojsonInternals,
@@ -31,6 +31,7 @@ import {
   SchemaInit,
   SubscribeListenerOptions,
   SubscribeRestArgs,
+  accessChildByKey,
   ensureCoValueLoaded,
   inspect,
   loadCoValue,
@@ -38,7 +39,6 @@ import {
   parseSubscribeRestArgs,
   subscribeToCoValueWithoutMe,
   subscribeToExistingCoValue,
-  subscriptionsScopes,
 } from "../internal.js";
 import { coValuesCache } from "../lib/cache.js";
 import { RegisteredAccount } from "../types.js";
@@ -57,7 +57,7 @@ export type AccountCreationProps = {
 export class Account extends CoValueBase implements CoValue {
   declare id: ID<this>;
   declare _type: "Account";
-  declare _raw: RawAccount | RawControlledAccount;
+  declare _raw: RawAccount;
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   static _schema: any;
@@ -86,10 +86,12 @@ export class Account extends CoValueBase implements CoValue {
   get _loadedAs(): Account | AnonymousJazzAgent {
     if (this.isLocalNodeOwner) return this;
 
-    const rawAccount = this._raw.core.node.account;
+    const agent = this._raw.core.node.getCurrentAgent();
 
-    if (rawAccount instanceof RawAccount) {
-      return coValuesCache.get(rawAccount, () => Account.fromRaw(rawAccount));
+    if (agent instanceof ControlledAccount) {
+      return coValuesCache.get(agent.account, () =>
+        Account.fromRaw(agent.account),
+      );
     }
 
     return new AnonymousJazzAgent(this._raw.core.node);
@@ -98,6 +100,16 @@ export class Account extends CoValueBase implements CoValue {
   declare profile: Profile | null;
   declare root: CoMap | null;
 
+  getDescriptor(key: string) {
+    if (key === "profile") {
+      return this._schema.profile;
+    } else if (key === "root") {
+      return this._schema.root;
+    }
+
+    return undefined;
+  }
+
   get _refs(): {
     profile: RefIfCoValue<Profile> | undefined;
     root: RefIfCoValue<CoMap> | undefined;
@@ -118,6 +130,7 @@ export class Account extends CoValueBase implements CoValue {
           this._schema.profile as RefEncoded<
             NonNullable<this["profile"]> & CoValue
           >,
+          this,
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
         ) as any as RefIfCoValue<this["profile"]>),
       root:
@@ -126,6 +139,7 @@ export class Account extends CoValueBase implements CoValue {
           rootID,
           this._loadedAs,
           this._schema.root as RefEncoded<NonNullable<this["root"]> & CoValue>,
+          this,
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
         ) as any as RefIfCoValue<this["root"]>),
     };
@@ -144,13 +158,13 @@ export class Account extends CoValueBase implements CoValue {
   isLocalNodeOwner: boolean;
   sessionID: SessionID | undefined;
 
-  constructor(options: { fromRaw: RawAccount | RawControlledAccount }) {
+  constructor(options: { fromRaw: RawAccount }) {
     super();
     if (!("fromRaw" in options)) {
       throw new Error("Can only construct account from raw or with .create()");
     }
     this.isLocalNodeOwner =
-      options.fromRaw.id == options.fromRaw.core.node.account.id;
+      options.fromRaw.id == options.fromRaw.core.node.getCurrentAgent().id;
 
     Object.defineProperties(this, {
       id: {
@@ -196,10 +210,15 @@ export class Account extends CoValueBase implements CoValue {
     ref: Ref<RegisteredAccount> | undefined;
     account: RegisteredAccount | null | undefined;
   }> {
-    const ref = new Ref<RegisteredAccount>(this.id, this._loadedAs, {
-      ref: () => this.constructor as typeof Account,
-      optional: false,
-    });
+    const ref = new Ref<RegisteredAccount>(
+      this.id,
+      this._loadedAs,
+      {
+        ref: () => this.constructor as typeof Account,
+        optional: false,
+      },
+      this,
+    );
 
     return [{ id: this.id, role: "admin", ref, account: this }];
   }
@@ -234,7 +253,7 @@ export class Account extends CoValueBase implements CoValue {
       throw new Error("Only a controlled account can accept invites");
     }
 
-    await (this._raw as RawControlledAccount).acceptInvite(
+    await this._raw.core.node.acceptInvite(
       valueID as unknown as CoID<RawCoValue>,
       inviteSecret,
     );
@@ -304,7 +323,7 @@ export class Account extends CoValueBase implements CoValue {
     node: LocalNode,
   ): A {
     return new this({
-      fromRaw: node.account as RawControlledAccount,
+      fromRaw: node.expectCurrentAccount("jazz-tools/Account.fromNode"),
     }) as A;
   }
 
@@ -440,16 +459,14 @@ export class Account extends CoValueBase implements CoValue {
 
 export const AccountAndGroupProxyHandler: ProxyHandler<Account | Group> = {
   get(target, key, receiver) {
-    if (key === "profile") {
-      const ref = target._refs.profile;
-      return ref
-        ? ref.accessFrom(receiver, "profile")
-        : // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          (undefined as any);
-    } else if (key === "root") {
-      const ref = target._refs.root;
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      return ref ? ref.accessFrom(receiver, "root") : (undefined as any);
+    if (key === "profile" || key === "root") {
+      const id = target._raw.get(key);
+
+      if (id) {
+        return accessChildByKey(target, id, key);
+      } else {
+        return undefined;
+      }
     } else {
       return Reflect.get(target, key, receiver);
     }
@@ -471,17 +488,12 @@ export const AccountAndGroupProxyHandler: ProxyHandler<Account | Group> = {
           "trusting",
         );
       }
-      subscriptionsScopes
-        .get(receiver)
-        ?.onRefAccessedOrSet(target.id, value.id);
+
       return true;
     } else if (key === "root") {
       if (value) {
         target._raw.set("root", value.id as unknown as CoID<RawCoMap>);
       }
-      subscriptionsScopes
-        .get(receiver)
-        ?.onRefAccessedOrSet(target.id, value.id);
       return true;
     } else {
       return Reflect.set(target, key, value, receiver);
@@ -507,7 +519,7 @@ export const AccountAndGroupProxyHandler: ProxyHandler<Account | Group> = {
 export function isControlledAccount(account: Account): account is Account & {
   isLocalNodeOwner: true;
   sessionID: SessionID;
-  _raw: RawControlledAccount;
+  _raw: RawAccount;
 } {
   return account.isLocalNodeOwner;
 }

package/src/coValues/coFeed.ts

@@ -30,6 +30,7 @@ import {
   ItemsSym,
   Ref,
   SchemaInit,
+  accessChildById,
   co,
   ensureCoValueLoaded,
   inspect,
@@ -230,6 +231,10 @@ export class CoFeed<Item = any> extends CoValueBase implements CoValue {
     return instance;
   }
 
+  getItemsDescriptor() {
+    return this._schema?.[ItemsSym];
+  }
+
   /**
    * Push items to this `CoFeed`
    *
@@ -438,9 +443,10 @@ function entryFromRawEntry<Item>(
       } else if ("encoded" in itemField) {
         return itemField.encoded.decode(rawEntry.value);
       } else if (isRefEncoded(itemField)) {
-        return this.ref?.accessFrom(
+        return accessChildById(
           accessFrom,
-          rawEntry.by + rawEntry.tx.sessionID + rawEntry.tx.txIndex + ".value",
+          rawEntry.value as string,
+          itemField,
         ) as NonNullable<Item> extends CoValue ? (CoValue & Item) | null : Item;
       } else {
         throw new Error("Invalid item field schema");
@@ -455,6 +461,7 @@ function entryFromRawEntry<Item>(
           rawId as unknown as ID<CoValue>,
           loadedAs,
           itemField,
+          accessFrom,
         ) as NonNullable<Item> extends CoValue ? Ref<NonNullable<Item>> : never;
       } else {
         return undefined as never;
@@ -463,13 +470,10 @@ function entryFromRawEntry<Item>(
     get by() {
       return (
         accountID &&
-        new Ref<Account>(accountID as unknown as ID<Account>, loadedAs, {
+        accessChildById(accessFrom, accountID, {
           ref: RegisteredSchemas["Account"],
           optional: false,
-        })?.accessFrom(
-          accessFrom,
-          rawEntry.by + rawEntry.tx.sessionID + rawEntry.tx.txIndex + ".by",
-        )
+        })
       );
     },
     madeAt: rawEntry.at,
@@ -906,13 +910,24 @@ export class FileStream extends CoValueBase implements CoValue {
    * Subscribe to a `FileStream`, when you have an ID but don't have a `FileStream` instance yet
    * @category Subscription & Loading
    */
-  static subscribe<C extends FileStream>(
-    this: CoValueClass<C>,
-    id: ID<C>,
-    options: { loadAs?: Account | AnonymousJazzAgent },
-    listener: (value: Resolved<C, true>) => void,
+  static subscribe<F extends FileStream, const R extends RefsToResolve<F>>(
+    this: CoValueClass<F>,
+    id: ID<F>,
+    listener: (value: Resolved<F, R>, unsubscribe: () => void) => void,
+  ): () => void;
+  static subscribe<F extends FileStream, const R extends RefsToResolve<F>>(
+    this: CoValueClass<F>,
+    id: ID<F>,
+    options: SubscribeListenerOptions<F, R>,
+    listener: (value: Resolved<F, R>, unsubscribe: () => void) => void,
+  ): () => void;
+  static subscribe<F extends FileStream, const R extends RefsToResolve<F>>(
+    this: CoValueClass<F>,
+    id: ID<F>,
+    ...args: SubscribeRestArgs<F, R>
   ): () => void {
-    return subscribeToCoValueWithoutMe<C, true>(this, id, options, listener);
+    const { options, listener } = parseSubscribeRestArgs(args);
+    return subscribeToCoValueWithoutMe<F, R>(this, id, options, listener);
   }
 
   /**

package/src/coValues/coList.ts

@@ -1,5 +1,5 @@
 import type { JsonValue, RawCoList } from "cojson";
-import { RawAccount } from "cojson";
+import { ControlledAccount, RawAccount } from "cojson";
 import { calcPatch } from "fast-myers-diff";
 import type {
   CoValue,
@@ -21,6 +21,7 @@ import {
   ItemsSym,
   Ref,
   SchemaInit,
+  accessChildByKey,
   co,
   ensureCoValueLoaded,
   inspect,
@@ -31,7 +32,6 @@ import {
   parseSubscribeRestArgs,
   subscribeToCoValueWithoutMe,
   subscribeToExistingCoValue,
-  subscriptionsScopes,
 } from "../internal.js";
 import { coValuesCache } from "../lib/cache.js";
 import { RegisteredAccount } from "../types.js";
@@ -147,6 +147,7 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
     >;
   } {
     return makeRefs<number>(
+      this,
       (idx) => this._raw.get(idx) as unknown as ID<CoValue>,
       () => Array.from({ length: this._raw.entries().length }, (_, idx) => idx),
       this._loadedAs,
@@ -167,11 +168,11 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
   }
 
   get _loadedAs() {
-    const rawAccount = this._raw.core.node.account;
+    const agent = this._raw.core.node.getCurrentAgent();
 
-    if (rawAccount instanceof RawAccount) {
-      return coValuesCache.get(rawAccount, () =>
-        RegisteredSchemas["Account"].fromRaw(rawAccount),
+    if (agent instanceof ControlledAccount) {
+      return coValuesCache.get(agent.account, () =>
+        RegisteredSchemas["Account"].fromRaw(agent.account),
       );
     }
 
@@ -182,6 +183,10 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
     return Array;
   }
 
+  getItemsDescriptor() {
+    return this._schema?.[ItemsSym];
+  }
+
   constructor(options: { fromRaw: RawCoList } | undefined) {
     super();
 
@@ -526,12 +531,7 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
   castAs<Cl extends CoValueClass & CoValueFromRaw<CoValue>>(
     cl: Cl,
   ): InstanceType<Cl> {
-    const casted = cl.fromRaw(this._raw) as InstanceType<Cl>;
-    const subscriptionScope = subscriptionsScopes.get(this);
-    if (subscriptionScope) {
-      subscriptionsScopes.set(casted, subscriptionScope);
-    }
-    return casted;
+    return cl.fromRaw(this._raw) as InstanceType<Cl>;
   }
 
   /**
@@ -582,11 +582,7 @@ const CoListProxyHandler: ProxyHandler<CoList> = {
       } else if (isRefEncoded(itemDescriptor)) {
         return rawValue === undefined
           ? undefined
-          : new Ref(
-              rawValue as unknown as ID<CoValue>,
-              target._loadedAs,
-              itemDescriptor,
-            ).accessFrom(receiver, Number(key));
+          : accessChildByKey(target, rawValue as string, key);
       }
     } else if (key === "length") {
       return target._raw.entries().length;