@tinacms/schema-tools 1.4.1 → 1.4.3

package/dist/index.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 export * from './schema';
 export * from './types/index';
 export * from './validate';

package/dist/index.es.js

@@ -213,7 +213,8 @@ class TinaSchema {
             return false;
           }
         }
-        return filepath.replace(/\\/g, "/").startsWith(collection.path.replace(/\/?$/, "/"));
+        const path = collection.path ? collection.path.replace(/\/?$/, "/") : "";
+        return filepath.replace(/\\/g, "/").startsWith(path);
       });
       if (possibleCollections.length === 0) {
         throw new Error(`Unable to find collection for file at ${filepath}`);
@@ -448,14 +449,15 @@ Visit https://tina.io/docs/reference/types/rich-text/#custom-shortcode-syntax to
     var _a, _b;
     const collection = typeof collectionOrString === "string" ? this.getCollection(collectionOrString) : collectionOrString;
     const normalPath = normalizePath(collection.path);
+    const pathSuffix = normalPath ? "/" : "";
     const format = collection.format || "md";
     const matches = [];
     if ((_a = collection == null ? void 0 : collection.match) == null ? void 0 : _a.include) {
-      const match = `${normalPath}/${collection.match.include}.${format}`;
+      const match = `${normalPath}${pathSuffix}${collection.match.include}.${format}`;
       matches.push(match);
     }
     if ((_b = collection == null ? void 0 : collection.match) == null ? void 0 : _b.exclude) {
-      const exclude = `!(${normalPath}/${collection.match.exclude}.${format})`;
+      const exclude = `!(${normalPath}${pathSuffix}${collection.match.exclude}.${format})`;
       matches.push(exclude);
     }
     return matches;
@@ -926,7 +928,14 @@ const CollectionBaseSchema = z.object({
       });
     }
   }),
-  path: z.string().transform((val) => val.replace(/^\/|\/$/g, "")),
+  path: z.string().transform((val) => val.replace(/^\/|\/$/g, "")).superRefine((val, ctx) => {
+    if (val === ".") {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: `path cannot be '.'. Please use '/' or '' instead. `
+      });
+    }
+  }),
   format: z.enum(FORMATS).optional()
 });
 const TinaCloudCollection = CollectionBaseSchema.extend({

package/dist/index.js

@@ -240,7 +240,8 @@
               return false;
             }
           }
-          return filepath.replace(/\\/g, "/").startsWith(collection.path.replace(/\/?$/, "/"));
+          const path = collection.path ? collection.path.replace(/\/?$/, "/") : "";
+          return filepath.replace(/\\/g, "/").startsWith(path);
         });
         if (possibleCollections.length === 0) {
           throw new Error(`Unable to find collection for file at ${filepath}`);
@@ -475,14 +476,15 @@ Visit https://tina.io/docs/reference/types/rich-text/#custom-shortcode-syntax to
       var _a, _b;
       const collection = typeof collectionOrString === "string" ? this.getCollection(collectionOrString) : collectionOrString;
       const normalPath = normalizePath(collection.path);
+      const pathSuffix = normalPath ? "/" : "";
       const format = collection.format || "md";
       const matches = [];
       if ((_a = collection == null ? void 0 : collection.match) == null ? void 0 : _a.include) {
-        const match = `${normalPath}/${collection.match.include}.${format}`;
+        const match = `${normalPath}${pathSuffix}${collection.match.include}.${format}`;
         matches.push(match);
       }
       if ((_b = collection == null ? void 0 : collection.match) == null ? void 0 : _b.exclude) {
-        const exclude = `!(${normalPath}/${collection.match.exclude}.${format})`;
+        const exclude = `!(${normalPath}${pathSuffix}${collection.match.exclude}.${format})`;
         matches.push(exclude);
       }
       return matches;
@@ -953,7 +955,14 @@ ${JSON.stringify(val, null, 2)}
         });
       }
     }),
-    path: z.z.string().transform((val) => val.replace(/^\/|\/$/g, "")),
+    path: z.z.string().transform((val) => val.replace(/^\/|\/$/g, "")).superRefine((val, ctx) => {
+      if (val === ".") {
+        ctx.addIssue({
+          code: z.z.ZodIssueCode.custom,
+          message: `path cannot be '.'. Please use '/' or '' instead. `
+        });
+      }
+    }),
     format: z.z.enum(FORMATS).optional()
   });
   const TinaCloudCollection = CollectionBaseSchema.extend({

package/dist/types/index.d.ts

@@ -234,6 +234,7 @@ export declare type ObjectField<WithNamespace extends boolean = false> = (FieldG
     type: 'object';
     fields?: undefined;
     templates: Template<WithNamespace>[];
+    templateKey?: string;
 });
 declare type Field<WithNamespace extends boolean = false> = (StringField | NumberField | BooleanField | DateTimeField | ImageField | ReferenceField | RichTextField<WithNamespace> | ObjectField<WithNamespace>) & MaybeNamespace<WithNamespace>;
 export declare type TinaField<WithNamespace extends boolean = false> = Field<WithNamespace> & MaybeNamespace<WithNamespace>;
@@ -243,6 +244,7 @@ declare type MaybeNamespace<WithNamespace extends boolean = false> = WithNamespa
 export declare type Template<WithNamespace extends boolean = false> = {
     label?: string | boolean;
     name: string;
+    nameOverride?: string;
     ui?: {
         /**
          * Override the properties passed to the field

package/dist/validate/schema.d.ts

@@ -5,7 +5,7 @@ import { z } from 'zod';
 export declare const CollectionBaseSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodString>;
     name: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
-    path: z.ZodEffects<z.ZodString, string, string>;
+    path: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
     format: z.ZodOptional<z.ZodEnum<["json", "md", "markdown", "mdx", "toml", "yaml", "yml"]>>;
 }, "strip", z.ZodTypeAny, {
     name?: string;
@@ -22,7 +22,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>;
-        path: z.ZodEffects<z.ZodString, string, string>;
+        path: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
         format: z.ZodOptional<z.ZodEnum<["json", "md", "markdown", "mdx", "toml", "yaml", "yml"]>>;
     }, {
         fields: z.ZodEffects<z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodType<import("..").TinaField<false>, z.ZodTypeDef, import("..").TinaField<false>>, "many">>, import("..").TinaField<false>[], import("..").TinaField<false>[]>, import("..").TinaField<false>[], import("..").TinaField<false>[]>;

package/package.json

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