@tinacms/schema-tools 1.0.2 → 1.1.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()
 });

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()
   });

package/dist/types/SchemaTypes.d.ts

@@ -173,7 +173,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 & {

package/dist/types.d.ts

@@ -193,7 +193,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;
@@ -384,6 +384,7 @@ export interface Config<CMSCallback = undefined, FormifyCallback = undefined, Do
             onLogin?: (args: {
                 token: TokenObject;
             }) => Promise<void>;
+            onLogout?: () => Promise<void>;
         };
     };
     /**
@@ -431,6 +432,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/package.json

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