@payloadcms/plugin-cloud-storage 4.0.0-internal.e7d4ebc → 4.0.0-internal.ea6e8f8

package/dist/hooks/afterChange.js

@@ -1,27 +1,112 @@
+import { deepMergeWithSourceArrays, MAIN_BRANCH, scheduleAfterTransactionCommit } from 'payload';
+import { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js';
+import { buildStoragePathData, buildUploadStoragePathData } from '../utilities/buildStoragePathData.js';
 import { getIncomingFiles } from '../utilities/getIncomingFiles.js';
-export const getAfterChangeHook = ({ adapter, collection })=>async ({ doc, operation, previousDoc, req })=>{
+import { appendProxyPrefix } from './afterRead.js';
+// The object's folder: semantic prefix + `_objectKey` segment.
+const getObjectFolder = (data)=>{
+    const record = data ?? {};
+    return buildPrefixWithObjectKey({
+        objectKey: record._objectKey,
+        prefix: record.prefix
+    });
+};
+export const getAfterChangeHook = ({ adapter, collection, collectionPrefix, disablePayloadAccessControl, hasCustomFileURL, useCompositePrefixes })=>async ({ data, doc, operation, previousDoc, req, select })=>{
         // Skip if this is an internal update to prevent infinite loop
         if (req.context?.skipCloudStorage) {
             return doc;
         }
-        const isDraftSave = doc._status === 'draft';
+        // Restore upload metadata removed by select, including partially selected image sizes.
+        const uploadData = select ? deepMergeWithSourceArrays(data, doc) : doc;
+        const withProxyPrefix = (upload)=>{
+            const { prefix } = upload;
+            if (disablePayloadAccessControl || hasCustomFileURL || !useCompositePrefixes || !prefix) {
+                return upload;
+            }
+            return {
+                ...upload,
+                ...upload.url && {
+                    url: appendProxyPrefix({
+                        prefix,
+                        url: upload.url
+                    })
+                },
+                ...upload.original?.url && {
+                    original: {
+                        ...upload.original,
+                        url: appendProxyPrefix({
+                            prefix,
+                            url: upload.original.url
+                        })
+                    }
+                }
+            };
+        };
+        const isDraftSave = uploadData._status === 'draft';
         const isDraftOverPublished = isDraftSave && previousDoc?._status === 'published';
+        if (req.context?._payloadManagedCloudStorage) {
+            const metadata = req.context._payloadManagedCloudMetadata;
+            if (!metadata || Object.keys(metadata).length === 0) {
+                return withProxyPrefix(doc);
+            }
+            req.context.skipCloudStorage = true;
+            req.file = undefined;
+            req.payloadUploadSizes = undefined;
+            const originalQuery = req.query;
+            req.query = {
+                ...req.query
+            };
+            delete req.query.uploadEdits;
+            try {
+                const updatedDoc = await req.payload.update({
+                    id: doc.id,
+                    collection: collection.slug,
+                    data: metadata,
+                    depth: 0,
+                    draft: isDraftSave,
+                    overrideAccess: true,
+                    req,
+                    select
+                });
+                return withProxyPrefix({
+                    ...doc,
+                    ...updatedDoc
+                });
+            } finally{
+                req.query = originalQuery;
+                delete req.context.skipCloudStorage;
+            }
+        }
         try {
             const files = getIncomingFiles({
-                data: doc,
+                data: uploadData,
                 req
             });
             if (files.length > 0) {
+                // Fold `_objectKey` so generated sizes land in the same folder as the original.
+                const dataForUpload = {
+                    ...uploadData,
+                    prefix: getObjectFolder(uploadData)
+                };
                 const uploadResults = await Promise.all(files.filter((file)=>!file.uploadReference).map((file)=>adapter.handleUpload({
                         collection,
-                        data: doc,
+                        data: dataForUpload,
                         file,
-                        req
+                        req,
+                        storageFilePath: buildUploadStoragePathData({
+                            collectionPrefix,
+                            docPrefix: dataForUpload.prefix,
+                            filename: file.filename,
+                            useCompositePrefixes
+                        }).storageFilePath
                     })));
                 const uploadMetadata = uploadResults.filter((result)=>result != null && typeof result === 'object').reduce((acc, metadata)=>({
                         ...acc,
                         ...metadata
                     }), {});
+                // Adapters may echo `data` back as metadata; keep the document's own `prefix`/`_objectKey`.
+                delete uploadMetadata.prefix;
+                delete uploadMetadata._objectKey;
                 let docWithMetadata = doc;
                 if (Object.keys(uploadMetadata).length > 0) {
                     if (!req.context) {
@@ -32,59 +117,126 @@ export const getAfterChangeHook = ({ adapter, collection })=>async ({ doc, opera
                     req.file = undefined;
                     req.payloadUploadSizes = undefined;
                     try {
-                        await req.payload.update({
+                        const updatedDoc = await req.payload.update({
                             id: doc.id,
                             collection: collection.slug,
                             data: uploadMetadata,
                             depth: 0,
                             draft: isDraftSave,
-                            req
+                            overrideAccess: true,
+                            req,
+                            select
                         });
+                        // Persist all adapter metadata, but do not add unselected fields to the response.
+                        docWithMetadata = select ? {
+                            ...doc,
+                            ...updatedDoc
+                        } : {
+                            ...doc,
+                            ...uploadMetadata
+                        };
                     } finally{
                         delete req.context.skipCloudStorage;
                     }
-                    docWithMetadata = {
-                        ...doc,
-                        ...uploadMetadata
-                    };
                 }
                 // Delete previous files only after the new upload and metadata
                 // persistence have succeeded. Deleting earlier would orphan the
                 // record if a later step throws (e.g. a user-defined afterChange
                 // hook on the same collection).
-                if (previousDoc && operation === 'update' && !isDraftOverPublished) {
+                if (previousDoc && operation === 'update' && !isDraftOverPublished && !collection.versions && !previousDoc.original) {
                     let filesToDelete = [];
                     if (typeof previousDoc?.filename === 'string') {
                         filesToDelete.push(previousDoc.filename);
                     }
-                    if (typeof previousDoc.sizes === 'object') {
-                        filesToDelete = filesToDelete.concat(Object.values(previousDoc?.sizes || []).map((resizedFileData)=>resizedFileData?.filename));
+                    if (typeof previousDoc.variants === 'object') {
+                        filesToDelete = filesToDelete.concat(Object.values(previousDoc?.variants || []).map((resizedFileData)=>resizedFileData?.filename));
                     }
-                    // Collect new filenames (main + sizes) so we don't delete a
-                    // file that the new upload reused (e.g. same filename on reupload
-                    // where Payload overwrites in place).
+                    // Compare full locations: a replacement can reuse a filename while moving
+                    // a legacy object beneath the collection prefix.
+                    const newFileData = {
+                        ...uploadData,
+                        ...uploadMetadata
+                    };
                     const newFilenames = new Set();
-                    if (typeof docWithMetadata.filename === 'string') {
-                        newFilenames.add(docWithMetadata.filename);
+                    if (typeof newFileData.filename === 'string') {
+                        newFilenames.add(newFileData.filename);
                     }
-                    if (typeof docWithMetadata.sizes === 'object') {
-                        for (const size of Object.values(docWithMetadata.sizes || {})){
+                    if (typeof newFileData.variants === 'object') {
+                        for (const size of Object.values(newFileData.variants || {})){
                             if (size?.filename && typeof size.filename === 'string') {
                                 newFilenames.add(size.filename);
                             }
                         }
                     }
-                    const deletionPromises = filesToDelete.map(async (filename)=>{
-                        if (filename && !newFilenames.has(filename)) {
-                            await adapter.handleDelete({
-                                collection,
-                                doc: previousDoc,
-                                filename,
-                                req
-                            });
+                    const resolveKey = ({ data, filename })=>buildStoragePathData({
+                            collectionPrefix,
+                            docPrefix: getObjectFolder(data),
+                            filename,
+                            useCompositePrefixes
+                        }).storageFilePath;
+                    const newKeys = new Set([
+                        ...newFilenames
+                    ].map((filename)=>resolveKey({
+                            data: newFileData,
+                            filename
+                        })));
+                    const branchDocumentID = getBranchDocumentID(previousDoc);
+                    if (branchDocumentID !== undefined) {
+                        const retainedMainDocument = await req.payload.db.findOne({
+                            branch: false,
+                            collection: collection.slug,
+                            req,
+                            where: {
+                                and: [
+                                    {
+                                        _branch: {
+                                            equals: MAIN_BRANCH
+                                        }
+                                    },
+                                    {
+                                        id: {
+                                            equals: branchDocumentID
+                                        }
+                                    }
+                                ]
+                            }
+                        });
+                        if (retainedMainDocument) {
+                            for (const filename of getDocumentFilenames(retainedMainDocument)){
+                                newKeys.add(resolveKey({
+                                    data: retainedMainDocument,
+                                    filename
+                                }));
+                            }
                         }
+                    }
+                    const deletionTargets = filesToDelete.flatMap((filename)=>{
+                        if (!filename) {
+                            return [];
+                        }
+                        const storageFilePath = resolveKey({
+                            data: previousDoc,
+                            filename
+                        });
+                        return newKeys.has(storageFilePath) ? [] : [
+                            {
+                                filename,
+                                storageFilePath
+                            }
+                        ];
+                    });
+                    await scheduleAfterTransactionCommit({
+                        callback: async ()=>{
+                            await Promise.all(deletionTargets.map(({ filename, storageFilePath })=>adapter.handleDelete({
+                                    collection,
+                                    doc: previousDoc,
+                                    filename,
+                                    req,
+                                    storageFilePath
+                                })));
+                        },
+                        req
                     });
-                    await Promise.all(deletionPromises);
                 }
                 if (docWithMetadata !== doc) {
                     return docWithMetadata;
@@ -99,5 +251,30 @@ export const getAfterChangeHook = ({ adapter, collection })=>async ({ doc, opera
         }
         return doc;
     };
+const getBranchDocumentID = (doc)=>{
+    if (!doc || typeof doc !== 'object' || Array.isArray(doc)) {
+        return undefined;
+    }
+    const branchDocument = doc;
+    if (branchDocument._branch === MAIN_BRANCH) {
+        return undefined;
+    }
+    const relation = branchDocument._branchDocID;
+    const value = relation && typeof relation === 'object' && !Array.isArray(relation) && 'value' in relation ? relation.value : relation;
+    return typeof value === 'number' || typeof value === 'string' ? value : undefined;
+};
+const getDocumentFilenames = (doc)=>{
+    const filenames = typeof doc.filename === 'string' ? [
+        doc.filename
+    ] : [];
+    if (doc.variants && typeof doc.variants === 'object' && !Array.isArray(doc.variants)) {
+        for (const variant of Object.values(doc.variants)){
+            if (variant && typeof variant === 'object' && !Array.isArray(variant) && 'filename' in variant && typeof variant.filename === 'string') {
+                filenames.push(variant.filename);
+            }
+        }
+    }
+    return filenames;
+};
 
 //# sourceMappingURL=afterChange.js.map

package/dist/hooks/afterChange.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/afterChange.ts"],"sourcesContent":["import type { CollectionAfterChangeHook, CollectionConfig, FileData, TypeWithID } from 'payload'\n\nimport type { GeneratedAdapter } from '../types.js'\n\nimport { getIncomingFiles } from '../utilities/getIncomingFiles.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n}\n\nexport const getAfterChangeHook =\n  ({ adapter, collection }: Args): CollectionAfterChangeHook<FileData & TypeWithID> =>\n  async ({ doc, operation, previousDoc, req }) => {\n    // Skip if this is an internal update to prevent infinite loop\n    if (req.context?.skipCloudStorage) {\n      return doc\n    }\n\n    const isDraftSave = (doc as { _status?: string })._status === 'draft'\n    const isDraftOverPublished =\n      isDraftSave && (previousDoc as { _status?: string } | undefined)?._status === 'published'\n\n    try {\n      const files = getIncomingFiles({ data: doc, req })\n\n      if (files.length > 0) {\n        const uploadResults = await Promise.all(\n          files\n            .filter((file) => !file.uploadReference)\n            .map((file) =>\n              adapter.handleUpload({\n                collection,\n                data: doc,\n                file,\n                req,\n              }),\n            ),\n        )\n\n        const uploadMetadata = uploadResults\n          .filter(\n            (result): result is Partial<FileData & TypeWithID> =>\n              result != null && typeof result === 'object',\n          )\n          .reduce(\n            (acc, metadata) => ({ ...acc, ...metadata }),\n            {} as Partial<FileData & TypeWithID>,\n          )\n\n        let docWithMetadata = doc\n\n        if (Object.keys(uploadMetadata).length > 0) {\n          if (!req.context) {\n            req.context = {}\n          }\n          req.context.skipCloudStorage = true\n\n          // Clear to prevent re-processing\n          req.file = undefined\n          req.payloadUploadSizes = undefined\n\n          try {\n            await req.payload.update({\n              id: doc.id,\n              collection: collection.slug,\n              data: uploadMetadata,\n              depth: 0,\n              draft: isDraftSave,\n              req,\n            })\n          } finally {\n            delete req.context.skipCloudStorage\n          }\n\n          docWithMetadata = { ...doc, ...uploadMetadata }\n        }\n\n        // Delete previous files only after the new upload and metadata\n        // persistence have succeeded. Deleting earlier would orphan the\n        // record if a later step throws (e.g. a user-defined afterChange\n        // hook on the same collection).\n        if (previousDoc && operation === 'update' && !isDraftOverPublished) {\n          let filesToDelete: string[] = []\n\n          if (typeof previousDoc?.filename === 'string') {\n            filesToDelete.push(previousDoc.filename)\n          }\n\n          if (typeof previousDoc.sizes === 'object') {\n            filesToDelete = filesToDelete.concat(\n              Object.values(previousDoc?.sizes || []).map(\n                (resizedFileData) => resizedFileData?.filename as string,\n              ),\n            )\n          }\n\n          // Collect new filenames (main + sizes) so we don't delete a\n          // file that the new upload reused (e.g. same filename on reupload\n          // where Payload overwrites in place).\n          const newFilenames = new Set<string>()\n          if (typeof docWithMetadata.filename === 'string') {\n            newFilenames.add(docWithMetadata.filename)\n          }\n          if (typeof docWithMetadata.sizes === 'object') {\n            for (const size of Object.values(docWithMetadata.sizes || {})) {\n              if (size?.filename && typeof size.filename === 'string') {\n                newFilenames.add(size.filename)\n              }\n            }\n          }\n\n          const deletionPromises = filesToDelete.map(async (filename) => {\n            if (filename && !newFilenames.has(filename)) {\n              await adapter.handleDelete({ collection, doc: previousDoc, filename, req })\n            }\n          })\n\n          await Promise.all(deletionPromises)\n        }\n\n        if (docWithMetadata !== doc) {\n          return docWithMetadata\n        }\n      }\n    } catch (err: unknown) {\n      req.payload.logger.error(\n        `There was an error while uploading files corresponding to the collection ${collection.slug} with filename ${doc.filename}:`,\n      )\n      req.payload.logger.error({ err })\n      throw err\n    }\n    return doc\n  }\n"],"names":["getIncomingFiles","getAfterChangeHook","adapter","collection","doc","operation","previousDoc","req","context","skipCloudStorage","isDraftSave","_status","isDraftOverPublished","files","data","length","uploadResults","Promise","all","filter","file","uploadReference","map","handleUpload","uploadMetadata","result","reduce","acc","metadata","docWithMetadata","Object","keys","undefined","payloadUploadSizes","payload","update","id","slug","depth","draft","filesToDelete","filename","push","sizes","concat","values","resizedFileData","newFilenames","Set","add","size","deletionPromises","has","handleDelete","err","logger","error"],"mappings":"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"}
+{"version":3,"sources":["../../src/hooks/afterChange.ts"],"sourcesContent":["import type { CollectionAfterChangeHook, CollectionConfig, FileData, TypeWithID } from 'payload'\n\nimport { deepMergeWithSourceArrays, MAIN_BRANCH, scheduleAfterTransactionCommit } from 'payload'\n\nimport type { GeneratedAdapter } from '../types.js'\n\nimport { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js'\nimport {\n  buildStoragePathData,\n  buildUploadStoragePathData,\n} from '../utilities/buildStoragePathData.js'\nimport { getIncomingFiles } from '../utilities/getIncomingFiles.js'\nimport { appendProxyPrefix } from './afterRead.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  collectionPrefix?: string\n  disablePayloadAccessControl?: boolean\n  hasCustomFileURL?: boolean\n  useCompositePrefixes?: boolean\n}\n\n// The object's folder: semantic prefix + `_objectKey` segment.\nconst getObjectFolder = (data: unknown): string => {\n  const record = (data ?? {}) as { _objectKey?: string; prefix?: string }\n  return buildPrefixWithObjectKey({ objectKey: record._objectKey, prefix: record.prefix })\n}\n\nexport const getAfterChangeHook =\n  ({\n    adapter,\n    collection,\n    collectionPrefix,\n    disablePayloadAccessControl,\n    hasCustomFileURL,\n    useCompositePrefixes,\n  }: Args): CollectionAfterChangeHook<FileData & TypeWithID> =>\n  async ({ data, doc, operation, previousDoc, req, select }) => {\n    // Skip if this is an internal update to prevent infinite loop\n    if (req.context?.skipCloudStorage) {\n      return doc\n    }\n\n    // Restore upload metadata removed by select, including partially selected image sizes.\n    const uploadData = select ? deepMergeWithSourceArrays<FileData & TypeWithID>(data, doc) : doc\n    const withProxyPrefix = (upload: FileData & TypeWithID): FileData & TypeWithID => {\n      const { prefix } = upload as { prefix?: string } & FileData & TypeWithID\n\n      if (disablePayloadAccessControl || hasCustomFileURL || !useCompositePrefixes || !prefix) {\n        return upload\n      }\n\n      return {\n        ...upload,\n        ...(upload.url && {\n          url: appendProxyPrefix({ prefix, url: upload.url }),\n        }),\n        ...(upload.original?.url && {\n          original: {\n            ...upload.original,\n            url: appendProxyPrefix({ prefix, url: upload.original.url }),\n          },\n        }),\n      }\n    }\n    const isDraftSave = (uploadData as { _status?: string })._status === 'draft'\n    const isDraftOverPublished =\n      isDraftSave && (previousDoc as { _status?: string } | undefined)?._status === 'published'\n\n    if (req.context?._payloadManagedCloudStorage) {\n      const metadata = req.context._payloadManagedCloudMetadata as\n        | Partial<FileData & TypeWithID>\n        | undefined\n\n      if (!metadata || Object.keys(metadata).length === 0) {\n        return withProxyPrefix(doc)\n      }\n\n      req.context.skipCloudStorage = true\n      req.file = undefined\n      req.payloadUploadSizes = undefined\n      const originalQuery = req.query\n      req.query = { ...req.query }\n      delete req.query.uploadEdits\n\n      try {\n        const updatedDoc = await req.payload.update({\n          id: doc.id,\n          collection: collection.slug,\n          data: metadata,\n          depth: 0,\n          draft: isDraftSave,\n          overrideAccess: true,\n          req,\n          select,\n        })\n\n        return withProxyPrefix({ ...doc, ...updatedDoc })\n      } finally {\n        req.query = originalQuery\n        delete req.context.skipCloudStorage\n      }\n    }\n\n    try {\n      const files = getIncomingFiles({ data: uploadData, req })\n\n      if (files.length > 0) {\n        // Fold `_objectKey` so generated sizes land in the same folder as the original.\n        const dataForUpload = { ...uploadData, prefix: getObjectFolder(uploadData) }\n\n        const uploadResults = await Promise.all(\n          files\n            .filter((file) => !file.uploadReference)\n            .map((file) =>\n              adapter.handleUpload({\n                collection,\n                data: dataForUpload,\n                file,\n                req,\n                storageFilePath: buildUploadStoragePathData({\n                  collectionPrefix,\n                  docPrefix: dataForUpload.prefix,\n                  filename: file.filename,\n                  useCompositePrefixes,\n                }).storageFilePath,\n              }),\n            ),\n        )\n\n        const uploadMetadata = uploadResults\n          .filter(\n            (result): result is Partial<FileData & TypeWithID> =>\n              result != null && typeof result === 'object',\n          )\n          .reduce(\n            (acc, metadata) => ({ ...acc, ...metadata }),\n            {} as Partial<FileData & TypeWithID>,\n          )\n\n        // Adapters may echo `data` back as metadata; keep the document's own `prefix`/`_objectKey`.\n        delete (uploadMetadata as Record<string, unknown>).prefix\n        delete (uploadMetadata as Record<string, unknown>)._objectKey\n\n        let docWithMetadata = doc\n\n        if (Object.keys(uploadMetadata).length > 0) {\n          if (!req.context) {\n            req.context = {}\n          }\n          req.context.skipCloudStorage = true\n\n          // Clear to prevent re-processing\n          req.file = undefined\n          req.payloadUploadSizes = undefined\n\n          try {\n            const updatedDoc = await req.payload.update({\n              id: doc.id,\n              collection: collection.slug,\n              data: uploadMetadata,\n              depth: 0,\n              draft: isDraftSave,\n              overrideAccess: true,\n              req,\n              select,\n            })\n\n            // Persist all adapter metadata, but do not add unselected fields to the response.\n            docWithMetadata = select ? { ...doc, ...updatedDoc } : { ...doc, ...uploadMetadata }\n          } finally {\n            delete req.context.skipCloudStorage\n          }\n        }\n\n        // Delete previous files only after the new upload and metadata\n        // persistence have succeeded. Deleting earlier would orphan the\n        // record if a later step throws (e.g. a user-defined afterChange\n        // hook on the same collection).\n        if (\n          previousDoc &&\n          operation === 'update' &&\n          !isDraftOverPublished &&\n          !collection.versions &&\n          !previousDoc.original\n        ) {\n          let filesToDelete: string[] = []\n\n          if (typeof previousDoc?.filename === 'string') {\n            filesToDelete.push(previousDoc.filename)\n          }\n\n          if (typeof previousDoc.variants === 'object') {\n            filesToDelete = filesToDelete.concat(\n              Object.values(previousDoc?.variants || []).map(\n                (resizedFileData) => resizedFileData?.filename as string,\n              ),\n            )\n          }\n\n          // Compare full locations: a replacement can reuse a filename while moving\n          // a legacy object beneath the collection prefix.\n          const newFileData = { ...uploadData, ...uploadMetadata }\n          const newFilenames = new Set<string>()\n          if (typeof newFileData.filename === 'string') {\n            newFilenames.add(newFileData.filename)\n          }\n          if (typeof newFileData.variants === 'object') {\n            for (const size of Object.values(newFileData.variants || {})) {\n              if (size?.filename && typeof size.filename === 'string') {\n                newFilenames.add(size.filename)\n              }\n            }\n          }\n\n          const resolveKey = ({\n            data,\n            filename,\n          }: {\n            data: { _objectKey?: string; prefix?: string }\n            filename: string\n          }) =>\n            buildStoragePathData({\n              collectionPrefix,\n              docPrefix: getObjectFolder(data),\n              filename,\n              useCompositePrefixes,\n            }).storageFilePath\n          const newKeys = new Set(\n            [...newFilenames].map((filename) =>\n              resolveKey({\n                data: newFileData as { _objectKey?: string; prefix?: string },\n                filename,\n              }),\n            ),\n          )\n          const branchDocumentID = getBranchDocumentID(previousDoc)\n\n          if (branchDocumentID !== undefined) {\n            const retainedMainDocument = (await req.payload.db.findOne({\n              branch: false,\n              collection: collection.slug,\n              req,\n              where: {\n                and: [{ _branch: { equals: MAIN_BRANCH } }, { id: { equals: branchDocumentID } }],\n              },\n            })) as null | Record<string, unknown>\n\n            if (retainedMainDocument) {\n              for (const filename of getDocumentFilenames(retainedMainDocument)) {\n                newKeys.add(\n                  resolveKey({\n                    data: retainedMainDocument as { _objectKey?: string; prefix?: string },\n                    filename,\n                  }),\n                )\n              }\n            }\n          }\n\n          const deletionTargets = filesToDelete.flatMap((filename) => {\n            if (!filename) {\n              return []\n            }\n            const storageFilePath = resolveKey({\n              data: previousDoc as { _objectKey?: string; prefix?: string },\n              filename,\n            })\n            return newKeys.has(storageFilePath) ? [] : [{ filename, storageFilePath }]\n          })\n\n          await scheduleAfterTransactionCommit({\n            callback: async () => {\n              await Promise.all(\n                deletionTargets.map(({ filename, storageFilePath }) =>\n                  adapter.handleDelete({\n                    collection,\n                    doc: previousDoc,\n                    filename,\n                    req,\n                    storageFilePath,\n                  }),\n                ),\n              )\n            },\n            req,\n          })\n        }\n\n        if (docWithMetadata !== doc) {\n          return docWithMetadata\n        }\n      }\n    } catch (err: unknown) {\n      req.payload.logger.error(\n        `There was an error while uploading files corresponding to the collection ${collection.slug} with filename ${doc.filename}:`,\n      )\n      req.payload.logger.error({ err })\n      throw err\n    }\n    return doc\n  }\n\nconst getBranchDocumentID = (doc: unknown): number | string | undefined => {\n  if (!doc || typeof doc !== 'object' || Array.isArray(doc)) {\n    return undefined\n  }\n\n  const branchDocument = doc as Record<string, unknown>\n\n  if (branchDocument._branch === MAIN_BRANCH) {\n    return undefined\n  }\n\n  const relation = branchDocument._branchDocID\n  const value =\n    relation && typeof relation === 'object' && !Array.isArray(relation) && 'value' in relation\n      ? relation.value\n      : relation\n\n  return typeof value === 'number' || typeof value === 'string' ? value : undefined\n}\n\nconst getDocumentFilenames = (doc: Record<string, unknown>): string[] => {\n  const filenames = typeof doc.filename === 'string' ? [doc.filename] : []\n\n  if (doc.variants && typeof doc.variants === 'object' && !Array.isArray(doc.variants)) {\n    for (const variant of Object.values(doc.variants)) {\n      if (\n        variant &&\n        typeof variant === 'object' &&\n        !Array.isArray(variant) &&\n        'filename' in variant &&\n        typeof variant.filename === 'string'\n      ) {\n        filenames.push(variant.filename)\n      }\n    }\n  }\n\n  return filenames\n}\n"],"names":["deepMergeWithSourceArrays","MAIN_BRANCH","scheduleAfterTransactionCommit","buildPrefixWithObjectKey","buildStoragePathData","buildUploadStoragePathData","getIncomingFiles","appendProxyPrefix","getObjectFolder","data","record","objectKey","_objectKey","prefix","getAfterChangeHook","adapter","collection","collectionPrefix","disablePayloadAccessControl","hasCustomFileURL","useCompositePrefixes","doc","operation","previousDoc","req","select","context","skipCloudStorage","uploadData","withProxyPrefix","upload","url","original","isDraftSave","_status","isDraftOverPublished","_payloadManagedCloudStorage","metadata","_payloadManagedCloudMetadata","Object","keys","length","file","undefined","payloadUploadSizes","originalQuery","query","uploadEdits","updatedDoc","payload","update","id","slug","depth","draft","overrideAccess","files","dataForUpload","uploadResults","Promise","all","filter","uploadReference","map","handleUpload","storageFilePath","docPrefix","filename","uploadMetadata","result","reduce","acc","docWithMetadata","versions","filesToDelete","push","variants","concat","values","resizedFileData","newFileData","newFilenames","Set","add","size","resolveKey","newKeys","branchDocumentID","getBranchDocumentID","retainedMainDocument","db","findOne","branch","where","and","_branch","equals","getDocumentFilenames","deletionTargets","flatMap","has","callback","handleDelete","err","logger","error","Array","isArray","branchDocument","relation","_branchDocID","value","filenames","variant"],"mappings":"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"}

package/dist/hooks/afterDelete.d.ts

@@ -1,9 +1,17 @@
-import type { CollectionAfterDeleteHook, CollectionConfig, FileData, TypeWithID } from 'payload';
+import type { CollectionAfterDeleteHook, CollectionConfig, FileData, PayloadRequest, TypeWithID } from 'payload';
 import type { GeneratedAdapter, TypeWithPrefix } from '../types.js';
 interface Args {
     adapter: GeneratedAdapter;
     collection: CollectionConfig;
+    collectionPrefix?: string;
+    useCompositePrefixes?: boolean;
 }
-export declare const getAfterDeleteHook: ({ adapter, collection, }: Args) => CollectionAfterDeleteHook<FileData & TypeWithID & TypeWithPrefix>;
+export declare const getAfterDeleteHook: ({ adapter, collection, collectionPrefix, useCompositePrefixes, }: Args) => CollectionAfterDeleteHook<FileData & TypeWithID & TypeWithPrefix>;
+export declare const getDeleteFiles: ({ adapter, collection, collectionPrefix, useCompositePrefixes }: Args) => ({ onError, req, retainedDoc, sourceDoc, }: {
+    onError?: (error: unknown) => void;
+    req: PayloadRequest;
+    retainedDoc?: null | object;
+    sourceDoc: object;
+}) => Promise<void>;
 export {};
 //# sourceMappingURL=afterDelete.d.ts.map

package/dist/hooks/afterDelete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"afterDelete.d.ts","sourceRoot":"","sources":["../../src/hooks/afterDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEhG,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEnE,UAAU,IAAI;IACZ,OAAO,EAAE,gBAAgB,CAAA;IACzB,UAAU,EAAE,gBAAgB,CAAA;CAC7B;AAED,eAAO,MAAM,kBAAkB,6BAG5B,IAAI,KAAG,yBAAyB,CAAC,QAAQ,GAAG,UAAU,GAAG,cAAc,CAyBzE,CAAA"}
+{"version":3,"file":"afterDelete.d.ts","sourceRoot":"","sources":["../../src/hooks/afterDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,gBAAgB,EAChB,QAAQ,EACR,cAAc,EACd,UAAU,EACX,MAAM,SAAS,CAAA;AAShB,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAKnE,UAAU,IAAI;IACZ,OAAO,EAAE,gBAAgB,CAAA;IACzB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAID,eAAO,MAAM,kBAAkB,qEAK5B,IAAI,KAAG,yBAAyB,CAAC,QAAQ,GAAG,UAAU,GAAG,cAAc,CAiDzE,CAAA;AAED,eAAO,MAAM,cAAc,oEACyC,IAAI,iDAMnE;IACD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IAClC,GAAG,EAAE,cAAc,CAAA;IACnB,WAAW,CAAC,EAAE,IAAI,GAAG,MAAM,CAAA;IAC3B,SAAS,EAAE,MAAM,CAAA;CAClB,kBAoEA,CAAA"}

package/dist/hooks/afterDelete.js

@@ -1,29 +1,124 @@
-export const getAfterDeleteHook = ({ adapter, collection })=>{
-    return async ({ doc, req })=>{
+import { beginDeferredCleanupScopeIfNeeded, clearDeferredCleanupScope, flushDeferredCleanupScope, scheduleAfterTransactionCommit } from 'payload';
+import { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js';
+import { buildStoragePathData } from '../utilities/buildStoragePathData.js';
+export const getAfterDeleteHook = ({ adapter, collection, collectionPrefix, useCompositePrefixes })=>{
+    const logDeleteError = ({ doc, err, req })=>{
+        req.payload.logger.error({
+            err,
+            msg: `There was an error while deleting files for collection ${collection.slug} document ${doc.id}.`
+        });
+    };
+    const deleteFiles = getDeleteFiles({
+        adapter,
+        collection,
+        collectionPrefix,
+        useCompositePrefixes
+    });
+    return async ({ id, doc, req })=>{
+        // Managed objects are deleted after the operation commits and all references are checked.
+        const managedDeletedUploads = req.context?._payloadManagedDeletedUploads;
+        if (collection.versions || Boolean(doc.original) && typeof doc.original?.filename === 'string' || managedDeletedUploads?.has(JSON.stringify([
+            collection.slug,
+            String(id)
+        ]))) {
+            return doc;
+        }
         try {
-            const filesToDelete = [
-                doc.filename,
-                ...Object.values(doc?.sizes || []).map((resizedFileData)=>resizedFileData?.filename)
-            ];
-            const promises = filesToDelete.map(async (filename)=>{
-                if (filename) {
-                    await adapter.handleDelete({
-                        collection,
+            await deleteFiles({
+                onError: (err)=>{
+                    logDeleteError({
                         doc,
-                        filename,
+                        err,
                         req
                     });
-                }
+                },
+                req,
+                sourceDoc: doc
             });
-            await Promise.all(promises);
         } catch (err) {
-            req.payload.logger.error({
+            logDeleteError({
+                doc,
                 err,
-                msg: `There was an error while deleting files corresponding to the ${collection.labels?.singular} with ID ${doc.id}.`
+                req
             });
         }
         return doc;
     };
 };
+export const getDeleteFiles = ({ adapter, collection, collectionPrefix, useCompositePrefixes })=>async ({ onError, req, retainedDoc, sourceDoc })=>{
+        const cleanupScope = await beginDeferredCleanupScopeIfNeeded({
+            req
+        });
+        const sourceUploadDocument = sourceDoc;
+        const retainedUploadDocument = retainedDoc;
+        const resolveKey = ({ doc, filename })=>{
+            const docPrefix = buildPrefixWithObjectKey({
+                objectKey: doc._objectKey,
+                prefix: doc.prefix
+            });
+            return buildStoragePathData({
+                collectionPrefix,
+                docPrefix,
+                filename,
+                useCompositePrefixes
+            }).storageFilePath;
+        };
+        const retainedStoragePaths = new Set(retainedUploadDocument ? getFilenames(retainedUploadDocument).map((filename)=>resolveKey({
+                doc: retainedUploadDocument,
+                filename
+            })) : []);
+        const filesToDelete = getFilenames(sourceUploadDocument).flatMap((filename)=>{
+            const storageFilePath = resolveKey({
+                doc: sourceUploadDocument,
+                filename
+            });
+            return retainedStoragePaths.has(storageFilePath) ? [] : [
+                {
+                    filename,
+                    storageFilePath
+                }
+            ];
+        });
+        try {
+            await scheduleAfterTransactionCommit({
+                callback: async ()=>{
+                    try {
+                        await Promise.all(filesToDelete.map(({ filename, storageFilePath })=>adapter.handleDelete({
+                                collection,
+                                doc: sourceUploadDocument,
+                                filename,
+                                req,
+                                storageFilePath
+                            })));
+                    } catch (error) {
+                        if (onError) {
+                            onError(error);
+                            return;
+                        }
+                        throw error;
+                    }
+                },
+                req
+            });
+            if (cleanupScope) {
+                await flushDeferredCleanupScope({
+                    req,
+                    scope: cleanupScope
+                });
+            }
+        } catch (error) {
+            if (cleanupScope) {
+                clearDeferredCleanupScope({
+                    req,
+                    scope: cleanupScope
+                });
+            }
+            throw error;
+        }
+    };
+const getFilenames = (doc)=>[
+        doc.filename,
+        ...Object.values(doc.variants || {}).map((variantFileData)=>variantFileData?.filename)
+    ].filter((filename)=>typeof filename === 'string' && filename.length > 0);
 
 //# sourceMappingURL=afterDelete.js.map

package/dist/hooks/afterDelete.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/afterDelete.ts"],"sourcesContent":["import type { CollectionAfterDeleteHook, CollectionConfig, FileData, TypeWithID } from 'payload'\n\nimport type { GeneratedAdapter, TypeWithPrefix } from '../types.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n}\n\nexport const getAfterDeleteHook = ({\n  adapter,\n  collection,\n}: Args): CollectionAfterDeleteHook<FileData & TypeWithID & TypeWithPrefix> => {\n  return async ({ doc, req }) => {\n    try {\n      const filesToDelete: string[] = [\n        doc.filename,\n        ...Object.values(doc?.sizes || []).map(\n          (resizedFileData) => resizedFileData?.filename as string,\n        ),\n      ]\n\n      const promises = filesToDelete.map(async (filename) => {\n        if (filename) {\n          await adapter.handleDelete({ collection, doc, filename, req })\n        }\n      })\n\n      await Promise.all(promises)\n    } catch (err: unknown) {\n      req.payload.logger.error({\n        err,\n        msg: `There was an error while deleting files corresponding to the ${collection.labels?.singular} with ID ${doc.id}.`,\n      })\n    }\n    return doc\n  }\n}\n"],"names":["getAfterDeleteHook","adapter","collection","doc","req","filesToDelete","filename","Object","values","sizes","map","resizedFileData","promises","handleDelete","Promise","all","err","payload","logger","error","msg","labels","singular","id"],"mappings":"AASA,OAAO,MAAMA,qBAAqB,CAAC,EACjCC,OAAO,EACPC,UAAU,EACL;IACL,OAAO,OAAO,EAAEC,GAAG,EAAEC,GAAG,EAAE;QACxB,IAAI;YACF,MAAMC,gBAA0B;gBAC9BF,IAAIG,QAAQ;mBACTC,OAAOC,MAAM,CAACL,KAAKM,SAAS,EAAE,EAAEC,GAAG,CACpC,CAACC,kBAAoBA,iBAAiBL;aAEzC;YAED,MAAMM,WAAWP,cAAcK,GAAG,CAAC,OAAOJ;gBACxC,IAAIA,UAAU;oBACZ,MAAML,QAAQY,YAAY,CAAC;wBAAEX;wBAAYC;wBAAKG;wBAAUF;oBAAI;gBAC9D;YACF;YAEA,MAAMU,QAAQC,GAAG,CAACH;QACpB,EAAE,OAAOI,KAAc;YACrBZ,IAAIa,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBACvBH;gBACAI,KAAK,CAAC,6DAA6D,EAAElB,WAAWmB,MAAM,EAAEC,SAAS,SAAS,EAAEnB,IAAIoB,EAAE,CAAC,CAAC,CAAC;YACvH;QACF;QACA,OAAOpB;IACT;AACF,EAAC"}
+{"version":3,"sources":["../../src/hooks/afterDelete.ts"],"sourcesContent":["import type {\n  CollectionAfterDeleteHook,\n  CollectionConfig,\n  FileData,\n  PayloadRequest,\n  TypeWithID,\n} from 'payload'\n\nimport {\n  beginDeferredCleanupScopeIfNeeded,\n  clearDeferredCleanupScope,\n  flushDeferredCleanupScope,\n  scheduleAfterTransactionCommit,\n} from 'payload'\n\nimport type { GeneratedAdapter, TypeWithPrefix } from '../types.js'\n\nimport { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js'\nimport { buildStoragePathData } from '../utilities/buildStoragePathData.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  collectionPrefix?: string\n  useCompositePrefixes?: boolean\n}\n\ntype UploadDocument = { _objectKey?: string } & FileData & TypeWithID & TypeWithPrefix\n\nexport const getAfterDeleteHook = ({\n  adapter,\n  collection,\n  collectionPrefix,\n  useCompositePrefixes,\n}: Args): CollectionAfterDeleteHook<FileData & TypeWithID & TypeWithPrefix> => {\n  const logDeleteError = ({\n    doc,\n    err,\n    req,\n  }: {\n    doc: TypeWithID\n    err: unknown\n    req: PayloadRequest\n  }) => {\n    req.payload.logger.error({\n      err,\n      msg: `There was an error while deleting files for collection ${collection.slug} document ${doc.id}.`,\n    })\n  }\n  const deleteFiles = getDeleteFiles({\n    adapter,\n    collection,\n    collectionPrefix,\n    useCompositePrefixes,\n  })\n\n  return async ({ id, doc, req }) => {\n    // Managed objects are deleted after the operation commits and all references are checked.\n    const managedDeletedUploads = req.context?._payloadManagedDeletedUploads as\n      | Set<string>\n      | undefined\n    if (\n      collection.versions ||\n      (Boolean(doc.original) && typeof doc.original?.filename === 'string') ||\n      managedDeletedUploads?.has(JSON.stringify([collection.slug, String(id)]))\n    ) {\n      return doc\n    }\n\n    try {\n      await deleteFiles({\n        onError: (err) => {\n          logDeleteError({ doc, err, req })\n        },\n        req,\n        sourceDoc: doc,\n      })\n    } catch (err: unknown) {\n      logDeleteError({ doc, err, req })\n    }\n\n    return doc\n  }\n}\n\nexport const getDeleteFiles =\n  ({ adapter, collection, collectionPrefix, useCompositePrefixes }: Args) =>\n  async ({\n    onError,\n    req,\n    retainedDoc,\n    sourceDoc,\n  }: {\n    onError?: (error: unknown) => void\n    req: PayloadRequest\n    retainedDoc?: null | object\n    sourceDoc: object\n  }) => {\n    const cleanupScope = await beginDeferredCleanupScopeIfNeeded({ req })\n    const sourceUploadDocument = sourceDoc as UploadDocument\n    const retainedUploadDocument = retainedDoc as null | undefined | UploadDocument\n    const resolveKey = ({ doc, filename }: { doc: UploadDocument; filename: string }) => {\n      const docPrefix = buildPrefixWithObjectKey({\n        objectKey: doc._objectKey,\n        prefix: doc.prefix,\n      })\n\n      return buildStoragePathData({\n        collectionPrefix,\n        docPrefix,\n        filename,\n        useCompositePrefixes,\n      }).storageFilePath\n    }\n    const retainedStoragePaths = new Set(\n      retainedUploadDocument\n        ? getFilenames(retainedUploadDocument).map((filename) =>\n            resolveKey({ doc: retainedUploadDocument, filename }),\n          )\n        : [],\n    )\n\n    const filesToDelete = getFilenames(sourceUploadDocument).flatMap((filename) => {\n      const storageFilePath = resolveKey({ doc: sourceUploadDocument, filename })\n\n      return retainedStoragePaths.has(storageFilePath) ? [] : [{ filename, storageFilePath }]\n    })\n\n    try {\n      await scheduleAfterTransactionCommit({\n        callback: async () => {\n          try {\n            await Promise.all(\n              filesToDelete.map(({ filename, storageFilePath }) =>\n                adapter.handleDelete({\n                  collection,\n                  doc: sourceUploadDocument,\n                  filename,\n                  req,\n                  storageFilePath,\n                }),\n              ),\n            )\n          } catch (error) {\n            if (onError) {\n              onError(error)\n              return\n            }\n\n            throw error\n          }\n        },\n        req,\n      })\n\n      if (cleanupScope) {\n        await flushDeferredCleanupScope({ req, scope: cleanupScope })\n      }\n    } catch (error) {\n      if (cleanupScope) {\n        clearDeferredCleanupScope({ req, scope: cleanupScope })\n      }\n\n      throw error\n    }\n  }\n\nconst getFilenames = (doc: FileData): string[] =>\n  [\n    doc.filename,\n    ...Object.values(doc.variants || {}).map((variantFileData) => variantFileData?.filename),\n  ].filter((filename): filename is string => typeof filename === 'string' && filename.length > 0)\n"],"names":["beginDeferredCleanupScopeIfNeeded","clearDeferredCleanupScope","flushDeferredCleanupScope","scheduleAfterTransactionCommit","buildPrefixWithObjectKey","buildStoragePathData","getAfterDeleteHook","adapter","collection","collectionPrefix","useCompositePrefixes","logDeleteError","doc","err","req","payload","logger","error","msg","slug","id","deleteFiles","getDeleteFiles","managedDeletedUploads","context","_payloadManagedDeletedUploads","versions","Boolean","original","filename","has","JSON","stringify","String","onError","sourceDoc","retainedDoc","cleanupScope","sourceUploadDocument","retainedUploadDocument","resolveKey","docPrefix","objectKey","_objectKey","prefix","storageFilePath","retainedStoragePaths","Set","getFilenames","map","filesToDelete","flatMap","callback","Promise","all","handleDelete","scope","Object","values","variants","variantFileData","filter","length"],"mappings":"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"}

package/dist/hooks/afterRead.d.ts

@@ -5,8 +5,13 @@ interface Args {
     collection: CollectionConfig;
     disablePayloadAccessControl?: boolean;
     generateFileURL?: GenerateFileURL;
+    isOriginal?: boolean;
     size?: ImageSize;
 }
-export declare const getAfterReadHook: ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size }: Args) => FieldHook;
+export declare const getAfterReadHook: ({ adapter, collection, disablePayloadAccessControl, generateFileURL, isOriginal, size, }: Args) => FieldHook;
+export declare const appendProxyPrefix: ({ prefix, url }: {
+    prefix: string;
+    url: string;
+}) => string;
 export {};
 //# sourceMappingURL=afterRead.d.ts.map

package/dist/hooks/afterRead.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"afterRead.d.ts","sourceRoot":"","sources":["../../src/hooks/afterRead.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAEpE,UAAU,IAAI;IACZ,OAAO,EAAE,gBAAgB,CAAA;IACzB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAED,eAAO,MAAM,gBAAgB,gFACmD,IAAI,KAAG,SA4BpF,CAAA"}
+{"version":3,"file":"afterRead.d.ts","sourceRoot":"","sources":["../../src/hooks/afterRead.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIpE,UAAU,IAAI;IACZ,OAAO,EAAE,gBAAgB,CAAA;IACzB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAiBD,eAAO,MAAM,gBAAgB,6FAQxB,IAAI,KAAG,SAkCT,CAAA;AAEH,eAAO,MAAM,iBAAiB,oBAAqB;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,KAAG,MAMpF,CAAA"}