jazz-tools 0.17.14 → 0.18.1

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

@@ -32,9 +32,12 @@ describe("co.discriminatedUnion", () => {
 
     expect(person.pet.type).toEqual("dog");
 
-    person.pet = Cat.create({
-      type: "cat",
-    });
+    person.$jazz.set(
+      "pet",
+      Cat.create({
+        type: "cat",
+      }),
+    );
 
     expect(person.pet.type).toEqual("cat");
   });
@@ -67,11 +70,14 @@ describe("co.discriminatedUnion", () => {
       expect(response.result.data).toEqual("Hello, world!");
     }
 
-    response.result = BadRequestError.create({
-      status: "failed",
-      message: "Bad request",
-      code: 400,
-    });
+    response.$jazz.set(
+      "result",
+      BadRequestError.create({
+        status: "failed",
+        message: "Bad request",
+        code: 400,
+      }),
+    );
 
     expect(response.result.status).toEqual("failed");
     if (response.result.status === "failed") {
@@ -115,11 +121,14 @@ describe("co.discriminatedUnion", () => {
       }
     }
 
-    response.error = UnauthorizedError.create({
-      status: "failed",
-      message: "Unauthorized",
-      code: 401,
-    });
+    response.$jazz.set(
+      "error",
+      UnauthorizedError.create({
+        status: "failed",
+        message: "Unauthorized",
+        code: 401,
+      }),
+    );
 
     expect(response.error.status).toEqual("failed");
     if (response.error.status === "failed") {
@@ -267,7 +276,7 @@ describe("co.discriminatedUnion", () => {
     const Pet = co.discriminatedUnion("type", [Dog, Cat]);
 
     const dog = Dog.create({ type: "dog" });
-    const loadedPet = await Pet.load(dog.id);
+    const loadedPet = await Pet.load(dog.$jazz.id);
     expect(loadedPet?.type).toEqual("dog");
   });
 
@@ -295,7 +304,7 @@ describe("co.discriminatedUnion", () => {
     const updates: Loaded<typeof Pet>[] = [];
     const spy = vi.fn((pet) => updates.push(pet));
 
-    Pet.subscribe(dog.id, {}, (pet) => {
+    Pet.subscribe(dog.$jazz.id, {}, (pet) => {
       expect(pet.type).toEqual("dog");
       spy(pet);
     });
@@ -332,7 +341,7 @@ describe("co.discriminatedUnion", () => {
       },
     });
 
-    const loadedAnimal = await Animal.load(animal.id);
+    const loadedAnimal = await Animal.load(animal.$jazz.id);
 
     expect(loadedAnimal?.breed?.type).toEqual("collie");
   });
@@ -354,7 +363,7 @@ describe("co.discriminatedUnion", () => {
       type: "collie",
     });
 
-    const loadedAnimal = await Animal.load(animal.id);
+    const loadedAnimal = await Animal.load(animal.$jazz.id);
 
     expect(loadedAnimal?.type).toEqual("collie");
   });

package/src/tools/tests/coFeed.test-d.ts

@@ -16,15 +16,15 @@ describe("CoFeed", () => {
         return value;
       }
 
-      matches(feed.perAccount[Account.getMe().id]!.value);
+      matches(feed.perAccount[Account.getMe().$jazz.id]!.value);
     });
 
-    test("has the _owner property", () => {
+    test("has the owner property", () => {
       const StringFeed = co.feed(z.string());
 
       const feed = StringFeed.create(["milk"], Account.getMe());
 
-      expectTypeOf(feed._owner).toEqualTypeOf<Account | Group>();
+      expectTypeOf(feed.$jazz.owner).toEqualTypeOf<Group>();
     });
 
     test("CoFeed with reference", () => {
@@ -45,7 +45,7 @@ describe("CoFeed", () => {
         return value;
       }
 
-      matches(feed.perAccount[Account.getMe().id]!.value);
+      matches(feed.perAccount[Account.getMe().$jazz.id]!.value);
     });
 
     test("CoFeed with optional reference", () => {
@@ -66,7 +66,7 @@ describe("CoFeed", () => {
         return value;
       }
 
-      matches(feed.perAccount[Account.getMe().id]?.value);
+      matches(feed.perAccount[Account.getMe().$jazz.id]?.value);
     });
 
     test("CoFeed create with partially loaded, reference and optional", () => {
@@ -95,7 +95,7 @@ describe("CoFeed", () => {
         return value;
       }
 
-      matches(feed.perAccount[Account.getMe().id]!.value);
+      matches(feed.perAccount[Account.getMe().$jazz.id]!.value);
     });
 
     test("CoFeed with nested feeds", () => {
@@ -109,7 +109,7 @@ describe("CoFeed", () => {
         return value;
       }
 
-      matches(feed.perAccount[Account.getMe().id]?.value);
+      matches(feed.perAccount[Account.getMe().$jazz.id]?.value);
     });
 
     test("CoFeed with enum type", () => {
@@ -123,7 +123,7 @@ describe("CoFeed", () => {
         return value;
       }
 
-      matches(feed.perAccount[Account.getMe().id]?.value);
+      matches(feed.perAccount[Account.getMe().$jazz.id]?.value);
     });
   });
 
@@ -140,7 +140,7 @@ describe("CoFeed", () => {
         Dog.create({ name: "Rex", breed: "Labrador" }),
       ]);
 
-      const loadedFeed = await DogFeed.load(feed.id, {
+      const loadedFeed = await DogFeed.load(feed.$jazz.id, {
         resolve: true,
       });
 
@@ -150,10 +150,10 @@ describe("CoFeed", () => {
         return value;
       }
 
-      matches(loadedFeed?.perAccount[Account.getMe().id]?.value);
+      matches(loadedFeed?.perAccount[Account.getMe().$jazz.id]?.value);
 
       assert(loadedFeed);
-      const dog = loadedFeed.perAccount[Account.getMe().id]?.value;
+      const dog = loadedFeed.perAccount[Account.getMe().$jazz.id]?.value;
       assert(dog);
       expectTypeOf(dog.name).toEqualTypeOf<string>();
     });
@@ -170,7 +170,7 @@ describe("CoFeed", () => {
         Dog.create({ name: "Rex", breed: "Labrador" }),
       ]);
 
-      const loadedFeed = await DogFeed.load(feed.id, {
+      const loadedFeed = await DogFeed.load(feed.$jazz.id, {
         resolve: { $each: { $onError: null } },
       });
 
@@ -180,7 +180,7 @@ describe("CoFeed", () => {
         return value;
       }
 
-      matches(loadedFeed?.perAccount[Account.getMe().id]?.value);
+      matches(loadedFeed?.perAccount[Account.getMe().$jazz.id]?.value);
     });
 
     test("loading a nested feed with deep resolve", async () => {
@@ -196,7 +196,7 @@ describe("CoFeed", () => {
         DogFeed.create([Dog.create({ name: "Rex", breed: "Labrador" })]),
       ]);
 
-      const loadedFeed = await NestedFeed.load(feed.id, {
+      const loadedFeed = await NestedFeed.load(feed.$jazz.id, {
         resolve: {
           $each: true,
         },
@@ -208,12 +208,13 @@ describe("CoFeed", () => {
         return value;
       }
 
-      const nestedFeed = loadedFeed?.perAccount[Account.getMe().id]?.value;
+      const nestedFeed =
+        loadedFeed?.perAccount[Account.getMe().$jazz.id]?.value;
       assert(nestedFeed);
-      matches(nestedFeed.perAccount[Account.getMe().id]?.value);
+      matches(nestedFeed.perAccount[Account.getMe().$jazz.id]?.value);
 
       assert(loadedFeed);
-      const dog = nestedFeed.perAccount[Account.getMe().id]?.value;
+      const dog = nestedFeed.perAccount[Account.getMe().$jazz.id]?.value;
       assert(dog);
       expectTypeOf(dog.name).toEqualTypeOf<string>();
     });