@payloadcms/drizzle 4.0.0-internal.a6582c6 → 4.0.0-internal.a9d2e4e

package/dist/find/findMany.js

@@ -1,11 +1,12 @@
-import { asc, desc, inArray, max, min } from 'drizzle-orm';
+import { and, asc, desc, inArray, max, min, sql } from 'drizzle-orm';
+import { buildBranchVisibility } from '../queries/buildBranchVisibility.js';
 import { buildQuery } from '../queries/buildQuery.js';
 import { selectDistinct } from '../queries/selectDistinct.js';
 import { transform } from '../transform/read/index.js';
 import { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js';
 import { getTransaction } from '../utilities/getTransaction.js';
 import { buildFindManyArgs } from './buildFindManyArgs.js';
-export const findMany = async function find({ adapter, collectionSlug, draftsEnabled, fields, joins: joinQuery, limit: limitArg, locale, page = 1, pagination, req, select, sort, tableName, versions, where: whereArg }) {
+export const findMany = async function find({ adapter, branchVisibility, collectionSlug, draftsEnabled, fields, joins: joinQuery, limit: limitArg, locale, page = 1, pagination, req, select, sort, tableName, versions, where: whereArg }) {
     let limit = limitArg;
     let totalDocs;
     let totalPages;
@@ -17,14 +18,25 @@ export const findMany = async function find({ adapter, collectionSlug, draftsEna
         pagination = false;
         limit = undefined;
     }
-    const { joins, orderBy, selectFields, where } = buildQuery({
+    const { joins, orderBy, selectFields, where: queryWhere } = buildQuery({
         adapter,
         fields,
         locale,
+        req,
         sort,
         tableName,
         where: whereArg
     });
+    const table = adapter.tables[tableName];
+    const branchVisibilityWhere = branchVisibility ? buildBranchVisibility({
+        adapter,
+        branch: branchVisibility.branch,
+        canonicalIDExpression: versions ? sql`COALESCE(${table._branchParent}, ${table.parent})` : undefined,
+        collectionSlug: branchVisibility.collectionSlug,
+        mode: branchVisibility.mode,
+        table
+    }) : undefined;
+    const where = branchVisibilityWhere ? and(queryWhere, branchVisibilityWhere) : queryWhere;
     const orderedIDMap = {};
     let orderedIDs;
     const findManyArgs = buildFindManyArgs({
@@ -36,6 +48,7 @@ export const findMany = async function find({ adapter, collectionSlug, draftsEna
         joinQuery,
         joins,
         locale,
+        req,
         select,
         tableName,
         versions

package/dist/find/findMany.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/find/findMany.ts"],"sourcesContent":["import type { FindArgs, FlattenedField, TypeWithID } from 'payload'\n\nimport { asc, desc, inArray, max, min } from 'drizzle-orm'\n\nimport type { DrizzleAdapter } from '../types.js'\n\nimport { buildQuery } from '../queries/buildQuery.js'\nimport { selectDistinct } from '../queries/selectDistinct.js'\nimport { transform } from '../transform/read/index.js'\nimport { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js'\nimport { getTransaction } from '../utilities/getTransaction.js'\nimport { buildFindManyArgs } from './buildFindManyArgs.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  collectionSlug?: string\n  fields: FlattenedField[]\n  tableName: string\n  versions?: boolean\n} & Omit<FindArgs, 'collection'>\n\nexport const findMany = async function find({\n  adapter,\n  collectionSlug,\n  draftsEnabled,\n  fields,\n  joins: joinQuery,\n  limit: limitArg,\n  locale,\n  page = 1,\n  pagination,\n  req,\n  select,\n  sort,\n  tableName,\n  versions,\n  where: whereArg,\n}: Args) {\n  let limit = limitArg\n  let totalDocs: number\n  let totalPages: number\n  let hasPrevPage: boolean\n  let hasNextPage: boolean\n  let pagingCounter: number\n  const offset = (page - 1) * limit\n\n  if (limit === 0) {\n    pagination = false\n    limit = undefined\n  }\n\n  const { joins, orderBy, selectFields, where } = buildQuery({\n    adapter,\n    fields,\n    locale,\n    sort,\n    tableName,\n    where: whereArg,\n  })\n\n  const orderedIDMap: Record<number | string, number> = {}\n  let orderedIDs: (number | string)[]\n\n  const findManyArgs = buildFindManyArgs({\n    adapter,\n    collectionSlug,\n    depth: 0,\n    draftsEnabled,\n    fields,\n    joinQuery,\n    joins,\n    locale,\n    select,\n    tableName,\n    versions,\n  })\n\n  if (orderBy) {\n    for (const key in selectFields) {\n      const column = selectFields[key]\n      if (!column || column.primary) {\n        continue\n      }\n\n      if (\n        !orderBy.some(\n          (col) =>\n            col.column.name === column.name &&\n            getNameFromDrizzleTable(col.column.table) === getNameFromDrizzleTable(column.table),\n        )\n      ) {\n        delete selectFields[key]\n      }\n    }\n  }\n\n  const db = await getTransaction(adapter, req)\n\n  const oneToManyJoinedTableNames = new Set(\n    joins.filter((j) => j.isOneToMany).map((j) => getNameFromDrizzleTable(j.table)),\n  )\n\n  const hasSortOnOneToMany =\n    oneToManyJoinedTableNames.size > 0 &&\n    orderBy?.some(({ column }) =>\n      oneToManyJoinedTableNames.has(getNameFromDrizzleTable(column.table)),\n    )\n\n  let selectDistinctResult: { id: number | string }[] | undefined\n\n  // avoid duplicate results by using a group query instead of select distinct when there is a sort on a one-to-many joined table\n  if (hasSortOnOneToMany) {\n    const mainTable = adapter.tables[tableName]\n    let groupQuery = (db as any).select({ id: mainTable.id }).from(mainTable).$dynamic()\n\n    if (where) {\n      groupQuery = groupQuery.where(where)\n    }\n\n    joins.forEach(({ type, condition, table }) => {\n      groupQuery = groupQuery[type ?? 'leftJoin'](table, condition)\n    })\n\n    groupQuery = groupQuery.groupBy(mainTable.id)\n\n    groupQuery = groupQuery.orderBy(() =>\n      orderBy.map(({ column, order }) => {\n        if (oneToManyJoinedTableNames.has(getNameFromDrizzleTable(column.table))) {\n          return order === asc ? asc(min(column)) : desc(max(column))\n        }\n        return order(column)\n      }),\n    )\n\n    selectDistinctResult = await groupQuery.offset(offset).limit(limit)\n  } else {\n    selectDistinctResult = await selectDistinct({\n      adapter,\n      db,\n      joins,\n      query: ({ query }) => {\n        if (orderBy) {\n          query = query.orderBy(() => orderBy.map(({ column, order }) => order(column)))\n        }\n        return query.offset(offset).limit(limit)\n      },\n      selectFields,\n      tableName,\n      where,\n    })\n  }\n\n  if (selectDistinctResult) {\n    if (selectDistinctResult.length === 0) {\n      return {\n        docs: [],\n        hasNextPage: false,\n        hasPrevPage: false,\n        limit,\n        nextPage: null,\n        page: 1,\n        pagingCounter: 0,\n        prevPage: null,\n        totalDocs: 0,\n        totalPages: 0,\n      }\n    } else {\n      // set the id in an object for sorting later\n      selectDistinctResult.forEach(({ id }, i) => {\n        orderedIDMap[id] = i\n      })\n      orderedIDs = Object.keys(orderedIDMap)\n      findManyArgs.where = inArray(adapter.tables[tableName].id, orderedIDs)\n    }\n  } else {\n    findManyArgs.limit = limit\n    findManyArgs.offset = offset\n    findManyArgs.orderBy = () => orderBy.map(({ column, order }) => order(column))\n\n    if (where) {\n      findManyArgs.where = where\n    }\n  }\n\n  const findPromise = db.query[tableName].findMany(findManyArgs)\n\n  if (pagination !== false && (orderedIDs ? orderedIDs?.length <= limit : true)) {\n    totalDocs = await adapter.countDistinct({\n      db,\n      joins,\n      tableName,\n      where,\n    })\n\n    totalPages = typeof limit === 'number' && limit !== 0 ? Math.ceil(totalDocs / limit) : 1\n    hasPrevPage = page > 1\n    hasNextPage = totalPages > page\n    pagingCounter = (page - 1) * limit + 1\n  }\n\n  const rawDocs = await findPromise\n  // sort rawDocs from selectQuery\n  if (Object.keys(orderedIDMap).length > 0) {\n    rawDocs.sort((a, b) => orderedIDMap[a.id] - orderedIDMap[b.id])\n  }\n\n  if (pagination === false || !totalDocs) {\n    totalDocs = rawDocs.length\n    totalPages = 1\n    pagingCounter = 1\n    hasPrevPage = false\n    hasNextPage = false\n  }\n\n  const docs = rawDocs.map((data: TypeWithID) => {\n    return transform({\n      adapter,\n      config: adapter.payload.config,\n      data,\n      fields,\n      joinQuery,\n      tableName,\n    })\n  })\n\n  return {\n    docs,\n    hasNextPage,\n    hasPrevPage,\n    limit: limitArg,\n    nextPage: hasNextPage ? page + 1 : null,\n    page,\n    pagingCounter,\n    prevPage: hasPrevPage ? page - 1 : null,\n    totalDocs,\n    totalPages,\n  }\n}\n"],"names":["asc","desc","inArray","max","min","buildQuery","selectDistinct","transform","getNameFromDrizzleTable","getTransaction","buildFindManyArgs","findMany","find","adapter","collectionSlug","draftsEnabled","fields","joins","joinQuery","limit","limitArg","locale","page","pagination","req","select","sort","tableName","versions","where","whereArg","totalDocs","totalPages","hasPrevPage","hasNextPage","pagingCounter","offset","undefined","orderBy","selectFields","orderedIDMap","orderedIDs","findManyArgs","depth","key","column","primary","some","col","name","table","db","oneToManyJoinedTableNames","Set","filter","j","isOneToMany","map","hasSortOnOneToMany","size","has","selectDistinctResult","mainTable","tables","groupQuery","id","from","$dynamic","forEach","type","condition","groupBy","order","query","length","docs","nextPage","prevPage","i","Object","keys","findPromise","countDistinct","Math","ceil","rawDocs","a","b","data","config","payload"],"mappings":"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"}
+{"version":3,"sources":["../../src/find/findMany.ts"],"sourcesContent":["import type { FindArgs, FlattenedField, TypeWithID } from 'payload'\n\nimport { and, asc, desc, inArray, max, min, sql } from 'drizzle-orm'\n\nimport type { DrizzleAdapter } from '../types.js'\n\nimport { buildBranchVisibility } from '../queries/buildBranchVisibility.js'\nimport { buildQuery } from '../queries/buildQuery.js'\nimport { selectDistinct } from '../queries/selectDistinct.js'\nimport { transform } from '../transform/read/index.js'\nimport { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js'\nimport { getTransaction } from '../utilities/getTransaction.js'\nimport { buildFindManyArgs } from './buildFindManyArgs.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  branchVisibility?: {\n    branch: string\n    collectionSlug: string\n    mode?: 'documents' | 'history'\n  }\n  collectionSlug?: string\n  fields: FlattenedField[]\n  tableName: string\n  versions?: boolean\n} & Omit<FindArgs, 'collection'>\n\nexport const findMany = async function find({\n  adapter,\n  branchVisibility,\n  collectionSlug,\n  draftsEnabled,\n  fields,\n  joins: joinQuery,\n  limit: limitArg,\n  locale,\n  page = 1,\n  pagination,\n  req,\n  select,\n  sort,\n  tableName,\n  versions,\n  where: whereArg,\n}: Args) {\n  let limit = limitArg\n  let totalDocs: number\n  let totalPages: number\n  let hasPrevPage: boolean\n  let hasNextPage: boolean\n  let pagingCounter: number\n  const offset = (page - 1) * limit\n\n  if (limit === 0) {\n    pagination = false\n    limit = undefined\n  }\n\n  const {\n    joins,\n    orderBy,\n    selectFields,\n    where: queryWhere,\n  } = buildQuery({\n    adapter,\n    fields,\n    locale,\n    req,\n    sort,\n    tableName,\n    where: whereArg,\n  })\n  const table = adapter.tables[tableName]\n  const branchVisibilityWhere = branchVisibility\n    ? buildBranchVisibility({\n        adapter,\n        branch: branchVisibility.branch,\n        canonicalIDExpression: versions\n          ? sql`COALESCE(${table._branchParent}, ${table.parent})`\n          : undefined,\n        collectionSlug: branchVisibility.collectionSlug,\n        mode: branchVisibility.mode,\n        table,\n      })\n    : undefined\n  const where = branchVisibilityWhere ? and(queryWhere, branchVisibilityWhere) : queryWhere\n\n  const orderedIDMap: Record<number | string, number> = {}\n  let orderedIDs: (number | string)[]\n\n  const findManyArgs = buildFindManyArgs({\n    adapter,\n    collectionSlug,\n    depth: 0,\n    draftsEnabled,\n    fields,\n    joinQuery,\n    joins,\n    locale,\n    req,\n    select,\n    tableName,\n    versions,\n  })\n\n  if (orderBy) {\n    for (const key in selectFields) {\n      const column = selectFields[key]\n      if (!column || column.primary) {\n        continue\n      }\n\n      if (\n        !orderBy.some(\n          (col) =>\n            col.column.name === column.name &&\n            getNameFromDrizzleTable(col.column.table) === getNameFromDrizzleTable(column.table),\n        )\n      ) {\n        delete selectFields[key]\n      }\n    }\n  }\n\n  const db = await getTransaction(adapter, req)\n\n  const oneToManyJoinedTableNames = new Set(\n    joins.filter((j) => j.isOneToMany).map((j) => getNameFromDrizzleTable(j.table)),\n  )\n\n  const hasSortOnOneToMany =\n    oneToManyJoinedTableNames.size > 0 &&\n    orderBy?.some(({ column }) =>\n      oneToManyJoinedTableNames.has(getNameFromDrizzleTable(column.table)),\n    )\n\n  let selectDistinctResult: { id: number | string }[] | undefined\n\n  // avoid duplicate results by using a group query instead of select distinct when there is a sort on a one-to-many joined table\n  if (hasSortOnOneToMany) {\n    const mainTable = adapter.tables[tableName]\n    let groupQuery = (db as any).select({ id: mainTable.id }).from(mainTable).$dynamic()\n\n    if (where) {\n      groupQuery = groupQuery.where(where)\n    }\n\n    joins.forEach(({ type, condition, table }) => {\n      groupQuery = groupQuery[type ?? 'leftJoin'](table, condition)\n    })\n\n    groupQuery = groupQuery.groupBy(mainTable.id)\n\n    groupQuery = groupQuery.orderBy(() =>\n      orderBy.map(({ column, order }) => {\n        if (oneToManyJoinedTableNames.has(getNameFromDrizzleTable(column.table))) {\n          return order === asc ? asc(min(column)) : desc(max(column))\n        }\n        return order(column)\n      }),\n    )\n\n    selectDistinctResult = await groupQuery.offset(offset).limit(limit)\n  } else {\n    selectDistinctResult = await selectDistinct({\n      adapter,\n      db,\n      joins,\n      query: ({ query }) => {\n        if (orderBy) {\n          query = query.orderBy(() => orderBy.map(({ column, order }) => order(column)))\n        }\n        return query.offset(offset).limit(limit)\n      },\n      selectFields,\n      tableName,\n      where,\n    })\n  }\n\n  if (selectDistinctResult) {\n    if (selectDistinctResult.length === 0) {\n      return {\n        docs: [],\n        hasNextPage: false,\n        hasPrevPage: false,\n        limit,\n        nextPage: null,\n        page: 1,\n        pagingCounter: 0,\n        prevPage: null,\n        totalDocs: 0,\n        totalPages: 0,\n      }\n    } else {\n      // set the id in an object for sorting later\n      selectDistinctResult.forEach(({ id }, i) => {\n        orderedIDMap[id] = i\n      })\n      orderedIDs = Object.keys(orderedIDMap)\n      findManyArgs.where = inArray(adapter.tables[tableName].id, orderedIDs)\n    }\n  } else {\n    findManyArgs.limit = limit\n    findManyArgs.offset = offset\n    findManyArgs.orderBy = () => orderBy.map(({ column, order }) => order(column))\n\n    if (where) {\n      findManyArgs.where = where\n    }\n  }\n\n  const findPromise = db.query[tableName].findMany(findManyArgs)\n\n  if (pagination !== false && (orderedIDs ? orderedIDs?.length <= limit : true)) {\n    totalDocs = await adapter.countDistinct({\n      db,\n      joins,\n      tableName,\n      where,\n    })\n\n    totalPages = typeof limit === 'number' && limit !== 0 ? Math.ceil(totalDocs / limit) : 1\n    hasPrevPage = page > 1\n    hasNextPage = totalPages > page\n    pagingCounter = (page - 1) * limit + 1\n  }\n\n  const rawDocs = await findPromise\n  // sort rawDocs from selectQuery\n  if (Object.keys(orderedIDMap).length > 0) {\n    rawDocs.sort((a, b) => orderedIDMap[a.id] - orderedIDMap[b.id])\n  }\n\n  if (pagination === false || !totalDocs) {\n    totalDocs = rawDocs.length\n    totalPages = 1\n    pagingCounter = 1\n    hasPrevPage = false\n    hasNextPage = false\n  }\n\n  const docs = rawDocs.map((data: TypeWithID) => {\n    return transform({\n      adapter,\n      config: adapter.payload.config,\n      data,\n      fields,\n      joinQuery,\n      tableName,\n    })\n  })\n\n  return {\n    docs,\n    hasNextPage,\n    hasPrevPage,\n    limit: limitArg,\n    nextPage: hasNextPage ? page + 1 : null,\n    page,\n    pagingCounter,\n    prevPage: hasPrevPage ? page - 1 : null,\n    totalDocs,\n    totalPages,\n  }\n}\n"],"names":["and","asc","desc","inArray","max","min","sql","buildBranchVisibility","buildQuery","selectDistinct","transform","getNameFromDrizzleTable","getTransaction","buildFindManyArgs","findMany","find","adapter","branchVisibility","collectionSlug","draftsEnabled","fields","joins","joinQuery","limit","limitArg","locale","page","pagination","req","select","sort","tableName","versions","where","whereArg","totalDocs","totalPages","hasPrevPage","hasNextPage","pagingCounter","offset","undefined","orderBy","selectFields","queryWhere","table","tables","branchVisibilityWhere","branch","canonicalIDExpression","_branchParent","parent","mode","orderedIDMap","orderedIDs","findManyArgs","depth","key","column","primary","some","col","name","db","oneToManyJoinedTableNames","Set","filter","j","isOneToMany","map","hasSortOnOneToMany","size","has","selectDistinctResult","mainTable","groupQuery","id","from","$dynamic","forEach","type","condition","groupBy","order","query","length","docs","nextPage","prevPage","i","Object","keys","findPromise","countDistinct","Math","ceil","rawDocs","a","b","data","config","payload"],"mappings":"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"}

package/dist/find/traverseFields.d.ts

@@ -1,4 +1,4 @@
-import { type FlattenedField, type JoinQuery, type SelectMode, type SelectType } from 'payload';
+import type { FlattenedField, JoinQuery, PayloadRequest, SelectMode, SelectType } from 'payload';
 import type { BuildQueryJoinAliases, DrizzleAdapter } from '../types.js';
 import type { Result } from './buildFindManyArgs.js';
 type TraverseFieldArgs = {
@@ -16,6 +16,7 @@ type TraverseFieldArgs = {
     locale?: string;
     parentIsLocalized?: boolean;
     path: string;
+    req?: Partial<PayloadRequest>;
     select?: SelectType;
     selectAllOnCurrentLevel?: boolean;
     selectMode?: SelectMode;
@@ -29,6 +30,6 @@ type TraverseFieldArgs = {
         texts?: boolean;
     };
 };
-export declare const traverseFields: ({ _locales, adapter, collectionSlug, currentArgs, currentTableName, depth, draftsEnabled, fields, forceWithFields, joinQuery, joins, locale, parentIsLocalized, path, select, selectAllOnCurrentLevel, selectMode, tablePath, topLevelArgs, topLevelTableName, versions, withTabledFields, }: TraverseFieldArgs) => Record<string, unknown>;
+export declare const traverseFields: ({ _locales, adapter, collectionSlug, currentArgs, currentTableName, depth, draftsEnabled, fields, forceWithFields, joinQuery, joins, locale, parentIsLocalized, path, req, select, selectAllOnCurrentLevel, selectMode, tablePath, topLevelArgs, topLevelTableName, versions, withTabledFields, }: TraverseFieldArgs) => Record<string, unknown>;
 export {};
 //# sourceMappingURL=traverseFields.d.ts.map

package/dist/find/traverseFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,KAAK,cAAc,EAGnB,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,UAAU,EAEhB,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AA6EpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE;QAChB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;CACF,CAAA;AAED,eAAO,MAAM,cAAc,iSAuBxB,iBAAiB,4BAkyBnB,CAAA"}
+{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,SAAS,EACT,cAAc,EACd,UAAU,EACV,UAAU,EAEX,MAAM,SAAS,CAAA;AAgBhB,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAiB,MAAM,aAAa,CAAA;AACvF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAepD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE;QAChB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;CACF,CAAA;AAED,eAAO,MAAM,cAAc,sSAwBxB,iBAAiB,4BAitBnB,CAAA"}

package/dist/find/traverseFields.js

@@ -1,75 +1,17 @@
-import { and, asc, count, desc, eq, getTableName, or, sql } from 'drizzle-orm';
-import { appendVersionToQueryKey, buildVersionCollectionFields, combineQueries, getFieldByPath, getQueryDraftsSort } from 'payload';
+import { and, count, sql } from 'drizzle-orm';
+import { appendVersionToQueryKey, buildVersionCollectionFields, combineQueries, getBranchPredicateSync, getQueryDraftsSort, resolveBranchReadState, resolveBranchVersionQuerySync, rewriteBranchVersionParents } from 'payload';
 import { fieldIsVirtual, fieldShouldBeLocalized, hasDraftsEnabled } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
+import { buildBranchVisibility } from '../queries/buildBranchVisibility.js';
 import { buildQuery } from '../queries/buildQuery.js';
 import { getTableAlias } from '../queries/getTableAlias.js';
-import { operatorMap } from '../queries/operatorMap.js';
 import { getArrayRelationName } from '../utilities/getArrayRelationName.js';
 import { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js';
 import { jsonAggBuildObject } from '../utilities/json.js';
 import { rawConstraint } from '../utilities/rawConstraint.js';
-import { sanitizePathSegment } from '../utilities/sanitizePathSegment.js';
 import { InternalBlockTableNameIndex, resolveBlockTableName } from '../utilities/validateExistingBlockIsIdentical.js';
-const flattenAllWherePaths = (where, paths)=>{
-    for(const k in where){
-        if ([
-            'AND',
-            'OR'
-        ].includes(k.toUpperCase())) {
-            if (Array.isArray(where[k])) {
-                for (const whereField of where[k]){
-                    flattenAllWherePaths(whereField, paths);
-                }
-            }
-        } else {
-            // TODO: explore how to support arrays/relationship querying.
-            paths.push({
-                path: k.split('.').join('_'),
-                ref: where
-            });
-        }
-    }
-};
-const buildSQLWhere = (where, alias)=>{
-    for(const k in where){
-        if ([
-            'AND',
-            'OR'
-        ].includes(k.toUpperCase())) {
-            if (Array.isArray(where[k])) {
-                const op = 'AND' === k.toUpperCase() ? and : or;
-                const accumulated = [];
-                for (const whereField of where[k]){
-                    accumulated.push(buildSQLWhere(whereField, alias));
-                }
-                return op(...accumulated);
-            }
-        } else {
-            let payloadOperator = Object.keys(where[k])[0];
-            const value = where[k][payloadOperator];
-            if (payloadOperator === '$raw') {
-                if (typeof value !== 'string') {
-                    return undefined;
-                }
-                return sql.raw(value);
-            }
-            // Handle exists: false -> use isNull instead of isNotNull
-            // This logic is duplicated from sanitizeQueryValue.ts because buildSQLWhere
-            // is a simplified WHERE builder for polymorphic joins that doesn't have access
-            // to field definitions needed by sanitizeQueryValue
-            if (payloadOperator === 'exists' && value === false) {
-                payloadOperator = 'isNull';
-            }
-            if (!(payloadOperator in operatorMap)) {
-                return undefined;
-            }
-            const sanitizedColumnName = k.split('.').map((s)=>sanitizePathSegment(s)).join('_');
-            return operatorMap[payloadOperator](sql.raw(`"${alias}"."${sanitizedColumnName}"`), value);
-        }
-    }
-};
-export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs, currentTableName, depth, draftsEnabled, fields, forceWithFields, joinQuery = {}, joins, locale, parentIsLocalized = false, path, select, selectAllOnCurrentLevel = false, selectMode, tablePath, topLevelArgs, topLevelTableName, versions, withTabledFields })=>{
+import { buildPolymorphicJoinQuery } from './buildPolymorphicJoinQuery.js';
+export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs, currentTableName, depth, draftsEnabled, fields, forceWithFields, joinQuery = {}, joins, locale, parentIsLocalized = false, path, req, select, selectAllOnCurrentLevel = false, selectMode, tablePath, topLevelArgs, topLevelTableName, versions, withTabledFields })=>{
     fields.forEach((field)=>{
         if (fieldIsVirtual(field)) {
             return;
@@ -147,6 +89,7 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                         locale,
                         parentIsLocalized: parentIsLocalized || field.localized,
                         path: '',
+                        req,
                         select: typeof arraySelect === 'object' ? arraySelect : undefined,
                         selectMode,
                         tablePath: '',
@@ -243,6 +186,7 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                                 locale,
                                 parentIsLocalized: parentIsLocalized || field.localized,
                                 path: '',
+                                req,
                                 select: typeof blockSelect === 'object' ? blockSelect : undefined,
                                 selectMode: blockSelectMode,
                                 tablePath: '',
@@ -279,6 +223,7 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                         locale,
                         parentIsLocalized: parentIsLocalized || field.localized,
                         path: `${path}${field.name}_`,
+                        req,
                         select: typeof fieldSelect === 'object' ? fieldSelect : undefined,
                         selectAllOnCurrentLevel: selectAllOnCurrentLevel || fieldSelect === true || selectMode === 'exclude' && typeof fieldSelect === 'undefined',
                         selectMode,
@@ -309,145 +254,42 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                         // get an additional document and slice it later to determine if there is a next page
                         limit += 1;
                     }
-                    const columnName = `${path.replaceAll('.', '_')}${field.name}`;
-                    const db = adapter.drizzle;
                     if (Array.isArray(field.collection)) {
-                        let currentQuery = null;
-                        const onPath = field.on.split('.').join('_');
-                        if (Array.isArray(sort)) {
-                            throw new Error('Not implemented');
-                        }
-                        let sanitizedSort = sort;
-                        if (!sanitizedSort) {
-                            if (field.collection.some((collection)=>adapter.payload.collections[collection].config.fields.some((f)=>f.type === 'date' && f.name === 'createdAt'))) {
-                                sanitizedSort = '-createdAt';
-                            } else {
-                                sanitizedSort = 'id';
-                            }
-                        }
-                        const sortOrder = sanitizedSort.startsWith('-') ? desc : asc;
-                        sanitizedSort = sanitizedSort.replace('-', '');
-                        const sortPath = sanitizedSort.split('.').join('_');
-                        const wherePaths = [];
-                        if (where) {
-                            flattenAllWherePaths(where, wherePaths);
-                        }
-                        for (const collection of field.collection){
-                            const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(collection));
-                            const table = adapter.tables[joinCollectionTableName];
-                            const sortColumn = table[sortPath];
-                            const selectFields = {
-                                id: adapter.tables[joinCollectionTableName].id,
-                                parent: sql`${adapter.tables[joinCollectionTableName][onPath]}`.as(onPath),
-                                relationTo: sql`${collection}`.as('relationTo'),
-                                sortPath: sql`${sortColumn ? sortColumn : null}`.as('sortPath')
-                            };
-                            const collectionQueryWhere = [];
-                            // Select for WHERE and Fallback NULL
-                            for (const { path, ref } of wherePaths){
-                                const collectioConfig = adapter.payload.collections[collection].config;
-                                const field = getFieldByPath({
-                                    fields: collectioConfig.flattenedFields,
-                                    path
-                                });
-                                if (field && field.field.type === 'select' && field.field.hasMany) {
-                                    let tableName = adapter.tableNameMap.get(`${toSnakeCase(collection)}_${toSnakeCase(path)}`);
-                                    let parentTable = getTableName(table);
-                                    if (adapter.schemaName) {
-                                        tableName = `"${adapter.schemaName}"."${tableName}"`;
-                                        parentTable = `"${adapter.schemaName}"."${parentTable}"`;
-                                    }
-                                    if (adapter.name === 'postgres') {
-                                        selectFields[path] = sql.raw(`(select jsonb_agg(${tableName}.value) from ${tableName} where ${tableName}.parent_id = ${parentTable}.id)`).as(path);
-                                    } else {
-                                        selectFields[path] = sql.raw(`(select json_group_array(${tableName}.value) from ${tableName} where ${tableName}.parent_id = ${parentTable}.id)`).as(path);
-                                    }
-                                    const constraint = ref[path];
-                                    const operator = Object.keys(constraint)[0];
-                                    const value = Object.values(constraint)[0];
-                                    const query = adapter.createJSONQuery({
-                                        column: `"${path}"`,
-                                        operator,
-                                        pathSegments: [
-                                            field.field.name
-                                        ],
-                                        table: parentTable,
-                                        value
-                                    });
-                                    ref[path] = {
-                                        $raw: query
-                                    };
-                                } else if (adapter.tables[joinCollectionTableName][path]) {
-                                    selectFields[path] = sql`${adapter.tables[joinCollectionTableName][path]}`.as(path);
-                                // Allow to filter by collectionSlug
-                                } else if (path !== 'relationTo') {
-                                    // For timestamp fields like deletedAt, we need to cast to timestamp in Postgres
-                                    // SQLite doesn't require explicit type casting for UNION queries
-                                    if (path === 'deletedAt' && adapter.name === 'postgres') {
-                                        selectFields[path] = sql`null::timestamp with time zone`.as(path);
-                                    } else {
-                                        selectFields[path] = sql`null`.as(path);
-                                    }
-                                }
-                            }
-                            let query = db.select(selectFields).from(adapter.tables[joinCollectionTableName]);
-                            if (collectionQueryWhere.length) {
-                                query = query.where(and(...collectionQueryWhere));
-                            }
-                            if (currentQuery === null) {
-                                currentQuery = query;
-                            } else {
-                                currentQuery = currentQuery.unionAll(query);
-                            }
-                        }
-                        const subQueryAlias = `${columnName}_subquery`;
-                        let sqlWhere = eq(sql.raw(`"${currentTableName}"."id"`), sql.raw(`"${subQueryAlias}"."${onPath}"`));
-                        if (where && Object.keys(where).length > 0) {
-                            sqlWhere = and(sqlWhere, buildSQLWhere(where, subQueryAlias));
-                        }
-                        if (shouldCount) {
-                            currentArgs.extras[`${columnName}_count`] = sql`${db.select({
-                                count: count()
-                            }).from(sql`${currentQuery.as(subQueryAlias)}`).where(sqlWhere)}`.as(`${columnName}_count`);
-                        }
-                        currentQuery = currentQuery.orderBy(sortOrder(sql`"sortPath"`));
-                        const sortedUnionAlias = `${columnName}_sorted`;
-                        let limitOffsetSQL = sql.empty();
-                        if (limit) {
-                            limitOffsetSQL = sql` LIMIT ${limit}`;
-                        }
-                        if (page && limit !== 0) {
-                            const offset = (page - 1) * limit;
-                            if (offset > 0) {
-                                limitOffsetSQL = sql`${limitOffsetSQL} OFFSET ${offset}`;
-                            }
-                        }
-                        // Correlate to parent row + apply any join where filters
-                        let innerWhere = sql.raw(`"${sortedUnionAlias}"."${onPath}" = "${currentTableName}"."id"`);
-                        if (where && Object.keys(where).length > 0) {
-                            const additionalWhere = buildSQLWhere(where, sortedUnionAlias);
-                            innerWhere = sql`${innerWhere} AND ${additionalWhere}`;
+                        const polymorphicJoinQuery = buildPolymorphicJoinQuery({
+                            adapter,
+                            currentTableName,
+                            field,
+                            limit,
+                            locale,
+                            page,
+                            pageSize: limitArg,
+                            path,
+                            req,
+                            shouldCount,
+                            sort,
+                            where
+                        });
+                        currentArgs.extras[polymorphicJoinQuery.columnName] = polymorphicJoinQuery.documents;
+                        if (polymorphicJoinQuery.count) {
+                            currentArgs.extras[`${polymorphicJoinQuery.columnName}_count`] = polymorphicJoinQuery.count;
                         }
-                        // IMPORTANT: For polymorphic joins, LIMIT must be applied AFTER correlating to the parent row.
-                        // Otherwise, the limit applies globally across ALL parents, not per-parent.
-                        currentArgs.extras[columnName] = sql`(
-            SELECT ${jsonAggBuildObject(adapter, {
-                            id: sql.raw(`"${subQueryAlias}"."id"`),
-                            relationTo: sql.raw(`"${subQueryAlias}"."relationTo"`)
-                        })}
-            FROM (
-              SELECT * FROM ${sql`${currentQuery.as(sortedUnionAlias)}`}
-              WHERE ${innerWhere}${limitOffsetSQL}
-            ) AS ${sql.raw(`"${subQueryAlias}"`)}
-          )`.as(columnName);
                     } else {
+                        const db = adapter.drizzle;
                         const useDrafts = (versions || draftsEnabled) && hasDraftsEnabled(adapter.payload.collections[field.collection].config);
                         const fields = useDrafts ? buildVersionCollectionFields(adapter.payload.config, adapter.payload.collections[field.collection].config, true) : adapter.payload.collections[field.collection].config.flattenedFields;
                         const joinCollectionTableName = adapter.tableNameMap.get(useDrafts ? `_${toSnakeCase(field.collection)}${adapter.versionsSuffix}` : toSnakeCase(field.collection));
                         const joins = [];
                         const currentIDColumn = versions ? adapter.tables[currentTableName].parent : adapter.tables[currentTableName].id;
                         let joinQueryWhere;
-                        const currentIDRaw = sql.raw(`"${getNameFromDrizzleTable(currentIDColumn.table)}"."${currentIDColumn.name}"`);
+                        const parentUsesBranching = collectionSlug ? resolveBranchReadState({
+                            collectionSlug,
+                            req
+                        }).useBranching : false;
+                        const canonicalIDColumn = parentUsesBranching ? adapter.tables[currentTableName][versions ? '_branchParent' : '_branchDocID'] : undefined;
+                        // Correlated constraints must reference the outer query's alias, without its schema.
+                        const currentTableIdentifier = sql.identifier(getNameFromDrizzleTable(currentIDColumn.table));
+                        const currentIDExpression = sql`${currentTableIdentifier}.${sql.identifier(currentIDColumn.name)}`;
+                        const currentIDRaw = canonicalIDColumn ? sql`COALESCE(${currentTableIdentifier}.${sql.identifier(canonicalIDColumn.name)}, ${currentIDExpression})` : currentIDExpression;
                         if (Array.isArray(field.targetField.relationTo)) {
                             joinQueryWhere = {
                                 [field.on]: {
@@ -472,12 +314,35 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                                 ]
                             };
                         }
+                        // A join subquery must carry the same branch predicate as the
+                        // top-level read, or a branch would see main's related documents.
+                        const branchReadState = resolveBranchReadState({
+                            collectionSlug: field.collection,
+                            req
+                        });
+                        const joinBranchPredicate = branchReadState.useBranching ? null : getBranchPredicateSync({
+                            collectionSlug: field.collection,
+                            req
+                        });
                         if (useDrafts) {
-                            joinQueryWhere = combineQueries(appendVersionToQueryKey(joinQueryWhere), {
+                            const versionWhere = appendVersionToQueryKey(joinQueryWhere);
+                            const branchVersionWhere = branchReadState.useBranching ? rewriteBranchVersionParents(versionWhere) : resolveBranchVersionQuerySync({
+                                collectionSlug: field.collection,
+                                req,
+                                where: versionWhere
+                            });
+                            joinQueryWhere = combineQueries(branchVersionWhere ?? {}, {
                                 latest: {
                                     equals: true
                                 }
                             });
+                        } else if (!branchReadState.useBranching && joinBranchPredicate) {
+                            joinQueryWhere = {
+                                and: [
+                                    joinQueryWhere,
+                                    joinBranchPredicate
+                                ]
+                            };
                         }
                         const columnName = `${path.replaceAll('.', '_')}${field.name}`;
                         const subQueryAlias = `${columnName}_alias`;
@@ -492,6 +357,7 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                             joins,
                             locale,
                             parentIsLocalized,
+                            req,
                             selectLocale: true,
                             sort: useDrafts ? getQueryDraftsSort({
                                 collectionConfig: adapter.payload.collections[field.collection].config,
@@ -500,6 +366,14 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                             tableName: joinCollectionTableName,
                             where: joinQueryWhere
                         });
+                        const nativeBranchVisibility = branchReadState.useBranching ? buildBranchVisibility({
+                            adapter,
+                            branch: branchReadState.branch,
+                            canonicalIDExpression: useDrafts ? sql`COALESCE(${newAliasTable._branchParent}, ${newAliasTable.parent})` : undefined,
+                            collectionSlug: field.collection,
+                            table: newAliasTable
+                        }) : undefined;
+                        const visibleSubQueryWhere = nativeBranchVisibility ? and(subQueryWhere, nativeBranchVisibility) : subQueryWhere;
                         for(let key in selectFields){
                             const val = selectFields[key];
                             if (val.table && getNameFromDrizzleTable(val.table) === joinCollectionTableName) {
@@ -509,9 +383,19 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                             }
                         }
                         if (useDrafts) {
-                            selectFields.parent = newAliasTable.parent;
-                        }
-                        let query = db.select(selectFields).from(newAliasTable).where(subQueryWhere).orderBy(()=>orderBy.map(({ column, order })=>order(column))).$dynamic();
+                            delete selectFields[`${joinCollectionTableName}.parent`];
+                            selectFields.parent = newAliasTable._branchParent ? sql`COALESCE(${newAliasTable._branchParent}, ${newAliasTable.parent})`.as(newAliasTable.parent.name) : newAliasTable.parent;
+                        }
+                        // Surface the canonical document ID rather than the shadow row's own
+                        // primary key, so join results address documents the same way every
+                        // other read does.
+                        if ((branchReadState.useBranching || joinBranchPredicate) && newAliasTable._branchDocID) {
+                            // `selectFields` is typed as a column map, but Drizzle accepts an
+                            // aliased expression in the same position — as the sibling
+                            // `sql\`...\`.as()` assignments above already rely on.
+                            selectFields.id = sql`COALESCE(${newAliasTable._branchDocID}, ${newAliasTable.id})`.as('id');
+                        }
+                        let query = db.select(selectFields).from(newAliasTable).where(visibleSubQueryWhere).orderBy(()=>orderBy.map(({ column, order })=>order(column))).$dynamic();
                         joins.forEach(({ type, condition, table })=>{
                             query = query[type ?? 'leftJoin'](table, condition);
                         });
@@ -526,7 +410,7 @@ export const traverseFields = ({ _locales, adapter, collectionSlug, currentArgs,
                         }
                         const subQuery = query.as(subQueryAlias);
                         if (shouldCount) {
-                            let countSubquery = db.select(selectFields).from(newAliasTable).where(subQueryWhere).$dynamic();
+                            let countSubquery = db.select(selectFields).from(newAliasTable).where(visibleSubQueryWhere).$dynamic();
                             joins.forEach(({ type, condition, table })=>{
                                 countSubquery = countSubquery[type ?? 'leftJoin'](table, condition);
                             });