@payloadcms/plugin-cloud-storage 4.0.0-internal.5b1e7cd → 4.0.0-internal.5e065b3

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2025 Payload CMS, Inc. <info@payloadcms.com>
+Copyright (c) 2018-2026 Payload CMS, LLC <info@payloadcms.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -98,6 +98,8 @@ Instead, all uploads will still be reached from the default `/:collectionSlug/fi
 
 If this does not apply to you (your upload collection has `read: () => true` or similar) you can disable this functionality by setting `disablePayloadAccessControl` to `true`. When this setting is in place, this plugin will update your file URLs to point directly to your cloud host.
 
+`disablePayloadAccessControl` does not disable safe outbound fetching. If Payload needs to fetch files from a private or internal storage endpoint, configure the upload collection's [`skipSafeFetch`](https://payloadcms.com/docs/upload/overview#skip-safe-fetch) option with an explicit allowlist for the trusted destination. Set `skipSafeFetch: true` only when every URL accepted by the collection is trusted.
+
 ## Credit
 
 This plugin was created with significant help, and code, from [Alex Bechmann](https://github.com/alexbechmann) and [Richard VanBergen](https://github.com/richardvanbergen). Thank you!!

package/dist/client/createClientUploadHandler.d.ts

@@ -3,23 +3,24 @@ import { type ReactNode } from 'react';
 type ClientUploadHandlerProps<T extends Record<string, unknown>> = {
     children: ReactNode;
     collectionSlug: UploadCollectionSlug;
-    enabled?: boolean;
-    extra: T;
+    endpointPath?: `/${string}`;
     prefix?: string;
-    serverHandlerPath: `/${string}`;
+    props: T;
 };
-export declare const createClientUploadHandler: <T extends Record<string, unknown>>({ handler, }: {
+export declare const createClientUploadHandler: <T extends Record<string, unknown>>({ name, handler, }: {
     handler: (args: {
         apiRoute: string;
         collectionSlug: UploadCollectionSlug;
+        data?: unknown;
         docPrefix?: string;
-        extra: T;
+        endpointPath?: `/${string}`;
         file: File;
         prefix?: string;
-        serverHandlerPath: `/${string}`;
+        props: T;
         serverURL: string;
         updateFilename: (value: string) => void;
     }) => Promise<unknown>;
-}) => ({ children, collectionSlug, enabled, extra, prefix, serverHandlerPath, }: ClientUploadHandlerProps<T>) => import("react").JSX.Element;
+    name: string;
+}) => ({ children, collectionSlug, endpointPath, prefix, props, }: ClientUploadHandlerProps<T>) => import("react").JSX.Element;
 export {};
 //# sourceMappingURL=createClientUploadHandler.d.ts.map

package/dist/client/createClientUploadHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/createClientUploadHandler.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAGnD,OAAO,EAAY,KAAK,SAAS,EAAa,MAAM,OAAO,CAAA;AAE3D,KAAK,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IACjE,QAAQ,EAAE,SAAS,CAAA;IACnB,cAAc,EAAE,oBAAoB,CAAA;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,EAAE,CAAC,CAAA;IACR,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,EAAE,IAAI,MAAM,EAAE,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,yBAAyB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,gBAExE;IACD,OAAO,EAAE,CAAC,IAAI,EAAE;QACd,QAAQ,EAAE,MAAM,CAAA;QAChB,cAAc,EAAE,oBAAoB,CAAA;QACpC,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,KAAK,EAAE,CAAC,CAAA;QACR,IAAI,EAAE,IAAI,CAAA;QACV,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,iBAAiB,EAAE,IAAI,MAAM,EAAE,CAAA;QAC/B,SAAS,EAAE,MAAM,CAAA;QACjB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KACxC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CACvB,gFAQI,wBAAwB,CAAC,CAAC,CAAC,gCAoC/B,CAAA"}
+{"version":3,"file":"createClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/createClientUploadHandler.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAGnD,OAAO,EAAY,KAAK,SAAS,EAAa,MAAM,OAAO,CAAA;AAE3D,KAAK,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IACjE,QAAQ,EAAE,SAAS,CAAA;IACnB,cAAc,EAAE,oBAAoB,CAAA;IACpC,YAAY,CAAC,EAAE,IAAI,MAAM,EAAE,CAAA;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,CAAC,CAAA;CACT,CAAA;AAED,eAAO,MAAM,yBAAyB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,sBAGxE;IACD,OAAO,EAAE,CAAC,IAAI,EAAE;QACd,QAAQ,EAAE,MAAM,CAAA;QAChB,cAAc,EAAE,oBAAoB,CAAA;QACpC,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,YAAY,CAAC,EAAE,IAAI,MAAM,EAAE,CAAA;QAC3B,IAAI,EAAE,IAAI,CAAA;QACV,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,KAAK,EAAE,CAAC,CAAA;QACR,SAAS,EAAE,MAAM,CAAA;QACjB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KACxC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;CACb,kEAOI,wBAAwB,CAAC,CAAC,CAAC,gCAmD/B,CAAA"}

package/dist/client/createClientUploadHandler.js

@@ -1,33 +1,37 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useConfig, useEffectEvent, useUploadHandlers } from '@payloadcms/ui';
+import { useConfig, useEffectEvent } from '@payloadcms/ui';
 import { Fragment, useEffect } from 'react';
-export const createClientUploadHandler = ({ handler })=>{
-    return function ClientUploadHandler({ children, collectionSlug, enabled, extra, prefix, serverHandlerPath }) {
-        const { setUploadHandler } = useUploadHandlers();
+export const createClientUploadHandler = ({ name, handler })=>{
+    return function ClientUploadHandler({ children, collectionSlug, endpointPath, prefix, props }) {
         const { config: { routes: { api: apiRoute }, serverURL } } = useConfig();
         const initializeHandler = useEffectEvent(()=>{
-            if (enabled) {
-                setUploadHandler({
+            const listener = (event)=>{
+                const customEvent = event;
+                if (customEvent.detail.collectionSlug !== collectionSlug) {
+                    return;
+                }
+                customEvent.preventDefault();
+                void handler({
+                    apiRoute,
                     collectionSlug,
-                    handler: ({ docPrefix, file, updateFilename })=>{
-                        return handler({
-                            apiRoute,
-                            collectionSlug,
-                            docPrefix,
-                            extra,
-                            file,
-                            prefix,
-                            serverHandlerPath,
-                            serverURL,
-                            updateFilename
-                        });
-                    }
-                });
-            }
+                    data: customEvent.detail.data,
+                    docPrefix: customEvent.detail.docPrefix,
+                    endpointPath,
+                    file: customEvent.detail.file,
+                    prefix,
+                    props,
+                    serverURL,
+                    updateFilename: customEvent.detail.updateFilename
+                }).then(customEvent.detail.resolve, customEvent.detail.reject);
+            };
+            const eventName = `payload:upload:${name}`;
+            const eventTarget = globalThis;
+            eventTarget.addEventListener(eventName, listener);
+            return ()=>eventTarget.removeEventListener(eventName, listener);
         });
         useEffect(()=>{
-            initializeHandler();
+            return initializeHandler();
         }, []);
         return /*#__PURE__*/ _jsx(Fragment, {
             children: children

package/dist/client/createClientUploadHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/client/createClientUploadHandler.tsx"],"sourcesContent":["'use client'\n\nimport type { UploadCollectionSlug } from 'payload'\n\nimport { useConfig, useEffectEvent, useUploadHandlers } from '@payloadcms/ui'\nimport { Fragment, type ReactNode, useEffect } from 'react'\n\ntype ClientUploadHandlerProps<T extends Record<string, unknown>> = {\n  children: ReactNode\n  collectionSlug: UploadCollectionSlug\n  enabled?: boolean\n  extra: T\n  prefix?: string\n  serverHandlerPath: `/${string}`\n}\n\nexport const createClientUploadHandler = <T extends Record<string, unknown>>({\n  handler,\n}: {\n  handler: (args: {\n    apiRoute: string\n    collectionSlug: UploadCollectionSlug\n    docPrefix?: string\n    extra: T\n    file: File\n    prefix?: string\n    serverHandlerPath: `/${string}`\n    serverURL: string\n    updateFilename: (value: string) => void\n  }) => Promise<unknown>\n}) => {\n  return function ClientUploadHandler({\n    children,\n    collectionSlug,\n    enabled,\n    extra,\n    prefix,\n    serverHandlerPath,\n  }: ClientUploadHandlerProps<T>) {\n    const { setUploadHandler } = useUploadHandlers()\n    const {\n      config: {\n        routes: { api: apiRoute },\n        serverURL,\n      },\n    } = useConfig()\n\n    const initializeHandler = useEffectEvent(() => {\n      if (enabled) {\n        setUploadHandler({\n          collectionSlug,\n          handler: ({ docPrefix, file, updateFilename }) => {\n            return handler({\n              apiRoute,\n              collectionSlug,\n              docPrefix,\n              extra,\n              file,\n              prefix,\n              serverHandlerPath,\n              serverURL,\n              updateFilename,\n            })\n          },\n        })\n      }\n    })\n\n    useEffect(() => {\n      initializeHandler()\n    }, [])\n\n    return <Fragment>{children}</Fragment>\n  }\n}\n"],"names":["useConfig","useEffectEvent","useUploadHandlers","Fragment","useEffect","createClientUploadHandler","handler","ClientUploadHandler","children","collectionSlug","enabled","extra","prefix","serverHandlerPath","setUploadHandler","config","routes","api","apiRoute","serverURL","initializeHandler","docPrefix","file","updateFilename"],"mappings":"AAAA;;AAIA,SAASA,SAAS,EAAEC,cAAc,EAAEC,iBAAiB,QAAQ,iBAAgB;AAC7E,SAASC,QAAQ,EAAkBC,SAAS,QAAQ,QAAO;AAW3D,OAAO,MAAMC,4BAA4B,CAAoC,EAC3EC,OAAO,EAaR;IACC,OAAO,SAASC,oBAAoB,EAClCC,QAAQ,EACRC,cAAc,EACdC,OAAO,EACPC,KAAK,EACLC,MAAM,EACNC,iBAAiB,EACW;QAC5B,MAAM,EAAEC,gBAAgB,EAAE,GAAGZ;QAC7B,MAAM,EACJa,QAAQ,EACNC,QAAQ,EAAEC,KAAKC,QAAQ,EAAE,EACzBC,SAAS,EACV,EACF,GAAGnB;QAEJ,MAAMoB,oBAAoBnB,eAAe;YACvC,IAAIS,SAAS;gBACXI,iBAAiB;oBACfL;oBACAH,SAAS,CAAC,EAAEe,SAAS,EAAEC,IAAI,EAAEC,cAAc,EAAE;wBAC3C,OAAOjB,QAAQ;4BACbY;4BACAT;4BACAY;4BACAV;4BACAW;4BACAV;4BACAC;4BACAM;4BACAI;wBACF;oBACF;gBACF;YACF;QACF;QAEAnB,UAAU;YACRgB;QACF,GAAG,EAAE;QAEL,qBAAO,KAACjB;sBAAUK;;IACpB;AACF,EAAC"}
+{"version":3,"sources":["../../src/client/createClientUploadHandler.tsx"],"sourcesContent":["'use client'\n\nimport type { UploadCollectionSlug } from 'payload'\n\nimport { useConfig, useEffectEvent } from '@payloadcms/ui'\nimport { Fragment, type ReactNode, useEffect } from 'react'\n\ntype ClientUploadHandlerProps<T extends Record<string, unknown>> = {\n  children: ReactNode\n  collectionSlug: UploadCollectionSlug\n  endpointPath?: `/${string}`\n  prefix?: string\n  props: T\n}\n\nexport const createClientUploadHandler = <T extends Record<string, unknown>>({\n  name,\n  handler,\n}: {\n  handler: (args: {\n    apiRoute: string\n    collectionSlug: UploadCollectionSlug\n    data?: unknown\n    docPrefix?: string\n    endpointPath?: `/${string}`\n    file: File\n    prefix?: string\n    props: T\n    serverURL: string\n    updateFilename: (value: string) => void\n  }) => Promise<unknown>\n  name: string\n}) => {\n  return function ClientUploadHandler({\n    children,\n    collectionSlug,\n    endpointPath,\n    prefix,\n    props,\n  }: ClientUploadHandlerProps<T>) {\n    const {\n      config: {\n        routes: { api: apiRoute },\n        serverURL,\n      },\n    } = useConfig()\n\n    const initializeHandler = useEffectEvent(() => {\n      const listener = (event: Event) => {\n        const customEvent = event as CustomEvent<{\n          collectionSlug: UploadCollectionSlug\n          data?: unknown\n          docPrefix?: string\n          file: File\n          reject: (reason?: unknown) => void\n          resolve: (value: unknown) => void\n          updateFilename: (value: string) => void\n        }>\n\n        if (customEvent.detail.collectionSlug !== collectionSlug) {\n          return\n        }\n\n        customEvent.preventDefault()\n        void handler({\n          apiRoute,\n          collectionSlug,\n          data: customEvent.detail.data,\n          docPrefix: customEvent.detail.docPrefix,\n          endpointPath,\n          file: customEvent.detail.file,\n          prefix,\n          props,\n          serverURL,\n          updateFilename: customEvent.detail.updateFilename,\n        }).then(customEvent.detail.resolve, customEvent.detail.reject)\n      }\n\n      const eventName = `payload:upload:${name}`\n      const eventTarget = globalThis as unknown as EventTarget\n      eventTarget.addEventListener(eventName, listener)\n      return () => eventTarget.removeEventListener(eventName, listener)\n    })\n\n    useEffect(() => {\n      return initializeHandler()\n    }, [])\n\n    return <Fragment>{children}</Fragment>\n  }\n}\n"],"names":["useConfig","useEffectEvent","Fragment","useEffect","createClientUploadHandler","name","handler","ClientUploadHandler","children","collectionSlug","endpointPath","prefix","props","config","routes","api","apiRoute","serverURL","initializeHandler","listener","event","customEvent","detail","preventDefault","data","docPrefix","file","updateFilename","then","resolve","reject","eventName","eventTarget","globalThis","addEventListener","removeEventListener"],"mappings":"AAAA;;AAIA,SAASA,SAAS,EAAEC,cAAc,QAAQ,iBAAgB;AAC1D,SAASC,QAAQ,EAAkBC,SAAS,QAAQ,QAAO;AAU3D,OAAO,MAAMC,4BAA4B,CAAoC,EAC3EC,IAAI,EACJC,OAAO,EAeR;IACC,OAAO,SAASC,oBAAoB,EAClCC,QAAQ,EACRC,cAAc,EACdC,YAAY,EACZC,MAAM,EACNC,KAAK,EACuB;QAC5B,MAAM,EACJC,QAAQ,EACNC,QAAQ,EAAEC,KAAKC,QAAQ,EAAE,EACzBC,SAAS,EACV,EACF,GAAGjB;QAEJ,MAAMkB,oBAAoBjB,eAAe;YACvC,MAAMkB,WAAW,CAACC;gBAChB,MAAMC,cAAcD;gBAUpB,IAAIC,YAAYC,MAAM,CAACb,cAAc,KAAKA,gBAAgB;oBACxD;gBACF;gBAEAY,YAAYE,cAAc;gBAC1B,KAAKjB,QAAQ;oBACXU;oBACAP;oBACAe,MAAMH,YAAYC,MAAM,CAACE,IAAI;oBAC7BC,WAAWJ,YAAYC,MAAM,CAACG,SAAS;oBACvCf;oBACAgB,MAAML,YAAYC,MAAM,CAACI,IAAI;oBAC7Bf;oBACAC;oBACAK;oBACAU,gBAAgBN,YAAYC,MAAM,CAACK,cAAc;gBACnD,GAAGC,IAAI,CAACP,YAAYC,MAAM,CAACO,OAAO,EAAER,YAAYC,MAAM,CAACQ,MAAM;YAC/D;YAEA,MAAMC,YAAY,CAAC,eAAe,EAAE1B,MAAM;YAC1C,MAAM2B,cAAcC;YACpBD,YAAYE,gBAAgB,CAACH,WAAWZ;YACxC,OAAO,IAAMa,YAAYG,mBAAmB,CAACJ,WAAWZ;QAC1D;QAEAhB,UAAU;YACR,OAAOe;QACT,GAAG,EAAE;QAEL,qBAAO,KAAChB;sBAAUM;;IACpB;AACF,EAAC"}

package/dist/exports/client.d.ts

@@ -1,2 +1,4 @@
 export { createClientUploadHandler } from '../client/createClientUploadHandler.js';
+export { buildStoragePathData, buildUploadStoragePathData, } from '../utilities/buildStoragePathData.js';
+export { sanitizePrefix } from '../utilities/sanitizePrefix.js';
 //# sourceMappingURL=client.d.ts.map

package/dist/exports/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAA;AAClF,OAAO,EACL,oBAAoB,EACpB,0BAA0B,GAC3B,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA"}

package/dist/exports/client.js

@@ -1,3 +1,5 @@
 export { createClientUploadHandler } from '../client/createClientUploadHandler.js';
+export { buildStoragePathData, buildUploadStoragePathData } from '../utilities/buildStoragePathData.js';
+export { sanitizePrefix } from '../utilities/sanitizePrefix.js';
 
 //# sourceMappingURL=client.js.map

package/dist/exports/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/client.ts"],"sourcesContent":["export { createClientUploadHandler } from '../client/createClientUploadHandler.js'\n"],"names":["createClientUploadHandler"],"mappings":"AAAA,SAASA,yBAAyB,QAAQ,yCAAwC"}
+{"version":3,"sources":["../../src/exports/client.ts"],"sourcesContent":["export { createClientUploadHandler } from '../client/createClientUploadHandler.js'\nexport {\n  buildStoragePathData,\n  buildUploadStoragePathData,\n} from '../utilities/buildStoragePathData.js'\nexport { sanitizePrefix } from '../utilities/sanitizePrefix.js'\n"],"names":["createClientUploadHandler","buildStoragePathData","buildUploadStoragePathData","sanitizePrefix"],"mappings":"AAAA,SAASA,yBAAyB,QAAQ,yCAAwC;AAClF,SACEC,oBAAoB,EACpBC,0BAA0B,QACrB,uCAAsC;AAC7C,SAASC,cAAc,QAAQ,iCAAgC"}

package/dist/exports/utilities.d.ts

@@ -1,5 +1,5 @@
-export { getFileKey } from '../utilities/getFileKey.js';
+export { buildStoragePathData, buildUploadStoragePathData, isStoragePathWithinCollectionPrefix, } from '../utilities/buildStoragePathData.js';
 export { getFilePrefix } from '../utilities/getFilePrefix.js';
-export { initClientUploads } from '../utilities/initClientUploads.js';
+export { resolveSignedURLKey } from '../utilities/resolveSignedURLKey.js';
 export { sanitizePrefix } from '../utilities/sanitizePrefix.js';
 //# sourceMappingURL=utilities.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../src/exports/utilities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA"}
+{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../src/exports/utilities.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,mCAAmC,GACpC,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA"}

package/dist/exports/utilities.js

@@ -1,6 +1,6 @@
-export { getFileKey } from '../utilities/getFileKey.js';
+export { buildStoragePathData, buildUploadStoragePathData, isStoragePathWithinCollectionPrefix } from '../utilities/buildStoragePathData.js';
 export { getFilePrefix } from '../utilities/getFilePrefix.js';
-export { initClientUploads } from '../utilities/initClientUploads.js';
+export { resolveSignedURLKey } from '../utilities/resolveSignedURLKey.js';
 export { sanitizePrefix } from '../utilities/sanitizePrefix.js';
 
 //# sourceMappingURL=utilities.js.map

package/dist/exports/utilities.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/utilities.ts"],"sourcesContent":["export { getFileKey } from '../utilities/getFileKey.js'\nexport { getFilePrefix } from '../utilities/getFilePrefix.js'\nexport { initClientUploads } from '../utilities/initClientUploads.js'\nexport { sanitizePrefix } from '../utilities/sanitizePrefix.js'\n"],"names":["getFileKey","getFilePrefix","initClientUploads","sanitizePrefix"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6BAA4B;AACvD,SAASC,aAAa,QAAQ,gCAA+B;AAC7D,SAASC,iBAAiB,QAAQ,oCAAmC;AACrE,SAASC,cAAc,QAAQ,iCAAgC"}
+{"version":3,"sources":["../../src/exports/utilities.ts"],"sourcesContent":["export {\n  buildStoragePathData,\n  buildUploadStoragePathData,\n  isStoragePathWithinCollectionPrefix,\n} from '../utilities/buildStoragePathData.js'\nexport { getFilePrefix } from '../utilities/getFilePrefix.js'\nexport { resolveSignedURLKey } from '../utilities/resolveSignedURLKey.js'\nexport { sanitizePrefix } from '../utilities/sanitizePrefix.js'\n"],"names":["buildStoragePathData","buildUploadStoragePathData","isStoragePathWithinCollectionPrefix","getFilePrefix","resolveSignedURLKey","sanitizePrefix"],"mappings":"AAAA,SACEA,oBAAoB,EACpBC,0BAA0B,EAC1BC,mCAAmC,QAC9B,uCAAsC;AAC7C,SAASC,aAAa,QAAQ,gCAA+B;AAC7D,SAASC,mBAAmB,QAAQ,sCAAqC;AACzE,SAASC,cAAc,QAAQ,iCAAgC"}

package/dist/fields/getFields.d.ts

@@ -2,10 +2,6 @@ import type { CollectionConfig, Field } from 'payload';
 import type { GeneratedAdapter, GenerateFileURL } from '../types.js';
 interface Args {
     adapter?: GeneratedAdapter;
-    /**
-     * When true, always insert the prefix field regardless of whether a prefix is configured.
-     */
-    alwaysInsertFields?: boolean;
     collection: CollectionConfig;
     disablePayloadAccessControl?: true;
     generateFileURL?: GenerateFileURL;
@@ -16,6 +12,6 @@ interface Args {
      */
     useCompositePrefixes?: boolean;
 }
-export declare const getFields: ({ adapter, alwaysInsertFields, collection, disablePayloadAccessControl, generateFileURL, prefix, useCompositePrefixes, }: Args) => Field[];
+export declare const getFields: ({ adapter, collection, disablePayloadAccessControl, generateFileURL, prefix, useCompositePrefixes, }: Args) => Field[];
 export {};
 //# sourceMappingURL=getFields.d.ts.map

package/dist/fields/getFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFields.d.ts","sourceRoot":"","sources":["../../src/fields/getFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAyB,MAAM,SAAS,CAAA;AAI7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAKpE,UAAU,IAAI;IACZ,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,2BAA2B,CAAC,EAAE,IAAI,CAAA;IAClC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,SAAS,6HAQnB,IAAI,KAAG,KAAK,EA6Kd,CAAA"}
+{"version":3,"file":"getFields.d.ts","sourceRoot":"","sources":["../../src/fields/getFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAgD,MAAM,SAAS,CAAA;AAIpG,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAMpE,UAAU,IAAI;IACZ,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,2BAA2B,CAAC,EAAE,IAAI,CAAA;IAClC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,SAAS,yGAOnB,IAAI,KAAG,KAAK,EAkNd,CAAA"}

package/dist/fields/getFields.js

@@ -1,7 +1,8 @@
 import path from 'path';
 import { getAfterReadHook } from '../hooks/afterRead.js';
 import { getBeforeChangeHook } from '../hooks/beforeChange.js';
-export const getFields = ({ adapter, alwaysInsertFields, collection, disablePayloadAccessControl, generateFileURL, prefix, useCompositePrefixes = false })=>{
+import { getNormalizeUploadPrefixFieldHook } from '../hooks/normalizeUploadPrefix.js';
+export const getFields = ({ adapter, collection, disablePayloadAccessControl, generateFileURL, prefix, useCompositePrefixes = false })=>{
     const baseURLField = {
         name: 'url',
         type: 'text',
@@ -15,10 +16,22 @@ export const getFields = ({ adapter, alwaysInsertFields, collection, disablePayl
         name: 'prefix',
         type: 'text',
         admin: {
+            disabled: {
+                bulkEdit: true,
+                column: true,
+                filter: true,
+                groupBy: true
+            },
             hidden: true,
             readOnly: true
         }
     };
+    // Server-owned key segment; hidden from the API and admin, read internally via showHiddenFields.
+    const baseObjectKeyField = {
+        name: '_objectKey',
+        type: 'text',
+        hidden: true
+    };
     const fields = [
         ...collection.fields,
         ...adapter?.fields || []
@@ -67,10 +80,13 @@ export const getFields = ({ adapter, alwaysInsertFields, collection, disablePayl
             ...existingURLField || {}
         });
     }
-    if (typeof collection.upload === 'object' && collection.upload.imageSizes) {
+    // Storage adapters add these fields during their `init`, after transformers (e.g. Sharp) have
+    // written each collection's image sizes onto its upload config.
+    const variants = typeof collection.upload === 'object' ? collection.upload.variants : undefined;
+    if (variants) {
         let existingSizesFieldIndex = -1;
         const existingSizesField = fields.find((existingField, i)=>{
-            if ('name' in existingField && existingField.name === 'sizes') {
+            if ('name' in existingField && existingField.name === 'variants') {
                 existingSizesFieldIndex = i;
                 return true;
             }
@@ -81,12 +97,12 @@ export const getFields = ({ adapter, alwaysInsertFields, collection, disablePayl
         }
         const sizesField = {
             ...existingSizesField || {},
-            name: 'sizes',
+            name: 'variants',
             type: 'group',
             admin: {
                 hidden: true
             },
-            fields: collection.upload.imageSizes.map((size)=>{
+            fields: variants.map((size)=>{
                 const existingSizeField = existingSizesField?.fields.find((existingField)=>'name' in existingField && existingField.name === size.name);
                 const existingSizeURLField = existingSizeField?.fields.find((existingField)=>'name' in existingField && existingField.name === 'url');
                 // Only add afterRead hook if adapter is provided
@@ -132,25 +148,41 @@ export const getFields = ({ adapter, alwaysInsertFields, collection, disablePayl
         };
         fields.push(sizesField);
     }
-    // If prefix is enabled or alwaysInsertFields is true, save it to db
-    if (typeof prefix !== 'undefined' || alwaysInsertFields) {
-        let existingPrefixFieldIndex = -1;
-        const existingPrefixField = fields.find((existingField, i)=>{
-            if ('name' in existingField && existingField.name === 'prefix') {
-                existingPrefixFieldIndex = i;
-                return true;
-            }
-            return false;
-        });
-        if (existingPrefixFieldIndex > -1) {
-            fields.splice(existingPrefixFieldIndex, 1);
+    // Always insert the prefix field so the schema stays consistent regardless of
+    // whether the plugin is enabled or a prefix is configured.
+    let existingPrefixFieldIndex = -1;
+    const existingPrefixField = fields.find((existingField, i)=>{
+        if ('name' in existingField && existingField.name === 'prefix') {
+            existingPrefixFieldIndex = i;
+            return true;
         }
-        fields.push({
-            ...basePrefixField,
-            ...existingPrefixField || {},
-            defaultValue: useCompositePrefixes ? '' : prefix ? path.posix.join(prefix) : ''
-        });
+        return false;
+    });
+    if (existingPrefixFieldIndex > -1) {
+        fields.splice(existingPrefixFieldIndex, 1);
     }
+    fields.push({
+        ...basePrefixField,
+        ...existingPrefixField || {},
+        defaultValue: existingPrefixField?.defaultValue ?? (useCompositePrefixes ? '' : prefix ? path.posix.join(prefix) : ''),
+        hooks: {
+            ...existingPrefixField?.hooks,
+            beforeChange: [
+                ...existingPrefixField?.hooks?.beforeChange || [],
+                getNormalizeUploadPrefixFieldHook({
+                    collectionPrefix: prefix,
+                    useCompositePrefixes
+                })
+            ]
+        }
+    });
+    const existingObjectKeyFieldIndex = fields.findIndex((existingField)=>'name' in existingField && existingField.name === '_objectKey');
+    if (existingObjectKeyFieldIndex > -1) {
+        fields.splice(existingObjectKeyFieldIndex, 1);
+    }
+    fields.push({
+        ...baseObjectKeyField
+    });
     return fields;
 };
 

package/dist/fields/getFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/fields/getFields.ts"],"sourcesContent":["import type { CollectionConfig, Field, GroupField, TextField } from 'payload'\n\nimport path from 'path'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { getAfterReadHook } from '../hooks/afterRead.js'\nimport { getBeforeChangeHook } from '../hooks/beforeChange.js'\n\ninterface Args {\n  adapter?: GeneratedAdapter\n  /**\n   * When true, always insert the prefix field regardless of whether a prefix is configured.\n   */\n  alwaysInsertFields?: boolean\n  collection: CollectionConfig\n  disablePayloadAccessControl?: true\n  generateFileURL?: GenerateFileURL\n  prefix?: string\n  /**\n   * When true, do not default the `prefix` field to the collection prefix; the\n   * document field holds only the document-level segment.\n   */\n  useCompositePrefixes?: boolean\n}\n\nexport const getFields = ({\n  adapter,\n  alwaysInsertFields,\n  collection,\n  disablePayloadAccessControl,\n  generateFileURL,\n  prefix,\n  useCompositePrefixes = false,\n}: Args): Field[] => {\n  const baseURLField: TextField = {\n    name: 'url',\n    type: 'text',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: 'URL',\n  }\n\n  const basePrefixField: TextField = {\n    name: 'prefix',\n    type: 'text',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n  }\n\n  const fields = [...collection.fields, ...(adapter?.fields || [])]\n\n  // Inject a hook into all URL fields to generate URLs\n\n  let existingURLFieldIndex = -1\n\n  const existingURLField = fields.find((existingField, i) => {\n    if ('name' in existingField && existingField.name === 'url') {\n      existingURLFieldIndex = i\n      return true\n    }\n    return false\n  }) as TextField\n\n  if (existingURLFieldIndex > -1) {\n    fields.splice(existingURLFieldIndex, 1)\n  }\n\n  // Only add afterRead hook if adapter is provided\n  if (adapter) {\n    fields.push({\n      ...baseURLField,\n      ...(existingURLField || {}),\n      hooks: {\n        afterRead: [\n          getAfterReadHook({ adapter, collection, disablePayloadAccessControl, generateFileURL }),\n          ...(existingURLField?.hooks?.afterRead || []),\n        ],\n        beforeChange: [\n          getBeforeChangeHook({\n            adapter,\n            collection,\n            disablePayloadAccessControl,\n            generateFileURL,\n          }),\n          ...(existingURLField?.hooks?.beforeChange || []),\n        ],\n      },\n    } as TextField)\n  } else {\n    fields.push({\n      ...baseURLField,\n      ...(existingURLField || {}),\n    } as TextField)\n  }\n\n  if (typeof collection.upload === 'object' && collection.upload.imageSizes) {\n    let existingSizesFieldIndex = -1\n\n    const existingSizesField = fields.find((existingField, i) => {\n      if ('name' in existingField && existingField.name === 'sizes') {\n        existingSizesFieldIndex = i\n        return true\n      }\n\n      return false\n    }) as GroupField\n\n    if (existingSizesFieldIndex > -1) {\n      fields.splice(existingSizesFieldIndex, 1)\n    }\n\n    const sizesField: Field = {\n      ...(existingSizesField || {}),\n      name: 'sizes',\n      type: 'group',\n      admin: {\n        hidden: true,\n      },\n      fields: collection.upload.imageSizes.map((size) => {\n        const existingSizeField = existingSizesField?.fields.find(\n          (existingField) => 'name' in existingField && existingField.name === size.name,\n        ) as GroupField\n\n        const existingSizeURLField = existingSizeField?.fields.find(\n          (existingField) => 'name' in existingField && existingField.name === 'url',\n        ) as TextField\n\n        // Only add afterRead hook if adapter is provided\n        const sizeURLField: TextField = adapter\n          ? ({\n              ...(existingSizeURLField || {}),\n              ...baseURLField,\n              hooks: {\n                afterRead: [\n                  getAfterReadHook({\n                    adapter,\n                    collection,\n                    disablePayloadAccessControl,\n                    generateFileURL,\n                    size,\n                  }),\n                  ...((typeof existingSizeURLField === 'object' &&\n                    'hooks' in existingSizeURLField &&\n                    existingSizeURLField?.hooks?.afterRead) ||\n                    []),\n                ],\n                beforeChange: [\n                  getBeforeChangeHook({\n                    adapter,\n                    collection,\n                    disablePayloadAccessControl,\n                    generateFileURL,\n                    size,\n                  }),\n                  ...((typeof existingSizeURLField === 'object' &&\n                    'hooks' in existingSizeURLField &&\n                    existingSizeURLField?.hooks?.beforeChange) ||\n                    []),\n                ],\n              },\n            } as TextField)\n          : ({\n              ...(existingSizeURLField || {}),\n              ...baseURLField,\n            } as TextField)\n\n        return {\n          ...existingSizeField,\n          name: size.name,\n          type: 'group',\n          fields: [...(adapter?.fields || []), sizeURLField],\n        } as Field\n      }),\n    }\n\n    fields.push(sizesField)\n  }\n\n  // If prefix is enabled or alwaysInsertFields is true, save it to db\n  if (typeof prefix !== 'undefined' || alwaysInsertFields) {\n    let existingPrefixFieldIndex = -1\n\n    const existingPrefixField = fields.find((existingField, i) => {\n      if ('name' in existingField && existingField.name === 'prefix') {\n        existingPrefixFieldIndex = i\n        return true\n      }\n      return false\n    }) as TextField\n\n    if (existingPrefixFieldIndex > -1) {\n      fields.splice(existingPrefixFieldIndex, 1)\n    }\n\n    fields.push({\n      ...basePrefixField,\n      ...(existingPrefixField || {}),\n      defaultValue: useCompositePrefixes ? '' : prefix ? path.posix.join(prefix) : '',\n    } as TextField)\n  }\n\n  return fields\n}\n"],"names":["path","getAfterReadHook","getBeforeChangeHook","getFields","adapter","alwaysInsertFields","collection","disablePayloadAccessControl","generateFileURL","prefix","useCompositePrefixes","baseURLField","name","type","admin","hidden","readOnly","label","basePrefixField","fields","existingURLFieldIndex","existingURLField","find","existingField","i","splice","push","hooks","afterRead","beforeChange","upload","imageSizes","existingSizesFieldIndex","existingSizesField","sizesField","map","size","existingSizeField","existingSizeURLField","sizeURLField","existingPrefixFieldIndex","existingPrefixField","defaultValue","posix","join"],"mappings":"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"}
+{"version":3,"sources":["../../src/fields/getFields.ts"],"sourcesContent":["import type { CollectionConfig, Field, GroupField, SanitizedUploadConfig, TextField } from 'payload'\n\nimport path from 'path'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { getAfterReadHook } from '../hooks/afterRead.js'\nimport { getBeforeChangeHook } from '../hooks/beforeChange.js'\nimport { getNormalizeUploadPrefixFieldHook } from '../hooks/normalizeUploadPrefix.js'\n\ninterface Args {\n  adapter?: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: true\n  generateFileURL?: GenerateFileURL\n  prefix?: string\n  /**\n   * When true, do not default the `prefix` field to the collection prefix; the\n   * document field holds only the document-level segment.\n   */\n  useCompositePrefixes?: boolean\n}\n\nexport const getFields = ({\n  adapter,\n  collection,\n  disablePayloadAccessControl,\n  generateFileURL,\n  prefix,\n  useCompositePrefixes = false,\n}: Args): Field[] => {\n  const baseURLField: TextField = {\n    name: 'url',\n    type: 'text',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: 'URL',\n  }\n\n  const basePrefixField: TextField = {\n    name: 'prefix',\n    type: 'text',\n    admin: {\n      disabled: {\n        bulkEdit: true,\n        column: true,\n        filter: true,\n        groupBy: true,\n      },\n      hidden: true,\n      readOnly: true,\n    },\n  }\n\n  // Server-owned key segment; hidden from the API and admin, read internally via showHiddenFields.\n  const baseObjectKeyField: TextField = {\n    name: '_objectKey',\n    type: 'text',\n    hidden: true,\n  }\n\n  const fields = [...collection.fields, ...(adapter?.fields || [])]\n\n  // Inject a hook into all URL fields to generate URLs\n\n  let existingURLFieldIndex = -1\n\n  const existingURLField = fields.find((existingField, i) => {\n    if ('name' in existingField && existingField.name === 'url') {\n      existingURLFieldIndex = i\n      return true\n    }\n    return false\n  }) as TextField\n\n  if (existingURLFieldIndex > -1) {\n    fields.splice(existingURLFieldIndex, 1)\n  }\n\n  // Only add afterRead hook if adapter is provided\n  if (adapter) {\n    fields.push({\n      ...baseURLField,\n      ...(existingURLField || {}),\n      hooks: {\n        afterRead: [\n          getAfterReadHook({ adapter, collection, disablePayloadAccessControl, generateFileURL }),\n          ...(existingURLField?.hooks?.afterRead || []),\n        ],\n        beforeChange: [\n          getBeforeChangeHook({\n            adapter,\n            collection,\n            disablePayloadAccessControl,\n            generateFileURL,\n          }),\n          ...(existingURLField?.hooks?.beforeChange || []),\n        ],\n      },\n    } as TextField)\n  } else {\n    fields.push({\n      ...baseURLField,\n      ...(existingURLField || {}),\n    } as TextField)\n  }\n\n  // Storage adapters add these fields during their `init`, after transformers (e.g. Sharp) have\n  // written each collection's image sizes onto its upload config.\n  const variants =\n    typeof collection.upload === 'object'\n      ? (collection.upload as SanitizedUploadConfig).variants\n      : undefined\n\n  if (variants) {\n    let existingSizesFieldIndex = -1\n\n    const existingSizesField = fields.find((existingField, i) => {\n      if ('name' in existingField && existingField.name === 'variants') {\n        existingSizesFieldIndex = i\n        return true\n      }\n\n      return false\n    }) as GroupField\n\n    if (existingSizesFieldIndex > -1) {\n      fields.splice(existingSizesFieldIndex, 1)\n    }\n\n    const sizesField: Field = {\n      ...(existingSizesField || {}),\n      name: 'variants',\n      type: 'group',\n      admin: {\n        hidden: true,\n      },\n      fields: variants.map((size) => {\n        const existingSizeField = existingSizesField?.fields.find(\n          (existingField) => 'name' in existingField && existingField.name === size.name,\n        ) as GroupField\n\n        const existingSizeURLField = existingSizeField?.fields.find(\n          (existingField) => 'name' in existingField && existingField.name === 'url',\n        ) as TextField\n\n        // Only add afterRead hook if adapter is provided\n        const sizeURLField: TextField = adapter\n          ? ({\n              ...(existingSizeURLField || {}),\n              ...baseURLField,\n              hooks: {\n                afterRead: [\n                  getAfterReadHook({\n                    adapter,\n                    collection,\n                    disablePayloadAccessControl,\n                    generateFileURL,\n                    size,\n                  }),\n                  ...((typeof existingSizeURLField === 'object' &&\n                    'hooks' in existingSizeURLField &&\n                    existingSizeURLField?.hooks?.afterRead) ||\n                    []),\n                ],\n                beforeChange: [\n                  getBeforeChangeHook({\n                    adapter,\n                    collection,\n                    disablePayloadAccessControl,\n                    generateFileURL,\n                    size,\n                  }),\n                  ...((typeof existingSizeURLField === 'object' &&\n                    'hooks' in existingSizeURLField &&\n                    existingSizeURLField?.hooks?.beforeChange) ||\n                    []),\n                ],\n              },\n            } as TextField)\n          : ({\n              ...(existingSizeURLField || {}),\n              ...baseURLField,\n            } as TextField)\n\n        return {\n          ...existingSizeField,\n          name: size.name,\n          type: 'group',\n          fields: [...(adapter?.fields || []), sizeURLField],\n        } as Field\n      }),\n    }\n\n    fields.push(sizesField)\n  }\n\n  // Always insert the prefix field so the schema stays consistent regardless of\n  // whether the plugin is enabled or a prefix is configured.\n  let existingPrefixFieldIndex = -1\n\n  const existingPrefixField = fields.find((existingField, i) => {\n    if ('name' in existingField && existingField.name === 'prefix') {\n      existingPrefixFieldIndex = i\n      return true\n    }\n    return false\n  }) as TextField\n\n  if (existingPrefixFieldIndex > -1) {\n    fields.splice(existingPrefixFieldIndex, 1)\n  }\n\n  fields.push({\n    ...basePrefixField,\n    ...(existingPrefixField || {}),\n    defaultValue:\n      existingPrefixField?.defaultValue ??\n      (useCompositePrefixes ? '' : prefix ? path.posix.join(prefix) : ''),\n    hooks: {\n      ...existingPrefixField?.hooks,\n      beforeChange: [\n        ...(existingPrefixField?.hooks?.beforeChange || []),\n        getNormalizeUploadPrefixFieldHook({ collectionPrefix: prefix, useCompositePrefixes }),\n      ],\n    },\n  } as TextField)\n\n  const existingObjectKeyFieldIndex = fields.findIndex(\n    (existingField) => 'name' in existingField && existingField.name === '_objectKey',\n  )\n  if (existingObjectKeyFieldIndex > -1) {\n    fields.splice(existingObjectKeyFieldIndex, 1)\n  }\n\n  fields.push({ ...baseObjectKeyField } as TextField)\n\n  return fields\n}\n"],"names":["path","getAfterReadHook","getBeforeChangeHook","getNormalizeUploadPrefixFieldHook","getFields","adapter","collection","disablePayloadAccessControl","generateFileURL","prefix","useCompositePrefixes","baseURLField","name","type","admin","hidden","readOnly","label","basePrefixField","disabled","bulkEdit","column","filter","groupBy","baseObjectKeyField","fields","existingURLFieldIndex","existingURLField","find","existingField","i","splice","push","hooks","afterRead","beforeChange","variants","upload","undefined","existingSizesFieldIndex","existingSizesField","sizesField","map","size","existingSizeField","existingSizeURLField","sizeURLField","existingPrefixFieldIndex","existingPrefixField","defaultValue","posix","join","collectionPrefix","existingObjectKeyFieldIndex","findIndex"],"mappings":"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"}

package/dist/hooks/afterChange.d.ts

@@ -3,7 +3,9 @@ import type { GeneratedAdapter } from '../types.js';
 interface Args {
     adapter: GeneratedAdapter;
     collection: CollectionConfig;
+    collectionPrefix?: string;
+    useCompositePrefixes?: boolean;
 }
-export declare const getAfterChangeHook: ({ adapter, collection }: Args) => CollectionAfterChangeHook<FileData & TypeWithID>;
+export declare const getAfterChangeHook: ({ adapter, collection, collectionPrefix, useCompositePrefixes, }: Args) => CollectionAfterChangeHook<FileData & TypeWithID>;
 export {};
 //# sourceMappingURL=afterChange.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"afterChange.d.ts","sourceRoot":"","sources":["../../src/hooks/afterChange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEhG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAInD,UAAU,IAAI;IACZ,OAAO,EAAE,gBAAgB,CAAA;IACzB,UAAU,EAAE,gBAAgB,CAAA;CAC7B;AAED,eAAO,MAAM,kBAAkB,4BACH,IAAI,KAAG,yBAAyB,CAAC,QAAQ,GAAG,UAAU,CAgG/E,CAAA"}
+{"version":3,"file":"afterChange.d.ts","sourceRoot":"","sources":["../../src/hooks/afterChange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAIhG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AASnD,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;AAQD,eAAO,MAAM,kBAAkB,qEAM1B,IAAI,KAAG,yBAAyB,CAAC,QAAQ,GAAG,UAAU,CA8KxD,CAAA"}

package/dist/hooks/afterChange.js

@@ -1,73 +1,150 @@
+import { deepMergeWithSourceArrays } 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 })=>{
+// 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, 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;
         }
+        // Restore upload metadata removed by select, including partially selected image sizes.
+        const uploadData = select ? deepMergeWithSourceArrays(data, doc) : doc;
+        const isDraftSave = uploadData._status === 'draft';
+        const isDraftOverPublished = isDraftSave && previousDoc?._status === 'published';
         try {
             const files = getIncomingFiles({
-                data: doc,
+                data: uploadData,
                 req
             });
             if (files.length > 0) {
-                // If there is a previous doc, files and the operation is update,
-                // delete the old files before uploading the new ones.
-                if (previousDoc && operation === 'update') {
-                    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));
-                    }
-                    const deletionPromises = filesToDelete.map(async (filename)=>{
-                        if (filename) {
-                            await adapter.handleDelete({
-                                collection,
-                                doc: previousDoc,
-                                filename,
-                                req
-                            });
-                        }
-                    });
-                    await Promise.all(deletionPromises);
-                }
-                const uploadResults = await Promise.all(files.filter((file)=>!file.clientUploadContext).map((file)=>adapter.handleUpload({
-                        clientUploadContext: file.clientUploadContext,
+                // 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) {
+                        req.context = {};
+                    }
+                    req.context.skipCloudStorage = true;
+                    // Clear to prevent re-processing
+                    req.file = undefined;
+                    req.payloadUploadSizes = undefined;
                     try {
-                        if (!req.context) {
-                            req.context = {};
-                        }
-                        req.context.skipCloudStorage = true;
-                        // Clear to prevent re-processing
-                        req.file = undefined;
-                        req.payloadUploadSizes = undefined;
-                        await req.payload.update({
+                        const updatedDoc = await req.payload.update({
                             id: doc.id,
                             collection: collection.slug,
                             data: uploadMetadata,
                             depth: 0,
-                            req
+                            draft: isDraftSave,
+                            overrideAccess: true,
+                            req,
+                            select
                         });
-                        delete req.context.skipCloudStorage;
-                        return {
+                        // Persist all adapter metadata, but do not add unselected fields to the response.
+                        docWithMetadata = select ? {
+                            ...doc,
+                            ...updatedDoc
+                        } : {
                             ...doc,
                             ...uploadMetadata
                         };
-                    } catch (updateError) {
-                        req.payload.logger.warn(`Failed to persist upload data for collection ${collection.slug} document ${doc.id}: ${String(updateError)}`);
+                    } finally{
+                        delete req.context.skipCloudStorage;
                     }
                 }
+                // 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) {
+                    let filesToDelete = [];
+                    if (typeof previousDoc?.filename === 'string') {
+                        filesToDelete.push(previousDoc.filename);
+                    }
+                    if (typeof previousDoc.variants === 'object') {
+                        filesToDelete = filesToDelete.concat(Object.values(previousDoc?.variants || []).map((resizedFileData)=>resizedFileData?.filename));
+                    }
+                    // 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 newFileData.filename === 'string') {
+                        newFilenames.add(newFileData.filename);
+                    }
+                    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 resolveKey = ({ data, filename })=>buildStoragePathData({
+                            collectionPrefix,
+                            docPrefix: getObjectFolder(data),
+                            filename,
+                            useCompositePrefixes
+                        }).storageFilePath;
+                    const newKeys = new Set([
+                        ...newFilenames
+                    ].map((filename)=>resolveKey({
+                            data: newFileData,
+                            filename
+                        })));
+                    const deletionPromises = filesToDelete.map(async (filename)=>{
+                        if (!filename) {
+                            return;
+                        }
+                        const storageFilePath = resolveKey({
+                            data: previousDoc,
+                            filename
+                        });
+                        if (!newKeys.has(storageFilePath)) {
+                            await adapter.handleDelete({
+                                collection,
+                                doc: previousDoc,
+                                filename,
+                                req,
+                                storageFilePath
+                            });
+                        }
+                    });
+                    await Promise.all(deletionPromises);
+                }
+                if (docWithMetadata !== doc) {
+                    return docWithMetadata;
+                }
             }
         } catch (err) {
             req.payload.logger.error(`There was an error while uploading files corresponding to the collection ${collection.slug} with filename ${doc.filename}:`);