@payloadcms/storage-r2 3.83.0-internal.06ac84e → 3.83.0-internal.ddc1147

package/dist/adapter.d.ts

@@ -0,0 +1,10 @@
+import type { Adapter, ClientUploadsConfig } from '@payloadcms/plugin-cloud-storage/types';
+import type { R2Bucket } from './types.js';
+interface CreateR2AdapterArgs {
+    bucket: R2Bucket;
+    clientUploads?: ClientUploadsConfig;
+    useCompositePrefixes?: boolean;
+}
+export declare function createR2Adapter({ bucket, clientUploads, useCompositePrefixes, }: CreateR2AdapterArgs): Adapter;
+export {};
+//# sourceMappingURL=adapter.d.ts.map

package/dist/adapter.d.ts.map

@@ -0,0 +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;AAE/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAM1C,UAAU,mBAAmB;IAC3B,MAAM,EAAE,QAAQ,CAAA;IAChB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,aAAa,EACb,oBAA4B,GAC7B,EAAE,mBAAmB,GAAG,OAAO,CAyC/B"}

package/dist/adapter.js

@@ -0,0 +1,38 @@
+import { deleteFile } from './deleteFile.js';
+import { getFile } from './getFile.js';
+import { uploadFile } from './uploadFile.js';
+export function createR2Adapter({ bucket, clientUploads, useCompositePrefixes = false }) {
+    return ({ collection, prefix = '' })=>({
+            name: 'r2',
+            clientUploads,
+            handleDelete: ({ doc: { prefix: docPrefix = '' }, filename })=>deleteFile({
+                    bucket,
+                    collectionPrefix: prefix,
+                    docPrefix,
+                    filename,
+                    useCompositePrefixes
+                }),
+            handleUpload: ({ data, file })=>uploadFile({
+                    bucket,
+                    buffer: file.buffer,
+                    collectionPrefix: prefix,
+                    docPrefix: data.prefix,
+                    filename: file.filename,
+                    mimeType: file.mimeType,
+                    useCompositePrefixes
+                }),
+            staticHandler: (req, { headers, params: { clientUploadContext, filename, prefix: prefixQueryParam } })=>getFile({
+                    bucket,
+                    clientUploadContext,
+                    collection,
+                    filename,
+                    incomingHeaders: headers,
+                    prefix,
+                    prefixQueryParam,
+                    req,
+                    useCompositePrefixes
+                })
+        });
+}
+
+//# sourceMappingURL=adapter.js.map

package/dist/adapter.js.map

@@ -0,0 +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 type { R2Bucket } from './types.js'\n\nimport { deleteFile } from './deleteFile.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateR2AdapterArgs {\n  bucket: R2Bucket\n  clientUploads?: ClientUploadsConfig\n  useCompositePrefixes?: boolean\n}\n\nexport function createR2Adapter({\n  bucket,\n  clientUploads,\n  useCompositePrefixes = false,\n}: CreateR2AdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 'r2',\n    clientUploads,\n\n    handleDelete: ({ doc: { prefix: docPrefix = '' }, filename }) =>\n      deleteFile({\n        bucket,\n        collectionPrefix: prefix,\n        docPrefix,\n        filename,\n        useCompositePrefixes,\n      }),\n\n    handleUpload: ({ data, file }) =>\n      uploadFile({\n        bucket,\n        buffer: file.buffer,\n        collectionPrefix: prefix,\n        docPrefix: data.prefix,\n        filename: file.filename,\n        mimeType: file.mimeType,\n        useCompositePrefixes,\n      }),\n\n    staticHandler: (\n      req,\n      { headers, params: { clientUploadContext, filename, prefix: prefixQueryParam } },\n    ) =>\n      getFile({\n        bucket,\n        clientUploadContext,\n        collection,\n        filename,\n        incomingHeaders: headers,\n        prefix,\n        prefixQueryParam,\n        req,\n        useCompositePrefixes,\n      }),\n  })\n}\n"],"names":["deleteFile","getFile","uploadFile","createR2Adapter","bucket","clientUploads","useCompositePrefixes","collection","prefix","name","handleDelete","doc","docPrefix","filename","collectionPrefix","handleUpload","data","file","buffer","mimeType","staticHandler","req","headers","params","clientUploadContext","prefixQueryParam","incomingHeaders"],"mappings":"AAQA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAQ5C,OAAO,SAASC,gBAAgB,EAC9BC,MAAM,EACNC,aAAa,EACbC,uBAAuB,KAAK,EACR;IACpB,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNJ;YAEAK,cAAc,CAAC,EAAEC,KAAK,EAAEH,QAAQI,YAAY,EAAE,EAAE,EAAEC,QAAQ,EAAE,GAC1Db,WAAW;oBACTI;oBACAU,kBAAkBN;oBAClBI;oBACAC;oBACAP;gBACF;YAEFS,cAAc,CAAC,EAAEC,IAAI,EAAEC,IAAI,EAAE,GAC3Bf,WAAW;oBACTE;oBACAc,QAAQD,KAAKC,MAAM;oBACnBJ,kBAAkBN;oBAClBI,WAAWI,KAAKR,MAAM;oBACtBK,UAAUI,KAAKJ,QAAQ;oBACvBM,UAAUF,KAAKE,QAAQ;oBACvBb;gBACF;YAEFc,eAAe,CACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEX,QAAQ,EAAEL,QAAQiB,gBAAgB,EAAE,EAAE,GAEhFxB,QAAQ;oBACNG;oBACAoB;oBACAjB;oBACAM;oBACAa,iBAAiBJ;oBACjBd;oBACAiB;oBACAJ;oBACAf;gBACF;QACJ,CAAA;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"R2ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/R2ClientUploadHandler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAGV,kCAAkC,EAGnC,MAAM,aAAa,CAAA;AAEpB,eAAO,MAAM,qBAAqB;;;;;;;aAe5B,OAAK,aAqDT,CAAA"}
+{"version":3,"file":"R2ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/R2ClientUploadHandler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAGV,kCAAkC,EAGnC,MAAM,aAAa,CAAA;AAEpB,eAAO,MAAM,qBAAqB;;;;;;;aAgBlB,OAAO,aAoDrB,CAAA"}

package/dist/deleteFile.d.ts

@@ -0,0 +1,11 @@
+import type { R2Bucket } from './types.js';
+interface DeleteFileArgs {
+    bucket: R2Bucket;
+    collectionPrefix?: string;
+    docPrefix: string;
+    filename: string;
+    useCompositePrefixes?: boolean;
+}
+export declare function deleteFile({ bucket, collectionPrefix, docPrefix, filename, useCompositePrefixes, }: DeleteFileArgs): Promise<void>;
+export {};
+//# sourceMappingURL=deleteFile.d.ts.map

package/dist/deleteFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,oBAA4B,GAC7B,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAShC"}

package/dist/deleteFile.js

@@ -0,0 +1,12 @@
+import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
+export async function deleteFile({ bucket, collectionPrefix = '', docPrefix, filename, useCompositePrefixes = false }) {
+    const key = getFileKey({
+        collectionPrefix,
+        docPrefix,
+        filename,
+        useCompositePrefixes
+    });
+    await bucket.delete(key);
+}
+
+//# sourceMappingURL=deleteFile.js.map

package/dist/deleteFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { R2Bucket } from './types.js'\n\ninterface DeleteFileArgs {\n  bucket: R2Bucket\n  collectionPrefix?: string\n  docPrefix: string\n  filename: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function deleteFile({\n  bucket,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  useCompositePrefixes = false,\n}: DeleteFileArgs): Promise<void> {\n  const key = getFileKey({\n    collectionPrefix,\n    docPrefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  await bucket.delete(key)\n}\n"],"names":["getFileKey","deleteFile","bucket","collectionPrefix","docPrefix","filename","useCompositePrefixes","key","delete"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AAYvE,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,uBAAuB,KAAK,EACb;IACf,MAAMC,MAAMP,WAAW;QACrBG;QACAC;QACAC;QACAC;IACF;IAEA,MAAMJ,OAAOM,MAAM,CAACD;AACtB"}

package/dist/getFile.d.ts

@@ -0,0 +1,16 @@
+import type { CollectionConfig, PayloadRequest } from 'payload';
+import type { R2Bucket } from './types.js';
+interface GetFileArgs {
+    bucket: R2Bucket;
+    clientUploadContext?: unknown;
+    collection: CollectionConfig;
+    filename: string;
+    incomingHeaders?: Headers;
+    prefix: string;
+    prefixQueryParam?: string;
+    req: PayloadRequest;
+    useCompositePrefixes?: boolean;
+}
+export declare function getFile({ bucket, clientUploadContext, collection, filename, incomingHeaders, prefix, prefixQueryParam, req, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
+export {};
+//# sourceMappingURL=getFile.d.ts.map

package/dist/getFile.d.ts.map

@@ -0,0 +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;AAS/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,UAAU,WAAW;IACnB,MAAM,EAAE,QAAQ,CAAA;IAChB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAID,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,mBAAmB,EACnB,UAAU,EACV,QAAQ,EACR,eAAe,EACf,MAAW,EACX,gBAAgB,EAChB,GAAG,EACH,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsHjC"}

package/dist/getFile.js

@@ -0,0 +1,117 @@
+import { getFilePrefix as getDocPrefix, getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
+import { getRangeRequestInfo } from 'payload/internal';
+import { sanitizeFilename } from 'payload/shared';
+const isMiniflare = process.env.NODE_ENV === 'development';
+export async function getFile({ bucket, clientUploadContext, collection, filename, incomingHeaders, prefix = '', prefixQueryParam, req, useCompositePrefixes = false }) {
+    try {
+        const docPrefix = await getDocPrefix({
+            clientUploadContext,
+            collection,
+            filename,
+            prefixQueryParam,
+            req
+        });
+        const key = getFileKey({
+            collectionPrefix: prefix,
+            docPrefix,
+            filename: sanitizeFilename(filename),
+            useCompositePrefixes
+        });
+        // Get file size for range validation
+        const headObj = await bucket?.head(key);
+        if (!headObj) {
+            return new Response(null, {
+                status: 404,
+                statusText: 'Not Found'
+            });
+        }
+        const fileSize = headObj.size;
+        // Don't return large file uploads back to the client, or the Worker will run out of memory
+        if (fileSize > 50 * 1024 * 1024 && clientUploadContext) {
+            return new Response(null, {
+                status: 200
+            });
+        }
+        // Handle range request
+        const rangeHeader = req.headers.get('range');
+        const rangeResult = getRangeRequestInfo({
+            fileSize,
+            rangeHeader
+        });
+        if (rangeResult.type === 'invalid') {
+            return new Response(null, {
+                headers: new Headers(rangeResult.headers),
+                status: rangeResult.status
+            });
+        }
+        // Get object with range if needed
+        // Due to https://github.com/cloudflare/workers-sdk/issues/6047
+        // We cannot send a Headers instance to Miniflare
+        const obj = rangeResult.type === 'partial' && !isMiniflare ? await bucket?.get(key, {
+            range: {
+                length: rangeResult.rangeEnd - rangeResult.rangeStart + 1,
+                offset: rangeResult.rangeStart
+            }
+        }) : await bucket?.get(key);
+        if (!obj || obj.body == undefined) {
+            return new Response(null, {
+                status: 404,
+                statusText: 'Not Found'
+            });
+        }
+        let headers = new Headers(incomingHeaders);
+        // Add range-related headers from the result
+        for (const [headerKey, value] of Object.entries(rangeResult.headers)){
+            headers.append(headerKey, value);
+        }
+        // Add R2-specific headers
+        if (isMiniflare) {
+            // In development with Miniflare, manually set headers from httpMetadata
+            const metadata = obj.httpMetadata;
+            if (metadata?.cacheControl) {
+                headers.set('Cache-Control', metadata.cacheControl);
+            }
+            if (metadata?.contentDisposition) {
+                headers.set('Content-Disposition', metadata.contentDisposition);
+            }
+            if (metadata?.contentEncoding) {
+                headers.set('Content-Encoding', metadata.contentEncoding);
+            }
+            if (metadata?.contentLanguage) {
+                headers.set('Content-Language', metadata.contentLanguage);
+            }
+            if (metadata?.contentType) {
+                headers.set('Content-Type', metadata.contentType);
+            }
+        } else {
+            obj.writeHttpMetadata(headers);
+        }
+        // Add Content-Security-Policy header for SVG files to prevent executable code
+        const contentType = headers.get('Content-Type');
+        if (contentType === 'image/svg+xml') {
+            headers.set('Content-Security-Policy', "script-src 'none'");
+        }
+        const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
+        if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
+            headers = collection.upload.modifyResponseHeaders({
+                headers
+            }) || headers;
+        }
+        if (etagFromHeaders && etagFromHeaders === obj.etag) {
+            return new Response(null, {
+                headers,
+                status: 304
+            });
+        }
+        return new Response(obj.body, {
+            headers,
+            status: rangeResult.status
+        });
+    } catch (err) {
+        return new Response('Internal Server Error', {
+            status: 500
+        });
+    }
+}
+
+//# sourceMappingURL=getFile.js.map

package/dist/getFile.js.map

@@ -0,0 +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 { getRangeRequestInfo } from 'payload/internal'\nimport { sanitizeFilename } from 'payload/shared'\n\nimport type { R2Bucket } from './types.js'\n\ninterface GetFileArgs {\n  bucket: R2Bucket\n  clientUploadContext?: unknown\n  collection: CollectionConfig\n  filename: string\n  incomingHeaders?: Headers\n  prefix: string\n  prefixQueryParam?: string\n  req: PayloadRequest\n  useCompositePrefixes?: boolean\n}\n\nconst isMiniflare = process.env.NODE_ENV === 'development'\n\nexport async function getFile({\n  bucket,\n  clientUploadContext,\n  collection,\n  filename,\n  incomingHeaders,\n  prefix = '',\n  prefixQueryParam,\n  req,\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 key = getFileKey({\n      collectionPrefix: prefix,\n      docPrefix,\n      filename: sanitizeFilename(filename),\n      useCompositePrefixes,\n    })\n\n    // Get file size for range validation\n    const headObj = await bucket?.head(key)\n    if (!headObj) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n\n    const fileSize = headObj.size\n\n    // Don't return large file uploads back to the client, or the Worker will run out of memory\n    if (fileSize > 50 * 1024 * 1024 && clientUploadContext) {\n      return new Response(null, { status: 200 })\n    }\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const rangeResult = getRangeRequestInfo({ fileSize, 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    // Get object with range if needed\n    // Due to https://github.com/cloudflare/workers-sdk/issues/6047\n    // We cannot send a Headers instance to Miniflare\n    const obj =\n      rangeResult.type === 'partial' && !isMiniflare\n        ? await bucket?.get(key, {\n            range: {\n              length: rangeResult.rangeEnd - rangeResult.rangeStart + 1,\n              offset: rangeResult.rangeStart,\n            },\n          })\n        : await bucket?.get(key)\n\n    if (!obj || obj.body == undefined) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [headerKey, value] of Object.entries(rangeResult.headers)) {\n      headers.append(headerKey, value)\n    }\n\n    // Add R2-specific headers\n    if (isMiniflare) {\n      // In development with Miniflare, manually set headers from httpMetadata\n      const metadata = obj.httpMetadata\n      if (metadata?.cacheControl) {\n        headers.set('Cache-Control', metadata.cacheControl)\n      }\n      if (metadata?.contentDisposition) {\n        headers.set('Content-Disposition', metadata.contentDisposition)\n      }\n      if (metadata?.contentEncoding) {\n        headers.set('Content-Encoding', metadata.contentEncoding)\n      }\n      if (metadata?.contentLanguage) {\n        headers.set('Content-Language', metadata.contentLanguage)\n      }\n      if (metadata?.contentType) {\n        headers.set('Content-Type', metadata.contentType)\n      }\n    } else {\n      obj.writeHttpMetadata(headers)\n    }\n\n    // Add Content-Security-Policy header for SVG files to prevent executable code\n    const contentType = headers.get('Content-Type')\n    if (contentType === 'image/svg+xml') {\n      headers.set('Content-Security-Policy', \"script-src 'none'\")\n    }\n\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\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 === obj.etag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    return new Response(obj.body, {\n      headers,\n      status: rangeResult.status,\n    })\n  } catch (err: unknown) {\n    return new Response('Internal Server Error', { status: 500 })\n  }\n}\n"],"names":["getFilePrefix","getDocPrefix","getFileKey","getRangeRequestInfo","sanitizeFilename","isMiniflare","process","env","NODE_ENV","getFile","bucket","clientUploadContext","collection","filename","incomingHeaders","prefix","prefixQueryParam","req","useCompositePrefixes","docPrefix","key","collectionPrefix","headObj","head","Response","status","statusText","fileSize","size","rangeHeader","headers","get","rangeResult","type","Headers","obj","range","length","rangeEnd","rangeStart","offset","body","undefined","headerKey","value","Object","entries","append","metadata","httpMetadata","cacheControl","set","contentDisposition","contentEncoding","contentLanguage","contentType","writeHttpMetadata","etagFromHeaders","upload","modifyResponseHeaders","etag","err"],"mappings":"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"}

package/dist/index.d.ts

@@ -22,6 +22,20 @@ export interface R2StorageOptions {
      */
     collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>;
     enabled?: boolean;
+    /**
+     * When true, the collection-level prefix and document-level prefix are combined
+     * (compositional). When false (default), document prefix overrides collection
+     * prefix entirely.
+     *
+     * 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/`
+     *
+     * @default false
+     */
+    useCompositePrefixes?: boolean;
 }
 type R2StoragePlugin = (r2StorageArgs: R2StorageOptions) => Plugin;
 export declare const r2Storage: R2StoragePlugin;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EAEnB,iBAAiB,EAElB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAKnE,OAAO,KAAK,EAAE,QAAQ,EAAsC,MAAM,YAAY,CAAA;AAO9E,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B,MAAM,EAAE,QAAQ,CAAA;IAChB;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAC7F,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,KAAK,eAAe,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,MAAM,CAAA;AAElE,eAAO,MAAM,SAAS,EAAE,eAsErB,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;AAKnE,OAAO,KAAK,EAAE,QAAQ,EAAsC,MAAM,YAAY,CAAA;AAK9E,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B,MAAM,EAAE,QAAQ,CAAA;IAChB;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAC7F,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,KAAK,eAAe,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,MAAM,CAAA;AAElE,eAAO,MAAM,SAAS,EAAE,eA2ErB,CAAA"}

package/dist/index.js

@@ -1,11 +1,13 @@
 import { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage';
 import { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities';
-import { getHandleDelete } from './handleDelete.js';
+import { createR2Adapter } from './adapter.js';
 import { getHandleMultiPartUpload } from './handleMultiPartUpload.js';
-import { getHandleUpload } from './handleUpload.js';
-import { getHandler } from './staticHandler.js';
 export const r2Storage = (r2StorageOptions)=>(incomingConfig)=>{
-        const adapter = r2StorageInternal(r2StorageOptions);
+        const adapter = createR2Adapter({
+            bucket: r2StorageOptions.bucket,
+            clientUploads: r2StorageOptions.clientUploads,
+            useCompositePrefixes: r2StorageOptions.useCompositePrefixes
+        });
         const isPluginDisabled = r2StorageOptions.enabled === false;
         initClientUploads({
             clientHandler: '@payloadcms/storage-r2/client#R2ClientUploadHandler',
@@ -51,29 +53,9 @@ export const r2Storage = (r2StorageOptions)=>(incomingConfig)=>{
         };
         return cloudStoragePlugin({
             alwaysInsertFields: r2StorageOptions.alwaysInsertFields,
-            collections: collectionsWithAdapter
+            collections: collectionsWithAdapter,
+            useCompositePrefixes: r2StorageOptions.useCompositePrefixes
         })(config);
     };
-function r2StorageInternal({ bucket, clientUploads }) {
-    return ({ collection, prefix })=>{
-        return {
-            name: 'r2',
-            clientUploads,
-            handleDelete: getHandleDelete({
-                bucket
-            }),
-            handleUpload: getHandleUpload({
-                bucket,
-                collection,
-                prefix
-            }),
-            staticHandler: getHandler({
-                bucket,
-                collection,
-                prefix
-            })
-        };
-    };
-}
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  Adapter,\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n  GeneratedAdapter,\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 { R2Bucket, R2StorageClientUploadHandlerParams } from './types.js'\n\nimport { getHandleDelete } from './handleDelete.js'\nimport { getHandleMultiPartUpload } from './handleMultiPartUpload.js'\nimport { getHandleUpload } from './handleUpload.js'\nimport { getHandler } from './staticHandler.js'\n\nexport interface R2StorageOptions {\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  bucket: R2Bucket\n  /**\n   * Do uploads directly on the client, to bypass limits on Cloudflare/Vercel.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the R2 adapter to.\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n  enabled?: boolean\n}\n\ntype R2StoragePlugin = (r2StorageArgs: R2StorageOptions) => Plugin\n\nexport const r2Storage: R2StoragePlugin =\n  (r2StorageOptions) =>\n  (incomingConfig: Config): Config => {\n    const adapter = r2StorageInternal(r2StorageOptions)\n\n    const isPluginDisabled = r2StorageOptions.enabled === false\n\n    initClientUploads<\n      R2StorageClientUploadHandlerParams,\n      R2StorageOptions['collections'][keyof R2StorageOptions['collections']]\n    >({\n      clientHandler: '@payloadcms/storage-r2/client#R2ClientUploadHandler',\n      collections: r2StorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(r2StorageOptions.clientUploads),\n      extraClientHandlerProps: (collection) => ({\n        prefix:\n          (typeof collection === 'object' && collection.prefix && `${collection.prefix}/`) || '',\n      }),\n      serverHandler: getHandleMultiPartUpload({\n        access:\n          typeof r2StorageOptions.clientUploads === 'object'\n            ? r2StorageOptions.clientUploads.access\n            : undefined,\n        bucket: r2StorageOptions.bucket,\n        collections: r2StorageOptions.collections,\n      }),\n      serverHandlerPath: '/storage-r2-multi-part-upload',\n    })\n\n    if (isPluginDisabled) {\n      return incomingConfig\n    }\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      r2StorageOptions.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: r2StorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n    })(config)\n  }\n\nfunction r2StorageInternal({ bucket, clientUploads }: R2StorageOptions): Adapter {\n  return ({ collection, prefix }): GeneratedAdapter => {\n    return {\n      name: 'r2',\n      clientUploads,\n      handleDelete: getHandleDelete({ bucket }),\n      handleUpload: getHandleUpload({\n        bucket,\n        collection,\n        prefix,\n      }),\n      staticHandler: getHandler({ bucket, collection, prefix }),\n    }\n  }\n}\n"],"names":["cloudStoragePlugin","initClientUploads","getHandleDelete","getHandleMultiPartUpload","getHandleUpload","getHandler","r2Storage","r2StorageOptions","incomingConfig","adapter","r2StorageInternal","isPluginDisabled","enabled","clientHandler","collections","config","Boolean","clientUploads","extraClientHandlerProps","collection","prefix","serverHandler","access","undefined","bucket","serverHandlerPath","collectionsWithAdapter","Object","entries","reduce","acc","slug","collOptions","map","upload","disableLocalStorage","alwaysInsertFields","name","handleDelete","handleUpload","staticHandler"],"mappings":"AASA,SAASA,kBAAkB,QAAQ,mCAAkC;AACrE,SAASC,iBAAiB,QAAQ,6CAA4C;AAI9E,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,wBAAwB,QAAQ,6BAA4B;AACrE,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,UAAU,QAAQ,qBAAoB;AA4B/C,OAAO,MAAMC,YACX,CAACC,mBACD,CAACC;QACC,MAAMC,UAAUC,kBAAkBH;QAElC,MAAMI,mBAAmBJ,iBAAiBK,OAAO,KAAK;QAEtDX,kBAGE;YACAY,eAAe;YACfC,aAAaP,iBAAiBO,WAAW;YACzCC,QAAQP;YACRI,SAAS,CAACD,oBAAoBK,QAAQT,iBAAiBU,aAAa;YACpEC,yBAAyB,CAACC,aAAgB,CAAA;oBACxCC,QACE,AAAC,OAAOD,eAAe,YAAYA,WAAWC,MAAM,IAAI,GAAGD,WAAWC,MAAM,CAAC,CAAC,CAAC,IAAK;gBACxF,CAAA;YACAC,eAAelB,yBAAyB;gBACtCmB,QACE,OAAOf,iBAAiBU,aAAa,KAAK,WACtCV,iBAAiBU,aAAa,CAACK,MAAM,GACrCC;gBACNC,QAAQjB,iBAAiBiB,MAAM;gBAC/BV,aAAaP,iBAAiBO,WAAW;YAC3C;YACAW,mBAAmB;QACrB;QAEA,IAAId,kBAAkB;YACpB,OAAOH;QACT;QAEA,+CAA+C;QAC/C,MAAMkB,yBAAmEC,OAAOC,OAAO,CACrFrB,iBAAiBO,WAAW,EAC5Be,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;gBAC7B,GAAGF,GAAG;gBACN,CAACC,KAAK,EAAE;oBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;oBAC3CvB;gBACF;YACF,CAAA,GACA,CAAC;QAGH,gFAAgF;QAChF,MAAMM,SAAS;YACb,GAAGP,cAAc;YACjBM,aAAa,AAACN,CAAAA,eAAeM,WAAW,IAAI,EAAE,AAAD,EAAGmB,GAAG,CAAC,CAACd;gBACnD,IAAI,CAACO,sBAAsB,CAACP,WAAWY,IAAI,CAAC,EAAE;oBAC5C,OAAOZ;gBACT;gBAEA,OAAO;oBACL,GAAGA,UAAU;oBACbe,QAAQ;wBACN,GAAI,OAAOf,WAAWe,MAAM,KAAK,WAAWf,WAAWe,MAAM,GAAG,CAAC,CAAC;wBAClEC,qBAAqB;oBACvB;gBACF;YACF;QACF;QAEA,OAAOnC,mBAAmB;YACxBoC,oBAAoB7B,iBAAiB6B,kBAAkB;YACvDtB,aAAaY;QACf,GAAGX;IACL,EAAC;AAEH,SAASL,kBAAkB,EAAEc,MAAM,EAAEP,aAAa,EAAoB;IACpE,OAAO,CAAC,EAAEE,UAAU,EAAEC,MAAM,EAAE;QAC5B,OAAO;YACLiB,MAAM;YACNpB;YACAqB,cAAcpC,gBAAgB;gBAAEsB;YAAO;YACvCe,cAAcnC,gBAAgB;gBAC5BoB;gBACAL;gBACAC;YACF;YACAoB,eAAenC,WAAW;gBAAEmB;gBAAQL;gBAAYC;YAAO;QACzD;IACF;AACF"}
+{"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 { R2Bucket, R2StorageClientUploadHandlerParams } from './types.js'\n\nimport { createR2Adapter } from './adapter.js'\nimport { getHandleMultiPartUpload } from './handleMultiPartUpload.js'\n\nexport interface R2StorageOptions {\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  bucket: R2Bucket\n  /**\n   * Do uploads directly on the client, to bypass limits on Cloudflare/Vercel.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the R2 adapter to.\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n  enabled?: boolean\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\ntype R2StoragePlugin = (r2StorageArgs: R2StorageOptions) => Plugin\n\nexport const r2Storage: R2StoragePlugin =\n  (r2StorageOptions) =>\n  (incomingConfig: Config): Config => {\n    const adapter = createR2Adapter({\n      bucket: r2StorageOptions.bucket,\n      clientUploads: r2StorageOptions.clientUploads,\n      useCompositePrefixes: r2StorageOptions.useCompositePrefixes,\n    })\n\n    const isPluginDisabled = r2StorageOptions.enabled === false\n\n    initClientUploads<\n      R2StorageClientUploadHandlerParams,\n      R2StorageOptions['collections'][keyof R2StorageOptions['collections']]\n    >({\n      clientHandler: '@payloadcms/storage-r2/client#R2ClientUploadHandler',\n      collections: r2StorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(r2StorageOptions.clientUploads),\n      extraClientHandlerProps: (collection) => ({\n        prefix:\n          (typeof collection === 'object' && collection.prefix && `${collection.prefix}/`) || '',\n      }),\n      serverHandler: getHandleMultiPartUpload({\n        access:\n          typeof r2StorageOptions.clientUploads === 'object'\n            ? r2StorageOptions.clientUploads.access\n            : undefined,\n        bucket: r2StorageOptions.bucket,\n        collections: r2StorageOptions.collections,\n      }),\n      serverHandlerPath: '/storage-r2-multi-part-upload',\n    })\n\n    if (isPluginDisabled) {\n      return incomingConfig\n    }\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      r2StorageOptions.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: r2StorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: r2StorageOptions.useCompositePrefixes,\n    })(config)\n  }\n"],"names":["cloudStoragePlugin","initClientUploads","createR2Adapter","getHandleMultiPartUpload","r2Storage","r2StorageOptions","incomingConfig","adapter","bucket","clientUploads","useCompositePrefixes","isPluginDisabled","enabled","clientHandler","collections","config","Boolean","extraClientHandlerProps","collection","prefix","serverHandler","access","undefined","serverHandlerPath","collectionsWithAdapter","Object","entries","reduce","acc","slug","collOptions","map","upload","disableLocalStorage","alwaysInsertFields"],"mappings":"AAOA,SAASA,kBAAkB,QAAQ,mCAAkC;AACrE,SAASC,iBAAiB,QAAQ,6CAA4C;AAI9E,SAASC,eAAe,QAAQ,eAAc;AAC9C,SAASC,wBAAwB,QAAQ,6BAA4B;AA0CrE,OAAO,MAAMC,YACX,CAACC,mBACD,CAACC;QACC,MAAMC,UAAUL,gBAAgB;YAC9BM,QAAQH,iBAAiBG,MAAM;YAC/BC,eAAeJ,iBAAiBI,aAAa;YAC7CC,sBAAsBL,iBAAiBK,oBAAoB;QAC7D;QAEA,MAAMC,mBAAmBN,iBAAiBO,OAAO,KAAK;QAEtDX,kBAGE;YACAY,eAAe;YACfC,aAAaT,iBAAiBS,WAAW;YACzCC,QAAQT;YACRM,SAAS,CAACD,oBAAoBK,QAAQX,iBAAiBI,aAAa;YACpEQ,yBAAyB,CAACC,aAAgB,CAAA;oBACxCC,QACE,AAAC,OAAOD,eAAe,YAAYA,WAAWC,MAAM,IAAI,GAAGD,WAAWC,MAAM,CAAC,CAAC,CAAC,IAAK;gBACxF,CAAA;YACAC,eAAejB,yBAAyB;gBACtCkB,QACE,OAAOhB,iBAAiBI,aAAa,KAAK,WACtCJ,iBAAiBI,aAAa,CAACY,MAAM,GACrCC;gBACNd,QAAQH,iBAAiBG,MAAM;gBAC/BM,aAAaT,iBAAiBS,WAAW;YAC3C;YACAS,mBAAmB;QACrB;QAEA,IAAIZ,kBAAkB;YACpB,OAAOL;QACT;QAEA,+CAA+C;QAC/C,MAAMkB,yBAAmEC,OAAOC,OAAO,CACrFrB,iBAAiBS,WAAW,EAC5Ba,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;gBAC7B,GAAGF,GAAG;gBACN,CAACC,KAAK,EAAE;oBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;oBAC3CvB;gBACF;YACF,CAAA,GACA,CAAC;QAGH,gFAAgF;QAChF,MAAMQ,SAAS;YACb,GAAGT,cAAc;YACjBQ,aAAa,AAACR,CAAAA,eAAeQ,WAAW,IAAI,EAAE,AAAD,EAAGiB,GAAG,CAAC,CAACb;gBACnD,IAAI,CAACM,sBAAsB,CAACN,WAAWW,IAAI,CAAC,EAAE;oBAC5C,OAAOX;gBACT;gBAEA,OAAO;oBACL,GAAGA,UAAU;oBACbc,QAAQ;wBACN,GAAI,OAAOd,WAAWc,MAAM,KAAK,WAAWd,WAAWc,MAAM,GAAG,CAAC,CAAC;wBAClEC,qBAAqB;oBACvB;gBACF;YACF;QACF;QAEA,OAAOjC,mBAAmB;YACxBkC,oBAAoB7B,iBAAiB6B,kBAAkB;YACvDpB,aAAaU;YACbd,sBAAsBL,iBAAiBK,oBAAoB;QAC7D,GAAGK;IACL,EAAC"}

package/dist/uploadFile.d.ts

@@ -0,0 +1,13 @@
+import type { R2Bucket } from './types.js';
+interface UploadFileArgs {
+    bucket: R2Bucket;
+    buffer: Buffer;
+    collectionPrefix?: string;
+    docPrefix?: string;
+    filename: string;
+    mimeType: string;
+    useCompositePrefixes?: boolean;
+}
+export declare function uploadFile({ bucket, buffer, collectionPrefix, docPrefix, filename, mimeType, useCompositePrefixes, }: UploadFileArgs): Promise<void>;
+export {};
+//# sourceMappingURL=uploadFile.d.ts.map

package/dist/uploadFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAI1C,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,MAAM,EACN,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,oBAA4B,GAC7B,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAchC"}

package/dist/uploadFile.js

@@ -0,0 +1,21 @@
+import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
+const isMiniflare = process.env.NODE_ENV === 'development';
+export async function uploadFile({ bucket, buffer, collectionPrefix = '', docPrefix, filename, mimeType, useCompositePrefixes = false }) {
+    // Read more: https://github.com/cloudflare/workers-sdk/issues/6047#issuecomment-2691217843
+    const body = isMiniflare ? new Blob([
+        buffer
+    ]) : buffer;
+    const key = getFileKey({
+        collectionPrefix,
+        docPrefix: docPrefix || '',
+        filename,
+        useCompositePrefixes
+    });
+    await bucket.put(key, body, {
+        httpMetadata: {
+            contentType: mimeType
+        }
+    });
+}
+
+//# sourceMappingURL=uploadFile.js.map

package/dist/uploadFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { R2Bucket } from './types.js'\n\nconst isMiniflare = process.env.NODE_ENV === 'development'\n\ninterface UploadFileArgs {\n  bucket: R2Bucket\n  buffer: Buffer\n  collectionPrefix?: string\n  docPrefix?: string\n  filename: string\n  mimeType: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function uploadFile({\n  bucket,\n  buffer,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  mimeType,\n  useCompositePrefixes = false,\n}: UploadFileArgs): Promise<void> {\n  // Read more: https://github.com/cloudflare/workers-sdk/issues/6047#issuecomment-2691217843\n  const body = isMiniflare ? new Blob([buffer]) : buffer\n\n  const key = getFileKey({\n    collectionPrefix,\n    docPrefix: docPrefix || '',\n    filename,\n    useCompositePrefixes,\n  })\n\n  await bucket.put(key, body, {\n    httpMetadata: { contentType: mimeType },\n  })\n}\n"],"names":["getFileKey","isMiniflare","process","env","NODE_ENV","uploadFile","bucket","buffer","collectionPrefix","docPrefix","filename","mimeType","useCompositePrefixes","body","Blob","key","put","httpMetadata","contentType"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AAIvE,MAAMC,cAAcC,QAAQC,GAAG,CAACC,QAAQ,KAAK;AAY7C,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,uBAAuB,KAAK,EACb;IACf,2FAA2F;IAC3F,MAAMC,OAAOZ,cAAc,IAAIa,KAAK;QAACP;KAAO,IAAIA;IAEhD,MAAMQ,MAAMf,WAAW;QACrBQ;QACAC,WAAWA,aAAa;QACxBC;QACAE;IACF;IAEA,MAAMN,OAAOU,GAAG,CAACD,KAAKF,MAAM;QAC1BI,cAAc;YAAEC,aAAaP;QAAS;IACxC;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-r2",
-  "version": "3.83.0-internal.06ac84e",
+  "version": "3.83.0-internal.ddc1147",
   "description": "Payload storage adapter for Cloudflare R2",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -37,14 +37,14 @@
     "dist"
   ],
   "dependencies": {
-    "@payloadcms/plugin-cloud-storage": "3.83.0-internal.06ac84e"
+    "@payloadcms/plugin-cloud-storage": "3.83.0-internal.ddc1147"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20260218.0",
-    "payload": "3.83.0-internal.06ac84e"
+    "payload": "3.83.0-internal.ddc1147"
   },
   "peerDependencies": {
-    "payload": "3.83.0-internal.06ac84e"
+    "payload": "3.83.0-internal.ddc1147"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"

package/dist/handleDelete.d.ts

@@ -1,8 +0,0 @@
-import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types';
-import type { R2Bucket } from './types.js';
-interface Args {
-    bucket: R2Bucket;
-}
-export declare const getHandleDelete: ({ bucket }: Args) => 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;AAI1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,UAAU,IAAI;IACZ,MAAM,EAAE,QAAQ,CAAA;CACjB;AAED,eAAO,MAAM,eAAe,eAAgB,IAAI,KAAG,YAIlD,CAAA"}

package/dist/handleDelete.js

@@ -1,8 +0,0 @@
-import path from 'path';
-export const getHandleDelete = ({ bucket })=>{
-    return async ({ doc: { prefix = '' }, filename })=>{
-        await bucket.delete(path.posix.join(prefix, filename));
-    };
-};
-
-//# 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 path from 'path'\n\nimport type { R2Bucket } from './types.js'\n\ninterface Args {\n  bucket: R2Bucket\n}\n\nexport const getHandleDelete = ({ bucket }: Args): HandleDelete => {\n  return async ({ doc: { prefix = '' }, filename }) => {\n    await bucket.delete(path.posix.join(prefix, filename))\n  }\n}\n"],"names":["path","getHandleDelete","bucket","doc","prefix","filename","delete","posix","join"],"mappings":"AAEA,OAAOA,UAAU,OAAM;AAQvB,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,MAAM,EAAQ;IAC9C,OAAO,OAAO,EAAEC,KAAK,EAAEC,SAAS,EAAE,EAAE,EAAEC,QAAQ,EAAE;QAC9C,MAAMH,OAAOI,MAAM,CAACN,KAAKO,KAAK,CAACC,IAAI,CAACJ,QAAQC;IAC9C;AACF,EAAC"}

package/dist/handleUpload.d.ts

@@ -1,11 +0,0 @@
-import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types';
-import type { CollectionConfig } from 'payload';
-import type { R2Bucket } from './types.js';
-interface Args {
-    bucket: R2Bucket;
-    collection: CollectionConfig;
-    prefix?: string;
-}
-export declare const getHandleUpload: ({ bucket, prefix }: Args) => 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;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAI/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,UAAU,IAAI;IACZ,MAAM,EAAE,QAAQ,CAAA;IAChB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,eAAe,uBAA6B,IAAI,KAAG,YAQ/D,CAAA"}

package/dist/handleUpload.js

@@ -1,16 +0,0 @@
-import path from 'path';
-export const getHandleUpload = ({ bucket, prefix = '' })=>{
-    return async ({ data, file })=>{
-        // Read more: https://github.com/cloudflare/workers-sdk/issues/6047#issuecomment-2691217843
-        const buffer = process.env.NODE_ENV === 'development' ? new Blob([
-            file.buffer
-        ]) : file.buffer;
-        await bucket.put(path.posix.join(data.prefix || prefix, file.filename), buffer, {
-            httpMetadata: {
-                contentType: file.mimeType
-            }
-        });
-    };
-};
-
-//# 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'\nimport type { CollectionConfig } from 'payload'\n\nimport path from 'path'\n\nimport type { R2Bucket } from './types.js'\n\ninterface Args {\n  bucket: R2Bucket\n  collection: CollectionConfig\n  prefix?: string\n}\n\nexport const getHandleUpload = ({ bucket, prefix = '' }: Args): HandleUpload => {\n  return async ({ data, file }) => {\n    // Read more: https://github.com/cloudflare/workers-sdk/issues/6047#issuecomment-2691217843\n    const buffer = process.env.NODE_ENV === 'development' ? new Blob([file.buffer]) : file.buffer\n    await bucket.put(path.posix.join(data.prefix || prefix, file.filename), buffer, {\n      httpMetadata: { contentType: file.mimeType },\n    })\n  }\n}\n"],"names":["path","getHandleUpload","bucket","prefix","data","file","buffer","process","env","NODE_ENV","Blob","put","posix","join","filename","httpMetadata","contentType","mimeType"],"mappings":"AAGA,OAAOA,UAAU,OAAM;AAUvB,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,MAAM,EAAEC,SAAS,EAAE,EAAQ;IAC3D,OAAO,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;QAC1B,2FAA2F;QAC3F,MAAMC,SAASC,QAAQC,GAAG,CAACC,QAAQ,KAAK,gBAAgB,IAAIC,KAAK;YAACL,KAAKC,MAAM;SAAC,IAAID,KAAKC,MAAM;QAC7F,MAAMJ,OAAOS,GAAG,CAACX,KAAKY,KAAK,CAACC,IAAI,CAACT,KAAKD,MAAM,IAAIA,QAAQE,KAAKS,QAAQ,GAAGR,QAAQ;YAC9ES,cAAc;gBAAEC,aAAaX,KAAKY,QAAQ;YAAC;QAC7C;IACF;AACF,EAAC"}

package/dist/staticHandler.d.ts

@@ -1,11 +0,0 @@
-import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types';
-import type { CollectionConfig } from 'payload';
-import type { R2Bucket } from './types.js';
-interface Args {
-    bucket: R2Bucket;
-    collection: CollectionConfig;
-    prefix?: string;
-}
-export declare const getHandler: ({ bucket, collection, prefix }: Args) => 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;AAO/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,UAAU,IAAI;IACZ,MAAM,EAAE,QAAQ,CAAA;IAChB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAID,eAAO,MAAM,UAAU,mCAAyC,IAAI,KAAG,aAwHtE,CAAA"}

package/dist/staticHandler.js

@@ -1,115 +0,0 @@
-import { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities';
-import path from 'path';
-import { getRangeRequestInfo } from 'payload/internal';
-import { sanitizeFilename } from 'payload/shared';
-const isMiniflare = process.env.NODE_ENV === 'development';
-export const getHandler = ({ bucket, collection, prefix = '' })=>{
-    return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename, prefix: prefixQueryParam } })=>{
-        try {
-            const filePrefix = await getFilePrefix({
-                clientUploadContext,
-                collection,
-                filename,
-                prefixQueryParam,
-                req
-            });
-            const key = path.posix.join(prefix, filePrefix, sanitizeFilename(filename));
-            // Get file size for range validation
-            const headObj = await bucket?.head(key);
-            if (!headObj) {
-                return new Response(null, {
-                    status: 404,
-                    statusText: 'Not Found'
-                });
-            }
-            const fileSize = headObj.size;
-            // Don't return large file uploads back to the client, or the Worker will run out of memory
-            if (fileSize > 50 * 1024 * 1024 && clientUploadContext) {
-                return new Response(null, {
-                    status: 200
-                });
-            }
-            // Handle range request
-            const rangeHeader = req.headers.get('range');
-            const rangeResult = getRangeRequestInfo({
-                fileSize,
-                rangeHeader
-            });
-            if (rangeResult.type === 'invalid') {
-                return new Response(null, {
-                    headers: new Headers(rangeResult.headers),
-                    status: rangeResult.status
-                });
-            }
-            // Get object with range if needed
-            // Due to https://github.com/cloudflare/workers-sdk/issues/6047
-            // We cannot send a Headers instance to Miniflare
-            const obj = rangeResult.type === 'partial' && !isMiniflare ? await bucket?.get(key, {
-                range: {
-                    length: rangeResult.rangeEnd - rangeResult.rangeStart + 1,
-                    offset: rangeResult.rangeStart
-                }
-            }) : await bucket?.get(key);
-            if (!obj || obj.body == undefined) {
-                return new Response(null, {
-                    status: 404,
-                    statusText: 'Not Found'
-                });
-            }
-            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);
-            }
-            // Add R2-specific headers
-            if (isMiniflare) {
-                // In development with Miniflare, manually set headers from httpMetadata
-                const metadata = obj.httpMetadata;
-                if (metadata?.cacheControl) {
-                    headers.set('Cache-Control', metadata.cacheControl);
-                }
-                if (metadata?.contentDisposition) {
-                    headers.set('Content-Disposition', metadata.contentDisposition);
-                }
-                if (metadata?.contentEncoding) {
-                    headers.set('Content-Encoding', metadata.contentEncoding);
-                }
-                if (metadata?.contentLanguage) {
-                    headers.set('Content-Language', metadata.contentLanguage);
-                }
-                if (metadata?.contentType) {
-                    headers.set('Content-Type', metadata.contentType);
-                }
-            } else {
-                obj.writeHttpMetadata(headers);
-            }
-            // Add Content-Security-Policy header for SVG files to prevent executable code
-            const contentType = headers.get('Content-Type');
-            if (contentType === 'image/svg+xml') {
-                headers.set('Content-Security-Policy', "script-src 'none'");
-            }
-            const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
-            if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
-                headers = collection.upload.modifyResponseHeaders({
-                    headers
-                }) || headers;
-            }
-            if (etagFromHeaders && etagFromHeaders === obj.etag) {
-                return new Response(null, {
-                    headers,
-                    status: 304
-                });
-            }
-            return new Response(obj.body, {
-                headers,
-                status: rangeResult.status
-            });
-        } catch (err) {
-            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 path from 'path'\nimport { getRangeRequestInfo } from 'payload/internal'\nimport { sanitizeFilename } from 'payload/shared'\n\nimport type { R2Bucket } from './types.js'\n\ninterface Args {\n  bucket: R2Bucket\n  collection: CollectionConfig\n  prefix?: string\n}\n\nconst isMiniflare = process.env.NODE_ENV === 'development'\n\nexport const getHandler = ({ bucket, collection, prefix = '' }: Args): StaticHandler => {\n  return async (\n    req,\n    {\n      headers: incomingHeaders,\n      params: { clientUploadContext, filename, prefix: prefixQueryParam },\n    },\n  ) => {\n    try {\n      const filePrefix = await getFilePrefix({\n        clientUploadContext,\n        collection,\n        filename,\n        prefixQueryParam,\n        req,\n      })\n      const key = path.posix.join(prefix, filePrefix, sanitizeFilename(filename))\n\n      // Get file size for range validation\n      const headObj = await bucket?.head(key)\n      if (!headObj) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const fileSize = headObj.size\n\n      // Don't return large file uploads back to the client, or the Worker will run out of memory\n      if (fileSize > 50 * 1024 * 1024 && clientUploadContext) {\n        return new Response(null, { status: 200 })\n      }\n\n      // Handle range request\n      const rangeHeader = req.headers.get('range')\n      const rangeResult = getRangeRequestInfo({ fileSize, 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      // Get object with range if needed\n      // Due to https://github.com/cloudflare/workers-sdk/issues/6047\n      // We cannot send a Headers instance to Miniflare\n      const obj =\n        rangeResult.type === 'partial' && !isMiniflare\n          ? await bucket?.get(key, {\n              range: {\n                length: rangeResult.rangeEnd - rangeResult.rangeStart + 1,\n                offset: rangeResult.rangeStart,\n              },\n            })\n          : await bucket?.get(key)\n\n      if (!obj || obj.body == undefined) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\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      // Add R2-specific headers\n      if (isMiniflare) {\n        // In development with Miniflare, manually set headers from httpMetadata\n        const metadata = obj.httpMetadata\n        if (metadata?.cacheControl) {\n          headers.set('Cache-Control', metadata.cacheControl)\n        }\n        if (metadata?.contentDisposition) {\n          headers.set('Content-Disposition', metadata.contentDisposition)\n        }\n        if (metadata?.contentEncoding) {\n          headers.set('Content-Encoding', metadata.contentEncoding)\n        }\n        if (metadata?.contentLanguage) {\n          headers.set('Content-Language', metadata.contentLanguage)\n        }\n        if (metadata?.contentType) {\n          headers.set('Content-Type', metadata.contentType)\n        }\n      } else {\n        obj.writeHttpMetadata(headers)\n      }\n\n      // Add Content-Security-Policy header for SVG files to prevent executable code\n      const contentType = headers.get('Content-Type')\n      if (contentType === 'image/svg+xml') {\n        headers.set('Content-Security-Policy', \"script-src 'none'\")\n      }\n\n      const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\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 === obj.etag) {\n        return new Response(null, {\n          headers,\n          status: 304,\n        })\n      }\n\n      return new Response(obj.body, {\n        headers,\n        status: rangeResult.status,\n      })\n    } catch (err: unknown) {\n      return new Response('Internal Server Error', { status: 500 })\n    }\n  }\n}\n"],"names":["getFilePrefix","path","getRangeRequestInfo","sanitizeFilename","isMiniflare","process","env","NODE_ENV","getHandler","bucket","collection","prefix","req","headers","incomingHeaders","params","clientUploadContext","filename","prefixQueryParam","filePrefix","key","posix","join","headObj","head","Response","status","statusText","fileSize","size","rangeHeader","get","rangeResult","type","Headers","obj","range","length","rangeEnd","rangeStart","offset","body","undefined","value","Object","entries","append","metadata","httpMetadata","cacheControl","set","contentDisposition","contentEncoding","contentLanguage","contentType","writeHttpMetadata","etagFromHeaders","upload","modifyResponseHeaders","etag","err"],"mappings":"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"}