@tinacms/schema-tools 1.3.0 → 1.3.2

package/dist/index.es.js

@@ -810,7 +810,15 @@ const validateTinaCloudSchemaConfig = (config) => {
   const newConfig = tinaConfigZod.parse(config);
   return newConfig;
 };
-const FORMATS = ["json", "md", "markdown", "mdx", "toml", "yaml"];
+const FORMATS = [
+  "json",
+  "md",
+  "markdown",
+  "mdx",
+  "toml",
+  "yaml",
+  "yml"
+];
 const Template = z.object({
   label: z.string({
     invalid_type_error: "label must be a string",

package/dist/index.js

@@ -837,7 +837,15 @@ ${JSON.stringify(val, null, 2)}
     const newConfig = tinaConfigZod.parse(config);
     return newConfig;
   };
-  const FORMATS = ["json", "md", "markdown", "mdx", "toml", "yaml"];
+  const FORMATS = [
+    "json",
+    "md",
+    "markdown",
+    "mdx",
+    "toml",
+    "yaml",
+    "yml"
+  ];
   const Template = z.z.object({
     label: z.z.string({
       invalid_type_error: "label must be a string",

package/dist/schema/TinaSchema.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 import { TinaCloudSchemaEnriched, TinaCloudSchemaBase, TinaCloudCollection, Templateable, Collectable, CollectionTemplateable } from '../types/index';
 declare type Version = {
     fullVersion: string;

package/dist/types/SchemaTypes.d.ts

@@ -275,6 +275,12 @@ export interface RichTypeInner extends TinaField {
     type: 'rich-text';
     isBody?: boolean;
     list?: boolean;
+    parser?: {
+        type: 'markdown';
+        skipEscaping?: 'all' | 'html' | 'none';
+    } | {
+        type: 'mdx';
+    };
     templates?: (string | (Template<false> & {
         inline?: boolean;
     }))[];

package/dist/types.d.ts

@@ -169,7 +169,7 @@ declare type UIField<Type, List extends boolean> = {
      */
     validate?(value: List extends true ? Type[] : Type, allValues: {
         [key: string]: any;
-    }, meta: Meta, field: UIField<Type, List>): (List extends true ? Type[] : Type) | undefined | void;
+    }, meta: Meta, field: UIField<Type, List>): string | void;
     /**
      * @deprecated use `defaultItem` at the collection level instead
      */
@@ -269,6 +269,22 @@ export declare type RichTextField = (FieldGeneric<RichTextAst, undefined> | Fiel
             name?: string;
         };
     })[];
+    /**
+     * By default, Tina parses markdown with MDX, this is a more strict parser
+     * that allows you to use structured content inside markdown (via `templates`).
+     *
+     * Specify `"markdown"` if you're having problems with Tina parsing your content.
+     */
+    parser?: {
+        type: 'markdown';
+        /**
+         * Tina will escape entities like `<` and `[` by default. You can choose to turn
+         * off all escaping, or specify HTML, so `<div>` will not be turned into `\<div>`
+         */
+        skipEscaping?: 'all' | 'html' | 'none';
+    } | {
+        type: 'mdx';
+    };
 };
 declare type DefaultItem<ReturnType> = ReturnType | (() => ReturnType);
 declare type ObjectUiProps = {
@@ -324,7 +340,7 @@ export interface FieldCollection {
     label?: string;
     name: string;
     path: string;
-    format?: 'json' | 'md' | 'markdown' | 'mdx' | 'yaml' | 'toml';
+    format?: 'json' | 'md' | 'markdown' | 'mdx' | 'yaml' | 'yml' | 'toml';
     /**
      * This format will be used to parse the markdown frontmatter
      */
@@ -352,7 +368,7 @@ export interface TemplateCollection {
     label?: string;
     name: string;
     path: string;
-    format?: 'json' | 'md' | 'markdown' | 'mdx' | 'yaml' | 'toml';
+    format?: 'json' | 'md' | 'markdown' | 'mdx' | 'yaml' | 'yml' | 'toml';
     ui?: UICollection;
     /**
      * @deprecated - use `ui.defaultItem` on the each `template` instead

package/dist/validate/schema.d.ts

@@ -6,7 +6,7 @@ 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.ZodEffects<z.ZodString, string, string>, string, string>;
-        format: z.ZodOptional<z.ZodEnum<["json", "md", "markdown", "mdx", "toml", "yaml"]>>;
+        format: z.ZodOptional<z.ZodEnum<["json", "md", "markdown", "mdx", "toml", "yaml", "yml"]>>;
     }, {
         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<{
@@ -46,7 +46,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
+        format?: "markdown" | "mdx" | "json" | "md" | "yaml" | "yml" | "toml";
         label?: string;
     }, {
         name?: string;
@@ -56,7 +56,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
+        format?: "markdown" | "mdx" | "json" | "md" | "yaml" | "yml" | "toml";
         label?: string;
     }>, {
         name?: string;
@@ -66,7 +66,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
+        format?: "markdown" | "mdx" | "json" | "md" | "yaml" | "yml" | "toml";
         label?: string;
     }, {
         name?: string;
@@ -76,7 +76,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
+        format?: "markdown" | "mdx" | "json" | "md" | "yaml" | "yml" | "toml";
         label?: string;
     }>, "many">;
     config: z.ZodOptional<z.ZodObject<{
@@ -144,7 +144,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
+        format?: "markdown" | "mdx" | "json" | "md" | "yaml" | "yml" | "toml";
         label?: string;
     }[];
     config?: {
@@ -168,7 +168,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
+        format?: "markdown" | "mdx" | "json" | "md" | "yaml" | "yml" | "toml";
         label?: string;
     }[];
     config?: {
@@ -192,7 +192,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
+        format?: "markdown" | "mdx" | "json" | "md" | "yaml" | "yml" | "toml";
         label?: string;
     }[];
     config?: {
@@ -216,7 +216,7 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
             fields?: import("..").TinaFieldInner<false>[];
             label?: string;
         }[];
-        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "toml";
+        format?: "markdown" | "mdx" | "json" | "md" | "yaml" | "yml" | "toml";
         label?: string;
     }[];
     config?: {

package/package.json

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