npm - @tinacms/graphql - Versions diffs - 0.0.0-ecea7ac-20241011043815 → 0.0.0-ed6025e-20251201040055 - Mend

@tinacms/graphql 0.0.0-ecea7ac-20241011043815 → 0.0.0-ed6025e-20251201040055

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/README.md +144 -0
package/dist/ast-builder/index.d.ts +2 -3
package/dist/build.d.ts +2 -4
package/dist/builder/index.d.ts +2 -2
package/dist/database/bridge/filesystem.d.ts +1 -1
package/dist/database/datalayer.d.ts +5 -1
package/dist/database/index.d.ts +2 -0
package/dist/database/util.d.ts +6 -9
package/dist/index.d.ts +1 -4
package/dist/index.js +1576 -793
package/dist/index.mjs +1438 -635
package/dist/mdx/index.d.ts +2 -7
package/dist/resolver/auth-fields.d.ts +31 -0
package/dist/resolver/error.d.ts +1 -2
package/dist/resolver/index.d.ts +42 -7
package/dist/resolver/media-utils.d.ts +3 -3
package/dist/schema/createSchema.d.ts +0 -3
package/dist/schema/validate.d.ts +0 -3
package/package.json +19 -27
package/readme.md +0 -194

package/dist/index.js CHANGED Viewed

@@ -17,14 +17,18 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   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
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   AuditFileSystemBridge: () => AuditFileSystemBridge,
   Database: () => Database,
   FilesystemBridge: () => FilesystemBridge,
@@ -58,11 +62,11 @@ __export(src_exports, {
   transformDocument: () => transformDocument,
   transformDocumentIntoPayload: () => transformDocumentIntoPayload
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 // src/build.ts
 var import_graphql2 = require("graphql");
-var import_lodash3 = __toESM(require("lodash.uniqby"));
+var import_es_toolkit3 = require("es-toolkit");
 // src/util.ts
 var yup = __toESM(require("yup"));
@@ -118,7 +122,7 @@ var flattenDeep = (arr) => arr.flatMap(
 );
 // src/ast-builder/index.ts
-var import_lodash = __toESM(require("lodash.uniqby"));
+var import_es_toolkit = require("es-toolkit");
 var SysFieldDefinition = {
   kind: "Field",
   name: {
@@ -130,6 +134,15 @@ var SysFieldDefinition = {
   selectionSet: {
     kind: "SelectionSet",
     selections: [
+      // {
+      //   kind: 'Field' as const,
+      //   name: {
+      //     kind: 'Name' as const,
+      //     value: 'title',
+      //   },
+      //   arguments: [],
+      //   directives: [],
+      // },
       {
         kind: "Field",
         name: {
@@ -148,6 +161,15 @@ var SysFieldDefinition = {
         arguments: [],
         directives: []
       },
+      {
+        kind: "Field",
+        name: {
+          kind: "Name",
+          value: "hasReferences"
+        },
+        arguments: [],
+        directives: []
+      },
       {
         kind: "Field",
         name: {
@@ -188,6 +210,10 @@ var SysFieldDefinition = {
   }
 };
 var astBuilder = {
+  /**
+   * `FormFieldBuilder` acts as a shortcut to building an entire `ObjectTypeDefinition`, we use this
+   * because all Tina field objects share a common set of fields ('name', 'label', 'component')
+   */
   FormFieldBuilder: ({
     name,
     additionalFields
@@ -411,6 +437,8 @@ var astBuilder = {
       kind: "Name",
       value: name
     },
+    // @ts-ignore FIXME; this is being handled properly but we're lying to
+    // ts and then fixing it in the `extractInlineTypes` function
     fields
   }),
   UnionTypeDefinition: ({
@@ -423,6 +451,8 @@ var astBuilder = {
       value: name
     },
     directives: [],
+    // @ts-ignore FIXME; this is being handled properly but we're lying to
+    // ts and then fixing it in the `extractInlineTypes` function
     types: types.map((name2) => ({
       kind: "NamedType",
       name: {
@@ -519,8 +549,11 @@ var astBuilder = {
         string: "String",
         boolean: "Boolean",
         number: "Float",
+        // FIXME - needs to be float or int
         datetime: "String",
+        // FIXME
         image: "String",
+        // FIXME
         text: "String"
       };
       return scalars[type];
@@ -1004,12 +1037,13 @@ var astBuilder = {
     };
   },
   toGraphQLAst: (ast) => {
-    const definitions = (0, import_lodash.default)(
+    const definitions = (0, import_es_toolkit.uniqBy)(
       [
         ...extractInlineTypes(ast.query),
         ...extractInlineTypes(ast.globalTemplates),
         ...ast.definitions
       ],
+      // @ts-ignore - all nodes have a name property in practice
       (field) => field.name.value
     );
     return {
@@ -1019,8 +1053,7 @@ var astBuilder = {
   }
 };
 var capitalize = (s) => {
-  if (typeof s !== "string")
-    return "";
+  if (typeof s !== "string") return "";
   return s.charAt(0).toUpperCase() + s.slice(1);
 };
 var extractInlineTypes = (item) => {
@@ -1033,7 +1066,7 @@ var extractInlineTypes = (item) => {
   const accumulator = [item];
   for (const node of walk(item)) {
     if (node.kind === "UnionTypeDefinition") {
-      node.types = (0, import_lodash.default)(node.types, (type) => type.name.value);
+      node.types = (0, import_es_toolkit.uniqBy)(node.types, (type) => type.name.value);
     }
     if (node.kind === "NamedType") {
       if (typeof node.name.value !== "string") {
@@ -1063,41 +1096,6 @@ function* walk(maybeNode, visited = /* @__PURE__ */ new WeakSet()) {
   yield maybeNode;
   visited.add(maybeNode);
 }
-function addNamespaceToSchema(maybeNode, namespace = []) {
-  if (typeof maybeNode === "string") {
-    return maybeNode;
-  }
-  if (typeof maybeNode === "boolean") {
-    return maybeNode;
-  }
-  const newNode = maybeNode;
-  const keys = Object.keys(maybeNode);
-  Object.values(maybeNode).map((m, index) => {
-    const key = keys[index];
-    if (Array.isArray(m)) {
-      newNode[key] = m.map((element) => {
-        if (!element) {
-          return;
-        }
-        if (!element.hasOwnProperty("name")) {
-          return element;
-        }
-        const value = element.name || element.value;
-        return addNamespaceToSchema(element, [...namespace, value]);
-      });
-    } else {
-      if (!m) {
-        return;
-      }
-      if (!m.hasOwnProperty("name")) {
-        newNode[key] = m;
-      } else {
-        newNode[key] = addNamespaceToSchema(m, [...namespace, m.name]);
-      }
-    }
-  });
-  return { ...newNode, namespace };
-}
 var generateNamespacedFieldName = (names, suffix = "") => {
   return (suffix ? [...names, suffix] : names).map(capitalize).join("");
 };
@@ -1257,6 +1255,11 @@ var scalarDefinitions = [
         required: true,
         type: astBuilder.TYPES.String
       }),
+      astBuilder.FieldDefinition({
+        name: "hasReferences",
+        required: false,
+        type: astBuilder.TYPES.Boolean
+      }),
       astBuilder.FieldDefinition({
         name: "breadcrumbs",
         required: true,
@@ -1433,13 +1436,12 @@ var checkPasswordHash = async ({
   return true;
 };
 var mapUserFields = (collectable, prefix = []) => {
-  var _a, _b, _c, _d, _e;
   const results = [];
-  const passwordFields = ((_a = collectable.fields) == null ? void 0 : _a.filter((field) => field.type === "password")) || [];
+  const passwordFields = collectable.fields?.filter((field) => field.type === "password") || [];
   if (passwordFields.length > 1) {
     throw new Error("Only one password field is allowed");
   }
-  const idFields = ((_b = collectable.fields) == null ? void 0 : _b.filter((field) => field.uid)) || [];
+  const idFields = collectable.fields?.filter((field) => field.uid) || [];
   if (idFields.length > 1) {
     throw new Error("Only one uid field is allowed");
   }
@@ -1447,11 +1449,11 @@ var mapUserFields = (collectable, prefix = []) => {
     results.push({
       path: prefix,
       collectable,
-      idFieldName: (_c = idFields[0]) == null ? void 0 : _c.name,
-      passwordFieldName: (_d = passwordFields[0]) == null ? void 0 : _d.name
+      idFieldName: idFields[0]?.name,
+      passwordFieldName: passwordFields[0]?.name
     });
   }
-  (_e = collectable.fields) == null ? void 0 : _e.forEach((field) => {
+  collectable.fields?.forEach((field) => {
     if (field.type === "object" && field.fields) {
       results.push(...mapUserFields(field, [...prefix, field.name]));
     }
@@ -1471,6 +1473,19 @@ var Builder = class {
     this.addToLookupMap = (lookup) => {
       this.lookupMap[lookup.type] = lookup;
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   getCollection(collection: $collection) {
+     *     name
+     *     documents {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collections
+     */
     this.buildCollectionDefinition = async (collections) => {
       const name = "collection";
       const typeName = "Collection";
@@ -1541,6 +1556,19 @@ var Builder = class {
         required: true
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   getCollections {
+     *     name
+     *     documents {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collections
+     */
     this.buildMultiCollectionDefinition = async (collections) => {
       const name = "collections";
       const typeName = "Collection";
@@ -1551,6 +1579,17 @@ var Builder = class {
         required: true
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   node(id: $id) {
+     *     id
+     *     data {...}
+     *   }
+     * }
+     * ```
+     */
     this.multiNodeDocument = async () => {
       const name = "node";
       const args = [
@@ -1571,6 +1610,19 @@ var Builder = class {
         required: true
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   getDocument(collection: $collection, relativePath: $relativePath) {
+     *     id
+     *     data {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collections
+     */
     this.multiCollectionDocument = async (collections) => {
       const name = "document";
       const args = [
@@ -1596,6 +1648,19 @@ var Builder = class {
         required: true
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   addPendingDocument(collection: $collection, relativePath: $relativePath, params: $params) {
+     *     id
+     *     data {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collections
+     */
     this.addMultiCollectionDocumentMutation = async () => {
       return astBuilder.FieldDefinition({
         name: "addPendingDocument",
@@ -1620,6 +1685,19 @@ var Builder = class {
         type: astBuilder.TYPES.MultiCollectionDocument
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   createDocument(relativePath: $relativePath, params: $params) {
+     *     id
+     *     data {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collections
+     */
     this.buildCreateCollectionDocumentMutation = async (collections) => {
       return astBuilder.FieldDefinition({
         name: "createDocument",
@@ -1647,6 +1725,19 @@ var Builder = class {
         type: astBuilder.TYPES.MultiCollectionDocument
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   updateDocument(relativePath: $relativePath, params: $params) {
+     *     id
+     *     data {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collections
+     */
     this.buildUpdateCollectionDocumentMutation = async (collections) => {
       return astBuilder.FieldDefinition({
         name: "updateDocument",
@@ -1674,6 +1765,19 @@ var Builder = class {
         type: astBuilder.TYPES.MultiCollectionDocument
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   deleteDocument(relativePath: $relativePath, params: $params) {
+     *     id
+     *     data {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collections
+     */
     this.buildDeleteCollectionDocumentMutation = async (collections) => {
       return astBuilder.FieldDefinition({
         name: "deleteDocument",
@@ -1693,6 +1797,19 @@ var Builder = class {
         type: astBuilder.TYPES.MultiCollectionDocument
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   createFolder(folderName: $folderName, params: $params) {
+     *     id
+     *     data {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collections
+     */
     this.buildCreateCollectionFolderMutation = async () => {
       return astBuilder.FieldDefinition({
         name: "createFolder",
@@ -1712,6 +1829,19 @@ var Builder = class {
         type: astBuilder.TYPES.MultiCollectionDocument
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   getPostDocument(relativePath: $relativePath) {
+     *     id
+     *     data {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collection
+     */
     this.collectionDocument = async (collection) => {
       const name = NAMER.queryName([collection.name]);
       const type = await this._buildCollectionDocumentType(collection);
@@ -1772,6 +1902,20 @@ var Builder = class {
       const args = [];
       return astBuilder.FieldDefinition({ type, name, args, required: false });
     };
+    /**
+     * Turns a collection into a fragment that gets updated on build. This fragment does not resolve references
+     * ```graphql
+     * # ex.
+     * fragment AuthorsParts on Authors {
+     *   name
+     *   avatar
+     *   ...
+     * }
+     * ```
+     *
+     * @public
+     * @param collection a TinaCloud collection
+     */
     this.collectionFragment = async (collection) => {
       const name = NAMER.dataTypeName(collection.namespace);
       const fragmentName = NAMER.fragmentName(collection.namespace);
@@ -1785,14 +1929,27 @@ var Builder = class {
         selections: filterSelections(selections)
       });
     };
+    /**
+     * Given a collection this function returns its selections set. For example for Post this would return
+     *
+     * "
+     * body
+     * title
+     * ... on Author {
+     *   name
+     *   heroImg
+     * }
+     *
+     * But in the AST format
+     *
+     * */
     this._getCollectionFragmentSelections = async (collection, depth) => {
-      var _a;
       const selections = [];
       selections.push({
         name: { kind: "Name", value: "__typename" },
         kind: "Field"
       });
-      if (((_a = collection.fields) == null ? void 0 : _a.length) > 0) {
+      if (collection.fields?.length > 0) {
         await sequential(collection.fields, async (x) => {
           const field = await this._buildFieldNodeForFragments(x, depth);
           selections.push(field);
@@ -1807,7 +1964,6 @@ var Builder = class {
       return selections;
     };
     this._buildFieldNodeForFragments = async (field, depth) => {
-      var _a, _b;
       switch (field.type) {
         case "string":
         case "image":
@@ -1840,7 +1996,7 @@ var Builder = class {
             selections: filterSelections([passwordValue, passwordChangeRequired])
           });
         case "object":
-          if (((_a = field.fields) == null ? void 0 : _a.length) > 0) {
+          if (field.fields?.length > 0) {
             const selections2 = [];
             await sequential(field.fields, async (item) => {
               const field2 = await this._buildFieldNodeForFragments(item, depth);
@@ -1853,7 +2009,7 @@ var Builder = class {
                 ...filterSelections(selections2)
               ]
             });
-          } else if (((_b = field.templates) == null ? void 0 : _b.length) > 0) {
+          } else if (field.templates?.length > 0) {
             const selections2 = [];
             await sequential(field.templates, async (tem) => {
               if (typeof tem === "object") {
@@ -1868,9 +2024,9 @@ var Builder = class {
               ]
             });
           }
+        // TODO: Should we throw here?
         case "reference":
-          if (depth >= this.maxDepth)
-            return false;
+          if (depth >= this.maxDepth) return false;
           if (!("collections" in field)) {
             return false;
           }
@@ -1902,6 +2058,7 @@ var Builder = class {
             name: field.name,
             selections: [
               ...selections,
+              // This is ... on Document { id }
               {
                 kind: "InlineFragment",
                 typeCondition: {
@@ -1932,6 +2089,19 @@ var Builder = class {
           });
       }
     };
+    /**
+     * ```graphql
+     * # ex.
+     * mutation {
+     *   updatePostDocument(relativePath: $relativePath, params: $params) {
+     *     id
+     *     data {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collection
+     */
     this.updateCollectionDocumentMutation = async (collection) => {
       return astBuilder.FieldDefinition({
         type: await this._buildCollectionDocumentType(collection),
@@ -1951,6 +2121,19 @@ var Builder = class {
         ]
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * mutation {
+     *   createPostDocument(relativePath: $relativePath, params: $params) {
+     *     id
+     *     data {...}
+     *   }
+     * }
+     * ```
+     *
+     * @param collection
+     */
     this.createCollectionDocumentMutation = async (collection) => {
       return astBuilder.FieldDefinition({
         type: await this._buildCollectionDocumentType(collection),
@@ -1970,6 +2153,22 @@ var Builder = class {
         ]
       });
     };
+    /**
+     * ```graphql
+     * # ex.
+     * {
+     *   getPostList(first: 10) {
+     *     edges {
+     *       node {
+     *         id
+     *       }
+     *     }
+     *   }
+     * }
+     * ```
+     *
+     * @param collection
+     */
     this.collectionDocumentList = async (collection) => {
       const connectionName = NAMER.referenceConnectionType(collection.namespace);
       this.addToLookupMap({
@@ -1985,6 +2184,10 @@ var Builder = class {
         collection
       });
     };
+    /**
+     * GraphQL type definitions which remain unchanged regardless
+     * of the supplied Tina schema. Ex. "node" interface
+     */
     this.buildStaticDefinitions = () => staticDefinitions;
     this._buildCollectionDocumentType = async (collection, suffix = "", extraFields = [], extraInterfaces = []) => {
       const documentTypeName = NAMER.documentTypeName(collection.namespace);
@@ -2468,7 +2671,7 @@ var Builder = class {
         this.addToLookupMap({
           type: name,
           resolveType: "unionData",
-          collection: collection == null ? void 0 : collection.name,
+          collection: collection?.name,
           typeMap
         });
         return astBuilder.UnionTypeDefinition({ name, types });
@@ -2489,6 +2692,7 @@ var Builder = class {
             name: NAMER.dataFilterTypeName(namespace),
             fields: await sequential(collections, async (collection2) => {
               return astBuilder.InputValueDefinition({
+                // @ts-ignore
                 name: collection2.name,
                 type: NAMER.dataFilterTypeName(collection2.namespace)
               });
@@ -2574,7 +2778,7 @@ var Builder = class {
     this._buildDataField = async (field) => {
       const listWarningMsg = `
 WARNING: The user interface for ${field.type} does not support \`list: true\`
-Visit https://tina.io/docs/errors/ui-not-supported/ for more information
+Visit https://tina.io/docs/r/content-fields/#list-fields/ for more information
 `;
       switch (field.type) {
@@ -2677,8 +2881,8 @@ Visit https://tina.io/docs/errors/ui-not-supported/ for more information
         ]
       });
     };
-    var _a, _b, _c, _d;
-    this.maxDepth = (_d = (_c = (_b = (_a = config == null ? void 0 : config.tinaSchema.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.client) == null ? void 0 : _c.referenceDepth) != null ? _d : 2;
+    this.maxDepth = // @ts-ignore
+    config?.tinaSchema.schema?.config?.client?.referenceDepth ?? 2;
     this.tinaSchema = config.tinaSchema;
     this.lookupMap = {};
   }
@@ -2689,8 +2893,7 @@ Visit https://tina.io/docs/errors/ui-not-supported/ for more information
       selections.push(field);
     });
     const filteredSelections = filterSelections(selections);
-    if (!filteredSelections.length)
-      return false;
+    if (!filteredSelections.length) return false;
     return astBuilder.InlineFragmentDefinition({
       selections: filteredSelections,
       name: NAMER.dataTypeName(template.namespace)
@@ -2724,12 +2927,13 @@ var filterSelections = (arr) => {
 };
 // src/schema/createSchema.ts
-var import_schema_tools2 = require("@tinacms/schema-tools");
+var import_schema_tools3 = require("@tinacms/schema-tools");
 // src/schema/validate.ts
-var import_lodash2 = __toESM(require("lodash.clonedeep"));
-var yup2 = __toESM(require("yup"));
 var import_schema_tools = require("@tinacms/schema-tools");
+var yup2 = __toESM(require("yup"));
+var import_es_toolkit2 = require("es-toolkit");
+var import_schema_tools2 = require("@tinacms/schema-tools");
 var FIELD_TYPES = [
   "string",
   "number",
@@ -2742,8 +2946,8 @@ var FIELD_TYPES = [
   "password"
 ];
 var validateSchema = async (schema) => {
-  const schema2 = addNamespaceToSchema(
-    (0, import_lodash2.default)(schema)
+  const schema2 = (0, import_schema_tools.addNamespaceToSchema)(
+    (0, import_es_toolkit2.cloneDeep)(schema)
   );
   const collections = await sequential(
     schema2.collections,
@@ -2751,7 +2955,7 @@ var validateSchema = async (schema) => {
   );
   validationCollectionsPathAndMatch(collections);
   if (schema2.config) {
-    const config = (0, import_schema_tools.validateTinaCloudSchemaConfig)(schema2.config);
+    const config = (0, import_schema_tools2.validateTinaCloudSchemaConfig)(schema2.config);
     return {
       collections,
       config
@@ -2767,20 +2971,18 @@ var validationCollectionsPathAndMatch = (collections) => {
     return;
   }
   const noMatchCollections = collections.filter((x) => {
-    return typeof (x == null ? void 0 : x.match) === "undefined";
+    return typeof x?.match === "undefined";
   }).map((x) => `${x.path}${x.format || "md"}`);
   if (noMatchCollections.length !== new Set(noMatchCollections).size) {
     throw new Error(
+      // TODO: add a link to the docs
       "Two collections without match can not have the same `path`. Please make the `path` unique or add a matches property to the collection."
     );
   }
   const hasMatchAndPath = collections.filter((x) => {
     return typeof x.path !== "undefined" && typeof x.match !== "undefined";
   }).map(
-    (x) => {
-      var _a, _b;
-      return `${x.path}|${((_a = x == null ? void 0 : x.match) == null ? void 0 : _a.exclude) || ""}|${((_b = x == null ? void 0 : x.match) == null ? void 0 : _b.include) || ""}|${x.format || "md"}`;
-    }
+    (x) => `${x.path}|${x?.match?.exclude || ""}|${x?.match?.include || ""}|${x.format || "md"}`
   );
   if (hasMatchAndPath.length !== new Set(hasMatchAndPath).size) {
     throw new Error(
@@ -2804,7 +3006,7 @@ var validationCollectionsPathAndMatch = (collections) => {
       );
     }
     const matches = collectionsArr.map(
-      (x) => typeof (x == null ? void 0 : x.match) === "object" ? JSON.stringify(x.match) : ""
+      (x) => typeof x?.match === "object" ? JSON.stringify(x.match) : ""
     );
     if (matches.length === new Set(matches).size) {
       return;
@@ -2882,7 +3084,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.5.5",
+  version: "1.6.3",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -2908,34 +3110,31 @@ var package_default = {
     types: "pnpm tsc",
     build: "tinacms-scripts build",
     docs: "pnpm typedoc",
-    serve: "pnpm nodemon dist/server.js",
-    test: "jest",
-    "test-watch": "jest --watch"
+    test: "vitest run",
+    "test-watch": "vitest"
   },
   dependencies: {
-    "@iarna/toml": "^2.2.5",
+    "@iarna/toml": "catalog:",
     "@tinacms/mdx": "workspace:*",
     "@tinacms/schema-tools": "workspace:*",
-    "abstract-level": "^1.0.4",
+    "abstract-level": "catalog:",
     "date-fns": "^2.30.0",
-    "fast-glob": "^3.3.2",
-    "fs-extra": "^11.2.0",
-    "glob-parent": "^6.0.2",
+    "es-toolkit": "^1.42.0",
+    "fast-glob": "catalog:",
+    "fs-extra": "catalog:",
+    "glob-parent": "catalog:",
     graphql: "15.8.0",
-    "gray-matter": "^4.0.3",
-    "isomorphic-git": "^1.27.1",
-    "js-sha1": "^0.6.0",
+    "gray-matter": "catalog:",
+    "isomorphic-git": "catalog:",
+    "js-sha1": "catalog:",
     "js-yaml": "^3.14.1",
-    "jsonpath-plus": "^6.0.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.set": "^4.3.2",
-    "lodash.uniqby": "^4.7.0",
-    "many-level": "^2.0.0",
-    micromatch: "4.0.8",
-    "normalize-path": "^3.0.0",
-    "readable-stream": "^4.5.2",
-    scmp: "^2.1.0",
-    yup: "^0.32.11"
+    "jsonpath-plus": "catalog:",
+    "many-level": "catalog:",
+    micromatch: "catalog:",
+    "normalize-path": "catalog:",
+    "readable-stream": "catalog:",
+    scmp: "catalog:",
+    yup: "^1.6.1"
   },
   publishConfig: {
     registry: "https://registry.npmjs.org"
@@ -2949,26 +3148,21 @@ var package_default = {
     "@tinacms/scripts": "workspace:*",
     "@types/cors": "^2.8.17",
     "@types/estree": "^0.0.50",
-    "@types/express": "^4.17.21",
+    "@types/express": "catalog:",
     "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^26.0.24",
     "@types/js-yaml": "^3.12.10",
-    "@types/lodash.camelcase": "^4.3.9",
-    "@types/lodash.upperfirst": "^4.3.9",
-    "@types/lru-cache": "^5.1.1",
-    "@types/mdast": "^3.0.15",
-    "@types/micromatch": "^4.0.9",
-    "@types/node": "^22.7.4",
-    "@types/normalize-path": "^3.0.2",
-    "@types/ws": "^7.4.7",
-    "@types/yup": "^0.29.14",
-    jest: "^29.7.0",
-    "jest-diff": "^29.7.0",
+    "@types/lru-cache": "catalog:",
+    "@types/mdast": "catalog:",
+    "@types/micromatch": "catalog:",
+    "@types/node": "^22.13.1",
+    "@types/normalize-path": "catalog:",
+    "@types/ws": "catalog:",
     "jest-file-snapshot": "^0.5.0",
-    "jest-matcher-utils": "^29.7.0",
-    "memory-level": "^1.0.0",
-    nodemon: "3.1.4",
-    typescript: "^5.6.2"
+    "memory-level": "catalog:",
+    typescript: "^5.7.3",
+    vite: "^4.5.9",
+    vitest: "^0.32.4",
+    zod: "catalog:"
   }
 };
@@ -2983,7 +3177,7 @@ var createSchema = async ({
   if (flags && flags.length > 0) {
     meta["flags"] = flags;
   }
-  return new import_schema_tools2.TinaSchema({
+  return new import_schema_tools3.TinaSchema({
     version: {
       fullVersion: package_default.version,
       major,
@@ -3038,8 +3232,9 @@ var _buildFragments = async (builder, tinaSchema) => {
   });
   const fragDoc = {
     kind: "Document",
-    definitions: (0, import_lodash3.default)(
+    definitions: (0, import_es_toolkit3.uniqBy)(
       extractInlineTypes(fragmentDefinitionsFields),
+      // @ts-ignore - all nodes returned by extractInlineTypes have a name property
       (node) => node.name.value
     )
   };
@@ -3049,7 +3244,6 @@ var _buildQueries = async (builder, tinaSchema) => {
   const operationsDefinitions = [];
   const collections = tinaSchema.getCollections();
   await sequential(collections, async (collection) => {
-    var _a, _b, _c;
     const queryName = NAMER.queryName(collection.namespace);
     const queryListName = NAMER.generateQueryListName(collection.namespace);
     const queryFilterTypeName = NAMER.dataFilterTypeName(collection.namespace);
@@ -3062,16 +3256,18 @@ var _buildQueries = async (builder, tinaSchema) => {
         fragName,
         queryName: queryListName,
         filterType: queryFilterTypeName,
+        // look for flag to see if the data layer is enabled
         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")
+          tinaSchema.config?.meta?.flags?.find((x) => x === "experimentalData")
         )
       })
     );
   });
   const queryDoc = {
     kind: "Document",
-    definitions: (0, import_lodash3.default)(
+    definitions: (0, import_es_toolkit3.uniqBy)(
       extractInlineTypes(operationsDefinitions),
+      // @ts-ignore - all nodes returned by extractInlineTypes have a name property
       (node) => node.name.value
     )
   };
@@ -3122,7 +3318,9 @@ var _buildSchema = async (builder, tinaSchema) => {
     await builder.buildCreateCollectionFolderMutation()
   );
   await sequential(collections, async (collection) => {
-    queryTypeDefinitionFields.push(await builder.collectionDocument(collection));
+    queryTypeDefinitionFields.push(
+      await builder.collectionDocument(collection)
+    );
     if (collection.isAuthCollection) {
       queryTypeDefinitionFields.push(
         await builder.authenticationCollectionDocument(collection)
@@ -3156,13 +3354,15 @@ var _buildSchema = async (builder, tinaSchema) => {
       fields: mutationTypeDefinitionFields
     })
   );
-  return {
+  const schema = {
     kind: "Document",
-    definitions: (0, import_lodash3.default)(
+    definitions: (0, import_es_toolkit3.uniqBy)(
       extractInlineTypes(definitions),
+      // @ts-ignore - all nodes returned by extractInlineTypes have a name property
       (node) => node.name.value
     )
   };
+  return schema;
 };
 // src/resolve.ts
@@ -3171,395 +3371,156 @@ var import_graphql5 = require("graphql");
 // src/resolver/index.ts
 var import_path3 = __toESM(require("path"));
 var import_isValid = __toESM(require("date-fns/isValid/index.js"));
+var import_jsonpath_plus2 = require("jsonpath-plus");
 // src/mdx/index.ts
 var import_mdx = require("@tinacms/mdx");
-// src/resolver/error.ts
-var TinaGraphQLError = class extends Error {
-  constructor(message, extensions) {
-    super(message);
-    if (!this.name) {
-      Object.defineProperty(this, "name", { value: "TinaGraphQLError" });
-    }
-    this.extensions = { ...extensions };
-  }
+// src/resolver/index.ts
+var import_graphql3 = require("graphql");
+// src/database/datalayer.ts
+var import_jsonpath_plus = require("jsonpath-plus");
+var import_js_sha1 = __toESM(require("js-sha1"));
+// src/database/level.ts
+var ARRAY_ITEM_VALUE_SEPARATOR = ",";
+var INDEX_KEY_FIELD_SEPARATOR = "";
+var CONTENT_ROOT_PREFIX = "~";
+var SUBLEVEL_OPTIONS = {
+  separator: INDEX_KEY_FIELD_SEPARATOR,
+  valueEncoding: "json"
 };
-var TinaFetchError = class extends Error {
-  constructor(message, args) {
-    super(message);
-    this.name = "TinaFetchError";
-    this.collection = args.collection;
-    this.stack = args.stack;
-    this.file = args.file;
-    this.originalError = args.originalError;
+var LevelProxyHandler = {
+  get: function(target, property) {
+    if (!target[property]) {
+      throw new Error(`The property, ${property.toString()}, doesn't exist`);
+    }
+    if (typeof target[property] !== "function") {
+      throw new Error(
+        `The property, ${property.toString()}, is not a function`
+      );
+    }
+    if (property === "get") {
+      return async (...args) => {
+        let result;
+        try {
+          result = await target[property].apply(target, args);
+        } catch (e) {
+          if (e.code !== "LEVEL_NOT_FOUND") {
+            throw e;
+          }
+        }
+        return result;
+      };
+    } else if (property === "sublevel") {
+      return (...args) => {
+        return new Proxy(
+          // eslint-disable-next-line prefer-spread
+          target[property].apply(target, args),
+          LevelProxyHandler
+        );
+      };
+    } else {
+      return (...args) => target[property].apply(target, args);
+    }
   }
 };
-var TinaQueryError = class extends TinaFetchError {
-  constructor(args) {
-    super(
-      `Error querying file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`,
-      args
-    );
+var LevelProxy = class {
+  constructor(level) {
+    return new Proxy(level, LevelProxyHandler);
   }
 };
-var TinaParseDocumentError = class extends TinaFetchError {
-  constructor(args) {
-    super(
-      `Error parsing file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`,
-      args
+// src/database/datalayer.ts
+var import_path2 = __toESM(require("path"));
+// src/database/util.ts
+var import_toml = __toESM(require("@iarna/toml"));
+var import_schema_tools4 = require("@tinacms/schema-tools");
+var import_gray_matter = __toESM(require("gray-matter"));
+var import_js_yaml = __toESM(require("js-yaml"));
+var import_path = __toESM(require("path"));
+var import_micromatch = __toESM(require("micromatch"));
+// src/database/alias-utils.ts
+var replaceBlockAliases = (template, item) => {
+  const output = { ...item };
+  const templateKey = template.templateKey || "_template";
+  const templateName = output[templateKey];
+  const matchingTemplate = template.templates.find(
+    (t) => t.nameOverride == templateName || t.name == templateName
+  );
+  if (!matchingTemplate) {
+    throw new Error(
+      `Block template "${templateName}" is not defined for field "${template.name}"`
     );
   }
-  toString() {
-    return super.toString() + "\n OriginalError: \n" + this.originalError.toString();
+  output._template = matchingTemplate.name;
+  if (templateKey != "_template") {
+    delete output[templateKey];
   }
+  return output;
 };
-var auditMessage = (includeAuditMessage = true) => includeAuditMessage ? `Please run "tinacms audit" or add the --verbose option  for more info` : "";
-var handleFetchErrorError = (e, verbose) => {
-  if (e instanceof Error) {
-    if (e instanceof TinaFetchError) {
-      if (verbose) {
-        console.log(e.toString());
-        console.log(e);
-        console.log(e.stack);
+var replaceNameOverrides = (template, obj) => {
+  if (template.list) {
+    return obj.map((item) => {
+      if (isBlockField(template)) {
+        item = replaceBlockAliases(template, item);
       }
-    }
+      return _replaceNameOverrides(
+        getTemplateForData(template, item).fields,
+        item
+      );
+    });
   } else {
-    console.error(e);
+    return _replaceNameOverrides(getTemplateForData(template, obj).fields, obj);
   }
-  throw e;
 };
-// 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
+function isBlockField(field) {
+  return field && field.type === "object" && field.templates?.length > 0;
+}
+var _replaceNameOverrides = (fields, obj) => {
+  const output = {};
+  Object.keys(obj).forEach((key) => {
+    const field = fields.find(
+      (fieldWithMatchingAlias) => (fieldWithMatchingAlias?.nameOverride || fieldWithMatchingAlias?.name) === key
     );
-    if (fieldDefinition) {
-      if (fieldDefinition.type === "reference") {
-        const { edges, values } = await resolver(filter, fieldDefinition);
-        if (edges.length === 1) {
-          filter[fieldKey] = {
-            eq: values[0]
-          };
-        } else if (edges.length > 1) {
-          filter[fieldKey] = {
-            in: values
-          };
-        } else {
-          filter[fieldKey] = {
-            eq: "___null___"
-          };
-        }
-      } else if (fieldDefinition.type === "object") {
-        if (fieldDefinition.templates) {
-          for (const templateName of Object.keys(filter[fieldKey])) {
-            const template = fieldDefinition.templates.find(
-              (template2) => !(typeof template2 === "string") && template2.name === templateName
-            );
-            if (template) {
-              await resolveReferences(
-                filter[fieldKey][templateName],
-                template.fields,
-                resolver
-              );
-            } else {
-              throw new Error(`Template ${templateName} not found`);
-            }
-          }
-        } else {
-          await resolveReferences(
-            filter[fieldKey],
-            fieldDefinition.fields,
-            resolver
-          );
-        }
+    output[field?.name || key] = field?.type == "object" ? replaceNameOverrides(field, obj[key]) : obj[key];
+  });
+  return output;
+};
+var getTemplateForData = (field, data) => {
+  if (field.templates?.length) {
+    const templateKey = "_template";
+    if (data[templateKey]) {
+      const result = field.templates.find(
+        (template) => template.nameOverride === data[templateKey] || template.name === data[templateKey]
+      );
+      if (result) {
+        return result;
       }
-    } else {
-      throw new Error(`Unable to find field ${fieldKey}`);
+      throw new Error(
+        `Template "${data[templateKey]}" is not defined for field "${field.name}"`
+      );
     }
+    throw new Error(
+      `Missing required key "${templateKey}" on field "${field.name}"`
+    );
+  } else {
+    return field;
   }
 };
-var collectConditionsForChildFields = (filterNode, fields, pathExpression, collectCondition) => {
-  for (const childFieldName of Object.keys(filterNode)) {
-    const childField = fields.find((field) => field.name === childFieldName);
-    if (!childField) {
-      throw new Error(`Unable to find type for field ${childFieldName}`);
-    }
-    collectConditionsForField(
-      childFieldName,
-      childField,
-      filterNode[childFieldName],
-      pathExpression,
-      collectCondition
-    );
-  }
-};
-var collectConditionsForObjectField = (fieldName, field, filterNode, pathExpression, collectCondition) => {
-  if (field.list && field.templates) {
-    for (const [filterKey, childFilterNode] of Object.entries(filterNode)) {
-      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
-      );
-    }
-  } else {
-    const jsonPath = `${fieldName}${field.list ? "[*]" : ""}`;
-    const filterPath = pathExpression ? `${pathExpression}.${jsonPath}` : `${jsonPath}`;
-    collectConditionsForChildFields(
-      filterNode,
-      field.fields,
-      filterPath,
-      collectCondition
-    );
-  }
-};
-var collectConditionsForField = (fieldName, field, filterNode, pathExpression, collectCondition) => {
-  if (field.type === "object") {
-    collectConditionsForObjectField(
-      fieldName,
-      field,
-      filterNode,
-      pathExpression,
-      collectCondition
-    );
-  } else {
-    collectCondition({
-      filterPath: pathExpression ? `${pathExpression}.${fieldName}` : fieldName,
-      filterExpression: {
-        _type: field.type,
-        _list: !!field.list,
-        ...filterNode
-      }
-    });
-  }
-};
-// src/resolver/media-utils.ts
-var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }, schema) => {
-  if (config && value) {
-    if (config.useRelativeMedia === true) {
-      return value;
-    }
-    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 strippedURL = value.replace(assetsURL, "");
-        return `${cleanMediaRoot}${strippedURL}`;
-      }
-      if (Array.isArray(value)) {
-        return value.map((v) => {
-          if (!v || typeof v !== "string")
-            return v;
-          const cleanMediaRoot = cleanUpSlashes(
-            schema.config.media.tina.mediaRoot
-          );
-          const strippedURL = v.replace(assetsURL, "");
-          return `${cleanMediaRoot}${strippedURL}`;
-        });
-      }
-      return value;
-    }
-    return value;
-  } else {
-    return value;
-  }
-};
-var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, schema) => {
-  if (config && value) {
-    if (config.useRelativeMedia === true) {
-      return value;
-    }
-    if (hasTinaMediaConfig(schema) === true) {
-      const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
-      if (typeof value === "string") {
-        const strippedValue = value.replace(cleanMediaRoot, "");
-        return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
-      }
-      if (Array.isArray(value)) {
-        return value.map((v) => {
-          if (!v || typeof v !== "string")
-            return v;
-          const strippedValue = v.replace(cleanMediaRoot, "");
-          return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
-        });
-      }
-    }
-    return value;
-  } else {
-    return value;
-  }
-};
-var cleanUpSlashes = (path7) => {
-  if (path7) {
-    return `/${path7.replace(/^\/+|\/+$/gm, "")}`;
-  }
-  return "";
-};
-var hasTinaMediaConfig = (schema) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
-  if (!((_b = (_a = schema.config) == null ? void 0 : _a.media) == null ? void 0 : _b.tina))
-    return false;
-  if (typeof ((_e = (_d = (_c = schema.config) == null ? void 0 : _c.media) == null ? void 0 : _d.tina) == null ? void 0 : _e.publicFolder) !== "string" && typeof ((_h = (_g = (_f = schema.config) == null ? void 0 : _f.media) == null ? void 0 : _g.tina) == null ? void 0 : _h.mediaRoot) !== "string")
-    return false;
-  return true;
-};
-// src/resolver/index.ts
-var import_graphql3 = require("graphql");
-// src/database/datalayer.ts
-var import_jsonpath_plus = require("jsonpath-plus");
-var import_js_sha1 = __toESM(require("js-sha1"));
-// src/database/level.ts
-var ARRAY_ITEM_VALUE_SEPARATOR = ",";
-var INDEX_KEY_FIELD_SEPARATOR = "";
-var CONTENT_ROOT_PREFIX = "~";
-var SUBLEVEL_OPTIONS = {
-  separator: INDEX_KEY_FIELD_SEPARATOR,
-  valueEncoding: "json"
-};
-var LevelProxyHandler = {
-  get: function(target, property) {
-    if (!target[property]) {
-      throw new Error(`The property, ${property.toString()}, doesn't exist`);
-    }
-    if (typeof target[property] !== "function") {
-      throw new Error(`The property, ${property.toString()}, is not a function`);
-    }
-    if (property === "get") {
-      return async (...args) => {
-        let result;
-        try {
-          result = await target[property].apply(target, args);
-        } catch (e) {
-          if (e.code !== "LEVEL_NOT_FOUND") {
-            throw e;
-          }
-        }
-        return result;
-      };
-    } else if (property === "sublevel") {
-      return (...args) => {
-        return new Proxy(
-          target[property].apply(target, args),
-          LevelProxyHandler
-        );
-      };
-    } else {
-      return (...args) => target[property].apply(target, args);
-    }
-  }
-};
-var LevelProxy = class {
-  constructor(level) {
-    return new Proxy(level, LevelProxyHandler);
-  }
-};
-// src/database/datalayer.ts
-var import_path2 = __toESM(require("path"));
-// src/database/util.ts
-var import_toml = __toESM(require("@iarna/toml"));
-var import_js_yaml = __toESM(require("js-yaml"));
-var import_gray_matter = __toESM(require("gray-matter"));
-var import_schema_tools3 = require("@tinacms/schema-tools");
-var import_micromatch = __toESM(require("micromatch"));
-var import_path = __toESM(require("path"));
-// src/database/alias-utils.ts
-var replaceBlockAliases = (template, item) => {
-  const output = { ...item };
-  const templateKey = template.templateKey || "_template";
-  const templateName = output[templateKey];
-  const matchingTemplate = template.templates.find(
-    (t) => t.nameOverride == templateName || t.name == templateName
-  );
-  if (!matchingTemplate) {
-    throw new Error(
-      `Block template "${templateName}" is not defined for field "${template.name}"`
-    );
-  }
-  output._template = matchingTemplate.name;
-  if (templateKey != "_template") {
-    delete output[templateKey];
-  }
-  return output;
-};
-var replaceNameOverrides = (template, obj) => {
-  if (template.list) {
-    return obj.map((item) => {
-      if (isBlockField(template)) {
-        item = replaceBlockAliases(template, item);
-      }
-      return _replaceNameOverrides(
-        getTemplateForData(template, item).fields,
-        item
-      );
-    });
-  } else {
-    return _replaceNameOverrides(getTemplateForData(template, obj).fields, obj);
-  }
-};
-function isBlockField(field) {
-  var _a;
-  return field && field.type === "object" && ((_a = field.templates) == null ? void 0 : _a.length) > 0;
-}
-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 getTemplateForData = (field, data) => {
-  var _a;
-  if ((_a = field.templates) == null ? void 0 : _a.length) {
-    const templateKey = "_template";
-    if (data[templateKey]) {
-      const result = field.templates.find(
-        (template) => template.nameOverride === data[templateKey] || template.name === data[templateKey]
-      );
-      if (result) {
-        return result;
-      }
-      throw new Error(
-        `Template "${data[templateKey]}" is not defined for field "${field.name}"`
-      );
-    }
-    throw new Error(
-      `Missing required key "${templateKey}" on field "${field.name}"`
-    );
-  } else {
-    return field;
-  }
-};
-var applyBlockAliases = (template, item) => {
-  const output = { ...item };
-  const templateKey = template.templateKey || "_template";
-  const templateName = output._template;
-  const matchingTemplate = template.templates.find(
-    (t) => t.nameOverride == templateName || t.name == templateName
-  );
-  if (!matchingTemplate) {
-    throw new Error(
-      `Block template "${templateName}" is not defined for field "${template.name}"`
+var applyBlockAliases = (template, item) => {
+  const output = { ...item };
+  const templateKey = template.templateKey || "_template";
+  const templateName = output._template;
+  const matchingTemplate = template.templates.find(
+    (t) => t.nameOverride == templateName || t.name == templateName
+  );
+  if (!matchingTemplate) {
+    throw new Error(
+      `Block template "${templateName}" is not defined for field "${template.name}"`
     );
   }
   output[templateKey] = matchingTemplate.nameOverride || matchingTemplate.name;
@@ -3588,8 +3549,8 @@ 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];
+    const outputKey = field?.nameOverride || key;
+    output[outputKey] = field?.type === "object" ? applyNameOverrides(field, obj[key]) : obj[key];
   });
   return output;
 };
@@ -3602,7 +3563,6 @@ var matterEngines = {
   }
 };
 var stringifyFile = (content, format, keepTemplateKey, markdownParseConfig) => {
-  var _a, _b;
   const {
     _relativePath,
     _keepTemplateKey,
@@ -3626,9 +3586,9 @@ var stringifyFile = (content, format, keepTemplateKey, markdownParseConfig) => {
 ${$_body}`,
         strippedContent,
         {
-          language: (_a = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterFormat) != null ? _a : "yaml",
+          language: markdownParseConfig?.frontmatterFormat ?? "yaml",
           engines: matterEngines,
-          delimiters: (_b = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) != null ? _b : "---"
+          delimiters: markdownParseConfig?.frontmatterDelimiters ?? "---"
         }
       );
       return ok;
@@ -3644,15 +3604,14 @@ ${$_body}`,
   }
 };
 var parseFile = (content, format, yupSchema, markdownParseConfig) => {
-  var _a, _b;
   try {
     switch (format) {
       case ".markdown":
       case ".mdx":
       case ".md":
         const contentJSON = (0, import_gray_matter.default)(content || "", {
-          language: (_a = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterFormat) != null ? _a : "yaml",
-          delimiters: (_b = markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) != null ? _b : "---",
+          language: markdownParseConfig?.frontmatterFormat ?? "yaml",
+          delimiters: markdownParseConfig?.frontmatterDelimiters ?? "---",
           engines: matterEngines
         });
         const markdownData = {
@@ -3689,7 +3648,7 @@ var scanAllContent = async (tinaSchema, bridge, callback) => {
   const filesSeen = /* @__PURE__ */ new Map();
   const duplicateFiles = /* @__PURE__ */ new Set();
   await sequential(tinaSchema.getCollections(), async (collection) => {
-    const normalPath = (0, import_schema_tools3.normalizePath)(collection.path);
+    const normalPath = (0, import_schema_tools4.normalizePath)(collection.path);
     const format = collection.format || "md";
     const documentPaths = await bridge.glob(normalPath, format);
     const matches = tinaSchema.getMatches({ collection });
@@ -3751,7 +3710,7 @@ var transformDocument = (filepath, contentObject, tinaSchema) => {
     ),
     template: void 0
   } : tinaSchema.getCollectionAndTemplateByFullPath(filepath, templateName);
-  const field = template == null ? void 0 : template.fields.find((field2) => {
+  const field = template?.fields.find((field2) => {
     if (field2.type === "string" || field2.type === "rich-text") {
       if (field2.isBody) {
         return true;
@@ -3771,7 +3730,7 @@ var transformDocument = (filepath, contentObject, tinaSchema) => {
     ...data,
     _collection: collection.name,
     _keepTemplateKey: !!collection.templates,
-    _template: (template == null ? void 0 : template.namespace) ? lastItem(template == null ? void 0 : template.namespace) : void 0,
+    _template: template?.namespace ? lastItem(template?.namespace) : void 0,
     _relativePath: filepath.replace(collection.path, "").replace(/^\/|\/$/g, ""),
     _id: filepath
   };
@@ -3780,10 +3739,10 @@ function hasOwnProperty(obj, prop) {
   return obj.hasOwnProperty(prop);
 }
 var getTemplateForFile = (templateInfo, data) => {
-  if ((templateInfo == null ? void 0 : templateInfo.type) === "object") {
+  if (templateInfo?.type === "object") {
     return templateInfo.template;
   }
-  if ((templateInfo == null ? void 0 : templateInfo.type) === "union") {
+  if (templateInfo?.type === "union") {
     if (hasOwnProperty(data, "_template")) {
       const template = templateInfo.templates.find(
         (t) => lastItem(t.namespace) === data._template
@@ -3801,14 +3760,14 @@ var getTemplateForFile = (templateInfo, data) => {
   throw new Error(`Unable to determine template`);
 };
 var loadAndParseWithAliases = async (bridge, filepath, collection, templateInfo) => {
-  const dataString = await bridge.get((0, import_schema_tools3.normalizePath)(filepath));
+  const dataString = await bridge.get((0, import_schema_tools4.normalizePath)(filepath));
   const data = parseFile(
     dataString,
     import_path.default.extname(filepath),
     (yup3) => yup3.object({}),
     {
-      frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters,
-      frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat
+      frontmatterDelimiters: collection?.frontmatterDelimiters,
+      frontmatterFormat: collection?.frontmatterFormat
     }
   );
   const template = getTemplateForFile(templateInfo, data);
@@ -3823,6 +3782,9 @@ var loadAndParseWithAliases = async (bridge, filepath, collection, templateInfo)
 // src/database/datalayer.ts
 var DEFAULT_COLLECTION_SORT_KEY = "__filepath__";
+var REFS_COLLECTIONS_SORT_KEY = "__refs__";
+var REFS_REFERENCE_FIELD = "__tina_ref__";
+var REFS_PATH_FIELD = "__tina_ref_path__";
 var DEFAULT_NUMERIC_LPAD = 4;
 var applyPadding = (input, pad) => {
   if (pad) {
@@ -4280,7 +4242,7 @@ var FolderTreeBuilder = class {
     return this._tree;
   }
   update(documentPath, collectionPath) {
-    let folderPath = import_path2.default.dirname((0, import_schema_tools3.normalizePath)(documentPath));
+    let folderPath = import_path2.default.dirname((0, import_schema_tools4.normalizePath)(documentPath));
     if (folderPath === ".") {
       folderPath = "";
     }
@@ -4293,7 +4255,7 @@ var FolderTreeBuilder = class {
       if (!this._tree[current2]) {
         this._tree[current2] = /* @__PURE__ */ new Set();
       }
-      this._tree[current2].add((0, import_schema_tools3.normalizePath)(import_path2.default.join(current2, part)));
+      this._tree[current2].add((0, import_schema_tools4.normalizePath)(import_path2.default.join(current2, part)));
       parent.push(part);
     });
     const current = parent.join("/");
@@ -4332,6 +4294,7 @@ var makeFolderOpsForCollection = (folderTree, collection, indexDefinitions, opTy
           result.push({
             type: opType,
             key: `${collection.path}/${subFolderKey}.${collection.format}`,
+            // replace the root with the collection path
             sublevel: indexSublevel,
             value: {}
           });
@@ -4395,6 +4358,57 @@ var makeIndexOpsForDocument = (filepath, collection, indexDefinitions, data, opT
   }
   return result;
 };
+var makeRefOpsForDocument = (filepath, collection, references, data, opType, level) => {
+  const result = [];
+  if (collection) {
+    for (const [c, referencePaths] of Object.entries(references || {})) {
+      if (!referencePaths.length) {
+        continue;
+      }
+      const collectionSublevel = level.sublevel(c, SUBLEVEL_OPTIONS);
+      const refSublevel = collectionSublevel.sublevel(
+        REFS_COLLECTIONS_SORT_KEY,
+        SUBLEVEL_OPTIONS
+      );
+      const references2 = {};
+      for (const path7 of referencePaths) {
+        const ref = (0, import_jsonpath_plus.JSONPath)({ path: path7, json: data });
+        if (!ref) {
+          continue;
+        }
+        if (Array.isArray(ref)) {
+          for (const r of ref) {
+            if (!r) {
+              continue;
+            }
+            if (references2[r]) {
+              references2[r].push(path7);
+            } else {
+              references2[r] = [path7];
+            }
+          }
+        } else {
+          if (references2[ref]) {
+            references2[ref].push(path7);
+          } else {
+            references2[ref] = [path7];
+          }
+        }
+      }
+      for (const ref of Object.keys(references2)) {
+        for (const path7 of references2[ref]) {
+          result.push({
+            type: opType,
+            key: `${ref}${INDEX_KEY_FIELD_SEPARATOR}${path7}${INDEX_KEY_FIELD_SEPARATOR}${filepath}`,
+            sublevel: refSublevel,
+            value: opType === "put" ? {} : void 0
+          });
+        }
+      }
+    }
+  }
+  return result;
+};
 var makeStringEscaper = (regex, replacement) => {
   return (input) => {
     if (Array.isArray(input)) {
@@ -4408,19 +4422,254 @@ var makeStringEscaper = (regex, replacement) => {
         return input;
       }
     }
-  };
+  };
+};
+var stringEscaper = makeStringEscaper(
+  new RegExp(INDEX_KEY_FIELD_SEPARATOR, "gm"),
+  encodeURIComponent(INDEX_KEY_FIELD_SEPARATOR)
+);
+// src/resolver/error.ts
+var TinaGraphQLError = class extends Error {
+  constructor(message, extensions) {
+    super(message);
+    if (!this.name) {
+      Object.defineProperty(this, "name", { value: "TinaGraphQLError" });
+    }
+    this.extensions = { ...extensions };
+  }
+};
+var TinaFetchError = class extends Error {
+  constructor(message, args) {
+    super(message);
+    this.name = "TinaFetchError";
+    this.collection = args.collection;
+    this.file = args.file;
+    this.originalError = args.originalError;
+  }
+};
+var TinaQueryError = class extends TinaFetchError {
+  constructor(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
+    );
+  }
+  toString() {
+    return super.toString() + "\n OriginalError: \n" + this.originalError.toString();
+  }
+};
+var auditMessage = (includeAuditMessage = true) => includeAuditMessage ? `Please run "tinacms audit" or add the --verbose option  for more info` : "";
+var handleFetchErrorError = (e, verbose) => {
+  if (e instanceof Error) {
+    if (e instanceof TinaFetchError) {
+      if (verbose) {
+        console.log(e.toString());
+        console.log(e);
+        console.log(e.stack);
+      }
+    }
+  } else {
+    console.error(e);
+  }
+  throw e;
+};
+// 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
+    );
+    if (fieldDefinition) {
+      if (fieldDefinition.type === "reference") {
+        const { edges, values } = await resolver(filter, fieldDefinition);
+        if (edges.length === 1) {
+          filter[fieldKey] = {
+            eq: values[0]
+          };
+        } else if (edges.length > 1) {
+          filter[fieldKey] = {
+            in: values
+          };
+        } else {
+          filter[fieldKey] = {
+            eq: "___null___"
+          };
+        }
+      } else if (fieldDefinition.type === "object") {
+        if (fieldDefinition.templates) {
+          for (const templateName of Object.keys(filter[fieldKey])) {
+            const template = fieldDefinition.templates.find(
+              (template2) => !(typeof template2 === "string") && template2.name === templateName
+            );
+            if (template) {
+              await resolveReferences(
+                filter[fieldKey][templateName],
+                template.fields,
+                resolver
+              );
+            } else {
+              throw new Error(`Template ${templateName} not found`);
+            }
+          }
+        } else {
+          await resolveReferences(
+            filter[fieldKey],
+            fieldDefinition.fields,
+            resolver
+          );
+        }
+      }
+    } else {
+      throw new Error(`Unable to find field ${fieldKey}`);
+    }
+  }
+};
+var collectConditionsForChildFields = (filterNode, fields, pathExpression, collectCondition) => {
+  for (const childFieldName of Object.keys(filterNode)) {
+    const childField = fields.find((field) => field.name === childFieldName);
+    if (!childField) {
+      throw new Error(`Unable to find type for field ${childFieldName}`);
+    }
+    collectConditionsForField(
+      childFieldName,
+      childField,
+      filterNode[childFieldName],
+      pathExpression,
+      collectCondition
+    );
+  }
+};
+var collectConditionsForObjectField = (fieldName, field, filterNode, pathExpression, collectCondition) => {
+  if (field.list && field.templates) {
+    for (const [filterKey, childFilterNode] of Object.entries(filterNode)) {
+      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
+      );
+    }
+  } else {
+    const jsonPath = `${fieldName}${field.list ? "[*]" : ""}`;
+    const filterPath = pathExpression ? `${pathExpression}.${jsonPath}` : `${jsonPath}`;
+    collectConditionsForChildFields(
+      filterNode,
+      field.fields,
+      filterPath,
+      collectCondition
+    );
+  }
+};
+var collectConditionsForField = (fieldName, field, filterNode, pathExpression, collectCondition) => {
+  if (field.type === "object") {
+    collectConditionsForObjectField(
+      fieldName,
+      field,
+      filterNode,
+      pathExpression,
+      collectCondition
+    );
+  } else {
+    collectCondition({
+      filterPath: pathExpression ? `${pathExpression}.${fieldName}` : fieldName,
+      filterExpression: {
+        _type: field.type,
+        _list: !!field.list,
+        ...filterNode
+      }
+    });
+  }
+};
+// src/resolver/media-utils.ts
+var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }, schema) => {
+  if (config && value) {
+    if (config.useRelativeMedia === true) {
+      return value;
+    }
+    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 strippedURL = value.replace(assetsURL, "");
+        return `${cleanMediaRoot}${strippedURL}`;
+      }
+      if (Array.isArray(value)) {
+        return value.map((v) => {
+          if (!v || typeof v !== "string") return v;
+          const cleanMediaRoot = cleanUpSlashes(
+            schema.config.media.tina.mediaRoot
+          );
+          const strippedURL = v.replace(assetsURL, "");
+          return `${cleanMediaRoot}${strippedURL}`;
+        });
+      }
+      return value;
+    }
+    return value;
+  } else {
+    return value;
+  }
+};
+var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, schema) => {
+  if (config && value) {
+    if (config.useRelativeMedia === true) {
+      return value;
+    }
+    if (hasTinaMediaConfig(schema) === true) {
+      const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
+      if (typeof value === "string") {
+        const strippedValue = value.replace(cleanMediaRoot, "");
+        return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
+      }
+      if (Array.isArray(value)) {
+        return value.map((v) => {
+          if (!v || typeof v !== "string") return v;
+          const strippedValue = v.replace(cleanMediaRoot, "");
+          return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
+        });
+      }
+    }
+    return value;
+  } else {
+    return value;
+  }
+};
+var cleanUpSlashes = (path7) => {
+  if (path7) {
+    return `/${path7.replace(/^\/+|\/+$/gm, "")}`;
+  }
+  return "";
+};
+var hasTinaMediaConfig = (schema) => {
+  if (!schema.config?.media?.tina) return false;
+  if (typeof schema.config?.media?.tina?.publicFolder !== "string" && typeof schema.config?.media?.tina?.mediaRoot !== "string")
+    return false;
+  return true;
 };
-var stringEscaper = makeStringEscaper(
-  new RegExp(INDEX_KEY_FIELD_SEPARATOR, "gm"),
-  encodeURIComponent(INDEX_KEY_FIELD_SEPARATOR)
-);
 // src/resolver/index.ts
 var createResolver = (args) => {
   return new Resolver(args);
 };
 var resolveFieldData = async ({ namespace, ...field }, rawData, accumulator, tinaSchema, config, isAudit) => {
-  var _a, _b;
   if (!rawData) {
     return void 0;
   }
@@ -4447,7 +4696,8 @@ var resolveFieldData = async ({ namespace, ...field }, rawData, accumulator, tin
     case "password":
       accumulator[field.name] = {
         value: void 0,
-        passwordChangeRequired: (_a = value["passwordChangeRequired"]) != null ? _a : false
+        // never resolve the password hash
+        passwordChangeRequired: value["passwordChangeRequired"] ?? false
       };
       break;
     case "image":
@@ -4463,11 +4713,11 @@ var resolveFieldData = async ({ namespace, ...field }, rawData, accumulator, tin
         field,
         (value2) => resolveMediaRelativeToCloud(value2, config, tinaSchema.schema)
       );
-      if (((_b = tree == null ? void 0 : tree.children[0]) == null ? void 0 : _b.type) === "invalid_markdown") {
+      if (tree?.children[0]?.type === "invalid_markdown") {
         if (isAudit) {
-          const invalidNode = tree == null ? void 0 : tree.children[0];
+          const invalidNode = 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}` : ""}`
+            `${invalidNode?.message}${invalidNode.position ? ` at line ${invalidNode.position.start.line}, column ${invalidNode.position.start.column}` : ""}`
           );
         }
       }
@@ -4541,7 +4791,7 @@ var resolveFieldData = async ({ namespace, ...field }, rawData, accumulator, tin
   }
   return accumulator;
 };
-var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config, isAudit) => {
+var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config, isAudit, hasReferences) => {
   const collection = tinaSchema.getCollection(rawData._collection);
   try {
     const template = tinaSchema.getTemplateForData({
@@ -4575,16 +4825,15 @@ var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config,
         originalError: e,
         collection: collection.name,
         includeAuditMessage: !isAudit,
-        file: relativePath,
-        stack: e.stack
+        file: relativePath
       });
     }
     const titleField = template.fields.find((x) => {
-      if (x.type === "string" && (x == null ? void 0 : x.isTitle)) {
+      if (x.type === "string" && x?.isTitle) {
         return true;
       }
     });
-    const titleFieldName = titleField == null ? void 0 : titleField.name;
+    const titleFieldName = titleField?.name;
     const title = data[titleFieldName || " "] || null;
     return {
       __typename: collection.fields ? NAMER.documentTypeName(collection.namespace) : NAMER.documentTypeName(template.namespace),
@@ -4595,6 +4844,7 @@ var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config,
         basename,
         filename,
         extension,
+        hasReferences,
         path: fullPath,
         relativePath,
         breadcrumbs,
@@ -4614,6 +4864,34 @@ var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config,
     throw e;
   }
 };
+var updateObjectWithJsonPath = (obj, path7, oldValue, newValue) => {
+  let updated = false;
+  if (!path7.includes(".") && !path7.includes("[")) {
+    if (path7 in obj && obj[path7] === oldValue) {
+      obj[path7] = newValue;
+      updated = true;
+    }
+    return { object: obj, updated };
+  }
+  const parentPath = path7.replace(/\.[^.\[\]]+$/, "");
+  const keyToUpdate = path7.match(/[^.\[\]]+$/)[0];
+  const parents = (0, import_jsonpath_plus2.JSONPath)({
+    path: parentPath,
+    json: obj,
+    resultType: "value"
+  });
+  if (parents.length > 0) {
+    parents.forEach((parent) => {
+      if (parent && typeof parent === "object" && keyToUpdate in parent) {
+        if (parent[keyToUpdate] === oldValue) {
+          parent[keyToUpdate] = newValue;
+          updated = true;
+        }
+      }
+    });
+  }
+  return { object: obj, updated };
+};
 var Resolver = class {
   constructor(init) {
     this.init = init;
@@ -4621,6 +4899,7 @@ var Resolver = class {
       const collection = this.tinaSchema.getCollection(collectionName);
       const extraFields = {};
       return {
+        // return the collection and hasDocuments to resolve documents at a lower level
         documents: { collection, hasDocuments },
         ...collection,
         ...extraFields
@@ -4628,7 +4907,9 @@ var Resolver = class {
     };
     this.getRaw = async (fullPath) => {
       if (typeof fullPath !== "string") {
-        throw new Error(`fullPath must be of type string for getDocument request`);
+        throw new Error(
+          `fullPath must be of type string for getDocument request`
+        );
       }
       return this.database.get(fullPath);
     };
@@ -4655,22 +4936,28 @@ var Resolver = class {
         );
       }
     };
-    this.getDocument = async (fullPath) => {
+    this.getDocument = async (fullPath, opts = {}) => {
       if (typeof fullPath !== "string") {
-        throw new Error(`fullPath must be of type string for getDocument request`);
+        throw new Error(
+          `fullPath must be of type string for getDocument request`
+        );
       }
       const rawData = await this.getRaw(fullPath);
+      const hasReferences = opts?.checkReferences ? await this.hasReferences(fullPath, opts.collection) : void 0;
       return transformDocumentIntoPayload(
         fullPath,
         rawData,
         this.tinaSchema,
         this.config,
-        this.isAudit
+        this.isAudit,
+        hasReferences
       );
     };
     this.deleteDocument = async (fullPath) => {
       if (typeof fullPath !== "string") {
-        throw new Error(`fullPath must be of type string for getDocument request`);
+        throw new Error(
+          `fullPath must be of type string for getDocument request`
+        );
       }
       await this.database.delete(fullPath);
     };
@@ -4696,16 +4983,18 @@ var Resolver = class {
                 return this.buildFieldMutations(
                   item,
                   objectTemplate,
-                  idField && existingData && (existingData == null ? void 0 : existingData.find(
+                  idField && existingData && existingData?.find(
                     (d) => d[idField.name] === item[idField.name]
-                  ))
+                  )
                 );
               }
             )
           );
         } else {
           return this.buildFieldMutations(
+            // @ts-ignore FIXME Argument of type 'string | object' is not assignable to parameter of type '{ [fieldName: string]: string | object | (string | object)[]; }'
             fieldValue,
+            //@ts-ignore
             objectTemplate,
             existingData
           );
@@ -4717,6 +5006,7 @@ var Resolver = class {
             fieldValue.map(async (item) => {
               if (typeof item === "string") {
                 throw new Error(
+                  //@ts-ignore
                   `Expected object for template value for field ${field.name}`
                 );
               }
@@ -4725,16 +5015,19 @@ var Resolver = class {
               });
               const [templateName] = Object.entries(item)[0];
               const template = templates.find(
+                //@ts-ignore
                 (template2) => template2.name === templateName
               );
               if (!template) {
                 throw new Error(`Expected to find template ${templateName}`);
               }
               return {
+                // @ts-ignore FIXME Argument of type 'unknown' is not assignable to parameter of type '{ [fieldName: string]: string | { [key: string]: unknown; } | (string | { [key: string]: unknown; })[]; }'
                 ...await this.buildFieldMutations(
                   item[template.name],
                   template
                 ),
+                //@ts-ignore
                 _template: template.name
               };
             })
@@ -4742,6 +5035,7 @@ var Resolver = class {
         } else {
           if (typeof fieldValue === "string") {
             throw new Error(
+              //@ts-ignore
               `Expected object for template value for field ${field.name}`
             );
           }
@@ -4750,16 +5044,19 @@ var Resolver = class {
           });
           const [templateName] = Object.entries(fieldValue)[0];
           const template = templates.find(
+            //@ts-ignore
             (template2) => template2.name === templateName
           );
           if (!template) {
             throw new Error(`Expected to find template ${templateName}`);
           }
           return {
+            // @ts-ignore FIXME Argument of type 'unknown' is not assignable to parameter of type '{ [fieldName: string]: string | { [key: string]: unknown; } | (string | { [key: string]: unknown; })[]; }'
             ...await this.buildFieldMutations(
               fieldValue[template.name],
               template
             ),
+            //@ts-ignore
             _template: template.name
           };
         }
@@ -4799,6 +5096,7 @@ var Resolver = class {
         return this.getDocument(realPath);
       }
       const params = await this.buildObjectMutations(
+        // @ts-ignore
         args.params[collection.name],
         collection
       );
@@ -4813,7 +5111,7 @@ var Resolver = class {
       isCollectionSpecific
     }) => {
       const doc = await this.getDocument(realPath);
-      const oldDoc = this.resolveLegacyValues((doc == null ? void 0 : doc._rawData) || {}, collection);
+      const oldDoc = this.resolveLegacyValues(doc?._rawData || {}, collection);
       if (isAddPendingDocument === true) {
         const templateInfo = this.tinaSchema.getTemplatesForCollectable(collection);
         const params2 = this.buildParams(args);
@@ -4823,7 +5121,7 @@ var Resolver = class {
               const values = await this.buildFieldMutations(
                 params2,
                 templateInfo.template,
-                doc == null ? void 0 : doc._rawData
+                doc?._rawData
               );
               await this.database.put(
                 realPath,
@@ -4844,9 +5142,10 @@ var Resolver = class {
                 const values = {
                   ...oldDoc,
                   ...await this.buildFieldMutations(
+                    // @ts-ignore FIXME: failing on unknown, which we don't need to know because it's recursive
                     templateParams,
                     template,
-                    doc == null ? void 0 : doc._rawData
+                    doc?._rawData
                   ),
                   _template: lastItem(template.namespace)
                 };
@@ -4857,17 +5156,25 @@ var Resolver = class {
         return this.getDocument(realPath);
       }
       const params = await this.buildObjectMutations(
+        //@ts-ignore
         isCollectionSpecific ? args.params : args.params[collection.name],
         collection,
-        doc == null ? void 0 : doc._rawData
+        doc?._rawData
+      );
+      await this.database.put(
+        realPath,
+        { ...oldDoc, ...params },
+        collection.name
       );
-      await this.database.put(realPath, { ...oldDoc, ...params }, collection.name);
       return this.getDocument(realPath);
     };
+    /**
+     * Returns top-level fields which are not defined in the collection, so their
+     * values are not eliminated from Tina when new values are saved
+     */
     this.resolveLegacyValues = (oldDoc, collection) => {
       const legacyValues = {};
       Object.entries(oldDoc).forEach(([key, value]) => {
-        var _a;
         const reservedKeys = [
           "$_body",
           "_collection",
@@ -4880,7 +5187,7 @@ var Resolver = class {
           return;
         }
         if (oldDoc._template && collection.templates) {
-          const template = (_a = collection.templates) == null ? void 0 : _a.find(
+          const template = collection.templates?.find(
             ({ name }) => name === oldDoc._template
           );
           if (template) {
@@ -4927,7 +5234,7 @@ var Resolver = class {
         (yup3) => yup3.object({ relativePath: yup3.string().required() })
       );
       const collection = await this.tinaSchema.getCollection(collectionLookup);
-      let realPath = import_path3.default.join(collection == null ? void 0 : collection.path, args.relativePath);
+      let realPath = import_path3.default.join(collection?.path, args.relativePath);
       if (isFolderCreation) {
         realPath = `${realPath}/.gitkeep.${collection.format || "md"}`;
       }
@@ -4969,6 +5276,40 @@ var Resolver = class {
         if (isDeletion) {
           const doc = await this.getDocument(realPath);
           await this.deleteDocument(realPath);
+          if (await this.hasReferences(realPath, collection)) {
+            const collRefs = await this.findReferences(realPath, collection);
+            for (const [collection2, docsWithRefs] of Object.entries(collRefs)) {
+              for (const [pathToDocWithRef, referencePaths] of Object.entries(
+                docsWithRefs
+              )) {
+                let refDoc = await this.getRaw(pathToDocWithRef);
+                let hasUpdate = false;
+                for (const path7 of referencePaths) {
+                  const { object: object2, updated } = updateObjectWithJsonPath(
+                    refDoc,
+                    path7,
+                    realPath,
+                    null
+                  );
+                  refDoc = object2;
+                  hasUpdate = updated || hasUpdate;
+                }
+                if (hasUpdate) {
+                  const collectionWithRef = this.tinaSchema.getCollectionByFullPath(pathToDocWithRef);
+                  if (!collectionWithRef) {
+                    throw new Error(
+                      `Unable to find collection for ${pathToDocWithRef}`
+                    );
+                  }
+                  await this.database.put(
+                    pathToDocWithRef,
+                    refDoc,
+                    collectionWithRef.name
+                  );
+                }
+              }
+            }
+          }
           return doc;
         }
         if (isUpdateName) {
@@ -4977,20 +5318,57 @@ var Resolver = class {
             (yup3) => yup3.object({ params: yup3.object().required() })
           );
           assertShape(
-            args == null ? void 0 : args.params,
+            args?.params,
             (yup3) => yup3.object({ relativePath: yup3.string().required() })
           );
           const doc = await this.getDocument(realPath);
           const newRealPath = import_path3.default.join(
-            collection == null ? void 0 : collection.path,
+            collection?.path,
             args.params.relativePath
           );
+          if (newRealPath === realPath) {
+            return doc;
+          }
           await this.database.put(newRealPath, doc._rawData, collection.name);
           await this.deleteDocument(realPath);
+          const collRefs = await this.findReferences(realPath, collection);
+          for (const [collection2, docsWithRefs] of Object.entries(collRefs)) {
+            for (const [pathToDocWithRef, referencePaths] of Object.entries(
+              docsWithRefs
+            )) {
+              let docWithRef = await this.getRaw(pathToDocWithRef);
+              let hasUpdate = false;
+              for (const path7 of referencePaths) {
+                const { object: object2, updated } = updateObjectWithJsonPath(
+                  docWithRef,
+                  path7,
+                  realPath,
+                  newRealPath
+                );
+                docWithRef = object2;
+                hasUpdate = updated || hasUpdate;
+              }
+              if (hasUpdate) {
+                const collectionWithRef = this.tinaSchema.getCollectionByFullPath(pathToDocWithRef);
+                if (!collectionWithRef) {
+                  throw new Error(
+                    `Unable to find collection for ${pathToDocWithRef}`
+                  );
+                }
+                await this.database.put(
+                  pathToDocWithRef,
+                  docWithRef,
+                  collectionWithRef.name
+                );
+              }
+            }
+          }
           return this.getDocument(newRealPath);
         }
         if (alreadyExists === false) {
-          throw new Error(`Unable to update document, ${realPath} does not exist`);
+          throw new Error(
+            `Unable to update document, ${realPath} does not exist`
+          );
         }
         return this.updateResolveDocument({
           collection,
@@ -5000,7 +5378,10 @@ var Resolver = class {
           isCollectionSpecific
         });
       } else {
-        return this.getDocument(realPath);
+        return this.getDocument(realPath, {
+          collection,
+          checkReferences: true
+        });
       }
     };
     this.resolveCollectionConnections = async ({ ids }) => {
@@ -5037,6 +5418,7 @@ var Resolver = class {
           },
           collection: referencedCollection,
           hydrator: (path7) => path7
+          // just return the path
         }
       );
       const { edges } = resolvedCollectionConnection;
@@ -5104,8 +5486,83 @@ var Resolver = class {
         }
       };
     };
+    /**
+     * Checks if a document has references to it
+     * @param id  The id of the document to check for references
+     * @param c The collection to check for references
+     * @returns true if the document has references, false otherwise
+     */
+    this.hasReferences = async (id, c) => {
+      let count = 0;
+      await this.database.query(
+        {
+          collection: c.name,
+          filterChain: makeFilterChain({
+            conditions: [
+              {
+                filterPath: REFS_REFERENCE_FIELD,
+                filterExpression: {
+                  _type: "string",
+                  _list: false,
+                  eq: id
+                }
+              }
+            ]
+          }),
+          sort: REFS_COLLECTIONS_SORT_KEY
+        },
+        (refId) => {
+          count++;
+          return refId;
+        }
+      );
+      if (count) {
+        return true;
+      }
+      return false;
+    };
+    /**
+     * Finds references to a document
+     * @param id the id of the document to find references to
+     * @param c the collection to find references in
+     * @returns a map of references to the document
+     */
+    this.findReferences = async (id, c) => {
+      const references = {};
+      await this.database.query(
+        {
+          collection: c.name,
+          filterChain: makeFilterChain({
+            conditions: [
+              {
+                filterPath: REFS_REFERENCE_FIELD,
+                filterExpression: {
+                  _type: "string",
+                  _list: false,
+                  eq: id
+                }
+              }
+            ]
+          }),
+          sort: REFS_COLLECTIONS_SORT_KEY
+        },
+        (refId, rawItem) => {
+          if (!references[c.name]) {
+            references[c.name] = {};
+          }
+          if (!references[c.name][refId]) {
+            references[c.name][refId] = [];
+          }
+          const referencePath = rawItem?.[REFS_PATH_FIELD];
+          if (referencePath) {
+            references[c.name][refId].push(referencePath);
+          }
+          return refId;
+        }
+      );
+      return references;
+    };
     this.buildFieldMutations = async (fieldParams, template, existingData) => {
-      var _a;
       const accum = {};
       for (const passwordField of template.fields.filter(
         (f) => f.type === "password"
@@ -5148,7 +5605,7 @@ var Resolver = class {
             accum[fieldName] = await this.buildObjectMutations(
               fieldValue,
               field,
-              existingData == null ? void 0 : existingData[fieldName]
+              existingData?.[fieldName]
             );
             break;
           case "password":
@@ -5167,12 +5624,12 @@ var Resolver = class {
             } else {
               accum[fieldName] = {
                 ...fieldValue,
-                value: (_a = existingData == null ? void 0 : existingData[fieldName]) == null ? void 0 : _a["value"]
+                value: existingData?.[fieldName]?.["value"]
               };
             }
             break;
           case "rich-text":
-            accum[fieldName] = (0, import_mdx.stringifyMDX)(
+            accum[fieldName] = (0, import_mdx.serializeMDX)(
               fieldValue,
               field,
               (fieldValue2) => resolveMediaCloudToRelative(
@@ -5191,6 +5648,27 @@ var Resolver = class {
       }
       return accum;
     };
+    /**
+     * A mutation looks nearly identical between updateDocument:
+     * ```graphql
+     * updateDocument(collection: $collection,relativePath: $path, params: {
+     *   post: {
+     *     title: "Hello, World"
+     *   }
+     * })`
+     * ```
+     * and `updatePostDocument`:
+     * ```graphql
+     * updatePostDocument(relativePath: $path, params: {
+     *   title: "Hello, World"
+     * })
+     * ```
+     * The problem here is that we don't know whether the payload came from `updateDocument`
+     * or `updatePostDocument` (we could, but for now it's easier not to pipe those details through),
+     * But we do know that when given a `args.collection` value, we can assume that
+     * this was a `updateDocument` request, and thus - should grab the data
+     * from the corresponding field name in the key
+     */
     this.buildParams = (args) => {
       try {
         assertShape(
@@ -5258,8 +5736,129 @@ var resolveDateInput = (value) => {
   return date;
 };
-// src/resolve.ts
-var import_lodash4 = __toESM(require("lodash.set"));
+// src/resolver/auth-fields.ts
+var import_compat = require("es-toolkit/compat");
+async function getUserDocumentContext(tinaSchema, resolver) {
+  const collection = tinaSchema.getCollections().find((c) => c.isAuthCollection);
+  if (!collection) {
+    throw new Error("Auth collection not found");
+  }
+  const userFields = mapUserFields(collection, ["_rawData"]);
+  if (!userFields.length) {
+    throw new Error(`No user field found in collection ${collection.name}`);
+  }
+  if (userFields.length > 1) {
+    throw new Error(
+      `Multiple user fields found in collection ${collection.name}`
+    );
+  }
+  const userField = userFields[0];
+  const realPath = `${collection.path}/index.json`;
+  const userDoc = await resolver.getDocument(realPath);
+  const users = get(userDoc, userField.path);
+  if (!users) {
+    throw new Error("No users found");
+  }
+  return { collection, userField, users, userDoc, realPath };
+}
+function findUserInCollection(users, userField, userSub) {
+  const { idFieldName } = userField;
+  if (!idFieldName) {
+    throw new Error("No uid field found on user field");
+  }
+  return users.find((u) => u[idFieldName] === userSub) || null;
+}
+async function handleAuthenticate({
+  tinaSchema,
+  resolver,
+  sub,
+  password,
+  ctxUser
+}) {
+  const userSub = sub || ctxUser?.sub;
+  const { userField, users } = await getUserDocumentContext(
+    tinaSchema,
+    resolver
+  );
+  const user = findUserInCollection(users, userField, userSub);
+  if (!user) {
+    return null;
+  }
+  const { passwordFieldName } = userField;
+  const saltedHash = get(user, [passwordFieldName || "", "value"]);
+  if (!saltedHash) {
+    throw new Error("No password field found on user field");
+  }
+  const matches = await checkPasswordHash({
+    saltedHash,
+    password
+  });
+  return matches ? user : null;
+}
+async function handleAuthorize({
+  tinaSchema,
+  resolver,
+  sub,
+  ctxUser
+}) {
+  const userSub = sub || ctxUser?.sub;
+  const { userField, users } = await getUserDocumentContext(
+    tinaSchema,
+    resolver
+  );
+  const user = findUserInCollection(users, userField, userSub);
+  return user ? user : null;
+}
+async function handleUpdatePassword({
+  tinaSchema,
+  resolver,
+  password,
+  ctxUser
+}) {
+  if (!ctxUser?.sub) {
+    throw new Error("Not authorized");
+  }
+  if (!password) {
+    throw new Error("No password provided");
+  }
+  const { collection, userField, users, realPath } = await getUserDocumentContext(tinaSchema, resolver);
+  const { idFieldName, passwordFieldName } = userField;
+  const user = users.find((u) => u[idFieldName] === ctxUser.sub);
+  if (!user) {
+    throw new Error("Not authorized");
+  }
+  user[passwordFieldName] = {
+    value: password,
+    passwordChangeRequired: false
+  };
+  const params = {};
+  (0, import_compat.set)(
+    params,
+    userField.path.slice(1),
+    // remove _rawData from users path
+    users.map((u) => {
+      if (user[idFieldName] === u[idFieldName]) {
+        return user;
+      }
+      return {
+        // don't overwrite other users' passwords
+        ...u,
+        [passwordFieldName]: {
+          ...u[passwordFieldName],
+          value: ""
+        }
+      };
+    })
+  );
+  await resolver.updateResolveDocument({
+    collection,
+    args: { params },
+    realPath,
+    isCollectionSpecific: true,
+    isAddPendingDocument: false
+  });
+  return true;
+}
 // src/error.ts
 var import_graphql4 = require("graphql");
@@ -5281,9 +5880,8 @@ var resolve = async ({
   isAudit,
   ctxUser
 }) => {
-  var _a;
   try {
-    const verboseValue = verbose != null ? verbose : true;
+    const verboseValue = verbose ?? true;
     const graphQLSchemaAst = await database.getGraphQLSchema();
     if (!graphQLSchemaAst) {
       throw new import_graphql5.GraphQLError("GraphQL schema not found");
@@ -5291,8 +5889,11 @@ var resolve = async ({
     const graphQLSchema = (0, import_graphql5.buildASTSchema)(graphQLSchemaAst);
     const tinaConfig = await database.getTinaSchema();
     const tinaSchema = await createSchema({
+      // TODO: please update all the types to import from @tinacms/schema-tools
+      // @ts-ignore
       schema: tinaConfig,
-      flags: (_a = tinaConfig == null ? void 0 : tinaConfig.meta) == null ? void 0 : _a.flags
+      // @ts-ignore
+      flags: tinaConfig?.meta?.flags
     });
     const resolver = createResolver({
       config,
@@ -5308,8 +5909,7 @@ var resolve = async ({
         database
       },
       typeResolver: async (source, _args, info) => {
-        if (source.__typename)
-          return source.__typename;
+        if (source.__typename) return source.__typename;
         const namedType = (0, import_graphql5.getNamedType)(info.returnType).toString();
         const lookup = await database.getLookup(namedType);
         if (lookup.resolveType === "unionData") {
@@ -5318,7 +5918,6 @@ var resolve = async ({
         throw new Error(`Unable to find lookup key for ${namedType}`);
       },
       fieldResolver: async (source = {}, _args = {}, _context, info) => {
-        var _a2, _b, _c, _d;
         try {
           const args = JSON.parse(JSON.stringify(_args));
           const returnType = (0, import_graphql5.getNamedType)(info.returnType).toString();
@@ -5335,8 +5934,7 @@ var resolve = async ({
               );
               const hasDocuments2 = collectionNode2.selectionSet.selections.find(
                 (x) => {
-                  var _a3;
-                  return ((_a3 = x == null ? void 0 : x.name) == null ? void 0 : _a3.value) === "documents";
+                  return x?.name?.value === "documents";
                 }
               );
               return tinaSchema.getCollections().map((collection) => {
@@ -5352,8 +5950,7 @@ var resolve = async ({
             );
             const hasDocuments = collectionNode.selectionSet.selections.find(
               (x) => {
-                var _a3;
-                return ((_a3 = x == null ? void 0 : x.name) == null ? void 0 : _a3.value) === "documents";
+                return x?.name?.value === "documents";
               }
             );
             return resolver.resolveCollection(
@@ -5371,123 +5968,42 @@ var resolve = async ({
               );
             }
           }
-          if (info.fieldName === "authenticate" || info.fieldName === "authorize") {
-            const sub = args.sub || (ctxUser == null ? void 0 : ctxUser.sub);
-            const collection = tinaSchema.getCollections().find((c) => c.isAuthCollection);
-            if (!collection) {
-              throw new Error("Auth collection not found");
-            }
-            const userFields = mapUserFields(collection, ["_rawData"]);
-            if (!userFields.length) {
-              throw new Error(
-                `No user field found in collection ${collection.name}`
-              );
-            }
-            if (userFields.length > 1) {
-              throw new Error(
-                `Multiple user fields found in collection ${collection.name}`
-              );
-            }
-            const userField = userFields[0];
-            const realPath = `${collection.path}/index.json`;
-            const userDoc = await resolver.getDocument(realPath);
-            const users = get(userDoc, userField.path);
-            if (!users) {
-              throw new Error("No users found");
-            }
-            const { idFieldName, passwordFieldName } = userField;
-            if (!idFieldName) {
-              throw new Error("No uid field found on user field");
-            }
-            const user = users.find((u) => u[idFieldName] === sub);
-            if (!user) {
-              return null;
-            }
-            if (info.fieldName === "authenticate") {
-              const saltedHash = get(user, [passwordFieldName || "", "value"]);
-              if (!saltedHash) {
-                throw new Error("No password field found on user field");
-              }
-              const matches = await checkPasswordHash({
-                saltedHash,
-                password: args.password
-              });
-              if (matches) {
-                return user;
-              }
-              return null;
-            }
-            return user;
+          if (info.fieldName === "authenticate") {
+            return handleAuthenticate({
+              tinaSchema,
+              resolver,
+              sub: args.sub,
+              password: args.password,
+              info,
+              ctxUser
+            });
+          }
+          if (info.fieldName === "authorize") {
+            return handleAuthorize({
+              tinaSchema,
+              resolver,
+              sub: args.sub,
+              info,
+              ctxUser
+            });
           }
           if (info.fieldName === "updatePassword") {
-            if (!(ctxUser == null ? void 0 : ctxUser.sub)) {
-              throw new Error("Not authorized");
-            }
-            if (!args.password) {
-              throw new Error("No password provided");
-            }
-            const collection = tinaSchema.getCollections().find((c) => c.isAuthCollection);
-            if (!collection) {
-              throw new Error("Auth collection not found");
-            }
-            const userFields = mapUserFields(collection, ["_rawData"]);
-            if (!userFields.length) {
-              throw new Error(
-                `No user field found in collection ${collection.name}`
-              );
-            }
-            if (userFields.length > 1) {
-              throw new Error(
-                `Multiple user fields found in collection ${collection.name}`
-              );
-            }
-            const userField = userFields[0];
-            const realPath = `${collection.path}/index.json`;
-            const userDoc = await resolver.getDocument(realPath);
-            const users = get(userDoc, userField.path);
-            if (!users) {
-              throw new Error("No users found");
-            }
-            const { idFieldName, passwordFieldName } = userField;
-            const user = users.find((u) => u[idFieldName] === ctxUser.sub);
-            if (!user) {
-              throw new Error("Not authorized");
-            }
-            user[passwordFieldName] = {
-              value: args.password,
-              passwordChangeRequired: false
-            };
-            const params = {};
-            (0, import_lodash4.default)(
-              params,
-              userField.path.slice(1),
-              users.map((u) => {
-                if (user[idFieldName] === u[idFieldName]) {
-                  return user;
-                }
-                return {
-                  ...u,
-                  [passwordFieldName]: {
-                    ...u[passwordFieldName],
-                    value: ""
-                  }
-                };
-              })
-            );
-            await resolver.updateResolveDocument({
-              collection,
-              args: { params },
-              realPath,
-              isCollectionSpecific: true,
-              isAddPendingDocument: false
+            return handleUpdatePassword({
+              tinaSchema,
+              resolver,
+              password: args.password,
+              info,
+              ctxUser
             });
-            return true;
           }
           if (!lookup) {
             return value;
           }
           const isCreation = lookup[info.fieldName] === "create";
           switch (lookup.resolveType) {
+            /**
+             * `node(id: $id)`
+             */
             case "nodeDocument":
               assertShape(
                 args,
@@ -5498,7 +6014,7 @@ var resolve = async ({
               if (typeof value === "string" && value !== "") {
                 return resolver.getDocument(value);
               }
-              if ((args == null ? void 0 : args.collection) && info.fieldName === "addPendingDocument") {
+              if (args?.collection && info.fieldName === "addPendingDocument") {
                 return resolver.resolveDocument({
                   args: { ...args, params: {} },
                   collection: args.collection,
@@ -5519,15 +6035,19 @@ var resolve = async ({
                   collection: args.collection,
                   isMutation,
                   isCreation,
+                  // Right now this is the only case for deletion
                   isDeletion: info.fieldName === "deleteDocument",
                   isFolderCreation: info.fieldName === "createFolder",
-                  isUpdateName: Boolean((_a2 = args == null ? void 0 : args.params) == null ? void 0 : _a2.relativePath),
+                  isUpdateName: Boolean(args?.params?.relativePath),
                   isAddPendingDocument: false,
                   isCollectionSpecific: false
                 });
                 return result;
               }
               return value;
+            /**
+             * eg `getMovieDocument.data.actors`
+             */
             case "multiCollectionDocumentList":
               if (Array.isArray(value)) {
                 return {
@@ -5537,9 +6057,17 @@ var resolve = async ({
                   })
                 };
               }
-              if (info.fieldName === "documents" && (value == null ? void 0 : value.collection) && (value == null ? void 0 : value.hasDocuments)) {
+              if (info.fieldName === "documents" && value?.collection && value?.hasDocuments) {
                 let filter = args.filter;
-                if (typeof (args == null ? void 0 : args.filter) !== "undefined" && (args == null ? void 0 : args.filter) !== null && typeof ((_b = value == null ? void 0 : value.collection) == null ? void 0 : _b.name) === "string" && Object.keys(args.filter).includes((_c = value == null ? void 0 : value.collection) == null ? void 0 : _c.name) && typeof args.filter[(_d = value == null ? void 0 : value.collection) == null ? void 0 : _d.name] !== "undefined") {
+                if (
+                  // 1. Make sure that the filter exists
+                  typeof args?.filter !== "undefined" && args?.filter !== null && // 2. Make sure that the collection name exists
+                  // @ts-ignore
+                  typeof value?.collection?.name === "string" && // 3. Make sure that the collection name is in the filter and is not undefined
+                  // @ts-ignore
+                  Object.keys(args.filter).includes(value?.collection?.name) && // @ts-ignore
+                  typeof args.filter[value?.collection?.name] !== "undefined"
+                ) {
                   filter = args.filter[value.collection.name];
                 }
                 return resolver.resolveCollectionConnection({
@@ -5547,12 +6075,20 @@ var resolve = async ({
                     ...args,
                     filter
                   },
+                  // @ts-ignore
                   collection: value.collection
                 });
               }
               throw new Error(
                 `Expected an array for result of ${info.fieldName} at ${info.path}`
               );
+            /**
+             * Collections-specific getter
+             * eg. `getPostDocument`/`createPostDocument`/`updatePostDocument`
+             *
+             * if coming from a query result
+             * the field will be `node`
+             */
             case "collectionDocument": {
               if (value) {
                 return value;
@@ -5567,11 +6103,32 @@ var resolve = async ({
               });
               return result;
             }
+            /**
+             * Collections-specific list getter
+             * eg. `getPageList`
+             */
             case "collectionDocumentList":
               return resolver.resolveCollectionConnection({
                 args,
                 collection: tinaSchema.getCollection(lookup.collection)
               });
+            /**
+             * A polymorphic data set, it can be from a document's data
+             * of any nested object which can be one of many shapes
+             *
+             * ```graphql
+             * getPostDocument(relativePath: $relativePath) {
+             *   data {...} <- this part
+             * }
+             * ```
+             * ```graphql
+             * getBlockDocument(relativePath: $relativePath) {
+             *   data {
+             *     blocks {...} <- or this part
+             *   }
+             * }
+             * ```
+             */
             case "unionData":
               if (!value) {
                 if (args.relativePath) {
@@ -5636,8 +6193,7 @@ var TinaLevelClient = class extends import_many_level.ManyLevelGuest {
     this.port = port || 9e3;
   }
   openConnection() {
-    if (this._connected)
-      return;
+    if (this._connected) return;
     const socket = (0, import_net.connect)(this.port);
     (0, import_readable_stream.pipeline)(socket, this.createRpcStream(), socket, () => {
       this._connected = false;
@@ -5647,15 +6203,15 @@ var TinaLevelClient = class extends import_many_level.ManyLevelGuest {
 };
 // src/database/index.ts
-var import_node_path = __toESM(require("path"));
+var import_node_path = __toESM(require("node:path"));
 var import_graphql6 = require("graphql");
 var import_micromatch2 = __toESM(require("micromatch"));
 var import_js_sha12 = __toESM(require("js-sha1"));
-var import_lodash5 = __toESM(require("lodash.set"));
+var import_compat2 = require("es-toolkit/compat");
 var createLocalDatabase = (config) => {
-  const level = new TinaLevelClient(config == null ? void 0 : config.port);
+  const level = new TinaLevelClient(config?.port);
   level.openConnection();
-  const fsBridge = new FilesystemBridge((config == null ? void 0 : config.rootPath) || process.cwd());
+  const fsBridge = new FilesystemBridge(config?.rootPath || process.cwd());
   return new Database({
     bridge: fsBridge,
     ...config || {},
@@ -5728,7 +6284,7 @@ var Database = class {
         );
       }
       const metadata = await metadataLevel.get(`metadata_${key}`);
-      return metadata == null ? void 0 : metadata.value;
+      return metadata?.value;
     };
     this.setMetadata = async (key, value) => {
       await this.initLevel();
@@ -5750,14 +6306,14 @@ var Database = class {
         let level = this.contentLevel;
         if (this.appLevel) {
           collection = await this.collectionForPath(filepath);
-          if (collection == null ? void 0 : collection.isDetached) {
+          if (collection?.isDetached) {
             level = this.appLevel.sublevel(collection.name, SUBLEVEL_OPTIONS);
           }
         }
         const contentObject = await level.sublevel(
           CONTENT_ROOT_PREFIX,
           SUBLEVEL_OPTIONS
-        ).get((0, import_schema_tools3.normalizePath)(filepath));
+        ).get((0, import_schema_tools4.normalizePath)(filepath));
         if (!contentObject) {
           throw new NotFoundError(`Unable to find record ${filepath}`);
         }
@@ -5781,9 +6337,10 @@ var Database = class {
         collection
       );
       const indexDefinitions = await this.getIndexDefinitions(this.contentLevel);
-      const collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
-      const normalizedPath = (0, import_schema_tools3.normalizePath)(filepath);
-      if (!(collection == null ? void 0 : collection.isDetached)) {
+      const collectionIndexDefinitions = indexDefinitions?.[collection.name];
+      const collectionReferences = (await this.getCollectionReferences())?.[collection.name];
+      const normalizedPath = (0, import_schema_tools4.normalizePath)(filepath);
+      if (!collection?.isDetached) {
         if (this.bridge) {
           await this.bridge.put(normalizedPath, stringifiedFile);
         }
@@ -5801,7 +6358,7 @@ var Database = class {
         }
       }
       let level = this.contentLevel;
-      if (collection == null ? void 0 : collection.isDetached) {
+      if (collection?.isDetached) {
         level = this.appLevel.sublevel(collection.name, SUBLEVEL_OPTIONS);
       }
       const folderTreeBuilder = new FolderTreeBuilder();
@@ -5810,17 +6367,26 @@ var Database = class {
       let delOps = [];
       if (!isGitKeep(normalizedPath, collection)) {
         putOps = [
+          ...makeRefOpsForDocument(
+            normalizedPath,
+            collection?.name,
+            collectionReferences,
+            dataFields,
+            "put",
+            level
+          ),
           ...makeIndexOpsForDocument(
             normalizedPath,
-            collection == null ? void 0 : collection.name,
+            collection?.name,
             collectionIndexDefinitions,
             dataFields,
             "put",
             level
           ),
+          // folder indices
           ...makeIndexOpsForDocument(
             normalizedPath,
-            `${collection == null ? void 0 : collection.name}_${folderKey}`,
+            `${collection?.name}_${folderKey}`,
             collectionIndexDefinitions,
             dataFields,
             "put",
@@ -5832,17 +6398,26 @@ var Database = class {
           SUBLEVEL_OPTIONS
         ).get(normalizedPath);
         delOps = existingItem ? [
+          ...makeRefOpsForDocument(
+            normalizedPath,
+            collection?.name,
+            collectionReferences,
+            existingItem,
+            "del",
+            level
+          ),
           ...makeIndexOpsForDocument(
             normalizedPath,
-            collection == null ? void 0 : collection.name,
+            collection?.name,
             collectionIndexDefinitions,
             existingItem,
             "del",
             level
           ),
+          // folder indices
           ...makeIndexOpsForDocument(
             normalizedPath,
-            `${collection == null ? void 0 : collection.name}_${folderKey}`,
+            `${collection?.name}_${folderKey}`,
             collectionIndexDefinitions,
             existingItem,
             "del",
@@ -5866,7 +6441,6 @@ var Database = class {
       await level.batch(ops);
     };
     this.put = async (filepath, data, collectionName) => {
-      var _a, _b;
       await this.initLevel();
       try {
         if (SYSTEM_FILES.includes(filepath)) {
@@ -5877,15 +6451,16 @@ var Database = class {
             const indexDefinitions = await this.getIndexDefinitions(
               this.contentLevel
             );
-            collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collectionName];
+            collectionIndexDefinitions = indexDefinitions?.[collectionName];
           }
-          const normalizedPath = (0, import_schema_tools3.normalizePath)(filepath);
+          const collectionReferences = (await this.getCollectionReferences())?.[collectionName];
+          const normalizedPath = (0, import_schema_tools4.normalizePath)(filepath);
           const dataFields = await this.formatBodyOnPayload(filepath, data);
           const collection = await this.collectionForPath(filepath);
           if (!collection) {
             throw new import_graphql6.GraphQLError(`Unable to find collection for ${filepath}.`);
           }
-          if (((_a = collection.match) == null ? void 0 : _a.exclude) || ((_b = collection.match) == null ? void 0 : _b.include)) {
+          if (collection.match?.exclude || collection.match?.include) {
             const matches = this.tinaSchema.getMatches({ collection });
             const match = import_micromatch2.default.isMatch(filepath, matches);
             if (!match) {
@@ -5899,7 +6474,7 @@ var Database = class {
           const stringifiedFile = filepath.endsWith(
             `.gitkeep.${collection.format || "md"}`
           ) ? "" : await this.stringifyFile(filepath, dataFields, collection);
-          if (!(collection == null ? void 0 : collection.isDetached)) {
+          if (!collection?.isDetached) {
             if (this.bridge) {
               await this.bridge.put(normalizedPath, stringifiedFile);
             }
@@ -5921,11 +6496,19 @@ var Database = class {
             filepath,
             collection.path || ""
           );
-          const level = (collection == null ? void 0 : collection.isDetached) ? this.appLevel.sublevel(collection == null ? void 0 : collection.name, SUBLEVEL_OPTIONS) : this.contentLevel;
+          const level = collection?.isDetached ? this.appLevel.sublevel(collection?.name, SUBLEVEL_OPTIONS) : this.contentLevel;
           let putOps = [];
           let delOps = [];
           if (!isGitKeep(normalizedPath, collection)) {
             putOps = [
+              ...makeRefOpsForDocument(
+                normalizedPath,
+                collectionName,
+                collectionReferences,
+                dataFields,
+                "put",
+                level
+              ),
               ...makeIndexOpsForDocument(
                 normalizedPath,
                 collectionName,
@@ -5934,9 +6517,10 @@ var Database = class {
                 "put",
                 level
               ),
+              // folder indices
               ...makeIndexOpsForDocument(
                 normalizedPath,
-                `${collection == null ? void 0 : collection.name}_${folderKey}`,
+                `${collection?.name}_${folderKey}`,
                 collectionIndexDefinitions,
                 dataFields,
                 "put",
@@ -5948,6 +6532,14 @@ var Database = class {
               SUBLEVEL_OPTIONS
             ).get(normalizedPath);
             delOps = existingItem ? [
+              ...makeRefOpsForDocument(
+                normalizedPath,
+                collectionName,
+                collectionReferences,
+                existingItem,
+                "del",
+                level
+              ),
               ...makeIndexOpsForDocument(
                 normalizedPath,
                 collectionName,
@@ -5956,9 +6548,10 @@ var Database = class {
                 "del",
                 level
               ),
+              // folder indices
               ...makeIndexOpsForDocument(
                 normalizedPath,
-                `${collection == null ? void 0 : collection.name}_${folderKey}`,
+                `${collection?.name}_${folderKey}`,
                 collectionIndexDefinitions,
                 existingItem,
                 "del",
@@ -5989,8 +6582,7 @@ var Database = class {
         throw new TinaFetchError(`Error in PUT for ${filepath}`, {
           originalError: error,
           file: filepath,
-          collection: collectionName,
-          stack: error.stack
+          collection: collectionName
         });
       }
     };
@@ -6033,9 +6625,10 @@ var Database = class {
         aliasedData,
         extension,
         writeTemplateKey,
+        //templateInfo.type === 'union',
         {
-          frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat,
-          frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters
+          frontmatterFormat: collection?.frontmatterFormat,
+          frontmatterDelimiters: collection?.frontmatterDelimiters
         }
       );
     };
@@ -6050,7 +6643,7 @@ var Database = class {
     };
     this.getLookup = async (returnType) => {
       await this.initLevel();
-      const lookupPath = (0, import_schema_tools3.normalizePath)(
+      const lookupPath = (0, import_schema_tools4.normalizePath)(
         import_node_path.default.join(this.getGeneratedFolder(), `_lookup.json`)
       );
       if (!this._lookup) {
@@ -6063,7 +6656,7 @@ var Database = class {
     };
     this.getGraphQLSchema = async () => {
       await this.initLevel();
-      const graphqlPath = (0, import_schema_tools3.normalizePath)(
+      const graphqlPath = (0, import_schema_tools4.normalizePath)(
         import_node_path.default.join(this.getGeneratedFolder(), `_graphql.json`)
       );
       return await this.contentLevel.sublevel(
@@ -6071,11 +6664,12 @@ var Database = class {
         SUBLEVEL_OPTIONS
       ).get(graphqlPath);
     };
+    //TODO - is there a reason why the database fetches some config with "bridge.get", and some with "store.get"?
     this.getGraphQLSchemaFromBridge = async () => {
       if (!this.bridge) {
         throw new Error(`No bridge configured`);
       }
-      const graphqlPath = (0, import_schema_tools3.normalizePath)(
+      const graphqlPath = (0, import_schema_tools4.normalizePath)(
         import_node_path.default.join(this.getGeneratedFolder(), `_graphql.json`)
       );
       const _graphql = await this.bridge.get(graphqlPath);
@@ -6083,7 +6677,7 @@ var Database = class {
     };
     this.getTinaSchema = async (level) => {
       await this.initLevel();
-      const schemaPath = (0, import_schema_tools3.normalizePath)(
+      const schemaPath = (0, import_schema_tools4.normalizePath)(
         import_node_path.default.join(this.getGeneratedFolder(), `_schema.json`)
       );
       return await (level || this.contentLevel).sublevel(
@@ -6099,7 +6693,7 @@ var Database = class {
       const schema = existingSchema || await this.getTinaSchema(level || this.contentLevel);
       if (!schema) {
         throw new Error(
-          `Unable to get schema from level db: ${(0, import_schema_tools3.normalizePath)(
+          `Unable to get schema from level db: ${(0, import_schema_tools4.normalizePath)(
             import_node_path.default.join(this.getGeneratedFolder(), `_schema.json`)
           )}`
         );
@@ -6107,6 +6701,22 @@ var Database = class {
       this.tinaSchema = await createSchema({ schema });
       return this.tinaSchema;
     };
+    this.getCollectionReferences = async (level) => {
+      if (this.collectionReferences) {
+        return this.collectionReferences;
+      }
+      const result = {};
+      const schema = await this.getSchema(level || this.contentLevel);
+      const collections = schema.getCollections();
+      for (const collection of collections) {
+        const collectionReferences = this.tinaSchema.findReferencesFromCollection(
+          collection.name
+        );
+        result[collection.name] = collectionReferences;
+      }
+      this.collectionReferences = result;
+      return result;
+    };
     this.getIndexDefinitions = async (level) => {
       if (!this.collectionIndexDefinitions) {
         await new Promise(async (resolve2, reject) => {
@@ -6116,10 +6726,53 @@ var Database = class {
             const collections = schema.getCollections();
             for (const collection of collections) {
               const indexDefinitions = {
-                [DEFAULT_COLLECTION_SORT_KEY]: { fields: [] }
+                [DEFAULT_COLLECTION_SORT_KEY]: { fields: [] },
+                // provide a default sort key which is the file sort
+                // pseudo-index for the collection's references
+                [REFS_COLLECTIONS_SORT_KEY]: {
+                  fields: [
+                    {
+                      name: REFS_REFERENCE_FIELD,
+                      type: "string",
+                      list: false
+                    },
+                    {
+                      name: REFS_PATH_FIELD,
+                      type: "string",
+                      list: false
+                    }
+                  ]
+                }
               };
-              if (collection.fields) {
-                for (const field of collection.fields) {
+              let fields = [];
+              if (collection.templates) {
+                const templateFieldMap = {};
+                const conflictedFields = /* @__PURE__ */ new Set();
+                for (const template of collection.templates) {
+                  for (const field of template.fields) {
+                    if (!templateFieldMap[field.name]) {
+                      templateFieldMap[field.name] = field;
+                    } else {
+                      if (templateFieldMap[field.name].type !== field.type) {
+                        console.warn(
+                          `Field ${field.name} has conflicting types in templates - skipping index`
+                        );
+                        conflictedFields.add(field.name);
+                      }
+                    }
+                  }
+                }
+                for (const conflictedField in conflictedFields) {
+                  delete templateFieldMap[conflictedField];
+                }
+                for (const field of Object.values(templateFieldMap)) {
+                  fields.push(field);
+                }
+              } else if (collection.fields) {
+                fields = collection.fields;
+              }
+              if (fields) {
+                for (const field of fields) {
                   if (field.indexed !== void 0 && field.indexed === false || field.type === "object") {
                     continue;
                   }
@@ -6144,8 +6797,8 @@ var Database = class {
                       );
                       return {
                         name: indexField.name,
-                        type: field == null ? void 0 : field.type,
-                        list: !!(field == null ? void 0 : field.list)
+                        type: field?.type,
+                        list: !!field?.list
                       };
                     })
                   };
@@ -6171,7 +6824,6 @@ var Database = class {
       return true;
     };
     this.query = async (queryOptions, hydrator) => {
-      var _a;
       await this.initLevel();
       const {
         first,
@@ -6199,14 +6851,14 @@ var Database = class {
       const allIndexDefinitions = await this.getIndexDefinitions(
         this.contentLevel
       );
-      const indexDefinitions = allIndexDefinitions == null ? void 0 : allIndexDefinitions[collection.name];
+      const indexDefinitions = allIndexDefinitions?.[collection.name];
       if (!indexDefinitions) {
         throw new Error(`No indexDefinitions for collection ${collection.name}`);
       }
       const filterChain = coerceFilterChainOperands(rawFilterChain);
-      const indexDefinition = sort && (indexDefinitions == null ? void 0 : indexDefinitions[sort]);
+      const indexDefinition = sort && indexDefinitions?.[sort];
       const filterSuffixes = indexDefinition && makeFilterSuffixes(filterChain, indexDefinition);
-      const level = (collection == null ? void 0 : collection.isDetached) ? this.appLevel.sublevel(collection == null ? void 0 : collection.name, SUBLEVEL_OPTIONS) : this.contentLevel;
+      const level = collection?.isDetached ? this.appLevel.sublevel(collection?.name, SUBLEVEL_OPTIONS) : this.contentLevel;
       const rootLevel = level.sublevel(
         CONTENT_ROOT_PREFIX,
         SUBLEVEL_OPTIONS
@@ -6216,17 +6868,17 @@ var Database = class {
         SUBLEVEL_OPTIONS
       ).sublevel(sort, SUBLEVEL_OPTIONS) : rootLevel;
       if (!query.gt && !query.gte) {
-        query.gte = (filterSuffixes == null ? void 0 : filterSuffixes.left) ? filterSuffixes.left : "";
+        query.gte = filterSuffixes?.left ? filterSuffixes.left : "";
       }
       if (!query.lt && !query.lte) {
-        query.lte = (filterSuffixes == null ? void 0 : filterSuffixes.right) ? `${filterSuffixes.right}\uFFFF` : "\uFFFF";
+        query.lte = filterSuffixes?.right ? `${filterSuffixes.right}\uFFFF` : "\uFFFF";
       }
       let edges = [];
       let startKey = "";
       let endKey = "";
       let hasPreviousPage = false;
       let hasNextPage = false;
-      const fieldsPattern = ((_a = indexDefinition == null ? void 0 : indexDefinition.fields) == null ? void 0 : _a.length) ? `${indexDefinition.fields.map((p) => `(?<${p.name}>.+)${INDEX_KEY_FIELD_SEPARATOR}`).join("")}` : "";
+      const fieldsPattern = indexDefinition?.fields?.length ? `${indexDefinition.fields.map((p) => `(?<${p.name}>.+)${INDEX_KEY_FIELD_SEPARATOR}`).join("")}` : "";
       const valuesRegex = indexDefinition ? new RegExp(`^${fieldsPattern}(?<_filepath_>.+)`) : new RegExp(`^(?<_filepath_>.+)`);
       const itemFilter = makeFilter({ filterChain });
       const iterator = sublevel.iterator(query);
@@ -6268,29 +6920,35 @@ var Database = class {
         }
         startKey = startKey || key || "";
         endKey = key || "";
-        edges = [...edges, { cursor: key, path: filepath }];
+        edges = [...edges, { cursor: key, path: filepath, value: itemRecord }];
       }
       return {
-        edges: await sequential(edges, async (edge) => {
-          try {
-            const node = await hydrator(edge.path);
-            return {
-              node,
-              cursor: btoa(edge.cursor)
-            };
-          } catch (error) {
-            console.log(error);
-            if (error instanceof Error && (!edge.path.includes(".tina/__generated__/_graphql.json") || !edge.path.includes("tina/__generated__/_graphql.json"))) {
-              throw new TinaQueryError({
-                originalError: error,
-                file: edge.path,
-                collection: collection.name,
-                stack: error.stack
-              });
+        edges: await sequential(
+          edges,
+          async ({
+            cursor,
+            path: path7,
+            value
+          }) => {
+            try {
+              const node = await hydrator(path7, value);
+              return {
+                node,
+                cursor: btoa(cursor)
+              };
+            } catch (error) {
+              console.log(error);
+              if (error instanceof Error && (!path7.includes(".tina/__generated__/_graphql.json") || !path7.includes("tina/__generated__/_graphql.json"))) {
+                throw new TinaQueryError({
+                  originalError: error,
+                  file: path7,
+                  collection: collection.name
+                });
+              }
+              throw error;
             }
-            throw error;
           }
-        }),
+        ),
         pageInfo: {
           hasPreviousPage,
           hasNextPage,
@@ -6315,7 +6973,7 @@ var Database = class {
           try {
             lookup = lookupFromLockFile || JSON.parse(
               await this.bridge.get(
-                (0, import_schema_tools3.normalizePath)(
+                (0, import_schema_tools4.normalizePath)(
                   import_node_path.default.join(this.getGeneratedFolder(), "_lookup.json")
                 )
               )
@@ -6340,15 +6998,15 @@ var Database = class {
           }
           const contentRootLevel = nextLevel.sublevel(CONTENT_ROOT_PREFIX, SUBLEVEL_OPTIONS);
           await contentRootLevel.put(
-            (0, import_schema_tools3.normalizePath)(import_node_path.default.join(this.getGeneratedFolder(), "_graphql.json")),
+            (0, import_schema_tools4.normalizePath)(import_node_path.default.join(this.getGeneratedFolder(), "_graphql.json")),
             graphQLSchema
           );
           await contentRootLevel.put(
-            (0, import_schema_tools3.normalizePath)(import_node_path.default.join(this.getGeneratedFolder(), "_schema.json")),
+            (0, import_schema_tools4.normalizePath)(import_node_path.default.join(this.getGeneratedFolder(), "_schema.json")),
             tinaSchema.schema
           );
           await contentRootLevel.put(
-            (0, import_schema_tools3.normalizePath)(import_node_path.default.join(this.getGeneratedFolder(), "_lookup.json")),
+            (0, import_schema_tools4.normalizePath)(import_node_path.default.join(this.getGeneratedFolder(), "_lookup.json")),
             lookup
           );
           const result = await this._indexAllContent(
@@ -6414,13 +7072,14 @@ var Database = class {
           documentPaths,
           async (collection, documentPaths2) => {
             if (collection && !collection.isDetached) {
-              await _indexContent(
-                this,
-                this.contentLevel,
-                documentPaths2,
+              await _indexContent({
+                database: this,
+                level: this.contentLevel,
+                documentPaths: documentPaths2,
                 enqueueOps,
-                collection
-              );
+                collection,
+                isPartialReindex: true
+              });
             }
           }
         );
@@ -6436,17 +7095,18 @@ var Database = class {
         throw new Error(`No collection found for path: ${filepath}`);
       }
       const indexDefinitions = await this.getIndexDefinitions(this.contentLevel);
-      const collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
+      const collectionReferences = (await this.getCollectionReferences())?.[collection.name];
+      const collectionIndexDefinitions = indexDefinitions?.[collection.name];
       let level = this.contentLevel;
-      if (collection == null ? void 0 : collection.isDetached) {
-        level = this.appLevel.sublevel(collection == null ? void 0 : collection.name, SUBLEVEL_OPTIONS);
+      if (collection?.isDetached) {
+        level = this.appLevel.sublevel(collection?.name, SUBLEVEL_OPTIONS);
       }
-      const itemKey = (0, import_schema_tools3.normalizePath)(filepath);
+      const normalizedPath = (0, import_schema_tools4.normalizePath)(filepath);
       const rootSublevel = level.sublevel(
         CONTENT_ROOT_PREFIX,
         SUBLEVEL_OPTIONS
       );
-      const item = await rootSublevel.get(itemKey);
+      const item = await rootSublevel.get(normalizedPath);
       if (item) {
         const folderTreeBuilder = new FolderTreeBuilder();
         const folderKey = folderTreeBuilder.update(
@@ -6454,16 +7114,25 @@ var Database = class {
           collection.path || ""
         );
         await this.contentLevel.batch([
+          ...makeRefOpsForDocument(
+            normalizedPath,
+            collection.name,
+            collectionReferences,
+            item,
+            "del",
+            level
+          ),
           ...makeIndexOpsForDocument(
-            filepath,
+            normalizedPath,
             collection.name,
             collectionIndexDefinitions,
             item,
             "del",
             level
           ),
+          // folder indices
           ...makeIndexOpsForDocument(
-            filepath,
+            normalizedPath,
             `${collection.name}_${folderKey}`,
             collectionIndexDefinitions,
             item,
@@ -6472,17 +7141,17 @@ var Database = class {
           ),
           {
             type: "del",
-            key: itemKey,
+            key: normalizedPath,
             sublevel: rootSublevel
           }
         ]);
       }
-      if (!(collection == null ? void 0 : collection.isDetached)) {
+      if (!collection?.isDetached) {
         if (this.bridge) {
-          await this.bridge.delete((0, import_schema_tools3.normalizePath)(filepath));
+          await this.bridge.delete(normalizedPath);
         }
         try {
-          await this.onDelete((0, import_schema_tools3.normalizePath)(filepath));
+          await this.onDelete(normalizedPath);
         } catch (e) {
           throw new import_graphql6.GraphQLError(
             `Error running onDelete hook for ${filepath}: ${e}`,
@@ -6517,20 +7186,26 @@ var Database = class {
             );
             const doc = await level2.keys({ limit: 1 }).next();
             if (!doc) {
-              await _indexContent(
-                this,
-                level2,
-                contentPaths,
+              await _indexContent({
+                database: this,
+                level: level2,
+                documentPaths: contentPaths,
                 enqueueOps,
                 collection,
-                userFields.map((field) => [
+                passwordFields: userFields.map((field) => [
                   ...field.path,
                   field.passwordFieldName
                 ])
-              );
+              });
             }
           } else {
-            await _indexContent(this, level, contentPaths, enqueueOps, collection);
+            await _indexContent({
+              database: this,
+              level,
+              documentPaths: contentPaths,
+              enqueueOps,
+              collection
+            });
           }
         }
       );
@@ -6566,7 +7241,7 @@ var Database = class {
       );
     }
     const metadata = await metadataLevel.get("metadata");
-    return metadata == null ? void 0 : metadata.version;
+    return metadata?.version;
   }
   async initLevel() {
     if (this.contentLevel) {
@@ -6616,6 +7291,9 @@ var Database = class {
       info: templateInfo
     };
   }
+  /**
+   * Clears the internal cache of the tinaSchema and the lookup file. This allows the state to be reset
+   */
   clearCache() {
     this.tinaSchema = null;
     this._lookup = null;
@@ -6640,7 +7318,7 @@ var hashPasswordVisitor = async (node, path7) => {
   const passwordValuePath = [...path7, "value"];
   const plaintextPassword = get(node, passwordValuePath);
   if (plaintextPassword) {
-    (0, import_lodash5.default)(
+    (0, import_compat2.set)(
       node,
       passwordValuePath,
       await generatePasswordHash({ password: plaintextPassword })
@@ -6649,7 +7327,7 @@ var hashPasswordVisitor = async (node, path7) => {
 };
 var visitNodes = async (node, path7, callback) => {
   const [currentLevel, ...remainingLevels] = path7;
-  if (!(remainingLevels == null ? void 0 : remainingLevels.length)) {
+  if (!remainingLevels?.length) {
     return callback(node, path7);
   }
   if (Array.isArray(node[currentLevel])) {
@@ -6665,18 +7343,27 @@ var hashPasswordValues = async (data, passwordFields) => Promise.all(
     async (passwordField) => visitNodes(data, passwordField, hashPasswordVisitor)
   )
 );
-var isGitKeep = (filepath, collection) => filepath.endsWith(`.gitkeep.${(collection == null ? void 0 : collection.format) || "md"}`);
-var _indexContent = async (database, level, documentPaths, enqueueOps, collection, passwordFields) => {
+var isGitKeep = (filepath, collection) => filepath.endsWith(`.gitkeep.${collection?.format || "md"}`);
+var _indexContent = async ({
+  database,
+  level,
+  documentPaths,
+  enqueueOps,
+  collection,
+  passwordFields,
+  isPartialReindex
+}) => {
   let collectionIndexDefinitions;
   let collectionPath;
   if (collection) {
     const indexDefinitions = await database.getIndexDefinitions(level);
-    collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
+    collectionIndexDefinitions = indexDefinitions?.[collection.name];
     if (!collectionIndexDefinitions) {
       throw new Error(`No indexDefinitions for collection ${collection.name}`);
     }
     collectionPath = collection.path;
   }
+  const collectionReferences = (await database.getCollectionReferences())?.[collection?.name];
   const tinaSchema = await database.getSchema();
   let templateInfo = null;
   if (collection) {
@@ -6694,27 +7381,77 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
       if (!aliasedData) {
         return;
       }
-      if (passwordFields == null ? void 0 : passwordFields.length) {
+      if (passwordFields?.length) {
         await hashPasswordValues(aliasedData, passwordFields);
       }
-      const normalizedPath = (0, import_schema_tools3.normalizePath)(filepath);
+      const normalizedPath = (0, import_schema_tools4.normalizePath)(filepath);
+      const rootSublevel = level.sublevel(
+        CONTENT_ROOT_PREFIX,
+        SUBLEVEL_OPTIONS
+      );
       const folderKey = folderTreeBuilder.update(
         normalizedPath,
         collectionPath || ""
       );
+      if (isPartialReindex) {
+        const item = await rootSublevel.get(normalizedPath);
+        if (item) {
+          await database.contentLevel.batch([
+            ...makeRefOpsForDocument(
+              normalizedPath,
+              collection?.name,
+              collectionReferences,
+              item,
+              "del",
+              level
+            ),
+            ...makeIndexOpsForDocument(
+              normalizedPath,
+              collection.name,
+              collectionIndexDefinitions,
+              item,
+              "del",
+              level
+            ),
+            // folder indices
+            ...makeIndexOpsForDocument(
+              normalizedPath,
+              `${collection.name}_${folderKey}`,
+              collectionIndexDefinitions,
+              item,
+              "del",
+              level
+            ),
+            {
+              type: "del",
+              key: normalizedPath,
+              sublevel: rootSublevel
+            }
+          ]);
+        }
+      }
       if (!isGitKeep(filepath, collection)) {
         await enqueueOps([
+          ...makeRefOpsForDocument(
+            normalizedPath,
+            collection?.name,
+            collectionReferences,
+            aliasedData,
+            "put",
+            level
+          ),
           ...makeIndexOpsForDocument(
             normalizedPath,
-            collection == null ? void 0 : collection.name,
+            collection?.name,
             collectionIndexDefinitions,
             aliasedData,
             "put",
             level
           ),
+          // folder indexes
           ...makeIndexOpsForDocument(
             normalizedPath,
-            `${collection == null ? void 0 : collection.name}_${folderKey}`,
+            `${collection?.name}_${folderKey}`,
             collectionIndexDefinitions,
             aliasedData,
             "put",
@@ -6735,8 +7472,7 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
       throw new TinaFetchError(`Unable to seed ${filepath}`, {
         originalError: error,
         file: filepath,
-        collection: collection == null ? void 0 : collection.name,
-        stack: error.stack
+        collection: collection?.name
       });
     }
   });
@@ -6761,11 +7497,12 @@ var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection
     const indexDefinitions = await database.getIndexDefinitions(
       database.contentLevel
     );
-    collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
+    collectionIndexDefinitions = indexDefinitions?.[collection.name];
     if (!collectionIndexDefinitions) {
       throw new Error(`No indexDefinitions for collection ${collection.name}`);
     }
   }
+  const collectionReferences = (await database.getCollectionReferences())?.[collection?.name];
   const tinaSchema = await database.getSchema();
   let templateInfo = null;
   if (collection) {
@@ -6777,18 +7514,26 @@ var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection
   );
   const folderTreeBuilder = new FolderTreeBuilder();
   await sequential(documentPaths, async (filepath) => {
-    const itemKey = (0, import_schema_tools3.normalizePath)(filepath);
+    const itemKey = (0, import_schema_tools4.normalizePath)(filepath);
     const item = await rootLevel.get(itemKey);
     if (item) {
       const folderKey = folderTreeBuilder.update(
         itemKey,
-        (collection == null ? void 0 : collection.path) || ""
+        collection?.path || ""
       );
       const aliasedData = templateInfo ? replaceNameOverrides(
         getTemplateForFile(templateInfo, item),
         item
       ) : item;
       await enqueueOps([
+        ...makeRefOpsForDocument(
+          itemKey,
+          collection?.name,
+          collectionReferences,
+          aliasedData,
+          "del",
+          database.contentLevel
+        ),
         ...makeIndexOpsForDocument(
           itemKey,
           collection.name,
@@ -6797,9 +7542,10 @@ var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection
           "del",
           database.contentLevel
         ),
+        // folder indexes
         ...makeIndexOpsForDocument(
           itemKey,
-          `${collection == null ? void 0 : collection.name}_${folderKey}`,
+          `${collection?.name}_${folderKey}`,
           collectionIndexDefinitions,
           aliasedData,
           "del",
@@ -6863,14 +7609,14 @@ var getChangedFiles = async ({
   const rootDir = await findGitRoot(dir);
   let pathPrefix = "";
   if (rootDir !== dir) {
-    pathPrefix = (0, import_schema_tools3.normalizePath)(dir.substring(rootDir.length + 1));
+    pathPrefix = (0, import_schema_tools4.normalizePath)(dir.substring(rootDir.length + 1));
   }
   await import_isomorphic_git.default.walk({
     fs: fs4,
     dir: rootDir,
     trees: [import_isomorphic_git.default.TREE({ ref: from }), import_isomorphic_git.default.TREE({ ref: to })],
     map: async function(filename, [A, B]) {
-      const relativePath = (0, import_schema_tools3.normalizePath)(filename).substring(pathPrefix.length);
+      const relativePath = (0, import_schema_tools4.normalizePath)(filename).substring(pathPrefix.length);
       let matches = false;
       for (const [key, matcher] of Object.entries(pathFilter)) {
         if (relativePath.startsWith(key)) {
@@ -6884,12 +7630,12 @@ var getChangedFiles = async ({
           }
         }
       }
-      if (await (B == null ? void 0 : B.type()) === "tree") {
+      if (await B?.type() === "tree") {
         return;
       }
       if (matches) {
-        const oidA = await (A == null ? void 0 : A.oid());
-        const oidB = await (B == null ? void 0 : B.oid());
+        const oidA = await A?.oid();
+        const oidB = await B?.oid();
         if (oidA !== oidB) {
           if (oidA === void 0) {
             results.added.push(relativePath);
@@ -6917,8 +7663,8 @@ var import_path5 = __toESM(require("path"));
 var import_normalize_path = __toESM(require("normalize-path"));
 var FilesystemBridge = class {
   constructor(rootPath, outputPath) {
-    this.rootPath = rootPath || "";
-    this.outputPath = outputPath || rootPath;
+    this.rootPath = import_path5.default.resolve(rootPath);
+    this.outputPath = outputPath ? import_path5.default.resolve(outputPath) : this.rootPath;
   }
   async glob(pattern, extension) {
     const basePath = import_path5.default.join(this.outputPath, ...pattern.split("/"));
@@ -6930,19 +7676,19 @@ var FilesystemBridge = class {
       }
     );
     const posixRootPath = (0, import_normalize_path.default)(this.outputPath);
-    return items.map((item) => {
-      return item.replace(posixRootPath, "").replace(/^\/|\/$/g, "");
-    });
+    return items.map(
+      (item) => item.substring(posixRootPath.length).replace(/^\/|\/$/g, "")
+    );
   }
   async delete(filepath) {
     await import_fs_extra2.default.remove(import_path5.default.join(this.outputPath, filepath));
   }
   async get(filepath) {
-    return import_fs_extra2.default.readFileSync(import_path5.default.join(this.outputPath, filepath)).toString();
+    return (await import_fs_extra2.default.readFile(import_path5.default.join(this.outputPath, filepath))).toString();
   }
   async put(filepath, data, basePathOverride) {
     const basePath = basePathOverride || this.outputPath;
-    await import_fs_extra2.default.outputFileSync(import_path5.default.join(basePath, filepath), data);
+    await import_fs_extra2.default.outputFile(import_path5.default.join(basePath, filepath), data);
   }
 };
 var AuditFileSystemBridge = class extends FilesystemBridge {
@@ -7012,17 +7758,26 @@ var IsomorphicBridge = class {
   getAuthor() {
     return {
       ...this.author,
-      timestamp: Math.round(new Date().getTime() / 1e3),
+      timestamp: Math.round((/* @__PURE__ */ new Date()).getTime() / 1e3),
       timezoneOffset: 0
     };
   }
   getCommitter() {
     return {
       ...this.committer,
-      timestamp: Math.round(new Date().getTime() / 1e3),
+      timestamp: Math.round((/* @__PURE__ */ new Date()).getTime() / 1e3),
       timezoneOffset: 0
     };
   }
+  /**
+   * Recursively populate paths matching `pattern` for the given `entry`
+   *
+   * @param pattern - pattern to filter paths by
+   * @param entry - TreeEntry to start building list from
+   * @param path - base path
+   * @param results
+   * @private
+   */
   async listEntries({
     pattern,
     entry,
@@ -7055,6 +7810,15 @@ var IsomorphicBridge = class {
       });
     }
   }
+  /**
+   * For the specified path, returns an object with an array containing the parts of the path (pathParts)
+   * and an array containing the WalkerEntry objects for the path parts (pathEntries). Any null elements in the
+   * pathEntries are placeholders for non-existent entries.
+   *
+   * @param path - path being resolved
+   * @param ref - ref to resolve path entries for
+   * @private
+   */
   async resolvePathEntries(path7, ref) {
     let pathParts = path7.split("/");
     const result = await import_isomorphic_git2.default.walk({
@@ -7085,6 +7849,17 @@ var IsomorphicBridge = class {
     }
     return { pathParts, pathEntries };
   }
+  /**
+   * Updates tree entry and associated parent tree entries
+   *
+   * @param existingOid - the existing OID
+   * @param updatedOid - the updated OID
+   * @param path - the path of the entry being updated
+   * @param type - the type of the entry being updated (blob or tree)
+   * @param pathEntries - parent path entries
+   * @param pathParts - parent path parts
+   * @private
+   */
   async updateTreeHierarchy(existingOid, updatedOid, path7, type, pathEntries, pathParts) {
     const lastIdx = pathEntries.length - 1;
     const parentEntry = pathEntries[lastIdx];
@@ -7140,6 +7915,13 @@ var IsomorphicBridge = class {
       );
     }
   }
+  /**
+   * Creates a commit for the specified tree and updates the specified ref to point to the commit
+   *
+   * @param treeSha - sha of the new tree
+   * @param ref - the ref that should be updated
+   * @private
+   */
   async commitTree(treeSha, ref) {
     const commitSha = await import_isomorphic_git2.default.writeCommit({
       ...this.isomorphicConfig,
@@ -7152,6 +7934,7 @@ var IsomorphicBridge = class {
           })
         ],
         message: this.commitMessage,
+        // TODO these should be configurable
         author: this.getAuthor(),
         committer: this.getCommitter()
       }
@@ -7390,5 +8173,5 @@ var buildSchema = async (config, flags) => {
   transformDocument,
   transformDocumentIntoPayload
 });
-//! Replaces _.flattenDeep()
 //! Replaces _.get()
+//! Replaces _.flattenDeep()