tinacms 0.67.2 → 0.68.0

package/dist/index.es.js

@@ -29,7 +29,7 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-import { useCMS, useBranchData, FormMetaPlugin, Form, GlobalFormPlugin, EventBus, Modal, ModalPopup, ModalHeader, ModalBody, ModalActions, Button, LoadingDots, useLocalStorage, TinaCMS, BranchSwitcherPlugin, BranchDataProvider, TinaProvider, Nav, LocalWarning, OverflowMenu, FormStatus, FormBuilder } from "@tinacms/toolkit";
+import { useCMS, Form, GlobalFormPlugin, EventBus, Modal, ModalPopup, ModalHeader, ModalBody, ModalActions, Button, LoadingDots, useLocalStorage, TinaCMS, BranchSwitcherPlugin, BranchDataProvider, TinaProvider, Nav, LocalWarning, OverflowMenu, FormStatus, FormBuilder } from "@tinacms/toolkit";
 export * from "@tinacms/toolkit";
 import * as G from "graphql";
 import { TypeInfo, visit, visitWithTypeInfo, getNamedType, GraphQLObjectType, isLeafType, GraphQLUnionType, isScalarType as isScalarType$1, getIntrospectionQuery, buildClientSchema, print, parse } from "graphql";
@@ -409,7 +409,7 @@ function safeAssertShape(value, yupSchema) {
     return false;
   }
 }
-function useGraphqlFormsUnstable({
+function useGraphqlForms({
   variables,
   onSubmit,
   query,
@@ -427,239 +427,6 @@ function useGraphqlFormsUnstable({
   });
   return [state.data, state.status !== "done"];
 }
-function useGraphqlForms({
-  variables,
-  onSubmit,
-  formify: formify2 = null,
-  query
-}) {
-  const cms = useCMS();
-  const [formValues, setFormValues] = React.useState({});
-  const [data, setData] = React.useState(null);
-  const [initialData, setInitialData] = React.useState({});
-  const [pendingReset, setPendingReset] = React.useState(null);
-  const [isLoading, setIsLoading] = React.useState(true);
-  const [newUpdate, setNewUpdate] = React.useState(null);
-  const { currentBranch } = useBranchData();
-  const updateData = async () => {
-    var _a;
-    if (newUpdate) {
-      const newValue = getIn(formValues, newUpdate.get);
-      const activeForm = getIn(data, [newUpdate.queryName, "form"].join("."));
-      if (!activeForm) {
-        throw new Error(`Unable to find form for query ${newUpdate.queryName}`);
-      }
-      if (activeForm == null ? void 0 : activeForm.paths) {
-        const asyncUpdate = (_a = activeForm.paths) == null ? void 0 : _a.find((p) => p.dataPath.join(".") === newUpdate.setReference);
-        if (asyncUpdate) {
-          const res = await cms.api.tina.request(asyncUpdate.queryString, {
-            variables: { id: newValue }
-          });
-          const newData2 = setIn(data, newUpdate.set, res.node);
-          const newDataAndNewJSONData2 = setIn(newData2, newUpdate.set.replace("data", "dataJSON"), newValue);
-          setData(newDataAndNewJSONData2);
-          setNewUpdate(null);
-          return;
-        }
-      }
-      if (newUpdate.lookup) {
-        const field = getFieldUpdate(newUpdate, activeForm, formValues);
-        if (field && field.typeMap) {
-          newValue.forEach((item) => {
-            if (!item.__typename) {
-              item["__typename"] = field.typeMap[item._template];
-            }
-          });
-        }
-      }
-      const newData = setIn(data, newUpdate.set, newValue);
-      const newDataAndNewJSONData = setIn(newData, newUpdate.set.replace("data", "dataJSON"), newValue);
-      setData(newDataAndNewJSONData);
-      setNewUpdate(null);
-    }
-  };
-  React.useEffect(() => {
-    updateData();
-  }, [JSON.stringify(formValues)]);
-  React.useEffect(() => {
-    if (pendingReset) {
-      setData(__spreadProps(__spreadValues({}, data), { [pendingReset]: initialData[pendingReset] }));
-      setPendingReset(null);
-    }
-  }, [pendingReset]);
-  React.useEffect(() => {
-    if (!query) {
-      setIsLoading(false);
-      return;
-    }
-    const useUnstableFormify = (cms == null ? void 0 : cms.flags.get("use-unstable-formify")) === false ? false : true;
-    const formIds = [];
-    setIsLoading(true);
-    cms.api.tina.requestWithForm((gql2) => gql2(query), {
-      variables,
-      useUnstableFormify
-    }).then((payload) => {
-      cms.plugins.remove(new FormMetaPlugin({ name: "tina-admin-link" }));
-      setData(payload);
-      setInitialData(payload);
-      setIsLoading(false);
-      Object.entries(payload).map(([queryName, result]) => {
-        formIds.push(queryName);
-        const canBeFormified = safeAssertShape(result, (yup2) => yup2.object({
-          values: yup2.object().required(),
-          form: yup2.object().required()
-        }));
-        if (!canBeFormified) {
-          return;
-        }
-        assertShape(result, (yup2) => yup2.object({
-          values: yup2.object().required(),
-          form: yup2.object().required()
-        }), `Unable to build form shape for fields at ${queryName}`);
-        let formConfig = {};
-        const formCommon = {
-          id: queryName,
-          initialValues: result.values,
-          reset: () => {
-            setPendingReset(queryName);
-          },
-          onSubmit: async (payload2) => {
-            try {
-              const params = transformDocumentIntoMutationRequestPayload(payload2, result.form.mutationInfo);
-              const variables2 = { params };
-              const mutationString = result.form.mutationInfo.string;
-              if (onSubmit) {
-                onSubmit({
-                  queryString: mutationString,
-                  mutationString,
-                  variables: variables2
-                });
-              } else {
-                try {
-                  await cms.api.tina.request(mutationString, {
-                    variables: variables2
-                  });
-                  cms.alerts.success("Document saved!");
-                } catch (e) {
-                  cms.alerts.error("There was a problem saving your document");
-                  console.error(e);
-                }
-              }
-            } catch (e) {
-              console.error(e);
-              cms.alerts.error("There was a problem saving your document");
-            }
-          }
-        };
-        if (cms.api.tina.schema) {
-          const enrichedSchema = cms.api.tina.schema;
-          const collection = enrichedSchema.getCollection(result._internalSys.collection.name);
-          const template = enrichedSchema.getTemplateForData({
-            collection,
-            data: result.values
-          });
-          const formInfo = resolveForm({
-            collection,
-            basename: collection.name,
-            schema: enrichedSchema,
-            template
-          });
-          formConfig = __spreadValues({
-            label: formInfo.label,
-            fields: formInfo.fields
-          }, formCommon);
-        } else {
-          formConfig = __spreadValues({
-            label: result.form.label,
-            fields: result.form.fields
-          }, formCommon);
-        }
-        const { createForm, createGlobalForm } = generateFormCreators(cms);
-        const SKIPPED = "SKIPPED";
-        let form;
-        let skipped;
-        const skip = () => {
-          skipped = SKIPPED;
-        };
-        if (skipped)
-          return;
-        if (formify2) {
-          form = formify2({ formConfig, createForm, createGlobalForm, skip }, cms);
-        } else {
-          form = createForm(formConfig);
-        }
-        if (!(form instanceof Form)) {
-          if (skipped === SKIPPED) {
-            return;
-          }
-          throw new Error("formify must return a form or skip()");
-        }
-        const { change } = form.finalForm;
-        form.finalForm.change = (name, value) => {
-          let referenceName = "";
-          if (typeof name === "string") {
-            referenceName = name.split(".").filter((item) => isNaN(Number(item))).join(".");
-          } else {
-            throw new Error(`Expected name to be of type string for FinalForm change callback`);
-          }
-          setNewUpdate({
-            queryName,
-            get: [queryName, "values", name].join("."),
-            set: [queryName, "data", name].join("."),
-            setReference: [queryName, "data", referenceName].join(".")
-          });
-          return change(name, value);
-        };
-        const _a = form.finalForm.mutators, { insert, move, remove } = _a, rest = __objRest(_a, ["insert", "move", "remove"]);
-        const prepareNewUpdate = (name, lookup) => {
-          const extra = {};
-          if (lookup) {
-            extra["lookup"] = lookup;
-          }
-          const referenceName = name.split(".").filter((item) => isNaN(Number(item))).join(".");
-          setNewUpdate(__spreadValues({
-            queryName,
-            get: [queryName, "values", name].join("."),
-            set: [queryName, "data", name].join("."),
-            setReference: [queryName, "data", referenceName].join(".")
-          }, extra));
-        };
-        form.finalForm.mutators = __spreadValues({
-          insert: (...args) => {
-            const fieldName = args[0];
-            prepareNewUpdate(fieldName, fieldName);
-            insert(...args);
-          },
-          move: (...args) => {
-            const fieldName = args[0];
-            prepareNewUpdate(fieldName, fieldName);
-            move(...args);
-          },
-          remove: (...args) => {
-            const fieldName = args[0];
-            prepareNewUpdate(fieldName, fieldName);
-            remove(...args);
-          }
-        }, rest);
-        form.subscribe(({ values }) => {
-          setFormValues(__spreadProps(__spreadValues({}, formValues), { [queryName]: { values } }));
-        }, { values: true });
-      });
-    }).catch((e) => {
-      setIsLoading(false);
-      throw new Error(`There was a problem setting up forms for your query: ${e.message}`);
-    });
-    return () => {
-      formIds.forEach((name) => {
-        const formPlugin = cms.forms.find(name);
-        if (formPlugin) {
-          cms.forms.remove(formPlugin);
-        }
-      });
-    };
-  }, [query, JSON.stringify(variables), currentBranch]);
-  return [data, isLoading];
-}
 const transformDocumentIntoMutationRequestPayload = (document, instructions) => {
   const _a = document, { _collection, __typename, _template } = _a, rest = __objRest(_a, ["_collection", "__typename", "_template"]);
   const params = transformParams(rest);
@@ -696,37 +463,7 @@ const transformParams = (data) => {
     }
   }
 };
-const getFieldUpdate = (newUpdate, activeForm, formValues) => {
-  const items = newUpdate.lookup.split(".");
-  let currentFields = activeForm.fields;
-  items.map((item, index) => {
-    const lookupName = items.slice(0, index + 1).join(".");
-    const value = getIn(formValues, [newUpdate.queryName, "values", lookupName].join("."));
-    if (isNaN(Number(item))) {
-      if (Array.isArray(currentFields)) {
-        currentFields = currentFields.find((field) => field.name === item);
-      }
-    } else {
-      const template = currentFields.templates ? currentFields.templates[value._template] : currentFields;
-      currentFields = template.fields;
-    }
-  });
-  return currentFields;
-};
-const generateFormCreators = (cms) => {
-  const createForm = (formConfig) => {
-    const form = new Form(formConfig);
-    cms.forms.add(form);
-    return form;
-  };
-  const createGlobalForm = (formConfig, options) => {
-    const form = new Form(formConfig);
-    cms.plugins.add(new GlobalFormPlugin(form, options == null ? void 0 : options.icon, options == null ? void 0 : options.layout));
-    return form;
-  };
-  return { createForm, createGlobalForm };
-};
-const generateFormCreatorsUnstable = (cms, showInSidebar) => {
+const generateFormCreators = (cms, showInSidebar) => {
   const createForm = (formConfig) => {
     const form = new Form(formConfig);
     if (showInSidebar) {
@@ -810,7 +547,7 @@ const getPathToChange = (documentBlueprint, formNode, event) => {
   return accum.join(".");
 };
 const buildForm = (doc, cms, formify2, showInSidebar = false, onSubmit) => {
-  const { createForm, createGlobalForm } = generateFormCreatorsUnstable(cms, showInSidebar);
+  const { createForm, createGlobalForm } = generateFormCreators(cms, showInSidebar);
   const SKIPPED = "SKIPPED";
   let form;
   let skipped;
@@ -820,25 +557,50 @@ const buildForm = (doc, cms, formify2, showInSidebar = false, onSubmit) => {
   if (skipped)
     return;
   const id = doc._internalSys.path;
+  const enrichedSchema = cms.api.tina.schema;
+  const collection = enrichedSchema.getCollection(doc._internalSys.collection.name);
+  const template = enrichedSchema.getTemplateForData({
+    collection,
+    data: doc._values
+  });
   const formCommon = {
     id,
-    label: doc.form.label,
-    initialValues: doc.values,
+    label: id,
+    initialValues: doc._values,
     onSubmit: async (payload) => {
       try {
-        const params = transformDocumentIntoMutationRequestPayload(payload, doc.form.mutationInfo);
+        const params = transformDocumentIntoMutationRequestPayload(payload, {
+          includeCollection: false,
+          includeTemplate: !!collection.templates
+        });
         const variables = { params };
-        const mutationString = doc.form.mutationInfo.string;
+        const mutationString = `#graphql
+          mutation UpdateDocument($collection: String!, $relativePath: String!, $params: DocumentMutation!) {
+            updateDocument(collection: $collection, relativePath: $relativePath, params: $params) {
+              __typename
+            }
+          }
+        `;
         if (onSubmit) {
           onSubmit({
             queryString: mutationString,
             mutationString,
-            variables
+            variables: {
+              collection: doc._internalSys.collection.name,
+              relativePath: doc._internalSys.relativePath,
+              params: { [doc._internalSys.collection.name]: variables }
+            }
           });
         } else {
           try {
             await cms.api.tina.request(mutationString, {
-              variables
+              variables: {
+                collection: doc._internalSys.collection.name,
+                relativePath: doc._internalSys.relativePath,
+                params: {
+                  [doc._internalSys.collection.name]: variables.params
+                }
+              }
             });
             cms.alerts.success("Document saved!");
           } catch (e) {
@@ -853,29 +615,16 @@ const buildForm = (doc, cms, formify2, showInSidebar = false, onSubmit) => {
     }
   };
   let formConfig = {};
-  if (cms.api.tina.schema) {
-    const enrichedSchema = cms.api.tina.schema;
-    const collection = enrichedSchema.getCollection(doc._internalSys.collection.name);
-    const template = enrichedSchema.getTemplateForData({
-      collection,
-      data: doc.values
-    });
-    const formInfo = resolveForm({
-      collection,
-      basename: collection.name,
-      schema: enrichedSchema,
-      template
-    });
-    formConfig = __spreadValues({
-      label: formInfo.label,
-      fields: formInfo.fields
-    }, formCommon);
-  } else {
-    formConfig = __spreadValues({
-      label: doc.form.label,
-      fields: doc.form.fields
-    }, formCommon);
-  }
+  const formInfo = resolveForm({
+    collection,
+    basename: collection.name,
+    schema: enrichedSchema,
+    template
+  });
+  formConfig = __spreadValues({
+    label: formInfo.label,
+    fields: formInfo.fields
+  }, formCommon);
   if (formify2) {
     form = formify2({
       formConfig,
@@ -994,7 +743,7 @@ const getEventPath = (event, blueprint) => {
     }
     return `[]`;
   }).join(".");
-  const items = [blueprint.id, DATA_NODE_NAME$1, eventPath];
+  const items = [blueprint.id, eventPath];
   const isList = event.field.data.tinaField.list;
   if (isList && !eventPath.endsWith("[]")) {
     items.push(`[]`);
@@ -1029,14 +778,13 @@ const getMatchName = ({ field, prefix, blueprint }) => {
   if (prefix) {
     extra.push(prefix);
   }
-  const matchName = [blueprintName, DATA_NODE_NAME$1, ...extra, fieldName].join(".");
+  const matchName = [blueprintName, ...extra, fieldName].join(".");
   return { matchName, fieldName };
 };
 const getFormNodesFromEvent = (state, event) => {
   const formNodes = state.formNodes.filter((formNode) => formNode.documentFormId === event.formId);
   return formNodes;
 };
-const DATA_NODE_NAME$1 = "data";
 const printEvent = (event) => {
   var _a, _b;
   return {
@@ -1242,14 +990,14 @@ function buildPath({
 }
 const node = G.parse(`
  query Sample {
-   _internalSys: sys {
+   _internalSys: _sys {
      path
+     relativePath
      collection {
        name
      }
    }
-   form
-   values
+   _values
  }`);
 const metaFields = node.definitions[0].selectionSet.selections;
 const getRelativeBlueprint = (path) => {
@@ -1266,6 +1014,21 @@ const getRelativeBlueprint = (path) => {
   const documentBlueprintPath = path.slice(0, indexOfLastNode + 1);
   return getBlueprintNamePath({ path: documentBlueprintPath });
 };
+const isSysField = (fieldNode) => {
+  if (fieldNode.name.value === "__typename") {
+    return true;
+  }
+  if (fieldNode.name.value === "_sys") {
+    return true;
+  }
+  if (fieldNode.name.value === "_values") {
+    return true;
+  }
+  if (fieldNode.name.value === "id") {
+    return true;
+  }
+  return false;
+};
 const getBlueprintId = (path) => {
   const namePath = [];
   const aliasPath = [];
@@ -1283,10 +1046,9 @@ const NOOP = "This is either an error or is not yet supported";
 const UNEXPECTED = "Formify encountered an unexpected error, please contact support";
 const EDGES_NODE_NAME = "edges";
 const NODE_NAME = "node";
-const COLLECTION_FIELD_NAME = "getCollection";
-const COLLECTIONS_FIELD_NAME = "getCollections";
+const COLLECTION_FIELD_NAME = "collection";
+const COLLECTIONS_FIELD_NAME = "collections";
 const COLLECTIONS_DOCUMENTS_NAME = "documents";
-const DATA_NODE_NAME = "data";
 const formify = async ({
   schema,
   query,
@@ -1392,22 +1154,15 @@ const formify = async ({
     showInSidebar = false
   }) {
     let extraFields = [];
-    let hasDataJSONField = false;
+    const hasDataJSONField = false;
     let hasValuesField = false;
     let shouldFormify = false;
     selection.selectionSet.selections.forEach((selection2) => {
       if (selection2.kind === "Field") {
-        if (selection2.name.value === "dataJSON") {
-          shouldFormify = true;
-          hasDataJSONField = true;
-        }
-        if (selection2.name.value === "values") {
-          shouldFormify = true;
+        shouldFormify = true;
+        if (selection2.name.value === "_values") {
           hasValuesField = true;
         }
-        if (selection2.name.value === "data") {
-          shouldFormify = true;
-        }
       }
     });
     if (shouldFormify) {
@@ -1446,33 +1201,11 @@ const formify = async ({
                 });
               }
               case "Field": {
-                if (selectionNode.name.value === DATA_NODE_NAME) {
-                  const field = getObjectField(type, selectionNode);
-                  return __spreadProps(__spreadValues({}, selectionNode), {
-                    selectionSet: {
-                      kind: "SelectionSet",
-                      selections: [
-                        ...selectionNode.selectionSet.selections.map((subSelectionNode) => {
-                          switch (subSelectionNode.kind) {
-                            case "Field":
-                              return formifyFieldNode({
-                                fieldNode: subSelectionNode,
-                                parentType: field.type,
-                                path: buildPath({
-                                  fieldNode: selectionNode,
-                                  type: field.type,
-                                  path
-                                })
-                              });
-                            default:
-                              throw new FormifyError("UNEXPECTED", `selection ${subSelectionNode.kind}`);
-                          }
-                        })
-                      ]
-                    }
-                  });
-                }
-                return selectionNode;
+                return formifyFieldNode({
+                  fieldNode: selectionNode,
+                  parentType: type,
+                  path
+                });
               }
               default:
                 throw new FormifyError("UNEXPECTED");
@@ -1495,16 +1228,19 @@ const formify = async ({
     if (!field) {
       return fieldNode;
     }
-    const blueprint = blueprints.find((blueprint2) => blueprint2.id === getRelativeBlueprint(path));
-    if (!blueprint) {
-      return fieldNode;
-    }
     const fieldPath = buildPath({
       fieldNode,
       type: field.type,
       parentTypename: G.getNamedType(parentType).name,
       path
     });
+    const blueprint = blueprints.find((blueprint2) => blueprint2.id === getRelativeBlueprint(fieldPath));
+    if (!blueprint) {
+      return fieldNode;
+    }
+    if (isSysField(fieldNode)) {
+      return fieldNode;
+    }
     blueprint.fields.push({
       id: getBlueprintId(fieldPath),
       documentBlueprintId: blueprint.id,
@@ -2050,10 +1786,10 @@ const useFormify = ({
                     query Node($id: String!) {
                       node(id: $id) {
                         ...on Document {
-                          form
-                          values
-                          _internalSys: sys {
+                          _values
+                          _internalSys: _sys {
                             path
+                            relativePath
                             collection {
                               name
                             }
@@ -2163,9 +1899,7 @@ const useFormify = ({
               dispatch({
                 type: "setIn",
                 value: __spreadProps(__spreadValues({}, changeSet), {
-                  value: __spreadProps(__spreadValues({}, res.node), {
-                    data
-                  })
+                  value: __spreadValues(__spreadValues({}, res.node), data)
                 })
               });
             }).catch((e) => {
@@ -2284,10 +2018,10 @@ const useFormify = ({
                       query Node($id: String!) {
                         node(id: $id) {
                           ...on Document {
-                            form
-                            values
-                            _internalSys: sys {
+                            _values
+                            _internalSys: _sys {
                               path
+                              relativePath
                               collection {
                                 name
                               }
@@ -2325,13 +2059,11 @@ const useFormify = ({
                       }
                     }
                   `, { variables: { id: value } });
-            data[keyName] = __spreadProps(__spreadValues({}, res.node), {
-              data: await resolveSubFields({
-                formNode: subDocumentFormNode,
-                form: form2,
-                loc: location
-              })
-            });
+            data[keyName] = __spreadValues(__spreadValues({}, res.node), await resolveSubFields({
+              formNode: subDocumentFormNode,
+              form: form2,
+              loc: location
+            }));
           });
           break;
         default:
@@ -2692,19 +2424,19 @@ const useTinaAuthRedirect = () => {
 class TinaAdminApi {
   constructor(cms) {
     this.api = cms.api.tina;
+    this.schema = cms.api.tina.schema;
   }
   async isAuthenticated() {
     return await this.api.isAuthenticated();
   }
   async fetchCollections() {
-    const response = await this.api.request(`#graphql
-      query{ 
-        getCollections { 
-          label, 
-          name 
-        } 
-      }`, { variables: {} });
-    return response;
+    try {
+      const collections = this.schema.getCollections();
+      return collections;
+    } catch (e) {
+      console.error(`[TinaAdminAPI] Unable to fetchCollections(): ${e.message}`);
+      return [];
+    }
   }
   async deleteDocument({
     collection,
@@ -2718,9 +2450,10 @@ class TinaAdminApi {
 }`, { variables: { collection, relativePath } });
   }
   async fetchCollection(collectionName, includeDocuments) {
-    const response = await this.api.request(`#graphql
+    if (includeDocuments === true) {
+      const response = await this.api.request(`#graphql
       query($collection: String!, $includeDocuments: Boolean!){
-        getCollection(collection: $collection){
+        collection(collection: $collection){
           name
           label
           format
@@ -2730,7 +2463,7 @@ class TinaAdminApi {
             edges {
               node {
                 ... on Document {
-                  sys {
+                  _sys {
                     template
                     breadcrumbs
                     path
@@ -2745,27 +2478,28 @@ class TinaAdminApi {
           }
         }
       }`, { variables: { collection: collectionName, includeDocuments } });
-    return response;
+      return response.collection;
+    } else {
+      try {
+        const collection = this.schema.getCollection(collectionName);
+        return collection;
+      } catch (e) {
+        console.error(`[TinaAdminAPI] Unable to fetchCollection(): ${e.message}`);
+        return void 0;
+      }
+    }
   }
   async fetchDocument(collectionName, relativePath) {
     const response = await this.api.request(`#graphql
       query($collection: String!, $relativePath: String!) {
-        getDocument(collection:$collection, relativePath:$relativePath) {
+        document(collection:$collection, relativePath:$relativePath) {
           ... on Document {
-            form
-            values
+            _values
           }
         }
       }`, { variables: { collection: collectionName, relativePath } });
     return response;
   }
-  async fetchDocumentFields() {
-    const response = await this.api.request(`#graphql
-      query { 
-        getDocumentFields 
-      }`, { variables: {} });
-    return response;
-  }
   async createDocument(collectionName, relativePath, params) {
     const response = await this.api.request(`#graphql
       mutation($collection: String!, $relativePath: String!, $params: DocumentMutation!) {
@@ -2786,7 +2520,7 @@ class TinaAdminApi {
   async updateDocument(collectionName, relativePath, params) {
     const response = await this.api.request(`#graphql
       mutation($collection: String!, $relativePath: String!, $params: DocumentMutation!) {
-        updateDocument( 
+        updateDocument(
           collection: $collection,
           relativePath: $relativePath,
           params: $params
@@ -2977,7 +2711,7 @@ class ContentCreatorPlugin {
         } else {
           cms.alerts.info("Document created!");
           if (typeof this.onNewDocument === "function") {
-            this.onNewDocument(res.addPendingDocument.sys);
+            this.onNewDocument(res.addPendingDocument._sys);
           }
         }
       } catch (e) {
@@ -2997,7 +2731,7 @@ const useDocumentCreatorPlugin = (args) => {
       var _a;
       const res = await cms.api.tina.request((gql2) => gql2`
           {
-            getCollections {
+            collections {
               label
               slug
               format
@@ -3006,7 +2740,7 @@ const useDocumentCreatorPlugin = (args) => {
           }
         `, { variables: {} });
       const allCollectionOptions = [];
-      res.getCollections.forEach((collection) => {
+      res.collections.forEach((collection) => {
         const value = collection.slug;
         const label = `${collection.label}`;
         allCollectionOptions.push({ value, label });
@@ -3028,7 +2762,7 @@ const useDocumentCreatorPlugin = (args) => {
         { value: "", label: "Choose Template" }
       ];
       if (values.collection) {
-        const filteredCollection = res.getCollections.find((c) => c.slug === values.collection);
+        const filteredCollection = res.collections.find((c) => c.slug === values.collection);
         (_a = filteredCollection == null ? void 0 : filteredCollection.templates) == null ? void 0 : _a.forEach((template) => {
           templateOptions.push({ value: template.name, label: template.label });
         });
@@ -3036,7 +2770,7 @@ const useDocumentCreatorPlugin = (args) => {
       setPlugin(new ContentCreatorPlugin({
         label: "Add Document",
         onNewDocument: args && args.onNewDocument,
-        collections: res.getCollections,
+        collections: res.collections,
         onChange: async ({ values: values2 }) => {
           setValues(values2);
         },
@@ -3133,6 +2867,30 @@ function useTina({
     isLoading
   };
 }
+const TINA_HOST = "content.tinajs.io";
+const parseURL = (url) => {
+  if (url.includes("localhost")) {
+    return { branch: null, isLocalClient: true, clientId: null };
+  }
+  const params = new URL(url);
+  const pattern = new UrlPattern("/content/:clientId/github/*", {
+    escapeChar: " "
+  });
+  const result = pattern.match(params.pathname);
+  const branch = result == null ? void 0 : result._;
+  const clientId = result == null ? void 0 : result.clientId;
+  if (!branch || !clientId) {
+    throw new Error(`Invalid URL format provided. Expected: https://content.tinajs.io/content/<ClientID>/github/<Branch> but but received ${url}`);
+  }
+  if (params.host !== TINA_HOST) {
+    throw new Error(`The only supported hosts are ${TINA_HOST} or localhost, but received ${params.host}.`);
+  }
+  return {
+    branch,
+    clientId,
+    isLocalClient: false
+  };
+};
 const errorButtonStyles = {
   background: "#eb6337",
   padding: "12px 18px",
@@ -3212,21 +2970,6 @@ class ErrorBoundary extends React.Component {
     return this.props.children;
   }
 }
-const parseURL = (url) => {
-  if (url.includes("localhost")) {
-    return { branch: null, isLocalClient: true, clientId: null };
-  }
-  const tinaHost = "content.tinajs.io";
-  const params = new URL(url);
-  const pattern = new UrlPattern("/content/:clientId/github/:branch");
-  const result = pattern.match(params.pathname);
-  if (params.host !== tinaHost) {
-    throw new Error(`The only supported hosts are ${tinaHost} or localhost, but received ${params.host}.`);
-  }
-  return __spreadProps(__spreadValues({}, result), {
-    isLocalClient: false
-  });
-};
 const TinaCMSProvider2 = (_c) => {
   var _d = _c, {
     query,
@@ -3248,6 +2991,9 @@ const TinaCMSProvider2 = (_c) => {
     clientId: props.clientId,
     isLocalClient: props.isLocalClient
   };
+  if (!schema) {
+    throw new Error("`schema` is required to be passed as a property to `TinaProvider`.  You can learn more about this change here: https://github.com/tinacms/tinacms/pull/2823");
+  }
   return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(TinaCloudProvider, {
     branch,
     clientId,
@@ -3297,25 +3043,13 @@ const TinaDataProvider = ({
     payload: void 0,
     isLoading: true
   });
-  const cms = useCMS();
-  const useUnstableFormify = React.useMemo(() => {
-    if ((cms == null ? void 0 : cms.flags.get("use-unstable-formify")) === false) {
-      return false;
-    }
-    return true;
-  }, [cms == null ? void 0 : cms.flags]);
   return /* @__PURE__ */ React.createElement(TinaDataContext.Provider, {
     value: {
       setRequest,
       isLoading: state.isLoading,
       state: { payload: state.payload }
     }
-  }, useUnstableFormify ? /* @__PURE__ */ React.createElement(FormRegistrarUnstable, {
-    key: request == null ? void 0 : request.query,
-    request,
-    formifyCallback,
-    onPayloadStateChange: setState
-  }) : /* @__PURE__ */ React.createElement(FormRegistrar, {
+  }, /* @__PURE__ */ React.createElement(FormRegistrar, {
     key: request == null ? void 0 : request.query,
     request,
     formifyCallback,
@@ -3344,35 +3078,6 @@ const FormRegistrar = ({
   }, [JSON.stringify(payload), isLoading]);
   return isLoading ? /* @__PURE__ */ React.createElement(Loader, null, /* @__PURE__ */ React.createElement(React.Fragment, null)) : null;
 };
-const FormRegistrarUnstable = (props) => {
-  var _a;
-  if (!((_a = props.request) == null ? void 0 : _a.query)) {
-    return null;
-  }
-  return /* @__PURE__ */ React.createElement(FormRegistrarUnstableInner, __spreadValues({}, props));
-};
-const FormRegistrarUnstableInner = ({
-  request,
-  formifyCallback,
-  onPayloadStateChange
-}) => {
-  const cms = useCMS();
-  const [payload, isLoading] = useGraphqlFormsUnstable({
-    query: request == null ? void 0 : request.query,
-    variables: request == null ? void 0 : request.variables,
-    formify: (args) => {
-      if (formifyCallback) {
-        return formifyCallback(args, cms);
-      } else {
-        return args.createForm(args.formConfig);
-      }
-    }
-  });
-  React.useEffect(() => {
-    onPayloadStateChange({ payload, isLoading });
-  }, [JSON.stringify(payload), isLoading]);
-  return isLoading ? /* @__PURE__ */ React.createElement(Loader, null, /* @__PURE__ */ React.createElement(React.Fragment, null)) : null;
-};
 const Loader = (props) => {
   return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", {
     style: {
@@ -3617,8 +3322,8 @@ const useGetCollections = (cms) => {
     const fetchCollections = async () => {
       if (await api.isAuthenticated()) {
         try {
-          const response = await api.fetchCollections();
-          setCollections(response.getCollections);
+          const collections2 = await api.fetchCollections();
+          setCollections(collections2);
         } catch (error2) {
           console.error(error2);
           setCollections([]);
@@ -3921,8 +3626,8 @@ const useGetCollection = (cms, collectionName, includeDocuments = true) => {
     const fetchCollection = async () => {
       if (await api.isAuthenticated()) {
         try {
-          const response = await api.fetchCollection(collectionName, includeDocuments);
-          setCollection(response.getCollection);
+          const collection2 = await api.fetchCollection(collectionName, includeDocuments);
+          setCollection(collection2);
         } catch (error2) {
           cms.alerts.error(`[${error2.name}] GetCollection failed: ${error2.message}`, 30 * 1e3);
           console.error(error2);
@@ -3988,7 +3693,7 @@ const handleNavigate = (navigate, cms, collection, document) => {
     window.location.href = routeOverride;
     return null;
   } else {
-    navigate(document.sys.breadcrumbs.join("/"));
+    navigate(document._sys.breadcrumbs.join("/"));
   }
 };
 const CollectionListPage = () => {
@@ -4041,9 +3746,9 @@ const CollectionListPage = () => {
       }, /* @__PURE__ */ React.createElement("tbody", {
         className: "divide-y divide-gray-150"
       }, documents.map((document) => {
-        const subfolders = document.node.sys.breadcrumbs.slice(0, -1).join("/");
+        const subfolders = document.node._sys.breadcrumbs.slice(0, -1).join("/");
         return /* @__PURE__ */ React.createElement("tr", {
-          key: `document-${document.node.sys.relativePath}`,
+          key: `document-${document.node._sys.relativePath}`,
           className: ""
         }, /* @__PURE__ */ React.createElement("td", {
           className: "px-6 py-2 whitespace-nowrap"
@@ -4060,19 +3765,19 @@ const CollectionListPage = () => {
           className: "h-5 leading-5 block whitespace-nowrap"
         }, subfolders && /* @__PURE__ */ React.createElement("span", {
           className: "text-xs text-gray-400"
-        }, `${subfolders}/`), /* @__PURE__ */ React.createElement("span", null, document.node.sys.filename))))), /* @__PURE__ */ React.createElement("td", {
+        }, `${subfolders}/`), /* @__PURE__ */ React.createElement("span", null, document.node._sys.filename))))), /* @__PURE__ */ React.createElement("td", {
           className: "px-6 py-4 whitespace-nowrap"
         }, /* @__PURE__ */ React.createElement("span", {
           className: "block text-xs text-gray-400 mb-1 uppercase"
         }, "Extension"), /* @__PURE__ */ React.createElement("span", {
           className: "h-5 leading-5 block text-sm font-medium text-gray-900"
-        }, document.node.sys.extension)), /* @__PURE__ */ React.createElement("td", {
+        }, document.node._sys.extension)), /* @__PURE__ */ React.createElement("td", {
           className: "px-6 py-4 whitespace-nowrap"
         }, /* @__PURE__ */ React.createElement("span", {
           className: "block text-xs text-gray-400 mb-1 uppercase"
         }, "Template"), /* @__PURE__ */ React.createElement("span", {
           className: "h-5 leading-5 block text-sm font-medium text-gray-900"
-        }, document.node.sys.template)), /* @__PURE__ */ React.createElement("td", {
+        }, document.node._sys.template)), /* @__PURE__ */ React.createElement("td", {
           className: "w-0"
         }, /* @__PURE__ */ React.createElement(OverflowMenu, {
           showEmbed: true,
@@ -4084,7 +3789,7 @@ const CollectionListPage = () => {
                 size: "1.3rem"
               }),
               onMouseDown: () => {
-                navigate(`${document.node.sys.filename}`, { replace: true });
+                navigate(`${document.node._sys.filename}`, { replace: true });
               }
             },
             {
@@ -4097,7 +3802,7 @@ const CollectionListPage = () => {
               onMouseDown: () => {
                 setVars({
                   collection: collectionName,
-                  relativePath: document.node.sys.filename + document.node.sys.extension
+                  relativePath: document.node._sys.filename + document.node._sys.extension
                 });
                 setOpen(true);
               }
@@ -4111,7 +3816,7 @@ const CollectionListPage = () => {
 const DeleteModal = ({ close: close2, deleteFunc, filename }) => {
   return /* @__PURE__ */ React.createElement(Modal, null, /* @__PURE__ */ React.createElement(ModalPopup, null, /* @__PURE__ */ React.createElement(ModalHeader, {
     close: close2
-  }, "Reset"), /* @__PURE__ */ React.createElement(ModalBody, {
+  }, "Delete ", filename), /* @__PURE__ */ React.createElement(ModalBody, {
     padded: true
   }, /* @__PURE__ */ React.createElement("p", null, `Are you sure you want to delete ${filename}?`)), /* @__PURE__ */ React.createElement(ModalActions, null, /* @__PURE__ */ React.createElement(Button, {
     style: { flexGrow: 2 },
@@ -4125,72 +3830,6 @@ const DeleteModal = ({ close: close2, deleteFunc, filename }) => {
     }
   }, "Delete"))));
 };
-const useGetDocumentFields = (cms, collectionName, templateName) => {
-  const api = new TinaAdminApi(cms);
-  const [info, setInfo] = useState({
-    collection: void 0,
-    template: void 0,
-    fields: void 0,
-    mutationInfo: void 0
-  });
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState(void 0);
-  useEffect(() => {
-    const fetchDocumentFields = async () => {
-      if (await api.isAuthenticated()) {
-        try {
-          const response = await api.fetchDocumentFields();
-          const documentFields = response.getDocumentFields;
-          const collection = documentFields[collectionName].collection;
-          const mutationInfo = documentFields[collectionName].mutationInfo;
-          let fields = void 0;
-          let template = void 0;
-          if (templateName && documentFields[collectionName].templates && documentFields[collectionName].templates[templateName]) {
-            template = documentFields[collectionName].templates[templateName].template;
-            fields = documentFields[collectionName].templates[templateName].fields;
-          } else {
-            fields = documentFields[collectionName].fields;
-          }
-          setInfo({
-            collection,
-            template,
-            fields,
-            mutationInfo
-          });
-        } catch (error2) {
-          cms.alerts.error(`[${error2.name}] GetDocumentFields failed: ${error2.message}`, 30 * 1e3);
-          console.error(error2);
-          setInfo({
-            collection: void 0,
-            template: void 0,
-            fields: void 0,
-            mutationInfo: void 0
-          });
-          setError(error2);
-        }
-        setLoading(false);
-      }
-    };
-    setLoading(true);
-    fetchDocumentFields();
-  }, [cms, collectionName]);
-  return __spreadProps(__spreadValues({}, info), { loading, error });
-};
-const GetDocumentFields = ({
-  cms,
-  collectionName,
-  templateName,
-  children
-}) => {
-  const { collection, template, fields, mutationInfo, loading, error } = useGetDocumentFields(cms, collectionName, templateName);
-  if (error) {
-    return null;
-  }
-  if (loading) {
-    return /* @__PURE__ */ React.createElement(LoadingPage, null);
-  }
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, children({ collection, template, fields, mutationInfo, loading }));
-};
 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);
 }
@@ -4216,38 +3855,39 @@ const createDocument = async (cms, collection, template, mutationInfo, values) =
 };
 const CollectionCreatePage = () => {
   const { collectionName, templateName } = useParams();
-  return /* @__PURE__ */ React.createElement(GetCMS, null, (cms) => /* @__PURE__ */ React.createElement(GetDocumentFields, {
+  return /* @__PURE__ */ React.createElement(GetCMS, null, (cms) => /* @__PURE__ */ React.createElement(GetCollection, {
     cms,
     collectionName,
-    templateName
-  }, ({ collection, template, fields, mutationInfo }) => /* @__PURE__ */ React.createElement(RenderForm$1, {
-    cms,
-    collection,
-    template,
-    fields,
-    mutationInfo
-  })));
+    includeDocuments: false
+  }, (collection) => {
+    const mutationInfo = {
+      includeCollection: true,
+      includeTemplate: !!collection.templates
+    };
+    return /* @__PURE__ */ React.createElement(RenderForm$1, {
+      cms,
+      collection,
+      templateName,
+      mutationInfo
+    });
+  }));
 };
-const RenderForm$1 = ({ cms, collection, template, fields, mutationInfo }) => {
+const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
   var _a, _b;
   const navigate = useNavigate();
   const [formIsPristine, setFormIsPristine] = useState(true);
   const schema = cms.api.tina.schema;
-  let schemaFields = fields;
-  if (schema) {
-    const schemaCollection = schema.getCollection(collection.name);
-    const template2 = schema.getTemplateForData({
-      collection: schemaCollection,
-      data: {}
-    });
-    const formInfo = resolveForm({
-      collection: schemaCollection,
-      basename: schemaCollection.name,
-      schema,
-      template: template2
-    });
-    schemaFields = formInfo.fields;
-  }
+  const schemaCollection = schema.getCollection(collection.name);
+  const template = schema.getTemplateForData({
+    collection: schemaCollection,
+    data: { _template: templateName }
+  });
+  const formInfo = resolveForm({
+    collection: schemaCollection,
+    basename: schemaCollection.name,
+    schema,
+    template
+  });
   const form = useMemo(() => {
     return new Form({
       id: "create-form",
@@ -4272,7 +3912,7 @@ const RenderForm$1 = ({ cms, collection, template, fields, mutationInfo }) => {
             }
           }
         },
-        ...schemaFields
+        ...formInfo.fields
       ],
       onSubmit: async (values) => {
         try {
@@ -4285,7 +3925,7 @@ const RenderForm$1 = ({ cms, collection, template, fields, mutationInfo }) => {
         }
       }
     });
-  }, [cms, collection, template, fields, mutationInfo]);
+  }, [cms, collection, mutationInfo]);
   return /* @__PURE__ */ React.createElement(PageWrapper, null, /* @__PURE__ */ React.createElement(React.Fragment, null, ((_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode) && /* @__PURE__ */ React.createElement(LocalWarning, null), /* @__PURE__ */ React.createElement("div", {
     className: "py-4 px-20 border-b border-gray-200 bg-white"
   }, /* @__PURE__ */ React.createElement("div", {
@@ -4318,7 +3958,7 @@ const useGetDocument = (cms, collectionName, relativePath) => {
       if (api.isAuthenticated()) {
         try {
           const response = await api.fetchDocument(collectionName, relativePath);
-          setDocument(response.getDocument);
+          setDocument(response.document);
         } catch (error2) {
           cms.alerts.error(`[${error2.name}] GetDocument failed: ${error2.message}`, 30 * 1e3);
           console.error(error2);
@@ -4367,11 +4007,16 @@ const updateDocument = async (cms, relativePath, collection, mutationInfo, value
 const CollectionUpdatePage = () => {
   const _a = useParams(), { collectionName } = _a, rest = __objRest(_a, ["collectionName"]);
   const { "*": filename } = rest;
-  return /* @__PURE__ */ React.createElement(GetCMS, null, (cms) => /* @__PURE__ */ React.createElement(GetDocumentFields, {
+  return /* @__PURE__ */ React.createElement(GetCMS, null, (cms) => /* @__PURE__ */ React.createElement(GetCollection, {
     cms,
-    collectionName
-  }, ({ collection, mutationInfo }) => {
+    collectionName,
+    includeDocuments: false
+  }, (collection) => {
     const relativePath = `${filename}.${collection.format}`;
+    const mutationInfo = {
+      includeCollection: true,
+      includeTemplate: !!collection.templates
+    };
     return /* @__PURE__ */ React.createElement(GetDocument, {
       cms,
       collectionName: collection.name,
@@ -4397,27 +4042,23 @@ const RenderForm = ({
   var _a, _b;
   const [formIsPristine, setFormIsPristine] = useState(true);
   const schema = cms.api.tina.schema;
-  let schemaFields = document.form.fields;
-  if (schema) {
-    const schemaCollection = schema.getCollection(collection.name);
-    const template = schema.getTemplateForData({
-      collection: schemaCollection,
-      data: document.value
-    });
-    const formInfo = resolveForm({
-      collection: schemaCollection,
-      basename: schemaCollection.name,
-      schema,
-      template
-    });
-    schemaFields = formInfo.fields;
-  }
+  const schemaCollection = schema.getCollection(collection.name);
+  const template = schema.getTemplateForData({
+    collection: schemaCollection,
+    data: document._values
+  });
+  const formInfo = resolveForm({
+    collection: schemaCollection,
+    basename: schemaCollection.name,
+    schema,
+    template
+  });
   const form = useMemo(() => {
     return new Form({
       id: "update-form",
       label: "form",
-      fields: schemaFields,
-      initialValues: document.values,
+      fields: formInfo.fields,
+      initialValues: document._values,
       onSubmit: async (values) => {
         try {
           await updateDocument(cms, relativePath, collection, mutationInfo, values);
@@ -4537,4 +4178,4 @@ const defineSchema = (config) => {
 const defineConfig = (config) => {
   return config;
 };
-export { AuthWallInner, Client, DEFAULT_LOCAL_TINA_GQL_SERVER_URL, LocalClient, RouteMappingPlugin, TinaAdmin, TinaAdminApi, TinaCMSProvider2, TinaCloudAuthWall, TinaCloudProvider, TinaDataProvider, assertShape, createClient, TinaCMSProvider2 as default, defineConfig, defineSchema, getStaticPropsForTina, gql, safeAssertShape, staticRequest, useDocumentCreatorPlugin, useGraphqlForms, useGraphqlFormsUnstable, useTinaAuthRedirect };
+export { AuthWallInner, Client, DEFAULT_LOCAL_TINA_GQL_SERVER_URL, LocalClient, RouteMappingPlugin, TinaAdmin, TinaAdminApi, TinaCMSProvider2, TinaCloudAuthWall, TinaCloudProvider, TinaDataProvider, assertShape, createClient, TinaCMSProvider2 as default, defineConfig, defineSchema, getStaticPropsForTina, gql, safeAssertShape, staticRequest, useDocumentCreatorPlugin, useGraphqlForms, useTinaAuthRedirect };