payload 3.0.0-beta.12 → 3.0.0-beta.121

package/dist/collections/config/useAsTitle.spec.js

@@ -0,0 +1,186 @@
+import { InvalidConfiguration } from '../../errors/InvalidConfiguration.js';
+import { sanitizeCollection } from './sanitize.js';
+describe('sanitize - collections -', ()=>{
+    const config = {
+        collections: [],
+        globals: []
+    };
+    describe('validate useAsTitle -', ()=>{
+        const defaultCollection = {
+            slug: 'collection-with-defaults',
+            fields: [
+                {
+                    name: 'title',
+                    type: 'text'
+                }
+            ]
+        };
+        it('should throw on invalid field', async ()=>{
+            const collectionConfig = {
+                ...defaultCollection,
+                admin: {
+                    useAsTitle: 'invalidField'
+                }
+            };
+            await expect(async ()=>{
+                await sanitizeCollection(// @ts-expect-error
+                {
+                    ...config,
+                    collections: [
+                        collectionConfig
+                    ]
+                }, collectionConfig);
+            }).rejects.toThrow(InvalidConfiguration);
+        });
+        it('should not throw on valid field', async ()=>{
+            const collectionConfig = {
+                ...defaultCollection,
+                admin: {
+                    useAsTitle: 'title'
+                }
+            };
+            await expect(async ()=>{
+                await sanitizeCollection(// @ts-expect-error
+                {
+                    ...config,
+                    collections: [
+                        collectionConfig
+                    ]
+                }, collectionConfig);
+            }).not.toThrow();
+        });
+        it('should not throw on valid field inside tabs', async ()=>{
+            const collectionConfig = {
+                ...defaultCollection,
+                admin: {
+                    useAsTitle: 'title'
+                },
+                fields: [
+                    {
+                        type: 'tabs',
+                        tabs: [
+                            {
+                                label: 'General',
+                                fields: [
+                                    {
+                                        name: 'title',
+                                        type: 'text'
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            };
+            await expect(async ()=>{
+                await sanitizeCollection(// @ts-expect-error
+                {
+                    ...config,
+                    collections: [
+                        collectionConfig
+                    ]
+                }, collectionConfig);
+            }).not.toThrow();
+        });
+        it('should not throw on valid field inside collapsibles', async ()=>{
+            const collectionConfig = {
+                ...defaultCollection,
+                admin: {
+                    useAsTitle: 'title'
+                },
+                fields: [
+                    {
+                        type: 'collapsible',
+                        label: 'Collapsible',
+                        fields: [
+                            {
+                                name: 'title',
+                                type: 'text'
+                            }
+                        ]
+                    }
+                ]
+            };
+            await expect(async ()=>{
+                await sanitizeCollection(// @ts-expect-error
+                {
+                    ...config,
+                    collections: [
+                        collectionConfig
+                    ]
+                }, collectionConfig);
+            }).not.toThrow();
+        });
+        it('should throw on nested useAsTitle', async ()=>{
+            const collectionConfig = {
+                ...defaultCollection,
+                admin: {
+                    useAsTitle: 'content.title'
+                }
+            };
+            await expect(async ()=>{
+                await sanitizeCollection(// @ts-expect-error
+                {
+                    ...config,
+                    collections: [
+                        collectionConfig
+                    ]
+                }, collectionConfig);
+            }).rejects.toThrow(InvalidConfiguration);
+        });
+        it('should not throw on default field: id', async ()=>{
+            const collectionConfig = {
+                ...defaultCollection,
+                admin: {
+                    useAsTitle: 'id'
+                }
+            };
+            await expect(async ()=>{
+                await sanitizeCollection(// @ts-expect-error
+                {
+                    ...config,
+                    collections: [
+                        collectionConfig
+                    ]
+                }, collectionConfig);
+            }).not.toThrow();
+        });
+        it('should not throw on default field: email if auth is enabled', async ()=>{
+            const collectionConfig = {
+                ...defaultCollection,
+                auth: true,
+                admin: {
+                    useAsTitle: 'email'
+                }
+            };
+            await expect(async ()=>{
+                await sanitizeCollection(// @ts-expect-error
+                {
+                    ...config,
+                    collections: [
+                        collectionConfig
+                    ]
+                }, collectionConfig);
+            }).not.toThrow();
+        });
+        it('should throw on default field: email if auth is not enabled', async ()=>{
+            const collectionConfig = {
+                ...defaultCollection,
+                admin: {
+                    useAsTitle: 'email'
+                }
+            };
+            await expect(async ()=>{
+                await sanitizeCollection(// @ts-expect-error
+                {
+                    ...config,
+                    collections: [
+                        collectionConfig
+                    ]
+                }, collectionConfig);
+            }).rejects.toThrow(InvalidConfiguration);
+        });
+    });
+});
+
+//# sourceMappingURL=useAsTitle.spec.js.map

package/dist/collections/config/useAsTitle.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/collections/config/useAsTitle.spec.ts"],"sourcesContent":["import type { Config } from '../../config/types.js'\nimport type { CollectionConfig } from '../../index.js'\n\nimport { InvalidConfiguration } from '../../errors/InvalidConfiguration.js'\nimport { sanitizeCollection } from './sanitize.js'\n\ndescribe('sanitize - collections -', () => {\n  const config = {\n    collections: [],\n    globals: [],\n  } as Partial<Config>\n\n  describe('validate useAsTitle -', () => {\n    const defaultCollection: CollectionConfig = {\n      slug: 'collection-with-defaults',\n      fields: [\n        {\n          name: 'title',\n          type: 'text',\n        },\n      ],\n    }\n\n    it('should throw on invalid field', async () => {\n      const collectionConfig: CollectionConfig = {\n        ...defaultCollection,\n        admin: {\n          useAsTitle: 'invalidField',\n        },\n      }\n      await expect(async () => {\n        await sanitizeCollection(\n          // @ts-expect-error\n          {\n            ...config,\n            collections: [collectionConfig],\n          },\n          collectionConfig,\n        )\n      }).rejects.toThrow(InvalidConfiguration)\n    })\n\n    it('should not throw on valid field', async () => {\n      const collectionConfig: CollectionConfig = {\n        ...defaultCollection,\n        admin: {\n          useAsTitle: 'title',\n        },\n      }\n      await expect(async () => {\n        await sanitizeCollection(\n          // @ts-expect-error\n          {\n            ...config,\n            collections: [collectionConfig],\n          },\n          collectionConfig,\n        )\n      }).not.toThrow()\n    })\n\n    it('should not throw on valid field inside tabs', async () => {\n      const collectionConfig: CollectionConfig = {\n        ...defaultCollection,\n        admin: {\n          useAsTitle: 'title',\n        },\n        fields: [\n          {\n            type: 'tabs',\n            tabs: [\n              {\n                label: 'General',\n                fields: [\n                  {\n                    name: 'title',\n                    type: 'text',\n                  },\n                ],\n              },\n            ],\n          },\n        ],\n      }\n      await expect(async () => {\n        await sanitizeCollection(\n          // @ts-expect-error\n          {\n            ...config,\n            collections: [collectionConfig],\n          },\n          collectionConfig,\n        )\n      }).not.toThrow()\n    })\n\n    it('should not throw on valid field inside collapsibles', async () => {\n      const collectionConfig: CollectionConfig = {\n        ...defaultCollection,\n        admin: {\n          useAsTitle: 'title',\n        },\n        fields: [\n          {\n            type: 'collapsible',\n            label: 'Collapsible',\n            fields: [\n              {\n                name: 'title',\n                type: 'text',\n              },\n            ],\n          },\n        ],\n      }\n      await expect(async () => {\n        await sanitizeCollection(\n          // @ts-expect-error\n          {\n            ...config,\n            collections: [collectionConfig],\n          },\n          collectionConfig,\n        )\n      }).not.toThrow()\n    })\n\n    it('should throw on nested useAsTitle', async () => {\n      const collectionConfig: CollectionConfig = {\n        ...defaultCollection,\n        admin: {\n          useAsTitle: 'content.title',\n        },\n      }\n      await expect(async () => {\n        await sanitizeCollection(\n          // @ts-expect-error\n          {\n            ...config,\n            collections: [collectionConfig],\n          },\n          collectionConfig,\n        )\n      }).rejects.toThrow(InvalidConfiguration)\n    })\n\n    it('should not throw on default field: id', async () => {\n      const collectionConfig: CollectionConfig = {\n        ...defaultCollection,\n        admin: {\n          useAsTitle: 'id',\n        },\n      }\n      await expect(async () => {\n        await sanitizeCollection(\n          // @ts-expect-error\n          {\n            ...config,\n            collections: [collectionConfig],\n          },\n          collectionConfig,\n        )\n      }).not.toThrow()\n    })\n\n    it('should not throw on default field: email if auth is enabled', async () => {\n      const collectionConfig: CollectionConfig = {\n        ...defaultCollection,\n        auth: true,\n        admin: {\n          useAsTitle: 'email',\n        },\n      }\n      await expect(async () => {\n        await sanitizeCollection(\n          // @ts-expect-error\n          {\n            ...config,\n            collections: [collectionConfig],\n          },\n          collectionConfig,\n        )\n      }).not.toThrow()\n    })\n    it('should throw on default field: email if auth is not enabled', async () => {\n      const collectionConfig: CollectionConfig = {\n        ...defaultCollection,\n        admin: {\n          useAsTitle: 'email',\n        },\n      }\n      await expect(async () => {\n        await sanitizeCollection(\n          // @ts-expect-error\n          {\n            ...config,\n            collections: [collectionConfig],\n          },\n          collectionConfig,\n        )\n      }).rejects.toThrow(InvalidConfiguration)\n    })\n  })\n})\n"],"names":["InvalidConfiguration","sanitizeCollection","describe","config","collections","globals","defaultCollection","slug","fields","name","type","it","collectionConfig","admin","useAsTitle","expect","rejects","toThrow","not","tabs","label","auth"],"mappings":"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"}

package/dist/collections/dataloader.d.ts

@@ -1,5 +1,20 @@
 import DataLoader from 'dataloader';
-import type { PayloadRequest } from '../types/index.js';
+import type { PayloadRequest, SelectType } from '../types/index.js';
 import type { TypeWithID } from './config/types.js';
 export declare const getDataLoader: (req: PayloadRequest) => DataLoader<string, TypeWithID, string>;
+type CreateCacheKeyArgs = {
+    collectionSlug: string;
+    currentDepth: number;
+    depth: number;
+    docID: number | string;
+    draft: boolean;
+    fallbackLocale: string;
+    locale: string;
+    overrideAccess: boolean;
+    select?: SelectType;
+    showHiddenFields: boolean;
+    transactionID: number | Promise<number | string> | string;
+};
+export declare const createDataloaderCacheKey: ({ collectionSlug, currentDepth, depth, docID, draft, fallbackLocale, locale, overrideAccess, select, showHiddenFields, transactionID, }: CreateCacheKeyArgs) => string;
+export {};
 //# sourceMappingURL=dataloader.d.ts.map

package/dist/collections/dataloader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataloader.d.ts","sourceRoot":"","sources":["../../src/collections/dataloader.ts"],"names":[],"mappings":"AAEA,OAAO,UAAU,MAAM,YAAY,CAAA;AAEnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAkJnD,eAAO,MAAM,aAAa,QAAS,cAAc,2CAA0C,CAAA"}
+{"version":3,"file":"dataloader.d.ts","sourceRoot":"","sources":["../../src/collections/dataloader.ts"],"names":[],"mappings":"AAEA,OAAO,UAAU,MAAM,YAAY,CAAA;AAEnC,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AA8JnD,eAAO,MAAM,aAAa,QAAS,cAAc,2CAA0C,CAAA;AAE3F,KAAK,kBAAkB,GAAG;IACxB,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;IACtB,KAAK,EAAE,OAAO,CAAA;IACd,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,gBAAgB,EAAE,OAAO,CAAA;IACzB,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM,CAAA;CAC1D,CAAA;AACD,eAAO,MAAM,wBAAwB,4IAYlC,kBAAkB,KAAG,MAapB,CAAA"}

package/dist/collections/dataloader.js

@@ -28,7 +28,7 @@ const batchAndLoadDocs = (req)=>async (keys)=>{
       };
     *
     **/ const batchByFindArgs = keys.reduce((batches, key)=>{
-            const [transactionID, collection, id, depth, currentDepth, locale, fallbackLocale, overrideAccess, showHiddenFields] = JSON.parse(key);
+            const [transactionID, collection, id, depth, currentDepth, locale, fallbackLocale, overrideAccess, showHiddenFields, draft, select] = JSON.parse(key);
             const batchKeyArray = [
                 transactionID,
                 collection,
@@ -37,12 +37,16 @@ const batchAndLoadDocs = (req)=>async (keys)=>{
                 locale,
                 fallbackLocale,
                 overrideAccess,
-                showHiddenFields
+                showHiddenFields,
+                draft,
+                select
             ];
             const batchKey = JSON.stringify(batchKeyArray);
             const idType = payload.collections?.[collection].customIDType || payload.db.defaultIDType;
             let sanitizedID = id;
-            if (idType === 'number') sanitizedID = parseFloat(id);
+            if (idType === 'number') {
+                sanitizedID = parseFloat(id);
+            }
             if (isValidID(sanitizedID, idType)) {
                 return {
                     ...batches,
@@ -57,18 +61,20 @@ const batchAndLoadDocs = (req)=>async (keys)=>{
         // Run find requests one after another, so as to not hang transactions
         await Object.entries(batchByFindArgs).reduce(async (priorFind, [batchKey, ids])=>{
             await priorFind;
-            const [transactionID, collection, depth, currentDepth, locale, fallbackLocale, overrideAccess, showHiddenFields] = JSON.parse(batchKey);
+            const [transactionID, collection, depth, currentDepth, locale, fallbackLocale, overrideAccess, showHiddenFields, draft, select] = JSON.parse(batchKey);
             req.transactionID = transactionID;
             const result = await payload.find({
                 collection,
                 currentDepth,
                 depth,
                 disableErrors: true,
+                draft,
                 fallbackLocale,
                 locale,
                 overrideAccess: Boolean(overrideAccess),
                 pagination: false,
                 req,
+                select,
                 showHiddenFields: Boolean(showHiddenFields),
                 where: {
                     id: {
@@ -79,17 +85,19 @@ const batchAndLoadDocs = (req)=>async (keys)=>{
             // For each returned doc, find index in original keys
             // Inject doc within docs array if index exists
             result.docs.forEach((doc)=>{
-                const docKey = JSON.stringify([
-                    req.transactionID,
-                    collection,
-                    doc.id,
-                    depth,
+                const docKey = createDataloaderCacheKey({
+                    collectionSlug: collection,
                     currentDepth,
-                    locale,
+                    depth,
+                    docID: doc.id,
+                    draft,
                     fallbackLocale,
+                    locale,
                     overrideAccess,
-                    showHiddenFields
-                ]);
+                    select,
+                    showHiddenFields,
+                    transactionID: req.transactionID
+                });
                 const docsIndex = keys.findIndex((key)=>key === docKey);
                 if (docsIndex > -1) {
                     docs[docsIndex] = doc;
@@ -102,5 +110,18 @@ const batchAndLoadDocs = (req)=>async (keys)=>{
         return docs;
     };
 export const getDataLoader = (req)=>new DataLoader(batchAndLoadDocs(req));
+export const createDataloaderCacheKey = ({ collectionSlug, currentDepth, depth, docID, draft, fallbackLocale, locale, overrideAccess, select, showHiddenFields, transactionID })=>JSON.stringify([
+        transactionID,
+        collectionSlug,
+        docID,
+        depth,
+        currentDepth,
+        locale,
+        fallbackLocale,
+        overrideAccess,
+        showHiddenFields,
+        draft,
+        select
+    ]);
 
 //# sourceMappingURL=dataloader.js.map

package/dist/collections/dataloader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/collections/dataloader.ts"],"sourcesContent":["import type { BatchLoadFn } from 'dataloader'\n\nimport DataLoader from 'dataloader'\n\nimport type { PayloadRequest } from '../types/index.js'\nimport type { TypeWithID } from './config/types.js'\n\nimport { isValidID } from '../utilities/isValidID.js'\n\n// Payload uses `dataloader` to solve the classic GraphQL N+1 problem.\n\n// We keep a list of all documents requested to be populated for any given request\n// and then batch together documents within the same collection,\n// making only 1 find per each collection, rather than `findByID` per each requested doc.\n\n// This dramatically improves performance for REST and Local API `depth` populations,\n// and also ensures complex GraphQL queries perform lightning-fast.\n\nconst batchAndLoadDocs =\n  (req: PayloadRequest): BatchLoadFn<string, TypeWithID> =>\n  async (keys: string[]): Promise<TypeWithID[]> => {\n    const { payload } = req\n\n    // Create docs array of same length as keys, using null as value\n    // We will replace nulls with injected docs as they are retrieved\n    const docs: (TypeWithID | null)[] = keys.map(() => null)\n\n    /**\n    * Batch IDs by their `find` args\n    * so we can make one find query per combination of collection, depth, locale, and fallbackLocale.\n    *\n    * Resulting shape will be as follows:\n      {\n        // key is stringified set of find args\n        '[null,\"pages\",2,0,\"es\",\"en\",false,false]': [\n          // value is array of IDs to find with these args\n          'q34tl23462346234524',\n          '435523540194324280',\n          '2346245j35l3j5234532li',\n        ],\n        // etc\n      };\n    *\n    **/\n\n    const batchByFindArgs = keys.reduce((batches, key) => {\n      const [\n        transactionID,\n        collection,\n        id,\n        depth,\n        currentDepth,\n        locale,\n        fallbackLocale,\n        overrideAccess,\n        showHiddenFields,\n      ] = JSON.parse(key)\n\n      const batchKeyArray = [\n        transactionID,\n        collection,\n        depth,\n        currentDepth,\n        locale,\n        fallbackLocale,\n        overrideAccess,\n        showHiddenFields,\n      ]\n\n      const batchKey = JSON.stringify(batchKeyArray)\n\n      const idType = payload.collections?.[collection].customIDType || payload.db.defaultIDType\n\n      let sanitizedID: number | string = id\n\n      if (idType === 'number') sanitizedID = parseFloat(id)\n\n      if (isValidID(sanitizedID, idType)) {\n        return {\n          ...batches,\n          [batchKey]: [...(batches[batchKey] || []), sanitizedID],\n        }\n      }\n      return batches\n    }, {})\n\n    // Run find requests one after another, so as to not hang transactions\n\n    await Object.entries(batchByFindArgs).reduce(async (priorFind, [batchKey, ids]) => {\n      await priorFind\n\n      const [\n        transactionID,\n        collection,\n        depth,\n        currentDepth,\n        locale,\n        fallbackLocale,\n        overrideAccess,\n        showHiddenFields,\n      ] = JSON.parse(batchKey)\n\n      req.transactionID = transactionID\n\n      const result = await payload.find({\n        collection,\n        currentDepth,\n        depth,\n        disableErrors: true,\n        fallbackLocale,\n        locale,\n        overrideAccess: Boolean(overrideAccess),\n        pagination: false,\n        req,\n        showHiddenFields: Boolean(showHiddenFields),\n        where: {\n          id: {\n            in: ids,\n          },\n        },\n      })\n\n      // For each returned doc, find index in original keys\n      // Inject doc within docs array if index exists\n\n      result.docs.forEach((doc) => {\n        const docKey = JSON.stringify([\n          req.transactionID,\n          collection,\n          doc.id,\n          depth,\n          currentDepth,\n          locale,\n          fallbackLocale,\n          overrideAccess,\n          showHiddenFields,\n        ])\n        const docsIndex = keys.findIndex((key) => key === docKey)\n\n        if (docsIndex > -1) {\n          docs[docsIndex] = doc\n        }\n      })\n    }, Promise.resolve())\n\n    // Return docs array,\n    // which has now been injected with all fetched docs\n    // and should match the length of the incoming keys arg\n    return docs\n  }\n\nexport const getDataLoader = (req: PayloadRequest) => new DataLoader(batchAndLoadDocs(req))\n"],"names":["DataLoader","isValidID","batchAndLoadDocs","req","keys","payload","docs","map","batchByFindArgs","reduce","batches","key","transactionID","collection","id","depth","currentDepth","locale","fallbackLocale","overrideAccess","showHiddenFields","JSON","parse","batchKeyArray","batchKey","stringify","idType","collections","customIDType","db","defaultIDType","sanitizedID","parseFloat","Object","entries","priorFind","ids","result","find","disableErrors","Boolean","pagination","where","in","forEach","doc","docKey","docsIndex","findIndex","Promise","resolve","getDataLoader"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,OAAOA,gBAAgB,aAAY;AAKnC,SAASC,SAAS,QAAQ,4BAA2B;AAErD,sEAAsE;AAEtE,kFAAkF;AAClF,gEAAgE;AAChE,yFAAyF;AAEzF,qFAAqF;AACrF,mEAAmE;AAEnE,MAAMC,mBACJ,CAACC,MACD,OAAOC;QACL,MAAM,EAAEC,OAAO,EAAE,GAAGF;QAEpB,gEAAgE;QAChE,iEAAiE;QACjE,MAAMG,OAA8BF,KAAKG,GAAG,CAAC,IAAM;QAEnD;;;;;;;;;;;;;;;;KAgBC,GAED,MAAMC,kBAAkBJ,KAAKK,MAAM,CAAC,CAACC,SAASC;YAC5C,MAAM,CACJC,eACAC,YACAC,IACAC,OACAC,cACAC,QACAC,gBACAC,gBACAC,iBACD,GAAGC,KAAKC,KAAK,CAACX;YAEf,MAAMY,gBAAgB;gBACpBX;gBACAC;gBACAE;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC;aACD;YAED,MAAMI,WAAWH,KAAKI,SAAS,CAACF;YAEhC,MAAMG,SAASrB,QAAQsB,WAAW,EAAE,CAACd,WAAW,CAACe,gBAAgBvB,QAAQwB,EAAE,CAACC,aAAa;YAEzF,IAAIC,cAA+BjB;YAEnC,IAAIY,WAAW,UAAUK,cAAcC,WAAWlB;YAElD,IAAIb,UAAU8B,aAAaL,SAAS;gBAClC,OAAO;oBACL,GAAGhB,OAAO;oBACV,CAACc,SAAS,EAAE;2BAAKd,OAAO,CAACc,SAAS,IAAI,EAAE;wBAAGO;qBAAY;gBACzD;YACF;YACA,OAAOrB;QACT,GAAG,CAAC;QAEJ,sEAAsE;QAEtE,MAAMuB,OAAOC,OAAO,CAAC1B,iBAAiBC,MAAM,CAAC,OAAO0B,WAAW,CAACX,UAAUY,IAAI;YAC5E,MAAMD;YAEN,MAAM,CACJvB,eACAC,YACAE,OACAC,cACAC,QACAC,gBACAC,gBACAC,iBACD,GAAGC,KAAKC,KAAK,CAACE;YAEfrB,IAAIS,aAAa,GAAGA;YAEpB,MAAMyB,SAAS,MAAMhC,QAAQiC,IAAI,CAAC;gBAChCzB;gBACAG;gBACAD;gBACAwB,eAAe;gBACfrB;gBACAD;gBACAE,gBAAgBqB,QAAQrB;gBACxBsB,YAAY;gBACZtC;gBACAiB,kBAAkBoB,QAAQpB;gBAC1BsB,OAAO;oBACL5B,IAAI;wBACF6B,IAAIP;oBACN;gBACF;YACF;YAEA,qDAAqD;YACrD,+CAA+C;YAE/CC,OAAO/B,IAAI,CAACsC,OAAO,CAAC,CAACC;gBACnB,MAAMC,SAASzB,KAAKI,SAAS,CAAC;oBAC5BtB,IAAIS,aAAa;oBACjBC;oBACAgC,IAAI/B,EAAE;oBACNC;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC;iBACD;gBACD,MAAM2B,YAAY3C,KAAK4C,SAAS,CAAC,CAACrC,MAAQA,QAAQmC;gBAElD,IAAIC,YAAY,CAAC,GAAG;oBAClBzC,IAAI,CAACyC,UAAU,GAAGF;gBACpB;YACF;QACF,GAAGI,QAAQC,OAAO;QAElB,qBAAqB;QACrB,oDAAoD;QACpD,uDAAuD;QACvD,OAAO5C;IACT;AAEF,OAAO,MAAM6C,gBAAgB,CAAChD,MAAwB,IAAIH,WAAWE,iBAAiBC,MAAK"}
+{"version":3,"sources":["../../src/collections/dataloader.ts"],"sourcesContent":["import type { BatchLoadFn } from 'dataloader'\n\nimport DataLoader from 'dataloader'\n\nimport type { PayloadRequest, SelectType } from '../types/index.js'\nimport type { TypeWithID } from './config/types.js'\n\nimport { isValidID } from '../utilities/isValidID.js'\n\n// Payload uses `dataloader` to solve the classic GraphQL N+1 problem.\n\n// We keep a list of all documents requested to be populated for any given request\n// and then batch together documents within the same collection,\n// making only 1 find per each collection, rather than `findByID` per each requested doc.\n\n// This dramatically improves performance for REST and Local API `depth` populations,\n// and also ensures complex GraphQL queries perform lightning-fast.\n\nconst batchAndLoadDocs =\n  (req: PayloadRequest): BatchLoadFn<string, TypeWithID> =>\n  async (keys: string[]): Promise<TypeWithID[]> => {\n    const { payload } = req\n\n    // Create docs array of same length as keys, using null as value\n    // We will replace nulls with injected docs as they are retrieved\n    const docs: (null | TypeWithID)[] = keys.map(() => null)\n\n    /**\n    * Batch IDs by their `find` args\n    * so we can make one find query per combination of collection, depth, locale, and fallbackLocale.\n    *\n    * Resulting shape will be as follows:\n      {\n        // key is stringified set of find args\n        '[null,\"pages\",2,0,\"es\",\"en\",false,false]': [\n          // value is array of IDs to find with these args\n          'q34tl23462346234524',\n          '435523540194324280',\n          '2346245j35l3j5234532li',\n        ],\n        // etc\n      };\n    *\n    **/\n\n    const batchByFindArgs = keys.reduce((batches, key) => {\n      const [\n        transactionID,\n        collection,\n        id,\n        depth,\n        currentDepth,\n        locale,\n        fallbackLocale,\n        overrideAccess,\n        showHiddenFields,\n        draft,\n        select,\n      ] = JSON.parse(key)\n\n      const batchKeyArray = [\n        transactionID,\n        collection,\n        depth,\n        currentDepth,\n        locale,\n        fallbackLocale,\n        overrideAccess,\n        showHiddenFields,\n        draft,\n        select,\n      ]\n\n      const batchKey = JSON.stringify(batchKeyArray)\n\n      const idType = payload.collections?.[collection].customIDType || payload.db.defaultIDType\n\n      let sanitizedID: number | string = id\n\n      if (idType === 'number') {\n        sanitizedID = parseFloat(id)\n      }\n\n      if (isValidID(sanitizedID, idType)) {\n        return {\n          ...batches,\n          [batchKey]: [...(batches[batchKey] || []), sanitizedID],\n        }\n      }\n      return batches\n    }, {})\n\n    // Run find requests one after another, so as to not hang transactions\n\n    await Object.entries(batchByFindArgs).reduce(async (priorFind, [batchKey, ids]) => {\n      await priorFind\n\n      const [\n        transactionID,\n        collection,\n        depth,\n        currentDepth,\n        locale,\n        fallbackLocale,\n        overrideAccess,\n        showHiddenFields,\n        draft,\n        select,\n      ] = JSON.parse(batchKey)\n\n      req.transactionID = transactionID\n\n      const result = await payload.find({\n        collection,\n        currentDepth,\n        depth,\n        disableErrors: true,\n        draft,\n        fallbackLocale,\n        locale,\n        overrideAccess: Boolean(overrideAccess),\n        pagination: false,\n        req,\n        select,\n        showHiddenFields: Boolean(showHiddenFields),\n        where: {\n          id: {\n            in: ids,\n          },\n        },\n      })\n\n      // For each returned doc, find index in original keys\n      // Inject doc within docs array if index exists\n\n      result.docs.forEach((doc) => {\n        const docKey = createDataloaderCacheKey({\n          collectionSlug: collection,\n          currentDepth,\n          depth,\n          docID: doc.id,\n          draft,\n          fallbackLocale,\n          locale,\n          overrideAccess,\n          select,\n          showHiddenFields,\n          transactionID: req.transactionID,\n        })\n        const docsIndex = keys.findIndex((key) => key === docKey)\n\n        if (docsIndex > -1) {\n          docs[docsIndex] = doc\n        }\n      })\n    }, Promise.resolve())\n\n    // Return docs array,\n    // which has now been injected with all fetched docs\n    // and should match the length of the incoming keys arg\n    return docs\n  }\n\nexport const getDataLoader = (req: PayloadRequest) => new DataLoader(batchAndLoadDocs(req))\n\ntype CreateCacheKeyArgs = {\n  collectionSlug: string\n  currentDepth: number\n  depth: number\n  docID: number | string\n  draft: boolean\n  fallbackLocale: string\n  locale: string\n  overrideAccess: boolean\n  select?: SelectType\n  showHiddenFields: boolean\n  transactionID: number | Promise<number | string> | string\n}\nexport const createDataloaderCacheKey = ({\n  collectionSlug,\n  currentDepth,\n  depth,\n  docID,\n  draft,\n  fallbackLocale,\n  locale,\n  overrideAccess,\n  select,\n  showHiddenFields,\n  transactionID,\n}: CreateCacheKeyArgs): string =>\n  JSON.stringify([\n    transactionID,\n    collectionSlug,\n    docID,\n    depth,\n    currentDepth,\n    locale,\n    fallbackLocale,\n    overrideAccess,\n    showHiddenFields,\n    draft,\n    select,\n  ])\n"],"names":["DataLoader","isValidID","batchAndLoadDocs","req","keys","payload","docs","map","batchByFindArgs","reduce","batches","key","transactionID","collection","id","depth","currentDepth","locale","fallbackLocale","overrideAccess","showHiddenFields","draft","select","JSON","parse","batchKeyArray","batchKey","stringify","idType","collections","customIDType","db","defaultIDType","sanitizedID","parseFloat","Object","entries","priorFind","ids","result","find","disableErrors","Boolean","pagination","where","in","forEach","doc","docKey","createDataloaderCacheKey","collectionSlug","docID","docsIndex","findIndex","Promise","resolve","getDataLoader"],"mappings":"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"}

package/dist/collections/operations/count.d.ts

@@ -1,5 +1,6 @@
+import type { CollectionSlug } from '../../index.js';
 import type { PayloadRequest, Where } from '../../types/index.js';
-import type { Collection, TypeWithID } from '../config/types.js';
+import type { Collection } from '../config/types.js';
 export type Arguments = {
     collection: Collection;
     disableErrors?: boolean;
@@ -7,7 +8,7 @@ export type Arguments = {
     req?: PayloadRequest;
     where?: Where;
 };
-export declare const countOperation: <T extends TypeWithID & Record<string, unknown>>(incomingArgs: Arguments) => Promise<{
+export declare const countOperation: <TSlug extends CollectionSlug>(incomingArgs: Arguments) => Promise<{
     totalDocs: number;
 }>;
 //# sourceMappingURL=count.d.ts.map

package/dist/collections/operations/count.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../src/collections/operations/count.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAUhE,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,eAAO,MAAM,cAAc,iEACX,SAAS,KACtB,QAAQ;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAwF/B,CAAA"}
+{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../src/collections/operations/count.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAQpD,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,eAAO,MAAM,cAAc,GAAU,KAAK,SAAS,cAAc,gBACjD,SAAS,KACtB,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAoF/B,CAAA"}

package/dist/collections/operations/count.js

@@ -1,14 +1,11 @@
 import executeAccess from '../../auth/executeAccess.js';
 import { combineQueries } from '../../database/combineQueries.js';
 import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js';
-import { commitTransaction } from '../../utilities/commitTransaction.js';
-import { initTransaction } from '../../utilities/initTransaction.js';
 import { killTransaction } from '../../utilities/killTransaction.js';
 import { buildAfterOperation } from './utils.js';
 export const countOperation = async (incomingArgs)=>{
     let args = incomingArgs;
     try {
-        const shouldCommit = await initTransaction(args.req);
         // /////////////////////////////////////
         // beforeOperation - Collection
         // /////////////////////////////////////
@@ -64,7 +61,6 @@ export const countOperation = async (incomingArgs)=>{
         // /////////////////////////////////////
         // Return results
         // /////////////////////////////////////
-        if (shouldCommit) await commitTransaction(req);
         return result;
     } catch (error) {
         await killTransaction(args.req);

package/dist/collections/operations/count.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/collections/operations/count.ts"],"sourcesContent":["import type { AccessResult } from '../../config/types.js'\nimport type { PayloadRequest, Where } from '../../types/index.js'\nimport type { Collection, TypeWithID } from '../config/types.js'\n\nimport executeAccess from '../../auth/executeAccess.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js'\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport { buildAfterOperation } from './utils.js'\n\nexport type Arguments = {\n  collection: Collection\n  disableErrors?: boolean\n  overrideAccess?: boolean\n  req?: PayloadRequest\n  where?: Where\n}\n\nexport const countOperation = async <T extends TypeWithID & Record<string, unknown>>(\n  incomingArgs: Arguments,\n): Promise<{ totalDocs: number }> => {\n  let args = incomingArgs\n\n  try {\n    const shouldCommit = await initTransaction(args.req)\n\n    // /////////////////////////////////////\n    // beforeOperation - Collection\n    // /////////////////////////////////////\n\n    await args.collection.config.hooks.beforeOperation.reduce(async (priorHook, hook) => {\n      await priorHook\n\n      args =\n        (await hook({\n          args,\n          collection: args.collection.config,\n          context: args.req.context,\n          operation: 'count',\n          req: args.req,\n        })) || args\n    }, Promise.resolve())\n\n    const {\n      collection: { config: collectionConfig },\n      disableErrors,\n      overrideAccess,\n      req: { payload },\n      req,\n      where,\n    } = args\n\n    // /////////////////////////////////////\n    // Access\n    // /////////////////////////////////////\n\n    let accessResult: AccessResult\n\n    if (!overrideAccess) {\n      accessResult = await executeAccess({ disableErrors, req }, collectionConfig.access.read)\n\n      // If errors are disabled, and access returns false, return empty results\n      if (accessResult === false) {\n        return {\n          totalDocs: 0,\n        }\n      }\n    }\n\n    let result: { totalDocs: number }\n\n    const fullWhere = combineQueries(where, accessResult)\n\n    await validateQueryPaths({\n      collectionConfig,\n      overrideAccess,\n      req,\n      where,\n    })\n\n    result = await payload.db.count({\n      collection: collectionConfig.slug,\n      req,\n      where: fullWhere,\n    })\n\n    // /////////////////////////////////////\n    // afterOperation - Collection\n    // /////////////////////////////////////\n\n    result = await buildAfterOperation<T>({\n      args,\n      collection: collectionConfig,\n      operation: 'count',\n      result,\n    })\n\n    // /////////////////////////////////////\n    // Return results\n    // /////////////////////////////////////\n\n    if (shouldCommit) await commitTransaction(req)\n\n    return result\n  } catch (error: unknown) {\n    await killTransaction(args.req)\n    throw error\n  }\n}\n"],"names":["executeAccess","combineQueries","validateQueryPaths","commitTransaction","initTransaction","killTransaction","buildAfterOperation","countOperation","incomingArgs","args","shouldCommit","req","collection","config","hooks","beforeOperation","reduce","priorHook","hook","context","operation","Promise","resolve","collectionConfig","disableErrors","overrideAccess","payload","where","accessResult","access","read","totalDocs","result","fullWhere","db","count","slug","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,OAAOA,mBAAmB,8BAA6B;AACvD,SAASC,cAAc,QAAQ,mCAAkC;AACjE,SAASC,kBAAkB,QAAQ,uDAAsD;AACzF,SAASC,iBAAiB,QAAQ,uCAAsC;AACxE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,mBAAmB,QAAQ,aAAY;AAUhD,OAAO,MAAMC,iBAAiB,OAC5BC;IAEA,IAAIC,OAAOD;IAEX,IAAI;QACF,MAAME,eAAe,MAAMN,gBAAgBK,KAAKE,GAAG;QAEnD,wCAAwC;QACxC,+BAA+B;QAC/B,wCAAwC;QAExC,MAAMF,KAAKG,UAAU,CAACC,MAAM,CAACC,KAAK,CAACC,eAAe,CAACC,MAAM,CAAC,OAAOC,WAAWC;YAC1E,MAAMD;YAENR,OACE,AAAC,MAAMS,KAAK;gBACVT;gBACAG,YAAYH,KAAKG,UAAU,CAACC,MAAM;gBAClCM,SAASV,KAAKE,GAAG,CAACQ,OAAO;gBACzBC,WAAW;gBACXT,KAAKF,KAAKE,GAAG;YACf,MAAOF;QACX,GAAGY,QAAQC,OAAO;QAElB,MAAM,EACJV,YAAY,EAAEC,QAAQU,gBAAgB,EAAE,EACxCC,aAAa,EACbC,cAAc,EACdd,KAAK,EAAEe,OAAO,EAAE,EAChBf,GAAG,EACHgB,KAAK,EACN,GAAGlB;QAEJ,wCAAwC;QACxC,SAAS;QACT,wCAAwC;QAExC,IAAImB;QAEJ,IAAI,CAACH,gBAAgB;YACnBG,eAAe,MAAM5B,cAAc;gBAAEwB;gBAAeb;YAAI,GAAGY,iBAAiBM,MAAM,CAACC,IAAI;YAEvF,yEAAyE;YACzE,IAAIF,iBAAiB,OAAO;gBAC1B,OAAO;oBACLG,WAAW;gBACb;YACF;QACF;QAEA,IAAIC;QAEJ,MAAMC,YAAYhC,eAAe0B,OAAOC;QAExC,MAAM1B,mBAAmB;YACvBqB;YACAE;YACAd;YACAgB;QACF;QAEAK,SAAS,MAAMN,QAAQQ,EAAE,CAACC,KAAK,CAAC;YAC9BvB,YAAYW,iBAAiBa,IAAI;YACjCzB;YACAgB,OAAOM;QACT;QAEA,wCAAwC;QACxC,8BAA8B;QAC9B,wCAAwC;QAExCD,SAAS,MAAM1B,oBAAuB;YACpCG;YACAG,YAAYW;YACZH,WAAW;YACXY;QACF;QAEA,wCAAwC;QACxC,iBAAiB;QACjB,wCAAwC;QAExC,IAAItB,cAAc,MAAMP,kBAAkBQ;QAE1C,OAAOqB;IACT,EAAE,OAAOK,OAAgB;QACvB,MAAMhC,gBAAgBI,KAAKE,GAAG;QAC9B,MAAM0B;IACR;AACF,EAAC"}
+{"version":3,"sources":["../../../src/collections/operations/count.ts"],"sourcesContent":["import type { AccessResult } from '../../config/types.js'\nimport type { CollectionSlug } from '../../index.js'\nimport type { PayloadRequest, Where } from '../../types/index.js'\nimport type { Collection } from '../config/types.js'\n\nimport executeAccess from '../../auth/executeAccess.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport { buildAfterOperation } from './utils.js'\n\nexport type Arguments = {\n  collection: Collection\n  disableErrors?: boolean\n  overrideAccess?: boolean\n  req?: PayloadRequest\n  where?: Where\n}\n\nexport const countOperation = async <TSlug extends CollectionSlug>(\n  incomingArgs: Arguments,\n): Promise<{ totalDocs: number }> => {\n  let args = incomingArgs\n\n  try {\n    // /////////////////////////////////////\n    // beforeOperation - Collection\n    // /////////////////////////////////////\n\n    await args.collection.config.hooks.beforeOperation.reduce(async (priorHook, hook) => {\n      await priorHook\n\n      args =\n        (await hook({\n          args,\n          collection: args.collection.config,\n          context: args.req.context,\n          operation: 'count',\n          req: args.req,\n        })) || args\n    }, Promise.resolve())\n\n    const {\n      collection: { config: collectionConfig },\n      disableErrors,\n      overrideAccess,\n      req: { payload },\n      req,\n      where,\n    } = args\n\n    // /////////////////////////////////////\n    // Access\n    // /////////////////////////////////////\n\n    let accessResult: AccessResult\n\n    if (!overrideAccess) {\n      accessResult = await executeAccess({ disableErrors, req }, collectionConfig.access.read)\n\n      // If errors are disabled, and access returns false, return empty results\n      if (accessResult === false) {\n        return {\n          totalDocs: 0,\n        }\n      }\n    }\n\n    let result: { totalDocs: number }\n\n    const fullWhere = combineQueries(where, accessResult)\n\n    await validateQueryPaths({\n      collectionConfig,\n      overrideAccess,\n      req,\n      where,\n    })\n\n    result = await payload.db.count({\n      collection: collectionConfig.slug,\n      req,\n      where: fullWhere,\n    })\n\n    // /////////////////////////////////////\n    // afterOperation - Collection\n    // /////////////////////////////////////\n\n    result = await buildAfterOperation({\n      args,\n      collection: collectionConfig,\n      operation: 'count',\n      result,\n    })\n\n    // /////////////////////////////////////\n    // Return results\n    // /////////////////////////////////////\n\n    return result\n  } catch (error: unknown) {\n    await killTransaction(args.req)\n    throw error\n  }\n}\n"],"names":["executeAccess","combineQueries","validateQueryPaths","killTransaction","buildAfterOperation","countOperation","incomingArgs","args","collection","config","hooks","beforeOperation","reduce","priorHook","hook","context","req","operation","Promise","resolve","collectionConfig","disableErrors","overrideAccess","payload","where","accessResult","access","read","totalDocs","result","fullWhere","db","count","slug","error"],"mappings":"AAKA,OAAOA,mBAAmB,8BAA6B;AACvD,SAASC,cAAc,QAAQ,mCAAkC;AACjE,SAASC,kBAAkB,QAAQ,uDAAsD;AACzF,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,mBAAmB,QAAQ,aAAY;AAUhD,OAAO,MAAMC,iBAAiB,OAC5BC;IAEA,IAAIC,OAAOD;IAEX,IAAI;QACF,wCAAwC;QACxC,+BAA+B;QAC/B,wCAAwC;QAExC,MAAMC,KAAKC,UAAU,CAACC,MAAM,CAACC,KAAK,CAACC,eAAe,CAACC,MAAM,CAAC,OAAOC,WAAWC;YAC1E,MAAMD;YAENN,OACE,AAAC,MAAMO,KAAK;gBACVP;gBACAC,YAAYD,KAAKC,UAAU,CAACC,MAAM;gBAClCM,SAASR,KAAKS,GAAG,CAACD,OAAO;gBACzBE,WAAW;gBACXD,KAAKT,KAAKS,GAAG;YACf,MAAOT;QACX,GAAGW,QAAQC,OAAO;QAElB,MAAM,EACJX,YAAY,EAAEC,QAAQW,gBAAgB,EAAE,EACxCC,aAAa,EACbC,cAAc,EACdN,KAAK,EAAEO,OAAO,EAAE,EAChBP,GAAG,EACHQ,KAAK,EACN,GAAGjB;QAEJ,wCAAwC;QACxC,SAAS;QACT,wCAAwC;QAExC,IAAIkB;QAEJ,IAAI,CAACH,gBAAgB;YACnBG,eAAe,MAAMzB,cAAc;gBAAEqB;gBAAeL;YAAI,GAAGI,iBAAiBM,MAAM,CAACC,IAAI;YAEvF,yEAAyE;YACzE,IAAIF,iBAAiB,OAAO;gBAC1B,OAAO;oBACLG,WAAW;gBACb;YACF;QACF;QAEA,IAAIC;QAEJ,MAAMC,YAAY7B,eAAeuB,OAAOC;QAExC,MAAMvB,mBAAmB;YACvBkB;YACAE;YACAN;YACAQ;QACF;QAEAK,SAAS,MAAMN,QAAQQ,EAAE,CAACC,KAAK,CAAC;YAC9BxB,YAAYY,iBAAiBa,IAAI;YACjCjB;YACAQ,OAAOM;QACT;QAEA,wCAAwC;QACxC,8BAA8B;QAC9B,wCAAwC;QAExCD,SAAS,MAAMzB,oBAAoB;YACjCG;YACAC,YAAYY;YACZH,WAAW;YACXY;QACF;QAEA,wCAAwC;QACxC,iBAAiB;QACjB,wCAAwC;QAExC,OAAOA;IACT,EAAE,OAAOK,OAAgB;QACvB,MAAM/B,gBAAgBI,KAAKS,GAAG;QAC9B,MAAMkB;IACR;AACF,EAAC"}

package/dist/collections/operations/create.d.ts

@@ -1,21 +1,19 @@
-import type { MarkOptional } from 'ts-essentials';
-import type { GeneratedTypes } from '../../index.js';
-import type { PayloadRequest } from '../../types/index.js';
-import type { Collection } from '../config/types.js';
-export type CreateUpdateType = {
-    [field: number | string | symbol]: unknown;
-};
-export type Arguments<T extends CreateUpdateType> = {
+import type { CollectionSlug } from '../../index.js';
+import type { PayloadRequest, SelectType, TransformCollectionWithSelect } from '../../types/index.js';
+import type { Collection, RequiredDataFromCollectionSlug, SelectFromCollectionSlug } from '../config/types.js';
+export type Arguments<TSlug extends CollectionSlug> = {
     autosave?: boolean;
     collection: Collection;
-    data: MarkOptional<T, 'createdAt' | 'id' | 'sizes' | 'updatedAt'>;
+    data: RequiredDataFromCollectionSlug<TSlug>;
     depth?: number;
+    disableTransaction?: boolean;
     disableVerificationEmail?: boolean;
     draft?: boolean;
     overrideAccess?: boolean;
     overwriteExistingFiles?: boolean;
     req: PayloadRequest;
+    select?: SelectType;
     showHiddenFields?: boolean;
 };
-export declare const createOperation: <TSlug extends string | number | symbol>(incomingArgs: Arguments<GeneratedTypes['collections'][TSlug]>) => Promise<GeneratedTypes['collections'][TSlug]>;
+export declare const createOperation: <TSlug extends CollectionSlug, TSelect extends SelectFromCollectionSlug<TSlug>>(incomingArgs: Arguments<TSlug>) => Promise<TransformCollectionWithSelect<TSlug, TSelect>>;
 //# sourceMappingURL=create.d.ts.map

package/dist/collections/operations/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/collections/operations/create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAIjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAY,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACpE,OAAO,KAAK,EAIV,UAAU,EACX,MAAM,oBAAoB,CAAA;AAmB3B,MAAM,MAAM,gBAAgB,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAE7E,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,gBAAgB,IAAI;IAClD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE,YAAY,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,OAAO,GAAG,WAAW,CAAC,CAAA;IACjE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,eAAe,yDACZ,UAAU,cAAc,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,KAC5D,QAAQ,cAAc,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,CAuU9C,CAAA"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/collections/operations/create.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,gBAAgB,CAAA;AAChE,OAAO,KAAK,EAEV,cAAc,EACd,UAAU,EACV,6BAA6B,EAC9B,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAIV,UAAU,EACV,8BAA8B,EAC9B,wBAAwB,EACzB,MAAM,oBAAoB,CAAA;AAoB3B,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,cAAc,IAAI;IACpD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE,8BAA8B,CAAC,KAAK,CAAC,CAAA;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,KAAK,SAAS,cAAc,EAC5B,OAAO,SAAS,wBAAwB,CAAC,KAAK,CAAC,gBAEjC,SAAS,CAAC,KAAK,CAAC,KAC7B,OAAO,CAAC,6BAA6B,CAAC,KAAK,EAAE,OAAO,CAAC,CA6UvD,CAAA"}

package/dist/collections/operations/create.js

@@ -1,4 +1,5 @@
 import crypto from 'crypto';
+import { ensureUsernameOrEmail } from '../../auth/ensureUsernameOrEmail.js';
 import executeAccess from '../../auth/executeAccess.js';
 import { sendVerificationEmail } from '../../auth/sendVerificationEmail.js';
 import { registerLocalStrategy } from '../../auth/strategies/local/register.js';
@@ -18,7 +19,14 @@ import { buildAfterOperation } from './utils.js';
 export const createOperation = async (incomingArgs)=>{
     let args = incomingArgs;
     try {
-        const shouldCommit = await initTransaction(args.req);
+        const shouldCommit = !args.disableTransaction && await initTransaction(args.req);
+        ensureUsernameOrEmail({
+            authOptions: args.collection.config.auth,
+            collectionSlug: args.collection.config.slug,
+            data: args.data,
+            operation: 'create',
+            req: args.req
+        });
         // /////////////////////////////////////
         // beforeOperation - Collection
         // /////////////////////////////////////
@@ -32,7 +40,7 @@ export const createOperation = async (incomingArgs)=>{
                 req: args.req
             }) || args;
         }, Promise.resolve());
-        const { autosave = false, collection: { config: collectionConfig }, collection, depth, disableVerificationEmail, draft = false, overrideAccess, overwriteExistingFiles = false, req: { fallbackLocale, locale, payload, payload: { config, email } }, req, showHiddenFields } = args;
+        const { autosave = false, collection: { config: collectionConfig }, collection, depth, disableVerificationEmail, draft = false, overrideAccess, overwriteExistingFiles = false, req: { fallbackLocale, locale, payload, payload: { config, email } }, req, select, showHiddenFields } = args;
         let { data } = args;
         const shouldSaveDraft = Boolean(draft && collectionConfig.versions.drafts);
         // /////////////////////////////////////
@@ -60,6 +68,7 @@ export const createOperation = async (incomingArgs)=>{
             collection,
             config,
             data,
+            operation: 'create',
             overwriteExistingFiles,
             req,
             throwOnMissingFile: !shouldSaveDraft && collection.config.upload.filesRequiredOnCreate !== false
@@ -92,12 +101,6 @@ export const createOperation = async (incomingArgs)=>{
             }) || data;
         }, Promise.resolve());
         // /////////////////////////////////////
-        // Write files to local storage
-        // /////////////////////////////////////
-        // if (!collectionConfig.upload.disableLocalStorage) {
-        //   await uploadFiles(payload, filesToUpload, req.t)
-        // }
-        // /////////////////////////////////////
         // beforeChange - Collection
         // /////////////////////////////////////
         await collectionConfig.hooks.beforeChange.reduce(async (priorHook, hook)=>{
@@ -122,7 +125,7 @@ export const createOperation = async (incomingArgs)=>{
             global: null,
             operation: 'create',
             req,
-            skipValidation: shouldSaveDraft
+            skipValidation: shouldSaveDraft && collectionConfig.versions.drafts && !collectionConfig.versions.drafts.validate
         });
         // /////////////////////////////////////
         // Write files to local storage
@@ -135,9 +138,6 @@ export const createOperation = async (incomingArgs)=>{
         // /////////////////////////////////////
         let doc;
         if (collectionConfig.auth && !collectionConfig.auth.disableLocalStrategy) {
-            if (data.email) {
-                resultWithLocales.email = data.email.toLowerCase();
-            }
             if (collectionConfig.auth.verify) {
                 resultWithLocales._verified = Boolean(resultWithLocales._verified) || false;
                 resultWithLocales._verificationToken = crypto.randomBytes(20).toString('hex');
@@ -147,13 +147,15 @@ export const createOperation = async (incomingArgs)=>{
                 doc: resultWithLocales,
                 password: data.password,
                 payload: req.payload,
-                req
+                req,
+                select
             });
         } else {
             doc = await payload.db.create({
                 collection: collectionConfig.slug,
                 data: resultWithLocales,
-                req
+                req,
+                select
             });
         }
         const verificationToken = doc._verificationToken;
@@ -174,9 +176,8 @@ export const createOperation = async (incomingArgs)=>{
         // /////////////////////////////////////
         // Send verification email if applicable
         // /////////////////////////////////////
-        if (collectionConfig.auth && collectionConfig.auth.verify) {
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            sendVerificationEmail({
+        if (collectionConfig.auth && collectionConfig.auth.verify && result.email) {
+            await sendVerificationEmail({
                 collection: {
                     config: collectionConfig
                 },
@@ -196,11 +197,13 @@ export const createOperation = async (incomingArgs)=>{
             context: req.context,
             depth,
             doc: result,
+            draft,
             fallbackLocale,
             global: null,
             locale,
             overrideAccess,
             req,
+            select,
             showHiddenFields
         });
         // /////////////////////////////////////
@@ -259,7 +262,9 @@ export const createOperation = async (incomingArgs)=>{
         // /////////////////////////////////////
         // Return results
         // /////////////////////////////////////
-        if (shouldCommit) await commitTransaction(req);
+        if (shouldCommit) {
+            await commitTransaction(req);
+        }
         return result;
     } catch (error) {
         await killTransaction(args.req);