jazz-tools 0.8.45 → 0.8.49

package/package.json

@@ -19,9 +19,9 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.8.45",
+  "version": "0.8.49",
   "dependencies": {
-    "cojson": "0.8.45"
+    "cojson": "0.8.49"
   },
   "devDependencies": {
     "tsup": "8.3.5",

package/src/coValues/account.ts

@@ -185,7 +185,7 @@ export class Account extends CoValueBase implements CoValue {
           fromRaw: rawAccount,
         }) as A;
 
-        await account.migrate?.(creationProps);
+        await account.applyMigration?.(creationProps);
       },
     });
 
@@ -236,7 +236,7 @@ export class Account extends CoValueBase implements CoValue {
     return this.toJSON();
   }
 
-  migrate(this: Account, creationProps?: { name: string }) {
+  async applyMigration(creationProps?: { name: string }) {
     if (creationProps) {
       const profileGroup = RegisteredSchemas["Group"].create({ owner: this });
       profileGroup.addMember("everyone", "reader");
@@ -256,6 +256,13 @@ export class Account extends CoValueBase implements CoValue {
       profile.set("inbox", inboxRoot.id);
       profile.set("inboxInvite", inboxRoot.inviteLink);
     }
+
+    await this.migrate(creationProps);
+  }
+
+  // Placeholder method for subclasses to override
+  migrate(creationProps?: { name: string }) {
+    creationProps; // To avoid unused parameter warning
   }
 
   /** @category Subscription & Loading */

package/src/coValues/coMap.ts

@@ -617,8 +617,14 @@ const CoMapProxyHandler: ProxyHandler<CoMap> = {
     } else if (key in target) {
       return Reflect.get(target, key, receiver);
     } else {
-      const descriptor = (target._schema[key as keyof CoMap["_schema"]] ||
-        target._schema[ItemsSym]) as Schema;
+      const schema = target._schema;
+
+      if (!schema) {
+        return undefined;
+      }
+
+      const descriptor = (schema[key as keyof CoMap["_schema"]] ||
+        schema[ItemsSym]) as Schema;
       if (descriptor && typeof key === "string") {
         const raw = target._raw.get(key);
 

package/src/implementation/createContext.ts

@@ -169,7 +169,7 @@ export async function createJazzContext<Acc extends Account>(
                 fromRaw: rawAccount,
               }) as Acc;
 
-              await account.migrate?.(creationProps);
+              await account.applyMigration(creationProps);
             },
           });
 
@@ -218,7 +218,7 @@ export async function createJazzContext<Acc extends Account>(
               fromRaw: rawAccount,
             }) as Acc;
 
-            await account.migrate?.(creationProps);
+            await account.applyMigration(creationProps);
           },
         });
 

package/src/tests/coMap.test.ts

@@ -38,8 +38,6 @@ describe("Simple CoMap operations", async () => {
     crypto: Crypto,
   });
 
-  console.log("TestMap schema", TestMap.prototype._schema);
-
   const birthday = new Date();
 
   const map = TestMap.create(
@@ -82,6 +80,13 @@ describe("Simple CoMap operations", async () => {
     expect(mapWithExtra.color).toEqual("red");
   });
 
+  test("Empty schema", () => {
+    const emptyMap = CoMap.create({}, { owner: me });
+
+    // @ts-expect-error
+    expect(emptyMap.color).toEqual(undefined);
+  });
+
   describe("Mutation", () => {
     test("assignment & deletion", () => {
       map.color = "blue";
@@ -468,10 +473,8 @@ describe("CoMap resolution", async () => {
     const queue = new cojsonInternals.Channel<TestMap>();
 
     TestMap.subscribe(map.id, meOnSecondPeer, {}, (subscribedMap) => {
-      console.log(
-        "subscribedMap.nested?.twiceNested?.taste",
-        subscribedMap.nested?.twiceNested?.taste,
-      );
+      // Read to property to trigger loading
+      subscribedMap.nested?.twiceNested?.taste;
       void queue.push(subscribedMap);
     });
 

package/src/tests/groupsAndAccounts.test.ts

@@ -166,68 +166,6 @@ describe("Group inheritance", () => {
     expect(mapAsReaderAfterUpdate?.title).toBe("In Grand Child");
   });
 
-  test("Group inheritance should fail if the current account doesn't have admin role in both groups", async () => {
-    const me = await Account.create({
-      creationProps: { name: "Hermes Puggington" },
-      crypto: Crypto,
-    });
-
-    const other = await Account.createAs(me, {
-      creationProps: { name: "Another user" },
-    });
-
-    const parentGroup = Group.create({ owner: me });
-    parentGroup.addMember(other, "writer");
-    const group = Group.create({ owner: me });
-    group.addMember(other, "admin");
-
-    const parentGroupOnTheOtherSide = await Group.load(
-      parentGroup.id,
-      other,
-      {},
-    );
-    const groupOnTheOtherSide = await Group.load(group.id, other, {});
-
-    if (!groupOnTheOtherSide || !parentGroupOnTheOtherSide) {
-      throw new Error("CoValue not available");
-    }
-
-    expect(() => groupOnTheOtherSide.extend(parentGroupOnTheOtherSide)).toThrow(
-      "To extend a group, the current account must have admin role in both groups",
-    );
-  });
-
-  test("Group inheritance should work if the current account has admin role in both groups", async () => {
-    const me = await Account.create({
-      creationProps: { name: "Hermes Puggington" },
-      crypto: Crypto,
-    });
-
-    const other = await Account.createAs(me, {
-      creationProps: { name: "Another user" },
-    });
-
-    const parentGroup = Group.create({ owner: me });
-    parentGroup.addMember(other, "admin");
-    const group = Group.create({ owner: me });
-    group.addMember(other, "admin");
-
-    const parentGroupOnTheOtherSide = await Group.load(
-      parentGroup.id,
-      other,
-      {},
-    );
-    const groupOnTheOtherSide = await Group.load(group.id, other, {});
-
-    if (!groupOnTheOtherSide || !parentGroupOnTheOtherSide) {
-      throw new Error("CoValue not available");
-    }
-
-    expect(() =>
-      groupOnTheOtherSide.extend(parentGroupOnTheOtherSide),
-    ).not.toThrow();
-  });
-
   test("waitForSync should resolve when the value is uploaded", async () => {
     const { clientNode, serverNode, clientAccount } = await setupTwoNodes();
 

package/src/tests/inbox.test.ts

@@ -51,6 +51,49 @@ describe("Inbox", () => {
     unsubscribe();
   });
 
+  it("should work with empty CoMaps", async () => {
+    const { clientAccount: sender, serverAccount: receiver } =
+      await setupTwoNodes();
+
+    class EmptyMessage extends CoMap {}
+
+    const receiverInbox = await Inbox.load(receiver);
+
+    // Create a message from sender
+    const message = EmptyMessage.create(
+      {},
+      {
+        owner: Group.create({ owner: sender }),
+      },
+    );
+
+    // Setup inbox sender
+    const inboxSender = await InboxSender.load(receiver.id, sender);
+    inboxSender.sendMessage(message);
+
+    // Track received messages
+    const receivedMessages: EmptyMessage[] = [];
+    let senderAccountID: unknown = undefined;
+
+    // Subscribe to inbox messages
+    const unsubscribe = receiverInbox.subscribe(
+      EmptyMessage,
+      async (message, id) => {
+        senderAccountID = id;
+        receivedMessages.push(message);
+      },
+    );
+
+    // Wait for message to be received
+    await waitFor(() => receivedMessages.length === 1);
+
+    expect(receivedMessages.length).toBe(1);
+    expect(receivedMessages[0]?.id).toBe(message.id);
+    expect(senderAccountID).toBe(sender.id);
+
+    unsubscribe();
+  });
+
   it("should return the result of the message", async () => {
     const { clientAccount: sender, serverAccount: receiver } =
       await setupTwoNodes();

package/src/tests/utils.ts

@@ -59,7 +59,7 @@ export async function setupTwoNodes() {
         fromRaw: rawAccount,
       });
 
-      await account.migrate?.(creationProps);
+      await account.applyMigration(creationProps);
     },
   });
 
@@ -72,7 +72,7 @@ export async function setupTwoNodes() {
         fromRaw: rawAccount,
       });
 
-      await account.migrate?.(creationProps);
+      await account.applyMigration(creationProps);
     },
   });