jazz-tools 0.9.1 → 0.9.8

package/dist/index.native.js

@@ -4,6 +4,8 @@ import {
   CoFeed,
   CoList,
   CoMap,
+  CoPlainText,
+  CoRichText,
   CoValueBase,
   Encoders,
   FileStream,
@@ -11,6 +13,7 @@ import {
   ImageDefinition,
   Inbox,
   InboxSender,
+  Marks,
   Profile,
   SchemaUnion,
   co,
@@ -23,7 +26,7 @@ import {
   loadCoValue,
   randomSessionProvider,
   subscribeToCoValue
-} from "./chunk-7LENDMTN.js";
+} from "./chunk-YD32FKHW.js";
 
 // src/index.native.ts
 import {
@@ -37,6 +40,8 @@ export {
   CoFeed,
   CoList,
   CoMap,
+  CoPlainText,
+  CoRichText,
   CoFeed as CoStream,
   CoValueBase,
   Encoders,
@@ -46,6 +51,7 @@ export {
   Inbox,
   InboxSender,
   MAX_RECOMMENDED_TX_SIZE,
+  Marks,
   Profile,
   SchemaUnion,
   co,

package/dist/index.native.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.native.ts"],"sourcesContent":["export * from \"./exports.js\";\n\nexport {\n  MAX_RECOMMENDED_TX_SIZE,\n  cojsonInternals,\n} from \"cojson/native\";\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA;AAAA,EACE;AAAA,EACA;AAAA,OACK;","names":[]}
+{"version":3,"sources":["../src/index.native.ts"],"sourcesContent":["export * from \"./exports.js\";\n\nexport {\n  MAX_RECOMMENDED_TX_SIZE,\n  cojsonInternals,\n} from \"cojson/native\";\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA;AAAA,EACE;AAAA,EACA;AAAA,OACK;","names":[]}

package/dist/index.web.js

@@ -4,6 +4,8 @@ import {
   CoFeed,
   CoList,
   CoMap,
+  CoPlainText,
+  CoRichText,
   CoValueBase,
   Encoders,
   FileStream,
@@ -11,6 +13,7 @@ import {
   ImageDefinition,
   Inbox,
   InboxSender,
+  Marks,
   Profile,
   SchemaUnion,
   co,
@@ -23,7 +26,7 @@ import {
   loadCoValue,
   randomSessionProvider,
   subscribeToCoValue
-} from "./chunk-7LENDMTN.js";
+} from "./chunk-YD32FKHW.js";
 
 // src/index.web.ts
 import { cojsonInternals, MAX_RECOMMENDED_TX_SIZE, WasmCrypto } from "cojson";
@@ -34,6 +37,8 @@ export {
   CoFeed,
   CoList,
   CoMap,
+  CoPlainText,
+  CoRichText,
   CoFeed as CoStream,
   CoValueBase,
   Encoders,
@@ -43,6 +48,7 @@ export {
   Inbox,
   InboxSender,
   MAX_RECOMMENDED_TX_SIZE,
+  Marks,
   Profile,
   SchemaUnion,
   WasmCrypto,

package/dist/index.web.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.web.ts"],"sourcesContent":["export * from \"./exports.js\";\n\nexport { cojsonInternals, MAX_RECOMMENDED_TX_SIZE, WasmCrypto } from \"cojson\";\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,SAAS,iBAAiB,yBAAyB,kBAAkB;","names":[]}
+{"version":3,"sources":["../src/index.web.ts"],"sourcesContent":["export * from \"./exports.js\";\n\nexport { cojsonInternals, MAX_RECOMMENDED_TX_SIZE, WasmCrypto } from \"cojson\";\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,SAAS,iBAAiB,yBAAyB,kBAAkB;","names":[]}

package/dist/testing.js

@@ -1,7 +1,8 @@
 import {
   Account,
+  activeAccountContext,
   createAnonymousJazzContext
-} from "./chunk-7LENDMTN.js";
+} from "./chunk-YD32FKHW.js";
 
 // src/testing.ts
 import { cojsonInternals } from "cojson";
@@ -27,8 +28,14 @@ async function createJazzTestAccount(options) {
     },
     crypto: await TestJSCrypto.create()
   });
+  if (options?.isCurrentActiveAccount) {
+    activeAccountContext.set(account);
+  }
   return account;
 }
+function setActiveAccount(account) {
+  activeAccountContext.set(account);
+}
 async function createJazzTestGuest() {
   const ctx = await createAnonymousJazzContext({
     crypto: await PureJSCrypto.create(),
@@ -66,6 +73,7 @@ export {
   createJazzTestAccount,
   createJazzTestGuest,
   getJazzContextShape,
-  linkAccounts
+  linkAccounts,
+  setActiveAccount
 };
 //# sourceMappingURL=testing.js.map

package/dist/testing.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/testing.ts"],"sourcesContent":["import { AgentSecret, CryptoProvider, Peer } from \"cojson\";\nimport { cojsonInternals } from \"cojson\";\nimport { PureJSCrypto } from \"cojson/crypto\";\nimport { Account, type AccountClass } from \"./exports.js\";\nimport {\n  type AnonymousJazzAgent,\n  type CoValueClass,\n  createAnonymousJazzContext,\n} from \"./internal.js\";\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\nclass 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 async function createJazzTestAccount<Acc extends Account>(options?: {\n  AccountSchema?: CoValueClass<Acc>;\n}): Promise<Acc> {\n  const AccountSchema = (options?.AccountSchema ??\n    Account) as unknown as TestAccountSchema<Acc>;\n  const account = await AccountSchema.create({\n    creationProps: {\n      name: \"Test Account\",\n    },\n    crypto: await TestJSCrypto.create(),\n  });\n\n  return 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 function getJazzContextShape<Acc extends Account>(\n  account: Acc | { guest: AnonymousJazzAgent },\n) {\n  if (\"guest\" in account) {\n    return {\n      guest: account.guest,\n      AccountSchema: Account,\n      logOut: () => account.guest.node.gracefulShutdown(),\n      done: () => account.guest.node.gracefulShutdown(),\n    };\n  }\n\n  return {\n    me: account,\n    AccountSchema: account.constructor as AccountClass<Acc>,\n    logOut: () => account._raw.core.node.gracefulShutdown(),\n    done: () => account._raw.core.node.gracefulShutdown(),\n  };\n}\n\nexport 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"],"mappings":";;;;;;AACA,SAAS,uBAAuB;AAChC,SAAS,oBAAoB;AAkB7B,IAAM,eAAN,cAA2B,aAAa;AAAA,EACtC,aAAa,SAAS;AACpB,QAAI,eAAe,cAAc,UAAU,UAAU,SAAS,OAAO,GAAG;AAEtE,YAAM,SAAS,IAAI,aAAa;AAEhC,aAAO,OAAO,CAAC,YACb,WAAW,gBAAgB,gBAAgB,QAAQ,OAAO,CAAC;AAC7D,aAAO,SAAS,CAAC,WACf,KAAK,MAAM,OAAO,UAAU,WAAW,MAAM,CAAC;AAChD,aAAO,UAAU,CAAC,YAChB,cAAc,gBAAgB,gBAAgB,OAAO,CAAC;AACxD,aAAO,aAAa,CAAC,cACnB,UAAU,UAAU,cAAc,MAAM;AAE1C,aAAO;AAAA,IACT;AAGA,WAAO,IAAI,aAAa;AAAA,EAC1B;AACF;AAEA,eAAsB,sBAA2C,SAEhD;AACf,QAAM,gBAAiB,SAAS,iBAC9B;AACF,QAAM,UAAU,MAAM,cAAc,OAAO;AAAA,IACzC,eAAe;AAAA,MACb,MAAM;AAAA,IACR;AAAA,IACA,QAAQ,MAAM,aAAa,OAAO;AAAA,EACpC,CAAC;AAED,SAAO;AACT;AAEA,eAAsB,sBAAsB;AAC1C,QAAM,MAAM,MAAM,2BAA2B;AAAA,IAC3C,QAAQ,MAAM,aAAa,OAAO;AAAA,IAClC,iBAAiB,CAAC;AAAA,EACpB,CAAC;AAED,SAAO;AAAA,IACL,OAAO,IAAI;AAAA,EACb;AACF;AAEO,SAAS,oBACd,SACA;AACA,MAAI,WAAW,SAAS;AACtB,WAAO;AAAA,MACL,OAAO,QAAQ;AAAA,MACf,eAAe;AAAA,MACf,QAAQ,MAAM,QAAQ,MAAM,KAAK,iBAAiB;AAAA,MAClD,MAAM,MAAM,QAAQ,MAAM,KAAK,iBAAiB;AAAA,IAClD;AAAA,EACF;AAEA,SAAO;AAAA,IACL,IAAI;AAAA,IACJ,eAAe,QAAQ;AAAA,IACvB,QAAQ,MAAM,QAAQ,KAAK,KAAK,KAAK,iBAAiB;AAAA,IACtD,MAAM,MAAM,QAAQ,KAAK,KAAK,KAAK,iBAAiB;AAAA,EACtD;AACF;AAEO,SAAS,aACd,GACA,GACA,QAA6B,UAC7B,QAA6B,UAC7B;AACA,QAAM,CAAC,OAAO,KAAK,IAAI,gBAAgB,eAAe,EAAE,IAAI,EAAE,IAAI;AAAA,IAChE,WAAW;AAAA,IACX,WAAW;AAAA,EACb,CAAC;AAED,IAAE,KAAK,KAAK,KAAK,YAAY,QAAQ,KAAK;AAC1C,IAAE,KAAK,KAAK,KAAK,YAAY,QAAQ,KAAK;AAC5C;","names":[]}
+{"version":3,"sources":["../src/testing.ts"],"sourcesContent":["import { AgentSecret, CryptoProvider, Peer } from \"cojson\";\nimport { cojsonInternals } from \"cojson\";\nimport { PureJSCrypto } from \"cojson/crypto\";\nimport { Account, type AccountClass } from \"./exports.js\";\nimport { activeAccountContext } from \"./implementation/activeAccountContext.js\";\nimport {\n  type AnonymousJazzAgent,\n  type CoValueClass,\n  createAnonymousJazzContext,\n} from \"./internal.js\";\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\nclass 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 async function createJazzTestAccount<Acc extends Account>(options?: {\n  isCurrentActiveAccount?: boolean;\n  AccountSchema?: CoValueClass<Acc>;\n}): Promise<Acc> {\n  const AccountSchema = (options?.AccountSchema ??\n    Account) as unknown as TestAccountSchema<Acc>;\n  const account = await AccountSchema.create({\n    creationProps: {\n      name: \"Test Account\",\n    },\n    crypto: await TestJSCrypto.create(),\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 function getJazzContextShape<Acc extends Account>(\n  account: Acc | { guest: AnonymousJazzAgent },\n) {\n  if (\"guest\" in account) {\n    return {\n      guest: account.guest,\n      AccountSchema: Account,\n      logOut: () => account.guest.node.gracefulShutdown(),\n      done: () => account.guest.node.gracefulShutdown(),\n    };\n  }\n\n  return {\n    me: account,\n    AccountSchema: account.constructor as AccountClass<Acc>,\n    logOut: () => account._raw.core.node.gracefulShutdown(),\n    done: () => account._raw.core.node.gracefulShutdown(),\n  };\n}\n\nexport 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"],"mappings":";;;;;;;AACA,SAAS,uBAAuB;AAChC,SAAS,oBAAoB;AAmB7B,IAAM,eAAN,cAA2B,aAAa;AAAA,EACtC,aAAa,SAAS;AACpB,QAAI,eAAe,cAAc,UAAU,UAAU,SAAS,OAAO,GAAG;AAEtE,YAAM,SAAS,IAAI,aAAa;AAEhC,aAAO,OAAO,CAAC,YACb,WAAW,gBAAgB,gBAAgB,QAAQ,OAAO,CAAC;AAC7D,aAAO,SAAS,CAAC,WACf,KAAK,MAAM,OAAO,UAAU,WAAW,MAAM,CAAC;AAChD,aAAO,UAAU,CAAC,YAChB,cAAc,gBAAgB,gBAAgB,OAAO,CAAC;AACxD,aAAO,aAAa,CAAC,cACnB,UAAU,UAAU,cAAc,MAAM;AAE1C,aAAO;AAAA,IACT;AAGA,WAAO,IAAI,aAAa;AAAA,EAC1B;AACF;AAEA,eAAsB,sBAA2C,SAGhD;AACf,QAAM,gBAAiB,SAAS,iBAC9B;AACF,QAAM,UAAU,MAAM,cAAc,OAAO;AAAA,IACzC,eAAe;AAAA,MACb,MAAM;AAAA,IACR;AAAA,IACA,QAAQ,MAAM,aAAa,OAAO;AAAA,EACpC,CAAC;AACD,MAAI,SAAS,wBAAwB;AACnC,yBAAqB,IAAI,OAAO;AAAA,EAClC;AAEA,SAAO;AACT;AAEO,SAAS,iBAAiB,SAAkB;AACjD,uBAAqB,IAAI,OAAO;AAClC;AAEA,eAAsB,sBAAsB;AAC1C,QAAM,MAAM,MAAM,2BAA2B;AAAA,IAC3C,QAAQ,MAAM,aAAa,OAAO;AAAA,IAClC,iBAAiB,CAAC;AAAA,EACpB,CAAC;AAED,SAAO;AAAA,IACL,OAAO,IAAI;AAAA,EACb;AACF;AAEO,SAAS,oBACd,SACA;AACA,MAAI,WAAW,SAAS;AACtB,WAAO;AAAA,MACL,OAAO,QAAQ;AAAA,MACf,eAAe;AAAA,MACf,QAAQ,MAAM,QAAQ,MAAM,KAAK,iBAAiB;AAAA,MAClD,MAAM,MAAM,QAAQ,MAAM,KAAK,iBAAiB;AAAA,IAClD;AAAA,EACF;AAEA,SAAO;AAAA,IACL,IAAI;AAAA,IACJ,eAAe,QAAQ;AAAA,IACvB,QAAQ,MAAM,QAAQ,KAAK,KAAK,KAAK,iBAAiB;AAAA,IACtD,MAAM,MAAM,QAAQ,KAAK,KAAK,KAAK,iBAAiB;AAAA,EACtD;AACF;AAEO,SAAS,aACd,GACA,GACA,QAA6B,UAC7B,QAA6B,UAC7B;AACA,QAAM,CAAC,OAAO,KAAK,IAAI,gBAAgB,eAAe,EAAE,IAAI,EAAE,IAAI;AAAA,IAChE,WAAW;AAAA,IACX,WAAW;AAAA,EACb,CAAC;AAED,IAAE,KAAK,KAAK,KAAK,YAAY,QAAQ,KAAK;AAC1C,IAAE,KAAK,KAAK,KAAK,YAAY,QAAQ,KAAK;AAC5C;","names":[]}

package/package.json

@@ -23,7 +23,7 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.9.1",
+  "version": "0.9.8",
   "dependencies": {
     "cojson": "0.9.0"
   },

package/src/coValues/account.ts

@@ -12,6 +12,7 @@ import {
   SessionID,
   cojsonInternals,
 } from "cojson";
+import { activeAccountContext } from "../implementation/activeAccountContext.js";
 import {
   AnonymousJazzAgent,
   type CoValue,
@@ -29,7 +30,8 @@ import {
   ensureCoValueLoaded,
   inspect,
   loadCoValue,
-  subscribeToCoValue,
+  loadCoValueWithoutMe,
+  subscribeToCoValueWithoutMe,
   subscribeToExistingCoValue,
   subscriptionsScopes,
 } from "../internal.js";
@@ -192,6 +194,10 @@ export class Account extends CoValueBase implements CoValue {
     return this.fromNode(node) as A;
   }
 
+  static getMe<A extends Account>(this: CoValueClass<A> & typeof Account) {
+    return activeAccountContext.get() as A;
+  }
+
   static async createAs<A extends Account>(
     this: CoValueClass<A> & typeof Account,
     as: Account,
@@ -266,24 +272,56 @@ export class Account extends CoValueBase implements CoValue {
   }
 
   /** @category Subscription & Loading */
+  static load<A extends Account, Depth>(
+    this: CoValueClass<A>,
+    id: ID<A>,
+    depth: Depth & DepthsIn<A>,
+  ): Promise<DeeplyLoaded<A, Depth> | undefined>;
   static load<A extends Account, Depth>(
     this: CoValueClass<A>,
     id: ID<A>,
     as: Account,
     depth: Depth & DepthsIn<A>,
+  ): Promise<DeeplyLoaded<A, Depth> | undefined>;
+  static load<A extends Account, Depth>(
+    this: CoValueClass<A>,
+    id: ID<A>,
+    asOrDepth: Account | (Depth & DepthsIn<A>),
+    depth?: Depth & DepthsIn<A>,
   ): Promise<DeeplyLoaded<A, Depth> | undefined> {
-    return loadCoValue(this, id, as, depth);
+    return loadCoValueWithoutMe(this, id, asOrDepth, depth);
   }
 
   /** @category Subscription & Loading */
+  static subscribe<A extends Account, Depth>(
+    this: CoValueClass<A>,
+    id: ID<A>,
+    depth: Depth & DepthsIn<A>,
+    listener: (value: DeeplyLoaded<A, Depth>) => void,
+  ): () => void;
   static subscribe<A extends Account, Depth>(
     this: CoValueClass<A>,
     id: ID<A>,
     as: Account,
     depth: Depth & DepthsIn<A>,
     listener: (value: DeeplyLoaded<A, Depth>) => void,
+  ): () => void;
+  static subscribe<A extends Account, Depth>(
+    this: CoValueClass<A>,
+    id: ID<A>,
+    asOrDepth: Account | (Depth & DepthsIn<A>),
+    depthOrListener:
+      | (Depth & DepthsIn<A>)
+      | ((value: DeeplyLoaded<A, Depth>) => void),
+    listener?: (value: DeeplyLoaded<A, Depth>) => void,
   ): () => void {
-    return subscribeToCoValue<A, Depth>(this, id, as, depth, listener);
+    return subscribeToCoValueWithoutMe<A, Depth>(
+      this,
+      id,
+      asOrDepth,
+      depthOrListener,
+      listener!,
+    );
   }
 
   /** @category Subscription & Loading */

package/src/coValues/coFeed.ts

@@ -10,6 +10,7 @@ import type {
   SessionID,
 } from "cojson";
 import { MAX_RECOMMENDED_TX_SIZE, cojsonInternals } from "cojson";
+import { activeAccountContext } from "../implementation/activeAccountContext.js";
 import type {
   AnonymousJazzAgent,
   CoValue,
@@ -30,10 +31,12 @@ import {
   co,
   ensureCoValueLoaded,
   inspect,
+  isAccountInstance,
   isRefEncoded,
-  loadCoValue,
+  loadCoValueWithoutMe,
   parseCoValueCreateOptions,
   subscribeToCoValue,
+  subscribeToCoValueWithoutMe,
   subscribeToExistingCoValue,
 } from "../internal.js";
 import { type Account } from "./account.js";
@@ -205,7 +208,7 @@ export class CoFeed<Item = any> extends CoValueBase implements CoValue {
   static create<S extends CoFeed>(
     this: CoValueClass<S>,
     init: S extends CoFeed<infer Item> ? UnCo<Item>[] : never,
-    options: { owner: Account | Group } | Account | Group,
+    options?: { owner: Account | Group } | Account | Group,
   ) {
     const { owner } = parseCoValueCreateOptions(options);
     const instance = new this({ init, owner });
@@ -323,27 +326,59 @@ export class CoFeed<Item = any> extends CoValueBase implements CoValue {
    * Load a `CoFeed`
    * @category Subscription & Loading
    */
+  static load<S extends CoFeed, Depth>(
+    this: CoValueClass<S>,
+    id: ID<S>,
+    depth: Depth & DepthsIn<S>,
+  ): Promise<DeeplyLoaded<S, Depth> | undefined>;
   static load<S extends CoFeed, Depth>(
     this: CoValueClass<S>,
     id: ID<S>,
     as: Account,
     depth: Depth & DepthsIn<S>,
+  ): Promise<DeeplyLoaded<S, Depth> | undefined>;
+  static load<S extends CoFeed, Depth>(
+    this: CoValueClass<S>,
+    id: ID<S>,
+    asOrDepth: Account | (Depth & DepthsIn<S>),
+    depth?: Depth & DepthsIn<S>,
   ): Promise<DeeplyLoaded<S, Depth> | undefined> {
-    return loadCoValue(this, id, as, depth);
+    return loadCoValueWithoutMe(this, id, asOrDepth, depth);
   }
 
   /**
    * Subscribe to a `CoFeed`, when you have an ID but don't have a `CoFeed` instance yet
    * @category Subscription & Loading
    */
+  static subscribe<S extends CoFeed, Depth>(
+    this: CoValueClass<S>,
+    id: ID<S>,
+    depth: Depth & DepthsIn<S>,
+    listener: (value: DeeplyLoaded<S, Depth>) => void,
+  ): () => void;
   static subscribe<S extends CoFeed, Depth>(
     this: CoValueClass<S>,
     id: ID<S>,
     as: Account,
     depth: Depth & DepthsIn<S>,
     listener: (value: DeeplyLoaded<S, Depth>) => void,
+  ): () => void;
+  static subscribe<S extends CoFeed, Depth>(
+    this: CoValueClass<S>,
+    id: ID<S>,
+    asOrDepth: Account | (Depth & DepthsIn<S>),
+    depthOrListener:
+      | (Depth & DepthsIn<S>)
+      | ((value: DeeplyLoaded<S, Depth>) => void),
+    listener?: (value: DeeplyLoaded<S, Depth>) => void,
   ): () => void {
-    return subscribeToCoValue<S, Depth>(this, id, as, depth, listener);
+    return subscribeToCoValueWithoutMe<S, Depth>(
+      this,
+      id,
+      asOrDepth,
+      depthOrListener,
+      listener,
+    );
   }
 
   /**
@@ -675,7 +710,7 @@ export class FileStream extends CoValueBase implements CoValue {
 
   static create<S extends FileStream>(
     this: CoValueClass<S>,
-    options: { owner: Account | Group } | Account | Group,
+    options?: { owner?: Account | Group } | Account | Group,
   ) {
     return new this(parseCoValueCreateOptions(options));
   }
@@ -722,13 +757,37 @@ export class FileStream extends CoValueBase implements CoValue {
    *
    * @category Content
    */
+  static async loadAsBlob(
+    id: ID<FileStream>,
+    options?: {
+      allowUnfinished?: boolean;
+    },
+  ): Promise<Blob | undefined>;
   static async loadAsBlob(
     id: ID<FileStream>,
     as: Account,
     options?: {
       allowUnfinished?: boolean;
     },
+  ): Promise<Blob | undefined>;
+  static async loadAsBlob(
+    id: ID<FileStream>,
+    asOrOptions?:
+      | Account
+      | {
+          allowUnfinished?: boolean;
+        },
+    optionsOrUndefined?: {
+      allowUnfinished?: boolean;
+    },
   ): Promise<Blob | undefined> {
+    const as = isAccountInstance(asOrOptions)
+      ? asOrOptions
+      : activeAccountContext.get();
+    const options = isAccountInstance(asOrOptions)
+      ? optionsOrUndefined
+      : asOrOptions;
+
     let stream = await this.load(id, as, []);
 
     /**
@@ -764,16 +823,17 @@ export class FileStream extends CoValueBase implements CoValue {
    */
   static async createFromBlob(
     blob: Blob | File,
-    options:
+    options?:
       | {
-          owner: Group | Account;
+          owner?: Group | Account;
           onProgress?: (progress: number) => void;
         }
       | Account
       | Group,
   ): Promise<FileStream> {
     const stream = this.create(options);
-    const onProgress = "onProgress" in options ? options.onProgress : undefined;
+    const onProgress =
+      options && "onProgress" in options ? options.onProgress : undefined;
 
     const start = Date.now();
 
@@ -840,27 +900,59 @@ export class FileStream extends CoValueBase implements CoValue {
    * Load a `FileStream`
    * @category Subscription & Loading
    */
-  static load<B extends FileStream, Depth>(
-    this: CoValueClass<B>,
-    id: ID<B>,
+  static load<C extends FileStream, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
+    depth: Depth & DepthsIn<C>,
+  ): Promise<DeeplyLoaded<C, Depth> | undefined>;
+  static load<C extends FileStream, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
     as: Account,
-    depth: Depth & DepthsIn<B>,
-  ): Promise<DeeplyLoaded<B, Depth> | undefined> {
-    return loadCoValue(this, id, as, depth);
+    depth: Depth & DepthsIn<C>,
+  ): Promise<DeeplyLoaded<C, Depth> | undefined>;
+  static load<C extends FileStream, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
+    asOrDepth: Account | (Depth & DepthsIn<C>),
+    depth?: Depth & DepthsIn<C>,
+  ): Promise<DeeplyLoaded<C, Depth> | undefined> {
+    return loadCoValueWithoutMe(this, id, asOrDepth, depth);
   }
 
   /**
    * Subscribe to a `FileStream`, when you have an ID but don't have a `FileStream` instance yet
    * @category Subscription & Loading
    */
-  static subscribe<B extends FileStream, Depth>(
-    this: CoValueClass<B>,
-    id: ID<B>,
+  static subscribe<C extends FileStream, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
+    depth: Depth & DepthsIn<C>,
+    listener: (value: DeeplyLoaded<C, Depth>) => void,
+  ): () => void;
+  static subscribe<C extends FileStream, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
     as: Account,
-    depth: Depth & DepthsIn<B>,
-    listener: (value: DeeplyLoaded<B, Depth>) => void,
+    depth: Depth & DepthsIn<C>,
+    listener: (value: DeeplyLoaded<C, Depth>) => void,
+  ): () => void;
+  static subscribe<C extends FileStream, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
+    asOrDepth: Account | (Depth & DepthsIn<C>),
+    depthOrListener:
+      | (Depth & DepthsIn<C>)
+      | ((value: DeeplyLoaded<C, Depth>) => void),
+    listener?: (value: DeeplyLoaded<C, Depth>) => void,
   ): () => void {
-    return subscribeToCoValue<B, Depth>(this, id, as, depth, listener);
+    return subscribeToCoValueWithoutMe<C, Depth>(
+      this,
+      id,
+      asOrDepth,
+      depthOrListener,
+      listener,
+    );
   }
 
   ensureLoaded<B extends FileStream, Depth>(

package/src/coValues/coList.ts

@@ -21,10 +21,10 @@ import {
   ensureCoValueLoaded,
   inspect,
   isRefEncoded,
-  loadCoValue,
+  loadCoValueWithoutMe,
   makeRefs,
   parseCoValueCreateOptions,
-  subscribeToCoValue,
+  subscribeToCoValueWithoutMe,
   subscribeToExistingCoValue,
   subscriptionsScopes,
 } from "../internal.js";
@@ -221,7 +221,7 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
   static create<L extends CoList>(
     this: CoValueClass<L>,
     items: UnCo<L[number]>[],
-    options: { owner: Account | Group } | Account | Group,
+    options?: { owner: Account | Group } | Account | Group,
   ) {
     const { owner } = parseCoValueCreateOptions(options);
     const instance = new this({ init: items, owner });
@@ -360,13 +360,24 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
    *
    * @category Subscription & Loading
    */
-  static load<L extends CoList, Depth>(
-    this: CoValueClass<L>,
-    id: ID<L>,
+  static load<C extends CoList, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
+    depth: Depth & DepthsIn<C>,
+  ): Promise<DeeplyLoaded<C, Depth> | undefined>;
+  static load<C extends CoList, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
     as: Account,
-    depth: Depth & DepthsIn<L>,
-  ): Promise<DeeplyLoaded<L, Depth> | undefined> {
-    return loadCoValue(this, id, as, depth);
+    depth: Depth & DepthsIn<C>,
+  ): Promise<DeeplyLoaded<C, Depth> | undefined>;
+  static load<C extends CoList, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
+    asOrDepth: Account | (Depth & DepthsIn<C>),
+    depth?: Depth & DepthsIn<C>,
+  ): Promise<DeeplyLoaded<C, Depth> | undefined> {
+    return loadCoValueWithoutMe(this, id, asOrDepth, depth);
   }
 
   /**
@@ -397,14 +408,35 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
    *
    * @category Subscription & Loading
    */
-  static subscribe<L extends CoList, Depth>(
-    this: CoValueClass<L>,
-    id: ID<L>,
+  static subscribe<C extends CoList, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
+    depth: Depth & DepthsIn<C>,
+    listener: (value: DeeplyLoaded<C, Depth>) => void,
+  ): () => void;
+  static subscribe<C extends CoList, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
     as: Account,
-    depth: Depth & DepthsIn<L>,
-    listener: (value: DeeplyLoaded<L, Depth>) => void,
+    depth: Depth & DepthsIn<C>,
+    listener: (value: DeeplyLoaded<C, Depth>) => void,
+  ): () => void;
+  static subscribe<C extends CoList, Depth>(
+    this: CoValueClass<C>,
+    id: ID<C>,
+    asOrDepth: Account | (Depth & DepthsIn<C>),
+    depthOrListener:
+      | (Depth & DepthsIn<C>)
+      | ((value: DeeplyLoaded<C, Depth>) => void),
+    listener?: (value: DeeplyLoaded<C, Depth>) => void,
   ): () => void {
-    return subscribeToCoValue<L, Depth>(this, id, as, depth, listener);
+    return subscribeToCoValueWithoutMe<C, Depth>(
+      this,
+      id,
+      asOrDepth,
+      depthOrListener,
+      listener,
+    );
   }
 
   /**