jazz-tools 0.13.18 → 0.13.19

package/dist/index.js

@@ -34,7 +34,7 @@ import {
   parseInviteLink,
   randomSessionProvider,
   subscribeToCoValue
-} from "./chunk-ITSHLDQB.js";
+} from "./chunk-4HBHY4I7.js";
 
 // src/index.ts
 import { MAX_RECOMMENDED_TX_SIZE, cojsonInternals } from "cojson";

package/dist/subscribe/SubscriptionScope.d.ts

@@ -19,6 +19,7 @@ export declare class SubscriptionScope<D extends CoValue> {
     resolve: RefsToResolve<any>;
     idsSubscribed: Set<string>;
     autoloaded: Set<string>;
+    autoloadedKeys: Set<string>;
     totalValidTransactions: number;
     silenceUpdates: boolean;
     constructor(node: LocalNode, resolve: RefsToResolve<D>, id: ID<D>, schema: RefEncoded<D>);

package/dist/subscribe/SubscriptionScope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubscriptionScope.d.ts","sourceRoot":"","sources":["../../src/subscribe/SubscriptionScope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,KAAK,EAAU,MAAM,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,EAAE,EACP,KAAK,UAAU,EACf,KAAK,aAAa,EAEnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,SAAS,EAAuB,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG9D,qBAAa,iBAAiB,CAAC,CAAC,SAAS,OAAO;IAoBrC,IAAI,EAAE,SAAS;IAEf,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACT,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAtB9B,UAAU,0CAAiD;IAC3D,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,CAG5D;IACJ,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC;IAC5C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAChD,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IACrD,iBAAiB,EAAE,SAAS,GAAG,SAAS,CAAC;IACzC,YAAY,EAAE,uBAAuB,CAAC;IACtC,KAAK,UAAS;IACd,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5B,aAAa,cAAqB;IAClC,UAAU,cAAqB;IAC/B,sBAAsB,SAAK;IAE3B,cAAc,UAAS;gBAGd,IAAI,EAAE,SAAS,EACtB,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,EAClB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EACT,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAS9B,WAAW,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC;IAO5C,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,aAAa;IA0E/C,kBAAkB;IAyBlB,iBAAiB,OACX,MAAM,SACH,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,QAAQ,QACvC,MAAM,UA6BZ;IAEF,iBAAiB;IAiBjB,aAAa;IAkBb,WAAW,cAAmB,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI,EAAI;IACpE,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI;IAQ9D,WAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI;IAKhE,cAAc,CAAC,GAAG,EAAE,MAAM;IA4C1B,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC;IA2BrD,YAAY;IA6GZ,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IA2CvE,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAsC1E,aAAa,CACX,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,EACzB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAC3B,GAAG,CAAC,EAAE,MAAM;IAiBd,OAAO;CAKR"}
+{"version":3,"file":"SubscriptionScope.d.ts","sourceRoot":"","sources":["../../src/subscribe/SubscriptionScope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,KAAK,EAAU,MAAM,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,EAAE,EACP,KAAK,UAAU,EACf,KAAK,aAAa,EAEnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,SAAS,EAAuB,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG9D,qBAAa,iBAAiB,CAAC,CAAC,SAAS,OAAO;IAqBrC,IAAI,EAAE,SAAS;IAEf,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACT,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAvB9B,UAAU,0CAAiD;IAC3D,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,CAG5D;IACJ,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC;IAC5C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAChD,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IACrD,iBAAiB,EAAE,SAAS,GAAG,SAAS,CAAC;IACzC,YAAY,EAAE,uBAAuB,CAAC;IACtC,KAAK,UAAS;IACd,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5B,aAAa,cAAqB;IAClC,UAAU,cAAqB;IAC/B,cAAc,cAAqB;IACnC,sBAAsB,SAAK;IAE3B,cAAc,UAAS;gBAGd,IAAI,EAAE,SAAS,EACtB,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,EAClB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EACT,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAS9B,WAAW,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC;IAO5C,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,aAAa;IA0E/C,kBAAkB;IAkClB,iBAAiB,OACX,MAAM,SACH,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,QAAQ,QACvC,MAAM,UA6BZ;IAEF,iBAAiB;IAiBjB,aAAa;IAkBb,WAAW,cAAmB,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI,EAAI;IACpE,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI;IAQ9D,WAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI;IAKhE,cAAc,CAAC,GAAG,EAAE,MAAM;IAuC1B,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC;IA2BrD,YAAY;IA6GZ,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IA2CvE,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAsC1E,aAAa,CACX,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,EACzB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAC3B,GAAG,CAAC,EAAE,MAAM;IAyBd,OAAO;CAKR"}

package/dist/testing.js

@@ -5,7 +5,7 @@ import {
   createAnonymousJazzContext,
   createJazzContext,
   randomSessionProvider
-} from "./chunk-ITSHLDQB.js";
+} from "./chunk-4HBHY4I7.js";
 
 // src/testing.ts
 import { LocalNode } from "cojson";

package/package.json

@@ -17,7 +17,7 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.13.18",
+  "version": "0.13.19",
   "dependencies": {
     "@scure/bip39": "^1.3.0",
     "fast-myers-diff": "^3.2.0",

package/src/subscribe/SubscriptionScope.ts

@@ -27,6 +27,7 @@ export class SubscriptionScope<D extends CoValue> {
   resolve: RefsToResolve<any>;
   idsSubscribed = new Set<string>();
   autoloaded = new Set<string>();
+  autoloadedKeys = new Set<string>();
   totalValidTransactions = 0;
 
   silenceUpdates = false;
@@ -133,7 +134,12 @@ export class SubscriptionScope<D extends CoValue> {
       return undefined;
     }
 
-    for (const value of this.childErrors.values()) {
+    for (const [key, value] of this.childErrors.entries()) {
+      // We don't want to block updates if the error is on an autoloaded value
+      if (this.autoloaded.has(key)) {
+        continue;
+      }
+
       errorType = value.type;
       if (value.issues) {
         issues.push(...value.issues);
@@ -147,7 +153,11 @@ export class SubscriptionScope<D extends CoValue> {
       }
     }
 
-    return new JazzError(this.id, errorType, issues);
+    if (issues.length) {
+      return new JazzError(this.id, errorType, issues);
+    }
+
+    return undefined;
   }
 
   handleChildUpdate = (
@@ -242,7 +252,10 @@ export class SubscriptionScope<D extends CoValue> {
       return;
     }
 
+    // Adding the key to the resolve object to resolve the key when calling loadChildren
     this.resolve[key as keyof typeof this.resolve] = true;
+    // Track the keys that are autoloaded to flag any id on that key as autoloaded
+    this.autoloadedKeys.add(key);
 
     if (this.value.type !== "loaded") {
       return;
@@ -259,19 +272,11 @@ export class SubscriptionScope<D extends CoValue> {
     if (value._type === "CoMap" || value._type === "Account") {
       const map = value as CoMap;
 
-      const id = this.loadCoMapKey(map, key, true);
-
-      if (id) {
-        this.autoloaded.add(id);
-      }
+      this.loadCoMapKey(map, key, true);
     } else if (value._type === "CoList") {
       const list = value as CoList;
 
-      const id = this.loadCoListKey(list, key, true);
-
-      if (id) {
-        this.autoloaded.add(id);
-      }
+      this.loadCoListKey(list, key, true);
     }
 
     this.silenceUpdates = false;
@@ -504,10 +509,18 @@ export class SubscriptionScope<D extends CoValue> {
       return;
     }
 
+    if (key && this.autoloadedKeys.has(key)) {
+      this.autoloaded.add(id);
+    }
+
+    // Cloning the resolve objects to avoid mutating the original object when tracking autoloaded values
+    const resolve =
+      typeof query === "object" && query !== null ? { ...query } : query;
+
     this.childValues.set(id, { type: "unloaded", id });
     const child = new SubscriptionScope(
       this.node,
-      query,
+      resolve,
       id as ID<any>,
       descriptor,
     );

package/src/tests/subscribe.test.ts

@@ -937,6 +937,263 @@ describe("subscribeToCoValue", () => {
     expect(value?.name).toBe("writer2");
     expect(value?._raw.totalValidTransactions).toBe(2);
   });
+
+  it("errors on autoloaded values shouldn't block updates", async () => {
+    class TestMap extends CoMap {
+      value = co.string;
+    }
+
+    class TestList extends CoList.Of(co.ref(TestMap)) {}
+
+    const reader = await createJazzTestAccount({
+      isCurrentActiveAccount: true,
+    });
+
+    const creator = await createJazzTestAccount({
+      isCurrentActiveAccount: true,
+    });
+
+    const everyone = Group.create(creator);
+    everyone.addMember("everyone", "reader");
+
+    const group = Group.create(creator);
+
+    const list = TestList.create(
+      [
+        TestMap.create({ value: "1" }, group),
+        TestMap.create({ value: "2" }, everyone),
+        TestMap.create({ value: "3" }, everyone),
+        TestMap.create({ value: "4" }, everyone),
+        TestMap.create({ value: "5" }, everyone),
+      ],
+      everyone,
+    );
+
+    let result = null as Resolved<TestList, { $each: true }> | null;
+
+    const updateFn = vi.fn().mockImplementation((value) => {
+      result = value;
+    });
+    const onUnauthorized = vi.fn();
+    const onUnavailable = vi.fn();
+
+    const unsubscribe = subscribeToCoValue(
+      TestList,
+      list.id,
+      {
+        loadAs: reader,
+        resolve: true,
+        onUnauthorized,
+        onUnavailable,
+      },
+      updateFn,
+    );
+
+    onTestFinished(unsubscribe);
+
+    await waitFor(() => {
+      expect(updateFn).toHaveBeenCalled();
+    });
+
+    await waitFor(() => {
+      assert(result);
+      expect(result[1]?.value).toBe("2");
+    });
+
+    assert(result);
+    expect(result[0]).toBe(null);
+
+    updateFn.mockClear();
+
+    list[1] = TestMap.create({ value: "updated" }, everyone);
+
+    await waitFor(() => {
+      expect(result?.[1]?.value).toBe("updated");
+    });
+
+    expect(onUnavailable).not.toHaveBeenCalled();
+    expect(onUnauthorized).not.toHaveBeenCalled();
+  });
+
+  it("errors on autoloaded values shouldn't block updates, even when the error comes from a new ref", async () => {
+    class Dog extends CoMap {
+      name = co.string;
+    }
+
+    class Person extends CoMap {
+      name = co.string;
+      dog = co.ref(Dog);
+    }
+
+    class PersonList extends CoList.Of(co.ref(Person)) {}
+
+    const reader = await createJazzTestAccount({
+      isCurrentActiveAccount: true,
+    });
+
+    const creator = await createJazzTestAccount({
+      isCurrentActiveAccount: true,
+    });
+
+    const everyone = Group.create(creator);
+    everyone.addMember("everyone", "reader");
+
+    const list = PersonList.create(
+      [
+        Person.create(
+          { name: "Guido", dog: Dog.create({ name: "Giggino" }, everyone) },
+          everyone,
+        ),
+        Person.create(
+          { name: "John", dog: Dog.create({ name: "Rex" }, everyone) },
+          everyone,
+        ),
+        Person.create(
+          { name: "Jane", dog: Dog.create({ name: "Bella" }, everyone) },
+          everyone,
+        ),
+      ],
+      everyone,
+    );
+
+    let result = null as Resolved<PersonList, { $each: true }> | null;
+
+    const updateFn = vi.fn().mockImplementation((value) => {
+      result = value;
+    });
+    const onUnauthorized = vi.fn();
+    const onUnavailable = vi.fn();
+
+    const unsubscribe = subscribeToCoValue(
+      PersonList,
+      list.id,
+      {
+        loadAs: reader,
+        resolve: {
+          $each: true,
+        },
+        onUnauthorized,
+        onUnavailable,
+      },
+      updateFn,
+    );
+
+    onTestFinished(unsubscribe);
+
+    await waitFor(() => {
+      expect(result?.[0]?.name).toBe("Guido");
+      expect(result?.[0]?.dog?.name).toBe("Giggino");
+    });
+
+    await waitFor(() => {
+      expect(result?.[1]?.name).toBe("John");
+      expect(result?.[1]?.dog?.name).toBe("Rex");
+    });
+
+    await waitFor(() => {
+      expect(result?.[2]?.name).toBe("Jane");
+      expect(result?.[2]?.dog?.name).toBe("Bella");
+    });
+
+    list[0]!.dog = Dog.create({ name: "Ninja" });
+
+    await waitFor(() => {
+      expect(result?.[0]?.dog).toBe(null);
+    });
+
+    list[1]!.dog = Dog.create({ name: "Pinkie" }, everyone);
+
+    await waitFor(() => {
+      expect(result?.[1]?.dog?.name).toBe("Pinkie");
+    });
+
+    expect(onUnavailable).not.toHaveBeenCalled();
+    expect(onUnauthorized).not.toHaveBeenCalled();
+  });
+
+  it("autoload on $each resolve should work on all items", async () => {
+    class Dog extends CoMap {
+      name = co.string;
+    }
+
+    class Person extends CoMap {
+      name = co.string;
+      dog = co.ref(Dog);
+    }
+
+    class PersonList extends CoList.Of(co.ref(Person)) {}
+
+    const reader = await createJazzTestAccount({
+      isCurrentActiveAccount: true,
+    });
+
+    const creator = await createJazzTestAccount({
+      isCurrentActiveAccount: true,
+    });
+
+    const everyone = Group.create(creator);
+    everyone.addMember("everyone", "reader");
+
+    const list = PersonList.create(
+      [
+        Person.create(
+          { name: "Guido", dog: Dog.create({ name: "Giggino" }, everyone) },
+          everyone,
+        ),
+        Person.create(
+          { name: "John", dog: Dog.create({ name: "Rex" }, everyone) },
+          everyone,
+        ),
+        Person.create(
+          { name: "Jane", dog: Dog.create({ name: "Bella" }, everyone) },
+          everyone,
+        ),
+      ],
+      everyone,
+    );
+
+    let result = null as Resolved<PersonList, { $each: true }> | null;
+
+    const updateFn = vi.fn().mockImplementation((value) => {
+      result = value;
+    });
+    const onUnauthorized = vi.fn();
+    const onUnavailable = vi.fn();
+
+    const unsubscribe = subscribeToCoValue(
+      PersonList,
+      list.id,
+      {
+        loadAs: reader,
+        resolve: {
+          $each: true,
+        },
+        onUnauthorized,
+        onUnavailable,
+      },
+      updateFn,
+    );
+
+    onTestFinished(unsubscribe);
+
+    await waitFor(() => {
+      expect(result?.[0]?.name).toBe("Guido");
+      expect(result?.[0]?.dog?.name).toBe("Giggino");
+    });
+
+    await waitFor(() => {
+      expect(result?.[1]?.name).toBe("John");
+      expect(result?.[1]?.dog?.name).toBe("Rex");
+    });
+
+    await waitFor(() => {
+      expect(result?.[2]?.name).toBe("Jane");
+      expect(result?.[2]?.dog?.name).toBe("Bella");
+    });
+
+    expect(onUnavailable).not.toHaveBeenCalled();
+    expect(onUnauthorized).not.toHaveBeenCalled();
+  });
 });
 
 describe("createCoValueObservable", () => {