jazz-tools 0.17.14 → 0.18.1

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

@@ -64,19 +64,34 @@ describe("co.optional", () => {
     expect(schema.feed).toBeUndefined();
     expect(schema.union).toBeUndefined();
 
-    schema.plainText = Schema.shape.plainText.innerType.create("Hello");
-    schema.richText = Schema.shape.richText.innerType.create("Hello");
-    schema.fileStream = Schema.shape.fileStream.innerType.create();
-    schema.image = Schema.shape.image.innerType.create({
-      originalSize: [1920, 1080],
-      original: FileStream.create(),
-      progressive: false,
-    });
-    schema.record = Schema.shape.record.innerType.create({ field: "hello" });
-    schema.map = Schema.shape.map.innerType.create({ field: "hello" });
-    schema.list = Schema.shape.list.innerType.create([]);
-    schema.feed = Schema.shape.feed.innerType.create([]);
-    schema.union = Option1.create({ type: "1" });
+    schema.$jazz.set(
+      "plainText",
+      Schema.shape.plainText.innerType.create("Hello"),
+    );
+    schema.$jazz.set(
+      "richText",
+      Schema.shape.richText.innerType.create("Hello"),
+    );
+    schema.$jazz.set("fileStream", Schema.shape.fileStream.innerType.create());
+    schema.$jazz.set(
+      "image",
+      Schema.shape.image.innerType.create({
+        originalSize: [1920, 1080],
+        original: FileStream.create(),
+        progressive: false,
+      }),
+    );
+    schema.$jazz.set(
+      "record",
+      Schema.shape.record.innerType.create({ field: "hello" }),
+    );
+    schema.$jazz.set(
+      "map",
+      Schema.shape.map.innerType.create({ field: "hello" }),
+    );
+    schema.$jazz.set("list", Schema.shape.list.innerType.create([]));
+    schema.$jazz.set("feed", Schema.shape.feed.innerType.create([]));
+    schema.$jazz.set("union", Option1.create({ type: "1" }));
 
     expect(schema.plainText?.toString()).toEqual("Hello");
     expect(schema.richText?.toString()).toEqual("Hello");

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

@@ -32,7 +32,7 @@ describe("CoPlainText", () => {
         crypto: Crypto,
       });
       const text = co.plainText().create("hello world", me);
-      expect(text._owner.id).toBe(me.id);
+      expect(text.$jazz.owner.$jazz.id).toBe(me.$jazz.id);
     });
 
     test("should allow `create` from raw", async () => {
@@ -41,9 +41,9 @@ describe("CoPlainText", () => {
         crypto: Crypto,
       });
       const text = co.plainText().create("hello world", me);
-      const raw = text._raw;
+      const raw = text.$jazz.raw;
       const text2 = co.plainText().fromRaw(raw);
-      expect(text2._owner.id).toBe(me.id);
+      expect(text2.$jazz.owner.$jazz.id).toBe(me.$jazz.id);
     });
 
     test("should allow owner shorthand", async () => {
@@ -52,7 +52,7 @@ describe("CoPlainText", () => {
         crypto: Crypto,
       });
       const text = co.plainText().create("hello world", me);
-      expect(text._owner.id).toBe(me.id);
+      expect(text.$jazz.owner.$jazz.id).toBe(me.$jazz.id);
     });
   });
 
@@ -83,15 +83,15 @@ describe("CoPlainText", () => {
 
       test("applyDiff", () => {
         const text = co.plainText().create("hello world", { owner: me });
-        text.applyDiff("hello cruel world");
+        text.$jazz.applyDiff("hello cruel world");
         expect(text.toString()).toEqual("hello cruel world");
       });
 
       test("applyDiff with complex grapheme clusters", () => {
         const text = co.plainText().create(`😊`, { owner: me });
-        text.applyDiff(`😊안녕!`);
+        text.$jazz.applyDiff(`😊안녕!`);
         expect(text.toString()).toEqual(`😊안녕!`);
-        text.applyDiff(`😊👋 안녕!`);
+        text.$jazz.applyDiff(`😊👋 안녕!`);
         expect(text.toString()).toEqual(`😊👋 안녕!`);
       });
     });
@@ -162,7 +162,7 @@ describe("CoPlainText", () => {
   describe("Loading and availability", () => {
     test("can load text across peers", async () => {
       const { me, text } = await initNodeAndText();
-      const id = text.id;
+      const id = text.$jazz.id;
 
       // Set up peer connections
       const [initialAsPeer, secondPeer] = connectedPeers("initial", "second", {
@@ -173,12 +173,12 @@ describe("CoPlainText", () => {
       if (!isControlledAccount(me)) {
         throw "me is not a controlled account";
       }
-      me._raw.core.node.syncManager.addPeer(secondPeer);
+      me.$jazz.localNode.syncManager.addPeer(secondPeer);
       const { account: meOnSecondPeer } =
         await createJazzContextFromExistingCredentials({
           credentials: {
-            accountID: me.id,
-            secret: me._raw.core.node.getCurrentAgent().agentSecret,
+            accountID: me.$jazz.id,
+            secret: me.$jazz.localNode.getCurrentAgent().agentSecret,
           },
           sessionProvider: randomSessionProvider,
           peersToLoadFrom: [initialAsPeer],
@@ -204,12 +204,12 @@ describe("CoPlainText", () => {
     if (!isControlledAccount(me)) {
       throw "me is not a controlled account";
     }
-    me._raw.core.node.syncManager.addPeer(secondPeer);
+    me.$jazz.localNode.syncManager.addPeer(secondPeer);
     const { account: meOnSecondPeer } =
       await createJazzContextFromExistingCredentials({
         credentials: {
-          accountID: me.id,
-          secret: me._raw.core.node.getCurrentAgent().agentSecret,
+          accountID: me.$jazz.id,
+          secret: me.$jazz.localNode.getCurrentAgent().agentSecret,
         },
         sessionProvider: randomSessionProvider,
         peersToLoadFrom: [initialAsPeer],
@@ -220,7 +220,7 @@ describe("CoPlainText", () => {
 
     // Subscribe to text updates
     co.plainText().subscribe(
-      text.id,
+      text.$jazz.id,
       { loadAs: meOnSecondPeer },
       (subscribedText) => {
         void queue.push(subscribedText);

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

@@ -45,8 +45,8 @@ describe("createContext methods", () => {
       });
 
       const credentials: Credentials = {
-        accountID: account.id,
-        secret: account._raw.core.node.getCurrentAgent().agentSecret,
+        accountID: account.$jazz.id,
+        secret: account.$jazz.localNode.getCurrentAgent().agentSecret,
       };
 
       const context = await createJazzContextFromExistingCredentials({
@@ -58,7 +58,7 @@ describe("createContext methods", () => {
 
       expect(context.node).toBeDefined();
       expect(context.account).toBeDefined();
-      expect(context.account.id).toBe(credentials.accountID);
+      expect(context.account.$jazz.id).toBe(credentials.accountID);
       expect(typeof context.done).toBe("function");
       expect(typeof context.logOut).toBe("function");
     });
@@ -76,8 +76,8 @@ describe("createContext methods", () => {
       });
 
       const credentials: Credentials = {
-        accountID: account.id,
-        secret: account._raw.core.node.getCurrentAgent().agentSecret,
+        accountID: account.$jazz.id,
+        secret: account.$jazz.localNode.getCurrentAgent().agentSecret,
       };
 
       const context = await createJazzContextFromExistingCredentials({
@@ -102,8 +102,8 @@ describe("createContext methods", () => {
 
       const context = await createJazzContextFromExistingCredentials({
         credentials: {
-          accountID: account.id,
-          secret: account._raw.core.node.getCurrentAgent().agentSecret,
+          accountID: account.$jazz.id,
+          secret: account.$jazz.localNode.getCurrentAgent().agentSecret,
         },
         peersToLoadFrom: [getPeerConnectedToTestSyncServer()],
         crypto: Crypto,
@@ -120,13 +120,13 @@ describe("createContext methods", () => {
         isCurrentActiveAccount: true,
       });
 
-      const coMap = account._raw.createMap();
+      const coMap = account.$jazz.raw.createMap();
       coMap.set("test", "test", "trusting");
 
       const context = await createJazzContextFromExistingCredentials({
         credentials: {
-          accountID: account.id,
-          secret: account._raw.core.node.getCurrentAgent().agentSecret,
+          accountID: account.$jazz.id,
+          secret: account.$jazz.localNode.getCurrentAgent().agentSecret,
         },
         peersToLoadFrom: [getPeerConnectedToTestSyncServer()],
         crypto: Crypto,
@@ -145,8 +145,8 @@ describe("createContext methods", () => {
 
       const context = await createJazzContextFromExistingCredentials({
         credentials: {
-          accountID: account.id,
-          secret: account._raw.core.node.getCurrentAgent().agentSecret,
+          accountID: account.$jazz.id,
+          secret: account.$jazz.localNode.getCurrentAgent().agentSecret,
         },
         peersToLoadFrom: [getPeerConnectedToTestSyncServer()],
         crypto: Crypto,
@@ -229,7 +229,7 @@ describe("createContext methods", () => {
         isCurrentActiveAccount: true,
       });
 
-      const coMap = account._raw.createMap();
+      const coMap = account.$jazz.raw.createMap();
       coMap.set("test", "test", "trusting");
 
       const context = await createAnonymousJazzContext({
@@ -284,7 +284,7 @@ describe("createContext methods", () => {
         sessionProvider: randomSessionProvider,
       });
 
-      expect(newContext.account.id).toBe(initialContext.account.id);
+      expect(newContext.account.$jazz.id).toBe(initialContext.account.$jazz.id);
     });
 
     test("uses provided new account props", async () => {