@tinacms/schema-tools 1.0.3 → 1.2.0

package/dist/index.es.js

@@ -164,13 +164,24 @@ class TinaSchema {
       return globalTemplate;
     };
     this.getCollectionByFullPath = (filepath) => {
-      const collection = this.getCollections().find((collection2) => {
-        return filepath.replace(/\\/g, "/").startsWith(collection2.path.replace(/\/?$/, "/"));
+      const possibleCollections = this.getCollections().filter((collection) => {
+        return filepath.replace(/\\/g, "/").startsWith(collection.path.replace(/\/?$/, "/"));
       });
-      if (!collection) {
+      if (possibleCollections.length === 0) {
         throw new Error(`Unable to find collection for file at ${filepath}`);
       }
-      return collection;
+      if (possibleCollections.length === 1) {
+        return possibleCollections[0];
+      }
+      if (possibleCollections.length > 1) {
+        const longestMatch = possibleCollections.reduce((acc, collection) => {
+          if (collection.path.length > acc.path.length) {
+            return collection;
+          }
+          return acc;
+        });
+        return longestMatch;
+      }
     };
     this.getCollectionAndTemplateByFullPath = (filepath, templateName) => {
       let template;
@@ -378,11 +389,19 @@ const resolveField = (field, schema) => {
             options: field.options
           };
         }
+        if (field.options[0] && typeof field.options[0] === "object" && field.options[0].icon) {
+          return {
+            component: "button-toggle",
+            ...field,
+            ...extraFields,
+            options: field.options
+          };
+        }
         return {
           component: "select",
           ...field,
           ...extraFields,
-          options: [{ label: `Choose an option`, value: "" }, ...field.options]
+          options: field.ui && field.ui.component !== "select" ? field.options : [{ label: `Choose an option`, value: "" }, ...field.options]
         };
       }
       if (field.list) {
@@ -540,16 +559,20 @@ const nameProp = z.string({
       fatal: true
     });
 });
-const Option = z.union([z.string(), z.object({ label: z.string(), value: z.string() })], {
+const Option = z.union([
+  z.string(),
+  z.object({ label: z.string(), value: z.string() }),
+  z.object({ icon: z.any(), value: z.string() })
+], {
   errorMap: () => {
     return {
-      message: "Invalid option array. Must be a string[] or {label: string, value: string}[]"
+      message: "Invalid option array. Must be a string[] or {label: string, value: string}[] or {icon: React.ComponentType<any>, value: string}[]"
     };
   }
 });
 const TinaField = z.object({
   name: nameProp,
-  label: z.string().optional(),
+  label: z.string().or(z.boolean()).optional(),
   description: z.string().optional(),
   required: z.boolean().optional()
 });
@@ -603,7 +626,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));
@@ -733,7 +757,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",

package/dist/index.js

@@ -191,13 +191,24 @@
         return globalTemplate;
       };
       this.getCollectionByFullPath = (filepath) => {
-        const collection = this.getCollections().find((collection2) => {
-          return filepath.replace(/\\/g, "/").startsWith(collection2.path.replace(/\/?$/, "/"));
+        const possibleCollections = this.getCollections().filter((collection) => {
+          return filepath.replace(/\\/g, "/").startsWith(collection.path.replace(/\/?$/, "/"));
         });
-        if (!collection) {
+        if (possibleCollections.length === 0) {
           throw new Error(`Unable to find collection for file at ${filepath}`);
         }
-        return collection;
+        if (possibleCollections.length === 1) {
+          return possibleCollections[0];
+        }
+        if (possibleCollections.length > 1) {
+          const longestMatch = possibleCollections.reduce((acc, collection) => {
+            if (collection.path.length > acc.path.length) {
+              return collection;
+            }
+            return acc;
+          });
+          return longestMatch;
+        }
       };
       this.getCollectionAndTemplateByFullPath = (filepath, templateName) => {
         let template;
@@ -405,11 +416,19 @@
               options: field.options
             };
           }
+          if (field.options[0] && typeof field.options[0] === "object" && field.options[0].icon) {
+            return {
+              component: "button-toggle",
+              ...field,
+              ...extraFields,
+              options: field.options
+            };
+          }
           return {
             component: "select",
             ...field,
             ...extraFields,
-            options: [{ label: `Choose an option`, value: "" }, ...field.options]
+            options: field.ui && field.ui.component !== "select" ? field.options : [{ label: `Choose an option`, value: "" }, ...field.options]
           };
         }
         if (field.list) {
@@ -567,16 +586,20 @@
         fatal: true
       });
   });
-  const Option = z.z.union([z.z.string(), z.z.object({ label: z.z.string(), value: z.z.string() })], {
+  const Option = z.z.union([
+    z.z.string(),
+    z.z.object({ label: z.z.string(), value: z.z.string() }),
+    z.z.object({ icon: z.z.any(), value: z.z.string() })
+  ], {
     errorMap: () => {
       return {
-        message: "Invalid option array. Must be a string[] or {label: string, value: string}[]"
+        message: "Invalid option array. Must be a string[] or {label: string, value: string}[] or {icon: React.ComponentType<any>, value: string}[]"
       };
     }
   });
   const TinaField = z.z.object({
     name: nameProp,
-    label: z.z.string().optional(),
+    label: z.z.string().or(z.z.boolean()).optional(),
     description: z.z.string().optional(),
     required: z.z.boolean().optional()
   });
@@ -630,7 +653,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));
@@ -760,7 +784,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",

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;
 }
@@ -173,7 +181,8 @@ export interface TinaField {
 }
 declare type ScalarType<WithNamespace extends boolean> = WithNamespace extends true ? ScalarTypeWithNamespace : ScalarTypeInner;
 export declare type Option = string | {
-    label: string;
+    label?: string;
+    icon?: FC;
     value: string;
 };
 declare type ScalarTypeInner = TinaField & TinaScalarField & {
@@ -409,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;
@@ -424,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
      */
@@ -193,7 +195,7 @@ declare type FieldGeneric<Type, List extends boolean | undefined, ExtraFieldUIPr
     ui?: UIField<Type, false> & ExtraFieldUIProps;
 };
 export interface BaseField {
-    label?: string;
+    label?: string | boolean;
     required?: boolean;
     name: string;
     description?: string;
@@ -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
@@ -432,6 +443,13 @@ export interface Config<CMSCallback = undefined, FormifyCallback = undefined, Do
          * Note that for most framworks you can omit the `index.html` portion, for Next.js see the [rewrites section](https://nextjs.org/docs/api-reference/next.config.js/rewrites)
          */
         outputFolder: string;
+        /**
+         *
+         *  the host option for the vite config. This is useful when trying to run tinacms dev in a docker container.
+         *
+         * See https://vitejs.dev/config/server-options.html#server-host for more details
+         */
+        host?: string | boolean;
     };
     media?: {
         /**

package/dist/validate/schema.d.ts

@@ -15,7 +15,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.ZodString, string, string>;
-        format: z.ZodOptional<z.ZodEnum<["json", "md", "markdown", "mdx"]>>;
+        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.0.3",
+  "version": "1.2.0",
   "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",