payload 4.0.0-internal.fa345ef → 4.0.0-internal.ff27d6e

package/dist/hierarchy/getInitialTreeData.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hierarchy/getInitialTreeData.ts"],"sourcesContent":["import type { TypeWithID } from '../collections/config/types.js'\nimport type { PayloadRequest, Where } from '../types/index.js'\n\nimport { DEFAULT_HIERARCHY_TREE_LIMIT } from '../hierarchy/constants.js'\n\nexport type GetInitialTreeDataArgs = {\n  /** Base filter to apply to all queries (e.g., tenant filter) */\n  baseFilter?: null | Where\n  collectionSlug: string\n  expandedNodeIds?: (number | string)[]\n  /** Filter tree to only show folders that allow these collection types (or are unrestricted) */\n  filterByCollections?: string[]\n  limit?: number\n  payload: PayloadRequest['payload']\n  /** The currently selected node ID. When provided, ensures siblings are loaded to include this node. */\n  selectedNodeId?: null | number | string\n  /** The parent ID of the selected node. Required when selectedNodeId is provided. */\n  selectedNodeParentId?: null | number | string\n  user: PayloadRequest['user']\n}\n\nexport type InitialTreeData = {\n  docs: TypeWithID[]\n  // Metadata about what was loaded - keyed by parent ID ('null' for root)\n  loadedParents: Record<string, { hasMore: boolean; loadedCount?: number; totalDocs: number }>\n}\n\nexport const getInitialTreeData = async ({\n  baseFilter,\n  collectionSlug,\n  expandedNodeIds = [],\n  filterByCollections,\n  limit,\n  payload,\n  selectedNodeId,\n  selectedNodeParentId,\n  user,\n}: GetInitialTreeDataArgs): Promise<InitialTreeData> => {\n  const collectionConfig = payload.collections[collectionSlug]?.config\n\n  if (!collectionConfig || !collectionConfig.hierarchy) {\n    throw new Error(`Collection ${collectionSlug} is not a hierarchy`)\n  }\n\n  const hierarchyConfig = collectionConfig.hierarchy\n  const parentFieldName = hierarchyConfig.parentFieldName\n  const useAsTitle = collectionConfig.admin?.useAsTitle ?? 'id'\n\n  // Get typeFieldName for filtering\n  const typeFieldName =\n    hierarchyConfig.collectionSpecific && typeof hierarchyConfig.collectionSpecific === 'object'\n      ? hierarchyConfig.collectionSpecific.fieldName\n      : undefined\n\n  // Build filter condition if filterByCollections is provided\n  // Exclude the hierarchy collection itself (folders always show folders)\n  const filteredTypes = filterByCollections?.filter((t) => t !== collectionSlug)\n\n  // Get all possible type values from relatedCollections for detecting empty arrays\n  const allPossibleTypes = hierarchyConfig.relatedCollections\n    ? Object.keys(hierarchyConfig.relatedCollections)\n    : []\n\n  const filterCondition =\n    filteredTypes?.length && typeFieldName\n      ? {\n          or: [\n            { [typeFieldName]: { in: filteredTypes } },\n            { [typeFieldName]: { exists: false } }, // Include unrestricted folders (field doesn't exist)\n            // Include unrestricted folders with empty allowedTypes array\n            // Using not_in with all possible values matches empty arrays in both MongoDB and Postgres\n            ...(allPossibleTypes.length > 0\n              ? [{ [typeFieldName]: { not_in: allPossibleTypes } }]\n              : []),\n          ],\n        }\n      : null\n\n  // Use limit from config if not provided, fallback to config's treeLimit\n  const effectiveLimit = limit ?? hierarchyConfig.admin?.treeLimit ?? DEFAULT_HIERARCHY_TREE_LIMIT\n\n  const allDocs: TypeWithID[] = []\n  const loadedParents: Record<\n    string,\n    { hasMore: boolean; loadedCount: number; totalDocs: number }\n  > = {}\n\n  // Normalize selectedNodeParentId: treat null/undefined as 'null' (root level)\n  const normalizedSelectedParentId =\n    selectedNodeParentId === null || selectedNodeParentId === undefined\n      ? 'null'\n      : String(selectedNodeParentId)\n\n  // Helper to check if selectedNodeId is among siblings at a given parent level\n  const needsSelectedNodeIncluded = (parentKey: string): boolean => {\n    return !!selectedNodeId && normalizedSelectedParentId === parentKey\n  }\n\n  // Helper to fetch children with optional selectedNodeId inclusion\n  const fetchChildrenForParent = async (\n    parentKey: string,\n    parentCondition: Where,\n  ): Promise<void> => {\n    const mustIncludeSelected = needsSelectedNodeIncluded(parentKey)\n    let accumulatedDocs: TypeWithID[] = []\n    let currentPage = 1\n    let hasMore = true\n    let totalDocs = 0\n    let foundSelected = false\n\n    // Combine parent condition with filter condition and baseFilter\n    const conditions: Where[] = [parentCondition]\n    if (filterCondition) {\n      conditions.push(filterCondition)\n    }\n    if (baseFilter) {\n      conditions.push(baseFilter)\n    }\n    const whereClause = conditions.length > 1 ? { and: conditions } : parentCondition\n\n    while (hasMore) {\n      const result = await payload.find({\n        collection: collectionSlug,\n        depth: 0,\n        limit: effectiveLimit,\n        overrideAccess: false,\n        page: currentPage,\n        sort: useAsTitle,\n        user,\n        where: whereClause,\n      })\n\n      accumulatedDocs = [...accumulatedDocs, ...result.docs]\n      totalDocs = result.totalDocs\n      hasMore = result.hasNextPage\n\n      // Check if selectedNodeId is in this page's results\n      if (mustIncludeSelected && !foundSelected) {\n        foundSelected = result.docs.some(\n          (doc: TypeWithID) => String(doc.id) === String(selectedNodeId),\n        )\n      }\n\n      // Stop if we've found the selected node OR we only need first page\n      if (!mustIncludeSelected || foundSelected || !hasMore) {\n        break\n      }\n\n      currentPage++\n    }\n\n    allDocs.push(...accumulatedDocs)\n    loadedParents[parentKey] = {\n      hasMore,\n      loadedCount: accumulatedDocs.length,\n      totalDocs,\n    }\n  }\n\n  // Query 1: Fetch root nodes\n  await fetchChildrenForParent('null', {\n    [parentFieldName]: { exists: false },\n  })\n\n  // Query 2: For each expanded node, fetch its children\n  for (const parentId of expandedNodeIds) {\n    await fetchChildrenForParent(String(parentId), {\n      [parentFieldName]: { equals: parentId },\n    })\n  }\n\n  return {\n    docs: allDocs,\n    loadedParents,\n  }\n}\n"],"names":["DEFAULT_HIERARCHY_TREE_LIMIT","getInitialTreeData","baseFilter","collectionSlug","expandedNodeIds","filterByCollections","limit","payload","selectedNodeId","selectedNodeParentId","user","collectionConfig","collections","config","hierarchy","Error","hierarchyConfig","parentFieldName","useAsTitle","admin","typeFieldName","collectionSpecific","fieldName","undefined","filteredTypes","filter","t","allPossibleTypes","relatedCollections","Object","keys","filterCondition","length","or","in","exists","not_in","effectiveLimit","treeLimit","allDocs","loadedParents","normalizedSelectedParentId","String","needsSelectedNodeIncluded","parentKey","fetchChildrenForParent","parentCondition","mustIncludeSelected","accumulatedDocs","currentPage","hasMore","totalDocs","foundSelected","conditions","push","whereClause","and","result","find","collection","depth","overrideAccess","page","sort","where","docs","hasNextPage","some","doc","id","loadedCount","parentId","equals"],"mappings":"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"}
+{"version":3,"sources":["../../src/hierarchy/getInitialTreeData.ts"],"sourcesContent":["import type { TypeWithID } from '../collections/config/types.js'\nimport type { PayloadRequest, Where } from '../types/index.js'\n\nimport { MAIN_BRANCH } from '../branching/types.js'\nimport { DEFAULT_HIERARCHY_TREE_LIMIT } from '../hierarchy/constants.js'\n\nexport type GetInitialTreeDataArgs = {\n  /** Base filter to apply to all queries (e.g., tenant filter) */\n  baseFilter?: null | Where\n  collectionSlug: string\n  expandedNodeIds?: (number | string)[]\n  /** Filter tree to only show folders that allow these collection types (or are unrestricted) */\n  filterByCollections?: string[]\n  limit?: number\n  payload: PayloadRequest['payload']\n  req?: PayloadRequest\n  /** The currently selected node ID. When provided, ensures siblings are loaded to include this node. */\n  selectedNodeId?: null | number | string\n  /** The parent ID of the selected node. Required when selectedNodeId is provided. */\n  selectedNodeParentId?: null | number | string\n  user: PayloadRequest['user']\n}\n\nexport type InitialTreeData = {\n  branch: null | string\n  docs: TypeWithID[]\n  // Metadata about what was loaded - keyed by parent ID ('null' for root)\n  loadedParents: Record<string, { hasMore: boolean; loadedCount?: number; totalDocs: number }>\n}\n\nexport const getInitialTreeData = async ({\n  baseFilter,\n  collectionSlug,\n  expandedNodeIds = [],\n  filterByCollections,\n  limit,\n  payload,\n  req,\n  selectedNodeId,\n  selectedNodeParentId,\n  user,\n}: GetInitialTreeDataArgs): Promise<InitialTreeData> => {\n  const collectionConfig = payload.collections[collectionSlug]?.config\n\n  if (!collectionConfig || !collectionConfig.hierarchy) {\n    throw new Error(`Collection ${collectionSlug} is not a hierarchy`)\n  }\n\n  const hierarchyConfig = collectionConfig.hierarchy\n  const parentFieldName = hierarchyConfig.parentFieldName\n  const useAsTitle = collectionConfig.admin?.useAsTitle ?? 'id'\n\n  // Get typeFieldName for filtering\n  const typeFieldName =\n    hierarchyConfig.collectionSpecific && typeof hierarchyConfig.collectionSpecific === 'object'\n      ? hierarchyConfig.collectionSpecific.fieldName\n      : undefined\n\n  // Build filter condition if filterByCollections is provided\n  // Exclude the hierarchy collection itself (folders always show folders)\n  const filteredTypes = filterByCollections?.filter((t) => t !== collectionSlug)\n\n  // Get all possible type values from relatedCollections for detecting empty arrays\n  const allPossibleTypes = hierarchyConfig.relatedCollections\n    ? Object.keys(hierarchyConfig.relatedCollections)\n    : []\n\n  const filterCondition =\n    filteredTypes?.length && typeFieldName\n      ? {\n          or: [\n            { [typeFieldName]: { in: filteredTypes } },\n            { [typeFieldName]: { exists: false } }, // Include unrestricted folders (field doesn't exist)\n            // Include unrestricted folders with empty allowedTypes array\n            // Using not_in with all possible values matches empty arrays in both MongoDB and Postgres\n            ...(allPossibleTypes.length > 0\n              ? [{ [typeFieldName]: { not_in: allPossibleTypes } }]\n              : []),\n          ],\n        }\n      : null\n\n  // Use limit from config if not provided, fallback to config's treeLimit\n  const effectiveLimit = limit ?? hierarchyConfig.admin?.treeLimit ?? DEFAULT_HIERARCHY_TREE_LIMIT\n\n  const allDocs: TypeWithID[] = []\n  const loadedParents: Record<\n    string,\n    { hasMore: boolean; loadedCount: number; totalDocs: number }\n  > = {}\n\n  // Normalize selectedNodeParentId: treat null/undefined as 'null' (root level)\n  const normalizedSelectedParentId =\n    selectedNodeParentId === null || selectedNodeParentId === undefined\n      ? 'null'\n      : String(selectedNodeParentId)\n\n  // Helper to check if selectedNodeId is among siblings at a given parent level\n  const needsSelectedNodeIncluded = (parentKey: string): boolean => {\n    return !!selectedNodeId && normalizedSelectedParentId === parentKey\n  }\n\n  // Helper to fetch children with optional selectedNodeId inclusion\n  const fetchChildrenForParent = async (\n    parentKey: string,\n    parentCondition: Where,\n  ): Promise<void> => {\n    const mustIncludeSelected = needsSelectedNodeIncluded(parentKey)\n    let accumulatedDocs: TypeWithID[] = []\n    let currentPage = 1\n    let hasMore = true\n    let totalDocs = 0\n    let foundSelected = false\n\n    // Combine parent condition with filter condition and baseFilter\n    const conditions: Where[] = [parentCondition]\n    if (filterCondition) {\n      conditions.push(filterCondition)\n    }\n    if (baseFilter) {\n      conditions.push(baseFilter)\n    }\n    const whereClause = conditions.length > 1 ? { and: conditions } : parentCondition\n\n    while (hasMore) {\n      const result = await payload.find({\n        collection: collectionSlug,\n        depth: 0,\n        limit: effectiveLimit,\n        overrideAccess: false,\n        page: currentPage,\n        req,\n        sort: useAsTitle,\n        user,\n        where: whereClause,\n      })\n\n      accumulatedDocs = [...accumulatedDocs, ...result.docs]\n      totalDocs = result.totalDocs\n      hasMore = result.hasNextPage\n\n      // Check if selectedNodeId is in this page's results\n      if (mustIncludeSelected && !foundSelected) {\n        foundSelected = result.docs.some(\n          (doc: TypeWithID) => String(doc.id) === String(selectedNodeId),\n        )\n      }\n\n      // Stop if we've found the selected node OR we only need first page\n      if (!mustIncludeSelected || foundSelected || !hasMore) {\n        break\n      }\n\n      currentPage++\n    }\n\n    allDocs.push(...accumulatedDocs)\n    loadedParents[parentKey] = {\n      hasMore,\n      loadedCount: accumulatedDocs.length,\n      totalDocs,\n    }\n  }\n\n  // Query 1: Fetch root nodes\n  await fetchChildrenForParent('null', {\n    [parentFieldName]: { exists: false },\n  })\n\n  // Query 2: For each expanded node, fetch its children\n  for (const parentId of expandedNodeIds) {\n    await fetchChildrenForParent(String(parentId), {\n      [parentFieldName]: { equals: parentId },\n    })\n  }\n\n  return {\n    branch: req?.branch && req.branch !== MAIN_BRANCH ? req.branch : null,\n    docs: allDocs,\n    loadedParents,\n  }\n}\n"],"names":["MAIN_BRANCH","DEFAULT_HIERARCHY_TREE_LIMIT","getInitialTreeData","baseFilter","collectionSlug","expandedNodeIds","filterByCollections","limit","payload","req","selectedNodeId","selectedNodeParentId","user","collectionConfig","collections","config","hierarchy","Error","hierarchyConfig","parentFieldName","useAsTitle","admin","typeFieldName","collectionSpecific","fieldName","undefined","filteredTypes","filter","t","allPossibleTypes","relatedCollections","Object","keys","filterCondition","length","or","in","exists","not_in","effectiveLimit","treeLimit","allDocs","loadedParents","normalizedSelectedParentId","String","needsSelectedNodeIncluded","parentKey","fetchChildrenForParent","parentCondition","mustIncludeSelected","accumulatedDocs","currentPage","hasMore","totalDocs","foundSelected","conditions","push","whereClause","and","result","find","collection","depth","overrideAccess","page","sort","where","docs","hasNextPage","some","doc","id","loadedCount","parentId","equals","branch"],"mappings":"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"}

package/dist/hierarchy/hooks/collectionAfterDelete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectionAfterDelete.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/collectionAfterDelete.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE/D,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC3C,CAAA;AAED,eAAO,MAAM,8BAA8B,GACxC,wBAAwB,IAAI,KAAG,yBAgB/B,CAAA"}
+{"version":3,"file":"collectionAfterDelete.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/collectionAfterDelete.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE/D,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC3C,CAAA;AAED,eAAO,MAAM,8BAA8B,2BAChB,IAAI,KAAG,yBAiB/B,CAAA"}

package/dist/hierarchy/hooks/collectionAfterDelete.js

@@ -8,6 +8,7 @@
                 data: {
                     [fieldName]: null
                 },
+                overrideAccess: true,
                 req,
                 where: {
                     [fieldName]: {

package/dist/hierarchy/hooks/collectionAfterDelete.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/hierarchy/hooks/collectionAfterDelete.ts"],"sourcesContent":["/**\n * afterDelete Hook Responsibilities:\n * - Clear folder references from related documents when folder is deleted\n */\n\nimport type { CollectionAfterDeleteHook } from '../../index.js'\n\ntype Args = {\n  /**\n   * Map of collection slugs to their field names\n   */\n  relatedCollections: Record<string, string>\n}\n\nexport const hierarchyCollectionAfterDelete =\n  ({ relatedCollections }: Args): CollectionAfterDeleteHook =>\n  async ({ id, req }) => {\n    for (const [collectionSlug, fieldName] of Object.entries(relatedCollections)) {\n      await req.payload.update({\n        collection: collectionSlug,\n        data: {\n          [fieldName]: null,\n        },\n        req,\n        where: {\n          [fieldName]: {\n            equals: id,\n          },\n        },\n      })\n    }\n  }\n"],"names":["hierarchyCollectionAfterDelete","relatedCollections","id","req","collectionSlug","fieldName","Object","entries","payload","update","collection","data","where","equals"],"mappings":"AAAA;;;CAGC,GAWD,OAAO,MAAMA,iCACX,CAAC,EAAEC,kBAAkB,EAAQ,GAC7B,OAAO,EAAEC,EAAE,EAAEC,GAAG,EAAE;QAChB,KAAK,MAAM,CAACC,gBAAgBC,UAAU,IAAIC,OAAOC,OAAO,CAACN,oBAAqB;YAC5E,MAAME,IAAIK,OAAO,CAACC,MAAM,CAAC;gBACvBC,YAAYN;gBACZO,MAAM;oBACJ,CAACN,UAAU,EAAE;gBACf;gBACAF;gBACAS,OAAO;oBACL,CAACP,UAAU,EAAE;wBACXQ,QAAQX;oBACV;gBACF;YACF;QACF;IACF,EAAC"}
+{"version":3,"sources":["../../../src/hierarchy/hooks/collectionAfterDelete.ts"],"sourcesContent":["/**\n * afterDelete Hook Responsibilities:\n * - Clear folder references from related documents when folder is deleted\n */\n\nimport type { CollectionAfterDeleteHook } from '../../index.js'\n\ntype Args = {\n  /**\n   * Map of collection slugs to their field names\n   */\n  relatedCollections: Record<string, string>\n}\n\nexport const hierarchyCollectionAfterDelete =\n  ({ relatedCollections }: Args): CollectionAfterDeleteHook =>\n  async ({ id, req }) => {\n    for (const [collectionSlug, fieldName] of Object.entries(relatedCollections)) {\n      await req.payload.update({\n        collection: collectionSlug,\n        data: {\n          [fieldName]: null,\n        },\n        overrideAccess: true,\n        req,\n        where: {\n          [fieldName]: {\n            equals: id,\n          },\n        },\n      })\n    }\n  }\n"],"names":["hierarchyCollectionAfterDelete","relatedCollections","id","req","collectionSlug","fieldName","Object","entries","payload","update","collection","data","overrideAccess","where","equals"],"mappings":"AAAA;;;CAGC,GAWD,OAAO,MAAMA,iCACX,CAAC,EAAEC,kBAAkB,EAAQ,GAC7B,OAAO,EAAEC,EAAE,EAAEC,GAAG,EAAE;QAChB,KAAK,MAAM,CAACC,gBAAgBC,UAAU,IAAIC,OAAOC,OAAO,CAACN,oBAAqB;YAC5E,MAAME,IAAIK,OAAO,CAACC,MAAM,CAAC;gBACvBC,YAAYN;gBACZO,MAAM;oBACJ,CAACN,UAAU,EAAE;gBACf;gBACAO,gBAAgB;gBAChBT;gBACAU,OAAO;oBACL,CAACR,UAAU,EAAE;wBACXS,QAAQZ;oBACV;gBACF;YACF;QACF;IACF,EAAC"}

package/dist/hierarchy/hooks/collectionAfterRead.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectionAfterRead.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/collectionAfterRead.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,uBAAuB,EAAkB,MAAM,gBAAgB,CAAA;AAgC7E,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,eAAe,EAAE,MAAM,CAAA;IACvB;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,4BAA4B,GACtC,4DAA4D,IAAI,KAAG,uBAuDnE,CAAA"}
+{"version":3,"file":"collectionAfterRead.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/collectionAfterRead.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,uBAAuB,EAAkB,MAAM,gBAAgB,CAAA;AAgC7E,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,eAAe,EAAE,MAAM,CAAA;IACvB;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,4BAA4B,+DACsB,IAAI,KAAG,uBAuDnE,CAAA"}

package/dist/hierarchy/hooks/collectionBeforeChange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectionBeforeChange.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/collectionBeforeChange.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,0BAA0B,EAI3B,MAAM,gBAAgB,CAAA;AAEvB,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,+BAA+B,GACzC,qBAAqB,IAAI,KAAG,0BAgC5B,CAAA"}
+{"version":3,"file":"collectionBeforeChange.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/collectionBeforeChange.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,0BAA0B,EAI3B,MAAM,gBAAgB,CAAA;AAEvB,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,+BAA+B,wBACpB,IAAI,KAAG,0BAgC5B,CAAA"}

package/dist/hierarchy/hooks/collectionBeforeChange.js

@@ -9,7 +9,7 @@
  */ export const hierarchyCollectionBeforeChange = ({ parentFieldName })=>async ({ collection, data, operation, originalDoc, req })=>{
         // Determine the new parent ID
         const newParentID = data[parentFieldName] !== undefined ? data[parentFieldName] : originalDoc?.[parentFieldName];
-        const parentChanged = operation === 'update' && data[parentFieldName] !== undefined && data[parentFieldName] !== originalDoc?.[parentFieldName];
+        const parentChanged = (operation === 'update' || operation === 'validate') && data[parentFieldName] !== undefined && data[parentFieldName] !== originalDoc?.[parentFieldName];
         // Validate circular references when parent is changing
         if (parentChanged && newParentID) {
             // Extract parent ID (could be plain ID or populated object with id)
@@ -57,6 +57,7 @@
                 id: ancestorId,
                 collection: collection.slug,
                 depth: 0,
+                overrideAccess: true,
                 req,
                 select: {
                     [fieldName]: true

package/dist/hierarchy/hooks/collectionBeforeChange.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/hierarchy/hooks/collectionBeforeChange.ts"],"sourcesContent":["/**\n * beforeChange Hook Responsibilities:\n * - Validate circular references when parent changes\n * - Prevent moving a folder into its own subfolder\n *\n * Does NOT handle:\n * - Tree structure (no stored tree anymore)\n * - Path computation (done in afterRead)\n */\n\nimport type {\n  CollectionBeforeChangeHook,\n  CollectionConfig,\n  JsonObject,\n  PayloadRequest,\n} from '../../index.js'\n\ntype Args = {\n  /**\n   * The name of the field that contains the parent document ID\n   */\n  parentFieldName: string\n}\n\nexport const hierarchyCollectionBeforeChange =\n  ({ parentFieldName }: Args): CollectionBeforeChangeHook =>\n  async ({ collection, data, operation, originalDoc, req }) => {\n    // Determine the new parent ID\n    const newParentID =\n      data[parentFieldName] !== undefined ? data[parentFieldName] : originalDoc?.[parentFieldName]\n    const parentChanged =\n      operation === 'update' &&\n      data[parentFieldName] !== undefined &&\n      data[parentFieldName] !== originalDoc?.[parentFieldName]\n\n    // Validate circular references when parent is changing\n    if (parentChanged && newParentID) {\n      // Extract parent ID (could be plain ID or populated object with id)\n      const parentId =\n        typeof newParentID === 'object' && 'id' in newParentID ? newParentID.id : newParentID\n\n      // Prevent self-referential parent\n      if (parentId === (originalDoc?.id || data.id)) {\n        throw new Error('Document cannot be its own parent')\n      }\n\n      // Check for true circular references (loops in the chain), but allow\n      // moving into a child - that will be handled by afterChange reparenting\n      await validateNoCircularReference({\n        collection,\n        currentDocId: originalDoc?.id,\n        parentId,\n        req,\n      })\n    }\n\n    return data\n  }\n\n/**\n * Walks up the parent chain to detect true circular references (loops).\n * Does NOT throw when moving into a child - that case is handled by afterChange\n * which will automatically reparent the child.\n */\nasync function validateNoCircularReference({\n  collection,\n  currentDocId,\n  parentId,\n  req,\n}: {\n  collection: CollectionConfig\n  currentDocId: number | string\n  parentId: number | string\n  req: PayloadRequest\n}) {\n  const parentFieldName =\n    collection.hierarchy && collection.hierarchy !== true\n      ? collection.hierarchy.parentFieldName\n      : undefined\n\n  if (!parentFieldName) {\n    return\n  }\n\n  const fieldName = parentFieldName\n\n  async function checkAncestor(\n    ancestorId: number | string,\n    visitedNodes: Set<string> = new Set(),\n  ): Promise<void> {\n    // Create unique key for this node\n    const nodeKey = `${collection.slug}:${ancestorId}`\n\n    // Check if we've visited this node before (true loop in the chain)\n    if (visitedNodes.has(nodeKey)) {\n      throw new Error(`Circular reference detected: the parent chain contains a loop`)\n    }\n\n    // If we've reached the current document, this means we're trying to move into a child\n    if (ancestorId === currentDocId) {\n      throw new Error('Cannot move folder into its own subfolder')\n    }\n\n    // Add this node to visited set\n    visitedNodes.add(nodeKey)\n\n    try {\n      const ancestor = (await req.payload.findByID({\n        id: ancestorId,\n        collection: collection.slug,\n        depth: 0,\n        req,\n        select: {\n          [fieldName]: true,\n        },\n      })) as JsonObject\n\n      const nextParent = ancestor?.[fieldName]\n\n      if (!nextParent) {\n        return // No parent, end of chain\n      }\n\n      // Extract next parent ID (could be plain ID or populated object)\n      let nextParentId = nextParent\n      if (typeof nextParent === 'object' && 'id' in nextParent) {\n        nextParentId = nextParent.id\n      }\n\n      // Continue traversal if parent exists\n      if (\n        nextParentId !== null &&\n        nextParentId !== undefined &&\n        (typeof nextParentId === 'string' || typeof nextParentId === 'number')\n      ) {\n        return checkAncestor(nextParentId, visitedNodes)\n      }\n    } catch (error) {\n      // If it's our validation error, re-throw it\n      if (error instanceof Error && error.message?.includes('Circular reference detected')) {\n        throw error\n      }\n      // Non-existent parent can't create a circular reference\n      return\n    }\n  }\n\n  await checkAncestor(parentId)\n}\n"],"names":["hierarchyCollectionBeforeChange","parentFieldName","collection","data","operation","originalDoc","req","newParentID","undefined","parentChanged","parentId","id","Error","validateNoCircularReference","currentDocId","hierarchy","fieldName","checkAncestor","ancestorId","visitedNodes","Set","nodeKey","slug","has","add","ancestor","payload","findByID","depth","select","nextParent","nextParentId","error","message","includes"],"mappings":"AAAA;;;;;;;;CAQC,GAgBD,OAAO,MAAMA,kCACX,CAAC,EAAEC,eAAe,EAAQ,GAC1B,OAAO,EAAEC,UAAU,EAAEC,IAAI,EAAEC,SAAS,EAAEC,WAAW,EAAEC,GAAG,EAAE;QACtD,8BAA8B;QAC9B,MAAMC,cACJJ,IAAI,CAACF,gBAAgB,KAAKO,YAAYL,IAAI,CAACF,gBAAgB,GAAGI,aAAa,CAACJ,gBAAgB;QAC9F,MAAMQ,gBACJL,cAAc,YACdD,IAAI,CAACF,gBAAgB,KAAKO,aAC1BL,IAAI,CAACF,gBAAgB,KAAKI,aAAa,CAACJ,gBAAgB;QAE1D,uDAAuD;QACvD,IAAIQ,iBAAiBF,aAAa;YAChC,oEAAoE;YACpE,MAAMG,WACJ,OAAOH,gBAAgB,YAAY,QAAQA,cAAcA,YAAYI,EAAE,GAAGJ;YAE5E,kCAAkC;YAClC,IAAIG,aAAcL,CAAAA,aAAaM,MAAMR,KAAKQ,EAAE,AAAD,GAAI;gBAC7C,MAAM,IAAIC,MAAM;YAClB;YAEA,qEAAqE;YACrE,wEAAwE;YACxE,MAAMC,4BAA4B;gBAChCX;gBACAY,cAAcT,aAAaM;gBAC3BD;gBACAJ;YACF;QACF;QAEA,OAAOH;IACT,EAAC;AAEH;;;;CAIC,GACD,eAAeU,4BAA4B,EACzCX,UAAU,EACVY,YAAY,EACZJ,QAAQ,EACRJ,GAAG,EAMJ;IACC,MAAML,kBACJC,WAAWa,SAAS,IAAIb,WAAWa,SAAS,KAAK,OAC7Cb,WAAWa,SAAS,CAACd,eAAe,GACpCO;IAEN,IAAI,CAACP,iBAAiB;QACpB;IACF;IAEA,MAAMe,YAAYf;IAElB,eAAegB,cACbC,UAA2B,EAC3BC,eAA4B,IAAIC,KAAK;QAErC,kCAAkC;QAClC,MAAMC,UAAU,GAAGnB,WAAWoB,IAAI,CAAC,CAAC,EAAEJ,YAAY;QAElD,mEAAmE;QACnE,IAAIC,aAAaI,GAAG,CAACF,UAAU;YAC7B,MAAM,IAAIT,MAAM,CAAC,6DAA6D,CAAC;QACjF;QAEA,sFAAsF;QACtF,IAAIM,eAAeJ,cAAc;YAC/B,MAAM,IAAIF,MAAM;QAClB;QAEA,+BAA+B;QAC/BO,aAAaK,GAAG,CAACH;QAEjB,IAAI;YACF,MAAMI,WAAY,MAAMnB,IAAIoB,OAAO,CAACC,QAAQ,CAAC;gBAC3ChB,IAAIO;gBACJhB,YAAYA,WAAWoB,IAAI;gBAC3BM,OAAO;gBACPtB;gBACAuB,QAAQ;oBACN,CAACb,UAAU,EAAE;gBACf;YACF;YAEA,MAAMc,aAAaL,UAAU,CAACT,UAAU;YAExC,IAAI,CAACc,YAAY;gBACf,QAAO,0BAA0B;YACnC;YAEA,iEAAiE;YACjE,IAAIC,eAAeD;YACnB,IAAI,OAAOA,eAAe,YAAY,QAAQA,YAAY;gBACxDC,eAAeD,WAAWnB,EAAE;YAC9B;YAEA,sCAAsC;YACtC,IACEoB,iBAAiB,QACjBA,iBAAiBvB,aAChB,CAAA,OAAOuB,iBAAiB,YAAY,OAAOA,iBAAiB,QAAO,GACpE;gBACA,OAAOd,cAAcc,cAAcZ;YACrC;QACF,EAAE,OAAOa,OAAO;YACd,4CAA4C;YAC5C,IAAIA,iBAAiBpB,SAASoB,MAAMC,OAAO,EAAEC,SAAS,gCAAgC;gBACpF,MAAMF;YACR;YACA,wDAAwD;YACxD;QACF;IACF;IAEA,MAAMf,cAAcP;AACtB"}
+{"version":3,"sources":["../../../src/hierarchy/hooks/collectionBeforeChange.ts"],"sourcesContent":["/**\n * beforeChange Hook Responsibilities:\n * - Validate circular references when parent changes\n * - Prevent moving a folder into its own subfolder\n *\n * Does NOT handle:\n * - Tree structure (no stored tree anymore)\n * - Path computation (done in afterRead)\n */\n\nimport type {\n  CollectionBeforeChangeHook,\n  CollectionConfig,\n  JsonObject,\n  PayloadRequest,\n} from '../../index.js'\n\ntype Args = {\n  /**\n   * The name of the field that contains the parent document ID\n   */\n  parentFieldName: string\n}\n\nexport const hierarchyCollectionBeforeChange =\n  ({ parentFieldName }: Args): CollectionBeforeChangeHook =>\n  async ({ collection, data, operation, originalDoc, req }) => {\n    // Determine the new parent ID\n    const newParentID =\n      data[parentFieldName] !== undefined ? data[parentFieldName] : originalDoc?.[parentFieldName]\n    const parentChanged =\n      (operation === 'update' || operation === 'validate') &&\n      data[parentFieldName] !== undefined &&\n      data[parentFieldName] !== originalDoc?.[parentFieldName]\n\n    // Validate circular references when parent is changing\n    if (parentChanged && newParentID) {\n      // Extract parent ID (could be plain ID or populated object with id)\n      const parentId =\n        typeof newParentID === 'object' && 'id' in newParentID ? newParentID.id : newParentID\n\n      // Prevent self-referential parent\n      if (parentId === (originalDoc?.id || data.id)) {\n        throw new Error('Document cannot be its own parent')\n      }\n\n      // Check for true circular references (loops in the chain), but allow\n      // moving into a child - that will be handled by afterChange reparenting\n      await validateNoCircularReference({\n        collection,\n        currentDocId: originalDoc?.id,\n        parentId,\n        req,\n      })\n    }\n\n    return data\n  }\n\n/**\n * Walks up the parent chain to detect true circular references (loops).\n * Does NOT throw when moving into a child - that case is handled by afterChange\n * which will automatically reparent the child.\n */\nasync function validateNoCircularReference({\n  collection,\n  currentDocId,\n  parentId,\n  req,\n}: {\n  collection: CollectionConfig\n  currentDocId: number | string\n  parentId: number | string\n  req: PayloadRequest\n}) {\n  const parentFieldName =\n    collection.hierarchy && collection.hierarchy !== true\n      ? collection.hierarchy.parentFieldName\n      : undefined\n\n  if (!parentFieldName) {\n    return\n  }\n\n  const fieldName = parentFieldName\n\n  async function checkAncestor(\n    ancestorId: number | string,\n    visitedNodes: Set<string> = new Set(),\n  ): Promise<void> {\n    // Create unique key for this node\n    const nodeKey = `${collection.slug}:${ancestorId}`\n\n    // Check if we've visited this node before (true loop in the chain)\n    if (visitedNodes.has(nodeKey)) {\n      throw new Error(`Circular reference detected: the parent chain contains a loop`)\n    }\n\n    // If we've reached the current document, this means we're trying to move into a child\n    if (ancestorId === currentDocId) {\n      throw new Error('Cannot move folder into its own subfolder')\n    }\n\n    // Add this node to visited set\n    visitedNodes.add(nodeKey)\n\n    try {\n      const ancestor = (await req.payload.findByID({\n        id: ancestorId,\n        collection: collection.slug,\n        depth: 0,\n        overrideAccess: true,\n        req,\n        select: {\n          [fieldName]: true,\n        },\n      })) as JsonObject\n\n      const nextParent = ancestor?.[fieldName]\n\n      if (!nextParent) {\n        return // No parent, end of chain\n      }\n\n      // Extract next parent ID (could be plain ID or populated object)\n      let nextParentId = nextParent\n      if (typeof nextParent === 'object' && 'id' in nextParent) {\n        nextParentId = nextParent.id\n      }\n\n      // Continue traversal if parent exists\n      if (\n        nextParentId !== null &&\n        nextParentId !== undefined &&\n        (typeof nextParentId === 'string' || typeof nextParentId === 'number')\n      ) {\n        return checkAncestor(nextParentId, visitedNodes)\n      }\n    } catch (error) {\n      // If it's our validation error, re-throw it\n      if (error instanceof Error && error.message?.includes('Circular reference detected')) {\n        throw error\n      }\n      // Non-existent parent can't create a circular reference\n      return\n    }\n  }\n\n  await checkAncestor(parentId)\n}\n"],"names":["hierarchyCollectionBeforeChange","parentFieldName","collection","data","operation","originalDoc","req","newParentID","undefined","parentChanged","parentId","id","Error","validateNoCircularReference","currentDocId","hierarchy","fieldName","checkAncestor","ancestorId","visitedNodes","Set","nodeKey","slug","has","add","ancestor","payload","findByID","depth","overrideAccess","select","nextParent","nextParentId","error","message","includes"],"mappings":"AAAA;;;;;;;;CAQC,GAgBD,OAAO,MAAMA,kCACX,CAAC,EAAEC,eAAe,EAAQ,GAC1B,OAAO,EAAEC,UAAU,EAAEC,IAAI,EAAEC,SAAS,EAAEC,WAAW,EAAEC,GAAG,EAAE;QACtD,8BAA8B;QAC9B,MAAMC,cACJJ,IAAI,CAACF,gBAAgB,KAAKO,YAAYL,IAAI,CAACF,gBAAgB,GAAGI,aAAa,CAACJ,gBAAgB;QAC9F,MAAMQ,gBACJ,AAACL,CAAAA,cAAc,YAAYA,cAAc,UAAS,KAClDD,IAAI,CAACF,gBAAgB,KAAKO,aAC1BL,IAAI,CAACF,gBAAgB,KAAKI,aAAa,CAACJ,gBAAgB;QAE1D,uDAAuD;QACvD,IAAIQ,iBAAiBF,aAAa;YAChC,oEAAoE;YACpE,MAAMG,WACJ,OAAOH,gBAAgB,YAAY,QAAQA,cAAcA,YAAYI,EAAE,GAAGJ;YAE5E,kCAAkC;YAClC,IAAIG,aAAcL,CAAAA,aAAaM,MAAMR,KAAKQ,EAAE,AAAD,GAAI;gBAC7C,MAAM,IAAIC,MAAM;YAClB;YAEA,qEAAqE;YACrE,wEAAwE;YACxE,MAAMC,4BAA4B;gBAChCX;gBACAY,cAAcT,aAAaM;gBAC3BD;gBACAJ;YACF;QACF;QAEA,OAAOH;IACT,EAAC;AAEH;;;;CAIC,GACD,eAAeU,4BAA4B,EACzCX,UAAU,EACVY,YAAY,EACZJ,QAAQ,EACRJ,GAAG,EAMJ;IACC,MAAML,kBACJC,WAAWa,SAAS,IAAIb,WAAWa,SAAS,KAAK,OAC7Cb,WAAWa,SAAS,CAACd,eAAe,GACpCO;IAEN,IAAI,CAACP,iBAAiB;QACpB;IACF;IAEA,MAAMe,YAAYf;IAElB,eAAegB,cACbC,UAA2B,EAC3BC,eAA4B,IAAIC,KAAK;QAErC,kCAAkC;QAClC,MAAMC,UAAU,GAAGnB,WAAWoB,IAAI,CAAC,CAAC,EAAEJ,YAAY;QAElD,mEAAmE;QACnE,IAAIC,aAAaI,GAAG,CAACF,UAAU;YAC7B,MAAM,IAAIT,MAAM,CAAC,6DAA6D,CAAC;QACjF;QAEA,sFAAsF;QACtF,IAAIM,eAAeJ,cAAc;YAC/B,MAAM,IAAIF,MAAM;QAClB;QAEA,+BAA+B;QAC/BO,aAAaK,GAAG,CAACH;QAEjB,IAAI;YACF,MAAMI,WAAY,MAAMnB,IAAIoB,OAAO,CAACC,QAAQ,CAAC;gBAC3ChB,IAAIO;gBACJhB,YAAYA,WAAWoB,IAAI;gBAC3BM,OAAO;gBACPC,gBAAgB;gBAChBvB;gBACAwB,QAAQ;oBACN,CAACd,UAAU,EAAE;gBACf;YACF;YAEA,MAAMe,aAAaN,UAAU,CAACT,UAAU;YAExC,IAAI,CAACe,YAAY;gBACf,QAAO,0BAA0B;YACnC;YAEA,iEAAiE;YACjE,IAAIC,eAAeD;YACnB,IAAI,OAAOA,eAAe,YAAY,QAAQA,YAAY;gBACxDC,eAAeD,WAAWpB,EAAE;YAC9B;YAEA,sCAAsC;YACtC,IACEqB,iBAAiB,QACjBA,iBAAiBxB,aAChB,CAAA,OAAOwB,iBAAiB,YAAY,OAAOA,iBAAiB,QAAO,GACpE;gBACA,OAAOf,cAAce,cAAcb;YACrC;QACF,EAAE,OAAOc,OAAO;YACd,4CAA4C;YAC5C,IAAIA,iBAAiBrB,SAASqB,MAAMC,OAAO,EAAEC,SAAS,gCAAgC;gBACpF,MAAMF;YACR;YACA,wDAAwD;YACxD;QACF;IACF;IAEA,MAAMhB,cAAcP;AACtB"}

package/dist/hierarchy/hooks/collectionBeforeDelete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectionBeforeDelete.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/collectionBeforeDelete.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAA;AAEhE,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,+BAA+B,GACzC,qBAAqB,IAAI,KAAG,0BAe5B,CAAA"}
+{"version":3,"file":"collectionBeforeDelete.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/collectionBeforeDelete.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAA;AAEhE,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,+BAA+B,wBACpB,IAAI,KAAG,0BAgB5B,CAAA"}

package/dist/hierarchy/hooks/collectionBeforeDelete.js

@@ -8,6 +8,7 @@
         // Delete all child folders (cascade delete)
         await req.payload.delete({
             collection: collection.slug,
+            overrideAccess: true,
             req,
             where: {
                 [parentFieldName]: {

package/dist/hierarchy/hooks/collectionBeforeDelete.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/hierarchy/hooks/collectionBeforeDelete.ts"],"sourcesContent":["/**\n * beforeDelete Hook Responsibilities:\n * - Delete child folders when parent is deleted (cascade delete)\n * - Set context flag for deletion tracking\n */\n\nimport type { CollectionBeforeDeleteHook } from '../../index.js'\n\ntype Args = {\n  /**\n   * The name of the field that contains the parent document ID\n   */\n  parentFieldName: string\n}\n\nexport const hierarchyCollectionBeforeDelete =\n  ({ parentFieldName }: Args): CollectionBeforeDeleteHook =>\n  async ({ id, collection, req }) => {\n    req.context = req.context || {}\n    req.context.isDeleting = true\n\n    // Delete all child folders (cascade delete)\n    await req.payload.delete({\n      collection: collection.slug,\n      req,\n      where: {\n        [parentFieldName]: {\n          equals: id,\n        },\n      },\n    })\n  }\n"],"names":["hierarchyCollectionBeforeDelete","parentFieldName","id","collection","req","context","isDeleting","payload","delete","slug","where","equals"],"mappings":"AAAA;;;;CAIC,GAWD,OAAO,MAAMA,kCACX,CAAC,EAAEC,eAAe,EAAQ,GAC1B,OAAO,EAAEC,EAAE,EAAEC,UAAU,EAAEC,GAAG,EAAE;QAC5BA,IAAIC,OAAO,GAAGD,IAAIC,OAAO,IAAI,CAAC;QAC9BD,IAAIC,OAAO,CAACC,UAAU,GAAG;QAEzB,4CAA4C;QAC5C,MAAMF,IAAIG,OAAO,CAACC,MAAM,CAAC;YACvBL,YAAYA,WAAWM,IAAI;YAC3BL;YACAM,OAAO;gBACL,CAACT,gBAAgB,EAAE;oBACjBU,QAAQT;gBACV;YACF;QACF;IACF,EAAC"}
+{"version":3,"sources":["../../../src/hierarchy/hooks/collectionBeforeDelete.ts"],"sourcesContent":["/**\n * beforeDelete Hook Responsibilities:\n * - Delete child folders when parent is deleted (cascade delete)\n * - Set context flag for deletion tracking\n */\n\nimport type { CollectionBeforeDeleteHook } from '../../index.js'\n\ntype Args = {\n  /**\n   * The name of the field that contains the parent document ID\n   */\n  parentFieldName: string\n}\n\nexport const hierarchyCollectionBeforeDelete =\n  ({ parentFieldName }: Args): CollectionBeforeDeleteHook =>\n  async ({ id, collection, req }) => {\n    req.context = req.context || {}\n    req.context.isDeleting = true\n\n    // Delete all child folders (cascade delete)\n    await req.payload.delete({\n      collection: collection.slug,\n      overrideAccess: true,\n      req,\n      where: {\n        [parentFieldName]: {\n          equals: id,\n        },\n      },\n    })\n  }\n"],"names":["hierarchyCollectionBeforeDelete","parentFieldName","id","collection","req","context","isDeleting","payload","delete","slug","overrideAccess","where","equals"],"mappings":"AAAA;;;;CAIC,GAWD,OAAO,MAAMA,kCACX,CAAC,EAAEC,eAAe,EAAQ,GAC1B,OAAO,EAAEC,EAAE,EAAEC,UAAU,EAAEC,GAAG,EAAE;QAC5BA,IAAIC,OAAO,GAAGD,IAAIC,OAAO,IAAI,CAAC;QAC9BD,IAAIC,OAAO,CAACC,UAAU,GAAG;QAEzB,4CAA4C;QAC5C,MAAMF,IAAIG,OAAO,CAACC,MAAM,CAAC;YACvBL,YAAYA,WAAWM,IAAI;YAC3BC,gBAAgB;YAChBN;YACAO,OAAO;gBACL,CAACV,gBAAgB,EAAE;oBACjBW,QAAQV;gBACV;YACF;QACF;IACF,EAAC"}

package/dist/hierarchy/hooks/collectionBeforeOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectionBeforeOperation.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/collectionBeforeOperation.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,eAAe,EAAE,MAAM,CAAA;IACvB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAA;IACtB;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAA;CAC3B,CAAA;AA0BD,eAAO,MAAM,kCAAkC,GAAI,KAAK,SAAS,cAAc,EAAE,4FAM9E,IAAI,KAAG,mBAAmB,CAAC,KAAK,CA0DlC,CAAA"}
+{"version":3,"file":"collectionBeforeOperation.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/collectionBeforeOperation.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,eAAe,EAAE,MAAM,CAAA;IACvB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAA;IACtB;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAA;CAC3B,CAAA;AA0BD,eAAO,MAAM,kCAAkC,GAAI,KAAK,SAAS,cAAc,8FAM5E,IAAI,KAAG,mBAAmB,CAAC,KAAK,CA0DlC,CAAA"}

package/dist/hierarchy/hooks/ensureSafeCollectionsChange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensureSafeCollectionsChange.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/ensureSafeCollectionsChange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,4BAA4B,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAIjG,eAAO,MAAM,2BAA2B,GACrC,mEAKE;IACD,eAAe,EAAE,MAAM,CAAA;IACvB,WAAW,EAAE,cAAc,CAAA;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,KAAG,4BAmIH,CAAA"}
+{"version":3,"file":"ensureSafeCollectionsChange.d.ts","sourceRoot":"","sources":["../../../src/hierarchy/hooks/ensureSafeCollectionsChange.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,4BAA4B,EACjC,KAAK,cAAc,EAEpB,MAAM,gBAAgB,CAAA;AAIvB,eAAO,MAAM,2BAA2B,sEAMnC;IACD,eAAe,EAAE,MAAM,CAAA;IACvB,WAAW,EAAE,cAAc,CAAA;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,KAAG,4BA4KH,CAAA"}

package/dist/hierarchy/hooks/ensureSafeCollectionsChange.js

@@ -3,10 +3,49 @@ import { extractID } from '../../utilities/extractID.js';
 import { getTranslatedLabel } from '../../utilities/getTranslatedLabel.js';
 export const ensureSafeCollectionsChange = ({ folderFieldName, foldersSlug, parentFieldName = 'folder', typeFieldName = 'hierarchyType' })=>async ({ data, originalDoc, req })=>{
         const currentParentDocID = extractID(originalDoc || {});
-        const newParentDocID = extractID(data?.[parentFieldName] || originalDoc?.[parentFieldName] || {});
+        const hasSubmittedParent = Object.hasOwn(data ?? {}, parentFieldName);
+        const hasSubmittedTypes = Object.hasOwn(data ?? {}, typeFieldName);
+        const parentValue = hasSubmittedParent ? data?.[parentFieldName] : originalDoc?.[parentFieldName];
+        const newParentDocID = extractID(parentValue || {});
+        const originalParentDocID = extractID(originalDoc?.[parentFieldName] || {});
+        const typeValue = hasSubmittedTypes ? data?.[typeFieldName] : originalDoc?.[typeFieldName];
+        const types = getStringValues(typeValue);
+        const originalTypes = getStringValues(originalDoc?.[typeFieldName]);
+        const hasParentChange = originalDoc ? newParentDocID !== originalParentDocID : hasSubmittedParent;
+        const hasTypeChange = originalDoc ? !haveSameValues({
+            first: types,
+            second: originalTypes
+        }) : hasSubmittedTypes;
+        const hierarchyConfig = req.payload.collections[foldersSlug]?.config.hierarchy;
+        const configuredTypes = hierarchyConfig && typeof hierarchyConfig === 'object' ? Object.keys(hierarchyConfig.relatedCollections) : [];
+        if ((hasParentChange || hasTypeChange) && newParentDocID) {
+            // Scope inheritance is an integrity constraint, so validate against the parent even when the
+            // requester cannot read it. Only select scope data to avoid exposing inaccessible metadata.
+            const parentFolder = await req.payload.findByID({
+                id: newParentDocID,
+                collection: foldersSlug,
+                overrideAccess: true,
+                req,
+                select: {
+                    [typeFieldName]: true
+                },
+                user: req.user
+            });
+            const parentTypes = Array.isArray(parentFolder[typeFieldName]) ? parentFolder[typeFieldName].filter((collectionSlug)=>typeof collectionSlug === 'string') : [];
+            const parentAllowsEveryConfiguredType = configuredTypes.length > 0 && configuredTypes.every((collectionSlug)=>parentTypes.includes(collectionSlug));
+            if (parentTypes.length > 0 && !parentAllowsEveryConfiguredType) {
+                if (types.length === 0) {
+                    throw new APIError(`The folder "${data?.name || originalDoc.name}" must have folder-type set since its parent folder has a folder-type set.`, 400);
+                }
+                const disallowedTypes = types.filter((collectionSlug)=>!parentTypes.includes(collectionSlug));
+                if (disallowedTypes.length > 0) {
+                    throw new APIError(`The folder "${data?.name || originalDoc.name}" cannot allow collection types that its parent does not allow: ${disallowedTypes.join(', ')}`, 400);
+                }
+            }
+        }
         if (Array.isArray(data?.[typeFieldName]) && data[typeFieldName].length > 0) {
             const typeFieldValue = data[typeFieldName];
-            const currentlyAssignedCollections = Array.isArray(originalDoc?.[typeFieldName]) && originalDoc[typeFieldName].length > 0 ? originalDoc[typeFieldName] : undefined;
+            const currentlyAssignedCollections = Array.isArray(originalDoc?.[typeFieldName]) && originalDoc[typeFieldName].length > 0 ? originalDoc[typeFieldName] : configuredTypes;
             /**
        * Check if the assigned collections have changed.
        * example:
@@ -16,7 +55,7 @@ export const ensureSafeCollectionsChange = ({ folderFieldName, foldersSlug, pare
        * The user is narrowing the types of documents that can be associated with this folder.
        * If the user is only expanding the types of documents that can be associated with this folder,
        * we do not need to do anything.
-       */ const newCollections = currentlyAssignedCollections ? currentlyAssignedCollections.filter((c)=>!typeFieldValue.includes(c)) : typeFieldValue;
+       */ const newCollections = currentlyAssignedCollections.filter((collectionSlug)=>!typeFieldValue.includes(collectionSlug));
             if (newCollections && newCollections.length > 0) {
                 let dependentCollection = null;
                 if (typeof currentParentDocID === 'string' || typeof currentParentDocID === 'number') {
@@ -38,8 +77,27 @@ export const ensureSafeCollectionsChange = ({ folderFieldName, foldersSlug, pare
                             break;
                         }
                     }
-                    // Also check for child folders with these types
+                    // Also check for child folders whose effective scope is broader than the new scope.
                     if (!dependentCollection) {
+                        const childScopeConditions = [
+                            {
+                                [typeFieldName]: {
+                                    in: newCollections
+                                }
+                            }
+                        ];
+                        const newScopeAllowsEveryConfiguredType = configuredTypes.every((collectionSlug)=>typeFieldValue.includes(collectionSlug));
+                        if (!newScopeAllowsEveryConfiguredType) {
+                            childScopeConditions.push({
+                                [typeFieldName]: {
+                                    exists: false
+                                }
+                            }, {
+                                [typeFieldName]: {
+                                    not_in: configuredTypes
+                                }
+                            });
+                        }
                         const childFoldersResult = await req.payload.find({
                             collection: foldersSlug,
                             limit: 1,
@@ -47,15 +105,13 @@ export const ensureSafeCollectionsChange = ({ folderFieldName, foldersSlug, pare
                             req,
                             where: {
                                 and: [
-                                    {
-                                        [typeFieldName]: {
-                                            in: newCollections
-                                        }
-                                    },
                                     {
                                         [parentFieldName]: {
                                             equals: currentParentDocID
                                         }
+                                    },
+                                    {
+                                        or: childScopeConditions
                                     }
                                 ]
                             }
@@ -77,32 +133,14 @@ export const ensureSafeCollectionsChange = ({ folderFieldName, foldersSlug, pare
                 }
                 return data;
             }
-        } else if ((data?.[typeFieldName] === null || Array.isArray(data?.[typeFieldName]) && data?.[typeFieldName].length === 0) && newParentDocID) {
-            // attempting to set the type to catch-all, so we need to ensure that the parent allows this
-            let parentFolder;
-            if (typeof newParentDocID === 'string' || typeof newParentDocID === 'number') {
-                try {
-                    parentFolder = await req.payload.findByID({
-                        id: newParentDocID,
-                        collection: foldersSlug,
-                        overrideAccess: true,
-                        req,
-                        select: {
-                            name: true,
-                            [typeFieldName]: true
-                        },
-                        user: req.user
-                    });
-                } catch (_) {
-                // parent folder does not exist
-                }
-            }
-            const parentTypeValue = parentFolder?.[typeFieldName];
-            if (parentFolder && parentTypeValue && Array.isArray(parentTypeValue) && parentTypeValue.length > 0) {
-                throw new APIError(`The folder "${data?.name || originalDoc.name}" must have folder-type set since its parent folder ${parentFolder?.name ? `"${parentFolder?.name}" ` : ''}has a folder-type set.`, 400);
-            }
         }
         return data;
     };
+function getStringValues(value) {
+    return Array.isArray(value) ? value.filter((item)=>typeof item === 'string') : [];
+}
+function haveSameValues({ first, second }) {
+    return first.length === second.length && first.every((value)=>second.includes(value));
+}
 
 //# sourceMappingURL=ensureSafeCollectionsChange.js.map

package/dist/hierarchy/hooks/ensureSafeCollectionsChange.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/hierarchy/hooks/ensureSafeCollectionsChange.ts"],"sourcesContent":["import { APIError, type CollectionBeforeValidateHook, type CollectionSlug } from '../../index.js'\nimport { extractID } from '../../utilities/extractID.js'\nimport { getTranslatedLabel } from '../../utilities/getTranslatedLabel.js'\n\nexport const ensureSafeCollectionsChange =\n  ({\n    folderFieldName,\n    foldersSlug,\n    parentFieldName = 'folder',\n    typeFieldName = 'hierarchyType',\n  }: {\n    folderFieldName: string\n    foldersSlug: CollectionSlug\n    parentFieldName?: string\n    typeFieldName?: string\n  }): CollectionBeforeValidateHook =>\n  async ({ data, originalDoc, req }) => {\n    const currentParentDocID = extractID(originalDoc || {})\n    const newParentDocID = extractID(\n      data?.[parentFieldName] || originalDoc?.[parentFieldName] || {},\n    )\n    if (Array.isArray(data?.[typeFieldName]) && data[typeFieldName].length > 0) {\n      const typeFieldValue = data[typeFieldName] as string[]\n      const currentlyAssignedCollections: string[] | undefined =\n        Array.isArray(originalDoc?.[typeFieldName]) && originalDoc[typeFieldName].length > 0\n          ? originalDoc[typeFieldName]\n          : undefined\n      /**\n       * Check if the assigned collections have changed.\n       * example:\n       * - originalAssignedCollections: ['posts', 'pages']\n       * - folderType: ['posts']\n       *\n       * The user is narrowing the types of documents that can be associated with this folder.\n       * If the user is only expanding the types of documents that can be associated with this folder,\n       * we do not need to do anything.\n       */\n      const newCollections = currentlyAssignedCollections\n        ? // user is narrowing the current scope of the folder\n          currentlyAssignedCollections.filter((c) => !typeFieldValue.includes(c))\n        : // user is adding a scope to the folder\n          typeFieldValue\n\n      if (newCollections && newCollections.length > 0) {\n        let dependentCollection: null | string = null\n\n        if (typeof currentParentDocID === 'string' || typeof currentParentDocID === 'number') {\n          // Check each collection being removed for dependent documents\n          for (const collectionSlug of newCollections) {\n            const result = await req.payload.find({\n              collection: collectionSlug,\n              limit: 1,\n              overrideAccess: true,\n              req,\n              where: {\n                [folderFieldName]: { equals: currentParentDocID },\n              },\n            })\n\n            if (result.totalDocs > 0) {\n              dependentCollection = collectionSlug\n              break\n            }\n          }\n\n          // Also check for child folders with these types\n          if (!dependentCollection) {\n            const childFoldersResult = await req.payload.find({\n              collection: foldersSlug,\n              limit: 1,\n              overrideAccess: true,\n              req,\n              where: {\n                and: [\n                  { [typeFieldName]: { in: newCollections } },\n                  { [parentFieldName]: { equals: currentParentDocID } },\n                ],\n              },\n            })\n\n            if (childFoldersResult.totalDocs > 0) {\n              dependentCollection = foldersSlug\n            }\n          }\n        }\n\n        if (dependentCollection) {\n          const translatedLabels = newCollections.map((collectionSlug) => {\n            if (req.payload.collections[collectionSlug]?.config.labels.singular) {\n              return getTranslatedLabel(\n                req.payload.collections[collectionSlug]?.config.labels.plural,\n                req.i18n,\n              )\n            }\n            return collectionSlug\n          })\n\n          const isFolder = dependentCollection === foldersSlug\n          throw new APIError(\n            `The folder \"${data.name || originalDoc.name}\" contains ${isFolder ? 'folders' : 'documents'} that still belong to the following collections: ${translatedLabels.join(', ')}`,\n            400,\n          )\n        }\n\n        return data\n      }\n    } else if (\n      (data?.[typeFieldName] === null ||\n        (Array.isArray(data?.[typeFieldName]) && data?.[typeFieldName].length === 0)) &&\n      newParentDocID\n    ) {\n      // attempting to set the type to catch-all, so we need to ensure that the parent allows this\n      let parentFolder\n      if (typeof newParentDocID === 'string' || typeof newParentDocID === 'number') {\n        try {\n          parentFolder = await req.payload.findByID({\n            id: newParentDocID,\n            collection: foldersSlug,\n            overrideAccess: true,\n            req,\n            select: {\n              name: true,\n              [typeFieldName]: true,\n            },\n            user: req.user,\n          })\n        } catch (_) {\n          // parent folder does not exist\n        }\n      }\n\n      const parentTypeValue = parentFolder?.[typeFieldName]\n      if (\n        parentFolder &&\n        parentTypeValue &&\n        Array.isArray(parentTypeValue) &&\n        parentTypeValue.length > 0\n      ) {\n        throw new APIError(\n          `The folder \"${data?.name || originalDoc.name}\" must have folder-type set since its parent folder ${parentFolder?.name ? `\"${parentFolder?.name}\" ` : ''}has a folder-type set.`,\n          400,\n        )\n      }\n    }\n\n    return data\n  }\n"],"names":["APIError","extractID","getTranslatedLabel","ensureSafeCollectionsChange","folderFieldName","foldersSlug","parentFieldName","typeFieldName","data","originalDoc","req","currentParentDocID","newParentDocID","Array","isArray","length","typeFieldValue","currentlyAssignedCollections","undefined","newCollections","filter","c","includes","dependentCollection","collectionSlug","result","payload","find","collection","limit","overrideAccess","where","equals","totalDocs","childFoldersResult","and","in","translatedLabels","map","collections","config","labels","singular","plural","i18n","isFolder","name","join","parentFolder","findByID","id","select","user","_","parentTypeValue"],"mappings":"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"}
+{"version":3,"sources":["../../../src/hierarchy/hooks/ensureSafeCollectionsChange.ts"],"sourcesContent":["import {\n  APIError,\n  type CollectionBeforeValidateHook,\n  type CollectionSlug,\n  type Where,\n} from '../../index.js'\nimport { extractID } from '../../utilities/extractID.js'\nimport { getTranslatedLabel } from '../../utilities/getTranslatedLabel.js'\n\nexport const ensureSafeCollectionsChange =\n  ({\n    folderFieldName,\n    foldersSlug,\n    parentFieldName = 'folder',\n    typeFieldName = 'hierarchyType',\n  }: {\n    folderFieldName: string\n    foldersSlug: CollectionSlug\n    parentFieldName?: string\n    typeFieldName?: string\n  }): CollectionBeforeValidateHook =>\n  async ({ data, originalDoc, req }) => {\n    const currentParentDocID = extractID(originalDoc || {})\n    const hasSubmittedParent = Object.hasOwn(data ?? {}, parentFieldName)\n    const hasSubmittedTypes = Object.hasOwn(data ?? {}, typeFieldName)\n    const parentValue = hasSubmittedParent\n      ? data?.[parentFieldName]\n      : originalDoc?.[parentFieldName]\n    const newParentDocID = extractID(parentValue || {})\n    const originalParentDocID = extractID(originalDoc?.[parentFieldName] || {})\n    const typeValue = hasSubmittedTypes ? data?.[typeFieldName] : originalDoc?.[typeFieldName]\n    const types = getStringValues(typeValue)\n    const originalTypes = getStringValues(originalDoc?.[typeFieldName])\n\n    const hasParentChange = originalDoc\n      ? newParentDocID !== originalParentDocID\n      : hasSubmittedParent\n    const hasTypeChange = originalDoc\n      ? !haveSameValues({ first: types, second: originalTypes })\n      : hasSubmittedTypes\n\n    const hierarchyConfig = req.payload.collections[foldersSlug]?.config.hierarchy\n    const configuredTypes =\n      hierarchyConfig && typeof hierarchyConfig === 'object'\n        ? Object.keys(hierarchyConfig.relatedCollections)\n        : []\n\n    if ((hasParentChange || hasTypeChange) && newParentDocID) {\n      // Scope inheritance is an integrity constraint, so validate against the parent even when the\n      // requester cannot read it. Only select scope data to avoid exposing inaccessible metadata.\n      const parentFolder = await req.payload.findByID({\n        id: newParentDocID,\n        collection: foldersSlug,\n        overrideAccess: true,\n        req,\n        select: {\n          [typeFieldName]: true,\n        },\n        user: req.user,\n      })\n\n      const parentTypes = Array.isArray(parentFolder[typeFieldName])\n        ? (parentFolder[typeFieldName] as unknown[]).filter(\n            (collectionSlug): collectionSlug is string => typeof collectionSlug === 'string',\n          )\n        : []\n\n      const parentAllowsEveryConfiguredType =\n        configuredTypes.length > 0 &&\n        configuredTypes.every((collectionSlug) => parentTypes.includes(collectionSlug))\n\n      if (parentTypes.length > 0 && !parentAllowsEveryConfiguredType) {\n        if (types.length === 0) {\n          throw new APIError(\n            `The folder \"${data?.name || originalDoc.name}\" must have folder-type set since its parent folder has a folder-type set.`,\n            400,\n          )\n        }\n\n        const disallowedTypes = types.filter(\n          (collectionSlug) => !parentTypes.includes(collectionSlug),\n        )\n\n        if (disallowedTypes.length > 0) {\n          throw new APIError(\n            `The folder \"${data?.name || originalDoc.name}\" cannot allow collection types that its parent does not allow: ${disallowedTypes.join(', ')}`,\n            400,\n          )\n        }\n      }\n    }\n\n    if (Array.isArray(data?.[typeFieldName]) && data[typeFieldName].length > 0) {\n      const typeFieldValue = data[typeFieldName] as string[]\n\n      const currentlyAssignedCollections =\n        Array.isArray(originalDoc?.[typeFieldName]) && originalDoc[typeFieldName].length > 0\n          ? originalDoc[typeFieldName]\n          : configuredTypes\n\n      /**\n       * Check if the assigned collections have changed.\n       * example:\n       * - originalAssignedCollections: ['posts', 'pages']\n       * - folderType: ['posts']\n       *\n       * The user is narrowing the types of documents that can be associated with this folder.\n       * If the user is only expanding the types of documents that can be associated with this folder,\n       * we do not need to do anything.\n       */\n      const newCollections = currentlyAssignedCollections.filter(\n        (collectionSlug) => !typeFieldValue.includes(collectionSlug),\n      )\n\n      if (newCollections && newCollections.length > 0) {\n        let dependentCollection: null | string = null\n\n        if (typeof currentParentDocID === 'string' || typeof currentParentDocID === 'number') {\n          // Check each collection being removed for dependent documents\n          for (const collectionSlug of newCollections) {\n            const result = await req.payload.find({\n              collection: collectionSlug,\n              limit: 1,\n              overrideAccess: true,\n              req,\n              where: {\n                [folderFieldName]: { equals: currentParentDocID },\n              },\n            })\n\n            if (result.totalDocs > 0) {\n              dependentCollection = collectionSlug\n              break\n            }\n          }\n\n          // Also check for child folders whose effective scope is broader than the new scope.\n          if (!dependentCollection) {\n            const childScopeConditions: Where[] = [{ [typeFieldName]: { in: newCollections } }]\n            const newScopeAllowsEveryConfiguredType = configuredTypes.every((collectionSlug) =>\n              typeFieldValue.includes(collectionSlug),\n            )\n\n            if (!newScopeAllowsEveryConfiguredType) {\n              childScopeConditions.push(\n                { [typeFieldName]: { exists: false } },\n                { [typeFieldName]: { not_in: configuredTypes } },\n              )\n            }\n\n            const childFoldersResult = await req.payload.find({\n              collection: foldersSlug,\n              limit: 1,\n              overrideAccess: true,\n              req,\n              where: {\n                and: [\n                  { [parentFieldName]: { equals: currentParentDocID } },\n                  { or: childScopeConditions },\n                ],\n              },\n            })\n\n            if (childFoldersResult.totalDocs > 0) {\n              dependentCollection = foldersSlug\n            }\n          }\n        }\n\n        if (dependentCollection) {\n          const translatedLabels = newCollections.map((collectionSlug) => {\n            if (req.payload.collections[collectionSlug]?.config.labels.singular) {\n              return getTranslatedLabel(\n                req.payload.collections[collectionSlug]?.config.labels.plural,\n                req.i18n,\n              )\n            }\n            return collectionSlug\n          })\n\n          const isFolder = dependentCollection === foldersSlug\n          throw new APIError(\n            `The folder \"${data.name || originalDoc.name}\" contains ${isFolder ? 'folders' : 'documents'} that still belong to the following collections: ${translatedLabels.join(', ')}`,\n            400,\n          )\n        }\n\n        return data\n      }\n    }\n\n    return data\n  }\n\nfunction getStringValues(value: unknown): string[] {\n  return Array.isArray(value)\n    ? value.filter((item): item is string => typeof item === 'string')\n    : []\n}\n\nfunction haveSameValues({ first, second }: { first: string[]; second: string[] }): boolean {\n  return first.length === second.length && first.every((value) => second.includes(value))\n}\n"],"names":["APIError","extractID","getTranslatedLabel","ensureSafeCollectionsChange","folderFieldName","foldersSlug","parentFieldName","typeFieldName","data","originalDoc","req","currentParentDocID","hasSubmittedParent","Object","hasOwn","hasSubmittedTypes","parentValue","newParentDocID","originalParentDocID","typeValue","types","getStringValues","originalTypes","hasParentChange","hasTypeChange","haveSameValues","first","second","hierarchyConfig","payload","collections","config","hierarchy","configuredTypes","keys","relatedCollections","parentFolder","findByID","id","collection","overrideAccess","select","user","parentTypes","Array","isArray","filter","collectionSlug","parentAllowsEveryConfiguredType","length","every","includes","name","disallowedTypes","join","typeFieldValue","currentlyAssignedCollections","newCollections","dependentCollection","result","find","limit","where","equals","totalDocs","childScopeConditions","in","newScopeAllowsEveryConfiguredType","push","exists","not_in","childFoldersResult","and","or","translatedLabels","map","labels","singular","plural","i18n","isFolder","value","item"],"mappings":"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"}

package/dist/hierarchy/injectHierarchyButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"injectHierarchyButton.d.ts","sourceRoot":"","sources":["../../src/hierarchy/injectHierarchyButton.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEtE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,sEAKnC;IACD,UAAU,EAAE,gBAAgB,CAAA;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,uBAAuB,EAAE,MAAM,CAAA;IAC/B,eAAe,EAAE,MAAM,CAAA;CACxB,KAAG,IAiCH,CAAA"}
+{"version":3,"file":"injectHierarchyButton.d.ts","sourceRoot":"","sources":["../../src/hierarchy/injectHierarchyButton.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEtE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,yEAK/B;IACD,UAAU,EAAE,gBAAgB,CAAA;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,uBAAuB,EAAE,MAAM,CAAA;IAC/B,eAAe,EAAE,MAAM,CAAA;CACxB,KAAG,IAiCH,CAAA"}

package/dist/hierarchy/resolveHierarchyCollections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveHierarchyCollections.d.ts","sourceRoot":"","sources":["../../src/hierarchy/resolveHierarchyCollections.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAuBhD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,2BAA2B,GAAI,QAAQ,MAAM,KAAG,IAiJ5D,CAAA"}
+{"version":3,"file":"resolveHierarchyCollections.d.ts","sourceRoot":"","sources":["../../src/hierarchy/resolveHierarchyCollections.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAuBhD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,2BAA2B,WAAY,MAAM,KAAG,IAiJ5D,CAAA"}

package/dist/hierarchy/resolveHierarchyCollections.js

@@ -93,7 +93,7 @@ import { injectHierarchyButton } from './injectHierarchyButton.js';
         if (hierarchyConfig.collectionSpecific) {
             injectTypeField({
                 config,
-                hierarchyCollection: hierarchyCollection,
+                hierarchyCollection,
                 parentFieldName: hierarchyConfig.parentFieldName,
                 sanitizedRelatedCollections,
                 typeFieldName: hierarchyConfig.collectionSpecific.fieldName
@@ -116,7 +116,7 @@ import { injectHierarchyButton } from './injectHierarchyButton.js';
         // Add afterDelete hook to clear folder references from related documents
         if (Object.keys(sanitizedRelatedCollections).length > 0) {
             injectAfterDeleteHook({
-                hierarchyCollection: hierarchyCollection,
+                hierarchyCollection,
                 sanitizedRelatedCollections
             });
         }
@@ -151,17 +151,30 @@ import { injectHierarchyButton } from './injectHierarchyButton.js';
                 return existingResult;
             }
         }
-        // No hierarchy selected, no validation needed
-        if (!value) {
-            return true;
-        }
-        const { collectionSlug, overrideAccess, previousValue, req } = options;
-        const newID = extractID(value);
-        // Value didn't change, no validation needed
-        if (previousValue && extractID(previousValue) === newID) {
-            return true;
+        return validateCollectionSpecificHierarchy({
+            hierarchySlug,
+            options,
+            typeFieldName,
+            value
+        });
+    };
+    hierarchyField.validate = validate;
+}
+const validateCollectionSpecificHierarchy = async ({ hierarchySlug, options, typeFieldName, value })=>{
+    if (!value || Array.isArray(value) && value.length === 0) {
+        return true;
+    }
+    const { collectionSlug, overrideAccess, previousValue, req } = options;
+    const newIDs = (Array.isArray(value) ? value : [
+        value
+    ]).map((item)=>extractID(item));
+    const previousIDs = new Set((Array.isArray(previousValue) ? previousValue : previousValue ? [
+        previousValue
+    ] : []).map((item)=>extractID(item)));
+    for (const newID of newIDs){
+        if (previousIDs.has(newID)) {
+            continue;
         }
-        // Fetch the hierarchy item to check its type field
         let parentItem = null;
         if (typeof newID === 'string' || typeof newID === 'number') {
             try {
@@ -183,18 +196,13 @@ import { injectHierarchyButton } from './injectHierarchyButton.js';
             return `Hierarchy item with ID ${newID} not found`;
         }
         const allowedTypes = parentItem[typeFieldName] || [];
-        // If hierarchy has no types, it accepts all collections
-        if (allowedTypes.length === 0) {
-            return true;
-        }
-        // Check if this collection is allowed
-        if (collectionSlug && allowedTypes.includes(collectionSlug)) {
-            return true;
+        if (allowedTypes.length === 0 || collectionSlug && allowedTypes.includes(collectionSlug)) {
+            continue;
         }
         return `Hierarchy item "${newID}" does not allow documents of type "${collectionSlug}"`;
-    };
-    hierarchyField.validate = validate;
-}
+    }
+    return true;
+};
 /**
  * Injects the hierarchyType select field into a hierarchy collection.
  */ function injectTypeField({ config, hierarchyCollection, parentFieldName, sanitizedRelatedCollections, typeFieldName }) {
@@ -221,10 +229,17 @@ import { injectHierarchyButton } from './injectHierarchyButton.js';
             position: 'sidebar'
         },
         hasMany: true,
+        label: ({ t })=>t('general:allowedTypes'),
         options: collectionOptions
     };
     hierarchyCollection.fields = hierarchyCollection.fields || [];
-    hierarchyCollection.fields.push(typeField);
+    // This can run again on the same `fields` array, so replace the field if it already exists
+    const existingTypeFieldIndex = hierarchyCollection.fields.findIndex((field)=>fieldAffectsData(field) && field.name === typeFieldName);
+    if (existingTypeFieldIndex === -1) {
+        hierarchyCollection.fields.push(typeField);
+    } else {
+        hierarchyCollection.fields[existingTypeFieldIndex] = typeField;
+    }
     // Recompute flattenedFields since we added a field after initial sanitization
     // This is required for the field to be queryable
     if ('flattenedFields' in hierarchyCollection) {