jazz-tools 0.20.14 → 0.20.16

package/dist/tools/tests/coValue.cursor.test.d.ts.map

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

package/dist/tools/tests/cursor.test.d.ts

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

package/dist/tools/tests/cursor.test.d.ts.map

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

package/package.json

@@ -206,7 +206,7 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.20.14",
+  "version": "0.20.16",
   "dependencies": {
     "@scure/base": "1.2.1",
     "@scure/bip39": "^1.3.0",
@@ -223,9 +223,9 @@
     "prosemirror-transform": "^1.9.0",
     "use-sync-external-store": "^1.5.0",
     "zod": "4.1.11",
-    "cojson": "0.20.14",
-    "cojson-storage-indexeddb": "0.20.14",
-    "cojson-transport-ws": "0.20.14"
+    "cojson": "0.20.16",
+    "cojson-storage-indexeddb": "0.20.16",
+    "cojson-transport-ws": "0.20.16"
   },
   "devDependencies": {
     "@scure/bip39": "^1.3.0",
@@ -245,7 +245,7 @@
     "queueueue": "^4.1.2",
     "react-error-boundary": "^6.0.0",
     "tsup": "8.5.0",
-    "typescript": "5.6.2",
+    "typescript": "6.0.2",
     "vitest": "4.0.16",
     "ws": "^8.14.2"
   },

package/src/better-auth/database-adapter/tests/repository/session.test.ts

@@ -8,6 +8,8 @@ import { createWorkerAccount, startSyncServer } from "../sync-utils.js";
 
 describe("SessionRepository", () => {
   let syncServer: any;
+  let jazzSchema: ReturnType<typeof createJazzSchema>;
+  let workerCredentials: { accountID: string; agentSecret: string };
 
   let databaseSchema: Database;
   let databaseRoot: co.loaded<Database, { group: true }>;
@@ -21,7 +23,12 @@ describe("SessionRepository", () => {
       peer: `ws://localhost:${syncServer.port}`,
     });
 
-    const JazzSchema = createJazzSchema({
+    workerCredentials = {
+      accountID: workerAccount.accountID,
+      agentSecret: workerAccount.agentSecret,
+    };
+
+    jazzSchema = createJazzSchema({
       user: {
         modelName: "user",
         fields: {
@@ -47,14 +54,14 @@ describe("SessionRepository", () => {
     });
 
     const result = await startWorker({
-      AccountSchema: JazzSchema.WorkerAccount,
+      AccountSchema: jazzSchema.WorkerAccount,
       syncServer: `ws://localhost:${syncServer.port}`,
       accountID: workerAccount.accountID,
       accountSecret: workerAccount.agentSecret,
     });
 
-    databaseSchema = JazzSchema.DatabaseRoot;
-    databaseRoot = await JazzSchema.loadDatabase(result.worker);
+    databaseSchema = jazzSchema.DatabaseRoot;
+    databaseRoot = await jazzSchema.loadDatabase(result.worker);
     worker = result.worker;
   });
 
@@ -416,4 +423,68 @@ describe("SessionRepository", () => {
       expect(deleted).toBe(0);
     });
   });
+
+  describe("cross-worker session lookup", () => {
+    it("should find a session on a fresh worker immediately after create + ensureSync on Worker A", async () => {
+      // Worker A: create user and session, then ensureSync so the sync server
+      // has the data before Worker B tries to read it.
+      const userRepository = new UserRepository(
+        databaseSchema,
+        databaseRoot,
+        worker,
+      );
+      const user = await userRepository.create("user", {
+        email: "cross-worker@test.com",
+      });
+
+      const sessionRepositoryA = new SessionRepository(
+        databaseSchema,
+        databaseRoot,
+        worker,
+        {},
+        true, // ensureSync=true so coValuesTracker is set up
+      );
+
+      await sessionRepositoryA.create("session", {
+        token: "cross-worker-token",
+        userId: user.$jazz.id,
+      });
+
+      // Guarantee the session CoValue has reached the sync server before
+      // Worker B connects — this is what the adapter does after create().
+      await sessionRepositoryA.ensureSync();
+
+      // Worker B: a fresh second connection using the same Jazz worker account,
+      // simulating a second server instance handling /get-session.
+      const workerBResult = await startWorker({
+        AccountSchema: jazzSchema.WorkerAccount,
+        syncServer: `ws://localhost:${syncServer.port}`,
+        accountID: workerCredentials.accountID,
+        accountSecret: workerCredentials.agentSecret,
+      });
+
+      const databaseRootB = await jazzSchema.loadDatabase(workerBResult.worker);
+
+      const sessionRepositoryB = new SessionRepository(
+        jazzSchema.DatabaseRoot,
+        databaseRootB,
+        workerBResult.worker,
+      );
+
+      // Worker B looks up the session by token — no retry, exactly as the
+      // adapter's findOne path does. If loadUnique's skipRetry:true fires
+      // before the sync server delivers the CoValue, this returns null.
+      const found = await sessionRepositoryB.findByUnique("session", [
+        {
+          connector: "AND",
+          operator: "eq",
+          field: "token",
+          value: "cross-worker-token",
+        },
+      ]);
+
+      expect(found).not.toBeNull();
+      expect(found?.token).toBe("cross-worker-token");
+    });
+  });
 });

package/src/media/create-image/server.ts

@@ -106,7 +106,7 @@ async function createFileStreamFromSource(
   const mimeType = formatToMimeType(format);
 
   return FileStream.createFromArrayBuffer(
-    imageBlobOrBuffer,
+    imageBlobOrBuffer as ArrayBuffer,
     mimeType,
     undefined,
     { owner },

package/src/react-core/hooks.ts

@@ -30,6 +30,7 @@ import {
   captureStack,
   getUnloadedCoValueWithoutId,
   type BranchDefinition,
+  type CoValueCursor,
 } from "jazz-tools";
 import { JazzContext } from "./provider.js";
 import { getCurrentAccountFromContextManager } from "./utils.js";
@@ -100,6 +101,7 @@ export function useCoValueSubscription<
   options?: {
     resolve?: ResolveQueryStrict<S, R>;
     unstable_branch?: BranchDefinition;
+    cursor?: CoValueCursor;
   },
   source?: string,
 ): CoValueSubscription<S, R> | null {
@@ -109,6 +111,7 @@ export function useCoValueSubscription<
     [id],
     resolve,
     options?.unstable_branch,
+    options?.cursor,
     source,
   );
   return (subscriptions[0] ?? null) as CoValueSubscription<S, R> | null;
@@ -127,6 +130,7 @@ interface SubscriptionsState {
   agent: AnonymousJazzAgent | Loaded<any, true>;
   branchName?: string;
   branchOwnerId?: string;
+  cursor?: CoValueCursor;
 }
 
 /**
@@ -142,6 +146,7 @@ function useCoValueSubscriptions(
   ids: readonly (string | undefined | null)[],
   resolve: ResolveQuery<any>,
   branch?: BranchDefinition,
+  cursor?: CoValueCursor,
   source?: string,
 ): (SubscriptionScope<CoValue> | null)[] {
   const contextManager = useJazzContext();
@@ -166,6 +171,7 @@ function useCoValueSubscriptions(
         false,
         false,
         branch,
+        cursor,
       );
 
       if (callerStack) {
@@ -187,6 +193,7 @@ function useCoValueSubscriptions(
       agent,
       branchName: branch?.name,
       branchOwnerId: branch?.owner?.$jazz.id,
+      cursor,
     };
   };
 
@@ -430,6 +437,12 @@ export function useCoState<
      * For more info see the [branching](https://jazz.tools/docs/react/using-covalues/version-control) documentation.
      */
     unstable_branch?: BranchDefinition;
+    /**
+     * Load the CoValue at a specific cursor.
+     *
+     * Cursors let you take a "snapshot" of a CoValue at the time of cursor creations.
+     */
+    cursor?: CoValueCursor;
     preloaded?: ExportedCoValue<Loaded<S, R>>;
   },
 ): TSelectorReturn {
@@ -477,6 +490,12 @@ export function useSuspenseCoState<
      * For more info see the [branching](https://jazz.tools/docs/react/using-covalues/version-control) documentation.
      */
     unstable_branch?: BranchDefinition;
+    /**
+     * Load the CoValue at a specific cursor.
+     *
+     * Cursors let you take a "snapshot" of a CoValue at the time of cursor creations.
+     */
+    cursor?: CoValueCursor;
     preloaded?: ExportedCoValue<Loaded<S, R>>;
   },
 ): TSelectorReturn {
@@ -549,6 +568,7 @@ export function useAccountSubscription<
   options?: {
     resolve?: ResolveQueryStrict<S, R>;
     unstable_branch?: BranchDefinition;
+    cursor?: CoValueCursor;
   },
   source?: string,
 ) {
@@ -580,6 +600,7 @@ export function useAccountSubscription<
       false,
       false,
       options?.unstable_branch,
+      options?.cursor,
     );
 
     // Set callerStack on returned subscription after retrieval
@@ -596,6 +617,7 @@ export function useAccountSubscription<
       Schema,
       branchName: options?.unstable_branch?.name,
       branchOwnerId: options?.unstable_branch?.owner?.$jazz.id,
+      cursor: options?.cursor,
     };
   };
 
@@ -609,7 +631,9 @@ export function useAccountSubscription<
       subscription.contextManager !== contextManager ||
       subscription.Schema !== Schema ||
       subscription.branchName !== options?.unstable_branch?.name ||
-      subscription.branchOwnerId !== options?.unstable_branch?.owner?.$jazz.id
+      subscription.branchOwnerId !==
+        options?.unstable_branch?.owner?.$jazz.id ||
+      subscription.cursor !== options?.cursor
     ) {
       // No need to manually destroy - cache handles cleanup via SubscriptionScope lifecycle
       setSubscription(createSubscription());
@@ -745,6 +769,12 @@ export function useAccount<
      * For more info see the [branching](https://jazz.tools/docs/react/using-covalues/version-control) documentation.
      */
     unstable_branch?: BranchDefinition;
+    /**
+     * Load the CoValue at a specific cursor.
+     *
+     * Cursors let you take a "snapshot" of a CoValue at the time of cursor creations.
+     */
+    cursor?: CoValueCursor;
   },
 ): TSelectorReturn {
   const subscription = useAccountSubscription(
@@ -787,6 +817,12 @@ export function useSuspenseAccount<
      * For more info see the [branching](https://jazz.tools/docs/react/using-covalues/version-control) documentation.
      */
     unstable_branch?: BranchDefinition;
+    /**
+     * Load the CoValue at a specific cursor.
+     *
+     * Cursors let you take a "snapshot" of a CoValue at the time of cursor creations.
+     */
+    cursor?: CoValueCursor;
   },
 ): TSelectorReturn {
   const subscription = useAccountSubscription(
@@ -1074,6 +1110,12 @@ export function useSuspenseCoStates<
      * For more info see the [branching](https://jazz.tools/docs/react/using-covalues/version-control) documentation.
      */
     unstable_branch?: BranchDefinition;
+    /**
+     * Load the CoValue at a specific cursor.
+     *
+     * Cursors let you take a "snapshot" of a CoValue at the time of cursor creations.
+     */
+    cursor?: CoValueCursor;
   },
 ): TSelectorReturn[] {
   const resolve = getResolveQuery(Schema, options?.resolve);
@@ -1082,6 +1124,7 @@ export function useSuspenseCoStates<
     ids,
     resolve,
     options?.unstable_branch,
+    options?.cursor,
     "useSuspenseCoStates",
   ) as SubscriptionScope<CoValue>[];
   useSuspendUntilLoaded(subscriptionScopes);
@@ -1144,6 +1187,12 @@ export function useCoStates<
      * For more info see the [branching](https://jazz.tools/docs/react/using-covalues/version-control) documentation.
      */
     unstable_branch?: BranchDefinition;
+    /**
+     * Load the CoValue at a specific cursor.
+     *
+     * Cursors let you take a "snapshot" of a CoValue at the time of cursor creations.
+     */
+    cursor?: CoValueCursor;
   },
 ): TSelectorReturn[] {
   const resolve = getResolveQuery(Schema, options?.resolve);
@@ -1152,6 +1201,7 @@ export function useCoStates<
     ids,
     resolve,
     options?.unstable_branch,
+    options?.cursor,
     "useCoStates",
   ) as SubscriptionScope<CoValue>[];
   return useSubscriptionsSelector(subscriptionScopes, options);

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

@@ -163,6 +163,10 @@ describe("usePassphraseAuth", () => {
           "accountIndex": 0,
           "state": "anonymous",
         },
+        {
+          "accountIndex": 0,
+          "state": "anonymous",
+        },
         {
           "accountIndex": 0,
           "state": "signedIn",

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

@@ -11,9 +11,9 @@ import type {
   InstanceOfSchema,
   Loaded,
   MaybeLoaded,
-  NotLoaded,
   ResolveQuery,
   ResolveQueryStrict,
+  CoValueCursor,
 } from "jazz-tools";
 import {
   captureStack,
@@ -48,6 +48,12 @@ type CoStateOptions<
    * For more info see the [branching](https://jazz.tools/docs/svelte/using-covalues/version-control) documentation.
    */
   unstable_branch?: BranchDefinition;
+  /**
+   * Load the CoValue at a specific cursor.
+   *
+   * Cursors let you take a "snapshot" of a CoValue at the time of cursor creations.
+   */
+  cursor?: CoValueCursor;
 };
 
 type CoStateId = string | undefined | null;
@@ -106,6 +112,7 @@ export class CoState<
           false, // skipRetry
           false, // bestEffortResolution
           options?.unstable_branch,
+          options?.cursor,
         );
 
         subscriptionScope.callerStack = callerStack;
@@ -193,6 +200,7 @@ export class AccountCoState<
           false, // skipRetry
           false, // bestEffortResolution
           options?.unstable_branch,
+          options?.cursor,
         );
 
         subscriptionScope.callerStack = callerStack;

package/src/tools/auth/AuthSecretStorage.ts

@@ -126,7 +126,7 @@ export class AuthSecretStorage {
   }
 
   async set(payload: AuthSetPayload) {
-    this.setWithoutNotify(payload);
+    await this.setWithoutNotify(payload);
     this.emitUpdate(payload);
   }
 

package/src/tools/coValues/CoValueBase.ts

@@ -13,6 +13,8 @@ import {
   getSubscriptionScope,
   inspect,
   unstable_mergeBranch,
+  CoValueCursor,
+  RefsToResolve,
 } from "../internal.js";
 import { Group, TypeSym } from "../internal.js";
 
@@ -169,6 +171,18 @@ export abstract class CoValueJazzApi<V extends CoValue> {
     return Boolean(subscriptionScope?.unstable_branch);
   }
 
+  get cursor(): CoValueCursor | undefined {
+    const subscriptionScope = this._subscriptionScope;
+
+    return subscriptionScope?.cursor;
+  }
+
+  createCursor(): CoValueCursor {
+    const subscriptionScope = getSubscriptionScope(this.coValue);
+
+    return subscriptionScope.cursor ?? subscriptionScope.createCursor();
+  }
+
   /**
    * Deeply merge the current branch into the main CoValues.
    *

package/src/tools/coValues/account.ts

@@ -59,6 +59,8 @@ import {
   subscribeToExistingCoValue,
   InstanceOfSchemaCoValuesMaybeLoaded,
   LoadedAndRequired,
+  CoValueCursor,
+  LoadCoValueCursorOption,
 } from "../internal.js";
 import type { CoreAccountSchema } from "../implementation/zodSchema/schemaTypes/AccountSchema.js";
 import type { AccountSchema as HydratedAccountSchema } from "../implementation/zodSchema/schemaTypes/AccountSchema.js";
@@ -571,6 +573,7 @@ class AccountJazzApi<A extends Account> extends CoValueJazzApi<A> {
     options: {
       resolve: RefsToResolveStrict<A, R>;
       unstable_branch?: BranchDefinition;
+      cursor?: LoadCoValueCursorOption;
     },
   ): Promise<Resolved<A, R>> {
     return ensureCoValueLoaded(this.account as unknown as A, options);
@@ -586,6 +589,7 @@ class AccountJazzApi<A extends Account> extends CoValueJazzApi<A> {
     options: {
       resolve?: RefsToResolveStrict<A, R>;
       unstable_branch?: BranchDefinition;
+      cursor?: CoValueCursor;
     },
     listener: (value: Resolved<A, R>, unsubscribe: () => void) => void,
   ): () => void;

package/src/tools/coValues/coFeed.ts

@@ -51,6 +51,8 @@ import {
   subscribeToExistingCoValue,
   CoreFileStreamSchema,
   CoValueCreateOptionsInternal,
+  CoValueCursor,
+  LoadCoValueCursorOption,
 } from "../internal.js";
 import { z } from "../implementation/zodSchema/zodReExport.js";
 import {
@@ -559,6 +561,7 @@ export class CoFeedJazzApi<F extends CoFeed> extends CoValueJazzApi<F> {
     options?: {
       resolve?: RefsToResolveStrict<F, R>;
       unstable_branch?: BranchDefinition;
+      cursor?: LoadCoValueCursorOption;
     },
   ): Promise<Resolved<F, R>> {
     return ensureCoValueLoaded(this.coFeed, options);
@@ -579,6 +582,7 @@ export class CoFeedJazzApi<F extends CoFeed> extends CoValueJazzApi<F> {
     options: {
       resolve?: RefsToResolveStrict<F, R>;
       unstable_branch?: BranchDefinition;
+      cursor?: CoValueCursor;
     },
     listener: (value: Resolved<F, R>, unsubscribe: () => void) => void,
   ): () => void;
@@ -910,10 +914,11 @@ export class FileStream extends CoValueBase implements CoValue {
     return this.$jazz.raw.getBinaryStreamInfo();
   }
 
-  getChunks(options?: {
-    allowUnfinished?: boolean;
-  }):
-    | (BinaryStreamInfo & { chunks: Uint8Array[]; finished: boolean })
+  getChunks(options?: { allowUnfinished?: boolean }):
+    | (BinaryStreamInfo & {
+        chunks: Uint8Array<ArrayBuffer>[];
+        finished: boolean;
+      })
     | undefined {
     return this.$jazz.raw.getBinaryChunks(options?.allowUnfinished);
   }
@@ -943,7 +948,6 @@ export class FileStream extends CoValueBase implements CoValue {
       return undefined;
     }
 
-    // @ts-ignore
     return new Blob(chunks.chunks, { type: chunks.mimeType });
   }
 

package/src/tools/coValues/coList.ts

@@ -38,6 +38,8 @@ import {
   subscribeToCoValueWithoutMe,
   subscribeToExistingCoValue,
   CoValueCreateOptionsInternal,
+  CoValueCursor,
+  LoadCoValueCursorOption,
 } from "../internal.js";
 import { z } from "../implementation/zodSchema/zodReExport.js";
 import { CoreCoListSchema } from "../implementation/zodSchema/schemaTypes/CoListSchema.js";
@@ -912,6 +914,7 @@ export class CoListJazzApi<L extends CoList> extends CoValueJazzApi<L> {
     options: {
       resolve: RefsToResolveStrict<L, R>;
       unstable_branch?: BranchDefinition;
+      cursor?: LoadCoValueCursorOption;
     },
   ): Promise<Resolved<L, R>> {
     return ensureCoValueLoaded(this.coList, options);
@@ -935,6 +938,7 @@ export class CoListJazzApi<L extends CoList> extends CoValueJazzApi<L> {
     options: {
       resolve?: RefsToResolveStrict<L, R>;
       unstable_branch?: BranchDefinition;
+      cursor?: CoValueCursor;
     },
     listener: (value: Resolved<L, R>, unsubscribe: () => void) => void,
   ): () => void;

package/src/tools/coValues/coMap.ts

@@ -53,6 +53,8 @@ import {
   subscribeToExistingCoValue,
   CoreCoMapSchema,
   CoValueCreateOptionsInternal,
+  CoValueCursor,
+  LoadCoValueCursorOption,
 } from "../internal.js";
 import { z } from "../implementation/zodSchema/zodReExport.js";
 import {
@@ -779,6 +781,7 @@ class CoMapJazzApi<M extends CoMap> extends CoValueJazzApi<M> {
     options: {
       resolve: RefsToResolveStrict<Map, R>;
       unstable_branch?: BranchDefinition;
+      cursor?: LoadCoValueCursorOption;
     },
   ): Promise<Resolved<Map, R>> {
     return ensureCoValueLoaded(this.coMap, options);
@@ -802,6 +805,7 @@ class CoMapJazzApi<M extends CoMap> extends CoValueJazzApi<M> {
     options: {
       resolve?: RefsToResolveStrict<Map, R>;
       unstable_branch?: BranchDefinition;
+      cursor?: CoValueCursor;
     },
     listener: (value: Resolved<Map, R>, unsubscribe: () => void) => void,
   ): () => void;