@tinacms/graphql 0.0.0-dced6ab-20250611061422 → 0.0.0-dde3eb3-20251028070343

package/dist/index.js

@@ -2777,7 +2777,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) {
@@ -3083,7 +3083,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.5.18",
+  version: "1.6.1",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -3166,7 +3166,7 @@ var package_default = {
     typescript: "^5.7.3",
     vite: "^4.5.9",
     vitest: "^0.32.4",
-    zod: "^3.24.2"
+    zod: "catalog:"
   }
 };
 
@@ -3374,250 +3374,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) => {
-  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;
-};
-
 // src/resolver/index.ts
 var import_graphql3 = require("graphql");
 
@@ -3679,11 +3440,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) => {
@@ -4570,106 +4331,342 @@ var makeFolderOpsForCollection = (folderTree, collection, indexDefinitions, opTy
       });
     }
   }
-  return result;
+  return result;
+};
+var makeIndexOpsForDocument = (filepath, collection, indexDefinitions, data, opType, level, escapeStr = stringEscaper) => {
+  const result = [];
+  if (collection) {
+    const collectionSublevel = level.sublevel(collection, SUBLEVEL_OPTIONS);
+    for (const [sort, definition] of Object.entries(indexDefinitions)) {
+      const indexedValue = makeKeyForField(definition, data, escapeStr);
+      const indexSublevel = collectionSublevel.sublevel(sort, SUBLEVEL_OPTIONS);
+      if (sort === DEFAULT_COLLECTION_SORT_KEY) {
+        result.push({
+          type: opType,
+          key: filepath,
+          sublevel: indexSublevel,
+          value: opType === "put" ? {} : void 0
+        });
+      } else {
+        if (indexedValue) {
+          result.push({
+            type: opType,
+            key: `${indexedValue}${INDEX_KEY_FIELD_SEPARATOR}${filepath}`,
+            sublevel: indexSublevel,
+            value: opType === "put" ? {} : void 0
+          });
+        }
+      }
+    }
+  }
+  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 makeIndexOpsForDocument = (filepath, collection, indexDefinitions, data, opType, level, escapeStr = stringEscaper) => {
-  const result = [];
-  if (collection) {
-    const collectionSublevel = level.sublevel(collection, SUBLEVEL_OPTIONS);
-    for (const [sort, definition] of Object.entries(indexDefinitions)) {
-      const indexedValue = makeKeyForField(definition, data, escapeStr);
-      const indexSublevel = collectionSublevel.sublevel(sort, SUBLEVEL_OPTIONS);
-      if (sort === DEFAULT_COLLECTION_SORT_KEY) {
-        result.push({
-          type: opType,
-          key: filepath,
-          sublevel: indexSublevel,
-          value: opType === "put" ? {} : void 0
-        });
-      } else {
-        if (indexedValue) {
-          result.push({
-            type: opType,
-            key: `${indexedValue}${INDEX_KEY_FIELD_SEPARATOR}${filepath}`,
-            sublevel: indexSublevel,
-            value: opType === "put" ? {} : void 0
-          });
-        }
+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) => {
@@ -4831,8 +4828,7 @@ 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) => {
@@ -5636,7 +5632,7 @@ var Resolver = class {
             }
             break;
           case "rich-text":
-            accum[fieldName] = (0, import_mdx.stringifyMDX)(
+            accum[fieldName] = (0, import_mdx.serializeMDX)(
               fieldValue,
               field,
               (fieldValue2) => resolveMediaCloudToRelative(
@@ -5743,8 +5739,129 @@ var resolveDateInput = (value) => {
   return date;
 };
 
-// src/resolve.ts
+// src/resolver/auth-fields.ts
 var import_lodash4 = __toESM(require("lodash.set"));
+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_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 true;
+}
 
 // src/error.ts
 var import_graphql4 = require("graphql");
@@ -5854,119 +5971,33 @@ var resolve = async ({
               );
             }
           }
-          if (info.fieldName === "authenticate" || info.fieldName === "authorize") {
-            const sub = args.sub || 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?.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;
@@ -6554,8 +6585,7 @@ var Database = class {
         throw new TinaFetchError(`Error in PUT for ${filepath}`, {
           originalError: error,
           file: filepath,
-          collection: collectionName,
-          stack: error.stack
+          collection: collectionName
         });
       }
     };
@@ -6915,8 +6945,7 @@ var Database = class {
                 throw new TinaQueryError({
                   originalError: error,
                   file: path7,
-                  collection: collection.name,
-                  stack: error.stack
+                  collection: collection.name
                 });
               }
               throw error;
@@ -7446,8 +7475,7 @@ var _indexContent = async ({
       throw new TinaFetchError(`Unable to seed ${filepath}`, {
         originalError: error,
         file: filepath,
-        collection: collection?.name,
-        stack: error.stack
+        collection: collection?.name
       });
     }
   });