@tinacms/schema-tools 0.0.0-bdc07c1-20250506013835 → 0.0.0-bdea884-20250606054015

package/dist/index.d.ts

@@ -1 +1,6 @@
-export * from "../src/index"
+export * from './schema';
+export * from './types/index';
+export * from './validate';
+export * from './util/namer';
+export * from './util/parseURL';
+export * from './util/normalizePath';

package/dist/index.js

@@ -1,6 +1,6 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("yup"), require("url-pattern"), require("zod"), require("@tinacms/common")) : typeof define === "function" && define.amd ? define(["exports", "yup", "url-pattern", "zod", "@tinacms/common"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@tinacms/schema-tools"] = {}, global.NOOP, global.NOOP, global.NOOP, global.NOOP));
-})(this, function(exports2, yup, UrlPattern, z, common) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("yup"), require("url-pattern"), require("zod")) : typeof define === "function" && define.amd ? define(["exports", "yup", "url-pattern", "zod"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@tinacms/schema-tools"] = {}, global.NOOP, global.NOOP, global.NOOP));
+})(this, function(exports2, yup, UrlPattern, z) {
   "use strict";
   function _interopNamespaceDefault(e) {
     const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -1664,6 +1664,9 @@
     };
   };
   const normalizePath = (filepath) => filepath.replace(/\\/g, "/");
+  const canonicalPath = (filepath) => {
+    return normalizePath(filepath).split("/").filter((name2) => name2 !== "").join("/");
+  };
   class TinaSchema {
     /**
      * Create a schema class from a user defined schema object
@@ -1713,21 +1716,21 @@
       };
       this.getCollectionByFullPath = (filepath) => {
         const fileExtension = filepath.split(".").pop();
-        const normalizedPath = filepath.replace(/\\/g, "/");
+        const canonicalFilepath = canonicalPath(filepath);
         const possibleCollections = this.getCollections().filter((collection) => {
           var _a, _b;
-          if (!normalizedPath.endsWith(`.gitkeep.${collection.format || "md"}`) && fileExtension !== (collection.format || "md")) {
+          if (!canonicalFilepath.endsWith(`.gitkeep.${collection.format || "md"}`) && fileExtension !== (collection.format || "md")) {
             return false;
           }
           if (((_a = collection == null ? void 0 : collection.match) == null ? void 0 : _a.include) || ((_b = collection == null ? void 0 : collection.match) == null ? void 0 : _b.exclude)) {
             const matches = this.getMatches({ collection });
-            const match = picomatch$1.isMatch(normalizedPath, matches);
+            const match = picomatch$1.isMatch(canonicalFilepath, matches);
             if (!match) {
               return false;
             }
           }
-          const path = collection.path ? collection.path.replace(/\/?$/, "/") : "";
-          return normalizedPath.startsWith(path);
+          const collectionPath = canonicalPath(collection.path);
+          return collectionPath === "" || canonicalFilepath.startsWith(`${collectionPath}/`);
         });
         if (possibleCollections.length === 0) {
           throw new Error(`Unable to find collection for file at ${filepath}`);
@@ -2060,16 +2063,16 @@
     }) {
       var _a, _b;
       const collection = typeof collectionOrString === "string" ? this.getCollection(collectionOrString) : collectionOrString;
-      const normalPath = normalizePath(collection.path);
-      const pathSuffix = normalPath ? "/" : "";
+      const collectionPath = canonicalPath(collection.path);
+      const pathSuffix = collectionPath ? "/" : "";
       const format = collection.format || "md";
       const matches = [];
       if ((_a = collection == null ? void 0 : collection.match) == null ? void 0 : _a.include) {
-        const match = `${normalPath}${pathSuffix}${collection.match.include}.${format}`;
+        const match = `${collectionPath}${pathSuffix}${collection.match.include}.${format}`;
         matches.push(match);
       }
       if ((_b = collection == null ? void 0 : collection.match) == null ? void 0 : _b.exclude) {
-        const exclude = `!(${normalPath}${pathSuffix}${collection.match.exclude}.${format})`;
+        const exclude = `!(${collectionPath}${pathSuffix}${collection.match.exclude}.${format})`;
         matches.push(exclude);
       }
       return matches;
@@ -2262,6 +2265,15 @@
       })
     };
   };
+  const CONTENT_FORMATS = [
+    "mdx",
+    "md",
+    "markdown",
+    "json",
+    "yaml",
+    "yml",
+    "toml"
+  ];
   const parseZodError = ({ zodError }) => {
     var _a, _b, _c, _d;
     const errors = zodError.flatten((issue) => {
@@ -2606,7 +2618,7 @@ ${stringifiedField}`
         });
       }
     }),
-    format: z.z.enum(common.CONTENT_FORMATS).optional(),
+    format: z.z.enum(CONTENT_FORMATS).optional(),
     isAuthCollection: z.z.boolean().optional(),
     isDetached: z.z.boolean().optional()
   });
@@ -2725,11 +2737,13 @@ ${stringifiedField}`
       throw new Error(e);
     }
   };
+  exports2.CONTENT_FORMATS = CONTENT_FORMATS;
   exports2.NAMER = NAMER;
   exports2.TINA_HOST = TINA_HOST;
   exports2.TinaSchema = TinaSchema;
   exports2.TinaSchemaValidationError = TinaSchemaValidationError;
   exports2.addNamespaceToSchema = addNamespaceToSchema;
+  exports2.canonicalPath = canonicalPath;
   exports2.normalizePath = normalizePath;
   exports2.parseURL = parseURL;
   exports2.resolveField = resolveField;

package/dist/index.mjs

@@ -1,7 +1,6 @@
 import * as yup from "yup";
 import UrlPattern from "url-pattern";
 import z$1, { z, ZodError } from "zod";
-import { CONTENT_FORMATS } from "@tinacms/common";
 function addNamespaceToSchema(maybeNode, namespace = []) {
   if (typeof maybeNode !== "object" || maybeNode === null) {
     return maybeNode;
@@ -1647,6 +1646,9 @@ const parseURL = (url) => {
   };
 };
 const normalizePath = (filepath) => filepath.replace(/\\/g, "/");
+const canonicalPath = (filepath) => {
+  return normalizePath(filepath).split("/").filter((name2) => name2 !== "").join("/");
+};
 class TinaSchema {
   /**
    * Create a schema class from a user defined schema object
@@ -1696,21 +1698,21 @@ class TinaSchema {
     };
     this.getCollectionByFullPath = (filepath) => {
       const fileExtension = filepath.split(".").pop();
-      const normalizedPath = filepath.replace(/\\/g, "/");
+      const canonicalFilepath = canonicalPath(filepath);
       const possibleCollections = this.getCollections().filter((collection) => {
         var _a, _b;
-        if (!normalizedPath.endsWith(`.gitkeep.${collection.format || "md"}`) && fileExtension !== (collection.format || "md")) {
+        if (!canonicalFilepath.endsWith(`.gitkeep.${collection.format || "md"}`) && fileExtension !== (collection.format || "md")) {
           return false;
         }
         if (((_a = collection == null ? void 0 : collection.match) == null ? void 0 : _a.include) || ((_b = collection == null ? void 0 : collection.match) == null ? void 0 : _b.exclude)) {
           const matches = this.getMatches({ collection });
-          const match = picomatch$1.isMatch(normalizedPath, matches);
+          const match = picomatch$1.isMatch(canonicalFilepath, matches);
           if (!match) {
             return false;
           }
         }
-        const path = collection.path ? collection.path.replace(/\/?$/, "/") : "";
-        return normalizedPath.startsWith(path);
+        const collectionPath = canonicalPath(collection.path);
+        return collectionPath === "" || canonicalFilepath.startsWith(`${collectionPath}/`);
       });
       if (possibleCollections.length === 0) {
         throw new Error(`Unable to find collection for file at ${filepath}`);
@@ -2043,16 +2045,16 @@ class TinaSchema {
   }) {
     var _a, _b;
     const collection = typeof collectionOrString === "string" ? this.getCollection(collectionOrString) : collectionOrString;
-    const normalPath = normalizePath(collection.path);
-    const pathSuffix = normalPath ? "/" : "";
+    const collectionPath = canonicalPath(collection.path);
+    const pathSuffix = collectionPath ? "/" : "";
     const format = collection.format || "md";
     const matches = [];
     if ((_a = collection == null ? void 0 : collection.match) == null ? void 0 : _a.include) {
-      const match = `${normalPath}${pathSuffix}${collection.match.include}.${format}`;
+      const match = `${collectionPath}${pathSuffix}${collection.match.include}.${format}`;
       matches.push(match);
     }
     if ((_b = collection == null ? void 0 : collection.match) == null ? void 0 : _b.exclude) {
-      const exclude = `!(${normalPath}${pathSuffix}${collection.match.exclude}.${format})`;
+      const exclude = `!(${collectionPath}${pathSuffix}${collection.match.exclude}.${format})`;
       matches.push(exclude);
     }
     return matches;
@@ -2245,6 +2247,15 @@ const resolveForm = ({
     })
   };
 };
+const CONTENT_FORMATS = [
+  "mdx",
+  "md",
+  "markdown",
+  "json",
+  "yaml",
+  "yml",
+  "toml"
+];
 const parseZodError = ({ zodError }) => {
   var _a, _b, _c, _d;
   const errors = zodError.flatten((issue) => {
@@ -2709,11 +2720,13 @@ const validateSchema = ({ schema }) => {
   }
 };
 export {
+  CONTENT_FORMATS,
   NAMER,
   TINA_HOST,
   TinaSchema,
   TinaSchemaValidationError,
   addNamespaceToSchema,
+  canonicalPath,
   normalizePath,
   parseURL,
   resolveField,

package/dist/types/index.d.ts

@@ -1,6 +1,8 @@
-import { ContentFormat, ContentFrontmatterFormat } from '@tinacms/common';
 import type { FC } from 'react';
 import type React from 'react';
+export declare const CONTENT_FORMATS: readonly ["mdx", "md", "markdown", "json", "yaml", "yml", "toml"];
+export type ContentFormat = (typeof CONTENT_FORMATS)[number];
+export type ContentFrontmatterFormat = 'yaml' | 'toml' | 'json';
 type Meta = {
     active?: boolean;
     dirty?: boolean;

package/dist/util/normalizePath.d.ts

@@ -1 +1,9 @@
 export declare const normalizePath: (filepath: string) => string;
+/**
+ * Returns the given path such that:
+ * - The path separator is converted from '\' to '/' if necessary.
+ * - Duplicate '/' are removed
+ * - Leading and trailing '/' are cleared
+ * @param filepath Filepath to convert to its canonical form
+ */
+export declare const canonicalPath: (filepath: string) => string;

package/dist/validate/schema.d.ts

@@ -30,44 +30,44 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         isAuthCollection: z.ZodOptional<z.ZodBoolean>;
         isDetached: z.ZodOptional<z.ZodBoolean>;
     }, {
-        fields: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodType<import("..").TinaField, z.ZodTypeDef, import("..").TinaField>, "many">>, import("..").TinaField[], import("..").TinaField[]>, import("..").TinaField[], import("..").TinaField[]>, import("..").TinaField[], import("..").TinaField[]>, import("..").TinaField[], import("..").TinaField[]>;
+        fields: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodType<import("../types/index").TinaField, z.ZodTypeDef, import("../types/index").TinaField>, "many">>, import("../types/index").TinaField[], import("../types/index").TinaField[]>, import("../types/index").TinaField[], import("../types/index").TinaField[]>, import("../types/index").TinaField[], import("../types/index").TinaField[]>, import("../types/index").TinaField[], import("../types/index").TinaField[]>;
         templates: z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodEffects<z.ZodObject<{
             label: z.ZodString;
             name: z.ZodEffects<z.ZodString, string, string>;
-            fields: z.ZodArray<z.ZodType<import("..").TinaField, z.ZodTypeDef, import("..").TinaField>, "many">;
+            fields: z.ZodArray<z.ZodType<import("../types/index").TinaField, z.ZodTypeDef, import("../types/index").TinaField>, "many">;
         }, "strip", z.ZodTypeAny, {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }, {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }>, {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }, {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }>, "many">>, {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }[], {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }[]>;
     }>, "strip", z.ZodTypeAny, {
         name?: string;
         templates?: {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }[];
-        fields?: import("..").TinaField[];
+        fields?: import("../types/index").TinaField[];
         label?: string;
         path?: string;
         format?: "mdx" | "md" | "markdown" | "json" | "yaml" | "yml" | "toml";
@@ -77,10 +77,10 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         name?: string;
         templates?: {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }[];
-        fields?: import("..").TinaField[];
+        fields?: import("../types/index").TinaField[];
         label?: string;
         path?: string;
         format?: "mdx" | "md" | "markdown" | "json" | "yaml" | "yml" | "toml";
@@ -90,10 +90,10 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         name?: string;
         templates?: {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }[];
-        fields?: import("..").TinaField[];
+        fields?: import("../types/index").TinaField[];
         label?: string;
         path?: string;
         format?: "mdx" | "md" | "markdown" | "json" | "yaml" | "yml" | "toml";
@@ -103,10 +103,10 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         name?: string;
         templates?: {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }[];
-        fields?: import("..").TinaField[];
+        fields?: import("../types/index").TinaField[];
         label?: string;
         path?: string;
         format?: "mdx" | "md" | "markdown" | "json" | "yaml" | "yml" | "toml";
@@ -237,10 +237,10 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         name?: string;
         templates?: {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }[];
-        fields?: import("..").TinaField[];
+        fields?: import("../types/index").TinaField[];
         label?: string;
         path?: string;
         format?: "mdx" | "md" | "markdown" | "json" | "yaml" | "yml" | "toml";
@@ -275,10 +275,10 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         name?: string;
         templates?: {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }[];
-        fields?: import("..").TinaField[];
+        fields?: import("../types/index").TinaField[];
         label?: string;
         path?: string;
         format?: "mdx" | "md" | "markdown" | "json" | "yaml" | "yml" | "toml";
@@ -313,10 +313,10 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         name?: string;
         templates?: {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }[];
-        fields?: import("..").TinaField[];
+        fields?: import("../types/index").TinaField[];
         label?: string;
         path?: string;
         format?: "mdx" | "md" | "markdown" | "json" | "yaml" | "yml" | "toml";
@@ -351,10 +351,10 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         name?: string;
         templates?: {
             name?: string;
-            fields?: import("..").TinaField[];
+            fields?: import("../types/index").TinaField[];
             label?: string;
         }[];
-        fields?: import("..").TinaField[];
+        fields?: import("../types/index").TinaField[];
         label?: string;
         path?: string;
         format?: "mdx" | "md" | "markdown" | "json" | "yaml" | "yml" | "toml";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/schema-tools",
-  "version": "0.0.0-bdc07c1-20250506013835",
+  "version": "0.0.0-bdea884-20250606054015",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -32,12 +32,11 @@
     "ts-jest": "^29.2.5",
     "typescript": "^5.7.3",
     "yup": "^0.32.11",
-    "@tinacms/scripts": "1.3.4"
+    "@tinacms/scripts": "0.0.0-bdea884-20250606054015"
   },
   "peerDependencies": {
     "react": ">=16.14.0",
-    "yup": "^0.32.0",
-    "@tinacms/common": "0.0.0-bdc07c1-20250506013835"
+    "yup": "^0.32.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"