jazz-tools 0.8.44 → 0.8.48

package/package.json

@@ -6,25 +6,25 @@
   "react-native": "dist/native/index.native.js",
   "exports": {
     ".": {
-      "react-native": "./dist/native/index.native.js",
+      "react-native": "./dist/index.native.js",
       "types": "./src/index.web.ts",
-      "default": "./dist/web/index.web.js"
+      "default": "./dist/index.web.js"
     },
     "./native": {
-      "react-native": "./dist/native/index.native.js",
+      "react-native": "./dist/index.native.js",
       "types": "./src/index.native.ts",
-      "default": "./dist/native/index.native.js"
+      "default": "./dist/index.native.js"
     },
     "./src/*": "./src/*"
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.8.44",
+  "version": "0.8.48",
   "dependencies": {
-    "fast-check": "^3.17.2",
-    "cojson": "0.8.44"
+    "cojson": "0.8.48"
   },
   "devDependencies": {
+    "tsup": "8.3.5",
     "typescript": "~5.6.2",
     "vitest": "1.5.3"
   },
@@ -38,12 +38,9 @@
   "scripts": {
     "format-and-lint": "biome check .",
     "format-and-lint:fix": "biome check . --write",
-    "dev:web": "tsc --sourceMap --watch --outDir dist/web -p tsconfig.web.json",
-    "dev:native": "tsc --sourceMap --watch --outDir dist/native -p tsconfig.native.json",
+    "dev": "tsup --watch",
     "test": "vitest --run --root ../../ --project jazz-tools",
     "test:watch": "vitest --watch --root ../../ --project jazz-tools",
-    "build:web": "tsc --sourceMap --outDir dist/web -p tsconfig.web.json",
-    "build:native": "tsc --sourceMap --outDir dist/native -p tsconfig.native.json",
-    "build": "rm -rf ./dist && pnpm run build:web && pnpm run build:native"
+    "build": "tsup"
   }
 }

package/src/coValues/account.ts

@@ -14,16 +14,13 @@ import {
 } from "cojson";
 import {
   AnonymousJazzAgent,
-  CoMap,
   type CoValue,
   CoValueBase,
   CoValueClass,
   DeeplyLoaded,
   DepthsIn,
-  Group,
   ID,
   MembersSym,
-  Profile,
   Ref,
   type RefEncoded,
   RefIfCoValue,
@@ -37,6 +34,11 @@ import {
   subscriptionsScopes,
 } from "../internal.js";
 import { coValuesCache } from "../lib/cache.js";
+import { type CoMap } from "./coMap.js";
+import { type Group } from "./group.js";
+import { createInboxRoot } from "./inbox.js";
+import { Profile } from "./profile.js";
+import { RegisteredSchemas } from "./registeredSchemas.js";
 
 /** @category Identity & Permissions */
 export class Account extends CoValueBase implements CoValue {
@@ -59,7 +61,7 @@ export class Account extends CoValueBase implements CoValue {
         optional: false,
       } satisfies RefEncoded<Profile>,
       root: {
-        ref: () => CoMap,
+        ref: () => RegisteredSchemas["CoMap"],
         optional: true,
       } satisfies RefEncoded<CoMap>,
     };
@@ -183,7 +185,7 @@ export class Account extends CoValueBase implements CoValue {
           fromRaw: rawAccount,
         }) as A;
 
-        await account.migrate?.(creationProps);
+        await account.applyMigration?.(creationProps);
       },
     });
 
@@ -234,18 +236,33 @@ export class Account extends CoValueBase implements CoValue {
     return this.toJSON();
   }
 
-  migrate(
-    this: Account,
-    creationProps?: { name: string },
-  ): void | Promise<void> {
+  async applyMigration(creationProps?: { name: string }) {
     if (creationProps) {
-      const profileGroup = Group.create({ owner: this });
+      const profileGroup = RegisteredSchemas["Group"].create({ owner: this });
       profileGroup.addMember("everyone", "reader");
       this.profile = Profile.create(
         { name: creationProps.name },
         { owner: profileGroup },
       );
     }
+
+    const node = this._raw.core.node;
+    const profile = node
+      .expectCoValueLoaded(this._raw.get("profile")!)
+      .getCurrentContent() as RawCoMap;
+
+    if (!profile.get("inbox")) {
+      const inboxRoot = createInboxRoot(this);
+      profile.set("inbox", inboxRoot.id);
+      profile.set("inboxInvite", inboxRoot.inviteLink);
+    }
+
+    await this.migrate(creationProps);
+  }
+
+  // Placeholder method for subclasses to override
+  migrate(creationProps?: { name: string }) {
+    creationProps; // To avoid unused parameter warning
   }
 
   /** @category Subscription & Loading */
@@ -388,3 +405,5 @@ export function isControlledAccount(account: Account): account is Account & {
 export type AccountClass<Acc extends Account> = CoValueClass<Acc> & {
   fromNode: (typeof Account)["fromNode"];
 };
+
+RegisteredSchemas["Account"] = Account;

package/src/coValues/coFeed.ts

@@ -16,7 +16,6 @@ import type {
   CoValueClass,
   DeeplyLoaded,
   DepthsIn,
-  Group,
   ID,
   IfCo,
   Schema,
@@ -24,7 +23,6 @@ import type {
   UnCo,
 } from "../internal.js";
 import {
-  Account,
   CoValueBase,
   ItemsSym,
   Ref,
@@ -37,6 +35,9 @@ import {
   subscribeToCoValue,
   subscribeToExistingCoValue,
 } from "../internal.js";
+import { type Account } from "./account.js";
+import { type Group } from "./group.js";
+import { RegisteredSchemas } from "./registeredSchemas.js";
 
 /** @deprecated Use CoFeedEntry instead */
 export type CoStreamEntry<Item> = CoFeedEntry<Item>;
@@ -436,7 +437,7 @@ function entryFromRawEntry<Item>(
       return (
         accountID &&
         new Ref<Account>(accountID as unknown as ID<Account>, loadedAs, {
-          ref: Account,
+          ref: RegisteredSchemas["Account"],
           optional: false,
         })?.accessFrom(
           accessFrom,

package/src/coValues/coList.ts

@@ -13,9 +13,7 @@ import type {
   UnCo,
 } from "../internal.js";
 import {
-  Account,
   AnonymousJazzAgent,
-  Group,
   ItemsSym,
   Ref,
   SchemaInit,
@@ -30,6 +28,9 @@ import {
   subscriptionsScopes,
 } from "../internal.js";
 import { coValuesCache } from "../lib/cache.js";
+import { type Account } from "./account.js";
+import { type Group } from "./group.js";
+import { RegisteredSchemas } from "./registeredSchemas.js";
 
 /**
  * CoLists are collaborative versions of plain arrays.
@@ -108,8 +109,8 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
   /** @category Collaboration */
   get _owner(): Account | Group {
     return this._raw.group instanceof RawAccount
-      ? Account.fromRaw(this._raw.group)
-      : Group.fromRaw(this._raw.group);
+      ? RegisteredSchemas["Account"].fromRaw(this._raw.group)
+      : RegisteredSchemas["Group"].fromRaw(this._raw.group);
   }
 
   /**
@@ -162,7 +163,9 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
     const rawAccount = this._raw.core.node.account;
 
     if (rawAccount instanceof RawAccount) {
-      return coValuesCache.get(rawAccount, () => Account.fromRaw(rawAccount));
+      return coValuesCache.get(rawAccount, () =>
+        RegisteredSchemas["Account"].fromRaw(rawAccount),
+      );
     }
 
     return new AnonymousJazzAgent(this._raw.core.node);

package/src/coValues/coMap.ts

@@ -13,7 +13,6 @@ import type {
   CoValueClass,
   DeeplyLoaded,
   DepthsIn,
-  Group,
   ID,
   IfCo,
   RefEncoded,
@@ -22,7 +21,6 @@ import type {
   co,
 } from "../internal.js";
 import {
-  Account,
   CoValueBase,
   ItemsSym,
   Ref,
@@ -36,6 +34,9 @@ import {
   subscribeToExistingCoValue,
   subscriptionsScopes,
 } from "../internal.js";
+import { type Account } from "./account.js";
+import { type Group } from "./group.js";
+import { RegisteredSchemas } from "./registeredSchemas.js";
 
 type CoMapEdit<V> = {
   value?: V;
@@ -178,7 +179,7 @@ export class CoMap extends CoValueBase implements CoValue {
       by:
         rawEdit.by &&
         new Ref<Account>(rawEdit.by as ID<Account>, target._loadedAs, {
-          ref: Account,
+          ref: RegisteredSchemas["Account"],
           optional: false,
         }).accessFrom(target, "_edits." + key + ".by"),
       madeAt: rawEdit.at,
@@ -616,8 +617,14 @@ const CoMapProxyHandler: ProxyHandler<CoMap> = {
     } else if (key in target) {
       return Reflect.get(target, key, receiver);
     } else {
-      const descriptor = (target._schema[key as keyof CoMap["_schema"]] ||
-        target._schema[ItemsSym]) as Schema;
+      const schema = target._schema;
+
+      if (!schema) {
+        return undefined;
+      }
+
+      const descriptor = (schema[key as keyof CoMap["_schema"]] ||
+        schema[ItemsSym]) as Schema;
       if (descriptor && typeof key === "string") {
         const raw = target._raw.get(key);
 
@@ -742,3 +749,5 @@ const CoMapProxyHandler: ProxyHandler<CoMap> = {
     }
   },
 };
+
+RegisteredSchemas["CoMap"] = CoMap;

package/src/coValues/deepLoading.ts

@@ -1,16 +1,10 @@
 import { SessionID } from "cojson";
-import {
-  Account,
-  CoFeed,
-  CoFeedEntry,
-  CoList,
-  ItemsSym,
-  Ref,
-  RefEncoded,
-  UnCo,
-} from "../internal.js";
-import { CoKeys, CoMap } from "./coMap.js";
-import { CoValue, ID } from "./interfaces.js";
+import { ItemsSym, type Ref, RefEncoded, UnCo } from "../internal.js";
+import { type Account } from "./account.js";
+import { type CoFeed, CoFeedEntry } from "./coFeed.js";
+import { type CoList } from "./coList.js";
+import { type CoKeys, type CoMap } from "./coMap.js";
+import { type CoValue, type ID } from "./interfaces.js";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fulfillsDepth(depth: any, value: CoValue): boolean {

package/src/coValues/extensions/imageDef.ts

@@ -1,4 +1,6 @@
-import { CoMap, FileStream, co, subscriptionsScopes } from "../../internal.js";
+import { co, subscriptionsScopes } from "../../internal.js";
+import { FileStream } from "../coFeed.js";
+import { CoMap } from "../coMap.js";
 
 /** @category Media */
 export class ImageDefinition extends CoMap {

package/src/coValues/group.ts

@@ -9,24 +9,19 @@ import type {
   Schema,
 } from "../internal.js";
 import {
-  Account,
-  AccountAndGroupProxyHandler,
-  CoMap,
   CoValueBase,
   MembersSym,
   Ref,
-  co,
   ensureCoValueLoaded,
-  isControlledAccount,
   loadCoValue,
   subscribeToCoValue,
   subscribeToExistingCoValue,
 } from "../internal.js";
-
-/** @category Identity & Permissions */
-export class Profile extends CoMap {
-  name = co.string;
-}
+import { AccountAndGroupProxyHandler, isControlledAccount } from "./account.js";
+import { type Account } from "./account.js";
+import { type CoMap } from "./coMap.js";
+import { type Profile } from "./profile.js";
+import { RegisteredSchemas } from "./registeredSchemas.js";
 
 /** @category Identity & Permissions */
 export class Group extends CoValueBase implements CoValue {
@@ -51,7 +46,7 @@ export class Group extends CoValueBase implements CoValue {
       profile: "json" satisfies Schema,
       root: "json" satisfies Schema,
       [MembersSym]: {
-        ref: () => Account,
+        ref: () => RegisteredSchemas["Account"],
         optional: false,
       } satisfies RefEncoded<Account>,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -229,3 +224,5 @@ export class Group extends CoValueBase implements CoValue {
     return this._raw.core.waitForSync(options);
   }
 }
+
+RegisteredSchemas["Group"] = Group;