tinacms 1.3.3 → 1.4.1

package/dist/admin/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
-export declare const TinaAdmin: ({ preview, config, schemaJson, }: {
+export declare const TinaAdmin: ({ preview, Playground, config, schemaJson, }: {
     schemaJson?: any;
     preview?: (props: object) => JSX.Element;
+    Playground?: (props: object) => JSX.Element;
     config: object;
 }) => JSX.Element;

package/dist/admin/pages/CollectionCreatePage.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 /// <reference types="react" />
 declare const CollectionCreatePage: () => JSX.Element;
 export default CollectionCreatePage;

package/dist/hooks/use-graphql-forms.d.ts

@@ -1,17 +1,5 @@
-/**
-
-*/
 import { Form } from '@tinacms/toolkit';
 import type { FormOptions, TinaCMS } from '@tinacms/toolkit';
-export declare const transformDocumentIntoMutationRequestPayload: (document: {
-    [key: string]: unknown;
-    _collection: string;
-    __typename?: string;
-    _template: string;
-}, instructions: {
-    includeCollection?: boolean;
-    includeTemplate?: boolean;
-}) => any;
 export declare const generateFormCreators: (cms: TinaCMS, showInSidebar?: boolean, global?: boolean | {
     icon?: any;
     layout: 'fullscreen' | 'popup';

package/dist/index.es.js

@@ -4,7 +4,7 @@ export * from "@tinacms/toolkit";
 export { MdxFieldPluginExtendible } from "@tinacms/toolkit";
 import { getIntrospectionQuery, buildClientSchema, print, parse, buildSchema } from "graphql";
 import gql$1 from "graphql-tag";
-import { TinaSchema, addNamespaceToSchema, parseURL, resolveForm, validateSchema } from "@tinacms/schema-tools";
+import { TinaSchema, addNamespaceToSchema, parseURL, resolveForm, normalizePath, validateSchema } from "@tinacms/schema-tools";
 export { NAMER, resolveForm } from "@tinacms/schema-tools";
 import React, { useState, useCallback, useEffect, Fragment, useMemo } from "react";
 import * as yup from "yup";
@@ -58,12 +58,18 @@ const IndexStatusResponse = z.object({
   ]).optional(),
   timestamp: z.number().optional()
 });
-async function asyncPoll(fn, pollInterval = 5 * 1e3, pollTimeout = 30 * 1e3) {
+function asyncPoll(fn, pollInterval = 5 * 1e3, pollTimeout = 30 * 1e3) {
   const endTime = new Date().getTime() + pollTimeout;
+  let stop = false;
+  const cancel = () => {
+    stop = true;
+  };
   const checkCondition = (resolve, reject) => {
     Promise.resolve(fn()).then((result) => {
       const now = new Date().getTime();
-      if (result.done) {
+      if (stop) {
+        reject(new Error("AsyncPoller: cancelled"));
+      } else if (result.done) {
         resolve(result.data);
       } else if (now < endTime) {
         setTimeout(checkCondition, pollInterval, resolve, reject);
@@ -74,7 +80,7 @@ async function asyncPoll(fn, pollInterval = 5 * 1e3, pollTimeout = 30 * 1e3) {
       reject(err);
     });
   };
-  return new Promise(checkCondition);
+  return [new Promise(checkCondition), cancel];
 }
 class Client {
   constructor({ tokenStorage = "MEMORY", ...options }) {
@@ -126,6 +132,7 @@ mutation addPendingDocumentMutation(
       });
       return parse(data.getOptimizedQuery);
     };
+    this.tinaGraphQLVersion = options.tinaGraphQLVersion;
     this.onLogin = (_d = (_c = (_b = (_a = options.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.admin) == null ? void 0 : _c.auth) == null ? void 0 : _d.onLogin;
     this.onLogout = (_h = (_g = (_f = (_e = options.schema) == null ? void 0 : _e.config) == null ? void 0 : _f.admin) == null ? void 0 : _g.auth) == null ? void 0 : _h.onLogout;
     if ((_l = (_k = (_j = (_i = options.schema) == null ? void 0 : _i.config) == null ? void 0 : _j.admin) == null ? void 0 : _k.auth) == null ? void 0 : _l.logout) {
@@ -210,7 +217,7 @@ mutation addPendingDocumentMutation(
     this.frontendUrl = ((_b = this.options.tinaioConfig) == null ? void 0 : _b.frontendUrlOverride) || "https://app.tina.io";
     this.identityApiUrl = ((_c = this.options.tinaioConfig) == null ? void 0 : _c.identityApiUrlOverride) || "https://identity.tinajs.io";
     this.contentApiBase = ((_d = this.options.tinaioConfig) == null ? void 0 : _d.contentApiUrlOverride) || `https://content.tinajs.io`;
-    this.contentApiUrl = this.options.customContentApiUrl || `${this.contentApiBase}/content/${this.options.clientId}/github/${encodedBranch}`;
+    this.contentApiUrl = this.options.customContentApiUrl || `${this.contentApiBase}/${this.tinaGraphQLVersion}/content/${this.options.clientId}/github/${encodedBranch}`;
   }
   async request(query, { variables }) {
     const res = await fetch(this.contentApiUrl, {
@@ -230,6 +237,13 @@ mutation addPendingDocumentMutation(
       if (resBody.message) {
         errorMessage = `${errorMessage}, Response: ${resBody.message}`;
       }
+      errorMessage = `${errorMessage}, Please check that the following information is correct: 
+	clientId: ${this.options.clientId}
+	branch: ${this.branch}.`;
+      if (this.branch !== "main") {
+        errorMessage = `${errorMessage}
+	Note: This error can occur if the branch does not exist on GitHub or on Tina Cloud`;
+      }
       throw new Error(errorMessage);
     }
     const json = await res.json();
@@ -375,15 +389,15 @@ mutation addPendingDocumentMutation(
       return null;
     }
   }
-  async waitForIndexStatus({ ref }) {
+  waitForIndexStatus({ ref }) {
     try {
-      const result = await asyncPoll(async () => {
+      const [prom, cancel] = asyncPoll(async () => {
         try {
-          const result2 = await this.getIndexStatus({ ref });
-          if (!(result2.status === "inprogress" || result2.status === "unknown")) {
+          const result = await this.getIndexStatus({ ref });
+          if (!(result.status === "inprogress" || result.status === "unknown")) {
             return Promise.resolve({
               done: true,
-              data: result2
+              data: result
             });
           } else {
             return Promise.resolve({
@@ -394,7 +408,7 @@ mutation addPendingDocumentMutation(
           return Promise.reject(err);
         }
       }, 5e3, 9e5);
-      return result;
+      return [prom, cancel];
     } catch (error) {
       if (error.message === "AsyncPoller: reached timeout") {
         console.warn(error);
@@ -462,6 +476,7 @@ class LocalClient extends Client {
       ...props,
       clientId: "",
       branch: "",
+      tinaGraphQLVersion: "",
       customContentApiUrl: props && props.customContentApiUrl ? props.customContentApiUrl : DEFAULT_LOCAL_TINA_GQL_SERVER_URL
     };
     super(clientProps);
@@ -533,14 +548,16 @@ const createClient = ({
   branch,
   tinaioConfig,
   schema,
-  apiUrl
+  apiUrl,
+  tinaGraphQLVersion
 }) => {
   return isLocalClient ? new LocalClient({ customContentApiUrl: apiUrl, schema }) : new Client({
     clientId: clientId || "",
     branch: branch || "main",
     tokenStorage: "LOCAL_STORAGE",
     tinaioConfig,
-    schema
+    schema,
+    tinaGraphQLVersion
   });
 };
 function assertShape(value, yupSchema, errorMessage) {
@@ -2302,7 +2319,8 @@ const TinaCMSProvider2 = ({
     cmsCallback: props.cmsCallback,
     mediaStore: props.mediaStore,
     apiUrl: apiURL,
-    schema: { ...schema, config: { ...schema.config, ...props } }
+    schema: { ...schema, config: { ...schema.config, ...props } },
+    tinaGraphQLVersion: props.tinaGraphQLVersion
   }, /* @__PURE__ */ React.createElement("style", null, styles), /* @__PURE__ */ React.createElement(ErrorBoundary, null, props.children)));
 };
 const Loader = (props) => {
@@ -3607,42 +3625,6 @@ const RenameModal = ({
 function HiChevronRight(props) {
   return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 20 20", "fill": "currentColor" }, "child": [{ "tag": "path", "attr": { "fillRule": "evenodd", "d": "M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z", "clipRule": "evenodd" } }] })(props);
 }
-const transformDocumentIntoMutationRequestPayload = (document, instructions) => {
-  const { _collection, __typename, _template, ...rest } = document;
-  const params = transformParams(rest);
-  const paramsWithTemplate = instructions.includeTemplate ? { [_template]: params } : params;
-  return instructions.includeCollection ? { [_collection]: paramsWithTemplate } : paramsWithTemplate;
-};
-const transformParams = (data) => {
-  if (["string", "number", "boolean"].includes(typeof data)) {
-    return data;
-  }
-  if (Array.isArray(data)) {
-    return data.map((item) => transformParams(item));
-  }
-  try {
-    assertShape(data, (yup2) => yup2.object({ _template: yup2.string().required() }));
-    const { _template, __typename, ...rest } = data;
-    const nested = transformParams(rest);
-    return { [_template]: nested };
-  } catch (e) {
-    if (e.message === "Failed to assertShape - _template is a required field") {
-      if (!data) {
-        return [];
-      }
-      const accum = {};
-      Object.entries(data).map(([keyName, value]) => {
-        accum[keyName] = transformParams(value);
-      });
-      return accum;
-    } else {
-      if (!data) {
-        return [];
-      }
-      throw e;
-    }
-  }
-};
 function FaLock(props) {
   return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 448 512" }, "child": [{ "tag": "path", "attr": { "d": "M400 224h-24v-72C376 68.2 307.8 0 224 0S72 68.2 72 152v72H48c-26.5 0-48 21.5-48 48v192c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V272c0-26.5-21.5-48-48-48zm-104 0H152v-72c0-39.7 32.3-72 72-72s72 32.3 72 72v72z" } }] })(props);
 }
@@ -3652,15 +3634,11 @@ function FaUnlock(props) {
 const createDocument = async (cms, collection, template, mutationInfo, values) => {
   const api = new TinaAdminApi(cms);
   const { filename, ...leftover } = values;
-  const { includeCollection, includeTemplate } = mutationInfo;
   const relativePath = `${filename}.${collection.format}`;
-  const params = transformDocumentIntoMutationRequestPayload({
+  const params = api.schema.transformPayload(collection.name, {
     _collection: collection.name,
     ...template && { _template: template.name },
     ...leftover
-  }, {
-    includeCollection,
-    includeTemplate
   });
   if (await api.isAuthenticated()) {
     await api.createDocument(collection.name, relativePath, params);
@@ -3765,6 +3743,7 @@ const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
           description: /* @__PURE__ */ React.createElement("span", null, "A unique filename for the content.", /* @__PURE__ */ React.createElement("br", null), "Examples: ", /* @__PURE__ */ React.createElement("code", null, "My_Document"), ", ", /* @__PURE__ */ React.createElement("code", null, "My_Document.en"), ",", " ", /* @__PURE__ */ React.createElement("code", null, "sub-folder/My_Document")),
           placeholder: `My_Document`,
           validate: (value, allValues, meta) => {
+            var _a3, _b3;
             if (!value) {
               if (meta.dirty) {
                 return "Required";
@@ -3775,6 +3754,16 @@ const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
             if (value && !isValid) {
               return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
             }
+            if (((_a3 = schemaCollection.match) == null ? void 0 : _a3.exclude) || ((_b3 = schemaCollection.match) == null ? void 0 : _b3.include)) {
+              const filePath = `${normalizePath(schemaCollection.path)}/${value}.${schemaCollection.format || "md"}`;
+              const match = schema.matchFiles({
+                files: [filePath],
+                collection: schemaCollection
+              });
+              if (match.length === 0) {
+                return `The filename "${value}" is not allowed for this collection.`;
+              }
+            }
           }
         }
       ],
@@ -3864,11 +3853,7 @@ const GetDocument = ({
 };
 const updateDocument = async (cms, relativePath, collection, mutationInfo, values) => {
   const api = new TinaAdminApi(cms);
-  const { includeCollection, includeTemplate } = mutationInfo;
-  const params = transformDocumentIntoMutationRequestPayload(values, {
-    includeCollection,
-    includeTemplate
-  });
+  const params = api.schema.transformPayload(collection.name, values);
   if (await api.isAuthenticated()) {
     await api.updateDocument(collection.name, relativePath, params);
   } else {
@@ -4081,6 +4066,7 @@ const CheckSchema = ({
 };
 const TinaAdmin = ({
   preview,
+  Playground,
   config,
   schemaJson
 }) => {
@@ -4113,6 +4099,9 @@ const TinaAdmin = ({
           config,
           preview
         })
+      }), /* @__PURE__ */ React.createElement(Route, {
+        path: "graphql",
+        element: /* @__PURE__ */ React.createElement(PlainLayout, null, /* @__PURE__ */ React.createElement(Playground, null))
       }), /* @__PURE__ */ React.createElement(Route, {
         path: "collections/:collectionName/new",
         element: /* @__PURE__ */ React.createElement(DefaultWrapper, {
@@ -4174,6 +4163,21 @@ const DefaultWrapper = ({
     className: "flex-1 relative"
   }, children)));
 };
+const PlainLayout = ({ children }) => {
+  return /* @__PURE__ */ React.createElement("div", {
+    style: {
+      position: "fixed",
+      top: 0,
+      left: 0,
+      width: "100%",
+      height: "100%",
+      overflow: "auto",
+      background: "#F6F6F9",
+      fontFamily: "'Inter', sans-serif",
+      zIndex: 9999
+    }
+  }, children);
+};
 class RouteMappingPlugin {
   constructor(mapper) {
     this.__type = "tina-admin";

package/dist/index.js

@@ -73,12 +73,18 @@
     ]).optional(),
     timestamp: zod.z.number().optional()
   });
-  async function asyncPoll(fn, pollInterval = 5 * 1e3, pollTimeout = 30 * 1e3) {
+  function asyncPoll(fn, pollInterval = 5 * 1e3, pollTimeout = 30 * 1e3) {
     const endTime = new Date().getTime() + pollTimeout;
+    let stop = false;
+    const cancel = () => {
+      stop = true;
+    };
     const checkCondition = (resolve, reject) => {
       Promise.resolve(fn()).then((result) => {
         const now = new Date().getTime();
-        if (result.done) {
+        if (stop) {
+          reject(new Error("AsyncPoller: cancelled"));
+        } else if (result.done) {
           resolve(result.data);
         } else if (now < endTime) {
           setTimeout(checkCondition, pollInterval, resolve, reject);
@@ -89,7 +95,7 @@
         reject(err);
       });
     };
-    return new Promise(checkCondition);
+    return [new Promise(checkCondition), cancel];
   }
   class Client {
     constructor({ tokenStorage = "MEMORY", ...options }) {
@@ -141,6 +147,7 @@ mutation addPendingDocumentMutation(
         });
         return graphql.parse(data.getOptimizedQuery);
       };
+      this.tinaGraphQLVersion = options.tinaGraphQLVersion;
       this.onLogin = (_d = (_c = (_b = (_a = options.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.admin) == null ? void 0 : _c.auth) == null ? void 0 : _d.onLogin;
       this.onLogout = (_h = (_g = (_f = (_e = options.schema) == null ? void 0 : _e.config) == null ? void 0 : _f.admin) == null ? void 0 : _g.auth) == null ? void 0 : _h.onLogout;
       if ((_l = (_k = (_j = (_i = options.schema) == null ? void 0 : _i.config) == null ? void 0 : _j.admin) == null ? void 0 : _k.auth) == null ? void 0 : _l.logout) {
@@ -225,7 +232,7 @@ mutation addPendingDocumentMutation(
       this.frontendUrl = ((_b = this.options.tinaioConfig) == null ? void 0 : _b.frontendUrlOverride) || "https://app.tina.io";
       this.identityApiUrl = ((_c = this.options.tinaioConfig) == null ? void 0 : _c.identityApiUrlOverride) || "https://identity.tinajs.io";
       this.contentApiBase = ((_d = this.options.tinaioConfig) == null ? void 0 : _d.contentApiUrlOverride) || `https://content.tinajs.io`;
-      this.contentApiUrl = this.options.customContentApiUrl || `${this.contentApiBase}/content/${this.options.clientId}/github/${encodedBranch}`;
+      this.contentApiUrl = this.options.customContentApiUrl || `${this.contentApiBase}/${this.tinaGraphQLVersion}/content/${this.options.clientId}/github/${encodedBranch}`;
     }
     async request(query, { variables }) {
       const res = await fetch(this.contentApiUrl, {
@@ -245,6 +252,13 @@ mutation addPendingDocumentMutation(
         if (resBody.message) {
           errorMessage = `${errorMessage}, Response: ${resBody.message}`;
         }
+        errorMessage = `${errorMessage}, Please check that the following information is correct: 
+	clientId: ${this.options.clientId}
+	branch: ${this.branch}.`;
+        if (this.branch !== "main") {
+          errorMessage = `${errorMessage}
+	Note: This error can occur if the branch does not exist on GitHub or on Tina Cloud`;
+        }
         throw new Error(errorMessage);
       }
       const json = await res.json();
@@ -390,15 +404,15 @@ mutation addPendingDocumentMutation(
         return null;
       }
     }
-    async waitForIndexStatus({ ref }) {
+    waitForIndexStatus({ ref }) {
       try {
-        const result = await asyncPoll(async () => {
+        const [prom, cancel] = asyncPoll(async () => {
           try {
-            const result2 = await this.getIndexStatus({ ref });
-            if (!(result2.status === "inprogress" || result2.status === "unknown")) {
+            const result = await this.getIndexStatus({ ref });
+            if (!(result.status === "inprogress" || result.status === "unknown")) {
               return Promise.resolve({
                 done: true,
-                data: result2
+                data: result
               });
             } else {
               return Promise.resolve({
@@ -409,7 +423,7 @@ mutation addPendingDocumentMutation(
             return Promise.reject(err);
           }
         }, 5e3, 9e5);
-        return result;
+        return [prom, cancel];
       } catch (error) {
         if (error.message === "AsyncPoller: reached timeout") {
           console.warn(error);
@@ -477,6 +491,7 @@ mutation addPendingDocumentMutation(
         ...props,
         clientId: "",
         branch: "",
+        tinaGraphQLVersion: "",
         customContentApiUrl: props && props.customContentApiUrl ? props.customContentApiUrl : DEFAULT_LOCAL_TINA_GQL_SERVER_URL
       };
       super(clientProps);
@@ -548,14 +563,16 @@ mutation addPendingDocumentMutation(
     branch,
     tinaioConfig,
     schema,
-    apiUrl
+    apiUrl,
+    tinaGraphQLVersion
   }) => {
     return isLocalClient ? new LocalClient({ customContentApiUrl: apiUrl, schema }) : new Client({
       clientId: clientId || "",
       branch: branch || "main",
       tokenStorage: "LOCAL_STORAGE",
       tinaioConfig,
-      schema
+      schema,
+      tinaGraphQLVersion
     });
   };
   function assertShape(value, yupSchema, errorMessage) {
@@ -2317,7 +2334,8 @@ mutation addPendingDocumentMutation(
       cmsCallback: props.cmsCallback,
       mediaStore: props.mediaStore,
       apiUrl: apiURL,
-      schema: { ...schema, config: { ...schema.config, ...props } }
+      schema: { ...schema, config: { ...schema.config, ...props } },
+      tinaGraphQLVersion: props.tinaGraphQLVersion
     }, /* @__PURE__ */ React__default["default"].createElement("style", null, styles), /* @__PURE__ */ React__default["default"].createElement(ErrorBoundary, null, props.children)));
   };
   const Loader = (props) => {
@@ -3622,42 +3640,6 @@ This will work when developing locally but NOT when deployed to production.
   function HiChevronRight(props) {
     return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 20 20", "fill": "currentColor" }, "child": [{ "tag": "path", "attr": { "fillRule": "evenodd", "d": "M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z", "clipRule": "evenodd" } }] })(props);
   }
-  const transformDocumentIntoMutationRequestPayload = (document, instructions) => {
-    const { _collection, __typename, _template, ...rest } = document;
-    const params = transformParams(rest);
-    const paramsWithTemplate = instructions.includeTemplate ? { [_template]: params } : params;
-    return instructions.includeCollection ? { [_collection]: paramsWithTemplate } : paramsWithTemplate;
-  };
-  const transformParams = (data) => {
-    if (["string", "number", "boolean"].includes(typeof data)) {
-      return data;
-    }
-    if (Array.isArray(data)) {
-      return data.map((item) => transformParams(item));
-    }
-    try {
-      assertShape(data, (yup2) => yup2.object({ _template: yup2.string().required() }));
-      const { _template, __typename, ...rest } = data;
-      const nested = transformParams(rest);
-      return { [_template]: nested };
-    } catch (e) {
-      if (e.message === "Failed to assertShape - _template is a required field") {
-        if (!data) {
-          return [];
-        }
-        const accum = {};
-        Object.entries(data).map(([keyName, value]) => {
-          accum[keyName] = transformParams(value);
-        });
-        return accum;
-      } else {
-        if (!data) {
-          return [];
-        }
-        throw e;
-      }
-    }
-  };
   function FaLock(props) {
     return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 448 512" }, "child": [{ "tag": "path", "attr": { "d": "M400 224h-24v-72C376 68.2 307.8 0 224 0S72 68.2 72 152v72H48c-26.5 0-48 21.5-48 48v192c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V272c0-26.5-21.5-48-48-48zm-104 0H152v-72c0-39.7 32.3-72 72-72s72 32.3 72 72v72z" } }] })(props);
   }
@@ -3667,15 +3649,11 @@ This will work when developing locally but NOT when deployed to production.
   const createDocument = async (cms, collection, template, mutationInfo, values) => {
     const api = new TinaAdminApi(cms);
     const { filename, ...leftover } = values;
-    const { includeCollection, includeTemplate } = mutationInfo;
     const relativePath = `${filename}.${collection.format}`;
-    const params = transformDocumentIntoMutationRequestPayload({
+    const params = api.schema.transformPayload(collection.name, {
       _collection: collection.name,
       ...template && { _template: template.name },
       ...leftover
-    }, {
-      includeCollection,
-      includeTemplate
     });
     if (await api.isAuthenticated()) {
       await api.createDocument(collection.name, relativePath, params);
@@ -3780,6 +3758,7 @@ This will work when developing locally but NOT when deployed to production.
             description: /* @__PURE__ */ React__default["default"].createElement("span", null, "A unique filename for the content.", /* @__PURE__ */ React__default["default"].createElement("br", null), "Examples: ", /* @__PURE__ */ React__default["default"].createElement("code", null, "My_Document"), ", ", /* @__PURE__ */ React__default["default"].createElement("code", null, "My_Document.en"), ",", " ", /* @__PURE__ */ React__default["default"].createElement("code", null, "sub-folder/My_Document")),
             placeholder: `My_Document`,
             validate: (value, allValues, meta) => {
+              var _a3, _b3;
               if (!value) {
                 if (meta.dirty) {
                   return "Required";
@@ -3790,6 +3769,16 @@ This will work when developing locally but NOT when deployed to production.
               if (value && !isValid) {
                 return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
               }
+              if (((_a3 = schemaCollection.match) == null ? void 0 : _a3.exclude) || ((_b3 = schemaCollection.match) == null ? void 0 : _b3.include)) {
+                const filePath = `${schemaTools.normalizePath(schemaCollection.path)}/${value}.${schemaCollection.format || "md"}`;
+                const match = schema.matchFiles({
+                  files: [filePath],
+                  collection: schemaCollection
+                });
+                if (match.length === 0) {
+                  return `The filename "${value}" is not allowed for this collection.`;
+                }
+              }
             }
           }
         ],
@@ -3879,11 +3868,7 @@ This will work when developing locally but NOT when deployed to production.
   };
   const updateDocument = async (cms, relativePath, collection, mutationInfo, values) => {
     const api = new TinaAdminApi(cms);
-    const { includeCollection, includeTemplate } = mutationInfo;
-    const params = transformDocumentIntoMutationRequestPayload(values, {
-      includeCollection,
-      includeTemplate
-    });
+    const params = api.schema.transformPayload(collection.name, values);
     if (await api.isAuthenticated()) {
       await api.updateDocument(collection.name, relativePath, params);
     } else {
@@ -4096,6 +4081,7 @@ This will work when developing locally but NOT when deployed to production.
   };
   const TinaAdmin = ({
     preview,
+    Playground,
     config,
     schemaJson
   }) => {
@@ -4128,6 +4114,9 @@ This will work when developing locally but NOT when deployed to production.
             config,
             preview
           })
+        }), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
+          path: "graphql",
+          element: /* @__PURE__ */ React__default["default"].createElement(PlainLayout, null, /* @__PURE__ */ React__default["default"].createElement(Playground, null))
         }), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
           path: "collections/:collectionName/new",
           element: /* @__PURE__ */ React__default["default"].createElement(DefaultWrapper, {
@@ -4189,6 +4178,21 @@ This will work when developing locally but NOT when deployed to production.
       className: "flex-1 relative"
     }, children)));
   };
+  const PlainLayout = ({ children }) => {
+    return /* @__PURE__ */ React__default["default"].createElement("div", {
+      style: {
+        position: "fixed",
+        top: 0,
+        left: 0,
+        width: "100%",
+        height: "100%",
+        overflow: "auto",
+        background: "#F6F6F9",
+        fontFamily: "'Inter', sans-serif",
+        zIndex: 9999
+      }
+    }, children);
+  };
   class RouteMappingPlugin {
     constructor(mapper) {
       this.__type = "tina-admin";

package/dist/internalClient/index.d.ts

@@ -16,6 +16,7 @@ interface ServerOptions {
     schema?: Schema;
     clientId: string;
     branch: string;
+    tinaGraphQLVersion: string;
     customContentApiUrl?: string;
     getTokenFn?: () => Promise<TokenObject>;
     tinaioConfig?: TinaIOConfig;
@@ -104,7 +105,7 @@ pollInterval?: number,
  *
  * Default 30 seconds.
  */
-pollTimeout?: number): Promise<T>;
+pollTimeout?: number): ((() => void) | Promise<T>)[];
 export declare class Client {
     onLogin?: OnLoginFunc;
     onLogout?: () => Promise<void>;
@@ -117,6 +118,7 @@ export declare class Client {
     clientId: string;
     contentApiBase: string;
     query: string;
+    tinaGraphQLVersion: string;
     setToken: (_token: TokenObject) => void;
     private getToken;
     private token;
@@ -200,7 +202,9 @@ export declare class Client {
     }>;
     waitForIndexStatus({ ref }: {
         ref: string;
-    }): Promise<any>;
+    }): (Promise<any> | (() => void))[] | {
+        status: string;
+    };
     getIndexStatus({ ref }: {
         ref: string;
     }): Promise<{
@@ -226,7 +230,7 @@ export declare class LocalClient extends Client {
     constructor(props?: {
         customContentApiUrl?: string;
         schema?: Schema;
-    } & Omit<ServerOptions, 'clientId' | 'branch'>);
+    } & Omit<ServerOptions, 'clientId' | 'branch' | 'tinaGraphQLVersion'>);
     get isLocalMode(): boolean;
     logout(): Promise<void>;
     authenticate(): Promise<{

package/dist/types/cms.d.ts

@@ -51,5 +51,7 @@ declare type QueryProviderProps = {
     /** The `data` from getStaticProps */
     data?: never;
 };
-export declare type TinaCMSProviderDefaultProps = QueryProviderProps & APIProviderProps & BaseProviderProps & Config;
+export declare type TinaCMSProviderDefaultProps = QueryProviderProps & APIProviderProps & BaseProviderProps & Config & {
+    tinaGraphQLVersion: string;
+};
 export {};

package/dist/utils/index.d.ts

@@ -14,7 +14,8 @@ export interface CreateClientProps {
     branch?: string;
     schema?: Schema;
     apiUrl?: string;
+    tinaGraphQLVersion: string;
 }
-export declare const createClient: ({ clientId, isLocalClient, branch, tinaioConfig, schema, apiUrl, }: CreateClientProps) => Client;
+export declare const createClient: ({ clientId, isLocalClient, branch, tinaioConfig, schema, apiUrl, tinaGraphQLVersion, }: CreateClientProps) => Client;
 export declare function assertShape<T extends unknown>(value: unknown, yupSchema: (args: typeof yup) => yup.AnySchema, errorMessage?: string): asserts value is T;
 export declare function safeAssertShape<T extends unknown>(value: unknown, yupSchema: (args: typeof yup) => yup.AnySchema): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "1.3.3",
+  "version": "1.4.1",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -56,9 +56,9 @@
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@react-hook/window-size": "^3.0.7",
-    "@tinacms/schema-tools": "1.3.4",
+    "@tinacms/schema-tools": "1.4.1",
     "@tinacms/sharedctx": "1.0.1",
-    "@tinacms/toolkit": "1.5.2",
+    "@tinacms/toolkit": "1.6.1",
     "crypto-js": "^4.0.0",
     "encoding": "0.1.13",
     "fetch-ponyfill": "^7.1.0",
@@ -78,7 +78,7 @@
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.2",
     "@testing-library/user-event": "^12.7.0",
-    "@tinacms/scripts": "1.0.4",
+    "@tinacms/scripts": "1.1.0",
     "@types/jest": "^27.0.1",
     "@types/lodash": "^4.14.169",
     "@types/node": "^14.0.13",