jazz-tools 0.13.30 → 0.14.0

package/src/tests/testing.test.ts

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, test } from "vitest";
-import { Account, CoMap, Group, co } from "../exports";
+import { Account, CoMap, Group, co, z, zodSchemaToCoSchema } from "../exports";
 import { createJazzTestAccount, setupJazzTestSync } from "../testing";
 
 describe("Jazz Test Sync", () => {
@@ -25,24 +25,25 @@ describe("Jazz Test Sync", () => {
   });
 
   test("correctly set the globalMe before starting the migration", async () => {
-    class MyRoot extends CoMap {
-      value = co.string;
-    }
-
-    class CustomAccount extends Account {
-      root = co.ref(MyRoot);
+    const MyRoot = co.map({
+      value: z.string(),
+    });
 
-      migrate() {
-        if (this.root === undefined) {
-          this.root = MyRoot.create({
+    const CustomAccount = co
+      .account({
+        root: MyRoot,
+        profile: co.profile(),
+      })
+      .withMigration((account) => {
+        if (account.root === undefined) {
+          account.root = MyRoot.create({
             value: "ok",
           });
         }
-      }
-    }
+      });
 
     const account1 = await createJazzTestAccount({
-      AccountSchema: CustomAccount,
+      AccountSchema: zodSchemaToCoSchema(CustomAccount),
       isCurrentActiveAccount: true,
     });
 
@@ -50,29 +51,30 @@ describe("Jazz Test Sync", () => {
   });
 
   test("correctly manages the global me during the migrations", async () => {
-    class MyRoot extends CoMap {
-      value = co.string;
-    }
-
-    class CustomAccount extends Account {
-      root = co.ref(MyRoot);
+    const MyRoot = co.map({
+      value: z.string(),
+    });
 
-      migrate() {
-        if (this.root === undefined) {
-          this.root = MyRoot.create({
+    const CustomAccount = co
+      .account({
+        root: MyRoot,
+        profile: co.profile(),
+      })
+      .withMigration((account) => {
+        if (account.root === undefined) {
+          account.root = MyRoot.create({
             value: "ok",
           });
         }
-      }
-    }
+      });
 
     const account1 = await createJazzTestAccount({
-      AccountSchema: CustomAccount,
+      AccountSchema: zodSchemaToCoSchema(CustomAccount),
       isCurrentActiveAccount: true,
     });
 
     const account2 = await createJazzTestAccount({
-      AccountSchema: CustomAccount,
+      AccountSchema: zodSchemaToCoSchema(CustomAccount),
       isCurrentActiveAccount: false,
     });
 
@@ -83,19 +85,17 @@ describe("Jazz Test Sync", () => {
   });
 
   test("throws when running multiple migrations in parallel", async () => {
-    class CustomAccount extends Account {
-      async migrate() {
-        await new Promise((resolve) => setTimeout(resolve, 10));
-      }
-    }
+    const CustomAccount = co.account().withMigration(async (account) => {
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    });
 
     const promise = Promise.all([
       createJazzTestAccount({
-        AccountSchema: CustomAccount,
+        AccountSchema: zodSchemaToCoSchema(CustomAccount),
         isCurrentActiveAccount: true,
       }),
       createJazzTestAccount({
-        AccountSchema: CustomAccount,
+        AccountSchema: zodSchemaToCoSchema(CustomAccount),
         isCurrentActiveAccount: true,
       }),
     ]);

package/src/tests/utils.ts

@@ -1,4 +1,4 @@
-import { isControlledAccount } from "../coValues/account";
+import { AccountClass, isControlledAccount } from "../coValues/account";
 
 import { CoID, LocalNode, RawCoValue } from "cojson";
 import { cojsonInternals } from "cojson";
@@ -8,6 +8,7 @@ import {
   createJazzContextFromExistingCredentials,
   randomSessionProvider,
 } from "../index";
+import { CoValueFromRaw } from "../internal";
 
 const Crypto = await WasmCrypto.create();
 
@@ -45,7 +46,7 @@ export async function setupAccount() {
 }
 
 export async function setupTwoNodes(options?: {
-  ServerAccountSchema?: typeof Account;
+  ServerAccountSchema?: CoValueFromRaw<Account> & AccountClass<Account>;
 }) {
   const ServerAccountSchema = options?.ServerAccountSchema ?? Account;
 

package/src/types.ts

@@ -1,6 +1,5 @@
 import type { AgentSecret, LocalNode } from "cojson";
-import type { Account } from "./exports.js";
-import type { AnonymousJazzAgent, ID } from "./internal.js";
+import type { Account, AnonymousJazzAgent, ID } from "./internal.js";
 
 export type AuthCredentials = {
   accountID: ID<Account>;
@@ -57,9 +56,3 @@ export type SyncConfig =
       peer?: `wss://${string}` | `ws://${string}`;
       when: "never";
     };
-
-export interface Register {}
-
-export type RegisteredAccount = Register extends { Account: infer Acc }
-  ? Acc
-  : Account;