jazz-tools 0.20.3 → 0.20.4

package/dist/index.js

@@ -50,7 +50,7 @@ import {
   subscribeToCoValue,
   unstable_loadUnique,
   zodReExport_exports
-} from "./chunk-Q5RNSSUM.js";
+} from "./chunk-XQ27DEA5.js";
 import {
   createSSRJazzAgent
 } from "./chunk-K4D7IMFM.js";

package/dist/testing.js

@@ -7,7 +7,7 @@ import {
   coValueClassFromCoValueClassOrSchema,
   createAnonymousJazzContext,
   createJazzContext
-} from "./chunk-Q5RNSSUM.js";
+} from "./chunk-XQ27DEA5.js";
 import "./chunk-ZQWSQH6L.js";
 
 // src/tools/testing.ts

package/dist/tools/subscribe/SubscriptionCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubscriptionCache.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/SubscriptionCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAEV,oBAAoB,EACpB,MAAM,EAGN,YAAY,EACb,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAanD,qBAAa,iBAAiB;IAE5B,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,cAAc,CAAS;gBAEnB,cAAc,GAAE,MAAa;IAKzC;;OAEG;IACH,OAAO,CAAC,QAAQ;IAIhB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IASxB;;OAEG;IACH,OAAO,CAAC,YAAY;IA+BpB;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAsBzB;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAY9B;;OAEG;IACH,OAAO,CAAC,eAAe;IASvB;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,YAAY;IA2BpB;;OAEG;IACH,WAAW,CAAC,CAAC,SAAS,oBAAoB,EACxC,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EACxB,SAAS,CAAC,EAAE,OAAO,EACnB,oBAAoB,CAAC,EAAE,OAAO,EAC9B,MAAM,CAAC,EAAE,gBAAgB,GACxB,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IA8DhD;;OAEG;IACH,KAAK,IAAI,IAAI;CAiBd"}
+{"version":3,"file":"SubscriptionCache.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/SubscriptionCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAEV,oBAAoB,EACpB,MAAM,EAGN,YAAY,EACb,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAqBnD,qBAAa,iBAAiB;IAE5B,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,cAAc,CAAS;gBAEnB,cAAc,GAAE,MAAa;IAKzC;;OAEG;IACH,OAAO,CAAC,QAAQ;IAIhB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IASxB;;OAEG;IACH,OAAO,CAAC,YAAY;IA+BpB;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAsBzB;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAY9B;;OAEG;IACH,OAAO,CAAC,eAAe;IASvB;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,YAAY;IA2BpB;;OAEG;IACH,WAAW,CAAC,CAAC,SAAS,oBAAoB,EACxC,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EACxB,SAAS,CAAC,EAAE,OAAO,EACnB,oBAAoB,CAAC,EAAE,OAAO,EAC9B,MAAM,CAAC,EAAE,gBAAgB,GACxB,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IA+DhD;;OAEG;IACH,KAAK,IAAI,IAAI;CAiBd"}

package/dist/tools/tests/testStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testStorage.d.ts","sourceRoot":"","sources":["../../../src/tools/tests/testStorage.ts"],"names":[],"mappings":"AA+CA,wBAAsB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,6CAU3E;AAED,wBAAgB,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,UAU/C"}
+{"version":3,"file":"testStorage.d.ts","sourceRoot":"","sources":["../../../src/tools/tests/testStorage.ts"],"names":[],"mappings":"AAuDA,wBAAsB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,6CAY3E;AAED,wBAAgB,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,UAE/C"}

package/package.json

@@ -196,7 +196,7 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.20.3",
+  "version": "0.20.4",
   "dependencies": {
     "@manuscripts/prosemirror-recreate-steps": "^0.1.4",
     "@scure/base": "1.2.1",
@@ -213,9 +213,9 @@
     "prosemirror-transform": "^1.9.0",
     "use-sync-external-store": "^1.5.0",
     "zod": "4.1.11",
-    "cojson": "0.20.3",
-    "cojson-storage-indexeddb": "0.20.3",
-    "cojson-transport-ws": "0.20.3"
+    "cojson": "0.20.4",
+    "cojson-storage-indexeddb": "0.20.4",
+    "cojson-transport-ws": "0.20.4"
   },
   "devDependencies": {
     "@scure/bip39": "^1.3.0",

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

@@ -890,4 +890,139 @@ describe("useCoState", () => {
     expect(result.current.person.age).toBe(30);
     expect(result.current.person.email).toBe("john@example.com");
   });
+
+  it("should render without infinite re-renders when accessing resolved schema", async () => {
+    const account = await createJazzTestAccount({
+      isCurrentActiveAccount: true,
+    });
+
+    // Minimal schema with a nested optional co-value
+    const ServerState = co.map({
+      status: z.string(),
+    });
+
+    const Organization = co
+      .map({
+        name: z.string(),
+        serverState: co.optional(ServerState),
+      })
+      .resolved({ serverState: true });
+
+    const org = Organization.create({
+      name: "Test Org",
+      serverState: ServerState.create({ status: "active" }),
+    });
+
+    let renderCount = 0;
+
+    const { result } = renderHook(
+      () => {
+        renderCount++;
+        const orgState = useCoState(Organization, org.$jazz.id);
+
+        // Access the unresolved nested co-value
+        if (orgState.$isLoaded) {
+          // This should not cause infinite re-renders
+          const _ = orgState.serverState;
+        }
+
+        return orgState;
+      },
+      {
+        account,
+      },
+    );
+
+    await waitFor(() => {
+      assertLoaded(result.current);
+      expect(result.current.name).toBe("Test Org");
+    });
+
+    // Wait a bit to ensure no additional re-renders occur
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    // Should not have excessive re-renders
+    expect(renderCount).toBeLessThan(10);
+  });
+
+  it("should render without infinite re-renders when accessing unresolved nested co-value", async () => {
+    const account = await createJazzTestAccount({
+      isCurrentActiveAccount: true,
+    });
+
+    // Minimal schema with a nested optional co-value
+    const ServerState = co.map({
+      status: z.string(),
+    });
+
+    const Organization = co.map({
+      name: z.string(),
+      serverState: co.optional(ServerState),
+    });
+
+    const org = Organization.create({
+      name: "Test Org",
+      serverState: ServerState.create({ status: "active" }),
+    });
+
+    let renderCount = 0;
+
+    const { result } = renderHook(
+      () => {
+        renderCount++;
+        const orgState = useCoState(Organization, org.$jazz.id, {
+          resolve: {},
+        });
+
+        // Access the unresolved nested co-value
+        if (orgState.$isLoaded) {
+          // This should not cause infinite re-renders
+          const _ = orgState.serverState;
+        }
+
+        return orgState;
+      },
+      {
+        account,
+      },
+    );
+
+    await waitFor(() => {
+      assertLoaded(result.current);
+      expect(result.current.name).toBe("Test Org");
+    });
+
+    // Wait a bit to ensure no additional re-renders occur
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    // Should not have excessive re-renders
+    expect(renderCount).toBeLessThan(10);
+  });
+
+  it("should not cause stack overflow when cloning resolve queries with circular references", async () => {
+    const account = await createJazzTestAccount({
+      isCurrentActiveAccount: true,
+    });
+
+    const TestMap = co.map({
+      value: z.string(),
+    });
+
+    const map = TestMap.create({
+      value: "test",
+    });
+
+    // Create a resolve query with circular reference
+    const circularResolve: Record<string, any> = { value: true };
+    circularResolve.self = circularResolve;
+
+    // This should not throw a stack overflow error
+    const { result } = renderHook(
+      () => useCoState(TestMap, map.$jazz.id, { resolve: circularResolve }),
+      { account },
+    );
+
+    assertLoaded(result.current);
+    expect(result.current.value).toBe("test");
+  });
 });

package/src/tools/subscribe/SubscriptionCache.ts

@@ -12,6 +12,14 @@ import { SubscriptionScope } from "./SubscriptionScope.js";
 import type { BranchDefinition } from "./types.js";
 import { isEqualRefsToResolve } from "./utils.js";
 
+function copyResolve(resolve: RefsToResolve<any>): RefsToResolve<any> {
+  if (typeof resolve !== "object" || resolve === null) {
+    return resolve;
+  }
+
+  return { ...resolve };
+}
+
 interface CacheEntry {
   subscriptionScope: SubscriptionScope<any>;
   schema: CoValueClassOrSchema;
@@ -233,10 +241,11 @@ export class SubscriptionCache {
     };
 
     // Create cache entry with initial subscriber count (starts at 0)
+    // Clone resolve to prevent mutation by SubscriptionScope.subscribeToKey from affecting cache lookups
     const entry: CacheEntry = {
       subscriptionScope,
       schema,
-      resolve,
+      resolve: copyResolve(resolve),
       branch,
       subscriberCount: subscriptionScope.subscribers.size,
       unsubscribeFromScope: subscriptionScope.onSubscriberChange(

package/src/tools/tests/testStorage.ts

@@ -45,26 +45,28 @@ class LibSQLSqliteAsyncDriver implements SQLiteDatabaseDriverAsync {
   }
 }
 
+function deleteDb(dbPath: string) {
+  try {
+    unlinkSync(dbPath);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
 export async function createAsyncStorage({ filename }: { filename?: string }) {
+  const dbPath = getDbPath(filename);
   const storage = await getSqliteStorageAsync(
-    new LibSQLSqliteAsyncDriver(getDbPath(filename)),
+    new LibSQLSqliteAsyncDriver(dbPath),
   );
 
   onTestFinished(async () => {
     await storage.close();
+    deleteDb(dbPath);
   });
 
   return storage;
 }
 
 export function getDbPath(defaultDbPath?: string) {
-  const dbPath = defaultDbPath ?? join(tmpdir(), `test-${randomUUID()}.db`);
-
-  if (!defaultDbPath) {
-    onTestFinished(() => {
-      unlinkSync(dbPath);
-    });
-  }
-
-  return dbPath;
+  return defaultDbPath ?? join(tmpdir(), `test-${randomUUID()}.db`);
 }