payload 4.0.0-internal.e7d4ebc → 4.0.0-internal.ea6e8f8

package/dist/utilities/batchProcessing.d.ts

@@ -0,0 +1,23 @@
+export type BatchProcessorResult = {
+    shouldContinue?: boolean;
+};
+export type BatchProcessingOptions<T> = {
+    /**
+     * The maximum number of items supplied to one processor call.
+     *
+     * @default 100
+     */
+    batchSize?: number;
+    input: AsyncIterable<T> | Iterable<T>;
+    processBatch: (args: {
+        batch: T[];
+        batchIndex: number;
+    }) => BatchProcessorResult | Promise<BatchProcessorResult | void> | void;
+};
+/**
+ * Processes iterable input in ordered, bounded batches. Processing is sequential and stops when the
+ * processor returns `shouldContinue: false` or throws. This utility does not retry work or manage
+ * transactions.
+ */
+export declare const batchProcessing: <T>({ batchSize, input, processBatch, }: BatchProcessingOptions<T>) => Promise<void>;
+//# sourceMappingURL=batchProcessing.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"batchProcessing.d.ts","sourceRoot":"","sources":["../../src/utilities/batchProcessing.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;IACtC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACrC,YAAY,EAAE,CAAC,IAAI,EAAE;QACnB,KAAK,EAAE,CAAC,EAAE,CAAA;QACV,UAAU,EAAE,MAAM,CAAA;KACnB,KAAK,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,GAAG,IAAI,CAAA;CACzE,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAU,CAAC,uCAIpC,sBAAsB,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,IAAI,CA4B1C,CAAA"}

package/dist/utilities/batchProcessing.js

@@ -0,0 +1,34 @@
+/**
+ * Processes iterable input in ordered, bounded batches. Processing is sequential and stops when the
+ * processor returns `shouldContinue: false` or throws. This utility does not retry work or manage
+ * transactions.
+ */ export const batchProcessing = async ({ batchSize = 100, input, processBatch })=>{
+    if (!Number.isInteger(batchSize) || batchSize < 1) {
+        throw new TypeError('batchSize must be a positive integer');
+    }
+    let batch = [];
+    let batchIndex = 0;
+    for await (const item of input){
+        batch.push(item);
+        if (batch.length < batchSize) {
+            continue;
+        }
+        const result = await processBatch({
+            batch,
+            batchIndex
+        });
+        if (result?.shouldContinue === false) {
+            return;
+        }
+        batch = [];
+        batchIndex += 1;
+    }
+    if (batch.length > 0) {
+        await processBatch({
+            batch,
+            batchIndex
+        });
+    }
+};
+
+//# sourceMappingURL=batchProcessing.js.map

package/dist/utilities/batchProcessing.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/batchProcessing.ts"],"sourcesContent":["export type BatchProcessorResult = {\n  shouldContinue?: boolean\n}\n\nexport type BatchProcessingOptions<T> = {\n  /**\n   * The maximum number of items supplied to one processor call.\n   *\n   * @default 100\n   */\n  batchSize?: number\n  input: AsyncIterable<T> | Iterable<T>\n  processBatch: (args: {\n    batch: T[]\n    batchIndex: number\n  }) => BatchProcessorResult | Promise<BatchProcessorResult | void> | void\n}\n\n/**\n * Processes iterable input in ordered, bounded batches. Processing is sequential and stops when the\n * processor returns `shouldContinue: false` or throws. This utility does not retry work or manage\n * transactions.\n */\nexport const batchProcessing = async <T>({\n  batchSize = 100,\n  input,\n  processBatch,\n}: BatchProcessingOptions<T>): Promise<void> => {\n  if (!Number.isInteger(batchSize) || batchSize < 1) {\n    throw new TypeError('batchSize must be a positive integer')\n  }\n\n  let batch: T[] = []\n  let batchIndex = 0\n\n  for await (const item of input) {\n    batch.push(item)\n\n    if (batch.length < batchSize) {\n      continue\n    }\n\n    const result = await processBatch({ batch, batchIndex })\n\n    if (result?.shouldContinue === false) {\n      return\n    }\n\n    batch = []\n    batchIndex += 1\n  }\n\n  if (batch.length > 0) {\n    await processBatch({ batch, batchIndex })\n  }\n}\n"],"names":["batchProcessing","batchSize","input","processBatch","Number","isInteger","TypeError","batch","batchIndex","item","push","length","result","shouldContinue"],"mappings":"AAkBA;;;;CAIC,GACD,OAAO,MAAMA,kBAAkB,OAAU,EACvCC,YAAY,GAAG,EACfC,KAAK,EACLC,YAAY,EACc;IAC1B,IAAI,CAACC,OAAOC,SAAS,CAACJ,cAAcA,YAAY,GAAG;QACjD,MAAM,IAAIK,UAAU;IACtB;IAEA,IAAIC,QAAa,EAAE;IACnB,IAAIC,aAAa;IAEjB,WAAW,MAAMC,QAAQP,MAAO;QAC9BK,MAAMG,IAAI,CAACD;QAEX,IAAIF,MAAMI,MAAM,GAAGV,WAAW;YAC5B;QACF;QAEA,MAAMW,SAAS,MAAMT,aAAa;YAAEI;YAAOC;QAAW;QAEtD,IAAII,QAAQC,mBAAmB,OAAO;YACpC;QACF;QAEAN,QAAQ,EAAE;QACVC,cAAc;IAChB;IAEA,IAAID,MAAMI,MAAM,GAAG,GAAG;QACpB,MAAMR,aAAa;YAAEI;YAAOC;QAAW;IACzC;AACF,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"canAccessAdmin.d.ts","sourceRoot":"","sources":["../../src/utilities/canAccessAdmin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAIvD;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,YAAmB;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,kBA8BpE,CAAA"}
+{"version":3,"file":"canAccessAdmin.d.ts","sourceRoot":"","sources":["../../src/utilities/canAccessAdmin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAIvD;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,YAAmB;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,kBA+BpE,CAAA"}

package/dist/utilities/canAccessAdmin.js

@@ -13,6 +13,7 @@ import { UnauthorizedError } from '../errors/UnauthorizedError.js';
         const adminAccessFn = req.payload.collections[incomingUserSlug]?.config.access?.admin;
         if (adminAccessFn) {
             const canAccess = await adminAccessFn({
+                slug: incomingUserSlug,
                 req
             });
             if (!canAccess) {
@@ -27,6 +28,7 @@ import { UnauthorizedError } from '../errors/UnauthorizedError.js';
             collection: adminUserSlug,
             depth: 0,
             limit: 1,
+            overrideAccess: true,
             pagination: false
         });
         // If there are users, we should not allow access because of `/create-first-user`

package/dist/utilities/canAccessAdmin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/canAccessAdmin.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\nimport { UnauthorizedError } from '../errors/UnauthorizedError.js'\n\n/**\n * Protects admin-only routes, server functions, etc.\n * The requesting user must either:\n * a. pass the `access.admin` function on the `users` collection, if defined\n * b. match the `config.admin.user` property on the Payload config\n * c. if no user is present, and there are no users in the system, allow access (for first user creation)\n * @throws {Error} Throws an `Unauthorized` error if access is denied that can be explicitly caught\n */\nexport const canAccessAdmin = async ({ req }: { req: PayloadRequest }) => {\n  const incomingUserSlug = req.user?.collection\n  const adminUserSlug = req.payload.config.admin.user\n\n  if (incomingUserSlug) {\n    const adminAccessFn = req.payload.collections[incomingUserSlug]?.config.access?.admin\n\n    if (adminAccessFn) {\n      const canAccess = await adminAccessFn({ req })\n\n      if (!canAccess) {\n        throw new UnauthorizedError()\n      }\n      // Match the user collection to the global admin config\n    } else if (adminUserSlug !== incomingUserSlug) {\n      throw new UnauthorizedError()\n    }\n  } else {\n    const hasUsers = await req.payload.find({\n      collection: adminUserSlug,\n      depth: 0,\n      limit: 1,\n      pagination: false,\n    })\n\n    // If there are users, we should not allow access because of `/create-first-user`\n    if (hasUsers.docs.length) {\n      throw new UnauthorizedError()\n    }\n  }\n}\n"],"names":["UnauthorizedError","canAccessAdmin","req","incomingUserSlug","user","collection","adminUserSlug","payload","config","admin","adminAccessFn","collections","access","canAccess","hasUsers","find","depth","limit","pagination","docs","length"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ,iCAAgC;AAElE;;;;;;;CAOC,GACD,OAAO,MAAMC,iBAAiB,OAAO,EAAEC,GAAG,EAA2B;IACnE,MAAMC,mBAAmBD,IAAIE,IAAI,EAAEC;IACnC,MAAMC,gBAAgBJ,IAAIK,OAAO,CAACC,MAAM,CAACC,KAAK,CAACL,IAAI;IAEnD,IAAID,kBAAkB;QACpB,MAAMO,gBAAgBR,IAAIK,OAAO,CAACI,WAAW,CAACR,iBAAiB,EAAEK,OAAOI,QAAQH;QAEhF,IAAIC,eAAe;YACjB,MAAMG,YAAY,MAAMH,cAAc;gBAAER;YAAI;YAE5C,IAAI,CAACW,WAAW;gBACd,MAAM,IAAIb;YACZ;QACA,uDAAuD;QACzD,OAAO,IAAIM,kBAAkBH,kBAAkB;YAC7C,MAAM,IAAIH;QACZ;IACF,OAAO;QACL,MAAMc,WAAW,MAAMZ,IAAIK,OAAO,CAACQ,IAAI,CAAC;YACtCV,YAAYC;YACZU,OAAO;YACPC,OAAO;YACPC,YAAY;QACd;QAEA,iFAAiF;QACjF,IAAIJ,SAASK,IAAI,CAACC,MAAM,EAAE;YACxB,MAAM,IAAIpB;QACZ;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/utilities/canAccessAdmin.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\nimport { UnauthorizedError } from '../errors/UnauthorizedError.js'\n\n/**\n * Protects admin-only routes, server functions, etc.\n * The requesting user must either:\n * a. pass the `access.admin` function on the `users` collection, if defined\n * b. match the `config.admin.user` property on the Payload config\n * c. if no user is present, and there are no users in the system, allow access (for first user creation)\n * @throws {Error} Throws an `Unauthorized` error if access is denied that can be explicitly caught\n */\nexport const canAccessAdmin = async ({ req }: { req: PayloadRequest }) => {\n  const incomingUserSlug = req.user?.collection\n  const adminUserSlug = req.payload.config.admin.user\n\n  if (incomingUserSlug) {\n    const adminAccessFn = req.payload.collections[incomingUserSlug]?.config.access?.admin\n\n    if (adminAccessFn) {\n      const canAccess = await adminAccessFn({ slug: incomingUserSlug, req })\n\n      if (!canAccess) {\n        throw new UnauthorizedError()\n      }\n      // Match the user collection to the global admin config\n    } else if (adminUserSlug !== incomingUserSlug) {\n      throw new UnauthorizedError()\n    }\n  } else {\n    const hasUsers = await req.payload.find({\n      collection: adminUserSlug,\n      depth: 0,\n      limit: 1,\n      overrideAccess: true,\n      pagination: false,\n    })\n\n    // If there are users, we should not allow access because of `/create-first-user`\n    if (hasUsers.docs.length) {\n      throw new UnauthorizedError()\n    }\n  }\n}\n"],"names":["UnauthorizedError","canAccessAdmin","req","incomingUserSlug","user","collection","adminUserSlug","payload","config","admin","adminAccessFn","collections","access","canAccess","slug","hasUsers","find","depth","limit","overrideAccess","pagination","docs","length"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ,iCAAgC;AAElE;;;;;;;CAOC,GACD,OAAO,MAAMC,iBAAiB,OAAO,EAAEC,GAAG,EAA2B;IACnE,MAAMC,mBAAmBD,IAAIE,IAAI,EAAEC;IACnC,MAAMC,gBAAgBJ,IAAIK,OAAO,CAACC,MAAM,CAACC,KAAK,CAACL,IAAI;IAEnD,IAAID,kBAAkB;QACpB,MAAMO,gBAAgBR,IAAIK,OAAO,CAACI,WAAW,CAACR,iBAAiB,EAAEK,OAAOI,QAAQH;QAEhF,IAAIC,eAAe;YACjB,MAAMG,YAAY,MAAMH,cAAc;gBAAEI,MAAMX;gBAAkBD;YAAI;YAEpE,IAAI,CAACW,WAAW;gBACd,MAAM,IAAIb;YACZ;QACA,uDAAuD;QACzD,OAAO,IAAIM,kBAAkBH,kBAAkB;YAC7C,MAAM,IAAIH;QACZ;IACF,OAAO;QACL,MAAMe,WAAW,MAAMb,IAAIK,OAAO,CAACS,IAAI,CAAC;YACtCX,YAAYC;YACZW,OAAO;YACPC,OAAO;YACPC,gBAAgB;YAChBC,YAAY;QACd;QAEA,iFAAiF;QACjF,IAAIL,SAASM,IAAI,CAACC,MAAM,EAAE;YACxB,MAAM,IAAItB;QACZ;IACF;AACF,EAAC"}

package/dist/utilities/checkDocumentLockStatus.d.ts

@@ -7,7 +7,35 @@ type CheckDocumentLockStatusArgs = {
     lockErrorMessage?: string;
     overrideLock?: boolean;
     req: PayloadRequest;
+    shouldDeleteLock?: boolean;
 };
-export declare const checkDocumentLockStatus: ({ id, collectionSlug, globalSlug, lockDurationDefault, lockErrorMessage, overrideLock, req, }: CheckDocumentLockStatusArgs) => Promise<void>;
+export declare const checkDocumentLockStatus: ({ id, collectionSlug, globalSlug, lockDurationDefault, lockErrorMessage, overrideLock, req, shouldDeleteLock, }: 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>>;
+/**
+ * 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 {};
 //# 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,EAAE,MAAM,mBAAmB,CAAA;AAKnE,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"}
+{"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"}

package/dist/utilities/checkDocumentLockStatus.js

@@ -1,6 +1,7 @@
 import { Locked } from '../errors/index.js';
 import { lockedDocumentsCollectionSlug } from '../locked-documents/config.js';
-export const checkDocumentLockStatus = async ({ id, collectionSlug, globalSlug, lockDurationDefault = 300, lockErrorMessage, overrideLock = true, req })=>{
+import { markTransactionWrite } from './transactionMutationTracker.js';
+export const checkDocumentLockStatus = async ({ id, collectionSlug, globalSlug, lockDurationDefault = 300, lockErrorMessage, overrideLock = true, req, shouldDeleteLock = true })=>{
     const { payload } = req;
     // Check if the locked-documents collection exists
     if (!payload.collections?.[lockedDocumentsCollectionSlug]) {
@@ -46,6 +47,7 @@ export const checkDocumentLockStatus = async ({ id, collectionSlug, globalSlug,
             collection: lockedDocumentsCollectionSlug,
             limit: 1,
             pagination: false,
+            req: payload.db.name === 'mongoose' ? undefined : req,
             sort: '-updatedAt',
             where: lockedDocumentQuery
         });
@@ -63,6 +65,9 @@ export const checkDocumentLockStatus = async ({ id, collectionSlug, globalSlug,
             }
         }
     }
+    if (!shouldDeleteLock) {
+        return;
+    }
     // Perform the delete operation regardless of overrideLock status
     await payload.db.deleteMany({
         collection: lockedDocumentsCollectionSlug,
@@ -70,6 +75,108 @@ 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: [
+            {
+                'document.relationTo': {
+                    equals: collectionSlug
+                }
+            },
+            {
+                'document.value': {
+                    in: ids
+                }
+            }
+        ]
+    });
+const isLockingAvailable = (collectionSlug, req)=>{
+    const { payload } = req;
+    if (!payload.collections?.[lockedDocumentsCollectionSlug]) {
+        return false;
+    }
+    return payload.collections?.[collectionSlug]?.config?.lockDocuments !== false;
+};
+/**
+ * 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;
+    }
+    const { payload } = req;
+    const lockDocumentsProp = payload.collections?.[collectionSlug]?.config?.lockDocuments;
+    const lockedDocumentResult = await payload.db.find({
+        collection: lockedDocumentsCollectionSlug,
+        limit: 0,
+        pagination: false,
+        req: payload.db.name === 'mongoose' ? undefined : req,
+        sort: '-updatedAt',
+        where: buildBulkLockedDocumentQuery(collectionSlug, ids)
+    });
+    const lockDuration = typeof lockDocumentsProp === 'object' ? lockDocumentsProp.duration : lockDurationDefault;
+    const lockDurationInMilliseconds = lockDuration * 1000;
+    const currentUserId = req.user?.id;
+    const now = new Date().getTime();
+    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;
+        }
+        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);
+        }
+    }
+    return lockState;
+};
+export const getLockedDocumentIds = async (args)=>{
+    if (args.overrideLock ?? true) {
+        return new Set();
+    }
+    return (await getDocumentLockState(args)).lockedDocumentIDs;
+};
+/**
+ * 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 })=>{
+    const { payload } = req;
+    if (!ids.length || lockDocumentIDs && !lockDocumentIDs.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
+    });
 };
 
 //# sourceMappingURL=checkDocumentLockStatus.js.map

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 } 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"],"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"],"mappings":"AAIA,SAASA,MAAM,QAAQ,qBAAoB;AAC3C,SAASC,6BAA6B,QAAQ,gCAA+B;AAY7E,OAAO,MAAMC,0BAA0B,OAAO,EAC5CC,EAAE,EACFC,cAAc,EACdC,UAAU,EACVC,sBAAsB,GAAG,EACzBC,gBAAgB,EAChBC,eAAe,IAAI,EACnBC,GAAG,EACyB;IAC5B,MAAM,EAAEC,OAAO,EAAE,GAAGD;IAEpB,kDAAkD;IAClD,IAAI,CAACC,QAAQC,WAAW,EAAE,CAACV,8BAA8B,EAAE;QACzD,4DAA4D;QAC5D;IACF;IAEA,sEAAsE;IACtE,MAAMW,oBAAoBR,iBACtBM,QAAQC,WAAW,EAAE,CAACP,eAAe,EAAES,QAAQC,gBAC/CJ,QAAQG,MAAM,EAAEE,SAASC,KAAK,CAACC,IAAMA,EAAEC,IAAI,KAAKb,aAAaS;IAEjE,MAAMK,mBAAmBP,sBAAsB;IAE/C,IAAIQ,sBAAsB,CAAC;IAE3B,IAAIhB,gBAAgB;QAClBgB,sBAAsB;YACpBC,KAAK;gBACH;oBAAE,uBAAuB;wBAAEC,QAAQlB;oBAAe;gBAAE;gBACpD;oBAAE,kBAAkB;wBAAEkB,QAAQnB;oBAAG;gBAAE;aACpC;QACH;IACF,OAAO,IAAIE,YAAY;QACrBe,sBAAsB;YAAEf,YAAY;gBAAEiB,QAAQjB;YAAW;QAAE;IAC7D,OAAO;QACL,MAAM,IAAIkB,MAAM;IAClB;IAEA,IAAI,CAACJ,kBAAkB;QACrB;IACF;IAEA,2EAA2E;IAC3E,IAAI,CAACX,cAAc;QACjB,MAAMgB,0BAA0BpB,iBAC5B,CAAC,iBAAiB,EAAED,GAAG,4DAA4D,CAAC,GACpF,CAAC,2BAA2B,EAAEE,WAAW,6DAA6D,CAAC;QAE3G,MAAMoB,wBAAwBlB,oBAAoBiB;QAElD,MAAME,uBAA+D,MAAMhB,QAAQiB,EAAE,CAACX,IAAI,CAAC;YACzFY,YAAY3B;YACZ4B,OAAO;YACPC,YAAY;YACZC,MAAM;YACNC,OAAOZ;QACT;QAEA,sDAAsD;QACtD,MAAMa,YAAYP,sBAAsBQ,IAAI,CAAC,EAAE;QAC/C,IAAID,WAAW;YACb,MAAME,eAAe,IAAIC,KAAKH,WAAWI,WAAWC,OAAO;YAC3D,MAAMC,MAAM,IAAIH,OAAOE,OAAO;YAE9B,MAAME,eACJ,OAAO5B,sBAAsB,WAAWA,kBAAkB6B,QAAQ,GAAGnC;YAEvE,MAAMoC,6BAA6BF,eAAe;YAClD,MAAMG,gBAAgBlC,IAAImC,IAAI,EAAEzC;YAEhC,iEAAiE;YACjE,IACE8B,UAAUW,IAAI,EAAEC,UAAUF,iBAC1BJ,MAAMJ,gBAAgBO,4BACtB;gBACA,MAAM,IAAI1C,OAAOyB;YACnB;QACF;IACF;IAEA,iEAAiE;IACjE,MAAMf,QAAQiB,EAAE,CAACmB,UAAU,CAAC;QAC1BlB,YAAY3B;QACZ,oCAAoC;QACpCQ,KAAKC,QAAQiB,EAAE,CAACoB,IAAI,KAAK,aAAaC,YAAYvC;QAClDuB,OAAOZ;IACT;AACF,EAAC"}
+{"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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"}

package/dist/utilities/cloneValidationRequest.d.ts

@@ -0,0 +1,15 @@
+import type { RequestContext, User } from '../index.js';
+import type { PayloadRequest } from '../types/index.js';
+export declare function cloneValidationContext({ context, }: {
+    context: RequestContext | undefined;
+}): RequestContext | undefined;
+export declare function cloneValidationData<TData>({ data }: {
+    data: TData;
+}): TData;
+export declare function cloneValidationRequest({ request, }: {
+    request: Partial<PayloadRequest> | undefined;
+}): Partial<PayloadRequest>;
+export declare function cloneValidationUser({ user, }: {
+    user: null | undefined | User;
+}): null | undefined | User;
+//# sourceMappingURL=cloneValidationRequest.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cloneValidationRequest.d.ts","sourceRoot":"","sources":["../../src/utilities/cloneValidationRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAWvD,wBAAgB,sBAAsB,CAAC,EACrC,OAAO,GACR,EAAE;IACD,OAAO,EAAE,cAAc,GAAG,SAAS,CAAA;CACpC,GAAG,cAAc,GAAG,SAAS,CAE7B;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,GAAG,KAAK,CAE3E;AAED,wBAAgB,sBAAsB,CAAC,EACrC,OAAO,GACR,EAAE;IACD,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,SAAS,CAAA;CAC7C,GAAG,OAAO,CAAC,cAAc,CAAC,CAqD1B;AAED,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,GACL,EAAE;IACD,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,IAAI,CAAA;CAC9B,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CAE1B"}

package/dist/utilities/cloneValidationRequest.js

@@ -0,0 +1,153 @@
+const sharedValidationRequestProperties = new Set([
+    'i18n',
+    'payload',
+    'server',
+    'signal',
+    't',
+    'transactionID'
+]);
+export function cloneValidationContext({ context }) {
+    return cloneValidationValue(context);
+}
+export function cloneValidationData({ data }) {
+    return cloneValidationValue(data);
+}
+export function cloneValidationRequest({ request }) {
+    if (!request) {
+        return {};
+    }
+    const payloadRequest = request;
+    const fetchRequest = typeof Request !== 'undefined' && request instanceof Request ? request : undefined;
+    const canCloneFetchRequest = fetchRequest && !fetchRequest.bodyUsed;
+    let clonedRequest;
+    if (canCloneFetchRequest) {
+        clonedRequest = fetchRequest.clone();
+    } else {
+        clonedRequest = {};
+    }
+    for (const [key, value] of Object.entries(payloadRequest)){
+        if (key === 'payloadDataLoader') {
+            continue;
+        }
+        if (key === 'file') {
+            clonedRequest.file = cloneValidationFile(payloadRequest.file);
+            continue;
+        }
+        if (key === 'files') {
+            clonedRequest.files = cloneValidationFiles(payloadRequest.files);
+            continue;
+        }
+        clonedRequest[key] = sharedValidationRequestProperties.has(key) ? value : cloneValidationValue(value);
+    }
+    Object.assign(clonedRequest, {
+        context: cloneValidationValue(payloadRequest.context ?? {}),
+        query: cloneValidationValue(payloadRequest.query ?? {}),
+        routeParams: cloneValidationValue(payloadRequest.routeParams ?? {})
+    });
+    if (!canCloneFetchRequest) {
+        Object.assign(clonedRequest, {
+            headers: cloneValidationValue(payloadRequest.headers),
+            method: payloadRequest.method,
+            signal: payloadRequest.signal,
+            url: payloadRequest.url
+        });
+    }
+    return clonedRequest;
+}
+export function cloneValidationUser({ user }) {
+    return cloneValidationValue(user);
+}
+function cloneValidationFile(file) {
+    if (!file) {
+        return file;
+    }
+    const { data, ...metadata } = file;
+    return {
+        ...cloneValidationValue(metadata),
+        data
+    };
+}
+function cloneValidationFiles(files) {
+    if (!files) {
+        return files;
+    }
+    return Object.fromEntries(Object.entries(files).map(([fieldName, fileOrFiles])=>[
+            fieldName,
+            Array.isArray(fileOrFiles) ? fileOrFiles.map((file)=>cloneValidationFile(file)) : cloneValidationFile(fileOrFiles)
+        ]));
+}
+function cloneValidationValue(value, cache = new WeakMap()) {
+    if (typeof value !== 'object' && typeof value !== 'function' || value === null) {
+        return value;
+    }
+    if (typeof value === 'function' || value instanceof Promise) {
+        return value;
+    }
+    const objectValue = value;
+    const cachedValue = cache.get(objectValue);
+    if (cachedValue) {
+        return cachedValue;
+    }
+    if (value instanceof Headers) {
+        return new Headers(value);
+    }
+    if (value instanceof URLSearchParams) {
+        return new URLSearchParams(value);
+    }
+    if (value instanceof URL) {
+        return new URL(value);
+    }
+    if (value instanceof Date) {
+        return new Date(value);
+    }
+    if (value instanceof RegExp) {
+        return new RegExp(value.source, value.flags);
+    }
+    if (value instanceof ArrayBuffer) {
+        return value.slice(0);
+    }
+    if (ArrayBuffer.isView(value)) {
+        if (Buffer.isBuffer(value)) {
+            return Buffer.from(value);
+        }
+        if (value instanceof DataView) {
+            return new DataView(value.buffer.slice(0), value.byteOffset, value.byteLength);
+        }
+        return new value.constructor(value);
+    }
+    if (value instanceof Map) {
+        const clonedMap = new Map();
+        cache.set(objectValue, clonedMap);
+        for (const [key, mapValue] of value){
+            clonedMap.set(cloneValidationValue(key, cache), cloneValidationValue(mapValue, cache));
+        }
+        return clonedMap;
+    }
+    if (value instanceof Set) {
+        const clonedSet = new Set();
+        cache.set(objectValue, clonedSet);
+        for (const setValue of value){
+            clonedSet.add(cloneValidationValue(setValue, cache));
+        }
+        return clonedSet;
+    }
+    if (typeof Blob !== 'undefined' && value instanceof Blob) {
+        return value;
+    }
+    const prototype = Object.getPrototypeOf(value);
+    if (!Array.isArray(value) && prototype !== Object.prototype && prototype !== null) {
+        return value;
+    }
+    const clonedValue = Array.isArray(value) ? [] : Object.create(prototype);
+    cache.set(objectValue, clonedValue);
+    for (const key of Reflect.ownKeys(value)){
+        const descriptor = Object.getOwnPropertyDescriptor(value, key);
+        if (descriptor?.enumerable) {
+            ;
+            clonedValue[key] = cloneValidationValue(value[key], cache);
+        }
+    }
+    return clonedValue;
+}
+
+//# sourceMappingURL=cloneValidationRequest.js.map

package/dist/utilities/cloneValidationRequest.js.map

@@ -0,0 +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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"}

package/dist/utilities/commitTransaction.d.ts

@@ -1,5 +1,9 @@
 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;AAEvD;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,GACpD,OAAO,CAAC,IAAI,CAAC,CAKf"}
+{"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"}

package/dist/utilities/commitTransaction.js

@@ -1,9 +1,53 @@
+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;
-    await payload.db.commitTransaction(transactionID);
+    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;
+    }
     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\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}\n"],"names":["commitTransaction","req","payload","transactionID","db"],"mappings":"AAIA;;CAEC,GACD,OAAO,eAAeA,kBACpBC,GAAqD;IAErD,MAAM,EAAEC,OAAO,EAAEC,aAAa,EAAE,GAAGF;IAEnC,MAAMC,QAAQE,EAAE,CAACJ,iBAAiB,CAACG;IACnC,OAAOF,IAAIE,aAAa;AAC1B"}
+{"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"}