jazz-tools 0.15.15 → 0.16.0

package/package.json

@@ -139,7 +139,7 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.15.15",
+  "version": "0.16.0",
   "dependencies": {
     "@manuscripts/prosemirror-recreate-steps": "^0.1.4",
     "@scure/base": "1.2.1",
@@ -157,10 +157,10 @@
     "prosemirror-schema-basic": "^1.2.2",
     "prosemirror-state": "^1.4.3",
     "prosemirror-transform": "^1.9.0",
-    "zod": "3.25.28",
-    "cojson": "0.15.15",
-    "cojson-storage-indexeddb": "0.15.15",
-    "cojson-transport-ws": "0.15.15"
+    "zod": "3.25.76",
+    "cojson": "0.16.0",
+    "cojson-storage-indexeddb": "0.16.0",
+    "cojson-transport-ws": "0.16.0"
   },
   "devDependencies": {
     "@scure/bip39": "^1.3.0",
@@ -171,8 +171,9 @@
     "@types/react": "19.1.0",
     "@types/react-dom": "19.1.0",
     "@vitest/browser": "^3.2.4",
-    "queueueue": "^4.1.2",
+    "msw": "^2.10.3",
     "playwright": "^1.50.1",
+    "queueueue": "^4.1.2",
     "tsup": "8.5.0",
     "typescript": "5.6.2",
     "vitest": "3.2.4",

package/src/browser/index.ts

@@ -1,9 +1,7 @@
 import {
   Account,
   CoValue,
-  CoValueClass,
-  CoValueOrZodSchema,
-  ID,
+  CoValueClassOrSchema,
   InviteSecret,
   createInviteLink as baseCreateInviteLink,
   consumeInviteLink,
@@ -36,7 +34,7 @@ export { parseInviteLink } from "jazz-tools";
 
 /** @category Invite Links */
 export async function consumeInviteLinkFromWindowLocation<
-  S extends CoValueOrZodSchema,
+  S extends CoValueClassOrSchema,
 >({
   as,
   forValueHint,

package/src/browser-media-images/index.ts

@@ -17,7 +17,7 @@ export async function createImage(
     owner?: Group | Account;
     maxSize?: 256 | 1024 | 2048;
   },
-): Promise<Loaded<typeof ImageDefinition>> {
+): Promise<Loaded<typeof ImageDefinition, { $each: true }>> {
   // Get the original size of the image
   const { width: originalWidth, height: originalHeight } =
     await getImageSize(imageBlobOrFile);

package/src/react/hooks.tsx

@@ -1,12 +1,12 @@
 import { consumeInviteLinkFromWindowLocation } from "jazz-tools/browser";
 import { useEffect } from "react";
 
-import { CoValueOrZodSchema } from "jazz-tools";
+import { CoValueClassOrSchema } from "jazz-tools";
 import { useJazzContext } from "jazz-tools/react-core";
 
 export { useCoState, useAuthSecretStorage } from "jazz-tools/react-core";
 
-export function useAcceptInvite<S extends CoValueOrZodSchema>({
+export function useAcceptInvite<S extends CoValueClassOrSchema>({
   invitedObjectSchema,
   onAccept,
   forValueHint,

package/src/react-core/hooks.ts

@@ -11,7 +11,7 @@ import {
   AnonymousJazzAgent,
   AnyAccountSchema,
   CoValue,
-  CoValueOrZodSchema,
+  CoValueClassOrSchema,
   InboxSender,
   InstanceOfSchema,
   JazzContextManager,
@@ -20,7 +20,7 @@ import {
   ResolveQuery,
   ResolveQueryStrict,
   SubscriptionScope,
-  anySchemaToCoSchema,
+  coValueClassFromCoValueClassOrSchema,
 } from "jazz-tools";
 import { JazzContext, JazzContextManagerContext } from "./provider.js";
 import { getCurrentAccountFromContextManager } from "./utils.js";
@@ -80,7 +80,7 @@ export function useIsAuthenticated() {
 }
 
 function useCoValueSubscription<
-  S extends CoValueOrZodSchema,
+  S extends CoValueClassOrSchema,
   const R extends ResolveQuery<S>,
 >(
   Schema: S,
@@ -107,7 +107,7 @@ function useCoValueSubscription<
       options?.resolve ?? true,
       id,
       {
-        ref: anySchemaToCoSchema(Schema),
+        ref: coValueClassFromCoValueClassOrSchema(Schema),
         optional: true,
       },
     );
@@ -142,7 +142,7 @@ function useCoValueSubscription<
 }
 
 export function useCoState<
-  S extends CoValueOrZodSchema,
+  S extends CoValueClassOrSchema,
   const R extends ResolveQuery<S> = true,
 >(
   Schema: S,
@@ -198,7 +198,7 @@ function useAccountSubscription<
 
     const node = contextManager.getCurrentValue()!.node;
     const subscription = new SubscriptionScope<any>(node, resolve, agent.id, {
-      ref: anySchemaToCoSchema(Schema),
+      ref: coValueClassFromCoValueClassOrSchema(Schema),
       optional: true,
     });
 

package/src/react-core/tests/useAccount.test.ts

@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 
-import { RefsToResolve, co, z, zodSchemaToCoSchema } from "jazz-tools";
+import { RefsToResolve, co, z } from "jazz-tools";
 import { beforeEach, describe, expect, it } from "vitest";
 import { useAccount, useJazzContextManager } from "../hooks.js";
 import { useIsAuthenticated } from "../index.js";
@@ -46,7 +46,7 @@ describe("useAccount", () => {
       });
 
     const account = await createJazzTestAccount({
-      AccountSchema: zodSchemaToCoSchema(AccountSchema),
+      AccountSchema,
     });
 
     const { result } = renderHook(

package/src/react-core/tests/useCoState.test.ts

@@ -520,12 +520,13 @@ describe("useCoState", () => {
     const Message = co.map({
       content: CoRichText,
     });
+    const Messages = co.list(Message);
     const Thread = co.map({
-      messages: co.list(Message),
+      messages: Messages,
     });
 
     const thread = Thread.create({
-      messages: Thread.def.shape.messages.create([
+      messages: Messages.create([
         Message.create({
           content: CoRichText.create("Hello man!"),
         }),

package/src/react-native-core/hooks.tsx

@@ -1,6 +1,6 @@
 import { useEffect } from "react";
 
-import { CoValueOrZodSchema, parseInviteLink } from "jazz-tools";
+import { CoValueClassOrSchema, parseInviteLink } from "jazz-tools";
 import { useJazzContext } from "jazz-tools/react-core";
 import { Linking } from "react-native";
 
@@ -15,7 +15,7 @@ export {
   useAccount,
 } from "jazz-tools/react-core";
 
-export function useAcceptInviteNative<S extends CoValueOrZodSchema>({
+export function useAcceptInviteNative<S extends CoValueClassOrSchema>({
   invitedObjectSchema,
   onAccept,
   forValueHint,

package/src/svelte/jazz.class.svelte.ts

@@ -2,21 +2,24 @@ import type {
   Account,
   AccountClass,
   AnyAccountSchema,
+  CoValueClassOrSchema,
   CoValueFromRaw,
-  CoValueOrZodSchema,
   InstanceOfSchema,
   Loaded,
   ResolveQuery,
   ResolveQueryStrict,
 } from "jazz-tools";
-import { anySchemaToCoSchema, subscribeToCoValue } from "jazz-tools";
+import {
+  coValueClassFromCoValueClassOrSchema,
+  subscribeToCoValue,
+} from "jazz-tools";
 import { untrack } from "svelte";
 import { createSubscriber } from "svelte/reactivity";
 import { useIsAuthenticated } from "./auth/useIsAuthenticated.svelte.js";
 import { getJazzContext } from "./jazz.svelte";
 
 export class CoState<
-  V extends CoValueOrZodSchema,
+  V extends CoValueClassOrSchema,
   R extends ResolveQuery<V> = true,
 > {
   #value: Loaded<V, R> | undefined | null = undefined;
@@ -47,10 +50,10 @@ export class CoState<
         const agent = "me" in ctx ? ctx.me : ctx.guest;
 
         const unsubscribe = subscribeToCoValue(
-          anySchemaToCoSchema(Schema),
+          coValueClassFromCoValueClassOrSchema(Schema),
           id,
           {
-            // @ts-expect-error The resolve query type isn't compatible with the anySchemaToCoSchema conversion
+            // @ts-expect-error The resolve query type isn't compatible with the coValueClassFromCoValueClassOrSchema conversion
             resolve: options?.resolve,
             loadAs: agent,
             onUnavailable: () => {
@@ -112,10 +115,10 @@ export class AccountCoState<
         const me = ctx.me;
 
         const unsubscribe = subscribeToCoValue(
-          anySchemaToCoSchema(Schema),
+          coValueClassFromCoValueClassOrSchema(Schema),
           me.id,
           {
-            // @ts-expect-error The resolve query type isn't compatible with the anySchemaToCoSchema conversion
+            // @ts-expect-error The resolve query type isn't compatible with the coValueClassFromCoValueClassOrSchema conversion
             resolve: options?.resolve,
             loadAs: me,
             onUnavailable: () => {

package/src/svelte/jazz.svelte.ts

@@ -1,7 +1,7 @@
 import type {
   AccountClass,
   AuthSecretStorage,
-  CoValueOrZodSchema,
+  CoValueClassOrSchema,
   ID,
   InstanceOfSchema,
   JazzContextType,
@@ -66,7 +66,7 @@ export function getAuthSecretStorage() {
  * @param forValueHint - Hint for the value.
  * @returns The accept invite hook.
  */
-export class InviteListener<V extends CoValueOrZodSchema> {
+export class InviteListener<V extends CoValueClassOrSchema> {
   constructor({
     invitedObjectSchema,
     onAccept,

package/src/tools/coValues/CoValueBase.ts

@@ -1,5 +1,5 @@
 import { ControlledAccount, RawAccount, type RawCoValue } from "cojson";
-import { z } from "../implementation/zodSchema/zodReExport.js";
+import { CoreCoValueSchema } from "../implementation/zodSchema/schemaTypes/CoValueSchema.js";
 import {
   AnonymousJazzAgent,
   CoValue,
@@ -8,13 +8,14 @@ import {
   ID,
   RegisteredSchemas,
   accessChildById,
-  anySchemaToCoSchema,
+  coValueClassFromCoValueClassOrSchema,
   coValuesCache,
   inspect,
   isCoValueSchema,
 } from "../internal.js";
 import type {
   Account,
+  CoValueClassOrSchema,
   Group,
   InstanceOfSchemaCoValuesNullable,
 } from "../internal.js";
@@ -46,9 +47,9 @@ export class CoValueBase implements CoValue {
 
     if (agent instanceof ControlledAccount) {
       return coValuesCache.get(agent.account, () =>
-        anySchemaToCoSchema(RegisteredSchemas["Account"]).fromRaw(
-          agent.account,
-        ),
+        coValueClassFromCoValueClassOrSchema(
+          RegisteredSchemas["Account"],
+        ).fromRaw(agent.account),
       );
     }
 
@@ -81,24 +82,11 @@ export class CoValueBase implements CoValue {
   }
 
   /** @category Type Helpers */
-  castAs<
-    S extends
-      | CoValueClass
-      | z.core.$ZodType
-      | (z.core.$ZodObject<any, any> & {
-          builtin: "Account";
-          migration?: (account: any, creationProps?: { name: string }) => void;
-        })
-      | (z.core.$ZodCustom<any, any> & { builtin: "FileStream" })
-      | (z.core.$ZodCustom<any, any> & {
-          builtin: "CoFeed";
-          element: z.core.$ZodType;
-        }),
-  >(
+  castAs<S extends CoValueClassOrSchema>(
     schema: S,
   ): S extends CoValueClass
     ? InstanceType<S>
-    : S extends z.core.$ZodType
+    : S extends CoreCoValueSchema
       ? NonNullable<InstanceOfSchemaCoValuesNullable<S>>
       : never {
     const cl = isCoValueSchema(schema) ? schema.getCoValueClass() : schema;

package/src/tools/coValues/account.ts

@@ -16,12 +16,12 @@ import {
 } from "cojson";
 import {
   AnonymousJazzAgent,
-  AnyAccountSchema,
   type CoMap,
   type CoValue,
   CoValueBase,
   CoValueClass,
-  CoValueOrZodSchema,
+  CoValueClassOrSchema,
+  CoreAccountSchema,
   type Group,
   ID,
   InstanceOfSchema,
@@ -40,7 +40,7 @@ import {
   SubscribeRestArgs,
   accessChildByKey,
   activeAccountContext,
-  anySchemaToCoSchema,
+  coValueClassFromCoValueClassOrSchema,
   coValuesCache,
   createInboxRoot,
   ensureCoValueLoaded,
@@ -254,7 +254,7 @@ export class Account extends CoValueBase implements CoValue {
     return value._owner.getRoleOf(this.id) === "admin";
   }
 
-  async acceptInvite<S extends CoValueOrZodSchema>(
+  async acceptInvite<S extends CoValueClassOrSchema>(
     valueID: string,
     inviteSecret: InviteSecret,
     coValueClass: S,
@@ -268,9 +268,13 @@ export class Account extends CoValueBase implements CoValue {
       inviteSecret,
     );
 
-    return loadCoValue(anySchemaToCoSchema(coValueClass), valueID, {
-      loadAs: this,
-    }) as Resolved<InstanceOrPrimitiveOfSchema<S>, true> | null;
+    return loadCoValue(
+      coValueClassFromCoValueClassOrSchema(coValueClass),
+      valueID,
+      {
+        loadAs: this,
+      },
+    ) as Resolved<InstanceOrPrimitiveOfSchema<S>, true> | null;
   }
 
   /** @private */
@@ -447,9 +451,7 @@ export class Account extends CoValueBase implements CoValue {
    *
    * @category Subscription & Loading
    */
-  waitForSync(options?: {
-    timeout?: number;
-  }) {
+  waitForSync(options?: { timeout?: number }) {
     return this._raw.core.waitForSync(options);
   }
 
@@ -458,9 +460,7 @@ export class Account extends CoValueBase implements CoValue {
    *
    * @category Subscription & Loading
    */
-  waitForAllCoValuesSync(options?: {
-    timeout?: number;
-  }) {
+  waitForAllCoValuesSync(options?: { timeout?: number }) {
     return this._raw.core.node.syncManager.waitForAllCoValuesSync(
       options?.timeout,
     );
@@ -502,7 +502,11 @@ export const AccountAndGroupProxyHandler: ProxyHandler<Account | Group> = {
       return true;
     } else if (key === "root") {
       if (value) {
-        target._raw.set("root", value.id as unknown as CoID<RawCoMap>);
+        target._raw.set(
+          "root",
+          value.id as unknown as CoID<RawCoMap>,
+          "trusting",
+        );
       }
       return true;
     } else {

package/src/tools/coValues/coFeed.ts

@@ -12,12 +12,10 @@ import type {
 import { MAX_RECOMMENDED_TX_SIZE, cojsonInternals } from "cojson";
 import type {
   AnonymousJazzAgent,
-  AnyAccountSchema,
   CoValue,
   CoValueClass,
   Group,
   ID,
-  InstanceOfSchema,
   RefsToResolve,
   RefsToResolveStrict,
   Resolved,
@@ -31,10 +29,8 @@ import {
   CoValueBase,
   ItemsSym,
   Ref,
-  RegisteredSchemas,
   SchemaInit,
   accessChildById,
-  anySchemaToCoSchema,
   coField,
   ensureCoValueLoaded,
   inspect,

package/src/tools/coValues/coList.ts

@@ -3,13 +3,11 @@ import { ControlledAccount, RawAccount } from "cojson";
 import { calcPatch } from "fast-myers-diff";
 import type {
   Account,
-  AnyAccountSchema,
   CoValue,
   CoValueClass,
   CoValueFromRaw,
   Group,
   ID,
-  InstanceOfSchema,
   RefEncoded,
   RefsToResolve,
   RefsToResolveStrict,
@@ -26,8 +24,8 @@ import {
   RegisteredSchemas,
   SchemaInit,
   accessChildByKey,
-  anySchemaToCoSchema,
   coField,
+  coValueClassFromCoValueClassOrSchema,
   coValuesCache,
   ensureCoValueLoaded,
   inspect,
@@ -117,9 +115,9 @@ export class CoList<out Item = any> extends Array<Item> implements CoValue {
   /** @category Collaboration */
   get _owner(): Account | Group {
     return this._raw.group instanceof RawAccount
-      ? anySchemaToCoSchema(RegisteredSchemas["Account"]).fromRaw(
-          this._raw.group,
-        )
+      ? coValueClassFromCoValueClassOrSchema(
+          RegisteredSchemas["Account"],
+        ).fromRaw(this._raw.group)
       : RegisteredSchemas["Group"].fromRaw(this._raw.group);
   }
 
@@ -175,9 +173,9 @@ export class CoList<out Item = any> extends Array<Item> implements CoValue {
 
     if (agent instanceof ControlledAccount) {
       return coValuesCache.get(agent.account, () =>
-        anySchemaToCoSchema(RegisteredSchemas["Account"]).fromRaw(
-          agent.account,
-        ),
+        coValueClassFromCoValueClassOrSchema(
+          RegisteredSchemas["Account"],
+        ).fromRaw(agent.account),
       );
     }
 

package/src/tools/coValues/coMap.ts

@@ -20,6 +20,7 @@ import type {
   RefsToResolveStrict,
   Resolved,
   Schema,
+  Simplify,
   SubscribeListenerOptions,
   SubscribeRestArgs,
 } from "../internal.js";
@@ -54,12 +55,6 @@ type CoMapEdit<V> = {
 
 type LastAndAllCoMapEdits<V> = CoMapEdit<V> & { all: CoMapEdit<V>[] };
 
-export type Simplify<A> = {
-  [K in keyof A]: A[K];
-} extends infer B
-  ? B
-  : never;
-
 /**
  * CoMaps are collaborative versions of plain objects, mapping string-like keys to values.
  *

package/src/tools/coValues/coPlainText.ts

@@ -14,7 +14,7 @@ import {
   Resolved,
   SubscribeListenerOptions,
   SubscribeRestArgs,
-  anySchemaToCoSchema,
+  coValueClassFromCoValueClassOrSchema,
   parseCoValueCreateOptions,
 } from "../internal.js";
 import {
@@ -47,9 +47,9 @@ export class CoPlainText extends String implements CoValue {
 
     if (agent instanceof ControlledAccount) {
       return coValuesCache.get(agent.account, () =>
-        anySchemaToCoSchema(RegisteredSchemas["Account"]).fromRaw(
-          agent.account,
-        ),
+        coValueClassFromCoValueClassOrSchema(
+          RegisteredSchemas["Account"],
+        ).fromRaw(agent.account),
       );
     }
 

package/src/tools/coValues/deepLoading.ts

@@ -5,7 +5,10 @@ import { CoFeedEntry } from "./coFeed.js";
 import { type CoKeys } from "./coMap.js";
 import { type CoValue, type ID } from "./interfaces.js";
 
-type NotNull<T> = Exclude<T, null>;
+/**
+ * Similar to {@link NonNullable}, but removes only `null` and preserves `undefined`.
+ */
+export type NotNull<T> = Exclude<T, null>;
 
 /**
  * Used to check if T is a union type.

package/src/tools/coValues/extensions/imageDef.ts

@@ -8,9 +8,9 @@ const ImageDefinitionBase = coMapDefiner({
 }).catchall(coFileStreamDefiner());
 
 /** @category Media */
-export const ImageDefinition = ImageDefinitionBase.withHelpers((Self) => ({
+export const ImageDefinition = Object.assign({}, ImageDefinitionBase, {
   highestResAvailable(
-    imageDef: Loaded<typeof Self>,
+    imageDef: ImageDefinition,
     options?: {
       maxWidth?: number;
       targetWidth?: number;
@@ -56,5 +56,5 @@ export const ImageDefinition = ImageDefinitionBase.withHelpers((Self) => ({
       }
     );
   },
-}));
+});
 export type ImageDefinition = Loaded<typeof ImageDefinition>;

package/src/tools/coValues/group.ts

@@ -153,6 +153,7 @@ export class Group extends CoValueBase implements CoValue {
     member: Group,
     role?: "reader" | "writer" | "admin" | "inherit",
   ): void;
+  addMember(member: Group | Account, role: "reader" | "writer" | "admin"): void;
   addMember(
     member: Group | Everyone | Account,
     role?: AccountRole | "inherit",

package/src/tools/coValues/inbox.ts

@@ -3,13 +3,14 @@ import { CoStreamItem, RawCoStream } from "cojson";
 import {
   type Account,
   CoValue,
-  CoValueOrZodSchema,
+  CoValueClassOrSchema,
   ID,
   InstanceOfSchema,
   activeAccountContext,
-  anySchemaToCoSchema,
+  coValueClassFromCoValueClassOrSchema,
   loadCoValue,
 } from "../internal.js";
+import { isCoValueId } from "../lib/id.js";
 
 export type InboxInvite = `${CoID<MessagesStream>}/${InviteSecret}`;
 type TxKey = `${SessionID}/${number}`;
@@ -108,7 +109,7 @@ export class Inbox {
     this.failed = failed;
   }
 
-  subscribe<M extends CoValueOrZodSchema, O extends CoValue | undefined>(
+  subscribe<M extends CoValueClassOrSchema, O extends CoValue | undefined>(
     Schema: M,
     callback: (
       message: InstanceOfSchema<M>,
@@ -171,7 +172,7 @@ export class Inbox {
                 }
 
                 return loadCoValue(
-                  anySchemaToCoSchema(Schema),
+                  coValueClassFromCoValueClassOrSchema(Schema),
                   message.get("payload")!,
                   {
                     loadAs: account,
@@ -382,7 +383,7 @@ async function acceptInvite(invite: string, account?: Account) {
 
   const inviteSecret = invite.slice(invite.indexOf("/") + 1) as InviteSecret;
 
-  if (!id?.startsWith("co_z") || !inviteSecret.startsWith("inviteSecret_")) {
+  if (!isCoValueId(id) || !inviteSecret.startsWith("inviteSecret_")) {
     throw new Error("Invalid inbox ticket");
   }
 
@@ -399,8 +400,8 @@ function getAccountIDfromSessionID(sessionID: SessionID) {
   const until = sessionID.indexOf("_session");
   const accountID = sessionID.slice(0, until);
 
-  if (accountID.startsWith("co_z")) {
-    return accountID as ID<Account>;
+  if (isCoValueId(accountID)) {
+    return accountID;
   }
 
   return;