@payloadcms/plugin-cloud-storage 4.0.0-internal.77191e5 → 4.0.0-internal.7803e2c

package/dist/hooks/afterDelete.js

@@ -1,43 +1,124 @@
+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 })=>{
-    return async ({ doc, req })=>{
+    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 {
-            // Fold `_objectKey` so deletes target the real object folder.
-            const docPrefix = buildPrefixWithObjectKey({
-                objectKey: doc._objectKey,
-                prefix: doc.prefix
-            });
-            const filesToDelete = [
-                doc.filename,
-                ...Object.values(doc?.sizes || []).map((resizedFileData)=>resizedFileData?.filename)
-            ];
-            const promises = filesToDelete.map(async (filename)=>{
-                if (filename) {
-                    const { storageFilePath } = buildStoragePathData({
-                        collectionPrefix,
-                        docPrefix,
-                        filename,
-                        useCompositePrefixes
-                    });
-                    await adapter.handleDelete({
-                        collection,
+            await deleteFiles({
+                onError: (err)=>{
+                    logDeleteError({
                         doc,
-                        filename,
-                        req,
-                        storageFilePath
+                        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(async ({ 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\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\nexport const getAfterDeleteHook = ({\n  adapter,\n  collection,\n  collectionPrefix,\n  useCompositePrefixes,\n}: Args): CollectionAfterDeleteHook<FileData & TypeWithID & TypeWithPrefix> => {\n  return async ({ doc, req }) => {\n    try {\n      // Fold `_objectKey` so deletes target the real object folder.\n      const docPrefix = buildPrefixWithObjectKey({\n        objectKey: (doc as { _objectKey?: string })._objectKey,\n        prefix: doc.prefix,\n      })\n\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          const { storageFilePath } = buildStoragePathData({\n            collectionPrefix,\n            docPrefix,\n            filename,\n            useCompositePrefixes,\n          })\n          await adapter.handleDelete({ collection, doc, filename, req, storageFilePath })\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":["buildPrefixWithObjectKey","buildStoragePathData","getAfterDeleteHook","adapter","collection","collectionPrefix","useCompositePrefixes","doc","req","docPrefix","objectKey","_objectKey","prefix","filesToDelete","filename","Object","values","sizes","map","resizedFileData","promises","storageFilePath","handleDelete","Promise","all","err","payload","logger","error","msg","labels","singular","id"],"mappings":"AAIA,SAASA,wBAAwB,QAAQ,2CAA0C;AACnF,SAASC,oBAAoB,QAAQ,uCAAsC;AAS3E,OAAO,MAAMC,qBAAqB,CAAC,EACjCC,OAAO,EACPC,UAAU,EACVC,gBAAgB,EAChBC,oBAAoB,EACf;IACL,OAAO,OAAO,EAAEC,GAAG,EAAEC,GAAG,EAAE;QACxB,IAAI;YACF,8DAA8D;YAC9D,MAAMC,YAAYT,yBAAyB;gBACzCU,WAAW,AAACH,IAAgCI,UAAU;gBACtDC,QAAQL,IAAIK,MAAM;YACpB;YAEA,MAAMC,gBAA0B;gBAC9BN,IAAIO,QAAQ;mBACTC,OAAOC,MAAM,CAACT,KAAKU,SAAS,EAAE,EAAEC,GAAG,CACpC,CAACC,kBAAoBA,iBAAiBL;aAEzC;YAED,MAAMM,WAAWP,cAAcK,GAAG,CAAC,OAAOJ;gBACxC,IAAIA,UAAU;oBACZ,MAAM,EAAEO,eAAe,EAAE,GAAGpB,qBAAqB;wBAC/CI;wBACAI;wBACAK;wBACAR;oBACF;oBACA,MAAMH,QAAQmB,YAAY,CAAC;wBAAElB;wBAAYG;wBAAKO;wBAAUN;wBAAKa;oBAAgB;gBAC/E;YACF;YAEA,MAAME,QAAQC,GAAG,CAACJ;QACpB,EAAE,OAAOK,KAAc;YACrBjB,IAAIkB,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBACvBH;gBACAI,KAAK,CAAC,6DAA6D,EAAEzB,WAAW0B,MAAM,EAAEC,SAAS,SAAS,EAAExB,IAAIyB,EAAE,CAAC,CAAC,CAAC;YACvH;QACF;QACA,OAAOzB;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(async ({ 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;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,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAiBD,eAAO,MAAM,gBAAgB,gFACmD,IAAI,KAAG,SA8BpF,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"}

package/dist/hooks/afterRead.js

@@ -9,11 +9,16 @@ const getObjectFolder = (data)=>{
     }
     return safePrefix || safeObjectKey;
 };
-export const getAfterReadHook = ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size })=>async ({ data, value })=>{
-        const filename = size ? data?.sizes?.[size.name]?.filename : data?.filename;
-        const prefix = data?.prefix;
+export const getAfterReadHook = ({ adapter, collection, disablePayloadAccessControl, generateFileURL, isOriginal, size })=>async ({ data, value })=>{
+        const representation = isOriginal ? data?.original : size ? data?.variants?.[size.name] : data;
+        const filename = representation?.filename;
+        const hasLegacyVariant = Boolean(size && !data?.original?.filename);
+        const prefix = representation?.prefix ?? (hasLegacyVariant ? data?.prefix : undefined);
         // Direct-serve URLs encode the full location; the proxy resolves `_objectKey` server-side.
-        const objectFolder = getObjectFolder(data);
+        const objectFolder = getObjectFolder({
+            _objectKey: representation?._objectKey ?? (hasLegacyVariant ? data?._objectKey : undefined),
+            prefix
+        });
         let url = value;
         if (filename) {
             if (generateFileURL) {
@@ -31,11 +36,20 @@ export const getAfterReadHook = ({ adapter, collection, disablePayloadAccessCont
                     prefix: objectFolder
                 });
             } else if (url && prefix) {
-                const separator = url.includes('?') ? '&' : '?';
-                url = `${url}${separator}prefix=${encodeURIComponent(prefix)}`;
+                url = appendProxyPrefix({
+                    prefix,
+                    url
+                });
             }
         }
         return url;
     };
+export const appendProxyPrefix = ({ prefix, url })=>{
+    if (new URL(url, 'http://payload.local').searchParams.has('prefix')) {
+        return url;
+    }
+    const separator = url.includes('?') ? '&' : '?';
+    return `${url}${separator}prefix=${encodeURIComponent(prefix)}`;
+};
 
 //# sourceMappingURL=afterRead.js.map

package/dist/hooks/afterRead.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/afterRead.ts"],"sourcesContent":["import type { CollectionConfig, FieldHook, ImageSize } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { sanitizePrefix } from '../utilities/sanitizePrefix.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  size?: ImageSize\n}\n\n// The object's folder: semantic prefix + `_objectKey` segment.\nconst getObjectFolder = (data: unknown): string => {\n  const record = (data ?? {}) as Record<string, unknown>\n  const safePrefix = sanitizePrefix(typeof record.prefix === 'string' ? record.prefix : '')\n  const safeObjectKey = sanitizePrefix(\n    typeof record._objectKey === 'string' ? record._objectKey : '',\n  )\n\n  if (safePrefix && safeObjectKey) {\n    return `${safePrefix}/${safeObjectKey}`\n  }\n\n  return safePrefix || safeObjectKey\n}\n\nexport const getAfterReadHook =\n  ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size }: Args): FieldHook =>\n  async ({ data, value }) => {\n    const filename = size ? data?.sizes?.[size.name]?.filename : data?.filename\n    const prefix = data?.prefix\n    // Direct-serve URLs encode the full location; the proxy resolves `_objectKey` server-side.\n    const objectFolder = getObjectFolder(data)\n    let url = value\n\n    if (filename) {\n      if (generateFileURL) {\n        url = await generateFileURL({\n          collection,\n          filename,\n          prefix: objectFolder,\n          size,\n        })\n      } else if (disablePayloadAccessControl && adapter.generateURL) {\n        url = await adapter.generateURL({\n          collection,\n          data,\n          filename,\n          prefix: objectFolder,\n        })\n      } else if (url && prefix) {\n        const separator = url.includes('?') ? '&' : '?'\n        url = `${url}${separator}prefix=${encodeURIComponent(prefix)}`\n      }\n    }\n\n    return url\n  }\n"],"names":["sanitizePrefix","getObjectFolder","data","record","safePrefix","prefix","safeObjectKey","_objectKey","getAfterReadHook","adapter","collection","disablePayloadAccessControl","generateFileURL","size","value","filename","sizes","name","objectFolder","url","generateURL","separator","includes","encodeURIComponent"],"mappings":"AAIA,SAASA,cAAc,QAAQ,iCAAgC;AAU/D,+DAA+D;AAC/D,MAAMC,kBAAkB,CAACC;IACvB,MAAMC,SAAUD,QAAQ,CAAC;IACzB,MAAME,aAAaJ,eAAe,OAAOG,OAAOE,MAAM,KAAK,WAAWF,OAAOE,MAAM,GAAG;IACtF,MAAMC,gBAAgBN,eACpB,OAAOG,OAAOI,UAAU,KAAK,WAAWJ,OAAOI,UAAU,GAAG;IAG9D,IAAIH,cAAcE,eAAe;QAC/B,OAAO,GAAGF,WAAW,CAAC,EAAEE,eAAe;IACzC;IAEA,OAAOF,cAAcE;AACvB;AAEA,OAAO,MAAME,mBACX,CAAC,EAAEC,OAAO,EAAEC,UAAU,EAAEC,2BAA2B,EAAEC,eAAe,EAAEC,IAAI,EAAQ,GAClF,OAAO,EAAEX,IAAI,EAAEY,KAAK,EAAE;QACpB,MAAMC,WAAWF,OAAOX,MAAMc,OAAO,CAACH,KAAKI,IAAI,CAAC,EAAEF,WAAWb,MAAMa;QACnE,MAAMV,SAASH,MAAMG;QACrB,2FAA2F;QAC3F,MAAMa,eAAejB,gBAAgBC;QACrC,IAAIiB,MAAML;QAEV,IAAIC,UAAU;YACZ,IAAIH,iBAAiB;gBACnBO,MAAM,MAAMP,gBAAgB;oBAC1BF;oBACAK;oBACAV,QAAQa;oBACRL;gBACF;YACF,OAAO,IAAIF,+BAA+BF,QAAQW,WAAW,EAAE;gBAC7DD,MAAM,MAAMV,QAAQW,WAAW,CAAC;oBAC9BV;oBACAR;oBACAa;oBACAV,QAAQa;gBACV;YACF,OAAO,IAAIC,OAAOd,QAAQ;gBACxB,MAAMgB,YAAYF,IAAIG,QAAQ,CAAC,OAAO,MAAM;gBAC5CH,MAAM,GAAGA,MAAME,UAAU,OAAO,EAAEE,mBAAmBlB,SAAS;YAChE;QACF;QAEA,OAAOc;IACT,EAAC"}
+{"version":3,"sources":["../../src/hooks/afterRead.ts"],"sourcesContent":["import type { CollectionConfig, FieldHook, ImageSize } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { sanitizePrefix } from '../utilities/sanitizePrefix.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  isOriginal?: boolean\n  size?: ImageSize\n}\n\n// The object's folder: semantic prefix + `_objectKey` segment.\nconst getObjectFolder = (data: unknown): string => {\n  const record = (data ?? {}) as Record<string, unknown>\n  const safePrefix = sanitizePrefix(typeof record.prefix === 'string' ? record.prefix : '')\n  const safeObjectKey = sanitizePrefix(\n    typeof record._objectKey === 'string' ? record._objectKey : '',\n  )\n\n  if (safePrefix && safeObjectKey) {\n    return `${safePrefix}/${safeObjectKey}`\n  }\n\n  return safePrefix || safeObjectKey\n}\n\nexport const getAfterReadHook =\n  ({\n    adapter,\n    collection,\n    disablePayloadAccessControl,\n    generateFileURL,\n    isOriginal,\n    size,\n  }: Args): FieldHook =>\n  async ({ data, value }) => {\n    const representation = isOriginal ? data?.original : size ? data?.variants?.[size.name] : data\n    const filename = representation?.filename\n    const hasLegacyVariant = Boolean(size && !data?.original?.filename)\n    const prefix = representation?.prefix ?? (hasLegacyVariant ? data?.prefix : undefined)\n    // Direct-serve URLs encode the full location; the proxy resolves `_objectKey` server-side.\n    const objectFolder = getObjectFolder({\n      _objectKey: representation?._objectKey ?? (hasLegacyVariant ? data?._objectKey : undefined),\n      prefix,\n    })\n    let url = value\n\n    if (filename) {\n      if (generateFileURL) {\n        url = await generateFileURL({\n          collection,\n          filename,\n          prefix: objectFolder,\n          size,\n        })\n      } else if (disablePayloadAccessControl && adapter.generateURL) {\n        url = await adapter.generateURL({\n          collection,\n          data,\n          filename,\n          prefix: objectFolder,\n        })\n      } else if (url && prefix) {\n        url = appendProxyPrefix({ prefix, url })\n      }\n    }\n\n    return url\n  }\n\nexport const appendProxyPrefix = ({ prefix, url }: { prefix: string; url: string }): string => {\n  if (new URL(url, 'http://payload.local').searchParams.has('prefix')) {\n    return url\n  }\n  const separator = url.includes('?') ? '&' : '?'\n  return `${url}${separator}prefix=${encodeURIComponent(prefix)}`\n}\n"],"names":["sanitizePrefix","getObjectFolder","data","record","safePrefix","prefix","safeObjectKey","_objectKey","getAfterReadHook","adapter","collection","disablePayloadAccessControl","generateFileURL","isOriginal","size","value","representation","original","variants","name","filename","hasLegacyVariant","Boolean","undefined","objectFolder","url","generateURL","appendProxyPrefix","URL","searchParams","has","separator","includes","encodeURIComponent"],"mappings":"AAIA,SAASA,cAAc,QAAQ,iCAAgC;AAW/D,+DAA+D;AAC/D,MAAMC,kBAAkB,CAACC;IACvB,MAAMC,SAAUD,QAAQ,CAAC;IACzB,MAAME,aAAaJ,eAAe,OAAOG,OAAOE,MAAM,KAAK,WAAWF,OAAOE,MAAM,GAAG;IACtF,MAAMC,gBAAgBN,eACpB,OAAOG,OAAOI,UAAU,KAAK,WAAWJ,OAAOI,UAAU,GAAG;IAG9D,IAAIH,cAAcE,eAAe;QAC/B,OAAO,GAAGF,WAAW,CAAC,EAAEE,eAAe;IACzC;IAEA,OAAOF,cAAcE;AACvB;AAEA,OAAO,MAAME,mBACX,CAAC,EACCC,OAAO,EACPC,UAAU,EACVC,2BAA2B,EAC3BC,eAAe,EACfC,UAAU,EACVC,IAAI,EACC,GACP,OAAO,EAAEZ,IAAI,EAAEa,KAAK,EAAE;QACpB,MAAMC,iBAAiBH,aAAaX,MAAMe,WAAWH,OAAOZ,MAAMgB,UAAU,CAACJ,KAAKK,IAAI,CAAC,GAAGjB;QAC1F,MAAMkB,WAAWJ,gBAAgBI;QACjC,MAAMC,mBAAmBC,QAAQR,QAAQ,CAACZ,MAAMe,UAAUG;QAC1D,MAAMf,SAASW,gBAAgBX,UAAWgB,CAAAA,mBAAmBnB,MAAMG,SAASkB,SAAQ;QACpF,2FAA2F;QAC3F,MAAMC,eAAevB,gBAAgB;YACnCM,YAAYS,gBAAgBT,cAAec,CAAAA,mBAAmBnB,MAAMK,aAAagB,SAAQ;YACzFlB;QACF;QACA,IAAIoB,MAAMV;QAEV,IAAIK,UAAU;YACZ,IAAIR,iBAAiB;gBACnBa,MAAM,MAAMb,gBAAgB;oBAC1BF;oBACAU;oBACAf,QAAQmB;oBACRV;gBACF;YACF,OAAO,IAAIH,+BAA+BF,QAAQiB,WAAW,EAAE;gBAC7DD,MAAM,MAAMhB,QAAQiB,WAAW,CAAC;oBAC9BhB;oBACAR;oBACAkB;oBACAf,QAAQmB;gBACV;YACF,OAAO,IAAIC,OAAOpB,QAAQ;gBACxBoB,MAAME,kBAAkB;oBAAEtB;oBAAQoB;gBAAI;YACxC;QACF;QAEA,OAAOA;IACT,EAAC;AAEH,OAAO,MAAME,oBAAoB,CAAC,EAAEtB,MAAM,EAAEoB,GAAG,EAAmC;IAChF,IAAI,IAAIG,IAAIH,KAAK,wBAAwBI,YAAY,CAACC,GAAG,CAAC,WAAW;QACnE,OAAOL;IACT;IACA,MAAMM,YAAYN,IAAIO,QAAQ,CAAC,OAAO,MAAM;IAC5C,OAAO,GAAGP,MAAMM,UAAU,OAAO,EAAEE,mBAAmB5B,SAAS;AACjE,EAAC"}

package/dist/hooks/beforeChange.d.ts

@@ -5,8 +5,9 @@ interface Args {
     collection: CollectionConfig;
     disablePayloadAccessControl?: boolean;
     generateFileURL?: GenerateFileURL;
+    isOriginal?: boolean;
     size?: ImageSize;
 }
-export declare const getBeforeChangeHook: ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size }: Args) => FieldHook;
+export declare const getBeforeChangeHook: ({ adapter, collection, disablePayloadAccessControl, generateFileURL, isOriginal, size, }: Args) => FieldHook;
 export {};
 //# sourceMappingURL=beforeChange.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"beforeChange.d.ts","sourceRoot":"","sources":["../../src/hooks/beforeChange.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,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAiBD,eAAO,MAAM,mBAAmB,gFACgD,IAAI,KAAG,SA2BpF,CAAA"}
+{"version":3,"file":"beforeChange.d.ts","sourceRoot":"","sources":["../../src/hooks/beforeChange.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,mBAAmB,6FAQ3B,IAAI,KAAG,SAoCT,CAAA"}

package/dist/hooks/beforeChange.js

@@ -9,11 +9,14 @@ const getObjectFolder = (data, originalDoc)=>{
     }
     return safePrefix || safeObjectKey;
 };
-export const getBeforeChangeHook = ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size })=>async ({ data, originalDoc, value })=>{
-        const newFilename = size ? data?.sizes?.[size.name]?.filename : data?.filename;
-        const originalFilename = size ? originalDoc?.sizes?.[size.name]?.filename : originalDoc?.filename;
+export const getBeforeChangeHook = ({ adapter, collection, disablePayloadAccessControl, generateFileURL, isOriginal, size })=>async ({ data, originalDoc, value })=>{
+        const newRepresentation = isOriginal ? data?.original : size ? data?.variants?.[size.name] : data;
+        const originalRepresentation = isOriginal ? originalDoc?.original : size ? originalDoc?.variants?.[size.name] : originalDoc;
+        const newFilename = newRepresentation?.filename;
+        const originalFilename = originalRepresentation?.filename;
         const filename = newFilename || originalFilename;
-        const prefix = getObjectFolder(data, originalDoc);
+        const representation = newRepresentation ?? originalRepresentation;
+        const prefix = getObjectFolder(representation, data ?? originalDoc);
         let url = value;
         if (generateFileURL && filename) {
             url = await generateFileURL({

package/dist/hooks/beforeChange.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/beforeChange.ts"],"sourcesContent":["import type { CollectionConfig, FieldHook, ImageSize } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { sanitizePrefix } from '../utilities/sanitizePrefix.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  size?: ImageSize\n}\n\n// The object's folder: semantic prefix + `_objectKey` segment.\nconst getObjectFolder = (data: unknown, originalDoc: unknown): string => {\n  const source = (data ?? originalDoc ?? {}) as Record<string, unknown>\n  const safePrefix = sanitizePrefix(typeof source.prefix === 'string' ? source.prefix : '')\n  const safeObjectKey = sanitizePrefix(\n    typeof source._objectKey === 'string' ? source._objectKey : '',\n  )\n\n  if (safePrefix && safeObjectKey) {\n    return `${safePrefix}/${safeObjectKey}`\n  }\n\n  return safePrefix || safeObjectKey\n}\n\nexport const getBeforeChangeHook =\n  ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size }: Args): FieldHook =>\n  async ({ data, originalDoc, value }) => {\n    const newFilename = size ? data?.sizes?.[size.name]?.filename : data?.filename\n    const originalFilename = size\n      ? originalDoc?.sizes?.[size.name]?.filename\n      : originalDoc?.filename\n    const filename = newFilename || originalFilename\n    const prefix = getObjectFolder(data, originalDoc)\n    let url = value\n\n    if (generateFileURL && filename) {\n      url = await generateFileURL({\n        collection,\n        filename,\n        prefix,\n        size,\n      })\n    } else if (disablePayloadAccessControl && filename && adapter.generateURL) {\n      url = await adapter.generateURL({\n        collection,\n        data: data || originalDoc,\n        filename,\n        prefix,\n      })\n    }\n\n    return url\n  }\n"],"names":["sanitizePrefix","getObjectFolder","data","originalDoc","source","safePrefix","prefix","safeObjectKey","_objectKey","getBeforeChangeHook","adapter","collection","disablePayloadAccessControl","generateFileURL","size","value","newFilename","sizes","name","filename","originalFilename","url","generateURL"],"mappings":"AAIA,SAASA,cAAc,QAAQ,iCAAgC;AAU/D,+DAA+D;AAC/D,MAAMC,kBAAkB,CAACC,MAAeC;IACtC,MAAMC,SAAUF,QAAQC,eAAe,CAAC;IACxC,MAAME,aAAaL,eAAe,OAAOI,OAAOE,MAAM,KAAK,WAAWF,OAAOE,MAAM,GAAG;IACtF,MAAMC,gBAAgBP,eACpB,OAAOI,OAAOI,UAAU,KAAK,WAAWJ,OAAOI,UAAU,GAAG;IAG9D,IAAIH,cAAcE,eAAe;QAC/B,OAAO,GAAGF,WAAW,CAAC,EAAEE,eAAe;IACzC;IAEA,OAAOF,cAAcE;AACvB;AAEA,OAAO,MAAME,sBACX,CAAC,EAAEC,OAAO,EAAEC,UAAU,EAAEC,2BAA2B,EAAEC,eAAe,EAAEC,IAAI,EAAQ,GAClF,OAAO,EAAEZ,IAAI,EAAEC,WAAW,EAAEY,KAAK,EAAE;QACjC,MAAMC,cAAcF,OAAOZ,MAAMe,OAAO,CAACH,KAAKI,IAAI,CAAC,EAAEC,WAAWjB,MAAMiB;QACtE,MAAMC,mBAAmBN,OACrBX,aAAac,OAAO,CAACH,KAAKI,IAAI,CAAC,EAAEC,WACjChB,aAAagB;QACjB,MAAMA,WAAWH,eAAeI;QAChC,MAAMd,SAASL,gBAAgBC,MAAMC;QACrC,IAAIkB,MAAMN;QAEV,IAAIF,mBAAmBM,UAAU;YAC/BE,MAAM,MAAMR,gBAAgB;gBAC1BF;gBACAQ;gBACAb;gBACAQ;YACF;QACF,OAAO,IAAIF,+BAA+BO,YAAYT,QAAQY,WAAW,EAAE;YACzED,MAAM,MAAMX,QAAQY,WAAW,CAAC;gBAC9BX;gBACAT,MAAMA,QAAQC;gBACdgB;gBACAb;YACF;QACF;QAEA,OAAOe;IACT,EAAC"}
+{"version":3,"sources":["../../src/hooks/beforeChange.ts"],"sourcesContent":["import type { CollectionConfig, FieldHook, ImageSize } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { sanitizePrefix } from '../utilities/sanitizePrefix.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  isOriginal?: boolean\n  size?: ImageSize\n}\n\n// The object's folder: semantic prefix + `_objectKey` segment.\nconst getObjectFolder = (data: unknown, originalDoc: unknown): string => {\n  const source = (data ?? originalDoc ?? {}) as Record<string, unknown>\n  const safePrefix = sanitizePrefix(typeof source.prefix === 'string' ? source.prefix : '')\n  const safeObjectKey = sanitizePrefix(\n    typeof source._objectKey === 'string' ? source._objectKey : '',\n  )\n\n  if (safePrefix && safeObjectKey) {\n    return `${safePrefix}/${safeObjectKey}`\n  }\n\n  return safePrefix || safeObjectKey\n}\n\nexport const getBeforeChangeHook =\n  ({\n    adapter,\n    collection,\n    disablePayloadAccessControl,\n    generateFileURL,\n    isOriginal,\n    size,\n  }: Args): FieldHook =>\n  async ({ data, originalDoc, value }) => {\n    const newRepresentation = isOriginal\n      ? data?.original\n      : size\n        ? data?.variants?.[size.name]\n        : data\n    const originalRepresentation = isOriginal\n      ? originalDoc?.original\n      : size\n        ? originalDoc?.variants?.[size.name]\n        : originalDoc\n    const newFilename = newRepresentation?.filename\n    const originalFilename = originalRepresentation?.filename\n    const filename = newFilename || originalFilename\n    const representation = newRepresentation ?? originalRepresentation\n    const prefix = getObjectFolder(representation, data ?? originalDoc)\n    let url = value\n\n    if (generateFileURL && filename) {\n      url = await generateFileURL({\n        collection,\n        filename,\n        prefix,\n        size,\n      })\n    } else if (disablePayloadAccessControl && filename && adapter.generateURL) {\n      url = await adapter.generateURL({\n        collection,\n        data: data || originalDoc,\n        filename,\n        prefix,\n      })\n    }\n\n    return url\n  }\n"],"names":["sanitizePrefix","getObjectFolder","data","originalDoc","source","safePrefix","prefix","safeObjectKey","_objectKey","getBeforeChangeHook","adapter","collection","disablePayloadAccessControl","generateFileURL","isOriginal","size","value","newRepresentation","original","variants","name","originalRepresentation","newFilename","filename","originalFilename","representation","url","generateURL"],"mappings":"AAIA,SAASA,cAAc,QAAQ,iCAAgC;AAW/D,+DAA+D;AAC/D,MAAMC,kBAAkB,CAACC,MAAeC;IACtC,MAAMC,SAAUF,QAAQC,eAAe,CAAC;IACxC,MAAME,aAAaL,eAAe,OAAOI,OAAOE,MAAM,KAAK,WAAWF,OAAOE,MAAM,GAAG;IACtF,MAAMC,gBAAgBP,eACpB,OAAOI,OAAOI,UAAU,KAAK,WAAWJ,OAAOI,UAAU,GAAG;IAG9D,IAAIH,cAAcE,eAAe;QAC/B,OAAO,GAAGF,WAAW,CAAC,EAAEE,eAAe;IACzC;IAEA,OAAOF,cAAcE;AACvB;AAEA,OAAO,MAAME,sBACX,CAAC,EACCC,OAAO,EACPC,UAAU,EACVC,2BAA2B,EAC3BC,eAAe,EACfC,UAAU,EACVC,IAAI,EACC,GACP,OAAO,EAAEb,IAAI,EAAEC,WAAW,EAAEa,KAAK,EAAE;QACjC,MAAMC,oBAAoBH,aACtBZ,MAAMgB,WACNH,OACEb,MAAMiB,UAAU,CAACJ,KAAKK,IAAI,CAAC,GAC3BlB;QACN,MAAMmB,yBAAyBP,aAC3BX,aAAae,WACbH,OACEZ,aAAagB,UAAU,CAACJ,KAAKK,IAAI,CAAC,GAClCjB;QACN,MAAMmB,cAAcL,mBAAmBM;QACvC,MAAMC,mBAAmBH,wBAAwBE;QACjD,MAAMA,WAAWD,eAAeE;QAChC,MAAMC,iBAAiBR,qBAAqBI;QAC5C,MAAMf,SAASL,gBAAgBwB,gBAAgBvB,QAAQC;QACvD,IAAIuB,MAAMV;QAEV,IAAIH,mBAAmBU,UAAU;YAC/BG,MAAM,MAAMb,gBAAgB;gBAC1BF;gBACAY;gBACAjB;gBACAS;YACF;QACF,OAAO,IAAIH,+BAA+BW,YAAYb,QAAQiB,WAAW,EAAE;YACzED,MAAM,MAAMhB,QAAQiB,WAAW,CAAC;gBAC9BhB;gBACAT,MAAMA,QAAQC;gBACdoB;gBACAjB;YACF;QACF;QAEA,OAAOoB;IACT,EAAC"}

package/dist/hooks/publicOriginalURL.d.ts

@@ -0,0 +1,8 @@
+import type { CollectionAfterReadHook, CollectionConfig } from 'payload';
+import type { GeneratedAdapter, GenerateFileURL } from '../types.js';
+export declare const getPublicOriginalURLHook: ({ adapter, collection, generateFileURL, }: {
+    adapter: GeneratedAdapter;
+    collection: CollectionConfig;
+    generateFileURL?: GenerateFileURL;
+}) => CollectionAfterReadHook;
+//# sourceMappingURL=publicOriginalURL.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"publicOriginalURL.d.ts","sourceRoot":"","sources":["../../src/hooks/publicOriginalURL.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAwB,MAAM,SAAS,CAAA;AAE9F,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIpE,eAAO,MAAM,wBAAwB,8CAKhC;IACD,OAAO,EAAE,gBAAgB,CAAA;IACzB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,eAAe,CAAC,EAAE,eAAe,CAAA;CAClC,KAAG,uBAsBH,CAAA"}

package/dist/hooks/publicOriginalURL.js

@@ -0,0 +1,34 @@
+import { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js';
+export const getPublicOriginalURLHook = ({ adapter, collection, generateFileURL })=>async ({ doc })=>{
+        const upload = doc;
+        const filename = upload.original?.filename;
+        if (!filename) {
+            return doc;
+        }
+        if (upload.original?.url && !upload.original.url.startsWith('/')) {
+            return doc;
+        }
+        const prefix = buildPrefixWithObjectKey({
+            objectKey: upload.original?._objectKey,
+            prefix: upload.original?.prefix
+        });
+        const url = generateFileURL ? await generateFileURL({
+            collection,
+            filename,
+            prefix
+        }) : await adapter.generateURL?.({
+            collection,
+            data: upload,
+            filename,
+            prefix
+        });
+        return url ? {
+            ...doc,
+            original: {
+                ...upload.original,
+                url
+            }
+        } : doc;
+    };
+
+//# sourceMappingURL=publicOriginalURL.js.map

package/dist/hooks/publicOriginalURL.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/hooks/publicOriginalURL.ts"],"sourcesContent":["import type { CollectionAfterReadHook, CollectionConfig, FileData, TypeWithID } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js'\n\nexport const getPublicOriginalURLHook =\n  ({\n    adapter,\n    collection,\n    generateFileURL,\n  }: {\n    adapter: GeneratedAdapter\n    collection: CollectionConfig\n    generateFileURL?: GenerateFileURL\n  }): CollectionAfterReadHook =>\n  async ({ doc }) => {\n    const upload = doc as { _objectKey?: string; prefix?: string } & FileData & TypeWithID\n    const filename = upload.original?.filename\n\n    if (!filename) {\n      return doc\n    }\n\n    if (upload.original?.url && !upload.original.url.startsWith('/')) {\n      return doc\n    }\n\n    const prefix = buildPrefixWithObjectKey({\n      objectKey: upload.original?._objectKey,\n      prefix: upload.original?.prefix,\n    })\n    const url = generateFileURL\n      ? await generateFileURL({ collection, filename, prefix })\n      : await adapter.generateURL?.({ collection, data: upload, filename, prefix })\n\n    return url ? { ...doc, original: { ...upload.original, url } } : doc\n  }\n"],"names":["buildPrefixWithObjectKey","getPublicOriginalURLHook","adapter","collection","generateFileURL","doc","upload","filename","original","url","startsWith","prefix","objectKey","_objectKey","generateURL","data"],"mappings":"AAIA,SAASA,wBAAwB,QAAQ,2CAA0C;AAEnF,OAAO,MAAMC,2BACX,CAAC,EACCC,OAAO,EACPC,UAAU,EACVC,eAAe,EAKhB,GACD,OAAO,EAAEC,GAAG,EAAE;QACZ,MAAMC,SAASD;QACf,MAAME,WAAWD,OAAOE,QAAQ,EAAED;QAElC,IAAI,CAACA,UAAU;YACb,OAAOF;QACT;QAEA,IAAIC,OAAOE,QAAQ,EAAEC,OAAO,CAACH,OAAOE,QAAQ,CAACC,GAAG,CAACC,UAAU,CAAC,MAAM;YAChE,OAAOL;QACT;QAEA,MAAMM,SAASX,yBAAyB;YACtCY,WAAWN,OAAOE,QAAQ,EAAEK;YAC5BF,QAAQL,OAAOE,QAAQ,EAAEG;QAC3B;QACA,MAAMF,MAAML,kBACR,MAAMA,gBAAgB;YAAED;YAAYI;YAAUI;QAAO,KACrD,MAAMT,QAAQY,WAAW,GAAG;YAAEX;YAAYY,MAAMT;YAAQC;YAAUI;QAAO;QAE7E,OAAOF,MAAM;YAAE,GAAGJ,GAAG;YAAEG,UAAU;gBAAE,GAAGF,OAAOE,QAAQ;gBAAEC;YAAI;QAAE,IAAIJ;IACnE,EAAC"}

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAErC,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,YAAY,CAAA;AAiBnE,eAAO,MAAM,kBAAkB,kBACb,aAAa,sBACZ,MAAM,KAAG,MAwOzB,CAAA"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAErC,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,YAAY,CAAA;AAoBnE,eAAO,MAAM,kBAAkB,kBACb,aAAa,sBACZ,MAAM,KAAG,MAqQzB,CAAA"}

package/dist/plugin.js

@@ -1,8 +1,11 @@
 import { getFields } from './fields/getFields.js';
 import { getAfterChangeHook } from './hooks/afterChange.js';
-import { getAfterDeleteHook } from './hooks/afterDelete.js';
+import { getAfterDeleteHook, getDeleteFiles } from './hooks/afterDelete.js';
 import { getNormalizeUploadPrefixHook } from './hooks/normalizeUploadPrefix.js';
 import { getPreserveFileDataHook } from './hooks/preserveFileData.js';
+import { getPublicOriginalURLHook } from './hooks/publicOriginalURL.js';
+import { createFileOperations } from './utilities/createFileOperations.js';
+import { getStorageLocationSelect } from './utilities/getStorageLocationSelect.js';
 // This plugin extends all targeted collections by offloading uploaded files
 // to cloud storage instead of solely storing files locally.
 // It is based on an adapter approach, where adapters can be written for any cloud provider.
@@ -109,11 +112,10 @@ export const cloudStoragePlugin = (pluginOptions)=>(incomingConfig)=>{
                 ];
                 if (!options.disablePayloadAccessControl) {
                     handlers.push(adapter.staticHandler);
-                // Else if disablePayloadAccessControl: true and upload instructions are used
-                // Build the "proxied" handler that responds only when addDataAndFileToRequest fetches the uploaded file
-                } else if (uploadInstructions) {
+                // Public files still need a server path when Payload reads them for a transform.
+                } else {
                     handlers.push((req, args)=>{
-                        if ('uploadReference' in args.params) {
+                        if ('uploadReference' in args.params || args.params.operation === 'transform') {
                             return adapter.staticHandler(req, args);
                         }
                     });
@@ -159,6 +161,8 @@ export const cloudStoragePlugin = (pluginOptions)=>(incomingConfig)=>{
                                 adapter,
                                 collection: existingCollection,
                                 collectionPrefix: options.prefix,
+                                disablePayloadAccessControl: options.disablePayloadAccessControl,
+                                hasCustomFileURL: Boolean(options.generateFileURL),
                                 useCompositePrefixes
                             })
                         ],
@@ -171,6 +175,16 @@ export const cloudStoragePlugin = (pluginOptions)=>(incomingConfig)=>{
                                 useCompositePrefixes
                             })
                         ],
+                        afterRead: [
+                            ...existingCollection.hooks?.afterRead || [],
+                            ...options.disablePayloadAccessControl && (options.generateFileURL || adapter.generateURL) ? [
+                                getPublicOriginalURLHook({
+                                    adapter,
+                                    collection: existingCollection,
+                                    generateFileURL: options.generateFileURL
+                                })
+                            ] : []
+                        ],
                         beforeChange: [
                             ...existingCollection.hooks?.beforeChange || [],
                             getNormalizeUploadPrefixHook({
@@ -180,9 +194,26 @@ export const cloudStoragePlugin = (pluginOptions)=>(incomingConfig)=>{
                             getPreserveFileDataHook()
                         ]
                     },
+                    select: getStorageLocationSelect({
+                        select: existingCollection.select
+                    }),
                     upload: {
                         ...typeof existingCollection.upload === 'object' ? existingCollection.upload : {},
                         adapter: adapter.name,
+                        deleteFiles: getDeleteFiles({
+                            adapter,
+                            collection: existingCollection,
+                            collectionPrefix: options.prefix,
+                            useCompositePrefixes
+                        }),
+                        fileOperations: createFileOperations({
+                            adapter,
+                            collection: existingCollection,
+                            collectionPrefix: options.prefix,
+                            disablePayloadAccessControl: options.disablePayloadAccessControl,
+                            generateFileURL: options.generateFileURL,
+                            useCompositePrefixes
+                        }),
                         ...uploadInstructions && {
                             uploadInstructions
                         },

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin.ts"],"sourcesContent":["import type { Config } from 'payload'\n\nimport type { Adapter, AllowList, PluginOptions } from './types.js'\n\nimport { getFields } from './fields/getFields.js'\nimport { getAfterChangeHook } from './hooks/afterChange.js'\nimport { getAfterDeleteHook } from './hooks/afterDelete.js'\nimport { getNormalizeUploadPrefixHook } from './hooks/normalizeUploadPrefix.js'\nimport { getPreserveFileDataHook } from './hooks/preserveFileData.js'\n\n// This plugin extends all targeted collections by offloading uploaded files\n// to cloud storage instead of solely storing files locally.\n\n// It is based on an adapter approach, where adapters can be written for any cloud provider.\n// Adapters are responsible for providing four actions that this plugin will use:\n// 1. handleUpload, 2. handleDelete, 3. generateURL, 4. staticHandler\n\n// Optionally, the adapter can specify any Webpack config overrides if they are necessary.\n\nexport const cloudStoragePlugin =\n  (pluginOptions: PluginOptions) =>\n  (incomingConfig: Config): Config => {\n    const { collections: allCollectionOptions, enabled, useCompositePrefixes } = pluginOptions\n    const config = { ...incomingConfig }\n\n    // If disabled, only insert fields (e.g. prefix) without full plugin functionality,\n    // so the collection schema stays consistent across environments.\n    if (enabled === false) {\n      return {\n        ...config,\n        collections: (config.collections || []).map((existingCollection) => {\n          const options = allCollectionOptions[existingCollection.slug]\n\n          if (options) {\n            // If adapter is provided, use it to get fields\n            const adapter = options.adapter\n              ? options.adapter({\n                  collection: existingCollection,\n                  prefix: options.prefix,\n                })\n              : undefined\n\n            const fields = getFields({\n              adapter,\n              collection: existingCollection,\n              disablePayloadAccessControl: options.disablePayloadAccessControl,\n              generateFileURL: options.generateFileURL,\n              prefix: options.prefix,\n              useCompositePrefixes,\n            })\n\n            return {\n              ...existingCollection,\n              fields,\n            }\n          }\n\n          return existingCollection\n        }),\n      }\n    }\n\n    const initFunctions: Array<() => Promise<void> | void> = []\n    const endpointPaths = new Map<Adapter, string>()\n\n    const collections = (config.collections || []).map((existingCollection) => {\n      const options = allCollectionOptions[existingCollection.slug]\n\n      if (options?.adapter) {\n        const adapter = options.adapter({\n          collection: existingCollection,\n          prefix: options.prefix,\n        })\n\n        if (adapter.onInit) {\n          initFunctions.push(adapter.onInit)\n        }\n\n        let uploadInstructions\n\n        if (adapter.uploadInstructions) {\n          const { adminHandler, enabled, endpoint, ...instructions } = adapter.uploadInstructions\n          let endpointPath = endpointPaths.get(options.adapter)\n\n          if (enabled && endpoint && !endpointPath) {\n            const endpointCount =\n              config.endpoints?.filter(({ path }) => path?.startsWith(endpoint.path)).length || 0\n\n            endpointPath = endpointCount ? `${endpoint.path}-${endpointCount}` : endpoint.path\n            config.endpoints ??= []\n            config.endpoints.push({\n              handler: endpoint.handler,\n              method: 'post',\n              path: endpointPath,\n            })\n            endpointPaths.set(options.adapter, endpointPath)\n          }\n\n          if (enabled && adminHandler) {\n            config.admin ??= {}\n            config.admin.components ??= {}\n            config.admin.components.providers ??= []\n            config.admin.components.providers.push({\n              clientProps: {\n                collectionSlug: existingCollection.slug,\n                endpointPath,\n                prefix: options.prefix,\n                props: adminHandler.props || {},\n              },\n              path: adminHandler.path,\n            })\n          }\n\n          if (enabled) {\n            uploadInstructions = instructions\n          } else if (adminHandler) {\n            /** Avoid importMap.js differences when client uploads vary between dev and production. */\n            config.admin ??= {}\n            config.admin.dependencies ??= {}\n            config.admin.dependencies[adminHandler.path] = {\n              type: 'component',\n              path: adminHandler.path,\n            }\n          }\n        }\n\n        const fields = getFields({\n          adapter,\n          collection: existingCollection,\n          disablePayloadAccessControl: options.disablePayloadAccessControl,\n          generateFileURL: options.generateFileURL,\n          prefix: options.prefix,\n          useCompositePrefixes,\n        })\n\n        const handlers = [\n          ...(typeof existingCollection.upload === 'object' &&\n          Array.isArray(existingCollection.upload.handlers)\n            ? existingCollection.upload.handlers\n            : []),\n        ]\n\n        if (!options.disablePayloadAccessControl) {\n          handlers.push(adapter.staticHandler)\n          // Else if disablePayloadAccessControl: true and upload instructions are used\n          // Build the \"proxied\" handler that responds only when addDataAndFileToRequest fetches the uploaded file\n        } else if (uploadInstructions) {\n          handlers.push((req, args) => {\n            if ('uploadReference' in args.params) {\n              return adapter.staticHandler(req, args)\n            }\n          })\n        }\n\n        const getSkipSafeFetchSetting = (): AllowList | boolean => {\n          const isBooleanTrueSkipSafeFetch =\n            typeof existingCollection.upload === 'object' &&\n            existingCollection.upload.skipSafeFetch === true\n\n          const isAllowListSkipSafeFetch =\n            typeof existingCollection.upload === 'object' &&\n            Array.isArray(existingCollection.upload.skipSafeFetch)\n\n          if (isBooleanTrueSkipSafeFetch) {\n            return true\n          } else if (isAllowListSkipSafeFetch) {\n            const existingSkipSafeFetch =\n              typeof existingCollection.upload === 'object' &&\n              Array.isArray(existingCollection.upload.skipSafeFetch)\n                ? existingCollection.upload.skipSafeFetch\n                : []\n\n            const hasExactLocalhostMatch = existingSkipSafeFetch.some((entry) => {\n              const entryKeys = Object.keys(entry)\n              return entryKeys.length === 1 && entry.hostname === 'localhost'\n            })\n\n            const localhostEntry =\n              process.env.NODE_ENV !== 'production' && !hasExactLocalhostMatch\n                ? [{ hostname: 'localhost' }]\n                : []\n\n            return [...existingSkipSafeFetch, ...localhostEntry]\n          }\n\n          if (process.env.NODE_ENV !== 'production') {\n            return [{ hostname: 'localhost' }]\n          }\n\n          return false\n        }\n\n        return {\n          ...existingCollection,\n          fields,\n          hooks: {\n            ...(existingCollection.hooks || {}),\n            afterChange: [\n              ...(existingCollection.hooks?.afterChange || []),\n              getAfterChangeHook({\n                adapter,\n                collection: existingCollection,\n                collectionPrefix: options.prefix,\n                useCompositePrefixes,\n              }),\n            ],\n            afterDelete: [\n              ...(existingCollection.hooks?.afterDelete || []),\n              getAfterDeleteHook({\n                adapter,\n                collection: existingCollection,\n                collectionPrefix: options.prefix,\n                useCompositePrefixes,\n              }),\n            ],\n            beforeChange: [\n              ...(existingCollection.hooks?.beforeChange || []),\n              getNormalizeUploadPrefixHook({\n                collectionPrefix: options.prefix,\n                useCompositePrefixes,\n              }),\n              getPreserveFileDataHook(),\n            ],\n          },\n          upload: {\n            ...(typeof existingCollection.upload === 'object' ? existingCollection.upload : {}),\n            adapter: adapter.name,\n            ...(uploadInstructions && {\n              uploadInstructions,\n            }),\n            disableLocalStorage:\n              typeof options.disableLocalStorage === 'boolean' ? options.disableLocalStorage : true,\n            handlers,\n            skipSafeFetch: getSkipSafeFetchSetting(),\n          },\n        }\n      }\n\n      return existingCollection\n    })\n\n    return {\n      ...config,\n      collections,\n      onInit: async (payload) => {\n        // Await each init so a provisioning failure fails Payload startup\n        // instead of becoming an unhandled rejection.\n        await Promise.all(initFunctions.map((fn) => fn()))\n        if (config.onInit) {\n          await config.onInit(payload)\n        }\n      },\n    }\n  }\n"],"names":["getFields","getAfterChangeHook","getAfterDeleteHook","getNormalizeUploadPrefixHook","getPreserveFileDataHook","cloudStoragePlugin","pluginOptions","incomingConfig","collections","allCollectionOptions","enabled","useCompositePrefixes","config","map","existingCollection","options","slug","adapter","collection","prefix","undefined","fields","disablePayloadAccessControl","generateFileURL","initFunctions","endpointPaths","Map","onInit","push","uploadInstructions","adminHandler","endpoint","instructions","endpointPath","get","endpointCount","endpoints","filter","path","startsWith","length","handler","method","set","admin","components","providers","clientProps","collectionSlug","props","dependencies","type","handlers","upload","Array","isArray","staticHandler","req","args","params","getSkipSafeFetchSetting","isBooleanTrueSkipSafeFetch","skipSafeFetch","isAllowListSkipSafeFetch","existingSkipSafeFetch","hasExactLocalhostMatch","some","entry","entryKeys","Object","keys","hostname","localhostEntry","process","env","NODE_ENV","hooks","afterChange","collectionPrefix","afterDelete","beforeChange","name","disableLocalStorage","payload","Promise","all","fn"],"mappings":"AAIA,SAASA,SAAS,QAAQ,wBAAuB;AACjD,SAASC,kBAAkB,QAAQ,yBAAwB;AAC3D,SAASC,kBAAkB,QAAQ,yBAAwB;AAC3D,SAASC,4BAA4B,QAAQ,mCAAkC;AAC/E,SAASC,uBAAuB,QAAQ,8BAA6B;AAErE,4EAA4E;AAC5E,4DAA4D;AAE5D,4FAA4F;AAC5F,iFAAiF;AACjF,qEAAqE;AAErE,0FAA0F;AAE1F,OAAO,MAAMC,qBACX,CAACC,gBACD,CAACC;QACC,MAAM,EAAEC,aAAaC,oBAAoB,EAAEC,OAAO,EAAEC,oBAAoB,EAAE,GAAGL;QAC7E,MAAMM,SAAS;YAAE,GAAGL,cAAc;QAAC;QAEnC,mFAAmF;QACnF,iEAAiE;QACjE,IAAIG,YAAY,OAAO;YACrB,OAAO;gBACL,GAAGE,MAAM;gBACTJ,aAAa,AAACI,CAAAA,OAAOJ,WAAW,IAAI,EAAE,AAAD,EAAGK,GAAG,CAAC,CAACC;oBAC3C,MAAMC,UAAUN,oBAAoB,CAACK,mBAAmBE,IAAI,CAAC;oBAE7D,IAAID,SAAS;wBACX,+CAA+C;wBAC/C,MAAME,UAAUF,QAAQE,OAAO,GAC3BF,QAAQE,OAAO,CAAC;4BACdC,YAAYJ;4BACZK,QAAQJ,QAAQI,MAAM;wBACxB,KACAC;wBAEJ,MAAMC,SAASrB,UAAU;4BACvBiB;4BACAC,YAAYJ;4BACZQ,6BAA6BP,QAAQO,2BAA2B;4BAChEC,iBAAiBR,QAAQQ,eAAe;4BACxCJ,QAAQJ,QAAQI,MAAM;4BACtBR;wBACF;wBAEA,OAAO;4BACL,GAAGG,kBAAkB;4BACrBO;wBACF;oBACF;oBAEA,OAAOP;gBACT;YACF;QACF;QAEA,MAAMU,gBAAmD,EAAE;QAC3D,MAAMC,gBAAgB,IAAIC;QAE1B,MAAMlB,cAAc,AAACI,CAAAA,OAAOJ,WAAW,IAAI,EAAE,AAAD,EAAGK,GAAG,CAAC,CAACC;YAClD,MAAMC,UAAUN,oBAAoB,CAACK,mBAAmBE,IAAI,CAAC;YAE7D,IAAID,SAASE,SAAS;gBACpB,MAAMA,UAAUF,QAAQE,OAAO,CAAC;oBAC9BC,YAAYJ;oBACZK,QAAQJ,QAAQI,MAAM;gBACxB;gBAEA,IAAIF,QAAQU,MAAM,EAAE;oBAClBH,cAAcI,IAAI,CAACX,QAAQU,MAAM;gBACnC;gBAEA,IAAIE;gBAEJ,IAAIZ,QAAQY,kBAAkB,EAAE;oBAC9B,MAAM,EAAEC,YAAY,EAAEpB,OAAO,EAAEqB,QAAQ,EAAE,GAAGC,cAAc,GAAGf,QAAQY,kBAAkB;oBACvF,IAAII,eAAeR,cAAcS,GAAG,CAACnB,QAAQE,OAAO;oBAEpD,IAAIP,WAAWqB,YAAY,CAACE,cAAc;wBACxC,MAAME,gBACJvB,OAAOwB,SAAS,EAAEC,OAAO,CAAC,EAAEC,IAAI,EAAE,GAAKA,MAAMC,WAAWR,SAASO,IAAI,GAAGE,UAAU;wBAEpFP,eAAeE,gBAAgB,GAAGJ,SAASO,IAAI,CAAC,CAAC,EAAEH,eAAe,GAAGJ,SAASO,IAAI;wBAClF1B,OAAOwB,SAAS,KAAK,EAAE;wBACvBxB,OAAOwB,SAAS,CAACR,IAAI,CAAC;4BACpBa,SAASV,SAASU,OAAO;4BACzBC,QAAQ;4BACRJ,MAAML;wBACR;wBACAR,cAAckB,GAAG,CAAC5B,QAAQE,OAAO,EAAEgB;oBACrC;oBAEA,IAAIvB,WAAWoB,cAAc;wBAC3BlB,OAAOgC,KAAK,KAAK,CAAC;wBAClBhC,OAAOgC,KAAK,CAACC,UAAU,KAAK,CAAC;wBAC7BjC,OAAOgC,KAAK,CAACC,UAAU,CAACC,SAAS,KAAK,EAAE;wBACxClC,OAAOgC,KAAK,CAACC,UAAU,CAACC,SAAS,CAAClB,IAAI,CAAC;4BACrCmB,aAAa;gCACXC,gBAAgBlC,mBAAmBE,IAAI;gCACvCiB;gCACAd,QAAQJ,QAAQI,MAAM;gCACtB8B,OAAOnB,aAAamB,KAAK,IAAI,CAAC;4BAChC;4BACAX,MAAMR,aAAaQ,IAAI;wBACzB;oBACF;oBAEA,IAAI5B,SAAS;wBACXmB,qBAAqBG;oBACvB,OAAO,IAAIF,cAAc;wBACvB,wFAAwF,GACxFlB,OAAOgC,KAAK,KAAK,CAAC;wBAClBhC,OAAOgC,KAAK,CAACM,YAAY,KAAK,CAAC;wBAC/BtC,OAAOgC,KAAK,CAACM,YAAY,CAACpB,aAAaQ,IAAI,CAAC,GAAG;4BAC7Ca,MAAM;4BACNb,MAAMR,aAAaQ,IAAI;wBACzB;oBACF;gBACF;gBAEA,MAAMjB,SAASrB,UAAU;oBACvBiB;oBACAC,YAAYJ;oBACZQ,6BAA6BP,QAAQO,2BAA2B;oBAChEC,iBAAiBR,QAAQQ,eAAe;oBACxCJ,QAAQJ,QAAQI,MAAM;oBACtBR;gBACF;gBAEA,MAAMyC,WAAW;uBACX,OAAOtC,mBAAmBuC,MAAM,KAAK,YACzCC,MAAMC,OAAO,CAACzC,mBAAmBuC,MAAM,CAACD,QAAQ,IAC5CtC,mBAAmBuC,MAAM,CAACD,QAAQ,GAClC,EAAE;iBACP;gBAED,IAAI,CAACrC,QAAQO,2BAA2B,EAAE;oBACxC8B,SAASxB,IAAI,CAACX,QAAQuC,aAAa;gBACnC,6EAA6E;gBAC7E,wGAAwG;gBAC1G,OAAO,IAAI3B,oBAAoB;oBAC7BuB,SAASxB,IAAI,CAAC,CAAC6B,KAAKC;wBAClB,IAAI,qBAAqBA,KAAKC,MAAM,EAAE;4BACpC,OAAO1C,QAAQuC,aAAa,CAACC,KAAKC;wBACpC;oBACF;gBACF;gBAEA,MAAME,0BAA0B;oBAC9B,MAAMC,6BACJ,OAAO/C,mBAAmBuC,MAAM,KAAK,YACrCvC,mBAAmBuC,MAAM,CAACS,aAAa,KAAK;oBAE9C,MAAMC,2BACJ,OAAOjD,mBAAmBuC,MAAM,KAAK,YACrCC,MAAMC,OAAO,CAACzC,mBAAmBuC,MAAM,CAACS,aAAa;oBAEvD,IAAID,4BAA4B;wBAC9B,OAAO;oBACT,OAAO,IAAIE,0BAA0B;wBACnC,MAAMC,wBACJ,OAAOlD,mBAAmBuC,MAAM,KAAK,YACrCC,MAAMC,OAAO,CAACzC,mBAAmBuC,MAAM,CAACS,aAAa,IACjDhD,mBAAmBuC,MAAM,CAACS,aAAa,GACvC,EAAE;wBAER,MAAMG,yBAAyBD,sBAAsBE,IAAI,CAAC,CAACC;4BACzD,MAAMC,YAAYC,OAAOC,IAAI,CAACH;4BAC9B,OAAOC,UAAU5B,MAAM,KAAK,KAAK2B,MAAMI,QAAQ,KAAK;wBACtD;wBAEA,MAAMC,iBACJC,QAAQC,GAAG,CAACC,QAAQ,KAAK,gBAAgB,CAACV,yBACtC;4BAAC;gCAAEM,UAAU;4BAAY;yBAAE,GAC3B,EAAE;wBAER,OAAO;+BAAIP;+BAA0BQ;yBAAe;oBACtD;oBAEA,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,cAAc;wBACzC,OAAO;4BAAC;gCAAEJ,UAAU;4BAAY;yBAAE;oBACpC;oBAEA,OAAO;gBACT;gBAEA,OAAO;oBACL,GAAGzD,kBAAkB;oBACrBO;oBACAuD,OAAO;wBACL,GAAI9D,mBAAmB8D,KAAK,IAAI,CAAC,CAAC;wBAClCC,aAAa;+BACP/D,mBAAmB8D,KAAK,EAAEC,eAAe,EAAE;4BAC/C5E,mBAAmB;gCACjBgB;gCACAC,YAAYJ;gCACZgE,kBAAkB/D,QAAQI,MAAM;gCAChCR;4BACF;yBACD;wBACDoE,aAAa;+BACPjE,mBAAmB8D,KAAK,EAAEG,eAAe,EAAE;4BAC/C7E,mBAAmB;gCACjBe;gCACAC,YAAYJ;gCACZgE,kBAAkB/D,QAAQI,MAAM;gCAChCR;4BACF;yBACD;wBACDqE,cAAc;+BACRlE,mBAAmB8D,KAAK,EAAEI,gBAAgB,EAAE;4BAChD7E,6BAA6B;gCAC3B2E,kBAAkB/D,QAAQI,MAAM;gCAChCR;4BACF;4BACAP;yBACD;oBACH;oBACAiD,QAAQ;wBACN,GAAI,OAAOvC,mBAAmBuC,MAAM,KAAK,WAAWvC,mBAAmBuC,MAAM,GAAG,CAAC,CAAC;wBAClFpC,SAASA,QAAQgE,IAAI;wBACrB,GAAIpD,sBAAsB;4BACxBA;wBACF,CAAC;wBACDqD,qBACE,OAAOnE,QAAQmE,mBAAmB,KAAK,YAAYnE,QAAQmE,mBAAmB,GAAG;wBACnF9B;wBACAU,eAAeF;oBACjB;gBACF;YACF;YAEA,OAAO9C;QACT;QAEA,OAAO;YACL,GAAGF,MAAM;YACTJ;YACAmB,QAAQ,OAAOwD;gBACb,kEAAkE;gBAClE,8CAA8C;gBAC9C,MAAMC,QAAQC,GAAG,CAAC7D,cAAcX,GAAG,CAAC,CAACyE,KAAOA;gBAC5C,IAAI1E,OAAOe,MAAM,EAAE;oBACjB,MAAMf,OAAOe,MAAM,CAACwD;gBACtB;YACF;QACF;IACF,EAAC"}
+{"version":3,"sources":["../src/plugin.ts"],"sourcesContent":["import type { Config } from 'payload'\n\nimport type { Adapter, AllowList, PluginOptions } from './types.js'\n\nimport { getFields } from './fields/getFields.js'\nimport { getAfterChangeHook } from './hooks/afterChange.js'\nimport { getAfterDeleteHook, getDeleteFiles } from './hooks/afterDelete.js'\nimport { getNormalizeUploadPrefixHook } from './hooks/normalizeUploadPrefix.js'\nimport { getPreserveFileDataHook } from './hooks/preserveFileData.js'\nimport { getPublicOriginalURLHook } from './hooks/publicOriginalURL.js'\nimport { createFileOperations } from './utilities/createFileOperations.js'\nimport { getStorageLocationSelect } from './utilities/getStorageLocationSelect.js'\n\n// This plugin extends all targeted collections by offloading uploaded files\n// to cloud storage instead of solely storing files locally.\n\n// It is based on an adapter approach, where adapters can be written for any cloud provider.\n// Adapters are responsible for providing four actions that this plugin will use:\n// 1. handleUpload, 2. handleDelete, 3. generateURL, 4. staticHandler\n\n// Optionally, the adapter can specify any Webpack config overrides if they are necessary.\n\nexport const cloudStoragePlugin =\n  (pluginOptions: PluginOptions) =>\n  (incomingConfig: Config): Config => {\n    const { collections: allCollectionOptions, enabled, useCompositePrefixes } = pluginOptions\n    const config = { ...incomingConfig }\n\n    // If disabled, only insert fields (e.g. prefix) without full plugin functionality,\n    // so the collection schema stays consistent across environments.\n    if (enabled === false) {\n      return {\n        ...config,\n        collections: (config.collections || []).map((existingCollection) => {\n          const options = allCollectionOptions[existingCollection.slug]\n\n          if (options) {\n            // If adapter is provided, use it to get fields\n            const adapter = options.adapter\n              ? options.adapter({\n                  collection: existingCollection,\n                  prefix: options.prefix,\n                })\n              : undefined\n\n            const fields = getFields({\n              adapter,\n              collection: existingCollection,\n              disablePayloadAccessControl: options.disablePayloadAccessControl,\n              generateFileURL: options.generateFileURL,\n              prefix: options.prefix,\n              useCompositePrefixes,\n            })\n\n            return {\n              ...existingCollection,\n              fields,\n            }\n          }\n\n          return existingCollection\n        }),\n      }\n    }\n\n    const initFunctions: Array<() => Promise<void> | void> = []\n    const endpointPaths = new Map<Adapter, string>()\n\n    const collections = (config.collections || []).map((existingCollection) => {\n      const options = allCollectionOptions[existingCollection.slug]\n\n      if (options?.adapter) {\n        const adapter = options.adapter({\n          collection: existingCollection,\n          prefix: options.prefix,\n        })\n\n        if (adapter.onInit) {\n          initFunctions.push(adapter.onInit)\n        }\n\n        let uploadInstructions\n\n        if (adapter.uploadInstructions) {\n          const { adminHandler, enabled, endpoint, ...instructions } = adapter.uploadInstructions\n          let endpointPath = endpointPaths.get(options.adapter)\n\n          if (enabled && endpoint && !endpointPath) {\n            const endpointCount =\n              config.endpoints?.filter(({ path }) => path?.startsWith(endpoint.path)).length || 0\n\n            endpointPath = endpointCount ? `${endpoint.path}-${endpointCount}` : endpoint.path\n            config.endpoints ??= []\n            config.endpoints.push({\n              handler: endpoint.handler,\n              method: 'post',\n              path: endpointPath,\n            })\n            endpointPaths.set(options.adapter, endpointPath)\n          }\n\n          if (enabled && adminHandler) {\n            config.admin ??= {}\n            config.admin.components ??= {}\n            config.admin.components.providers ??= []\n            config.admin.components.providers.push({\n              clientProps: {\n                collectionSlug: existingCollection.slug,\n                endpointPath,\n                prefix: options.prefix,\n                props: adminHandler.props || {},\n              },\n              path: adminHandler.path,\n            })\n          }\n\n          if (enabled) {\n            uploadInstructions = instructions\n          } else if (adminHandler) {\n            /** Avoid importMap.js differences when client uploads vary between dev and production. */\n            config.admin ??= {}\n            config.admin.dependencies ??= {}\n            config.admin.dependencies[adminHandler.path] = {\n              type: 'component',\n              path: adminHandler.path,\n            }\n          }\n        }\n\n        const fields = getFields({\n          adapter,\n          collection: existingCollection,\n          disablePayloadAccessControl: options.disablePayloadAccessControl,\n          generateFileURL: options.generateFileURL,\n          prefix: options.prefix,\n          useCompositePrefixes,\n        })\n\n        const handlers = [\n          ...(typeof existingCollection.upload === 'object' &&\n          Array.isArray(existingCollection.upload.handlers)\n            ? existingCollection.upload.handlers\n            : []),\n        ]\n\n        if (!options.disablePayloadAccessControl) {\n          handlers.push(adapter.staticHandler)\n          // Public files still need a server path when Payload reads them for a transform.\n        } else {\n          handlers.push((req, args) => {\n            if ('uploadReference' in args.params || args.params.operation === 'transform') {\n              return adapter.staticHandler(req, args)\n            }\n          })\n        }\n\n        const getSkipSafeFetchSetting = (): AllowList | boolean => {\n          const isBooleanTrueSkipSafeFetch =\n            typeof existingCollection.upload === 'object' &&\n            existingCollection.upload.skipSafeFetch === true\n\n          const isAllowListSkipSafeFetch =\n            typeof existingCollection.upload === 'object' &&\n            Array.isArray(existingCollection.upload.skipSafeFetch)\n\n          if (isBooleanTrueSkipSafeFetch) {\n            return true\n          } else if (isAllowListSkipSafeFetch) {\n            const existingSkipSafeFetch =\n              typeof existingCollection.upload === 'object' &&\n              Array.isArray(existingCollection.upload.skipSafeFetch)\n                ? existingCollection.upload.skipSafeFetch\n                : []\n\n            const hasExactLocalhostMatch = existingSkipSafeFetch.some((entry) => {\n              const entryKeys = Object.keys(entry)\n              return entryKeys.length === 1 && entry.hostname === 'localhost'\n            })\n\n            const localhostEntry =\n              process.env.NODE_ENV !== 'production' && !hasExactLocalhostMatch\n                ? [{ hostname: 'localhost' }]\n                : []\n\n            return [...existingSkipSafeFetch, ...localhostEntry]\n          }\n\n          if (process.env.NODE_ENV !== 'production') {\n            return [{ hostname: 'localhost' }]\n          }\n\n          return false\n        }\n\n        return {\n          ...existingCollection,\n          fields,\n          hooks: {\n            ...(existingCollection.hooks || {}),\n            afterChange: [\n              ...(existingCollection.hooks?.afterChange || []),\n              getAfterChangeHook({\n                adapter,\n                collection: existingCollection,\n                collectionPrefix: options.prefix,\n                disablePayloadAccessControl: options.disablePayloadAccessControl,\n                hasCustomFileURL: Boolean(options.generateFileURL),\n                useCompositePrefixes,\n              }),\n            ],\n            afterDelete: [\n              ...(existingCollection.hooks?.afterDelete || []),\n              getAfterDeleteHook({\n                adapter,\n                collection: existingCollection,\n                collectionPrefix: options.prefix,\n                useCompositePrefixes,\n              }),\n            ],\n            afterRead: [\n              ...(existingCollection.hooks?.afterRead || []),\n              ...(options.disablePayloadAccessControl &&\n              (options.generateFileURL || adapter.generateURL)\n                ? [\n                    getPublicOriginalURLHook({\n                      adapter,\n                      collection: existingCollection,\n                      generateFileURL: options.generateFileURL,\n                    }),\n                  ]\n                : []),\n            ],\n            beforeChange: [\n              ...(existingCollection.hooks?.beforeChange || []),\n              getNormalizeUploadPrefixHook({\n                collectionPrefix: options.prefix,\n                useCompositePrefixes,\n              }),\n              getPreserveFileDataHook(),\n            ],\n          },\n          select: getStorageLocationSelect({ select: existingCollection.select }),\n          upload: {\n            ...(typeof existingCollection.upload === 'object' ? existingCollection.upload : {}),\n            adapter: adapter.name,\n            deleteFiles: getDeleteFiles({\n              adapter,\n              collection: existingCollection,\n              collectionPrefix: options.prefix,\n              useCompositePrefixes,\n            }),\n            fileOperations: createFileOperations({\n              adapter,\n              collection: existingCollection,\n              collectionPrefix: options.prefix,\n              disablePayloadAccessControl: options.disablePayloadAccessControl,\n              generateFileURL: options.generateFileURL,\n              useCompositePrefixes,\n            }),\n            ...(uploadInstructions && {\n              uploadInstructions,\n            }),\n            disableLocalStorage:\n              typeof options.disableLocalStorage === 'boolean' ? options.disableLocalStorage : true,\n            handlers,\n            skipSafeFetch: getSkipSafeFetchSetting(),\n          },\n        }\n      }\n\n      return existingCollection\n    })\n\n    return {\n      ...config,\n      collections,\n      onInit: async (payload) => {\n        // Await each init so a provisioning failure fails Payload startup\n        // instead of becoming an unhandled rejection.\n        await Promise.all(initFunctions.map((fn) => fn()))\n        if (config.onInit) {\n          await config.onInit(payload)\n        }\n      },\n    }\n  }\n"],"names":["getFields","getAfterChangeHook","getAfterDeleteHook","getDeleteFiles","getNormalizeUploadPrefixHook","getPreserveFileDataHook","getPublicOriginalURLHook","createFileOperations","getStorageLocationSelect","cloudStoragePlugin","pluginOptions","incomingConfig","collections","allCollectionOptions","enabled","useCompositePrefixes","config","map","existingCollection","options","slug","adapter","collection","prefix","undefined","fields","disablePayloadAccessControl","generateFileURL","initFunctions","endpointPaths","Map","onInit","push","uploadInstructions","adminHandler","endpoint","instructions","endpointPath","get","endpointCount","endpoints","filter","path","startsWith","length","handler","method","set","admin","components","providers","clientProps","collectionSlug","props","dependencies","type","handlers","upload","Array","isArray","staticHandler","req","args","params","operation","getSkipSafeFetchSetting","isBooleanTrueSkipSafeFetch","skipSafeFetch","isAllowListSkipSafeFetch","existingSkipSafeFetch","hasExactLocalhostMatch","some","entry","entryKeys","Object","keys","hostname","localhostEntry","process","env","NODE_ENV","hooks","afterChange","collectionPrefix","hasCustomFileURL","Boolean","afterDelete","afterRead","generateURL","beforeChange","select","name","deleteFiles","fileOperations","disableLocalStorage","payload","Promise","all","fn"],"mappings":"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"}