@tinacms/graphql 1.3.2 → 1.3.4

package/dist/index.js

@@ -1,58 +1,30 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
-  __markAsModule(target);
-  for (var name2 in all)
-    __defProp(target, name2, { get: all[name2], enumerable: true });
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module3, desc) => {
-  if (module3 && typeof module3 === "object" || typeof module3 === "function") {
-    for (let key of __getOwnPropNames(module3))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module3[key], enumerable: !(desc = __getOwnPropDesc(module3, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
-};
-var __toModule = (module3) => {
-  return __reExport(__markAsModule(__defProp(module3 != null ? __create(__getProtoOf(module3)) : {}, "default", module3 && module3.__esModule && "default" in module3 ? { get: () => module3.default, enumerable: true } : { value: module3, enumerable: true })), module3);
+  return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-__export(exports, {
+var src_exports = {};
+__export(src_exports, {
   AuditFileSystemBridge: () => AuditFileSystemBridge,
   FilesystemBridge: () => FilesystemBridge,
   IsomorphicBridge: () => IsomorphicBridge,
@@ -73,21 +45,22 @@ __export(exports, {
   sequential: () => sequential,
   stringifyFile: () => stringifyFile
 });
-var import_fs_extra4 = __toModule(require("fs-extra"));
-var import_path6 = __toModule(require("path"));
-var import_graphql7 = __toModule(require("graphql"));
+module.exports = __toCommonJS(src_exports);
+var import_fs_extra4 = __toESM(require("fs-extra"));
+var import_path6 = __toESM(require("path"));
+var import_graphql7 = require("graphql");
 
 // src/build.ts
-var import_lodash3 = __toModule(require("lodash"));
-var import_fs_extra = __toModule(require("fs-extra"));
-var import_graphql2 = __toModule(require("graphql"));
+var import_lodash3 = __toESM(require("lodash"));
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_graphql2 = require("graphql");
 
 // src/ast-builder/index.ts
-var import_lodash = __toModule(require("lodash"));
+var import_lodash = __toESM(require("lodash"));
 
 // src/util.ts
-var yup = __toModule(require("yup"));
-var import_graphql = __toModule(require("graphql"));
+var yup = __toESM(require("yup"));
+var import_graphql = require("graphql");
 var sequential = async (items, callback) => {
   const accum = [];
   if (!items) {
@@ -198,11 +171,11 @@ var SysFieldDefinition = {
 };
 var astBuilder = {
   FormFieldBuilder: ({
-    name: name2,
+    name,
     additionalFields
   }) => {
     return astBuilder.ObjectTypeDefinition({
-      name: name2,
+      name,
       interfaces: [astBuilder.NamedType({ name: "FormField" })],
       fields: [
         astBuilder.FieldDefinition({
@@ -225,14 +198,14 @@ var astBuilder = {
     });
   },
   ScalarTypeDefinition: ({
-    name: name2,
+    name,
     description
   }) => {
     return {
       kind: "ScalarTypeDefinition",
       name: {
         kind: "Name",
-        value: name2
+        value: name
       },
       description: {
         kind: "StringValue",
@@ -242,7 +215,7 @@ var astBuilder = {
     };
   },
   InputValueDefinition: ({
-    name: name2,
+    name,
     type,
     list,
     required
@@ -259,12 +232,13 @@ var astBuilder = {
       kind: "InputValueDefinition",
       name: {
         kind: "Name",
-        value: name2
+        value: name
       }
     };
     if (list) {
       if (required) {
-        res = __spreadProps(__spreadValues({}, def), {
+        res = {
+          ...def,
           type: {
             kind: "ListType",
             type: {
@@ -272,27 +246,30 @@ var astBuilder = {
               type: namedType
             }
           }
-        });
+        };
       } else {
-        res = __spreadProps(__spreadValues({}, def), {
+        res = {
+          ...def,
           type: {
             kind: "ListType",
             type: namedType
           }
-        });
+        };
       }
     } else {
       if (required) {
-        res = __spreadProps(__spreadValues({}, def), {
+        res = {
+          ...def,
           type: {
             kind: "NonNullType",
             type: namedType
           }
-        });
+        };
       } else {
-        res = __spreadProps(__spreadValues({}, def), {
+        res = {
+          ...def,
           type: namedType
-        });
+        };
       }
     }
     return res;
@@ -316,17 +293,17 @@ var astBuilder = {
     };
   },
   FieldNodeDefinition: ({
-    name: name2,
+    name,
     type,
     args = [],
     list,
     required
   }) => ({
-    name: { kind: "Name", value: name2 },
+    name: { kind: "Name", value: name },
     kind: "Field"
   }),
   FieldDefinition: ({
-    name: name2,
+    name,
     type,
     args = [],
     list,
@@ -344,13 +321,14 @@ var astBuilder = {
       kind: "FieldDefinition",
       name: {
         kind: "Name",
-        value: name2
+        value: name
       },
       arguments: args
     };
     if (list) {
       if (required) {
-        res = __spreadProps(__spreadValues({}, def), {
+        res = {
+          ...def,
           type: {
             kind: "NonNullType",
             type: {
@@ -361,33 +339,36 @@ var astBuilder = {
               }
             }
           }
-        });
+        };
       } else {
-        res = __spreadProps(__spreadValues({}, def), {
+        res = {
+          ...def,
           type: {
             kind: "ListType",
             type: namedType
           }
-        });
+        };
       }
     } else {
       if (required) {
-        res = __spreadProps(__spreadValues({}, def), {
+        res = {
+          ...def,
           type: {
             kind: "NonNullType",
             type: namedType
           }
-        });
+        };
       } else {
-        res = __spreadProps(__spreadValues({}, def), {
+        res = {
+          ...def,
           type: namedType
-        });
+        };
       }
     }
     return res;
   },
   InterfaceTypeDefinition: ({
-    name: name2,
+    name,
     fields,
     description = ""
   }) => {
@@ -396,7 +377,7 @@ var astBuilder = {
       description: { kind: "StringValue", value: description },
       name: {
         kind: "Name",
-        value: name2
+        value: name
       },
       interfaces: [],
       directives: [],
@@ -404,45 +385,45 @@ var astBuilder = {
     };
   },
   InputObjectTypeDefinition: ({
-    name: name2,
+    name,
     fields
   }) => ({
     kind: "InputObjectTypeDefinition",
     name: {
       kind: "Name",
-      value: name2
+      value: name
     },
     fields
   }),
   UnionTypeDefinition: ({
-    name: name2,
+    name,
     types
   }) => ({
     kind: "UnionTypeDefinition",
     name: {
       kind: "Name",
-      value: name2
+      value: name
     },
     directives: [],
-    types: types.map((name3) => ({
+    types: types.map((name2) => ({
       kind: "NamedType",
       name: {
         kind: "Name",
-        value: name3
+        value: name2
       }
     }))
   }),
-  NamedType: ({ name: name2 }) => {
+  NamedType: ({ name }) => {
     return {
       kind: "NamedType",
       name: {
         kind: "Name",
-        value: name2
+        value: name
       }
     };
   },
   ObjectTypeDefinition: ({
-    name: name2,
+    name,
     fields,
     interfaces = [],
     directives = [],
@@ -453,16 +434,16 @@ var astBuilder = {
     directives,
     name: {
       kind: "Name",
-      value: name2
+      value: name
     },
     fields
   }),
   FieldWithSelectionSetDefinition: ({
-    name: name2,
+    name,
     selections
   }) => {
     return {
-      name: { kind: "Name", value: name2 },
+      name: { kind: "Name", value: name },
       kind: "Field",
       selectionSet: {
         kind: "SelectionSet",
@@ -471,7 +452,7 @@ var astBuilder = {
     };
   },
   InlineFragmentDefinition: ({
-    name: name2,
+    name,
     selections
   }) => {
     return {
@@ -484,13 +465,13 @@ var astBuilder = {
         kind: "NamedType",
         name: {
           kind: "Name",
-          value: name2
+          value: name
         }
       }
     };
   },
   FragmentDefinition: ({
-    name: name2,
+    name,
     fragmentName,
     selections
   }) => {
@@ -504,7 +485,7 @@ var astBuilder = {
         kind: "NamedType",
         name: {
           kind: "Name",
-          value: name2
+          value: name
         }
       },
       directives: [],
@@ -1003,11 +984,14 @@ var astBuilder = {
     };
   },
   toGraphQLAst: (ast) => {
-    const definitions = import_lodash.default.uniqBy([
-      ...extractInlineTypes(ast.query),
-      ...extractInlineTypes(ast.globalTemplates),
-      ...ast.definitions
-    ], (field) => field.name.value);
+    const definitions = import_lodash.default.uniqBy(
+      [
+        ...extractInlineTypes(ast.query),
+        ...extractInlineTypes(ast.globalTemplates),
+        ...ast.definitions
+      ],
+      (field) => field.name.value
+    );
     return {
       kind: "Document",
       definitions
@@ -1041,7 +1025,7 @@ var extractInlineTypes = (item) => {
     return accumulator;
   }
 };
-function* walk(maybeNode, visited = new WeakSet()) {
+function* walk(maybeNode, visited = /* @__PURE__ */ new WeakSet()) {
   if (typeof maybeNode === "string") {
     return;
   }
@@ -1093,7 +1077,7 @@ function addNamespaceToSchema(maybeNode, namespace = []) {
       }
     }
   });
-  return __spreadProps(__spreadValues({}, newNode), { namespace });
+  return { ...newNode, namespace };
 }
 var generateNamespacedFieldName = (names, suffix = "") => {
   return (suffix ? [...names, suffix] : names).map(capitalize).join("");
@@ -1332,7 +1316,7 @@ var Builder = class {
   constructor(config) {
     this.config = config;
     this.buildCollectionDefinition = async (collections) => {
-      const name2 = "collection";
+      const name = "collection";
       const typeName = "Collection";
       const args = [
         astBuilder.InputValueDefinition({
@@ -1395,23 +1379,23 @@ var Builder = class {
       });
       return astBuilder.FieldDefinition({
         type,
-        name: name2,
+        name,
         args,
         required: true
       });
     };
     this.buildMultiCollectionDefinition = async (collections) => {
-      const name2 = "collections";
+      const name = "collections";
       const typeName = "Collection";
       return astBuilder.FieldDefinition({
         type: typeName,
-        name: name2,
+        name,
         list: true,
         required: true
       });
     };
     this.multiNodeDocument = async () => {
-      const name2 = "node";
+      const name = "node";
       const args = [
         astBuilder.InputValueDefinition({
           name: "id",
@@ -1423,7 +1407,7 @@ var Builder = class {
         resolveType: "nodeDocument"
       });
       return astBuilder.FieldDefinition({
-        name: name2,
+        name,
         args,
         list: false,
         type: astBuilder.TYPES.Node,
@@ -1431,7 +1415,7 @@ var Builder = class {
       });
     };
     this.multiCollectionDocument = async (collections) => {
-      const name2 = "document";
+      const name = "document";
       const args = [
         astBuilder.InputValueDefinition({
           name: "collection",
@@ -1447,7 +1431,7 @@ var Builder = class {
         collections
       });
       return astBuilder.FieldDefinition({
-        name: name2,
+        name,
         args,
         list: false,
         type,
@@ -1552,7 +1536,7 @@ var Builder = class {
       });
     };
     this.collectionDocument = async (collection) => {
-      const name2 = NAMER.queryName([collection.name]);
+      const name = NAMER.queryName([collection.name]);
       const type = await this._buildCollectionDocumentType(collection);
       const args = [
         astBuilder.InputValueDefinition({
@@ -1567,21 +1551,25 @@ var Builder = class {
         [NAMER.createName([collection.name])]: "create",
         [NAMER.updateName([collection.name])]: "update"
       });
-      return astBuilder.FieldDefinition({ type, name: name2, args, required: true });
+      return astBuilder.FieldDefinition({ type, name, args, required: true });
     };
     this.collectionFragment = async (collection) => {
-      const name2 = NAMER.dataTypeName(collection.namespace);
+      const name = NAMER.dataTypeName(collection.namespace);
       const fragmentName = NAMER.fragmentName(collection.namespace);
-      const selections = await this._getCollectionFragmentSelections(collection, 0);
+      const selections = await this._getCollectionFragmentSelections(
+        collection,
+        0
+      );
       return astBuilder.FragmentDefinition({
-        name: name2,
+        name,
         fragmentName,
         selections: filterSelections(selections)
       });
     };
     this._getCollectionFragmentSelections = async (collection, depth) => {
+      var _a;
       const selections = [];
-      if (typeof collection.fields === "object") {
+      if (((_a = collection.fields) == null ? void 0 : _a.length) > 0) {
         await sequential(collection.fields, async (x) => {
           const field = await this._buildFieldNodeForFragments(x, depth);
           selections.push(field);
@@ -1596,6 +1584,7 @@ var Builder = class {
       return selections;
     };
     this._buildFieldNodeForFragments = async (field, depth) => {
+      var _a, _b;
       switch (field.type) {
         case "string":
         case "image":
@@ -1605,7 +1594,7 @@ var Builder = class {
         case "rich-text":
           return astBuilder.FieldNodeDefinition(field);
         case "object":
-          if (typeof field.fields === "object") {
+          if (((_a = field.fields) == null ? void 0 : _a.length) > 0) {
             const selections2 = [];
             await sequential(field.fields, async (item) => {
               const field2 = await this._buildFieldNodeForFragments(item, depth);
@@ -1618,7 +1607,7 @@ var Builder = class {
                 ...filterSelections(selections2)
               ]
             });
-          } else if (typeof field.templates === "object") {
+          } else if (((_b = field.templates) == null ? void 0 : _b.length) > 0) {
             const selections2 = [];
             await sequential(field.templates, async (tem) => {
               if (typeof tem === "object") {
@@ -1654,7 +1643,12 @@ var Builder = class {
               directives: [],
               selectionSet: {
                 kind: "SelectionSet",
-                selections: filterSelections(await this._getCollectionFragmentSelections(collection, depth + 1))
+                selections: filterSelections(
+                  await this._getCollectionFragmentSelections(
+                    collection,
+                    depth + 1
+                  )
+                )
               }
             });
           });
@@ -1749,28 +1743,35 @@ var Builder = class {
       const documentTypeName = NAMER.documentTypeName(collection.namespace);
       const templateInfo = this.tinaSchema.getTemplatesForCollectable(collection);
       if (templateInfo.type === "union") {
-        return this._buildObjectOrUnionData(__spreadValues({}, templateInfo), [
-          astBuilder.FieldDefinition({
-            name: "id",
-            required: true,
-            type: astBuilder.TYPES.ID
-          }),
-          astBuilder.FieldDefinition({
-            name: "_sys",
-            required: true,
-            type: astBuilder.TYPES.SystemInfo
-          }),
-          ...extraFields,
-          astBuilder.FieldDefinition({
-            name: "_values",
-            required: true,
-            type: "JSON"
-          })
-        ], [
-          astBuilder.NamedType({ name: astBuilder.TYPES.Node }),
-          astBuilder.NamedType({ name: astBuilder.TYPES.Document }),
-          ...extraInterfaces
-        ], collection);
+        return this._buildObjectOrUnionData(
+          {
+            ...templateInfo
+          },
+          [
+            astBuilder.FieldDefinition({
+              name: "id",
+              required: true,
+              type: astBuilder.TYPES.ID
+            }),
+            astBuilder.FieldDefinition({
+              name: "_sys",
+              required: true,
+              type: astBuilder.TYPES.SystemInfo
+            }),
+            ...extraFields,
+            astBuilder.FieldDefinition({
+              name: "_values",
+              required: true,
+              type: "JSON"
+            })
+          ],
+          [
+            astBuilder.NamedType({ name: astBuilder.TYPES.Node }),
+            astBuilder.NamedType({ name: astBuilder.TYPES.Document }),
+            ...extraInterfaces
+          ],
+          collection
+        );
       }
       const fields = templateInfo.template.fields;
       const templateFields = await sequential(fields, async (field) => {
@@ -2059,7 +2060,9 @@ var Builder = class {
           const filter = await this._connectionFilterBuilder({
             fieldName: field.name,
             namespace: field.namespace,
-            collections: await this.tinaSchema.getCollectionsByName(field.collections)
+            collections: await this.tinaSchema.getCollectionsByName(
+              field.collections
+            )
           });
           return astBuilder.InputValueDefinition({
             name: field.name,
@@ -2115,25 +2118,33 @@ var Builder = class {
     this._buildReferenceMutation = async (field) => {
       return astBuilder.InputObjectTypeDefinition({
         name: NAMER.dataMutationTypeName(field.namespace),
-        fields: await sequential(this.tinaSchema.getCollectionsByName(field.collections), async (collection) => {
+        fields: await sequential(
+          this.tinaSchema.getCollectionsByName(field.collections),
+          async (collection) => {
+            return astBuilder.InputValueDefinition({
+              name: collection.name,
+              type: NAMER.dataMutationTypeName([collection.name])
+            });
+          }
+        )
+      });
+    };
+    this._buildUpdateDocumentMutationParams = async (field) => {
+      const fields = await sequential(
+        this.tinaSchema.getCollectionsByName(field.collections),
+        async (collection) => {
           return astBuilder.InputValueDefinition({
             name: collection.name,
             type: NAMER.dataMutationTypeName([collection.name])
           });
+        }
+      );
+      fields.push(
+        astBuilder.InputValueDefinition({
+          name: "relativePath",
+          type: astBuilder.TYPES.String
         })
-      });
-    };
-    this._buildUpdateDocumentMutationParams = async (field) => {
-      const fields = await sequential(this.tinaSchema.getCollectionsByName(field.collections), async (collection) => {
-        return astBuilder.InputValueDefinition({
-          name: collection.name,
-          type: NAMER.dataMutationTypeName([collection.name])
-        });
-      });
-      fields.push(astBuilder.InputValueDefinition({
-        name: "relativePath",
-        type: astBuilder.TYPES.String
-      }));
+      );
       return astBuilder.InputObjectTypeDefinition({
         name: NAMER.dataMutationUpdateTypeName(field.namespace),
         fields
@@ -2141,20 +2152,27 @@ var Builder = class {
     };
     this._buildObjectOrUnionData = async (collectableTemplate, extraFields = [], extraInterfaces = [], collection) => {
       if (collectableTemplate.type === "union") {
-        const name2 = NAMER.dataTypeName(collectableTemplate.namespace);
+        const name = NAMER.dataTypeName(collectableTemplate.namespace);
         const typeMap = {};
-        const types = await sequential(collectableTemplate.templates, async (template) => {
-          const type = await this._buildTemplateData(template, extraFields, extraInterfaces);
-          typeMap[template.namespace[template.namespace.length - 1]] = type.name.value;
-          return type;
-        });
+        const types = await sequential(
+          collectableTemplate.templates,
+          async (template) => {
+            const type = await this._buildTemplateData(
+              template,
+              extraFields,
+              extraInterfaces
+            );
+            typeMap[template.namespace[template.namespace.length - 1]] = type.name.value;
+            return type;
+          }
+        );
         await this.database.addToLookupMap({
-          type: name2,
+          type: name,
           resolveType: "unionData",
           collection: collection == null ? void 0 : collection.name,
           typeMap
         });
-        return astBuilder.UnionTypeDefinition({ name: name2, types });
+        return astBuilder.UnionTypeDefinition({ name, types });
       }
       return this._buildTemplateData(collectableTemplate.template);
     };
@@ -2184,7 +2202,9 @@ var Builder = class {
           type: await this._filterCollectionDocumentType(collection)
         });
       } else {
-        throw new Error(`Must provide either collection or collections to filter field builder`);
+        throw new Error(
+          `Must provide either collection or collections to filter field builder`
+        );
       }
       return filter;
     };
@@ -2269,7 +2289,9 @@ Visit https://tina.io/docs/errors/ui-not-supported/ for more information
             name: field.name,
             list: field.list,
             required: field.required,
-            type: await this._buildObjectOrUnionData(this.tinaSchema.getTemplatesForCollectable(field))
+            type: await this._buildObjectOrUnionData(
+              this.tinaSchema.getTemplatesForCollectable(field)
+            )
           });
         case "rich-text":
           return astBuilder.FieldDefinition({
@@ -2279,23 +2301,29 @@ Visit https://tina.io/docs/errors/ui-not-supported/ for more information
             type: astBuilder.TYPES.JSON
           });
         case "reference":
-          const name2 = NAMER.documentTypeName(field.namespace);
+          const name = NAMER.documentTypeName(field.namespace);
           if (field.list) {
             console.warn(listWarningMsg);
             return this._buildMultiCollectionDocumentListDefinition({
               fieldName: field.name,
               namespace: field.namespace,
               nodeType: astBuilder.UnionTypeDefinition({
-                name: name2,
-                types: field.collections.map((collectionName) => NAMER.documentTypeName([collectionName]))
+                name,
+                types: field.collections.map(
+                  (collectionName) => NAMER.documentTypeName([collectionName])
+                )
               }),
-              collections: this.tinaSchema.getCollectionsByName(field.collections),
+              collections: this.tinaSchema.getCollectionsByName(
+                field.collections
+              ),
               connectionNamespace: field.namespace
             });
           } else {
             const type = await this._buildMultiCollectionDocumentDefinition({
-              fieldName: name2,
-              collections: this.tinaSchema.getCollectionsByName(field.collections)
+              fieldName: name,
+              collections: this.tinaSchema.getCollectionsByName(
+                field.collections
+              )
             });
             return astBuilder.FieldDefinition({
               name: field.name,
@@ -2365,12 +2393,12 @@ var filterSelections = (arr) => {
 };
 
 // src/schema/createSchema.ts
-var import_schema_tools2 = __toModule(require("@tinacms/schema-tools"));
+var import_schema_tools2 = require("@tinacms/schema-tools");
 
 // src/schema/validate.ts
-var import_lodash2 = __toModule(require("lodash"));
-var yup2 = __toModule(require("yup"));
-var import_schema_tools = __toModule(require("@tinacms/schema-tools"));
+var import_lodash2 = __toESM(require("lodash"));
+var yup2 = __toESM(require("yup"));
+var import_schema_tools = require("@tinacms/schema-tools");
 var FIELD_TYPES = [
   "string",
   "number",
@@ -2382,8 +2410,13 @@ var FIELD_TYPES = [
   "rich-text"
 ];
 var validateSchema = async (schema) => {
-  const schema2 = addNamespaceToSchema(import_lodash2.default.cloneDeep(schema));
-  const collections = await sequential(schema2.collections, async (collection) => validateCollection(collection));
+  const schema2 = addNamespaceToSchema(
+    import_lodash2.default.cloneDeep(schema)
+  );
+  const collections = await sequential(
+    schema2.collections,
+    async (collection) => validateCollection(collection)
+  );
   validationCollectionsPathAndMatch(collections);
   if (schema2.config) {
     const config = (0, import_schema_tools.validateTinaCloudSchemaConfig)(schema2.config);
@@ -2417,7 +2450,7 @@ var validationCollectionsPathAndMatch = (collections) => {
     r[a.path] = r[a.path] || [];
     r[a.path].push(a);
     return r;
-  }, Object.create(null));
+  }, /* @__PURE__ */ Object.create(null));
   Object.keys(groupbyPath).forEach((key) => {
     const collectionsArr = groupbyPath[key];
     if (collectionsArr.length === 1) {
@@ -2444,17 +2477,22 @@ var validateCollection = async (collection) => {
     })
   });
   await collectionSchema.validate(collection);
-  const validCollection = await collectionSchema.cast(collection);
+  const validCollection = await collectionSchema.cast(
+    collection
+  );
   if (validCollection.templates) {
-    templates = await sequential(validCollection.templates, async (template) => {
-      if (typeof template === "string") {
-        throw new Error(`Global templates are not yet supported`);
+    templates = await sequential(
+      validCollection.templates,
+      async (template) => {
+        const fields2 = await sequential(template.fields, async (field) => {
+          return validateField(field);
+        });
+        return {
+          ...validCollection,
+          ...fields2
+        };
       }
-      const fields2 = await sequential(template.fields, async (field) => {
-        return validateField(field);
-      });
-      return __spreadValues(__spreadValues({}, validCollection), fields2);
-    });
+    );
   }
   if (validCollection.fields) {
     if (typeof validCollection.fields === "string") {
@@ -2463,9 +2501,10 @@ var validateCollection = async (collection) => {
     fields = await sequential(validCollection.fields, async (field) => {
       return validateField(field);
     });
-    return __spreadProps(__spreadValues({}, validCollection), {
+    return {
+      ...validCollection,
       fields
-    });
+    };
   }
   return collection;
 };
@@ -2475,144 +2514,134 @@ var validateField = async (field) => {
     name: yup2.string().matches(/^[a-zA-Z0-9_]*$/, {
       message: (obj) => `Field's 'name' must match ${obj.regex} at ${messageName}`
     }).required(),
-    type: yup2.string().oneOf(FIELD_TYPES, (obj) => `'type' must be one of: ${obj.values}, but got '${obj.value}' at ${messageName}`)
+    type: yup2.string().oneOf(
+      FIELD_TYPES,
+      (obj) => `'type' must be one of: ${obj.values}, but got '${obj.value}' at ${messageName}`
+    )
   });
   await schema.validate(field);
-  return field;
+  const validField = await schema.cast(field);
+  return validField;
 };
 
 // package.json
-var name = "@tinacms/graphql";
-var version = "1.3.2";
-var main = "dist/index.js";
-var module2 = "dist/index.es.js";
-var typings = "dist/index.d.ts";
-var files = [
-  "package.json",
-  "dist"
-];
-var exports = {
-  import: "./dist/index.es.js",
-  require: "./dist/index.js"
-};
-var license = "SEE LICENSE IN LICENSE";
-var buildConfig = {
-  entryPoints: [
-    {
-      name: "src/index.ts",
-      target: "node",
-      bundle: []
-    }
-  ]
-};
-var scripts = {
-  types: "pnpm tsc",
-  build: "tinacms-scripts build",
-  docs: "yarn typedoc",
-  serve: "yarn nodemon dist/server.js",
-  test: "jest",
-  "test-watch": "jest --watch"
-};
-var dependencies = {
-  "@graphql-tools/relay-operation-optimizer": "^6.4.1",
-  "@iarna/toml": "^2.2.5",
-  "@tinacms/mdx": "workspace:*",
-  "@tinacms/schema-tools": "workspace:*",
-  "abstract-level": "^1.0.3",
-  "body-parser": "^1.19.0",
-  cors: "^2.8.5",
-  dataloader: "^2.0.0",
-  "date-fns": "^2.21.1",
-  "encoding-down": "^7.1.0",
-  esbuild: "^0.12.25",
-  "esbuild-jest": "^0.5.0",
-  "estree-walker": "^3.0.0",
-  "fast-glob": "^3.2.5",
-  flat: "^5.0.2",
-  "fs-extra": "^9.0.1",
-  "glob-parent": "^6.0.2",
-  graphql: "15.8.0",
-  "graphql-type-json": "^0.3.2",
-  "gray-matter": "^4.0.2",
-  "isomorphic-git": "^1.21.0",
-  "js-yaml": "^3.14.1",
-  "jsonpath-plus": "^6.0.1",
-  leveldown: "^6.1.0",
-  lodash: "^4.17.20",
-  "many-level": "^2.0.0",
-  mdast: "^3.0.0",
-  "mdast-util-from-markdown": "^1.0.0",
-  "mdast-util-mdx": "^1.1.0",
-  "mdast-util-mdx-expression": "^1.1.0",
-  "mdast-util-to-markdown": "^1.2.1",
-  "micromark-extension-mdxjs": "^1.0.0",
-  "normalize-path": "^3.0.0",
-  prettier: "^2.2.1",
-  "readable-stream": "^4.3.0",
-  "rehype-format": "^3.1.0",
-  "rehype-stringify": "^8.0.0",
-  remark: "^13.0.0",
-  "remark-frontmatter": "^3.0.0",
-  "remark-mdx": "next",
-  "remark-parse": "^10.0.0",
-  "remark-rehype": "^8.0.0",
-  "remark-slate": "^1.8.0",
-  "remark-stringify": "^8.1.1",
-  unified: "^10.1.0",
-  "unist-util-remove-position": "^3.0.0",
-  "unist-util-visit": "^4.0.0",
-  vfile: "^4.2.0",
-  ws: "^7.3.1",
-  yup: "^0.32.9"
-};
-var publishConfig = {
-  registry: "https://registry.npmjs.org"
-};
-var repository = {
-  url: "https://github.com/tinacms/tinacms.git",
-  directory: "packages/tina-graphql"
-};
-var devDependencies = {
-  "@tinacms/schema-tools": "workspace:*",
-  "@tinacms/scripts": "workspace:*",
-  "@types/cors": "^2.8.7",
-  "@types/estree": "^0.0.50",
-  "@types/express": "^4.17.8",
-  "@types/fs-extra": "^9.0.2",
-  "@types/jest": "^26.0.4",
-  "@types/js-yaml": "^3.12.5",
-  "@types/lodash": "^4.14.161",
-  "@types/lodash.camelcase": "^4.3.6",
-  "@types/lodash.upperfirst": "^4.3.6",
-  "@types/lru-cache": "^5.1.0",
-  "@types/mdast": "^3.0.10",
-  "@types/node": "^14.17.34",
-  "@types/normalize-path": "^3.0.0",
-  "@types/ws": "^7.2.6",
-  "@types/yup": "^0.29.7",
-  jest: "27.0.6",
-  "jest-diff": "27.0.6",
-  "jest-file-snapshot": "^0.5.0",
-  "jest-matcher-utils": "27.0.6",
-  "memory-level": "^1.0.0",
-  nodemon: "2.0.19",
-  typescript: "4.3.5"
-};
 var package_default = {
-  name,
-  version,
-  main,
-  module: module2,
-  typings,
-  files,
-  exports,
-  license,
-  buildConfig,
-  scripts,
-  dependencies,
-  publishConfig,
-  repository,
-  devDependencies
+  name: "@tinacms/graphql",
+  version: "1.3.4",
+  main: "dist/index.js",
+  module: "dist/index.es.js",
+  typings: "dist/index.d.ts",
+  files: [
+    "package.json",
+    "dist"
+  ],
+  exports: {
+    import: "./dist/index.es.js",
+    require: "./dist/index.js"
+  },
+  license: "SEE LICENSE IN LICENSE",
+  buildConfig: {
+    entryPoints: [
+      {
+        name: "src/index.ts",
+        target: "node",
+        bundle: []
+      }
+    ]
+  },
+  scripts: {
+    types: "pnpm tsc",
+    build: "tinacms-scripts build",
+    docs: "yarn typedoc",
+    serve: "yarn nodemon dist/server.js",
+    test: "jest",
+    "test-watch": "jest --watch"
+  },
+  dependencies: {
+    "@graphql-tools/relay-operation-optimizer": "^6.4.1",
+    "@iarna/toml": "^2.2.5",
+    "@tinacms/mdx": "workspace:*",
+    "@tinacms/schema-tools": "workspace:*",
+    "abstract-level": "^1.0.3",
+    "body-parser": "^1.19.0",
+    cors: "^2.8.5",
+    dataloader: "^2.0.0",
+    "date-fns": "^2.21.1",
+    "encoding-down": "^7.1.0",
+    esbuild: "^0.15.5",
+    "esbuild-jest": "^0.5.0",
+    "estree-walker": "^3.0.0",
+    "fast-glob": "^3.2.5",
+    flat: "^5.0.2",
+    "fs-extra": "^9.0.1",
+    "glob-parent": "^6.0.2",
+    graphql: "15.8.0",
+    "graphql-type-json": "^0.3.2",
+    "gray-matter": "^4.0.2",
+    "isomorphic-git": "^1.21.0",
+    "js-yaml": "^3.14.1",
+    "jsonpath-plus": "^6.0.1",
+    leveldown: "^6.1.0",
+    lodash: "^4.17.20",
+    "many-level": "^2.0.0",
+    mdast: "^3.0.0",
+    "mdast-util-from-markdown": "^1.0.0",
+    "mdast-util-mdx": "^1.1.0",
+    "mdast-util-mdx-expression": "^1.1.0",
+    "mdast-util-to-markdown": "^1.2.1",
+    "micromark-extension-mdxjs": "^1.0.0",
+    "normalize-path": "^3.0.0",
+    prettier: "^2.2.1",
+    "readable-stream": "^4.3.0",
+    "rehype-format": "^3.1.0",
+    "rehype-stringify": "^8.0.0",
+    remark: "^13.0.0",
+    "remark-frontmatter": "^3.0.0",
+    "remark-mdx": "next",
+    "remark-parse": "^10.0.0",
+    "remark-rehype": "^8.0.0",
+    "remark-slate": "^1.8.0",
+    "remark-stringify": "^8.1.1",
+    unified: "^10.1.0",
+    "unist-util-remove-position": "^3.0.0",
+    "unist-util-visit": "^4.0.0",
+    vfile: "^4.2.0",
+    ws: "^7.3.1",
+    yup: "^0.32.9"
+  },
+  publishConfig: {
+    registry: "https://registry.npmjs.org"
+  },
+  repository: {
+    url: "https://github.com/tinacms/tinacms.git",
+    directory: "packages/tina-graphql"
+  },
+  devDependencies: {
+    "@tinacms/schema-tools": "workspace:*",
+    "@tinacms/scripts": "workspace:*",
+    "@types/cors": "^2.8.7",
+    "@types/estree": "^0.0.50",
+    "@types/express": "^4.17.8",
+    "@types/fs-extra": "^9.0.2",
+    "@types/jest": "^26.0.4",
+    "@types/js-yaml": "^3.12.5",
+    "@types/lodash": "^4.14.161",
+    "@types/lodash.camelcase": "^4.3.6",
+    "@types/lodash.upperfirst": "^4.3.6",
+    "@types/lru-cache": "^5.1.0",
+    "@types/mdast": "^3.0.10",
+    "@types/node": "^14.17.34",
+    "@types/normalize-path": "^3.0.0",
+    "@types/ws": "^7.2.6",
+    "@types/yup": "^0.29.7",
+    jest: "27.0.6",
+    "jest-diff": "27.0.6",
+    "jest-file-snapshot": "^0.5.0",
+    "jest-matcher-utils": "27.0.6",
+    "memory-level": "^1.0.0",
+    nodemon: "2.0.19",
+    typescript: "4.3.5"
+  }
 };
 
 // src/schema/createSchema.ts
@@ -2626,19 +2655,20 @@ var createSchema = async ({
   if (flags && flags.length > 0) {
     meta["flags"] = flags;
   }
-  return new import_schema_tools2.TinaSchema(__spreadValues({
+  return new import_schema_tools2.TinaSchema({
     version: {
       fullVersion: package_default.version,
       major,
       minor,
       patch
     },
-    meta
-  }, validSchema));
+    meta,
+    ...validSchema
+  });
 };
 
 // src/build.ts
-var import_path = __toModule(require("path"));
+var import_path = __toESM(require("path"));
 var buildDotTinaFiles = async ({
   database,
   config,
@@ -2658,7 +2688,9 @@ var buildDotTinaFiles = async ({
     graphQLSchema = await _buildSchema(builder, tinaSchema);
     await database.putConfigFiles({ graphQLSchema, tinaSchema });
   } else {
-    graphQLSchema = JSON.parse(await database.bridge.get(".tina/__generated__/_graphql.json"));
+    graphQLSchema = JSON.parse(
+      await database.bridge.get(".tina/__generated__/_graphql.json")
+    );
   }
   if (buildSDK) {
     await _buildFragments(builder, tinaSchema, database.bridge.rootPath);
@@ -2670,25 +2702,34 @@ var _buildFragments = async (builder, tinaSchema, rootPath) => {
   const fragmentDefinitionsFields = [];
   const collections = tinaSchema.getCollections();
   await sequential(collections, async (collection) => {
-    const frag = await builder.collectionFragment(collection);
+    const frag = await builder.collectionFragment(
+      collection
+    );
     fragmentDefinitionsFields.push(frag);
   });
   const fragDoc = {
     kind: "Document",
-    definitions: import_lodash3.default.uniqBy(extractInlineTypes(fragmentDefinitionsFields), (node) => node.name.value)
+    definitions: import_lodash3.default.uniqBy(
+      extractInlineTypes(fragmentDefinitionsFields),
+      (node) => node.name.value
+    )
   };
   const fragPath = import_path.default.join(rootPath, ".tina", "__generated__");
   await import_fs_extra.default.outputFile(import_path.default.join(fragPath, "frags.gql"), (0, import_graphql2.print)(fragDoc));
   if (await (await import_fs_extra.default.stat(import_path.default.join(fragPath, "frags.gql"))).size > 100 * 1024) {
-    console.warn("Warning: frags.gql is very large (>100kb). Consider setting the reference depth to 1 or 0. See code snippet below.");
-    console.log(`const schema = defineSchema({
+    console.warn(
+      "Warning: frags.gql is very large (>100kb). Consider setting the reference depth to 1 or 0. See code snippet below."
+    );
+    console.log(
+      `const schema = defineSchema({
         config: {
             client: {
                 referenceDepth: 1,
             },
         }
         // ...
-    })`);
+    })`
+    );
   }
 };
 var _buildQueries = async (builder, tinaSchema, rootPath) => {
@@ -2700,17 +2741,26 @@ var _buildQueries = async (builder, tinaSchema, rootPath) => {
     const queryListName = NAMER.generateQueryListName(collection.namespace);
     const queryFilterTypeName = NAMER.dataFilterTypeName(collection.namespace);
     const fragName = NAMER.fragmentName(collection.namespace);
-    operationsDefinitions.push(astBuilder.QueryOperationDefinition({ fragName, queryName }));
-    operationsDefinitions.push(astBuilder.ListQueryOperationDefinition({
-      fragName,
-      queryName: queryListName,
-      filterType: queryFilterTypeName,
-      dataLayer: Boolean((_c = (_b = (_a = tinaSchema.config) == null ? void 0 : _a.meta) == null ? void 0 : _b.flags) == null ? void 0 : _c.find((x) => x === "experimentalData"))
-    }));
+    operationsDefinitions.push(
+      astBuilder.QueryOperationDefinition({ fragName, queryName })
+    );
+    operationsDefinitions.push(
+      astBuilder.ListQueryOperationDefinition({
+        fragName,
+        queryName: queryListName,
+        filterType: queryFilterTypeName,
+        dataLayer: Boolean(
+          (_c = (_b = (_a = tinaSchema.config) == null ? void 0 : _a.meta) == null ? void 0 : _b.flags) == null ? void 0 : _c.find((x) => x === "experimentalData")
+        )
+      })
+    );
   });
   const queryDoc = {
     kind: "Document",
-    definitions: import_lodash3.default.uniqBy(extractInlineTypes(operationsDefinitions), (node) => node.name.value)
+    definitions: import_lodash3.default.uniqBy(
+      extractInlineTypes(operationsDefinitions),
+      (node) => node.name.value
+    )
   };
   const fragPath = import_path.default.join(rootPath, ".tina", "__generated__");
   await import_fs_extra.default.outputFile(import_path.default.join(fragPath, "queries.gql"), (0, import_graphql2.print)(queryDoc));
@@ -2721,55 +2771,84 @@ var _buildSchema = async (builder, tinaSchema) => {
   const queryTypeDefinitionFields = [];
   const mutationTypeDefinitionFields = [];
   const collections = tinaSchema.getCollections();
-  queryTypeDefinitionFields.push(astBuilder.FieldDefinition({
-    name: "getOptimizedQuery",
-    args: [
-      astBuilder.InputValueDefinition({
-        name: "queryString",
-        type: astBuilder.TYPES.String,
-        required: true
-      })
-    ],
-    type: astBuilder.TYPES.String
-  }));
-  queryTypeDefinitionFields.push(await builder.buildCollectionDefinition(collections));
-  queryTypeDefinitionFields.push(await builder.buildMultiCollectionDefinition(collections));
+  queryTypeDefinitionFields.push(
+    astBuilder.FieldDefinition({
+      name: "getOptimizedQuery",
+      args: [
+        astBuilder.InputValueDefinition({
+          name: "queryString",
+          type: astBuilder.TYPES.String,
+          required: true
+        })
+      ],
+      type: astBuilder.TYPES.String
+    })
+  );
+  queryTypeDefinitionFields.push(
+    await builder.buildCollectionDefinition(collections)
+  );
+  queryTypeDefinitionFields.push(
+    await builder.buildMultiCollectionDefinition(collections)
+  );
   queryTypeDefinitionFields.push(await builder.multiNodeDocument());
-  queryTypeDefinitionFields.push(await builder.multiCollectionDocument(collections));
-  mutationTypeDefinitionFields.push(await builder.addMultiCollectionDocumentMutation());
-  mutationTypeDefinitionFields.push(await builder.buildUpdateCollectionDocumentMutation(collections));
-  mutationTypeDefinitionFields.push(await builder.buildDeleteCollectionDocumentMutation(collections));
-  mutationTypeDefinitionFields.push(await builder.buildCreateCollectionDocumentMutation(collections));
+  queryTypeDefinitionFields.push(
+    await builder.multiCollectionDocument(collections)
+  );
+  mutationTypeDefinitionFields.push(
+    await builder.addMultiCollectionDocumentMutation()
+  );
+  mutationTypeDefinitionFields.push(
+    await builder.buildUpdateCollectionDocumentMutation(collections)
+  );
+  mutationTypeDefinitionFields.push(
+    await builder.buildDeleteCollectionDocumentMutation(collections)
+  );
+  mutationTypeDefinitionFields.push(
+    await builder.buildCreateCollectionDocumentMutation(collections)
+  );
   await sequential(collections, async (collection) => {
     queryTypeDefinitionFields.push(await builder.collectionDocument(collection));
-    mutationTypeDefinitionFields.push(await builder.updateCollectionDocumentMutation(collection));
-    mutationTypeDefinitionFields.push(await builder.createCollectionDocumentMutation(collection));
-    queryTypeDefinitionFields.push(await builder.collectionDocumentList(collection));
+    mutationTypeDefinitionFields.push(
+      await builder.updateCollectionDocumentMutation(collection)
+    );
+    mutationTypeDefinitionFields.push(
+      await builder.createCollectionDocumentMutation(collection)
+    );
+    queryTypeDefinitionFields.push(
+      await builder.collectionDocumentList(collection)
+    );
   });
-  definitions.push(astBuilder.ObjectTypeDefinition({
-    name: "Query",
-    fields: queryTypeDefinitionFields
-  }));
-  definitions.push(astBuilder.ObjectTypeDefinition({
-    name: "Mutation",
-    fields: mutationTypeDefinitionFields
-  }));
+  definitions.push(
+    astBuilder.ObjectTypeDefinition({
+      name: "Query",
+      fields: queryTypeDefinitionFields
+    })
+  );
+  definitions.push(
+    astBuilder.ObjectTypeDefinition({
+      name: "Mutation",
+      fields: mutationTypeDefinitionFields
+    })
+  );
   const doc = {
     kind: "Document",
-    definitions: import_lodash3.default.uniqBy(extractInlineTypes(definitions), (node) => node.name.value)
+    definitions: import_lodash3.default.uniqBy(
+      extractInlineTypes(definitions),
+      (node) => node.name.value
+    )
   };
   return doc;
 };
 
 // src/resolve.ts
-var import_graphql4 = __toModule(require("graphql"));
+var import_graphql4 = require("graphql");
 
 // src/resolver/index.ts
-var import_path2 = __toModule(require("path"));
-var import_isValid = __toModule(require("date-fns/isValid"));
+var import_path2 = __toESM(require("path"));
+var import_isValid = __toESM(require("date-fns/isValid"));
 
 // src/mdx/index.ts
-var import_mdx = __toModule(require("@tinacms/mdx"));
+var import_mdx = require("@tinacms/mdx");
 
 // src/resolver/error.ts
 var TinaGraphQLError = class extends Error {
@@ -2778,7 +2857,7 @@ var TinaGraphQLError = class extends Error {
     if (!this.name) {
       Object.defineProperty(this, "name", { value: "TinaGraphQLError" });
     }
-    this.extensions = __spreadValues({}, extensions);
+    this.extensions = { ...extensions };
   }
 };
 var TinaFetchError = class extends Error {
@@ -2793,12 +2872,18 @@ var TinaFetchError = class extends Error {
 };
 var TinaQueryError = class extends TinaFetchError {
   constructor(args) {
-    super(`Error querying file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`, args);
+    super(
+      `Error querying file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`,
+      args
+    );
   }
 };
 var TinaParseDocumentError = class extends TinaFetchError {
   constructor(args) {
-    super(`Error parsing file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`, args);
+    super(
+      `Error parsing file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`,
+      args
+    );
   }
   toString() {
     return super.toString() + "\n OriginalError: \n" + this.originalError.toString();
@@ -2823,7 +2908,9 @@ var handleFetchErrorError = (e, verbose) => {
 // src/resolver/filter-utils.ts
 var resolveReferences = async (filter, fields, resolver) => {
   for (const fieldKey of Object.keys(filter)) {
-    const fieldDefinition = fields.find((f) => f.name === fieldKey);
+    const fieldDefinition = fields.find(
+      (f) => f.name === fieldKey
+    );
     if (fieldDefinition) {
       if (fieldDefinition.type === "reference") {
         const { edges, values } = await resolver(filter, fieldDefinition);
@@ -2842,25 +2929,26 @@ var resolveReferences = async (filter, fields, resolver) => {
         }
       } else if (fieldDefinition.type === "object") {
         if (fieldDefinition.templates) {
-          const globalTemplates = {};
-          for (const template of fieldDefinition.templates) {
-            if (typeof template === "string") {
-              globalTemplates[template] = 1;
-            }
-          }
           for (const templateName of Object.keys(filter[fieldKey])) {
-            if (templateName in globalTemplates) {
-              throw new Error("Global templates not yet supported for queries");
-            }
-            const template = fieldDefinition.templates.find((template2) => !(typeof template2 === "string") && template2.name === templateName);
+            const template = fieldDefinition.templates.find(
+              (template2) => !(typeof template2 === "string") && template2.name === templateName
+            );
             if (template) {
-              await resolveReferences(filter[fieldKey][templateName], template.fields, resolver);
+              await resolveReferences(
+                filter[fieldKey][templateName],
+                template.fields,
+                resolver
+              );
             } else {
               throw new Error(`Template ${templateName} not found`);
             }
           }
         } else {
-          await resolveReferences(filter[fieldKey], fieldDefinition.fields, resolver);
+          await resolveReferences(
+            filter[fieldKey],
+            fieldDefinition.fields,
+            resolver
+          );
         }
       }
     } else {
@@ -2874,41 +2962,57 @@ var collectConditionsForChildFields = (filterNode, fields, pathExpression, colle
     if (!childField) {
       throw new Error(`Unable to find type for field ${childFieldName}`);
     }
-    collectConditionsForField(childFieldName, childField, filterNode[childFieldName], pathExpression, collectCondition);
+    collectConditionsForField(
+      childFieldName,
+      childField,
+      filterNode[childFieldName],
+      pathExpression,
+      collectCondition
+    );
   }
 };
 var collectConditionsForObjectField = (fieldName, field, filterNode, pathExpression, collectCondition) => {
   if (field.list && field.templates) {
-    const globalTemplates = {};
-    for (const template of field.templates) {
-      if (typeof template === "string") {
-        globalTemplates[template] = 1;
-      }
-    }
     for (const [filterKey, childFilterNode] of Object.entries(filterNode)) {
-      if (filterKey in globalTemplates) {
-        throw new Error("Global templates not yet supported for queries");
-      }
-      const template = field.templates.find((template2) => !(typeof template2 === "string") && template2.name === filterKey);
+      const template = field.templates.find(
+        (template2) => !(typeof template2 === "string") && template2.name === filterKey
+      );
       const jsonPath = `${fieldName}[?(@._template=="${filterKey}")]`;
       const filterPath = pathExpression ? `${pathExpression}.${jsonPath}` : jsonPath;
-      collectConditionsForChildFields(childFilterNode, template.fields, filterPath, collectCondition);
+      collectConditionsForChildFields(
+        childFilterNode,
+        template.fields,
+        filterPath,
+        collectCondition
+      );
     }
   } else {
     const jsonPath = `${fieldName}${field.list ? "[*]" : ""}`;
     const filterPath = pathExpression ? `${pathExpression}.${jsonPath}` : `${jsonPath}`;
-    collectConditionsForChildFields(filterNode, field.fields, filterPath, collectCondition);
+    collectConditionsForChildFields(
+      filterNode,
+      field.fields,
+      filterPath,
+      collectCondition
+    );
   }
 };
 var collectConditionsForField = (fieldName, field, filterNode, pathExpression, collectCondition) => {
   if (field.type === "object") {
-    collectConditionsForObjectField(fieldName, field, filterNode, pathExpression, collectCondition);
+    collectConditionsForObjectField(
+      fieldName,
+      field,
+      filterNode,
+      pathExpression,
+      collectCondition
+    );
   } else {
     collectCondition({
       filterPath: pathExpression ? `${pathExpression}.${fieldName}` : fieldName,
-      filterExpression: __spreadValues({
-        _type: field.type
-      }, filterNode)
+      filterExpression: {
+        _type: field.type,
+        ...filterNode
+      }
     });
   }
 };
@@ -2922,7 +3026,9 @@ var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }, s
     if (hasTinaMediaConfig(schema) === true) {
       const assetsURL = `https://${config.assetsHost}/${config.clientId}`;
       if (typeof value === "string" && value.includes(assetsURL)) {
-        const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
+        const cleanMediaRoot = cleanUpSlashes(
+          schema.config.media.tina.mediaRoot
+        );
         const strippedURL = value.replace(assetsURL, "");
         return `${cleanMediaRoot}${strippedURL}`;
       }
@@ -2963,10 +3069,10 @@ var hasTinaMediaConfig = (schema) => {
 };
 
 // src/resolver/index.ts
-var import_graphql3 = __toModule(require("graphql"));
+var import_graphql3 = require("graphql");
 
 // src/database/datalayer.ts
-var import_jsonpath_plus = __toModule(require("jsonpath-plus"));
+var import_jsonpath_plus = require("jsonpath-plus");
 
 // src/database/level.ts
 var INDEX_KEY_FIELD_SEPARATOR = "";
@@ -2997,7 +3103,10 @@ var LevelProxyHandler = {
       };
     } else if (property === "sublevel") {
       return (...args) => {
-        return new Proxy(target[property].apply(target, args), LevelProxyHandler);
+        return new Proxy(
+          target[property].apply(target, args),
+          LevelProxyHandler
+        );
       };
     } else {
       return (...args) => target[property].apply(target, args);
@@ -3011,22 +3120,14 @@ var LevelProxy = class {
 };
 
 // src/database/datalayer.ts
-var OP;
-(function(OP2) {
-  OP2["EQ"] = "eq";
-  OP2["GT"] = "gt";
-  OP2["LT"] = "lt";
-  OP2["GTE"] = "gte";
-  OP2["LTE"] = "lte";
-  OP2["STARTS_WITH"] = "startsWith";
-  OP2["IN"] = "in";
-})(OP || (OP = {}));
 var DEFAULT_COLLECTION_SORT_KEY = "__filepath__";
 var DEFAULT_NUMERIC_LPAD = 4;
 var applyPadding = (input, pad) => {
   if (pad) {
     if (Array.isArray(input)) {
-      return input.map((val) => String(val).padStart(pad.maxLength, pad.fillString));
+      return input.map(
+        (val) => String(val).padStart(pad.maxLength, pad.fillString)
+      );
     } else {
       return String(input).padStart(pad.maxLength, pad.fillString);
     }
@@ -3039,23 +3140,23 @@ var getFilterOperator = (expression, operand) => {
 var inferOperatorFromFilter = (filterOperator) => {
   switch (filterOperator) {
     case "after":
-      return OP.GT;
+      return "gt" /* GT */;
     case "before":
-      return OP.LT;
+      return "lt" /* LT */;
     case "eq":
-      return OP.EQ;
+      return "eq" /* EQ */;
     case "startsWith":
-      return OP.STARTS_WITH;
+      return "startsWith" /* STARTS_WITH */;
     case "lt":
-      return OP.LT;
+      return "lt" /* LT */;
     case "lte":
-      return OP.LTE;
+      return "lte" /* LTE */;
     case "gt":
-      return OP.GT;
+      return "gt" /* GT */;
     case "gte":
-      return OP.GTE;
+      return "gte" /* GTE */;
     case "in":
-      return OP.IN;
+      return "in" /* IN */;
     default:
       throw new Error(`unsupported filter condition: '${filterOperator}'`);
   }
@@ -3065,7 +3166,9 @@ var makeKeyForField = (definition, data, stringEscaper2, maxStringLength = 100)
   for (const field of definition.fields) {
     if (field.name in data && data[field.name] !== void 0 && data[field.name] !== null) {
       const rawValue = data[field.name];
-      const resolvedValue = String(field.type === "datetime" ? new Date(rawValue).getTime() : field.type === "string" ? stringEscaper2(rawValue) : rawValue).substring(0, maxStringLength);
+      const resolvedValue = String(
+        field.type === "datetime" ? new Date(rawValue).getTime() : field.type === "string" ? stringEscaper2(rawValue) : rawValue
+      ).substring(0, maxStringLength);
       valueParts.push(applyPadding(resolvedValue, field.pad));
     } else {
       return null;
@@ -3080,34 +3183,54 @@ var coerceFilterChainOperands = (filterChain, escapeString = stringEscaper) => {
       const dataType = filter.type;
       if (dataType === "datetime") {
         if (filter.leftOperand !== void 0) {
-          result.push(__spreadProps(__spreadValues({}, filter), {
+          result.push({
+            ...filter,
             rightOperand: new Date(filter.rightOperand).getTime(),
-            leftOperand: new Date(filter.leftOperand).getTime()
-          }));
+            leftOperand: new Date(
+              filter.leftOperand
+            ).getTime()
+          });
         } else {
           if (Array.isArray(filter.rightOperand)) {
-            result.push(__spreadProps(__spreadValues({}, filter), {
-              rightOperand: filter.rightOperand.map((operand) => new Date(operand).getTime())
-            }));
+            result.push({
+              ...filter,
+              rightOperand: filter.rightOperand.map(
+                (operand) => new Date(operand).getTime()
+              )
+            });
           } else {
-            result.push(__spreadProps(__spreadValues({}, filter), {
+            result.push({
+              ...filter,
               rightOperand: new Date(filter.rightOperand).getTime()
-            }));
+            });
           }
         }
       } else if (dataType === "string") {
         if (filter.leftOperand !== void 0) {
-          result.push(__spreadProps(__spreadValues({}, filter), {
-            rightOperand: applyPadding(escapeString(filter.rightOperand), filter.pad),
-            leftOperand: applyPadding(escapeString(filter.leftOperand), filter.pad)
-          }));
+          result.push({
+            ...filter,
+            rightOperand: applyPadding(
+              escapeString(filter.rightOperand),
+              filter.pad
+            ),
+            leftOperand: applyPadding(
+              escapeString(
+                filter.leftOperand
+              ),
+              filter.pad
+            )
+          });
         } else {
-          result.push(__spreadProps(__spreadValues({}, filter), {
-            rightOperand: applyPadding(escapeString(filter.rightOperand), filter.pad)
-          }));
+          result.push({
+            ...filter,
+            rightOperand: applyPadding(
+              escapeString(filter.rightOperand),
+              filter.pad
+            )
+          });
         }
       } else {
-        result.push(__spreadValues({}, filter));
+        result.push({ ...filter });
       }
     }
   }
@@ -3137,7 +3260,9 @@ var makeFilter = ({
           return isNaN(coerced) ? Number(resolvedValue) : coerced;
         });
       } else if (dataType === "boolean") {
-        operands = resolvedValues.map((resolvedValue) => typeof resolvedValue === "boolean" && resolvedValue || resolvedValue === "true" || resolvedValue === "1");
+        operands = resolvedValues.map(
+          (resolvedValue) => typeof resolvedValue === "boolean" && resolvedValue || resolvedValue === "true" || resolvedValue === "1"
+        );
       } else {
         throw new Error(`Unexpected datatype ${dataType}`);
       }
@@ -3145,12 +3270,14 @@ var makeFilter = ({
       let matches = false;
       if (operator) {
         switch (operator) {
-          case OP.EQ:
-            if (operands.findIndex((operand) => operand === filter.rightOperand) >= 0) {
+          case "eq" /* EQ */:
+            if (operands.findIndex(
+              (operand) => operand === filter.rightOperand
+            ) >= 0) {
               matches = true;
             }
             break;
-          case OP.GT:
+          case "gt" /* GT */:
             for (const operand of operands) {
               if (operand > filter.rightOperand) {
                 matches = true;
@@ -3158,7 +3285,7 @@ var makeFilter = ({
               }
             }
             break;
-          case OP.LT:
+          case "lt" /* LT */:
             for (const operand of operands) {
               if (operand < filter.rightOperand) {
                 matches = true;
@@ -3166,7 +3293,7 @@ var makeFilter = ({
               }
             }
             break;
-          case OP.GTE:
+          case "gte" /* GTE */:
             for (const operand of operands) {
               if (operand >= filter.rightOperand) {
                 matches = true;
@@ -3174,7 +3301,7 @@ var makeFilter = ({
               }
             }
             break;
-          case OP.LTE:
+          case "lte" /* LTE */:
             for (const operand of operands) {
               if (operand <= filter.rightOperand) {
                 matches = true;
@@ -3182,7 +3309,7 @@ var makeFilter = ({
               }
             }
             break;
-          case OP.IN:
+          case "in" /* IN */:
             for (const operand of operands) {
               if (filter.rightOperand.indexOf(operand) >= 0) {
                 matches = true;
@@ -3190,7 +3317,7 @@ var makeFilter = ({
               }
             }
             break;
-          case OP.STARTS_WITH:
+          case "startsWith" /* STARTS_WITH */:
             for (const operand of operands) {
               if (operand.startsWith(filter.rightOperand)) {
                 matches = true;
@@ -3206,14 +3333,14 @@ var makeFilter = ({
         for (const operand of operands) {
           let rightMatches = false;
           let leftMatches = false;
-          if (rightOperator === OP.LTE && operand <= rightOperand) {
+          if (rightOperator === "lte" /* LTE */ && operand <= rightOperand) {
             rightMatches = true;
-          } else if (rightOperator === OP.LT && operand < rightOperand) {
+          } else if (rightOperator === "lt" /* LT */ && operand < rightOperand) {
             rightMatches = true;
           }
-          if (leftOperator === OP.GTE && operand >= leftOperand) {
+          if (leftOperator === "gte" /* GTE */ && operand >= leftOperand) {
             leftMatches = true;
-          } else if (leftOperator === OP.GT && operand > leftOperand) {
+          } else if (leftOperator === "gt" /* GT */ && operand > leftOperand) {
             leftMatches = true;
           }
           if (rightMatches && leftMatches) {
@@ -3238,10 +3365,12 @@ var makeFilterChain = ({
   }
   for (const condition of conditions) {
     const { filterPath, filterExpression } = condition;
-    const _a = filterExpression, { _type } = _a, keys = __objRest(_a, ["_type"]);
+    const { _type, ...keys } = filterExpression;
     const [key1, key2, ...extraKeys] = Object.keys(keys);
     if (extraKeys.length) {
-      throw new Error(`Unexpected keys: [${extraKeys.join(",")}] in filter expression`);
+      throw new Error(
+        `Unexpected keys: [${extraKeys.join(",")}] in filter expression`
+      );
     }
     if (key1 && !key2) {
       filterChain.push({
@@ -3274,7 +3403,9 @@ var makeFilterChain = ({
           pad: _type === "number" ? { fillString: "0", maxLength: DEFAULT_NUMERIC_LPAD } : void 0
         });
       } else {
-        throw new Error(`Filter on field '${filterPath}' has invalid combination of conditions: '${key1}, ${key2}'`);
+        throw new Error(
+          `Filter on field '${filterPath}' has invalid combination of conditions: '${key1}, ${key2}'`
+        );
       }
     }
   }
@@ -3289,7 +3420,7 @@ var makeFilterSuffixes = (filterChain, index) => {
       if (idx === -1) {
         return;
       }
-      if (filter.operator && filter.operator === OP.IN) {
+      if (filter.operator && filter.operator === "in" /* IN */) {
         return;
       }
       orderedFilterChain[idx] = filter;
@@ -3311,20 +3442,34 @@ var makeFilterSuffixes = (filterChain, index) => {
           return;
         }
         const binaryFilter = filter;
-        if (binaryFilter.operator !== OP.EQ) {
+        if (binaryFilter.operator !== "eq" /* EQ */) {
           return;
         }
-        baseFragments.push(applyPadding(orderedFilterChain[i].rightOperand, orderedFilterChain[i].pad));
+        baseFragments.push(
+          applyPadding(
+            orderedFilterChain[i].rightOperand,
+            orderedFilterChain[i].pad
+          )
+        );
       } else {
         if (ternaryFilter) {
-          leftSuffix = applyPadding(orderedFilterChain[i].leftOperand, orderedFilterChain[i].pad);
-          rightSuffix = applyPadding(orderedFilterChain[i].rightOperand, orderedFilterChain[i].pad);
+          leftSuffix = applyPadding(
+            orderedFilterChain[i].leftOperand,
+            orderedFilterChain[i].pad
+          );
+          rightSuffix = applyPadding(
+            orderedFilterChain[i].rightOperand,
+            orderedFilterChain[i].pad
+          );
         } else {
           const op = orderedFilterChain[i].operator;
-          const operand = applyPadding(orderedFilterChain[i].rightOperand, orderedFilterChain[i].pad);
-          if (op === OP.LT || op === OP.LTE) {
+          const operand = applyPadding(
+            orderedFilterChain[i].rightOperand,
+            orderedFilterChain[i].pad
+          );
+          if (op === "lt" /* LT */ || op === "lte" /* LTE */) {
             rightSuffix = operand;
-          } else if (op === OP.GT || op === OP.GTE) {
+          } else if (op === "gt" /* GT */ || op === "gte" /* GTE */) {
             leftSuffix = operand;
           } else {
             rightSuffix = operand;
@@ -3372,13 +3517,18 @@ var makeIndexOpsForDocument = (filepath, collection, indexDefinitions, data, opT
 var makeStringEscaper = (regex, replacement) => {
   return (input) => {
     if (Array.isArray(input)) {
-      return input.map((val) => val.replace(regex, replacement));
+      return input.map(
+        (val) => val.replace(regex, replacement)
+      );
     } else {
       return input.replace(regex, replacement);
     }
   };
 };
-var stringEscaper = makeStringEscaper(new RegExp(INDEX_KEY_FIELD_SEPARATOR, "gm"), encodeURIComponent(INDEX_KEY_FIELD_SEPARATOR));
+var stringEscaper = makeStringEscaper(
+  new RegExp(INDEX_KEY_FIELD_SEPARATOR, "gm"),
+  encodeURIComponent(INDEX_KEY_FIELD_SEPARATOR)
+);
 
 // src/resolver/index.ts
 var createResolver = (args) => {
@@ -3390,9 +3540,11 @@ var Resolver = class {
     this.resolveCollection = async (args, collectionName, hasDocuments) => {
       const collection = this.tinaSchema.getCollection(collectionName);
       const extraFields = {};
-      return __spreadValues(__spreadValues({
-        documents: { collection, hasDocuments }
-      }, collection), extraFields);
+      return {
+        documents: { collection, hasDocuments },
+        ...collection,
+        ...extraFields
+      };
     };
     this.getDocument = async (fullPath) => {
       if (typeof fullPath !== "string") {
@@ -3436,10 +3588,10 @@ var Resolver = class {
         });
         const titleFieldName = titleField == null ? void 0 : titleField.name;
         const title = data[titleFieldName || " "] || null;
-        return __spreadProps(__spreadValues({
+        return {
           __typename: collection.fields ? NAMER.documentTypeName(collection.namespace) : NAMER.documentTypeName(template.namespace),
-          id: fullPath
-        }, data), {
+          id: fullPath,
+          ...data,
           _sys: {
             title,
             basename,
@@ -3453,12 +3605,13 @@ var Resolver = class {
           },
           _values: data,
           _rawData: rawData
-        });
+        };
       } catch (e) {
         if (e instanceof TinaGraphQLError) {
-          throw new TinaGraphQLError(e.message, __spreadValues({
-            requestedDocument: fullPath
-          }, e.extensions));
+          throw new TinaGraphQLError(e.message, {
+            requestedDocument: fullPath,
+            ...e.extensions
+          });
         }
         throw e;
       }
@@ -3471,52 +3624,61 @@ var Resolver = class {
     };
     this.buildObjectMutations = (fieldValue, field) => {
       if (field.fields) {
-        const objectTemplate = typeof field.fields === "string" ? this.tinaSchema.getGlobalTemplate(field.fields) : field;
+        const objectTemplate = field;
         if (Array.isArray(fieldValue)) {
-          return fieldValue.map((item) => this.buildFieldMutations(item, objectTemplate));
+          return fieldValue.map(
+            (item) => this.buildFieldMutations(item, objectTemplate)
+          );
         } else {
-          return this.buildFieldMutations(fieldValue, objectTemplate);
+          return this.buildFieldMutations(
+            fieldValue,
+            objectTemplate
+          );
         }
       }
       if (field.templates) {
         if (Array.isArray(fieldValue)) {
           return fieldValue.map((item) => {
             if (typeof item === "string") {
-              throw new Error(`Expected object for template value for field ${field.name}`);
+              throw new Error(
+                `Expected object for template value for field ${field.name}`
+              );
             }
             const templates = field.templates.map((templateOrTemplateName) => {
-              if (typeof templateOrTemplateName === "string") {
-                return this.tinaSchema.getGlobalTemplate(templateOrTemplateName);
-              }
               return templateOrTemplateName;
             });
             const [templateName] = Object.entries(item)[0];
-            const template = templates.find((template2) => template2.name === templateName);
+            const template = templates.find(
+              (template2) => template2.name === templateName
+            );
             if (!template) {
               throw new Error(`Expected to find template ${templateName}`);
             }
-            return __spreadProps(__spreadValues({}, this.buildFieldMutations(item[template.name], template)), {
+            return {
+              ...this.buildFieldMutations(item[template.name], template),
               _template: template.name
-            });
+            };
           });
         } else {
           if (typeof fieldValue === "string") {
-            throw new Error(`Expected object for template value for field ${field.name}`);
+            throw new Error(
+              `Expected object for template value for field ${field.name}`
+            );
           }
           const templates = field.templates.map((templateOrTemplateName) => {
-            if (typeof templateOrTemplateName === "string") {
-              return this.tinaSchema.getGlobalTemplate(templateOrTemplateName);
-            }
             return templateOrTemplateName;
           });
           const [templateName] = Object.entries(fieldValue)[0];
-          const template = templates.find((template2) => template2.name === templateName);
+          const template = templates.find(
+            (template2) => template2.name === templateName
+          );
           if (!template) {
             throw new Error(`Expected to find template ${templateName}`);
           }
-          return __spreadProps(__spreadValues({}, this.buildFieldMutations(fieldValue[template.name], template)), {
+          return {
+            ...this.buildFieldMutations(fieldValue[template.name], template),
             _template: template.name
-          });
+          };
         }
       }
     };
@@ -3534,12 +3696,18 @@ var Resolver = class {
             break;
           case "union":
             const templateString = args.template;
-            const template = templateInfo.templates.find((template2) => lastItem(template2.namespace) === templateString);
+            const template = templateInfo.templates.find(
+              (template2) => lastItem(template2.namespace) === templateString
+            );
             if (!args.template) {
-              throw new Error(`Must specify a template when creating content for a collection with multiple templates. Possible templates are: ${templateInfo.templates.map((t) => lastItem(t.namespace)).join(" ")}`);
+              throw new Error(
+                `Must specify a template when creating content for a collection with multiple templates. Possible templates are: ${templateInfo.templates.map((t) => lastItem(t.namespace)).join(" ")}`
+              );
             }
             if (!template) {
-              throw new Error(`Expected to find template named ${templateString} in collection "${collection.name}" but none was found. Possible templates are: ${templateInfo.templates.map((t) => lastItem(t.namespace)).join(" ")}`);
+              throw new Error(
+                `Expected to find template named ${templateString} in collection "${collection.name}" but none was found. Possible templates are: ${templateInfo.templates.map((t) => lastItem(t.namespace)).join(" ")}`
+              );
             }
             await this.database.addPendingDocument(realPath, {
               _template: lastItem(template.namespace)
@@ -3547,7 +3715,10 @@ var Resolver = class {
         }
         return this.getDocument(realPath);
       }
-      const params = this.buildObjectMutations(args.params[collection.name], collection);
+      const params = this.buildObjectMutations(
+        args.params[collection.name],
+        collection
+      );
       await this.database.put(realPath, params, collection.name);
       return this.getDocument(realPath);
     };
@@ -3566,8 +3737,15 @@ var Resolver = class {
         switch (templateInfo.type) {
           case "object":
             if (params2) {
-              const values = this.buildFieldMutations(params2, templateInfo.template);
-              await this.database.put(realPath, __spreadValues(__spreadValues({}, oldDoc), values), collection.name);
+              const values = this.buildFieldMutations(
+                params2,
+                templateInfo.template
+              );
+              await this.database.put(
+                realPath,
+                { ...oldDoc, ...values },
+                collection.name
+              );
             }
             break;
           case "union":
@@ -3575,19 +3753,26 @@ var Resolver = class {
               const templateParams = params2[lastItem(template.namespace)];
               if (templateParams) {
                 if (typeof templateParams === "string") {
-                  throw new Error(`Expected to find an object for template params, but got string`);
+                  throw new Error(
+                    `Expected to find an object for template params, but got string`
+                  );
                 }
-                const values = __spreadProps(__spreadValues(__spreadValues({}, oldDoc), this.buildFieldMutations(templateParams, template)), {
+                const values = {
+                  ...oldDoc,
+                  ...this.buildFieldMutations(templateParams, template),
                   _template: lastItem(template.namespace)
-                });
+                };
                 await this.database.put(realPath, values, collection.name);
               }
             });
         }
         return this.getDocument(realPath);
       }
-      const params = this.buildObjectMutations(isCollectionSpecific ? args.params : args.params[collection.name], collection);
-      await this.database.put(realPath, __spreadValues(__spreadValues({}, oldDoc), params), collection.name);
+      const params = this.buildObjectMutations(
+        isCollectionSpecific ? args.params : args.params[collection.name],
+        collection
+      );
+      await this.database.put(realPath, { ...oldDoc, ...params }, collection.name);
       return this.getDocument(realPath);
     };
     this.resolveDocument = async ({
@@ -3605,10 +3790,19 @@ var Resolver = class {
         collectionLookup = Object.keys(args.params)[0];
       }
       const collectionNames = this.tinaSchema.getCollections().map((item) => item.name);
-      assertShape(collectionLookup, (yup3) => {
-        return yup3.mixed().oneOf(collectionNames);
-      }, `"collection" must be one of: [${collectionNames.join(", ")}] but got ${collectionLookup}`);
-      assertShape(args, (yup3) => yup3.object({ relativePath: yup3.string().required() }));
+      assertShape(
+        collectionLookup,
+        (yup3) => {
+          return yup3.mixed().oneOf(collectionNames);
+        },
+        `"collection" must be one of: [${collectionNames.join(
+          ", "
+        )}] but got ${collectionLookup}`
+      );
+      assertShape(
+        args,
+        (yup3) => yup3.object({ relativePath: yup3.string().required() })
+      );
       const collection = await this.tinaSchema.getCollection(collectionLookup);
       const realPath = import_path2.default.join(collection == null ? void 0 : collection.path, args.relativePath);
       const alreadyExists = await this.database.documentExists(realPath);
@@ -3626,10 +3820,14 @@ var Resolver = class {
         }
         if (!alreadyExists) {
           if (isDeletion) {
-            throw new Error(`Unable to delete document, ${realPath} does not exist`);
+            throw new Error(
+              `Unable to delete document, ${realPath} does not exist`
+            );
           }
           if (isUpdateName) {
-            throw new Error(`Unable to update document, ${realPath} does not exist`);
+            throw new Error(
+              `Unable to update document, ${realPath} does not exist`
+            );
           }
         }
         if (isDeletion) {
@@ -3638,10 +3836,19 @@ var Resolver = class {
           return doc;
         }
         if (isUpdateName) {
-          assertShape(args, (yup3) => yup3.object({ params: yup3.object().required() }));
-          assertShape(args == null ? void 0 : args.params, (yup3) => yup3.object({ relativePath: yup3.string().required() }));
+          assertShape(
+            args,
+            (yup3) => yup3.object({ params: yup3.object().required() })
+          );
+          assertShape(
+            args == null ? void 0 : args.params,
+            (yup3) => yup3.object({ relativePath: yup3.string().required() })
+          );
           const doc = await this.getDocument(realPath);
-          const newRealPath = import_path2.default.join(collection == null ? void 0 : collection.path, args.params.relativePath);
+          const newRealPath = import_path2.default.join(
+            collection == null ? void 0 : collection.path,
+            args.params.relativePath
+          );
           await this.database.put(newRealPath, doc._rawData, collection.name);
           await this.deleteDocument(realPath);
           return this.getDocument(newRealPath);
@@ -3672,20 +3879,30 @@ var Resolver = class {
       };
     };
     this.referenceResolver = async (filter, fieldDefinition) => {
-      const referencedCollection = this.tinaSchema.getCollection(fieldDefinition.collections[0]);
+      const referencedCollection = this.tinaSchema.getCollection(
+        fieldDefinition.collections[0]
+      );
       if (!referencedCollection) {
-        throw new Error(`Unable to find collection for ${fieldDefinition.collections[0]} querying ${fieldDefinition.name}`);
+        throw new Error(
+          `Unable to find collection for ${fieldDefinition.collections[0]} querying ${fieldDefinition.name}`
+        );
       }
-      const sortKeys = Object.keys(filter[fieldDefinition.name][referencedCollection.name]);
-      const resolvedCollectionConnection = await this.resolveCollectionConnection({
-        args: {
-          sort: sortKeys.length === 1 ? sortKeys[0] : void 0,
-          filter: __spreadValues({}, filter[fieldDefinition.name][referencedCollection.name]),
-          first: -1
-        },
-        collection: referencedCollection,
-        hydrator: (path6) => path6
-      });
+      const sortKeys = Object.keys(
+        filter[fieldDefinition.name][referencedCollection.name]
+      );
+      const resolvedCollectionConnection = await this.resolveCollectionConnection(
+        {
+          args: {
+            sort: sortKeys.length === 1 ? sortKeys[0] : void 0,
+            filter: {
+              ...filter[fieldDefinition.name][referencedCollection.name]
+            },
+            first: -1
+          },
+          collection: referencedCollection,
+          hydrator: (path6) => path6
+        }
+      );
       const { edges } = resolvedCollectionConnection;
       const values = edges.map((edge) => edge.node);
       return { edges, values };
@@ -3698,14 +3915,26 @@ var Resolver = class {
       let conditions;
       if (args.filter) {
         if (collection.fields) {
-          conditions = await this.resolveFilterConditions(args.filter, collection.fields, collection.name);
+          conditions = await this.resolveFilterConditions(
+            args.filter,
+            collection.fields,
+            collection.name
+          );
         } else if (collection.templates) {
           for (const templateName of Object.keys(args.filter)) {
-            const template = collection.templates.find((template2) => template2.name === templateName);
+            const template = collection.templates.find(
+              (template2) => template2.name === templateName
+            );
             if (template) {
-              conditions = await this.resolveFilterConditions(args.filter[templateName], template.fields, `${collection.name}.${templateName}`);
+              conditions = await this.resolveFilterConditions(
+                args.filter[templateName],
+                template.fields,
+                `${collection.name}.${templateName}`
+              );
             } else {
-              throw new Error(`Error template not found: ${templateName} in collection ${collection.name}`);
+              throw new Error(
+                `Error template not found: ${templateName} in collection ${collection.name}`
+              );
             }
           }
         }
@@ -3721,7 +3950,10 @@ var Resolver = class {
         before: args.before,
         after: args.after
       };
-      const result = await this.database.query(queryOptions, hydrator ? hydrator : this.getDocument);
+      const result = await this.database.query(
+        queryOptions,
+        hydrator ? hydrator : this.getDocument
+      );
       const edges = result.edges;
       const pageInfo = result.pageInfo;
       return {
@@ -3758,13 +3990,25 @@ var Resolver = class {
             accum[fieldName] = fieldValue;
             break;
           case "image":
-            accum[fieldName] = resolveMediaCloudToRelative(fieldValue, this.config, this.tinaSchema.schema);
+            accum[fieldName] = resolveMediaCloudToRelative(
+              fieldValue,
+              this.config,
+              this.tinaSchema.schema
+            );
             break;
           case "object":
             accum[fieldName] = this.buildObjectMutations(fieldValue, field);
             break;
           case "rich-text":
-            accum[fieldName] = (0, import_mdx.stringifyMDX)(fieldValue, field, (fieldValue2) => resolveMediaCloudToRelative(fieldValue2, this.config, this.tinaSchema.schema));
+            accum[fieldName] = (0, import_mdx.stringifyMDX)(
+              fieldValue,
+              field,
+              (fieldValue2) => resolveMediaCloudToRelative(
+                fieldValue2,
+                this.config,
+                this.tinaSchema.schema
+              )
+            );
             break;
           case "reference":
             accum[fieldName] = fieldValue;
@@ -3775,9 +4019,8 @@ var Resolver = class {
       });
       return accum;
     };
-    this.resolveFieldData = async (_a, rawData, accumulator) => {
-      var _b = _a, { namespace } = _b, field = __objRest(_b, ["namespace"]);
-      var _a2;
+    this.resolveFieldData = async ({ namespace, ...field }, rawData, accumulator) => {
+      var _a;
       if (!rawData) {
         return void 0;
       }
@@ -3798,14 +4041,28 @@ var Resolver = class {
           accumulator[field.name] = value;
           break;
         case "image":
-          accumulator[field.name] = resolveMediaRelativeToCloud(value, this.config, this.tinaSchema.schema);
+          accumulator[field.name] = resolveMediaRelativeToCloud(
+            value,
+            this.config,
+            this.tinaSchema.schema
+          );
           break;
         case "rich-text":
-          const tree = (0, import_mdx.parseMDX)(value, field, (value2) => resolveMediaRelativeToCloud(value2, this.config, this.tinaSchema.schema));
-          if (((_a2 = tree == null ? void 0 : tree.children[0]) == null ? void 0 : _a2.type) === "invalid_markdown") {
+          const tree = (0, import_mdx.parseMDX)(
+            value,
+            field,
+            (value2) => resolveMediaRelativeToCloud(
+              value2,
+              this.config,
+              this.tinaSchema.schema
+            )
+          );
+          if (((_a = tree == null ? void 0 : tree.children[0]) == null ? void 0 : _a.type) === "invalid_markdown") {
             if (this.isAudit) {
               const invalidNode = tree == null ? void 0 : tree.children[0];
-              throw new import_graphql3.GraphQLError(`${invalidNode == null ? void 0 : invalidNode.message}${invalidNode.position ? ` at line ${invalidNode.position.start.line}, column ${invalidNode.position.start.column}` : ""}`);
+              throw new import_graphql3.GraphQLError(
+                `${invalidNode == null ? void 0 : invalidNode.message}${invalidNode.position ? ` at line ${invalidNode.position.start.line}, column ${invalidNode.position.start.column}` : ""}`
+              );
             }
           }
           accumulator[field.name] = tree;
@@ -3815,22 +4072,27 @@ var Resolver = class {
             if (!value) {
               return;
             }
-            assertShape(value, (yup3) => yup3.array().of(yup3.object().required()));
+            assertShape(
+              value,
+              (yup3) => yup3.array().of(yup3.object().required())
+            );
             accumulator[field.name] = await sequential(value, async (item) => {
               const template = await this.tinaSchema.getTemplateForData({
                 data: item,
-                collection: __spreadValues({
-                  namespace
-                }, field)
+                collection: {
+                  namespace,
+                  ...field
+                }
               });
               const payload = {};
               await sequential(template.fields, async (field2) => {
                 await this.resolveFieldData(field2, item, payload);
               });
               const isUnion = !!field.templates;
-              return isUnion ? __spreadValues({
-                _template: lastItem(template.namespace)
-              }, payload) : payload;
+              return isUnion ? {
+                _template: lastItem(template.namespace),
+                ...payload
+              } : payload;
             });
           } else {
             if (!value) {
@@ -3838,18 +4100,20 @@ var Resolver = class {
             }
             const template = await this.tinaSchema.getTemplateForData({
               data: value,
-              collection: __spreadValues({
-                namespace
-              }, field)
+              collection: {
+                namespace,
+                ...field
+              }
             });
             const payload = {};
             await sequential(template.fields, async (field2) => {
               await this.resolveFieldData(field2, value, payload);
             });
             const isUnion = !!field.templates;
-            accumulator[field.name] = isUnion ? __spreadValues({
-              _template: lastItem(template.namespace)
-            }, payload) : payload;
+            accumulator[field.name] = isUnion ? {
+              _template: lastItem(template.namespace),
+              ...payload
+            } : payload;
           }
           break;
         default:
@@ -3859,16 +4123,22 @@ var Resolver = class {
     };
     this.buildParams = (args) => {
       try {
-        assertShape(args, (yup3) => yup3.object({
-          collection: yup3.string().required(),
-          params: yup3.object().required()
-        }));
+        assertShape(
+          args,
+          (yup3) => yup3.object({
+            collection: yup3.string().required(),
+            params: yup3.object().required()
+          })
+        );
         return args.params[args.collection];
       } catch (e) {
       }
-      assertShape(args, (yup3) => yup3.object({
-        params: yup3.object().required()
-      }));
+      assertShape(
+        args,
+        (yup3) => yup3.object({
+          params: yup3.object().required()
+        })
+      );
       return args.params;
     };
     this.config = init.config;
@@ -3883,17 +4153,29 @@ var Resolver = class {
         throw new Error("Error parsing filter - unable to generate filterPath");
       }
       if (!condition.filterExpression) {
-        throw new Error(`Error parsing filter - missing expression for ${condition.filterPath}`);
+        throw new Error(
+          `Error parsing filter - missing expression for ${condition.filterPath}`
+        );
       }
       conditions.push(condition);
     };
     await resolveReferences(filter, fields, this.referenceResolver);
     for (const fieldName of Object.keys(filter)) {
-      const field = fields.find((field2) => field2.name === fieldName);
+      const field = fields.find(
+        (field2) => field2.name === fieldName
+      );
       if (!field) {
-        throw new Error(`${fieldName} not found in collection ${collectionName}`);
+        throw new Error(
+          `${fieldName} not found in collection ${collectionName}`
+        );
       }
-      collectConditionsForField(fieldName, field, filter[fieldName], "", conditionCollector);
+      collectConditionsForField(
+        fieldName,
+        field,
+        filter[fieldName],
+        "",
+        conditionCollector
+      );
     }
     return conditions;
   }
@@ -3907,7 +4189,7 @@ var resolveDateInput = (value) => {
 };
 
 // src/resolve.ts
-var import_relay_operation_optimizer = __toModule(require("@graphql-tools/relay-operation-optimizer"));
+var import_relay_operation_optimizer = require("@graphql-tools/relay-operation-optimizer");
 var resolve = async ({
   config,
   query,
@@ -3964,32 +4246,54 @@ var resolve = async ({
               return value;
             }
             if (info.fieldName === "collections") {
-              const collectionNode2 = info.fieldNodes.find((x) => x.name.value === "collections");
-              const hasDocuments2 = collectionNode2.selectionSet.selections.find((x) => {
-                var _a3;
-                return ((_a3 = x == null ? void 0 : x.name) == null ? void 0 : _a3.value) === "documents";
-              });
+              const collectionNode2 = info.fieldNodes.find(
+                (x) => x.name.value === "collections"
+              );
+              const hasDocuments2 = collectionNode2.selectionSet.selections.find(
+                (x) => {
+                  var _a3;
+                  return ((_a3 = x == null ? void 0 : x.name) == null ? void 0 : _a3.value) === "documents";
+                }
+              );
               return tinaSchema.getCollections().map((collection) => {
-                return resolver.resolveCollection(args, collection.name, Boolean(hasDocuments2));
+                return resolver.resolveCollection(
+                  args,
+                  collection.name,
+                  Boolean(hasDocuments2)
+                );
               });
             }
-            const collectionNode = info.fieldNodes.find((x) => x.name.value === "collection");
-            const hasDocuments = collectionNode.selectionSet.selections.find((x) => {
-              var _a3;
-              return ((_a3 = x == null ? void 0 : x.name) == null ? void 0 : _a3.value) === "documents";
-            });
-            return resolver.resolveCollection(args, args.collection, Boolean(hasDocuments));
+            const collectionNode = info.fieldNodes.find(
+              (x) => x.name.value === "collection"
+            );
+            const hasDocuments = collectionNode.selectionSet.selections.find(
+              (x) => {
+                var _a3;
+                return ((_a3 = x == null ? void 0 : x.name) == null ? void 0 : _a3.value) === "documents";
+              }
+            );
+            return resolver.resolveCollection(
+              args,
+              args.collection,
+              Boolean(hasDocuments)
+            );
           }
           if (info.fieldName === "getOptimizedQuery") {
             try {
-              const [optimizedQuery] = (0, import_relay_operation_optimizer.optimizeDocuments)(info.schema, [(0, import_graphql4.parse)(args.queryString)], {
-                assumeValid: true,
-                includeFragments: false,
-                noLocation: true
-              });
+              const [optimizedQuery] = (0, import_relay_operation_optimizer.optimizeDocuments)(
+                info.schema,
+                [(0, import_graphql4.parse)(args.queryString)],
+                {
+                  assumeValid: true,
+                  includeFragments: false,
+                  noLocation: true
+                }
+              );
               return (0, import_graphql4.print)(optimizedQuery);
             } catch (e) {
-              throw new Error(`Invalid query provided, Error message: ${e.message}`);
+              throw new Error(
+                `Invalid query provided, Error message: ${e.message}`
+              );
             }
           }
           if (!lookup) {
@@ -3998,7 +4302,10 @@ var resolve = async ({
           const isCreation = lookup[info.fieldName] === "create";
           switch (lookup.resolveType) {
             case "nodeDocument":
-              assertShape(args, (yup3) => yup3.object({ id: yup3.string().required() }));
+              assertShape(
+                args,
+                (yup3) => yup3.object({ id: yup3.string().required() })
+              );
               return resolver.getDocument(args.id);
             case "multiCollectionDocument":
               if (typeof value === "string") {
@@ -4006,7 +4313,7 @@ var resolve = async ({
               }
               if (args && args.collection && info.fieldName === "addPendingDocument") {
                 return resolver.resolveDocument({
-                  args: __spreadProps(__spreadValues({}, args), { params: {} }),
+                  args: { ...args, params: {} },
                   collection: args.collection,
                   isMutation,
                   isCreation: true,
@@ -4046,13 +4353,16 @@ var resolve = async ({
                   filter = args.filter[value.collection.name];
                 }
                 return resolver.resolveCollectionConnection({
-                  args: __spreadProps(__spreadValues({}, args), {
+                  args: {
+                    ...args,
                     filter
-                  }),
+                  },
                   collection: value.collection
                 });
               } else {
-                throw new Error(`Expected an array for result of ${info.fieldName} at ${info.path}`);
+                throw new Error(
+                  `Expected an array for result of ${info.fieldName} at ${info.path}`
+                );
               }
             case "collectionDocument":
               if (value) {
@@ -4124,13 +4434,13 @@ var resolve = async ({
 };
 
 // src/database/index.ts
-var import_path3 = __toModule(require("path"));
-var import_graphql5 = __toModule(require("graphql"));
+var import_path3 = __toESM(require("path"));
+var import_graphql5 = require("graphql");
 
 // src/database/util.ts
-var import_toml = __toModule(require("@iarna/toml"));
-var import_js_yaml = __toModule(require("js-yaml"));
-var import_gray_matter = __toModule(require("gray-matter"));
+var import_toml = __toESM(require("@iarna/toml"));
+var import_js_yaml = __toESM(require("js-yaml"));
+var import_gray_matter = __toESM(require("gray-matter"));
 var matterEngines = {
   toml: {
     parse: (val) => import_toml.default.parse(val),
@@ -4138,36 +4448,34 @@ var matterEngines = {
   }
 };
 var stringifyFile = (content, format, keepTemplateKey, markdownParseConfig) => {
-  const _a = content, {
+  const {
     _relativePath,
     _keepTemplateKey,
     _id,
     _template,
     _collection,
-    $_body
-  } = _a, rest = __objRest(_a, [
-    "_relativePath",
-    "_keepTemplateKey",
-    "_id",
-    "_template",
-    "_collection",
-    "$_body"
-  ]);
+    $_body,
+    ...rest
+  } = content;
   const extra = {};
   if (keepTemplateKey) {
     extra["_template"] = _template;
   }
-  const strippedContent = __spreadValues(__spreadValues({}, rest), extra);
+  const strippedContent = { ...rest, ...extra };
   switch (format) {
     case ".markdown":
     case ".mdx":
     case ".md":
-      const ok = import_gray_matter.default.stringify(typeof $_body === "undefined" ? "" : `
-${$_body}`, strippedContent, {
-        language: (markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterFormat) || "yaml",
-        engines: matterEngines,
-        delimiters: (markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) || "---"
-      });
+      const ok = import_gray_matter.default.stringify(
+        typeof $_body === "undefined" ? "" : `
+${$_body}`,
+        strippedContent,
+        {
+          language: (markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterFormat) || "yaml",
+          engines: matterEngines,
+          delimiters: (markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) || "---"
+        }
+      );
       return ok;
     case ".json":
       return JSON.stringify(strippedContent, null, 2);
@@ -4190,9 +4498,10 @@ var parseFile = (content, format, yupSchema, markdownParseConfig) => {
         delimiters: (markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) || "---",
         engines: matterEngines
       });
-      const markdownData = __spreadProps(__spreadValues({}, contentJSON.data), {
+      const markdownData = {
+        ...contentJSON.data,
         $_body: contentJSON.content
-      });
+      };
       assertShape(markdownData, yupSchema);
       return markdownData;
     case ".json":
@@ -4217,12 +4526,83 @@ var parseFile = (content, format, yupSchema, markdownParseConfig) => {
 };
 var normalizePath = (filepath) => filepath.replace(/\\/g, "/");
 
+// src/database/alias-utils.ts
+var replaceNameOverrides = (template, obj) => {
+  if (template.list) {
+    return obj.map((item) => {
+      return _replaceNameOverrides(
+        getTemplateForData(template, item).fields,
+        item
+      );
+    });
+  } else {
+    return _replaceNameOverrides(getTemplateForData(template, obj).fields, obj);
+  }
+};
+var _replaceNameOverrides = (fields, obj) => {
+  const output = {};
+  Object.keys(obj).forEach((key) => {
+    const field = fields.find(
+      (fieldWithMatchingAlias) => ((fieldWithMatchingAlias == null ? void 0 : fieldWithMatchingAlias.nameOverride) || (fieldWithMatchingAlias == null ? void 0 : fieldWithMatchingAlias.name)) === key
+    );
+    output[(field == null ? void 0 : field.name) || key] = (field == null ? void 0 : field.type) == "object" ? replaceNameOverrides(field, obj[key]) : obj[key];
+  });
+  return output;
+};
+var getTemplateKey = (field) => {
+  var _a, _b, _c;
+  const DEFAULT_TEMPLATE_KEY = "_template";
+  if ((_a = field.templates) == null ? void 0 : _a.length) {
+    const templateField = (_c = (_b = field.templates[0]) == null ? void 0 : _b.fields) == null ? void 0 : _c.find(
+      (field2) => field2.name === DEFAULT_TEMPLATE_KEY
+    );
+    return (templateField == null ? void 0 : templateField.alias) || DEFAULT_TEMPLATE_KEY;
+  }
+  return DEFAULT_TEMPLATE_KEY;
+};
+var getTemplateForData = (field, data) => {
+  var _a;
+  if ((_a = field.templates) == null ? void 0 : _a.length) {
+    const templateKey = getTemplateKey(field);
+    if (data[templateKey]) {
+      return field.templates.find(
+        (template) => template.name === data[templateKey]
+      );
+    }
+  } else {
+    return field;
+  }
+  throw new Error("No template found for field " + field.name);
+};
+var applyNameOverrides = (template, obj) => {
+  if (template.list) {
+    return obj.map((item) => {
+      return _applyNameOverrides(
+        getTemplateForData(template, item).fields,
+        item
+      );
+    });
+  } else {
+    return _applyNameOverrides(getTemplateForData(template, obj).fields, obj);
+  }
+};
+var _applyNameOverrides = (fields, obj) => {
+  const output = {};
+  Object.keys(obj).forEach((key) => {
+    const field = fields.find((field2) => field2.name === key);
+    const outputKey = (field == null ? void 0 : field.nameOverride) || key;
+    output[outputKey] = (field == null ? void 0 : field.type) === "object" ? applyNameOverrides(field, obj[key]) : obj[key];
+  });
+  return output;
+};
+
 // src/database/index.ts
 var createDatabase = (config) => {
-  return new Database(__spreadProps(__spreadValues({}, config), {
+  return new Database({
+    ...config,
     bridge: config.bridge,
     level: config.level
-  }));
+  });
 };
 var SYSTEM_FILES = ["_schema", "_graphql", "_lookup"];
 var defaultStatusCallback = () => Promise.resolve();
@@ -4243,7 +4623,10 @@ var Database = class {
       } else {
         const tinaSchema = await this.getSchema(this.level);
         const extension = import_path3.default.extname(filepath);
-        const contentObject = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizePath(filepath));
+        const contentObject = await this.level.sublevel(
+          CONTENT_ROOT_PREFIX,
+          SUBLEVEL_OPTIONS
+        ).get(normalizePath(filepath));
         if (!contentObject) {
           throw new import_graphql5.GraphQLError(`Unable to find record ${filepath}`);
         }
@@ -4260,24 +4643,30 @@ var Database = class {
         let data = contentObject;
         if ((extension === ".md" || extension === ".mdx") && field) {
           if (hasOwnProperty(contentObject, "$_body")) {
-            const _a = contentObject, { $_body } = _a, rest = __objRest(_a, ["$_body"]);
+            const { $_body, ...rest } = contentObject;
             data = rest;
             data[field.name] = $_body;
           }
         }
-        return __spreadProps(__spreadValues({}, data), {
+        return {
+          ...data,
           _collection: collection.name,
           _keepTemplateKey: !!collection.templates,
           _template: lastItem(template.namespace),
           _relativePath: filepath.replace(collection.path, "").replace(/^\/|\/$/g, ""),
           _id: filepath
-        });
+        };
       }
     };
     this.addPendingDocument = async (filepath, data) => {
       await this.initLevel();
-      const { stringifiedFile, payload } = await this.stringifyFile(filepath, data);
+      const dataFields = await this.formatBodyOnPayload(filepath, data);
       const collection = await this.collectionForPath(filepath);
+      const stringifiedFile = await this.stringifyFile(
+        filepath,
+        dataFields,
+        collection
+      );
       let collectionIndexDefinitions;
       if (collection) {
         const indexDefinitions = await this.getIndexDefinitions(this.level);
@@ -4288,49 +4677,95 @@ var Database = class {
         await this.bridge.put(normalizedPath, stringifiedFile);
       }
       await this.onPut(normalizedPath, stringifiedFile);
-      const putOps = makeIndexOpsForDocument(normalizedPath, collection == null ? void 0 : collection.name, collectionIndexDefinitions, payload, "put", this.level);
-      const existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
-      const delOps = existingItem ? makeIndexOpsForDocument(normalizedPath, collection == null ? void 0 : collection.name, collectionIndexDefinitions, existingItem, "del", this.level) : [];
+      const putOps = makeIndexOpsForDocument(
+        normalizedPath,
+        collection == null ? void 0 : collection.name,
+        collectionIndexDefinitions,
+        dataFields,
+        "put",
+        this.level
+      );
+      const existingItem = await this.level.sublevel(
+        CONTENT_ROOT_PREFIX,
+        SUBLEVEL_OPTIONS
+      ).get(normalizedPath);
+      const delOps = existingItem ? makeIndexOpsForDocument(
+        normalizedPath,
+        collection == null ? void 0 : collection.name,
+        collectionIndexDefinitions,
+        existingItem,
+        "del",
+        this.level
+      ) : [];
       const ops = [
         ...delOps,
         ...putOps,
         {
           type: "put",
           key: normalizedPath,
-          value: payload,
-          sublevel: this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS)
+          value: dataFields,
+          sublevel: this.level.sublevel(
+            CONTENT_ROOT_PREFIX,
+            SUBLEVEL_OPTIONS
+          )
         }
       ];
       await this.level.batch(ops);
     };
-    this.put = async (filepath, data, collection) => {
+    this.put = async (filepath, data, collectionName) => {
       await this.initLevel();
       try {
         if (SYSTEM_FILES.includes(filepath)) {
           throw new Error(`Unexpected put for config file ${filepath}`);
         } else {
           let collectionIndexDefinitions;
-          if (collection) {
+          if (collectionName) {
             const indexDefinitions = await this.getIndexDefinitions(this.level);
-            collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection];
+            collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collectionName];
           }
           const normalizedPath = normalizePath(filepath);
-          const { stringifiedFile, payload } = await this.stringifyFile(filepath, data);
+          const dataFields = await this.formatBodyOnPayload(filepath, data);
+          const collection = await this.collectionForPath(filepath);
+          const stringifiedFile = await this.stringifyFile(
+            filepath,
+            dataFields,
+            collection
+          );
           if (this.bridge) {
             await this.bridge.put(normalizedPath, stringifiedFile);
           }
           await this.onPut(normalizedPath, stringifiedFile);
-          const putOps = makeIndexOpsForDocument(normalizedPath, collection, collectionIndexDefinitions, payload, "put", this.level);
-          const existingItem = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(normalizedPath);
-          const delOps = existingItem ? makeIndexOpsForDocument(normalizedPath, collection, collectionIndexDefinitions, existingItem, "del", this.level) : [];
+          const putOps = makeIndexOpsForDocument(
+            normalizedPath,
+            collectionName,
+            collectionIndexDefinitions,
+            dataFields,
+            "put",
+            this.level
+          );
+          const existingItem = await this.level.sublevel(
+            CONTENT_ROOT_PREFIX,
+            SUBLEVEL_OPTIONS
+          ).get(normalizedPath);
+          const delOps = existingItem ? makeIndexOpsForDocument(
+            normalizedPath,
+            collectionName,
+            collectionIndexDefinitions,
+            existingItem,
+            "del",
+            this.level
+          ) : [];
           const ops = [
             ...delOps,
             ...putOps,
             {
               type: "put",
               key: normalizedPath,
-              value: payload,
-              sublevel: this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS)
+              value: dataFields,
+              sublevel: this.level.sublevel(
+                CONTENT_ROOT_PREFIX,
+                SUBLEVEL_OPTIONS
+              )
             }
           ];
           await this.level.batch(ops);
@@ -4340,94 +4775,109 @@ var Database = class {
         throw new TinaFetchError(`Error in PUT for ${filepath}`, {
           originalError: error,
           file: filepath,
-          collection,
+          collection: collectionName,
           stack: error.stack
         });
       }
     };
-    this.stringifyFile = async (filepath, data) => {
-      if (SYSTEM_FILES.includes(filepath)) {
-        throw new Error(`Unexpected put for config file ${filepath}`);
-      } else {
-        const tinaSchema = await this.getSchema(this.level);
-        const collection = tinaSchema.getCollectionByFullPath(filepath);
-        const templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
-        let template;
-        if (templateInfo.type === "object") {
-          template = templateInfo.template;
-        }
-        if (templateInfo.type === "union") {
-          if (hasOwnProperty(data, "_template")) {
-            template = templateInfo.templates.find((t) => lastItem(t.namespace) === data._template);
-          } else {
-            throw new Error(`Expected _template to be provided for document in an ambiguous collection`);
+    this.formatBodyOnPayload = async (filepath, data) => {
+      const tinaSchema = await this.getSchema(this.level);
+      const collection = tinaSchema.getCollectionByFullPath(filepath);
+      const { template } = await this.getTemplateDetailsForFile(collection, data);
+      const bodyField = template.fields.find((field) => {
+        if (field.type === "string" || field.type === "rich-text") {
+          if (field.isBody) {
+            return true;
           }
         }
-        if (!template) {
-          throw new Error(`Unable to determine template`);
-        }
-        const field = template.fields.find((field2) => {
-          if (field2.type === "string" || field2.type === "rich-text") {
-            if (field2.isBody) {
-              return true;
-            }
+        return false;
+      });
+      let payload = {};
+      if (["md", "mdx"].includes(collection.format) && bodyField) {
+        Object.entries(data).forEach(([key, value]) => {
+          if (key !== bodyField.name) {
+            payload[key] = value;
           }
-          return false;
         });
-        let payload = {};
-        if (["md", "mdx"].includes(collection.format) && field) {
-          Object.entries(data).forEach(([key, value]) => {
-            if (key !== field.name) {
-              payload[key] = value;
-            }
-          });
-          payload["$_body"] = data[field.name];
-        } else {
-          payload = data;
-        }
-        const extension = import_path3.default.extname(filepath);
-        const stringifiedFile = stringifyFile(payload, extension, templateInfo.type === "union", {
+        payload["$_body"] = data[bodyField.name];
+      } else {
+        payload = data;
+      }
+      return payload;
+    };
+    this.stringifyFile = async (filepath, payload, collection) => {
+      const templateDetails = await this.getTemplateDetailsForFile(
+        collection,
+        payload
+      );
+      const writeTemplateKey = templateDetails.info.type === "union";
+      const aliasedData = applyNameOverrides(templateDetails.template, payload);
+      const extension = import_path3.default.extname(filepath);
+      const stringifiedFile = stringifyFile(
+        aliasedData,
+        extension,
+        writeTemplateKey,
+        {
           frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat,
           frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters
-        });
-        return {
-          stringifiedFile,
-          payload,
-          keepTemplateKey: templateInfo.type === "union"
-        };
-      }
+        }
+      );
+      return stringifiedFile;
     };
     this.flush = async (filepath) => {
       const data = await this.get(filepath);
-      const { stringifiedFile } = await this.stringifyFile(filepath, data);
+      const dataFields = await this.formatBodyOnPayload(filepath, data);
+      const collection = await this.collectionForPath(filepath);
+      const stringifiedFile = await this.stringifyFile(
+        filepath,
+        dataFields,
+        collection
+      );
       return stringifiedFile;
     };
     this.getLookup = async (returnType) => {
       await this.initLevel();
-      const lookupPath = normalizePath(import_path3.default.join(this.getGeneratedFolder(), `_lookup.json`));
+      const lookupPath = normalizePath(
+        import_path3.default.join(this.getGeneratedFolder(), `_lookup.json`)
+      );
       if (!this._lookup) {
-        const _lookup = await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(lookupPath);
+        const _lookup = await this.level.sublevel(
+          CONTENT_ROOT_PREFIX,
+          SUBLEVEL_OPTIONS
+        ).get(lookupPath);
         this._lookup = _lookup;
       }
       return this._lookup[returnType];
     };
     this.getGraphQLSchema = async () => {
       await this.initLevel();
-      const graphqlPath = normalizePath(import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`));
-      return await this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(graphqlPath);
+      const graphqlPath = normalizePath(
+        import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`)
+      );
+      return await this.level.sublevel(
+        CONTENT_ROOT_PREFIX,
+        SUBLEVEL_OPTIONS
+      ).get(graphqlPath);
     };
     this.getGraphQLSchemaFromBridge = async () => {
       if (!this.bridge) {
         throw new Error(`No bridge configured`);
       }
-      const graphqlPath = normalizePath(import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`));
+      const graphqlPath = normalizePath(
+        import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`)
+      );
       const _graphql = await this.bridge.get(graphqlPath);
       return JSON.parse(_graphql);
     };
     this.getTinaSchema = async (level) => {
       await this.initLevel();
-      const schemaPath = normalizePath(import_path3.default.join(this.getGeneratedFolder(), `_schema.json`));
-      return await (level || this.level).sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS).get(schemaPath);
+      const schemaPath = normalizePath(
+        import_path3.default.join(this.getGeneratedFolder(), `_schema.json`)
+      );
+      return await (level || this.level).sublevel(
+        CONTENT_ROOT_PREFIX,
+        SUBLEVEL_OPTIONS
+      ).get(schemaPath);
     };
     this.getSchema = async (level) => {
       if (this.tinaSchema) {
@@ -4472,7 +4922,9 @@ var Database = class {
                       var _a;
                       return {
                         name: indexField.name,
-                        type: (_a = collection.fields.find((field) => indexField.name === field.name)) == null ? void 0 : _a.type
+                        type: (_a = collection.fields.find(
+                          (field) => indexField.name === field.name
+                        )) == null ? void 0 : _a.type
                       };
                     })
                   };
@@ -4524,12 +4976,17 @@ var Database = class {
       const allIndexDefinitions = await this.getIndexDefinitions(this.level);
       const indexDefinitions = allIndexDefinitions == null ? void 0 : allIndexDefinitions[queryOptions.collection];
       if (!indexDefinitions) {
-        throw new Error(`No indexDefinitions for collection ${queryOptions.collection}`);
+        throw new Error(
+          `No indexDefinitions for collection ${queryOptions.collection}`
+        );
       }
       const filterChain = coerceFilterChainOperands(rawFilterChain);
       const indexDefinition = sort && (indexDefinitions == null ? void 0 : indexDefinitions[sort]);
       const filterSuffixes = indexDefinition && makeFilterSuffixes(filterChain, indexDefinition);
-      const rootLevel = this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
+      const rootLevel = this.level.sublevel(
+        CONTENT_ROOT_PREFIX,
+        SUBLEVEL_OPTIONS
+      );
       const sublevel = indexDefinition ? this.level.sublevel(collection, SUBLEVEL_OPTIONS).sublevel(sort, SUBLEVEL_OPTIONS) : rootLevel;
       if (!query.gt && !query.gte) {
         query.gte = (filterSuffixes == null ? void 0 : filterSuffixes.left) ? filterSuffixes.left : "";
@@ -4552,7 +5009,9 @@ var Database = class {
           continue;
         }
         const filepath = matcher.groups["_filepath_"];
-        if (!itemFilter(filterSuffixes ? matcher.groups : indexDefinition ? await rootLevel.get(filepath) : value)) {
+        if (!itemFilter(
+          filterSuffixes ? matcher.groups : indexDefinition ? await rootLevel.get(filepath) : value
+        )) {
           continue;
         }
         if (limit !== -1 && edges.length >= limit) {
@@ -4601,8 +5060,14 @@ var Database = class {
       tinaSchema
     }) => {
       if (this.bridge && this.bridge.supportsBuilding()) {
-        await this.bridge.putConfig(normalizePath(import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`)), JSON.stringify(graphQLSchema));
-        await this.bridge.putConfig(normalizePath(import_path3.default.join(this.getGeneratedFolder(), `_schema.json`)), JSON.stringify(tinaSchema.schema));
+        await this.bridge.putConfig(
+          normalizePath(import_path3.default.join(this.getGeneratedFolder(), `_graphql.json`)),
+          JSON.stringify(graphQLSchema)
+        );
+        await this.bridge.putConfig(
+          normalizePath(import_path3.default.join(this.getGeneratedFolder(), `_schema.json`)),
+          JSON.stringify(tinaSchema.schema)
+        );
       }
     };
     this.indexContent = async ({
@@ -4615,21 +5080,37 @@ var Database = class {
       }
       await this.initLevel();
       await this.indexStatusCallbackWrapper(async () => {
-        const lookup = lookupFromLockFile || JSON.parse(await this.bridge.get(normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_lookup.json"))));
+        const lookup = lookupFromLockFile || JSON.parse(
+          await this.bridge.get(
+            normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_lookup.json"))
+          )
+        );
         let nextLevel;
         let nextVersion;
         if (!this.config.version) {
           await this.level.clear();
           nextLevel = this.level;
         } else {
-          const version2 = await this.getDatabaseVersion();
-          nextVersion = version2 ? `${parseInt(version2) + 1}` : "0";
+          const version = await this.getDatabaseVersion();
+          nextVersion = version ? `${parseInt(version) + 1}` : "0";
           nextLevel = this.rootLevel.sublevel(nextVersion, SUBLEVEL_OPTIONS);
         }
-        const contentRootLevel = nextLevel.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
-        await contentRootLevel.put(normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_graphql.json")), graphQLSchema);
-        await contentRootLevel.put(normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_schema.json")), tinaSchema.schema);
-        await contentRootLevel.put(normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_lookup.json")), lookup);
+        const contentRootLevel = nextLevel.sublevel(
+          CONTENT_ROOT_PREFIX,
+          SUBLEVEL_OPTIONS
+        );
+        await contentRootLevel.put(
+          normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_graphql.json")),
+          graphQLSchema
+        );
+        await contentRootLevel.put(
+          normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_schema.json")),
+          tinaSchema.schema
+        );
+        await contentRootLevel.put(
+          normalizePath(import_path3.default.join(this.getGeneratedFolder(), "_lookup.json")),
+          lookup
+        );
         await this._indexAllContent(nextLevel);
         if (this.config.version) {
           await this.updateDatabaseVersion(nextVersion);
@@ -4652,7 +5133,12 @@ var Database = class {
       await this.indexStatusCallbackWrapper(async () => {
         const { pathsByCollection, nonCollectionPaths, collections } = await this.partitionPathsByCollection(documentPaths);
         for (const collection of Object.keys(pathsByCollection)) {
-          await _deleteIndexContent(this, pathsByCollection[collection], enqueueOps, collections[collection]);
+          await _deleteIndexContent(
+            this,
+            pathsByCollection[collection],
+            enqueueOps,
+            collections[collection]
+          );
         }
         await _deleteIndexContent(this, nonCollectionPaths, enqueueOps, null);
       });
@@ -4672,7 +5158,13 @@ var Database = class {
       await this.indexStatusCallbackWrapper(async () => {
         const { pathsByCollection, nonCollectionPaths, collections } = await this.partitionPathsByCollection(documentPaths);
         for (const collection of Object.keys(pathsByCollection)) {
-          await _indexContent(this, this.level, pathsByCollection[collection], enqueueOps, collections[collection]);
+          await _indexContent(
+            this,
+            this.level,
+            pathsByCollection[collection],
+            enqueueOps,
+            collections[collection]
+          );
         }
         await _indexContent(this, this.level, nonCollectionPaths, enqueueOps);
       });
@@ -4688,13 +5180,26 @@ var Database = class {
         const indexDefinitions = await this.getIndexDefinitions(this.level);
         collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
       }
-      this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
+      this.level.sublevel(
+        CONTENT_ROOT_PREFIX,
+        SUBLEVEL_OPTIONS
+      );
       const itemKey = normalizePath(filepath);
-      const rootSublevel = this.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
+      const rootSublevel = this.level.sublevel(
+        CONTENT_ROOT_PREFIX,
+        SUBLEVEL_OPTIONS
+      );
       const item = await rootSublevel.get(itemKey);
       if (item) {
         await this.level.batch([
-          ...makeIndexOpsForDocument(filepath, collection.name, collectionIndexDefinitions, item, "del", this.level),
+          ...makeIndexOpsForDocument(
+            filepath,
+            collection.name,
+            collectionIndexDefinitions,
+            item,
+            "del",
+            this.level
+          ),
           {
             type: "del",
             key: itemKey,
@@ -4718,7 +5223,10 @@ var Database = class {
         }
       };
       await sequential(tinaSchema.getCollections(), async (collection) => {
-        const documentPaths = await this.bridge.glob(normalizePath(collection.path), collection.format || "md");
+        const documentPaths = await this.bridge.glob(
+          normalizePath(collection.path),
+          collection.format || "md"
+        );
         await _indexContent(this, level, documentPaths, enqueueOps, collection);
       });
       while (operations.length) {
@@ -4736,10 +5244,14 @@ var Database = class {
       } catch (e) {
         lookupMap = {};
       }
-      const updatedLookup = __spreadProps(__spreadValues({}, lookupMap), {
+      const updatedLookup = {
+        ...lookupMap,
         [lookup.type]: lookup
-      });
-      await this.bridge.putConfig(normalizePath(lookupPath), JSON.stringify(updatedLookup));
+      };
+      await this.bridge.putConfig(
+        normalizePath(lookupPath),
+        JSON.stringify(updatedLookup)
+      );
     };
     this.tinaDirectory = config.tinaDirectory || ".tina";
     this.bridge = config.bridge;
@@ -4766,9 +5278,9 @@ var Database = class {
     }
     return { pathsByCollection, nonCollectionPaths, collections };
   }
-  async updateDatabaseVersion(version2) {
+  async updateDatabaseVersion(version) {
     const metadataLevel = this.rootLevel.sublevel("_metadata", SUBLEVEL_OPTIONS);
-    await metadataLevel.put("metadata", { version: version2 });
+    await metadataLevel.put("metadata", { version });
   }
   async getDatabaseVersion() {
     const metadataLevel = this.rootLevel.sublevel("_metadata", SUBLEVEL_OPTIONS);
@@ -4782,17 +5294,43 @@ var Database = class {
     if (!this.config.version) {
       this.level = this.rootLevel;
     } else {
-      let version2 = await this.getDatabaseVersion();
-      if (!version2) {
-        version2 = "";
-        await this.updateDatabaseVersion(version2);
+      let version = await this.getDatabaseVersion();
+      if (!version) {
+        version = "";
+        await this.updateDatabaseVersion(version);
       }
-      this.level = this.rootLevel.sublevel(version2, SUBLEVEL_OPTIONS);
+      this.level = this.rootLevel.sublevel(version, SUBLEVEL_OPTIONS);
     }
     if (!this.level) {
       throw new import_graphql5.GraphQLError("Error initializing LevelDB instance");
     }
   }
+  async getTemplateDetailsForFile(collection, data) {
+    const tinaSchema = await this.getSchema();
+    const templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
+    let template;
+    if (templateInfo.type === "object") {
+      template = templateInfo.template;
+    }
+    if (templateInfo.type === "union") {
+      if (hasOwnProperty(data, "_template")) {
+        template = templateInfo.templates.find(
+          (t) => lastItem(t.namespace) === data._template
+        );
+      } else {
+        throw new Error(
+          `Expected _template to be provided for document in an ambiguous collection`
+        );
+      }
+    }
+    if (!template) {
+      throw new Error(`Unable to determine template`);
+    }
+    return {
+      template,
+      info: templateInfo
+    };
+  }
   clearCache() {
     this.tinaSchema = null;
     this._lookup = null;
@@ -4820,21 +5358,45 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
       throw new Error(`No indexDefinitions for collection ${collection.name}`);
     }
   }
+  const tinaSchema = await database.getSchema();
+  let templateInfo = null;
+  if (collection) {
+    templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
+  }
   await sequential(documentPaths, async (filepath) => {
     try {
       const dataString = await database.bridge.get(normalizePath(filepath));
-      const data = parseFile(dataString, import_path3.default.extname(filepath), (yup3) => yup3.object({}), {
-        frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters,
-        frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat
-      });
+      const data = parseFile(
+        dataString,
+        import_path3.default.extname(filepath),
+        (yup3) => yup3.object({}),
+        {
+          frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters,
+          frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat
+        }
+      );
       const normalizedPath = normalizePath(filepath);
+      const aliasedData = templateInfo ? replaceNameOverrides(
+        getTemplateForFile(templateInfo, data),
+        data
+      ) : data;
       await enqueueOps([
-        ...makeIndexOpsForDocument(normalizedPath, collection == null ? void 0 : collection.name, collectionIndexDefinitions, data, "put", level),
+        ...makeIndexOpsForDocument(
+          normalizedPath,
+          collection == null ? void 0 : collection.name,
+          collectionIndexDefinitions,
+          aliasedData,
+          "put",
+          level
+        ),
         {
           type: "put",
           key: normalizedPath,
-          value: data,
-          sublevel: level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS)
+          value: aliasedData,
+          sublevel: level.sublevel(
+            CONTENT_ROOT_PREFIX,
+            SUBLEVEL_OPTIONS
+          )
         }
       ]);
     } catch (error) {
@@ -4856,23 +5418,50 @@ var _deleteIndexContent = async (database, documentPaths, enequeueOps, collectio
       throw new Error(`No indexDefinitions for collection ${collection.name}`);
     }
   }
-  const rootLevel = database.level.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
+  const rootLevel = database.level.sublevel(
+    CONTENT_ROOT_PREFIX,
+    SUBLEVEL_OPTIONS
+  );
   await sequential(documentPaths, async (filepath) => {
     const itemKey = normalizePath(filepath);
     const item = await rootLevel.get(itemKey);
     if (item) {
       await enequeueOps([
-        ...makeIndexOpsForDocument(itemKey, collection.name, collectionIndexDefinitions, item, "del", database.level),
+        ...makeIndexOpsForDocument(
+          itemKey,
+          collection.name,
+          collectionIndexDefinitions,
+          item,
+          "del",
+          database.level
+        ),
         { type: "del", key: itemKey, sublevel: rootLevel }
       ]);
     }
   });
 };
+var getTemplateForFile = (templateInfo, data) => {
+  if (templateInfo.type === "object") {
+    return templateInfo.template;
+  }
+  if (templateInfo.type === "union") {
+    if (hasOwnProperty(data, "_template")) {
+      return templateInfo.templates.find(
+        (t) => lastItem(t.namespace) === data._template
+      );
+    } else {
+      throw new Error(
+        `Expected _template to be provided for document in an ambiguous collection`
+      );
+    }
+  }
+  throw new Error(`Unable to determine template`);
+};
 
 // src/level/tinaLevel.ts
-var import_many_level = __toModule(require("many-level"));
-var import_readable_stream = __toModule(require("readable-stream"));
-var import_net = __toModule(require("net"));
+var import_many_level = require("many-level");
+var import_readable_stream = require("readable-stream");
+var import_net = require("net");
 var TinaLevelClient = class extends import_many_level.ManyLevelGuest {
   constructor() {
     super(...arguments);
@@ -4890,10 +5479,10 @@ var TinaLevelClient = class extends import_many_level.ManyLevelGuest {
 };
 
 // src/database/bridge/filesystem.ts
-var import_fs_extra2 = __toModule(require("fs-extra"));
-var import_fast_glob = __toModule(require("fast-glob"));
-var import_path4 = __toModule(require("path"));
-var import_normalize_path = __toModule(require("normalize-path"));
+var import_fs_extra2 = __toESM(require("fs-extra"));
+var import_fast_glob = __toESM(require("fast-glob"));
+var import_path4 = __toESM(require("path"));
+var import_normalize_path = __toESM(require("normalize-path"));
 var FilesystemBridge = class {
   constructor(rootPath) {
     this.rootPath = rootPath || "";
@@ -4904,9 +5493,12 @@ var FilesystemBridge = class {
   }
   async glob(pattern, extension) {
     const basePath = import_path4.default.join(this.outputPath, ...pattern.split("/"));
-    const items = await (0, import_fast_glob.default)(import_path4.default.join(basePath, "**", `/*${extension}`).replace(/\\/g, "/"), {
-      dot: true
-    });
+    const items = await (0, import_fast_glob.default)(
+      import_path4.default.join(basePath, "**", `/*${extension}`).replace(/\\/g, "/"),
+      {
+        dot: true
+      }
+    );
     const posixRootPath = (0, import_normalize_path.default)(this.outputPath);
     return items.map((item) => {
       return item.replace(posixRootPath, "").replace(/^\/|\/$/g, "");
@@ -4948,12 +5540,12 @@ var AuditFileSystemBridge = class extends FilesystemBridge {
 };
 
 // src/database/bridge/isomorphic.ts
-var import_isomorphic_git = __toModule(require("isomorphic-git"));
-var import_fs_extra3 = __toModule(require("fs-extra"));
-var import_glob_parent = __toModule(require("glob-parent"));
-var import_normalize_path2 = __toModule(require("normalize-path"));
-var import_graphql6 = __toModule(require("graphql"));
-var import_path5 = __toModule(require("path"));
+var import_isomorphic_git = __toESM(require("isomorphic-git"));
+var import_fs_extra3 = __toESM(require("fs-extra"));
+var import_glob_parent = __toESM(require("glob-parent"));
+var import_normalize_path2 = __toESM(require("normalize-path"));
+var import_graphql6 = require("graphql");
+var import_path5 = require("path");
 var flat = typeof Array.prototype.flat === "undefined" ? (entries) => entries.reduce((acc, x) => acc.concat(x), []) : (entries) => entries.flat();
 var toUint8Array = (buf) => {
   const ab = new ArrayBuffer(buf.length);
@@ -4996,16 +5588,18 @@ var IsomorphicBridge = class {
     });
   }
   getAuthor() {
-    return __spreadProps(__spreadValues({}, this.author), {
+    return {
+      ...this.author,
       timestamp: Math.round(new Date().getTime() / 1e3),
       timezoneOffset: 0
-    });
+    };
   }
   getCommitter() {
-    return __spreadProps(__spreadValues({}, this.committer), {
+    return {
+      ...this.committer,
       timestamp: Math.round(new Date().getTime() / 1e3),
       timezoneOffset: 0
-    });
+    };
   }
   async listEntries({
     pattern,
@@ -5013,10 +5607,11 @@ var IsomorphicBridge = class {
     path: path6,
     results
   }) {
-    const treeResult = await import_isomorphic_git.default.readTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+    const treeResult = await import_isomorphic_git.default.readTree({
+      ...this.isomorphicConfig,
       oid: entry.oid,
       cache: this.cache
-    }));
+    });
     const children = [];
     for (const childEntry of treeResult.tree) {
       const childPath = path6 ? `${path6}/${childEntry.path}` : childEntry.path;
@@ -5040,7 +5635,8 @@ var IsomorphicBridge = class {
   }
   async resolvePathEntries(path6, ref) {
     let pathParts = path6.split("/");
-    const result = await import_isomorphic_git.default.walk(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+    const result = await import_isomorphic_git.default.walk({
+      ...this.isomorphicConfig,
       map: async (filepath, [head]) => {
         if (head._fullpath === ".") {
           return head;
@@ -5057,7 +5653,7 @@ var IsomorphicBridge = class {
       },
       cache: this.cache,
       trees: [import_isomorphic_git.default.TREE({ ref })]
-    }));
+    });
     const pathEntries = flat(result);
     if (pathParts.indexOf(".") === -1) {
       pathParts = [".", ...pathParts];
@@ -5076,10 +5672,11 @@ var IsomorphicBridge = class {
     const mode = type === "blob" ? "100644" : "040000";
     if (parentEntry) {
       parentOid = await parentEntry.oid();
-      const treeResult = await import_isomorphic_git.default.readTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      const treeResult = await import_isomorphic_git.default.readTree({
+        ...this.isomorphicConfig,
         oid: parentOid,
         cache: this.cache
-      }));
+      });
       tree = existingOid ? treeResult.tree.map((entry) => {
         if (entry.path === path6) {
           entry.oid = updatedOid;
@@ -5104,44 +5701,64 @@ var IsomorphicBridge = class {
         }
       ];
     }
-    const updatedParentOid = await import_isomorphic_git.default.writeTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+    const updatedParentOid = await import_isomorphic_git.default.writeTree({
+      ...this.isomorphicConfig,
       tree
-    }));
+    });
     if (lastIdx === 0) {
       return updatedParentOid;
     } else {
-      return await this.updateTreeHierarchy(parentOid, updatedParentOid, parentPath, "tree", pathEntries.slice(0, lastIdx), pathParts.slice(0, lastIdx));
+      return await this.updateTreeHierarchy(
+        parentOid,
+        updatedParentOid,
+        parentPath,
+        "tree",
+        pathEntries.slice(0, lastIdx),
+        pathParts.slice(0, lastIdx)
+      );
     }
   }
   async commitTree(treeSha, ref) {
-    const commitSha = await import_isomorphic_git.default.writeCommit(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+    const commitSha = await import_isomorphic_git.default.writeCommit({
+      ...this.isomorphicConfig,
       commit: {
         tree: treeSha,
         parent: [
-          await import_isomorphic_git.default.resolveRef(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+          await import_isomorphic_git.default.resolveRef({
+            ...this.isomorphicConfig,
             ref
-          }))
+          })
         ],
         message: this.commitMessage,
         author: this.getAuthor(),
         committer: this.getCommitter()
       }
-    }));
-    await import_isomorphic_git.default.writeRef(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+    });
+    await import_isomorphic_git.default.writeRef({
+      ...this.isomorphicConfig,
       ref,
       value: commitSha,
       force: true
-    }));
+    });
   }
   async getRef() {
     if (this.ref) {
       return this.ref;
     }
-    const ref = await import_isomorphic_git.default.currentBranch(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+    const ref = await import_isomorphic_git.default.currentBranch({
+      ...this.isomorphicConfig,
       fullname: true
-    }));
+    });
     if (!ref) {
-      throw new import_graphql6.GraphQLError(`Unable to determine current branch from HEAD`, null, null, null, null, null, {});
+      throw new import_graphql6.GraphQLError(
+        `Unable to determine current branch from HEAD`,
+        null,
+        null,
+        null,
+        null,
+        null,
+        {}
+      );
     }
     this.ref = ref;
     return ref;
@@ -5149,17 +5766,21 @@ var IsomorphicBridge = class {
   async glob(pattern, extension) {
     const ref = await this.getRef();
     const parent = (0, import_glob_parent.default)(this.qualifyPath(pattern));
-    const { pathParts, pathEntries } = await this.resolvePathEntries(parent, ref);
+    const { pathParts, pathEntries } = await this.resolvePathEntries(
+      parent,
+      ref
+    );
     const leafEntry = pathEntries[pathEntries.length - 1];
     const entryPath = pathParts[pathParts.length - 1];
     const parentEntry = pathEntries[pathEntries.length - 2];
     let treeEntry;
     let parentPath;
     if (parentEntry) {
-      const treeResult = await import_isomorphic_git.default.readTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      const treeResult = await import_isomorphic_git.default.readTree({
+        ...this.isomorphicConfig,
         oid: await parentEntry.oid(),
         cache: this.cache
-      }));
+      });
       treeEntry = treeResult.tree.find((entry) => entry.path === entryPath);
       parentPath = pathParts.slice(1, pathParts.length).join("/");
     } else {
@@ -5183,7 +5804,10 @@ var IsomorphicBridge = class {
   }
   async delete(filepath) {
     const ref = await this.getRef();
-    const { pathParts, pathEntries } = await this.resolvePathEntries(this.qualifyPath(filepath), ref);
+    const { pathParts, pathEntries } = await this.resolvePathEntries(
+      this.qualifyPath(filepath),
+      ref
+    );
     let oidToRemove;
     let ptr = pathEntries.length - 1;
     while (ptr >= 1) {
@@ -5193,33 +5817,53 @@ var IsomorphicBridge = class {
         oidToRemove = oidToRemove || await leafEntry.oid();
         const parentEntry = pathEntries[ptr - 1];
         const existingOid = await parentEntry.oid();
-        const treeResult = await import_isomorphic_git.default.readTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+        const treeResult = await import_isomorphic_git.default.readTree({
+          ...this.isomorphicConfig,
           oid: existingOid,
           cache: this.cache
-        }));
-        const updatedTree = treeResult.tree.filter((value) => value.path !== nodePath);
+        });
+        const updatedTree = treeResult.tree.filter(
+          (value) => value.path !== nodePath
+        );
         if (updatedTree.length === 0) {
           ptr -= 1;
           continue;
         }
-        const updatedTreeOid = await import_isomorphic_git.default.writeTree(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+        const updatedTreeOid = await import_isomorphic_git.default.writeTree({
+          ...this.isomorphicConfig,
           tree: updatedTree
-        }));
-        const updatedRootTreeOid = await this.updateTreeHierarchy(existingOid, updatedTreeOid, pathParts[ptr - 1], "tree", pathEntries.slice(0, ptr - 1), pathParts.slice(0, ptr - 1));
+        });
+        const updatedRootTreeOid = await this.updateTreeHierarchy(
+          existingOid,
+          updatedTreeOid,
+          pathParts[ptr - 1],
+          "tree",
+          pathEntries.slice(0, ptr - 1),
+          pathParts.slice(0, ptr - 1)
+        );
         await this.commitTree(updatedRootTreeOid, ref);
         break;
       } else {
-        throw new import_graphql6.GraphQLError(`Unable to resolve path: ${filepath}`, null, null, null, null, null, { status: 404 });
+        throw new import_graphql6.GraphQLError(
+          `Unable to resolve path: ${filepath}`,
+          null,
+          null,
+          null,
+          null,
+          null,
+          { status: 404 }
+        );
       }
     }
     if (oidToRemove) {
-      await import_isomorphic_git.default.updateIndex(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+      await import_isomorphic_git.default.updateIndex({
+        ...this.isomorphicConfig,
         filepath: this.qualifyPath(filepath),
         force: true,
         remove: true,
         oid: oidToRemove,
         cache: this.cache
-      }));
+      });
     }
     await this.onDelete(filepath);
   }
@@ -5231,14 +5875,16 @@ var IsomorphicBridge = class {
   }
   async get(filepath) {
     const ref = await this.getRef();
-    const oid = await import_isomorphic_git.default.resolveRef(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+    const oid = await import_isomorphic_git.default.resolveRef({
+      ...this.isomorphicConfig,
       ref
-    }));
-    const { blob } = await import_isomorphic_git.default.readBlob(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+    });
+    const { blob } = await import_isomorphic_git.default.readBlob({
+      ...this.isomorphicConfig,
       oid,
       filepath: this.qualifyPath(filepath),
       cache: this.cache
-    }));
+    });
     return Buffer.from(blob).toString("utf8");
   }
   async putConfig(filepath, data) {
@@ -5246,7 +5892,10 @@ var IsomorphicBridge = class {
   }
   async put(filepath, data) {
     const ref = await this.getRef();
-    const { pathParts, pathEntries } = await this.resolvePathEntries(this.qualifyPath(filepath), ref);
+    const { pathParts, pathEntries } = await this.resolvePathEntries(
+      this.qualifyPath(filepath),
+      ref
+    );
     const blobUpdate = toUint8Array(Buffer.from(data));
     let existingOid;
     const leafEntry = pathEntries[pathEntries.length - 1];
@@ -5259,17 +5908,26 @@ var IsomorphicBridge = class {
         return;
       }
     }
-    const updatedOid = await import_isomorphic_git.default.writeBlob(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+    const updatedOid = await import_isomorphic_git.default.writeBlob({
+      ...this.isomorphicConfig,
       blob: blobUpdate
-    }));
-    const updatedRootSha = await this.updateTreeHierarchy(existingOid, updatedOid, nodePath, "blob", pathEntries.slice(0, pathEntries.length - 1), pathParts.slice(0, pathParts.length - 1));
+    });
+    const updatedRootSha = await this.updateTreeHierarchy(
+      existingOid,
+      updatedOid,
+      nodePath,
+      "blob",
+      pathEntries.slice(0, pathEntries.length - 1),
+      pathParts.slice(0, pathParts.length - 1)
+    );
     await this.commitTree(updatedRootSha, ref);
-    await import_isomorphic_git.default.updateIndex(__spreadProps(__spreadValues({}, this.isomorphicConfig), {
+    await import_isomorphic_git.default.updateIndex({
+      ...this.isomorphicConfig,
       filepath: this.qualifyPath(filepath),
       add: true,
       oid: updatedOid,
       cache: this.cache
-    }));
+    });
     await this.onPut(filepath, data);
   }
 };