@tinacms/graphql 1.6.0 → 1.6.2

package/dist/ast-builder/index.d.ts

@@ -1,7 +1,7 @@
 /**
 
 */
-import { type FieldDefinitionNode, type ScalarTypeDefinitionNode, type InputValueDefinitionNode, type ObjectTypeDefinitionNode, type InterfaceTypeDefinitionNode, type NamedTypeNode, type UnionTypeDefinitionNode, type TypeDefinitionNode, type DirectiveNode, type EnumTypeDefinitionNode, type InputObjectTypeDefinitionNode, type DocumentNode, type FragmentDefinitionNode, type SelectionNode, type FieldNode, type InlineFragmentNode, type OperationDefinitionNode } from 'graphql';
+import { type FieldDefinitionNode, type ScalarTypeDefinitionNode, type InputValueDefinitionNode, type ObjectTypeDefinitionNode, type InterfaceTypeDefinitionNode, type NamedTypeNode, type UnionTypeDefinitionNode, type TypeDefinitionNode, type DirectiveNode, type EnumTypeDefinitionNode, type InputObjectTypeDefinitionNode, type DocumentNode, type FragmentDefinitionNode, type SelectionNode, type FieldNode, type InlineFragmentNode, type OperationDefinitionNode, type DefinitionNode } from 'graphql';
 export declare const SysFieldDefinition: {
     kind: "Field";
     name: {
@@ -153,7 +153,7 @@ export declare const astBuilder: {
     }) => DocumentNode;
 };
 type scalarNames = 'string' | 'boolean' | 'datetime' | 'image' | 'text' | 'number';
-export declare const extractInlineTypes: (item: TypeDefinitionNode | TypeDefinitionNode[]) => any;
+export declare const extractInlineTypes: (item: DefinitionNode | DefinitionNode[]) => DefinitionNode[];
 export declare function walk(maybeNode: TypeDefinitionNode, visited?: WeakSet<WeakKey>): IterableIterator<TypeDefinitionNode>;
 export declare const NAMER: {
     dataFilterTypeNameOn: (namespace: string[]) => string;

package/dist/build.d.ts

@@ -1,16 +1,14 @@
 /**
 
 */
+import { type DocumentNode } from 'graphql';
 import type { TinaSchema, Config } from '@tinacms/schema-tools';
 export declare const buildDotTinaFiles: ({ config, flags, buildSDK, }: {
     config: Config;
     flags?: string[];
     buildSDK?: boolean;
 }) => Promise<{
-    graphQLSchema: {
-        kind: "Document";
-        definitions: any;
-    };
+    graphQLSchema: DocumentNode;
     tinaSchema: TinaSchema;
     lookup: Record<string, import("./database").LookupMapType>;
     fragDoc: string;

package/dist/index.d.ts

@@ -16,10 +16,7 @@ export { createSchema } from './schema/createSchema';
 export { buildDotTinaFiles };
 export type DummyType = unknown;
 export declare const buildSchema: (config: Config, flags?: string[]) => Promise<{
-    graphQLSchema: {
-        kind: "Document";
-        definitions: any;
-    };
+    graphQLSchema: import("graphql").DocumentNode;
     tinaSchema: import("@tinacms/schema-tools").TinaSchema;
     lookup: Record<string, import("./database").LookupMapType>;
     fragDoc: string;

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") {
@@ -2777,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) {
@@ -2930,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",
@@ -2946,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,
@@ -3083,7 +3084,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.6.0",
+  version: "1.6.2",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -3118,6 +3119,7 @@ var package_default = {
     "@tinacms/schema-tools": "workspace:*",
     "abstract-level": "catalog:",
     "date-fns": "^2.30.0",
+    "es-toolkit": "^1.42.0",
     "fast-glob": "catalog:",
     "fs-extra": "catalog:",
     "glob-parent": "catalog:",
@@ -3127,9 +3129,6 @@ var package_default = {
     "js-sha1": "catalog:",
     "js-yaml": "^3.14.1",
     "jsonpath-plus": "catalog:",
-    "lodash.clonedeep": "catalog:",
-    "lodash.set": "catalog:",
-    "lodash.uniqby": "catalog:",
     "many-level": "catalog:",
     micromatch: "catalog:",
     "normalize-path": "catalog:",
@@ -3152,8 +3151,6 @@ var package_default = {
     "@types/express": "catalog:",
     "@types/fs-extra": "^9.0.13",
     "@types/js-yaml": "^3.12.10",
-    "@types/lodash.camelcase": "catalog:",
-    "@types/lodash.upperfirst": "catalog:",
     "@types/lru-cache": "catalog:",
     "@types/mdast": "catalog:",
     "@types/micromatch": "catalog:",
@@ -3166,7 +3163,7 @@ var package_default = {
     typescript: "^5.7.3",
     vite: "^4.5.9",
     vitest: "^0.32.4",
-    zod: "^3.24.2"
+    zod: "catalog:"
   }
 };
 
@@ -3236,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
     )
   };
@@ -3269,9 +3266,9 @@ var _buildQueries = async (builder, tinaSchema) => {
   });
   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
     )
   };
@@ -3358,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
@@ -4447,7 +4445,6 @@ var TinaFetchError = class extends Error {
     super(message);
     this.name = "TinaFetchError";
     this.collection = args.collection;
-    this.stack = args.stack;
     this.file = args.file;
     this.originalError = args.originalError;
   }
@@ -4829,8 +4826,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) => {
@@ -5741,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");
@@ -5852,119 +5969,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;
@@ -6177,7 +6208,7 @@ 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?.port);
   level.openConnection();
@@ -6552,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
         });
       }
     };
@@ -6913,8 +6943,7 @@ var Database = class {
                 throw new TinaQueryError({
                   originalError: error,
                   file: path7,
-                  collection: collection.name,
-                  stack: error.stack
+                  collection: collection.name
                 });
               }
               throw error;
@@ -7290,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 })
@@ -7444,8 +7473,7 @@ var _indexContent = async ({
       throw new TinaFetchError(`Unable to seed ${filepath}`, {
         originalError: error,
         file: filepath,
-        collection: collection?.name,
-        stack: error.stack
+        collection: collection?.name
       });
     }
   });

package/dist/index.mjs

@@ -1,6 +1,8 @@
 // src/build.ts
-import { print } from "graphql";
-import uniqBy2 from "lodash.uniqby";
+import {
+  print
+} from "graphql";
+import { uniqBy as uniqBy2 } from "es-toolkit";
 
 // src/util.ts
 import * as yup from "yup";
@@ -56,7 +58,7 @@ var flattenDeep = (arr) => arr.flatMap(
 );
 
 // src/ast-builder/index.ts
-import uniqBy from "lodash.uniqby";
+import { uniqBy } from "es-toolkit";
 var SysFieldDefinition = {
   kind: "Field",
   name: {
@@ -977,6 +979,7 @@ var astBuilder = {
         ...extractInlineTypes(ast.globalTemplates),
         ...ast.definitions
       ],
+      // @ts-ignore - all nodes have a name property in practice
       (field) => field.name.value
     );
     return {
@@ -2711,7 +2714,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) {
@@ -2864,8 +2867,8 @@ import { TinaSchema } from "@tinacms/schema-tools";
 
 // src/schema/validate.ts
 import { addNamespaceToSchema } from "@tinacms/schema-tools";
-import deepClone from "lodash.clonedeep";
 import * as yup2 from "yup";
+import { cloneDeep } from "es-toolkit";
 import {
   validateTinaCloudSchemaConfig
 } from "@tinacms/schema-tools";
@@ -2882,7 +2885,7 @@ var FIELD_TYPES = [
 ];
 var validateSchema = async (schema) => {
   const schema2 = addNamespaceToSchema(
-    deepClone(schema)
+    cloneDeep(schema)
   );
   const collections = await sequential(
     schema2.collections,
@@ -3019,7 +3022,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.6.0",
+  version: "1.6.2",
   main: "dist/index.js",
   module: "dist/index.mjs",
   typings: "dist/index.d.ts",
@@ -3054,6 +3057,7 @@ var package_default = {
     "@tinacms/schema-tools": "workspace:*",
     "abstract-level": "catalog:",
     "date-fns": "^2.30.0",
+    "es-toolkit": "^1.42.0",
     "fast-glob": "catalog:",
     "fs-extra": "catalog:",
     "glob-parent": "catalog:",
@@ -3063,9 +3067,6 @@ var package_default = {
     "js-sha1": "catalog:",
     "js-yaml": "^3.14.1",
     "jsonpath-plus": "catalog:",
-    "lodash.clonedeep": "catalog:",
-    "lodash.set": "catalog:",
-    "lodash.uniqby": "catalog:",
     "many-level": "catalog:",
     micromatch: "catalog:",
     "normalize-path": "catalog:",
@@ -3088,8 +3089,6 @@ var package_default = {
     "@types/express": "catalog:",
     "@types/fs-extra": "^9.0.13",
     "@types/js-yaml": "^3.12.10",
-    "@types/lodash.camelcase": "catalog:",
-    "@types/lodash.upperfirst": "catalog:",
     "@types/lru-cache": "catalog:",
     "@types/mdast": "catalog:",
     "@types/micromatch": "catalog:",
@@ -3102,7 +3101,7 @@ var package_default = {
     typescript: "^5.7.3",
     vite: "^4.5.9",
     vitest: "^0.32.4",
-    zod: "^3.24.2"
+    zod: "catalog:"
   }
 };
 
@@ -3173,8 +3172,8 @@ var _buildFragments = async (builder, tinaSchema) => {
   const fragDoc = {
     kind: "Document",
     definitions: uniqBy2(
-      // @ts-ignore
       extractInlineTypes(fragmentDefinitionsFields),
+      // @ts-ignore - all nodes returned by extractInlineTypes have a name property
       (node) => node.name.value
     )
   };
@@ -3206,8 +3205,8 @@ var _buildQueries = async (builder, tinaSchema) => {
   const queryDoc = {
     kind: "Document",
     definitions: uniqBy2(
-      // @ts-ignore
       extractInlineTypes(operationsDefinitions),
+      // @ts-ignore - all nodes returned by extractInlineTypes have a name property
       (node) => node.name.value
     )
   };
@@ -3294,14 +3293,15 @@ var _buildSchema = async (builder, tinaSchema) => {
       fields: mutationTypeDefinitionFields
     })
   );
-  return {
+  const schema = {
     kind: "Document",
     definitions: uniqBy2(
-      // @ts-ignore
       extractInlineTypes(definitions),
+      // @ts-ignore - all nodes returned by extractInlineTypes have a name property
       (node) => node.name.value
     )
   };
+  return schema;
 };
 
 // src/resolve.ts
@@ -4385,7 +4385,6 @@ var TinaFetchError = class extends Error {
     super(message);
     this.name = "TinaFetchError";
     this.collection = args.collection;
-    this.stack = args.stack;
     this.file = args.file;
     this.originalError = args.originalError;
   }
@@ -4767,8 +4766,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) => {
@@ -5679,8 +5677,129 @@ var resolveDateInput = (value) => {
   return date;
 };
 
-// src/resolve.ts
-import set from "lodash.set";
+// src/resolver/auth-fields.ts
+import { set } from "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 = {};
+  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
 import { GraphQLError as GraphQLError3 } from "graphql";
@@ -5790,119 +5909,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 = {};
-            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 handleUpdatePassword({
+              tinaSchema,
+              resolver,
+              password: args.password,
+              info,
+              ctxUser
             });
-            return true;
           }
           if (!lookup) {
             return value;
@@ -6115,7 +6148,7 @@ import path4 from "node:path";
 import { GraphQLError as GraphQLError5 } from "graphql";
 import micromatch2 from "micromatch";
 import sha2 from "js-sha1";
-import set2 from "lodash.set";
+import { set as set2 } from "es-toolkit/compat";
 var createLocalDatabase = (config) => {
   const level = new TinaLevelClient(config?.port);
   level.openConnection();
@@ -6490,8 +6523,7 @@ var Database = class {
         throw new TinaFetchError(`Error in PUT for ${filepath}`, {
           originalError: error,
           file: filepath,
-          collection: collectionName,
-          stack: error.stack
+          collection: collectionName
         });
       }
     };
@@ -6851,8 +6883,7 @@ var Database = class {
                 throw new TinaQueryError({
                   originalError: error,
                   file: path7,
-                  collection: collection.name,
-                  stack: error.stack
+                  collection: collection.name
                 });
               }
               throw error;
@@ -7382,8 +7413,7 @@ var _indexContent = async ({
       throw new TinaFetchError(`Unable to seed ${filepath}`, {
         originalError: error,
         file: filepath,
-        collection: collection?.name,
-        stack: error.stack
+        collection: collection?.name
       });
     }
   });

package/dist/resolver/auth-fields.d.ts

@@ -0,0 +1,31 @@
+import type { TinaSchema } from '@tinacms/schema-tools';
+import type { GraphQLResolveInfo } from 'graphql';
+import type { Resolver } from './index';
+export declare function handleAuthenticate({ tinaSchema, resolver, sub, password, ctxUser, }: {
+    tinaSchema: TinaSchema;
+    resolver: Resolver;
+    sub?: string;
+    password: string;
+    info: GraphQLResolveInfo;
+    ctxUser?: {
+        sub?: string;
+    };
+}): Promise<any>;
+export declare function handleAuthorize({ tinaSchema, resolver, sub, ctxUser, }: {
+    tinaSchema: TinaSchema;
+    resolver: Resolver;
+    sub?: string;
+    info: GraphQLResolveInfo;
+    ctxUser?: {
+        sub?: string;
+    };
+}): Promise<any>;
+export declare function handleUpdatePassword({ tinaSchema, resolver, password, ctxUser, }: {
+    tinaSchema: TinaSchema;
+    resolver: Resolver;
+    password: string;
+    info: GraphQLResolveInfo;
+    ctxUser?: {
+        sub?: string;
+    };
+}): Promise<boolean>;

package/dist/resolver/error.d.ts

@@ -15,6 +15,7 @@ export declare class TinaGraphQLError extends Error implements GraphQLError {
     constructor(message: string, extensions?: Record<string, any>);
 }
 export type TypeFetchErrorArgs = {
+    /** @deprecated */
     stack?: string;
     file?: string;
     includeAuditMessage?: boolean;
@@ -22,7 +23,6 @@ export type TypeFetchErrorArgs = {
     collection?: string;
 };
 export declare class TinaFetchError extends Error {
-    stack?: string;
     collection?: string;
     file?: string;
     originalError: Error;
@@ -36,7 +36,6 @@ export declare class TinaQueryError extends TinaFetchError {
     constructor(args: TypeFetchErrorArgs);
 }
 export declare class TinaParseDocumentError extends TinaFetchError {
-    stack?: string;
     collection?: string;
     file?: string;
     originalError: Error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "typings": "dist/index.d.ts",
@@ -26,6 +26,7 @@
     "@iarna/toml": "^2.2.5",
     "abstract-level": "^1.0.4",
     "date-fns": "^2.30.0",
+    "es-toolkit": "^1.42.0",
     "fast-glob": "^3.3.3",
     "fs-extra": "^11.3.0",
     "glob-parent": "^6.0.2",
@@ -35,17 +36,14 @@
     "js-sha1": "^0.6.0",
     "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",
     "yup": "^0.32.11",
-    "@tinacms/mdx": "1.8.0",
-    "@tinacms/schema-tools": "1.9.0"
+    "@tinacms/mdx": "1.8.2",
+    "@tinacms/schema-tools": "1.10.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -60,8 +58,6 @@
     "@types/express": "^4.17.21",
     "@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",
@@ -75,8 +71,8 @@
     "vite": "^4.5.9",
     "vitest": "^0.32.4",
     "zod": "^3.24.2",
-    "@tinacms/schema-tools": "1.9.0",
-    "@tinacms/scripts": "1.4.0"
+    "@tinacms/schema-tools": "1.10.0",
+    "@tinacms/scripts": "1.4.1"
   },
   "scripts": {
     "types": "pnpm tsc",