@payloadcms/drizzle 3.0.0-beta.118 → 3.0.0-beta.119

package/dist/find/findMany.js

@@ -26,10 +26,10 @@ export const findMany = async function find({ adapter, fields, joins: joinQuery,
     const orderedIDMap = {};
     let orderedIDs;
     const selectDistinctMethods = [];
-    if (orderBy?.order && orderBy?.column) {
+    if (orderBy) {
         selectDistinctMethods.push({
             args: [
-                orderBy.order(orderBy.column)
+                ()=>orderBy.map(({ column, order })=>order(column))
             ],
             method: 'orderBy'
         });
@@ -89,7 +89,7 @@ export const findMany = async function find({ adapter, fields, joins: joinQuery,
     } else {
         findManyArgs.limit = limit;
         findManyArgs.offset = offset;
-        findManyArgs.orderBy = orderBy.order(orderBy.column);
+        findManyArgs.orderBy = ()=>orderBy.map(({ column, order })=>order(column));
         if (where) {
             findManyArgs.where = where;
         }

package/dist/find/findMany.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/find/findMany.ts"],"sourcesContent":["import type { Field, FindArgs, PayloadRequest, TypeWithID } from 'payload'\n\nimport { inArray } from 'drizzle-orm'\n\nimport type { DrizzleAdapter } from '../types.js'\nimport type { ChainedMethods } from './chainMethods.js'\n\nimport buildQuery from '../queries/buildQuery.js'\nimport { selectDistinct } from '../queries/selectDistinct.js'\nimport { transform } from '../transform/read/index.js'\nimport { buildFindManyArgs } from './buildFindManyArgs.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  tableName: string\n  versions?: boolean\n} & Omit<FindArgs, 'collection'>\n\nexport const findMany = async function find({\n  adapter,\n  fields,\n  joins: joinQuery,\n  limit: limitArg,\n  locale,\n  page = 1,\n  pagination,\n  req = {} as PayloadRequest,\n  skip,\n  sort,\n  tableName,\n  versions,\n  where: whereArg,\n}: Args) {\n  const db = adapter.sessions[await req.transactionID]?.db || adapter.drizzle\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 = skip || (page - 1) * limit\n\n  if (limit === 0) {\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 selectDistinctMethods: ChainedMethods = []\n\n  if (orderBy?.order && orderBy?.column) {\n    selectDistinctMethods.push({\n      args: [orderBy.order(orderBy.column)],\n      method: 'orderBy',\n    })\n  }\n\n  const findManyArgs = buildFindManyArgs({\n    adapter,\n    depth: 0,\n    fields,\n    joinQuery,\n    joins,\n    tableName,\n    versions,\n  })\n\n  selectDistinctMethods.push({ args: [offset], method: 'offset' })\n  selectDistinctMethods.push({ args: [limit], method: 'limit' })\n\n  const selectDistinctResult = await selectDistinct({\n    adapter,\n    chainedMethods: selectDistinctMethods,\n    db,\n    joins,\n    selectFields,\n    tableName,\n    where,\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.order(orderBy.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    })\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":["inArray","buildQuery","selectDistinct","transform","buildFindManyArgs","findMany","find","adapter","fields","joins","joinQuery","limit","limitArg","locale","page","pagination","req","skip","sort","tableName","versions","where","whereArg","db","sessions","transactionID","drizzle","totalDocs","totalPages","hasPrevPage","hasNextPage","pagingCounter","offset","undefined","orderBy","selectFields","orderedIDMap","orderedIDs","selectDistinctMethods","order","column","push","args","method","findManyArgs","depth","selectDistinctResult","chainedMethods","length","docs","nextPage","prevPage","forEach","id","i","Object","keys","tables","findPromise","query","countDistinct","Math","ceil","rawDocs","a","b","map","data","config","payload"],"mappings":"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"}
+{"version":3,"sources":["../../src/find/findMany.ts"],"sourcesContent":["import type { Field, FindArgs, PayloadRequest, TypeWithID } from 'payload'\n\nimport { inArray } from 'drizzle-orm'\n\nimport type { DrizzleAdapter } from '../types.js'\nimport type { ChainedMethods } from './chainMethods.js'\n\nimport buildQuery from '../queries/buildQuery.js'\nimport { selectDistinct } from '../queries/selectDistinct.js'\nimport { transform } from '../transform/read/index.js'\nimport { buildFindManyArgs } from './buildFindManyArgs.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  tableName: string\n  versions?: boolean\n} & Omit<FindArgs, 'collection'>\n\nexport const findMany = async function find({\n  adapter,\n  fields,\n  joins: joinQuery,\n  limit: limitArg,\n  locale,\n  page = 1,\n  pagination,\n  req = {} as PayloadRequest,\n  skip,\n  sort,\n  tableName,\n  versions,\n  where: whereArg,\n}: Args) {\n  const db = adapter.sessions[await req.transactionID]?.db || adapter.drizzle\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 = skip || (page - 1) * limit\n\n  if (limit === 0) {\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 selectDistinctMethods: ChainedMethods = []\n\n  if (orderBy) {\n    selectDistinctMethods.push({\n      args: [() => orderBy.map(({ column, order }) => order(column))],\n      method: 'orderBy',\n    })\n  }\n\n  const findManyArgs = buildFindManyArgs({\n    adapter,\n    depth: 0,\n    fields,\n    joinQuery,\n    joins,\n    tableName,\n    versions,\n  })\n\n  selectDistinctMethods.push({ args: [offset], method: 'offset' })\n  selectDistinctMethods.push({ args: [limit], method: 'limit' })\n\n  const selectDistinctResult = await selectDistinct({\n    adapter,\n    chainedMethods: selectDistinctMethods,\n    db,\n    joins,\n    selectFields,\n    tableName,\n    where,\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    })\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":["inArray","buildQuery","selectDistinct","transform","buildFindManyArgs","findMany","find","adapter","fields","joins","joinQuery","limit","limitArg","locale","page","pagination","req","skip","sort","tableName","versions","where","whereArg","db","sessions","transactionID","drizzle","totalDocs","totalPages","hasPrevPage","hasNextPage","pagingCounter","offset","undefined","orderBy","selectFields","orderedIDMap","orderedIDs","selectDistinctMethods","push","args","map","column","order","method","findManyArgs","depth","selectDistinctResult","chainedMethods","length","docs","nextPage","prevPage","forEach","id","i","Object","keys","tables","findPromise","query","countDistinct","Math","ceil","rawDocs","a","b","data","config","payload"],"mappings":"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"}

package/dist/find/traverseFields.js

@@ -258,7 +258,7 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                                 ...joinLocalesCollectionTableName && {
                                     locale: adapter.tables[joinLocalesCollectionTableName].locale || adapter.tables[joinLocalesCollectionTableName]._locale
                                 }
-                            }).from(adapter.tables[joinCollectionTableName]).where(subQueryWhere).orderBy(orderBy.order(orderBy.column))
+                            }).from(adapter.tables[joinCollectionTableName]).where(subQueryWhere).orderBy(()=>orderBy.map(({ column, order })=>order(column)))
                         });
                         const columnName = `${path.replaceAll('.', '_')}${field.name}`;
                         const jsonObjectSelect = field.localized ? sql.raw(`'_parentID', "id", '_locale', "${adapter.tables[joinLocalesCollectionTableName].locale ? 'locale' : '_locale'}"`) : sql.raw(`'id', "id"`);

package/dist/find/traverseFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/find/traverseFields.ts"],"sourcesContent":["import type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { Field, JoinQuery } from 'payload'\n\nimport { and, eq, sql } from 'drizzle-orm'\nimport { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BuildQueryJoinAliases, ChainedMethods, DrizzleAdapter } from '../types.js'\nimport type { Result } from './buildFindManyArgs.js'\n\nimport buildQuery from '../queries/buildQuery.js'\nimport { chainMethods } from './chainMethods.js'\n\ntype TraverseFieldArgs = {\n  _locales: Result\n  adapter: DrizzleAdapter\n  currentArgs: Result\n  currentTableName: string\n  depth?: number\n  fields: Field[]\n  joinQuery: JoinQuery\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  path: string\n  tablePath: string\n  topLevelArgs: Record<string, unknown>\n  topLevelTableName: string\n  versions?: boolean\n}\n\nexport const traverseFields = ({\n  _locales,\n  adapter,\n  currentArgs,\n  currentTableName,\n  depth,\n  fields,\n  joinQuery = {},\n  joins,\n  locale,\n  path,\n  tablePath,\n  topLevelArgs,\n  topLevelTableName,\n  versions,\n}: TraverseFieldArgs) => {\n  fields.forEach((field) => {\n    if (fieldIsVirtual(field)) {\n      return\n    }\n\n    // handle simple relationship\n    if (\n      depth > 0 &&\n      (field.type === 'upload' || field.type === 'relationship') &&\n      !field.hasMany &&\n      typeof field.relationTo === 'string'\n    ) {\n      if (field.localized) {\n        _locales.with[`${path}${field.name}`] = true\n      } else {\n        currentArgs.with[`${path}${field.name}`] = true\n      }\n    }\n\n    if (field.type === 'collapsible' || field.type === 'row') {\n      traverseFields({\n        _locales,\n        adapter,\n        currentArgs,\n        currentTableName,\n        depth,\n        fields: field.fields,\n        joinQuery,\n        joins,\n        path,\n        tablePath,\n        topLevelArgs,\n        topLevelTableName,\n      })\n\n      return\n    }\n\n    if (field.type === 'tabs') {\n      field.tabs.forEach((tab) => {\n        const tabPath = tabHasName(tab) ? `${path}${tab.name}_` : path\n        const tabTablePath = tabHasName(tab) ? `${tablePath}${toSnakeCase(tab.name)}_` : tablePath\n\n        traverseFields({\n          _locales,\n          adapter,\n          currentArgs,\n          currentTableName,\n          depth,\n          fields: tab.fields,\n          joinQuery,\n          joins,\n          path: tabPath,\n          tablePath: tabTablePath,\n          topLevelArgs,\n          topLevelTableName,\n          versions,\n        })\n      })\n\n      return\n    }\n\n    if (fieldAffectsData(field)) {\n      switch (field.type) {\n        case 'array': {\n          const withArray: Result = {\n            columns: {\n              _parentID: false,\n            },\n            orderBy: ({ _order }, { asc }) => [asc(_order)],\n            with: {},\n          }\n\n          const arrayTableName = adapter.tableNameMap.get(\n            `${currentTableName}_${tablePath}${toSnakeCase(field.name)}`,\n          )\n\n          const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`\n\n          if (adapter.tables[arrayTableNameWithLocales]) {\n            withArray.with._locales = {\n              columns: {\n                id: false,\n                _parentID: false,\n              },\n              with: {},\n            }\n          }\n          currentArgs.with[`${path}${field.name}`] = withArray\n\n          traverseFields({\n            _locales: withArray.with._locales,\n            adapter,\n            currentArgs: withArray,\n            currentTableName: arrayTableName,\n            depth,\n            fields: field.fields,\n            joinQuery,\n            path: '',\n            tablePath: '',\n            topLevelArgs,\n            topLevelTableName,\n          })\n\n          break\n        }\n\n        case 'select': {\n          if (field.hasMany) {\n            const withSelect: Result = {\n              columns: {\n                id: false,\n                order: false,\n                parent: false,\n              },\n              orderBy: ({ order }, { asc }) => [asc(order)],\n            }\n\n            currentArgs.with[`${path}${field.name}`] = withSelect\n          }\n\n          break\n        }\n\n        case 'blocks':\n          field.blocks.forEach((block) => {\n            const blockKey = `_blocks_${block.slug}`\n\n            if (!topLevelArgs[blockKey]) {\n              const withBlock: Result = {\n                columns: {\n                  _parentID: false,\n                },\n                orderBy: ({ _order }, { asc }) => [asc(_order)],\n                with: {},\n              }\n\n              const tableName = adapter.tableNameMap.get(\n                `${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`,\n              )\n\n              if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {\n                withBlock.with._locales = {\n                  with: {},\n                }\n              }\n              topLevelArgs.with[blockKey] = withBlock\n\n              traverseFields({\n                _locales: withBlock.with._locales,\n                adapter,\n                currentArgs: withBlock,\n                currentTableName: tableName,\n                depth,\n                fields: block.fields,\n                joinQuery,\n                path: '',\n                tablePath: '',\n                topLevelArgs,\n                topLevelTableName,\n              })\n            }\n          })\n\n          break\n\n        case 'group': {\n          traverseFields({\n            _locales,\n            adapter,\n            currentArgs,\n            currentTableName,\n            depth,\n            fields: field.fields,\n            joinQuery,\n            joins,\n            path: `${path}${field.name}_`,\n            tablePath: `${tablePath}${toSnakeCase(field.name)}_`,\n            topLevelArgs,\n            topLevelTableName,\n            versions,\n          })\n\n          break\n        }\n\n        case 'join': {\n          // when `joinsQuery` is false, do not join\n          if (joinQuery === false) {\n            break\n          }\n\n          const {\n            limit: limitArg = 10,\n            sort,\n            where,\n          } = joinQuery[`${path.replaceAll('_', '.')}${field.name}`] || {}\n          let limit = limitArg\n\n          if (limit !== 0) {\n            // get an additional document and slice it later to determine if there is a next page\n            limit += 1\n          }\n\n          const fields = adapter.payload.collections[field.collection].config.fields\n\n          const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection))\n\n          const joins: BuildQueryJoinAliases = []\n\n          const buildQueryResult = buildQuery({\n            adapter,\n            fields,\n            joins,\n            locale,\n            sort,\n            tableName: joinCollectionTableName,\n            where,\n          })\n\n          let subQueryWhere = buildQueryResult.where\n          const orderBy = buildQueryResult.orderBy\n\n          let joinLocalesCollectionTableName: string | undefined\n\n          const currentIDColumn = versions\n            ? adapter.tables[currentTableName].parent\n            : adapter.tables[currentTableName].id\n\n          // Handle hasMany _rels table\n          if (field.hasMany) {\n            const joinRelsCollectionTableName = `${joinCollectionTableName}${adapter.relationshipsSuffix}`\n\n            if (field.localized) {\n              joinLocalesCollectionTableName = joinRelsCollectionTableName\n            }\n\n            let columnReferenceToCurrentID: string\n\n            if (versions) {\n              columnReferenceToCurrentID = `${topLevelTableName.replace('_', '').replace(new RegExp(`${adapter.versionsSuffix}$`), '')}_id`\n            } else {\n              columnReferenceToCurrentID = `${topLevelTableName}_id`\n            }\n\n            joins.push({\n              type: 'innerJoin',\n              condition: and(\n                eq(\n                  adapter.tables[joinRelsCollectionTableName].parent,\n                  adapter.tables[joinCollectionTableName].id,\n                ),\n                eq(\n                  sql.raw(`\"${joinRelsCollectionTableName}\".\"${columnReferenceToCurrentID}\"`),\n                  currentIDColumn,\n                ),\n                eq(adapter.tables[joinRelsCollectionTableName].path, field.on),\n              ),\n              table: adapter.tables[joinRelsCollectionTableName],\n            })\n          } else {\n            // Handle localized without hasMany\n\n            const foreignColumn = field.on.replaceAll('.', '_')\n\n            if (field.localized) {\n              joinLocalesCollectionTableName = `${joinCollectionTableName}${adapter.localesSuffix}`\n\n              joins.push({\n                type: 'innerJoin',\n                condition: and(\n                  eq(\n                    adapter.tables[joinLocalesCollectionTableName]._parentID,\n                    adapter.tables[joinCollectionTableName].id,\n                  ),\n                  eq(\n                    adapter.tables[joinLocalesCollectionTableName][foreignColumn],\n                    currentIDColumn,\n                  ),\n                ),\n                table: adapter.tables[joinLocalesCollectionTableName],\n              })\n              // Handle without localized and without hasMany, just a condition append to where. With localized the inner join handles eq.\n            } else {\n              const constraint = eq(\n                adapter.tables[joinCollectionTableName][foreignColumn],\n                currentIDColumn,\n              )\n\n              if (subQueryWhere) {\n                subQueryWhere = and(subQueryWhere, constraint)\n              } else {\n                subQueryWhere = constraint\n              }\n            }\n          }\n\n          const chainedMethods: ChainedMethods = []\n\n          joins.forEach(({ type, condition, table }) => {\n            chainedMethods.push({\n              args: [table, condition],\n              method: type ?? 'leftJoin',\n            })\n          })\n\n          if (limit !== 0) {\n            chainedMethods.push({\n              args: [limit],\n              method: 'limit',\n            })\n          }\n\n          const db = adapter.drizzle as LibSQLDatabase\n\n          const subQuery = chainMethods({\n            methods: chainedMethods,\n            query: db\n              .select({\n                id: adapter.tables[joinCollectionTableName].id,\n                ...(joinLocalesCollectionTableName && {\n                  locale:\n                    adapter.tables[joinLocalesCollectionTableName].locale ||\n                    adapter.tables[joinLocalesCollectionTableName]._locale,\n                }),\n              })\n              .from(adapter.tables[joinCollectionTableName])\n              .where(subQueryWhere)\n              .orderBy(orderBy.order(orderBy.column)),\n          })\n\n          const columnName = `${path.replaceAll('.', '_')}${field.name}`\n\n          const jsonObjectSelect = field.localized\n            ? sql.raw(\n                `'_parentID', \"id\", '_locale', \"${adapter.tables[joinLocalesCollectionTableName].locale ? 'locale' : '_locale'}\"`,\n              )\n            : sql.raw(`'id', \"id\"`)\n\n          if (adapter.name === 'sqlite') {\n            currentArgs.extras[columnName] = sql`\n              COALESCE((\n                SELECT json_group_array(json_object(${jsonObjectSelect}))\n                FROM (\n                  ${subQuery}\n                ) AS ${sql.raw(`${columnName}_sub`)}\n              ), '[]')\n            `.as(columnName)\n          } else {\n            currentArgs.extras[columnName] = sql`\n              COALESCE((\n                SELECT json_agg(json_build_object(${jsonObjectSelect}))\n                FROM (\n                  ${subQuery}\n                ) AS ${sql.raw(`${columnName}_sub`)}\n              ), '[]'::json)\n            `.as(columnName)\n          }\n\n          break\n        }\n\n        default: {\n          break\n        }\n      }\n    }\n  })\n\n  return topLevelArgs\n}\n"],"names":["and","eq","sql","fieldAffectsData","fieldIsVirtual","tabHasName","toSnakeCase","buildQuery","chainMethods","traverseFields","_locales","adapter","currentArgs","currentTableName","depth","fields","joinQuery","joins","locale","path","tablePath","topLevelArgs","topLevelTableName","versions","forEach","field","type","hasMany","relationTo","localized","with","name","tabs","tab","tabPath","tabTablePath","withArray","columns","_parentID","orderBy","_order","asc","arrayTableName","tableNameMap","get","arrayTableNameWithLocales","localesSuffix","tables","id","withSelect","order","parent","blocks","block","blockKey","slug","withBlock","tableName","limit","limitArg","sort","where","replaceAll","payload","collections","collection","config","joinCollectionTableName","buildQueryResult","subQueryWhere","joinLocalesCollectionTableName","currentIDColumn","joinRelsCollectionTableName","relationshipsSuffix","columnReferenceToCurrentID","replace","RegExp","versionsSuffix","push","condition","raw","on","table","foreignColumn","constraint","chainedMethods","args","method","db","drizzle","subQuery","methods","query","select","_locale","from","column","columnName","jsonObjectSelect","extras","as"],"mappings":"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"}
+{"version":3,"sources":["../../src/find/traverseFields.ts"],"sourcesContent":["import type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { Field, JoinQuery } from 'payload'\n\nimport { and, eq, sql } from 'drizzle-orm'\nimport { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BuildQueryJoinAliases, ChainedMethods, DrizzleAdapter } from '../types.js'\nimport type { Result } from './buildFindManyArgs.js'\n\nimport buildQuery from '../queries/buildQuery.js'\nimport { chainMethods } from './chainMethods.js'\n\ntype TraverseFieldArgs = {\n  _locales: Result\n  adapter: DrizzleAdapter\n  currentArgs: Result\n  currentTableName: string\n  depth?: number\n  fields: Field[]\n  joinQuery: JoinQuery\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  path: string\n  tablePath: string\n  topLevelArgs: Record<string, unknown>\n  topLevelTableName: string\n  versions?: boolean\n}\n\nexport const traverseFields = ({\n  _locales,\n  adapter,\n  currentArgs,\n  currentTableName,\n  depth,\n  fields,\n  joinQuery = {},\n  joins,\n  locale,\n  path,\n  tablePath,\n  topLevelArgs,\n  topLevelTableName,\n  versions,\n}: TraverseFieldArgs) => {\n  fields.forEach((field) => {\n    if (fieldIsVirtual(field)) {\n      return\n    }\n\n    // handle simple relationship\n    if (\n      depth > 0 &&\n      (field.type === 'upload' || field.type === 'relationship') &&\n      !field.hasMany &&\n      typeof field.relationTo === 'string'\n    ) {\n      if (field.localized) {\n        _locales.with[`${path}${field.name}`] = true\n      } else {\n        currentArgs.with[`${path}${field.name}`] = true\n      }\n    }\n\n    if (field.type === 'collapsible' || field.type === 'row') {\n      traverseFields({\n        _locales,\n        adapter,\n        currentArgs,\n        currentTableName,\n        depth,\n        fields: field.fields,\n        joinQuery,\n        joins,\n        path,\n        tablePath,\n        topLevelArgs,\n        topLevelTableName,\n      })\n\n      return\n    }\n\n    if (field.type === 'tabs') {\n      field.tabs.forEach((tab) => {\n        const tabPath = tabHasName(tab) ? `${path}${tab.name}_` : path\n        const tabTablePath = tabHasName(tab) ? `${tablePath}${toSnakeCase(tab.name)}_` : tablePath\n\n        traverseFields({\n          _locales,\n          adapter,\n          currentArgs,\n          currentTableName,\n          depth,\n          fields: tab.fields,\n          joinQuery,\n          joins,\n          path: tabPath,\n          tablePath: tabTablePath,\n          topLevelArgs,\n          topLevelTableName,\n          versions,\n        })\n      })\n\n      return\n    }\n\n    if (fieldAffectsData(field)) {\n      switch (field.type) {\n        case 'array': {\n          const withArray: Result = {\n            columns: {\n              _parentID: false,\n            },\n            orderBy: ({ _order }, { asc }) => [asc(_order)],\n            with: {},\n          }\n\n          const arrayTableName = adapter.tableNameMap.get(\n            `${currentTableName}_${tablePath}${toSnakeCase(field.name)}`,\n          )\n\n          const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`\n\n          if (adapter.tables[arrayTableNameWithLocales]) {\n            withArray.with._locales = {\n              columns: {\n                id: false,\n                _parentID: false,\n              },\n              with: {},\n            }\n          }\n          currentArgs.with[`${path}${field.name}`] = withArray\n\n          traverseFields({\n            _locales: withArray.with._locales,\n            adapter,\n            currentArgs: withArray,\n            currentTableName: arrayTableName,\n            depth,\n            fields: field.fields,\n            joinQuery,\n            path: '',\n            tablePath: '',\n            topLevelArgs,\n            topLevelTableName,\n          })\n\n          break\n        }\n\n        case 'select': {\n          if (field.hasMany) {\n            const withSelect: Result = {\n              columns: {\n                id: false,\n                order: false,\n                parent: false,\n              },\n              orderBy: ({ order }, { asc }) => [asc(order)],\n            }\n\n            currentArgs.with[`${path}${field.name}`] = withSelect\n          }\n\n          break\n        }\n\n        case 'blocks':\n          field.blocks.forEach((block) => {\n            const blockKey = `_blocks_${block.slug}`\n\n            if (!topLevelArgs[blockKey]) {\n              const withBlock: Result = {\n                columns: {\n                  _parentID: false,\n                },\n                orderBy: ({ _order }, { asc }) => [asc(_order)],\n                with: {},\n              }\n\n              const tableName = adapter.tableNameMap.get(\n                `${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`,\n              )\n\n              if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {\n                withBlock.with._locales = {\n                  with: {},\n                }\n              }\n              topLevelArgs.with[blockKey] = withBlock\n\n              traverseFields({\n                _locales: withBlock.with._locales,\n                adapter,\n                currentArgs: withBlock,\n                currentTableName: tableName,\n                depth,\n                fields: block.fields,\n                joinQuery,\n                path: '',\n                tablePath: '',\n                topLevelArgs,\n                topLevelTableName,\n              })\n            }\n          })\n\n          break\n\n        case 'group': {\n          traverseFields({\n            _locales,\n            adapter,\n            currentArgs,\n            currentTableName,\n            depth,\n            fields: field.fields,\n            joinQuery,\n            joins,\n            path: `${path}${field.name}_`,\n            tablePath: `${tablePath}${toSnakeCase(field.name)}_`,\n            topLevelArgs,\n            topLevelTableName,\n            versions,\n          })\n\n          break\n        }\n\n        case 'join': {\n          // when `joinsQuery` is false, do not join\n          if (joinQuery === false) {\n            break\n          }\n\n          const {\n            limit: limitArg = 10,\n            sort,\n            where,\n          } = joinQuery[`${path.replaceAll('_', '.')}${field.name}`] || {}\n          let limit = limitArg\n\n          if (limit !== 0) {\n            // get an additional document and slice it later to determine if there is a next page\n            limit += 1\n          }\n\n          const fields = adapter.payload.collections[field.collection].config.fields\n\n          const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection))\n\n          const joins: BuildQueryJoinAliases = []\n\n          const buildQueryResult = buildQuery({\n            adapter,\n            fields,\n            joins,\n            locale,\n            sort,\n            tableName: joinCollectionTableName,\n            where,\n          })\n\n          let subQueryWhere = buildQueryResult.where\n          const orderBy = buildQueryResult.orderBy\n\n          let joinLocalesCollectionTableName: string | undefined\n\n          const currentIDColumn = versions\n            ? adapter.tables[currentTableName].parent\n            : adapter.tables[currentTableName].id\n\n          // Handle hasMany _rels table\n          if (field.hasMany) {\n            const joinRelsCollectionTableName = `${joinCollectionTableName}${adapter.relationshipsSuffix}`\n\n            if (field.localized) {\n              joinLocalesCollectionTableName = joinRelsCollectionTableName\n            }\n\n            let columnReferenceToCurrentID: string\n\n            if (versions) {\n              columnReferenceToCurrentID = `${topLevelTableName.replace('_', '').replace(new RegExp(`${adapter.versionsSuffix}$`), '')}_id`\n            } else {\n              columnReferenceToCurrentID = `${topLevelTableName}_id`\n            }\n\n            joins.push({\n              type: 'innerJoin',\n              condition: and(\n                eq(\n                  adapter.tables[joinRelsCollectionTableName].parent,\n                  adapter.tables[joinCollectionTableName].id,\n                ),\n                eq(\n                  sql.raw(`\"${joinRelsCollectionTableName}\".\"${columnReferenceToCurrentID}\"`),\n                  currentIDColumn,\n                ),\n                eq(adapter.tables[joinRelsCollectionTableName].path, field.on),\n              ),\n              table: adapter.tables[joinRelsCollectionTableName],\n            })\n          } else {\n            // Handle localized without hasMany\n\n            const foreignColumn = field.on.replaceAll('.', '_')\n\n            if (field.localized) {\n              joinLocalesCollectionTableName = `${joinCollectionTableName}${adapter.localesSuffix}`\n\n              joins.push({\n                type: 'innerJoin',\n                condition: and(\n                  eq(\n                    adapter.tables[joinLocalesCollectionTableName]._parentID,\n                    adapter.tables[joinCollectionTableName].id,\n                  ),\n                  eq(\n                    adapter.tables[joinLocalesCollectionTableName][foreignColumn],\n                    currentIDColumn,\n                  ),\n                ),\n                table: adapter.tables[joinLocalesCollectionTableName],\n              })\n              // Handle without localized and without hasMany, just a condition append to where. With localized the inner join handles eq.\n            } else {\n              const constraint = eq(\n                adapter.tables[joinCollectionTableName][foreignColumn],\n                currentIDColumn,\n              )\n\n              if (subQueryWhere) {\n                subQueryWhere = and(subQueryWhere, constraint)\n              } else {\n                subQueryWhere = constraint\n              }\n            }\n          }\n\n          const chainedMethods: ChainedMethods = []\n\n          joins.forEach(({ type, condition, table }) => {\n            chainedMethods.push({\n              args: [table, condition],\n              method: type ?? 'leftJoin',\n            })\n          })\n\n          if (limit !== 0) {\n            chainedMethods.push({\n              args: [limit],\n              method: 'limit',\n            })\n          }\n\n          const db = adapter.drizzle as LibSQLDatabase\n\n          const subQuery = chainMethods({\n            methods: chainedMethods,\n            query: db\n              .select({\n                id: adapter.tables[joinCollectionTableName].id,\n                ...(joinLocalesCollectionTableName && {\n                  locale:\n                    adapter.tables[joinLocalesCollectionTableName].locale ||\n                    adapter.tables[joinLocalesCollectionTableName]._locale,\n                }),\n              })\n              .from(adapter.tables[joinCollectionTableName])\n              .where(subQueryWhere)\n              .orderBy(() => orderBy.map(({ column, order }) => order(column))),\n          })\n\n          const columnName = `${path.replaceAll('.', '_')}${field.name}`\n\n          const jsonObjectSelect = field.localized\n            ? sql.raw(\n                `'_parentID', \"id\", '_locale', \"${adapter.tables[joinLocalesCollectionTableName].locale ? 'locale' : '_locale'}\"`,\n              )\n            : sql.raw(`'id', \"id\"`)\n\n          if (adapter.name === 'sqlite') {\n            currentArgs.extras[columnName] = sql`\n              COALESCE((\n                SELECT json_group_array(json_object(${jsonObjectSelect}))\n                FROM (\n                  ${subQuery}\n                ) AS ${sql.raw(`${columnName}_sub`)}\n              ), '[]')\n            `.as(columnName)\n          } else {\n            currentArgs.extras[columnName] = sql`\n              COALESCE((\n                SELECT json_agg(json_build_object(${jsonObjectSelect}))\n                FROM (\n                  ${subQuery}\n                ) AS ${sql.raw(`${columnName}_sub`)}\n              ), '[]'::json)\n            `.as(columnName)\n          }\n\n          break\n        }\n\n        default: {\n          break\n        }\n      }\n    }\n  })\n\n  return topLevelArgs\n}\n"],"names":["and","eq","sql","fieldAffectsData","fieldIsVirtual","tabHasName","toSnakeCase","buildQuery","chainMethods","traverseFields","_locales","adapter","currentArgs","currentTableName","depth","fields","joinQuery","joins","locale","path","tablePath","topLevelArgs","topLevelTableName","versions","forEach","field","type","hasMany","relationTo","localized","with","name","tabs","tab","tabPath","tabTablePath","withArray","columns","_parentID","orderBy","_order","asc","arrayTableName","tableNameMap","get","arrayTableNameWithLocales","localesSuffix","tables","id","withSelect","order","parent","blocks","block","blockKey","slug","withBlock","tableName","limit","limitArg","sort","where","replaceAll","payload","collections","collection","config","joinCollectionTableName","buildQueryResult","subQueryWhere","joinLocalesCollectionTableName","currentIDColumn","joinRelsCollectionTableName","relationshipsSuffix","columnReferenceToCurrentID","replace","RegExp","versionsSuffix","push","condition","raw","on","table","foreignColumn","constraint","chainedMethods","args","method","db","drizzle","subQuery","methods","query","select","_locale","from","map","column","columnName","jsonObjectSelect","extras","as"],"mappings":"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"}

package/dist/find.js

@@ -2,7 +2,7 @@ import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
 export const find = async function find({ collection, joins, limit, locale, page = 1, pagination, req = {}, sort: sortArg, where }) {
     const collectionConfig = this.payload.collections[collection].config;
-    const sort = typeof sortArg === 'string' ? sortArg : collectionConfig.defaultSort;
+    const sort = sortArg !== undefined && sortArg !== null ? sortArg : collectionConfig.defaultSort;
     const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug));
     return findMany({
         adapter: this,

package/dist/find.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/find.ts"],"sourcesContent":["import type { Find, PayloadRequest, SanitizedCollectionConfig } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const find: Find = async function find(\n  this: DrizzleAdapter,\n  {\n    collection,\n    joins,\n    limit,\n    locale,\n    page = 1,\n    pagination,\n    req = {} as PayloadRequest,\n    sort: sortArg,\n    where,\n  },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n  const sort = typeof sortArg === 'string' ? sortArg : collectionConfig.defaultSort\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  return findMany({\n    adapter: this,\n    fields: collectionConfig.fields,\n    joins,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    sort,\n    tableName,\n    where,\n  })\n}\n"],"names":["toSnakeCase","findMany","find","collection","joins","limit","locale","page","pagination","req","sort","sortArg","where","collectionConfig","payload","collections","config","defaultSort","tableName","tableNameMap","get","slug","adapter","fields"],"mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,OAAa,eAAeA,KAEvC,EACEC,UAAU,EACVC,KAAK,EACLC,KAAK,EACLC,MAAM,EACNC,OAAO,CAAC,EACRC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACZ,WAAW,CAACa,MAAM;IAC/F,MAAMN,OAAO,OAAOC,YAAY,WAAWA,UAAUE,iBAAiBI,WAAW;IAEjF,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACpB,YAAYa,iBAAiBQ,IAAI;IAEzE,OAAOpB,SAAS;QACdqB,SAAS,IAAI;QACbC,QAAQV,iBAAiBU,MAAM;QAC/BnB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAQ;QACAN;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/find.ts"],"sourcesContent":["import type { Find, PayloadRequest, SanitizedCollectionConfig } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const find: Find = async function find(\n  this: DrizzleAdapter,\n  {\n    collection,\n    joins,\n    limit,\n    locale,\n    page = 1,\n    pagination,\n    req = {} as PayloadRequest,\n    sort: sortArg,\n    where,\n  },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : collectionConfig.defaultSort\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  return findMany({\n    adapter: this,\n    fields: collectionConfig.fields,\n    joins,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    sort,\n    tableName,\n    where,\n  })\n}\n"],"names":["toSnakeCase","findMany","find","collection","joins","limit","locale","page","pagination","req","sort","sortArg","where","collectionConfig","payload","collections","config","undefined","defaultSort","tableName","tableNameMap","get","slug","adapter","fields"],"mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,OAAa,eAAeA,KAEvC,EACEC,UAAU,EACVC,KAAK,EACLC,KAAK,EACLC,MAAM,EACNC,OAAO,CAAC,EACRC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACZ,WAAW,CAACa,MAAM;IAC/F,MAAMN,OAAOC,YAAYM,aAAaN,YAAY,OAAOA,UAAUE,iBAAiBK,WAAW;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACrB,YAAYa,iBAAiBS,IAAI;IAEzE,OAAOrB,SAAS;QACdsB,SAAS,IAAI;QACbC,QAAQX,iBAAiBW,MAAM;QAC/BpB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAS;QACAP;IACF;AACF,EAAC"}

package/dist/findGlobalVersions.js

@@ -3,7 +3,7 @@ import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
 export const findGlobalVersions = async function findGlobalVersions({ global, limit, locale, page, pagination, req = {}, skip, sort: sortArg, where }) {
     const globalConfig = this.payload.globals.config.find(({ slug })=>slug === global);
-    const sort = typeof sortArg === 'string' ? sortArg : '-createdAt';
+    const sort = sortArg !== undefined && sortArg !== null ? sortArg : '-createdAt';
     const tableName = this.tableNameMap.get(`_${toSnakeCase(globalConfig.slug)}${this.versionsSuffix}`);
     const fields = buildVersionGlobalFields(this.payload.config, globalConfig);
     return findMany({

package/dist/findGlobalVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findGlobalVersions.ts"],"sourcesContent":["import type { FindGlobalVersions, PayloadRequest, SanitizedGlobalConfig } from 'payload'\n\nimport { buildVersionGlobalFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions(\n  this: DrizzleAdapter,\n  {\n    global,\n    limit,\n    locale,\n    page,\n    pagination,\n    req = {} as PayloadRequest,\n    skip,\n    sort: sortArg,\n    where,\n  },\n) {\n  const globalConfig: SanitizedGlobalConfig = this.payload.globals.config.find(\n    ({ slug }) => slug === global,\n  )\n  const sort = typeof sortArg === 'string' ? sortArg : '-createdAt'\n\n  const tableName = this.tableNameMap.get(\n    `_${toSnakeCase(globalConfig.slug)}${this.versionsSuffix}`,\n  )\n\n  const fields = buildVersionGlobalFields(this.payload.config, globalConfig)\n\n  return findMany({\n    adapter: this,\n    fields,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    skip,\n    sort,\n    tableName,\n    where,\n  })\n}\n"],"names":["buildVersionGlobalFields","toSnakeCase","findMany","findGlobalVersions","global","limit","locale","page","pagination","req","skip","sort","sortArg","where","globalConfig","payload","globals","config","find","slug","tableName","tableNameMap","get","versionsSuffix","fields","adapter"],"mappings":"AAEA,SAASA,wBAAwB,QAAQ,UAAS;AAClD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,qBAAyC,eAAeA,mBAEnE,EACEC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,IAAI,EACJC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,IAAI,EACJC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,eAAsC,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAC1E,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASf;IAEzB,MAAMO,OAAO,OAAOC,YAAY,WAAWA,UAAU;IAErD,MAAMQ,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAErB,YAAYa,aAAaK,IAAI,EAAE,EAAE,IAAI,CAACI,cAAc,CAAC,CAAC;IAG5D,MAAMC,SAASxB,yBAAyB,IAAI,CAACe,OAAO,CAACE,MAAM,EAAEH;IAE7D,OAAOZ,SAAS;QACduB,SAAS,IAAI;QACbD;QACAnB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAS;QACAP;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/findGlobalVersions.ts"],"sourcesContent":["import type { FindGlobalVersions, PayloadRequest, SanitizedGlobalConfig } from 'payload'\n\nimport { buildVersionGlobalFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions(\n  this: DrizzleAdapter,\n  {\n    global,\n    limit,\n    locale,\n    page,\n    pagination,\n    req = {} as PayloadRequest,\n    skip,\n    sort: sortArg,\n    where,\n  },\n) {\n  const globalConfig: SanitizedGlobalConfig = this.payload.globals.config.find(\n    ({ slug }) => slug === global,\n  )\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : '-createdAt'\n\n  const tableName = this.tableNameMap.get(\n    `_${toSnakeCase(globalConfig.slug)}${this.versionsSuffix}`,\n  )\n\n  const fields = buildVersionGlobalFields(this.payload.config, globalConfig)\n\n  return findMany({\n    adapter: this,\n    fields,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    skip,\n    sort,\n    tableName,\n    where,\n  })\n}\n"],"names":["buildVersionGlobalFields","toSnakeCase","findMany","findGlobalVersions","global","limit","locale","page","pagination","req","skip","sort","sortArg","where","globalConfig","payload","globals","config","find","slug","undefined","tableName","tableNameMap","get","versionsSuffix","fields","adapter"],"mappings":"AAEA,SAASA,wBAAwB,QAAQ,UAAS;AAClD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,qBAAyC,eAAeA,mBAEnE,EACEC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,IAAI,EACJC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,IAAI,EACJC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,eAAsC,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAC1E,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASf;IAEzB,MAAMO,OAAOC,YAAYQ,aAAaR,YAAY,OAAOA,UAAU;IAEnE,MAAMS,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAEtB,YAAYa,aAAaK,IAAI,EAAE,EAAE,IAAI,CAACK,cAAc,CAAC,CAAC;IAG5D,MAAMC,SAASzB,yBAAyB,IAAI,CAACe,OAAO,CAACE,MAAM,EAAEH;IAE7D,OAAOZ,SAAS;QACdwB,SAAS,IAAI;QACbD;QACApB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAU;QACAR;IACF;AACF,EAAC"}

package/dist/findVersions.js

@@ -3,7 +3,7 @@ import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
 export const findVersions = async function findVersions({ collection, limit, locale, page, pagination, req = {}, skip, sort: sortArg, where }) {
     const collectionConfig = this.payload.collections[collection].config;
-    const sort = typeof sortArg === 'string' ? sortArg : collectionConfig.defaultSort;
+    const sort = sortArg !== undefined && sortArg !== null ? sortArg : collectionConfig.defaultSort;
     const tableName = this.tableNameMap.get(`_${toSnakeCase(collectionConfig.slug)}${this.versionsSuffix}`);
     const fields = buildVersionCollectionFields(this.payload.config, collectionConfig);
     return findMany({

package/dist/findVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findVersions.ts"],"sourcesContent":["import type { FindVersions, PayloadRequest, SanitizedCollectionConfig } from 'payload'\n\nimport { buildVersionCollectionFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const findVersions: FindVersions = async function findVersions(\n  this: DrizzleAdapter,\n  {\n    collection,\n    limit,\n    locale,\n    page,\n    pagination,\n    req = {} as PayloadRequest,\n    skip,\n    sort: sortArg,\n    where,\n  },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n  const sort = typeof sortArg === 'string' ? sortArg : collectionConfig.defaultSort\n\n  const tableName = this.tableNameMap.get(\n    `_${toSnakeCase(collectionConfig.slug)}${this.versionsSuffix}`,\n  )\n\n  const fields = buildVersionCollectionFields(this.payload.config, collectionConfig)\n\n  return findMany({\n    adapter: this,\n    fields,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    skip,\n    sort,\n    tableName,\n    where,\n  })\n}\n"],"names":["buildVersionCollectionFields","toSnakeCase","findMany","findVersions","collection","limit","locale","page","pagination","req","skip","sort","sortArg","where","collectionConfig","payload","collections","config","defaultSort","tableName","tableNameMap","get","slug","versionsSuffix","fields","adapter"],"mappings":"AAEA,SAASA,4BAA4B,QAAQ,UAAS;AACtD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,eAA6B,eAAeA,aAEvD,EACEC,UAAU,EACVC,KAAK,EACLC,MAAM,EACNC,IAAI,EACJC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,IAAI,EACJC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACZ,WAAW,CAACa,MAAM;IAC/F,MAAMN,OAAO,OAAOC,YAAY,WAAWA,UAAUE,iBAAiBI,WAAW;IAEjF,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAEpB,YAAYa,iBAAiBQ,IAAI,EAAE,EAAE,IAAI,CAACC,cAAc,CAAC,CAAC;IAGhE,MAAMC,SAASxB,6BAA6B,IAAI,CAACe,OAAO,CAACE,MAAM,EAAEH;IAEjE,OAAOZ,SAAS;QACduB,SAAS,IAAI;QACbD;QACAnB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAQ;QACAN;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/findVersions.ts"],"sourcesContent":["import type { FindVersions, PayloadRequest, SanitizedCollectionConfig } from 'payload'\n\nimport { buildVersionCollectionFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\n\nexport const findVersions: FindVersions = async function findVersions(\n  this: DrizzleAdapter,\n  {\n    collection,\n    limit,\n    locale,\n    page,\n    pagination,\n    req = {} as PayloadRequest,\n    skip,\n    sort: sortArg,\n    where,\n  },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : collectionConfig.defaultSort\n\n  const tableName = this.tableNameMap.get(\n    `_${toSnakeCase(collectionConfig.slug)}${this.versionsSuffix}`,\n  )\n\n  const fields = buildVersionCollectionFields(this.payload.config, collectionConfig)\n\n  return findMany({\n    adapter: this,\n    fields,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    skip,\n    sort,\n    tableName,\n    where,\n  })\n}\n"],"names":["buildVersionCollectionFields","toSnakeCase","findMany","findVersions","collection","limit","locale","page","pagination","req","skip","sort","sortArg","where","collectionConfig","payload","collections","config","undefined","defaultSort","tableName","tableNameMap","get","slug","versionsSuffix","fields","adapter"],"mappings":"AAEA,SAASA,4BAA4B,QAAQ,UAAS;AACtD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,MAAMC,eAA6B,eAAeA,aAEvD,EACEC,UAAU,EACVC,KAAK,EACLC,MAAM,EACNC,IAAI,EACJC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,IAAI,EACJC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACZ,WAAW,CAACa,MAAM;IAC/F,MAAMN,OAAOC,YAAYM,aAAaN,YAAY,OAAOA,UAAUE,iBAAiBK,WAAW;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CACrC,CAAC,CAAC,EAAErB,YAAYa,iBAAiBS,IAAI,EAAE,EAAE,IAAI,CAACC,cAAc,CAAC,CAAC;IAGhE,MAAMC,SAASzB,6BAA6B,IAAI,CAACe,OAAO,CAACE,MAAM,EAAEH;IAEjE,OAAOZ,SAAS;QACdwB,SAAS,IAAI;QACbD;QACApB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAS;QACAP;IACF;AACF,EAAC"}

package/dist/postgres/countDistinct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"countDistinct.d.ts","sourceRoot":"","sources":["../../src/postgres/countDistinct.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAuB,aAAa,EAAE,MAAM,YAAY,CAAA;AAIpE,eAAO,MAAM,aAAa,EAAE,aA4B3B,CAAA"}
+{"version":3,"file":"countDistinct.d.ts","sourceRoot":"","sources":["../../src/postgres/countDistinct.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAuB,aAAa,EAAE,MAAM,YAAY,CAAA;AAIpE,eAAO,MAAM,aAAa,EAAE,aAwB3B,CAAA"}

package/dist/postgres/countDistinct.js

@@ -1,4 +1,4 @@
-import { count, sql } from 'drizzle-orm';
+import { count } from 'drizzle-orm';
 import { chainMethods } from '../find/chainMethods.js';
 export const countDistinct = async function countDistinct({ db, joins, tableName, where }) {
     const chainedMethods = [];
@@ -14,8 +14,7 @@ export const countDistinct = async function countDistinct({ db, joins, tableName
     const countResult = await chainMethods({
         methods: chainedMethods,
         query: db.select({
-            count: joins.length > 0 ? sql`count
-      (DISTINCT ${this.tables[tableName].id})`.mapWith(Number) : count()
+            count: count()
         }).from(this.tables[tableName]).where(where)
     });
     return Number(countResult[0].count);

package/dist/postgres/countDistinct.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/postgres/countDistinct.ts"],"sourcesContent":["import { count, sql } from 'drizzle-orm'\n\nimport type { ChainedMethods, TransactionPg } from '../types.js'\nimport type { BasePostgresAdapter, CountDistinct } from './types.js'\n\nimport { chainMethods } from '../find/chainMethods.js'\n\nexport const countDistinct: CountDistinct = async function countDistinct(\n  this: BasePostgresAdapter,\n  { db, joins, tableName, where },\n) {\n  const chainedMethods: ChainedMethods = []\n\n  joins.forEach(({ condition, table }) => {\n    chainedMethods.push({\n      args: [table, condition],\n      method: 'leftJoin',\n    })\n  })\n\n  const countResult = await chainMethods({\n    methods: chainedMethods,\n    query: (db as TransactionPg)\n      .select({\n        count:\n          joins.length > 0\n            ? sql`count\n      (DISTINCT ${this.tables[tableName].id})`.mapWith(Number)\n            : count(),\n      })\n      .from(this.tables[tableName])\n      .where(where),\n  })\n\n  return Number(countResult[0].count)\n}\n"],"names":["count","sql","chainMethods","countDistinct","db","joins","tableName","where","chainedMethods","forEach","condition","table","push","args","method","countResult","methods","query","select","length","tables","id","mapWith","Number","from"],"mappings":"AAAA,SAASA,KAAK,EAAEC,GAAG,QAAQ,cAAa;AAKxC,SAASC,YAAY,QAAQ,0BAAyB;AAEtD,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EAAEC,EAAE,EAAEC,KAAK,EAAEC,SAAS,EAAEC,KAAK,EAAE;IAE/B,MAAMC,iBAAiC,EAAE;IAEzCH,MAAMI,OAAO,CAAC,CAAC,EAAEC,SAAS,EAAEC,KAAK,EAAE;QACjCH,eAAeI,IAAI,CAAC;YAClBC,MAAM;gBAACF;gBAAOD;aAAU;YACxBI,QAAQ;QACV;IACF;IAEA,MAAMC,cAAc,MAAMb,aAAa;QACrCc,SAASR;QACTS,OAAO,AAACb,GACLc,MAAM,CAAC;YACNlB,OACEK,MAAMc,MAAM,GAAG,IACXlB,GAAG,CAAC;gBACF,EAAE,IAAI,CAACmB,MAAM,CAACd,UAAU,CAACe,EAAE,CAAC,CAAC,CAAC,CAACC,OAAO,CAACC,UACzCvB;QACR,GACCwB,IAAI,CAAC,IAAI,CAACJ,MAAM,CAACd,UAAU,EAC3BC,KAAK,CAACA;IACX;IAEA,OAAOgB,OAAOR,WAAW,CAAC,EAAE,CAACf,KAAK;AACpC,EAAC"}
+{"version":3,"sources":["../../src/postgres/countDistinct.ts"],"sourcesContent":["import { count } from 'drizzle-orm'\n\nimport type { ChainedMethods, TransactionPg } from '../types.js'\nimport type { BasePostgresAdapter, CountDistinct } from './types.js'\n\nimport { chainMethods } from '../find/chainMethods.js'\n\nexport const countDistinct: CountDistinct = async function countDistinct(\n  this: BasePostgresAdapter,\n  { db, joins, tableName, where },\n) {\n  const chainedMethods: ChainedMethods = []\n\n  joins.forEach(({ condition, table }) => {\n    chainedMethods.push({\n      args: [table, condition],\n      method: 'leftJoin',\n    })\n  })\n\n  const countResult = await chainMethods({\n    methods: chainedMethods,\n    query: (db as TransactionPg)\n      .select({\n        count: count(),\n      })\n      .from(this.tables[tableName])\n      .where(where),\n  })\n\n  return Number(countResult[0].count)\n}\n"],"names":["count","chainMethods","countDistinct","db","joins","tableName","where","chainedMethods","forEach","condition","table","push","args","method","countResult","methods","query","select","from","tables","Number"],"mappings":"AAAA,SAASA,KAAK,QAAQ,cAAa;AAKnC,SAASC,YAAY,QAAQ,0BAAyB;AAEtD,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EAAEC,EAAE,EAAEC,KAAK,EAAEC,SAAS,EAAEC,KAAK,EAAE;IAE/B,MAAMC,iBAAiC,EAAE;IAEzCH,MAAMI,OAAO,CAAC,CAAC,EAAEC,SAAS,EAAEC,KAAK,EAAE;QACjCH,eAAeI,IAAI,CAAC;YAClBC,MAAM;gBAACF;gBAAOD;aAAU;YACxBI,QAAQ;QACV;IACF;IAEA,MAAMC,cAAc,MAAMb,aAAa;QACrCc,SAASR;QACTS,OAAO,AAACb,GACLc,MAAM,CAAC;YACNjB,OAAOA;QACT,GACCkB,IAAI,CAAC,IAAI,CAACC,MAAM,CAACd,UAAU,EAC3BC,KAAK,CAACA;IACX;IAEA,OAAOc,OAAON,WAAW,CAAC,EAAE,CAACd,KAAK;AACpC,EAAC"}

package/dist/queries/buildOrderBy.d.ts

@@ -1,4 +1,4 @@
-import type { Field } from 'payload';
+import type { Field, Sort } from 'payload';
 import type { DrizzleAdapter, GenericColumn } from '../types.js';
 import type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js';
 type Args = {
@@ -7,7 +7,7 @@ type Args = {
     joins: BuildQueryJoinAliases;
     locale?: string;
     selectFields: Record<string, GenericColumn>;
-    sort?: string;
+    sort?: Sort;
     tableName: string;
 };
 /**

package/dist/queries/buildOrderBy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildOrderBy.d.ts","sourceRoot":"","sources":["../../src/queries/buildOrderBy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAIpC,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAI9E,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,uEAQtB,IAAI,KAAG,gBAAgB,CAAC,SAAS,CAmDnC,CAAA"}
+{"version":3,"file":"buildOrderBy.d.ts","sourceRoot":"","sources":["../../src/queries/buildOrderBy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAI1C,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAI9E,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,uEAQtB,IAAI,KAAG,gBAAgB,CAAC,SAAS,CAoDnC,CAAA"}

package/dist/queries/buildOrderBy.js

@@ -3,48 +3,53 @@ import { getTableColumnFromPath } from './getTableColumnFromPath.js';
 /**
  * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary
  */ export const buildOrderBy = ({ adapter, fields, joins, locale, selectFields, sort, tableName })=>{
-    const orderBy = {
-        column: null,
-        order: null
-    };
-    if (sort) {
-        let sortPath;
-        if (sort[0] === '-') {
-            sortPath = sort.substring(1);
-            orderBy.order = desc;
+    const orderBy = [];
+    if (!sort) {
+        const createdAt = adapter.tables[tableName]?.createdAt;
+        if (createdAt) {
+            sort = '-createdAt';
+        } else {
+            sort = '-id';
+        }
+    }
+    if (typeof sort === 'string') {
+        sort = [
+            sort
+        ];
+    }
+    for (const sortItem of sort){
+        let sortProperty;
+        let sortDirection;
+        if (sortItem[0] === '-') {
+            sortProperty = sortItem.substring(1);
+            sortDirection = 'desc';
         } else {
-            sortPath = sort;
-            orderBy.order = asc;
+            sortProperty = sortItem;
+            sortDirection = 'asc';
         }
         try {
             const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({
                 adapter,
-                collectionPath: sortPath,
+                collectionPath: sortProperty,
                 fields,
                 joins,
                 locale,
-                pathSegments: sortPath.replace(/__/g, '.').split('.'),
+                pathSegments: sortProperty.replace(/__/g, '.').split('.'),
                 selectFields,
                 tableName,
-                value: sortPath
+                value: sortProperty
             });
-            orderBy.column = sortTable?.[sortTableColumnName];
+            if (sortTable?.[sortTableColumnName]) {
+                orderBy.push({
+                    column: sortTable[sortTableColumnName],
+                    order: sortDirection === 'asc' ? asc : desc
+                });
+                selectFields[sortTableColumnName] = sortTable[sortTableColumnName];
+            }
         } catch (err) {
         // continue
         }
     }
-    if (!orderBy?.column) {
-        orderBy.order = desc;
-        const createdAt = adapter.tables[tableName]?.createdAt;
-        if (createdAt) {
-            orderBy.column = createdAt;
-        } else {
-            orderBy.column = adapter.tables[tableName].id;
-        }
-    }
-    if (orderBy.column) {
-        selectFields.sort = orderBy.column;
-    }
     return orderBy;
 };
 

package/dist/queries/buildOrderBy.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildOrderBy.ts"],"sourcesContent":["import type { Field } from 'payload'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js'\n\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  joins: BuildQueryJoinAliases\n  locale?: string\n  selectFields: Record<string, GenericColumn>\n  sort?: string\n  tableName: string\n}\n\n/**\n * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary\n */\nexport const buildOrderBy = ({\n  adapter,\n  fields,\n  joins,\n  locale,\n  selectFields,\n  sort,\n  tableName,\n}: Args): BuildQueryResult['orderBy'] => {\n  const orderBy: BuildQueryResult['orderBy'] = {\n    column: null,\n    order: null,\n  }\n\n  if (sort) {\n    let sortPath\n\n    if (sort[0] === '-') {\n      sortPath = sort.substring(1)\n      orderBy.order = desc\n    } else {\n      sortPath = sort\n      orderBy.order = asc\n    }\n\n    try {\n      const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({\n        adapter,\n        collectionPath: sortPath,\n        fields,\n        joins,\n        locale,\n        pathSegments: sortPath.replace(/__/g, '.').split('.'),\n        selectFields,\n        tableName,\n        value: sortPath,\n      })\n      orderBy.column = sortTable?.[sortTableColumnName]\n    } catch (err) {\n      // continue\n    }\n  }\n\n  if (!orderBy?.column) {\n    orderBy.order = desc\n    const createdAt = adapter.tables[tableName]?.createdAt\n\n    if (createdAt) {\n      orderBy.column = createdAt\n    } else {\n      orderBy.column = adapter.tables[tableName].id\n    }\n  }\n\n  if (orderBy.column) {\n    selectFields.sort = orderBy.column\n  }\n\n  return orderBy\n}\n"],"names":["asc","desc","getTableColumnFromPath","buildOrderBy","adapter","fields","joins","locale","selectFields","sort","tableName","orderBy","column","order","sortPath","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","replace","split","value","err","createdAt","tables","id"],"mappings":"AAEA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAKvC,SAASC,sBAAsB,QAAQ,8BAA6B;AAYpE;;CAEC,GACD,OAAO,MAAMC,eAAe,CAAC,EAC3BC,OAAO,EACPC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,YAAY,EACZC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,UAAuC;QAC3CC,QAAQ;QACRC,OAAO;IACT;IAEA,IAAIJ,MAAM;QACR,IAAIK;QAEJ,IAAIL,IAAI,CAAC,EAAE,KAAK,KAAK;YACnBK,WAAWL,KAAKM,SAAS,CAAC;YAC1BJ,QAAQE,KAAK,GAAGZ;QAClB,OAAO;YACLa,WAAWL;YACXE,QAAQE,KAAK,GAAGb;QAClB;QAEA,IAAI;YACF,MAAM,EAAEgB,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAGjB,uBAAuB;gBACnFE;gBACAgB,gBAAgBN;gBAChBT;gBACAC;gBACAC;gBACAc,cAAcP,SAASQ,OAAO,CAAC,OAAO,KAAKC,KAAK,CAAC;gBACjDf;gBACAE;gBACAc,OAAOV;YACT;YACAH,QAAQC,MAAM,GAAGO,WAAW,CAACF,oBAAoB;QACnD,EAAE,OAAOQ,KAAK;QACZ,WAAW;QACb;IACF;IAEA,IAAI,CAACd,SAASC,QAAQ;QACpBD,QAAQE,KAAK,GAAGZ;QAChB,MAAMyB,YAAYtB,QAAQuB,MAAM,CAACjB,UAAU,EAAEgB;QAE7C,IAAIA,WAAW;YACbf,QAAQC,MAAM,GAAGc;QACnB,OAAO;YACLf,QAAQC,MAAM,GAAGR,QAAQuB,MAAM,CAACjB,UAAU,CAACkB,EAAE;QAC/C;IACF;IAEA,IAAIjB,QAAQC,MAAM,EAAE;QAClBJ,aAAaC,IAAI,GAAGE,QAAQC,MAAM;IACpC;IAEA,OAAOD;AACT,EAAC"}
+{"version":3,"sources":["../../src/queries/buildOrderBy.ts"],"sourcesContent":["import type { Field, Sort } from 'payload'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js'\n\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  joins: BuildQueryJoinAliases\n  locale?: string\n  selectFields: Record<string, GenericColumn>\n  sort?: Sort\n  tableName: string\n}\n\n/**\n * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary\n */\nexport const buildOrderBy = ({\n  adapter,\n  fields,\n  joins,\n  locale,\n  selectFields,\n  sort,\n  tableName,\n}: Args): BuildQueryResult['orderBy'] => {\n  const orderBy: BuildQueryResult['orderBy'] = []\n\n  if (!sort) {\n    const createdAt = adapter.tables[tableName]?.createdAt\n    if (createdAt) {\n      sort = '-createdAt'\n    } else {\n      sort = '-id'\n    }\n  }\n\n  if (typeof sort === 'string') {\n    sort = [sort]\n  }\n\n  for (const sortItem of sort) {\n    let sortProperty: string\n    let sortDirection: 'asc' | 'desc'\n    if (sortItem[0] === '-') {\n      sortProperty = sortItem.substring(1)\n      sortDirection = 'desc'\n    } else {\n      sortProperty = sortItem\n      sortDirection = 'asc'\n    }\n    try {\n      const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({\n        adapter,\n        collectionPath: sortProperty,\n        fields,\n        joins,\n        locale,\n        pathSegments: sortProperty.replace(/__/g, '.').split('.'),\n        selectFields,\n        tableName,\n        value: sortProperty,\n      })\n      if (sortTable?.[sortTableColumnName]) {\n        orderBy.push({\n          column: sortTable[sortTableColumnName],\n          order: sortDirection === 'asc' ? asc : desc,\n        })\n\n        selectFields[sortTableColumnName] = sortTable[sortTableColumnName]\n      }\n    } catch (err) {\n      // continue\n    }\n  }\n\n  return orderBy\n}\n"],"names":["asc","desc","getTableColumnFromPath","buildOrderBy","adapter","fields","joins","locale","selectFields","sort","tableName","orderBy","createdAt","tables","sortItem","sortProperty","sortDirection","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","replace","split","value","push","column","order","err"],"mappings":"AAEA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAKvC,SAASC,sBAAsB,QAAQ,8BAA6B;AAYpE;;CAEC,GACD,OAAO,MAAMC,eAAe,CAAC,EAC3BC,OAAO,EACPC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,YAAY,EACZC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,UAAuC,EAAE;IAE/C,IAAI,CAACF,MAAM;QACT,MAAMG,YAAYR,QAAQS,MAAM,CAACH,UAAU,EAAEE;QAC7C,IAAIA,WAAW;YACbH,OAAO;QACT,OAAO;YACLA,OAAO;QACT;IACF;IAEA,IAAI,OAAOA,SAAS,UAAU;QAC5BA,OAAO;YAACA;SAAK;IACf;IAEA,KAAK,MAAMK,YAAYL,KAAM;QAC3B,IAAIM;QACJ,IAAIC;QACJ,IAAIF,QAAQ,CAAC,EAAE,KAAK,KAAK;YACvBC,eAAeD,SAASG,SAAS,CAAC;YAClCD,gBAAgB;QAClB,OAAO;YACLD,eAAeD;YACfE,gBAAgB;QAClB;QACA,IAAI;YACF,MAAM,EAAEE,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAGnB,uBAAuB;gBACnFE;gBACAkB,gBAAgBP;gBAChBV;gBACAC;gBACAC;gBACAgB,cAAcR,aAAaS,OAAO,CAAC,OAAO,KAAKC,KAAK,CAAC;gBACrDjB;gBACAE;gBACAgB,OAAOX;YACT;YACA,IAAIM,WAAW,CAACF,oBAAoB,EAAE;gBACpCR,QAAQgB,IAAI,CAAC;oBACXC,QAAQP,SAAS,CAACF,oBAAoB;oBACtCU,OAAOb,kBAAkB,QAAQhB,MAAMC;gBACzC;gBAEAO,YAAY,CAACW,oBAAoB,GAAGE,SAAS,CAACF,oBAAoB;YACpE;QACF,EAAE,OAAOW,KAAK;QACZ,WAAW;QACb;IACF;IAEA,OAAOnB;AACT,EAAC"}

package/dist/queries/buildQuery.d.ts

@@ -1,6 +1,6 @@
 import type { asc, desc, SQL } from 'drizzle-orm';
 import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
-import type { Field, Where } from 'payload';
+import type { Field, Sort, Where } from 'payload';
 import type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js';
 export type BuildQueryJoinAliases = {
     condition: SQL;
@@ -12,7 +12,7 @@ type BuildQueryArgs = {
     fields: Field[];
     joins?: BuildQueryJoinAliases;
     locale?: string;
-    sort?: string;
+    sort?: Sort;
     tableName: string;
     where: Where;
 };
@@ -21,7 +21,7 @@ export type BuildQueryResult = {
     orderBy: {
         column: GenericColumn;
         order: typeof asc | typeof desc;
-    };
+    }[];
     selectFields: Record<string, GenericColumn>;
     where: SQL;
 };

package/dist/queries/buildQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAK9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IACd,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,CAAA;CAC9C,EAAE,CAAA;AAEH,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,OAAO,EAAE;QACP,MAAM,EAAE,aAAa,CAAA;QACrB,KAAK,EAAE,OAAO,GAAG,GAAG,OAAO,IAAI,CAAA;KAChC,CAAA;IACD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AACD,QAAA,MAAM,UAAU,+EAQb,cAAc,KAAG,gBAmCnB,CAAA;AAED,eAAe,UAAU,CAAA"}
+{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAK9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IACd,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,CAAA;CAC9C,EAAE,CAAA;AAEH,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,OAAO,EAAE;QACP,MAAM,EAAE,aAAa,CAAA;QACrB,KAAK,EAAE,OAAO,GAAG,GAAG,OAAO,IAAI,CAAA;KAChC,EAAE,CAAA;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AACD,QAAA,MAAM,UAAU,+EAQb,cAAc,KAAG,gBAmCnB,CAAA;AAED,eAAe,UAAU,CAAA"}

package/dist/queries/buildQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { asc, desc, SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { Field, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\n\nimport { buildOrderBy } from './buildOrderBy.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  table: GenericTable | PgTableWithColumns<any>\n  type?: 'innerJoin' | 'leftJoin' | 'rightJoin'\n}[]\n\ntype BuildQueryArgs = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  sort?: string\n  tableName: string\n  where: Where\n}\n\nexport type BuildQueryResult = {\n  joins: BuildQueryJoinAliases\n  orderBy: {\n    column: GenericColumn\n    order: typeof asc | typeof desc\n  }\n  selectFields: Record<string, GenericColumn>\n  where: SQL\n}\nconst buildQuery = function buildQuery({\n  adapter,\n  fields,\n  joins = [],\n  locale,\n  sort,\n  tableName,\n  where: incomingWhere,\n}: BuildQueryArgs): BuildQueryResult {\n  const selectFields: Record<string, GenericColumn> = {\n    id: adapter.tables[tableName].id,\n  }\n\n  const orderBy = buildOrderBy({\n    adapter,\n    fields,\n    joins,\n    locale,\n    selectFields,\n    sort,\n    tableName,\n  })\n\n  let where: SQL\n\n  if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n    where = parseParams({\n      adapter,\n      fields,\n      joins,\n      locale,\n      selectFields,\n      tableName,\n      where: incomingWhere,\n    })\n  }\n\n  return {\n    joins,\n    orderBy,\n    selectFields,\n    where,\n  }\n}\n\nexport default buildQuery\n"],"names":["buildOrderBy","parseParams","buildQuery","adapter","fields","joins","locale","sort","tableName","where","incomingWhere","selectFields","id","tables","orderBy","Object","keys","length"],"mappings":"AAMA,SAASA,YAAY,QAAQ,oBAAmB;AAChD,SAASC,WAAW,QAAQ,mBAAkB;AA2B9C,MAAMC,aAAa,SAASA,WAAW,EACrCC,OAAO,EACPC,MAAM,EACNC,QAAQ,EAAE,EACVC,MAAM,EACNC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAIT,QAAQU,MAAM,CAACL,UAAU,CAACI,EAAE;IAClC;IAEA,MAAME,UAAUd,aAAa;QAC3BG;QACAC;QACAC;QACAC;QACAK;QACAJ;QACAC;IACF;IAEA,IAAIC;IAEJ,IAAIC,iBAAiBK,OAAOC,IAAI,CAACN,eAAeO,MAAM,GAAG,GAAG;QAC1DR,QAAQR,YAAY;YAClBE;YACAC;YACAC;YACAC;YACAK;YACAH;YACAC,OAAOC;QACT;IACF;IAEA,OAAO;QACLL;QACAS;QACAH;QACAF;IACF;AACF;AAEA,eAAeP,WAAU"}
+{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { asc, desc, SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { Field, Sort, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\n\nimport { buildOrderBy } from './buildOrderBy.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  table: GenericTable | PgTableWithColumns<any>\n  type?: 'innerJoin' | 'leftJoin' | 'rightJoin'\n}[]\n\ntype BuildQueryArgs = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  sort?: Sort\n  tableName: string\n  where: Where\n}\n\nexport type BuildQueryResult = {\n  joins: BuildQueryJoinAliases\n  orderBy: {\n    column: GenericColumn\n    order: typeof asc | typeof desc\n  }[]\n  selectFields: Record<string, GenericColumn>\n  where: SQL\n}\nconst buildQuery = function buildQuery({\n  adapter,\n  fields,\n  joins = [],\n  locale,\n  sort,\n  tableName,\n  where: incomingWhere,\n}: BuildQueryArgs): BuildQueryResult {\n  const selectFields: Record<string, GenericColumn> = {\n    id: adapter.tables[tableName].id,\n  }\n\n  const orderBy = buildOrderBy({\n    adapter,\n    fields,\n    joins,\n    locale,\n    selectFields,\n    sort,\n    tableName,\n  })\n\n  let where: SQL\n\n  if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n    where = parseParams({\n      adapter,\n      fields,\n      joins,\n      locale,\n      selectFields,\n      tableName,\n      where: incomingWhere,\n    })\n  }\n\n  return {\n    joins,\n    orderBy,\n    selectFields,\n    where,\n  }\n}\n\nexport default buildQuery\n"],"names":["buildOrderBy","parseParams","buildQuery","adapter","fields","joins","locale","sort","tableName","where","incomingWhere","selectFields","id","tables","orderBy","Object","keys","length"],"mappings":"AAMA,SAASA,YAAY,QAAQ,oBAAmB;AAChD,SAASC,WAAW,QAAQ,mBAAkB;AA2B9C,MAAMC,aAAa,SAASA,WAAW,EACrCC,OAAO,EACPC,MAAM,EACNC,QAAQ,EAAE,EACVC,MAAM,EACNC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAIT,QAAQU,MAAM,CAACL,UAAU,CAACI,EAAE;IAClC;IAEA,MAAME,UAAUd,aAAa;QAC3BG;QACAC;QACAC;QACAC;QACAK;QACAJ;QACAC;IACF;IAEA,IAAIC;IAEJ,IAAIC,iBAAiBK,OAAOC,IAAI,CAACN,eAAeO,MAAM,GAAG,GAAG;QAC1DR,QAAQR,YAAY;YAClBE;YACAC;YACAC;YACAC;YACAK;YACAH;YACAC,OAAOC;QACT;IACF;IAEA,OAAO;QACLL;QACAS;QACAH;QACAF;IACF;AACF;AAEA,eAAeP,WAAU"}

package/dist/queries/getTableColumnFromPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,SAAS,CAAA;AAG5F,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAM7D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAM5D,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAC5D,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;QAClC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;KACxB,EAAE,CAAA;IACH,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,KAAK,EAAE,kBAAkB,CAAA;IACzB,uBAAuB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAA;IAClD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,GAAG,CAAA;IACf,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;CAC7D,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAClE,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,MAAM,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AACD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,8QAgBhC,IAAI,KAAG,WA6pBT,CAAA"}
+{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,SAAS,CAAA;AAG5F,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAM7D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAM5D,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAC5D,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;QAClC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;KACxB,EAAE,CAAA;IACH,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,KAAK,EAAE,kBAAkB,CAAA;IACzB,uBAAuB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAA;IAClD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,GAAG,CAAA;IACf,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;CAC7D,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAClE,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,MAAM,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AACD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,8QAgBhC,IAAI,KAAG,WAopBT,CAAA"}

package/dist/queries/getTableColumnFromPath.js

@@ -109,18 +109,15 @@ import { getTableAlias } from './getTableAlias.js';
                 {
                     if (locale && field.localized && adapter.payload.config.localization) {
                         newTableName = `${tableName}${adapter.localesSuffix}`;
+                        let condition = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID);
+                        if (locale !== 'all') {
+                            condition = and(condition, eq(adapter.tables[newTableName]._locale, locale));
+                        }
                         addJoinTable({
-                            condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),
+                            condition,
                             joins,
                             table: adapter.tables[newTableName]
                         });
-                        if (locale !== 'all') {
-                            constraints.push({
-                                columnName: '_locale',
-                                table: adapter.tables[newTableName],
-                                value: locale
-                            });
-                        }
                     }
                     return getTableColumnFromPath({
                         adapter,
@@ -145,18 +142,18 @@ import { getTableAlias } from './getTableAlias.js';
                     if (field.hasMany) {
                         const newTableName = adapter.tableNameMap.get(`${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`);
                         if (locale && field.localized && adapter.payload.config.localization) {
+                            const conditions = [
+                                eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
+                                eq(adapter.tables[newTableName]._locale, locale)
+                            ];
+                            if (locale !== 'all') {
+                                conditions.push(eq(adapter.tables[newTableName]._locale, locale));
+                            }
                             addJoinTable({
-                                condition: and(eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent), eq(adapter.tables[newTableName]._locale, locale)),
+                                condition: and(...conditions),
                                 joins,
                                 table: adapter.tables[newTableName]
                             });
-                            if (locale !== 'all') {
-                                constraints.push({
-                                    columnName: '_locale',
-                                    table: adapter.tables[newTableName],
-                                    value: locale
-                                });
-                            }
                         } else {
                             addJoinTable({
                                 condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
@@ -189,18 +186,17 @@ import { getTableAlias } from './getTableAlias.js';
                             like(adapter.tables[newTableName].path, `${constraintPath}${field.name}`)
                         ];
                         if (locale && field.localized && adapter.payload.config.localization) {
+                            const conditions = [
+                                ...joinConstraints
+                            ];
+                            if (locale !== 'all') {
+                                conditions.push(eq(adapter.tables[newTableName]._locale, locale));
+                            }
                             addJoinTable({
-                                condition: and(...joinConstraints, eq(adapter.tables[newTableName]._locale, locale)),
+                                condition: and(...conditions),
                                 joins,
                                 table: adapter.tables[newTableName]
                             });
-                            if (locale !== 'all') {
-                                constraints.push({
-                                    columnName: 'locale',
-                                    table: adapter.tables[newTableName],
-                                    value: locale
-                                });
-                            }
                         } else {
                             addJoinTable({
                                 condition: and(...joinConstraints),
@@ -223,18 +219,17 @@ import { getTableAlias } from './getTableAlias.js';
                     const arrayParentTable = aliasTable || adapter.tables[tableName];
                     constraintPath = `${constraintPath}${field.name}.%.`;
                     if (locale && field.localized && adapter.payload.config.localization) {
+                        const conditions = [
+                            eq(arrayParentTable.id, adapter.tables[newTableName]._parentID)
+                        ];
+                        if (locale !== 'all') {
+                            conditions.push(eq(adapter.tables[newTableName]._locale, locale));
+                        }
                         addJoinTable({
-                            condition: and(eq(arrayParentTable.id, adapter.tables[newTableName]._parentID), eq(adapter.tables[newTableName]._locale, locale)),
+                            condition: and(...conditions),
                             joins,
                             table: adapter.tables[newTableName]
                         });
-                        if (locale !== 'all') {
-                            constraints.push({
-                                columnName: '_locale',
-                                table: adapter.tables[newTableName],
-                                value: locale
-                            });
-                        }
                     } else {
                         addJoinTable({
                             condition: eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),
@@ -325,17 +320,16 @@ import { getTableAlias } from './getTableAlias.js';
                             ...blockSelectFields
                         };
                         if (field.localized && adapter.payload.config.localization) {
+                            const conditions = [
+                                eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID)
+                            ];
+                            if (locale !== 'all') {
+                                conditions.push(eq(adapter.tables[newTableName]._locale, locale));
+                            }
                             joins.push({
-                                condition: and(eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID), eq(adapter.tables[newTableName]._locale, locale)),
+                                condition: and(...conditions),
                                 table: adapter.tables[newTableName]
                             });
-                            if (locale) {
-                                constraints.push({
-                                    columnName: '_locale',
-                                    table: adapter.tables[newTableName],
-                                    value: locale
-                                });
-                            }
                         } else {
                             joins.push({
                                 condition: eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID),
@@ -369,17 +363,17 @@ import { getTableAlias } from './getTableAlias.js';
                         });
                         // Join in the relationships table
                         if (locale && field.localized && adapter.payload.config.localization) {
+                            const conditions = [
+                                eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),
+                                like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)
+                            ];
+                            if (locale !== 'all') {
+                                conditions.push(eq(aliasRelationshipTable.locale, locale));
+                            }
                             joins.push({
-                                condition: and(eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent), eq(aliasRelationshipTable.locale, locale), like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)),
+                                condition: and(...conditions),
                                 table: aliasRelationshipTable
                             });
-                            if (locale !== 'all') {
-                                constraints.push({
-                                    columnName: 'locale',
-                                    table: aliasRelationshipTable,
-                                    value: locale
-                                });
-                            }
                         } else {
                             // Join in the relationships table
                             joins.push({
@@ -505,12 +499,20 @@ import { getTableAlias } from './getTableAlias.js';
                                 adapter,
                                 tableName: `${rootTableName}${adapter.localesSuffix}`
                             });
-                            joins.push({
-                                condition: and(eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id), eq(aliasLocaleTable._locale, locale)),
-                                table: aliasLocaleTable
+                            const condtions = [
+                                eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id)
+                            ];
+                            if (locale !== 'all') {
+                                condtions.push(eq(aliasLocaleTable._locale, locale));
+                            }
+                            const localesTable = adapter.tables[`${rootTableName}${adapter.localesSuffix}`];
+                            addJoinTable({
+                                condition: and(...condtions),
+                                joins,
+                                table: localesTable
                             });
                             joins.push({
-                                condition: eq(aliasLocaleTable[columnName], newAliasTable.id),
+                                condition: eq(localesTable[columnName], newAliasTable.id),
                                 table: newAliasTable
                             });
                         } else {
@@ -549,19 +551,16 @@ import { getTableAlias } from './getTableAlias.js';
                 const parentTable = aliasTable || adapter.tables[tableName];
                 newTableName = `${tableName}${adapter.localesSuffix}`;
                 newTable = adapter.tables[newTableName];
+                let condition = eq(parentTable.id, newTable._parentID);
+                if (locale !== 'all') {
+                    condition = and(condition, eq(newTable._locale, locale));
+                }
                 addJoinTable({
-                    condition: eq(parentTable.id, newTable._parentID),
+                    condition,
                     joins,
                     table: newTable
                 });
                 aliasTable = undefined;
-                if (locale !== 'all') {
-                    constraints.push({
-                        columnName: '_locale',
-                        table: newTable,
-                        value: locale
-                    });
-                }
             }
             const targetTable = aliasTable || newTable;
             selectFields[`${newTableName}.${columnPrefix}${field.name}`] = targetTable[`${columnPrefix}${field.name}`];

package/dist/queries/getTableColumnFromPath.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/getTableColumnFromPath.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core'\nimport type { Field, FieldAffectingData, NumberField, TabAsField, TextField } from 'payload'\n\nimport { and, eq, like, sql } from 'drizzle-orm'\nimport { type PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport { APIError, flattenTopLevelFields } from 'payload'\nimport { fieldAffectsData, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\nimport { validate as uuidValidate } from 'uuid'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases } from './buildQuery.js'\n\nimport { isPolymorphicRelationship } from '../utilities/isPolymorphicRelationship.js'\nimport { addJoinTable } from './addJoinTable.js'\nimport { getTableAlias } from './getTableAlias.js'\n\ntype Constraint = {\n  columnName: string\n  table: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n  value: unknown\n}\n\ntype TableColumn = {\n  columnName?: string\n  columns?: {\n    idType: 'number' | 'text' | 'uuid'\n    rawColumn: SQL<unknown>\n  }[]\n  constraints: Constraint[]\n  field: FieldAffectingData\n  getNotNullColumnByValue?: (val: unknown) => string\n  pathSegments?: string[]\n  rawColumn?: SQL\n  table: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n}\n\ntype Args = {\n  adapter: DrizzleAdapter\n  aliasTable?: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n  collectionPath: string\n  columnPrefix?: string\n  constraintPath?: string\n  constraints?: Constraint[]\n  fields: (Field | TabAsField)[]\n  joins: BuildQueryJoinAliases\n  locale?: string\n  pathSegments: string[]\n  rootTableName?: string\n  selectFields: Record<string, GenericColumn>\n  tableName: string\n  /**\n   * If creating a new table name for arrays and blocks, this suffix should be appended to the table name\n   */\n  tableNameSuffix?: string\n  /**\n   * The raw value of the query before sanitization\n   */\n  value: unknown\n}\n/**\n * Transforms path to table and column name or to a list of OR columns\n * Adds tables to `join`\n * @returns TableColumn\n */\nexport const getTableColumnFromPath = ({\n  adapter,\n  aliasTable,\n  collectionPath,\n  columnPrefix = '',\n  constraintPath: incomingConstraintPath,\n  constraints = [],\n  fields,\n  joins,\n  locale: incomingLocale,\n  pathSegments: incomingSegments,\n  rootTableName: incomingRootTableName,\n  selectFields,\n  tableName,\n  tableNameSuffix = '',\n  value,\n}: Args): TableColumn => {\n  const fieldPath = incomingSegments[0]\n  let locale = incomingLocale\n  const rootTableName = incomingRootTableName || tableName\n  let constraintPath = incomingConstraintPath || ''\n\n  const field = flattenTopLevelFields(fields as Field[]).find(\n    (fieldToFind) => fieldAffectsData(fieldToFind) && fieldToFind.name === fieldPath,\n  ) as Field | TabAsField\n  let newTableName = tableName\n\n  if (!field && fieldPath === 'id') {\n    selectFields.id = adapter.tables[newTableName].id\n    return {\n      columnName: 'id',\n      constraints,\n      field: {\n        name: 'id',\n        type: adapter.idType === 'uuid' ? 'text' : 'number',\n      } as NumberField | TextField,\n      table: adapter.tables[newTableName],\n    }\n  }\n\n  if (field) {\n    const pathSegments = [...incomingSegments]\n\n    // If next segment is a locale,\n    // we need to take it out and use it as the locale from this point on\n    if ('localized' in field && field.localized && adapter.payload.config.localization) {\n      const matchedLocale = adapter.payload.config.localization.localeCodes.find(\n        (locale) => locale === pathSegments[1],\n      )\n\n      if (matchedLocale) {\n        locale = matchedLocale\n        pathSegments.splice(1, 1)\n      }\n    }\n\n    switch (field.type) {\n      case 'tabs': {\n        return getTableColumnFromPath({\n          adapter,\n          aliasTable,\n          collectionPath,\n          columnPrefix,\n          constraintPath,\n          constraints,\n          fields: field.tabs.map((tab) => ({\n            ...tab,\n            type: 'tab',\n          })),\n          joins,\n          locale,\n          pathSegments: pathSegments.slice(1),\n          rootTableName,\n          selectFields,\n          tableName: newTableName,\n          tableNameSuffix,\n          value,\n        })\n      }\n      case 'tab': {\n        if (tabHasName(field)) {\n          return getTableColumnFromPath({\n            adapter,\n            aliasTable,\n            collectionPath,\n            columnPrefix: `${columnPrefix}${field.name}_`,\n            constraintPath: `${constraintPath}${field.name}.`,\n            constraints,\n            fields: field.fields,\n            joins,\n            locale,\n            pathSegments: pathSegments.slice(1),\n            rootTableName,\n            selectFields,\n            tableName: newTableName,\n            tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n            value,\n          })\n        }\n        return getTableColumnFromPath({\n          adapter,\n          aliasTable,\n          collectionPath,\n          columnPrefix,\n          constraintPath,\n          constraints,\n          fields: field.fields,\n          joins,\n          locale,\n          pathSegments: pathSegments.slice(1),\n          rootTableName,\n          selectFields,\n          tableName: newTableName,\n          tableNameSuffix,\n          value,\n        })\n      }\n\n      case 'group': {\n        if (locale && field.localized && adapter.payload.config.localization) {\n          newTableName = `${tableName}${adapter.localesSuffix}`\n\n          addJoinTable({\n            condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),\n            joins,\n            table: adapter.tables[newTableName],\n          })\n          if (locale !== 'all') {\n            constraints.push({\n              columnName: '_locale',\n              table: adapter.tables[newTableName],\n              value: locale,\n            })\n          }\n        }\n        return getTableColumnFromPath({\n          adapter,\n          aliasTable,\n          collectionPath,\n          columnPrefix: `${columnPrefix}${field.name}_`,\n          constraintPath: `${constraintPath}${field.name}.`,\n          constraints,\n          fields: field.fields,\n          joins,\n          locale,\n          pathSegments: pathSegments.slice(1),\n          rootTableName,\n          selectFields,\n          tableName: newTableName,\n          tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n          value,\n        })\n      }\n\n      case 'select': {\n        if (field.hasMany) {\n          const newTableName = adapter.tableNameMap.get(\n            `${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`,\n          )\n\n          if (locale && field.localized && adapter.payload.config.localization) {\n            addJoinTable({\n              condition: and(\n                eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),\n                eq(adapter.tables[newTableName]._locale, locale),\n              ),\n              joins,\n              table: adapter.tables[newTableName],\n            })\n            if (locale !== 'all') {\n              constraints.push({\n                columnName: '_locale',\n                table: adapter.tables[newTableName],\n                value: locale,\n              })\n            }\n          } else {\n            addJoinTable({\n              condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),\n              joins,\n              table: adapter.tables[newTableName],\n            })\n          }\n\n          return {\n            columnName: 'value',\n            constraints,\n            field,\n            table: adapter.tables[newTableName],\n          }\n        }\n        break\n      }\n\n      case 'text':\n      case 'number': {\n        if (field.hasMany) {\n          let tableType = 'texts'\n          let columnName = 'text'\n          if (field.type === 'number') {\n            tableType = 'numbers'\n            columnName = 'number'\n          }\n          newTableName = `${rootTableName}_${tableType}`\n          const joinConstraints = [\n            eq(adapter.tables[rootTableName].id, adapter.tables[newTableName].parent),\n            like(adapter.tables[newTableName].path, `${constraintPath}${field.name}`),\n          ]\n\n          if (locale && field.localized && adapter.payload.config.localization) {\n            addJoinTable({\n              condition: and(...joinConstraints, eq(adapter.tables[newTableName]._locale, locale)),\n              joins,\n              table: adapter.tables[newTableName],\n            })\n            if (locale !== 'all') {\n              constraints.push({\n                columnName: 'locale',\n                table: adapter.tables[newTableName],\n                value: locale,\n              })\n            }\n          } else {\n            addJoinTable({\n              condition: and(...joinConstraints),\n              joins,\n              table: adapter.tables[newTableName],\n            })\n          }\n\n          return {\n            columnName,\n            constraints,\n            field,\n            table: adapter.tables[newTableName],\n          }\n        }\n        break\n      }\n\n      case 'array': {\n        newTableName = adapter.tableNameMap.get(\n          `${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`,\n        )\n\n        const arrayParentTable = aliasTable || adapter.tables[tableName]\n\n        constraintPath = `${constraintPath}${field.name}.%.`\n        if (locale && field.localized && adapter.payload.config.localization) {\n          addJoinTable({\n            condition: and(\n              eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),\n              eq(adapter.tables[newTableName]._locale, locale),\n            ),\n            joins,\n            table: adapter.tables[newTableName],\n          })\n          if (locale !== 'all') {\n            constraints.push({\n              columnName: '_locale',\n              table: adapter.tables[newTableName],\n              value: locale,\n            })\n          }\n        } else {\n          addJoinTable({\n            condition: eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),\n            joins,\n            table: adapter.tables[newTableName],\n          })\n        }\n        return getTableColumnFromPath({\n          adapter,\n          collectionPath,\n          constraintPath,\n          constraints,\n          fields: field.fields,\n          joins,\n          locale,\n          pathSegments: pathSegments.slice(1),\n          rootTableName,\n          selectFields,\n          tableName: newTableName,\n          value,\n        })\n      }\n\n      case 'blocks': {\n        let blockTableColumn: TableColumn\n        let newTableName: string\n\n        // handle blockType queries\n        if (pathSegments[1] === 'blockType') {\n          // find the block config using the value\n          const blockTypes = Array.isArray(value) ? value : [value]\n          blockTypes.forEach((blockType) => {\n            const block = field.blocks.find((block) => block.slug === blockType)\n            newTableName = adapter.tableNameMap.get(\n              `${tableName}_blocks_${toSnakeCase(block.slug)}`,\n            )\n\n            const { newAliasTable } = getTableAlias({ adapter, tableName: newTableName })\n\n            joins.push({\n              condition: eq(adapter.tables[tableName].id, newAliasTable._parentID),\n              table: newAliasTable,\n            })\n            constraints.push({\n              columnName: '_path',\n              table: newAliasTable,\n              value: pathSegments[0],\n            })\n          })\n          return {\n            constraints,\n            field,\n            getNotNullColumnByValue: () => 'id',\n            table: adapter.tables[tableName],\n          }\n        }\n\n        const hasBlockField = field.blocks.some((block) => {\n          newTableName = adapter.tableNameMap.get(`${tableName}_blocks_${toSnakeCase(block.slug)}`)\n          constraintPath = `${constraintPath}${field.name}.%.`\n\n          let result\n          const blockConstraints = []\n          const blockSelectFields = {}\n          try {\n            result = getTableColumnFromPath({\n              adapter,\n              collectionPath,\n              constraintPath,\n              constraints: blockConstraints,\n              fields: block.fields,\n              joins,\n              locale,\n              pathSegments: pathSegments.slice(1),\n              rootTableName,\n              selectFields: blockSelectFields,\n              tableName: newTableName,\n              value,\n            })\n          } catch (error) {\n            // this is fine, not every block will have the field\n          }\n          if (!result) {\n            return\n          }\n          blockTableColumn = result\n          constraints = constraints.concat(blockConstraints)\n          selectFields = { ...selectFields, ...blockSelectFields }\n          if (field.localized && adapter.payload.config.localization) {\n            joins.push({\n              condition: and(\n                eq(\n                  (aliasTable || adapter.tables[tableName]).id,\n                  adapter.tables[newTableName]._parentID,\n                ),\n                eq(adapter.tables[newTableName]._locale, locale),\n              ),\n              table: adapter.tables[newTableName],\n            })\n            if (locale) {\n              constraints.push({\n                columnName: '_locale',\n                table: adapter.tables[newTableName],\n                value: locale,\n              })\n            }\n          } else {\n            joins.push({\n              condition: eq(\n                (aliasTable || adapter.tables[tableName]).id,\n                adapter.tables[newTableName]._parentID,\n              ),\n              table: adapter.tables[newTableName],\n            })\n          }\n          return true\n        })\n        if (hasBlockField) {\n          return {\n            columnName: blockTableColumn.columnName,\n            constraints,\n            field: blockTableColumn.field,\n            pathSegments: pathSegments.slice(1),\n            rawColumn: blockTableColumn.rawColumn,\n            table: blockTableColumn.table,\n          }\n        }\n        break\n      }\n\n      case 'relationship':\n      case 'upload': {\n        const newCollectionPath = pathSegments.slice(1).join('.')\n        if (Array.isArray(field.relationTo) || field.hasMany) {\n          let relationshipFields\n          const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`\n          const {\n            newAliasTable: aliasRelationshipTable,\n            newAliasTableName: aliasRelationshipTableName,\n          } = getTableAlias({ adapter, tableName: relationTableName })\n\n          // Join in the relationships table\n          if (locale && field.localized && adapter.payload.config.localization) {\n            joins.push({\n              condition: and(\n                eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n                eq(aliasRelationshipTable.locale, locale),\n                like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n              ),\n              table: aliasRelationshipTable,\n            })\n            if (locale !== 'all') {\n              constraints.push({\n                columnName: 'locale',\n                table: aliasRelationshipTable,\n                value: locale,\n              })\n            }\n          } else {\n            // Join in the relationships table\n            joins.push({\n              condition: and(\n                eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n                like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n              ),\n              table: aliasRelationshipTable,\n            })\n          }\n\n          selectFields[`${relationTableName}.path`] = aliasRelationshipTable.path\n\n          let newAliasTable\n\n          if (typeof field.relationTo === 'string') {\n            const relationshipConfig = adapter.payload.collections[field.relationTo].config\n\n            newTableName = adapter.tableNameMap.get(toSnakeCase(relationshipConfig.slug))\n\n            // parent to relationship join table\n            relationshipFields = relationshipConfig.fields\n            ;({ newAliasTable } = getTableAlias({ adapter, tableName: newTableName }))\n\n            joins.push({\n              condition: eq(newAliasTable.id, aliasRelationshipTable[`${field.relationTo}ID`]),\n              table: newAliasTable,\n            })\n\n            if (newCollectionPath === '' || newCollectionPath === 'id') {\n              return {\n                columnName: `${field.relationTo}ID`,\n                constraints,\n                field,\n                table: aliasRelationshipTable,\n              }\n            }\n          } else if (newCollectionPath === 'value') {\n            const hasCustomCollectionWithCustomID = field.relationTo.some(\n              (relationTo) => !!adapter.payload.collections[relationTo].customIDType,\n            )\n\n            const columns: TableColumn['columns'] = field.relationTo\n              .map((relationTo) => {\n                let idType: 'number' | 'text' | 'uuid' =\n                  adapter.idType === 'uuid' ? 'uuid' : 'number'\n\n                const { customIDType } = adapter.payload.collections[relationTo]\n\n                if (customIDType) {\n                  idType = customIDType\n                }\n\n                const idTypeTextOrUuid = idType === 'text' || idType === 'uuid'\n\n                // Do not add the column to OR if we know that it can't match by the type\n                // We can't do the same with idType: 'number' because `value` can be from the REST search query params\n                if (typeof value === 'number' && idTypeTextOrUuid) {\n                  return null\n                }\n\n                if (\n                  Array.isArray(value) &&\n                  value.every((val) => typeof val === 'number') &&\n                  idTypeTextOrUuid\n                ) {\n                  return null\n                }\n\n                // Do not add the UUID type column if incoming query value doesn't match UUID. If there aren't any collections with\n                // a custom ID type, we skip this check\n                // We need this because Postgres throws an error if querying by UUID column with a value that isn't a valid UUID.\n                if (\n                  value &&\n                  !Array.isArray(value) &&\n                  idType === 'uuid' &&\n                  hasCustomCollectionWithCustomID\n                ) {\n                  if (!uuidValidate(value)) {\n                    return null\n                  }\n                }\n\n                if (\n                  Array.isArray(value) &&\n                  idType === 'uuid' &&\n                  hasCustomCollectionWithCustomID &&\n                  !value.some((val) => uuidValidate(val))\n                ) {\n                  return null\n                }\n\n                const relationTableName = adapter.tableNameMap.get(\n                  toSnakeCase(adapter.payload.collections[relationTo].config.slug),\n                )\n\n                return {\n                  idType,\n                  rawColumn: sql.raw(`\"${aliasRelationshipTableName}\".\"${relationTableName}_id\"`),\n                }\n              })\n              .filter(Boolean)\n\n            return {\n              columns,\n              constraints,\n              field,\n              table: aliasRelationshipTable,\n            }\n          } else if (newCollectionPath === 'relationTo') {\n            const relationTo = Array.isArray(field.relationTo)\n              ? field.relationTo\n              : [field.relationTo]\n\n            return {\n              constraints,\n              field,\n              getNotNullColumnByValue: (val) => {\n                const matchedRelation = relationTo.find((relation) => relation === val)\n                if (matchedRelation) {\n                  return `${matchedRelation}ID`\n                }\n                return undefined\n              },\n              table: aliasRelationshipTable,\n            }\n          } else if (isPolymorphicRelationship(value)) {\n            const { relationTo } = value\n\n            const relationTableName = adapter.tableNameMap.get(\n              toSnakeCase(adapter.payload.collections[relationTo].config.slug),\n            )\n\n            return {\n              constraints,\n              field,\n              rawColumn: sql.raw(`\"${aliasRelationshipTableName}\".\"${relationTableName}_id\"`),\n              table: aliasRelationshipTable,\n            }\n          } else {\n            throw new APIError('Not supported')\n          }\n\n          return getTableColumnFromPath({\n            adapter,\n            aliasTable: newAliasTable,\n            collectionPath: newCollectionPath,\n            constraints,\n            fields: relationshipFields,\n            joins,\n            locale,\n            pathSegments: pathSegments.slice(1),\n            rootTableName: newTableName,\n            selectFields,\n            tableName: newTableName,\n            value,\n          })\n        } else if (\n          pathSegments.length > 1 &&\n          !(pathSegments.length === 2 && pathSegments[1] === 'id')\n        ) {\n          // simple relationships\n          const columnName = `${columnPrefix}${field.name}`\n          const newTableName = adapter.tableNameMap.get(\n            toSnakeCase(adapter.payload.collections[field.relationTo].config.slug),\n          )\n          const { newAliasTable } = getTableAlias({ adapter, tableName: newTableName })\n\n          if (field.localized && adapter.payload.config.localization) {\n            const { newAliasTable: aliasLocaleTable } = getTableAlias({\n              adapter,\n              tableName: `${rootTableName}${adapter.localesSuffix}`,\n            })\n\n            joins.push({\n              condition: and(\n                eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id),\n                eq(aliasLocaleTable._locale, locale),\n              ),\n              table: aliasLocaleTable,\n            })\n            joins.push({\n              condition: eq(aliasLocaleTable[columnName], newAliasTable.id),\n              table: newAliasTable,\n            })\n          } else {\n            joins.push({\n              condition: eq(\n                newAliasTable.id,\n                aliasTable ? aliasTable[columnName] : adapter.tables[tableName][columnName],\n              ),\n              table: newAliasTable,\n            })\n          }\n\n          return getTableColumnFromPath({\n            adapter,\n            aliasTable: newAliasTable,\n            collectionPath: newCollectionPath,\n            constraintPath: '',\n            constraints,\n            fields: adapter.payload.collections[field.relationTo].config.fields,\n            joins,\n            locale,\n            pathSegments: pathSegments.slice(1),\n            selectFields,\n            tableName: newTableName,\n            value,\n          })\n        }\n        break\n      }\n\n      default: {\n        // fall through\n        break\n      }\n    }\n\n    if (fieldAffectsData(field)) {\n      let newTable = adapter.tables[newTableName]\n\n      if (field.localized && adapter.payload.config.localization) {\n        // If localized, we go to localized table and set aliasTable to undefined\n        // so it is not picked up below to be used as targetTable\n        const parentTable = aliasTable || adapter.tables[tableName]\n        newTableName = `${tableName}${adapter.localesSuffix}`\n\n        newTable = adapter.tables[newTableName]\n\n        addJoinTable({\n          condition: eq(parentTable.id, newTable._parentID),\n          joins,\n          table: newTable,\n        })\n\n        aliasTable = undefined\n\n        if (locale !== 'all') {\n          constraints.push({\n            columnName: '_locale',\n            table: newTable,\n            value: locale,\n          })\n        }\n      }\n\n      const targetTable = aliasTable || newTable\n\n      selectFields[`${newTableName}.${columnPrefix}${field.name}`] =\n        targetTable[`${columnPrefix}${field.name}`]\n\n      return {\n        columnName: `${columnPrefix}${field.name}`,\n        constraints,\n        field,\n        pathSegments,\n        table: targetTable,\n      }\n    }\n  }\n\n  throw new APIError(`Cannot find field for path at ${fieldPath}`)\n}\n"],"names":["and","eq","like","sql","APIError","flattenTopLevelFields","fieldAffectsData","tabHasName","toSnakeCase","validate","uuidValidate","isPolymorphicRelationship","addJoinTable","getTableAlias","getTableColumnFromPath","adapter","aliasTable","collectionPath","columnPrefix","constraintPath","incomingConstraintPath","constraints","fields","joins","locale","incomingLocale","pathSegments","incomingSegments","rootTableName","incomingRootTableName","selectFields","tableName","tableNameSuffix","value","fieldPath","field","find","fieldToFind","name","newTableName","id","tables","columnName","type","idType","table","localized","payload","config","localization","matchedLocale","localeCodes","splice","tabs","map","tab","slice","localesSuffix","condition","_parentID","push","hasMany","tableNameMap","get","parent","_locale","tableType","joinConstraints","path","arrayParentTable","blockTableColumn","blockTypes","Array","isArray","forEach","blockType","block","blocks","slug","newAliasTable","getNotNullColumnByValue","hasBlockField","some","result","blockConstraints","blockSelectFields","error","concat","rawColumn","newCollectionPath","join","relationTo","relationshipFields","relationTableName","relationshipsSuffix","aliasRelationshipTable","newAliasTableName","aliasRelationshipTableName","relationshipConfig","collections","hasCustomCollectionWithCustomID","customIDType","columns","idTypeTextOrUuid","every","val","raw","filter","Boolean","matchedRelation","relation","undefined","length","aliasLocaleTable","newTable","parentTable","targetTable"],"mappings":"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"}
+{"version":3,"sources":["../../src/queries/getTableColumnFromPath.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core'\nimport type { Field, FieldAffectingData, NumberField, TabAsField, TextField } from 'payload'\n\nimport { and, eq, like, sql } from 'drizzle-orm'\nimport { type PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport { APIError, flattenTopLevelFields } from 'payload'\nimport { fieldAffectsData, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\nimport { validate as uuidValidate } from 'uuid'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases } from './buildQuery.js'\n\nimport { isPolymorphicRelationship } from '../utilities/isPolymorphicRelationship.js'\nimport { addJoinTable } from './addJoinTable.js'\nimport { getTableAlias } from './getTableAlias.js'\n\ntype Constraint = {\n  columnName: string\n  table: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n  value: unknown\n}\n\ntype TableColumn = {\n  columnName?: string\n  columns?: {\n    idType: 'number' | 'text' | 'uuid'\n    rawColumn: SQL<unknown>\n  }[]\n  constraints: Constraint[]\n  field: FieldAffectingData\n  getNotNullColumnByValue?: (val: unknown) => string\n  pathSegments?: string[]\n  rawColumn?: SQL\n  table: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n}\n\ntype Args = {\n  adapter: DrizzleAdapter\n  aliasTable?: PgTableWithColumns<any> | SQLiteTableWithColumns<any>\n  collectionPath: string\n  columnPrefix?: string\n  constraintPath?: string\n  constraints?: Constraint[]\n  fields: (Field | TabAsField)[]\n  joins: BuildQueryJoinAliases\n  locale?: string\n  pathSegments: string[]\n  rootTableName?: string\n  selectFields: Record<string, GenericColumn>\n  tableName: string\n  /**\n   * If creating a new table name for arrays and blocks, this suffix should be appended to the table name\n   */\n  tableNameSuffix?: string\n  /**\n   * The raw value of the query before sanitization\n   */\n  value: unknown\n}\n/**\n * Transforms path to table and column name or to a list of OR columns\n * Adds tables to `join`\n * @returns TableColumn\n */\nexport const getTableColumnFromPath = ({\n  adapter,\n  aliasTable,\n  collectionPath,\n  columnPrefix = '',\n  constraintPath: incomingConstraintPath,\n  constraints = [],\n  fields,\n  joins,\n  locale: incomingLocale,\n  pathSegments: incomingSegments,\n  rootTableName: incomingRootTableName,\n  selectFields,\n  tableName,\n  tableNameSuffix = '',\n  value,\n}: Args): TableColumn => {\n  const fieldPath = incomingSegments[0]\n  let locale = incomingLocale\n  const rootTableName = incomingRootTableName || tableName\n  let constraintPath = incomingConstraintPath || ''\n\n  const field = flattenTopLevelFields(fields as Field[]).find(\n    (fieldToFind) => fieldAffectsData(fieldToFind) && fieldToFind.name === fieldPath,\n  ) as Field | TabAsField\n  let newTableName = tableName\n\n  if (!field && fieldPath === 'id') {\n    selectFields.id = adapter.tables[newTableName].id\n    return {\n      columnName: 'id',\n      constraints,\n      field: {\n        name: 'id',\n        type: adapter.idType === 'uuid' ? 'text' : 'number',\n      } as NumberField | TextField,\n      table: adapter.tables[newTableName],\n    }\n  }\n\n  if (field) {\n    const pathSegments = [...incomingSegments]\n\n    // If next segment is a locale,\n    // we need to take it out and use it as the locale from this point on\n    if ('localized' in field && field.localized && adapter.payload.config.localization) {\n      const matchedLocale = adapter.payload.config.localization.localeCodes.find(\n        (locale) => locale === pathSegments[1],\n      )\n\n      if (matchedLocale) {\n        locale = matchedLocale\n        pathSegments.splice(1, 1)\n      }\n    }\n\n    switch (field.type) {\n      case 'tabs': {\n        return getTableColumnFromPath({\n          adapter,\n          aliasTable,\n          collectionPath,\n          columnPrefix,\n          constraintPath,\n          constraints,\n          fields: field.tabs.map((tab) => ({\n            ...tab,\n            type: 'tab',\n          })),\n          joins,\n          locale,\n          pathSegments: pathSegments.slice(1),\n          rootTableName,\n          selectFields,\n          tableName: newTableName,\n          tableNameSuffix,\n          value,\n        })\n      }\n      case 'tab': {\n        if (tabHasName(field)) {\n          return getTableColumnFromPath({\n            adapter,\n            aliasTable,\n            collectionPath,\n            columnPrefix: `${columnPrefix}${field.name}_`,\n            constraintPath: `${constraintPath}${field.name}.`,\n            constraints,\n            fields: field.fields,\n            joins,\n            locale,\n            pathSegments: pathSegments.slice(1),\n            rootTableName,\n            selectFields,\n            tableName: newTableName,\n            tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n            value,\n          })\n        }\n        return getTableColumnFromPath({\n          adapter,\n          aliasTable,\n          collectionPath,\n          columnPrefix,\n          constraintPath,\n          constraints,\n          fields: field.fields,\n          joins,\n          locale,\n          pathSegments: pathSegments.slice(1),\n          rootTableName,\n          selectFields,\n          tableName: newTableName,\n          tableNameSuffix,\n          value,\n        })\n      }\n\n      case 'group': {\n        if (locale && field.localized && adapter.payload.config.localization) {\n          newTableName = `${tableName}${adapter.localesSuffix}`\n\n          let condition = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID)\n\n          if (locale !== 'all') {\n            condition = and(condition, eq(adapter.tables[newTableName]._locale, locale))\n          }\n\n          addJoinTable({\n            condition,\n            joins,\n            table: adapter.tables[newTableName],\n          })\n        }\n        return getTableColumnFromPath({\n          adapter,\n          aliasTable,\n          collectionPath,\n          columnPrefix: `${columnPrefix}${field.name}_`,\n          constraintPath: `${constraintPath}${field.name}.`,\n          constraints,\n          fields: field.fields,\n          joins,\n          locale,\n          pathSegments: pathSegments.slice(1),\n          rootTableName,\n          selectFields,\n          tableName: newTableName,\n          tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n          value,\n        })\n      }\n\n      case 'select': {\n        if (field.hasMany) {\n          const newTableName = adapter.tableNameMap.get(\n            `${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`,\n          )\n\n          if (locale && field.localized && adapter.payload.config.localization) {\n            const conditions = [\n              eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),\n              eq(adapter.tables[newTableName]._locale, locale),\n            ]\n\n            if (locale !== 'all') {\n              conditions.push(eq(adapter.tables[newTableName]._locale, locale))\n            }\n\n            addJoinTable({\n              condition: and(...conditions),\n              joins,\n              table: adapter.tables[newTableName],\n            })\n          } else {\n            addJoinTable({\n              condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),\n              joins,\n              table: adapter.tables[newTableName],\n            })\n          }\n\n          return {\n            columnName: 'value',\n            constraints,\n            field,\n            table: adapter.tables[newTableName],\n          }\n        }\n        break\n      }\n\n      case 'text':\n      case 'number': {\n        if (field.hasMany) {\n          let tableType = 'texts'\n          let columnName = 'text'\n          if (field.type === 'number') {\n            tableType = 'numbers'\n            columnName = 'number'\n          }\n          newTableName = `${rootTableName}_${tableType}`\n          const joinConstraints = [\n            eq(adapter.tables[rootTableName].id, adapter.tables[newTableName].parent),\n            like(adapter.tables[newTableName].path, `${constraintPath}${field.name}`),\n          ]\n\n          if (locale && field.localized && adapter.payload.config.localization) {\n            const conditions = [...joinConstraints]\n\n            if (locale !== 'all') {\n              conditions.push(eq(adapter.tables[newTableName]._locale, locale))\n            }\n            addJoinTable({\n              condition: and(...conditions),\n              joins,\n              table: adapter.tables[newTableName],\n            })\n          } else {\n            addJoinTable({\n              condition: and(...joinConstraints),\n              joins,\n              table: adapter.tables[newTableName],\n            })\n          }\n\n          return {\n            columnName,\n            constraints,\n            field,\n            table: adapter.tables[newTableName],\n          }\n        }\n        break\n      }\n\n      case 'array': {\n        newTableName = adapter.tableNameMap.get(\n          `${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`,\n        )\n\n        const arrayParentTable = aliasTable || adapter.tables[tableName]\n\n        constraintPath = `${constraintPath}${field.name}.%.`\n        if (locale && field.localized && adapter.payload.config.localization) {\n          const conditions = [eq(arrayParentTable.id, adapter.tables[newTableName]._parentID)]\n\n          if (locale !== 'all') {\n            conditions.push(eq(adapter.tables[newTableName]._locale, locale))\n          }\n          addJoinTable({\n            condition: and(...conditions),\n            joins,\n            table: adapter.tables[newTableName],\n          })\n        } else {\n          addJoinTable({\n            condition: eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),\n            joins,\n            table: adapter.tables[newTableName],\n          })\n        }\n        return getTableColumnFromPath({\n          adapter,\n          collectionPath,\n          constraintPath,\n          constraints,\n          fields: field.fields,\n          joins,\n          locale,\n          pathSegments: pathSegments.slice(1),\n          rootTableName,\n          selectFields,\n          tableName: newTableName,\n          value,\n        })\n      }\n\n      case 'blocks': {\n        let blockTableColumn: TableColumn\n        let newTableName: string\n\n        // handle blockType queries\n        if (pathSegments[1] === 'blockType') {\n          // find the block config using the value\n          const blockTypes = Array.isArray(value) ? value : [value]\n          blockTypes.forEach((blockType) => {\n            const block = field.blocks.find((block) => block.slug === blockType)\n            newTableName = adapter.tableNameMap.get(\n              `${tableName}_blocks_${toSnakeCase(block.slug)}`,\n            )\n\n            const { newAliasTable } = getTableAlias({ adapter, tableName: newTableName })\n\n            joins.push({\n              condition: eq(adapter.tables[tableName].id, newAliasTable._parentID),\n              table: newAliasTable,\n            })\n            constraints.push({\n              columnName: '_path',\n              table: newAliasTable,\n              value: pathSegments[0],\n            })\n          })\n          return {\n            constraints,\n            field,\n            getNotNullColumnByValue: () => 'id',\n            table: adapter.tables[tableName],\n          }\n        }\n\n        const hasBlockField = field.blocks.some((block) => {\n          newTableName = adapter.tableNameMap.get(`${tableName}_blocks_${toSnakeCase(block.slug)}`)\n          constraintPath = `${constraintPath}${field.name}.%.`\n\n          let result\n          const blockConstraints = []\n          const blockSelectFields = {}\n          try {\n            result = getTableColumnFromPath({\n              adapter,\n              collectionPath,\n              constraintPath,\n              constraints: blockConstraints,\n              fields: block.fields,\n              joins,\n              locale,\n              pathSegments: pathSegments.slice(1),\n              rootTableName,\n              selectFields: blockSelectFields,\n              tableName: newTableName,\n              value,\n            })\n          } catch (error) {\n            // this is fine, not every block will have the field\n          }\n          if (!result) {\n            return\n          }\n          blockTableColumn = result\n          constraints = constraints.concat(blockConstraints)\n          selectFields = { ...selectFields, ...blockSelectFields }\n          if (field.localized && adapter.payload.config.localization) {\n            const conditions = [\n              eq(\n                (aliasTable || adapter.tables[tableName]).id,\n                adapter.tables[newTableName]._parentID,\n              ),\n            ]\n\n            if (locale !== 'all') {\n              conditions.push(eq(adapter.tables[newTableName]._locale, locale))\n            }\n\n            joins.push({\n              condition: and(...conditions),\n              table: adapter.tables[newTableName],\n            })\n          } else {\n            joins.push({\n              condition: eq(\n                (aliasTable || adapter.tables[tableName]).id,\n                adapter.tables[newTableName]._parentID,\n              ),\n              table: adapter.tables[newTableName],\n            })\n          }\n          return true\n        })\n        if (hasBlockField) {\n          return {\n            columnName: blockTableColumn.columnName,\n            constraints,\n            field: blockTableColumn.field,\n            pathSegments: pathSegments.slice(1),\n            rawColumn: blockTableColumn.rawColumn,\n            table: blockTableColumn.table,\n          }\n        }\n        break\n      }\n\n      case 'relationship':\n      case 'upload': {\n        const newCollectionPath = pathSegments.slice(1).join('.')\n        if (Array.isArray(field.relationTo) || field.hasMany) {\n          let relationshipFields\n          const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`\n          const {\n            newAliasTable: aliasRelationshipTable,\n            newAliasTableName: aliasRelationshipTableName,\n          } = getTableAlias({ adapter, tableName: relationTableName })\n\n          // Join in the relationships table\n          if (locale && field.localized && adapter.payload.config.localization) {\n            const conditions = [\n              eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n              like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n            ]\n\n            if (locale !== 'all') {\n              conditions.push(eq(aliasRelationshipTable.locale, locale))\n            }\n            joins.push({\n              condition: and(...conditions),\n              table: aliasRelationshipTable,\n            })\n          } else {\n            // Join in the relationships table\n            joins.push({\n              condition: and(\n                eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n                like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n              ),\n              table: aliasRelationshipTable,\n            })\n          }\n\n          selectFields[`${relationTableName}.path`] = aliasRelationshipTable.path\n\n          let newAliasTable\n\n          if (typeof field.relationTo === 'string') {\n            const relationshipConfig = adapter.payload.collections[field.relationTo].config\n\n            newTableName = adapter.tableNameMap.get(toSnakeCase(relationshipConfig.slug))\n\n            // parent to relationship join table\n            relationshipFields = relationshipConfig.fields\n            ;({ newAliasTable } = getTableAlias({ adapter, tableName: newTableName }))\n\n            joins.push({\n              condition: eq(newAliasTable.id, aliasRelationshipTable[`${field.relationTo}ID`]),\n              table: newAliasTable,\n            })\n\n            if (newCollectionPath === '' || newCollectionPath === 'id') {\n              return {\n                columnName: `${field.relationTo}ID`,\n                constraints,\n                field,\n                table: aliasRelationshipTable,\n              }\n            }\n          } else if (newCollectionPath === 'value') {\n            const hasCustomCollectionWithCustomID = field.relationTo.some(\n              (relationTo) => !!adapter.payload.collections[relationTo].customIDType,\n            )\n\n            const columns: TableColumn['columns'] = field.relationTo\n              .map((relationTo) => {\n                let idType: 'number' | 'text' | 'uuid' =\n                  adapter.idType === 'uuid' ? 'uuid' : 'number'\n\n                const { customIDType } = adapter.payload.collections[relationTo]\n\n                if (customIDType) {\n                  idType = customIDType\n                }\n\n                const idTypeTextOrUuid = idType === 'text' || idType === 'uuid'\n\n                // Do not add the column to OR if we know that it can't match by the type\n                // We can't do the same with idType: 'number' because `value` can be from the REST search query params\n                if (typeof value === 'number' && idTypeTextOrUuid) {\n                  return null\n                }\n\n                if (\n                  Array.isArray(value) &&\n                  value.every((val) => typeof val === 'number') &&\n                  idTypeTextOrUuid\n                ) {\n                  return null\n                }\n\n                // Do not add the UUID type column if incoming query value doesn't match UUID. If there aren't any collections with\n                // a custom ID type, we skip this check\n                // We need this because Postgres throws an error if querying by UUID column with a value that isn't a valid UUID.\n                if (\n                  value &&\n                  !Array.isArray(value) &&\n                  idType === 'uuid' &&\n                  hasCustomCollectionWithCustomID\n                ) {\n                  if (!uuidValidate(value)) {\n                    return null\n                  }\n                }\n\n                if (\n                  Array.isArray(value) &&\n                  idType === 'uuid' &&\n                  hasCustomCollectionWithCustomID &&\n                  !value.some((val) => uuidValidate(val))\n                ) {\n                  return null\n                }\n\n                const relationTableName = adapter.tableNameMap.get(\n                  toSnakeCase(adapter.payload.collections[relationTo].config.slug),\n                )\n\n                return {\n                  idType,\n                  rawColumn: sql.raw(`\"${aliasRelationshipTableName}\".\"${relationTableName}_id\"`),\n                }\n              })\n              .filter(Boolean)\n\n            return {\n              columns,\n              constraints,\n              field,\n              table: aliasRelationshipTable,\n            }\n          } else if (newCollectionPath === 'relationTo') {\n            const relationTo = Array.isArray(field.relationTo)\n              ? field.relationTo\n              : [field.relationTo]\n\n            return {\n              constraints,\n              field,\n              getNotNullColumnByValue: (val) => {\n                const matchedRelation = relationTo.find((relation) => relation === val)\n                if (matchedRelation) {\n                  return `${matchedRelation}ID`\n                }\n                return undefined\n              },\n              table: aliasRelationshipTable,\n            }\n          } else if (isPolymorphicRelationship(value)) {\n            const { relationTo } = value\n\n            const relationTableName = adapter.tableNameMap.get(\n              toSnakeCase(adapter.payload.collections[relationTo].config.slug),\n            )\n\n            return {\n              constraints,\n              field,\n              rawColumn: sql.raw(`\"${aliasRelationshipTableName}\".\"${relationTableName}_id\"`),\n              table: aliasRelationshipTable,\n            }\n          } else {\n            throw new APIError('Not supported')\n          }\n\n          return getTableColumnFromPath({\n            adapter,\n            aliasTable: newAliasTable,\n            collectionPath: newCollectionPath,\n            constraints,\n            fields: relationshipFields,\n            joins,\n            locale,\n            pathSegments: pathSegments.slice(1),\n            rootTableName: newTableName,\n            selectFields,\n            tableName: newTableName,\n            value,\n          })\n        } else if (\n          pathSegments.length > 1 &&\n          !(pathSegments.length === 2 && pathSegments[1] === 'id')\n        ) {\n          // simple relationships\n          const columnName = `${columnPrefix}${field.name}`\n          const newTableName = adapter.tableNameMap.get(\n            toSnakeCase(adapter.payload.collections[field.relationTo].config.slug),\n          )\n          const { newAliasTable } = getTableAlias({ adapter, tableName: newTableName })\n\n          if (field.localized && adapter.payload.config.localization) {\n            const { newAliasTable: aliasLocaleTable } = getTableAlias({\n              adapter,\n              tableName: `${rootTableName}${adapter.localesSuffix}`,\n            })\n\n            const condtions = [eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id)]\n\n            if (locale !== 'all') {\n              condtions.push(eq(aliasLocaleTable._locale, locale))\n            }\n\n            const localesTable = adapter.tables[`${rootTableName}${adapter.localesSuffix}`]\n\n            addJoinTable({\n              condition: and(...condtions),\n              joins,\n              table: localesTable,\n            })\n\n            joins.push({\n              condition: eq(localesTable[columnName], newAliasTable.id),\n              table: newAliasTable,\n            })\n          } else {\n            joins.push({\n              condition: eq(\n                newAliasTable.id,\n                aliasTable ? aliasTable[columnName] : adapter.tables[tableName][columnName],\n              ),\n              table: newAliasTable,\n            })\n          }\n\n          return getTableColumnFromPath({\n            adapter,\n            aliasTable: newAliasTable,\n            collectionPath: newCollectionPath,\n            constraintPath: '',\n            constraints,\n            fields: adapter.payload.collections[field.relationTo].config.fields,\n            joins,\n            locale,\n            pathSegments: pathSegments.slice(1),\n            selectFields,\n            tableName: newTableName,\n            value,\n          })\n        }\n        break\n      }\n\n      default: {\n        // fall through\n        break\n      }\n    }\n\n    if (fieldAffectsData(field)) {\n      let newTable = adapter.tables[newTableName]\n\n      if (field.localized && adapter.payload.config.localization) {\n        // If localized, we go to localized table and set aliasTable to undefined\n        // so it is not picked up below to be used as targetTable\n        const parentTable = aliasTable || adapter.tables[tableName]\n        newTableName = `${tableName}${adapter.localesSuffix}`\n\n        newTable = adapter.tables[newTableName]\n\n        let condition = eq(parentTable.id, newTable._parentID)\n\n        if (locale !== 'all') {\n          condition = and(condition, eq(newTable._locale, locale))\n        }\n\n        addJoinTable({\n          condition,\n          joins,\n          table: newTable,\n        })\n\n        aliasTable = undefined\n      }\n\n      const targetTable = aliasTable || newTable\n\n      selectFields[`${newTableName}.${columnPrefix}${field.name}`] =\n        targetTable[`${columnPrefix}${field.name}`]\n\n      return {\n        columnName: `${columnPrefix}${field.name}`,\n        constraints,\n        field,\n        pathSegments,\n        table: targetTable,\n      }\n    }\n  }\n\n  throw new APIError(`Cannot find field for path at ${fieldPath}`)\n}\n"],"names":["and","eq","like","sql","APIError","flattenTopLevelFields","fieldAffectsData","tabHasName","toSnakeCase","validate","uuidValidate","isPolymorphicRelationship","addJoinTable","getTableAlias","getTableColumnFromPath","adapter","aliasTable","collectionPath","columnPrefix","constraintPath","incomingConstraintPath","constraints","fields","joins","locale","incomingLocale","pathSegments","incomingSegments","rootTableName","incomingRootTableName","selectFields","tableName","tableNameSuffix","value","fieldPath","field","find","fieldToFind","name","newTableName","id","tables","columnName","type","idType","table","localized","payload","config","localization","matchedLocale","localeCodes","splice","tabs","map","tab","slice","localesSuffix","condition","_parentID","_locale","hasMany","tableNameMap","get","conditions","parent","push","tableType","joinConstraints","path","arrayParentTable","blockTableColumn","blockTypes","Array","isArray","forEach","blockType","block","blocks","slug","newAliasTable","getNotNullColumnByValue","hasBlockField","some","result","blockConstraints","blockSelectFields","error","concat","rawColumn","newCollectionPath","join","relationTo","relationshipFields","relationTableName","relationshipsSuffix","aliasRelationshipTable","newAliasTableName","aliasRelationshipTableName","relationshipConfig","collections","hasCustomCollectionWithCustomID","customIDType","columns","idTypeTextOrUuid","every","val","raw","filter","Boolean","matchedRelation","relation","undefined","length","aliasLocaleTable","condtions","localesTable","newTable","parentTable","targetTable"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "3.0.0-beta.118",
+  "version": "3.0.0-beta.119",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -46,10 +46,10 @@
     "@types/pg": "8.10.2",
     "@types/to-snake-case": "1.0.0",
     "@payloadcms/eslint-config": "3.0.0-beta.112",
-    "payload": "3.0.0-beta.118"
+    "payload": "3.0.0-beta.119"
   },
   "peerDependencies": {
-    "payload": "3.0.0-beta.118"
+    "payload": "3.0.0-beta.119"
   },
   "scripts": {
     "build": "pnpm build:swc && pnpm build:types",