tinacms 0.67.4 → 0.68.0

package/dist/index.js

@@ -428,7 +428,7 @@ var __objRest = (source, exclude) => {
       return false;
     }
   }
-  function useGraphqlFormsUnstable({
+  function useGraphqlForms({
     variables,
     onSubmit,
     query,
@@ -446,239 +446,6 @@ var __objRest = (source, exclude) => {
     });
     return [state.data, state.status !== "done"];
   }
-  function useGraphqlForms({
-    variables,
-    onSubmit,
-    formify: formify2 = null,
-    query
-  }) {
-    const cms = toolkit.useCMS();
-    const [formValues, setFormValues] = React__default["default"].useState({});
-    const [data, setData] = React__default["default"].useState(null);
-    const [initialData, setInitialData] = React__default["default"].useState({});
-    const [pendingReset, setPendingReset] = React__default["default"].useState(null);
-    const [isLoading, setIsLoading] = React__default["default"].useState(true);
-    const [newUpdate, setNewUpdate] = React__default["default"].useState(null);
-    const { currentBranch } = toolkit.useBranchData();
-    const updateData = async () => {
-      var _a;
-      if (newUpdate) {
-        const newValue = finalForm.getIn(formValues, newUpdate.get);
-        const activeForm = finalForm.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 = finalForm.setIn(data, newUpdate.set, res.node);
-            const newDataAndNewJSONData2 = finalForm.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 = finalForm.setIn(data, newUpdate.set, newValue);
-        const newDataAndNewJSONData = finalForm.setIn(newData, newUpdate.set.replace("data", "dataJSON"), newValue);
-        setData(newDataAndNewJSONData);
-        setNewUpdate(null);
-      }
-    };
-    React__default["default"].useEffect(() => {
-      updateData();
-    }, [JSON.stringify(formValues)]);
-    React__default["default"].useEffect(() => {
-      if (pendingReset) {
-        setData(__spreadProps(__spreadValues({}, data), { [pendingReset]: initialData[pendingReset] }));
-        setPendingReset(null);
-      }
-    }, [pendingReset]);
-    React__default["default"].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 toolkit.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 = schemaTools.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 toolkit.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);
@@ -715,37 +482,7 @@ var __objRest = (source, exclude) => {
       }
     }
   };
-  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 = finalForm.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 toolkit.Form(formConfig);
-      cms.forms.add(form);
-      return form;
-    };
-    const createGlobalForm = (formConfig, options) => {
-      const form = new toolkit.Form(formConfig);
-      cms.plugins.add(new toolkit.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 toolkit.Form(formConfig);
       if (showInSidebar) {
@@ -829,7 +566,7 @@ var __objRest = (source, exclude) => {
     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;
@@ -839,25 +576,50 @@ var __objRest = (source, exclude) => {
     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) {
@@ -872,29 +634,16 @@ var __objRest = (source, exclude) => {
       }
     };
     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 = schemaTools.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 = schemaTools.resolveForm({
+      collection,
+      basename: collection.name,
+      schema: enrichedSchema,
+      template
+    });
+    formConfig = __spreadValues({
+      label: formInfo.label,
+      fields: formInfo.fields
+    }, formCommon);
     if (formify2) {
       form = formify2({
         formConfig,
@@ -1013,7 +762,7 @@ var __objRest = (source, exclude) => {
       }
       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(`[]`);
@@ -1048,14 +797,13 @@ var __objRest = (source, exclude) => {
     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 {
@@ -1261,14 +1009,14 @@ var __objRest = (source, exclude) => {
   }
   const node = G__namespace.parse(`
  query Sample {
-   _internalSys: sys {
+   _internalSys: _sys {
      path
+     relativePath
      collection {
        name
      }
    }
-   form
-   values
+   _values
  }`);
   const metaFields = node.definitions[0].selectionSet.selections;
   const getRelativeBlueprint = (path) => {
@@ -1285,6 +1033,21 @@ var __objRest = (source, exclude) => {
     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 = [];
@@ -1302,10 +1065,9 @@ var __objRest = (source, exclude) => {
   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,
@@ -1411,22 +1173,15 @@ var __objRest = (source, exclude) => {
       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) {
@@ -1465,33 +1220,11 @@ var __objRest = (source, exclude) => {
                   });
                 }
                 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");
@@ -1514,16 +1247,19 @@ var __objRest = (source, exclude) => {
       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__namespace.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,
@@ -2069,10 +1805,10 @@ var __objRest = (source, exclude) => {
                     query Node($id: String!) {
                       node(id: $id) {
                         ...on Document {
-                          form
-                          values
-                          _internalSys: sys {
+                          _values
+                          _internalSys: _sys {
                             path
+                            relativePath
                             collection {
                               name
                             }
@@ -2182,9 +1918,7 @@ var __objRest = (source, exclude) => {
                 dispatch({
                   type: "setIn",
                   value: __spreadProps(__spreadValues({}, changeSet), {
-                    value: __spreadProps(__spreadValues({}, res.node), {
-                      data
-                    })
+                    value: __spreadValues(__spreadValues({}, res.node), data)
                   })
                 });
               }).catch((e) => {
@@ -2303,10 +2037,10 @@ var __objRest = (source, exclude) => {
                       query Node($id: String!) {
                         node(id: $id) {
                           ...on Document {
-                            form
-                            values
-                            _internalSys: sys {
+                            _values
+                            _internalSys: _sys {
                               path
+                              relativePath
                               collection {
                                 name
                               }
@@ -2344,13 +2078,11 @@ var __objRest = (source, exclude) => {
                       }
                     }
                   `, { 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:
@@ -2711,19 +2443,19 @@ mutation addPendingDocumentMutation(
   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,
@@ -2737,9 +2469,10 @@ mutation addPendingDocumentMutation(
 }`, { 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
@@ -2749,7 +2482,7 @@ mutation addPendingDocumentMutation(
             edges {
               node {
                 ... on Document {
-                  sys {
+                  _sys {
                     template
                     breadcrumbs
                     path
@@ -2764,27 +2497,28 @@ mutation addPendingDocumentMutation(
           }
         }
       }`, { 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!) {
@@ -2805,7 +2539,7 @@ mutation addPendingDocumentMutation(
     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
@@ -2996,7 +2730,7 @@ mutation addPendingDocumentMutation(
           } else {
             cms.alerts.info("Document created!");
             if (typeof this.onNewDocument === "function") {
-              this.onNewDocument(res.addPendingDocument.sys);
+              this.onNewDocument(res.addPendingDocument._sys);
             }
           }
         } catch (e) {
@@ -3016,7 +2750,7 @@ mutation addPendingDocumentMutation(
         var _a;
         const res = await cms.api.tina.request((gql2) => gql2`
           {
-            getCollections {
+            collections {
               label
               slug
               format
@@ -3025,7 +2759,7 @@ mutation addPendingDocumentMutation(
           }
         `, { variables: {} });
         const allCollectionOptions = [];
-        res.getCollections.forEach((collection) => {
+        res.collections.forEach((collection) => {
           const value = collection.slug;
           const label = `${collection.label}`;
           allCollectionOptions.push({ value, label });
@@ -3047,7 +2781,7 @@ mutation addPendingDocumentMutation(
           { 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 });
           });
@@ -3055,7 +2789,7 @@ mutation addPendingDocumentMutation(
         setPlugin(new ContentCreatorPlugin({
           label: "Add Document",
           onNewDocument: args && args.onNewDocument,
-          collections: res.getCollections,
+          collections: res.collections,
           onChange: async ({ values: values2 }) => {
             setValues(values2);
           },
@@ -3276,6 +3010,9 @@ mutation addPendingDocumentMutation(
       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__default["default"].createElement(React__default["default"].Fragment, null, /* @__PURE__ */ React__default["default"].createElement(TinaCloudProvider, {
       branch,
       clientId,
@@ -3325,25 +3062,13 @@ mutation addPendingDocumentMutation(
       payload: void 0,
       isLoading: true
     });
-    const cms = toolkit.useCMS();
-    const useUnstableFormify = React__default["default"].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__default["default"].createElement(sharedctx.TinaDataContext.Provider, {
       value: {
         setRequest,
         isLoading: state.isLoading,
         state: { payload: state.payload }
       }
-    }, useUnstableFormify ? /* @__PURE__ */ React__default["default"].createElement(FormRegistrarUnstable, {
-      key: request == null ? void 0 : request.query,
-      request,
-      formifyCallback,
-      onPayloadStateChange: setState
-    }) : /* @__PURE__ */ React__default["default"].createElement(FormRegistrar, {
+    }, /* @__PURE__ */ React__default["default"].createElement(FormRegistrar, {
       key: request == null ? void 0 : request.query,
       request,
       formifyCallback,
@@ -3372,35 +3097,6 @@ mutation addPendingDocumentMutation(
     }, [JSON.stringify(payload), isLoading]);
     return isLoading ? /* @__PURE__ */ React__default["default"].createElement(Loader, null, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null)) : null;
   };
-  const FormRegistrarUnstable = (props) => {
-    var _a;
-    if (!((_a = props.request) == null ? void 0 : _a.query)) {
-      return null;
-    }
-    return /* @__PURE__ */ React__default["default"].createElement(FormRegistrarUnstableInner, __spreadValues({}, props));
-  };
-  const FormRegistrarUnstableInner = ({
-    request,
-    formifyCallback,
-    onPayloadStateChange
-  }) => {
-    const cms = toolkit.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__default["default"].useEffect(() => {
-      onPayloadStateChange({ payload, isLoading });
-    }, [JSON.stringify(payload), isLoading]);
-    return isLoading ? /* @__PURE__ */ React__default["default"].createElement(Loader, null, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null)) : null;
-  };
   const Loader = (props) => {
     return /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, /* @__PURE__ */ React__default["default"].createElement("div", {
       style: {
@@ -3645,8 +3341,8 @@ This will work when developing locally but NOT when deployed to production.
       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([]);
@@ -3949,8 +3645,8 @@ This will work when developing locally but NOT when deployed to production.
       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);
@@ -4016,7 +3712,7 @@ This will work when developing locally but NOT when deployed to production.
       window.location.href = routeOverride;
       return null;
     } else {
-      navigate(document.sys.breadcrumbs.join("/"));
+      navigate(document._sys.breadcrumbs.join("/"));
     }
   };
   const CollectionListPage = () => {
@@ -4069,9 +3765,9 @@ This will work when developing locally but NOT when deployed to production.
         }, /* @__PURE__ */ React__default["default"].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__default["default"].createElement("tr", {
-            key: `document-${document.node.sys.relativePath}`,
+            key: `document-${document.node._sys.relativePath}`,
             className: ""
           }, /* @__PURE__ */ React__default["default"].createElement("td", {
             className: "px-6 py-2 whitespace-nowrap"
@@ -4088,19 +3784,19 @@ This will work when developing locally but NOT when deployed to production.
             className: "h-5 leading-5 block whitespace-nowrap"
           }, subfolders && /* @__PURE__ */ React__default["default"].createElement("span", {
             className: "text-xs text-gray-400"
-          }, `${subfolders}/`), /* @__PURE__ */ React__default["default"].createElement("span", null, document.node.sys.filename))))), /* @__PURE__ */ React__default["default"].createElement("td", {
+          }, `${subfolders}/`), /* @__PURE__ */ React__default["default"].createElement("span", null, document.node._sys.filename))))), /* @__PURE__ */ React__default["default"].createElement("td", {
             className: "px-6 py-4 whitespace-nowrap"
           }, /* @__PURE__ */ React__default["default"].createElement("span", {
             className: "block text-xs text-gray-400 mb-1 uppercase"
           }, "Extension"), /* @__PURE__ */ React__default["default"].createElement("span", {
             className: "h-5 leading-5 block text-sm font-medium text-gray-900"
-          }, document.node.sys.extension)), /* @__PURE__ */ React__default["default"].createElement("td", {
+          }, document.node._sys.extension)), /* @__PURE__ */ React__default["default"].createElement("td", {
             className: "px-6 py-4 whitespace-nowrap"
           }, /* @__PURE__ */ React__default["default"].createElement("span", {
             className: "block text-xs text-gray-400 mb-1 uppercase"
           }, "Template"), /* @__PURE__ */ React__default["default"].createElement("span", {
             className: "h-5 leading-5 block text-sm font-medium text-gray-900"
-          }, document.node.sys.template)), /* @__PURE__ */ React__default["default"].createElement("td", {
+          }, document.node._sys.template)), /* @__PURE__ */ React__default["default"].createElement("td", {
             className: "w-0"
           }, /* @__PURE__ */ React__default["default"].createElement(toolkit.OverflowMenu, {
             showEmbed: true,
@@ -4112,7 +3808,7 @@ This will work when developing locally but NOT when deployed to production.
                   size: "1.3rem"
                 }),
                 onMouseDown: () => {
-                  navigate(`${document.node.sys.filename}`, { replace: true });
+                  navigate(`${document.node._sys.filename}`, { replace: true });
                 }
               },
               {
@@ -4125,7 +3821,7 @@ This will work when developing locally but NOT when deployed to production.
                 onMouseDown: () => {
                   setVars({
                     collection: collectionName,
-                    relativePath: document.node.sys.filename + document.node.sys.extension
+                    relativePath: document.node._sys.filename + document.node._sys.extension
                   });
                   setOpen(true);
                 }
@@ -4153,72 +3849,6 @@ This will work when developing locally but NOT when deployed to production.
       }
     }, "Delete"))));
   };
-  const useGetDocumentFields = (cms, collectionName, templateName) => {
-    const api = new TinaAdminApi(cms);
-    const [info, setInfo] = React.useState({
-      collection: void 0,
-      template: void 0,
-      fields: void 0,
-      mutationInfo: void 0
-    });
-    const [loading, setLoading] = React.useState(true);
-    const [error, setError] = React.useState(void 0);
-    React.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__default["default"].createElement(LoadingPage, null);
-    }
-    return /* @__PURE__ */ React__default["default"].createElement(React__default["default"].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);
   }
@@ -4244,34 +3874,39 @@ This will work when developing locally but NOT when deployed to production.
   };
   const CollectionCreatePage = () => {
     const { collectionName, templateName } = reactRouterDom.useParams();
-    return /* @__PURE__ */ React__default["default"].createElement(GetCMS, null, (cms) => /* @__PURE__ */ React__default["default"].createElement(GetDocumentFields, {
+    return /* @__PURE__ */ React__default["default"].createElement(GetCMS, null, (cms) => /* @__PURE__ */ React__default["default"].createElement(GetCollection, {
       cms,
       collectionName,
-      templateName
-    }, ({ collection, template, fields, mutationInfo }) => /* @__PURE__ */ React__default["default"].createElement(RenderForm$1, {
-      cms,
-      collection,
-      template,
-      fields,
-      mutationInfo
-    })));
+      includeDocuments: false
+    }, (collection) => {
+      const mutationInfo = {
+        includeCollection: true,
+        includeTemplate: !!collection.templates
+      };
+      return /* @__PURE__ */ React__default["default"].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 = reactRouterDom.useNavigate();
     const [formIsPristine, setFormIsPristine] = React.useState(true);
     const schema = cms.api.tina.schema;
-    let schemaFields = fields;
-    if (schema) {
-      const schemaCollection = schema.getCollection(collection.name);
-      const formInfo = schemaTools.resolveForm({
-        collection: schemaCollection,
-        basename: schemaCollection.name,
-        schema,
-        template
-      });
-      schemaFields = formInfo.fields;
-    }
+    const schemaCollection = schema.getCollection(collection.name);
+    const template = schema.getTemplateForData({
+      collection: schemaCollection,
+      data: { _template: templateName }
+    });
+    const formInfo = schemaTools.resolveForm({
+      collection: schemaCollection,
+      basename: schemaCollection.name,
+      schema,
+      template
+    });
     const form = React.useMemo(() => {
       return new toolkit.Form({
         id: "create-form",
@@ -4296,7 +3931,7 @@ This will work when developing locally but NOT when deployed to production.
               }
             }
           },
-          ...schemaFields
+          ...formInfo.fields
         ],
         onSubmit: async (values) => {
           try {
@@ -4309,7 +3944,7 @@ This will work when developing locally but NOT when deployed to production.
           }
         }
       });
-    }, [cms, collection, template, fields, mutationInfo]);
+    }, [cms, collection, mutationInfo]);
     return /* @__PURE__ */ React__default["default"].createElement(PageWrapper, null, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, ((_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode) && /* @__PURE__ */ React__default["default"].createElement(toolkit.LocalWarning, null), /* @__PURE__ */ React__default["default"].createElement("div", {
       className: "py-4 px-20 border-b border-gray-200 bg-white"
     }, /* @__PURE__ */ React__default["default"].createElement("div", {
@@ -4342,7 +3977,7 @@ This will work when developing locally but NOT when deployed to production.
         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);
@@ -4391,11 +4026,16 @@ This will work when developing locally but NOT when deployed to production.
   const CollectionUpdatePage = () => {
     const _a = reactRouterDom.useParams(), { collectionName } = _a, rest = __objRest(_a, ["collectionName"]);
     const { "*": filename } = rest;
-    return /* @__PURE__ */ React__default["default"].createElement(GetCMS, null, (cms) => /* @__PURE__ */ React__default["default"].createElement(GetDocumentFields, {
+    return /* @__PURE__ */ React__default["default"].createElement(GetCMS, null, (cms) => /* @__PURE__ */ React__default["default"].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__default["default"].createElement(GetDocument, {
         cms,
         collectionName: collection.name,
@@ -4421,27 +4061,23 @@ This will work when developing locally but NOT when deployed to production.
     var _a, _b;
     const [formIsPristine, setFormIsPristine] = React.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.values
-      });
-      const formInfo = schemaTools.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 = schemaTools.resolveForm({
+      collection: schemaCollection,
+      basename: schemaCollection.name,
+      schema,
+      template
+    });
     const form = React.useMemo(() => {
       return new toolkit.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);
@@ -4583,7 +4219,6 @@ This will work when developing locally but NOT when deployed to production.
   exports2.staticRequest = staticRequest;
   exports2.useDocumentCreatorPlugin = useDocumentCreatorPlugin;
   exports2.useGraphqlForms = useGraphqlForms;
-  exports2.useGraphqlFormsUnstable = useGraphqlFormsUnstable;
   exports2.useTinaAuthRedirect = useTinaAuthRedirect;
   Object.keys(toolkit).forEach(function(k) {
     if (k !== "default" && !exports2.hasOwnProperty(k))