@tinacms/schema-tools 1.6.8 → 1.6.9

package/dist/index.js

@@ -2240,9 +2240,12 @@
           moreInfo.push(parseZodError({ zodError: unionError }));
         });
       }
-      const errorMessage = `Error ${issue == null ? void 0 : issue.message} at path ${issue.path.join(
+      const errorMessage = `${issue == null ? void 0 : issue.message}
+Additional information: 
+	- Error found at path ${issue.path.join(
         "."
-      )}`;
+      )}
+`;
       const errorMessages = [errorMessage, ...moreInfo];
       return {
         errors: errorMessages
@@ -2277,6 +2280,9 @@ If you need to use this value in your content you can use the \`nameOverride\` p
       });
     }
   });
+  const duplicateFieldErrorMessage = (fields) => `Fields must have unique names. Found duplicate field names: [${fields}]`;
+  const duplicateTemplateErrorMessage = (templates) => `Templates must have unique names. Found duplicate template names: [${templates}]`;
+  const duplicateCollectionErrorMessage = (collection) => `Collections must have unique names. Found duplicate collection names: [${collection}]`;
   const TypeName = [
     "string",
     "boolean",
@@ -2287,10 +2293,11 @@ If you need to use this value in your content you can use the \`nameOverride\` p
     "reference",
     "rich-text"
   ];
-  const typeTypeError = `type must be one of ${TypeName.join(", ")}`;
-  const typeRequiredError = `type is required and must be one of ${TypeName.join(
-    ", "
-  )}`;
+  const formattedTypes = `  - ${TypeName.join("\n  - ")}`;
+  const typeTypeError = `Invalid \`type\` property. \`type\` expected to be one of the following values:
+${formattedTypes}`;
+  const typeRequiredError = `Missing \`type\` property. Please add a \`type\` property with one of the following:
+${formattedTypes}`;
   const Option = z.z.union(
     [
       z.z.string(),
@@ -2376,7 +2383,7 @@ If you need to use this value in your content you can use the \`nameOverride\` p
       if (dups) {
         ctx.addIssue({
           code: z.z.ZodIssueCode.custom,
-          message: `Fields must have a unique name, duplicate field names: ${dups}`
+          message: duplicateFieldErrorMessage(dups)
         });
       }
     });
@@ -2386,21 +2393,21 @@ If you need to use this value in your content you can use the \`nameOverride\` p
         invalid_type_error: typeTypeError,
         required_error: typeRequiredError
       }),
-      fields: z.z.array(TinaFieldZod).min(1).optional().superRefine((val, ctx) => {
+      fields: z.z.array(TinaFieldZod).min(1, "Property `fields` cannot be empty.").optional().superRefine((val, ctx) => {
         const dups = findDuplicates(val == null ? void 0 : val.map((x) => x.name));
         if (dups) {
           ctx.addIssue({
             code: z.z.ZodIssueCode.custom,
-            message: `Fields must have a unique name, duplicate field names: ${dups}`
+            message: duplicateFieldErrorMessage(dups)
           });
         }
       }),
-      templates: z.z.array(TemplateTemp).min(1).optional().superRefine((val, ctx) => {
+      templates: z.z.array(TemplateTemp).min(1, "Property `templates` cannot be empty.").optional().superRefine((val, ctx) => {
         const dups = findDuplicates(val == null ? void 0 : val.map((x) => x.name));
         if (dups) {
           ctx.addIssue({
             code: z.z.ZodIssueCode.custom,
-            message: `Templates must have a unique name, duplicate template names: ${dups}`
+            message: duplicateTemplateErrorMessage(dups)
           });
         }
       })
@@ -2415,7 +2422,7 @@ If you need to use this value in your content you can use the \`nameOverride\` p
         if (dups) {
           ctx.addIssue({
             code: z.z.ZodIssueCode.custom,
-            message: `Templates must have a unique name, duplicate template names: ${dups}`
+            message: duplicateTemplateErrorMessage(dups)
           });
         }
       })
@@ -2435,10 +2442,17 @@ If you need to use this value in your content you can use the \`nameOverride\` p
       ],
       {
         errorMap: (issue, ctx) => {
-          var _a;
+          var _a, _b;
           if (issue.code === "invalid_union_discriminator") {
+            if (!((_a = ctx.data) == null ? void 0 : _a.type)) {
+              return {
+                message: `Missing \`type\` property in field \`${ctx.data.name}\`. Please add a \`type\` property with one of the following:
+${formattedTypes}`
+              };
+            }
             return {
-              message: `Invalid \`type\` property. In the schema is 'type: ${(_a = ctx.data) == null ? void 0 : _a.type}' and expected one of ${TypeName.join(", ")}`
+              message: `Invalid \`type\` property in field \`${ctx.data.name}\`. In the schema is 'type: ${(_b = ctx.data) == null ? void 0 : _b.type}' but expected one of the following:
+${formattedTypes}`
             };
           }
           return {
@@ -2448,77 +2462,52 @@ If you need to use this value in your content you can use the \`nameOverride\` p
       }
     ).superRefine((val, ctx) => {
       if (val.type === "string") {
-        if (val.isTitle) {
-          if (val.list) {
-            ctx.addIssue({
-              code: z.z.ZodIssueCode.custom,
-              message: `Can not have \`list: true\` when using \`isTitle\`. Error in value 
-${JSON.stringify(
-                val,
-                null,
-                2
-              )}
-`
-            });
-          }
-          if (!val.required) {
-            ctx.addIssue({
-              code: z.z.ZodIssueCode.custom,
-              message: `Must have { required: true } when using \`isTitle\` Error in value 
-${JSON.stringify(
-                val,
-                null,
-                2
-              )}
-`
-            });
-          }
+        const stringifiedField = JSON.stringify(val, null, 2);
+        if (val.isTitle && val.list) {
+          ctx.addIssue({
+            code: z.z.ZodIssueCode.custom,
+            message: `\`list: true\` is not allowed when using \`isTitle\` for fields of \`type: string\`. Error found in field:
+${stringifiedField}`
+          });
+        }
+        if (val.isTitle && !val.required) {
+          ctx.addIssue({
+            code: z.z.ZodIssueCode.custom,
+            message: `Property \`required: true\` is required when using \`isTitle\` for fields of \`type: string\`. Error found in field:
+${stringifiedField}`
+          });
         }
-        if (val.uid) {
+        if (val.uid && val.list) {
           if (val.list) {
             ctx.addIssue({
               code: z.z.ZodIssueCode.custom,
-              message: `Can not have \`list: true\` when using \`uid\`. Error in value 
-${JSON.stringify(
-                val,
-                null,
-                2
-              )}
-`
-            });
-          }
-          if (!val.required) {
-            ctx.addIssue({
-              code: z.z.ZodIssueCode.custom,
-              message: `Must have { required: true } when using \`uid\` Error in value 
-${JSON.stringify(
-                val,
-                null,
-                2
-              )}
-`
+              message: `\`list: true\` is not allowed when using \`uid\` for fields of \`type: string\`. Error found in field:
+${stringifiedField}`
             });
           }
         }
+        if (val.uid && !val.required) {
+          ctx.addIssue({
+            code: z.z.ZodIssueCode.custom,
+            message: `Property \`required: true\` is required when using \`uid\` for fields of \`type: string\`. Error found in field:
+${stringifiedField}`
+          });
+        }
       }
       if (val.type === "object") {
-        const message = "Must provide one of templates or fields in your collection";
-        let isValid = Boolean(val == null ? void 0 : val.templates) || Boolean(val == null ? void 0 : val.fields);
-        if (!isValid) {
+        if (!(val == null ? void 0 : val.templates) && !(val == null ? void 0 : val.fields)) {
           ctx.addIssue({
             code: z.z.ZodIssueCode.custom,
-            message
+            message: "Fields of `type: object` must have either `templates` or `fields` property."
+          });
+          return false;
+        }
+        if ((val == null ? void 0 : val.templates) && (val == null ? void 0 : val.fields)) {
+          ctx.addIssue({
+            code: z.z.ZodIssueCode.custom,
+            message: "Fields of `type: object` must have either `templates` or `fields` property, not both."
           });
           return false;
-        } else {
-          isValid = !((val == null ? void 0 : val.templates) && (val == null ? void 0 : val.fields));
-          if (!isValid) {
-            ctx.addIssue({
-              code: z.z.ZodIssueCode.custom,
-              message
-            });
-          }
-          return isValid;
         }
       }
       return true;
@@ -2562,8 +2551,8 @@ ${JSON.stringify(
   ];
   const Template = z.z.object({
     label: z.z.string({
-      invalid_type_error: "label must be a string",
-      required_error: "label was not provided but is required"
+      invalid_type_error: "Invalid data type for property `label`. Must be of type `string`",
+      required_error: "Missing `label` property. Property `label` is required."
     }),
     name,
     fields: z.z.array(TinaFieldZod)
@@ -2573,7 +2562,7 @@ ${JSON.stringify(
     if (dups) {
       ctx.addIssue({
         code: z.z.ZodIssueCode.custom,
-        message: `Fields must have a unique name, duplicate field names: ${dups}`
+        message: duplicateFieldErrorMessage(dups)
       });
     }
   });
@@ -2583,7 +2572,7 @@ ${JSON.stringify(
       if (val === "relativePath") {
         ctx.addIssue({
           code: z.z.ZodIssueCode.custom,
-          message: `name cannot be 'relativePath'. 'relativePath' is a reserved field name.`
+          message: "Invalid `name` property. `name` cannot be 'relativePath' as it is a reserved field name."
         });
       }
     }),
@@ -2591,7 +2580,7 @@ ${JSON.stringify(
       if (val === ".") {
         ctx.addIssue({
           code: z.z.ZodIssueCode.custom,
-          message: `path cannot be '.'. Please use '/' or '' instead. `
+          message: "Invalid `path` property. `path` cannot be '.'. Please use '/' or '' instead."
         });
       }
     }),
@@ -2600,63 +2589,64 @@ ${JSON.stringify(
     isDetached: z.z.boolean().optional()
   });
   const TinaCloudCollection = CollectionBaseSchema.extend({
-    fields: z.z.array(TinaFieldZod).min(1).optional().superRefine((val, ctx) => {
+    fields: z.z.array(TinaFieldZod).min(1, "Property `fields` cannot be empty.").optional().superRefine((val, ctx) => {
       const dups = findDuplicates(val == null ? void 0 : val.map((x) => x.name));
       if (dups) {
         ctx.addIssue({
           code: z.z.ZodIssueCode.custom,
-          message: `Fields must have a unique name, duplicate field names: ${dups}`
+          message: duplicateFieldErrorMessage(dups)
         });
       }
-    }).refine(
-      // It is valid if it is 0 or 1
-      (val) => {
-        const arr = (val == null ? void 0 : val.filter((x) => x.type === "string" && x.isTitle)) || [];
-        return arr.length < 2;
-      },
-      {
-        message: "Fields can only have one use of `isTitle`"
-      }
-    ).refine(
-      // It is valid if it is 0 or 1
-      (val) => {
-        const arr = (val == null ? void 0 : val.filter((x) => x.uid)) || [];
-        return arr.length < 2;
-      },
-      {
-        message: "Fields can only have one use of `uid`"
-      }
-    ).refine(
-      // It is valid if it is 0 or 1
-      (val) => {
-        const arr = (val == null ? void 0 : val.filter((x) => x.type === "password")) || [];
-        return arr.length < 2;
-      },
-      {
-        message: "Fields can only have one use of `password` type"
+    }).superRefine((val, ctx) => {
+      const arr = (val == null ? void 0 : val.filter((x) => x.type === "string" && x.isTitle)) || [];
+      if (arr.length > 1) {
+        ctx.addIssue({
+          code: z.z.ZodIssueCode.custom,
+          message: `The following fields have the property \`isTitle\`: [${arr.map((field) => field.name).join(", ")}]. Only one can contain the property \`isTitle\`.`
+        });
+      }
+    }).superRefine((val, ctx) => {
+      const arr = (val == null ? void 0 : val.filter((x) => x.uid)) || [];
+      if (arr.length > 2) {
+        ctx.addIssue({
+          code: z.z.ZodIssueCode.custom,
+          message: `The following fields have the property \`uid\`: [${arr.map((field) => field.name).join(", ")}]. Only one can contain the property \`uid\`.`
+        });
+      }
+    }).superRefine((val, ctx) => {
+      const arr = (val == null ? void 0 : val.filter((x) => x.type === "password")) || [];
+      if (arr.length > 2) {
+        ctx.addIssue({
+          code: z.z.ZodIssueCode.custom,
+          message: `The following fields have \`type: password\`: [${arr.map((field) => field.name).join(", ")}]. Only one can be of \`type: password\`.`
+        });
       }
-    ),
-    templates: z.z.array(Template).min(1).optional().superRefine((val, ctx) => {
+    }),
+    templates: z.z.array(Template).min(1, "Property `templates` cannot be empty.").optional().superRefine((val, ctx) => {
       const dups = findDuplicates(val == null ? void 0 : val.map((x) => x.name));
       if (dups) {
         ctx.addIssue({
           code: z.z.ZodIssueCode.custom,
-          message: `Templates must have a unique name, duplicate template names: ${dups}`
+          message: duplicateFieldErrorMessage(dups)
         });
       }
     })
-  }).refine(
-    (val) => {
-      let isValid = Boolean(val == null ? void 0 : val.templates) || Boolean(val == null ? void 0 : val.fields);
-      if (!isValid) {
-        return false;
-      } else {
-        isValid = !((val == null ? void 0 : val.templates) && (val == null ? void 0 : val.fields));
-        return isValid;
-      }
-    },
-    { message: "Must provide one of templates or fields in your collection" }
-  );
+  }).superRefine((val, ctx) => {
+    if (!(val == null ? void 0 : val.templates) && !(val == null ? void 0 : val.fields)) {
+      ctx.addIssue({
+        code: z.z.ZodIssueCode.custom,
+        message: "Fields of `type: object` must have either `templates` or `fields` property."
+      });
+      return false;
+    }
+    if ((val == null ? void 0 : val.templates) && (val == null ? void 0 : val.fields)) {
+      ctx.addIssue({
+        code: z.z.ZodIssueCode.custom,
+        message: "Fields of `type: object` must have either `templates` or `fields` property, not both."
+      });
+      return false;
+    }
+  });
   const TinaCloudSchemaZod = z.z.object({
     collections: z.z.array(TinaCloudCollection),
     config: tinaConfigZod.optional()
@@ -2666,14 +2656,14 @@ ${JSON.stringify(
     if (dups) {
       ctx.addIssue({
         code: z.z.ZodIssueCode.custom,
-        message: `${dups} are duplicate names in your collections. Collection names must be unique.`,
+        message: duplicateCollectionErrorMessage(dups),
         fatal: true
       });
     }
     if (((_b = val.collections) == null ? void 0 : _b.filter((x) => x.isAuthCollection).length) > 1) {
       ctx.addIssue({
         code: z.z.ZodIssueCode.custom,
-        message: `Only one collection can be marked as isAuthCollection`,
+        message: "Only one collection can be marked as `isAuthCollection`.",
         fatal: true
       });
     }
@@ -2681,7 +2671,7 @@ ${JSON.stringify(
     if (media && media.tina && media.loadCustomStore) {
       ctx.addIssue({
         code: z.z.ZodIssueCode.custom,
-        message: "can not have both loadCustomStore and tina. Must use one or the other",
+        message: "Cannot have both `loadCustomStore` and `tina`. Must use one or the other.",
         fatal: true,
         path: ["config", "media"]
       });
@@ -2690,7 +2680,7 @@ ${JSON.stringify(
     if (search && search.tina && search.searchClient) {
       ctx.addIssue({
         code: z.z.ZodIssueCode.custom,
-        message: "can not have both searchClient and tina. Must use one or the other",
+        message: "Cannot have both `searchClient` and `tina`. Must use one or the other.",
         fatal: true,
         path: ["config", "search"]
       });
@@ -2708,7 +2698,7 @@ ${JSON.stringify(
     } catch (e) {
       if (e instanceof z.ZodError) {
         const errors = parseZodError({ zodError: e });
-        throw new TinaSchemaValidationError(errors.join(", \n"));
+        throw new TinaSchemaValidationError(errors.join("\n"));
       }
       throw new Error(e);
     }

package/dist/index.mjs

@@ -2222,9 +2222,12 @@ const parseZodError = ({ zodError }) => {
         moreInfo.push(parseZodError({ zodError: unionError }));
       });
     }
-    const errorMessage = `Error ${issue == null ? void 0 : issue.message} at path ${issue.path.join(
+    const errorMessage = `${issue == null ? void 0 : issue.message}
+Additional information: 
+	- Error found at path ${issue.path.join(
       "."
-    )}`;
+    )}
+`;
     const errorMessages = [errorMessage, ...moreInfo];
     return {
       errors: errorMessages
@@ -2259,6 +2262,9 @@ If you need to use this value in your content you can use the \`nameOverride\` p
     });
   }
 });
+const duplicateFieldErrorMessage = (fields) => `Fields must have unique names. Found duplicate field names: [${fields}]`;
+const duplicateTemplateErrorMessage = (templates) => `Templates must have unique names. Found duplicate template names: [${templates}]`;
+const duplicateCollectionErrorMessage = (collection) => `Collections must have unique names. Found duplicate collection names: [${collection}]`;
 const TypeName = [
   "string",
   "boolean",
@@ -2269,10 +2275,11 @@ const TypeName = [
   "reference",
   "rich-text"
 ];
-const typeTypeError = `type must be one of ${TypeName.join(", ")}`;
-const typeRequiredError = `type is required and must be one of ${TypeName.join(
-  ", "
-)}`;
+const formattedTypes = `  - ${TypeName.join("\n  - ")}`;
+const typeTypeError = `Invalid \`type\` property. \`type\` expected to be one of the following values:
+${formattedTypes}`;
+const typeRequiredError = `Missing \`type\` property. Please add a \`type\` property with one of the following:
+${formattedTypes}`;
 const Option = z.union(
   [
     z.string(),
@@ -2358,7 +2365,7 @@ const TinaFieldZod = z.lazy(() => {
     if (dups) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
-        message: `Fields must have a unique name, duplicate field names: ${dups}`
+        message: duplicateFieldErrorMessage(dups)
       });
     }
   });
@@ -2368,21 +2375,21 @@ const TinaFieldZod = z.lazy(() => {
       invalid_type_error: typeTypeError,
       required_error: typeRequiredError
     }),
-    fields: z.array(TinaFieldZod).min(1).optional().superRefine((val, ctx) => {
+    fields: z.array(TinaFieldZod).min(1, "Property `fields` cannot be empty.").optional().superRefine((val, ctx) => {
       const dups = findDuplicates(val == null ? void 0 : val.map((x) => x.name));
       if (dups) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
-          message: `Fields must have a unique name, duplicate field names: ${dups}`
+          message: duplicateFieldErrorMessage(dups)
         });
       }
     }),
-    templates: z.array(TemplateTemp).min(1).optional().superRefine((val, ctx) => {
+    templates: z.array(TemplateTemp).min(1, "Property `templates` cannot be empty.").optional().superRefine((val, ctx) => {
       const dups = findDuplicates(val == null ? void 0 : val.map((x) => x.name));
       if (dups) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
-          message: `Templates must have a unique name, duplicate template names: ${dups}`
+          message: duplicateTemplateErrorMessage(dups)
         });
       }
     })
@@ -2397,7 +2404,7 @@ const TinaFieldZod = z.lazy(() => {
       if (dups) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
-          message: `Templates must have a unique name, duplicate template names: ${dups}`
+          message: duplicateTemplateErrorMessage(dups)
         });
       }
     })
@@ -2417,10 +2424,17 @@ const TinaFieldZod = z.lazy(() => {
     ],
     {
       errorMap: (issue, ctx) => {
-        var _a;
+        var _a, _b;
         if (issue.code === "invalid_union_discriminator") {
+          if (!((_a = ctx.data) == null ? void 0 : _a.type)) {
+            return {
+              message: `Missing \`type\` property in field \`${ctx.data.name}\`. Please add a \`type\` property with one of the following:
+${formattedTypes}`
+            };
+          }
           return {
-            message: `Invalid \`type\` property. In the schema is 'type: ${(_a = ctx.data) == null ? void 0 : _a.type}' and expected one of ${TypeName.join(", ")}`
+            message: `Invalid \`type\` property in field \`${ctx.data.name}\`. In the schema is 'type: ${(_b = ctx.data) == null ? void 0 : _b.type}' but expected one of the following:
+${formattedTypes}`
           };
         }
         return {
@@ -2430,77 +2444,52 @@ const TinaFieldZod = z.lazy(() => {
     }
   ).superRefine((val, ctx) => {
     if (val.type === "string") {
-      if (val.isTitle) {
-        if (val.list) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `Can not have \`list: true\` when using \`isTitle\`. Error in value 
-${JSON.stringify(
-              val,
-              null,
-              2
-            )}
-`
-          });
-        }
-        if (!val.required) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `Must have { required: true } when using \`isTitle\` Error in value 
-${JSON.stringify(
-              val,
-              null,
-              2
-            )}
-`
-          });
-        }
+      const stringifiedField = JSON.stringify(val, null, 2);
+      if (val.isTitle && val.list) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `\`list: true\` is not allowed when using \`isTitle\` for fields of \`type: string\`. Error found in field:
+${stringifiedField}`
+        });
+      }
+      if (val.isTitle && !val.required) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `Property \`required: true\` is required when using \`isTitle\` for fields of \`type: string\`. Error found in field:
+${stringifiedField}`
+        });
       }
-      if (val.uid) {
+      if (val.uid && val.list) {
         if (val.list) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: `Can not have \`list: true\` when using \`uid\`. Error in value 
-${JSON.stringify(
-              val,
-              null,
-              2
-            )}
-`
-          });
-        }
-        if (!val.required) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `Must have { required: true } when using \`uid\` Error in value 
-${JSON.stringify(
-              val,
-              null,
-              2
-            )}
-`
+            message: `\`list: true\` is not allowed when using \`uid\` for fields of \`type: string\`. Error found in field:
+${stringifiedField}`
           });
         }
       }
+      if (val.uid && !val.required) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `Property \`required: true\` is required when using \`uid\` for fields of \`type: string\`. Error found in field:
+${stringifiedField}`
+        });
+      }
     }
     if (val.type === "object") {
-      const message = "Must provide one of templates or fields in your collection";
-      let isValid = Boolean(val == null ? void 0 : val.templates) || Boolean(val == null ? void 0 : val.fields);
-      if (!isValid) {
+      if (!(val == null ? void 0 : val.templates) && !(val == null ? void 0 : val.fields)) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
-          message
+          message: "Fields of `type: object` must have either `templates` or `fields` property."
+        });
+        return false;
+      }
+      if ((val == null ? void 0 : val.templates) && (val == null ? void 0 : val.fields)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Fields of `type: object` must have either `templates` or `fields` property, not both."
         });
         return false;
-      } else {
-        isValid = !((val == null ? void 0 : val.templates) && (val == null ? void 0 : val.fields));
-        if (!isValid) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message
-          });
-        }
-        return isValid;
       }
     }
     return true;
@@ -2544,8 +2533,8 @@ const FORMATS = [
 ];
 const Template = z.object({
   label: z.string({
-    invalid_type_error: "label must be a string",
-    required_error: "label was not provided but is required"
+    invalid_type_error: "Invalid data type for property `label`. Must be of type `string`",
+    required_error: "Missing `label` property. Property `label` is required."
   }),
   name,
   fields: z.array(TinaFieldZod)
@@ -2555,7 +2544,7 @@ const Template = z.object({
   if (dups) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
-      message: `Fields must have a unique name, duplicate field names: ${dups}`
+      message: duplicateFieldErrorMessage(dups)
     });
   }
 });
@@ -2565,7 +2554,7 @@ const CollectionBaseSchema = z.object({
     if (val === "relativePath") {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
-        message: `name cannot be 'relativePath'. 'relativePath' is a reserved field name.`
+        message: "Invalid `name` property. `name` cannot be 'relativePath' as it is a reserved field name."
       });
     }
   }),
@@ -2573,7 +2562,7 @@ const CollectionBaseSchema = z.object({
     if (val === ".") {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
-        message: `path cannot be '.'. Please use '/' or '' instead. `
+        message: "Invalid `path` property. `path` cannot be '.'. Please use '/' or '' instead."
       });
     }
   }),
@@ -2582,63 +2571,64 @@ const CollectionBaseSchema = z.object({
   isDetached: z.boolean().optional()
 });
 const TinaCloudCollection = CollectionBaseSchema.extend({
-  fields: z.array(TinaFieldZod).min(1).optional().superRefine((val, ctx) => {
+  fields: z.array(TinaFieldZod).min(1, "Property `fields` cannot be empty.").optional().superRefine((val, ctx) => {
     const dups = findDuplicates(val == null ? void 0 : val.map((x) => x.name));
     if (dups) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
-        message: `Fields must have a unique name, duplicate field names: ${dups}`
+        message: duplicateFieldErrorMessage(dups)
       });
     }
-  }).refine(
-    // It is valid if it is 0 or 1
-    (val) => {
-      const arr = (val == null ? void 0 : val.filter((x) => x.type === "string" && x.isTitle)) || [];
-      return arr.length < 2;
-    },
-    {
-      message: "Fields can only have one use of `isTitle`"
-    }
-  ).refine(
-    // It is valid if it is 0 or 1
-    (val) => {
-      const arr = (val == null ? void 0 : val.filter((x) => x.uid)) || [];
-      return arr.length < 2;
-    },
-    {
-      message: "Fields can only have one use of `uid`"
-    }
-  ).refine(
-    // It is valid if it is 0 or 1
-    (val) => {
-      const arr = (val == null ? void 0 : val.filter((x) => x.type === "password")) || [];
-      return arr.length < 2;
-    },
-    {
-      message: "Fields can only have one use of `password` type"
+  }).superRefine((val, ctx) => {
+    const arr = (val == null ? void 0 : val.filter((x) => x.type === "string" && x.isTitle)) || [];
+    if (arr.length > 1) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: `The following fields have the property \`isTitle\`: [${arr.map((field) => field.name).join(", ")}]. Only one can contain the property \`isTitle\`.`
+      });
+    }
+  }).superRefine((val, ctx) => {
+    const arr = (val == null ? void 0 : val.filter((x) => x.uid)) || [];
+    if (arr.length > 2) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: `The following fields have the property \`uid\`: [${arr.map((field) => field.name).join(", ")}]. Only one can contain the property \`uid\`.`
+      });
+    }
+  }).superRefine((val, ctx) => {
+    const arr = (val == null ? void 0 : val.filter((x) => x.type === "password")) || [];
+    if (arr.length > 2) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: `The following fields have \`type: password\`: [${arr.map((field) => field.name).join(", ")}]. Only one can be of \`type: password\`.`
+      });
     }
-  ),
-  templates: z.array(Template).min(1).optional().superRefine((val, ctx) => {
+  }),
+  templates: z.array(Template).min(1, "Property `templates` cannot be empty.").optional().superRefine((val, ctx) => {
     const dups = findDuplicates(val == null ? void 0 : val.map((x) => x.name));
     if (dups) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
-        message: `Templates must have a unique name, duplicate template names: ${dups}`
+        message: duplicateFieldErrorMessage(dups)
       });
     }
   })
-}).refine(
-  (val) => {
-    let isValid = Boolean(val == null ? void 0 : val.templates) || Boolean(val == null ? void 0 : val.fields);
-    if (!isValid) {
-      return false;
-    } else {
-      isValid = !((val == null ? void 0 : val.templates) && (val == null ? void 0 : val.fields));
-      return isValid;
-    }
-  },
-  { message: "Must provide one of templates or fields in your collection" }
-);
+}).superRefine((val, ctx) => {
+  if (!(val == null ? void 0 : val.templates) && !(val == null ? void 0 : val.fields)) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: "Fields of `type: object` must have either `templates` or `fields` property."
+    });
+    return false;
+  }
+  if ((val == null ? void 0 : val.templates) && (val == null ? void 0 : val.fields)) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: "Fields of `type: object` must have either `templates` or `fields` property, not both."
+    });
+    return false;
+  }
+});
 const TinaCloudSchemaZod = z.object({
   collections: z.array(TinaCloudCollection),
   config: tinaConfigZod.optional()
@@ -2648,14 +2638,14 @@ const TinaCloudSchemaZod = z.object({
   if (dups) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
-      message: `${dups} are duplicate names in your collections. Collection names must be unique.`,
+      message: duplicateCollectionErrorMessage(dups),
       fatal: true
     });
   }
   if (((_b = val.collections) == null ? void 0 : _b.filter((x) => x.isAuthCollection).length) > 1) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
-      message: `Only one collection can be marked as isAuthCollection`,
+      message: "Only one collection can be marked as `isAuthCollection`.",
       fatal: true
     });
   }
@@ -2663,7 +2653,7 @@ const TinaCloudSchemaZod = z.object({
   if (media && media.tina && media.loadCustomStore) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
-      message: "can not have both loadCustomStore and tina. Must use one or the other",
+      message: "Cannot have both `loadCustomStore` and `tina`. Must use one or the other.",
       fatal: true,
       path: ["config", "media"]
     });
@@ -2672,7 +2662,7 @@ const TinaCloudSchemaZod = z.object({
   if (search && search.tina && search.searchClient) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
-      message: "can not have both searchClient and tina. Must use one or the other",
+      message: "Cannot have both `searchClient` and `tina`. Must use one or the other.",
       fatal: true,
       path: ["config", "search"]
     });
@@ -2690,7 +2680,7 @@ const validateSchema = ({ schema }) => {
   } catch (e) {
     if (e instanceof ZodError) {
       const errors = parseZodError({ zodError: e });
-      throw new TinaSchemaValidationError(errors.join(", \n"));
+      throw new TinaSchemaValidationError(errors.join("\n"));
     }
     throw new Error(e);
   }

package/dist/validate/fields.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 import { z } from 'zod';
 import type { TinaField as TinaFieldType } from '../types/index';
 export declare const TinaFieldZod: z.ZodType<TinaFieldType>;

package/dist/validate/schema.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 import { z } from 'zod';
 export declare const CollectionBaseSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodString>;

package/dist/validate/util.d.ts

@@ -0,0 +1,3 @@
+export declare const duplicateFieldErrorMessage: (fields: string) => string;
+export declare const duplicateTemplateErrorMessage: (templates: string) => string;
+export declare const duplicateCollectionErrorMessage: (collection: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/schema-tools",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {