@tinacms/schema-tools 0.1.0 → 0.1.3

package/dist/index.d.ts

@@ -13,3 +13,4 @@ limitations under the License.
 export * from './schema';
 export * from './types';
 export * from './validate';
+export * from './util/namer';

package/dist/index.es.js

@@ -7,6 +7,9 @@ function addNamespaceToSchema(maybeNode, namespace = []) {
   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) => {
@@ -102,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) {
@@ -160,7 +165,7 @@ class TinaSchema {
     };
     this.getCollectionByFullPath = (filepath) => {
       const collection = this.getCollections().find((collection2) => {
-        return filepath.replace("\\", "/").startsWith(collection2.path);
+        return filepath.replace(/\\/g, "/").startsWith(collection2.path.replace(/\/?$/, "/"));
       });
       if (!collection) {
         throw new Error(`Unable to find collection for file at ${filepath}`);
@@ -169,12 +174,7 @@ class TinaSchema {
     };
     this.getCollectionAndTemplateByFullPath = (filepath, templateName) => {
       let template;
-      const collection = this.getCollections().find((collection2) => {
-        return filepath.replace("\\", "/").startsWith(collection2.path);
-      });
-      if (!collection) {
-        throw new Error(`Unable to find collection for file at ${filepath}`);
-      }
+      const collection = this.getCollectionByFullPath(filepath);
       const templates = this.getTemplatesForCollectable(collection);
       if (templates.type === "union") {
         if (templateName) {
@@ -211,6 +211,72 @@ class TinaSchema {
           return template;
       }
     };
+    this.transformPayload = (collectionName, payload) => {
+      const collection = this.getCollection(collectionName);
+      if (collection.templates) {
+        const template = collection.templates.find((template2) => {
+          if (typeof template2 === "string") {
+            throw new Error("Global templates not supported");
+          }
+          return payload["_template"] === template2.name;
+        });
+        if (!template) {
+          console.error(payload);
+          throw new Error(`Unable to find template for payload`);
+        }
+        if (typeof template === "string") {
+          throw new Error("Global templates not supported");
+        }
+        return {
+          [collectionName]: {
+            [template.name]: this.transformCollectablePayload(payload, template)
+          }
+        };
+      } else {
+        return {
+          [collectionName]: this.transformCollectablePayload(payload, collection)
+        };
+      }
+    };
+    this.transformCollectablePayload = (payload, collection) => {
+      const accumulator = {};
+      Object.entries(payload).forEach(([key, value]) => {
+        if (typeof collection.fields === "string") {
+          throw new Error("Global templates not supported");
+        }
+        const field = collection.fields.find((field2) => {
+          if (typeof field2 === "string") {
+            throw new Error("Global templates not supported");
+          }
+          return field2.name === key;
+        });
+        if (field) {
+          accumulator[key] = this.transformField(field, value);
+        }
+      });
+      return accumulator;
+    };
+    this.transformField = (field, value) => {
+      if (field.type === "object")
+        if (field.templates) {
+          if (field.list) {
+            assertShape(value, (yup2) => yup2.array(yup2.object({ _template: yup2.string().required() })));
+            return value.map((item) => {
+              const { _template, ...rest } = item;
+              return { [_template]: rest };
+            });
+          } else {
+            assertShape(value, (yup2) => yup2.object({ _template: yup2.string().required() }));
+            const { _template, ...rest } = value;
+            return { [_template]: rest };
+          }
+        } else {
+          return value;
+        }
+      else {
+        return value;
+      }
+    };
     this.isMarkdownCollection = (collectionName) => {
       const collection = this.getCollection(collectionName);
       const format = collection.format;
@@ -261,9 +327,9 @@ class TinaSchema {
     this.schema = config;
   }
 }
-const resolveField = ({ namespace, ...field }, schema) => {
+const resolveField = (field, schema) => {
   var _a;
-  field.parentTypename = NAMER.dataTypeName(namespace.filter((_, i) => i < namespace.length - 1));
+  field.parentTypename = NAMER.dataTypeName(field.namespace.filter((_, i) => i < field.namespace.length - 1));
   const extraFields = field.ui || {};
   switch (field.type) {
     case "number":
@@ -324,10 +390,7 @@ const resolveField = ({ namespace, ...field }, schema) => {
         ...extraFields
       };
     case "object":
-      const templateInfo = schema.getTemplatesForCollectable({
-        ...field,
-        namespace
-      });
+      const templateInfo = schema.getTemplatesForCollectable(field);
       if (templateInfo.type === "object") {
         return {
           ...field,
@@ -345,6 +408,7 @@ const resolveField = ({ namespace, ...field }, schema) => {
           templates2[lastItem(template.namespace)] = {
             label: template.label || templateName,
             key: templateName,
+            namespace: [...field.namespace, templateName],
             fields: template.fields.map((field2) => resolveField(field2, schema)),
             ...extraFields2
           };
@@ -353,6 +417,7 @@ const resolveField = ({ namespace, ...field }, schema) => {
         return {
           ...field,
           typeMap: typeMap2,
+          namespace: field.namespace,
           component: field.list ? "blocks" : "not-implemented",
           templates: templates2,
           ...extraFields
@@ -438,7 +503,9 @@ const parseZodError = ({ zodError }) => {
 const name = z.string({
   required_error: "Name is required but not provided",
   invalid_type_error: "Name must be a string"
-});
+}).refine((val) => val.match(/^[a-zA-Z0-9_]*$/) !== null, (val) => ({
+  message: `name, "${val}" must be alphanumeric and can only contain underscores`
+}));
 const TypeName = [
   "string",
   "boolean",
@@ -457,7 +524,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 +594,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 +632,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 +669,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 +730,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 +746,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 +782,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,
@@ -717,4 +826,4 @@ const validateSchema = ({
     }
   }
 };
-export { TinaSchema, TinaSchemaValidationError, addNamespaceToSchema, resolveField, resolveForm, validateSchema, validateTinaCloudSchemaConfig };
+export { NAMER, TinaSchema, TinaSchemaValidationError, addNamespaceToSchema, resolveField, resolveForm, validateSchema, validateTinaCloudSchemaConfig };

package/dist/index.js

@@ -34,6 +34,9 @@
     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) => {
@@ -129,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) {
@@ -187,7 +192,7 @@
       };
       this.getCollectionByFullPath = (filepath) => {
         const collection = this.getCollections().find((collection2) => {
-          return filepath.replace("\\", "/").startsWith(collection2.path);
+          return filepath.replace(/\\/g, "/").startsWith(collection2.path.replace(/\/?$/, "/"));
         });
         if (!collection) {
           throw new Error(`Unable to find collection for file at ${filepath}`);
@@ -196,12 +201,7 @@
       };
       this.getCollectionAndTemplateByFullPath = (filepath, templateName) => {
         let template;
-        const collection = this.getCollections().find((collection2) => {
-          return filepath.replace("\\", "/").startsWith(collection2.path);
-        });
-        if (!collection) {
-          throw new Error(`Unable to find collection for file at ${filepath}`);
-        }
+        const collection = this.getCollectionByFullPath(filepath);
         const templates = this.getTemplatesForCollectable(collection);
         if (templates.type === "union") {
           if (templateName) {
@@ -238,6 +238,72 @@
             return template;
         }
       };
+      this.transformPayload = (collectionName, payload) => {
+        const collection = this.getCollection(collectionName);
+        if (collection.templates) {
+          const template = collection.templates.find((template2) => {
+            if (typeof template2 === "string") {
+              throw new Error("Global templates not supported");
+            }
+            return payload["_template"] === template2.name;
+          });
+          if (!template) {
+            console.error(payload);
+            throw new Error(`Unable to find template for payload`);
+          }
+          if (typeof template === "string") {
+            throw new Error("Global templates not supported");
+          }
+          return {
+            [collectionName]: {
+              [template.name]: this.transformCollectablePayload(payload, template)
+            }
+          };
+        } else {
+          return {
+            [collectionName]: this.transformCollectablePayload(payload, collection)
+          };
+        }
+      };
+      this.transformCollectablePayload = (payload, collection) => {
+        const accumulator = {};
+        Object.entries(payload).forEach(([key, value]) => {
+          if (typeof collection.fields === "string") {
+            throw new Error("Global templates not supported");
+          }
+          const field = collection.fields.find((field2) => {
+            if (typeof field2 === "string") {
+              throw new Error("Global templates not supported");
+            }
+            return field2.name === key;
+          });
+          if (field) {
+            accumulator[key] = this.transformField(field, value);
+          }
+        });
+        return accumulator;
+      };
+      this.transformField = (field, value) => {
+        if (field.type === "object")
+          if (field.templates) {
+            if (field.list) {
+              assertShape(value, (yup2) => yup2.array(yup2.object({ _template: yup2.string().required() })));
+              return value.map((item) => {
+                const { _template, ...rest } = item;
+                return { [_template]: rest };
+              });
+            } else {
+              assertShape(value, (yup2) => yup2.object({ _template: yup2.string().required() }));
+              const { _template, ...rest } = value;
+              return { [_template]: rest };
+            }
+          } else {
+            return value;
+          }
+        else {
+          return value;
+        }
+      };
       this.isMarkdownCollection = (collectionName) => {
         const collection = this.getCollection(collectionName);
         const format = collection.format;
@@ -288,9 +354,9 @@
       this.schema = config;
     }
   }
-  const resolveField = ({ namespace, ...field }, schema) => {
+  const resolveField = (field, schema) => {
     var _a;
-    field.parentTypename = NAMER.dataTypeName(namespace.filter((_, i) => i < namespace.length - 1));
+    field.parentTypename = NAMER.dataTypeName(field.namespace.filter((_, i) => i < field.namespace.length - 1));
     const extraFields = field.ui || {};
     switch (field.type) {
       case "number":
@@ -351,10 +417,7 @@
           ...extraFields
         };
       case "object":
-        const templateInfo = schema.getTemplatesForCollectable({
-          ...field,
-          namespace
-        });
+        const templateInfo = schema.getTemplatesForCollectable(field);
         if (templateInfo.type === "object") {
           return {
             ...field,
@@ -372,6 +435,7 @@
             templates2[lastItem(template.namespace)] = {
               label: template.label || templateName,
               key: templateName,
+              namespace: [...field.namespace, templateName],
               fields: template.fields.map((field2) => resolveField(field2, schema)),
               ...extraFields2
             };
@@ -380,6 +444,7 @@
           return {
             ...field,
             typeMap: typeMap2,
+            namespace: field.namespace,
             component: field.list ? "blocks" : "not-implemented",
             templates: templates2,
             ...extraFields
@@ -465,7 +530,9 @@
   const name = z.z.string({
     required_error: "Name is required but not provided",
     invalid_type_error: "Name must be a string"
-  });
+  }).refine((val) => val.match(/^[a-zA-Z0-9_]*$/) !== null, (val) => ({
+    message: `name, "${val}" must be alphanumeric and can only contain underscores`
+  }));
   const TypeName = [
     "string",
     "boolean",
@@ -484,7 +551,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 +621,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 +659,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 +696,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 +757,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 +773,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 +809,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,
@@ -744,6 +853,7 @@
       }
     }
   };
+  exports2.NAMER = NAMER;
   exports2.TinaSchema = TinaSchema;
   exports2.TinaSchemaValidationError = TinaSchemaValidationError;
   exports2.addNamespaceToSchema = addNamespaceToSchema;

package/dist/schema/TinaSchema.d.ts

@@ -64,6 +64,13 @@ export declare class TinaSchema {
         data?: unknown;
         collection: Collectable;
     }) => Templateable;
+    transformPayload: (collectionName: string, payload: object) => {
+        [x: string]: {
+            [x: string]: {};
+        };
+    };
+    private transformCollectablePayload;
+    private transformField;
     isMarkdownCollection: (collectionName: string) => boolean;
     /**
      * Gets the template or templates from the item.

package/dist/schema/resolveField.d.ts

@@ -21,4 +21,9 @@ import { TinaSchema } from './TinaSchema';
  * @param  {TinaSchema} schema the entireT Tina Schema
  * @returns unknown
  */
-export declare const resolveField: ({ namespace, ...field }: TinaFieldEnriched, schema: TinaSchema) => unknown;
+export declare const resolveField: (field: TinaFieldEnriched, schema: TinaSchema) => {
+    [key: string]: unknown;
+    name: string;
+    component: string;
+    type: string;
+};

package/dist/schema/resolveForm.d.ts

@@ -18,5 +18,10 @@ export declare const resolveForm: ({ collection, basename, template, schema, }:
     id: string;
     label: string;
     name: string;
-    fields: unknown[];
+    fields: {
+        [key: string]: unknown;
+        name: string;
+        component: string;
+        type: string;
+    }[];
 };

package/dist/types/SchemaTypes.d.ts

@@ -44,11 +44,46 @@ export declare type TinaCloudCollection<WithNamespace extends boolean> = Collect
 export declare type TinaCloudCollectionBase = TinaCloudCollection<false>;
 export declare type TinaCloudCollectionEnriched = TinaCloudCollection<true>;
 declare type FormatType = 'json' | 'md' | 'markdown' | 'mdx';
+declare type Document = {
+    _sys: {
+        title?: string;
+        template: string;
+        breadcrumbs: string[];
+        path: string;
+        basename: string;
+        relativePath: string;
+        filename: string;
+        extension: string;
+    };
+};
 interface BaseCollection {
     label?: string;
     name: string;
     path: string;
     format?: FormatType;
+    ui?: {
+        /**
+         * Forms for this collection will be editable from the global sidebar rather than the form panel
+         */
+        global?: boolean | {
+            icon?: any;
+            layout: 'fullscreen' | 'popup';
+        };
+        /**
+         * Provide the path that your document is viewable on your site
+         *
+         * eg:
+         * ```ts
+         * router: ({ document }) => {
+         *   return `blog-posts/${document._sys.filename}`;
+         * }
+         * ```
+         */
+        router?: (args: {
+            document: Document;
+            collection: TinaCloudCollection<true>;
+        }) => string | undefined;
+    };
     match?: string;
 }
 declare type CollectionTemplates<WithNamespace extends boolean> = WithNamespace extends true ? CollectionTemplatesWithNamespace<WithNamespace> : CollectionTemplatesInner<WithNamespace>;

package/dist/types/SchemaTypes2.d.ts

@@ -0,0 +1,101 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+import { TinaCloudSchema } from './SchemaTypes';
+/**
+ * Used with `defineStaticConfig`
+ *
+ * These are mostly similar types as whats in `schemaTypes`
+ * but since those have gone through several iterations
+ * they're pretty messy. These should act as the happy path
+ * for iframe/standalone setups which we hope to eventually
+ * make the default/only path for all Tina users.
+ */
+export declare type TinaCMSConfig<CMSCallback = undefined, FormifyCallback = undefined, DocumentCreatorCallback = undefined, Store = undefined> = {
+    schema: TinaCloudSchema<false>;
+    /**
+     * The base branch to pull content from. Note that this is ignored for local development
+     */
+    branch: string | null;
+    /**
+     * Your clientId from  app.tina.io
+     */
+    clientId: string | null;
+    /**
+     * Your read only token from app.tina.io
+     */
+    token: string | null;
+    /**
+     * Configurations for the autogenerated GraphQL HTTP client
+     */
+    client?: {
+        /**
+         * Autogenerated queries will traverse references to a given depth
+         * @default 2
+         */
+        referenceDepth?: number;
+    };
+    build?: {
+        /**
+         * The folder where your application stores assets, eg. `"public"`
+         */
+        publicFolder: string;
+        /**
+         * TinaCMS is shipped as a single-page app, the value specified here will
+         * determine the path when visiting the TinaCMS dashboard.
+         *
+         * Eg. `"admin"` will be viewable at `[your-development-url]/admin/index.html`
+         */
+        outputFolder: string;
+    };
+    media?: {
+        /**
+         * Load a media store like Cloudinary
+         *
+         * ```ts
+         * loadCustomStore = async () => {
+         *   const pack = await import("next-tinacms-cloudinary");
+         *   return pack.TinaCloudCloudinaryMediaStore;
+         * }
+         * ```
+         */
+        loadCustomStore: () => Promise<Store>;
+        tina?: never;
+    } | {
+        /**
+         * Use Git-backed assets for media, these values will
+         * [Learn more](https://tina.io/docs/reference/media/repo-based/)
+         */
+        tina: {
+            /**
+             * The folder where your application stores assets, eg. `"public"`
+             */
+            publicFolder: string;
+            /**
+             * The root folder for media managed by Tina. For example, `"uploads"`
+             * would store content in `"<my-public-folder>/uploads"`
+             */
+            mediaRoot: string;
+        };
+        loadCustomStore?: never;
+    };
+    tinaioConfig?: {
+        assetsApiUrlOverride?: string;
+        frontendUrlOverride?: string;
+        identityApiUrlOverride?: string;
+        contentApiUrlOverride?: string;
+    };
+    cmsCallback?: CMSCallback;
+    formifyCallback?: FormifyCallback;
+    documentCreatorCallback?: DocumentCreatorCallback;
+};
+export {};

package/dist/types/index.d.ts

@@ -16,3 +16,4 @@ limitations under the License.
 
 */
 export * from './SchemaTypes';
+export * from './SchemaTypes2';

package/dist/types/schema2.d.ts

@@ -0,0 +1,13 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 {};

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/dist/validate/properties.d.ts

@@ -11,4 +11,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import { z } from 'zod';
-export declare const name: z.ZodString;
+export declare const name: z.ZodEffects<z.ZodString, string, string>;

package/dist/validate/schema.d.ts

@@ -14,13 +14,13 @@ import { z } from 'zod';
 export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
     collections: z.ZodArray<z.ZodEffects<z.ZodObject<z.extendShape<{
         label: z.ZodOptional<z.ZodString>;
-        name: z.ZodString;
+        name: z.ZodEffects<z.ZodString, string, string>;
         format: z.ZodOptional<z.ZodEnum<["json", "md", "markdown", "mdx"]>>;
     }, {
         fields: z.ZodEffects<z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodType<import("..").TinaFieldInner<false>, z.ZodTypeDef, import("..").TinaFieldInner<false>>, "many">>, import("..").TinaFieldInner<false>[], import("..").TinaFieldInner<false>[]>, import("..").TinaFieldInner<false>[], import("..").TinaFieldInner<false>[]>;
         templates: z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodEffects<z.ZodObject<{
             label: z.ZodString;
-            name: z.ZodString;
+            name: z.ZodEffects<z.ZodString, string, string>;
             fields: z.ZodArray<z.ZodType<import("..").TinaFieldInner<false>, z.ZodTypeDef, import("..").TinaFieldInner<false>>, "many">;
         }, "strip", z.ZodTypeAny, {
             name?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/schema-tools",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -23,7 +23,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "0.51.0",
+    "@tinacms/scripts": "0.51.1",
     "@types/yup": "^0.29.10",
     "jest": "^27.0.6",
     "react": "17.0.2",