jazz-tools 0.13.23 → 0.13.26

package/dist/coValues/coPlainText.d.ts

@@ -96,7 +96,7 @@ export declare class CoPlainText extends String implements CoValue {
      *
      * The 'hint' parameter indicates the preferred type of conversion:
      * - 'string': prefer string conversion
-     * - 'number': prefer number conversion (not meaningful for text, so return NaN)
+     * - 'number': prefer number conversion (attempt to parse the text as a number)
      * - 'default': usually treat as string
      */
     [Symbol.toPrimitive](hint: string): string | number;

package/dist/index.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/subscribe/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAY,MAAM,QAAQ,CAAC;AAE1D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAyB,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,mEAQnD;AAED,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,EAC7C,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,EAClB,GAAG,EAAE,UAAU,EACf,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;EAgBxC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/subscribe/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAyB,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,mEAQnD;AAED,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,EAC7C,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,EAClB,GAAG,EAAE,UAAU,EACf,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;EAgBxC"}

package/dist/testing.js

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

package/dist/tests/load.test.d.ts

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

package/dist/tests/load.test.d.ts.map

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

package/package.json

@@ -17,11 +17,11 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.13.23",
+  "version": "0.13.26",
   "dependencies": {
     "@scure/bip39": "^1.3.0",
     "fast-myers-diff": "^3.2.0",
-    "cojson": "0.13.23"
+    "cojson": "0.13.25"
   },
   "devDependencies": {
     "tsup": "8.3.5",

package/src/coValues/coPlainText.ts

@@ -268,7 +268,7 @@ export class CoPlainText extends String implements CoValue {
    *
    * The 'hint' parameter indicates the preferred type of conversion:
    * - 'string': prefer string conversion
-   * - 'number': prefer number conversion (not meaningful for text, so return NaN)
+   * - 'number': prefer number conversion (attempt to parse the text as a number)
    * - 'default': usually treat as string
    */
   [Symbol.toPrimitive](hint: string) {

package/src/subscribe/SubscriptionScope.ts

@@ -72,12 +72,12 @@ export class SubscriptionScope<D extends CoValue> {
       return;
     }
 
-    const owner = getOwnerFromRawValue(update);
-
     const ruleset = update.core.verified.header.ruleset;
 
     // Groups and accounts are accessible by everyone, for the other coValues we use the role to check access
-    const hasAccess = ruleset.type === "group" || owner.myRole() !== undefined;
+    const hasAccess =
+      ruleset.type !== "ownedByGroup" ||
+      getOwnerFromRawValue(update).myRole() !== undefined;
 
     if (!hasAccess) {
       if (this.value.type !== "unauthorized") {

package/src/subscribe/utils.ts

@@ -1,13 +1,13 @@
-import { RawAccount, RawCoValue, RawGroup } from "cojson";
+import { RawAccount, RawCoValue } from "cojson";
 import { RegisteredSchemas } from "../coValues/registeredSchemas.js";
 import { CoValue, RefEncoded, instantiateRefEncoded } from "../internal.js";
 import { coValuesCache } from "../lib/cache.js";
 import { SubscriptionScope } from "./SubscriptionScope.js";
 
 export function getOwnerFromRawValue(raw: RawCoValue) {
-  let owner = raw instanceof RawGroup ? raw : raw.group;
+  const owner = raw.group;
 
-  return coValuesCache.get(owner as any, () =>
+  return coValuesCache.get(owner, () =>
     owner instanceof RawAccount
       ? RegisteredSchemas["Account"].fromRaw(owner)
       : RegisteredSchemas["Group"].fromRaw(owner as any),

package/src/tests/account.test.ts

@@ -1,12 +1,18 @@
-import { expect, test } from "vitest";
+import { LocalNode } from "cojson";
+import { assert, beforeEach, expect, test } from "vitest";
 import { Account, CoMap, Group, co } from "../exports.js";
 import {
   createJazzTestAccount,
   linkAccounts,
   setActiveAccount,
+  setupJazzTestSync,
 } from "../testing.js";
 import { setupTwoNodes } from "./utils.js";
 
+beforeEach(async () => {
+  await setupJazzTestSync();
+});
+
 test("waitForAllCoValuesSync should resolve when all the values are synced", async () => {
   class TestMap extends CoMap {
     name = co.string;
@@ -98,3 +104,38 @@ test("accounts should sync correctly", async () => {
   expect(members[0]?.account.profile!.name).toBe("test 1");
   expect(members[1]?.account.profile!.name).toBe("test 2");
 });
+
+test("loading accounts should work", async () => {
+  const account = await createJazzTestAccount({
+    creationProps: {
+      name: "test 1",
+    },
+  });
+
+  const otherAccount = await createJazzTestAccount();
+
+  const loadedAccount = await Account.load(account.id, {
+    loadAs: otherAccount,
+    resolve: {
+      profile: true,
+    },
+  });
+
+  assert(loadedAccount);
+  expect(loadedAccount.profile.name).toBe("test 1");
+});
+
+test("loading raw accounts should work", async () => {
+  const account = await createJazzTestAccount({
+    creationProps: {
+      name: "test 1",
+    },
+  });
+
+  const loadedAccount = await Account.load(account.id, {
+    loadAs: account,
+  });
+
+  assert(loadedAccount);
+  expect(loadedAccount.profile!.name).toBe("test 1");
+});

package/src/tests/load.test.ts

@@ -0,0 +1,116 @@
+import { cojsonInternals } from "cojson";
+import { beforeEach, expect, test } from "vitest";
+import { Account, CoMap, Group, co } from "../exports.js";
+import {
+  createJazzTestAccount,
+  getPeerConnectedToTestSyncServer,
+  setupJazzTestSync,
+} from "../testing.js";
+
+beforeEach(async () => {
+  await setupJazzTestSync();
+  await createJazzTestAccount({
+    isCurrentActiveAccount: true,
+  });
+});
+
+test("load a value", async () => {
+  class Person extends CoMap {
+    name = co.string;
+  }
+
+  const group = Group.create();
+  const map = Person.create({ name: "John" }, group);
+  group.addMember("everyone", "reader");
+
+  const alice = await createJazzTestAccount();
+
+  const john = await Person.load(map.id, { loadAs: alice });
+  expect(john).not.toBeNull();
+  expect(john?.name).toBe("John");
+});
+
+test("retry an unavailable a value", async () => {
+  class Person extends CoMap {
+    name = co.string;
+  }
+
+  const currentAccount = Account.getMe();
+
+  // Disconnect the current account
+  currentAccount._raw.core.node.syncManager.getPeers().forEach((peer) => {
+    peer.gracefulShutdown();
+  });
+
+  const group = Group.create();
+  const map = Person.create({ name: "John" }, group);
+  group.addMember("everyone", "reader");
+
+  const alice = await createJazzTestAccount();
+
+  let resolved = false;
+  const promise = Person.load(map.id, { loadAs: alice });
+  promise.then(() => {
+    resolved = true;
+  });
+
+  await new Promise((resolve) =>
+    setTimeout(
+      resolve,
+      cojsonInternals.CO_VALUE_LOADING_CONFIG.RETRY_DELAY - 100,
+    ),
+  );
+
+  expect(resolved).toBe(false);
+
+  // Reconnect the current account
+  currentAccount._raw.core.node.syncManager.addPeer(
+    getPeerConnectedToTestSyncServer(),
+  );
+
+  const john = await promise;
+  expect(john).not.toBeNull();
+  expect(john?.name).toBe("John");
+});
+
+test("returns null if the value is unavailable after retries", async () => {
+  class Person extends CoMap {
+    name = co.string;
+  }
+
+  const currentAccount = Account.getMe();
+
+  // Disconnect the current account
+  currentAccount._raw.core.node.syncManager.getPeers().forEach((peer) => {
+    peer.gracefulShutdown();
+  });
+
+  const group = Group.create();
+  const map = Person.create({ name: "John" }, group);
+  group.addMember("everyone", "reader");
+
+  const alice = await createJazzTestAccount();
+
+  let resolved = false;
+  const promise = Person.load(map.id, { loadAs: alice });
+  promise.then(() => {
+    resolved = true;
+  });
+
+  await new Promise((resolve) =>
+    setTimeout(
+      resolve,
+      cojsonInternals.CO_VALUE_LOADING_CONFIG.RETRY_DELAY + 100,
+    ),
+  );
+
+  expect(resolved).toBe(true);
+
+  // Reconnect the current account
+  currentAccount._raw.core.node.syncManager.addPeer(
+    getPeerConnectedToTestSyncServer(),
+  );
+
+  const john = await promise;
+  expect(john).toBeNull();
+});