@tinacms/graphql 0.0.0-c965b5f-20250426163441 → 0.0.0-ccab7a5-20251124054446

package/dist/index.js

@@ -66,7 +66,7 @@ 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"));
@@ -122,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: {
@@ -1037,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 {
@@ -1065,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") {
@@ -1435,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");
   }
@@ -1449,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]));
     }
@@ -1944,13 +1944,12 @@ var Builder = class {
      *
      * */
     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);
@@ -1965,7 +1964,6 @@ var Builder = class {
       return selections;
     };
     this._buildFieldNodeForFragments = async (field, depth) => {
-      var _a, _b;
       switch (field.type) {
         case "string":
         case "image":
@@ -1998,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);
@@ -2011,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") {
@@ -2673,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 });
@@ -2780,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) {
@@ -2883,9 +2881,8 @@ Visit https://tina.io/docs/errors/ui-not-supported/ for more information
         ]
       });
     };
-    var _a, _b, _c, _d;
     this.maxDepth = // @ts-ignore
-    (_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;
+    config?.tinaSchema.schema?.config?.client?.referenceDepth ?? 2;
     this.tinaSchema = config.tinaSchema;
     this.lookupMap = {};
   }
@@ -2934,8 +2931,8 @@ var import_schema_tools3 = require("@tinacms/schema-tools");
 
 // src/schema/validate.ts
 var import_schema_tools = require("@tinacms/schema-tools");
-var import_lodash2 = __toESM(require("lodash.clonedeep"));
 var yup2 = __toESM(require("yup"));
+var import_es_toolkit2 = require("es-toolkit");
 var import_schema_tools2 = require("@tinacms/schema-tools");
 var FIELD_TYPES = [
   "string",
@@ -2950,7 +2947,7 @@ var FIELD_TYPES = [
 ];
 var validateSchema = async (schema) => {
   const schema2 = (0, import_schema_tools.addNamespaceToSchema)(
-    (0, import_lodash2.default)(schema)
+    (0, import_es_toolkit2.cloneDeep)(schema)
   );
   const collections = await sequential(
     schema2.collections,
@@ -2974,7 +2971,7 @@ 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(
@@ -2985,10 +2982,7 @@ var validationCollectionsPathAndMatch = (collections) => {
   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(
@@ -3012,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;
@@ -3090,7 +3084,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.5.16",
+  version: "1.6.1",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -3116,33 +3110,30 @@ var package_default = {
     types: "pnpm tsc",
     build: "tinacms-scripts build",
     docs: "pnpm typedoc",
-    serve: "pnpm nodemon dist/server.js",
     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.3",
-    "fs-extra": "^11.3.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.29.0",
-    "js-sha1": "^0.6.0",
+    "gray-matter": "catalog:",
+    "isomorphic-git": "catalog:",
+    "js-sha1": "catalog:",
     "js-yaml": "^3.14.1",
-    "jsonpath-plus": "10.1.0",
-    "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.7.0",
-    scmp: "^2.1.0",
+    "jsonpath-plus": "catalog:",
+    "many-level": "catalog:",
+    micromatch: "catalog:",
+    "normalize-path": "catalog:",
+    "readable-stream": "catalog:",
+    scmp: "catalog:",
     yup: "^0.32.11"
   },
   publishConfig: {
@@ -3157,25 +3148,22 @@ 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/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/lru-cache": "catalog:",
+    "@types/mdast": "catalog:",
+    "@types/micromatch": "catalog:",
     "@types/node": "^22.13.1",
-    "@types/normalize-path": "^3.0.2",
-    "@types/ws": "^7.4.7",
+    "@types/normalize-path": "catalog:",
+    "@types/ws": "catalog:",
     "@types/yup": "^0.29.14",
     "jest-file-snapshot": "^0.5.0",
-    "memory-level": "^1.0.0",
-    nodemon: "3.1.4",
+    "memory-level": "catalog:",
     typescript: "^5.7.3",
     vite: "^4.5.9",
     vitest: "^0.32.4",
-    zod: "^3.24.2"
+    zod: "catalog:"
   }
 };
 
@@ -3245,9 +3233,9 @@ var _buildFragments = async (builder, tinaSchema) => {
   });
   const fragDoc = {
     kind: "Document",
-    definitions: (0, import_lodash3.default)(
-      // @ts-ignore
+    definitions: (0, import_es_toolkit3.uniqBy)(
       extractInlineTypes(fragmentDefinitionsFields),
+      // @ts-ignore - all nodes returned by extractInlineTypes have a name property
       (node) => node.name.value
     )
   };
@@ -3257,7 +3245,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);
@@ -3272,16 +3259,16 @@ var _buildQueries = async (builder, tinaSchema) => {
         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)(
-      // @ts-ignore
+    definitions: (0, import_es_toolkit3.uniqBy)(
       extractInlineTypes(operationsDefinitions),
+      // @ts-ignore - all nodes returned by extractInlineTypes have a name property
       (node) => node.name.value
     )
   };
@@ -3368,14 +3355,15 @@ var _buildSchema = async (builder, tinaSchema) => {
       fields: mutationTypeDefinitionFields
     })
   );
-  return {
+  const schema = {
     kind: "Document",
-    definitions: (0, import_lodash3.default)(
-      // @ts-ignore
+    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
@@ -3384,251 +3372,11 @@ 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/index.ts
-var import_jsonpath_plus2 = require("jsonpath-plus");
-
-// 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.stack = args.stack;
-    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) => {
-  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");
 
@@ -3690,11 +3438,11 @@ 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_tools4 = require("@tinacms/schema-tools");
-var import_micromatch = __toESM(require("micromatch"));
+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) => {
@@ -3731,22 +3479,20 @@ var replaceNameOverrides = (template, obj) => {
   }
 };
 function isBlockField(field) {
-  var _a;
-  return field && field.type === "object" && ((_a = field.templates) == null ? void 0 : _a.length) > 0;
+  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 == null ? void 0 : fieldWithMatchingAlias.nameOverride) || (fieldWithMatchingAlias == null ? void 0 : fieldWithMatchingAlias.name)) === key
+      (fieldWithMatchingAlias) => (fieldWithMatchingAlias?.nameOverride || fieldWithMatchingAlias?.name) === key
     );
-    output[(field == null ? void 0 : field.name) || key] = (field == null ? void 0 : field.type) == "object" ? replaceNameOverrides(field, obj[key]) : obj[key];
+    output[field?.name || key] = 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) {
+  if (field.templates?.length) {
     const templateKey = "_template";
     if (data[templateKey]) {
       const result = field.templates.find(
@@ -3804,8 +3550,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;
 };
@@ -3818,7 +3564,6 @@ var matterEngines = {
   }
 };
 var stringifyFile = (content, format, keepTemplateKey, markdownParseConfig) => {
-  var _a, _b;
   const {
     _relativePath,
     _keepTemplateKey,
@@ -3842,9 +3587,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;
@@ -3860,15 +3605,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 = {
@@ -3967,7 +3711,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;
@@ -3987,7 +3731,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
   };
@@ -3996,10 +3740,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
@@ -4023,8 +3767,8 @@ var loadAndParseWithAliases = async (bridge, filepath, collection, templateInfo)
     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);
@@ -4611,87 +4355,322 @@ 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)) {
+      return input.map(
+        (val) => val.replace(regex, replacement)
+      );
+    } else {
+      if (typeof input === "string") {
+        return input.replace(regex, replacement);
+      } else {
+        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
+      }
+    });
   }
-  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];
-          }
-        }
+
+// 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}`;
       }
-      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
-          });
-        }
+      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;
   }
-  return result;
 };
-var makeStringEscaper = (regex, replacement) => {
-  return (input) => {
-    if (Array.isArray(input)) {
-      return input.map(
-        (val) => val.replace(regex, replacement)
-      );
-    } else {
-      if (typeof input === "string") {
-        return input.replace(regex, replacement);
-      } else {
-        return input;
+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;
   }
@@ -4719,7 +4698,7 @@ var resolveFieldData = async ({ namespace, ...field }, rawData, accumulator, tin
       accumulator[field.name] = {
         value: void 0,
         // never resolve the password hash
-        passwordChangeRequired: (_a = value["passwordChangeRequired"]) != null ? _a : false
+        passwordChangeRequired: value["passwordChangeRequired"] ?? false
       };
       break;
     case "image":
@@ -4735,11 +4714,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}` : ""}`
           );
         }
       }
@@ -4847,16 +4826,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),
@@ -4966,7 +4944,7 @@ var Resolver = class {
         );
       }
       const rawData = await this.getRaw(fullPath);
-      const hasReferences = (opts == null ? void 0 : opts.checkReferences) ? await this.hasReferences(fullPath, opts.collection) : void 0;
+      const hasReferences = opts?.checkReferences ? await this.hasReferences(fullPath, opts.collection) : void 0;
       return transformDocumentIntoPayload(
         fullPath,
         rawData,
@@ -5006,9 +4984,9 @@ 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]
-                  ))
+                  )
                 );
               }
             )
@@ -5134,7 +5112,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);
@@ -5144,7 +5122,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,
@@ -5168,7 +5146,7 @@ var Resolver = class {
                     // @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)
                 };
@@ -5182,7 +5160,7 @@ var Resolver = class {
         //@ts-ignore
         isCollectionSpecific ? args.params : args.params[collection.name],
         collection,
-        doc == null ? void 0 : doc._rawData
+        doc?._rawData
       );
       await this.database.put(
         realPath,
@@ -5198,7 +5176,6 @@ var Resolver = class {
     this.resolveLegacyValues = (oldDoc, collection) => {
       const legacyValues = {};
       Object.entries(oldDoc).forEach(([key, value]) => {
-        var _a;
         const reservedKeys = [
           "$_body",
           "_collection",
@@ -5211,7 +5188,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) {
@@ -5258,7 +5235,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"}`;
       }
@@ -5342,12 +5319,12 @@ 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) {
@@ -5577,7 +5554,7 @@ var Resolver = class {
           if (!references[c.name][refId]) {
             references[c.name][refId] = [];
           }
-          const referencePath = rawItem == null ? void 0 : rawItem[REFS_PATH_FIELD];
+          const referencePath = rawItem?.[REFS_PATH_FIELD];
           if (referencePath) {
             references[c.name][refId].push(referencePath);
           }
@@ -5587,7 +5564,6 @@ var Resolver = class {
       return references;
     };
     this.buildFieldMutations = async (fieldParams, template, existingData) => {
-      var _a;
       const accum = {};
       for (const passwordField of template.fields.filter(
         (f) => f.type === "password"
@@ -5630,7 +5606,7 @@ var Resolver = class {
             accum[fieldName] = await this.buildObjectMutations(
               fieldValue,
               field,
-              existingData == null ? void 0 : existingData[fieldName]
+              existingData?.[fieldName]
             );
             break;
           case "password":
@@ -5649,12 +5625,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(
@@ -5761,8 +5737,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");
@@ -5784,9 +5881,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");
@@ -5798,7 +5894,7 @@ var resolve = async ({
       // @ts-ignore
       schema: tinaConfig,
       // @ts-ignore
-      flags: (_a = tinaConfig == null ? void 0 : tinaConfig.meta) == null ? void 0 : _a.flags
+      flags: tinaConfig?.meta?.flags
     });
     const resolver = createResolver({
       config,
@@ -5823,7 +5919,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();
@@ -5840,8 +5935,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) => {
@@ -5857,8 +5951,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(
@@ -5876,119 +5969,33 @@ 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),
-              // 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 handleUpdatePassword({
+              tinaSchema,
+              resolver,
+              password: args.password,
+              info,
+              ctxUser
             });
-            return true;
           }
           if (!lookup) {
             return value;
@@ -6008,7 +6015,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,
@@ -6032,7 +6039,7 @@ var resolve = async ({
                   // 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
                 });
@@ -6051,16 +6058,16 @@ 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 (
                   // 1. Make sure that the filter exists
-                  typeof (args == null ? void 0 : args.filter) !== "undefined" && (args == null ? void 0 : args.filter) !== null && // 2. Make sure that the collection name exists
+                  typeof args?.filter !== "undefined" && args?.filter !== null && // 2. Make sure that the collection name exists
                   // @ts-ignore
-                  typeof ((_b = value == null ? void 0 : value.collection) == null ? void 0 : _b.name) === "string" && // 3. Make sure that the collection name is in the filter and is not undefined
+                  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((_c = value == null ? void 0 : value.collection) == null ? void 0 : _c.name) && // @ts-ignore
-                  typeof args.filter[(_d = value == null ? void 0 : value.collection) == null ? void 0 : _d.name] !== "undefined"
+                  Object.keys(args.filter).includes(value?.collection?.name) && // @ts-ignore
+                  typeof args.filter[value?.collection?.name] !== "undefined"
                 ) {
                   filter = args.filter[value.collection.name];
                 }
@@ -6197,15 +6204,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 || {},
@@ -6278,7 +6285,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();
@@ -6300,7 +6307,7 @@ 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);
           }
         }
@@ -6319,7 +6326,6 @@ var Database = class {
       }
     };
     this.addPendingDocument = async (filepath, data) => {
-      var _a;
       await this.initLevel();
       const dataFields = await this.formatBodyOnPayload(filepath, data);
       const collection = await this.collectionForPath(filepath);
@@ -6332,10 +6338,10 @@ var Database = class {
         collection
       );
       const indexDefinitions = await this.getIndexDefinitions(this.contentLevel);
-      const collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
-      const collectionReferences = (_a = await this.getCollectionReferences()) == null ? void 0 : _a[collection.name];
+      const collectionIndexDefinitions = indexDefinitions?.[collection.name];
+      const collectionReferences = (await this.getCollectionReferences())?.[collection.name];
       const normalizedPath = (0, import_schema_tools4.normalizePath)(filepath);
-      if (!(collection == null ? void 0 : collection.isDetached)) {
+      if (!collection?.isDetached) {
         if (this.bridge) {
           await this.bridge.put(normalizedPath, stringifiedFile);
         }
@@ -6353,7 +6359,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();
@@ -6364,7 +6370,7 @@ var Database = class {
         putOps = [
           ...makeRefOpsForDocument(
             normalizedPath,
-            collection == null ? void 0 : collection.name,
+            collection?.name,
             collectionReferences,
             dataFields,
             "put",
@@ -6372,7 +6378,7 @@ var Database = class {
           ),
           ...makeIndexOpsForDocument(
             normalizedPath,
-            collection == null ? void 0 : collection.name,
+            collection?.name,
             collectionIndexDefinitions,
             dataFields,
             "put",
@@ -6381,7 +6387,7 @@ var Database = class {
           // folder indices
           ...makeIndexOpsForDocument(
             normalizedPath,
-            `${collection == null ? void 0 : collection.name}_${folderKey}`,
+            `${collection?.name}_${folderKey}`,
             collectionIndexDefinitions,
             dataFields,
             "put",
@@ -6395,7 +6401,7 @@ var Database = class {
         delOps = existingItem ? [
           ...makeRefOpsForDocument(
             normalizedPath,
-            collection == null ? void 0 : collection.name,
+            collection?.name,
             collectionReferences,
             existingItem,
             "del",
@@ -6403,7 +6409,7 @@ var Database = class {
           ),
           ...makeIndexOpsForDocument(
             normalizedPath,
-            collection == null ? void 0 : collection.name,
+            collection?.name,
             collectionIndexDefinitions,
             existingItem,
             "del",
@@ -6412,7 +6418,7 @@ var Database = class {
           // folder indices
           ...makeIndexOpsForDocument(
             normalizedPath,
-            `${collection == null ? void 0 : collection.name}_${folderKey}`,
+            `${collection?.name}_${folderKey}`,
             collectionIndexDefinitions,
             existingItem,
             "del",
@@ -6436,7 +6442,6 @@ var Database = class {
       await level.batch(ops);
     };
     this.put = async (filepath, data, collectionName) => {
-      var _a, _b, _c;
       await this.initLevel();
       try {
         if (SYSTEM_FILES.includes(filepath)) {
@@ -6447,16 +6452,16 @@ var Database = class {
             const indexDefinitions = await this.getIndexDefinitions(
               this.contentLevel
             );
-            collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collectionName];
+            collectionIndexDefinitions = indexDefinitions?.[collectionName];
           }
-          const collectionReferences = (_a = await this.getCollectionReferences()) == null ? void 0 : _a[collectionName];
+          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 (((_b = collection.match) == null ? void 0 : _b.exclude) || ((_c = collection.match) == null ? void 0 : _c.include)) {
+          if (collection.match?.exclude || collection.match?.include) {
             const matches = this.tinaSchema.getMatches({ collection });
             const match = import_micromatch2.default.isMatch(filepath, matches);
             if (!match) {
@@ -6470,7 +6475,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);
             }
@@ -6492,7 +6497,7 @@ 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)) {
@@ -6516,7 +6521,7 @@ var Database = class {
               // folder indices
               ...makeIndexOpsForDocument(
                 normalizedPath,
-                `${collection == null ? void 0 : collection.name}_${folderKey}`,
+                `${collection?.name}_${folderKey}`,
                 collectionIndexDefinitions,
                 dataFields,
                 "put",
@@ -6547,7 +6552,7 @@ var Database = class {
               // folder indices
               ...makeIndexOpsForDocument(
                 normalizedPath,
-                `${collection == null ? void 0 : collection.name}_${folderKey}`,
+                `${collection?.name}_${folderKey}`,
                 collectionIndexDefinitions,
                 existingItem,
                 "del",
@@ -6578,8 +6583,7 @@ var Database = class {
         throw new TinaFetchError(`Error in PUT for ${filepath}`, {
           originalError: error,
           file: filepath,
-          collection: collectionName,
-          stack: error.stack
+          collection: collectionName
         });
       }
     };
@@ -6624,8 +6628,8 @@ var Database = class {
         writeTemplateKey,
         //templateInfo.type === 'union',
         {
-          frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat,
-          frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters
+          frontmatterFormat: collection?.frontmatterFormat,
+          frontmatterDelimiters: collection?.frontmatterDelimiters
         }
       );
     };
@@ -6794,8 +6798,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
                       };
                     })
                   };
@@ -6821,7 +6825,6 @@ var Database = class {
       return true;
     };
     this.query = async (queryOptions, hydrator) => {
-      var _a;
       await this.initLevel();
       const {
         first,
@@ -6849,14 +6852,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
@@ -6866,17 +6869,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);
@@ -6940,8 +6943,7 @@ var Database = class {
                 throw new TinaQueryError({
                   originalError: error,
                   file: path7,
-                  collection: collection.name,
-                  stack: error.stack
+                  collection: collection.name
                 });
               }
               throw error;
@@ -7071,13 +7073,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
+              });
             }
           }
         );
@@ -7087,18 +7090,17 @@ var Database = class {
       }
     };
     this.delete = async (filepath) => {
-      var _a;
       await this.initLevel();
       const collection = await this.collectionForPath(filepath);
       if (!collection) {
         throw new Error(`No collection found for path: ${filepath}`);
       }
       const indexDefinitions = await this.getIndexDefinitions(this.contentLevel);
-      const collectionReferences = (_a = await this.getCollectionReferences()) == null ? void 0 : _a[collection.name];
-      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 normalizedPath = (0, import_schema_tools4.normalizePath)(filepath);
       const rootSublevel = level.sublevel(
@@ -7145,7 +7147,7 @@ var Database = class {
           }
         ]);
       }
-      if (!(collection == null ? void 0 : collection.isDetached)) {
+      if (!collection?.isDetached) {
         if (this.bridge) {
           await this.bridge.delete(normalizedPath);
         }
@@ -7185,26 +7187,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,
+            await _indexContent({
+              database: this,
               level,
-              contentPaths,
+              documentPaths: contentPaths,
               enqueueOps,
               collection
-            );
+            });
           }
         }
       );
@@ -7240,7 +7242,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) {
@@ -7317,7 +7319,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 })
@@ -7326,7 +7328,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])) {
@@ -7342,20 +7344,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 _a;
+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 = (_a = await database.getCollectionReferences()) == null ? void 0 : _a[collection == null ? void 0 : collection.name];
+  const collectionReferences = (await database.getCollectionReferences())?.[collection?.name];
   const tinaSchema = await database.getSchema();
   let templateInfo = null;
   if (collection) {
@@ -7373,7 +7382,7 @@ 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_tools4.normalizePath)(filepath);
@@ -7385,46 +7394,48 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
         normalizedPath,
         collectionPath || ""
       );
-      const item = await rootSublevel.get(normalizedPath);
-      if (item) {
-        await database.contentLevel.batch([
-          ...makeRefOpsForDocument(
-            normalizedPath,
-            collection == null ? void 0 : 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 (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 == null ? void 0 : collection.name,
+            collection?.name,
             collectionReferences,
             aliasedData,
             "put",
@@ -7432,7 +7443,7 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
           ),
           ...makeIndexOpsForDocument(
             normalizedPath,
-            collection == null ? void 0 : collection.name,
+            collection?.name,
             collectionIndexDefinitions,
             aliasedData,
             "put",
@@ -7441,7 +7452,7 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
           // folder indexes
           ...makeIndexOpsForDocument(
             normalizedPath,
-            `${collection == null ? void 0 : collection.name}_${folderKey}`,
+            `${collection?.name}_${folderKey}`,
             collectionIndexDefinitions,
             aliasedData,
             "put",
@@ -7462,8 +7473,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
       });
     }
   });
@@ -7480,7 +7490,6 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
   }
 };
 var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection) => {
-  var _a;
   if (!documentPaths.length) {
     return;
   }
@@ -7489,12 +7498,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 = (_a = await database.getCollectionReferences()) == null ? void 0 : _a[collection == null ? void 0 : collection.name];
+  const collectionReferences = (await database.getCollectionReferences())?.[collection?.name];
   const tinaSchema = await database.getSchema();
   let templateInfo = null;
   if (collection) {
@@ -7511,7 +7520,7 @@ var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection
     if (item) {
       const folderKey = folderTreeBuilder.update(
         itemKey,
-        (collection == null ? void 0 : collection.path) || ""
+        collection?.path || ""
       );
       const aliasedData = templateInfo ? replaceNameOverrides(
         getTemplateForFile(templateInfo, item),
@@ -7520,7 +7529,7 @@ var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection
       await enqueueOps([
         ...makeRefOpsForDocument(
           itemKey,
-          collection == null ? void 0 : collection.name,
+          collection?.name,
           collectionReferences,
           aliasedData,
           "del",
@@ -7537,7 +7546,7 @@ var _deleteIndexContent = async (database, documentPaths, enqueueOps, collection
         // folder indexes
         ...makeIndexOpsForDocument(
           itemKey,
-          `${collection == null ? void 0 : collection.name}_${folderKey}`,
+          `${collection?.name}_${folderKey}`,
           collectionIndexDefinitions,
           aliasedData,
           "del",
@@ -7622,12 +7631,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);
@@ -7655,8 +7664,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("/"));
@@ -7668,19 +7677,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 {