@payloadcms/storage-vercel-blob 3.83.0 → 3.84.0-canary.1

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;AAO/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,CAgEvC"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAO/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,CA+DvC"}

package/dist/adapter.js

@@ -25,7 +25,6 @@ export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cach
                 const result = await uploadFile({
                     access,
                     addRandomSuffix,
-                    baseUrl,
                     buffer,
                     cacheControlMaxAge,
                     collectionPrefix: prefix,

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 { 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  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 'vercel-blob',\n    clientUploads,\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        baseUrl,\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: { clientUploadContext, filename, prefix: prefixQueryParam } },\n    ) =>\n      getFile({\n        baseUrl,\n        cacheControlMaxAge,\n        clientUploadContext,\n        collection,\n        collectionPrefix: prefix,\n        filename,\n        incomingHeaders: headers,\n        prefixQueryParam,\n        req,\n        token,\n        useCompositePrefixes,\n      }),\n  })\n}\n"],"names":["deleteFile","generateURL","getFile","uploadFile","createVercelBlobAdapter","access","addRandomSuffix","baseUrl","cacheControlMaxAge","clientUploads","token","useCompositePrefixes","collection","prefix","name","filename","urlPrefix","collectionPrefix","handleDelete","doc","docPrefix","handleUpload","data","file","buffer","mimeType","result","staticHandler","req","headers","params","clientUploadContext","prefixQueryParam","incomingHeaders"],"mappings":"AAMA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,wBAAwB,EACtCC,MAAM,EACNC,eAAe,EACfC,OAAO,EACPC,kBAAkB,EAClBC,aAAa,EACbC,KAAK,EACLC,uBAAuB,KAAK,EACA;IAC5B,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNL;YAEAR,aAAa,CAAC,EAAEc,QAAQ,EAAEF,QAAQG,YAAY,EAAE,EAAE,GAChDf,YAAY;oBACVM;oBACAU,kBAAkBJ;oBAClBE;oBACAF,QAAQG;oBACRL;gBACF;YAEFO,cAAc,CAAC,EAAEC,KAAK,EAAEN,QAAQO,YAAY,EAAE,EAAE,EAAEL,QAAQ,EAAE,GAC1Df,WAAW;oBACTO;oBACAU,kBAAkBJ;oBAClBO;oBACAL;oBACAL;oBACAC;gBACF;YAEFU,cAAc,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAET,QAAQ,EAAEU,QAAQ,EAAE,EAAE;gBACjE,MAAMC,SAAS,MAAMvB,WAAW;oBAC9BE;oBACAC;oBACAC;oBACAiB;oBACAhB;oBACAS,kBAAkBJ;oBAClBO,WAAWE,KAAKT,MAAM;oBACtBE;oBACAU;oBACAf;oBACAC;gBACF;gBAEA,IAAIe,OAAOX,QAAQ,EAAE;oBACnBO,KAAKP,QAAQ,GAAGW,OAAOX,QAAQ;gBACjC;gBAEA,OAAOO;YACT;YAEAK,eAAe,CACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEhB,QAAQ,EAAEF,QAAQmB,gBAAgB,EAAE,EAAE,GAEhF9B,QAAQ;oBACNK;oBACAC;oBACAuB;oBACAnB;oBACAK,kBAAkBJ;oBAClBE;oBACAkB,iBAAiBJ;oBACjBG;oBACAJ;oBACAlB;oBACAC;gBACF;QACJ,CAAA;AACF"}
+{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\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  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 'vercel-blob',\n    clientUploads,\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: { clientUploadContext, filename, prefix: prefixQueryParam } },\n    ) =>\n      getFile({\n        baseUrl,\n        cacheControlMaxAge,\n        clientUploadContext,\n        collection,\n        collectionPrefix: prefix,\n        filename,\n        incomingHeaders: headers,\n        prefixQueryParam,\n        req,\n        token,\n        useCompositePrefixes,\n      }),\n  })\n}\n"],"names":["deleteFile","generateURL","getFile","uploadFile","createVercelBlobAdapter","access","addRandomSuffix","baseUrl","cacheControlMaxAge","clientUploads","token","useCompositePrefixes","collection","prefix","name","filename","urlPrefix","collectionPrefix","handleDelete","doc","docPrefix","handleUpload","data","file","buffer","mimeType","result","staticHandler","req","headers","params","clientUploadContext","prefixQueryParam","incomingHeaders"],"mappings":"AAMA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,wBAAwB,EACtCC,MAAM,EACNC,eAAe,EACfC,OAAO,EACPC,kBAAkB,EAClBC,aAAa,EACbC,KAAK,EACLC,uBAAuB,KAAK,EACA;IAC5B,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNL;YAEAR,aAAa,CAAC,EAAEc,QAAQ,EAAEF,QAAQG,YAAY,EAAE,EAAE,GAChDf,YAAY;oBACVM;oBACAU,kBAAkBJ;oBAClBE;oBACAF,QAAQG;oBACRL;gBACF;YAEFO,cAAc,CAAC,EAAEC,KAAK,EAAEN,QAAQO,YAAY,EAAE,EAAE,EAAEL,QAAQ,EAAE,GAC1Df,WAAW;oBACTO;oBACAU,kBAAkBJ;oBAClBO;oBACAL;oBACAL;oBACAC;gBACF;YAEFU,cAAc,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAET,QAAQ,EAAEU,QAAQ,EAAE,EAAE;gBACjE,MAAMC,SAAS,MAAMvB,WAAW;oBAC9BE;oBACAC;oBACAkB;oBACAhB;oBACAS,kBAAkBJ;oBAClBO,WAAWE,KAAKT,MAAM;oBACtBE;oBACAU;oBACAf;oBACAC;gBACF;gBAEA,IAAIe,OAAOX,QAAQ,EAAE;oBACnBO,KAAKP,QAAQ,GAAGW,OAAOX,QAAQ;gBACjC;gBAEA,OAAOO;YACT;YAEAK,eAAe,CACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEhB,QAAQ,EAAEF,QAAQmB,gBAAgB,EAAE,EAAE,GAEhF9B,QAAQ;oBACNK;oBACAC;oBACAuB;oBACAnB;oBACAK,kBAAkBJ;oBAClBE;oBACAkB,iBAAiBJ;oBACjBG;oBACAJ;oBACAlB;oBACAC;gBACF;QACJ,CAAA;AACF"}

package/dist/client/VercelBlobClientUploadHandler.d.ts

@@ -1,7 +1,6 @@
 export type VercelBlobClientUploadHandlerExtra = {
     addRandomSuffix: boolean;
-    baseURL: string;
-    prefix: string;
+    useCompositePrefixes: boolean;
 };
 export declare const VercelBlobClientUploadHandler: ({ children, collectionSlug, enabled, extra, prefix, serverHandlerPath, }: {
     children: import("react").ReactNode;

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

@@ -1 +1 @@
-{"version":3,"file":"VercelBlobClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,OAAO,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,6BAA6B;;;;;;;aAmBlC,OAAF,aAWF,CAAA"}
+{"version":3,"file":"VercelBlobClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,OAAO,CAAA;IACxB,oBAAoB,EAAE,OAAO,CAAA;CAC9B,CAAA;AASD,eAAO,MAAM,6BAA6B;;;;;;;aAMpB,OAAO,aAmCzB,CAAA"}

package/dist/client/VercelBlobClientUploadHandler.js

@@ -1,26 +1,40 @@
 'use client';
 import { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client';
+import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { upload } from '@vercel/blob/client';
 import { formatAdminURL } from 'payload/shared';
+/** Last path segment only (POSIX), for keys like `folder/sub/file.png`. */ function posixBasename(key) {
+    const normalized = key.replace(/^\/+/, '');
+    const lastSlash = normalized.lastIndexOf('/');
+    return lastSlash === -1 ? normalized : normalized.slice(lastSlash + 1);
+}
 export const VercelBlobClientUploadHandler = createClientUploadHandler({
-    handler: async ({ apiRoute, collectionSlug, extra: { addRandomSuffix, baseURL, prefix = '' }, file, serverHandlerPath, serverURL, updateFilename })=>{
+    handler: async ({ apiRoute, collectionSlug, docPrefix, extra: { addRandomSuffix, useCompositePrefixes = false }, file, prefix, serverHandlerPath, serverURL, updateFilename })=>{
         const endpointRoute = formatAdminURL({
             apiRoute,
             path: serverHandlerPath,
             serverURL
         });
-        const result = await upload(`${prefix}${file.name}`, file, {
+        const { fileKey: pathname, sanitizedDocPrefix } = getFileKey({
+            collectionPrefix: prefix,
+            docPrefix,
+            filename: file.name,
+            useCompositePrefixes
+        });
+        // upload the file directly to Vercel Blob using the signed URL
+        const result = await upload(pathname, file, {
             access: 'public',
             clientPayload: collectionSlug,
             contentType: file.type,
             handleUploadUrl: endpointRoute
         });
-        // Update filename with suffix from returned url
+        // Match server uploadFile: document `filename` is basename only; prefixes are separate.
         if (addRandomSuffix) {
-            updateFilename(result.url.replace(`${baseURL}/`, ''));
+            const pathname = result.pathname.replace(/^\/+/, '');
+            updateFilename(decodeURIComponent(posixBasename(pathname)));
         }
         return {
-            prefix
+            prefix: sanitizedDocPrefix
         };
     }
 });

package/dist/client/VercelBlobClientUploadHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { upload } from '@vercel/blob/client'\nimport { formatAdminURL } from 'payload/shared'\n\nexport type VercelBlobClientUploadHandlerExtra = {\n  addRandomSuffix: boolean\n  baseURL: string\n  prefix: string\n}\n\nexport const VercelBlobClientUploadHandler =\n  createClientUploadHandler<VercelBlobClientUploadHandlerExtra>({\n    handler: async ({\n      apiRoute,\n      collectionSlug,\n      extra: { addRandomSuffix, baseURL, prefix = '' },\n      file,\n      serverHandlerPath,\n      serverURL,\n      updateFilename,\n    }) => {\n      const endpointRoute = formatAdminURL({\n        apiRoute,\n        path: serverHandlerPath,\n        serverURL,\n      })\n      const result = await upload(`${prefix}${file.name}`, file, {\n        access: 'public',\n        clientPayload: collectionSlug,\n        contentType: file.type,\n        handleUploadUrl: endpointRoute,\n      })\n\n      // Update filename with suffix from returned url\n      if (addRandomSuffix) {\n        updateFilename(result.url.replace(`${baseURL}/`, ''))\n      }\n\n      return { prefix }\n    },\n  })\n"],"names":["createClientUploadHandler","upload","formatAdminURL","VercelBlobClientUploadHandler","handler","apiRoute","collectionSlug","extra","addRandomSuffix","baseURL","prefix","file","serverHandlerPath","serverURL","updateFilename","endpointRoute","path","result","name","access","clientPayload","contentType","type","handleUploadUrl","url","replace"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,MAAM,QAAQ,sBAAqB;AAC5C,SAASC,cAAc,QAAQ,iBAAgB;AAQ/C,OAAO,MAAMC,gCACXH,0BAA8D;IAC5DI,SAAS,OAAO,EACdC,QAAQ,EACRC,cAAc,EACdC,OAAO,EAAEC,eAAe,EAAEC,OAAO,EAAEC,SAAS,EAAE,EAAE,EAChDC,IAAI,EACJC,iBAAiB,EACjBC,SAAS,EACTC,cAAc,EACf;QACC,MAAMC,gBAAgBb,eAAe;YACnCG;YACAW,MAAMJ;YACNC;QACF;QACA,MAAMI,SAAS,MAAMhB,OAAO,GAAGS,SAASC,KAAKO,IAAI,EAAE,EAAEP,MAAM;YACzDQ,QAAQ;YACRC,eAAed;YACfe,aAAaV,KAAKW,IAAI;YACtBC,iBAAiBR;QACnB;QAEA,gDAAgD;QAChD,IAAIP,iBAAiB;YACnBM,eAAeG,OAAOO,GAAG,CAACC,OAAO,CAAC,GAAGhB,QAAQ,CAAC,CAAC,EAAE;QACnD;QAEA,OAAO;YAAEC;QAAO;IAClB;AACF,GAAE"}
+{"version":3,"sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { upload } from '@vercel/blob/client'\nimport { formatAdminURL } from 'payload/shared'\n\nexport type VercelBlobClientUploadHandlerExtra = {\n  addRandomSuffix: boolean\n  useCompositePrefixes: boolean\n}\n\n/** Last path segment only (POSIX), for keys like `folder/sub/file.png`. */\nfunction posixBasename(key: string): string {\n  const normalized = key.replace(/^\\/+/, '')\n  const lastSlash = normalized.lastIndexOf('/')\n  return lastSlash === -1 ? normalized : normalized.slice(lastSlash + 1)\n}\n\nexport const VercelBlobClientUploadHandler =\n  createClientUploadHandler<VercelBlobClientUploadHandlerExtra>({\n    handler: async ({\n      apiRoute,\n      collectionSlug,\n      docPrefix,\n      extra: { addRandomSuffix, useCompositePrefixes = false },\n      file,\n      prefix,\n      serverHandlerPath,\n      serverURL,\n      updateFilename,\n    }) => {\n      const endpointRoute = formatAdminURL({\n        apiRoute,\n        path: serverHandlerPath,\n        serverURL,\n      })\n      const { fileKey: pathname, sanitizedDocPrefix } = getFileKey({\n        collectionPrefix: prefix,\n        docPrefix,\n        filename: file.name,\n        useCompositePrefixes,\n      })\n\n      // upload the file directly to Vercel Blob using the signed URL\n      const result = await upload(pathname, file, {\n        access: 'public',\n        clientPayload: collectionSlug,\n        contentType: file.type,\n        handleUploadUrl: endpointRoute,\n      })\n\n      // Match server uploadFile: document `filename` is basename only; prefixes are separate.\n      if (addRandomSuffix) {\n        const pathname = result.pathname.replace(/^\\/+/, '')\n        updateFilename(decodeURIComponent(posixBasename(pathname)))\n      }\n\n      return { prefix: sanitizedDocPrefix }\n    },\n  })\n"],"names":["createClientUploadHandler","getFileKey","upload","formatAdminURL","posixBasename","key","normalized","replace","lastSlash","lastIndexOf","slice","VercelBlobClientUploadHandler","handler","apiRoute","collectionSlug","docPrefix","extra","addRandomSuffix","useCompositePrefixes","file","prefix","serverHandlerPath","serverURL","updateFilename","endpointRoute","path","fileKey","pathname","sanitizedDocPrefix","collectionPrefix","filename","name","result","access","clientPayload","contentType","type","handleUploadUrl","decodeURIComponent"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,UAAU,QAAQ,6CAA4C;AACvE,SAASC,MAAM,QAAQ,sBAAqB;AAC5C,SAASC,cAAc,QAAQ,iBAAgB;AAO/C,yEAAyE,GACzE,SAASC,cAAcC,GAAW;IAChC,MAAMC,aAAaD,IAAIE,OAAO,CAAC,QAAQ;IACvC,MAAMC,YAAYF,WAAWG,WAAW,CAAC;IACzC,OAAOD,cAAc,CAAC,IAAIF,aAAaA,WAAWI,KAAK,CAACF,YAAY;AACtE;AAEA,OAAO,MAAMG,gCACXX,0BAA8D;IAC5DY,SAAS,OAAO,EACdC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,OAAO,EAAEC,eAAe,EAAEC,uBAAuB,KAAK,EAAE,EACxDC,IAAI,EACJC,MAAM,EACNC,iBAAiB,EACjBC,SAAS,EACTC,cAAc,EACf;QACC,MAAMC,gBAAgBrB,eAAe;YACnCU;YACAY,MAAMJ;YACNC;QACF;QACA,MAAM,EAAEI,SAASC,QAAQ,EAAEC,kBAAkB,EAAE,GAAG3B,WAAW;YAC3D4B,kBAAkBT;YAClBL;YACAe,UAAUX,KAAKY,IAAI;YACnBb;QACF;QAEA,+DAA+D;QAC/D,MAAMc,SAAS,MAAM9B,OAAOyB,UAAUR,MAAM;YAC1Cc,QAAQ;YACRC,eAAepB;YACfqB,aAAahB,KAAKiB,IAAI;YACtBC,iBAAiBb;QACnB;QAEA,wFAAwF;QACxF,IAAIP,iBAAiB;YACnB,MAAMU,WAAWK,OAAOL,QAAQ,CAACpB,OAAO,CAAC,QAAQ;YACjDgB,eAAee,mBAAmBlC,cAAcuB;QAClD;QAEA,OAAO;YAAEP,QAAQQ;QAAmB;IACtC;AACF,GAAE"}

package/dist/deleteFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAGA,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,CAWhC"}
+{"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"}

package/dist/deleteFile.js

@@ -1,13 +1,13 @@
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { del } from '@vercel/blob';
+import { generateURL } from './generateURL.js';
 export async function deleteFile({ baseUrl, collectionPrefix = '', docPrefix, filename, token, useCompositePrefixes = false }) {
-    const fileKey = getFileKey({
+    const fileUrl = generateURL({
+        baseUrl,
         collectionPrefix,
-        docPrefix,
         filename,
+        prefix: docPrefix,
         useCompositePrefixes
     });
-    const fileUrl = `${baseUrl}/${fileKey}`;
     await del(fileUrl, {
         token
     });

package/dist/deleteFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { del } from '@vercel/blob'\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 fileKey = getFileKey({\n    collectionPrefix,\n    docPrefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  const fileUrl = `${baseUrl}/${fileKey}`\n\n  await del(fileUrl, { token })\n}\n"],"names":["getFileKey","del","deleteFile","baseUrl","collectionPrefix","docPrefix","filename","token","useCompositePrefixes","fileKey","fileUrl"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,SAASC,GAAG,QAAQ,eAAc;AAWlC,OAAO,eAAeC,WAAW,EAC/BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,KAAK,EACLC,uBAAuB,KAAK,EACb;IACf,MAAMC,UAAUT,WAAW;QACzBI;QACAC;QACAC;QACAE;IACF;IAEA,MAAME,UAAU,GAAGP,QAAQ,CAAC,EAAEM,SAAS;IAEvC,MAAMR,IAAIS,SAAS;QAAEH;IAAM;AAC7B"}
+{"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"}

package/dist/generateURL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateURL.d.ts","sourceRoot":"","sources":["../src/generateURL.ts"],"names":[],"mappings":"AAEA,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,CAS1B"}
+{"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"}

package/dist/generateURL.js

@@ -1,12 +1,19 @@
 import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
+import path from 'path';
 export function generateURL({ baseUrl, collectionPrefix = '', filename, prefix, useCompositePrefixes = false }) {
-    const fileKey = getFileKey({
+    const { fileKey: fileKeyWithPrefix } = getFileKey({
         collectionPrefix,
         docPrefix: prefix,
-        filename: encodeURIComponent(filename),
+        filename,
         useCompositePrefixes
     });
-    return `${baseUrl}/${fileKey}`;
+    // 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}`;
 }
 
 //# 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'\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 = getFileKey({\n    collectionPrefix,\n    docPrefix: prefix,\n    filename: encodeURIComponent(filename),\n    useCompositePrefixes,\n  })\n\n  return `${baseUrl}/${fileKey}`\n}\n"],"names":["getFileKey","generateURL","baseUrl","collectionPrefix","filename","prefix","useCompositePrefixes","fileKey","docPrefix","encodeURIComponent"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AAUvE,OAAO,SAASC,YAAY,EAC1BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAMC,UAAUP,WAAW;QACzBG;QACAK,WAAWH;QACXD,UAAUK,mBAAmBL;QAC7BE;IACF;IAEA,OAAO,GAAGJ,QAAQ,CAAC,EAAEK,SAAS;AAChC"}
+{"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"}

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;AAU/D,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,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,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,OAAO,EACP,kBAAkB,EAClB,mBAAmB,EACnB,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,KAAK,EACL,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6FjC"}
+{"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,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,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,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,OAAO,EACP,kBAAkB,EAClB,mBAAmB,EACnB,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,KAAK,EACL,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8FjC"}

package/dist/getFile.js

@@ -1,7 +1,7 @@
-import { getFilePrefix as getDocPrefix, getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
+import { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities';
 import { BlobNotFoundError, head } from '@vercel/blob';
 import { getRangeRequestInfo } from 'payload/internal';
-import { sanitizeFilename } from 'payload/shared';
+import { generateURL } from './generateURL.js';
 export async function getFile({ baseUrl, cacheControlMaxAge, clientUploadContext, collection, collectionPrefix = '', filename, incomingHeaders, prefixQueryParam, req, token, useCompositePrefixes = false }) {
     try {
         const docPrefix = await getDocPrefix({
@@ -11,20 +11,21 @@ export async function getFile({ baseUrl, cacheControlMaxAge, clientUploadContext
             prefixQueryParam,
             req
         });
-        const fileKey = getFileKey({
+        const fileUrl = generateURL({
+            baseUrl,
             collectionPrefix,
-            docPrefix,
-            filename: encodeURIComponent(sanitizeFilename(filename)),
+            filename,
+            prefix: docPrefix,
             useCompositePrefixes
         });
-        const fileUrl = `${baseUrl}/${fileKey}`;
         const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
         const blobMetadata = await head(fileUrl, {
             token
         });
         const { contentDisposition, contentType, size, uploadedAt } = blobMetadata;
         const uploadedAtString = uploadedAt.toISOString();
-        const ETag = `"${fileKey}-${uploadedAtString}"`;
+        const fileKeyForETag = fileUrl.replace(`${baseUrl}/`, '');
+        const ETag = `"${fileKeyForETag}-${uploadedAtString}"`;
         // Handle range request
         const rangeHeader = req.headers.get('range');
         const rangeResult = getRangeRequestInfo({

package/dist/getFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { CollectionConfig, PayloadRequest } from 'payload'\n\nimport {\n  getFilePrefix as getDocPrefix,\n  getFileKey,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { BlobNotFoundError, head } from '@vercel/blob'\nimport { getRangeRequestInfo } from 'payload/internal'\nimport { sanitizeFilename } from 'payload/shared'\n\ninterface GetFileArgs {\n  baseUrl: string\n  cacheControlMaxAge: number\n  clientUploadContext?: unknown\n  collection: CollectionConfig\n  collectionPrefix?: string\n  filename: string\n  incomingHeaders?: Headers\n  prefixQueryParam?: string\n  req: PayloadRequest\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n  baseUrl,\n  cacheControlMaxAge,\n  clientUploadContext,\n  collection,\n  collectionPrefix = '',\n  filename,\n  incomingHeaders,\n  prefixQueryParam,\n  req,\n  token,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  try {\n    const docPrefix = await getDocPrefix({\n      clientUploadContext,\n      collection,\n      filename,\n      prefixQueryParam,\n      req,\n    })\n\n    const fileKey = getFileKey({\n      collectionPrefix,\n      docPrefix,\n      filename: encodeURIComponent(sanitizeFilename(filename)),\n      useCompositePrefixes,\n    })\n    const fileUrl = `${baseUrl}/${fileKey}`\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 ETag = `\"${fileKey}-${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","getFileKey","BlobNotFoundError","head","getRangeRequestInfo","sanitizeFilename","getFile","baseUrl","cacheControlMaxAge","clientUploadContext","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","token","useCompositePrefixes","docPrefix","fileKey","encodeURIComponent","fileUrl","etagFromHeaders","headers","get","blobMetadata","contentDisposition","contentType","size","uploadedAt","uploadedAtString","toISOString","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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"}
+{"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  clientUploadContext?: unknown\n  collection: CollectionConfig\n  collectionPrefix?: string\n  filename: string\n  incomingHeaders?: Headers\n  prefixQueryParam?: string\n  req: PayloadRequest\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n  baseUrl,\n  cacheControlMaxAge,\n  clientUploadContext,\n  collection,\n  collectionPrefix = '',\n  filename,\n  incomingHeaders,\n  prefixQueryParam,\n  req,\n  token,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  try {\n    const docPrefix = await getDocPrefix({\n      clientUploadContext,\n      collection,\n      filename,\n      prefixQueryParam,\n      req,\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","clientUploadContext","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","token","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.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,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAUnE,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,uBAAuB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,MAAM,CAAA;AAE1F,eAAO,MAAM,iBAAiB,EAAE,uBAwH7B,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,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAUnE,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,uBAAuB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,MAAM,CAAA;AAE1F,eAAO,MAAM,iBAAiB,EAAE,uBAsH7B,CAAA"}

package/dist/index.js

@@ -27,10 +27,9 @@ export const vercelBlobStorage = (options)=>(incomingConfig)=>{
             collections: options.collections,
             config: incomingConfig,
             enabled: !isPluginDisabled && Boolean(options.clientUploads),
-            extraClientHandlerProps: (collection)=>({
+            extraClientHandlerProps: ()=>({
                     addRandomSuffix: !!optionsWithDefaults.addRandomSuffix,
-                    baseURL: baseUrl,
-                    prefix: typeof collection === 'object' && collection.prefix && `${collection.prefix}/` || ''
+                    useCompositePrefixes: !!options.useCompositePrefixes
                 }),
             serverHandler: getClientUploadRoute({
                 access: typeof options.clientUploads === 'object' ? options.clientUploads.access : undefined,

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, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { VercelBlobClientUploadHandlerExtra } from './client/VercelBlobClientUploadHandler.js'\n\nimport { createVercelBlobAdapter } from './adapter.js'\nimport { getClientUploadRoute } from './getClientUploadRoute.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   * Do uploads directly on the client, to bypass limits on Vercel.\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 VercelBlobStoragePlugin = (vercelBlobStorageOpts: VercelBlobStorageOptions) => Plugin\n\nexport const vercelBlobStorage: VercelBlobStoragePlugin =\n  (options: VercelBlobStorageOptions) =>\n  (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    initClientUploads<\n      VercelBlobClientUploadHandlerExtra,\n      VercelBlobStorageOptions['collections'][string]\n    >({\n      clientHandler: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',\n      collections: options.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(options.clientUploads),\n      extraClientHandlerProps: (collection) => ({\n        addRandomSuffix: !!optionsWithDefaults.addRandomSuffix,\n        baseURL: baseUrl,\n        prefix:\n          (typeof collection === 'object' && collection.prefix && `${collection.prefix}/`) || '',\n      }),\n      serverHandler: getClientUploadRoute({\n        access:\n          typeof options.clientUploads === 'object' ? options.clientUploads.access : undefined,\n        addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n        cacheControlMaxAge: options.cacheControlMaxAge,\n        token: options.token ?? '',\n      }),\n      serverHandlerPath: '/vercel-blob-client-upload-route',\n    })\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"],"names":["cloudStoragePlugin","initClientUploads","createVercelBlobAdapter","getClientUploadRoute","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","incomingConfig","storeId","token","match","toLowerCase","isPluginDisabled","Error","optionsWithDefaults","baseUrl","process","env","STORAGE_VERCEL_BLOB_BASE_URL","clientHandler","collections","config","Boolean","clientUploads","extraClientHandlerProps","collection","baseURL","prefix","serverHandler","undefined","serverHandlerPath","alwaysInsertFields","collectionsWithoutAdapter","Object","entries","reduce","acc","slug","collOptions","adapter","useCompositePrefixes","collectionsWithAdapter","map","upload","disableLocalStorage"],"mappings":"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"}
+{"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, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { VercelBlobClientUploadHandlerExtra } from './client/VercelBlobClientUploadHandler.js'\n\nimport { createVercelBlobAdapter } from './adapter.js'\nimport { getClientUploadRoute } from './getClientUploadRoute.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   * Do uploads directly on the client, to bypass limits on Vercel.\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 VercelBlobStoragePlugin = (vercelBlobStorageOpts: VercelBlobStorageOptions) => Plugin\n\nexport const vercelBlobStorage: VercelBlobStoragePlugin =\n  (options: VercelBlobStorageOptions) =>\n  (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    initClientUploads<\n      VercelBlobClientUploadHandlerExtra,\n      VercelBlobStorageOptions['collections'][string]\n    >({\n      clientHandler: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',\n      collections: options.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(options.clientUploads),\n      extraClientHandlerProps: () => ({\n        addRandomSuffix: !!optionsWithDefaults.addRandomSuffix,\n        useCompositePrefixes: !!options.useCompositePrefixes,\n      }),\n      serverHandler: getClientUploadRoute({\n        access:\n          typeof options.clientUploads === 'object' ? options.clientUploads.access : undefined,\n        addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n        cacheControlMaxAge: options.cacheControlMaxAge,\n        token: options.token ?? '',\n      }),\n      serverHandlerPath: '/vercel-blob-client-upload-route',\n    })\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"],"names":["cloudStoragePlugin","initClientUploads","createVercelBlobAdapter","getClientUploadRoute","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","incomingConfig","storeId","token","match","toLowerCase","isPluginDisabled","Error","optionsWithDefaults","baseUrl","process","env","STORAGE_VERCEL_BLOB_BASE_URL","clientHandler","collections","config","Boolean","clientUploads","extraClientHandlerProps","useCompositePrefixes","serverHandler","undefined","serverHandlerPath","alwaysInsertFields","collectionsWithoutAdapter","Object","entries","reduce","acc","slug","collOptions","adapter","collectionsWithAdapter","map","collection","upload","disableLocalStorage"],"mappings":"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"}

package/dist/uploadFile.d.ts

@@ -1,7 +1,6 @@
 interface UploadFileArgs {
     access: 'public';
     addRandomSuffix?: boolean;
-    baseUrl: string;
     buffer: Buffer;
     cacheControlMaxAge?: number;
     collectionPrefix?: string;
@@ -14,6 +13,6 @@ interface UploadFileArgs {
 interface UploadFileResult {
     filename?: string;
 }
-export declare function uploadFile({ access, addRandomSuffix, baseUrl, buffer, cacheControlMaxAge, collectionPrefix, docPrefix, filename, mimeType, token, useCompositePrefixes, }: UploadFileArgs): Promise<UploadFileResult>;
+export declare function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, collectionPrefix, docPrefix, filename, mimeType, token, useCompositePrefixes, }: 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":"AAGA,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,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,OAAO,EACP,MAAM,EACN,kBAAkB,EAClB,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,oBAA4B,GAC7B,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAqB5C"}
+{"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,CAuB5C"}

package/dist/uploadFile.js

@@ -1,9 +1,10 @@
 import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { put } from '@vercel/blob';
-export async function uploadFile({ access, addRandomSuffix, baseUrl, buffer, cacheControlMaxAge, collectionPrefix = '', docPrefix, filename, mimeType, token, useCompositePrefixes = false }) {
-    const fileKey = getFileKey({
+import path from 'path';
+export async function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, collectionPrefix = '', docPrefix, filename, mimeType, token, useCompositePrefixes = false }) {
+    const { fileKey } = getFileKey({
         collectionPrefix,
-        docPrefix: docPrefix || '',
+        docPrefix,
         filename,
         useCompositePrefixes
     });
@@ -15,8 +16,10 @@ export async function uploadFile({ access, addRandomSuffix, baseUrl, buffer, cac
         token
     });
     if (addRandomSuffix) {
+        const pathname = result.pathname.replace(/^\/+/, '');
+        const basename = path.posix.basename(pathname);
         return {
-            filename: decodeURIComponent(result.url.replace(`${baseUrl}/`, ''))
+            filename: decodeURIComponent(basename)
         };
     }
     return {};

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'\n\ninterface UploadFileArgs {\n  access: 'public'\n  addRandomSuffix?: boolean\n  baseUrl: string\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  baseUrl,\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: docPrefix || '',\n    filename,\n    useCompositePrefixes,\n  })\n\n  const result = await put(fileKey, buffer, {\n    access,\n    addRandomSuffix,\n    cacheControlMaxAge,\n    contentType: mimeType,\n    token,\n  })\n\n  if (addRandomSuffix) {\n    return { filename: decodeURIComponent(result.url.replace(`${baseUrl}/`, '')) }\n  }\n\n  return {}\n}\n"],"names":["getFileKey","put","uploadFile","access","addRandomSuffix","baseUrl","buffer","cacheControlMaxAge","collectionPrefix","docPrefix","filename","mimeType","token","useCompositePrefixes","fileKey","result","contentType","decodeURIComponent","url","replace"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,SAASC,GAAG,QAAQ,eAAc;AAoBlC,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,eAAe,EACfC,OAAO,EACPC,MAAM,EACNC,kBAAkB,EAClBC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,KAAK,EACLC,uBAAuB,KAAK,EACb;IACf,MAAMC,UAAUd,WAAW;QACzBQ;QACAC,WAAWA,aAAa;QACxBC;QACAG;IACF;IAEA,MAAME,SAAS,MAAMd,IAAIa,SAASR,QAAQ;QACxCH;QACAC;QACAG;QACAS,aAAaL;QACbC;IACF;IAEA,IAAIR,iBAAiB;QACnB,OAAO;YAAEM,UAAUO,mBAAmBF,OAAOG,GAAG,CAACC,OAAO,CAAC,GAAGd,QAAQ,CAAC,CAAC,EAAE;QAAK;IAC/E;IAEA,OAAO,CAAC;AACV"}
+{"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    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","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;QACAE;QACAS,aAAaL;QACbC;IACF;IAEA,IAAIP,iBAAiB;QACnB,MAAMY,WAAWF,OAAOE,QAAQ,CAACC,OAAO,CAAC,QAAQ;QACjD,MAAMC,WAAWjB,KAAKkB,KAAK,CAACD,QAAQ,CAACF;QACrC,OAAO;YAAEP,UAAUW,mBAAmBF;QAAU;IAClD;IAEA,OAAO,CAAC;AACV"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-vercel-blob",
-  "version": "3.83.0",
+  "version": "3.84.0-canary.1",
   "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": "3.83.0"
+    "@payloadcms/plugin-cloud-storage": "3.84.0-canary.1"
   },
   "devDependencies": {
-    "payload": "3.83.0"
+    "payload": "3.84.0-canary.1"
   },
   "peerDependencies": {
-    "payload": "3.83.0"
+    "payload": "3.84.0-canary.1"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"

package/dist/handleDelete.d.ts

@@ -1,9 +0,0 @@
-import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types';
-type HandleDeleteArgs = {
-    baseUrl: string;
-    prefix?: string;
-    token: string;
-};
-export declare const getHandleDelete: ({ baseUrl, token }: HandleDeleteArgs) => HandleDelete;
-export {};
-//# sourceMappingURL=handleDelete.d.ts.map

package/dist/handleDelete.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleDelete.d.ts","sourceRoot":"","sources":["../src/handleDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAK1E,KAAK,gBAAgB,GAAG;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,eAAO,MAAM,eAAe,uBAAwB,gBAAgB,KAAG,YAOtE,CAAA"}

package/dist/handleDelete.js

@@ -1,13 +0,0 @@
-import { del } from '@vercel/blob';
-import path from 'path';
-export const getHandleDelete = ({ baseUrl, token })=>{
-    return async ({ doc: { prefix = '' }, filename })=>{
-        const fileUrl = `${baseUrl}/${path.posix.join(prefix, filename)}`;
-        const deletedBlob = await del(fileUrl, {
-            token
-        });
-        return deletedBlob;
-    };
-};
-
-//# sourceMappingURL=handleDelete.js.map

package/dist/handleDelete.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/handleDelete.ts"],"sourcesContent":["import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types'\n\nimport { del } from '@vercel/blob'\nimport path from 'path'\n\ntype HandleDeleteArgs = {\n  baseUrl: string\n  prefix?: string\n  token: string\n}\n\nexport const getHandleDelete = ({ baseUrl, token }: HandleDeleteArgs): HandleDelete => {\n  return async ({ doc: { prefix = '' }, filename }) => {\n    const fileUrl = `${baseUrl}/${path.posix.join(prefix, filename)}`\n    const deletedBlob = await del(fileUrl, { token })\n\n    return deletedBlob\n  }\n}\n"],"names":["del","path","getHandleDelete","baseUrl","token","doc","prefix","filename","fileUrl","posix","join","deletedBlob"],"mappings":"AAEA,SAASA,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AAQvB,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,OAAO,EAAEC,KAAK,EAAoB;IAClE,OAAO,OAAO,EAAEC,KAAK,EAAEC,SAAS,EAAE,EAAE,EAAEC,QAAQ,EAAE;QAC9C,MAAMC,UAAU,GAAGL,QAAQ,CAAC,EAAEF,KAAKQ,KAAK,CAACC,IAAI,CAACJ,QAAQC,WAAW;QACjE,MAAMI,cAAc,MAAMX,IAAIQ,SAAS;YAAEJ;QAAM;QAE/C,OAAOO;IACT;AACF,EAAC"}

package/dist/handleUpload.d.ts

@@ -1,9 +0,0 @@
-import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types';
-import type { VercelBlobStorageOptions } from './index.js';
-type HandleUploadArgs = {
-    baseUrl: string;
-    prefix?: string;
-} & Omit<VercelBlobStorageOptions, 'collections'>;
-export declare const getHandleUpload: ({ access, addRandomSuffix, baseUrl, cacheControlMaxAge, prefix, token, }: HandleUploadArgs) => HandleUpload;
-export {};
-//# sourceMappingURL=handleUpload.d.ts.map

package/dist/handleUpload.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleUpload.d.ts","sourceRoot":"","sources":["../src/handleUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAK1E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAE1D,KAAK,gBAAgB,GAAG;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,GAAG,IAAI,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAA;AAEjD,eAAO,MAAM,eAAe,6EAOzB,gBAAgB,KAAG,YAmBrB,CAAA"}

package/dist/handleUpload.js

@@ -1,21 +0,0 @@
-import { put } from '@vercel/blob';
-import path from 'path';
-export const getHandleUpload = ({ access = 'public', addRandomSuffix, baseUrl, cacheControlMaxAge, prefix = '', token })=>{
-    return async ({ data, file: { buffer, filename, mimeType } })=>{
-        const fileKey = path.posix.join(data.prefix || prefix, filename);
-        const result = await put(fileKey, buffer, {
-            access,
-            addRandomSuffix,
-            cacheControlMaxAge,
-            contentType: mimeType,
-            token
-        });
-        // Get filename with suffix from returned url
-        if (addRandomSuffix) {
-            data.filename = decodeURIComponent(result.url.replace(`${baseUrl}/`, ''));
-        }
-        return data;
-    };
-};
-
-//# sourceMappingURL=handleUpload.js.map

package/dist/handleUpload.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/handleUpload.ts"],"sourcesContent":["import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types'\n\nimport { put } from '@vercel/blob'\nimport path from 'path'\n\nimport type { VercelBlobStorageOptions } from './index.js'\n\ntype HandleUploadArgs = {\n  baseUrl: string\n  prefix?: string\n} & Omit<VercelBlobStorageOptions, 'collections'>\n\nexport const getHandleUpload = ({\n  access = 'public',\n  addRandomSuffix,\n  baseUrl,\n  cacheControlMaxAge,\n  prefix = '',\n  token,\n}: HandleUploadArgs): HandleUpload => {\n  return async ({ data, file: { buffer, filename, mimeType } }) => {\n    const fileKey = path.posix.join(data.prefix || prefix, filename)\n\n    const result = await put(fileKey, buffer, {\n      access,\n      addRandomSuffix,\n      cacheControlMaxAge,\n      contentType: mimeType,\n      token,\n    })\n\n    // Get filename with suffix from returned url\n    if (addRandomSuffix) {\n      data.filename = decodeURIComponent(result.url.replace(`${baseUrl}/`, ''))\n    }\n\n    return data\n  }\n}\n"],"names":["put","path","getHandleUpload","access","addRandomSuffix","baseUrl","cacheControlMaxAge","prefix","token","data","file","buffer","filename","mimeType","fileKey","posix","join","result","contentType","decodeURIComponent","url","replace"],"mappings":"AAEA,SAASA,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AASvB,OAAO,MAAMC,kBAAkB,CAAC,EAC9BC,SAAS,QAAQ,EACjBC,eAAe,EACfC,OAAO,EACPC,kBAAkB,EAClBC,SAAS,EAAE,EACXC,KAAK,EACY;IACjB,OAAO,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,EAAE;QAC1D,MAAMC,UAAUb,KAAKc,KAAK,CAACC,IAAI,CAACP,KAAKF,MAAM,IAAIA,QAAQK;QAEvD,MAAMK,SAAS,MAAMjB,IAAIc,SAASH,QAAQ;YACxCR;YACAC;YACAE;YACAY,aAAaL;YACbL;QACF;QAEA,6CAA6C;QAC7C,IAAIJ,iBAAiB;YACnBK,KAAKG,QAAQ,GAAGO,mBAAmBF,OAAOG,GAAG,CAACC,OAAO,CAAC,GAAGhB,QAAQ,CAAC,CAAC,EAAE;QACvE;QAEA,OAAOI;IACT;AACF,EAAC"}

package/dist/staticHandler.d.ts

@@ -1,10 +0,0 @@
-import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types';
-import type { CollectionConfig } from 'payload';
-type StaticHandlerArgs = {
-    baseUrl: string;
-    cacheControlMaxAge?: number;
-    token: string;
-};
-export declare const getStaticHandler: ({ baseUrl, cacheControlMaxAge, token }: StaticHandlerArgs, collection: CollectionConfig) => StaticHandler;
-export {};
-//# sourceMappingURL=staticHandler.d.ts.map

package/dist/staticHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"staticHandler.d.ts","sourceRoot":"","sources":["../src/staticHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAQ/C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,eAAO,MAAM,gBAAgB,2CACiB,iBAAiB,cACjD,gBAAgB,KAC3B,aAmFF,CAAA"}

package/dist/staticHandler.js

@@ -1,98 +0,0 @@
-import { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities';
-import { BlobNotFoundError, head } from '@vercel/blob';
-import path from 'path';
-import { getRangeRequestInfo } from 'payload/internal';
-import { sanitizeFilename } from 'payload/shared';
-export const getStaticHandler = ({ baseUrl, cacheControlMaxAge = 0, token }, collection)=>{
-    return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } })=>{
-        try {
-            const prefix = await getFilePrefix({
-                clientUploadContext,
-                collection,
-                filename,
-                req
-            });
-            const fileKey = path.posix.join(prefix, encodeURIComponent(sanitizeFilename(filename)));
-            const fileUrl = `${baseUrl}/${fileKey}`;
-            const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
-            const blobMetadata = await head(fileUrl, {
-                token
-            });
-            const { contentDisposition, contentType, size, uploadedAt } = blobMetadata;
-            const uploadedAtString = uploadedAt.toISOString();
-            const ETag = `"${fileKey}-${uploadedAtString}"`;
-            // Handle range request
-            const rangeHeader = req.headers.get('range');
-            const rangeResult = getRangeRequestInfo({
-                fileSize: size,
-                rangeHeader
-            });
-            if (rangeResult.type === 'invalid') {
-                return new Response(null, {
-                    headers: new Headers(rangeResult.headers),
-                    status: rangeResult.status
-                });
-            }
-            let headers = new Headers(incomingHeaders);
-            // Add range-related headers from the result
-            for (const [key, value] of Object.entries(rangeResult.headers)){
-                headers.append(key, value);
-            }
-            headers.append('Cache-Control', `public, max-age=${cacheControlMaxAge}`);
-            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'");
-            }
-            if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
-                headers = collection.upload.modifyResponseHeaders({
-                    headers
-                }) || headers;
-            }
-            if (etagFromHeaders && etagFromHeaders === ETag) {
-                return new Response(null, {
-                    headers,
-                    status: 304
-                });
-            }
-            const response = await fetch(`${fileUrl}?${uploadedAtString}`, {
-                headers: {
-                    'Cache-Control': 'no-store, no-cache, must-revalidate',
-                    Pragma: 'no-cache',
-                    ...rangeResult.type === 'partial' && {
-                        Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`
-                    }
-                }
-            });
-            if (!response.ok || !response.body) {
-                return new Response(null, {
-                    status: 204,
-                    statusText: 'No Content'
-                });
-            }
-            headers.append('Last-Modified', uploadedAtString);
-            return new Response(response.body, {
-                headers,
-                status: rangeResult.status
-            });
-        } catch (err) {
-            if (err instanceof BlobNotFoundError) {
-                return new Response(null, {
-                    status: 404,
-                    statusText: 'Not Found'
-                });
-            }
-            req.payload.logger.error({
-                err,
-                msg: 'Unexpected error in staticHandler'
-            });
-            return new Response('Internal Server Error', {
-                status: 500
-            });
-        }
-    };
-};
-
-//# sourceMappingURL=staticHandler.js.map

package/dist/staticHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { BlobNotFoundError, head } from '@vercel/blob'\nimport path from 'path'\nimport { getRangeRequestInfo } from 'payload/internal'\nimport { sanitizeFilename } from 'payload/shared'\n\ntype StaticHandlerArgs = {\n  baseUrl: string\n  cacheControlMaxAge?: number\n  token: string\n}\n\nexport const getStaticHandler = (\n  { baseUrl, cacheControlMaxAge = 0, token }: StaticHandlerArgs,\n  collection: CollectionConfig,\n): StaticHandler => {\n  return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } }) => {\n    try {\n      const prefix = await getFilePrefix({ clientUploadContext, collection, filename, req })\n      const fileKey = path.posix.join(prefix, encodeURIComponent(sanitizeFilename(filename)))\n      const fileUrl = `${baseUrl}/${fileKey}`\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 ETag = `\"${fileKey}-${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}\n"],"names":["getFilePrefix","BlobNotFoundError","head","path","getRangeRequestInfo","sanitizeFilename","getStaticHandler","baseUrl","cacheControlMaxAge","token","collection","req","headers","incomingHeaders","params","clientUploadContext","filename","prefix","fileKey","posix","join","encodeURIComponent","fileUrl","etagFromHeaders","get","blobMetadata","contentDisposition","contentType","size","uploadedAt","uploadedAtString","toISOString","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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"}