@tinacms/schema-tools 1.1.0 → 1.2.1

package/dist/index.es.js

@@ -293,7 +293,15 @@ class TinaSchema {
             return { [_template]: this.transformCollectablePayload(rest, field) };
           }
         } else {
-          return value;
+          if (field.list) {
+            assertShape(value, (yup2) => yup2.array(yup2.object()));
+            return value.map((item) => {
+              return this.transformCollectablePayload(item, field);
+            });
+          } else {
+            assertShape(value, (yup2) => yup2.object());
+            return this.transformCollectablePayload(value, field);
+          }
         }
       else {
         return value;
@@ -626,7 +634,8 @@ const TinaFieldZod = z.lazy(() => {
     fields: z.array(TinaFieldZod),
     match: z.object({
       start: z.string(),
-      end: z.string()
+      end: z.string(),
+      name: z.string().optional()
     }).optional()
   }).superRefine((val, ctx) => {
     const dups = findDuplicates(val == null ? void 0 : val.fields.map((x) => x.name));
@@ -756,7 +765,7 @@ const validateTinaCloudSchemaConfig = (config) => {
   const newConfig = tinaConfigZod.parse(config);
   return newConfig;
 };
-const FORMATS = ["json", "md", "markdown", "mdx"];
+const FORMATS = ["json", "md", "markdown", "mdx", "toml", "yaml"];
 const Template = z.object({
   label: z.string({
     invalid_type_error: "label must be a string",
@@ -776,7 +785,14 @@ const Template = z.object({
 });
 const TinaCloudCollectionBase = z.object({
   label: z.string().optional(),
-  name,
+  name: name.superRefine((val, ctx) => {
+    if (val === "relativePath") {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: `name cannot be 'relativePath'. 'relativePath' is a reserved field name.`
+      });
+    }
+  }),
   format: z.enum(FORMATS).optional()
 });
 const TinaCloudCollection = TinaCloudCollectionBase.extend({

package/dist/index.js

@@ -320,7 +320,15 @@
               return { [_template]: this.transformCollectablePayload(rest, field) };
             }
           } else {
-            return value;
+            if (field.list) {
+              assertShape(value, (yup2) => yup2.array(yup2.object()));
+              return value.map((item) => {
+                return this.transformCollectablePayload(item, field);
+              });
+            } else {
+              assertShape(value, (yup2) => yup2.object());
+              return this.transformCollectablePayload(value, field);
+            }
           }
         else {
           return value;
@@ -653,7 +661,8 @@
       fields: z.z.array(TinaFieldZod),
       match: z.z.object({
         start: z.z.string(),
-        end: z.z.string()
+        end: z.z.string(),
+        name: z.z.string().optional()
       }).optional()
     }).superRefine((val, ctx) => {
       const dups = findDuplicates(val == null ? void 0 : val.fields.map((x) => x.name));
@@ -783,7 +792,7 @@ ${JSON.stringify(val, null, 2)}
     const newConfig = tinaConfigZod.parse(config);
     return newConfig;
   };
-  const FORMATS = ["json", "md", "markdown", "mdx"];
+  const FORMATS = ["json", "md", "markdown", "mdx", "toml", "yaml"];
   const Template = z.z.object({
     label: z.z.string({
       invalid_type_error: "label must be a string",
@@ -803,7 +812,14 @@ ${JSON.stringify(val, null, 2)}
   });
   const TinaCloudCollectionBase = z.z.object({
     label: z.z.string().optional(),
-    name,
+    name: name.superRefine((val, ctx) => {
+      if (val === "relativePath") {
+        ctx.addIssue({
+          code: z.z.ZodIssueCode.custom,
+          message: `name cannot be 'relativePath'. 'relativePath' is a reserved field name.`
+        });
+      }
+    }),
     format: z.z.enum(FORMATS).optional()
   });
   const TinaCloudCollection = TinaCloudCollectionBase.extend({

package/dist/types/SchemaTypes.d.ts

@@ -123,6 +123,14 @@ interface BaseCollection {
     defaultItem?: DefaultItem<Record<string, any>>;
     indexes?: TinaIndex[];
     format?: FormatType;
+    /**
+     * This format will be used to parse the markdown frontmatter
+     */
+    frontmatterFormat?: 'yaml' | 'toml' | 'json';
+    /**
+     * The delimiters used to parse the frontmatter.
+     */
+    frontmatterDelimiters?: [string, string] | string;
     ui?: UICollection;
     match?: string;
 }
@@ -410,6 +418,7 @@ export declare type Template<WithNamespace extends boolean> = WithNamespace exte
     match?: {
         start: string;
         end: string;
+        name?: string;
     };
     ui?: object | (UIField<any, any> & {
         previewSrc: string;
@@ -425,6 +434,7 @@ export declare type Template<WithNamespace extends boolean> = WithNamespace exte
     match?: {
         start: string;
         end: string;
+        name?: string;
     };
 };
 export declare type CollectionTemplateableUnion = {

package/dist/types/schema2.d.ts

@@ -108,6 +108,7 @@ declare type Template = {
     match?: {
         start: string;
         end: string;
+        name?: string;
     };
 };
 declare type WithTemplates<Optional extends boolean = false> = Optional extends true ? {

package/dist/types/types2.d.ts

@@ -245,6 +245,7 @@ export declare type RichTextField = (FieldGeneric<RichTextAst, undefined> | Fiel
         match?: {
             start: string;
             end: string;
+            name?: string;
         };
     })[];
 };

package/dist/types.d.ts

@@ -109,6 +109,8 @@ declare type Component<Type, List> = (props: {
     meta: Meta;
 }) => any;
 declare type UIField<Type, List extends boolean> = {
+    max?: List extends true ? number : never;
+    min?: List extends true ? number : never;
     /**
      * Override the label from parent object
      */
@@ -273,6 +275,7 @@ export declare type RichTextField = (FieldGeneric<RichTextAst, undefined> | Fiel
         match?: {
             start: string;
             end: string;
+            name?: string;
         };
     })[];
 };
@@ -330,7 +333,15 @@ export interface FieldCollection {
     label?: string;
     name: string;
     path: string;
-    format?: 'json' | 'md' | 'markdown' | 'mdx';
+    format?: 'json' | 'md' | 'markdown' | 'mdx' | 'yaml' | 'toml';
+    /**
+     * This format will be used to parse the markdown frontmatter
+     */
+    frontmatterFormat?: 'yaml' | 'toml' | 'json';
+    /**
+     * The delimiters used to parse the frontmatter.
+     */
+    frontmatterDelimiters?: [string, string] | string;
     ui?: UICollection & {
         defaultItem?: DefaultItem<Record<string, any>>;
     };
@@ -350,7 +361,7 @@ export interface TemplateCollection {
     label?: string;
     name: string;
     path: string;
-    format?: 'json' | 'md' | 'markdown' | 'mdx';
+    format?: 'json' | 'md' | 'markdown' | 'mdx' | 'yaml' | 'toml';
     ui?: UICollection;
     /**
      * @deprecated - use `ui.defaultItem` on the each `template` instead
@@ -415,6 +426,19 @@ export interface Config<CMSCallback = undefined, FormifyCallback = undefined, Do
          */
         referenceDepth?: number;
     };
+    /**
+     *
+     * Tina supports serving content from a separate Git repo. To enable this during local development, point
+     * this config at the root of the content repo.
+     *
+     * NOTE: Relative paths are fine to use here, but you should use an environment variable for this, as each developer on your team may have a different
+     * location to the path.
+     *
+     * ```ts
+     * localContentPath: process.env.REMOTE_ROOT_PATH // eg. '../../my-content-repo'
+     * ```
+     */
+    localContentPath?: string;
     /**
      * Tina is compiled as a single-page app and placed in the public directory
      * of your application.

package/dist/validate/schema.d.ts

@@ -14,8 +14,8 @@ 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.ZodEffects<z.ZodString, string, string>;
-        format: z.ZodOptional<z.ZodEnum<["json", "md", "markdown", "mdx"]>>;
+        name: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
+        format: z.ZodOptional<z.ZodEnum<["json", "md", "markdown", "mdx", "toml", "yaml"]>>;
     }, {
         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<{
@@ -55,7 +55,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx";
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
         label?: string;
     }, {
         name?: string;
@@ -65,7 +65,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx";
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
         label?: string;
     }>, {
         name?: string;
@@ -75,7 +75,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx";
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
         label?: string;
     }, {
         name?: string;
@@ -85,7 +85,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx";
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
         label?: string;
     }>, "many">;
     config: z.ZodOptional<z.ZodObject<{
@@ -153,7 +153,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx";
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
         label?: string;
     }[];
     config?: {
@@ -177,7 +177,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx";
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
         label?: string;
     }[];
     config?: {
@@ -201,7 +201,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx";
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
         label?: string;
     }[];
     config?: {
@@ -225,7 +225,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx";
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
         label?: string;
     }[];
     config?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/schema-tools",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -31,7 +31,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "1.0.0",
+    "@tinacms/scripts": "1.0.1",
     "@types/yup": "^0.29.10",
     "jest": "^27.0.6",
     "react": "17.0.2",