@payloadcms/drizzle 3.0.0-canary.2c2c95f → 3.0.0-canary.3eda767

package/dist/find/findMany.d.ts

@@ -4,8 +4,9 @@ type Args = {
     adapter: DrizzleAdapter;
     fields: Field[];
     tableName: string;
+    versions?: boolean;
 } & Omit<FindArgs, 'collection'>;
-export declare const findMany: ({ adapter, fields, limit: limitArg, locale, page, pagination, req, skip, sort, tableName, where: whereArg, }: Args) => Promise<{
+export declare const findMany: ({ adapter, fields, joins: joinQuery, limit: limitArg, locale, page, pagination, req, skip, sort, tableName, versions, where: whereArg, }: Args) => Promise<{
     docs: any;
     hasNextPage: boolean;
     hasPrevPage: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/find/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAA8B,MAAM,SAAS,CAAA;AAI1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAQjD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CAClB,GAAG,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;AAEhC,eAAO,MAAM,QAAQ,iHAYlB,IAAI;;;;;;;;;;;EA0IN,CAAA"}
+{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/find/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAA8B,MAAM,SAAS,CAAA;AAI1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAQjD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;AAEhC,eAAO,MAAM,QAAQ,6IAclB,IAAI;;;;;;;;;;;EA8IN,CAAA"}

package/dist/find/findMany.js

@@ -3,7 +3,7 @@ import buildQuery from '../queries/buildQuery.js';
 import { selectDistinct } from '../queries/selectDistinct.js';
 import { transform } from '../transform/read/index.js';
 import { buildFindManyArgs } from './buildFindManyArgs.js';
-export const findMany = async function find({ adapter, fields, limit: limitArg, locale, page = 1, pagination, req = {}, skip, sort, tableName, where: whereArg }) {
+export const findMany = async function find({ adapter, fields, joins: joinQuery, limit: limitArg, locale, page = 1, pagination, req = {}, skip, sort, tableName, versions, where: whereArg }) {
     const db = adapter.sessions[await req.transactionID]?.db || adapter.drizzle;
     let limit = limitArg;
     let totalDocs;
@@ -15,7 +15,7 @@ export const findMany = async function find({ adapter, fields, limit: limitArg,
     if (limit === 0) {
         limit = undefined;
     }
-    const { joins, orderBy, selectFields, where } = await buildQuery({
+    const { joins, orderBy, selectFields, where } = buildQuery({
         adapter,
         fields,
         locale,
@@ -26,10 +26,10 @@ export const findMany = async function find({ adapter, fields, limit: limitArg,
     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'
         });
@@ -38,7 +38,10 @@ export const findMany = async function find({ adapter, fields, limit: limitArg,
         adapter,
         depth: 0,
         fields,
-        tableName
+        joinQuery,
+        joins,
+        tableName,
+        versions
     });
     selectDistinctMethods.push({
         args: [
@@ -86,7 +89,7 @@ export const findMany = async function find({ adapter, fields, limit: limitArg,
     } 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;
         }
@@ -121,7 +124,8 @@ export const findMany = async function find({ adapter, fields, limit: limitArg,
             adapter,
             config: adapter.payload.config,
             data,
-            fields
+            fields,
+            joinQuery
         });
     });
     return {

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} & Omit<FindArgs, 'collection'>\n\nexport const findMany = async function find({\n  adapter,\n  fields,\n  limit: limitArg,\n  locale,\n  page = 1,\n  pagination,\n  req = {} as PayloadRequest,\n  skip,\n  sort,\n  tableName,\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 } = await 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    tableName,\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    })\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","limit","limitArg","locale","page","pagination","req","skip","sort","tableName","where","whereArg","db","sessions","transactionID","drizzle","totalDocs","totalPages","hasPrevPage","hasNextPage","pagingCounter","offset","undefined","joins","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.d.ts

@@ -1,5 +1,5 @@
-import type { Field } from 'payload';
-import type { DrizzleAdapter } from '../types.js';
+import type { Field, JoinQuery } from 'payload';
+import type { BuildQueryJoinAliases, DrizzleAdapter } from '../types.js';
 import type { Result } from './buildFindManyArgs.js';
 type TraverseFieldArgs = {
     _locales: Result;
@@ -8,10 +8,15 @@ type TraverseFieldArgs = {
     currentTableName: string;
     depth?: number;
     fields: Field[];
+    joinQuery: JoinQuery;
+    joins?: BuildQueryJoinAliases;
+    locale?: string;
     path: string;
+    tablePath: string;
     topLevelArgs: Record<string, unknown>;
     topLevelTableName: string;
+    versions?: boolean;
 };
-export declare const traverseFields: ({ _locales, adapter, currentArgs, currentTableName, depth, fields, path, topLevelArgs, topLevelTableName, }: TraverseFieldArgs) => Record<string, unknown>;
+export declare const traverseFields: ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery, joins, locale, path, tablePath, topLevelArgs, topLevelTableName, versions, }: TraverseFieldArgs) => Record<string, unknown>;
 export {};
 //# sourceMappingURL=traverseFields.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAKpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAEpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,cAAc,gHAUxB,iBAAiB,4BA8KnB,CAAA"}
+{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAM/C,OAAO,KAAK,EAAE,qBAAqB,EAAkB,cAAc,EAAE,MAAM,aAAa,CAAA;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAKpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,cAAc,+JAexB,iBAAiB,4BAoXnB,CAAA"}

package/dist/find/traverseFields.js

@@ -1,9 +1,15 @@
-/* eslint-disable no-param-reassign */ import { fieldAffectsData, tabHasName } from 'payload/shared';
+import { and, eq, sql } from 'drizzle-orm';
+import { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
-export const traverseFields = ({ _locales, adapter, currentArgs, currentTableName, depth, fields, path, topLevelArgs, topLevelTableName })=>{
+import buildQuery from '../queries/buildQuery.js';
+import { chainMethods } from './chainMethods.js';
+export const traverseFields = ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery = {}, joins, locale, path, tablePath, topLevelArgs, topLevelTableName, versions })=>{
     fields.forEach((field)=>{
+        if (fieldIsVirtual(field)) {
+            return;
+        }
         // handle simple relationship
-        if (depth > 0 && (field.type === 'upload' || field.type === 'relationship' && !field.hasMany && typeof field.relationTo === 'string')) {
+        if (depth > 0 && (field.type === 'upload' || field.type === 'relationship') && !field.hasMany && typeof field.relationTo === 'string') {
             if (field.localized) {
                 _locales.with[`${path}${field.name}`] = true;
             } else {
@@ -18,7 +24,10 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                 currentTableName,
                 depth,
                 fields: field.fields,
+                joinQuery,
+                joins,
                 path,
+                tablePath,
                 topLevelArgs,
                 topLevelTableName
             });
@@ -27,6 +36,7 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
         if (field.type === 'tabs') {
             field.tabs.forEach((tab)=>{
                 const tabPath = tabHasName(tab) ? `${path}${tab.name}_` : path;
+                const tabTablePath = tabHasName(tab) ? `${tablePath}${toSnakeCase(tab.name)}_` : tablePath;
                 traverseFields({
                     _locales,
                     adapter,
@@ -34,9 +44,13 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                     currentTableName,
                     depth,
                     fields: tab.fields,
+                    joinQuery,
+                    joins,
                     path: tabPath,
+                    tablePath: tabTablePath,
                     topLevelArgs,
-                    topLevelTableName
+                    topLevelTableName,
+                    versions
                 });
             });
             return;
@@ -54,7 +68,7 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                                 ],
                             with: {}
                         };
-                        const arrayTableName = adapter.tableNameMap.get(`${currentTableName}_${path}${toSnakeCase(field.name)}`);
+                        const arrayTableName = adapter.tableNameMap.get(`${currentTableName}_${tablePath}${toSnakeCase(field.name)}`);
                         const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`;
                         if (adapter.tables[arrayTableNameWithLocales]) {
                             withArray.with._locales = {
@@ -73,7 +87,9 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                             currentTableName: arrayTableName,
                             depth,
                             fields: field.fields,
+                            joinQuery,
                             path: '',
+                            tablePath: '',
                             topLevelArgs,
                             topLevelTableName
                         });
@@ -123,7 +139,9 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                                 currentTableName: tableName,
                                 depth,
                                 fields: block.fields,
+                                joinQuery,
                                 path: '',
+                                tablePath: '',
                                 topLevelArgs,
                                 topLevelTableName
                             });
@@ -131,18 +149,140 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                     });
                     break;
                 case 'group':
-                    traverseFields({
-                        _locales,
-                        adapter,
-                        currentArgs,
-                        currentTableName,
-                        depth,
-                        fields: field.fields,
-                        path: `${path}${field.name}_`,
-                        topLevelArgs,
-                        topLevelTableName
-                    });
-                    break;
+                    {
+                        traverseFields({
+                            _locales,
+                            adapter,
+                            currentArgs,
+                            currentTableName,
+                            depth,
+                            fields: field.fields,
+                            joinQuery,
+                            joins,
+                            path: `${path}${field.name}_`,
+                            tablePath: `${tablePath}${toSnakeCase(field.name)}_`,
+                            topLevelArgs,
+                            topLevelTableName,
+                            versions
+                        });
+                        break;
+                    }
+                case 'join':
+                    {
+                        // when `joinsQuery` is false, do not join
+                        if (joinQuery === false) {
+                            break;
+                        }
+                        const { limit: limitArg = 10, sort, where } = joinQuery[`${path.replaceAll('_', '.')}${field.name}`] || {};
+                        let limit = limitArg;
+                        if (limit !== 0) {
+                            // get an additional document and slice it later to determine if there is a next page
+                            limit += 1;
+                        }
+                        const fields = adapter.payload.collections[field.collection].config.fields;
+                        const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection));
+                        const joins = [];
+                        const buildQueryResult = buildQuery({
+                            adapter,
+                            fields,
+                            joins,
+                            locale,
+                            sort,
+                            tableName: joinCollectionTableName,
+                            where
+                        });
+                        let subQueryWhere = buildQueryResult.where;
+                        const orderBy = buildQueryResult.orderBy;
+                        let joinLocalesCollectionTableName;
+                        const currentIDColumn = versions ? adapter.tables[currentTableName].parent : adapter.tables[currentTableName].id;
+                        // Handle hasMany _rels table
+                        if (field.hasMany) {
+                            const joinRelsCollectionTableName = `${joinCollectionTableName}${adapter.relationshipsSuffix}`;
+                            if (field.localized) {
+                                joinLocalesCollectionTableName = joinRelsCollectionTableName;
+                            }
+                            let columnReferenceToCurrentID;
+                            if (versions) {
+                                columnReferenceToCurrentID = `${topLevelTableName.replace('_', '').replace(new RegExp(`${adapter.versionsSuffix}$`), '')}_id`;
+                            } else {
+                                columnReferenceToCurrentID = `${topLevelTableName}_id`;
+                            }
+                            joins.push({
+                                type: 'innerJoin',
+                                condition: and(eq(adapter.tables[joinRelsCollectionTableName].parent, adapter.tables[joinCollectionTableName].id), eq(sql.raw(`"${joinRelsCollectionTableName}"."${columnReferenceToCurrentID}"`), currentIDColumn), eq(adapter.tables[joinRelsCollectionTableName].path, field.on)),
+                                table: adapter.tables[joinRelsCollectionTableName]
+                            });
+                        } else {
+                            // Handle localized without hasMany
+                            const foreignColumn = field.on.replaceAll('.', '_');
+                            if (field.localized) {
+                                joinLocalesCollectionTableName = `${joinCollectionTableName}${adapter.localesSuffix}`;
+                                joins.push({
+                                    type: 'innerJoin',
+                                    condition: and(eq(adapter.tables[joinLocalesCollectionTableName]._parentID, adapter.tables[joinCollectionTableName].id), eq(adapter.tables[joinLocalesCollectionTableName][foreignColumn], currentIDColumn)),
+                                    table: adapter.tables[joinLocalesCollectionTableName]
+                                });
+                            // Handle without localized and without hasMany, just a condition append to where. With localized the inner join handles eq.
+                            } else {
+                                const constraint = eq(adapter.tables[joinCollectionTableName][foreignColumn], currentIDColumn);
+                                if (subQueryWhere) {
+                                    subQueryWhere = and(subQueryWhere, constraint);
+                                } else {
+                                    subQueryWhere = constraint;
+                                }
+                            }
+                        }
+                        const chainedMethods = [];
+                        joins.forEach(({ type, condition, table })=>{
+                            chainedMethods.push({
+                                args: [
+                                    table,
+                                    condition
+                                ],
+                                method: type ?? 'leftJoin'
+                            });
+                        });
+                        if (limit !== 0) {
+                            chainedMethods.push({
+                                args: [
+                                    limit
+                                ],
+                                method: 'limit'
+                            });
+                        }
+                        const db = adapter.drizzle;
+                        const subQuery = chainMethods({
+                            methods: chainedMethods,
+                            query: db.select({
+                                id: adapter.tables[joinCollectionTableName].id,
+                                ...joinLocalesCollectionTableName && {
+                                    locale: adapter.tables[joinLocalesCollectionTableName].locale || adapter.tables[joinLocalesCollectionTableName]._locale
+                                }
+                            }).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"`);
+                        if (adapter.name === 'sqlite') {
+                            currentArgs.extras[columnName] = sql`
+              COALESCE((
+                SELECT json_group_array(json_object(${jsonObjectSelect}))
+                FROM (
+                  ${subQuery}
+                ) AS ${sql.raw(`${columnName}_sub`)}
+              ), '[]')
+            `.as(columnName);
+                        } else {
+                            currentArgs.extras[columnName] = sql`
+              COALESCE((
+                SELECT json_agg(json_build_object(${jsonObjectSelect}))
+                FROM (
+                  ${subQuery}
+                ) AS ${sql.raw(`${columnName}_sub`)}
+              ), '[]'::json)
+            `.as(columnName);
+                        }
+                        break;
+                    }
                 default:
                     {
                         break;

package/dist/find/traverseFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/find/traverseFields.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport type { Field } from 'payload'\n\nimport { fieldAffectsData, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from '../types.js'\nimport type { Result } from './buildFindManyArgs.js'\n\ntype TraverseFieldArgs = {\n  _locales: Result\n  adapter: DrizzleAdapter\n  currentArgs: Result\n  currentTableName: string\n  depth?: number\n  fields: Field[]\n  path: string\n  topLevelArgs: Record<string, unknown>\n  topLevelTableName: string\n}\n\nexport const traverseFields = ({\n  _locales,\n  adapter,\n  currentArgs,\n  currentTableName,\n  depth,\n  fields,\n  path,\n  topLevelArgs,\n  topLevelTableName,\n}: TraverseFieldArgs) => {\n  fields.forEach((field) => {\n    // handle simple relationship\n    if (\n      depth > 0 &&\n      (field.type === 'upload' ||\n        (field.type === 'relationship' && !field.hasMany && 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        path,\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\n        traverseFields({\n          _locales,\n          adapter,\n          currentArgs,\n          currentTableName,\n          depth,\n          fields: tab.fields,\n          path: tabPath,\n          topLevelArgs,\n          topLevelTableName,\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}_${path}${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            path: '',\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                path: '',\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            path: `${path}${field.name}_`,\n            topLevelArgs,\n            topLevelTableName,\n          })\n\n          break\n\n        default: {\n          break\n        }\n      }\n    }\n  })\n\n  return topLevelArgs\n}\n"],"names":["fieldAffectsData","tabHasName","toSnakeCase","traverseFields","_locales","adapter","currentArgs","currentTableName","depth","fields","path","topLevelArgs","topLevelTableName","forEach","field","type","hasMany","relationTo","localized","with","name","tabs","tab","tabPath","withArray","columns","_parentID","orderBy","_order","asc","arrayTableName","tableNameMap","get","arrayTableNameWithLocales","localesSuffix","tables","id","withSelect","order","parent","blocks","block","blockKey","slug","withBlock","tableName"],"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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../src/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA6C,MAAM,SAAS,CAAA;AAQ9E,eAAO,MAAM,IAAI,EAAE,IA8BlB,CAAA"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../src/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA6C,MAAM,SAAS,CAAA;AAQ9E,eAAO,MAAM,IAAI,EAAE,IAgClB,CAAA"}

package/dist/find.js

@@ -1,12 +1,13 @@
 import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
-export const find = async function find({ collection, limit, locale, page = 1, pagination, req = {}, sort: sortArg, where }) {
+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,
         fields: collectionConfig.fields,
+        joins,
         limit,
         locale,
         page,

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    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    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    sort,\n    tableName,\n    where,\n  })\n}\n"],"names":["toSnakeCase","findMany","find","collection","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,MAAM,EACNC,OAAO,CAAC,EACRC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACX,WAAW,CAACY,MAAM;IAC/F,MAAMN,OAAO,OAAOC,YAAY,WAAWA,UAAUE,iBAAiBI,WAAW;IAEjF,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACnB,YAAYY,iBAAiBQ,IAAI;IAEzE,OAAOnB,SAAS;QACdoB,SAAS,IAAI;QACbC,QAAQV,iBAAiBU,MAAM;QAC/BlB;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,9 +3,9 @@ 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(globalConfig);
+    const fields = buildVersionGlobalFields(this.payload.config, globalConfig);
     return findMany({
         adapter: this,
         fields,

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(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,yBAAyBc;IAExC,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/findMigrationDir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findMigrationDir.d.ts","sourceRoot":"","sources":["../src/findMigrationDir.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAuB9D"}
+{"version":3,"file":"findMigrationDir.d.ts","sourceRoot":"","sources":["../src/findMigrationDir.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAyB9D"}

package/dist/findMigrationDir.js

@@ -19,7 +19,9 @@ import path from 'path';
     const distDir = path.resolve(cwd, 'dist/migrations');
     const relativeMigrations = path.resolve(cwd, 'migrations');
     // Use arg if provided
-    if (migrationDir) return migrationDir;
+    if (migrationDir) {
+        return migrationDir;
+    }
     // Check other common locations
     if (fs.existsSync(srcDir)) {
         return srcDir;

package/dist/findMigrationDir.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findMigrationDir.ts"],"sourcesContent":["import fs from 'fs'\nimport path from 'path'\n\n/**\n * Attempt to find migrations directory.\n *\n * Checks for the following directories in order:\n * - `migrationDir` argument from Payload config\n * - `src/migrations`\n * - `dist/migrations`\n * - `migrations`\n *\n * Defaults to `src/migrations`\n *\n * @param migrationDir\n * @returns\n */\nexport function findMigrationDir(migrationDir?: string): string {\n  const cwd = process.cwd()\n  const srcDir = path.resolve(cwd, 'src/migrations')\n  const distDir = path.resolve(cwd, 'dist/migrations')\n  const relativeMigrations = path.resolve(cwd, 'migrations')\n\n  // Use arg if provided\n  if (migrationDir) return migrationDir\n\n  // Check other common locations\n  if (fs.existsSync(srcDir)) {\n    return srcDir\n  }\n\n  if (fs.existsSync(distDir)) {\n    return distDir\n  }\n\n  if (fs.existsSync(relativeMigrations)) {\n    return relativeMigrations\n  }\n\n  return srcDir\n}\n"],"names":["fs","path","findMigrationDir","migrationDir","cwd","process","srcDir","resolve","distDir","relativeMigrations","existsSync"],"mappings":"AAAA,OAAOA,QAAQ,KAAI;AACnB,OAAOC,UAAU,OAAM;AAEvB;;;;;;;;;;;;;CAaC,GACD,OAAO,SAASC,iBAAiBC,YAAqB;IACpD,MAAMC,MAAMC,QAAQD,GAAG;IACvB,MAAME,SAASL,KAAKM,OAAO,CAACH,KAAK;IACjC,MAAMI,UAAUP,KAAKM,OAAO,CAACH,KAAK;IAClC,MAAMK,qBAAqBR,KAAKM,OAAO,CAACH,KAAK;IAE7C,sBAAsB;IACtB,IAAID,cAAc,OAAOA;IAEzB,+BAA+B;IAC/B,IAAIH,GAAGU,UAAU,CAACJ,SAAS;QACzB,OAAOA;IACT;IAEA,IAAIN,GAAGU,UAAU,CAACF,UAAU;QAC1B,OAAOA;IACT;IAEA,IAAIR,GAAGU,UAAU,CAACD,qBAAqB;QACrC,OAAOA;IACT;IAEA,OAAOH;AACT"}
+{"version":3,"sources":["../src/findMigrationDir.ts"],"sourcesContent":["import fs from 'fs'\nimport path from 'path'\n\n/**\n * Attempt to find migrations directory.\n *\n * Checks for the following directories in order:\n * - `migrationDir` argument from Payload config\n * - `src/migrations`\n * - `dist/migrations`\n * - `migrations`\n *\n * Defaults to `src/migrations`\n *\n * @param migrationDir\n * @returns\n */\nexport function findMigrationDir(migrationDir?: string): string {\n  const cwd = process.cwd()\n  const srcDir = path.resolve(cwd, 'src/migrations')\n  const distDir = path.resolve(cwd, 'dist/migrations')\n  const relativeMigrations = path.resolve(cwd, 'migrations')\n\n  // Use arg if provided\n  if (migrationDir) {\n    return migrationDir\n  }\n\n  // Check other common locations\n  if (fs.existsSync(srcDir)) {\n    return srcDir\n  }\n\n  if (fs.existsSync(distDir)) {\n    return distDir\n  }\n\n  if (fs.existsSync(relativeMigrations)) {\n    return relativeMigrations\n  }\n\n  return srcDir\n}\n"],"names":["fs","path","findMigrationDir","migrationDir","cwd","process","srcDir","resolve","distDir","relativeMigrations","existsSync"],"mappings":"AAAA,OAAOA,QAAQ,KAAI;AACnB,OAAOC,UAAU,OAAM;AAEvB;;;;;;;;;;;;;CAaC,GACD,OAAO,SAASC,iBAAiBC,YAAqB;IACpD,MAAMC,MAAMC,QAAQD,GAAG;IACvB,MAAME,SAASL,KAAKM,OAAO,CAACH,KAAK;IACjC,MAAMI,UAAUP,KAAKM,OAAO,CAACH,KAAK;IAClC,MAAMK,qBAAqBR,KAAKM,OAAO,CAACH,KAAK;IAE7C,sBAAsB;IACtB,IAAID,cAAc;QAChB,OAAOA;IACT;IAEA,+BAA+B;IAC/B,IAAIH,GAAGU,UAAU,CAACJ,SAAS;QACzB,OAAOA;IACT;IAEA,IAAIN,GAAGU,UAAU,CAACF,UAAU;QAC1B,OAAOA;IACT;IAEA,IAAIR,GAAGU,UAAU,CAACD,qBAAqB;QACrC,OAAOA;IACT;IAEA,OAAOH;AACT"}

package/dist/findOne.d.ts

@@ -1,4 +1,4 @@
 import type { FindOneArgs, TypeWithID } from 'payload';
 import type { DrizzleAdapter } from './types.js';
-export declare function findOne<T extends TypeWithID>(this: DrizzleAdapter, { collection, locale, req, where }: FindOneArgs): Promise<T>;
+export declare function findOne<T extends TypeWithID>(this: DrizzleAdapter, { collection, joins, locale, req, where }: FindOneArgs): Promise<T>;
 //# sourceMappingURL=findOne.d.ts.map

package/dist/findOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findOne.d.ts","sourceRoot":"","sources":["../src/findOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAA6C,UAAU,EAAE,MAAM,SAAS,CAAA;AAIjG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,wBAAsB,OAAO,CAAC,CAAC,SAAS,UAAU,EAChD,IAAI,EAAE,cAAc,EACpB,EAAE,UAAU,EAAE,MAAM,EAAE,GAA0B,EAAE,KAAK,EAAE,EAAE,WAAW,GACrE,OAAO,CAAC,CAAC,CAAC,CAmBZ"}
+{"version":3,"file":"findOne.d.ts","sourceRoot":"","sources":["../src/findOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAA6C,UAAU,EAAE,MAAM,SAAS,CAAA;AAIjG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,wBAAsB,OAAO,CAAC,CAAC,SAAS,UAAU,EAChD,IAAI,EAAE,cAAc,EACpB,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAA0B,EAAE,KAAK,EAAE,EAAE,WAAW,GAC5E,OAAO,CAAC,CAAC,CAAC,CAoBZ"}

package/dist/findOne.js

@@ -1,11 +1,12 @@
 import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
-export async function findOne({ collection, locale, req = {}, where }) {
+export async function findOne({ collection, joins, locale, req = {}, where }) {
     const collectionConfig = this.payload.collections[collection].config;
     const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug));
     const { docs } = await findMany({
         adapter: this,
         fields: collectionConfig.fields,
+        joins,
         limit: 1,
         locale,
         page: 1,

package/dist/findOne.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findOne.ts"],"sourcesContent":["import type { FindOneArgs, PayloadRequest, SanitizedCollectionConfig, TypeWithID } 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 async function findOne<T extends TypeWithID>(\n  this: DrizzleAdapter,\n  { collection, locale, req = {} as PayloadRequest, where }: FindOneArgs,\n): Promise<T> {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  const { docs } = await findMany({\n    adapter: this,\n    fields: collectionConfig.fields,\n    limit: 1,\n    locale,\n    page: 1,\n    pagination: false,\n    req,\n    sort: undefined,\n    tableName,\n    where,\n  })\n\n  return docs?.[0] || null\n}\n"],"names":["toSnakeCase","findMany","findOne","collection","locale","req","where","collectionConfig","payload","collections","config","tableName","tableNameMap","get","slug","docs","adapter","fields","limit","page","pagination","sort","undefined"],"mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,eAAeC,QAEpB,EAAEC,UAAU,EAAEC,MAAM,EAAEC,MAAM,CAAC,CAAmB,EAAEC,KAAK,EAAe;IAEtE,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACN,WAAW,CAACO,MAAM;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACb,YAAYO,iBAAiBO,IAAI;IAEzE,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAMd,SAAS;QAC9Be,SAAS,IAAI;QACbC,QAAQV,iBAAiBU,MAAM;QAC/BC,OAAO;QACPd;QACAe,MAAM;QACNC,YAAY;QACZf;QACAgB,MAAMC;QACNX;QACAL;IACF;IAEA,OAAOS,MAAM,CAAC,EAAE,IAAI;AACtB"}
+{"version":3,"sources":["../src/findOne.ts"],"sourcesContent":["import type { FindOneArgs, PayloadRequest, SanitizedCollectionConfig, TypeWithID } 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 async function findOne<T extends TypeWithID>(\n  this: DrizzleAdapter,\n  { collection, joins, locale, req = {} as PayloadRequest, where }: FindOneArgs,\n): Promise<T> {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  const { docs } = await findMany({\n    adapter: this,\n    fields: collectionConfig.fields,\n    joins,\n    limit: 1,\n    locale,\n    page: 1,\n    pagination: false,\n    req,\n    sort: undefined,\n    tableName,\n    where,\n  })\n\n  return docs?.[0] || null\n}\n"],"names":["toSnakeCase","findMany","findOne","collection","joins","locale","req","where","collectionConfig","payload","collections","config","tableName","tableNameMap","get","slug","docs","adapter","fields","limit","page","pagination","sort","undefined"],"mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C,OAAO,eAAeC,QAEpB,EAAEC,UAAU,EAAEC,KAAK,EAAEC,MAAM,EAAEC,MAAM,CAAC,CAAmB,EAAEC,KAAK,EAAe;IAE7E,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACP,WAAW,CAACQ,MAAM;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACd,YAAYQ,iBAAiBO,IAAI;IAEzE,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAMf,SAAS;QAC9BgB,SAAS,IAAI;QACbC,QAAQV,iBAAiBU,MAAM;QAC/Bd;QACAe,OAAO;QACPd;QACAe,MAAM;QACNC,YAAY;QACZf;QACAgB,MAAMC;QACNX;QACAL;IACF;IAEA,OAAOS,MAAM,CAAC,EAAE,IAAI;AACtB"}

package/dist/findVersions.js

@@ -3,9 +3,9 @@ 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(collectionConfig);
+    const fields = buildVersionCollectionFields(this.payload.config, collectionConfig);
     return findMany({
         adapter: this,
         fields,