payload 4.0.0-internal.ea6e8f8 → 4.0.0-internal.ee5d8bd

package/dist/uploads/uploadFiles.js

@@ -2,40 +2,16 @@ import fs from 'fs/promises';
 import { FileUploadError } from '../errors/index.js';
 import { assertNoValidationWrite } from '../utilities/assertNoValidationWrite.js';
 import { saveBufferToFile } from './saveBufferToFile.js';
-import { publishUploadedFile, stageUploadFileRollback } from './uploadFileRollback.js';
-export const uploadFiles = async (payload, files, req, { uploadFileRollbacks } = {})=>{
+export const uploadFiles = async (payload, files, req)=>{
     assertNoValidationWrite(req);
     try {
-        const filesToUpload = [];
-        for (const file of files){
-            filesToUpload.push({
-                file,
-                stagedFile: uploadFileRollbacks ? await stageUploadFileRollback({
-                    file,
-                    rollbacks: uploadFileRollbacks
-                }) : file
-            });
-        }
-        const uploadResults = await Promise.allSettled(filesToUpload.map(async ({ stagedFile })=>{
-            if ('sourcePath' in stagedFile) {
-                await fs.copyFile(stagedFile.sourcePath, stagedFile.path);
+        await Promise.all(files.map(async (file)=>{
+            if ('sourcePath' in file) {
+                await fs.copyFile(file.sourcePath, file.path);
             } else {
-                await saveBufferToFile(stagedFile.buffer, stagedFile.path);
+                await saveBufferToFile(file.buffer, file.path);
             }
         }));
-        const failedUpload = uploadResults.find((result)=>result.status === 'rejected');
-        if (failedUpload) {
-            throw failedUpload.reason;
-        }
-        if (uploadFileRollbacks) {
-            for (const { file, stagedFile } of filesToUpload){
-                await publishUploadedFile({
-                    file,
-                    rollbacks: uploadFileRollbacks,
-                    stagedFile
-                });
-            }
-        }
     } catch (err) {
         payload.logger.error(err);
         throw new FileUploadError(req.t);

package/dist/uploads/uploadFiles.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/uploadFiles.ts"],"sourcesContent":["import fs from 'fs/promises'\n\nimport type { Payload } from '../index.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { FileToSave } from './types.js'\nimport type { UploadFileRollbacks } from './uploadFileRollback.js'\n\nimport { FileUploadError } from '../errors/index.js'\nimport { assertNoValidationWrite } from '../utilities/assertNoValidationWrite.js'\nimport { saveBufferToFile } from './saveBufferToFile.js'\nimport { publishUploadedFile, stageUploadFileRollback } from './uploadFileRollback.js'\n\nexport const uploadFiles = async (\n  payload: Payload,\n  files: FileToSave[],\n  req: PayloadRequest,\n  {\n    uploadFileRollbacks,\n  }: {\n    uploadFileRollbacks?: UploadFileRollbacks\n  } = {},\n): Promise<void> => {\n  assertNoValidationWrite(req)\n\n  try {\n    const filesToUpload: Array<{ file: FileToSave; stagedFile: FileToSave }> = []\n\n    for (const file of files) {\n      filesToUpload.push({\n        file,\n        stagedFile: uploadFileRollbacks\n          ? await stageUploadFileRollback({ file, rollbacks: uploadFileRollbacks })\n          : file,\n      })\n    }\n\n    const uploadResults = await Promise.allSettled(\n      filesToUpload.map(async ({ stagedFile }) => {\n        if ('sourcePath' in stagedFile) {\n          await fs.copyFile(stagedFile.sourcePath, stagedFile.path)\n        } else {\n          await saveBufferToFile(stagedFile.buffer, stagedFile.path)\n        }\n      }),\n    )\n\n    const failedUpload = uploadResults.find((result) => result.status === 'rejected')\n\n    if (failedUpload) {\n      throw failedUpload.reason\n    }\n\n    if (uploadFileRollbacks) {\n      for (const { file, stagedFile } of filesToUpload) {\n        await publishUploadedFile({ file, rollbacks: uploadFileRollbacks, stagedFile })\n      }\n    }\n  } catch (err) {\n    payload.logger.error(err)\n    throw new FileUploadError(req.t)\n  }\n}\n"],"names":["fs","FileUploadError","assertNoValidationWrite","saveBufferToFile","publishUploadedFile","stageUploadFileRollback","uploadFiles","payload","files","req","uploadFileRollbacks","filesToUpload","file","push","stagedFile","rollbacks","uploadResults","Promise","allSettled","map","copyFile","sourcePath","path","buffer","failedUpload","find","result","status","reason","err","logger","error","t"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAO5B,SAASC,eAAe,QAAQ,qBAAoB;AACpD,SAASC,uBAAuB,QAAQ,0CAAyC;AACjF,SAASC,gBAAgB,QAAQ,wBAAuB;AACxD,SAASC,mBAAmB,EAAEC,uBAAuB,QAAQ,0BAAyB;AAEtF,OAAO,MAAMC,cAAc,OACzBC,SACAC,OACAC,KACA,EACEC,mBAAmB,EAGpB,GAAG,CAAC,CAAC;IAENR,wBAAwBO;IAExB,IAAI;QACF,MAAME,gBAAqE,EAAE;QAE7E,KAAK,MAAMC,QAAQJ,MAAO;YACxBG,cAAcE,IAAI,CAAC;gBACjBD;gBACAE,YAAYJ,sBACR,MAAML,wBAAwB;oBAAEO;oBAAMG,WAAWL;gBAAoB,KACrEE;YACN;QACF;QAEA,MAAMI,gBAAgB,MAAMC,QAAQC,UAAU,CAC5CP,cAAcQ,GAAG,CAAC,OAAO,EAAEL,UAAU,EAAE;YACrC,IAAI,gBAAgBA,YAAY;gBAC9B,MAAMd,GAAGoB,QAAQ,CAACN,WAAWO,UAAU,EAAEP,WAAWQ,IAAI;YAC1D,OAAO;gBACL,MAAMnB,iBAAiBW,WAAWS,MAAM,EAAET,WAAWQ,IAAI;YAC3D;QACF;QAGF,MAAME,eAAeR,cAAcS,IAAI,CAAC,CAACC,SAAWA,OAAOC,MAAM,KAAK;QAEtE,IAAIH,cAAc;YAChB,MAAMA,aAAaI,MAAM;QAC3B;QAEA,IAAIlB,qBAAqB;YACvB,KAAK,MAAM,EAAEE,IAAI,EAAEE,UAAU,EAAE,IAAIH,cAAe;gBAChD,MAAMP,oBAAoB;oBAAEQ;oBAAMG,WAAWL;oBAAqBI;gBAAW;YAC/E;QACF;IACF,EAAE,OAAOe,KAAK;QACZtB,QAAQuB,MAAM,CAACC,KAAK,CAACF;QACrB,MAAM,IAAI5B,gBAAgBQ,IAAIuB,CAAC;IACjC;AACF,EAAC"}
+{"version":3,"sources":["../../src/uploads/uploadFiles.ts"],"sourcesContent":["import fs from 'fs/promises'\n\nimport type { Payload } from '../index.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { FileToSave } from './types.js'\n\nimport { FileUploadError } from '../errors/index.js'\nimport { assertNoValidationWrite } from '../utilities/assertNoValidationWrite.js'\nimport { saveBufferToFile } from './saveBufferToFile.js'\n\nexport const uploadFiles = async (\n  payload: Payload,\n  files: FileToSave[],\n  req: PayloadRequest,\n): Promise<void> => {\n  assertNoValidationWrite(req)\n\n  try {\n    await Promise.all(\n      files.map(async (file) => {\n        if ('sourcePath' in file) {\n          await fs.copyFile(file.sourcePath, file.path)\n        } else {\n          await saveBufferToFile(file.buffer, file.path)\n        }\n      }),\n    )\n  } catch (err) {\n    payload.logger.error(err)\n    throw new FileUploadError(req.t)\n  }\n}\n"],"names":["fs","FileUploadError","assertNoValidationWrite","saveBufferToFile","uploadFiles","payload","files","req","Promise","all","map","file","copyFile","sourcePath","path","buffer","err","logger","error","t"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAM5B,SAASC,eAAe,QAAQ,qBAAoB;AACpD,SAASC,uBAAuB,QAAQ,0CAAyC;AACjF,SAASC,gBAAgB,QAAQ,wBAAuB;AAExD,OAAO,MAAMC,cAAc,OACzBC,SACAC,OACAC;IAEAL,wBAAwBK;IAExB,IAAI;QACF,MAAMC,QAAQC,GAAG,CACfH,MAAMI,GAAG,CAAC,OAAOC;YACf,IAAI,gBAAgBA,MAAM;gBACxB,MAAMX,GAAGY,QAAQ,CAACD,KAAKE,UAAU,EAAEF,KAAKG,IAAI;YAC9C,OAAO;gBACL,MAAMX,iBAAiBQ,KAAKI,MAAM,EAAEJ,KAAKG,IAAI;YAC/C;QACF;IAEJ,EAAE,OAAOE,KAAK;QACZX,QAAQY,MAAM,CAACC,KAAK,CAACF;QACrB,MAAM,IAAIf,gBAAgBM,IAAIY,CAAC;IACjC;AACF,EAAC"}

package/dist/utilities/addSelectGenericsToGeneretedTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addSelectGenericsToGeneretedTypes.d.ts","sourceRoot":"","sources":["../../src/utilities/addSelectGenericsToGeneretedTypes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iCAAiC,gCAE3C;IACD,sBAAsB,EAAE,MAAM,CAAA;CAC/B,WAoDA,CAAA"}
+{"version":3,"file":"addSelectGenericsToGeneretedTypes.d.ts","sourceRoot":"","sources":["../../src/utilities/addSelectGenericsToGeneretedTypes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iCAAiC,gCAE3C;IACD,sBAAsB,EAAE,MAAM,CAAA;CAC/B,WAmDA,CAAA"}

package/dist/utilities/addSelectGenericsToGeneretedTypes.js

@@ -17,7 +17,6 @@ export const addSelectGenericsToGeneratedTypes = ({ compiledGeneratedTypes })=>{
                 });
             }
         }
-        // eslint-disable-next-line regexp/no-unused-capturing-group
         if (line.match(/via the `definition` "([\w-]+_select)"/g)) {
             isSelectTypeToken = true;
         }

package/dist/utilities/addSelectGenericsToGeneretedTypes.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/addSelectGenericsToGeneretedTypes.ts"],"sourcesContent":["export const addSelectGenericsToGeneratedTypes = ({\n  compiledGeneratedTypes,\n}: {\n  compiledGeneratedTypes: string\n}) => {\n  const modifiedLines: string[] = []\n\n  let isCollectionsSelectToken = false\n  let isSelectTypeToken = false\n\n  for (const line of compiledGeneratedTypes.split('\\n')) {\n    let newLine = line\n    if (line === `  collectionsSelect: {` || line === `  globalsSelect: {`) {\n      isCollectionsSelectToken = true\n    }\n\n    if (isCollectionsSelectToken) {\n      if (line === '  };') {\n        isCollectionsSelectToken = false\n      } else {\n        // replace <posts: PostsSelect;> with <posts: PostsSelect<true> | PostsSelect<false;>\n        newLine = line.replace(/(['\"]?\\w+['\"]?):\\s*(\\w+);/g, (_, variable, type) => {\n          return `${variable}: ${type}<false> | ${type}<true>;`\n        })\n      }\n    }\n\n    // eslint-disable-next-line regexp/no-unused-capturing-group\n    if (line.match(/via the `definition` \"([\\w-]+_select)\"/g)) {\n      isSelectTypeToken = true\n    }\n\n    if (isSelectTypeToken) {\n      if (line.startsWith('export interface')) {\n        // add generic to the interface\n        newLine = line.replace(/(export interface\\s+\\w+)(\\s*\\{)/g, '$1<T extends boolean = true>$2')\n      } else {\n        newLine = line\n          // replace booleans with T on the line\n          .replace(/(?<!\\?)\\bboolean\\b/g, 'T')\n          // replace interface names like CtaBlock to CtaBlock<T>\n          .replace(\n            /\\b(\\w+)\\s*\\|\\s*(\\w+)\\b/g,\n            (_match, left, right) => `${left} | ${right}<${left}>`,\n          )\n\n        if (line === '}') {\n          isSelectTypeToken = false\n        }\n      }\n    }\n\n    modifiedLines.push(newLine)\n  }\n\n  return modifiedLines.join('\\n')\n}\n"],"names":["addSelectGenericsToGeneratedTypes","compiledGeneratedTypes","modifiedLines","isCollectionsSelectToken","isSelectTypeToken","line","split","newLine","replace","_","variable","type","match","startsWith","_match","left","right","push","join"],"mappings":"AAAA,OAAO,MAAMA,oCAAoC,CAAC,EAChDC,sBAAsB,EAGvB;IACC,MAAMC,gBAA0B,EAAE;IAElC,IAAIC,2BAA2B;IAC/B,IAAIC,oBAAoB;IAExB,KAAK,MAAMC,QAAQJ,uBAAuBK,KAAK,CAAC,MAAO;QACrD,IAAIC,UAAUF;QACd,IAAIA,SAAS,CAAC,sBAAsB,CAAC,IAAIA,SAAS,CAAC,kBAAkB,CAAC,EAAE;YACtEF,2BAA2B;QAC7B;QAEA,IAAIA,0BAA0B;YAC5B,IAAIE,SAAS,QAAQ;gBACnBF,2BAA2B;YAC7B,OAAO;gBACL,qFAAqF;gBACrFI,UAAUF,KAAKG,OAAO,CAAC,8BAA8B,CAACC,GAAGC,UAAUC;oBACjE,OAAO,GAAGD,SAAS,EAAE,EAAEC,KAAK,UAAU,EAAEA,KAAK,OAAO,CAAC;gBACvD;YACF;QACF;QAEA,4DAA4D;QAC5D,IAAIN,KAAKO,KAAK,CAAC,4CAA4C;YACzDR,oBAAoB;QACtB;QAEA,IAAIA,mBAAmB;YACrB,IAAIC,KAAKQ,UAAU,CAAC,qBAAqB;gBACvC,+BAA+B;gBAC/BN,UAAUF,KAAKG,OAAO,CAAC,oCAAoC;YAC7D,OAAO;gBACLD,UAAUF,IACR,sCAAsC;iBACrCG,OAAO,CAAC,uBAAuB,IAChC,uDAAuD;iBACtDA,OAAO,CACN,2BACA,CAACM,QAAQC,MAAMC,QAAU,GAAGD,KAAK,GAAG,EAAEC,MAAM,CAAC,EAAED,KAAK,CAAC,CAAC;gBAG1D,IAAIV,SAAS,KAAK;oBAChBD,oBAAoB;gBACtB;YACF;QACF;QAEAF,cAAce,IAAI,CAACV;IACrB;IAEA,OAAOL,cAAcgB,IAAI,CAAC;AAC5B,EAAC"}
+{"version":3,"sources":["../../src/utilities/addSelectGenericsToGeneretedTypes.ts"],"sourcesContent":["export const addSelectGenericsToGeneratedTypes = ({\n  compiledGeneratedTypes,\n}: {\n  compiledGeneratedTypes: string\n}) => {\n  const modifiedLines: string[] = []\n\n  let isCollectionsSelectToken = false\n  let isSelectTypeToken = false\n\n  for (const line of compiledGeneratedTypes.split('\\n')) {\n    let newLine = line\n    if (line === `  collectionsSelect: {` || line === `  globalsSelect: {`) {\n      isCollectionsSelectToken = true\n    }\n\n    if (isCollectionsSelectToken) {\n      if (line === '  };') {\n        isCollectionsSelectToken = false\n      } else {\n        // replace <posts: PostsSelect;> with <posts: PostsSelect<true> | PostsSelect<false;>\n        newLine = line.replace(/(['\"]?\\w+['\"]?):\\s*(\\w+);/g, (_, variable, type) => {\n          return `${variable}: ${type}<false> | ${type}<true>;`\n        })\n      }\n    }\n\n    if (line.match(/via the `definition` \"([\\w-]+_select)\"/g)) {\n      isSelectTypeToken = true\n    }\n\n    if (isSelectTypeToken) {\n      if (line.startsWith('export interface')) {\n        // add generic to the interface\n        newLine = line.replace(/(export interface\\s+\\w+)(\\s*\\{)/g, '$1<T extends boolean = true>$2')\n      } else {\n        newLine = line\n          // replace booleans with T on the line\n          .replace(/(?<!\\?)\\bboolean\\b/g, 'T')\n          // replace interface names like CtaBlock to CtaBlock<T>\n          .replace(\n            /\\b(\\w+)\\s*\\|\\s*(\\w+)\\b/g,\n            (_match, left, right) => `${left} | ${right}<${left}>`,\n          )\n\n        if (line === '}') {\n          isSelectTypeToken = false\n        }\n      }\n    }\n\n    modifiedLines.push(newLine)\n  }\n\n  return modifiedLines.join('\\n')\n}\n"],"names":["addSelectGenericsToGeneratedTypes","compiledGeneratedTypes","modifiedLines","isCollectionsSelectToken","isSelectTypeToken","line","split","newLine","replace","_","variable","type","match","startsWith","_match","left","right","push","join"],"mappings":"AAAA,OAAO,MAAMA,oCAAoC,CAAC,EAChDC,sBAAsB,EAGvB;IACC,MAAMC,gBAA0B,EAAE;IAElC,IAAIC,2BAA2B;IAC/B,IAAIC,oBAAoB;IAExB,KAAK,MAAMC,QAAQJ,uBAAuBK,KAAK,CAAC,MAAO;QACrD,IAAIC,UAAUF;QACd,IAAIA,SAAS,CAAC,sBAAsB,CAAC,IAAIA,SAAS,CAAC,kBAAkB,CAAC,EAAE;YACtEF,2BAA2B;QAC7B;QAEA,IAAIA,0BAA0B;YAC5B,IAAIE,SAAS,QAAQ;gBACnBF,2BAA2B;YAC7B,OAAO;gBACL,qFAAqF;gBACrFI,UAAUF,KAAKG,OAAO,CAAC,8BAA8B,CAACC,GAAGC,UAAUC;oBACjE,OAAO,GAAGD,SAAS,EAAE,EAAEC,KAAK,UAAU,EAAEA,KAAK,OAAO,CAAC;gBACvD;YACF;QACF;QAEA,IAAIN,KAAKO,KAAK,CAAC,4CAA4C;YACzDR,oBAAoB;QACtB;QAEA,IAAIA,mBAAmB;YACrB,IAAIC,KAAKQ,UAAU,CAAC,qBAAqB;gBACvC,+BAA+B;gBAC/BN,UAAUF,KAAKG,OAAO,CAAC,oCAAoC;YAC7D,OAAO;gBACLD,UAAUF,IACR,sCAAsC;iBACrCG,OAAO,CAAC,uBAAuB,IAChC,uDAAuD;iBACtDA,OAAO,CACN,2BACA,CAACM,QAAQC,MAAMC,QAAU,GAAGD,KAAK,GAAG,EAAEC,MAAM,CAAC,EAAED,KAAK,CAAC,CAAC;gBAG1D,IAAIV,SAAS,KAAK;oBAChBD,oBAAoB;gBACtB;YACF;QACF;QAEAF,cAAce,IAAI,CAACV;IACrB;IAEA,OAAOL,cAAcgB,IAAI,CAAC;AAC5B,EAAC"}

package/dist/utilities/appendDateTimezoneSelectFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/appendDateTimezoneSelectFields.ts"],"sourcesContent":["import type { FlattenedField } from '../fields/config/types.js'\nimport type { SelectType } from '../types/index.js'\n\n/**\n * Mutates the incoming select object to append `{name}_tz` siblings for any date\n * field with `timezone` enabled that has been requested in the select. Without\n * this, the List View's Select API would omit the timezone sibling and\n * cells would render dates in the server's timezone.\n */\nexport const appendDateTimezoneSelectFields = ({\n  fields,\n  select,\n}: {\n  fields: FlattenedField[]\n  select: SelectType\n}) => {\n  if (!select) {\n    return\n  }\n\n  for (const field of fields) {\n    if (!('name' in field)) {\n      continue\n    }\n\n    const value = select[field.name]\n\n    if (field.type === 'date' && field.timezone && value) {\n      select[`${field.name}_tz`] = true\n      continue\n    }\n\n    if (!value || typeof value !== 'object') {\n      continue\n    }\n\n    if ('flattenedFields' in field) {\n      appendDateTimezoneSelectFields({\n        fields: field.flattenedFields,\n        select: value as SelectType,\n      })\n      continue\n    }\n\n    if (field.type === 'blocks') {\n      const blocks = field.blocks as Array<\n        | {\n            flattenedFields: FlattenedField[]\n            slug: string\n          }\n        | string\n      >\n\n      for (const block of blocks) {\n        if (typeof block === 'string') {\n          continue\n        }\n        const blockSelect = (value as SelectType)[block.slug]\n        if (blockSelect && typeof blockSelect === 'object') {\n          appendDateTimezoneSelectFields({\n            fields: block.flattenedFields,\n            select: blockSelect as SelectType,\n          })\n        }\n      }\n    }\n  }\n}\n"],"names":["appendDateTimezoneSelectFields","fields","select","field","value","name","type","timezone","flattenedFields","blocks","block","blockSelect","slug"],"mappings":"AAGA;;;;;CAKC,GACD,OAAO,MAAMA,iCAAiC,CAAC,EAC7CC,MAAM,EACNC,MAAM,EAIP;IACC,IAAI,CAACA,QAAQ;QACX;IACF;IAEA,KAAK,MAAMC,SAASF,OAAQ;QAC1B,IAAI,CAAE,CAAA,UAAUE,KAAI,GAAI;YACtB;QACF;QAEA,MAAMC,QAAQF,MAAM,CAACC,MAAME,IAAI,CAAC;QAEhC,IAAIF,MAAMG,IAAI,KAAK,UAAUH,MAAMI,QAAQ,IAAIH,OAAO;YACpDF,MAAM,CAAC,GAAGC,MAAME,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG;YAC7B;QACF;QAEA,IAAI,CAACD,SAAS,OAAOA,UAAU,UAAU;YACvC;QACF;QAEA,IAAI,qBAAqBD,OAAO;YAC9BH,+BAA+B;gBAC7BC,QAAQE,MAAMK,eAAe;gBAC7BN,QAAQE;YACV;YACA;QACF;QAEA,IAAID,MAAMG,IAAI,KAAK,UAAU;YAC3B,MAAMG,SAASN,MAAMM,MAAM;YAQ3B,KAAK,MAAMC,SAASD,OAAQ;gBAC1B,IAAI,OAAOC,UAAU,UAAU;oBAC7B;gBACF;gBACA,MAAMC,cAAc,AAACP,KAAoB,CAACM,MAAME,IAAI,CAAC;gBACrD,IAAID,eAAe,OAAOA,gBAAgB,UAAU;oBAClDX,+BAA+B;wBAC7BC,QAAQS,MAAMF,eAAe;wBAC7BN,QAAQS;oBACV;gBACF;YACF;QACF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/utilities/appendDateTimezoneSelectFields.ts"],"sourcesContent":["import type { FlattenedField } from '../fields/config/types.js'\nimport type { SelectType } from '../types/index.js'\n\n/**\n * Mutates the incoming select object to append `{name}_tz` siblings for any date\n * field with `timezone` enabled that has been requested in the select. Without\n * this, the List View's Select API would omit the timezone sibling and\n * cells would render dates in the server's timezone.\n */\nexport const appendDateTimezoneSelectFields = ({\n  fields,\n  select,\n}: {\n  fields: FlattenedField[]\n  select: SelectType\n}) => {\n  if (!select) {\n    return\n  }\n\n  for (const field of fields) {\n    if (!('name' in field)) {\n      continue\n    }\n\n    const value = select[field.name]\n\n    if (field.type === 'date' && field.timezone && value) {\n      select[`${field.name}_tz`] = true\n      continue\n    }\n\n    if (!value || typeof value !== 'object') {\n      continue\n    }\n\n    if ('flattenedFields' in field) {\n      appendDateTimezoneSelectFields({\n        fields: field.flattenedFields,\n        select: value,\n      })\n      continue\n    }\n\n    if (field.type === 'blocks') {\n      const blocks = field.blocks as Array<\n        | {\n            flattenedFields: FlattenedField[]\n            slug: string\n          }\n        | string\n      >\n\n      for (const block of blocks) {\n        if (typeof block === 'string') {\n          continue\n        }\n        const blockSelect = value[block.slug]\n        if (blockSelect && typeof blockSelect === 'object') {\n          appendDateTimezoneSelectFields({\n            fields: block.flattenedFields,\n            select: blockSelect,\n          })\n        }\n      }\n    }\n  }\n}\n"],"names":["appendDateTimezoneSelectFields","fields","select","field","value","name","type","timezone","flattenedFields","blocks","block","blockSelect","slug"],"mappings":"AAGA;;;;;CAKC,GACD,OAAO,MAAMA,iCAAiC,CAAC,EAC7CC,MAAM,EACNC,MAAM,EAIP;IACC,IAAI,CAACA,QAAQ;QACX;IACF;IAEA,KAAK,MAAMC,SAASF,OAAQ;QAC1B,IAAI,CAAE,CAAA,UAAUE,KAAI,GAAI;YACtB;QACF;QAEA,MAAMC,QAAQF,MAAM,CAACC,MAAME,IAAI,CAAC;QAEhC,IAAIF,MAAMG,IAAI,KAAK,UAAUH,MAAMI,QAAQ,IAAIH,OAAO;YACpDF,MAAM,CAAC,GAAGC,MAAME,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG;YAC7B;QACF;QAEA,IAAI,CAACD,SAAS,OAAOA,UAAU,UAAU;YACvC;QACF;QAEA,IAAI,qBAAqBD,OAAO;YAC9BH,+BAA+B;gBAC7BC,QAAQE,MAAMK,eAAe;gBAC7BN,QAAQE;YACV;YACA;QACF;QAEA,IAAID,MAAMG,IAAI,KAAK,UAAU;YAC3B,MAAMG,SAASN,MAAMM,MAAM;YAQ3B,KAAK,MAAMC,SAASD,OAAQ;gBAC1B,IAAI,OAAOC,UAAU,UAAU;oBAC7B;gBACF;gBACA,MAAMC,cAAcP,KAAK,CAACM,MAAME,IAAI,CAAC;gBACrC,IAAID,eAAe,OAAOA,gBAAgB,UAAU;oBAClDX,+BAA+B;wBAC7BC,QAAQS,MAAMF,eAAe;wBAC7BN,QAAQS;oBACV;gBACF;YACF;QACF;IACF;AACF,EAAC"}

package/dist/utilities/assertNoValidationWrite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assertNoValidationWrite.d.ts","sourceRoot":"","sources":["../../src/utilities/assertNoValidationWrite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAKvD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAM3E"}
+{"version":3,"file":"assertNoValidationWrite.d.ts","sourceRoot":"","sources":["../../src/utilities/assertNoValidationWrite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAIvD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAI3E"}

package/dist/utilities/assertNoValidationWrite.js

@@ -1,4 +1,3 @@
-import { assertBranchMergeValidationWriteAllowed } from '../branching/mergeWriteGuard.js';
 import { APIError } from '../errors/index.js';
 /**
  * Prevents guarded document, global, upload, and version mutation entry points from writing
@@ -6,9 +5,6 @@ import { APIError } from '../errors/index.js';
  * intentionally unaffected.
  */ export function assertNoValidationWrite(req) {
     if (req?.operation === 'validate') {
-        assertBranchMergeValidationWriteAllowed({
-            req
-        });
         throw new APIError('Payload writes are not allowed during validation.');
     }
 }

package/dist/utilities/assertNoValidationWrite.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/assertNoValidationWrite.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\nimport { assertBranchMergeValidationWriteAllowed } from '../branching/mergeWriteGuard.js'\nimport { APIError } from '../errors/index.js'\n\n/**\n * Prevents guarded document, global, upload, and version mutation entry points from writing\n * through an active validation request. Reads and writes made with a separate request are\n * intentionally unaffected.\n */\nexport function assertNoValidationWrite(req?: Partial<PayloadRequest>): void {\n  if (req?.operation === 'validate') {\n    assertBranchMergeValidationWriteAllowed({ req })\n\n    throw new APIError('Payload writes are not allowed during validation.')\n  }\n}\n"],"names":["assertBranchMergeValidationWriteAllowed","APIError","assertNoValidationWrite","req","operation"],"mappings":"AAEA,SAASA,uCAAuC,QAAQ,kCAAiC;AACzF,SAASC,QAAQ,QAAQ,qBAAoB;AAE7C;;;;CAIC,GACD,OAAO,SAASC,wBAAwBC,GAA6B;IACnE,IAAIA,KAAKC,cAAc,YAAY;QACjCJ,wCAAwC;YAAEG;QAAI;QAE9C,MAAM,IAAIF,SAAS;IACrB;AACF"}
+{"version":3,"sources":["../../src/utilities/assertNoValidationWrite.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\nimport { APIError } from '../errors/index.js'\n\n/**\n * Prevents guarded document, global, upload, and version mutation entry points from writing\n * through an active validation request. Reads and writes made with a separate request are\n * intentionally unaffected.\n */\nexport function assertNoValidationWrite(req?: Partial<PayloadRequest>): void {\n  if (req?.operation === 'validate') {\n    throw new APIError('Payload writes are not allowed during validation.')\n  }\n}\n"],"names":["APIError","assertNoValidationWrite","req","operation"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,qBAAoB;AAE7C;;;;CAIC,GACD,OAAO,SAASC,wBAAwBC,GAA6B;IACnE,IAAIA,KAAKC,cAAc,YAAY;QACjC,MAAM,IAAIH,SAAS;IACrB;AACF"}

package/dist/utilities/checkDocumentLockStatus.d.ts

@@ -7,35 +7,26 @@ type CheckDocumentLockStatusArgs = {
     lockErrorMessage?: string;
     overrideLock?: boolean;
     req: PayloadRequest;
-    shouldDeleteLock?: boolean;
 };
-export declare const checkDocumentLockStatus: ({ id, collectionSlug, globalSlug, lockDurationDefault, lockErrorMessage, overrideLock, req, shouldDeleteLock, }: CheckDocumentLockStatusArgs) => Promise<void>;
+export declare const checkDocumentLockStatus: ({ id, collectionSlug, globalSlug, lockDurationDefault, lockErrorMessage, overrideLock, req, }: CheckDocumentLockStatusArgs) => Promise<void>;
 type BulkLockArgs = {
     collectionSlug: string;
     ids: (number | string)[];
     req: PayloadRequest;
 };
-type DocumentLockState = {
-    lockDocumentIDsByDocumentID: Map<string, (number | string)[]>;
-    lockedDocumentIDs: Set<string>;
-};
-type GetDocumentLockStateArgs = {
-    lockDurationDefault?: number;
-    overrideLock?: boolean;
-} & BulkLockArgs;
 /**
  * Batched counterpart to `checkDocumentLockStatus`. Resolves the lock state of every id with a
  * single query instead of one per document, and returns the ids that are locked by another user.
  * Callers are expected to report those ids as errors and leave them alone.
  */
-export declare const getDocumentLockState: ({ collectionSlug, ids, lockDurationDefault, overrideLock, req, }: GetDocumentLockStateArgs) => Promise<DocumentLockState>;
-export declare const getLockedDocumentIds: (args: GetDocumentLockStateArgs) => Promise<Set<string>>;
+export declare const getLockedDocumentIds: ({ collectionSlug, ids, lockDurationDefault, overrideLock, req, }: {
+    lockDurationDefault?: number;
+    overrideLock?: boolean;
+} & BulkLockArgs) => Promise<Set<string>>;
 /**
  * Batched counterpart to the lock cleanup `checkDocumentLockStatus` performs, so that bulk
  * operations release every lock in one query instead of one per document.
  */
-export declare const deleteDocumentLocks: ({ collectionSlug, ids, lockDocumentIDs, req, }: {
-    lockDocumentIDs?: (number | string)[];
-} & BulkLockArgs) => Promise<void>;
+export declare const deleteDocumentLocks: ({ collectionSlug, ids, req, }: BulkLockArgs) => Promise<void>;
 export {};
 //# sourceMappingURL=checkDocumentLockStatus.d.ts.map

package/dist/utilities/checkDocumentLockStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkDocumentLockStatus.d.ts","sourceRoot":"","sources":["../../src/utilities/checkDocumentLockStatus.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAc,cAAc,EAAS,MAAM,mBAAmB,CAAA;AAM1E,KAAK,2BAA2B,GAAG;IACjC,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,uBAAuB,oHASjC,2BAA2B,KAAG,OAAO,CAAC,IAAI,CAsF5C,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,cAAc,EAAE,MAAM,CAAA;IACtB,GAAG,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,2BAA2B,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAA;IAC7D,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAC/B,CAAA;AAED,KAAK,wBAAwB,GAAG;IAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,GAAG,YAAY,CAAA;AAgBhB;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,qEAM9B,wBAAwB,KAAG,OAAO,CAAC,iBAAiB,CA2DtD,CAAA;AAED,eAAO,MAAM,oBAAoB,SACzB,wBAAwB,KAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAMrB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,mDAK7B;IAAE,eAAe,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,GAAG,YAAY,KAAG,OAAO,CAAC,IAAI,CAoBzE,CAAA"}
+{"version":3,"file":"checkDocumentLockStatus.d.ts","sourceRoot":"","sources":["../../src/utilities/checkDocumentLockStatus.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAc,cAAc,EAAS,MAAM,mBAAmB,CAAA;AAK1E,KAAK,2BAA2B,GAAG;IACjC,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,uBAAuB,kGAQjC,2BAA2B,KAAG,OAAO,CAAC,IAAI,CAgF5C,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,cAAc,EAAE,MAAM,CAAA;IACtB,GAAG,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAgBD;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,qEAM9B;IACD,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,GAAG,YAAY,KAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CA+CrC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,kCAI7B,YAAY,KAAG,OAAO,CAAC,IAAI,CAa7B,CAAA"}

package/dist/utilities/checkDocumentLockStatus.js

@@ -1,7 +1,6 @@
 import { Locked } from '../errors/index.js';
 import { lockedDocumentsCollectionSlug } from '../locked-documents/config.js';
-import { markTransactionWrite } from './transactionMutationTracker.js';
-export const checkDocumentLockStatus = async ({ id, collectionSlug, globalSlug, lockDurationDefault = 300, lockErrorMessage, overrideLock = true, req, shouldDeleteLock = true })=>{
+export const checkDocumentLockStatus = async ({ id, collectionSlug, globalSlug, lockDurationDefault = 300, lockErrorMessage, overrideLock = true, req })=>{
     const { payload } = req;
     // Check if the locked-documents collection exists
     if (!payload.collections?.[lockedDocumentsCollectionSlug]) {
@@ -47,7 +46,6 @@ export const checkDocumentLockStatus = async ({ id, collectionSlug, globalSlug,
             collection: lockedDocumentsCollectionSlug,
             limit: 1,
             pagination: false,
-            req: payload.db.name === 'mongoose' ? undefined : req,
             sort: '-updatedAt',
             where: lockedDocumentQuery
         });
@@ -65,9 +63,6 @@ export const checkDocumentLockStatus = async ({ id, collectionSlug, globalSlug,
             }
         }
     }
-    if (!shouldDeleteLock) {
-        return;
-    }
     // Perform the delete operation regardless of overrideLock status
     await payload.db.deleteMany({
         collection: lockedDocumentsCollectionSlug,
@@ -75,9 +70,6 @@ export const checkDocumentLockStatus = async ({ id, collectionSlug, globalSlug,
         req: payload.db.name === 'mongoose' ? undefined : req,
         where: lockedDocumentQuery
     });
-    markTransactionWrite({
-        req: payload.db.name === 'mongoose' ? undefined : req
-    });
 };
 const buildBulkLockedDocumentQuery = (collectionSlug, ids)=>({
         and: [
@@ -104,13 +96,10 @@ const isLockingAvailable = (collectionSlug, req)=>{
  * Batched counterpart to `checkDocumentLockStatus`. Resolves the lock state of every id with a
  * single query instead of one per document, and returns the ids that are locked by another user.
  * Callers are expected to report those ids as errors and leave them alone.
- */ export const getDocumentLockState = async ({ collectionSlug, ids, lockDurationDefault = 300, overrideLock = true, req })=>{
-    const lockState = {
-        lockDocumentIDsByDocumentID: new Map(),
-        lockedDocumentIDs: new Set()
-    };
-    if (!ids.length || !isLockingAvailable(collectionSlug, req)) {
-        return lockState;
+ */ export const getLockedDocumentIds = async ({ collectionSlug, ids, lockDurationDefault = 300, overrideLock = true, req })=>{
+    const lockedIds = new Set();
+    if (overrideLock || !ids.length || !isLockingAvailable(collectionSlug, req)) {
+        return lockedIds;
     }
     const { payload } = req;
     const lockDocumentsProp = payload.collections?.[collectionSlug]?.config?.lockDocuments;
@@ -118,7 +107,6 @@ const isLockingAvailable = (collectionSlug, req)=>{
         collection: lockedDocumentsCollectionSlug,
         limit: 0,
         pagination: false,
-        req: payload.db.name === 'mongoose' ? undefined : req,
         sort: '-updatedAt',
         where: buildBulkLockedDocumentQuery(collectionSlug, ids)
     });
@@ -129,14 +117,6 @@ const isLockingAvailable = (collectionSlug, req)=>{
     const resolved = new Set();
     for (const lockedDoc of lockedDocumentResult?.docs ?? []){
         const documentId = String(lockedDoc.document?.value);
-        const lockDocumentIDs = lockState.lockDocumentIDsByDocumentID.get(documentId);
-        if (lockDocumentIDs) {
-            lockDocumentIDs.push(lockedDoc.id);
-        } else {
-            lockState.lockDocumentIDsByDocumentID.set(documentId, [
-                lockedDoc.id
-            ]);
-        }
         // Sorted by -updatedAt, so the first row seen for an id is its most recent lock
         if (resolved.has(documentId)) {
             continue;
@@ -144,38 +124,25 @@ const isLockingAvailable = (collectionSlug, req)=>{
         resolved.add(documentId);
         const lastEditedAt = new Date(lockedDoc?.updatedAt).getTime();
         // document is locked by another user and the lock hasn't expired
-        if (!overrideLock && lockedDoc.user?.value !== currentUserId && now - lastEditedAt <= lockDurationInMilliseconds) {
-            lockState.lockedDocumentIDs.add(documentId);
+        if (lockedDoc.user?.value !== currentUserId && now - lastEditedAt <= lockDurationInMilliseconds) {
+            lockedIds.add(documentId);
         }
     }
-    return lockState;
-};
-export const getLockedDocumentIds = async (args)=>{
-    if (args.overrideLock ?? true) {
-        return new Set();
-    }
-    return (await getDocumentLockState(args)).lockedDocumentIDs;
+    return lockedIds;
 };
 /**
  * Batched counterpart to the lock cleanup `checkDocumentLockStatus` performs, so that bulk
  * operations release every lock in one query instead of one per document.
- */ export const deleteDocumentLocks = async ({ collectionSlug, ids, lockDocumentIDs, req })=>{
+ */ export const deleteDocumentLocks = async ({ collectionSlug, ids, req })=>{
     const { payload } = req;
-    if (!ids.length || lockDocumentIDs && !lockDocumentIDs.length || !isLockingAvailable(collectionSlug, req)) {
+    if (!ids.length || !isLockingAvailable(collectionSlug, req)) {
         return;
     }
     await payload.db.deleteMany({
         collection: lockedDocumentsCollectionSlug,
         // Not passing req fails on postgres
         req: payload.db.name === 'mongoose' ? undefined : req,
-        where: lockDocumentIDs ? {
-            id: {
-                in: lockDocumentIDs
-            }
-        } : buildBulkLockedDocumentQuery(collectionSlug, ids)
-    });
-    markTransactionWrite({
-        req: payload.db.name === 'mongoose' ? undefined : req
+        where: buildBulkLockedDocumentQuery(collectionSlug, ids)
     });
 };
 

package/dist/utilities/checkDocumentLockStatus.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/checkDocumentLockStatus.ts"],"sourcesContent":["import type { TypeWithID } from '../collections/config/types.js'\nimport type { PaginatedDocs } from '../database/types.js'\nimport type { JsonObject, PayloadRequest, Where } from '../types/index.js'\n\nimport { Locked } from '../errors/index.js'\nimport { lockedDocumentsCollectionSlug } from '../locked-documents/config.js'\nimport { markTransactionWrite } from './transactionMutationTracker.js'\n\ntype CheckDocumentLockStatusArgs = {\n  collectionSlug?: string\n  globalSlug?: string\n  id?: number | string\n  lockDurationDefault?: number\n  lockErrorMessage?: string\n  overrideLock?: boolean\n  req: PayloadRequest\n  shouldDeleteLock?: boolean\n}\n\nexport const checkDocumentLockStatus = async ({\n  id,\n  collectionSlug,\n  globalSlug,\n  lockDurationDefault = 300, // Default 5 minutes in seconds\n  lockErrorMessage,\n  overrideLock = true,\n  req,\n  shouldDeleteLock = true,\n}: CheckDocumentLockStatusArgs): Promise<void> => {\n  const { payload } = req\n\n  // Check if the locked-documents collection exists\n  if (!payload.collections?.[lockedDocumentsCollectionSlug]) {\n    // If the collection doesn't exist, locking is not available\n    return\n  }\n\n  // Retrieve the lockDocuments property for either collection or global\n  const lockDocumentsProp = collectionSlug\n    ? payload.collections?.[collectionSlug]?.config?.lockDocuments\n    : payload.config?.globals?.find((g) => g.slug === globalSlug)?.lockDocuments\n\n  const isLockingEnabled = lockDocumentsProp !== false\n\n  let lockedDocumentQuery = {}\n\n  if (collectionSlug) {\n    lockedDocumentQuery = {\n      and: [\n        { 'document.relationTo': { equals: collectionSlug } },\n        { 'document.value': { equals: id } },\n      ],\n    }\n  } else if (globalSlug) {\n    lockedDocumentQuery = { globalSlug: { equals: globalSlug } }\n  } else {\n    throw new Error('Either collectionSlug or globalSlug must be provided.')\n  }\n\n  if (!isLockingEnabled) {\n    return\n  }\n\n  // Only perform lock checks if overrideLock is false and locking is enabled\n  if (!overrideLock) {\n    const defaultLockErrorMessage = collectionSlug\n      ? `Document with ID ${id} is currently locked by another user and cannot be modified.`\n      : `Global document with slug \"${globalSlug}\" is currently locked by another user and cannot be modified.`\n\n    const finalLockErrorMessage = lockErrorMessage || defaultLockErrorMessage\n\n    const lockedDocumentResult: PaginatedDocs<JsonObject & TypeWithID> = await payload.db.find({\n      collection: lockedDocumentsCollectionSlug,\n      limit: 1,\n      pagination: false,\n      req: payload.db.name === 'mongoose' ? undefined : req,\n      sort: '-updatedAt',\n      where: lockedDocumentQuery,\n    })\n\n    // If there's a locked document, check lock conditions\n    const lockedDoc = lockedDocumentResult?.docs[0]\n    if (lockedDoc) {\n      const lastEditedAt = new Date(lockedDoc?.updatedAt).getTime()\n      const now = new Date().getTime()\n\n      const lockDuration =\n        typeof lockDocumentsProp === 'object' ? lockDocumentsProp.duration : lockDurationDefault\n\n      const lockDurationInMilliseconds = lockDuration * 1000\n      const currentUserId = req.user?.id\n\n      // document is locked by another user and the lock hasn't expired\n      if (\n        lockedDoc.user?.value !== currentUserId &&\n        now - lastEditedAt <= lockDurationInMilliseconds\n      ) {\n        throw new Locked(finalLockErrorMessage)\n      }\n    }\n  }\n\n  if (!shouldDeleteLock) {\n    return\n  }\n\n  // Perform the delete operation regardless of overrideLock status\n  await payload.db.deleteMany({\n    collection: lockedDocumentsCollectionSlug,\n    // Not passing req fails on postgres\n    req: payload.db.name === 'mongoose' ? undefined : req,\n    where: lockedDocumentQuery,\n  })\n  markTransactionWrite({ req: payload.db.name === 'mongoose' ? undefined : req })\n}\n\ntype BulkLockArgs = {\n  collectionSlug: string\n  ids: (number | string)[]\n  req: PayloadRequest\n}\n\ntype DocumentLockState = {\n  lockDocumentIDsByDocumentID: Map<string, (number | string)[]>\n  lockedDocumentIDs: Set<string>\n}\n\ntype GetDocumentLockStateArgs = {\n  lockDurationDefault?: number\n  overrideLock?: boolean\n} & BulkLockArgs\n\nconst buildBulkLockedDocumentQuery = (collectionSlug: string, ids: (number | string)[]): Where => ({\n  and: [{ 'document.relationTo': { equals: collectionSlug } }, { 'document.value': { in: ids } }],\n})\n\nconst isLockingAvailable = (collectionSlug: string, req: PayloadRequest): boolean => {\n  const { payload } = req\n\n  if (!payload.collections?.[lockedDocumentsCollectionSlug]) {\n    return false\n  }\n\n  return payload.collections?.[collectionSlug]?.config?.lockDocuments !== false\n}\n\n/**\n * Batched counterpart to `checkDocumentLockStatus`. Resolves the lock state of every id with a\n * single query instead of one per document, and returns the ids that are locked by another user.\n * Callers are expected to report those ids as errors and leave them alone.\n */\nexport const getDocumentLockState = async ({\n  collectionSlug,\n  ids,\n  lockDurationDefault = 300, // Default 5 minutes in seconds\n  overrideLock = true,\n  req,\n}: GetDocumentLockStateArgs): Promise<DocumentLockState> => {\n  const lockState: DocumentLockState = {\n    lockDocumentIDsByDocumentID: new Map<string, (number | string)[]>(),\n    lockedDocumentIDs: new Set<string>(),\n  }\n\n  if (!ids.length || !isLockingAvailable(collectionSlug, req)) {\n    return lockState\n  }\n\n  const { payload } = req\n  const lockDocumentsProp = payload.collections?.[collectionSlug]?.config?.lockDocuments\n\n  const lockedDocumentResult: PaginatedDocs<JsonObject & TypeWithID> = await payload.db.find({\n    collection: lockedDocumentsCollectionSlug,\n    limit: 0,\n    pagination: false,\n    req: payload.db.name === 'mongoose' ? undefined : req,\n    sort: '-updatedAt',\n    where: buildBulkLockedDocumentQuery(collectionSlug, ids),\n  })\n\n  const lockDuration =\n    typeof lockDocumentsProp === 'object' ? lockDocumentsProp.duration : lockDurationDefault\n\n  const lockDurationInMilliseconds = lockDuration * 1000\n  const currentUserId = req.user?.id\n  const now = new Date().getTime()\n  const resolved = new Set<string>()\n\n  for (const lockedDoc of lockedDocumentResult?.docs ?? []) {\n    const documentId = String(lockedDoc.document?.value)\n    const lockDocumentIDs = lockState.lockDocumentIDsByDocumentID.get(documentId)\n\n    if (lockDocumentIDs) {\n      lockDocumentIDs.push(lockedDoc.id)\n    } else {\n      lockState.lockDocumentIDsByDocumentID.set(documentId, [lockedDoc.id])\n    }\n\n    // Sorted by -updatedAt, so the first row seen for an id is its most recent lock\n    if (resolved.has(documentId)) {\n      continue\n    }\n    resolved.add(documentId)\n\n    const lastEditedAt = new Date(lockedDoc?.updatedAt).getTime()\n\n    // document is locked by another user and the lock hasn't expired\n    if (\n      !overrideLock &&\n      lockedDoc.user?.value !== currentUserId &&\n      now - lastEditedAt <= lockDurationInMilliseconds\n    ) {\n      lockState.lockedDocumentIDs.add(documentId)\n    }\n  }\n\n  return lockState\n}\n\nexport const getLockedDocumentIds = async (\n  args: GetDocumentLockStateArgs,\n): Promise<Set<string>> => {\n  if (args.overrideLock ?? true) {\n    return new Set<string>()\n  }\n\n  return (await getDocumentLockState(args)).lockedDocumentIDs\n}\n\n/**\n * Batched counterpart to the lock cleanup `checkDocumentLockStatus` performs, so that bulk\n * operations release every lock in one query instead of one per document.\n */\nexport const deleteDocumentLocks = async ({\n  collectionSlug,\n  ids,\n  lockDocumentIDs,\n  req,\n}: { lockDocumentIDs?: (number | string)[] } & BulkLockArgs): Promise<void> => {\n  const { payload } = req\n\n  if (\n    !ids.length ||\n    (lockDocumentIDs && !lockDocumentIDs.length) ||\n    !isLockingAvailable(collectionSlug, req)\n  ) {\n    return\n  }\n\n  await payload.db.deleteMany({\n    collection: lockedDocumentsCollectionSlug,\n    // Not passing req fails on postgres\n    req: payload.db.name === 'mongoose' ? undefined : req,\n    where: lockDocumentIDs\n      ? { id: { in: lockDocumentIDs } }\n      : buildBulkLockedDocumentQuery(collectionSlug, ids),\n  })\n  markTransactionWrite({ req: payload.db.name === 'mongoose' ? undefined : req })\n}\n"],"names":["Locked","lockedDocumentsCollectionSlug","markTransactionWrite","checkDocumentLockStatus","id","collectionSlug","globalSlug","lockDurationDefault","lockErrorMessage","overrideLock","req","shouldDeleteLock","payload","collections","lockDocumentsProp","config","lockDocuments","globals","find","g","slug","isLockingEnabled","lockedDocumentQuery","and","equals","Error","defaultLockErrorMessage","finalLockErrorMessage","lockedDocumentResult","db","collection","limit","pagination","name","undefined","sort","where","lockedDoc","docs","lastEditedAt","Date","updatedAt","getTime","now","lockDuration","duration","lockDurationInMilliseconds","currentUserId","user","value","deleteMany","buildBulkLockedDocumentQuery","ids","in","isLockingAvailable","getDocumentLockState","lockState","lockDocumentIDsByDocumentID","Map","lockedDocumentIDs","Set","length","resolved","documentId","String","document","lockDocumentIDs","get","push","set","has","add","getLockedDocumentIds","args","deleteDocumentLocks"],"mappings":"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"}
+{"version":3,"sources":["../../src/utilities/checkDocumentLockStatus.ts"],"sourcesContent":["import type { TypeWithID } from '../collections/config/types.js'\nimport type { PaginatedDocs } from '../database/types.js'\nimport type { JsonObject, PayloadRequest, Where } from '../types/index.js'\n\nimport { Locked } from '../errors/index.js'\nimport { lockedDocumentsCollectionSlug } from '../locked-documents/config.js'\n\ntype CheckDocumentLockStatusArgs = {\n  collectionSlug?: string\n  globalSlug?: string\n  id?: number | string\n  lockDurationDefault?: number\n  lockErrorMessage?: string\n  overrideLock?: boolean\n  req: PayloadRequest\n}\n\nexport const checkDocumentLockStatus = async ({\n  id,\n  collectionSlug,\n  globalSlug,\n  lockDurationDefault = 300, // Default 5 minutes in seconds\n  lockErrorMessage,\n  overrideLock = true,\n  req,\n}: CheckDocumentLockStatusArgs): Promise<void> => {\n  const { payload } = req\n\n  // Check if the locked-documents collection exists\n  if (!payload.collections?.[lockedDocumentsCollectionSlug]) {\n    // If the collection doesn't exist, locking is not available\n    return\n  }\n\n  // Retrieve the lockDocuments property for either collection or global\n  const lockDocumentsProp = collectionSlug\n    ? payload.collections?.[collectionSlug]?.config?.lockDocuments\n    : payload.config?.globals?.find((g) => g.slug === globalSlug)?.lockDocuments\n\n  const isLockingEnabled = lockDocumentsProp !== false\n\n  let lockedDocumentQuery = {}\n\n  if (collectionSlug) {\n    lockedDocumentQuery = {\n      and: [\n        { 'document.relationTo': { equals: collectionSlug } },\n        { 'document.value': { equals: id } },\n      ],\n    }\n  } else if (globalSlug) {\n    lockedDocumentQuery = { globalSlug: { equals: globalSlug } }\n  } else {\n    throw new Error('Either collectionSlug or globalSlug must be provided.')\n  }\n\n  if (!isLockingEnabled) {\n    return\n  }\n\n  // Only perform lock checks if overrideLock is false and locking is enabled\n  if (!overrideLock) {\n    const defaultLockErrorMessage = collectionSlug\n      ? `Document with ID ${id} is currently locked by another user and cannot be modified.`\n      : `Global document with slug \"${globalSlug}\" is currently locked by another user and cannot be modified.`\n\n    const finalLockErrorMessage = lockErrorMessage || defaultLockErrorMessage\n\n    const lockedDocumentResult: PaginatedDocs<JsonObject & TypeWithID> = await payload.db.find({\n      collection: lockedDocumentsCollectionSlug,\n      limit: 1,\n      pagination: false,\n      sort: '-updatedAt',\n      where: lockedDocumentQuery,\n    })\n\n    // If there's a locked document, check lock conditions\n    const lockedDoc = lockedDocumentResult?.docs[0]\n    if (lockedDoc) {\n      const lastEditedAt = new Date(lockedDoc?.updatedAt).getTime()\n      const now = new Date().getTime()\n\n      const lockDuration =\n        typeof lockDocumentsProp === 'object' ? lockDocumentsProp.duration : lockDurationDefault\n\n      const lockDurationInMilliseconds = lockDuration * 1000\n      const currentUserId = req.user?.id\n\n      // document is locked by another user and the lock hasn't expired\n      if (\n        lockedDoc.user?.value !== currentUserId &&\n        now - lastEditedAt <= lockDurationInMilliseconds\n      ) {\n        throw new Locked(finalLockErrorMessage)\n      }\n    }\n  }\n\n  // Perform the delete operation regardless of overrideLock status\n  await payload.db.deleteMany({\n    collection: lockedDocumentsCollectionSlug,\n    // Not passing req fails on postgres\n    req: payload.db.name === 'mongoose' ? undefined : req,\n    where: lockedDocumentQuery,\n  })\n}\n\ntype BulkLockArgs = {\n  collectionSlug: string\n  ids: (number | string)[]\n  req: PayloadRequest\n}\n\nconst buildBulkLockedDocumentQuery = (collectionSlug: string, ids: (number | string)[]): Where => ({\n  and: [{ 'document.relationTo': { equals: collectionSlug } }, { 'document.value': { in: ids } }],\n})\n\nconst isLockingAvailable = (collectionSlug: string, req: PayloadRequest): boolean => {\n  const { payload } = req\n\n  if (!payload.collections?.[lockedDocumentsCollectionSlug]) {\n    return false\n  }\n\n  return payload.collections?.[collectionSlug]?.config?.lockDocuments !== false\n}\n\n/**\n * Batched counterpart to `checkDocumentLockStatus`. Resolves the lock state of every id with a\n * single query instead of one per document, and returns the ids that are locked by another user.\n * Callers are expected to report those ids as errors and leave them alone.\n */\nexport const getLockedDocumentIds = async ({\n  collectionSlug,\n  ids,\n  lockDurationDefault = 300, // Default 5 minutes in seconds\n  overrideLock = true,\n  req,\n}: {\n  lockDurationDefault?: number\n  overrideLock?: boolean\n} & BulkLockArgs): Promise<Set<string>> => {\n  const lockedIds = new Set<string>()\n\n  if (overrideLock || !ids.length || !isLockingAvailable(collectionSlug, req)) {\n    return lockedIds\n  }\n\n  const { payload } = req\n  const lockDocumentsProp = payload.collections?.[collectionSlug]?.config?.lockDocuments\n\n  const lockedDocumentResult: PaginatedDocs<JsonObject & TypeWithID> = await payload.db.find({\n    collection: lockedDocumentsCollectionSlug,\n    limit: 0,\n    pagination: false,\n    sort: '-updatedAt',\n    where: buildBulkLockedDocumentQuery(collectionSlug, ids),\n  })\n\n  const lockDuration =\n    typeof lockDocumentsProp === 'object' ? lockDocumentsProp.duration : lockDurationDefault\n\n  const lockDurationInMilliseconds = lockDuration * 1000\n  const currentUserId = req.user?.id\n  const now = new Date().getTime()\n  const resolved = new Set<string>()\n\n  for (const lockedDoc of lockedDocumentResult?.docs ?? []) {\n    const documentId = String(lockedDoc.document?.value)\n\n    // Sorted by -updatedAt, so the first row seen for an id is its most recent lock\n    if (resolved.has(documentId)) {\n      continue\n    }\n    resolved.add(documentId)\n\n    const lastEditedAt = new Date(lockedDoc?.updatedAt).getTime()\n\n    // document is locked by another user and the lock hasn't expired\n    if (\n      lockedDoc.user?.value !== currentUserId &&\n      now - lastEditedAt <= lockDurationInMilliseconds\n    ) {\n      lockedIds.add(documentId)\n    }\n  }\n\n  return lockedIds\n}\n\n/**\n * Batched counterpart to the lock cleanup `checkDocumentLockStatus` performs, so that bulk\n * operations release every lock in one query instead of one per document.\n */\nexport const deleteDocumentLocks = async ({\n  collectionSlug,\n  ids,\n  req,\n}: BulkLockArgs): Promise<void> => {\n  const { payload } = req\n\n  if (!ids.length || !isLockingAvailable(collectionSlug, req)) {\n    return\n  }\n\n  await payload.db.deleteMany({\n    collection: lockedDocumentsCollectionSlug,\n    // Not passing req fails on postgres\n    req: payload.db.name === 'mongoose' ? undefined : req,\n    where: buildBulkLockedDocumentQuery(collectionSlug, ids),\n  })\n}\n"],"names":["Locked","lockedDocumentsCollectionSlug","checkDocumentLockStatus","id","collectionSlug","globalSlug","lockDurationDefault","lockErrorMessage","overrideLock","req","payload","collections","lockDocumentsProp","config","lockDocuments","globals","find","g","slug","isLockingEnabled","lockedDocumentQuery","and","equals","Error","defaultLockErrorMessage","finalLockErrorMessage","lockedDocumentResult","db","collection","limit","pagination","sort","where","lockedDoc","docs","lastEditedAt","Date","updatedAt","getTime","now","lockDuration","duration","lockDurationInMilliseconds","currentUserId","user","value","deleteMany","name","undefined","buildBulkLockedDocumentQuery","ids","in","isLockingAvailable","getLockedDocumentIds","lockedIds","Set","length","resolved","documentId","String","document","has","add","deleteDocumentLocks"],"mappings":"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"}

package/dist/utilities/cloneValidationRequest.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/cloneValidationRequest.ts"],"sourcesContent":["import type { RequestContext, User } from '../index.js'\nimport type { PayloadRequest } from '../types/index.js'\n\nconst sharedValidationRequestProperties = new Set([\n  'i18n',\n  'payload',\n  'server',\n  'signal',\n  't',\n  'transactionID',\n])\n\nexport function cloneValidationContext({\n  context,\n}: {\n  context: RequestContext | undefined\n}): RequestContext | undefined {\n  return cloneValidationValue(context)\n}\n\nexport function cloneValidationData<TData>({ data }: { data: TData }): TData {\n  return cloneValidationValue(data)\n}\n\nexport function cloneValidationRequest({\n  request,\n}: {\n  request: Partial<PayloadRequest> | undefined\n}): Partial<PayloadRequest> {\n  if (!request) {\n    return {}\n  }\n\n  const payloadRequest: Partial<PayloadRequest> = request\n  const fetchRequest: Request | undefined =\n    typeof Request !== 'undefined' && request instanceof Request ? request : undefined\n  const canCloneFetchRequest = fetchRequest && !fetchRequest.bodyUsed\n  let clonedRequest: Record<string, unknown>\n\n  if (canCloneFetchRequest) {\n    clonedRequest = fetchRequest.clone() as unknown as Record<string, unknown>\n  } else {\n    clonedRequest = {}\n  }\n\n  for (const [key, value] of Object.entries(payloadRequest)) {\n    if (key === 'payloadDataLoader') {\n      continue\n    }\n\n    if (key === 'file') {\n      clonedRequest.file = cloneValidationFile(payloadRequest.file)\n      continue\n    }\n\n    if (key === 'files') {\n      clonedRequest.files = cloneValidationFiles(payloadRequest.files)\n      continue\n    }\n\n    clonedRequest[key] = sharedValidationRequestProperties.has(key)\n      ? value\n      : cloneValidationValue(value)\n  }\n\n  Object.assign(clonedRequest, {\n    context: cloneValidationValue(payloadRequest.context ?? {}),\n    query: cloneValidationValue(payloadRequest.query ?? {}),\n    routeParams: cloneValidationValue(payloadRequest.routeParams ?? {}),\n  })\n\n  if (!canCloneFetchRequest) {\n    Object.assign(clonedRequest, {\n      headers: cloneValidationValue(payloadRequest.headers),\n      method: payloadRequest.method,\n      signal: payloadRequest.signal,\n      url: payloadRequest.url,\n    })\n  }\n\n  return clonedRequest as Partial<PayloadRequest>\n}\n\nexport function cloneValidationUser({\n  user,\n}: {\n  user: null | undefined | User\n}): null | undefined | User {\n  return cloneValidationValue(user)\n}\n\nfunction cloneValidationFile(file: PayloadRequest['file']): PayloadRequest['file'] {\n  if (!file) {\n    return file\n  }\n\n  const { data, ...metadata } = file\n\n  return {\n    ...cloneValidationValue(metadata),\n    data,\n  }\n}\n\nfunction cloneValidationFiles(files: PayloadRequest['files']): PayloadRequest['files'] {\n  if (!files) {\n    return files\n  }\n\n  return Object.fromEntries(\n    Object.entries(files).map(([fieldName, fileOrFiles]) => [\n      fieldName,\n      Array.isArray(fileOrFiles)\n        ? fileOrFiles.map((file) => cloneValidationFile(file)!)\n        : cloneValidationFile(fileOrFiles)!,\n    ]),\n  )\n}\n\nfunction cloneValidationValue<T>(value: T, cache = new WeakMap<object, unknown>()): T {\n  if ((typeof value !== 'object' && typeof value !== 'function') || value === null) {\n    return value\n  }\n\n  if (typeof value === 'function' || value instanceof Promise) {\n    return value\n  }\n\n  const objectValue = value as object\n  const cachedValue = cache.get(objectValue)\n\n  if (cachedValue) {\n    return cachedValue as T\n  }\n\n  if (value instanceof Headers) {\n    return new Headers(value) as T\n  }\n\n  if (value instanceof URLSearchParams) {\n    return new URLSearchParams(value) as T\n  }\n\n  if (value instanceof URL) {\n    return new URL(value) as T\n  }\n\n  if (value instanceof Date) {\n    return new Date(value) as T\n  }\n\n  if (value instanceof RegExp) {\n    return new RegExp(value.source, value.flags) as T\n  }\n\n  if (value instanceof ArrayBuffer) {\n    return value.slice(0) as T\n  }\n\n  if (ArrayBuffer.isView(value)) {\n    if (Buffer.isBuffer(value)) {\n      return Buffer.from(value) as T\n    }\n\n    if (value instanceof DataView) {\n      return new DataView(value.buffer.slice(0), value.byteOffset, value.byteLength) as T\n    }\n\n    return new (value.constructor as new (input: typeof value) => typeof value)(value)\n  }\n\n  if (value instanceof Map) {\n    const clonedMap = new Map()\n    cache.set(objectValue, clonedMap)\n    for (const [key, mapValue] of value) {\n      clonedMap.set(cloneValidationValue(key, cache), cloneValidationValue(mapValue, cache))\n    }\n    return clonedMap as T\n  }\n\n  if (value instanceof Set) {\n    const clonedSet = new Set()\n    cache.set(objectValue, clonedSet)\n    for (const setValue of value) {\n      clonedSet.add(cloneValidationValue(setValue, cache))\n    }\n    return clonedSet as T\n  }\n\n  if (typeof Blob !== 'undefined' && value instanceof Blob) {\n    return value\n  }\n\n  const prototype = Object.getPrototypeOf(value)\n\n  if (!Array.isArray(value) && prototype !== Object.prototype && prototype !== null) {\n    return value\n  }\n\n  const clonedValue: Record<PropertyKey, unknown> | unknown[] = Array.isArray(value)\n    ? []\n    : Object.create(prototype)\n  cache.set(objectValue, clonedValue)\n\n  for (const key of Reflect.ownKeys(value)) {\n    const descriptor = Object.getOwnPropertyDescriptor(value, key)\n\n    if (descriptor?.enumerable) {\n      ;(clonedValue as Record<PropertyKey, unknown>)[key] = cloneValidationValue(\n        (value as Record<PropertyKey, unknown>)[key],\n        cache,\n      )\n    }\n  }\n\n  return clonedValue as T\n}\n"],"names":["sharedValidationRequestProperties","Set","cloneValidationContext","context","cloneValidationValue","cloneValidationData","data","cloneValidationRequest","request","payloadRequest","fetchRequest","Request","undefined","canCloneFetchRequest","bodyUsed","clonedRequest","clone","key","value","Object","entries","file","cloneValidationFile","files","cloneValidationFiles","has","assign","query","routeParams","headers","method","signal","url","cloneValidationUser","user","metadata","fromEntries","map","fieldName","fileOrFiles","Array","isArray","cache","WeakMap","Promise","objectValue","cachedValue","get","Headers","URLSearchParams","URL","Date","RegExp","source","flags","ArrayBuffer","slice","isView","Buffer","isBuffer","from","DataView","buffer","byteOffset","byteLength","Map","clonedMap","set","mapValue","clonedSet","setValue","add","Blob","prototype","getPrototypeOf","clonedValue","create","Reflect","ownKeys","descriptor","getOwnPropertyDescriptor","enumerable"],"mappings":"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"}
+{"version":3,"sources":["../../src/utilities/cloneValidationRequest.ts"],"sourcesContent":["import type { RequestContext, User } from '../index.js'\nimport type { PayloadRequest } from '../types/index.js'\n\nconst sharedValidationRequestProperties = new Set([\n  'i18n',\n  'payload',\n  'server',\n  'signal',\n  't',\n  'transactionID',\n])\n\nexport function cloneValidationContext({\n  context,\n}: {\n  context: RequestContext | undefined\n}): RequestContext | undefined {\n  return cloneValidationValue(context)\n}\n\nexport function cloneValidationData<TData>({ data }: { data: TData }): TData {\n  return cloneValidationValue(data)\n}\n\nexport function cloneValidationRequest({\n  request,\n}: {\n  request: Partial<PayloadRequest> | undefined\n}): Partial<PayloadRequest> {\n  if (!request) {\n    return {}\n  }\n\n  const payloadRequest: Partial<PayloadRequest> = request\n  const fetchRequest: Request | undefined =\n    typeof Request !== 'undefined' && request instanceof Request ? request : undefined\n  const canCloneFetchRequest = fetchRequest && !fetchRequest.bodyUsed\n  let clonedRequest: Record<string, unknown>\n\n  if (canCloneFetchRequest) {\n    clonedRequest = fetchRequest.clone() as unknown as Record<string, unknown>\n  } else {\n    clonedRequest = {}\n  }\n\n  for (const [key, value] of Object.entries(payloadRequest)) {\n    if (key === 'payloadDataLoader') {\n      continue\n    }\n\n    if (key === 'file') {\n      clonedRequest.file = cloneValidationFile(payloadRequest.file)\n      continue\n    }\n\n    if (key === 'files') {\n      clonedRequest.files = cloneValidationFiles(payloadRequest.files)\n      continue\n    }\n\n    clonedRequest[key] = sharedValidationRequestProperties.has(key)\n      ? value\n      : cloneValidationValue(value)\n  }\n\n  Object.assign(clonedRequest, {\n    context: cloneValidationValue(payloadRequest.context ?? {}),\n    query: cloneValidationValue(payloadRequest.query ?? {}),\n    routeParams: cloneValidationValue(payloadRequest.routeParams ?? {}),\n  })\n\n  if (!canCloneFetchRequest) {\n    Object.assign(clonedRequest, {\n      headers: cloneValidationValue(payloadRequest.headers),\n      method: payloadRequest.method,\n      signal: payloadRequest.signal,\n      url: payloadRequest.url,\n    })\n  }\n\n  return clonedRequest\n}\n\nexport function cloneValidationUser({\n  user,\n}: {\n  user: null | undefined | User\n}): null | undefined | User {\n  return cloneValidationValue(user)\n}\n\nfunction cloneValidationFile(file: PayloadRequest['file']): PayloadRequest['file'] {\n  if (!file) {\n    return file\n  }\n\n  const { data, ...metadata } = file\n\n  return {\n    ...cloneValidationValue(metadata),\n    data,\n  }\n}\n\nfunction cloneValidationFiles(files: PayloadRequest['files']): PayloadRequest['files'] {\n  if (!files) {\n    return files\n  }\n\n  return Object.fromEntries(\n    Object.entries(files).map(([fieldName, fileOrFiles]) => [\n      fieldName,\n      Array.isArray(fileOrFiles)\n        ? fileOrFiles.map((file) => cloneValidationFile(file)!)\n        : cloneValidationFile(fileOrFiles)!,\n    ]),\n  )\n}\n\nfunction cloneValidationValue<T>(value: T, cache = new WeakMap<object, unknown>()): T {\n  if ((typeof value !== 'object' && typeof value !== 'function') || value === null) {\n    return value\n  }\n\n  if (typeof value === 'function' || value instanceof Promise) {\n    return value\n  }\n\n  const objectValue = value as object\n  const cachedValue = cache.get(objectValue)\n\n  if (cachedValue) {\n    return cachedValue as T\n  }\n\n  if (value instanceof Headers) {\n    return new Headers(value) as T\n  }\n\n  if (value instanceof URLSearchParams) {\n    return new URLSearchParams(value) as T\n  }\n\n  if (value instanceof URL) {\n    return new URL(value) as T\n  }\n\n  if (value instanceof Date) {\n    return new Date(value) as T\n  }\n\n  if (value instanceof RegExp) {\n    return new RegExp(value.source, value.flags) as T\n  }\n\n  if (value instanceof ArrayBuffer) {\n    return value.slice(0) as T\n  }\n\n  if (ArrayBuffer.isView(value)) {\n    if (Buffer.isBuffer(value)) {\n      return Buffer.from(value) as T\n    }\n\n    if (value instanceof DataView) {\n      return new DataView(value.buffer.slice(0), value.byteOffset, value.byteLength) as T\n    }\n\n    return new (value.constructor as new (input: typeof value) => typeof value)(value)\n  }\n\n  if (value instanceof Map) {\n    const clonedMap = new Map()\n    cache.set(objectValue, clonedMap)\n    for (const [key, mapValue] of value) {\n      clonedMap.set(cloneValidationValue(key, cache), cloneValidationValue(mapValue, cache))\n    }\n    return clonedMap as T\n  }\n\n  if (value instanceof Set) {\n    const clonedSet = new Set()\n    cache.set(objectValue, clonedSet)\n    for (const setValue of value) {\n      clonedSet.add(cloneValidationValue(setValue, cache))\n    }\n    return clonedSet as T\n  }\n\n  if (typeof Blob !== 'undefined' && value instanceof Blob) {\n    return value\n  }\n\n  const prototype = Object.getPrototypeOf(value)\n\n  if (!Array.isArray(value) && prototype !== Object.prototype && prototype !== null) {\n    return value\n  }\n\n  const clonedValue: Record<PropertyKey, unknown> | unknown[] = Array.isArray(value)\n    ? []\n    : Object.create(prototype)\n  cache.set(objectValue, clonedValue)\n\n  for (const key of Reflect.ownKeys(value)) {\n    const descriptor = Object.getOwnPropertyDescriptor(value, key)\n\n    if (descriptor?.enumerable) {\n      ;(clonedValue as Record<PropertyKey, unknown>)[key] = cloneValidationValue(\n        (value as Record<PropertyKey, unknown>)[key],\n        cache,\n      )\n    }\n  }\n\n  return clonedValue as T\n}\n"],"names":["sharedValidationRequestProperties","Set","cloneValidationContext","context","cloneValidationValue","cloneValidationData","data","cloneValidationRequest","request","payloadRequest","fetchRequest","Request","undefined","canCloneFetchRequest","bodyUsed","clonedRequest","clone","key","value","Object","entries","file","cloneValidationFile","files","cloneValidationFiles","has","assign","query","routeParams","headers","method","signal","url","cloneValidationUser","user","metadata","fromEntries","map","fieldName","fileOrFiles","Array","isArray","cache","WeakMap","Promise","objectValue","cachedValue","get","Headers","URLSearchParams","URL","Date","RegExp","source","flags","ArrayBuffer","slice","isView","Buffer","isBuffer","from","DataView","buffer","byteOffset","byteLength","Map","clonedMap","set","mapValue","clonedSet","setValue","add","Blob","prototype","getPrototypeOf","clonedValue","create","Reflect","ownKeys","descriptor","getOwnPropertyDescriptor","enumerable"],"mappings":"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"}

package/dist/utilities/commitTransaction.d.ts

@@ -1,9 +1,5 @@
 import type { MarkRequired } from 'ts-essentials';
 import type { PayloadRequest } from '../types/index.js';
-export declare const isUnknownTransactionCommitResult: (error: unknown) => boolean;
-export declare const shouldRollbackTransactionArtifacts: ({ error }: {
-    error: unknown;
-}) => boolean;
 /**
  * complete a transaction calling adapter db.commitTransaction and delete the transactionID from req
  */

package/dist/utilities/commitTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commitTransaction.d.ts","sourceRoot":"","sources":["../../src/utilities/commitTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AASvD,eAAO,MAAM,gCAAgC,UAAW,OAAO,KAAG,OAcjE,CAAA;AAED,eAAO,MAAM,kCAAkC,cAAe;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,KAAG,OACzC,CAAA;AAE1C;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,GACpD,OAAO,CAAC,IAAI,CAAC,CAyBf"}
+{"version":3,"file":"commitTransaction.d.ts","sourceRoot":"","sources":["../../src/utilities/commitTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAIvD;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,GACpD,OAAO,CAAC,IAAI,CAAC,CAMf"}

package/dist/utilities/commitTransaction.js

@@ -1,53 +1,13 @@
 import { commitFileOperations } from '../uploads/fileVersioning/fileOperationManager.js';
-import { clearTransactionCommitCallbacks, clearTransactionRollbackCallbacks, runTransactionCommitCallbacks } from './transactionCallbacks.js';
-export const isUnknownTransactionCommitResult = (error)=>{
-    if (!error || typeof error !== 'object') {
-        return false;
-    }
-    const labeledError = error;
-    return labeledError.hasErrorLabel?.('UnknownTransactionCommitResult') === true || labeledError.errorLabels?.includes('UnknownTransactionCommitResult') === true;
-};
-export const shouldRollbackTransactionArtifacts = ({ error })=>!isUnknownTransactionCommitResult(error);
 /**
  * complete a transaction calling adapter db.commitTransaction and delete the transactionID from req
  */ export async function commitTransaction(req) {
     const { payload, transactionID } = req;
-    const resolvedTransactionID = await transactionID;
-    try {
-        await payload.db.commitTransaction(resolvedTransactionID);
-    } catch (error) {
-        if (isUnknownTransactionCommitResult(error)) {
-            delete req.transactionID;
-            clearTransactionCommitCallbacks({
-                req,
-                transactionID: resolvedTransactionID
-            });
-            clearTransactionRollbackCallbacks({
-                req,
-                transactionID: resolvedTransactionID
-            });
-        }
-        throw error;
-    }
+    await payload.db.commitTransaction(transactionID);
     delete req.transactionID;
     await commitFileOperations({
         req: req
     });
-    clearTransactionRollbackCallbacks({
-        req,
-        transactionID: resolvedTransactionID
-    });
-    try {
-        await runTransactionCommitCallbacks({
-            req,
-            transactionID: resolvedTransactionID
-        });
-    } catch (err) {
-        payload.logger.error({
-            err,
-            msg: 'A post-commit cleanup task failed.'
-        });
-    }
 }
 
 //# sourceMappingURL=commitTransaction.js.map

package/dist/utilities/commitTransaction.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/commitTransaction.ts"],"sourcesContent":["import type { MarkRequired } from 'ts-essentials'\n\nimport type { PayloadRequest } from '../types/index.js'\n\nimport { commitFileOperations } from '../uploads/fileVersioning/fileOperationManager.js'\nimport {\n  clearTransactionCommitCallbacks,\n  clearTransactionRollbackCallbacks,\n  runTransactionCommitCallbacks,\n} from './transactionCallbacks.js'\n\nexport const isUnknownTransactionCommitResult = (error: unknown): boolean => {\n  if (!error || typeof error !== 'object') {\n    return false\n  }\n\n  const labeledError = error as {\n    errorLabels?: string[]\n    hasErrorLabel?: (label: string) => boolean\n  }\n\n  return (\n    labeledError.hasErrorLabel?.('UnknownTransactionCommitResult') === true ||\n    labeledError.errorLabels?.includes('UnknownTransactionCommitResult') === true\n  )\n}\n\nexport const shouldRollbackTransactionArtifacts = ({ error }: { error: unknown }): boolean =>\n  !isUnknownTransactionCommitResult(error)\n\n/**\n * complete a transaction calling adapter db.commitTransaction and delete the transactionID from req\n */\nexport async function commitTransaction(\n  req: MarkRequired<Partial<PayloadRequest>, 'payload'>,\n): Promise<void> {\n  const { payload, transactionID } = req\n  const resolvedTransactionID = await transactionID!\n\n  try {\n    await payload.db.commitTransaction(resolvedTransactionID)\n  } catch (error) {\n    if (isUnknownTransactionCommitResult(error)) {\n      delete req.transactionID\n      clearTransactionCommitCallbacks({ req, transactionID: resolvedTransactionID })\n      clearTransactionRollbackCallbacks({ req, transactionID: resolvedTransactionID })\n    }\n\n    throw error\n  }\n\n  delete req.transactionID\n  await commitFileOperations({ req: req as PayloadRequest })\n  clearTransactionRollbackCallbacks({ req, transactionID: resolvedTransactionID })\n\n  try {\n    await runTransactionCommitCallbacks({ req, transactionID: resolvedTransactionID })\n  } catch (err) {\n    payload.logger.error({ err, msg: 'A post-commit cleanup task failed.' })\n  }\n}\n"],"names":["commitFileOperations","clearTransactionCommitCallbacks","clearTransactionRollbackCallbacks","runTransactionCommitCallbacks","isUnknownTransactionCommitResult","error","labeledError","hasErrorLabel","errorLabels","includes","shouldRollbackTransactionArtifacts","commitTransaction","req","payload","transactionID","resolvedTransactionID","db","err","logger","msg"],"mappings":"AAIA,SAASA,oBAAoB,QAAQ,oDAAmD;AACxF,SACEC,+BAA+B,EAC/BC,iCAAiC,EACjCC,6BAA6B,QACxB,4BAA2B;AAElC,OAAO,MAAMC,mCAAmC,CAACC;IAC/C,IAAI,CAACA,SAAS,OAAOA,UAAU,UAAU;QACvC,OAAO;IACT;IAEA,MAAMC,eAAeD;IAKrB,OACEC,aAAaC,aAAa,GAAG,sCAAsC,QACnED,aAAaE,WAAW,EAAEC,SAAS,sCAAsC;AAE7E,EAAC;AAED,OAAO,MAAMC,qCAAqC,CAAC,EAAEL,KAAK,EAAsB,GAC9E,CAACD,iCAAiCC,OAAM;AAE1C;;CAEC,GACD,OAAO,eAAeM,kBACpBC,GAAqD;IAErD,MAAM,EAAEC,OAAO,EAAEC,aAAa,EAAE,GAAGF;IACnC,MAAMG,wBAAwB,MAAMD;IAEpC,IAAI;QACF,MAAMD,QAAQG,EAAE,CAACL,iBAAiB,CAACI;IACrC,EAAE,OAAOV,OAAO;QACd,IAAID,iCAAiCC,QAAQ;YAC3C,OAAOO,IAAIE,aAAa;YACxBb,gCAAgC;gBAAEW;gBAAKE,eAAeC;YAAsB;YAC5Eb,kCAAkC;gBAAEU;gBAAKE,eAAeC;YAAsB;QAChF;QAEA,MAAMV;IACR;IAEA,OAAOO,IAAIE,aAAa;IACxB,MAAMd,qBAAqB;QAAEY,KAAKA;IAAsB;IACxDV,kCAAkC;QAAEU;QAAKE,eAAeC;IAAsB;IAE9E,IAAI;QACF,MAAMZ,8BAA8B;YAAES;YAAKE,eAAeC;QAAsB;IAClF,EAAE,OAAOE,KAAK;QACZJ,QAAQK,MAAM,CAACb,KAAK,CAAC;YAAEY;YAAKE,KAAK;QAAqC;IACxE;AACF"}
+{"version":3,"sources":["../../src/utilities/commitTransaction.ts"],"sourcesContent":["import type { MarkRequired } from 'ts-essentials'\n\nimport type { PayloadRequest } from '../types/index.js'\n\nimport { commitFileOperations } from '../uploads/fileVersioning/fileOperationManager.js'\n\n/**\n * complete a transaction calling adapter db.commitTransaction and delete the transactionID from req\n */\nexport async function commitTransaction(\n  req: MarkRequired<Partial<PayloadRequest>, 'payload'>,\n): Promise<void> {\n  const { payload, transactionID } = req\n\n  await payload.db.commitTransaction(transactionID!)\n  delete req.transactionID\n  await commitFileOperations({ req: req as PayloadRequest })\n}\n"],"names":["commitFileOperations","commitTransaction","req","payload","transactionID","db"],"mappings":"AAIA,SAASA,oBAAoB,QAAQ,oDAAmD;AAExF;;CAEC,GACD,OAAO,eAAeC,kBACpBC,GAAqD;IAErD,MAAM,EAAEC,OAAO,EAAEC,aAAa,EAAE,GAAGF;IAEnC,MAAMC,QAAQE,EAAE,CAACJ,iBAAiB,CAACG;IACnC,OAAOF,IAAIE,aAAa;IACxB,MAAMJ,qBAAqB;QAAEE,KAAKA;IAAsB;AAC1D"}

package/dist/utilities/configToJSONSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configToJSONSchema.d.ts","sourceRoot":"","sources":["../../src/utilities/configToJSONSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configToJSONSchema.d.ts","sourceRoot":"","sources":["../../src/utilities/configToJSONSchema.ts"],"names":[],"mappings":"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"}

package/dist/utilities/configToJSONSchema.js

@@ -547,15 +547,7 @@ export function fieldsToJSONSchema({ collectionIDFieldTypes, config, fields, for
                     }
                 case 'json':
                     {
-                        const jsonFieldSchema = field.jsonSchema?.schema;
-                        fieldSchema = jsonFieldSchema ? isRequired ? jsonFieldSchema : {
-                            anyOf: [
-                                jsonFieldSchema,
-                                {
-                                    type: 'null'
-                                }
-                            ]
-                        } : {
+                        fieldSchema = field.jsonSchema?.schema || {
                             ...baseFieldSchema,
                             type: [
                                 'object',
@@ -726,7 +718,7 @@ export function fieldsToJSONSchema({ collectionIDFieldTypes, config, fields, for
                             throw new Error('Attempted to access unsanitized rich text editor.');
                         }
                         if (field.editor.jsonSchema) {
-                            const richTextSchema = {
+                            fieldSchema = {
                                 ...baseFieldSchema,
                                 ...field.editor.jsonSchema({
                                     collectionIDFieldTypes,
@@ -739,14 +731,6 @@ export function fieldsToJSONSchema({ collectionIDFieldTypes, config, fields, for
                                     variant
                                 })
                             };
-                            fieldSchema = isRequired ? richTextSchema : {
-                                anyOf: [
-                                    richTextSchema,
-                                    {
-                                        type: 'null'
-                                    }
-                                ]
-                            };
                         } else {
                             // Maintain backwards compatibility with existing rich text editors
                             fieldSchema = {