@payloadcms/storage-vercel-blob 4.0.0-internal.d1cc1d3 → 4.0.0-internal.d21c039

package/dist/adapter.d.ts

@@ -1,13 +1,15 @@
 import type { Adapter, ClientUploadsConfig } from '@payloadcms/plugin-cloud-storage/types';
+import type { VercelBlobCollectionSource } from './authorizeFileOverwrite.js';
 interface CreateVercelBlobAdapterArgs {
     access: 'public';
     addRandomSuffix?: boolean;
     baseUrl: string;
     cacheControlMaxAge: number;
     clientUploads?: ClientUploadsConfig;
+    collectionSources: VercelBlobCollectionSource[];
     token: string;
     useCompositePrefixes?: boolean;
 }
-export declare function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cacheControlMaxAge, clientUploads, token, useCompositePrefixes, }: CreateVercelBlobAdapterArgs): Adapter;
+export declare function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cacheControlMaxAge, clientUploads, collectionSources, token, useCompositePrefixes, }: CreateVercelBlobAdapterArgs): Adapter;
 export {};
 //# sourceMappingURL=adapter.d.ts.map

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAW/C,UAAU,2BAA2B;IACnC,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,eAAe,EACf,OAAO,EACP,kBAAkB,EAClB,aAAa,EACb,KAAK,EACL,oBAA4B,GAC7B,EAAE,2BAA2B,GAAG,OAAO,CAwHvC"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAU/C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAA;AAQ7E,UAAU,2BAA2B;IACnC,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,iBAAiB,EAAE,0BAA0B,EAAE,CAAA;IAC/C,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,eAAe,EACf,OAAO,EACP,kBAAkB,EAClB,aAAa,EACb,iBAAiB,EACjB,KAAK,EACL,oBAA4B,GAC7B,EAAE,2BAA2B,GAAG,OAAO,CAgJvC"}

package/dist/adapter.js

@@ -1,11 +1,13 @@
-import { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities';
+import { buildUploadStoragePathData, resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { generateClientTokenFromReadWriteToken } from '@vercel/blob/client';
 import { Forbidden } from 'payload';
+import { assertClientUploadAllowed, createClientUploadReceipt } from 'payload/internal';
+import { authorizeClientOverwrite } from './authorizeFileOverwrite.js';
 import { deleteFile } from './deleteFile.js';
 import { generateURL } from './generateURL.js';
 import { getFile } from './getFile.js';
 import { uploadFile } from './uploadFile.js';
-export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cacheControlMaxAge, clientUploads, token, useCompositePrefixes = false }) {
+export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cacheControlMaxAge, clientUploads, collectionSources, token, useCompositePrefixes = false }) {
     const clientUploadsAccess = typeof clientUploads === 'object' ? clientUploads.access : undefined;
     return ({ collection, prefix = '' })=>({
             name: 'vercel-blob',
@@ -21,7 +23,40 @@ export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cach
                     }) : !req.user)) {
                         throw new Forbidden(req.t);
                     }
-                    const resolved = await resolveSignedURLKey({
+                    assertClientUploadAllowed({
+                        collection,
+                        filename,
+                        mimeType
+                    });
+                    const requested = buildUploadStoragePathData({
+                        collectionPrefix: prefix,
+                        docPrefix,
+                        filename,
+                        useCompositePrefixes
+                    });
+                    const allowOverwrite = await authorizeClientOverwrite({
+                        collectionPrefix: prefix,
+                        collectionSources,
+                        overrideAccess,
+                        req,
+                        requestedCollectionSlug: collectionSlug,
+                        requestedFilename: requested.sanitizedFilename,
+                        requestedStorageFilePath: requested.storageFilePath
+                    });
+                    const resolved = allowOverwrite ? {
+                        ...requested,
+                        uploadReference: {
+                            prefix: requested.sanitizedDocPrefix,
+                            signedReceipt: createClientUploadReceipt({
+                                allowOverwrite: true,
+                                collectionSlug,
+                                filename: requested.sanitizedFilename,
+                                filePrefix: requested.sanitizedDocPrefix,
+                                req,
+                                storageFilePath: requested.storageFilePath
+                            })
+                        }
+                    } : await resolveSignedURLKey({
                         collectionPrefix: prefix,
                         collectionSlug,
                         docPrefix,
@@ -33,16 +68,18 @@ export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cach
                         name: 'uploadToVercelBlob',
                         type: 'dispatch',
                         data: {
-                            pathname: resolved.fileKey,
+                            pathname: resolved.storageFilePath,
                             token: await generateClientTokenFromReadWriteToken({
-                                addRandomSuffix,
+                                addRandomSuffix: false,
                                 allowedContentTypes: mimeType ? [
                                     mimeType
                                 ] : undefined,
-                                allowOverwrite: true,
+                                ...allowOverwrite && {
+                                    allowOverwrite: true
+                                },
                                 cacheControlMaxAge,
                                 maximumSizeInBytes: filesize,
-                                pathname: resolved.fileKey,
+                                pathname: resolved.storageFilePath,
                                 token
                             })
                         },
@@ -50,12 +87,11 @@ export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cach
                             filename: resolved.sanitizedFilename,
                             mimeType,
                             size: filesize,
-                            uploadReference: {
-                                prefix: resolved.sanitizedDocPrefix
-                            }
+                            uploadReference: resolved.uploadReference
                         }
                     };
                 },
+                requiresUploadReceipt: true,
                 useInAdmin: true
             },
             generateURL: ({ filename, prefix: urlPrefix = '' })=>generateURL({
@@ -65,40 +101,34 @@ export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cach
                     prefix: urlPrefix,
                     useCompositePrefixes
                 }),
-            handleDelete: ({ doc: { prefix: docPrefix = '' }, filename })=>deleteFile({
+            handleDelete: ({ storageFilePath })=>deleteFile({
                     baseUrl,
-                    collectionPrefix: prefix,
-                    docPrefix,
-                    filename,
-                    token,
-                    useCompositePrefixes
+                    storageFilePath,
+                    token
                 }),
-            handleUpload: async ({ data, file: { buffer, filename, mimeType } })=>{
+            handleUpload: async ({ data, file: { buffer, mimeType }, storageFilePath })=>{
                 const result = await uploadFile({
                     access,
                     addRandomSuffix,
                     buffer,
                     cacheControlMaxAge,
-                    collectionPrefix: prefix,
-                    docPrefix: data.prefix,
-                    filename,
                     mimeType,
-                    token,
-                    useCompositePrefixes
+                    storageFilePath,
+                    token
                 });
                 if (result.filename) {
                     data.filename = result.filename;
                 }
                 return data;
             },
-            staticHandler: (req, { headers, params: { filename, prefix: prefixQueryParam, uploadReference } })=>getFile({
+            staticHandler: (req, { doc, headers, params: { filename, uploadReference } })=>getFile({
                     baseUrl,
                     cacheControlMaxAge,
                     collection,
                     collectionPrefix: prefix,
+                    doc,
                     filename,
                     incomingHeaders: headers,
-                    prefixQueryParam,
                     req,
                     token,
                     uploadReference,

package/dist/adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { generateClientTokenFromReadWriteToken } from '@vercel/blob/client'\nimport { Forbidden } from 'payload'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateVercelBlobAdapterArgs {\n  access: 'public'\n  addRandomSuffix?: boolean\n  baseUrl: string\n  cacheControlMaxAge: number\n  clientUploads?: ClientUploadsConfig\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nexport function createVercelBlobAdapter({\n  access,\n  addRandomSuffix,\n  baseUrl,\n  cacheControlMaxAge,\n  clientUploads,\n  token,\n  useCompositePrefixes = false,\n}: CreateVercelBlobAdapterArgs): Adapter {\n  const clientUploadsAccess = typeof clientUploads === 'object' ? clientUploads.access : undefined\n\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 'vercel-blob',\n\n    uploadInstructions: {\n      adminHandler: {\n        path: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',\n      },\n      enabled: Boolean(clientUploads),\n      generate: async ({\n        collectionSlug,\n        docPrefix,\n        filename,\n        filesize,\n        mimeType,\n        overrideAccess,\n        req,\n      }) => {\n        if (\n          !overrideAccess &&\n          (clientUploadsAccess ? !(await clientUploadsAccess({ collectionSlug, req })) : !req.user)\n        ) {\n          throw new Forbidden(req.t)\n        }\n\n        const resolved = await resolveSignedURLKey({\n          collectionPrefix: prefix,\n          collectionSlug,\n          docPrefix,\n          filename,\n          req,\n          useCompositePrefixes,\n        })\n\n        return {\n          name: 'uploadToVercelBlob',\n          type: 'dispatch',\n          data: {\n            pathname: resolved.fileKey,\n            token: await generateClientTokenFromReadWriteToken({\n              addRandomSuffix,\n              allowedContentTypes: mimeType ? [mimeType] : undefined,\n              allowOverwrite: true,\n              cacheControlMaxAge,\n              maximumSizeInBytes: filesize,\n              pathname: resolved.fileKey,\n              token,\n            }),\n          },\n          file: {\n            filename: resolved.sanitizedFilename,\n            mimeType,\n            size: filesize,\n            uploadReference: { prefix: resolved.sanitizedDocPrefix },\n          },\n        }\n      },\n      useInAdmin: true,\n    },\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        baseUrl,\n        collectionPrefix: prefix,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    handleDelete: ({ doc: { prefix: docPrefix = '' }, filename }) =>\n      deleteFile({\n        baseUrl,\n        collectionPrefix: prefix,\n        docPrefix,\n        filename,\n        token,\n        useCompositePrefixes,\n      }),\n\n    handleUpload: async ({ data, file: { buffer, filename, mimeType } }) => {\n      const result = await uploadFile({\n        access,\n        addRandomSuffix,\n        buffer,\n        cacheControlMaxAge,\n        collectionPrefix: prefix,\n        docPrefix: data.prefix,\n        filename,\n        mimeType,\n        token,\n        useCompositePrefixes,\n      })\n\n      if (result.filename) {\n        data.filename = result.filename\n      }\n\n      return data\n    },\n\n    staticHandler: (\n      req,\n      { headers, params: { filename, prefix: prefixQueryParam, uploadReference } },\n    ) =>\n      getFile({\n        baseUrl,\n        cacheControlMaxAge,\n        collection,\n        collectionPrefix: prefix,\n        filename,\n        incomingHeaders: headers,\n        prefixQueryParam,\n        req,\n        token,\n        uploadReference,\n        useCompositePrefixes,\n      }),\n  })\n}\n"],"names":["resolveSignedURLKey","generateClientTokenFromReadWriteToken","Forbidden","deleteFile","generateURL","getFile","uploadFile","createVercelBlobAdapter","access","addRandomSuffix","baseUrl","cacheControlMaxAge","clientUploads","token","useCompositePrefixes","clientUploadsAccess","undefined","collection","prefix","name","uploadInstructions","adminHandler","path","enabled","Boolean","generate","collectionSlug","docPrefix","filename","filesize","mimeType","overrideAccess","req","user","t","resolved","collectionPrefix","type","data","pathname","fileKey","allowedContentTypes","allowOverwrite","maximumSizeInBytes","file","sanitizedFilename","size","uploadReference","sanitizedDocPrefix","useInAdmin","urlPrefix","handleDelete","doc","handleUpload","buffer","result","staticHandler","headers","params","prefixQueryParam","incomingHeaders"],"mappings":"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"}
+{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport {\n  buildUploadStoragePathData,\n  resolveSignedURLKey,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { generateClientTokenFromReadWriteToken } from '@vercel/blob/client'\nimport { Forbidden } from 'payload'\nimport { assertClientUploadAllowed, createClientUploadReceipt } from 'payload/internal'\n\nimport type { VercelBlobCollectionSource } from './authorizeFileOverwrite.js'\n\nimport { authorizeClientOverwrite } from './authorizeFileOverwrite.js'\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateVercelBlobAdapterArgs {\n  access: 'public'\n  addRandomSuffix?: boolean\n  baseUrl: string\n  cacheControlMaxAge: number\n  clientUploads?: ClientUploadsConfig\n  collectionSources: VercelBlobCollectionSource[]\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nexport function createVercelBlobAdapter({\n  access,\n  addRandomSuffix,\n  baseUrl,\n  cacheControlMaxAge,\n  clientUploads,\n  collectionSources,\n  token,\n  useCompositePrefixes = false,\n}: CreateVercelBlobAdapterArgs): Adapter {\n  const clientUploadsAccess = typeof clientUploads === 'object' ? clientUploads.access : undefined\n\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 'vercel-blob',\n\n    uploadInstructions: {\n      adminHandler: {\n        path: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',\n      },\n      enabled: Boolean(clientUploads),\n      generate: async ({\n        collectionSlug,\n        docPrefix,\n        filename,\n        filesize,\n        mimeType,\n        overrideAccess,\n        req,\n      }) => {\n        if (\n          !overrideAccess &&\n          (clientUploadsAccess ? !(await clientUploadsAccess({ collectionSlug, req })) : !req.user)\n        ) {\n          throw new Forbidden(req.t)\n        }\n\n        assertClientUploadAllowed({ collection, filename, mimeType })\n\n        const requested = buildUploadStoragePathData({\n          collectionPrefix: prefix,\n          docPrefix,\n          filename,\n          useCompositePrefixes,\n        })\n        const allowOverwrite = await authorizeClientOverwrite({\n          collectionPrefix: prefix,\n          collectionSources,\n          overrideAccess,\n          req,\n          requestedCollectionSlug: collectionSlug,\n          requestedFilename: requested.sanitizedFilename,\n          requestedStorageFilePath: requested.storageFilePath,\n        })\n        const resolved = allowOverwrite\n          ? {\n              ...requested,\n              uploadReference: {\n                prefix: requested.sanitizedDocPrefix,\n                signedReceipt: createClientUploadReceipt({\n                  allowOverwrite: true,\n                  collectionSlug,\n                  filename: requested.sanitizedFilename,\n                  filePrefix: requested.sanitizedDocPrefix,\n                  req,\n                  storageFilePath: requested.storageFilePath,\n                }),\n              },\n            }\n          : await resolveSignedURLKey({\n              collectionPrefix: prefix,\n              collectionSlug,\n              docPrefix,\n              filename,\n              req,\n              useCompositePrefixes,\n            })\n\n        return {\n          name: 'uploadToVercelBlob',\n          type: 'dispatch',\n          data: {\n            pathname: resolved.storageFilePath,\n            token: await generateClientTokenFromReadWriteToken({\n              addRandomSuffix: false,\n              allowedContentTypes: mimeType ? [mimeType] : undefined,\n              ...(allowOverwrite && { allowOverwrite: true }),\n              cacheControlMaxAge,\n              maximumSizeInBytes: filesize,\n              pathname: resolved.storageFilePath,\n              token,\n            }),\n          },\n          file: {\n            filename: resolved.sanitizedFilename,\n            mimeType,\n            size: filesize,\n            uploadReference: resolved.uploadReference,\n          },\n        }\n      },\n      requiresUploadReceipt: true,\n      useInAdmin: true,\n    },\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        baseUrl,\n        collectionPrefix: prefix,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    handleDelete: ({ storageFilePath }) =>\n      deleteFile({\n        baseUrl,\n        storageFilePath,\n        token,\n      }),\n\n    handleUpload: async ({ data, file: { buffer, mimeType }, storageFilePath }) => {\n      const result = await uploadFile({\n        access,\n        addRandomSuffix,\n        buffer,\n        cacheControlMaxAge,\n        mimeType,\n        storageFilePath,\n        token,\n      })\n\n      if (result.filename) {\n        data.filename = result.filename\n      }\n\n      return data\n    },\n\n    staticHandler: (req, { doc, headers, params: { filename, uploadReference } }) =>\n      getFile({\n        baseUrl,\n        cacheControlMaxAge,\n        collection,\n        collectionPrefix: prefix,\n        doc,\n        filename,\n        incomingHeaders: headers,\n        req,\n        token,\n        uploadReference,\n        useCompositePrefixes,\n      }),\n  })\n}\n"],"names":["buildUploadStoragePathData","resolveSignedURLKey","generateClientTokenFromReadWriteToken","Forbidden","assertClientUploadAllowed","createClientUploadReceipt","authorizeClientOverwrite","deleteFile","generateURL","getFile","uploadFile","createVercelBlobAdapter","access","addRandomSuffix","baseUrl","cacheControlMaxAge","clientUploads","collectionSources","token","useCompositePrefixes","clientUploadsAccess","undefined","collection","prefix","name","uploadInstructions","adminHandler","path","enabled","Boolean","generate","collectionSlug","docPrefix","filename","filesize","mimeType","overrideAccess","req","user","t","requested","collectionPrefix","allowOverwrite","requestedCollectionSlug","requestedFilename","sanitizedFilename","requestedStorageFilePath","storageFilePath","resolved","uploadReference","sanitizedDocPrefix","signedReceipt","filePrefix","type","data","pathname","allowedContentTypes","maximumSizeInBytes","file","size","requiresUploadReceipt","useInAdmin","urlPrefix","handleDelete","handleUpload","buffer","result","staticHandler","doc","headers","params","incomingHeaders"],"mappings":"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"}

package/dist/authorizeFileOverwrite.d.ts

@@ -0,0 +1,16 @@
+import type { PayloadRequest } from 'payload';
+export type VercelBlobCollectionSource = {
+    collectionPrefix: string;
+    collectionSlug: string;
+    useCompositePrefixes: boolean;
+};
+export declare function authorizeClientOverwrite({ collectionPrefix: collectionPrefixArg, collectionSources, overrideAccess, req, requestedCollectionSlug, requestedFilename, requestedStorageFilePath, }: {
+    collectionPrefix: string;
+    collectionSources: VercelBlobCollectionSource[];
+    overrideAccess?: boolean;
+    req: PayloadRequest;
+    requestedCollectionSlug: string;
+    requestedFilename: string;
+    requestedStorageFilePath: string;
+}): Promise<boolean>;
+//# sourceMappingURL=authorizeFileOverwrite.d.ts.map

package/dist/authorizeFileOverwrite.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authorizeFileOverwrite.d.ts","sourceRoot":"","sources":["../src/authorizeFileOverwrite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,cAAc,EAAqB,MAAM,SAAS,CAAA;AAU1E,MAAM,MAAM,0BAA0B,GAAG;IACvC,gBAAgB,EAAE,MAAM,CAAA;IACxB,cAAc,EAAE,MAAM,CAAA;IACtB,oBAAoB,EAAE,OAAO,CAAA;CAC9B,CAAA;AAmHD,wBAAsB,wBAAwB,CAAC,EAC7C,gBAAgB,EAAE,mBAAmB,EACrC,iBAAiB,EACjB,cAAsB,EACtB,GAAG,EACH,uBAAuB,EACvB,iBAAiB,EACjB,wBAAwB,GACzB,EAAE;IACD,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,0BAA0B,EAAE,CAAA;IAC/C,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,uBAAuB,EAAE,MAAM,CAAA;IAC/B,iBAAiB,EAAE,MAAM,CAAA;IACzB,wBAAwB,EAAE,MAAM,CAAA;CACjC,GAAG,OAAO,CAAC,OAAO,CAAC,CA8CnB"}

package/dist/authorizeFileOverwrite.js

@@ -0,0 +1,117 @@
+import { buildStoragePathData, isStoragePathWithinCollectionPrefix } from '@payloadcms/plugin-cloud-storage/utilities';
+import { combineQueries, executeAccess, Forbidden } from 'payload';
+function getDocumentFileKeys({ collectionPrefix, doc, useCompositePrefixes }) {
+    return [
+        doc.filename,
+        ...Object.values(doc.sizes || {}).map((size)=>size?.filename)
+    ].filter((filename)=>typeof filename === 'string').map((filename)=>buildStoragePathData({
+            collectionPrefix,
+            docPrefix: doc.prefix,
+            filename,
+            useCompositePrefixes
+        }).storageFilePath);
+}
+async function findMatchingDocs({ collectionPrefix, collectionSlug, req, requestedFilename, requestedStorageFilePath, useCompositePrefixes }) {
+    const collection = req.payload.collections[collectionSlug];
+    if (!collection) {
+        return [];
+    }
+    const imageSizes = collection.config.upload && typeof collection.config.upload === 'object' ? collection.config.upload.imageSizes || [] : [];
+    const filenameQueries = [
+        {
+            filename: {
+                equals: requestedFilename
+            }
+        },
+        ...imageSizes.map(({ name })=>({
+                [`sizes.${name}.filename`]: {
+                    equals: requestedFilename
+                }
+            }))
+    ];
+    const result = await req.payload.find({
+        collection: collectionSlug,
+        depth: 0,
+        draft: true,
+        overrideAccess: true,
+        pagination: false,
+        req,
+        where: {
+            or: filenameQueries
+        }
+    });
+    return result.docs.filter((doc)=>getDocumentFileKeys({
+            collectionPrefix,
+            doc,
+            useCompositePrefixes
+        }).includes(requestedStorageFilePath));
+}
+async function canUpdateDoc({ collectionSlug, doc, req }) {
+    const collection = req.payload.collections[collectionSlug];
+    if (!collection) {
+        return false;
+    }
+    const accessResult = await executeAccess({
+        id: doc.id,
+        slug: collectionSlug,
+        disableErrors: true,
+        req
+    }, collection.config.access.update);
+    if (typeof accessResult === 'boolean') {
+        return accessResult;
+    }
+    const result = await req.payload.find({
+        collection: collectionSlug,
+        depth: 0,
+        draft: true,
+        limit: 1,
+        overrideAccess: true,
+        pagination: false,
+        req,
+        where: combineQueries({
+            id: {
+                equals: doc.id
+            }
+        }, accessResult)
+    });
+    return result.docs.length === 1;
+}
+export async function authorizeClientOverwrite({ collectionPrefix: collectionPrefixArg, collectionSources, overrideAccess = false, req, requestedCollectionSlug, requestedFilename, requestedStorageFilePath }) {
+    if (!isStoragePathWithinCollectionPrefix({
+        collectionPrefix: collectionPrefixArg,
+        docPrefix: requestedStorageFilePath
+    })) {
+        throw new Forbidden(req.t);
+    }
+    const matchedDocs = (await Promise.all(collectionSources.map(async ({ collectionPrefix, collectionSlug, useCompositePrefixes })=>{
+        const docs = await findMatchingDocs({
+            collectionPrefix,
+            collectionSlug,
+            req,
+            requestedFilename,
+            requestedStorageFilePath,
+            useCompositePrefixes
+        });
+        return docs.map((doc)=>({
+                collectionSlug,
+                doc
+            }));
+    }))).flat();
+    if (matchedDocs.length === 0) {
+        return false;
+    }
+    const matchedDoc = matchedDocs[0];
+    if (matchedDocs.length !== 1 || matchedDoc.collectionSlug !== requestedCollectionSlug) {
+        throw new Forbidden(req.t);
+    }
+    if (!overrideAccess && !await canUpdateDoc({
+        collectionSlug: matchedDoc.collectionSlug,
+        doc: matchedDoc.doc,
+        req
+    })) {
+        throw new Forbidden(req.t);
+    }
+    return true;
+}
+
+//# sourceMappingURL=authorizeFileOverwrite.js.map

package/dist/authorizeFileOverwrite.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/authorizeFileOverwrite.ts"],"sourcesContent":["import type { FileData, PayloadRequest, TypeWithID, Where } from 'payload'\n\nimport {\n  buildStoragePathData,\n  isStoragePathWithinCollectionPrefix,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { combineQueries, executeAccess, Forbidden } from 'payload'\n\ntype OwnerDocument = { prefix?: string } & FileData & TypeWithID\n\nexport type VercelBlobCollectionSource = {\n  collectionPrefix: string\n  collectionSlug: string\n  useCompositePrefixes: boolean\n}\n\ntype Owner = {\n  collectionSlug: string\n  doc: OwnerDocument\n}\n\nfunction getDocumentFileKeys({\n  collectionPrefix,\n  doc,\n  useCompositePrefixes,\n}: {\n  collectionPrefix: string\n  doc: OwnerDocument\n  useCompositePrefixes: boolean\n}): string[] {\n  return [doc.filename, ...Object.values(doc.sizes || {}).map((size) => size?.filename)]\n    .filter((filename): filename is string => typeof filename === 'string')\n    .map(\n      (filename) =>\n        buildStoragePathData({\n          collectionPrefix,\n          docPrefix: doc.prefix,\n          filename,\n          useCompositePrefixes,\n        }).storageFilePath,\n    )\n}\n\nasync function findMatchingDocs({\n  collectionPrefix,\n  collectionSlug,\n  req,\n  requestedFilename,\n  requestedStorageFilePath,\n  useCompositePrefixes,\n}: {\n  collectionPrefix: string\n  collectionSlug: string\n  req: PayloadRequest\n  requestedFilename: string\n  requestedStorageFilePath: string\n  useCompositePrefixes: boolean\n}): Promise<OwnerDocument[]> {\n  const collection = req.payload.collections[collectionSlug]\n\n  if (!collection) {\n    return []\n  }\n\n  const imageSizes =\n    collection.config.upload && typeof collection.config.upload === 'object'\n      ? collection.config.upload.imageSizes || []\n      : []\n  const filenameQueries: Where[] = [\n    { filename: { equals: requestedFilename } },\n    ...imageSizes.map(({ name }) => ({\n      [`sizes.${name}.filename`]: { equals: requestedFilename },\n    })),\n  ]\n  const result = await req.payload.find({\n    collection: collectionSlug,\n    depth: 0,\n    draft: true,\n    overrideAccess: true,\n    pagination: false,\n    req,\n    where: { or: filenameQueries },\n  })\n\n  return (result.docs as OwnerDocument[]).filter((doc) =>\n    getDocumentFileKeys({ collectionPrefix, doc, useCompositePrefixes }).includes(\n      requestedStorageFilePath,\n    ),\n  )\n}\n\nasync function canUpdateDoc({\n  collectionSlug,\n  doc,\n  req,\n}: {\n  collectionSlug: string\n  doc: OwnerDocument\n  req: PayloadRequest\n}): Promise<boolean> {\n  const collection = req.payload.collections[collectionSlug]\n\n  if (!collection) {\n    return false\n  }\n\n  const accessResult = await executeAccess(\n    { id: doc.id, slug: collectionSlug, disableErrors: true, req },\n    collection.config.access.update,\n  )\n\n  if (typeof accessResult === 'boolean') {\n    return accessResult\n  }\n\n  const result = await req.payload.find({\n    collection: collectionSlug,\n    depth: 0,\n    draft: true,\n    limit: 1,\n    overrideAccess: true,\n    pagination: false,\n    req,\n    where: combineQueries({ id: { equals: doc.id } }, accessResult),\n  })\n\n  return result.docs.length === 1\n}\n\nexport async function authorizeClientOverwrite({\n  collectionPrefix: collectionPrefixArg,\n  collectionSources,\n  overrideAccess = false,\n  req,\n  requestedCollectionSlug,\n  requestedFilename,\n  requestedStorageFilePath,\n}: {\n  collectionPrefix: string\n  collectionSources: VercelBlobCollectionSource[]\n  overrideAccess?: boolean\n  req: PayloadRequest\n  requestedCollectionSlug: string\n  requestedFilename: string\n  requestedStorageFilePath: string\n}): Promise<boolean> {\n  if (\n    !isStoragePathWithinCollectionPrefix({\n      collectionPrefix: collectionPrefixArg,\n      docPrefix: requestedStorageFilePath,\n    })\n  ) {\n    throw new Forbidden(req.t)\n  }\n\n  const matchedDocs = (\n    await Promise.all(\n      collectionSources.map(\n        async ({ collectionPrefix, collectionSlug, useCompositePrefixes }): Promise<Owner[]> => {\n          const docs = await findMatchingDocs({\n            collectionPrefix,\n            collectionSlug,\n            req,\n            requestedFilename,\n            requestedStorageFilePath,\n            useCompositePrefixes,\n          })\n\n          return docs.map((doc) => ({ collectionSlug, doc }))\n        },\n      ),\n    )\n  ).flat()\n\n  if (matchedDocs.length === 0) {\n    return false\n  }\n\n  const matchedDoc = matchedDocs[0]!\n  if (matchedDocs.length !== 1 || matchedDoc.collectionSlug !== requestedCollectionSlug) {\n    throw new Forbidden(req.t)\n  }\n\n  if (\n    !overrideAccess &&\n    !(await canUpdateDoc({ collectionSlug: matchedDoc.collectionSlug, doc: matchedDoc.doc, req }))\n  ) {\n    throw new Forbidden(req.t)\n  }\n\n  return true\n}\n"],"names":["buildStoragePathData","isStoragePathWithinCollectionPrefix","combineQueries","executeAccess","Forbidden","getDocumentFileKeys","collectionPrefix","doc","useCompositePrefixes","filename","Object","values","sizes","map","size","filter","docPrefix","prefix","storageFilePath","findMatchingDocs","collectionSlug","req","requestedFilename","requestedStorageFilePath","collection","payload","collections","imageSizes","config","upload","filenameQueries","equals","name","result","find","depth","draft","overrideAccess","pagination","where","or","docs","includes","canUpdateDoc","accessResult","id","slug","disableErrors","access","update","limit","length","authorizeClientOverwrite","collectionPrefixArg","collectionSources","requestedCollectionSlug","t","matchedDocs","Promise","all","flat","matchedDoc"],"mappings":"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"}

package/dist/deleteFile.d.ts

@@ -1,11 +1,8 @@
 interface DeleteFileArgs {
     baseUrl: string;
-    collectionPrefix?: string;
-    docPrefix: string;
-    filename: string;
+    storageFilePath: string;
     token: string;
-    useCompositePrefixes?: boolean;
 }
-export declare function deleteFile({ baseUrl, collectionPrefix, docPrefix, filename, token, useCompositePrefixes, }: DeleteFileArgs): Promise<void>;
+export declare function deleteFile({ baseUrl, storageFilePath, token, }: DeleteFileArgs): Promise<void>;
 export {};
 //# sourceMappingURL=deleteFile.d.ts.map

package/dist/deleteFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAIA,UAAU,cAAc;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,UAAU,CAAC,EAC/B,OAAO,EACP,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,KAAK,EACL,oBAA4B,GAC7B,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhC"}
+{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAIA,UAAU,cAAc;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,eAAe,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,wBAAsB,UAAU,CAAC,EAC/B,OAAO,EACP,eAAe,EACf,KAAK,GACN,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhC"}

package/dist/deleteFile.js

@@ -1,14 +1,7 @@
 import { del } from '@vercel/blob';
-import { generateURL } from './generateURL.js';
-export async function deleteFile({ baseUrl, collectionPrefix = '', docPrefix, filename, token, useCompositePrefixes = false }) {
-    const fileUrl = generateURL({
-        baseUrl,
-        collectionPrefix,
-        filename,
-        prefix: docPrefix,
-        useCompositePrefixes
-    });
-    await del(fileUrl, {
+import { buildBlobUrl } from './generateURL.js';
+export async function deleteFile({ baseUrl, storageFilePath, token }) {
+    await del(buildBlobUrl(baseUrl, storageFilePath), {
         token
     });
 }

package/dist/deleteFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import { del } from '@vercel/blob'\n\nimport { generateURL } from './generateURL.js'\n\ninterface DeleteFileArgs {\n  baseUrl: string\n  collectionPrefix?: string\n  docPrefix: string\n  filename: string\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function deleteFile({\n  baseUrl,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  token,\n  useCompositePrefixes = false,\n}: DeleteFileArgs): Promise<void> {\n  const fileUrl = generateURL({\n    baseUrl,\n    collectionPrefix,\n    filename,\n    prefix: docPrefix,\n    useCompositePrefixes,\n  })\n\n  await del(fileUrl, { token })\n}\n"],"names":["del","generateURL","deleteFile","baseUrl","collectionPrefix","docPrefix","filename","token","useCompositePrefixes","fileUrl","prefix"],"mappings":"AAAA,SAASA,GAAG,QAAQ,eAAc;AAElC,SAASC,WAAW,QAAQ,mBAAkB;AAW9C,OAAO,eAAeC,WAAW,EAC/BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,KAAK,EACLC,uBAAuB,KAAK,EACb;IACf,MAAMC,UAAUR,YAAY;QAC1BE;QACAC;QACAE;QACAI,QAAQL;QACRG;IACF;IAEA,MAAMR,IAAIS,SAAS;QAAEF;IAAM;AAC7B"}
+{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import { del } from '@vercel/blob'\n\nimport { buildBlobUrl } from './generateURL.js'\n\ninterface DeleteFileArgs {\n  baseUrl: string\n  storageFilePath: string\n  token: string\n}\n\nexport async function deleteFile({\n  baseUrl,\n  storageFilePath,\n  token,\n}: DeleteFileArgs): Promise<void> {\n  await del(buildBlobUrl(baseUrl, storageFilePath), { token })\n}\n"],"names":["del","buildBlobUrl","deleteFile","baseUrl","storageFilePath","token"],"mappings":"AAAA,SAASA,GAAG,QAAQ,eAAc;AAElC,SAASC,YAAY,QAAQ,mBAAkB;AAQ/C,OAAO,eAAeC,WAAW,EAC/BC,OAAO,EACPC,eAAe,EACfC,KAAK,EACU;IACf,MAAML,IAAIC,aAAaE,SAASC,kBAAkB;QAAEC;IAAM;AAC5D"}

package/dist/generateURL.d.ts

@@ -5,6 +5,7 @@ interface GenerateURLArgs {
     prefix: string;
     useCompositePrefixes?: boolean;
 }
+export declare function buildBlobUrl(baseUrl: string, storageFilePath: string): string;
 export declare function generateURL({ baseUrl, collectionPrefix, filename, prefix, useCompositePrefixes, }: GenerateURLArgs): string;
 export {};
 //# sourceMappingURL=generateURL.d.ts.map

package/dist/generateURL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateURL.d.ts","sourceRoot":"","sources":["../src/generateURL.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,gBAAqB,EACrB,QAAQ,EACR,MAAM,EACN,oBAA4B,GAC7B,EAAE,eAAe,GAAG,MAAM,CAgB1B"}
+{"version":3,"file":"generateURL.d.ts","sourceRoot":"","sources":["../src/generateURL.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAGD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAU7E;AAED,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,gBAAqB,EACrB,QAAQ,EACR,MAAM,EACN,oBAA4B,GAC7B,EAAE,eAAe,GAAG,MAAM,CAS1B"}

package/dist/generateURL.js

@@ -1,19 +1,23 @@
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
+import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities';
 import path from 'path';
+// Builds the public blob URL for a storage path, URL-encoding only the filename segment.
+export function buildBlobUrl(baseUrl, storageFilePath) {
+    // example: "my-collection/my-doc/my file.jpg" -> "my-collection/my-doc"
+    const dir = path.posix.dirname(storageFilePath);
+    // example: "my file.jpg" -> "my%20file.jpg"
+    const encodedFilename = encodeURIComponent(path.posix.basename(storageFilePath));
+    // example: "my-collection/my-doc/my%20file.jpg"
+    const storageFilePathWithEncodedFilename = dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename);
+    return `${baseUrl}/${storageFilePathWithEncodedFilename}`;
+}
 export function generateURL({ baseUrl, collectionPrefix = '', filename, prefix, useCompositePrefixes = false }) {
-    const { fileKey: fileKeyWithPrefix } = getFileKey({
+    const { storageFilePath } = buildStoragePathData({
         collectionPrefix,
         docPrefix: prefix,
         filename,
         useCompositePrefixes
     });
-    // example: "my-collection/my-doc/my file.jpg" -> "my-collection/my-doc"
-    const dir = path.posix.dirname(fileKeyWithPrefix);
-    // example: "my file.jpg" -> "my%20file.jpg"
-    const encodedFilename = encodeURIComponent(path.posix.basename(fileKeyWithPrefix));
-    // example: "my-collection/my-doc/my%20file.jpg"
-    const fileKeyWithEncodedFilename = dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename);
-    return `${baseUrl}/${fileKeyWithEncodedFilename}`;
+    return buildBlobUrl(baseUrl, storageFilePath);
 }
 
 //# sourceMappingURL=generateURL.js.map

package/dist/generateURL.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\ninterface GenerateURLArgs {\n  baseUrl: string\n  collectionPrefix?: string\n  filename: string\n  prefix: string\n  useCompositePrefixes?: boolean\n}\n\nexport function generateURL({\n  baseUrl,\n  collectionPrefix = '',\n  filename,\n  prefix,\n  useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n  const { fileKey: fileKeyWithPrefix } = getFileKey({\n    collectionPrefix,\n    docPrefix: prefix,\n    filename,\n    useCompositePrefixes,\n  })\n  // example: \"my-collection/my-doc/my file.jpg\" -> \"my-collection/my-doc\"\n  const dir = path.posix.dirname(fileKeyWithPrefix)\n  // example: \"my file.jpg\" -> \"my%20file.jpg\"\n  const encodedFilename = encodeURIComponent(path.posix.basename(fileKeyWithPrefix))\n  // example: \"my-collection/my-doc/my%20file.jpg\"\n  const fileKeyWithEncodedFilename =\n    dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename)\n\n  return `${baseUrl}/${fileKeyWithEncodedFilename}`\n}\n"],"names":["getFileKey","path","generateURL","baseUrl","collectionPrefix","filename","prefix","useCompositePrefixes","fileKey","fileKeyWithPrefix","docPrefix","dir","posix","dirname","encodedFilename","encodeURIComponent","basename","fileKeyWithEncodedFilename","join"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,OAAOC,UAAU,OAAM;AAUvB,OAAO,SAASC,YAAY,EAC1BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEC,SAASC,iBAAiB,EAAE,GAAGT,WAAW;QAChDI;QACAM,WAAWJ;QACXD;QACAE;IACF;IACA,wEAAwE;IACxE,MAAMI,MAAMV,KAAKW,KAAK,CAACC,OAAO,CAACJ;IAC/B,4CAA4C;IAC5C,MAAMK,kBAAkBC,mBAAmBd,KAAKW,KAAK,CAACI,QAAQ,CAACP;IAC/D,gDAAgD;IAChD,MAAMQ,6BACJN,QAAQ,MAAMG,kBAAkBb,KAAKW,KAAK,CAACM,IAAI,CAACP,KAAKG;IAEvD,OAAO,GAAGX,QAAQ,CAAC,EAAEc,4BAA4B;AACnD"}
+{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\ninterface GenerateURLArgs {\n  baseUrl: string\n  collectionPrefix?: string\n  filename: string\n  prefix: string\n  useCompositePrefixes?: boolean\n}\n\n// Builds the public blob URL for a storage path, URL-encoding only the filename segment.\nexport function buildBlobUrl(baseUrl: string, storageFilePath: string): string {\n  // example: \"my-collection/my-doc/my file.jpg\" -> \"my-collection/my-doc\"\n  const dir = path.posix.dirname(storageFilePath)\n  // example: \"my file.jpg\" -> \"my%20file.jpg\"\n  const encodedFilename = encodeURIComponent(path.posix.basename(storageFilePath))\n  // example: \"my-collection/my-doc/my%20file.jpg\"\n  const storageFilePathWithEncodedFilename =\n    dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename)\n\n  return `${baseUrl}/${storageFilePathWithEncodedFilename}`\n}\n\nexport function generateURL({\n  baseUrl,\n  collectionPrefix = '',\n  filename,\n  prefix,\n  useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n  const { storageFilePath } = buildStoragePathData({\n    collectionPrefix,\n    docPrefix: prefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  return buildBlobUrl(baseUrl, storageFilePath)\n}\n"],"names":["buildStoragePathData","path","buildBlobUrl","baseUrl","storageFilePath","dir","posix","dirname","encodedFilename","encodeURIComponent","basename","storageFilePathWithEncodedFilename","join","generateURL","collectionPrefix","filename","prefix","useCompositePrefixes","docPrefix"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,6CAA4C;AACjF,OAAOC,UAAU,OAAM;AAUvB,yFAAyF;AACzF,OAAO,SAASC,aAAaC,OAAe,EAAEC,eAAuB;IACnE,wEAAwE;IACxE,MAAMC,MAAMJ,KAAKK,KAAK,CAACC,OAAO,CAACH;IAC/B,4CAA4C;IAC5C,MAAMI,kBAAkBC,mBAAmBR,KAAKK,KAAK,CAACI,QAAQ,CAACN;IAC/D,gDAAgD;IAChD,MAAMO,qCACJN,QAAQ,MAAMG,kBAAkBP,KAAKK,KAAK,CAACM,IAAI,CAACP,KAAKG;IAEvD,OAAO,GAAGL,QAAQ,CAAC,EAAEQ,oCAAoC;AAC3D;AAEA,OAAO,SAASE,YAAY,EAC1BV,OAAO,EACPW,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEb,eAAe,EAAE,GAAGJ,qBAAqB;QAC/Cc;QACAI,WAAWF;QACXD;QACAE;IACF;IAEA,OAAOf,aAAaC,SAASC;AAC/B"}

package/dist/getCollectionSources.d.ts

@@ -0,0 +1,20 @@
+import type { StorageAdapter } from 'payload';
+import type { VercelBlobCollectionSource } from './authorizeFileOverwrite.js';
+type VercelBlobStorageMetadata = {
+    collections: Record<string, {
+        prefix?: string;
+    } | true | undefined>;
+    enabled: boolean;
+    storeId?: string;
+    useCompositePrefixes: boolean;
+};
+export declare const vercelBlobStorageMetadata: unique symbol;
+export type InternalVercelBlobStorageAdapter = {
+    [vercelBlobStorageMetadata]: VercelBlobStorageMetadata;
+} & StorageAdapter;
+export declare const getCollectionSources: ({ currentAdapter, storageAdapters, }: {
+    currentAdapter: InternalVercelBlobStorageAdapter;
+    storageAdapters?: StorageAdapter[];
+}) => VercelBlobCollectionSource[];
+export {};
+//# sourceMappingURL=getCollectionSources.d.ts.map

package/dist/getCollectionSources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getCollectionSources.d.ts","sourceRoot":"","sources":["../src/getCollectionSources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAA;AAE7E,KAAK,yBAAyB,GAAG;IAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;IACnE,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,oBAAoB,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,yBAAyB,eAAsC,CAAA;AAE5E,MAAM,MAAM,gCAAgC,GAAG;IAC7C,CAAC,yBAAyB,CAAC,EAAE,yBAAyB,CAAA;CACvD,GAAG,cAAc,CAAA;AAMlB,eAAO,MAAM,oBAAoB,yCAG9B;IACD,cAAc,EAAE,gCAAgC,CAAA;IAChD,eAAe,CAAC,EAAE,cAAc,EAAE,CAAA;CACnC,KAAG,0BAA0B,EAoB7B,CAAA"}

package/dist/getCollectionSources.js

@@ -0,0 +1,27 @@
+export const vercelBlobStorageMetadata = Symbol('vercelBlobStorageMetadata');
+const isInternalVercelBlobStorageAdapter = (adapter)=>vercelBlobStorageMetadata in adapter;
+export const getCollectionSources = ({ currentAdapter, storageAdapters = [] })=>{
+    const currentMetadata = currentAdapter[vercelBlobStorageMetadata];
+    const adapters = new Set([
+        currentAdapter,
+        ...storageAdapters
+    ]);
+    return [
+        ...adapters
+    ].flatMap((adapter)=>{
+        if (!isInternalVercelBlobStorageAdapter(adapter)) {
+            return [];
+        }
+        const metadata = adapter[vercelBlobStorageMetadata];
+        if (!metadata.enabled || metadata.storeId !== currentMetadata.storeId) {
+            return [];
+        }
+        return Object.entries(metadata.collections).map(([collectionSlug, options])=>({
+                collectionPrefix: options === true ? '' : options?.prefix || '',
+                collectionSlug,
+                useCompositePrefixes: metadata.useCompositePrefixes
+            }));
+    });
+};
+
+//# sourceMappingURL=getCollectionSources.js.map

package/dist/getCollectionSources.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/getCollectionSources.ts"],"sourcesContent":["import type { StorageAdapter } from 'payload'\n\nimport type { VercelBlobCollectionSource } from './authorizeFileOverwrite.js'\n\ntype VercelBlobStorageMetadata = {\n  collections: Record<string, { prefix?: string } | true | undefined>\n  enabled: boolean\n  storeId?: string\n  useCompositePrefixes: boolean\n}\n\nexport const vercelBlobStorageMetadata = Symbol('vercelBlobStorageMetadata')\n\nexport type InternalVercelBlobStorageAdapter = {\n  [vercelBlobStorageMetadata]: VercelBlobStorageMetadata\n} & StorageAdapter\n\nconst isInternalVercelBlobStorageAdapter = (\n  adapter: StorageAdapter,\n): adapter is InternalVercelBlobStorageAdapter => vercelBlobStorageMetadata in adapter\n\nexport const getCollectionSources = ({\n  currentAdapter,\n  storageAdapters = [],\n}: {\n  currentAdapter: InternalVercelBlobStorageAdapter\n  storageAdapters?: StorageAdapter[]\n}): VercelBlobCollectionSource[] => {\n  const currentMetadata = currentAdapter[vercelBlobStorageMetadata]\n  const adapters = new Set([currentAdapter, ...storageAdapters])\n\n  return [...adapters].flatMap((adapter) => {\n    if (!isInternalVercelBlobStorageAdapter(adapter)) {\n      return []\n    }\n\n    const metadata = adapter[vercelBlobStorageMetadata]\n    if (!metadata.enabled || metadata.storeId !== currentMetadata.storeId) {\n      return []\n    }\n\n    return Object.entries(metadata.collections).map(([collectionSlug, options]) => ({\n      collectionPrefix: options === true ? '' : options?.prefix || '',\n      collectionSlug,\n      useCompositePrefixes: metadata.useCompositePrefixes,\n    }))\n  })\n}\n"],"names":["vercelBlobStorageMetadata","Symbol","isInternalVercelBlobStorageAdapter","adapter","getCollectionSources","currentAdapter","storageAdapters","currentMetadata","adapters","Set","flatMap","metadata","enabled","storeId","Object","entries","collections","map","collectionSlug","options","collectionPrefix","prefix","useCompositePrefixes"],"mappings":"AAWA,OAAO,MAAMA,4BAA4BC,OAAO,6BAA4B;AAM5E,MAAMC,qCAAqC,CACzCC,UACgDH,6BAA6BG;AAE/E,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,cAAc,EACdC,kBAAkB,EAAE,EAIrB;IACC,MAAMC,kBAAkBF,cAAc,CAACL,0BAA0B;IACjE,MAAMQ,WAAW,IAAIC,IAAI;QAACJ;WAAmBC;KAAgB;IAE7D,OAAO;WAAIE;KAAS,CAACE,OAAO,CAAC,CAACP;QAC5B,IAAI,CAACD,mCAAmCC,UAAU;YAChD,OAAO,EAAE;QACX;QAEA,MAAMQ,WAAWR,OAAO,CAACH,0BAA0B;QACnD,IAAI,CAACW,SAASC,OAAO,IAAID,SAASE,OAAO,KAAKN,gBAAgBM,OAAO,EAAE;YACrE,OAAO,EAAE;QACX;QAEA,OAAOC,OAAOC,OAAO,CAACJ,SAASK,WAAW,EAAEC,GAAG,CAAC,CAAC,CAACC,gBAAgBC,QAAQ,GAAM,CAAA;gBAC9EC,kBAAkBD,YAAY,OAAO,KAAKA,SAASE,UAAU;gBAC7DH;gBACAI,sBAAsBX,SAASW,oBAAoB;YACrD,CAAA;IACF;AACF,EAAC"}

package/dist/getFile.d.ts

@@ -1,17 +1,17 @@
-import type { CollectionConfig, PayloadRequest } from 'payload';
+import type { CollectionConfig, PayloadRequest, TypeWithID } from 'payload';
 interface GetFileArgs {
     baseUrl: string;
     cacheControlMaxAge: number;
     collection: CollectionConfig;
     collectionPrefix?: string;
+    doc?: TypeWithID;
     filename: string;
     incomingHeaders?: Headers;
-    prefixQueryParam?: string;
     req: PayloadRequest;
     token: string;
     uploadReference?: unknown;
     useCompositePrefixes?: boolean;
 }
-export declare function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix, filename, incomingHeaders, prefixQueryParam, req, token, uploadReference, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
+export declare function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix, doc, filename, incomingHeaders, req, token, uploadReference, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
 export {};
 //# sourceMappingURL=getFile.d.ts.map

package/dist/getFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAQ/D,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,OAAO,EACP,kBAAkB,EAClB,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,KAAK,EACL,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8FjC"}
+{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAQ3E,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,CAAC,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,OAAO,EACP,kBAAkB,EAClB,UAAU,EACV,gBAAqB,EACrB,GAAG,EACH,QAAQ,EACR,eAAe,EACf,GAAG,EACH,KAAK,EACL,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAgGjC"}

package/dist/getFile.js

@@ -1,15 +1,17 @@
 import { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities';
 import { BlobNotFoundError, head } from '@vercel/blob';
-import { getRangeRequestInfo } from 'payload/internal';
+import { getRangeRequestInfo, isXmlMimeType, uploadContentSecurityPolicy } from 'payload/internal';
 import { generateURL } from './generateURL.js';
-export async function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix = '', filename, incomingHeaders, prefixQueryParam, req, token, uploadReference, useCompositePrefixes = false }) {
+export async function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix = '', doc, filename, incomingHeaders, req, token, uploadReference, useCompositePrefixes = false }) {
     try {
         const docPrefix = await getDocPrefix({
             collection,
+            collectionPrefix,
+            doc,
             filename,
-            prefixQueryParam,
             req,
-            uploadReference
+            uploadReference,
+            useCompositePrefixes
         });
         const fileUrl = generateURL({
             baseUrl,
@@ -47,9 +49,9 @@ export async function getFile({ baseUrl, cacheControlMaxAge, collection, collect
         headers.append('Content-Disposition', contentDisposition);
         headers.append('Content-Type', contentType);
         headers.append('ETag', ETag);
-        // Add Content-Security-Policy header for SVG files to prevent executable code
-        if (contentType === 'image/svg+xml') {
-            headers.append('Content-Security-Policy', "script-src 'none'");
+        // Apply a restrictive policy to XML-family responses served through Payload.
+        if (isXmlMimeType(contentType)) {
+            headers.append('Content-Security-Policy', uploadContentSecurityPolicy);
         }
         if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
             headers = collection.upload.modifyResponseHeaders({

package/dist/getFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { CollectionConfig, PayloadRequest } from 'payload'\n\nimport { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { BlobNotFoundError, head } from '@vercel/blob'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport { generateURL } from './generateURL.js'\n\ninterface GetFileArgs {\n  baseUrl: string\n  cacheControlMaxAge: number\n  collection: CollectionConfig\n  collectionPrefix?: string\n  filename: string\n  incomingHeaders?: Headers\n  prefixQueryParam?: string\n  req: PayloadRequest\n  token: string\n  uploadReference?: unknown\n  useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n  baseUrl,\n  cacheControlMaxAge,\n  collection,\n  collectionPrefix = '',\n  filename,\n  incomingHeaders,\n  prefixQueryParam,\n  req,\n  token,\n  uploadReference,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  try {\n    const docPrefix = await getDocPrefix({\n      collection,\n      filename,\n      prefixQueryParam,\n      req,\n      uploadReference,\n    })\n\n    const fileUrl = generateURL({\n      baseUrl,\n      collectionPrefix,\n      filename,\n      prefix: docPrefix,\n      useCompositePrefixes,\n    })\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const blobMetadata = await head(fileUrl, { token })\n    const { contentDisposition, contentType, size, uploadedAt } = blobMetadata\n    const uploadedAtString = uploadedAt.toISOString()\n    const fileKeyForETag = fileUrl.replace(`${baseUrl}/`, '')\n    const ETag = `\"${fileKeyForETag}-${uploadedAtString}\"`\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const rangeResult = getRangeRequestInfo({ fileSize: size, rangeHeader })\n\n    if (rangeResult.type === 'invalid') {\n      return new Response(null, {\n        headers: new Headers(rangeResult.headers),\n        status: rangeResult.status,\n      })\n    }\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [key, value] of Object.entries(rangeResult.headers)) {\n      headers.append(key, value)\n    }\n\n    headers.append('Cache-Control', `public, max-age=${cacheControlMaxAge}`)\n    headers.append('Content-Disposition', contentDisposition)\n    headers.append('Content-Type', contentType)\n    headers.append('ETag', ETag)\n\n    // Add Content-Security-Policy header for SVG files to prevent executable code\n    if (contentType === 'image/svg+xml') {\n      headers.append('Content-Security-Policy', \"script-src 'none'\")\n    }\n\n    if (\n      collection.upload &&\n      typeof collection.upload === 'object' &&\n      typeof collection.upload.modifyResponseHeaders === 'function'\n    ) {\n      headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n    }\n\n    if (etagFromHeaders && etagFromHeaders === ETag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    const response = await fetch(`${fileUrl}?${uploadedAtString}`, {\n      headers: {\n        'Cache-Control': 'no-store, no-cache, must-revalidate',\n        Pragma: 'no-cache',\n        ...(rangeResult.type === 'partial' && {\n          Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`,\n        }),\n      },\n    })\n\n    if (!response.ok || !response.body) {\n      return new Response(null, { status: 204, statusText: 'No Content' })\n    }\n\n    headers.append('Last-Modified', uploadedAtString)\n\n    return new Response(response.body, {\n      headers,\n      status: rangeResult.status,\n    })\n  } catch (err: unknown) {\n    if (err instanceof BlobNotFoundError) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n    req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n    return new Response('Internal Server Error', { status: 500 })\n  }\n}\n"],"names":["getFilePrefix","getDocPrefix","BlobNotFoundError","head","getRangeRequestInfo","generateURL","getFile","baseUrl","cacheControlMaxAge","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","token","uploadReference","useCompositePrefixes","docPrefix","fileUrl","prefix","etagFromHeaders","headers","get","blobMetadata","contentDisposition","contentType","size","uploadedAt","uploadedAtString","toISOString","fileKeyForETag","replace","ETag","rangeHeader","rangeResult","fileSize","type","Response","Headers","status","key","value","Object","entries","append","upload","modifyResponseHeaders","response","fetch","Pragma","Range","rangeStart","rangeEnd","ok","body","statusText","err","payload","logger","error","msg"],"mappings":"AAEA,SAASA,iBAAiBC,YAAY,QAAQ,6CAA4C;AAC1F,SAASC,iBAAiB,EAAEC,IAAI,QAAQ,eAAc;AACtD,SAASC,mBAAmB,QAAQ,mBAAkB;AAEtD,SAASC,WAAW,QAAQ,mBAAkB;AAgB9C,OAAO,eAAeC,QAAQ,EAC5BC,OAAO,EACPC,kBAAkB,EAClBC,UAAU,EACVC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,eAAe,EACfC,gBAAgB,EAChBC,GAAG,EACHC,KAAK,EACLC,eAAe,EACfC,uBAAuB,KAAK,EAChB;IACZ,IAAI;QACF,MAAMC,YAAY,MAAMjB,aAAa;YACnCQ;YACAE;YACAE;YACAC;YACAE;QACF;QAEA,MAAMG,UAAUd,YAAY;YAC1BE;YACAG;YACAC;YACAS,QAAQF;YACRD;QACF;QACA,MAAMI,kBAAkBP,IAAIQ,OAAO,CAACC,GAAG,CAAC,WAAWT,IAAIQ,OAAO,CAACC,GAAG,CAAC;QACnE,MAAMC,eAAe,MAAMrB,KAAKgB,SAAS;YAAEJ;QAAM;QACjD,MAAM,EAAEU,kBAAkB,EAAEC,WAAW,EAAEC,IAAI,EAAEC,UAAU,EAAE,GAAGJ;QAC9D,MAAMK,mBAAmBD,WAAWE,WAAW;QAC/C,MAAMC,iBAAiBZ,QAAQa,OAAO,CAAC,GAAGzB,QAAQ,CAAC,CAAC,EAAE;QACtD,MAAM0B,OAAO,CAAC,CAAC,EAAEF,eAAe,CAAC,EAAEF,iBAAiB,CAAC,CAAC;QAEtD,uBAAuB;QACvB,MAAMK,cAAcpB,IAAIQ,OAAO,CAACC,GAAG,CAAC;QACpC,MAAMY,cAAc/B,oBAAoB;YAAEgC,UAAUT;YAAMO;QAAY;QAEtE,IAAIC,YAAYE,IAAI,KAAK,WAAW;YAClC,OAAO,IAAIC,SAAS,MAAM;gBACxBhB,SAAS,IAAIiB,QAAQJ,YAAYb,OAAO;gBACxCkB,QAAQL,YAAYK,MAAM;YAC5B;QACF;QAEA,IAAIlB,UAAU,IAAIiB,QAAQ3B;QAE1B,4CAA4C;QAC5C,KAAK,MAAM,CAAC6B,KAAKC,MAAM,IAAIC,OAAOC,OAAO,CAACT,YAAYb,OAAO,EAAG;YAC9DA,QAAQuB,MAAM,CAACJ,KAAKC;QACtB;QAEApB,QAAQuB,MAAM,CAAC,iBAAiB,CAAC,gBAAgB,EAAErC,oBAAoB;QACvEc,QAAQuB,MAAM,CAAC,uBAAuBpB;QACtCH,QAAQuB,MAAM,CAAC,gBAAgBnB;QAC/BJ,QAAQuB,MAAM,CAAC,QAAQZ;QAEvB,8EAA8E;QAC9E,IAAIP,gBAAgB,iBAAiB;YACnCJ,QAAQuB,MAAM,CAAC,2BAA2B;QAC5C;QAEA,IACEpC,WAAWqC,MAAM,IACjB,OAAOrC,WAAWqC,MAAM,KAAK,YAC7B,OAAOrC,WAAWqC,MAAM,CAACC,qBAAqB,KAAK,YACnD;YACAzB,UAAUb,WAAWqC,MAAM,CAACC,qBAAqB,CAAC;gBAAEzB;YAAQ,MAAMA;QACpE;QAEA,IAAID,mBAAmBA,oBAAoBY,MAAM;YAC/C,OAAO,IAAIK,SAAS,MAAM;gBACxBhB;gBACAkB,QAAQ;YACV;QACF;QAEA,MAAMQ,WAAW,MAAMC,MAAM,GAAG9B,QAAQ,CAAC,EAAEU,kBAAkB,EAAE;YAC7DP,SAAS;gBACP,iBAAiB;gBACjB4B,QAAQ;gBACR,GAAIf,YAAYE,IAAI,KAAK,aAAa;oBACpCc,OAAO,CAAC,MAAM,EAAEhB,YAAYiB,UAAU,CAAC,CAAC,EAAEjB,YAAYkB,QAAQ,EAAE;gBAClE,CAAC;YACH;QACF;QAEA,IAAI,CAACL,SAASM,EAAE,IAAI,CAACN,SAASO,IAAI,EAAE;YAClC,OAAO,IAAIjB,SAAS,MAAM;gBAAEE,QAAQ;gBAAKgB,YAAY;YAAa;QACpE;QAEAlC,QAAQuB,MAAM,CAAC,iBAAiBhB;QAEhC,OAAO,IAAIS,SAASU,SAASO,IAAI,EAAE;YACjCjC;YACAkB,QAAQL,YAAYK,MAAM;QAC5B;IACF,EAAE,OAAOiB,KAAc;QACrB,IAAIA,eAAevD,mBAAmB;YACpC,OAAO,IAAIoC,SAAS,MAAM;gBAAEE,QAAQ;gBAAKgB,YAAY;YAAY;QACnE;QACA1C,IAAI4C,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;YAAEH;YAAKI,KAAK;QAAoC;QACzE,OAAO,IAAIvB,SAAS,yBAAyB;YAAEE,QAAQ;QAAI;IAC7D;AACF"}
+{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { CollectionConfig, PayloadRequest, TypeWithID } from 'payload'\n\nimport { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { BlobNotFoundError, head } from '@vercel/blob'\nimport { getRangeRequestInfo, isXmlMimeType, uploadContentSecurityPolicy } from 'payload/internal'\n\nimport { generateURL } from './generateURL.js'\n\ninterface GetFileArgs {\n  baseUrl: string\n  cacheControlMaxAge: number\n  collection: CollectionConfig\n  collectionPrefix?: string\n  doc?: TypeWithID\n  filename: string\n  incomingHeaders?: Headers\n  req: PayloadRequest\n  token: string\n  uploadReference?: unknown\n  useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n  baseUrl,\n  cacheControlMaxAge,\n  collection,\n  collectionPrefix = '',\n  doc,\n  filename,\n  incomingHeaders,\n  req,\n  token,\n  uploadReference,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  try {\n    const docPrefix = await getDocPrefix({\n      collection,\n      collectionPrefix,\n      doc,\n      filename,\n      req,\n      uploadReference,\n      useCompositePrefixes,\n    })\n\n    const fileUrl = generateURL({\n      baseUrl,\n      collectionPrefix,\n      filename,\n      prefix: docPrefix,\n      useCompositePrefixes,\n    })\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const blobMetadata = await head(fileUrl, { token })\n    const { contentDisposition, contentType, size, uploadedAt } = blobMetadata\n    const uploadedAtString = uploadedAt.toISOString()\n    const fileKeyForETag = fileUrl.replace(`${baseUrl}/`, '')\n    const ETag = `\"${fileKeyForETag}-${uploadedAtString}\"`\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const rangeResult = getRangeRequestInfo({ fileSize: size, rangeHeader })\n\n    if (rangeResult.type === 'invalid') {\n      return new Response(null, {\n        headers: new Headers(rangeResult.headers),\n        status: rangeResult.status,\n      })\n    }\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [key, value] of Object.entries(rangeResult.headers)) {\n      headers.append(key, value)\n    }\n\n    headers.append('Cache-Control', `public, max-age=${cacheControlMaxAge}`)\n    headers.append('Content-Disposition', contentDisposition)\n    headers.append('Content-Type', contentType)\n    headers.append('ETag', ETag)\n\n    // Apply a restrictive policy to XML-family responses served through Payload.\n    if (isXmlMimeType(contentType)) {\n      headers.append('Content-Security-Policy', uploadContentSecurityPolicy)\n    }\n\n    if (\n      collection.upload &&\n      typeof collection.upload === 'object' &&\n      typeof collection.upload.modifyResponseHeaders === 'function'\n    ) {\n      headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n    }\n\n    if (etagFromHeaders && etagFromHeaders === ETag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    const response = await fetch(`${fileUrl}?${uploadedAtString}`, {\n      headers: {\n        'Cache-Control': 'no-store, no-cache, must-revalidate',\n        Pragma: 'no-cache',\n        ...(rangeResult.type === 'partial' && {\n          Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`,\n        }),\n      },\n    })\n\n    if (!response.ok || !response.body) {\n      return new Response(null, { status: 204, statusText: 'No Content' })\n    }\n\n    headers.append('Last-Modified', uploadedAtString)\n\n    return new Response(response.body, {\n      headers,\n      status: rangeResult.status,\n    })\n  } catch (err: unknown) {\n    if (err instanceof BlobNotFoundError) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n    req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n    return new Response('Internal Server Error', { status: 500 })\n  }\n}\n"],"names":["getFilePrefix","getDocPrefix","BlobNotFoundError","head","getRangeRequestInfo","isXmlMimeType","uploadContentSecurityPolicy","generateURL","getFile","baseUrl","cacheControlMaxAge","collection","collectionPrefix","doc","filename","incomingHeaders","req","token","uploadReference","useCompositePrefixes","docPrefix","fileUrl","prefix","etagFromHeaders","headers","get","blobMetadata","contentDisposition","contentType","size","uploadedAt","uploadedAtString","toISOString","fileKeyForETag","replace","ETag","rangeHeader","rangeResult","fileSize","type","Response","Headers","status","key","value","Object","entries","append","upload","modifyResponseHeaders","response","fetch","Pragma","Range","rangeStart","rangeEnd","ok","body","statusText","err","payload","logger","error","msg"],"mappings":"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"}

package/dist/index.d.ts

@@ -14,16 +14,6 @@ export type VercelBlobStorageOptions = {
      * @default false
      */
     addRandomSuffix?: boolean;
-    /**
-     * When enabled, fields (like the prefix field) will always be inserted into
-     * the collection schema regardless of whether the plugin is enabled. This
-     * ensures a consistent schema across all environments.
-     *
-     * This will be enabled by default in Payload v4.
-     *
-     * @default false
-     */
-    alwaysInsertFields?: boolean;
     /**
      * Cache-Control max-age in seconds
      *
@@ -54,14 +44,15 @@ export type VercelBlobStorageOptions = {
     token: string | undefined;
     /**
      * When true, the collection-level prefix and document-level prefix are combined
-     * (compositional). When false (default), document prefix overrides collection
-     * prefix entirely.
+     * (compositional). When false (default), a document prefix already within the
+     * collection prefix is used as-is for new uploads; otherwise it is nested beneath it.
+     * Existing files retain their stored prefixes for reads, URLs, and cleanup.
      *
-     * Example:
-     * - collection prefix: `collection-prefix/`
-     * - document prefix: `document-prefix/`
-     * - resulting prefix with useCompositePrefixes=true: `collection-prefix/document-prefix/`
-     * - resulting prefix with useCompositePrefixes=false: `document-prefix/`
+     * Example with a document prefix already contained by the collection prefix:
+     * - collection prefix: `uploads/`
+     * - document prefix: `uploads/documents/`
+     * - resulting prefix with useCompositePrefixes=true: `uploads/uploads/documents/`
+     * - resulting prefix with useCompositePrefixes=false: `uploads/documents/`
      *
      * @default false
      */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAM3E,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAEzB;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AASD,KAAK,wBAAwB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,cAAc,CAAA;AAEnG,eAAO,MAAM,iBAAiB,EAAE,wBAoG9B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAW3E,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAEzB;;;;;;;;;;;;;OAaG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AASD,KAAK,wBAAwB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,cAAc,CAAA;AAEnG,eAAO,MAAM,iBAAiB,EAAE,wBAwG/B,CAAA"}

package/dist/index.js

@@ -1,18 +1,19 @@
 import { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage';
 import { createVercelBlobAdapter } from './adapter.js';
+import { getCollectionSources, vercelBlobStorageMetadata } from './getCollectionSources.js';
 const defaultUploadOptions = {
     access: 'public',
     addRandomSuffix: false,
     cacheControlMaxAge: 60 * 60 * 24 * 365,
     enabled: true
 };
-export const vercelBlobStorage = (options)=>({
+export const vercelBlobStorage = (options)=>{
+    const storeId = options.token?.match(/^vercel_blob_rw_([a-z\d]+)_[a-z\d]+$/i)?.[1]?.toLowerCase();
+    const isPluginDisabled = options.enabled === false || !options.token;
+    const storageAdapter = {
         name: 'vercel-blob',
         collections: Object.keys(options.collections),
         init: (incomingConfig)=>{
-            // Parse storeId from token
-            const storeId = options.token?.match(/^vercel_blob_rw_([a-z\d]+)_[a-z\d]+$/i)?.[1]?.toLowerCase();
-            const isPluginDisabled = options.enabled === false || !options.token;
             // Don't throw if the plugin is disabled
             if (!storeId && !isPluginDisabled) {
                 throw new Error('Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.');
@@ -25,22 +26,18 @@ export const vercelBlobStorage = (options)=>({
             const baseUrl = process.env.STORAGE_VERCEL_BLOB_BASE_URL || `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`;
             // If the plugin is disabled or no token is provided, do not enable the plugin
             if (isPluginDisabled) {
-                if (options.alwaysInsertFields) {
-                    const collectionsWithoutAdapter = Object.entries(options.collections).reduce((acc, [slug, collOptions])=>({
-                            ...acc,
-                            [slug]: {
-                                ...collOptions === true ? {} : collOptions,
-                                adapter: null
-                            }
-                        }), {});
-                    return cloudStoragePlugin({
-                        alwaysInsertFields: true,
-                        collections: collectionsWithoutAdapter,
-                        enabled: false,
-                        useCompositePrefixes: options.useCompositePrefixes
-                    })(incomingConfig);
-                }
-                return incomingConfig;
+                const collectionsWithoutAdapter = Object.entries(options.collections).reduce((acc, [slug, collOptions])=>({
+                        ...acc,
+                        [slug]: {
+                            ...collOptions === true ? {} : collOptions,
+                            adapter: null
+                        }
+                    }), {});
+                return cloudStoragePlugin({
+                    collections: collectionsWithoutAdapter,
+                    enabled: false,
+                    useCompositePrefixes: options.useCompositePrefixes
+                })(incomingConfig);
             }
             const adapter = createVercelBlobAdapter({
                 access: optionsWithDefaults.access ?? 'public',
@@ -48,6 +45,10 @@ export const vercelBlobStorage = (options)=>({
                 baseUrl,
                 cacheControlMaxAge: optionsWithDefaults.cacheControlMaxAge ?? 60 * 60 * 24 * 365,
                 clientUploads: optionsWithDefaults.clientUploads,
+                collectionSources: getCollectionSources({
+                    currentAdapter: storageAdapter,
+                    storageAdapters: incomingConfig.storage
+                }),
                 token: options.token,
                 useCompositePrefixes: options.useCompositePrefixes
             });
@@ -76,11 +77,18 @@ export const vercelBlobStorage = (options)=>({
                 })
             };
             return cloudStoragePlugin({
-                alwaysInsertFields: options.alwaysInsertFields,
                 collections: collectionsWithAdapter,
                 useCompositePrefixes: options.useCompositePrefixes
             })(config);
+        },
+        [vercelBlobStorageMetadata]: {
+            collections: options.collections,
+            enabled: !isPluginDisabled,
+            storeId,
+            useCompositePrefixes: Boolean(options.useCompositePrefixes)
         }
-    });
+    };
+    return storageAdapter;
+};
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, StorageAdapter, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\n\nimport { createVercelBlobAdapter } from './adapter.js'\n\nexport type VercelBlobStorageOptions = {\n  /**\n   * Access control level. Currently, only 'public' is supported.\n   * Vercel plans on adding support for private blobs in the future.\n   *\n   * @default 'public'\n   */\n  access?: 'public'\n\n  /**\n   * Add a random suffix to the uploaded file name in Vercel Blob storage\n   *\n   * @default false\n   */\n  addRandomSuffix?: boolean\n\n  /**\n   * When enabled, fields (like the prefix field) will always be inserted into\n   * the collection schema regardless of whether the plugin is enabled. This\n   * ensures a consistent schema across all environments.\n   *\n   * This will be enabled by default in Payload v4.\n   *\n   * @default false\n   */\n  alwaysInsertFields?: boolean\n\n  /**\n   * Cache-Control max-age in seconds\n   *\n   * @default 365 * 24 * 60 * 60 // (1 Year)\n   */\n  cacheControlMaxAge?: number\n\n  /**\n   * Upload directly to Vercel Blob instead of through Payload.\n   */\n  clientUploads?: ClientUploadsConfig\n\n  /**\n   * Collections to apply the Vercel Blob adapter to\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * Vercel Blob storage read/write token\n   *\n   * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n   *\n   * If unset, the plugin will be disabled and will fallback to local storage\n   */\n  token: string | undefined\n\n  /**\n   * When true, the collection-level prefix and document-level prefix are combined\n   * (compositional). When false (default), document prefix overrides collection\n   * prefix entirely.\n   *\n   * Example:\n   * - collection prefix: `collection-prefix/`\n   * - document prefix: `document-prefix/`\n   * - resulting prefix with useCompositePrefixes=true: `collection-prefix/document-prefix/`\n   * - resulting prefix with useCompositePrefixes=false: `document-prefix/`\n   *\n   * @default false\n   */\n  useCompositePrefixes?: boolean\n}\n\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n  access: 'public',\n  addRandomSuffix: false,\n  cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n  enabled: true,\n}\n\ntype VercelBlobStorageFactory = (vercelBlobStorageOpts: VercelBlobStorageOptions) => StorageAdapter\n\nexport const vercelBlobStorage: VercelBlobStorageFactory = (\n  options: VercelBlobStorageOptions,\n): StorageAdapter => ({\n  name: 'vercel-blob',\n  collections: Object.keys(options.collections),\n  init: (incomingConfig: Config): Config => {\n    // Parse storeId from token\n    const storeId = options.token\n      ?.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]\n      ?.toLowerCase()\n\n    const isPluginDisabled = options.enabled === false || !options.token\n\n    // Don't throw if the plugin is disabled\n    if (!storeId && !isPluginDisabled) {\n      throw new Error(\n        'Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.',\n      )\n    }\n\n    const optionsWithDefaults = {\n      ...defaultUploadOptions,\n      ...options,\n    }\n\n    // support overriding the base URL for emulator https://github.com/payloadcms/vercel-blob-emulator\n    const baseUrl =\n      process.env.STORAGE_VERCEL_BLOB_BASE_URL ||\n      `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n    // If the plugin is disabled or no token is provided, do not enable the plugin\n    if (isPluginDisabled) {\n      if (options.alwaysInsertFields) {\n        const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n          options.collections,\n        ).reduce(\n          (acc, [slug, collOptions]) => ({\n            ...acc,\n            [slug]: { ...(collOptions === true ? {} : collOptions), adapter: null },\n          }),\n          {} as Record<string, CollectionOptions>,\n        )\n        return cloudStoragePlugin({\n          alwaysInsertFields: true,\n          collections: collectionsWithoutAdapter,\n          enabled: false,\n          useCompositePrefixes: options.useCompositePrefixes,\n        })(incomingConfig)\n      }\n      return incomingConfig\n    }\n\n    const adapter = createVercelBlobAdapter({\n      access: optionsWithDefaults.access ?? 'public',\n      addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n      baseUrl,\n      cacheControlMaxAge: optionsWithDefaults.cacheControlMaxAge ?? 60 * 60 * 24 * 365,\n      clientUploads: optionsWithDefaults.clientUploads,\n      token: options.token!,\n      useCompositePrefixes: options.useCompositePrefixes,\n    })\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      options.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\n          adapter,\n        },\n      }),\n      {} as Record<string, CollectionOptions>,\n    )\n\n    // Set disableLocalStorage: true for collections specified in the plugin options\n    const config = {\n      ...incomingConfig,\n      collections: (incomingConfig.collections || []).map((collection) => {\n        if (!collectionsWithAdapter[collection.slug]) {\n          return collection\n        }\n\n        return {\n          ...collection,\n          upload: {\n            ...(typeof collection.upload === 'object' ? collection.upload : {}),\n            disableLocalStorage: true,\n          },\n        }\n      }),\n    }\n\n    return cloudStoragePlugin({\n      alwaysInsertFields: options.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: options.useCompositePrefixes,\n    })(config)\n  },\n})\n"],"names":["cloudStoragePlugin","createVercelBlobAdapter","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","name","collections","Object","keys","init","incomingConfig","storeId","token","match","toLowerCase","isPluginDisabled","Error","optionsWithDefaults","baseUrl","process","env","STORAGE_VERCEL_BLOB_BASE_URL","alwaysInsertFields","collectionsWithoutAdapter","entries","reduce","acc","slug","collOptions","adapter","useCompositePrefixes","clientUploads","collectionsWithAdapter","config","map","collection","upload","disableLocalStorage"],"mappings":"AAOA,SAASA,kBAAkB,QAAQ,mCAAkC;AAErE,SAASC,uBAAuB,QAAQ,eAAc;AA6EtD,MAAMC,uBAA0D;IAC9DC,QAAQ;IACRC,iBAAiB;IACjBC,oBAAoB,KAAK,KAAK,KAAK;IACnCC,SAAS;AACX;AAIA,OAAO,MAAMC,oBAA8C,CACzDC,UACoB,CAAA;QACpBC,MAAM;QACNC,aAAaC,OAAOC,IAAI,CAACJ,QAAQE,WAAW;QAC5CG,MAAM,CAACC;YACL,2BAA2B;YAC3B,MAAMC,UAAUP,QAAQQ,KAAK,EACzBC,MAAM,0CAA0C,CAAC,EAAE,EACnDC;YAEJ,MAAMC,mBAAmBX,QAAQF,OAAO,KAAK,SAAS,CAACE,QAAQQ,KAAK;YAEpE,wCAAwC;YACxC,IAAI,CAACD,WAAW,CAACI,kBAAkB;gBACjC,MAAM,IAAIC,MACR;YAEJ;YAEA,MAAMC,sBAAsB;gBAC1B,GAAGnB,oBAAoB;gBACvB,GAAGM,OAAO;YACZ;YAEA,kGAAkG;YAClG,MAAMc,UACJC,QAAQC,GAAG,CAACC,4BAA4B,IACxC,CAAC,QAAQ,EAAEV,QAAQ,CAAC,EAAEM,oBAAoBlB,MAAM,CAAC,wBAAwB,CAAC;YAE5E,8EAA8E;YAC9E,IAAIgB,kBAAkB;gBACpB,IAAIX,QAAQkB,kBAAkB,EAAE;oBAC9B,MAAMC,4BAAsEhB,OAAOiB,OAAO,CACxFpB,QAAQE,WAAW,EACnBmB,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;4BAC7B,GAAGF,GAAG;4BACN,CAACC,KAAK,EAAE;gCAAE,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;gCAAGC,SAAS;4BAAK;wBACxE,CAAA,GACA,CAAC;oBAEH,OAAOjC,mBAAmB;wBACxB0B,oBAAoB;wBACpBhB,aAAaiB;wBACbrB,SAAS;wBACT4B,sBAAsB1B,QAAQ0B,oBAAoB;oBACpD,GAAGpB;gBACL;gBACA,OAAOA;YACT;YAEA,MAAMmB,UAAUhC,wBAAwB;gBACtCE,QAAQkB,oBAAoBlB,MAAM,IAAI;gBACtCC,iBAAiBiB,oBAAoBjB,eAAe;gBACpDkB;gBACAjB,oBAAoBgB,oBAAoBhB,kBAAkB,IAAI,KAAK,KAAK,KAAK;gBAC7E8B,eAAed,oBAAoBc,aAAa;gBAChDnB,OAAOR,QAAQQ,KAAK;gBACpBkB,sBAAsB1B,QAAQ0B,oBAAoB;YACpD;YAEA,+CAA+C;YAC/C,MAAME,yBAAmEzB,OAAOiB,OAAO,CACrFpB,QAAQE,WAAW,EACnBmB,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;oBAC7B,GAAGF,GAAG;oBACN,CAACC,KAAK,EAAE;wBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;wBAC3CC;oBACF;gBACF,CAAA,GACA,CAAC;YAGH,gFAAgF;YAChF,MAAMI,SAAS;gBACb,GAAGvB,cAAc;gBACjBJ,aAAa,AAACI,CAAAA,eAAeJ,WAAW,IAAI,EAAE,AAAD,EAAG4B,GAAG,CAAC,CAACC;oBACnD,IAAI,CAACH,sBAAsB,CAACG,WAAWR,IAAI,CAAC,EAAE;wBAC5C,OAAOQ;oBACT;oBAEA,OAAO;wBACL,GAAGA,UAAU;wBACbC,QAAQ;4BACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;4BAClEC,qBAAqB;wBACvB;oBACF;gBACF;YACF;YAEA,OAAOzC,mBAAmB;gBACxB0B,oBAAoBlB,QAAQkB,kBAAkB;gBAC9ChB,aAAa0B;gBACbF,sBAAsB1B,QAAQ0B,oBAAoB;YACpD,GAAGG;QACL;IACF,CAAA,EAAE"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, StorageAdapter, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\n\nimport { createVercelBlobAdapter } from './adapter.js'\nimport {\n  getCollectionSources,\n  type InternalVercelBlobStorageAdapter,\n  vercelBlobStorageMetadata,\n} from './getCollectionSources.js'\n\nexport type VercelBlobStorageOptions = {\n  /**\n   * Access control level. Currently, only 'public' is supported.\n   * Vercel plans on adding support for private blobs in the future.\n   *\n   * @default 'public'\n   */\n  access?: 'public'\n\n  /**\n   * Add a random suffix to the uploaded file name in Vercel Blob storage\n   *\n   * @default false\n   */\n  addRandomSuffix?: boolean\n\n  /**\n   * Cache-Control max-age in seconds\n   *\n   * @default 365 * 24 * 60 * 60 // (1 Year)\n   */\n  cacheControlMaxAge?: number\n\n  /**\n   * Upload directly to Vercel Blob instead of through Payload.\n   */\n  clientUploads?: ClientUploadsConfig\n\n  /**\n   * Collections to apply the Vercel Blob adapter to\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * Vercel Blob storage read/write token\n   *\n   * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n   *\n   * If unset, the plugin will be disabled and will fallback to local storage\n   */\n  token: string | undefined\n\n  /**\n   * When true, the collection-level prefix and document-level prefix are combined\n   * (compositional). When false (default), a document prefix already within the\n   * collection prefix is used as-is for new uploads; otherwise it is nested beneath it.\n   * Existing files retain their stored prefixes for reads, URLs, and cleanup.\n   *\n   * Example with a document prefix already contained by the collection prefix:\n   * - collection prefix: `uploads/`\n   * - document prefix: `uploads/documents/`\n   * - resulting prefix with useCompositePrefixes=true: `uploads/uploads/documents/`\n   * - resulting prefix with useCompositePrefixes=false: `uploads/documents/`\n   *\n   * @default false\n   */\n  useCompositePrefixes?: boolean\n}\n\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n  access: 'public',\n  addRandomSuffix: false,\n  cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n  enabled: true,\n}\n\ntype VercelBlobStorageFactory = (vercelBlobStorageOpts: VercelBlobStorageOptions) => StorageAdapter\n\nexport const vercelBlobStorage: VercelBlobStorageFactory = (\n  options: VercelBlobStorageOptions,\n): StorageAdapter => {\n  const storeId = options.token?.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]?.toLowerCase()\n  const isPluginDisabled = options.enabled === false || !options.token\n  const storageAdapter: InternalVercelBlobStorageAdapter = {\n    name: 'vercel-blob',\n    collections: Object.keys(options.collections),\n    init: (incomingConfig: Config): Config => {\n      // Don't throw if the plugin is disabled\n      if (!storeId && !isPluginDisabled) {\n        throw new Error(\n          'Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.',\n        )\n      }\n\n      const optionsWithDefaults = {\n        ...defaultUploadOptions,\n        ...options,\n      }\n\n      // support overriding the base URL for emulator https://github.com/payloadcms/vercel-blob-emulator\n      const baseUrl =\n        process.env.STORAGE_VERCEL_BLOB_BASE_URL ||\n        `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n      // If the plugin is disabled or no token is provided, do not enable the plugin\n      if (isPluginDisabled) {\n        const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n          options.collections,\n        ).reduce(\n          (acc, [slug, collOptions]) => ({\n            ...acc,\n            [slug]: { ...(collOptions === true ? {} : collOptions), adapter: null },\n          }),\n          {} as Record<string, CollectionOptions>,\n        )\n        return cloudStoragePlugin({\n          collections: collectionsWithoutAdapter,\n          enabled: false,\n          useCompositePrefixes: options.useCompositePrefixes,\n        })(incomingConfig)\n      }\n\n      const adapter = createVercelBlobAdapter({\n        access: optionsWithDefaults.access ?? 'public',\n        addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n        baseUrl,\n        cacheControlMaxAge: optionsWithDefaults.cacheControlMaxAge ?? 60 * 60 * 24 * 365,\n        clientUploads: optionsWithDefaults.clientUploads,\n        collectionSources: getCollectionSources({\n          currentAdapter: storageAdapter,\n          storageAdapters: incomingConfig.storage,\n        }),\n        token: options.token!,\n        useCompositePrefixes: options.useCompositePrefixes,\n      })\n\n      // Add adapter to each collection option object\n      const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n        options.collections,\n      ).reduce(\n        (acc, [slug, collOptions]) => ({\n          ...acc,\n          [slug]: {\n            ...(collOptions === true ? {} : collOptions),\n            adapter,\n          },\n        }),\n        {} as Record<string, CollectionOptions>,\n      )\n\n      // Set disableLocalStorage: true for collections specified in the plugin options\n      const config = {\n        ...incomingConfig,\n        collections: (incomingConfig.collections || []).map((collection) => {\n          if (!collectionsWithAdapter[collection.slug]) {\n            return collection\n          }\n\n          return {\n            ...collection,\n            upload: {\n              ...(typeof collection.upload === 'object' ? collection.upload : {}),\n              disableLocalStorage: true,\n            },\n          }\n        }),\n      }\n\n      return cloudStoragePlugin({\n        collections: collectionsWithAdapter,\n        useCompositePrefixes: options.useCompositePrefixes,\n      })(config)\n    },\n    [vercelBlobStorageMetadata]: {\n      collections: options.collections,\n      enabled: !isPluginDisabled,\n      storeId,\n      useCompositePrefixes: Boolean(options.useCompositePrefixes),\n    },\n  }\n\n  return storageAdapter\n}\n"],"names":["cloudStoragePlugin","createVercelBlobAdapter","getCollectionSources","vercelBlobStorageMetadata","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","storeId","token","match","toLowerCase","isPluginDisabled","storageAdapter","name","collections","Object","keys","init","incomingConfig","Error","optionsWithDefaults","baseUrl","process","env","STORAGE_VERCEL_BLOB_BASE_URL","collectionsWithoutAdapter","entries","reduce","acc","slug","collOptions","adapter","useCompositePrefixes","clientUploads","collectionSources","currentAdapter","storageAdapters","storage","collectionsWithAdapter","config","map","collection","upload","disableLocalStorage","Boolean"],"mappings":"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"}

package/dist/uploadFile.d.ts

@@ -3,16 +3,13 @@ interface UploadFileArgs {
     addRandomSuffix?: boolean;
     buffer: Buffer;
     cacheControlMaxAge?: number;
-    collectionPrefix?: string;
-    docPrefix?: string;
-    filename: string;
     mimeType: string;
+    storageFilePath: string;
     token: string;
-    useCompositePrefixes?: boolean;
 }
 interface UploadFileResult {
     filename?: string;
 }
-export declare function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, collectionPrefix, docPrefix, filename, mimeType, token, useCompositePrefixes, }: UploadFileArgs): Promise<UploadFileResult>;
+export declare function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, mimeType, storageFilePath, token, }: UploadFileArgs): Promise<UploadFileResult>;
 export {};
 //# sourceMappingURL=uploadFile.d.ts.map

package/dist/uploadFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAIA,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,EACN,kBAAkB,EAClB,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,oBAA4B,GAC7B,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwB5C"}
+{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAGA,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,EACN,kBAAkB,EAClB,QAAQ,EACR,eAAe,EACf,KAAK,GACN,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiB5C"}

package/dist/uploadFile.js

@@ -1,14 +1,7 @@
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { put } from '@vercel/blob';
 import path from 'path';
-export async function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, collectionPrefix = '', docPrefix, filename, mimeType, token, useCompositePrefixes = false }) {
-    const { fileKey } = getFileKey({
-        collectionPrefix,
-        docPrefix,
-        filename,
-        useCompositePrefixes
-    });
-    const result = await put(fileKey, buffer, {
+export async function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, mimeType, storageFilePath, token }) {
+    const result = await put(storageFilePath, buffer, {
         access,
         addRandomSuffix,
         allowOverwrite: true,

package/dist/uploadFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { put } from '@vercel/blob'\nimport path from 'path'\n\ninterface UploadFileArgs {\n  access: 'public'\n  addRandomSuffix?: boolean\n  buffer: Buffer\n  cacheControlMaxAge?: number\n  collectionPrefix?: string\n  docPrefix?: string\n  filename: string\n  mimeType: string\n  token: string\n  useCompositePrefixes?: boolean\n}\n\ninterface UploadFileResult {\n  filename?: string\n}\n\nexport async function uploadFile({\n  access,\n  addRandomSuffix,\n  buffer,\n  cacheControlMaxAge,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  mimeType,\n  token,\n  useCompositePrefixes = false,\n}: UploadFileArgs): Promise<UploadFileResult> {\n  const { fileKey } = getFileKey({\n    collectionPrefix,\n    docPrefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  const result = await put(fileKey, buffer, {\n    access,\n    addRandomSuffix,\n    allowOverwrite: true,\n    cacheControlMaxAge,\n    contentType: mimeType,\n    token,\n  })\n\n  if (addRandomSuffix) {\n    const pathname = result.pathname.replace(/^\\/+/, '')\n    const basename = path.posix.basename(pathname)\n    return { filename: decodeURIComponent(basename) }\n  }\n\n  return {}\n}\n"],"names":["getFileKey","put","path","uploadFile","access","addRandomSuffix","buffer","cacheControlMaxAge","collectionPrefix","docPrefix","filename","mimeType","token","useCompositePrefixes","fileKey","result","allowOverwrite","contentType","pathname","replace","basename","posix","decodeURIComponent"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,SAASC,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AAmBvB,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,eAAe,EACfC,MAAM,EACNC,kBAAkB,EAClBC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,KAAK,EACLC,uBAAuB,KAAK,EACb;IACf,MAAM,EAAEC,OAAO,EAAE,GAAGd,WAAW;QAC7BQ;QACAC;QACAC;QACAG;IACF;IAEA,MAAME,SAAS,MAAMd,IAAIa,SAASR,QAAQ;QACxCF;QACAC;QACAW,gBAAgB;QAChBT;QACAU,aAAaN;QACbC;IACF;IAEA,IAAIP,iBAAiB;QACnB,MAAMa,WAAWH,OAAOG,QAAQ,CAACC,OAAO,CAAC,QAAQ;QACjD,MAAMC,WAAWlB,KAAKmB,KAAK,CAACD,QAAQ,CAACF;QACrC,OAAO;YAAER,UAAUY,mBAAmBF;QAAU;IAClD;IAEA,OAAO,CAAC;AACV"}
+{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import { put } from '@vercel/blob'\nimport path from 'path'\n\ninterface UploadFileArgs {\n  access: 'public'\n  addRandomSuffix?: boolean\n  buffer: Buffer\n  cacheControlMaxAge?: number\n  mimeType: string\n  storageFilePath: string\n  token: string\n}\n\ninterface UploadFileResult {\n  filename?: string\n}\n\nexport async function uploadFile({\n  access,\n  addRandomSuffix,\n  buffer,\n  cacheControlMaxAge,\n  mimeType,\n  storageFilePath,\n  token,\n}: UploadFileArgs): Promise<UploadFileResult> {\n  const result = await put(storageFilePath, buffer, {\n    access,\n    addRandomSuffix,\n    allowOverwrite: true,\n    cacheControlMaxAge,\n    contentType: mimeType,\n    token,\n  })\n\n  if (addRandomSuffix) {\n    const pathname = result.pathname.replace(/^\\/+/, '')\n    const basename = path.posix.basename(pathname)\n    return { filename: decodeURIComponent(basename) }\n  }\n\n  return {}\n}\n"],"names":["put","path","uploadFile","access","addRandomSuffix","buffer","cacheControlMaxAge","mimeType","storageFilePath","token","result","allowOverwrite","contentType","pathname","replace","basename","posix","filename","decodeURIComponent"],"mappings":"AAAA,SAASA,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AAgBvB,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,eAAe,EACfC,MAAM,EACNC,kBAAkB,EAClBC,QAAQ,EACRC,eAAe,EACfC,KAAK,EACU;IACf,MAAMC,SAAS,MAAMV,IAAIQ,iBAAiBH,QAAQ;QAChDF;QACAC;QACAO,gBAAgB;QAChBL;QACAM,aAAaL;QACbE;IACF;IAEA,IAAIL,iBAAiB;QACnB,MAAMS,WAAWH,OAAOG,QAAQ,CAACC,OAAO,CAAC,QAAQ;QACjD,MAAMC,WAAWd,KAAKe,KAAK,CAACD,QAAQ,CAACF;QACrC,OAAO;YAAEI,UAAUC,mBAAmBH;QAAU;IAClD;IAEA,OAAO,CAAC;AACV"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-vercel-blob",
-  "version": "4.0.0-internal.d1cc1d3",
+  "version": "4.0.0-internal.d21c039",
   "description": "Payload storage adapter for Vercel Blob Storage",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -38,13 +38,13 @@
   ],
   "dependencies": {
     "@vercel/blob": "2.3.1",
-    "@payloadcms/plugin-cloud-storage": "4.0.0-internal.d1cc1d3"
+    "@payloadcms/plugin-cloud-storage": "4.0.0-internal.d21c039"
   },
   "devDependencies": {
-    "payload": "4.0.0-internal.d1cc1d3"
+    "payload": "4.0.0-internal.d21c039"
   },
   "peerDependencies": {
-    "payload": "4.0.0-internal.d1cc1d3"
+    "payload": "4.0.0-internal.d21c039"
   },
   "engines": {
     "node": ">=24.15.0"