@tinacms/schema-tools 0.0.0-f90ef4d-20241119072342 → 0.0.0-fd664d8-20250407054012

package/dist/index.js

@@ -20,42 +20,26 @@
   }
   const yup__namespace = /* @__PURE__ */ _interopNamespaceDefault(yup);
   function addNamespaceToSchema(maybeNode, namespace = []) {
-    if (typeof maybeNode === "string") {
+    if (typeof maybeNode !== "object" || maybeNode === null) {
       return maybeNode;
     }
-    if (typeof maybeNode === "boolean") {
-      return maybeNode;
-    }
-    if (typeof maybeNode === "function") {
-      return maybeNode;
-    }
-    const newNode = { ...maybeNode };
-    const keys = Object.keys(maybeNode);
-    Object.values(maybeNode).map((m, index) => {
-      const key = keys[index];
-      if (Array.isArray(m)) {
-        newNode[key] = m.map((element) => {
-          if (!element) {
-            return;
-          }
-          if (!element.hasOwnProperty("name")) {
-            return element;
+    const newNode = { ...maybeNode, namespace: [...namespace] };
+    Object.entries(maybeNode).forEach(([key, value]) => {
+      if (Array.isArray(value)) {
+        newNode[key] = value.map((element) => {
+          if (element && typeof element === "object" && "name" in element) {
+            const valueName = element.name || element.value;
+            return addNamespaceToSchema(element, [...namespace, valueName]);
           }
-          const value = element.name || element.value;
-          return addNamespaceToSchema(element, [...namespace, value]);
+          return element;
         });
+      } else if (value && typeof value === "object" && "name" in value) {
+        newNode[key] = addNamespaceToSchema(value, [...namespace, value.name]);
       } else {
-        if (!m) {
-          return;
-        }
-        if (!m.hasOwnProperty("name")) {
-          newNode[key] = m;
-        } else {
-          newNode[key] = addNamespaceToSchema(m, [...namespace, m.name]);
-        }
+        newNode[key] = value;
       }
     });
-    return { ...newNode, namespace };
+    return newNode;
   }
   function getDefaultExportFromCjs(x) {
     return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -1961,7 +1945,7 @@
           }
         }
       };
-      this.walkFields = (cb) => {
+      this.legacyWalkFields = (cb) => {
         const walk = (collectionOrObject, collection, path) => {
           if (collectionOrObject.templates) {
             collectionOrObject.templates.forEach((template) => {
@@ -1983,7 +1967,7 @@
         collections.forEach((collection) => walk(collection, collection, []));
       };
       this.schema = config;
-      this.walkFields(({ field, collection, path }) => {
+      this.legacyWalkFields(({ field, collection }) => {
         if (!("searchable" in field)) {
           if (field.type === "image") {
             field.searchable = false;
@@ -2004,20 +1988,67 @@
         field.uid = field.uid || false;
       });
     }
-    findReferences(name2) {
+    findReferencesFromCollection(name2) {
       const result = {};
       this.walkFields(({ field, collection: c, path }) => {
+        if (c.name !== name2) {
+          return;
+        }
         if (field.type === "reference") {
-          if (field.collections.includes(name2)) {
-            if (result[c.name] === void 0) {
-              result[c.name] = [];
+          field.collections.forEach((name22) => {
+            if (result[name22] === void 0) {
+              result[name22] = [];
             }
-            result[c.name].push({ path, field });
-          }
+            result[name22].push(path);
+          });
         }
       });
       return result;
     }
+    /**
+     * Walk all fields in tina schema
+     *
+     * @param cb callback function invoked for each field
+     */
+    walkFields(cb) {
+      const walk = (collectionOrObject, collection, path = "$") => {
+        if (collectionOrObject.templates) {
+          collectionOrObject.templates.forEach((template) => {
+            const templatePath = `${path}.${template.name}`;
+            template.fields.forEach((field) => {
+              const fieldPath = field.list ? `${templatePath}[*].${field.name}` : `${templatePath}.${field.name}`;
+              cb({ field, collection, path: fieldPath });
+              if (field.type === "object") {
+                walk(field, collection, fieldPath);
+              }
+            });
+          });
+        }
+        if (collectionOrObject.fields) {
+          collectionOrObject.fields.forEach((field) => {
+            const fieldPath = field.list ? `${path}.${field.name}[*]` : `${path}.${field.name}`;
+            cb({ field, collection, path: fieldPath });
+            if (field.type === "object" && field.fields) {
+              walk(field, collection, fieldPath);
+            } else if (field.templates) {
+              field.templates.forEach((template) => {
+                const templatePath = `${fieldPath}.${template.name}`;
+                template.fields.forEach((field2) => {
+                  const fieldPath2 = field2.list ? `${templatePath}[*].${field2.name}` : `${templatePath}.${field2.name}`;
+                  cb({ field: field2, collection, path: fieldPath2 });
+                  if (field2.type === "object") {
+                    walk(field2, collection, fieldPath2);
+                  }
+                });
+              });
+            }
+          });
+        }
+      };
+      this.getCollections().forEach((collection) => {
+        walk(collection, collection);
+      });
+    }
     /**
      * This function returns an array of glob matches for a given collection.
      *
@@ -2240,9 +2271,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 +2311,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 +2324,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 +2414,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 +2424,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 +2453,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 +2473,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 +2493,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.uid) {
+        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 && 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 +2582,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 +2593,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 +2603,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 +2611,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 +2620,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\`.`
+        });
       }
-    ),
-    templates: z.z.array(Template).min(1).optional().superRefine((val, ctx) => {
+    }).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, "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 +2687,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 +2702,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 +2711,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 +2729,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

@@ -2,42 +2,26 @@ import * as yup from "yup";
 import UrlPattern from "url-pattern";
 import z$1, { z, ZodError } from "zod";
 function addNamespaceToSchema(maybeNode, namespace = []) {
-  if (typeof maybeNode === "string") {
+  if (typeof maybeNode !== "object" || maybeNode === null) {
     return maybeNode;
   }
-  if (typeof maybeNode === "boolean") {
-    return maybeNode;
-  }
-  if (typeof maybeNode === "function") {
-    return maybeNode;
-  }
-  const newNode = { ...maybeNode };
-  const keys = Object.keys(maybeNode);
-  Object.values(maybeNode).map((m, index) => {
-    const key = keys[index];
-    if (Array.isArray(m)) {
-      newNode[key] = m.map((element) => {
-        if (!element) {
-          return;
-        }
-        if (!element.hasOwnProperty("name")) {
-          return element;
+  const newNode = { ...maybeNode, namespace: [...namespace] };
+  Object.entries(maybeNode).forEach(([key, value]) => {
+    if (Array.isArray(value)) {
+      newNode[key] = value.map((element) => {
+        if (element && typeof element === "object" && "name" in element) {
+          const valueName = element.name || element.value;
+          return addNamespaceToSchema(element, [...namespace, valueName]);
         }
-        const value = element.name || element.value;
-        return addNamespaceToSchema(element, [...namespace, value]);
+        return element;
       });
+    } else if (value && typeof value === "object" && "name" in value) {
+      newNode[key] = addNamespaceToSchema(value, [...namespace, value.name]);
     } else {
-      if (!m) {
-        return;
-      }
-      if (!m.hasOwnProperty("name")) {
-        newNode[key] = m;
-      } else {
-        newNode[key] = addNamespaceToSchema(m, [...namespace, m.name]);
-      }
+      newNode[key] = value;
     }
   });
-  return { ...newNode, namespace };
+  return newNode;
 }
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -1943,7 +1927,7 @@ class TinaSchema {
         }
       }
     };
-    this.walkFields = (cb) => {
+    this.legacyWalkFields = (cb) => {
       const walk = (collectionOrObject, collection, path) => {
         if (collectionOrObject.templates) {
           collectionOrObject.templates.forEach((template) => {
@@ -1965,7 +1949,7 @@ class TinaSchema {
       collections.forEach((collection) => walk(collection, collection, []));
     };
     this.schema = config;
-    this.walkFields(({ field, collection, path }) => {
+    this.legacyWalkFields(({ field, collection }) => {
       if (!("searchable" in field)) {
         if (field.type === "image") {
           field.searchable = false;
@@ -1986,20 +1970,67 @@ class TinaSchema {
       field.uid = field.uid || false;
     });
   }
-  findReferences(name2) {
+  findReferencesFromCollection(name2) {
     const result = {};
     this.walkFields(({ field, collection: c, path }) => {
+      if (c.name !== name2) {
+        return;
+      }
       if (field.type === "reference") {
-        if (field.collections.includes(name2)) {
-          if (result[c.name] === void 0) {
-            result[c.name] = [];
+        field.collections.forEach((name22) => {
+          if (result[name22] === void 0) {
+            result[name22] = [];
           }
-          result[c.name].push({ path, field });
-        }
+          result[name22].push(path);
+        });
       }
     });
     return result;
   }
+  /**
+   * Walk all fields in tina schema
+   *
+   * @param cb callback function invoked for each field
+   */
+  walkFields(cb) {
+    const walk = (collectionOrObject, collection, path = "$") => {
+      if (collectionOrObject.templates) {
+        collectionOrObject.templates.forEach((template) => {
+          const templatePath = `${path}.${template.name}`;
+          template.fields.forEach((field) => {
+            const fieldPath = field.list ? `${templatePath}[*].${field.name}` : `${templatePath}.${field.name}`;
+            cb({ field, collection, path: fieldPath });
+            if (field.type === "object") {
+              walk(field, collection, fieldPath);
+            }
+          });
+        });
+      }
+      if (collectionOrObject.fields) {
+        collectionOrObject.fields.forEach((field) => {
+          const fieldPath = field.list ? `${path}.${field.name}[*]` : `${path}.${field.name}`;
+          cb({ field, collection, path: fieldPath });
+          if (field.type === "object" && field.fields) {
+            walk(field, collection, fieldPath);
+          } else if (field.templates) {
+            field.templates.forEach((template) => {
+              const templatePath = `${fieldPath}.${template.name}`;
+              template.fields.forEach((field2) => {
+                const fieldPath2 = field2.list ? `${templatePath}[*].${field2.name}` : `${templatePath}.${field2.name}`;
+                cb({ field: field2, collection, path: fieldPath2 });
+                if (field2.type === "object") {
+                  walk(field2, collection, fieldPath2);
+                }
+              });
+            });
+          }
+        });
+      }
+    };
+    this.getCollections().forEach((collection) => {
+      walk(collection, collection);
+    });
+  }
   /**
    * This function returns an array of glob matches for a given collection.
    *
@@ -2222,9 +2253,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 +2293,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 +2306,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 +2396,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 +2406,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 +2435,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 +2455,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 +2475,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.uid) {
+      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 && 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 +2564,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 +2575,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 +2585,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 +2593,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 +2602,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\`.`
+      });
     }
-  ),
-  templates: z.array(Template).min(1).optional().superRefine((val, ctx) => {
+  }).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, "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 +2669,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 +2684,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 +2693,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 +2711,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/schema/TinaSchema.d.ts

@@ -28,10 +28,7 @@ export declare class TinaSchema {
     } & Schema);
     getIsTitleFieldName: (collection: string) => string;
     getCollectionsByName: (collectionNames: string[]) => Collection<true>[];
-    findReferences(name: string): Record<string, {
-        path: string[];
-        field: TinaField;
-    }[]>;
+    findReferencesFromCollection(name: string): Record<string, string[]>;
     getCollection: (collectionName: string) => Collection<true>;
     getCollections: () => Collection<true>[];
     getCollectionByFullPath: (filepath: string) => Collection<true>;
@@ -63,7 +60,26 @@ export declare class TinaSchema {
      *
      */
     getTemplatesForCollectable: (collection: Collectable) => CollectionTemplateable;
-    walkFields: (cb: (args: {
+    /**
+     * Walk all fields in tina schema
+     *
+     * @param cb callback function invoked for each field
+     */
+    walkFields(cb: (args: {
+        field: any;
+        collection: any;
+        path: string;
+        isListItem?: boolean;
+    }) => void): void;
+    /**
+     * Walk all fields in Tina Schema
+     *
+     * This is a legacy version to preserve backwards compatibility for the tina generated schema. It does not
+     * traverse fields in object lists in rich-text templates.
+     *
+     * @param cb callback function invoked for each field
+     */
+    legacyWalkFields: (cb: (args: {
         field: TinaField;
         collection: Collection;
         path: string[];

package/dist/schema/addNamespaceToSchema.d.ts

@@ -1,4 +1,8 @@
-/**
-
-*/
-export declare function addNamespaceToSchema<T extends object | string>(maybeNode: T, namespace?: string[]): T;
+type Node = {
+    name?: string;
+    value?: string;
+    namespace?: string[];
+    [key: string]: any;
+};
+export declare function addNamespaceToSchema<T extends Node | string>(maybeNode: T, namespace?: string[]): T;
+export {};

package/dist/types/index.d.ts

@@ -198,8 +198,14 @@ export type RichTextField<WithNamespace extends boolean = false> = (FieldGeneric
      * will be stored as frontmatter
      */
     isBody?: boolean;
+    /**@deprecated use overrides.toolbar */
     toolbarOverride?: ToolbarOverrideType[];
     templates?: RichTextTemplate<WithNamespace>[];
+    overrides?: {
+        toolbar?: ToolbarOverrideType[];
+        /**Default set to true */
+        showFloatingToolbar?: boolean;
+    };
     /**
      * By default, Tina parses markdown with MDX, this is a more strict parser
      * that allows you to use structured content inside markdown (via `templates`).
@@ -394,7 +400,7 @@ export interface Config<CMSCallback = undefined, FormifyCallback = undefined, Do
     token?: string | null;
     ui?: {
         /**
-         * When using Tina Cloud's branching feature, provide the URL for your given branch
+         * When using TinaCloud's branching feature, provide the URL for your given branch
          *
          * Eg. If you're deplying to Vercel, and your repo name is 'my-app',
          * Vercel's preview URL would be based on the branch:
@@ -521,7 +527,7 @@ export interface Config<CMSCallback = undefined, FormifyCallback = undefined, Do
     } | {
         searchClient?: never;
         /**
-         * Use the Tina Cloud search index
+         * Use the TinaCloud search index
          */
         tina: {
             /**
@@ -548,7 +554,7 @@ export interface Config<CMSCallback = undefined, FormifyCallback = undefined, Do
         maxSearchIndexFieldLength?: number;
     };
     /**
-     * Used to override the default Tina Cloud API URL
+     * Used to override the default TinaCloud API URL
      *
      * [mostly for internal use only]
      */

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": "0.0.0-f90ef4d-20241119072342",
+  "version": "0.0.0-fd664d8-20250407054012",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -25,14 +25,14 @@
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "@types/micromatch": "^4.0.9",
-    "@types/react": "^18.3.12",
+    "@types/react": "^18.3.18",
     "@types/yup": "^0.29.14",
     "jest": "^29.7.0",
     "react": "^18.3.1",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.3",
     "yup": "^0.32.11",
-    "@tinacms/scripts": "0.0.0-f90ef4d-20241119072342"
+    "@tinacms/scripts": "0.0.0-fd664d8-20250407054012"
   },
   "peerDependencies": {
     "react": ">=16.14.0",
@@ -48,7 +48,7 @@
   "dependencies": {
     "picomatch-browser": "2.2.6",
     "url-pattern": "^1.0.3",
-    "zod": "^3.23.8"
+    "zod": "^3.24.2"
   },
   "scripts": {
     "build": "tinacms-scripts build",