@payloadcms/storage-s3 3.85.0 → 4.0.0-internal.1f9ae9a

package/dist/adapter.d.ts

@@ -1,12 +1,12 @@
-import type * as AWS from '@aws-sdk/client-s3';
+import type { S3, S3ClientConfig } from '@aws-sdk/client-s3';
 import type { Adapter, ClientUploadsConfig } from '@payloadcms/plugin-cloud-storage/types';
 import type { SignedDownloadsConfig } from './getFile.js';
 interface CreateS3AdapterArgs {
     acl?: 'private' | 'public-read';
     bucket: string;
     clientUploads?: ClientUploadsConfig;
-    config: AWS.S3ClientConfig;
-    getStorageClient: () => AWS.S3;
+    config: S3ClientConfig;
+    getStorageClient: () => S3;
     signedDownloads: SignedDownloadsConfig;
     useCompositePrefixes?: boolean;
 }

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAC9C,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAE/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAOzD,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,MAAM,EAAE,GAAG,CAAC,cAAc,CAAA;IAC1B,gBAAgB,EAAE,MAAM,GAAG,CAAC,EAAE,CAAA;IAC9B,eAAe,EAAE,qBAAqB,CAAA;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,eAAe,CAAC,EAC9B,GAAG,EACH,MAAM,EACN,aAAa,EACb,MAAM,EACN,gBAAgB,EAChB,eAAe,EACf,oBAA4B,GAC7B,EAAE,mBAAmB,GAAG,OAAO,CA4D/B"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAC5D,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAE/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAIzD,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,MAAM,EAAE,cAAc,CAAA;IACtB,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,eAAe,EAAE,qBAAqB,CAAA;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,eAAe,CAAC,EAC9B,GAAG,EACH,MAAM,EACN,aAAa,EACb,MAAM,EACN,gBAAgB,EAChB,eAAe,EACf,oBAA4B,GAC7B,EAAE,mBAAmB,GAAG,OAAO,CAmE/B"}

package/dist/adapter.js

@@ -1,7 +1,4 @@
-import { deleteFile } from './deleteFile.js';
 import { generateURL } from './generateURL.js';
-import { getFile } from './getFile.js';
-import { uploadFile } from './uploadFile.js';
 export function createS3Adapter({ acl, bucket, clientUploads, config, getStorageClient, signedDownloads, useCompositePrefixes = false }) {
     return ({ collection, prefix = '' })=>({
             name: 's3',
@@ -14,15 +11,21 @@ export function createS3Adapter({ acl, bucket, clientUploads, config, getStorage
                     prefix: urlPrefix,
                     useCompositePrefixes
                 }),
-            handleDelete: ({ doc: { prefix: docPrefix = '' }, filename })=>deleteFile({
+            // Helpers below dynamic-import their @aws-sdk dependencies so the SDK only
+            // loads on the first request that actually needs it.
+            handleDelete: async ({ doc: { prefix: docPrefix = '' }, filename })=>{
+                const { deleteFile } = await import('./deleteFile.js');
+                return deleteFile({
                     bucket,
                     client: getStorageClient(),
                     collectionPrefix: prefix,
                     docPrefix,
                     filename,
                     useCompositePrefixes
-                }),
+                });
+            },
             handleUpload: async ({ data, file })=>{
+                const { uploadFile } = await import('./uploadFile.js');
                 await uploadFile({
                     acl,
                     bucket,
@@ -37,7 +40,9 @@ export function createS3Adapter({ acl, bucket, clientUploads, config, getStorage
                 });
                 return data;
             },
-            staticHandler: (req, { headers, params: { clientUploadContext, filename, prefix: prefixQueryParam } })=>getFile({
+            staticHandler: async (req, { headers, params: { clientUploadContext, filename, prefix: prefixQueryParam } })=>{
+                const { getFile } = await import('./getFile.js');
+                return getFile({
                     bucket,
                     client: getStorageClient(),
                     clientUploadContext,
@@ -49,7 +54,8 @@ export function createS3Adapter({ acl, bucket, clientUploads, config, getStorage
                     req,
                     signedDownloads,
                     useCompositePrefixes
-                })
+                });
+            }
         });
 }
 

package/dist/adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\nimport type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport type { SignedDownloadsConfig } from './getFile.js'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateS3AdapterArgs {\n  acl?: 'private' | 'public-read'\n  bucket: string\n  clientUploads?: ClientUploadsConfig\n  config: AWS.S3ClientConfig\n  getStorageClient: () => AWS.S3\n  signedDownloads: SignedDownloadsConfig\n  useCompositePrefixes?: boolean\n}\n\nexport function createS3Adapter({\n  acl,\n  bucket,\n  clientUploads,\n  config,\n  getStorageClient,\n  signedDownloads,\n  useCompositePrefixes = false,\n}: CreateS3AdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 's3',\n    clientUploads,\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        bucket,\n        collectionPrefix: prefix,\n        endpoint: config.endpoint,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    handleDelete: ({ doc: { prefix: docPrefix = '' }, filename }) =>\n      deleteFile({\n        bucket,\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix,\n        filename,\n        useCompositePrefixes,\n      }),\n\n    handleUpload: async ({ data, file }) => {\n      await uploadFile({\n        acl,\n        bucket,\n        buffer: file.buffer,\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix: data.prefix,\n        filename: file.filename,\n        mimeType: file.mimeType,\n        tempFilePath: file.tempFilePath,\n        useCompositePrefixes,\n      })\n\n      return data\n    },\n\n    staticHandler: (\n      req,\n      { headers, params: { clientUploadContext, filename, prefix: prefixQueryParam } },\n    ) =>\n      getFile({\n        bucket,\n        client: getStorageClient(),\n        clientUploadContext,\n        collection,\n        collectionPrefix: prefix,\n        filename,\n        incomingHeaders: headers,\n        prefixQueryParam,\n        req,\n        signedDownloads,\n        useCompositePrefixes,\n      }),\n  })\n}\n"],"names":["deleteFile","generateURL","getFile","uploadFile","createS3Adapter","acl","bucket","clientUploads","config","getStorageClient","signedDownloads","useCompositePrefixes","collection","prefix","name","filename","urlPrefix","collectionPrefix","endpoint","handleDelete","doc","docPrefix","client","handleUpload","data","file","buffer","mimeType","tempFilePath","staticHandler","req","headers","params","clientUploadContext","prefixQueryParam","incomingHeaders"],"mappings":"AASA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,gBAAgB,EAC9BC,GAAG,EACHC,MAAM,EACNC,aAAa,EACbC,MAAM,EACNC,gBAAgB,EAChBC,eAAe,EACfC,uBAAuB,KAAK,EACR;IACpB,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNP;YAEAN,aAAa,CAAC,EAAEc,QAAQ,EAAEF,QAAQG,YAAY,EAAE,EAAE,GAChDf,YAAY;oBACVK;oBACAW,kBAAkBJ;oBAClBK,UAAUV,OAAOU,QAAQ;oBACzBH;oBACAF,QAAQG;oBACRL;gBACF;YAEFQ,cAAc,CAAC,EAAEC,KAAK,EAAEP,QAAQQ,YAAY,EAAE,EAAE,EAAEN,QAAQ,EAAE,GAC1Df,WAAW;oBACTM;oBACAgB,QAAQb;oBACRQ,kBAAkBJ;oBAClBQ;oBACAN;oBACAJ;gBACF;YAEFY,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;gBACjC,MAAMtB,WAAW;oBACfE;oBACAC;oBACAoB,QAAQD,KAAKC,MAAM;oBACnBJ,QAAQb;oBACRQ,kBAAkBJ;oBAClBQ,WAAWG,KAAKX,MAAM;oBACtBE,UAAUU,KAAKV,QAAQ;oBACvBY,UAAUF,KAAKE,QAAQ;oBACvBC,cAAcH,KAAKG,YAAY;oBAC/BjB;gBACF;gBAEA,OAAOa;YACT;YAEAK,eAAe,CACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,mBAAmB,EAAElB,QAAQ,EAAEF,QAAQqB,gBAAgB,EAAE,EAAE,GAEhFhC,QAAQ;oBACNI;oBACAgB,QAAQb;oBACRwB;oBACArB;oBACAK,kBAAkBJ;oBAClBE;oBACAoB,iBAAiBJ;oBACjBG;oBACAJ;oBACApB;oBACAC;gBACF;QACJ,CAAA;AACF"}
+{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type { S3, S3ClientConfig } from '@aws-sdk/client-s3'\nimport type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport type { SignedDownloadsConfig } from './getFile.js'\n\nimport { generateURL } from './generateURL.js'\n\ninterface CreateS3AdapterArgs {\n  acl?: 'private' | 'public-read'\n  bucket: string\n  clientUploads?: ClientUploadsConfig\n  config: S3ClientConfig\n  getStorageClient: () => S3\n  signedDownloads: SignedDownloadsConfig\n  useCompositePrefixes?: boolean\n}\n\nexport function createS3Adapter({\n  acl,\n  bucket,\n  clientUploads,\n  config,\n  getStorageClient,\n  signedDownloads,\n  useCompositePrefixes = false,\n}: CreateS3AdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 's3',\n    clientUploads,\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        bucket,\n        collectionPrefix: prefix,\n        endpoint: config.endpoint,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    // Helpers below dynamic-import their @aws-sdk dependencies so the SDK only\n    // loads on the first request that actually needs it.\n    handleDelete: async ({ doc: { prefix: docPrefix = '' }, filename }) => {\n      const { deleteFile } = await import('./deleteFile.js')\n      return deleteFile({\n        bucket,\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix,\n        filename,\n        useCompositePrefixes,\n      })\n    },\n\n    handleUpload: async ({ data, file }) => {\n      const { uploadFile } = await import('./uploadFile.js')\n      await uploadFile({\n        acl,\n        bucket,\n        buffer: file.buffer,\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix: data.prefix,\n        filename: file.filename,\n        mimeType: file.mimeType,\n        tempFilePath: file.tempFilePath,\n        useCompositePrefixes,\n      })\n\n      return data\n    },\n\n    staticHandler: async (\n      req,\n      { headers, params: { clientUploadContext, filename, prefix: prefixQueryParam } },\n    ) => {\n      const { getFile } = await import('./getFile.js')\n      return getFile({\n        bucket,\n        client: getStorageClient(),\n        clientUploadContext,\n        collection,\n        collectionPrefix: prefix,\n        filename,\n        incomingHeaders: headers,\n        prefixQueryParam,\n        req,\n        signedDownloads,\n        useCompositePrefixes,\n      })\n    },\n  })\n}\n"],"names":["generateURL","createS3Adapter","acl","bucket","clientUploads","config","getStorageClient","signedDownloads","useCompositePrefixes","collection","prefix","name","filename","urlPrefix","collectionPrefix","endpoint","handleDelete","doc","docPrefix","deleteFile","client","handleUpload","data","file","uploadFile","buffer","mimeType","tempFilePath","staticHandler","req","headers","params","clientUploadContext","prefixQueryParam","getFile","incomingHeaders"],"mappings":"AASA,SAASA,WAAW,QAAQ,mBAAkB;AAY9C,OAAO,SAASC,gBAAgB,EAC9BC,GAAG,EACHC,MAAM,EACNC,aAAa,EACbC,MAAM,EACNC,gBAAgB,EAChBC,eAAe,EACfC,uBAAuB,KAAK,EACR;IACpB,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNP;YAEAJ,aAAa,CAAC,EAAEY,QAAQ,EAAEF,QAAQG,YAAY,EAAE,EAAE,GAChDb,YAAY;oBACVG;oBACAW,kBAAkBJ;oBAClBK,UAAUV,OAAOU,QAAQ;oBACzBH;oBACAF,QAAQG;oBACRL;gBACF;YAEF,2EAA2E;YAC3E,qDAAqD;YACrDQ,cAAc,OAAO,EAAEC,KAAK,EAAEP,QAAQQ,YAAY,EAAE,EAAE,EAAEN,QAAQ,EAAE;gBAChE,MAAM,EAAEO,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;gBACpC,OAAOA,WAAW;oBAChBhB;oBACAiB,QAAQd;oBACRQ,kBAAkBJ;oBAClBQ;oBACAN;oBACAJ;gBACF;YACF;YAEAa,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;gBACjC,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;gBACpC,MAAMA,WAAW;oBACftB;oBACAC;oBACAsB,QAAQF,KAAKE,MAAM;oBACnBL,QAAQd;oBACRQ,kBAAkBJ;oBAClBQ,WAAWI,KAAKZ,MAAM;oBACtBE,UAAUW,KAAKX,QAAQ;oBACvBc,UAAUH,KAAKG,QAAQ;oBACvBC,cAAcJ,KAAKI,YAAY;oBAC/BnB;gBACF;gBAEA,OAAOc;YACT;YAEAM,eAAe,OACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEpB,QAAQ,EAAEF,QAAQuB,gBAAgB,EAAE,EAAE;gBAEhF,MAAM,EAAEC,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC;gBACjC,OAAOA,QAAQ;oBACb/B;oBACAiB,QAAQd;oBACR0B;oBACAvB;oBACAK,kBAAkBJ;oBAClBE;oBACAuB,iBAAiBL;oBACjBG;oBACAJ;oBACAtB;oBACAC;gBACF;YACF;QACF,CAAA;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"S3ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/S3ClientUploadHandler.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB;;;;;;;aA+B1B,OAAI,aA8BV,CAAA"}
+{"version":3,"file":"S3ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/S3ClientUploadHandler.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB;;;;;;;iCA6DhC,CAAA"}

package/dist/generateSignedURL.d.ts

@@ -1,13 +1,13 @@
+import type { S3 } from '@aws-sdk/client-s3';
 import type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types';
 import type { PayloadHandler } from 'payload';
-import * as AWS from '@aws-sdk/client-s3';
 import type { S3StorageOptions } from './index.js';
 interface Args {
     access?: ClientUploadsAccess;
     acl?: 'private' | 'public-read';
     bucket: string;
     collections: S3StorageOptions['collections'];
-    getStorageClient: () => AWS.S3;
+    getStorageClient: () => S3;
     useCompositePrefixes?: boolean;
 }
 export declare const getGenerateSignedURLHandler: ({ access, acl, bucket, collections, getStorageClient, useCompositePrefixes, }: Args) => PayloadHandler;

package/dist/generateSignedURL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateSignedURL.d.ts","sourceRoot":"","sources":["../src/generateSignedURL.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAKzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAMlD,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAA;IAC5C,gBAAgB,EAAE,MAAM,GAAG,CAAC,EAAE,CAAA;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAID,eAAO,MAAM,2BAA2B,kFAOrC,IAAI,KAAG,cA4ET,CAAA"}
+{"version":3,"file":"generateSignedURL.d.ts","sourceRoot":"","sources":["../src/generateSignedURL.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAO7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAMlD,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAA;IAC5C,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAID,eAAO,MAAM,2BAA2B,GAAI,+EAOzC,IAAI,KAAG,cA4ET,CAAA"}

package/dist/generateSignedURL.js

@@ -1,4 +1,4 @@
-import * as AWS from '@aws-sdk/client-s3';
+import { PutObjectCommand } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { APIError, Forbidden } from 'payload';
@@ -43,7 +43,7 @@ export const getGenerateSignedURLHandler = ({ access = defaultAccess, acl, bucke
             // Still force S3 to validate
             signableHeaders.add('content-length');
         }
-        const url = await getSignedUrl(getStorageClient(), new AWS.PutObjectCommand({
+        const url = await getSignedUrl(getStorageClient(), new PutObjectCommand({
             ACL: acl,
             Bucket: bucket,
             ContentLength: filesizeLimit ? Math.min(filesize, filesizeLimit) : undefined,

package/dist/generateSignedURL.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateSignedURL.ts"],"sourcesContent":["import type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport * as AWS from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { APIError, Forbidden } from 'payload'\n\nimport type { S3StorageOptions } from './index.js'\n\nconst bytesToMB = (bytes: number) => {\n  return bytes / 1024 / 1024\n}\n\ninterface Args {\n  access?: ClientUploadsAccess\n  acl?: 'private' | 'public-read'\n  bucket: string\n  collections: S3StorageOptions['collections']\n  getStorageClient: () => AWS.S3\n  useCompositePrefixes?: boolean\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getGenerateSignedURLHandler = ({\n  access = defaultAccess,\n  acl,\n  bucket,\n  collections,\n  getStorageClient,\n  useCompositePrefixes = false,\n}: Args): PayloadHandler => {\n  return async (req) => {\n    if (!req.json) {\n      throw new APIError('Content-Type expected to be application/json', 400)\n    }\n\n    let filesizeLimit = req.payload.config.upload.limits?.fileSize\n\n    if (filesizeLimit === Infinity) {\n      filesizeLimit = undefined\n    }\n\n    const { collectionSlug, docPrefix, filename, filesize, mimeType } = (await req.json()) as {\n      collectionSlug: string\n      docPrefix?: string\n      filename: string\n      filesize: number\n      mimeType: string\n    }\n\n    const collectionS3Config = collections[collectionSlug]\n    if (!collectionS3Config) {\n      throw new APIError(`Collection ${collectionSlug} was not found in S3 options`)\n    }\n\n    const collectionPrefix =\n      (typeof collectionS3Config === 'object' && collectionS3Config.prefix) || ''\n\n    if (!(await access({ collectionSlug, req }))) {\n      throw new Forbidden()\n    }\n\n    const { fileKey, sanitizedDocPrefix, sanitizedFilename } = await resolveSignedURLKey({\n      collectionPrefix,\n      collectionSlug,\n      docPrefix,\n      filename,\n      req,\n      useCompositePrefixes,\n    })\n\n    const signableHeaders = new Set<string>()\n\n    if (filesizeLimit) {\n      if (filesize > filesizeLimit) {\n        throw new APIError(\n          `Exceeded file size limit. Limit: ${bytesToMB(filesizeLimit).toFixed(2)}MB, got: ${bytesToMB(filesize).toFixed(2)}MB`,\n          400,\n        )\n      }\n\n      // Still force S3 to validate\n      signableHeaders.add('content-length')\n    }\n\n    const url = await getSignedUrl(\n      getStorageClient(),\n      new AWS.PutObjectCommand({\n        ACL: acl,\n        Bucket: bucket,\n        ContentLength: filesizeLimit ? Math.min(filesize, filesizeLimit) : undefined,\n        ContentType: mimeType,\n        Key: fileKey,\n      }),\n      {\n        expiresIn: 600,\n        signableHeaders,\n      },\n    )\n\n    return Response.json({\n      docPrefix: sanitizedDocPrefix,\n      filename: sanitizedFilename,\n      url,\n    })\n  }\n}\n"],"names":["AWS","getSignedUrl","resolveSignedURLKey","APIError","Forbidden","bytesToMB","bytes","defaultAccess","req","user","getGenerateSignedURLHandler","access","acl","bucket","collections","getStorageClient","useCompositePrefixes","json","filesizeLimit","payload","config","upload","limits","fileSize","Infinity","undefined","collectionSlug","docPrefix","filename","filesize","mimeType","collectionS3Config","collectionPrefix","prefix","fileKey","sanitizedDocPrefix","sanitizedFilename","signableHeaders","Set","toFixed","add","url","PutObjectCommand","ACL","Bucket","ContentLength","Math","min","ContentType","Key","expiresIn","Response"],"mappings":"AAGA,YAAYA,SAAS,qBAAoB;AACzC,SAASC,YAAY,QAAQ,gCAA+B;AAC5D,SAASC,mBAAmB,QAAQ,6CAA4C;AAChF,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAI7C,MAAMC,YAAY,CAACC;IACjB,OAAOA,QAAQ,OAAO;AACxB;AAWA,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAE7D,OAAO,MAAMC,8BAA8B,CAAC,EAC1CC,SAASJ,aAAa,EACtBK,GAAG,EACHC,MAAM,EACNC,WAAW,EACXC,gBAAgB,EAChBC,uBAAuB,KAAK,EACvB;IACL,OAAO,OAAOR;QACZ,IAAI,CAACA,IAAIS,IAAI,EAAE;YACb,MAAM,IAAId,SAAS,gDAAgD;QACrE;QAEA,IAAIe,gBAAgBV,IAAIW,OAAO,CAACC,MAAM,CAACC,MAAM,CAACC,MAAM,EAAEC;QAEtD,IAAIL,kBAAkBM,UAAU;YAC9BN,gBAAgBO;QAClB;QAEA,MAAM,EAAEC,cAAc,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAI,MAAMtB,IAAIS,IAAI;QAQnF,MAAMc,qBAAqBjB,WAAW,CAACY,eAAe;QACtD,IAAI,CAACK,oBAAoB;YACvB,MAAM,IAAI5B,SAAS,CAAC,WAAW,EAAEuB,eAAe,4BAA4B,CAAC;QAC/E;QAEA,MAAMM,mBACJ,AAAC,OAAOD,uBAAuB,YAAYA,mBAAmBE,MAAM,IAAK;QAE3E,IAAI,CAAE,MAAMtB,OAAO;YAAEe;YAAgBlB;QAAI,IAAK;YAC5C,MAAM,IAAIJ;QACZ;QAEA,MAAM,EAAE8B,OAAO,EAAEC,kBAAkB,EAAEC,iBAAiB,EAAE,GAAG,MAAMlC,oBAAoB;YACnF8B;YACAN;YACAC;YACAC;YACApB;YACAQ;QACF;QAEA,MAAMqB,kBAAkB,IAAIC;QAE5B,IAAIpB,eAAe;YACjB,IAAIW,WAAWX,eAAe;gBAC5B,MAAM,IAAIf,SACR,CAAC,iCAAiC,EAAEE,UAAUa,eAAeqB,OAAO,CAAC,GAAG,SAAS,EAAElC,UAAUwB,UAAUU,OAAO,CAAC,GAAG,EAAE,CAAC,EACrH;YAEJ;YAEA,6BAA6B;YAC7BF,gBAAgBG,GAAG,CAAC;QACtB;QAEA,MAAMC,MAAM,MAAMxC,aAChBc,oBACA,IAAIf,IAAI0C,gBAAgB,CAAC;YACvBC,KAAK/B;YACLgC,QAAQ/B;YACRgC,eAAe3B,gBAAgB4B,KAAKC,GAAG,CAAClB,UAAUX,iBAAiBO;YACnEuB,aAAalB;YACbmB,KAAKf;QACP,IACA;YACEgB,WAAW;YACXb;QACF;QAGF,OAAOc,SAASlC,IAAI,CAAC;YACnBU,WAAWQ;YACXP,UAAUQ;YACVK;QACF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/generateSignedURL.ts"],"sourcesContent":["import type { S3 } from '@aws-sdk/client-s3'\nimport type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport { PutObjectCommand } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { APIError, Forbidden } from 'payload'\n\nimport type { S3StorageOptions } from './index.js'\n\nconst bytesToMB = (bytes: number) => {\n  return bytes / 1024 / 1024\n}\n\ninterface Args {\n  access?: ClientUploadsAccess\n  acl?: 'private' | 'public-read'\n  bucket: string\n  collections: S3StorageOptions['collections']\n  getStorageClient: () => S3\n  useCompositePrefixes?: boolean\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getGenerateSignedURLHandler = ({\n  access = defaultAccess,\n  acl,\n  bucket,\n  collections,\n  getStorageClient,\n  useCompositePrefixes = false,\n}: Args): PayloadHandler => {\n  return async (req) => {\n    if (!req.json) {\n      throw new APIError('Content-Type expected to be application/json', 400)\n    }\n\n    let filesizeLimit = req.payload.config.upload.limits?.fileSize\n\n    if (filesizeLimit === Infinity) {\n      filesizeLimit = undefined\n    }\n\n    const { collectionSlug, docPrefix, filename, filesize, mimeType } = (await req.json()) as {\n      collectionSlug: string\n      docPrefix?: string\n      filename: string\n      filesize: number\n      mimeType: string\n    }\n\n    const collectionS3Config = collections[collectionSlug]\n    if (!collectionS3Config) {\n      throw new APIError(`Collection ${collectionSlug} was not found in S3 options`)\n    }\n\n    const collectionPrefix =\n      (typeof collectionS3Config === 'object' && collectionS3Config.prefix) || ''\n\n    if (!(await access({ collectionSlug, req }))) {\n      throw new Forbidden()\n    }\n\n    const { fileKey, sanitizedDocPrefix, sanitizedFilename } = await resolveSignedURLKey({\n      collectionPrefix,\n      collectionSlug,\n      docPrefix,\n      filename,\n      req,\n      useCompositePrefixes,\n    })\n\n    const signableHeaders = new Set<string>()\n\n    if (filesizeLimit) {\n      if (filesize > filesizeLimit) {\n        throw new APIError(\n          `Exceeded file size limit. Limit: ${bytesToMB(filesizeLimit).toFixed(2)}MB, got: ${bytesToMB(filesize).toFixed(2)}MB`,\n          400,\n        )\n      }\n\n      // Still force S3 to validate\n      signableHeaders.add('content-length')\n    }\n\n    const url = await getSignedUrl(\n      getStorageClient(),\n      new PutObjectCommand({\n        ACL: acl,\n        Bucket: bucket,\n        ContentLength: filesizeLimit ? Math.min(filesize, filesizeLimit) : undefined,\n        ContentType: mimeType,\n        Key: fileKey,\n      }),\n      {\n        expiresIn: 600,\n        signableHeaders,\n      },\n    )\n\n    return Response.json({\n      docPrefix: sanitizedDocPrefix,\n      filename: sanitizedFilename,\n      url,\n    })\n  }\n}\n"],"names":["PutObjectCommand","getSignedUrl","resolveSignedURLKey","APIError","Forbidden","bytesToMB","bytes","defaultAccess","req","user","getGenerateSignedURLHandler","access","acl","bucket","collections","getStorageClient","useCompositePrefixes","json","filesizeLimit","payload","config","upload","limits","fileSize","Infinity","undefined","collectionSlug","docPrefix","filename","filesize","mimeType","collectionS3Config","collectionPrefix","prefix","fileKey","sanitizedDocPrefix","sanitizedFilename","signableHeaders","Set","toFixed","add","url","ACL","Bucket","ContentLength","Math","min","ContentType","Key","expiresIn","Response"],"mappings":"AAIA,SAASA,gBAAgB,QAAQ,qBAAoB;AACrD,SAASC,YAAY,QAAQ,gCAA+B;AAC5D,SAASC,mBAAmB,QAAQ,6CAA4C;AAChF,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAI7C,MAAMC,YAAY,CAACC;IACjB,OAAOA,QAAQ,OAAO;AACxB;AAWA,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAE7D,OAAO,MAAMC,8BAA8B,CAAC,EAC1CC,SAASJ,aAAa,EACtBK,GAAG,EACHC,MAAM,EACNC,WAAW,EACXC,gBAAgB,EAChBC,uBAAuB,KAAK,EACvB;IACL,OAAO,OAAOR;QACZ,IAAI,CAACA,IAAIS,IAAI,EAAE;YACb,MAAM,IAAId,SAAS,gDAAgD;QACrE;QAEA,IAAIe,gBAAgBV,IAAIW,OAAO,CAACC,MAAM,CAACC,MAAM,CAACC,MAAM,EAAEC;QAEtD,IAAIL,kBAAkBM,UAAU;YAC9BN,gBAAgBO;QAClB;QAEA,MAAM,EAAEC,cAAc,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAI,MAAMtB,IAAIS,IAAI;QAQnF,MAAMc,qBAAqBjB,WAAW,CAACY,eAAe;QACtD,IAAI,CAACK,oBAAoB;YACvB,MAAM,IAAI5B,SAAS,CAAC,WAAW,EAAEuB,eAAe,4BAA4B,CAAC;QAC/E;QAEA,MAAMM,mBACJ,AAAC,OAAOD,uBAAuB,YAAYA,mBAAmBE,MAAM,IAAK;QAE3E,IAAI,CAAE,MAAMtB,OAAO;YAAEe;YAAgBlB;QAAI,IAAK;YAC5C,MAAM,IAAIJ;QACZ;QAEA,MAAM,EAAE8B,OAAO,EAAEC,kBAAkB,EAAEC,iBAAiB,EAAE,GAAG,MAAMlC,oBAAoB;YACnF8B;YACAN;YACAC;YACAC;YACApB;YACAQ;QACF;QAEA,MAAMqB,kBAAkB,IAAIC;QAE5B,IAAIpB,eAAe;YACjB,IAAIW,WAAWX,eAAe;gBAC5B,MAAM,IAAIf,SACR,CAAC,iCAAiC,EAAEE,UAAUa,eAAeqB,OAAO,CAAC,GAAG,SAAS,EAAElC,UAAUwB,UAAUU,OAAO,CAAC,GAAG,EAAE,CAAC,EACrH;YAEJ;YAEA,6BAA6B;YAC7BF,gBAAgBG,GAAG,CAAC;QACtB;QAEA,MAAMC,MAAM,MAAMxC,aAChBc,oBACA,IAAIf,iBAAiB;YACnB0C,KAAK9B;YACL+B,QAAQ9B;YACR+B,eAAe1B,gBAAgB2B,KAAKC,GAAG,CAACjB,UAAUX,iBAAiBO;YACnEsB,aAAajB;YACbkB,KAAKd;QACP,IACA;YACEe,WAAW;YACXZ;QACF;QAGF,OAAOa,SAASjC,IAAI,CAAC;YACnBU,WAAWQ;YACXP,UAAUQ;YACVK;QACF;IACF;AACF,EAAC"}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
+import type { S3ClientConfig } from '@aws-sdk/client-s3';
 import type { ClientUploadsConfig, CollectionOptions } from '@payloadcms/plugin-cloud-storage/types';
-import type { Plugin, UploadCollectionSlug } from 'payload';
-import * as AWS from '@aws-sdk/client-s3';
+import type { StorageAdapter, UploadCollectionSlug } from 'payload';
 import type { SignedDownloadsConfig } from './getFile.js';
 export type S3StorageOptions = {
     /**
@@ -45,7 +45,7 @@ export type S3StorageOptions = {
      *
      * [AWS.S3ClientConfig Docs](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-s3/interfaces/s3clientconfig.html)
      */
-    config: AWS.S3ClientConfig;
+    config: S3ClientConfig;
     /**
      * Whether or not to disable local storage
      *
@@ -77,7 +77,7 @@ export type S3StorageOptions = {
      */
     useCompositePrefixes?: boolean;
 };
-type S3StoragePlugin = (storageS3Args: S3StorageOptions) => Plugin;
-export declare const s3Storage: S3StoragePlugin;
+type S3StorageFactory = (storageS3Args: S3StorageOptions) => StorageAdapter;
+export declare const s3Storage: S3StorageFactory;
 export {};
 //# sourceMappingURL=index.d.ts.map

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;AAE/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAEnE,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAIzC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAE/B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IAEH,MAAM,EAAE,MAAM,CAAA;IAEd;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAClB,MAAM,CACJ,oBAAoB,EAClB,CAAC;QACC,eAAe,CAAC,EAAE,qBAAqB,CAAA;KACxC,GAAG,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC,GACvC,IAAI,CACP,CACF,CAAA;IACD;;;;OAIG;IACH,MAAM,EAAE,GAAG,CAAC,cAAc,CAAA;IAE1B;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAE7B;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,qBAAqB,CAAA;IACvC;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED,KAAK,eAAe,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,MAAM,CAAA;AAelE,eAAO,MAAM,SAAS,EAAE,eAmIrB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAE/C,OAAO,KAAK,EAAU,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAM3E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAE/B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IAEH,MAAM,EAAE,MAAM,CAAA;IAEd;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAClB,MAAM,CACJ,oBAAoB,EAClB,CAAC;QACC,eAAe,CAAC,EAAE,qBAAqB,CAAA;KACxC,GAAG,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC,GACvC,IAAI,CACP,CACF,CAAA;IACD;;;;OAIG;IACH,MAAM,EAAE,cAAc,CAAA;IAEtB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAE7B;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,qBAAqB,CAAA;IACvC;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED,KAAK,gBAAgB,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,cAAc,CAAA;AAe3E,eAAO,MAAM,SAAS,EAAE,gBAuItB,CAAA"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import * as AWS from '@aws-sdk/client-s3';
+import { S3 } from '@aws-sdk/client-s3';
 import { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage';
 import { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities';
 import { createS3Adapter } from './adapter.js';
@@ -14,100 +14,104 @@ const defaultRequestHandlerOpts = {
         maxSockets: 100
     }
 };
-export const s3Storage = (s3StorageOptions)=>(incomingConfig)=>{
-        const cacheKey = s3StorageOptions.clientCacheKey || `s3:${s3StorageOptions.bucket}`;
-        const getStorageClient = ()=>{
-            if (s3Clients.has(cacheKey)) {
+export const s3Storage = (s3StorageOptions)=>({
+        name: 's3',
+        collections: Object.keys(s3StorageOptions.collections),
+        init: (incomingConfig)=>{
+            const cacheKey = s3StorageOptions.clientCacheKey || `s3:${s3StorageOptions.bucket}`;
+            const isPluginDisabled = s3StorageOptions.enabled === false;
+            const getStorageClient = ()=>{
+                if (s3Clients.has(cacheKey)) {
+                    return s3Clients.get(cacheKey);
+                }
+                s3Clients.set(cacheKey, new S3({
+                    requestHandler: defaultRequestHandlerOpts,
+                    ...s3StorageOptions.config ?? {}
+                }));
                 return s3Clients.get(cacheKey);
-            }
-            s3Clients.set(cacheKey, new AWS.S3({
-                requestHandler: defaultRequestHandlerOpts,
-                ...s3StorageOptions.config ?? {}
-            }));
-            return s3Clients.get(cacheKey);
-        };
-        const isPluginDisabled = s3StorageOptions.enabled === false;
-        initClientUploads({
-            clientHandler: '@payloadcms/storage-s3/client#S3ClientUploadHandler',
-            collections: s3StorageOptions.collections,
-            config: incomingConfig,
-            enabled: !isPluginDisabled && Boolean(s3StorageOptions.clientUploads),
-            serverHandler: getGenerateSignedURLHandler({
-                access: typeof s3StorageOptions.clientUploads === 'object' ? s3StorageOptions.clientUploads.access : undefined,
-                acl: s3StorageOptions.acl,
-                bucket: s3StorageOptions.bucket,
+            };
+            initClientUploads({
+                clientHandler: '@payloadcms/storage-s3/client#S3ClientUploadHandler',
                 collections: s3StorageOptions.collections,
-                getStorageClient,
-                useCompositePrefixes: s3StorageOptions.useCompositePrefixes
-            }),
-            serverHandlerPath: '/storage-s3-generate-signed-url'
-        });
-        if (isPluginDisabled) {
-            // If alwaysInsertFields is true, still call cloudStoragePlugin to insert fields
-            if (s3StorageOptions.alwaysInsertFields) {
-                // Build collections with adapter: null since plugin is disabled
-                const collectionsWithoutAdapter = Object.entries(s3StorageOptions.collections).reduce((acc, [slug, collOptions])=>({
-                        ...acc,
-                        [slug]: {
-                            ...collOptions === true ? {} : collOptions,
-                            adapter: null
-                        }
-                    }), {});
-                return cloudStoragePlugin({
-                    alwaysInsertFields: true,
-                    collections: collectionsWithoutAdapter,
-                    enabled: false,
+                config: incomingConfig,
+                enabled: !isPluginDisabled && Boolean(s3StorageOptions.clientUploads),
+                serverHandler: getGenerateSignedURLHandler({
+                    access: typeof s3StorageOptions.clientUploads === 'object' ? s3StorageOptions.clientUploads.access : undefined,
+                    acl: s3StorageOptions.acl,
+                    bucket: s3StorageOptions.bucket,
+                    collections: s3StorageOptions.collections,
+                    getStorageClient,
                     useCompositePrefixes: s3StorageOptions.useCompositePrefixes
-                })(incomingConfig);
-            }
-            return incomingConfig;
-        }
-        // Determine signedDownloads for this collection
-        const resolveSignedDownloads = (slug)=>{
-            const collectionStorageConfig = s3StorageOptions.collections[slug];
-            let signedDownloads = typeof collectionStorageConfig === 'object' ? collectionStorageConfig.signedDownloads ?? false : null;
-            if (signedDownloads === null) {
-                signedDownloads = s3StorageOptions.signedDownloads ?? false;
-            }
-            return signedDownloads;
-        };
-        // Add adapter to each collection option object
-        const collectionsWithAdapter = Object.entries(s3StorageOptions.collections).reduce((acc, [slug, collOptions])=>({
-                ...acc,
-                [slug]: {
-                    ...collOptions === true ? {} : collOptions,
-                    adapter: createS3Adapter({
-                        acl: s3StorageOptions.acl,
-                        bucket: s3StorageOptions.bucket,
-                        clientUploads: s3StorageOptions.clientUploads,
-                        config: s3StorageOptions.config,
-                        getStorageClient,
-                        signedDownloads: resolveSignedDownloads(slug),
+                }),
+                serverHandlerPath: '/storage-s3-generate-signed-url'
+            });
+            if (isPluginDisabled) {
+                // If alwaysInsertFields is true, still call cloudStoragePlugin to insert fields
+                if (s3StorageOptions.alwaysInsertFields) {
+                    // Build collections with adapter: null since plugin is disabled
+                    const collectionsWithoutAdapter = Object.entries(s3StorageOptions.collections).reduce((acc, [slug, collOptions])=>({
+                            ...acc,
+                            [slug]: {
+                                ...collOptions === true ? {} : collOptions,
+                                adapter: null
+                            }
+                        }), {});
+                    return cloudStoragePlugin({
+                        alwaysInsertFields: true,
+                        collections: collectionsWithoutAdapter,
+                        enabled: false,
                         useCompositePrefixes: s3StorageOptions.useCompositePrefixes
-                    })
+                    })(incomingConfig);
                 }
-            }), {});
-        // Set disableLocalStorage: true for collections specified in the plugin options
-        const config = {
-            ...incomingConfig,
-            collections: (incomingConfig.collections || []).map((collection)=>{
-                if (!collectionsWithAdapter[collection.slug]) {
-                    return collection;
+                return incomingConfig;
+            }
+            // Determine signedDownloads for this collection
+            const resolveSignedDownloads = (slug)=>{
+                const collectionStorageConfig = s3StorageOptions.collections[slug];
+                let signedDownloads = typeof collectionStorageConfig === 'object' ? collectionStorageConfig.signedDownloads ?? false : null;
+                if (signedDownloads === null) {
+                    signedDownloads = s3StorageOptions.signedDownloads ?? false;
                 }
-                return {
-                    ...collection,
-                    upload: {
-                        ...typeof collection.upload === 'object' ? collection.upload : {},
-                        disableLocalStorage: true
+                return signedDownloads;
+            };
+            // Add adapter to each collection option object
+            const collectionsWithAdapter = Object.entries(s3StorageOptions.collections).reduce((acc, [slug, collOptions])=>({
+                    ...acc,
+                    [slug]: {
+                        ...collOptions === true ? {} : collOptions,
+                        adapter: createS3Adapter({
+                            acl: s3StorageOptions.acl,
+                            bucket: s3StorageOptions.bucket,
+                            clientUploads: s3StorageOptions.clientUploads,
+                            config: s3StorageOptions.config,
+                            getStorageClient,
+                            signedDownloads: resolveSignedDownloads(slug),
+                            useCompositePrefixes: s3StorageOptions.useCompositePrefixes
+                        })
+                    }
+                }), {});
+            // Set disableLocalStorage: true for collections specified in the plugin options
+            const config = {
+                ...incomingConfig,
+                collections: (incomingConfig.collections || []).map((collection)=>{
+                    if (!collectionsWithAdapter[collection.slug]) {
+                        return collection;
                     }
-                };
-            })
-        };
-        return cloudStoragePlugin({
-            alwaysInsertFields: s3StorageOptions.alwaysInsertFields,
-            collections: collectionsWithAdapter,
-            useCompositePrefixes: s3StorageOptions.useCompositePrefixes
-        })(config);
-    };
+                    return {
+                        ...collection,
+                        upload: {
+                            ...typeof collection.upload === 'object' ? collection.upload : {},
+                            disableLocalStorage: true
+                        }
+                    };
+                })
+            };
+            return cloudStoragePlugin({
+                alwaysInsertFields: s3StorageOptions.alwaysInsertFields,
+                collections: collectionsWithAdapter,
+                useCompositePrefixes: s3StorageOptions.useCompositePrefixes
+            })(config);
+        }
+    });
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { NodeHttpHandlerOptions } from '@smithy/node-http-handler'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport * as AWS from '@aws-sdk/client-s3'\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { SignedDownloadsConfig } from './getFile.js'\n\nimport { createS3Adapter } from './adapter.js'\nimport { getGenerateSignedURLHandler } from './generateSignedURL.js'\n\nexport type S3StorageOptions = {\n  /**\n   * Access control list for uploaded files.\n   */\n  acl?: 'private' | 'public-read'\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   * Bucket name to upload files to.\n   *\n   * Must follow [AWS S3 bucket naming conventions](https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html).\n   */\n\n  bucket: string\n\n  /**\n   * Optional cache key to identify the S3 storage client instance.\n   * If not provided, a default key will be used.\n   *\n   * @default `s3:containerName`\n   */\n  clientCacheKey?: string\n\n  /**\n   * Do uploads directly on the client to bypass limits on Vercel. You must allow CORS PUT method for the bucket to your website.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the S3 adapter to.\n   */\n  collections: Partial<\n    Record<\n      UploadCollectionSlug,\n      | ({\n          signedDownloads?: SignedDownloadsConfig\n        } & Omit<CollectionOptions, 'adapter'>)\n      | true\n    >\n  >\n  /**\n   * AWS S3 client configuration. Highly dependent on your AWS setup.\n   *\n   * [AWS.S3ClientConfig Docs](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-s3/interfaces/s3clientconfig.html)\n   */\n  config: AWS.S3ClientConfig\n\n  /**\n   * Whether or not to disable local storage\n   *\n   * @default true\n   */\n  disableLocalStorage?: boolean\n\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * Use pre-signed URLs for files downloading. Can be overriden per-collection.\n   */\n  signedDownloads?: SignedDownloadsConfig\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 S3StoragePlugin = (storageS3Args: S3StorageOptions) => Plugin\n\nconst s3Clients = new Map<string, AWS.S3>()\n\nconst defaultRequestHandlerOpts: NodeHttpHandlerOptions = {\n  httpAgent: {\n    keepAlive: true,\n    maxSockets: 100,\n  },\n  httpsAgent: {\n    keepAlive: true,\n    maxSockets: 100,\n  },\n}\n\nexport const s3Storage: S3StoragePlugin =\n  (s3StorageOptions: S3StorageOptions) =>\n  (incomingConfig: Config): Config => {\n    const cacheKey = s3StorageOptions.clientCacheKey || `s3:${s3StorageOptions.bucket}`\n\n    const getStorageClient: () => AWS.S3 = () => {\n      if (s3Clients.has(cacheKey)) {\n        return s3Clients.get(cacheKey)!\n      }\n\n      s3Clients.set(\n        cacheKey,\n        new AWS.S3({\n          requestHandler: defaultRequestHandlerOpts,\n          ...(s3StorageOptions.config ?? {}),\n        }),\n      )\n\n      return s3Clients.get(cacheKey)!\n    }\n\n    const isPluginDisabled = s3StorageOptions.enabled === false\n\n    initClientUploads({\n      clientHandler: '@payloadcms/storage-s3/client#S3ClientUploadHandler',\n      collections: s3StorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(s3StorageOptions.clientUploads),\n      serverHandler: getGenerateSignedURLHandler({\n        access:\n          typeof s3StorageOptions.clientUploads === 'object'\n            ? s3StorageOptions.clientUploads.access\n            : undefined,\n        acl: s3StorageOptions.acl,\n        bucket: s3StorageOptions.bucket,\n        collections: s3StorageOptions.collections,\n        getStorageClient,\n        useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n      }),\n      serverHandlerPath: '/storage-s3-generate-signed-url',\n    })\n\n    if (isPluginDisabled) {\n      // If alwaysInsertFields is true, still call cloudStoragePlugin to insert fields\n      if (s3StorageOptions.alwaysInsertFields) {\n        // Build collections with adapter: null since plugin is disabled\n        const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n          s3StorageOptions.collections,\n        ).reduce(\n          (acc, [slug, collOptions]) => ({\n            ...acc,\n            [slug]: {\n              ...(collOptions === true ? {} : collOptions),\n              adapter: null,\n            },\n          }),\n          {} as Record<string, CollectionOptions>,\n        )\n\n        return cloudStoragePlugin({\n          alwaysInsertFields: true,\n          collections: collectionsWithoutAdapter,\n          enabled: false,\n          useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n        })(incomingConfig)\n      }\n\n      return incomingConfig\n    }\n\n    // Determine signedDownloads for this collection\n    const resolveSignedDownloads = (slug: string): SignedDownloadsConfig => {\n      const collectionStorageConfig = s3StorageOptions.collections[slug]\n\n      let signedDownloads: null | SignedDownloadsConfig =\n        typeof collectionStorageConfig === 'object'\n          ? (collectionStorageConfig.signedDownloads ?? false)\n          : null\n\n      if (signedDownloads === null) {\n        signedDownloads = s3StorageOptions.signedDownloads ?? false\n      }\n\n      return signedDownloads\n    }\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      s3StorageOptions.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\n          adapter: createS3Adapter({\n            acl: s3StorageOptions.acl,\n            bucket: s3StorageOptions.bucket,\n            clientUploads: s3StorageOptions.clientUploads,\n            config: s3StorageOptions.config,\n            getStorageClient,\n            signedDownloads: resolveSignedDownloads(slug),\n            useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n          }),\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: s3StorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n    })(config)\n  }\n"],"names":["AWS","cloudStoragePlugin","initClientUploads","createS3Adapter","getGenerateSignedURLHandler","s3Clients","Map","defaultRequestHandlerOpts","httpAgent","keepAlive","maxSockets","httpsAgent","s3Storage","s3StorageOptions","incomingConfig","cacheKey","clientCacheKey","bucket","getStorageClient","has","get","set","S3","requestHandler","config","isPluginDisabled","enabled","clientHandler","collections","Boolean","clientUploads","serverHandler","access","undefined","acl","useCompositePrefixes","serverHandlerPath","alwaysInsertFields","collectionsWithoutAdapter","Object","entries","reduce","acc","slug","collOptions","adapter","resolveSignedDownloads","collectionStorageConfig","signedDownloads","collectionsWithAdapter","map","collection","upload","disableLocalStorage"],"mappings":"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"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type { S3ClientConfig } from '@aws-sdk/client-s3'\nimport type {\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { NodeHttpHandlerOptions } from '@smithy/node-http-handler'\nimport type { Config, StorageAdapter, UploadCollectionSlug } from 'payload'\n\nimport { S3 } from '@aws-sdk/client-s3'\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { SignedDownloadsConfig } from './getFile.js'\n\nimport { createS3Adapter } from './adapter.js'\nimport { getGenerateSignedURLHandler } from './generateSignedURL.js'\n\nexport type S3StorageOptions = {\n  /**\n   * Access control list for uploaded files.\n   */\n  acl?: 'private' | 'public-read'\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   * Bucket name to upload files to.\n   *\n   * Must follow [AWS S3 bucket naming conventions](https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html).\n   */\n\n  bucket: string\n\n  /**\n   * Optional cache key to identify the S3 storage client instance.\n   * If not provided, a default key will be used.\n   *\n   * @default `s3:containerName`\n   */\n  clientCacheKey?: string\n\n  /**\n   * Do uploads directly on the client to bypass limits on Vercel. You must allow CORS PUT method for the bucket to your website.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the S3 adapter to.\n   */\n  collections: Partial<\n    Record<\n      UploadCollectionSlug,\n      | ({\n          signedDownloads?: SignedDownloadsConfig\n        } & Omit<CollectionOptions, 'adapter'>)\n      | true\n    >\n  >\n  /**\n   * AWS S3 client configuration. Highly dependent on your AWS setup.\n   *\n   * [AWS.S3ClientConfig Docs](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-s3/interfaces/s3clientconfig.html)\n   */\n  config: S3ClientConfig\n\n  /**\n   * Whether or not to disable local storage\n   *\n   * @default true\n   */\n  disableLocalStorage?: boolean\n\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * Use pre-signed URLs for files downloading. Can be overriden per-collection.\n   */\n  signedDownloads?: SignedDownloadsConfig\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 S3StorageFactory = (storageS3Args: S3StorageOptions) => StorageAdapter\n\nconst s3Clients = new Map<string, S3>()\n\nconst defaultRequestHandlerOpts: NodeHttpHandlerOptions = {\n  httpAgent: {\n    keepAlive: true,\n    maxSockets: 100,\n  },\n  httpsAgent: {\n    keepAlive: true,\n    maxSockets: 100,\n  },\n}\n\nexport const s3Storage: S3StorageFactory = (\n  s3StorageOptions: S3StorageOptions,\n): StorageAdapter => ({\n  name: 's3',\n  collections: Object.keys(s3StorageOptions.collections),\n  init: (incomingConfig: Config): Config => {\n    const cacheKey = s3StorageOptions.clientCacheKey || `s3:${s3StorageOptions.bucket}`\n\n    const isPluginDisabled = s3StorageOptions.enabled === false\n\n    const getStorageClient: () => S3 = () => {\n      if (s3Clients.has(cacheKey)) {\n        return s3Clients.get(cacheKey)!\n      }\n\n      s3Clients.set(\n        cacheKey,\n        new S3({\n          requestHandler: defaultRequestHandlerOpts,\n          ...(s3StorageOptions.config ?? {}),\n        }),\n      )\n\n      return s3Clients.get(cacheKey)!\n    }\n\n    initClientUploads({\n      clientHandler: '@payloadcms/storage-s3/client#S3ClientUploadHandler',\n      collections: s3StorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(s3StorageOptions.clientUploads),\n      serverHandler: getGenerateSignedURLHandler({\n        access:\n          typeof s3StorageOptions.clientUploads === 'object'\n            ? s3StorageOptions.clientUploads.access\n            : undefined,\n        acl: s3StorageOptions.acl,\n        bucket: s3StorageOptions.bucket,\n        collections: s3StorageOptions.collections,\n        getStorageClient,\n        useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n      }),\n      serverHandlerPath: '/storage-s3-generate-signed-url',\n    })\n\n    if (isPluginDisabled) {\n      // If alwaysInsertFields is true, still call cloudStoragePlugin to insert fields\n      if (s3StorageOptions.alwaysInsertFields) {\n        // Build collections with adapter: null since plugin is disabled\n        const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n          s3StorageOptions.collections,\n        ).reduce(\n          (acc, [slug, collOptions]) => ({\n            ...acc,\n            [slug]: {\n              ...(collOptions === true ? {} : collOptions),\n              adapter: null,\n            },\n          }),\n          {} as Record<string, CollectionOptions>,\n        )\n\n        return cloudStoragePlugin({\n          alwaysInsertFields: true,\n          collections: collectionsWithoutAdapter,\n          enabled: false,\n          useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n        })(incomingConfig)\n      }\n\n      return incomingConfig\n    }\n\n    // Determine signedDownloads for this collection\n    const resolveSignedDownloads = (slug: string): SignedDownloadsConfig => {\n      const collectionStorageConfig = s3StorageOptions.collections[slug]\n\n      let signedDownloads: null | SignedDownloadsConfig =\n        typeof collectionStorageConfig === 'object'\n          ? (collectionStorageConfig.signedDownloads ?? false)\n          : null\n\n      if (signedDownloads === null) {\n        signedDownloads = s3StorageOptions.signedDownloads ?? false\n      }\n\n      return signedDownloads\n    }\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      s3StorageOptions.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\n          adapter: createS3Adapter({\n            acl: s3StorageOptions.acl,\n            bucket: s3StorageOptions.bucket,\n            clientUploads: s3StorageOptions.clientUploads,\n            config: s3StorageOptions.config,\n            getStorageClient,\n            signedDownloads: resolveSignedDownloads(slug),\n            useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n          }),\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: s3StorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n    })(config)\n  },\n})\n"],"names":["S3","cloudStoragePlugin","initClientUploads","createS3Adapter","getGenerateSignedURLHandler","s3Clients","Map","defaultRequestHandlerOpts","httpAgent","keepAlive","maxSockets","httpsAgent","s3Storage","s3StorageOptions","name","collections","Object","keys","init","incomingConfig","cacheKey","clientCacheKey","bucket","isPluginDisabled","enabled","getStorageClient","has","get","set","requestHandler","config","clientHandler","Boolean","clientUploads","serverHandler","access","undefined","acl","useCompositePrefixes","serverHandlerPath","alwaysInsertFields","collectionsWithoutAdapter","entries","reduce","acc","slug","collOptions","adapter","resolveSignedDownloads","collectionStorageConfig","signedDownloads","collectionsWithAdapter","map","collection","upload","disableLocalStorage"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-s3",
-  "version": "3.85.0",
+  "version": "4.0.0-internal.1f9ae9a",
   "description": "Payload storage adapter for Amazon S3",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -40,17 +40,17 @@
     "@aws-sdk/client-s3": "^3.614.0",
     "@aws-sdk/lib-storage": "^3.614.0",
     "@aws-sdk/s3-request-presigner": "^3.614.0",
-    "@payloadcms/plugin-cloud-storage": "3.85.0"
+    "@payloadcms/plugin-cloud-storage": "4.0.0-internal.1f9ae9a"
   },
   "devDependencies": {
     "@smithy/node-http-handler": "4.0.3",
-    "payload": "3.85.0"
+    "payload": "4.0.0-internal.1f9ae9a"
   },
   "peerDependencies": {
-    "payload": "3.85.0"
+    "payload": "4.0.0-internal.1f9ae9a"
   },
   "engines": {
-    "node": "^18.20.2 || >=20.9.0"
+    "node": ">=24.15.0"
   },
   "scripts": {
     "build": "pnpm build:types && pnpm build:swc",