@tinacms/schema-tools 0.1.1 → 0.1.2

package/dist/index.es.js

@@ -105,12 +105,14 @@ const NAMER = {
     return generateNamespacedFieldName(namespace, "ConnectionEdges");
   }
 };
-function hasDuplicates(array) {
-  if (!array) {
-    return false;
-  } else {
-    return new Set(array).size !== array.length;
-  }
+function findDuplicates(array = []) {
+  const duplicates = [
+    ...new Set(array.filter((item, index) => array.indexOf(item) !== index))
+  ].map((x) => `"${x}"`);
+  if (duplicates.length) {
+    return duplicates.join(", ");
+  } else
+    return void 0;
 }
 class TinaSchema {
   constructor(config) {
@@ -457,7 +459,7 @@ const nameProp = z.string({
 }).superRefine((val, ctx) => {
   if (val.includes(" "))
     ctx.addIssue({
-      message: "name cannot contain spaces",
+      message: `name "${val}" cannot contain spaces`,
       code: z.ZodIssueCode.custom,
       fatal: true
     });
@@ -527,22 +529,37 @@ const TinaFieldZod = z.lazy(() => {
       start: z.string(),
       end: z.string()
     }).optional()
-  }).refine((val) => {
-    var _a;
-    return !hasDuplicates((_a = val.fields) == null ? void 0 : _a.map((x) => x.name));
-  }, {
-    message: "Fields must have a unique name"
+  }).superRefine((val, ctx) => {
+    const dups = findDuplicates(val == null ? void 0 : val.fields.map((x) => x.name));
+    if (dups) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: `Fields must have a unique name, duplicate field names: ${dups}`
+      });
+    }
   });
   const ObjectField = FieldWithList.extend({
     type: z.literal("object", {
       invalid_type_error: typeTypeError,
       required_error: typeRequiredError
     }),
-    fields: z.array(TinaFieldZod).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
-      message: "Fields must have a unique name"
+    fields: z.array(TinaFieldZod).min(1).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}`
+        });
+      }
     }),
-    templates: z.array(TemplateTemp).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
-      message: "Templates must have a unique name"
+    templates: z.array(TemplateTemp).min(1).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}`
+        });
+      }
     })
   });
   const RichTextField = FieldWithList.extend({
@@ -550,8 +567,14 @@ const TinaFieldZod = z.lazy(() => {
       invalid_type_error: typeTypeError,
       required_error: typeRequiredError
     }),
-    templates: z.array(TemplateTemp).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
-      message: "Templates must have a unique name"
+    templates: z.array(TemplateTemp).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}`
+        });
+      }
     })
   });
   return z.discriminatedUnion("type", [
@@ -581,13 +604,17 @@ const TinaFieldZod = z.lazy(() => {
         if (val.list) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: "You can not have `list: true` when using `isTitle`"
+            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: "You must have { required: true } when using `isTitle`"
+            message: `Must have { required: true } when using \`isTitle\` Error in value 
+${JSON.stringify(val, null, 2)}
+`
           });
         }
       }
@@ -638,11 +665,15 @@ const Template = z.object({
   }),
   name,
   fields: z.array(TinaFieldZod)
-}).refine((val) => {
+}).superRefine((val, ctx) => {
   var _a;
-  return !hasDuplicates((_a = val.fields) == null ? void 0 : _a.map((x) => x.name));
-}, {
-  message: "Fields must have a unique name"
+  const dups = findDuplicates((_a = val.fields) == null ? void 0 : _a.map((x) => x.name));
+  if (dups) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: `Fields must have a unique name, duplicate field names: ${dups}`
+    });
+  }
 });
 const TinaCloudCollectionBase = z.object({
   label: z.string().optional(),
@@ -650,16 +681,28 @@ const TinaCloudCollectionBase = z.object({
   format: z.enum(FORMATS).optional()
 });
 const TinaCloudCollection = TinaCloudCollectionBase.extend({
-  fields: z.array(TinaFieldZod).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
-    message: "Fields must have a unique name"
+  fields: z.array(TinaFieldZod).min(1).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}`
+      });
+    }
   }).refine((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`"
   }),
-  templates: z.array(Template).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
-    message: "Templates must have a unique name"
+  templates: z.array(Template).min(1).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}`
+      });
+    }
   })
 }).refine((val) => {
   let isValid = Boolean(val == null ? void 0 : val.templates) || Boolean(val == null ? void 0 : val.fields);
@@ -674,20 +717,21 @@ const TinaCloudSchemaZod = z.object({
   collections: z.array(TinaCloudCollection),
   config: tinaConfigZod.optional()
 }).superRefine((val, ctx) => {
-  var _a, _b;
-  if (hasDuplicates(val.collections.map((x) => x.name))) {
+  var _a, _b, _c;
+  const dups = findDuplicates((_a = val.collections) == null ? void 0 : _a.map((x) => x.name));
+  if (dups) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
-      message: "can not have two collections with the same name",
+      message: `${dups} are duplicate names in your collections. Collection names must be unique.`,
       fatal: true
     });
   }
-  (_a = val == null ? void 0 : val.collections) == null ? void 0 : _a.map((x) => {
+  (_b = val == null ? void 0 : val.collections) == null ? void 0 : _b.map((x) => {
     if (!x.format) {
       console.warn(`No format provided for collection ${x.name}, defaulting to .md`);
     }
   });
-  const media = (_b = val == null ? void 0 : val.config) == null ? void 0 : _b.media;
+  const media = (_c = val == null ? void 0 : val.config) == null ? void 0 : _c.media;
   if (media && media.tina && media.loadCustomStore) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,

package/dist/index.js

@@ -132,12 +132,14 @@
       return generateNamespacedFieldName(namespace, "ConnectionEdges");
     }
   };
-  function hasDuplicates(array) {
-    if (!array) {
-      return false;
-    } else {
-      return new Set(array).size !== array.length;
-    }
+  function findDuplicates(array = []) {
+    const duplicates = [
+      ...new Set(array.filter((item, index) => array.indexOf(item) !== index))
+    ].map((x) => `"${x}"`);
+    if (duplicates.length) {
+      return duplicates.join(", ");
+    } else
+      return void 0;
   }
   class TinaSchema {
     constructor(config) {
@@ -484,7 +486,7 @@
   }).superRefine((val, ctx) => {
     if (val.includes(" "))
       ctx.addIssue({
-        message: "name cannot contain spaces",
+        message: `name "${val}" cannot contain spaces`,
         code: z.z.ZodIssueCode.custom,
         fatal: true
       });
@@ -554,22 +556,37 @@
         start: z.z.string(),
         end: z.z.string()
       }).optional()
-    }).refine((val) => {
-      var _a;
-      return !hasDuplicates((_a = val.fields) == null ? void 0 : _a.map((x) => x.name));
-    }, {
-      message: "Fields must have a unique name"
+    }).superRefine((val, ctx) => {
+      const dups = findDuplicates(val == null ? void 0 : val.fields.map((x) => x.name));
+      if (dups) {
+        ctx.addIssue({
+          code: z.z.ZodIssueCode.custom,
+          message: `Fields must have a unique name, duplicate field names: ${dups}`
+        });
+      }
     });
     const ObjectField = FieldWithList.extend({
       type: z.z.literal("object", {
         invalid_type_error: typeTypeError,
         required_error: typeRequiredError
       }),
-      fields: z.z.array(TinaFieldZod).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
-        message: "Fields must have a unique name"
+      fields: z.z.array(TinaFieldZod).min(1).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}`
+          });
+        }
       }),
-      templates: z.z.array(TemplateTemp).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
-        message: "Templates must have a unique name"
+      templates: z.z.array(TemplateTemp).min(1).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}`
+          });
+        }
       })
     });
     const RichTextField = FieldWithList.extend({
@@ -577,8 +594,14 @@
         invalid_type_error: typeTypeError,
         required_error: typeRequiredError
       }),
-      templates: z.z.array(TemplateTemp).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
-        message: "Templates must have a unique name"
+      templates: z.z.array(TemplateTemp).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}`
+          });
+        }
       })
     });
     return z.z.discriminatedUnion("type", [
@@ -608,13 +631,17 @@
           if (val.list) {
             ctx.addIssue({
               code: z.z.ZodIssueCode.custom,
-              message: "You can not have `list: true` when using `isTitle`"
+              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: "You must have { required: true } when using `isTitle`"
+              message: `Must have { required: true } when using \`isTitle\` Error in value 
+${JSON.stringify(val, null, 2)}
+`
             });
           }
         }
@@ -665,11 +692,15 @@
     }),
     name,
     fields: z.z.array(TinaFieldZod)
-  }).refine((val) => {
+  }).superRefine((val, ctx) => {
     var _a;
-    return !hasDuplicates((_a = val.fields) == null ? void 0 : _a.map((x) => x.name));
-  }, {
-    message: "Fields must have a unique name"
+    const dups = findDuplicates((_a = val.fields) == null ? void 0 : _a.map((x) => x.name));
+    if (dups) {
+      ctx.addIssue({
+        code: z.z.ZodIssueCode.custom,
+        message: `Fields must have a unique name, duplicate field names: ${dups}`
+      });
+    }
   });
   const TinaCloudCollectionBase = z.z.object({
     label: z.z.string().optional(),
@@ -677,16 +708,28 @@
     format: z.z.enum(FORMATS).optional()
   });
   const TinaCloudCollection = TinaCloudCollectionBase.extend({
-    fields: z.z.array(TinaFieldZod).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
-      message: "Fields must have a unique name"
+    fields: z.z.array(TinaFieldZod).min(1).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}`
+        });
+      }
     }).refine((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`"
     }),
-    templates: z.z.array(Template).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
-      message: "Templates must have a unique name"
+    templates: z.z.array(Template).min(1).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}`
+        });
+      }
     })
   }).refine((val) => {
     let isValid = Boolean(val == null ? void 0 : val.templates) || Boolean(val == null ? void 0 : val.fields);
@@ -701,20 +744,21 @@
     collections: z.z.array(TinaCloudCollection),
     config: tinaConfigZod.optional()
   }).superRefine((val, ctx) => {
-    var _a, _b;
-    if (hasDuplicates(val.collections.map((x) => x.name))) {
+    var _a, _b, _c;
+    const dups = findDuplicates((_a = val.collections) == null ? void 0 : _a.map((x) => x.name));
+    if (dups) {
       ctx.addIssue({
         code: z.z.ZodIssueCode.custom,
-        message: "can not have two collections with the same name",
+        message: `${dups} are duplicate names in your collections. Collection names must be unique.`,
         fatal: true
       });
     }
-    (_a = val == null ? void 0 : val.collections) == null ? void 0 : _a.map((x) => {
+    (_b = val == null ? void 0 : val.collections) == null ? void 0 : _b.map((x) => {
       if (!x.format) {
         console.warn(`No format provided for collection ${x.name}, defaulting to .md`);
       }
     });
-    const media = (_b = val == null ? void 0 : val.config) == null ? void 0 : _b.media;
+    const media = (_c = val == null ? void 0 : val.config) == null ? void 0 : _c.media;
     if (media && media.tina && media.loadCustomStore) {
       ctx.addIssue({
         code: z.z.ZodIssueCode.custom,

package/dist/util/hasDuplicates.d.ts

@@ -10,4 +10,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-export declare function hasDuplicates<T = any>(array: T[]): boolean;
+export declare function hasDuplicates<T = any>(array?: T[]): boolean;
+/**
+ *
+ * @param array
+ * @returns False if the array is undefined or has no duplicates.
+ */
+export declare function findDuplicates<T = any>(array?: T[] | undefined): undefined | string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/schema-tools",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {