jazz-tools 0.9.19 → 0.9.21

package/dist/index.native.js

@@ -29,7 +29,7 @@ import {
   parseInviteLink,
   randomSessionProvider,
   subscribeToCoValue
-} from "./chunk-LRDIS2Q2.js";
+} from "./chunk-OJIEP4WE.js";
 
 // src/index.native.ts
 import {

package/dist/index.web.js

@@ -29,7 +29,7 @@ import {
   parseInviteLink,
   randomSessionProvider,
   subscribeToCoValue
-} from "./chunk-LRDIS2Q2.js";
+} from "./chunk-OJIEP4WE.js";
 
 // src/index.web.ts
 import { cojsonInternals, MAX_RECOMMENDED_TX_SIZE, WasmCrypto } from "cojson";

package/dist/testing.js

@@ -2,7 +2,7 @@ import {
   Account,
   activeAccountContext,
   createAnonymousJazzContext
-} from "./chunk-LRDIS2Q2.js";
+} from "./chunk-OJIEP4WE.js";
 
 // src/testing.ts
 import { LocalNode } from "cojson";

package/package.json

@@ -23,7 +23,7 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.9.19",
+  "version": "0.9.21",
   "dependencies": {
     "cojson": "0.9.19"
   },

package/src/coValues/account.ts

@@ -73,7 +73,7 @@ export class Account extends CoValueBase implements CoValue {
     return this as Account;
   }
   get _loadedAs(): Account | AnonymousJazzAgent {
-    if (this.isMe) return this;
+    if (this.isLocalNodeOwner) return this;
 
     const rawAccount = this._raw.core.node.account;
 
@@ -120,7 +120,17 @@ export class Account extends CoValueBase implements CoValue {
     };
   }
 
-  isMe: boolean;
+  /**
+   * Whether this account is the currently active account.
+   */
+  get isMe() {
+    return activeAccountContext.get().id === this.id;
+  }
+
+  /**
+   * Whether this account is the owner of the local node.
+   */
+  isLocalNodeOwner: boolean;
   sessionID: SessionID | undefined;
 
   constructor(options: { fromRaw: RawAccount | RawControlledAccount }) {
@@ -128,7 +138,8 @@ export class Account extends CoValueBase implements CoValue {
     if (!("fromRaw" in options)) {
       throw new Error("Can only construct account from raw or with .create()");
     }
-    this.isMe = options.fromRaw.id == options.fromRaw.core.node.account.id;
+    this.isLocalNodeOwner =
+      options.fromRaw.id == options.fromRaw.core.node.account.id;
 
     Object.defineProperties(this, {
       id: {
@@ -139,7 +150,7 @@ export class Account extends CoValueBase implements CoValue {
       _type: { value: "Account", enumerable: false },
     });
 
-    if (this.isMe) {
+    if (this.isLocalNodeOwner) {
       this.sessionID = options.fromRaw.core.node.currentSessionID;
     }
 
@@ -147,7 +158,7 @@ export class Account extends CoValueBase implements CoValue {
   }
 
   myRole(): "admin" | undefined {
-    if (this.isMe) {
+    if (this.isLocalNodeOwner) {
       return "admin";
     }
   }
@@ -157,7 +168,7 @@ export class Account extends CoValueBase implements CoValue {
     inviteSecret: InviteSecret,
     coValueClass: CoValueClass<V>,
   ) {
-    if (!this.isMe) {
+    if (!this.isLocalNodeOwner) {
       throw new Error("Only a controlled account can accept invites");
     }
 
@@ -433,11 +444,11 @@ export const AccountAndGroupProxyHandler: ProxyHandler<Account | Group> = {
 
 /** @category Identity & Permissions */
 export function isControlledAccount(account: Account): account is Account & {
-  isMe: true;
+  isLocalNodeOwner: true;
   sessionID: SessionID;
   _raw: RawControlledAccount;
 } {
-  return account.isMe;
+  return account.isLocalNodeOwner;
 }
 
 export type AccountClass<Acc extends Account> = CoValueClass<Acc> & {

package/src/coValues/coFeed.ts

@@ -708,6 +708,29 @@ export class FileStream extends CoValueBase implements CoValue {
     });
   }
 
+  /**
+   * Create a new empty `FileStream` instance.
+   *
+   * @param options - Configuration options for the new FileStream
+   * @param options.owner - The Account or Group that will own this FileStream and control access rights
+   *
+   * @example
+   * ```typescript
+   * // Create owned by an account
+   * const stream = FileStream.create({ owner: myAccount });
+   *
+   * // Create owned by a group
+   * const stream = FileStream.create({ owner: teamGroup });
+   *
+   * // Create with implicit owner
+   * const stream = FileStream.create(myAccount);
+   * ```
+   *
+   * @remarks
+   * For uploading an existing file or blob, use {@link FileStream.createFromBlob} instead.
+   *
+   * @category Creation
+   */
   static create<S extends FileStream>(
     this: CoValueClass<S>,
     options?: { owner?: Account | Group } | Account | Group,

package/src/coValues/inbox.ts

@@ -28,7 +28,7 @@ export type InboxRoot = RawCoMap<{
 }>;
 
 export function createInboxRoot(account: Account) {
-  if (!account.isMe) {
+  if (!account.isLocalNodeOwner) {
     throw new Error("Account is not controlled");
   }
 
@@ -361,7 +361,7 @@ async function acceptInvite(invite: string, account?: Account) {
     throw new Error("Invalid inbox ticket");
   }
 
-  if (!account.isMe) {
+  if (!account.isLocalNodeOwner) {
     throw new Error("Account is not controlled");
   }
 

package/src/implementation/schema.ts

@@ -5,6 +5,7 @@ import {
   type CoValueClass,
   CoValueFromRaw,
   ItemsSym,
+  JazzToolsSymbol,
   MembersSym,
   SchemaInit,
   isCoValueClass,
@@ -23,7 +24,9 @@ export type CoMarker = { readonly __co: unique symbol };
 export type co<T> = T | (T & CoMarker);
 export type IfCo<C, R> = C extends infer _A | infer B
   ? B extends CoMarker
-    ? R
+    ? R extends JazzToolsSymbol // Exclude symbol properties like co.items or co.members from the refs/init types
+      ? never
+      : R
     : never
   : never;
 export type UnCo<T> = T extends co<infer A> ? A : T;

package/src/implementation/symbols.ts

@@ -1,8 +1,10 @@
-export const SchemaInit = Symbol.for("SchemaInit");
+export type JazzToolsSymbol = SchemaInit | ItemsSym | MembersSym;
+
+export const SchemaInit = "$SchemaInit$";
 export type SchemaInit = typeof SchemaInit;
 
-export const ItemsSym = Symbol.for("items");
+export const ItemsSym = "$items$";
 export type ItemsSym = typeof ItemsSym;
 
-export const MembersSym = Symbol.for("members");
+export const MembersSym = "$members$";
 export type MembersSym = typeof MembersSym;

package/src/tests/account.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from "vitest";
-import { CoMap, co } from "../exports.js";
-import { createJazzTestAccount } from "../testing.js";
+import { Account, CoMap, co } from "../exports.js";
+import { createJazzTestAccount, setActiveAccount } from "../testing.js";
 import { setupTwoNodes } from "./utils.js";
 
 test("waitForAllCoValuesSync should resolve when all the values are synced", async () => {
@@ -39,3 +39,38 @@ test("waitForSync should resolve when the value is uploaded", async () => {
 
   expect(loadedAccount).not.toBe("unavailable");
 });
+
+test("isMe gets updated correctly when switching accounts", async () => {
+  const oldMe = await createJazzTestAccount({
+    isCurrentActiveAccount: true,
+  });
+
+  expect(oldMe.isMe).toBe(true);
+
+  const newMe = await createJazzTestAccount({
+    isCurrentActiveAccount: false,
+  });
+
+  expect(newMe.isMe).toBe(false);
+  expect(oldMe.isMe).toBe(true);
+
+  setActiveAccount(newMe);
+
+  expect(newMe.isMe).toBe(true);
+  expect(oldMe.isMe).toBe(false);
+});
+
+test("Me gets updated correctly when creating a new account as active", async () => {
+  const oldMe = await createJazzTestAccount({
+    isCurrentActiveAccount: true,
+  });
+
+  expect(oldMe.isMe).toBe(true);
+
+  const newMe = await createJazzTestAccount({
+    isCurrentActiveAccount: true,
+  });
+
+  expect(newMe.isMe).toBe(true);
+  expect(oldMe.isMe).toBe(false);
+});