jazz-tools 0.13.31 → 0.14.0

package/src/tests/coPlainText.test.ts

@@ -2,12 +2,11 @@ import { WasmCrypto } from "cojson/crypto/WasmCrypto";
 import { describe, expect, test } from "vitest";
 import {
   Account,
-  CoPlainText,
   cojsonInternals,
   createJazzContextFromExistingCredentials,
   isControlledAccount,
 } from "../index.js";
-import { randomSessionProvider } from "../internal.js";
+import { co, randomSessionProvider } from "../internal.js";
 
 const Crypto = await WasmCrypto.create();
 
@@ -20,7 +19,7 @@ describe("CoPlainText", () => {
       crypto: Crypto,
     });
 
-    const text = CoPlainText.create("hello world", { owner: me });
+    const text = co.plainText().create("hello world", { owner: me });
 
     return { me, text };
   };
@@ -31,16 +30,7 @@ describe("CoPlainText", () => {
         creationProps: { name: "Hermes Puggington" },
         crypto: Crypto,
       });
-      const text = CoPlainText.create("hello world", me);
-      expect(text._owner.id).toBe(me.id);
-    });
-
-    test("should allow `new CoPlainText`", async () => {
-      const me = await Account.create({
-        creationProps: { name: "Hermes Puggington" },
-        crypto: Crypto,
-      });
-      const text = new CoPlainText({ text: "hello world", owner: me });
+      const text = co.plainText().create("hello world", me);
       expect(text._owner.id).toBe(me.id);
     });
 
@@ -49,28 +39,18 @@ describe("CoPlainText", () => {
         creationProps: { name: "Hermes Puggington" },
         crypto: Crypto,
       });
-      const text = CoPlainText.create("hello world", me);
+      const text = co.plainText().create("hello world", me);
       const raw = text._raw;
-      const text2 = CoPlainText.fromRaw(raw);
+      const text2 = co.plainText().fromRaw(raw);
       expect(text2._owner.id).toBe(me.id);
     });
 
-    test("should allow creation of new instance from raw", async () => {
-      const me = await Account.create({
-        creationProps: { name: "Hermes Puggington" },
-        crypto: Crypto,
-      });
-      const raw = me._raw.createPlainText("hello world");
-      const text = new CoPlainText({ fromRaw: raw });
-      expect(text._owner.id).toBe(me.id);
-    });
-
     test("should allow owner shorthand", async () => {
       const me = await Account.create({
         creationProps: { name: "Hermes Puggington" },
         crypto: Crypto,
       });
-      const text = CoPlainText.create("hello world", me);
+      const text = co.plainText().create("hello world", me);
       expect(text._owner.id).toBe(me.id);
     });
   });
@@ -84,7 +64,7 @@ describe("CoPlainText", () => {
 
     describe("Mutation", () => {
       test("insertion", () => {
-        const text = CoPlainText.create("hello world", { owner: me });
+        const text = co.plainText().create("hello world", { owner: me });
 
         text.insertAfter(4, " cruel");
         expect(text + "").toEqual("hello cruel world");
@@ -94,14 +74,14 @@ describe("CoPlainText", () => {
       });
 
       test("deletion", () => {
-        const text = CoPlainText.create("hello world", { owner: me });
+        const text = co.plainText().create("hello world", { owner: me });
 
         text.deleteRange({ from: 3, to: 8 });
         expect(text + "").toEqual("helrld");
       });
 
       test("applyDiff", () => {
-        const text = CoPlainText.create("hello world", { owner: me });
+        const text = co.plainText().create("hello world", { owner: me });
         text.applyDiff("hello cruel world");
         expect(text.toString()).toEqual("hello cruel world");
       });
@@ -109,39 +89,39 @@ describe("CoPlainText", () => {
 
     describe("Properties", () => {
       test("length", () => {
-        const text = CoPlainText.create("hello world", { owner: me });
+        const text = co.plainText().create("hello world", { owner: me });
         expect(text.length).toBe(11);
       });
 
       test("as string", () => {
-        const text = CoPlainText.create("hello world", { owner: me });
+        const text = co.plainText().create("hello world", { owner: me });
         expect(`${text}`).toBe("hello world");
       });
 
       test("as number", () => {
-        const text = CoPlainText.create("hello world", { owner: me });
+        const text = co.plainText().create("hello world", { owner: me });
         expect(Number(text)).toBe(NaN);
       });
 
       test("as number", () => {
-        const text = CoPlainText.create("123", { owner: me });
+        const text = co.plainText().create("123", { owner: me });
         expect(Number(text)).toBe(123);
       });
 
       test("toJSON", () => {
-        const text = CoPlainText.create("hello world", { owner: me });
+        const text = co.plainText().create("hello world", { owner: me });
         expect(text.toJSON()).toBe("hello world");
       });
 
       test("toString", () => {
-        const text = CoPlainText.create("hello world", { owner: me });
+        const text = co.plainText().create("hello world", { owner: me });
         expect(text.toString()).toBe("hello world");
       });
     });
 
     describe("Position operations", () => {
       test("idxBefore returns index before a position", () => {
-        const text = CoPlainText.create("hello world", { owner: me });
+        const text = co.plainText().create("hello world", { owner: me });
 
         // Get position at index 5 (between "hello" and " world")
         const pos = text.posBefore(5);
@@ -155,7 +135,7 @@ describe("CoPlainText", () => {
       });
 
       test("idxAfter returns index after a position", () => {
-        const text = CoPlainText.create("hello world", { owner: me });
+        const text = co.plainText().create("hello world", { owner: me });
 
         // Get position at index 5 (between "hello" and " world")
         const pos = text.posBefore(5);
@@ -197,7 +177,7 @@ describe("CoPlainText", () => {
         });
 
       // Load the text on the second peer
-      const loaded = await CoPlainText.load(id, { loadAs: meOnSecondPeer });
+      const loaded = await co.plainText().load(id, { loadAs: meOnSecondPeer });
       expect(loaded).toBeDefined();
       expect(loaded!.toString()).toBe("hello world");
     });
@@ -230,7 +210,7 @@ describe("CoPlainText", () => {
     const queue = new cojsonInternals.Channel();
 
     // Subscribe to text updates
-    CoPlainText.subscribe(
+    co.plainText().subscribe(
       text.id,
       { loadAs: meOnSecondPeer },
       (subscribedText) => {

package/src/tests/createContext.test.ts

@@ -9,11 +9,14 @@ import {
   ID,
   InMemoryKVStore,
   KvStoreContext,
+  co,
   createAnonymousJazzContext,
   createJazzContext,
   createJazzContextForNewAccount,
   createJazzContextFromExistingCredentials,
   randomSessionProvider,
+  z,
+  zodSchemaToCoSchema,
 } from "../exports";
 import { activeAccountContext } from "../implementation/activeAccountContext";
 import {
@@ -62,9 +65,12 @@ describe("createContext methods", () => {
     });
 
     test("handles custom account schema", async () => {
-      class CustomAccount extends Account {
-        static migration = async () => {};
-      }
+      const CustomAccount = co
+        .account({
+          root: co.map({}),
+          profile: co.profile(),
+        })
+        .withMigration(async () => {});
 
       const account = await createJazzTestAccount({
         isCurrentActiveAccount: true,
@@ -79,11 +85,13 @@ describe("createContext methods", () => {
         credentials,
         peersToLoadFrom: [getPeerConnectedToTestSyncServer()],
         crypto: Crypto,
-        AccountSchema: CustomAccount,
+        AccountSchema: zodSchemaToCoSchema(CustomAccount),
         sessionProvider: randomSessionProvider,
       });
 
-      expect(context.account).toBeInstanceOf(CustomAccount);
+      expect(context.account).toBeInstanceOf(
+        zodSchemaToCoSchema(CustomAccount),
+      );
     });
 
     test("calls onLogOut callback when logging out", async () => {
@@ -176,18 +184,23 @@ describe("createContext methods", () => {
     });
 
     test("handles custom account schema", async () => {
-      class CustomAccount extends Account {
-        static migration = async () => {};
-      }
+      const CustomAccount = co
+        .account({
+          root: co.map({}),
+          profile: co.profile(),
+        })
+        .withMigration(async () => {});
 
       const context = await createJazzContextForNewAccount({
         creationProps: { name: "New User" },
         peersToLoadFrom: [],
         crypto: Crypto,
-        AccountSchema: CustomAccount,
+        AccountSchema: zodSchemaToCoSchema(CustomAccount),
       });
 
-      expect(context.account).toBeInstanceOf(CustomAccount);
+      expect(context.account).toBeInstanceOf(
+        zodSchemaToCoSchema(CustomAccount),
+      );
     });
 
     test("sets the active account to the new account", async () => {
@@ -321,19 +334,24 @@ describe("createContext methods", () => {
     });
 
     test("handles custom account schema", async () => {
-      class CustomAccount extends Account {
-        static migration = async () => {};
-      }
+      const CustomAccount = co
+        .account({
+          root: co.map({}),
+          profile: co.profile(),
+        })
+        .withMigration(async () => {});
 
       const context = await createJazzContext({
         peersToLoadFrom: [],
         crypto: Crypto,
         authSecretStorage,
         sessionProvider: randomSessionProvider,
-        AccountSchema: CustomAccount,
+        AccountSchema: zodSchemaToCoSchema(CustomAccount),
       });
 
-      expect(context.account).toBeInstanceOf(CustomAccount);
+      expect(context.account).toBeInstanceOf(
+        zodSchemaToCoSchema(CustomAccount),
+      );
     });
   });
 });