jazz-tools 0.14.8 → 0.14.10

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> jazz-tools@0.14.8 build /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.14.10 build /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsup && pnpm types
 
 CLI Building entry: {"index":"src/index.ts","testing":"src/testing.ts"}
@@ -9,14 +9,14 @@
 CLI Target: es2021
 CLI Cleaning output folder
 ESM Build start
-ESM dist/index.js              12.29 KB
+ESM dist/index.js              11.07 KB
 ESM dist/testing.js            6.31 KB
-ESM dist/chunk-PA6UHG6Q.js     131.68 KB
-ESM dist/index.js.map          19.42 KB
+ESM dist/chunk-YLZ5746T.js     132.99 KB
+ESM dist/index.js.map          18.38 KB
 ESM dist/testing.js.map        12.57 KB
-ESM dist/chunk-PA6UHG6Q.js.map 306.05 KB
-ESM ⚡️ Build success in 58ms
+ESM dist/chunk-YLZ5746T.js.map 307.99 KB
+ESM ⚡️ Build success in 79ms
 
-> jazz-tools@0.14.8 types /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.14.10 types /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsc --outDir dist
 

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # jazz-tools
 
+## 0.14.10
+
+### Patch Changes
+
+- dc746a2: Make the react peerDependency definition more relaxed
+- f869d9a: Deprecated the withHelpers method in favor of standalone functions
+- 3fe6832: Add support for z.catch/default. We ignore them for the moment and flag a warning.
+
+## 0.14.9
+
+### Patch Changes
+
+- 22c2600: Move back to zod as dependency and clean up zod re-export
+
 ## 0.14.8
 
 ### Patch Changes

package/dist/{chunk-PA6UHG6Q.js → chunk-YLZ5746T.js}

@@ -4,6 +4,79 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/implementation/zodSchema/zodReExport.ts
+var zodReExport_exports = {};
+__export(zodReExport_exports, {
+  array: () => array,
+  base64: () => base64,
+  base64url: () => base64url,
+  boolean: () => boolean,
+  cidrv4: () => cidrv4,
+  cidrv6: () => cidrv6,
+  cuid: () => cuid,
+  cuid2: () => cuid2,
+  date: () => date,
+  discriminatedUnion: () => discriminatedUnion,
+  email: () => email,
+  emoji: () => emoji,
+  enum: () => enum2,
+  int: () => int,
+  int32: () => int32,
+  ipv4: () => ipv4,
+  ipv6: () => ipv6,
+  iso: () => iso,
+  json: () => json,
+  literal: () => literal,
+  nanoid: () => nanoid,
+  number: () => number,
+  object: () => object,
+  optional: () => optional,
+  strictObject: () => strictObject,
+  string: () => string,
+  templateLiteral: () => templateLiteral,
+  tuple: () => tuple,
+  ulid: () => ulid,
+  union: () => union,
+  url: () => url,
+  uuid: () => uuid,
+  z: () => z
+});
+import {
+  string,
+  number,
+  boolean,
+  union,
+  object,
+  array,
+  templateLiteral,
+  json,
+  tuple,
+  date,
+  emoji,
+  base64,
+  base64url,
+  nanoid,
+  cuid,
+  cuid2,
+  ulid,
+  ipv4,
+  ipv6,
+  email,
+  url,
+  uuid,
+  literal,
+  enum as enum2,
+  cidrv4,
+  cidrv6,
+  iso,
+  int32,
+  strictObject,
+  discriminatedUnion,
+  int,
+  optional,
+  z
+} from "zod/v4";
+
 // src/coValues/CoValueBase.ts
 import { ControlledAccount, RawAccount } from "cojson";
 var CoValueBase = class {
@@ -2560,7 +2633,7 @@ var Encoders = {
     decode: (value) => value === null ? void 0 : new Date(value)
   }
 };
-var optional = {
+var optional2 = {
   ref: optionalRef,
   json() {
     return { [SchemaInit]: "json" };
@@ -2614,7 +2687,7 @@ var coField = {
   },
   ref,
   items: ItemsSym,
-  optional
+  optional: optional2
 };
 function optionalRef(arg) {
   return ref(arg, { optional: true });
@@ -3368,7 +3441,6 @@ function getDef(schema) {
 }
 
 // src/implementation/zodSchema/zodCo.ts
-import z from "jazz-tools-zod-v4-rn-patch/v4";
 var coMapDefiner = (shape) => {
   const objectSchema = z.object(shape).meta({
     collaborative: true
@@ -3564,12 +3636,8 @@ __export(coExport_exports, {
   richText: () => coRichTextDefiner
 });
 
-// src/implementation/zodSchema/runtimeConverters/zodSchemaToCoSchema.ts
-import z3 from "jazz-tools-zod-v4-rn-patch/v4";
-
 // src/implementation/zodSchema/unionUtils.ts
 import { RawCoList } from "cojson";
-import z2 from "jazz-tools-zod-v4-rn-patch/v4";
 function schemaUnionDiscriminatorFor(schema) {
   if (isUnionOfCoMapsDeeply(schema)) {
     if (!schema._zod.disc || schema._zod.disc.size == 0) {
@@ -3655,23 +3723,23 @@ function schemaUnionDiscriminatorFor(schema) {
   }
 }
 function isUnionOfCoMapsDeeply(schema) {
-  if (schema instanceof z2.core.$ZodUnion) {
+  if (schema instanceof z.core.$ZodUnion) {
     return schema._zod.def.options.every(isCoMapOrUnionOfCoMapsDeeply);
   } else {
     return false;
   }
 }
 function isCoMapOrUnionOfCoMapsDeeply(schema) {
-  if (schema instanceof z2.core.$ZodObject && "collaborative" in schema && schema.collaborative) {
+  if (schema instanceof z.core.$ZodObject && "collaborative" in schema && schema.collaborative) {
     return true;
-  } else if (schema instanceof z2.core.$ZodUnion) {
+  } else if (schema instanceof z.core.$ZodUnion) {
     return schema._zod.def.options.every(isCoMapOrUnionOfCoMapsDeeply);
   } else {
     return false;
   }
 }
 function isUnionOfPrimitivesDeeply(schema) {
-  if (schema instanceof z2.core.$ZodUnion) {
+  if (schema instanceof z.core.$ZodUnion) {
     return schema._zod.def.options.every(isUnionOfPrimitivesDeeply);
   } else {
     return !("collaborative" in schema);
@@ -3715,16 +3783,23 @@ function zodFieldToCoFieldDef(schema) {
         return zodFieldToCoFieldDef(
           schema.unwrap()
         );
+      } else if (schema._zod.def.type === "default" || schema._zod.def.type === "catch") {
+        console.warn(
+          "z.default()/z.catch() are not supported in collaborative schemas. They will be ignored."
+        );
+        return zodFieldToCoFieldDef(
+          schema.def.innerType
+        );
       } else if (schema._zod.def.type === "literal") {
         if (schema._zod.def.values.some(
-          (literal) => typeof literal === "undefined"
+          (literal2) => typeof literal2 === "undefined"
         )) {
           throw new Error("z.literal() with undefined is not supported");
         }
-        if (schema._zod.def.values.some((literal) => literal === null)) {
+        if (schema._zod.def.values.some((literal2) => literal2 === null)) {
           throw new Error("z.literal() with null is not supported");
         }
-        if (schema._zod.def.values.some((literal) => typeof literal === "bigint")) {
+        if (schema._zod.def.values.some((literal2) => typeof literal2 === "bigint")) {
           throw new Error("z.literal() with bigint is not supported");
         }
         return coField.literal(
@@ -3838,7 +3913,7 @@ function tryZodSchemaToCoSchema(schema) {
         `Unsupported zod CoValue type for top-level schema: ${schema._zod?.def?.type || JSON.stringify(schema, void 0, 2)}`
       );
     }
-  } else if (schema instanceof z3.core.$ZodDiscriminatedUnion) {
+  } else if (schema instanceof z.core.$ZodDiscriminatedUnion) {
     if (isUnionOfCoMapsDeeply(schema)) {
       return SchemaUnion.Of(
         schemaUnionDiscriminatorFor(schema)
@@ -3877,10 +3952,9 @@ function zodSchemaToCoSchemaOrKeepPrimitive(schema) {
 }
 
 // src/coValues/extensions/imageDef.ts
-import z4 from "jazz-tools-zod-v4-rn-patch/v4";
 var ImageDefinitionBase = coMapDefiner({
-  originalSize: z4.tuple([z4.number(), z4.number()]),
-  placeholderDataURL: z4.string().optional()
+  originalSize: z.tuple([z.number(), z.number()]),
+  placeholderDataURL: z.string().optional()
 }).catchall(coFileStreamDefiner());
 var ImageDefinition = ImageDefinitionBase.withHelpers((Self) => ({
   highestResAvailable(imageDef, options) {
@@ -4255,23 +4329,23 @@ function createResolvablePromise() {
 // src/implementation/devtoolsFormatters.ts
 globalThis.devtoolsFormatters = [
   {
-    header: (object) => {
-      if (object._type === "CoMap") {
-        return ["div", {}, ["span", {}, object.constructor.name]];
-      } else if (object._type === "CoList") {
+    header: (object2) => {
+      if (object2._type === "CoMap") {
+        return ["div", {}, ["span", {}, object2.constructor.name]];
+      } else if (object2._type === "CoList") {
         return [
           "div",
           {},
-          ["span", {}, object.constructor.name + "(" + object.length + ") "]
+          ["span", {}, object2.constructor.name + "(" + object2.length + ") "]
         ];
-      } else if (object._type === "Account") {
+      } else if (object2._type === "Account") {
         return [
           "div",
           {},
           [
             "span",
             {},
-            object.constructor.name + "(" + object._refs.profile.value?.name + (object.isMe ? " ME" : "") + ")"
+            object2.constructor.name + "(" + object2._refs.profile.value?.name + (object2.isMe ? " ME" : "") + ")"
           ]
         ];
       } else {
@@ -4281,44 +4355,44 @@ globalThis.devtoolsFormatters = [
     hasBody: function() {
       return true;
     },
-    body: function(object) {
-      if (object._type === "CoMap" || object._type === "Account") {
+    body: function(object2) {
+      if (object2._type === "CoMap" || object2._type === "Account") {
         return [
           "div",
           { style: "margin-left: 15px" },
-          ["div", "id: ", ["object", { object: object.id }]],
-          ...Object.entries(object).map(([k, v]) => [
+          ["div", "id: ", ["object", { object: object2.id }]],
+          ...Object.entries(object2).map(([k, v]) => [
             "div",
             { style: "white-space: nowrap;" },
             ["span", { style: "font-weight: bold; opacity: 0.6" }, k, ": "],
             ["object", { object: v }],
-            ...typeof object._schema[k] === "function" ? v === null ? [
+            ...typeof object2._schema[k] === "function" ? v === null ? [
               [
                 "span",
                 { style: "opacity: 0.5" },
-                ` (pending ${object._schema[k].name} `,
-                ["object", { object: object._refs[k] }],
+                ` (pending ${object2._schema[k].name} `,
+                ["object", { object: object2._refs[k] }],
                 ")"
               ]
             ] : [] : []
           ])
         ];
-      } else if (object._type === "CoList") {
+      } else if (object2._type === "CoList") {
         return [
           "div",
           { style: "margin-left: 15px" },
-          ["div", "id: ", ["object", { object: object.id }]],
-          ...object.map((v, i) => [
+          ["div", "id: ", ["object", { object: object2.id }]],
+          ...object2.map((v, i) => [
             "div",
             { style: "white-space: nowrap;" },
             ["span", { style: "font-weight: bold; opacity: 0.6" }, i, ": "],
             ["object", { object: v }],
-            ...typeof object._schema[ItemsSym] === "function" ? v === null ? [
+            ...typeof object2._schema[ItemsSym] === "function" ? v === null ? [
               [
                 "span",
                 { style: "opacity: 0.5" },
-                ` (pending ${object._schema[ItemsSym].name} `,
-                ["object", { object: object._refs[i] }],
+                ` (pending ${object2._schema[ItemsSym].name} `,
+                ["object", { object: object2._refs[i] }],
                 ")"
               ]
             ] : [] : []
@@ -4531,7 +4605,7 @@ function parseGroupCreateOptions(options) {
 }
 
 export {
-  __export,
+  zodReExport_exports,
   loadCoValue,
   subscribeToCoValue,
   createCoValueObservable,
@@ -4568,4 +4642,4 @@ export {
   JazzContextManager
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-PA6UHG6Q.js.map
+//# sourceMappingURL=chunk-YLZ5746T.js.map