jazz-tools 0.17.14 → 0.18.0

package/src/tools/tests/inbox.test.ts

@@ -11,9 +11,12 @@ describe("Inbox", () => {
   describe("Private profile", () => {
     it("Should throw if the inbox owner profile is private", async () => {
       const WorkerAccount = co.account().withMigration((account) => {
-        account.profile = co
-          .profile()
-          .create({ name: "Worker" }, Group.create({ owner: account }));
+        account.$jazz.set(
+          "profile",
+          co
+            .profile()
+            .create({ name: "Worker" }, Group.create({ owner: account })),
+        );
       });
 
       const { clientAccount: sender, serverAccount: receiver } =
@@ -22,7 +25,9 @@ describe("Inbox", () => {
             coValueClassFromCoValueClassOrSchema(WorkerAccount),
         });
 
-      await expect(() => InboxSender.load(receiver.id, sender)).rejects.toThrow(
+      await expect(() =>
+        InboxSender.load(receiver.$jazz.id, sender),
+      ).rejects.toThrow(
         "Insufficient permissions to access the inbox, make sure its user profile is publicly readable.",
       );
     });
@@ -43,7 +48,7 @@ describe("Inbox", () => {
     );
 
     // Setup inbox sender
-    const inboxSender = await InboxSender.load(receiver.id, sender);
+    const inboxSender = await InboxSender.load(receiver.$jazz.id, sender);
     inboxSender.sendMessage(message);
 
     // Track received messages
@@ -64,7 +69,7 @@ describe("Inbox", () => {
 
     expect(receivedMessages.length).toBe(1);
     expect(receivedMessages[0]?.text).toBe("Hello");
-    expect(senderAccountID).toBe(sender.id);
+    expect(senderAccountID).toBe(sender.$jazz.id);
 
     unsubscribe();
   });
@@ -86,7 +91,7 @@ describe("Inbox", () => {
     );
 
     // Setup inbox sender
-    const inboxSender = await InboxSender.load(receiver.id, sender);
+    const inboxSender = await InboxSender.load(receiver.$jazz.id, sender);
     inboxSender.sendMessage(message);
 
     // Track received messages
@@ -106,8 +111,8 @@ describe("Inbox", () => {
     await waitFor(() => receivedMessages.length === 1);
 
     expect(receivedMessages.length).toBe(1);
-    expect(receivedMessages[0]?.id).toBe(message.id);
-    expect(senderAccountID).toBe(sender.id);
+    expect(receivedMessages[0]?.$jazz.id).toBe(message.$jazz.id);
+    expect(senderAccountID).toBe(sender.$jazz.id);
 
     unsubscribe();
   });
@@ -129,7 +134,7 @@ describe("Inbox", () => {
     const unsubscribe = receiverInbox.subscribe(Message, async (message) => {
       return Message.create(
         { text: "Responded from the inbox" },
-        { owner: message._owner },
+        { owner: message.$jazz.owner },
       );
     });
 
@@ -137,7 +142,7 @@ describe("Inbox", () => {
     const inboxSender = await InboxSender.load<
       Loaded<typeof Message>,
       Loaded<typeof Message>
-    >(receiver.id, sender);
+    >(receiver.$jazz.id, sender);
     const resultId = await inboxSender.sendMessage(message);
 
     const result = await Message.load(resultId, { loadAs: receiver });
@@ -164,7 +169,7 @@ describe("Inbox", () => {
 
     // Setup inbox sender
     const inboxSender = await InboxSender.load<Loaded<typeof Message>>(
-      receiver.id,
+      receiver.$jazz.id,
       sender,
     );
     const result = await inboxSender.sendMessage(message);
@@ -196,7 +201,7 @@ describe("Inbox", () => {
 
     // Setup inbox sender
     const inboxSender = await InboxSender.load<Loaded<typeof Message>>(
-      receiver.id,
+      receiver.$jazz.id,
       sender,
     );
 
@@ -229,7 +234,7 @@ describe("Inbox", () => {
     );
 
     // Setup inbox sender
-    const inboxSender = await InboxSender.load(receiver.id, sender);
+    const inboxSender = await InboxSender.load(receiver.$jazz.id, sender);
     inboxSender.sendMessage(message);
 
     // Track received messages
@@ -269,7 +274,7 @@ describe("Inbox", () => {
     );
 
     // Setup inbox sender
-    const inboxSender = await InboxSender.load(receiver.id, sender);
+    const inboxSender = await InboxSender.load(receiver.$jazz.id, sender);
     inboxSender.sendMessage(message);
 
     // Track received messages
@@ -309,7 +314,7 @@ describe("Inbox", () => {
     const errorLogSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
     // Setup inbox sender
-    const inboxSender = await InboxSender.load(receiver.id, sender);
+    const inboxSender = await InboxSender.load(receiver.$jazz.id, sender);
     const promise = inboxSender.sendMessage(message);
 
     let failures = 0;
@@ -344,7 +349,7 @@ describe("Inbox", () => {
 
     const receiverInbox = await Inbox.load(receiver);
 
-    const inboxSender = await InboxSender.load(receiver.id, sender);
+    const inboxSender = await InboxSender.load(receiver.$jazz.id, sender);
     inboxSender.messages.push(`co_z123234` as any);
 
     const spy = vi.fn();

package/src/tools/tests/interfaces.test.ts

@@ -4,6 +4,7 @@ import { Account } from "../exports";
 import {
   parseCoValueCreateOptions,
   parseGroupCreateOptions,
+  TypeSym,
 } from "../internal";
 import { createJazzTestAccount } from "../testing";
 
@@ -16,17 +17,17 @@ beforeEach(async () => {
 describe("parseCoValueCreateOptions", () => {
   it("should create a new group when no options provided", () => {
     const result = parseCoValueCreateOptions(undefined);
-    expect(result.owner._type).toBe("Group");
-    expect(
-      result.owner.castAs(Group)._raw.roleOf(Account.getMe()._raw.id),
-    ).toBe("admin");
+    expect(result.owner[TypeSym]).toBe("Group");
+    expect(result.owner.$jazz.raw.roleOf(Account.getMe().$jazz.raw.id)).toBe(
+      "admin",
+    );
     expect(result.uniqueness).toBeUndefined();
   });
 
-  it("should use the account as the owner when passing an Account", async () => {
+  it("should create a group that wraps a RawAccount as the owner when passing an Account", async () => {
     const account = await createJazzTestAccount();
     const result = parseCoValueCreateOptions(account);
-    expect(result.owner).toBe(account);
+    expect(result.owner.$jazz.id).toBe(account.$jazz.raw.id);
     expect(result.uniqueness).toBeUndefined();
   });
 
@@ -34,9 +35,9 @@ describe("parseCoValueCreateOptions", () => {
     const group = Group.create();
     const result = parseCoValueCreateOptions(group);
     expect(result.owner).toBe(group);
-    expect(
-      result.owner.castAs(Group)._raw.roleOf(Account.getMe()._raw.id),
-    ).toBe("admin");
+    expect(result.owner.$jazz.raw.roleOf(Account.getMe().$jazz.raw.id)).toBe(
+      "admin",
+    );
     expect(result.uniqueness).toBeUndefined();
   });
 
@@ -50,13 +51,13 @@ describe("parseCoValueCreateOptions", () => {
     expect(result.uniqueness?.uniqueness).toBe("per-group");
   });
 
-  it("should use the account as the owner when passing an Account", async () => {
+  it("should create a group that wraps a RawAccount as the owner when passing an Account inside options", async () => {
     const account = await createJazzTestAccount();
     const result = parseCoValueCreateOptions({
       owner: account,
       unique: "per-group",
     });
-    expect(result.owner).toBe(account);
+    expect(result.owner.$jazz.id).toBe(account.$jazz.raw.id);
     expect(result.uniqueness?.uniqueness).toBe("per-group");
   });
 });

package/src/tools/tests/invites.test.ts

@@ -24,7 +24,7 @@ describe("Invite Links", () => {
     const inviteLink = createInviteLink(group, "writer", baseURL);
 
     expect(inviteLink).toMatch(
-      new RegExp(`^${baseURL}#/invite/${group.id}/[A-Za-z0-9_-]+$`),
+      new RegExp(`^${baseURL}#/invite/${group.$jazz.id}/[A-Za-z0-9_-]+$`),
     );
   });
 
@@ -32,7 +32,9 @@ describe("Invite Links", () => {
     const inviteLink = createInviteLink(group, "writer", baseURL, "myGroup");
 
     expect(inviteLink).toMatch(
-      new RegExp(`^${baseURL}#/invite/myGroup/${group.id}/[A-Za-z0-9_-]+$`),
+      new RegExp(
+        `^${baseURL}#/invite/myGroup/${group.$jazz.id}/[A-Za-z0-9_-]+$`,
+      ),
     );
   });
 
@@ -41,7 +43,7 @@ describe("Invite Links", () => {
     const result = parseInviteLink(inviteLink);
 
     expect(result).toBeDefined();
-    expect(result?.valueID).toBe(group.id);
+    expect(result?.valueID).toBe(group.$jazz.id);
     expect(result?.valueHint).toBe("myGroup");
     expect(result?.inviteSecret).toBeDefined();
   });
@@ -65,7 +67,7 @@ describe("Invite Links", () => {
     });
 
     expect(result).toBeDefined();
-    expect(result?.valueID).toBe(group.id);
+    expect(result?.valueID).toBe(group.$jazz.id);
     expect(result?.valueHint).toBe("myGroup");
   });
 

package/src/tools/tests/load.test.ts

@@ -28,7 +28,7 @@ test("load a value", async () => {
 
   const alice = await createJazzTestAccount();
 
-  const john = await Person.load(map.id, { loadAs: alice });
+  const john = await Person.load(map.$jazz.id, { loadAs: alice });
   expect(john).not.toBeNull();
   expect(john?.name).toBe("John");
 });
@@ -58,7 +58,7 @@ test("load a missing optional value (co.optional)", async () => {
 
   const alice = await createJazzTestAccount();
 
-  const john = await Person.load(map.id, {
+  const john = await Person.load(map.$jazz.id, {
     loadAs: alice,
     resolve: { dog: true },
   });
@@ -85,7 +85,7 @@ test("load a missing optional value (Schema.optional)", async () => {
 
   const alice = await createJazzTestAccount();
 
-  const john = await Person.load(map.id, {
+  const john = await Person.load(map.$jazz.id, {
     loadAs: alice,
     resolve: { dog: true },
   });
@@ -118,7 +118,7 @@ test("load a missing optional value (optional discrminatedUnion)", async () => {
 
   const alice = await createJazzTestAccount();
 
-  const john = await Person.load(map.id, {
+  const john = await Person.load(map.$jazz.id, {
     loadAs: alice,
     resolve: { pet: true },
   });
@@ -137,9 +137,11 @@ test("retry an unavailable value", async () => {
   const currentAccount = Account.getMe();
 
   // Disconnect the current account
-  currentAccount._raw.core.node.syncManager.getClientPeers().forEach((peer) => {
-    peer.gracefulShutdown();
-  });
+  currentAccount.$jazz.localNode.syncManager
+    .getClientPeers()
+    .forEach((peer) => {
+      peer.gracefulShutdown();
+    });
 
   const group = Group.create();
   const map = Person.create({ name: "John" }, group);
@@ -147,12 +149,12 @@ test("retry an unavailable value", async () => {
 
   const alice = await createJazzTestAccount();
 
-  const promise = Person.load(map.id, { loadAs: alice });
+  const promise = Person.load(map.$jazz.id, { loadAs: alice });
 
   await new Promise((resolve) => setTimeout(resolve));
 
   // Reconnect the current account
-  currentAccount._raw.core.node.syncManager.addPeer(
+  currentAccount.$jazz.localNode.syncManager.addPeer(
     getPeerConnectedToTestSyncServer(),
   );
 
@@ -169,8 +171,8 @@ test("returns null if the value is unavailable after retries", async () => {
   const currentAccount = Account.getMe();
 
   // Disconnect the current account
-  currentAccount._raw.core.node.syncManager
-    .getServerPeers(currentAccount._raw.id)
+  currentAccount.$jazz.localNode.syncManager
+    .getServerPeers(currentAccount.$jazz.raw.id)
     .forEach((peer) => {
       peer.gracefulShutdown();
     });
@@ -181,7 +183,7 @@ test("returns null if the value is unavailable after retries", async () => {
 
   const alice = await createJazzTestAccount();
 
-  const john = await Person.load(map.id, { loadAs: alice });
+  const john = await Person.load(map.$jazz.id, { loadAs: alice });
 
   expect(john).toBeNull();
 });
@@ -199,7 +201,7 @@ test("load works even when the coValue access is granted after the creation", as
 
   group.addMember("everyone", "reader");
 
-  const mapOnBob = await Person.load(map.id, { loadAs: bob });
+  const mapOnBob = await Person.load(map.$jazz.id, { loadAs: bob });
 
   expect(mapOnBob).not.toBeNull();
   expect(mapOnBob?.name).toBe("John");
@@ -240,16 +242,16 @@ test("load a large coValue", async () => {
   const value = "x".repeat(chunkSize);
 
   for (let i = 0; i < chunks; i++) {
-    largeMap.data.push(value);
+    largeMap.data.$jazz.push(value);
   }
 
   // Wait for the large coValue to be fully synced
-  await largeMap.data._raw.core.waitForSync();
+  await largeMap.data.$jazz.raw.core.waitForSync();
 
   const alice = await createJazzTestAccount();
 
   // Test loading the large coValue
-  const loadedDataset = await LargeDataset.load(largeMap.id, {
+  const loadedDataset = await LargeDataset.load(largeMap.$jazz.id, {
     loadAs: alice,
     resolve: {
       data: true,
@@ -264,7 +266,7 @@ test("load a large coValue", async () => {
   );
 
   expect(loadedDataset.data.length).toBe(chunks);
-  expect(loadedDataset.data._raw.core.knownState()).toEqual(
-    largeMap.data._raw.core.knownState(),
+  expect(loadedDataset.data.$jazz.raw.core.knownState()).toEqual(
+    largeMap.data.$jazz.raw.core.knownState(),
   );
 });

package/src/tools/tests/patterns/notifications.test.ts

@@ -18,8 +18,8 @@ const WorkerAccount = co
   })
   .withMigration((account) => {
     if (account.root === undefined) {
-      account.root = WorkerRoot.create({
-        notificationQueue: co.list(QueuedNotification).create([]),
+      account.$jazz.set("root", {
+        notificationQueue: [],
       });
     }
   });
@@ -28,7 +28,7 @@ async function pushNotification(
   worker: InstanceOfSchema<typeof WorkerAccount>,
   content: string,
 ) {
-  const workerAccount = await worker.ensureLoaded({
+  const workerAccount = await worker.$jazz.ensureLoaded({
     resolve: {
       root: {
         notificationQueue: {
@@ -43,7 +43,7 @@ async function pushNotification(
     sent: false,
   });
 
-  workerAccount.root.notificationQueue.push(notification);
+  workerAccount.root.notificationQueue.$jazz.push(notification);
 
   return notification;
 }
@@ -52,7 +52,7 @@ async function sendAllThePendingNotifications(
   worker: InstanceOfSchema<typeof WorkerAccount>,
   sender: (notification: Loaded<typeof QueuedNotification>) => Promise<void>,
 ) {
-  const workerAccount = await worker.ensureLoaded({
+  const workerAccount = await worker.$jazz.ensureLoaded({
     resolve: {
       root: {
         notificationQueue: {
@@ -64,7 +64,7 @@ async function sendAllThePendingNotifications(
 
   for (const notification of workerAccount.root.notificationQueue) {
     if (!notification.sent) {
-      notification.sent = true;
+      notification.$jazz.set("sent", true);
       await sender(notification);
     }
   }

package/src/tools/tests/patterns/quest.test.ts

@@ -19,7 +19,7 @@ const QuestSchema = co
   })
   .withMigration((quest) => {
     if (quest.categories === undefined) {
-      quest.categories = [quest.category];
+      quest.$jazz.set("categories", [quest.category]);
     }
   });
 
@@ -50,7 +50,7 @@ describe("QuestSchema", () => {
     expect(quest.categories).toBeUndefined();
 
     // Load the quest to trigger the migration
-    const loadedQuest = await QuestSchema.load(quest.id);
+    const loadedQuest = await QuestSchema.load(quest.$jazz.id);
     assert(loadedQuest);
 
     // After loading, the migration should have run and filled categories
@@ -75,7 +75,7 @@ describe("QuestSchema", () => {
     expect(quest.categories).toEqual(["combat", "boss-fight", "endgame"]);
 
     // Load the quest to ensure migration doesn't change existing categories
-    const loadedQuest = await QuestSchema.load(quest.id);
+    const loadedQuest = await QuestSchema.load(quest.$jazz.id);
     assert(loadedQuest);
 
     // Categories should remain unchanged after migration

package/src/tools/tests/patterns/requestToJoin.test.ts

@@ -71,9 +71,9 @@ async function setup() {
     publicGroup,
   );
 
-  const organizationId = organization.id;
+  const organizationId = organization.$jazz.id;
 
-  await admin1.waitForAllCoValuesSync();
+  await admin1.$jazz.waitForAllCoValuesSync();
 
   return {
     admin1,
@@ -105,9 +105,9 @@ async function sendRequestToJoin(organizationId: string, account: Account) {
     group,
   );
 
-  organization.requests[account.id] = request;
+  organization.requests.$jazz.set(account.$jazz.id, request);
 
-  await account.waitForAllCoValuesSync();
+  await account.$jazz.waitForAllCoValuesSync();
 
   return request;
 }
@@ -126,11 +126,11 @@ async function approveRequest(
     throw new Error("Organization not found");
   }
 
-  const request = organization.requests[user.id];
+  const request = organization.requests[user.$jazz.id];
 
   if (
-    organization.statuses[user.id] === "approved" ||
-    organization.statuses[user.id] === "rejected"
+    organization.statuses[user.$jazz.id] === "approved" ||
+    organization.statuses[user.$jazz.id] === "rejected"
   ) {
     throw new Error("Request already processed");
   }
@@ -139,12 +139,12 @@ async function approveRequest(
     throw new Error("Request not found");
   }
 
-  request.status = "approved";
-  organization.statuses[user.id] = "approved";
+  request.$jazz.set("status", "approved");
+  organization.statuses.$jazz.set(user.$jazz.id, "approved");
 
   organization.mainGroup.addMember(user, "writer");
 
-  await admin.waitForAllCoValuesSync();
+  await admin.$jazz.waitForAllCoValuesSync();
 }
 
 async function rejectRequest(
@@ -161,11 +161,11 @@ async function rejectRequest(
     throw new Error("Organization not found");
   }
 
-  const request = organization.requests[user.id];
+  const request = organization.requests[user.$jazz.id];
 
   if (
-    organization.statuses[user.id] === "approved" ||
-    organization.statuses[user.id] === "rejected"
+    organization.statuses[user.$jazz.id] === "approved" ||
+    organization.statuses[user.$jazz.id] === "rejected"
   ) {
     throw new Error("Request already processed");
   }
@@ -174,10 +174,10 @@ async function rejectRequest(
     throw new Error("Request not found");
   }
 
-  request.status = "rejected";
-  organization.statuses[user.id] = "rejected";
+  request.$jazz.set("status", "rejected");
+  organization.statuses.$jazz.set(user.$jazz.id, "rejected");
 
-  await admin.waitForAllCoValuesSync();
+  await admin.$jazz.waitForAllCoValuesSync();
 }
 
 describe("Request to join", () => {
@@ -201,13 +201,13 @@ describe("Request to join", () => {
 
     const projectsOnUser = await co
       .list(z.string())
-      .load(organization.projects.id, {
+      .load(organization.projects.$jazz.id, {
         loadAs: user1,
       });
 
     assert(projectsOnUser);
 
-    projectsOnUser.push("project1");
+    projectsOnUser.$jazz.push("project1");
 
     expect(projectsOnUser[0]).toBe("project1");
   });
@@ -231,7 +231,7 @@ describe("Request to join", () => {
 
     const projectsOnUser = await co
       .list(z.string())
-      .load(organization.projects.id, {
+      .load(organization.projects.$jazz.id, {
         loadAs: user1,
       });
 
@@ -250,8 +250,8 @@ describe("Request to join", () => {
     });
 
     assert(organization);
-    expect(organization.statuses[user1.id]).toBe("approved");
-    const requestOnAdmin2 = await RequestToJoin.load(request.id, {
+    expect(organization.statuses[user1.$jazz.id]).toBe("approved");
+    const requestOnAdmin2 = await RequestToJoin.load(request.$jazz.id, {
       loadAs: admin2,
     });
     assert(requestOnAdmin2);
@@ -263,7 +263,7 @@ describe("Request to join", () => {
 
     const request = await sendRequestToJoin(organizationId, user1);
 
-    const requestOnUser2 = await RequestToJoin.load(request.id, {
+    const requestOnUser2 = await RequestToJoin.load(request.$jazz.id, {
       loadAs: user2,
     });