tinacms 0.66.9 → 0.66.10

package/dist/index.js

@@ -30,8 +30,8 @@ var __objRest = (source, exclude) => {
   return target;
 };
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@tinacms/toolkit"), require("graphql"), require("lodash.set"), require("react"), require("final-form"), require("yup"), require("graphql-tag"), require("styled-components"), require("@tinacms/sharedctx"), require("url-pattern"), require("react-router-dom"), require("@headlessui/react")) : typeof define === "function" && define.amd ? define(["exports", "@tinacms/toolkit", "graphql", "lodash.set", "react", "final-form", "yup", "graphql-tag", "styled-components", "@tinacms/sharedctx", "url-pattern", "react-router-dom", "@headlessui/react"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP));
-})(this, function(exports2, toolkit, G, set, React, finalForm, yup, gql$1, styled, sharedctx, UrlPattern, reactRouterDom, react) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@tinacms/toolkit"), require("graphql"), require("lodash.set"), require("react"), require("final-form"), require("@tinacms/schema-tools"), require("graphql-tag"), require("yup"), require("styled-components"), require("@tinacms/sharedctx"), require("url-pattern"), require("react-router-dom"), require("@headlessui/react")) : typeof define === "function" && define.amd ? define(["exports", "@tinacms/toolkit", "graphql", "lodash.set", "react", "final-form", "@tinacms/schema-tools", "graphql-tag", "yup", "styled-components", "@tinacms/sharedctx", "url-pattern", "react-router-dom", "@headlessui/react"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP));
+})(this, function(exports2, toolkit, G, set, React, finalForm, schemaTools, gql$1, yup, styled, sharedctx, UrlPattern, reactRouterDom, react) {
   "use strict";
   function _interopDefaultLegacy(e) {
     return e && typeof e === "object" && "default" in e ? e : { "default": e };
@@ -59,8 +59,8 @@ var __objRest = (source, exclude) => {
   var G__namespace = /* @__PURE__ */ _interopNamespace(G);
   var set__default = /* @__PURE__ */ _interopDefaultLegacy(set);
   var React__default = /* @__PURE__ */ _interopDefaultLegacy(React);
-  var yup__namespace = /* @__PURE__ */ _interopNamespace(yup);
   var gql__default = /* @__PURE__ */ _interopDefaultLegacy(gql$1);
+  var yup__namespace = /* @__PURE__ */ _interopNamespace(yup);
   var styled__default = /* @__PURE__ */ _interopDefaultLegacy(styled);
   var UrlPattern__default = /* @__PURE__ */ _interopDefaultLegacy(UrlPattern);
   function popupWindow(url, title, window2, w, h) {
@@ -400,13 +400,15 @@ var __objRest = (source, exclude) => {
     clientId,
     isLocalClient = true,
     branch,
-    tinaioConfig
+    tinaioConfig,
+    schema
   }) => {
-    return isLocalClient ? new LocalClient() : new Client({
+    return isLocalClient ? new LocalClient({ schema }) : new Client({
       clientId: clientId || "",
       branch: branch || "main",
       tokenStorage: "LOCAL_STORAGE",
-      tinaioConfig
+      tinaioConfig,
+      schema
     });
   };
   function assertShape(value, yupSchema, errorMessage) {
@@ -535,11 +537,10 @@ var __objRest = (source, exclude) => {
             values: yup2.object().required(),
             form: yup2.object().required()
           }), `Unable to build form shape for fields at ${queryName}`);
-          const formConfig = {
+          let formConfig = {};
+          const formCommon = {
             id: queryName,
-            label: result.form.label,
             initialValues: result.values,
-            fields: result.form.fields,
             reset: () => {
               setPendingReset(queryName);
             },
@@ -571,6 +572,29 @@ var __objRest = (source, exclude) => {
               }
             }
           };
+          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;
@@ -742,100 +766,7 @@ var __objRest = (source, exclude) => {
     };
     return { createForm, createGlobalForm };
   };
-  const isNodeField = (type) => {
-    if (G__namespace.isUnionType(type)) {
-      return type.getTypes().every((type2) => {
-        return type2.getInterfaces().find((intfc) => intfc.name === "Node");
-      });
-    } else if (G__namespace.isObjectType(type)) {
-      return !!type.getInterfaces().find((intfc) => intfc.name === "Node");
-    } else if (G__namespace.isInterfaceType(type)) {
-      if (type.name === "Node") {
-        return true;
-      }
-    } else {
-      return false;
-    }
-  };
-  const isConnectionField = (type) => {
-    if (G__namespace.isObjectType(type)) {
-      return !!type.getInterfaces().find((intfc) => intfc.name === "Connection");
-    } else {
-      throw new Error(`Expected GraphQLObjectType for isConnectionField check`);
-    }
-  };
-  const getObjectField = (object, selectionNode) => {
-    return object.getFields()[selectionNode.name.value];
-  };
-  const getSelectedUnionType = (unionType, selectionNode) => {
-    return unionType.getTypes().find((type) => type.name === selectionNode.typeCondition.name.value);
-  };
-  function isListType(type) {
-    if (G__namespace.isListType(type)) {
-      return true;
-    } else if (G__namespace.isNonNullType(type)) {
-      if (G__namespace.isListType(type.ofType)) {
-        return true;
-      }
-    }
-    return false;
-  }
-  function ensureNodeField(field) {
-    if (!isNodeField(field)) {
-      throw new Error(`Expected field to implement Node interface`);
-    }
-  }
-  function ensureUnionType(type) {
-    if (!G__namespace.isUnionType(type)) {
-      throw new Error(`Expected type to be GraphQLUnionType`);
-    }
-  }
-  function ensureObjectType(type) {
-    if (!G__namespace.isObjectType(type)) {
-      console.log(type);
-      throw new Error(`Expected type to be GraphQLObjectType`);
-    }
-  }
-  function ensureOperationDefinition(type) {
-    if (type.kind !== "OperationDefinition") {
-      throw new Error(`Expected top-level definition to be an OperationDefinition node, ensure your query has been optimized before calling formify`);
-    }
-  }
-  function getNameAndAlias(fieldNode, list, isNode) {
-    return {
-      name: fieldNode.name.value,
-      alias: fieldNode.alias ? fieldNode.alias.value : fieldNode.name.value,
-      list: !!list,
-      isNode: !!isNode
-    };
-  }
-  const node = G__namespace.parse(`
- query Sample {
-   _internalSys: sys {
-     path
-     collection {
-       name
-     }
-   }
-   form
-   values
- }`);
-  const metaFields = node.definitions[0].selectionSet.selections;
-  const getRelativeBlueprint = (path) => {
-    let indexOfLastNode = 0;
-    path.forEach((item, i) => {
-      if (item.isNode) {
-        if (i === path.length - 1)
-          ;
-        else {
-          indexOfLastNode = i;
-        }
-      }
-    });
-    const documentBlueprintPath = path.slice(0, indexOfLastNode + 1);
-    return getBlueprintNamePath({ path: documentBlueprintPath });
-  };
-  const getIn2 = (state, path) => {
+  const getValueForBlueprint = (state, path) => {
     const pathArray = path.split(".");
     let latest = state;
     pathArray.every((item, index) => {
@@ -845,7 +776,7 @@ var __objRest = (source, exclude) => {
           const next = [];
           if (Array.isArray(latest)) {
             latest.forEach((latest2, index2) => {
-              const res = getIn2(latest2, restOfItems.join("."));
+              const res = getValueForBlueprint(latest2, restOfItems.join("."));
               next.push(res);
             });
           } else {
@@ -912,9 +843,8 @@ var __objRest = (source, exclude) => {
     if (skipped)
       return;
     const id = doc._internalSys.path;
-    const formConfig = __spreadProps(__spreadValues({
-      id
-    }, doc.form), {
+    const formCommon = {
+      id,
       label: doc.form.label,
       initialValues: doc.values,
       onSubmit: async (payload) => {
@@ -944,7 +874,31 @@ var __objRest = (source, exclude) => {
           cms.alerts.error("There was a problem saving your document");
         }
       }
-    });
+    };
+    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);
+    }
     if (formify2) {
       form = formify2({
         formConfig,
@@ -990,19 +944,6 @@ var __objRest = (source, exclude) => {
     }
     return accum;
   };
-  const getBlueprintId = (path) => {
-    const namePath = [];
-    const aliasPath = [];
-    path.forEach((p) => {
-      namePath.push(p.name);
-      aliasPath.push(p.alias);
-      if (p.list) {
-        namePath.push("[]");
-        aliasPath.push("[]");
-      }
-    });
-    return namePath.join(".");
-  };
   const getFormNodesStartingWith = (string, state) => {
     return state.formNodes.filter((subFormNode) => {
       return subFormNode.documentBlueprintId.startsWith(string);
@@ -1018,44 +959,6 @@ var __objRest = (source, exclude) => {
     const existing = finalForm.getIn(state.data, pathToChange);
     return { pathToChange, formNodes, eventLocation, existing };
   };
-  const matchLocation = (eventLocation, formNode) => {
-    return eventLocation.every((item, index) => item === formNode.location[index]);
-  };
-  const bumpLocation = (location) => {
-    return location.map((item, index) => {
-      if (index === location.length - 1) {
-        return item + 1;
-      }
-      return item;
-    });
-  };
-  const maybeLowerLocation = (location, at) => {
-    return location.map((item, index) => {
-      if (index === location.length - 1) {
-        return item < at ? item : item - 1;
-      }
-      return item;
-    });
-  };
-  const matchesAt = (location, at) => {
-    let matches = false;
-    location.map((item, index) => {
-      if (index === location.length - 1) {
-        if (item === at) {
-          matches = true;
-        }
-      }
-    });
-    return matches;
-  };
-  const swapLocation = (location, mapping) => {
-    return location.map((item, index) => {
-      if (index === location.length - 1) {
-        return mapping[item];
-      }
-      return item;
-    });
-  };
   const getBlueprintAliasPath = (blueprint) => {
     const namePath = [];
     const aliasPath = [];
@@ -1071,22 +974,56 @@ var __objRest = (source, exclude) => {
   };
   const getBlueprintFieldsForEvent = (blueprint, event) => {
     return blueprint.fields.filter((fbp) => {
-      return getBlueprintNamePath(fbp) === getEventPath(event, blueprint);
+      if (getBlueprintNamePath(fbp) === getEventPath(event, blueprint)) {
+        return true;
+      }
+    }).filter((fbp) => {
+      return filterFieldBlueprintsByParentTypename(fbp, event.field.data.tinaField.parentTypename);
+    });
+  };
+  const filterFieldBlueprintsByParentTypename = (fbp, typename) => {
+    let lastDisambiguator;
+    fbp.path.forEach((path) => {
+      if (path.parentTypename) {
+        lastDisambiguator = path.parentTypename;
+      }
     });
+    if (lastDisambiguator) {
+      return typename === lastDisambiguator;
+    } else {
+      return true;
+    }
   };
-  const getBlueprintNamePath = (blueprint) => {
+  const getBlueprintNamePath = (blueprint, disambiguator) => {
     const namePath = [];
-    const aliasPath = [];
     blueprint.path.forEach((p) => {
+      if (disambiguator) {
+        if (p.parentTypename) {
+          namePath.push(p.parentTypename);
+        }
+      }
       namePath.push(p.name);
-      aliasPath.push(p.alias);
       if (p.list) {
         namePath.push("[]");
-        aliasPath.push("[]");
       }
     });
     return namePath.join(".");
   };
+  const getEventPath = (event, blueprint) => {
+    const stringArray = event.field.name.split(".");
+    const eventPath = stringArray.map((item) => {
+      if (isNaN(Number(item))) {
+        return item;
+      }
+      return `[]`;
+    }).join(".");
+    const items = [blueprint.id, DATA_NODE_NAME$1, eventPath];
+    const isList = event.field.data.tinaField.list;
+    if (isList && !eventPath.endsWith("[]")) {
+      items.push(`[]`);
+    }
+    return items.join(".");
+  };
   const stripIndices = (string) => {
     const accum = [];
     const stringArray = string.split(".");
@@ -1108,20 +1045,21 @@ var __objRest = (source, exclude) => {
       return "[]";
     }).join(".");
   };
+  const getMatchName = ({ field, prefix, blueprint }) => {
+    const fieldName = field.list ? `${field.name}.[]` : field.name;
+    const blueprintName = getBlueprintNamePath(blueprint);
+    const extra = [];
+    if (prefix) {
+      extra.push(prefix);
+    }
+    const matchName = [blueprintName, DATA_NODE_NAME$1, ...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 getEventPath = (event, blueprint) => {
-    const eventPath = replaceRealNum(event.field.name);
-    const items = [blueprint.id, DATA_NODE_NAME$1, eventPath];
-    const isList = event.field.data.tinaField.list;
-    if (isList && !eventPath.endsWith("[]")) {
-      items.push("[]");
-    }
-    return items.join(".");
-  };
   const printEvent = (event) => {
     var _a, _b;
     return {
@@ -1190,17 +1128,43 @@ var __objRest = (source, exclude) => {
     }
     return newOrderObject;
   };
-  const getPathsToChange = (event, state) => {
-    const pathsToChange = [];
-    const formNodes = getFormNodesFromEvent(state, event);
-    formNodes.forEach((formNode) => {
-      const blueprint = getFormNodeBlueprint(formNode, state);
-      getBlueprintFieldsForEvent(blueprint, event).forEach((fieldBlueprint) => {
-        const pathToChange = getPathToChange(fieldBlueprint, formNode, event);
-        pathsToChange.push({ pathToChange, formNode });
-      });
+  const matchLocation = (eventLocation, formNode) => {
+    return eventLocation.every((item, index) => item === formNode.location[index]);
+  };
+  const bumpLocation = (location) => {
+    return location.map((item, index) => {
+      if (index === location.length - 1) {
+        return item + 1;
+      }
+      return item;
+    });
+  };
+  const maybeLowerLocation = (location, at) => {
+    return location.map((item, index) => {
+      if (index === location.length - 1) {
+        return item < at ? item : item - 1;
+      }
+      return item;
+    });
+  };
+  const matchesAt = (location, at) => {
+    let matches = false;
+    location.map((item, index) => {
+      if (index === location.length - 1) {
+        if (item === at) {
+          matches = true;
+        }
+      }
+    });
+    return matches;
+  };
+  const swapLocation = (location, mapping) => {
+    return location.map((item, index) => {
+      if (index === location.length - 1) {
+        return mapping[item];
+      }
+      return item;
     });
-    return pathsToChange;
   };
   const getSubFields = (changeSet) => {
     var _a;
@@ -1211,6 +1175,133 @@ var __objRest = (source, exclude) => {
     }
     return { fields, __typename };
   };
+  const isFormifiableDocument = (t) => {
+    const type = G__namespace.getNamedType(t);
+    if (G__namespace.isUnionType(type)) {
+      return type.getTypes().every((type2) => {
+        return type2.getInterfaces().find((intfc) => intfc.name === "Node");
+      });
+    } else if (G__namespace.isObjectType(type)) {
+      return !!type.getInterfaces().find((intfc) => intfc.name === "Node");
+    } else {
+      return false;
+    }
+  };
+  const isScalarType = (t) => {
+    const namedType = G__namespace.getNamedType(t);
+    return G__namespace.isScalarType(namedType);
+  };
+  const isConnectionField = (t) => {
+    const type = G__namespace.getNamedType(t);
+    if (G__namespace.isObjectType(type)) {
+      return !!type.getInterfaces().find((intfc) => intfc.name === "Connection");
+    } else {
+      throw new Error(`Expected GraphQLObjectType for isConnectionField check`);
+    }
+  };
+  const getObjectField = (object, selectionNode) => {
+    const namedType = G__namespace.getNamedType(object);
+    ensureObjectOrInterfaceType(namedType);
+    return namedType.getFields()[selectionNode.name.value];
+  };
+  const getSelectedUnionType = (unionType, selectionNode) => {
+    const namedType = G__namespace.getNamedType(unionType);
+    if (!G__namespace.isUnionType(namedType)) {
+      return;
+    }
+    const types = namedType.getTypes();
+    const typeCondition = selectionNode.typeCondition.name.value;
+    let intfc;
+    types.forEach((type) => {
+      intfc = type.getInterfaces().find((intfc2) => intfc2.name === typeCondition);
+    });
+    if (intfc) {
+      return intfc;
+    }
+    return namedType.getTypes().find((type) => type.name === typeCondition);
+  };
+  function isListType(type) {
+    if (G__namespace.isListType(type)) {
+      return true;
+    } else if (G__namespace.isNonNullType(type)) {
+      if (G__namespace.isListType(type.ofType)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  function ensureObjectOrInterfaceType(type) {
+    if (G__namespace.isInterfaceType(type) || G__namespace.isObjectType(type))
+      ;
+    else {
+      console.log("Expected type to be GraphQLObjectType or GraphQLInterfaceType", type);
+      throw new Error(`Expected type to be GraphQLObjectType or GraphQLInterfaceType`);
+    }
+  }
+  function ensureOperationDefinition(type) {
+    if (type.kind !== "OperationDefinition") {
+      throw new Error(`Expected top-level definition to be an OperationDefinition node, ensure your query has been optimized before calling formify`);
+    }
+  }
+  function buildPath({
+    fieldNode,
+    type,
+    parentTypename,
+    path
+  }) {
+    const p = path || [];
+    const list = isListType(type);
+    const isNode = isFormifiableDocument(type);
+    return [
+      ...p,
+      {
+        name: fieldNode.name.value,
+        alias: fieldNode.alias ? fieldNode.alias.value : fieldNode.name.value,
+        parentTypename,
+        list: !!list,
+        isNode: !!isNode
+      }
+    ];
+  }
+  const node = G__namespace.parse(`
+ query Sample {
+   _internalSys: sys {
+     path
+     collection {
+       name
+     }
+   }
+   form
+   values
+ }`);
+  const metaFields = node.definitions[0].selectionSet.selections;
+  const getRelativeBlueprint = (path) => {
+    let indexOfLastNode = 0;
+    path.forEach((item, i) => {
+      if (item.isNode) {
+        if (i === path.length - 1)
+          ;
+        else {
+          indexOfLastNode = i;
+        }
+      }
+    });
+    const documentBlueprintPath = path.slice(0, indexOfLastNode + 1);
+    return getBlueprintNamePath({ path: documentBlueprintPath });
+  };
+  const getBlueprintId = (path) => {
+    const namePath = [];
+    const aliasPath = [];
+    path.forEach((p) => {
+      namePath.push(p.name);
+      aliasPath.push(p.alias);
+      if (p.list) {
+        namePath.push("[]");
+        aliasPath.push("[]");
+      }
+    });
+    return namePath.join(".");
+  };
   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";
@@ -1243,11 +1334,10 @@ var __objRest = (source, exclude) => {
     const optimizedQuery = await getOptimizedQuery(documentNodeWithName);
     const typeInfo = new G__namespace.TypeInfo(schema);
     const formifyConnection = ({
-      namedFieldType,
+      parentType,
       selectionNode,
       path
     }) => {
-      ensureObjectType(namedFieldType);
       return __spreadProps(__spreadValues({}, selectionNode), {
         selectionSet: {
           kind: "SelectionSet",
@@ -1255,13 +1345,12 @@ var __objRest = (source, exclude) => {
             switch (selectionNode2.kind) {
               case "Field":
                 if (selectionNode2.name.value === EDGES_NODE_NAME) {
-                  const edgeField = namedFieldType.getFields()[EDGES_NODE_NAME];
-                  const edgeType = G__namespace.getNamedType(edgeField.type);
-                  ensureObjectType(edgeType);
-                  const path2 = [
-                    ...path,
-                    getNameAndAlias(selectionNode2, true, false)
-                  ];
+                  const edgeField = getObjectField(parentType, selectionNode2);
+                  const edgesPath = buildPath({
+                    fieldNode: selectionNode2,
+                    type: edgeField.type,
+                    path
+                  });
                   return __spreadProps(__spreadValues({}, selectionNode2), {
                     selectionSet: {
                       kind: "SelectionSet",
@@ -1269,15 +1358,15 @@ var __objRest = (source, exclude) => {
                         switch (subSelectionNode.kind) {
                           case "Field":
                             if (subSelectionNode.name.value === NODE_NAME) {
-                              const nodeField = edgeType.getFields()[NODE_NAME];
-                              const path3 = [
-                                ...path2,
-                                getNameAndAlias(subSelectionNode, false, true)
-                              ];
-                              return formifyNode({
-                                fieldOrInlineFragmentNode: subSelectionNode,
+                              const nodeField = getObjectField(edgeField.type, subSelectionNode);
+                              return formifyFieldNodeDocument({
+                                fieldNode: subSelectionNode,
                                 type: nodeField.type,
-                                path: path3,
+                                path: buildPath({
+                                  fieldNode: subSelectionNode,
+                                  type: nodeField.type,
+                                  path: edgesPath
+                                }),
                                 showInSidebar: false
                               });
                             } else {
@@ -1298,28 +1387,48 @@ var __objRest = (source, exclude) => {
         }
       });
     };
-    function formifyNode({
-      fieldOrInlineFragmentNode,
+    function formifyInlineFragmentDocument({
+      inlineFragmentNode,
+      type,
+      path,
+      showInSidebar = false
+    }) {
+      return formifyDocument({
+        selection: inlineFragmentNode,
+        type,
+        path,
+        showInSidebar
+      });
+    }
+    function formifyFieldNodeDocument({
+      fieldNode,
+      type,
+      path,
+      showInSidebar = false
+    }) {
+      return formifyDocument({ selection: fieldNode, type, path, showInSidebar });
+    }
+    function formifyDocument({
+      selection,
       type,
       path,
       showInSidebar = false
     }) {
       let extraFields = [];
-      const namedType = G__namespace.getNamedType(type);
       let hasDataJSONField = false;
       let hasValuesField = false;
       let shouldFormify = false;
-      fieldOrInlineFragmentNode.selectionSet.selections.forEach((selection) => {
-        if (selection.kind === "Field") {
-          if (selection.name.value === "dataJSON") {
+      selection.selectionSet.selections.forEach((selection2) => {
+        if (selection2.kind === "Field") {
+          if (selection2.name.value === "dataJSON") {
             shouldFormify = true;
             hasDataJSONField = true;
           }
-          if (selection.name.value === "values") {
+          if (selection2.name.value === "values") {
             shouldFormify = true;
             hasValuesField = true;
           }
-          if (selection.name.value === "data") {
+          if (selection2.name.value === "data") {
             shouldFormify = true;
           }
         }
@@ -1328,7 +1437,7 @@ var __objRest = (source, exclude) => {
         blueprints.push({
           id: getBlueprintId(path),
           path,
-          selection: fieldOrInlineFragmentNode,
+          selection,
           fields: [],
           showInSidebar,
           hasDataJSONField,
@@ -1336,71 +1445,58 @@ var __objRest = (source, exclude) => {
         });
         extraFields = metaFields;
       }
-      const formifiedNode = __spreadProps(__spreadValues({}, fieldOrInlineFragmentNode), {
+      return __spreadProps(__spreadValues({}, selection), {
         selectionSet: {
           kind: "SelectionSet",
           selections: [
-            ...fieldOrInlineFragmentNode.selectionSet.selections.map((selectionNode) => {
+            ...selection.selectionSet.selections.map((selectionNode) => {
               switch (selectionNode.kind) {
-                case "InlineFragment":
+                case "InlineFragment": {
+                  const namedType = G__namespace.getNamedType(type);
                   if (G__namespace.isInterfaceType(namedType)) {
-                    const subType2 = schema.getImplementations(namedType).objects.find((item) => item.name === selectionNode.typeCondition.name.value);
-                    return formifyNode({
-                      fieldOrInlineFragmentNode: selectionNode,
-                      type: subType2,
+                    const subType = schema.getImplementations(namedType).objects.find((item) => item.name === selectionNode.typeCondition.name.value);
+                    return formifyInlineFragmentDocument({
+                      inlineFragmentNode: selectionNode,
+                      type: subType,
                       path,
-                      showInSidebar: false
+                      showInSidebar: true
                     });
                   }
-                  ensureUnionType(namedType);
-                  const subType = getSelectedUnionType(namedType, selectionNode);
-                  return formifyNode({
-                    fieldOrInlineFragmentNode: selectionNode,
-                    type: subType,
-                    path,
-                    showInSidebar
+                  return formifyInlineFragmentNode({
+                    inlineFragmentNode: selectionNode,
+                    parentType: type,
+                    path
                   });
-                case "Field":
+                }
+                case "Field": {
                   if (selectionNode.name.value === DATA_NODE_NAME) {
-                    const path2 = [
-                      ...path,
-                      getNameAndAlias(selectionNode, false, false)
-                    ];
-                    if (G__namespace.isObjectType(namedType)) {
-                      const field = getObjectField(namedType, selectionNode);
-                      const namedSubType = G__namespace.getNamedType(field.type);
-                      ensureObjectType(namedSubType);
-                      return __spreadProps(__spreadValues({}, selectionNode), {
-                        selectionSet: {
-                          kind: "SelectionSet",
-                          selections: [
-                            ...selectionNode.selectionSet.selections.map((subSelectionNode) => {
-                              switch (subSelectionNode.kind) {
-                                case "Field":
-                                  const subSelectionField = getObjectField(namedSubType, subSelectionNode);
-                                  if (!subSelectionField) {
-                                    return subSelectionNode;
-                                  }
-                                  const subSelectionType = G__namespace.getNamedType(subSelectionField.type);
-                                  return formifyField({
-                                    fieldNode: subSelectionNode,
-                                    parentType: field.type,
-                                    path: [
-                                      ...path2,
-                                      getNameAndAlias(subSelectionNode, isListType(subSelectionField.type), isNodeField(subSelectionType))
-                                    ]
-                                  });
-                                default:
-                                  throw new FormifyError("UNEXPECTED", `selection ${subSelectionNode.kind}`);
-                              }
-                            })
-                          ]
-                        }
-                      });
-                    }
-                    throw new FormifyError("UNEXPECTED");
+                    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;
+                }
                 default:
                   throw new FormifyError("UNEXPECTED");
               }
@@ -1409,32 +1505,35 @@ var __objRest = (source, exclude) => {
           ]
         }
       });
-      return formifiedNode;
     }
-    const formifyField = ({
+    const formifyFieldNode = ({
       fieldNode,
       parentType,
       path
     }) => {
-      const namedParentType = G__namespace.getNamedType(parentType);
-      ensureObjectType(namedParentType);
-      const field = getObjectField(namedParentType, fieldNode);
+      if (fieldNode.name.value === "__typename") {
+        return fieldNode;
+      }
+      const field = getObjectField(parentType, fieldNode);
       if (!field) {
-        if (fieldNode.name.value === "__typename") {
-          return fieldNode;
-        } else {
-          throw new FormifyError("UNEXPECTED", `field with no associated type ${fieldNode.name.value}`);
-        }
+        return fieldNode;
       }
-      const namedType = G__namespace.getNamedType(field.type);
-      const fieldBlueprint = {
-        id: getBlueprintId([...path]),
-        documentBlueprintId: getRelativeBlueprint(path),
-        path: [...path]
-      };
       const blueprint = blueprints.find((blueprint2) => blueprint2.id === getRelativeBlueprint(path));
-      blueprint.fields.push(fieldBlueprint);
-      if (G__namespace.isScalarType(namedType)) {
+      if (!blueprint) {
+        return fieldNode;
+      }
+      const fieldPath = buildPath({
+        fieldNode,
+        type: field.type,
+        parentTypename: G__namespace.getNamedType(parentType).name,
+        path
+      });
+      blueprint.fields.push({
+        id: getBlueprintId(fieldPath),
+        documentBlueprintId: blueprint.id,
+        path: fieldPath
+      });
+      if (isScalarType(field.type)) {
         return fieldNode;
       }
       return __spreadProps(__spreadValues({}, fieldNode), {
@@ -1443,121 +1542,20 @@ var __objRest = (source, exclude) => {
           selections: [
             ...fieldNode.selectionSet.selections.map((selectionNode) => {
               switch (selectionNode.kind) {
-                case "Field":
-                  if (selectionNode.name.value === "__typename") {
-                    return selectionNode;
-                  }
-                  ensureObjectType(namedType);
-                  const subField = getObjectField(namedType, selectionNode);
-                  if (!subField) {
-                    return fieldNode;
-                  }
-                  if (G__namespace.isScalarType(G__namespace.getNamedType(subField.type))) {
-                    const newPath2 = [
-                      ...path,
-                      getNameAndAlias(selectionNode, isListType(subField.type), false)
-                    ];
-                    const fieldBlueprint3 = {
-                      id: getBlueprintId(newPath2),
-                      documentBlueprintId: getRelativeBlueprint(newPath2),
-                      path: newPath2
-                    };
-                    const blueprint3 = blueprints.find((blueprint4) => blueprint4.id === getRelativeBlueprint(path));
-                    blueprint3.fields.push(fieldBlueprint3);
-                    return selectionNode;
-                  }
-                  const subFieldType = subField.type;
-                  const namedSubFieldType = G__namespace.getNamedType(subFieldType);
-                  const newPath = [
-                    ...path,
-                    getNameAndAlias(selectionNode, isListType(subFieldType), isNodeField(namedSubFieldType))
-                  ];
-                  const fieldBlueprint2 = {
-                    id: getBlueprintId(newPath),
-                    documentBlueprintId: getRelativeBlueprint(newPath),
-                    path: newPath
-                  };
-                  const blueprint2 = blueprints.find((blueprint3) => blueprint3.id === getRelativeBlueprint(path));
-                  blueprint2.fields.push(fieldBlueprint2);
-                  return __spreadProps(__spreadValues({}, selectionNode), {
-                    selectionSet: {
-                      kind: "SelectionSet",
-                      selections: selectionNode.selectionSet.selections.map((subSelectionNode) => {
-                        switch (subSelectionNode.kind) {
-                          case "Field":
-                            if (subSelectionNode.name.value === "__typename") {
-                              return subSelectionNode;
-                            }
-                            ensureObjectType(namedSubFieldType);
-                            const subField1 = getObjectField(namedSubFieldType, subSelectionNode);
-                            const subType1 = subField1.type;
-                            const namedSubType2 = G__namespace.getNamedType(subType1);
-                            return formifyField({
-                              fieldNode: subSelectionNode,
-                              parentType: subFieldType,
-                              path: [
-                                ...path,
-                                getNameAndAlias(subSelectionNode, isListType(subType1), isNodeField(namedSubType2))
-                              ]
-                            });
-                          case "InlineFragment":
-                            const subNamedType = G__namespace.getNamedType(subField.type);
-                            ensureNodeField(subNamedType);
-                            ensureUnionType(subNamedType);
-                            const subType2 = getSelectedUnionType(subNamedType, subSelectionNode);
-                            const newPath2 = [
-                              ...path,
-                              getNameAndAlias(selectionNode, isListType(subField.type), true)
-                            ];
-                            return formifyNode({
-                              fieldOrInlineFragmentNode: subSelectionNode,
-                              type: subType2,
-                              path: newPath2,
-                              showInSidebar: false
-                            });
-                          default:
-                            throw new FormifyError("UNEXPECTED", `selection ${subSelectionNode.kind}`);
-                        }
-                      })
-                    }
+                case "Field": {
+                  return formifyFieldNode({
+                    fieldNode: selectionNode,
+                    parentType: field.type,
+                    path: fieldPath
                   });
-                case "InlineFragment":
-                  ensureUnionType(namedType);
-                  if (isNodeField(namedType)) {
-                    const parentType2 = getSelectedUnionType(namedType, selectionNode);
-                    return formifyNode({
-                      fieldOrInlineFragmentNode: selectionNode,
-                      type: parentType2,
-                      path,
-                      showInSidebar: false
-                    });
-                  }
-                  const subType = getSelectedUnionType(namedType, selectionNode);
-                  const namedSubType = G__namespace.getNamedType(subType);
-                  return __spreadProps(__spreadValues({}, selectionNode), {
-                    selectionSet: {
-                      kind: "SelectionSet",
-                      selections: selectionNode.selectionSet.selections.map((subSelectionNode) => {
-                        switch (subSelectionNode.kind) {
-                          case "Field":
-                            ensureObjectType(namedSubType);
-                            const subField2 = getObjectField(namedSubType, subSelectionNode);
-                            const subType2 = subField2.type;
-                            const namedSubType2 = G__namespace.getNamedType(subType2);
-                            return formifyField({
-                              fieldNode: subSelectionNode,
-                              parentType: subType,
-                              path: [
-                                ...path,
-                                getNameAndAlias(subSelectionNode, isListType(subType2), isNodeField(namedSubType2))
-                              ]
-                            });
-                          default:
-                            throw new FormifyError("UNEXPECTED", `selection ${subSelectionNode.kind}`);
-                        }
-                      })
-                    }
+                }
+                case "InlineFragment": {
+                  return formifyInlineFragmentNode({
+                    inlineFragmentNode: selectionNode,
+                    parentType: field.type,
+                    path: fieldPath
                   });
+                }
                 default:
                   throw new FormifyError("UNEXPECTED", `selection ${selectionNode.kind}`);
               }
@@ -1566,43 +1564,77 @@ var __objRest = (source, exclude) => {
         }
       });
     };
+    const formifyInlineFragmentNode = ({
+      inlineFragmentNode,
+      parentType,
+      path
+    }) => {
+      const type = getSelectedUnionType(parentType, inlineFragmentNode);
+      if (!type) {
+        return inlineFragmentNode;
+      }
+      if (isFormifiableDocument(type)) {
+        return formifyInlineFragmentDocument({
+          inlineFragmentNode,
+          type,
+          path,
+          showInSidebar: false
+        });
+      }
+      return __spreadProps(__spreadValues({}, inlineFragmentNode), {
+        selectionSet: {
+          kind: "SelectionSet",
+          selections: inlineFragmentNode.selectionSet.selections.map((selectionNode) => {
+            switch (selectionNode.kind) {
+              case "Field":
+                return formifyFieldNode({
+                  fieldNode: selectionNode,
+                  parentType: type,
+                  path
+                });
+              default:
+                throw new FormifyError("UNEXPECTED", `selection ${selectionNode.kind}`);
+            }
+          })
+        }
+      });
+    };
     const formifiedQuery = {
       kind: "Document",
       definitions: optimizedQuery.definitions.map((definition) => {
         typeInfo.enter(definition);
         ensureOperationDefinition(definition);
-        const type = typeInfo.getType();
-        const namedType = G__namespace.getNamedType(type);
-        ensureObjectType(namedType);
+        const parentType = typeInfo.getType();
         return __spreadProps(__spreadValues({}, definition), {
           selectionSet: {
             kind: "SelectionSet",
             selections: definition.selectionSet.selections.map((selectionNode) => {
               switch (selectionNode.kind) {
                 case "Field":
-                  const parentType = type;
-                  const namedParentType = G__namespace.getNamedType(parentType);
-                  ensureObjectType(namedParentType);
-                  const field = getObjectField(namedParentType, selectionNode);
-                  const namedFieldType = G__namespace.getNamedType(field.type);
-                  if (isNodeField(namedFieldType)) {
-                    return formifyNode({
-                      fieldOrInlineFragmentNode: selectionNode,
+                  const field = getObjectField(parentType, selectionNode);
+                  const path = buildPath({
+                    fieldNode: selectionNode,
+                    type: field.type
+                  });
+                  if (isFormifiableDocument(field.type)) {
+                    return formifyFieldNodeDocument({
+                      fieldNode: selectionNode,
                       type: field.type,
-                      path: [getNameAndAlias(selectionNode, false, true)],
+                      path,
                       showInSidebar: true
                     });
-                  } else if (isConnectionField(namedFieldType)) {
+                  } else if (isConnectionField(field.type)) {
                     return formifyConnection({
-                      namedFieldType,
+                      parentType: field.type,
                       selectionNode,
-                      path: [getNameAndAlias(selectionNode, false, false)]
+                      path
                     });
                   }
                   if (selectionNode.name.value === COLLECTION_FIELD_NAME || selectionNode.name.value === COLLECTIONS_FIELD_NAME) {
-                    const path = [
-                      getNameAndAlias(selectionNode, false, false)
-                    ];
+                    const path2 = buildPath({
+                      fieldNode: selectionNode,
+                      type: field.type
+                    });
                     return __spreadProps(__spreadValues({}, selectionNode), {
                       selectionSet: {
                         kind: "SelectionSet",
@@ -1610,16 +1642,15 @@ var __objRest = (source, exclude) => {
                           switch (subSelectionNode.kind) {
                             case "Field":
                               if (subSelectionNode.name.value === COLLECTIONS_DOCUMENTS_NAME) {
-                                ensureObjectType(namedFieldType);
-                                const n = namedFieldType.getFields()[COLLECTIONS_DOCUMENTS_NAME];
-                                const docType = G__namespace.getNamedType(n.type);
+                                const subField = getObjectField(field.type, subSelectionNode);
                                 return formifyConnection({
-                                  namedFieldType: docType,
+                                  parentType: subField.type,
                                   selectionNode: subSelectionNode,
-                                  path: [
-                                    ...path,
-                                    getNameAndAlias(subSelectionNode, isListType(docType), isNodeField(docType))
-                                  ]
+                                  path: buildPath({
+                                    fieldNode: subSelectionNode,
+                                    type: subField.type,
+                                    path: path2
+                                  })
                                 });
                               }
                               return subSelectionNode;
@@ -1659,9 +1690,27 @@ var __objRest = (source, exclude) => {
       this.name = "FormifyError";
     }
   }
+  const defaultState = {
+    status: "idle",
+    schema: void 0,
+    query: null,
+    queryString: null,
+    data: {},
+    changeSets: [],
+    count: 0,
+    blueprints: [],
+    formNodes: [],
+    documentForms: []
+  };
   function reducer(state, action) {
     var _a, _b, _c, _d;
     switch (action.type) {
+      case "start":
+        return __spreadProps(__spreadValues(__spreadValues({}, state), defaultState), {
+          query: action.value.query ? G__namespace.parse(action.value.query) : null,
+          queryString: action.value.query,
+          status: "initialized"
+        });
       case "addDocumentBlueprints":
         return __spreadProps(__spreadValues({}, state), {
           status: "formified",
@@ -1716,16 +1765,21 @@ var __objRest = (source, exclude) => {
           }
           if (event.mutationType.type === "change") {
             if (!action.value.form) {
-              getPathsToChange(event, state).forEach(({ formNode: formNode2, pathToChange }) => {
+              getBlueprintFieldsForEvent(blueprint, event).forEach((fieldBlueprint) => {
+                const { pathToChange } = getFormNodesForField(fieldBlueprint, formNode, event, state);
                 changeSets.push(__spreadValues({
                   path: pathToChange
-                }, buildChangeSet(event, formNode2)));
+                }, buildChangeSet(event, formNode)));
               });
             }
           } else if (event.mutationType.type === "referenceChange") {
             getBlueprintFieldsForEvent(blueprint, event).forEach((fieldBlueprint) => {
-              const { pathToChange, formNodes, eventLocation } = getFormNodesForField(fieldBlueprint, formNode, event, state);
-              if (action.value.form) {
+              const {
+                pathToChange,
+                formNodes: subFormNodes,
+                eventLocation
+              } = getFormNodesForField(fieldBlueprint, formNode, event, state);
+              if (action.value.form && state.blueprints.find((blueprint2) => blueprint2.id === fieldBlueprint.id)) {
                 const newFormNode = {
                   documentBlueprintId: fieldBlueprint.id,
                   documentFormId: action.value.form.id,
@@ -1736,8 +1790,15 @@ var __objRest = (source, exclude) => {
                   path: pathToChange
                 }, buildChangeSet(event, newFormNode)));
               }
-              formNodes.forEach((subFormNode) => {
+              subFormNodes.forEach((subFormNode) => {
                 if (matchLocation(eventLocation, subFormNode)) {
+                  if (!action.value.form) {
+                    changeSets.push(__spreadProps(__spreadValues({
+                      path: pathToChange
+                    }, buildChangeSet(event, subFormNode)), {
+                      value: null
+                    }));
+                  }
                   formNodesToReplace.push(subFormNode);
                 }
               });
@@ -1890,7 +1951,7 @@ var __objRest = (source, exclude) => {
   }) => {
     const formIds = React__default["default"].useRef([]);
     const [state, dispatch] = React__default["default"].useReducer(reducer, {
-      status: "initialized",
+      status: "idle",
       schema: void 0,
       query: query ? G__namespace.parse(query) : null,
       queryString: query,
@@ -1901,6 +1962,17 @@ var __objRest = (source, exclude) => {
       formNodes: [],
       documentForms: []
     });
+    React__default["default"].useEffect(() => {
+      if (query) {
+        dispatch({ type: "start", value: { query } });
+        formIds.current.forEach((formId) => {
+          const form = cms.forms.find(formId);
+          if (form) {
+            cms.plugins.remove(form);
+          }
+        });
+      }
+    }, [query, JSON.stringify(variables)]);
     React__default["default"].useEffect(() => {
       if (state.status === "initialized") {
         cms.api.tina.request(query, { variables }).then((res) => {
@@ -1932,7 +2004,7 @@ var __objRest = (source, exclude) => {
           variables
         });
         state.blueprints.map((blueprint) => {
-          const responseAtBlueprint = getIn2(result, getBlueprintAliasPath(blueprint));
+          const responseAtBlueprint = getValueForBlueprint(result, getBlueprintAliasPath(blueprint));
           const location = [];
           const findFormNodes = (res, location2) => {
             if (Array.isArray(res)) {
@@ -1981,6 +2053,9 @@ var __objRest = (source, exclude) => {
     React__default["default"].useEffect(() => {
       if (state.status === "ready") {
         cms.events.subscribe(`forms:reset`, (event) => {
+          if (eventList) {
+            eventList.push(printEvent(event));
+          }
           dispatch({ type: "formOnReset", value: { event } });
         });
         cms.events.subscribe(`forms:fields:onChange`, async (event) => {
@@ -2002,6 +2077,9 @@ var __objRest = (source, exclude) => {
                           values
                           _internalSys: sys {
                             path
+                            collection {
+                              name
+                            }
                           }
                         }
                       }
@@ -2032,7 +2110,8 @@ var __objRest = (source, exclude) => {
           const form = cms.forms.find(changeSet.formId);
           resolveSubFields({
             formNode: changeSet.formNode,
-            form
+            form,
+            loc: []
           }).then((res) => {
             dispatch({
               type: "setIn",
@@ -2141,22 +2220,15 @@ var __objRest = (source, exclude) => {
       const data = {};
       await sequential(form.fields, async (field) => {
         const value = form.values[field.name];
-        const fieldName = field.list ? `${field.name}.[]` : field.name;
         const blueprint = getFormNodeBlueprint(formNode, state);
-        const blueprintName = getBlueprintNamePath(blueprint);
-        const extra = [];
-        if (prefix) {
-          extra.push(prefix);
-        }
-        const matchName = [
-          blueprintName,
-          DATA_NODE_NAME,
-          ...extra,
-          fieldName
-        ].join(".");
+        const { matchName, fieldName } = getMatchName({
+          field,
+          prefix,
+          blueprint
+        });
         const fieldBlueprints = blueprint.fields.filter((fieldBlueprint) => {
           return matchName === getBlueprintNamePath(fieldBlueprint);
-        });
+        }).filter((fbp) => filterFieldBlueprintsByParentTypename(fbp, field.parentTypename));
         switch (field.type) {
           case "object":
             if (field.templates) {
@@ -2170,18 +2242,17 @@ var __objRest = (source, exclude) => {
                   if (!Array.isArray(value)) {
                     throw new Error(`Expected value for object list field to be an array`);
                   }
-                  const d = [];
-                  await sequential(value, async (item, index) => {
+                  data[keyName] = await sequential(value, async (item, index) => {
                     const template = field.templates[item._template];
-                    const d2 = await resolveSubFields({
+                    return __spreadProps(__spreadValues({}, await resolveSubFields({
                       formNode,
                       form: { fields: template.fields, values: item },
-                      prefix: [prefix, fieldName].join("."),
+                      prefix: prefix ? [prefix, fieldName].join(".") : fieldName,
                       loc: [...loc, index]
+                    })), {
+                      __typename: field.typeMap[item._template]
                     });
-                    d.push(d2);
                   });
-                  data[keyName] = d;
                 });
               } else {
                 throw new Error("blocks without list true is not yet supported");
@@ -2197,18 +2268,14 @@ var __objRest = (source, exclude) => {
                   if (!Array.isArray(value)) {
                     throw new Error(`Expected value for object list field to be an array`);
                   }
-                  const d = [];
-                  await sequential(value, async (item, index) => {
-                    const d2 = await resolveSubFields({
+                  data[keyName] = await sequential(value, async (item, index) => {
+                    return resolveSubFields({
                       formNode,
                       form: { fields: field.fields, values: item },
                       prefix: [prefix, fieldName].join("."),
                       loc: [...loc, index]
                     });
-                    d.push(d2);
-                    return true;
                   });
-                  data[keyName] = d;
                   return true;
                 });
               } else {
@@ -2218,13 +2285,12 @@ var __objRest = (source, exclude) => {
                     data[keyName] = null;
                     return true;
                   }
-                  const d = await resolveSubFields({
+                  data[keyName] = await resolveSubFields({
                     formNode,
                     form: { fields: field.fields, values: value },
                     prefix: [prefix, fieldName].join("."),
                     loc
                   });
-                  data[keyName] = d;
                   return true;
                 });
               }
@@ -2245,6 +2311,9 @@ var __objRest = (source, exclude) => {
                             values
                             _internalSys: sys {
                               path
+                              collection {
+                                name
+                              }
                             }
                           }
                         }
@@ -2279,12 +2348,13 @@ var __objRest = (source, exclude) => {
                       }
                     }
                   `, { variables: { id: value } });
-              const d = await resolveSubFields({
-                formNode: subDocumentFormNode,
-                form: form2,
-                loc: location
+              data[keyName] = __spreadProps(__spreadValues({}, res.node), {
+                data: await resolveSubFields({
+                  formNode: subDocumentFormNode,
+                  form: form2,
+                  loc: location
+                })
               });
-              data[keyName] = __spreadProps(__spreadValues({}, res.node), { data: d });
             });
             break;
           default:
@@ -2352,13 +2422,13 @@ mutation addPendingDocumentMutation(
         return result;
       };
       this.getSchema = async () => {
-        if (!this.schema) {
+        if (!this.gqlSchema) {
           const data = await this.request(G.getIntrospectionQuery(), {
             variables: {}
           });
-          this.schema = G.buildClientSchema(data);
+          this.gqlSchema = G.buildClientSchema(data);
         }
-        return this.schema;
+        return this.gqlSchema;
       };
       this.getOptimizedQuery = async (documentNode) => {
         const data = await this.request(`query GetOptimizedQuery($queryString: String!) {
@@ -2368,6 +2438,13 @@ mutation addPendingDocumentMutation(
         });
         return G.parse(data.getOptimizedQuery);
       };
+      if (options.schema) {
+        const enrichedSchema = new schemaTools.TinaSchema(__spreadValues({
+          version: { fullVersion: "", major: "", minor: "", patch: "" },
+          meta: { flags: [] }
+        }, schemaTools.addNamespaceToSchema(options.schema, [])));
+        this.schema = enrichedSchema;
+      }
       this.options = options;
       this.setBranch(options.branch);
       this.events.subscribe("branch:change", ({ branchName }) => {
@@ -2577,11 +2654,11 @@ mutation addPendingDocumentMutation(
   const DEFAULT_LOCAL_TINA_GQL_SERVER_URL = "http://localhost:4001/graphql";
   class LocalClient extends Client {
     constructor(props) {
-      const clientProps = {
+      const clientProps = __spreadProps(__spreadValues({}, props), {
         clientId: "",
         branch: "",
         customContentApiUrl: props && props.customContentApiUrl ? props.customContentApiUrl : DEFAULT_LOCAL_TINA_GQL_SERVER_URL
-      };
+      });
       super(clientProps);
     }
     async isAuthorized() {
@@ -3156,11 +3233,13 @@ mutation addPendingDocumentMutation(
     var _d = _c, {
       query,
       documentCreatorCallback,
-      formifyCallback
+      formifyCallback,
+      schema
     } = _d, props = __objRest(_d, [
       "query",
       "documentCreatorCallback",
-      "formifyCallback"
+      "formifyCallback",
+      "schema"
     ]);
     const validOldSetup = new Boolean(props == null ? void 0 : props.isLocalClient) || new Boolean(props == null ? void 0 : props.clientId) && new Boolean(props == null ? void 0 : props.branch);
     if (!props.apiURL && !validOldSetup) {
@@ -3177,7 +3256,8 @@ mutation addPendingDocumentMutation(
       tinaioConfig: props.tinaioConfig,
       isLocalClient,
       cmsCallback: props.cmsCallback,
-      mediaStore: props.mediaStore
+      mediaStore: props.mediaStore,
+      schema
     }, /* @__PURE__ */ React__default["default"].createElement("style", null, styles), /* @__PURE__ */ React__default["default"].createElement(ErrorBoundary, null, /* @__PURE__ */ React__default["default"].createElement(DocumentCreator, {
       documentCreatorCallback
     }), /* @__PURE__ */ React__default["default"].createElement(TinaDataProvider, {
@@ -3905,7 +3985,7 @@ This will work when developing locally but NOT when deployed to production.
       window.location.href = routeOverride;
       return null;
     } else {
-      navigate(document.sys.filename);
+      navigate(document.sys.breadcrumbs.join("/"));
     }
   };
   const CollectionListPage = () => {
@@ -3938,8 +4018,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("/");
           return /* @__PURE__ */ React__default["default"].createElement("tr", {
-            key: `document-${document.node.sys.filename}`,
+            key: `document-${document.node.sys.relativePath}`,
             className: ""
           }, /* @__PURE__ */ React__default["default"].createElement("td", {
             className: "px-6 py-2 whitespace-nowrap"
@@ -3954,7 +4035,9 @@ This will work when developing locally but NOT when deployed to production.
             className: "block text-xs text-gray-400 mb-1 uppercase"
           }, "Filename"), /* @__PURE__ */ React__default["default"].createElement("span", {
             className: "h-5 leading-5 block whitespace-nowrap"
-          }, document.node.sys.filename)))), /* @__PURE__ */ React__default["default"].createElement("td", {
+          }, 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", {
             className: "px-6 py-4 whitespace-nowrap"
           }, /* @__PURE__ */ React__default["default"].createElement("span", {
             className: "block text-xs text-gray-400 mb-1 uppercase"
@@ -4078,6 +4161,22 @@ This will work when developing locally but NOT when deployed to production.
     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 template2 = schema.getTemplateForData({
+        collection: schemaCollection,
+        data: {}
+      });
+      const formInfo = schemaTools.resolveForm({
+        collection: schemaCollection,
+        basename: schemaCollection.name,
+        schema,
+        template: template2
+      });
+      schemaFields = formInfo.fields;
+    }
     const form = React.useMemo(() => {
       return new toolkit.Form({
         id: "create-form",
@@ -4087,7 +4186,7 @@ This will work when developing locally but NOT when deployed to production.
             name: "filename",
             label: "Filename",
             component: "text",
-            description: `A unique filename for the content.  Example: My_Document`,
+            description: /* @__PURE__ */ React__default["default"].createElement("span", null, "A unique filename for the content.", /* @__PURE__ */ React__default["default"].createElement("br", null), "Examples: ", /* @__PURE__ */ React__default["default"].createElement("code", null, "My_Document"), ", ", /* @__PURE__ */ React__default["default"].createElement("code", null, "My_Document.en"), ",", " ", /* @__PURE__ */ React__default["default"].createElement("code", null, "sub-folder/My_Document")),
             placeholder: `My_Document`,
             validate: (value, allValues, meta) => {
               if (!value) {
@@ -4096,13 +4195,13 @@ This will work when developing locally but NOT when deployed to production.
                 }
                 return true;
               }
-              const isValid = /^[_a-zA-Z][.,-,_a-zA-Z0-9]*$/.test(value);
+              const isValid = /^[_a-zA-Z][\.\-_\/a-zA-Z0-9]*$/.test(value);
               if (value && !isValid) {
-                return "Must begin with a-z, A-Z, or _ and contain only a-z, A-Z, 0-9, -, ., or _";
+                return "Must begin with a-z, A-Z, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
               }
             }
           },
-          ...fields
+          ...schemaFields
         ],
         onSubmit: async (values) => {
           try {
@@ -4195,7 +4294,8 @@ This will work when developing locally but NOT when deployed to production.
     }
   };
   const CollectionUpdatePage = () => {
-    const { collectionName, filename } = reactRouterDom.useParams();
+    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, {
       cms,
       collectionName
@@ -4224,13 +4324,28 @@ This will work when developing locally but NOT when deployed to production.
     mutationInfo
   }) => {
     var _a, _b;
-    reactRouterDom.useNavigate();
     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.value
+      });
+      const formInfo = schemaTools.resolveForm({
+        collection: schemaCollection,
+        basename: schemaCollection.name,
+        schema,
+        template
+      });
+      schemaFields = formInfo.fields;
+    }
     const form = React.useMemo(() => {
       return new toolkit.Form({
         id: "update-form",
         label: "form",
-        fields: document.form.fields,
+        fields: schemaFields,
         initialValues: document.values,
         onSubmit: async (values) => {
           try {
@@ -4314,7 +4429,7 @@ This will work when developing locally but NOT when deployed to production.
           path: "collections/:collectionName/:templateName/new",
           element: /* @__PURE__ */ React__default["default"].createElement(CollectionCreatePage, null)
         }), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
-          path: "collections/:collectionName/:filename",
+          path: "collections/:collectionName/*",
           element: /* @__PURE__ */ React__default["default"].createElement(CollectionUpdatePage, null)
         }), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
           path: "collections/:collectionName",