@payloadcms/plugin-cloud-storage 1.0.7 → 1.0.9

package/README.md

@@ -45,17 +45,18 @@ However, you can create your own adapter for any third-party service you would l
 
 This plugin is configurable to work across many different Payload collections. A `*` denotes that the property is required.
 
-| Option                  | Description |
-| ----------------------- | ----------- |
-| `collections` *         | Object with keys set to the slug of collections you want to enable the plugin for, and values set to collection-specific options. |
+| Option                  | Type                                    | Description |
+|-------------------------|-----------------------------------------| ----------- |
+| `collections` *         | Record<string, [CollectionOptions](https://github.com/payloadcms/plugin-cloud-storage/blob/c4a492a62abc2f21b4cd6a7c97778acd8e831212/src/types.ts#L48)> | Object with keys set to the slug of collections you want to enable the plugin for, and values set to collection-specific options. |
 
 **Collection-specific options:**
 
-| Option                       | Description                     |
-|------------------------------|---------------------------------|
-| `adapter` *            | Pass in the adapter that you'd like to use for this collection. |
-| `disableLocalStorage`  | Choose to disable local storage on this collection. Defaults to `true`. |
-| `disablePayloadAccessControl` | Set to `true` to disable Payload's access control. [More](#payload-access-control) |
+| Option                        | Type                                                                                                                                | Description                                                                        |
+|-------------------------------|-------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------|
+| `adapter` *                   | [Adapter](https://github.com/payloadcms/plugin-cloud-storage/blob/c4a492a62abc2f21b4cd6a7c97778acd8e831212/src/types.ts#L46)        | Pass in the adapter that you'd like to use for this collection. You can also set this field to `null` for local development if you'd like to bypass cloud storage in certain scenarios and use local storage.                |
+| `disableLocalStorage`         | `boolean`                                                                                                                           | Choose to disable local storage on this collection. Defaults to `true`.            |
+| `disablePayloadAccessControl` | `true`                                                                                                                              | Set to `true` to disable Payload's access control. [More](#payload-access-control)                                           |
+| `prefix`                      | `string`                                                                                                                            | Set to `media/images` to upload files inside `media/images` folder in the bucket.                                            |
 
 ### Azure Blob Storage Adapter
 

package/dist/adapters/azure/generateURL.js

@@ -1,11 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGenerateURL = void 0;
+var path_1 = __importDefault(require("path"));
 var getGenerateURL = function (_a) {
     var containerName = _a.containerName, baseURL = _a.baseURL;
     return function (_a) {
-        var filename = _a.filename;
-        return "".concat(baseURL, "/").concat(containerName, "/").concat(filename);
+        var filename = _a.filename, _b = _a.prefix, prefix = _b === void 0 ? '' : _b;
+        return "".concat(baseURL, "/").concat(containerName, "/").concat(path_1.default.posix.join(prefix, filename));
     };
 };
 exports.getGenerateURL = getGenerateURL;

package/dist/adapters/azure/generateURL.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateURL.js","sourceRoot":"","sources":["../../../src/adapters/azure/generateURL.ts"],"names":[],"mappings":";;;AAOO,IAAM,cAAc,GACzB,UAAC,EAAgC;QAA9B,aAAa,mBAAA,EAAE,OAAO,aAAA;IACzB,OAAA,UAAC,EAAY;YAAV,QAAQ,cAAA;QACT,OAAO,UAAG,OAAO,cAAI,aAAa,cAAI,QAAQ,CAAE,CAAA;IAClD,CAAC;AAFD,CAEC,CAAA;AAJU,QAAA,cAAc,kBAIxB"}
+{"version":3,"file":"generateURL.js","sourceRoot":"","sources":["../../../src/adapters/azure/generateURL.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAuB;AAQhB,IAAM,cAAc,GACzB,UAAC,EAAgC;QAA9B,aAAa,mBAAA,EAAE,OAAO,aAAA;IACzB,OAAA,UAAC,EAAyB;YAAvB,QAAQ,cAAA,EAAE,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;QACtB,OAAO,UAAG,OAAO,cAAI,aAAa,cAAI,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAE,CAAA;IAC3E,CAAC;AAFD,CAEC,CAAA;AAJU,QAAA,cAAc,kBAIxB"}

package/dist/adapters/azure/handleDelete.js

@@ -35,21 +35,25 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandleDelete = void 0;
+var path_1 = __importDefault(require("path"));
 var getHandleDelete = function (_a) {
     var containerClient = _a.containerClient;
     return function (_a) {
-        var filename = _a.filename;
+        var filename = _a.filename, _b = _a.doc.prefix, prefix = _b === void 0 ? '' : _b;
         return __awaiter(void 0, void 0, void 0, function () {
             var blockBlobClient;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        blockBlobClient = containerClient.getBlockBlobClient(filename);
+                        blockBlobClient = containerClient.getBlockBlobClient(path_1.default.posix.join(prefix, filename));
                         return [4 /*yield*/, blockBlobClient.deleteIfExists()];
                     case 1:
-                        _b.sent();
+                        _c.sent();
                         return [2 /*return*/];
                 }
             });

package/dist/adapters/azure/handleDelete.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleDelete.js","sourceRoot":"","sources":["../../../src/adapters/azure/handleDelete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASO,IAAM,eAAe,GAAG,UAAC,EAAyB;QAAvB,eAAe,qBAAA;IAC/C,OAAO,UAAO,EAAY;YAAV,QAAQ,cAAA;;;;;;wBAChB,eAAe,GAAG,eAAe,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAA;wBACpE,qBAAM,eAAe,CAAC,cAAc,EAAE,EAAA;;wBAAtC,SAAsC,CAAA;;;;;KACvC,CAAA;AACH,CAAC,CAAA;AALY,QAAA,eAAe,mBAK3B"}
+{"version":3,"file":"handleDelete.js","sourceRoot":"","sources":["../../../src/adapters/azure/handleDelete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAUhB,IAAM,eAAe,GAAG,UAAC,EAAyB;QAAvB,eAAe,qBAAA;IAC/C,OAAO,UAAO,EAAkC;YAAhC,QAAQ,cAAA,EAAS,kBAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;;;;;;wBACpC,eAAe,GAAG,eAAe,CAAC,kBAAkB,CAAC,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAA;wBAC7F,qBAAM,eAAe,CAAC,cAAc,EAAE,EAAA;;wBAAtC,SAAsC,CAAA;;;;;KACvC,CAAA;AACH,CAAC,CAAA;AALY,QAAA,eAAe,mBAK3B"}

package/dist/adapters/azure/handleUpload.d.ts

@@ -5,6 +5,7 @@ interface Args {
     collection: CollectionConfig;
     containerClient: ContainerClient;
     allowContainerCreate: boolean;
+    prefix?: string;
 }
-export declare const getHandleUpload: ({ allowContainerCreate, containerClient }: Args) => HandleUpload;
+export declare const getHandleUpload: ({ allowContainerCreate, containerClient, prefix, }: Args) => HandleUpload;
 export {};

package/dist/adapters/azure/handleUpload.js

@@ -35,22 +35,25 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandleUpload = void 0;
+var path_1 = __importDefault(require("path"));
 var getHandleUpload = function (_a) {
-    var allowContainerCreate = _a.allowContainerCreate, containerClient = _a.containerClient;
+    var allowContainerCreate = _a.allowContainerCreate, containerClient = _a.containerClient, _b = _a.prefix, prefix = _b === void 0 ? '' : _b;
     if (allowContainerCreate) {
         containerClient.createIfNotExists({ access: 'blob' });
     }
     return function (_a) {
         var data = _a.data, file = _a.file;
         return __awaiter(void 0, void 0, void 0, function () {
-            var blobName, blockBlobClient;
+            var blockBlobClient;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        blobName = file.filename;
-                        blockBlobClient = containerClient.getBlockBlobClient(blobName);
+                        blockBlobClient = containerClient.getBlockBlobClient(path_1.default.posix.join(prefix, file.filename));
                         return [4 /*yield*/, blockBlobClient.upload(file.buffer, file.buffer.byteLength, {
                                 blobHTTPHeaders: { blobContentType: file.mimeType },
                             })];

package/dist/adapters/azure/handleUpload.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/azure/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUO,IAAM,eAAe,GAAG,UAAC,EAA+C;QAA7C,oBAAoB,0BAAA,EAAE,eAAe,qBAAA;IACrE,IAAI,oBAAoB,EAAE;QACxB,eAAe,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;KACtD;IAED,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBAClB,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;wBACxB,eAAe,GAAG,eAAe,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAA;wBAEpE,qBAAM,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;gCAChE,eAAe,EAAE,EAAE,eAAe,EAAE,IAAI,CAAC,QAAQ,EAAE;6BACpD,CAAC,EAAA;;wBAFF,SAEE,CAAA;wBAEF,sBAAO,IAAI,EAAA;;;;KACZ,CAAA;AACH,CAAC,CAAA;AAfY,QAAA,eAAe,mBAe3B"}
+{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/azure/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAYhB,IAAM,eAAe,GAAG,UAAC,EAIzB;QAHL,oBAAoB,0BAAA,EACpB,eAAe,qBAAA,EACf,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;IAEX,IAAI,oBAAoB,EAAE;QACxB,eAAe,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;KACtD;IAED,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBAClB,eAAe,GAAG,eAAe,CAAC,kBAAkB,CACxD,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CACvC,CAAA;wBAED,qBAAM,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;gCAChE,eAAe,EAAE,EAAE,eAAe,EAAE,IAAI,CAAC,QAAQ,EAAE;6BACpD,CAAC,EAAA;;wBAFF,SAEE,CAAA;wBAEF,sBAAO,IAAI,EAAA;;;;KACZ,CAAA;AACH,CAAC,CAAA;AApBY,QAAA,eAAe,mBAoB3B"}

package/dist/adapters/azure/index.js

@@ -10,7 +10,7 @@ var webpack_1 = require("./webpack");
 var azureBlobStorageAdapter = function (_a) {
     var connectionString = _a.connectionString, containerName = _a.containerName, baseURL = _a.baseURL, allowContainerCreate = _a.allowContainerCreate;
     return function (_a) {
-        var collection = _a.collection;
+        var collection = _a.collection, prefix = _a.prefix;
         var blobServiceClient = storage_blob_1.BlobServiceClient.fromConnectionString(connectionString);
         var containerClient = blobServiceClient.getContainerClient(containerName);
         return {
@@ -18,10 +18,11 @@ var azureBlobStorageAdapter = function (_a) {
                 collection: collection,
                 containerClient: containerClient,
                 allowContainerCreate: allowContainerCreate,
+                prefix: prefix,
             }),
             handleDelete: (0, handleDelete_1.getHandleDelete)({ collection: collection, containerClient: containerClient }),
             generateURL: (0, generateURL_1.getGenerateURL)({ containerName: containerName, baseURL: baseURL }),
-            staticHandler: (0, staticHandler_1.getHandler)({ containerClient: containerClient }),
+            staticHandler: (0, staticHandler_1.getHandler)({ containerClient: containerClient, collection: collection }),
             webpack: webpack_1.extendWebpackConfig,
         };
     };

package/dist/adapters/azure/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/azure/index.ts"],"names":[],"mappings":";;;AAAA,oDAAuD;AAEvD,iDAA4C;AAC5C,6CAA8C;AAC9C,+CAAgD;AAChD,+CAAgD;AAChD,qCAA+C;AASxC,IAAM,uBAAuB,GAClC,UAAC,EAAwE;QAAtE,gBAAgB,sBAAA,EAAE,aAAa,mBAAA,EAAE,OAAO,aAAA,EAAE,oBAAoB,0BAAA;IACjE,OAAA,UAAC,EAAc;YAAZ,UAAU,gBAAA;QACX,IAAM,iBAAiB,GAAG,gCAAiB,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;QAClF,IAAM,eAAe,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;QAE3E,OAAO;YACL,YAAY,EAAE,IAAA,8BAAe,EAAC;gBAC5B,UAAU,YAAA;gBACV,eAAe,iBAAA;gBACf,oBAAoB,sBAAA;aACrB,CAAC;YACF,YAAY,EAAE,IAAA,8BAAe,EAAC,EAAE,UAAU,YAAA,EAAE,eAAe,iBAAA,EAAE,CAAC;YAC9D,WAAW,EAAE,IAAA,4BAAc,EAAC,EAAE,aAAa,eAAA,EAAE,OAAO,SAAA,EAAE,CAAC;YACvD,aAAa,EAAE,IAAA,0BAAU,EAAC,EAAE,eAAe,iBAAA,EAAE,CAAC;YAC9C,OAAO,EAAE,6BAAmB;SAC7B,CAAA;IACH,CAAC;AAfD,CAeC,CAAA;AAjBU,QAAA,uBAAuB,2BAiBjC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/azure/index.ts"],"names":[],"mappings":";;;AAAA,oDAAuD;AAEvD,iDAA4C;AAC5C,6CAA8C;AAC9C,+CAAgD;AAChD,+CAAgD;AAChD,qCAA+C;AASxC,IAAM,uBAAuB,GAClC,UAAC,EAAwE;QAAtE,gBAAgB,sBAAA,EAAE,aAAa,mBAAA,EAAE,OAAO,aAAA,EAAE,oBAAoB,0BAAA;IACjE,OAAA,UAAC,EAAsB;YAApB,UAAU,gBAAA,EAAE,MAAM,YAAA;QACnB,IAAM,iBAAiB,GAAG,gCAAiB,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;QAClF,IAAM,eAAe,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;QAE3E,OAAO;YACL,YAAY,EAAE,IAAA,8BAAe,EAAC;gBAC5B,UAAU,YAAA;gBACV,eAAe,iBAAA;gBACf,oBAAoB,sBAAA;gBACpB,MAAM,QAAA;aACP,CAAC;YACF,YAAY,EAAE,IAAA,8BAAe,EAAC,EAAE,UAAU,YAAA,EAAE,eAAe,iBAAA,EAAE,CAAC;YAC9D,WAAW,EAAE,IAAA,4BAAc,EAAC,EAAE,aAAa,eAAA,EAAE,OAAO,SAAA,EAAE,CAAC;YACvD,aAAa,EAAE,IAAA,0BAAU,EAAC,EAAE,eAAe,iBAAA,EAAE,UAAU,YAAA,EAAE,CAAC;YAC1D,OAAO,EAAE,6BAAmB;SAC7B,CAAA;IACH,CAAC;AAhBD,CAgBC,CAAA;AAlBU,QAAA,uBAAuB,2BAkBjC"}

package/dist/adapters/azure/staticHandler.d.ts

@@ -1,7 +1,9 @@
 import type { ContainerClient } from '@azure/storage-blob';
+import type { CollectionConfig } from 'payload/types';
 import type { StaticHandler } from '../../types';
 interface Args {
     containerClient: ContainerClient;
+    collection: CollectionConfig;
 }
-export declare const getHandler: ({ containerClient }: Args) => StaticHandler;
+export declare const getHandler: ({ containerClient, collection }: Args) => StaticHandler;
 export {};

package/dist/adapters/azure/staticHandler.js

@@ -35,28 +35,41 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandler = void 0;
+var path_1 = __importDefault(require("path"));
+var getFilePrefix_1 = require("../../utilities/getFilePrefix");
 var getHandler = function (_a) {
-    var containerClient = _a.containerClient;
+    var containerClient = _a.containerClient, collection = _a.collection;
     return function (req, res, next) { return __awaiter(void 0, void 0, void 0, function () {
-        var blockBlobClient, downloadBlockBlobResponse, err_1;
+        var prefix, blockBlobClient, blob, err_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    blockBlobClient = containerClient.getBlockBlobClient(req.params.filename);
-                    return [4 /*yield*/, blockBlobClient.download(0)];
+                    _a.trys.push([0, 3, , 4]);
+                    return [4 /*yield*/, (0, getFilePrefix_1.getFilePrefix)({ req: req, collection: collection })];
                 case 1:
-                    downloadBlockBlobResponse = _a.sent();
-                    if (downloadBlockBlobResponse === null || downloadBlockBlobResponse === void 0 ? void 0 : downloadBlockBlobResponse.readableStreamBody) {
-                        return [2 /*return*/, downloadBlockBlobResponse.readableStreamBody.pipe(res)];
+                    prefix = _a.sent();
+                    blockBlobClient = containerClient.getBlockBlobClient(path_1.default.posix.join(prefix, req.params.filename));
+                    return [4 /*yield*/, blockBlobClient.download(0)];
+                case 2:
+                    blob = _a.sent();
+                    res.set({
+                        'Content-Length': blob.contentLanguage,
+                        'Content-Type': blob.contentType,
+                        ETag: blob.etag,
+                    });
+                    if (blob === null || blob === void 0 ? void 0 : blob.readableStreamBody) {
+                        return [2 /*return*/, blob.readableStreamBody.pipe(res)];
                     }
                     return [2 /*return*/, next()];
-                case 2:
+                case 3:
                     err_1 = _a.sent();
                     return [2 /*return*/, next()];
-                case 3: return [2 /*return*/];
+                case 4: return [2 /*return*/];
             }
         });
     }); };

package/dist/adapters/azure/staticHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"staticHandler.js","sourceRoot":"","sources":["../../../src/adapters/azure/staticHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOO,IAAM,UAAU,GAAG,UAAC,EAAyB;QAAvB,eAAe,qBAAA;IAC1C,OAAO,UAAO,GAAG,EAAE,GAAG,EAAE,IAAI;;;;;;oBAElB,eAAe,GAAG,eAAe,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;oBAE7C,qBAAM,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAA;;oBAA7D,yBAAyB,GAAG,SAAiC;oBAEnE,IAAI,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,kBAAkB,EAAE;wBACjD,sBAAO,yBAAyB,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAA;qBAC9D;oBAED,sBAAO,IAAI,EAAE,EAAA;;;oBAEb,sBAAO,IAAI,EAAE,EAAA;;;;SAEhB,CAAA;AACH,CAAC,CAAA;AAhBY,QAAA,UAAU,cAgBtB"}
+{"version":3,"file":"staticHandler.js","sourceRoot":"","sources":["../../../src/adapters/azure/staticHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAIvB,+DAA6D;AAOtD,IAAM,UAAU,GAAG,UAAC,EAAqC;QAAnC,eAAe,qBAAA,EAAE,UAAU,gBAAA;IACtD,OAAO,UAAO,GAAG,EAAE,GAAG,EAAE,IAAI;;;;;;oBAET,qBAAM,IAAA,6BAAa,EAAC,EAAE,GAAG,KAAA,EAAE,UAAU,YAAA,EAAE,CAAC,EAAA;;oBAAjD,MAAM,GAAG,SAAwC;oBACjD,eAAe,GAAG,eAAe,CAAC,kBAAkB,CACxD,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAC7C,CAAA;oBAEY,qBAAM,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAA;;oBAAxC,IAAI,GAAG,SAAiC;oBAE9C,GAAG,CAAC,GAAG,CAAC;wBACN,gBAAgB,EAAE,IAAI,CAAC,eAAe;wBACtC,cAAc,EAAE,IAAI,CAAC,WAAW;wBAChC,IAAI,EAAE,IAAI,CAAC,IAAI;qBAChB,CAAC,CAAA;oBAEF,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,kBAAkB,EAAE;wBAC5B,sBAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAA;qBACzC;oBAED,sBAAO,IAAI,EAAE,EAAA;;;oBAEb,sBAAO,IAAI,EAAE,EAAA;;;;SAEhB,CAAA;AACH,CAAC,CAAA;AAzBY,QAAA,UAAU,cAyBtB"}

package/dist/adapters/gcs/generateURL.js

@@ -1,11 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGenerateURL = void 0;
+var path_1 = __importDefault(require("path"));
 var getGenerateURL = function (_a) {
     var gcs = _a.gcs, bucket = _a.bucket;
     return function (_a) {
-        var filename = _a.filename;
-        return gcs.bucket(bucket).file(filename).publicUrl();
+        var filename = _a.filename, _b = _a.prefix, prefix = _b === void 0 ? '' : _b;
+        return decodeURIComponent(gcs.bucket(bucket).file(path_1.default.posix.join(prefix, filename)).publicUrl());
     };
 };
 exports.getGenerateURL = getGenerateURL;

package/dist/adapters/gcs/generateURL.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateURL.js","sourceRoot":"","sources":["../../../src/adapters/gcs/generateURL.ts"],"names":[],"mappings":";;;AAQO,IAAM,cAAc,GACzB,UAAC,EAAqB;QAAnB,GAAG,SAAA,EAAE,MAAM,YAAA;IACd,OAAA,UAAC,EAAY;YAAV,QAAQ,cAAA;QACT,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,CAAA;IACtD,CAAC;AAFD,CAEC,CAAA;AAJU,QAAA,cAAc,kBAIxB"}
+{"version":3,"file":"generateURL.js","sourceRoot":"","sources":["../../../src/adapters/gcs/generateURL.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAuB;AAShB,IAAM,cAAc,GACzB,UAAC,EAAqB;QAAnB,GAAG,SAAA,EAAE,MAAM,YAAA;IACd,OAAA,UAAC,EAAyB;YAAvB,QAAQ,cAAA,EAAE,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;QACtB,OAAO,kBAAkB,CACvB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,EAAE,CACvE,CAAA;IACH,CAAC;AAJD,CAIC,CAAA;AANU,QAAA,cAAc,kBAMxB"}

package/dist/adapters/gcs/handleDelete.js

@@ -35,20 +35,24 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandleDelete = void 0;
+var path_1 = __importDefault(require("path"));
 var getHandleDelete = function (_a) {
     var gcs = _a.gcs, bucket = _a.bucket;
     return function (_a) {
-        var filename = _a.filename;
+        var filename = _a.filename, _b = _a.doc.prefix, prefix = _b === void 0 ? '' : _b;
         return __awaiter(void 0, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, gcs.bucket(bucket).file(filename).delete({
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0: return [4 /*yield*/, gcs.bucket(bucket).file(path_1.default.posix.join(prefix, filename)).delete({
                             ignoreNotFound: true,
                         })];
                     case 1:
-                        _b.sent();
+                        _c.sent();
                         return [2 /*return*/];
                 }
             });

package/dist/adapters/gcs/handleDelete.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleDelete.js","sourceRoot":"","sources":["../../../src/adapters/gcs/handleDelete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQO,IAAM,eAAe,GAAG,UAAC,EAAqB;QAAnB,GAAG,SAAA,EAAE,MAAM,YAAA;IAC3C,OAAO,UAAO,EAAY;YAAV,QAAQ,cAAA;;;;4BACtB,qBAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;4BAC7C,cAAc,EAAE,IAAI;yBACrB,CAAC,EAAA;;wBAFF,SAEE,CAAA;;;;;KACH,CAAA;AACH,CAAC,CAAA;AANY,QAAA,eAAe,mBAM3B"}
+{"version":3,"file":"handleDelete.js","sourceRoot":"","sources":["../../../src/adapters/gcs/handleDelete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAShB,IAAM,eAAe,GAAG,UAAC,EAAqB;QAAnB,GAAG,SAAA,EAAE,MAAM,YAAA;IAC3C,OAAO,UAAO,EAAkC;YAAhC,QAAQ,cAAA,EAAS,kBAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;;;;4BAC1C,qBAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;4BACtE,cAAc,EAAE,IAAI;yBACrB,CAAC,EAAA;;wBAFF,SAEE,CAAA;;;;;KACH,CAAA;AACH,CAAC,CAAA;AANY,QAAA,eAAe,mBAM3B"}

package/dist/adapters/gcs/handleUpload.d.ts

@@ -1,11 +1,12 @@
-import { Storage } from '@google-cloud/storage';
+import type { Storage } from '@google-cloud/storage';
 import type { CollectionConfig } from 'payload/types';
 import type { HandleUpload } from '../../types';
 interface Args {
     collection: CollectionConfig;
     bucket: string;
     acl?: 'Private' | 'Public';
+    prefix?: string;
     gcs: Storage;
 }
-export declare const getHandleUpload: ({ gcs, bucket, acl }: Args) => HandleUpload;
+export declare const getHandleUpload: ({ gcs, bucket, acl, prefix }: Args) => HandleUpload;
 export {};

package/dist/adapters/gcs/handleUpload.js

@@ -35,10 +35,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandleUpload = void 0;
+var path_1 = __importDefault(require("path"));
 var getHandleUpload = function (_a) {
-    var gcs = _a.gcs, bucket = _a.bucket, acl = _a.acl;
+    var gcs = _a.gcs, bucket = _a.bucket, acl = _a.acl, _b = _a.prefix, prefix = _b === void 0 ? '' : _b;
     return function (_a) {
         var data = _a.data, file = _a.file;
         return __awaiter(void 0, void 0, void 0, function () {
@@ -46,9 +50,11 @@ var getHandleUpload = function (_a) {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        gcsFile = gcs.bucket(bucket).file(file.filename);
+                        gcsFile = gcs.bucket(bucket).file(path_1.default.posix.join(prefix, file.filename));
                         return [4 /*yield*/, gcsFile.save(file.buffer, {
-                                contentType: file.mimeType,
+                                metadata: {
+                                    contentType: file.mimeType,
+                                },
                             })];
                     case 1:
                         _b.sent();

package/dist/adapters/gcs/handleUpload.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/gcs/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWO,IAAM,eAAe,GAAG,UAAC,EAA0B;QAAxB,GAAG,SAAA,EAAE,MAAM,YAAA,EAAE,GAAG,SAAA;IAChD,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBAClB,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;wBACtD,qBAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gCAC9B,WAAW,EAAE,IAAI,CAAC,QAAQ;6BAC3B,CAAC,EAAA;;wBAFF,SAEE,CAAA;6BACE,GAAG,EAAH,wBAAG;wBACL,qBAAM,OAAO,CAAC,cAAO,GAAG,CAAE,CAAC,EAAE,EAAA;;wBAA7B,SAA6B,CAAA;;4BAG/B,sBAAO,IAAI,EAAA;;;;KACZ,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,eAAe,mBAY3B"}
+{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/gcs/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAahB,IAAM,eAAe,GAAG,UAAC,EAAuC;QAArC,GAAG,SAAA,EAAE,MAAM,YAAA,EAAE,GAAG,SAAA,EAAE,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;IAC7D,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBAClB,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;wBAC/E,qBAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gCAC9B,QAAQ,EAAE;oCACR,WAAW,EAAE,IAAI,CAAC,QAAQ;iCAC3B;6BACF,CAAC,EAAA;;wBAJF,SAIE,CAAA;6BAEE,GAAG,EAAH,wBAAG;wBACL,qBAAM,OAAO,CAAC,cAAO,GAAG,CAAE,CAAC,EAAE,EAAA;;wBAA7B,SAA6B,CAAA;;4BAG/B,sBAAO,IAAI,EAAA;;;;KACZ,CAAA;AACH,CAAC,CAAA;AAfY,QAAA,eAAe,mBAe3B"}

package/dist/adapters/gcs/index.js

@@ -10,7 +10,7 @@ var webpack_1 = require("./webpack");
 var gcsAdapter = function (_a) {
     var options = _a.options, bucket = _a.bucket, acl = _a.acl;
     return function (_a) {
-        var collection = _a.collection;
+        var collection = _a.collection, prefix = _a.prefix;
         var gcs = new storage_1.Storage(options);
         return {
             handleUpload: (0, handleUpload_1.getHandleUpload)({
@@ -18,10 +18,11 @@ var gcsAdapter = function (_a) {
                 gcs: gcs,
                 bucket: bucket,
                 acl: acl,
+                prefix: prefix,
             }),
             handleDelete: (0, handleDelete_1.getHandleDelete)({ gcs: gcs, bucket: bucket }),
             generateURL: (0, generateURL_1.getGenerateURL)({ gcs: gcs, bucket: bucket }),
-            staticHandler: (0, staticHandler_1.getHandler)({ gcs: gcs, bucket: bucket }),
+            staticHandler: (0, staticHandler_1.getHandler)({ gcs: gcs, bucket: bucket, collection: collection }),
             webpack: webpack_1.extendWebpackConfig,
         };
     };

package/dist/adapters/gcs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/gcs/index.ts"],"names":[],"mappings":";;;AAAA,iDAA+D;AAE/D,6CAA8C;AAC9C,iDAA4C;AAC5C,+CAAgD;AAChD,+CAAgD;AAChD,qCAA+C;AAQxC,IAAM,UAAU,GACrB,UAAC,EAA8B;QAA5B,OAAO,aAAA,EAAE,MAAM,YAAA,EAAE,GAAG,SAAA;IACvB,OAAA,UAAC,EAAc;YAAZ,UAAU,gBAAA;QACX,IAAM,GAAG,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAA;QAEhC,OAAO;YACL,YAAY,EAAE,IAAA,8BAAe,EAAC;gBAC5B,UAAU,YAAA;gBACV,GAAG,KAAA;gBACH,MAAM,QAAA;gBACN,GAAG,KAAA;aACJ,CAAC;YACF,YAAY,EAAE,IAAA,8BAAe,EAAC,EAAE,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC9C,WAAW,EAAE,IAAA,4BAAc,EAAC,EAAE,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC5C,aAAa,EAAE,IAAA,0BAAU,EAAC,EAAE,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC1C,OAAO,EAAE,6BAAmB;SAC7B,CAAA;IACH,CAAC;AAfD,CAeC,CAAA;AAjBU,QAAA,UAAU,cAiBpB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/gcs/index.ts"],"names":[],"mappings":";;;AAAA,iDAA+D;AAE/D,6CAA8C;AAC9C,iDAA4C;AAC5C,+CAAgD;AAChD,+CAAgD;AAChD,qCAA+C;AAQxC,IAAM,UAAU,GACrB,UAAC,EAA8B;QAA5B,OAAO,aAAA,EAAE,MAAM,YAAA,EAAE,GAAG,SAAA;IACvB,OAAA,UAAC,EAAsB;YAApB,UAAU,gBAAA,EAAE,MAAM,YAAA;QACnB,IAAM,GAAG,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAA;QAEhC,OAAO;YACL,YAAY,EAAE,IAAA,8BAAe,EAAC;gBAC5B,UAAU,YAAA;gBACV,GAAG,KAAA;gBACH,MAAM,QAAA;gBACN,GAAG,KAAA;gBACH,MAAM,QAAA;aACP,CAAC;YACF,YAAY,EAAE,IAAA,8BAAe,EAAC,EAAE,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC9C,WAAW,EAAE,IAAA,4BAAc,EAAC,EAAE,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC5C,aAAa,EAAE,IAAA,0BAAU,EAAC,EAAE,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,UAAU,YAAA,EAAE,CAAC;YACtD,OAAO,EAAE,6BAAmB;SAC7B,CAAA;IACH,CAAC;AAhBD,CAgBC,CAAA;AAlBU,QAAA,UAAU,cAkBpB"}

package/dist/adapters/gcs/staticHandler.d.ts

@@ -1,8 +1,10 @@
-import { Storage } from '@google-cloud/storage';
+import type { Storage } from '@google-cloud/storage';
+import type { CollectionConfig } from 'payload/types';
 import type { StaticHandler } from '../../types';
 interface Args {
     gcs: Storage;
     bucket: string;
+    collection: CollectionConfig;
 }
-export declare const getHandler: ({ gcs, bucket }: Args) => StaticHandler;
+export declare const getHandler: ({ gcs, bucket, collection }: Args) => StaticHandler;
 export {};

package/dist/adapters/gcs/staticHandler.js

@@ -35,19 +35,39 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandler = void 0;
+var path_1 = __importDefault(require("path"));
+var getFilePrefix_1 = require("../../utilities/getFilePrefix");
 var getHandler = function (_a) {
-    var gcs = _a.gcs, bucket = _a.bucket;
+    var gcs = _a.gcs, bucket = _a.bucket, collection = _a.collection;
     return function (req, res, next) { return __awaiter(void 0, void 0, void 0, function () {
+        var prefix, file, metadata, err_1;
         return __generator(this, function (_a) {
-            try {
-                return [2 /*return*/, gcs.bucket(bucket).file(req.params.filename).createReadStream().pipe(res)];
-            }
-            catch (err) {
-                return [2 /*return*/, next()];
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 3, , 4]);
+                    return [4 /*yield*/, (0, getFilePrefix_1.getFilePrefix)({ req: req, collection: collection })];
+                case 1:
+                    prefix = _a.sent();
+                    file = gcs.bucket(bucket).file(path_1.default.posix.join(prefix, req.params.filename));
+                    return [4 /*yield*/, file.getMetadata()];
+                case 2:
+                    metadata = (_a.sent())[0];
+                    res.set({
+                        'Content-Length': metadata.size,
+                        'Content-Type': metadata.contentType,
+                        ETag: metadata.etag,
+                    });
+                    return [2 /*return*/, file.createReadStream().pipe(res)];
+                case 3:
+                    err_1 = _a.sent();
+                    return [2 /*return*/, next()];
+                case 4: return [2 /*return*/];
             }
-            return [2 /*return*/];
         });
     }); };
 };

package/dist/adapters/gcs/staticHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"staticHandler.js","sourceRoot":"","sources":["../../../src/adapters/gcs/staticHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQO,IAAM,UAAU,GAAG,UAAC,EAAqB;QAAnB,GAAG,SAAA,EAAE,MAAM,YAAA;IACtC,OAAO,UAAO,GAAG,EAAE,GAAG,EAAE,IAAI;;YAC1B,IAAI;gBACF,sBAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAA;aACjF;YAAC,OAAO,GAAY,EAAE;gBACrB,sBAAO,IAAI,EAAE,EAAA;aACd;;;SACF,CAAA;AACH,CAAC,CAAA;AARY,QAAA,UAAU,cAQtB"}
+{"version":3,"file":"staticHandler.js","sourceRoot":"","sources":["../../../src/adapters/gcs/staticHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAIvB,+DAA6D;AAQtD,IAAM,UAAU,GAAG,UAAC,EAAiC;QAA/B,GAAG,SAAA,EAAE,MAAM,YAAA,EAAE,UAAU,gBAAA;IAClD,OAAO,UAAO,GAAG,EAAE,GAAG,EAAE,IAAI;;;;;;oBAET,qBAAM,IAAA,6BAAa,EAAC,EAAE,GAAG,KAAA,EAAE,UAAU,YAAA,EAAE,CAAC,EAAA;;oBAAjD,MAAM,GAAG,SAAwC;oBACjD,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;oBAE/D,qBAAM,IAAI,CAAC,WAAW,EAAE,EAAA;;oBAApC,QAAQ,GAAI,CAAA,SAAwB,CAAA,GAA5B;oBAEf,GAAG,CAAC,GAAG,CAAC;wBACN,gBAAgB,EAAE,QAAQ,CAAC,IAAI;wBAC/B,cAAc,EAAE,QAAQ,CAAC,WAAW;wBACpC,IAAI,EAAE,QAAQ,CAAC,IAAI;qBACpB,CAAC,CAAA;oBAEF,sBAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAA;;;oBAExC,sBAAO,IAAI,EAAE,EAAA;;;;SAEhB,CAAA;AACH,CAAC,CAAA;AAnBY,QAAA,UAAU,cAmBtB"}

package/dist/adapters/s3/generateURL.js

@@ -1,11 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGenerateURL = void 0;
+var path_1 = __importDefault(require("path"));
 var getGenerateURL = function (_a) {
     var endpoint = _a.config.endpoint, bucket = _a.bucket;
     return function (_a) {
-        var filename = _a.filename;
-        return "".concat(endpoint, "/").concat(bucket, "/").concat(filename);
+        var filename = _a.filename, _b = _a.prefix, prefix = _b === void 0 ? '' : _b;
+        return "".concat(endpoint, "/").concat(bucket, "/").concat(path_1.default.posix.join(prefix, filename));
     };
 };
 exports.getGenerateURL = getGenerateURL;

package/dist/adapters/s3/generateURL.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateURL.js","sourceRoot":"","sources":["../../../src/adapters/s3/generateURL.ts"],"names":[],"mappings":";;;AAQO,IAAM,cAAc,GACzB,UAAC,EAAsC;QAA1B,QAAQ,qBAAA,EAAI,MAAM,YAAA;IAC/B,OAAA,UAAC,EAAY;YAAV,QAAQ,cAAA;QACT,OAAO,UAAG,QAAQ,cAAI,MAAM,cAAI,QAAQ,CAAE,CAAA;IAC5C,CAAC;AAFD,CAEC,CAAA;AAJU,QAAA,cAAc,kBAIxB"}
+{"version":3,"file":"generateURL.js","sourceRoot":"","sources":["../../../src/adapters/s3/generateURL.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAuB;AAShB,IAAM,cAAc,GACzB,UAAC,EAAsC;QAA1B,QAAQ,qBAAA,EAAI,MAAM,YAAA;IAC/B,OAAA,UAAC,EAAyB;YAAvB,QAAQ,cAAA,EAAE,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;QACtB,OAAO,UAAG,QAAQ,cAAI,MAAM,cAAI,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAE,CAAA;IACrE,CAAC;AAFD,CAEC,CAAA;AAJU,QAAA,cAAc,kBAIxB"}

package/dist/adapters/s3/handleDelete.js

@@ -35,21 +35,25 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandleDelete = void 0;
+var path_1 = __importDefault(require("path"));
 var getHandleDelete = function (_a) {
     var s3 = _a.s3, bucket = _a.bucket;
     return function (_a) {
-        var filename = _a.filename;
+        var filename = _a.filename, _b = _a.doc.prefix, prefix = _b === void 0 ? '' : _b;
         return __awaiter(void 0, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0: return [4 /*yield*/, s3.deleteObject({
                             Bucket: bucket,
-                            Key: filename,
+                            Key: path_1.default.posix.join(prefix, filename),
                         })];
                     case 1:
-                        _b.sent();
+                        _c.sent();
                         return [2 /*return*/];
                 }
             });

package/dist/adapters/s3/handleDelete.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleDelete.js","sourceRoot":"","sources":["../../../src/adapters/s3/handleDelete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQO,IAAM,eAAe,GAAG,UAAC,EAAoB;QAAlB,EAAE,QAAA,EAAE,MAAM,YAAA;IAC1C,OAAO,UAAO,EAAY;YAAV,QAAQ,cAAA;;;;4BACtB,qBAAM,EAAE,CAAC,YAAY,CAAC;4BACpB,MAAM,EAAE,MAAM;4BACd,GAAG,EAAE,QAAQ;yBACd,CAAC,EAAA;;wBAHF,SAGE,CAAA;;;;;KACH,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,eAAe,mBAO3B"}
+{"version":3,"file":"handleDelete.js","sourceRoot":"","sources":["../../../src/adapters/s3/handleDelete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAShB,IAAM,eAAe,GAAG,UAAC,EAAoB;QAAlB,EAAE,QAAA,EAAE,MAAM,YAAA;IAC1C,OAAO,UAAO,EAAkC;YAAhC,QAAQ,cAAA,EAAS,kBAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;;;;4BAC1C,qBAAM,EAAE,CAAC,YAAY,CAAC;4BACpB,MAAM,EAAE,MAAM;4BACd,GAAG,EAAE,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC;yBACvC,CAAC,EAAA;;wBAHF,SAGE,CAAA;;;;;KACH,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,eAAe,mBAO3B"}

package/dist/adapters/s3/handleUpload.d.ts

@@ -5,7 +5,8 @@ interface Args {
     collection: CollectionConfig;
     bucket: string;
     acl?: 'private' | 'public-read';
+    prefix?: string;
     s3: AWS.S3;
 }
-export declare const getHandleUpload: ({ s3, bucket, acl }: Args) => HandleUpload;
+export declare const getHandleUpload: ({ s3, bucket, acl, prefix }: Args) => HandleUpload;
 export {};

package/dist/adapters/s3/handleUpload.js

@@ -35,10 +35,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandleUpload = void 0;
+var path_1 = __importDefault(require("path"));
 var getHandleUpload = function (_a) {
-    var s3 = _a.s3, bucket = _a.bucket, acl = _a.acl;
+    var s3 = _a.s3, bucket = _a.bucket, acl = _a.acl, _b = _a.prefix, prefix = _b === void 0 ? '' : _b;
     return function (_a) {
         var data = _a.data, file = _a.file;
         return __awaiter(void 0, void 0, void 0, function () {
@@ -46,7 +50,7 @@ var getHandleUpload = function (_a) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, s3.putObject({
                             Bucket: bucket,
-                            Key: file.filename,
+                            Key: path_1.default.posix.join(prefix, file.filename),
                             Body: file.buffer,
                             ACL: acl,
                             ContentType: file.mimeType,

package/dist/adapters/s3/handleUpload.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/s3/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWO,IAAM,eAAe,GAAG,UAAC,EAAyB;QAAvB,EAAE,QAAA,EAAE,MAAM,YAAA,EAAE,GAAG,SAAA;IAC/C,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;4BACxB,qBAAM,EAAE,CAAC,SAAS,CAAC;4BACjB,MAAM,EAAE,MAAM;4BACd,GAAG,EAAE,IAAI,CAAC,QAAQ;4BAClB,IAAI,EAAE,IAAI,CAAC,MAAM;4BACjB,GAAG,EAAE,GAAG;4BACR,WAAW,EAAE,IAAI,CAAC,QAAQ;yBAC3B,CAAC,EAAA;;wBANF,SAME,CAAA;wBAEF,sBAAO,IAAI,EAAA;;;;KACZ,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,eAAe,mBAY3B"}
+{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/s3/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAahB,IAAM,eAAe,GAAG,UAAC,EAAsC;QAApC,EAAE,QAAA,EAAE,MAAM,YAAA,EAAE,GAAG,SAAA,EAAE,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;IAC5D,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;4BACxB,qBAAM,EAAE,CAAC,SAAS,CAAC;4BACjB,MAAM,EAAE,MAAM;4BACd,GAAG,EAAE,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC;4BAC3C,IAAI,EAAE,IAAI,CAAC,MAAM;4BACjB,GAAG,EAAE,GAAG;4BACR,WAAW,EAAE,IAAI,CAAC,QAAQ;yBAC3B,CAAC,EAAA;;wBANF,SAME,CAAA;wBAEF,sBAAO,IAAI,EAAA;;;;KACZ,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,eAAe,mBAY3B"}

package/dist/adapters/s3/index.js

@@ -33,7 +33,7 @@ var webpack_1 = require("./webpack");
 var s3Adapter = function (_a) {
     var config = _a.config, bucket = _a.bucket, acl = _a.acl;
     return function (_a) {
-        var collection = _a.collection;
+        var collection = _a.collection, prefix = _a.prefix;
         var s3 = new AWS.S3(config);
         return {
             handleUpload: (0, handleUpload_1.getHandleUpload)({
@@ -41,10 +41,11 @@ var s3Adapter = function (_a) {
                 s3: s3,
                 bucket: bucket,
                 acl: acl,
+                prefix: prefix,
             }),
             handleDelete: (0, handleDelete_1.getHandleDelete)({ s3: s3, bucket: bucket }),
             generateURL: (0, generateURL_1.getGenerateURL)({ bucket: bucket, config: config }),
-            staticHandler: (0, staticHandler_1.getHandler)({ bucket: bucket, s3: s3 }),
+            staticHandler: (0, staticHandler_1.getHandler)({ bucket: bucket, s3: s3, collection: collection }),
             webpack: webpack_1.extendWebpackConfig,
         };
     };

package/dist/adapters/s3/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/s3/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAyC;AAEzC,6CAA8C;AAC9C,iDAA4C;AAC5C,+CAAgD;AAChD,+CAAgD;AAChD,qCAA+C;AAQxC,IAAM,SAAS,GACpB,UAAC,EAA6B;QAA3B,MAAM,YAAA,EAAE,MAAM,YAAA,EAAE,GAAG,SAAA;IACtB,OAAA,UAAC,EAAc;YAAZ,UAAU,gBAAA;QACX,IAAM,EAAE,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAA;QAE7B,OAAO;YACL,YAAY,EAAE,IAAA,8BAAe,EAAC;gBAC5B,UAAU,YAAA;gBACV,EAAE,IAAA;gBACF,MAAM,QAAA;gBACN,GAAG,KAAA;aACJ,CAAC;YACF,YAAY,EAAE,IAAA,8BAAe,EAAC,EAAE,EAAE,IAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC7C,WAAW,EAAE,IAAA,4BAAc,EAAC,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC/C,aAAa,EAAE,IAAA,0BAAU,EAAC,EAAE,MAAM,QAAA,EAAE,EAAE,IAAA,EAAE,CAAC;YACzC,OAAO,EAAE,6BAAmB;SAC7B,CAAA;IACH,CAAC;AAfD,CAeC,CAAA;AAjBU,QAAA,SAAS,aAiBnB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/s3/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAyC;AAEzC,6CAA8C;AAC9C,iDAA4C;AAC5C,+CAAgD;AAChD,+CAAgD;AAChD,qCAA+C;AAQxC,IAAM,SAAS,GACpB,UAAC,EAA6B;QAA3B,MAAM,YAAA,EAAE,MAAM,YAAA,EAAE,GAAG,SAAA;IACtB,OAAA,UAAC,EAAsB;YAApB,UAAU,gBAAA,EAAE,MAAM,YAAA;QACnB,IAAM,EAAE,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAA;QAE7B,OAAO;YACL,YAAY,EAAE,IAAA,8BAAe,EAAC;gBAC5B,UAAU,YAAA;gBACV,EAAE,IAAA;gBACF,MAAM,QAAA;gBACN,GAAG,KAAA;gBACH,MAAM,QAAA;aACP,CAAC;YACF,YAAY,EAAE,IAAA,8BAAe,EAAC,EAAE,EAAE,IAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC7C,WAAW,EAAE,IAAA,4BAAc,EAAC,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC/C,aAAa,EAAE,IAAA,0BAAU,EAAC,EAAE,MAAM,QAAA,EAAE,EAAE,IAAA,EAAE,UAAU,YAAA,EAAE,CAAC;YACrD,OAAO,EAAE,6BAAmB;SAC7B,CAAA;IACH,CAAC;AAhBD,CAgBC,CAAA;AAlBU,QAAA,SAAS,aAkBnB"}

package/dist/adapters/s3/mock.d.ts

@@ -1 +1,2 @@
 export function S3(): null;
+export function HeadObjectCommand(): null;

package/dist/adapters/s3/mock.js

@@ -2,4 +2,7 @@
 exports.S3 = function () {
     return null;
 };
+exports.HeadObjectCommand = function () {
+    return null;
+};
 //# sourceMappingURL=mock.js.map

package/dist/adapters/s3/mock.js.map

@@ -1 +1 @@
-{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/adapters/s3/mock.js"],"names":[],"mappings":";AAAA,OAAO,CAAC,EAAE,GAAG;IACX,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}
+{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/adapters/s3/mock.js"],"names":[],"mappings":";AAAA,OAAO,CAAC,EAAE,GAAG;IACX,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,OAAO,CAAC,iBAAiB,GAAG;IAC1B,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}

package/dist/adapters/s3/staticHandler.d.ts

@@ -1,8 +1,10 @@
 import type * as AWS from '@aws-sdk/client-s3';
+import type { CollectionConfig } from 'payload/types';
 import type { StaticHandler } from '../../types';
 interface Args {
     s3: AWS.S3;
     bucket: string;
+    collection: CollectionConfig;
 }
-export declare const getHandler: ({ s3, bucket }: Args) => StaticHandler;
+export declare const getHandler: ({ s3, bucket, collection }: Args) => StaticHandler;
 export {};

package/dist/adapters/s3/staticHandler.js

@@ -35,30 +35,44 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandler = void 0;
+var path_1 = __importDefault(require("path"));
+var getFilePrefix_1 = require("../../utilities/getFilePrefix");
 var getHandler = function (_a) {
-    var s3 = _a.s3, bucket = _a.bucket;
+    var s3 = _a.s3, bucket = _a.bucket, collection = _a.collection;
     return function (req, res, next) { return __awaiter(void 0, void 0, void 0, function () {
-        var response, err_1;
+        var prefix, object, err_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 2, , 3]);
+                    _a.trys.push([0, 3, , 4]);
+                    return [4 /*yield*/, (0, getFilePrefix_1.getFilePrefix)({ req: req, collection: collection })];
+                case 1:
+                    prefix = _a.sent();
                     return [4 /*yield*/, s3.getObject({
                             Bucket: bucket,
-                            Key: req.params.filename,
+                            Key: path_1.default.posix.join(prefix, req.params.filename),
                         })];
-                case 1:
-                    response = _a.sent();
-                    if (response === null || response === void 0 ? void 0 : response.Body) {
-                        return [2 /*return*/, response.Body.pipe(res)];
+                case 2:
+                    object = _a.sent();
+                    res.set({
+                        'Content-Length': object.ContentLength,
+                        'Content-Type': object.ContentType,
+                        ETag: object.ETag,
+                    });
+                    if (object === null || object === void 0 ? void 0 : object.Body) {
+                        return [2 /*return*/, object.Body.pipe(res)];
                     }
                     return [2 /*return*/, next()];
-                case 2:
+                case 3:
                     err_1 = _a.sent();
+                    req.payload.logger.error(err_1);
                     return [2 /*return*/, next()];
-                case 3: return [2 /*return*/];
+                case 4: return [2 /*return*/];
             }
         });
     }); };

package/dist/adapters/s3/staticHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"staticHandler.js","sourceRoot":"","sources":["../../../src/adapters/s3/staticHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASO,IAAM,UAAU,GAAG,UAAC,EAAoB;QAAlB,EAAE,QAAA,EAAE,MAAM,YAAA;IACrC,OAAO,UAAO,GAAG,EAAE,GAAG,EAAE,IAAI;;;;;;oBAEP,qBAAM,EAAE,CAAC,SAAS,CAAC;4BAClC,MAAM,EAAE,MAAM;4BACd,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ;yBACzB,CAAC,EAAA;;oBAHI,QAAQ,GAAG,SAGf;oBAEF,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE;wBAClB,sBAAQ,QAAQ,CAAC,IAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAA;qBAC7C;oBAED,sBAAO,IAAI,EAAE,EAAA;;;oBAEb,sBAAO,IAAI,EAAE,EAAA;;;;SAEhB,CAAA;AACH,CAAC,CAAA;AAjBY,QAAA,UAAU,cAiBtB"}
+{"version":3,"file":"staticHandler.js","sourceRoot":"","sources":["../../../src/adapters/s3/staticHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAKvB,+DAA6D;AAQtD,IAAM,UAAU,GAAG,UAAC,EAAgC;QAA9B,EAAE,QAAA,EAAE,MAAM,YAAA,EAAE,UAAU,gBAAA;IACjD,OAAO,UAAO,GAAG,EAAE,GAAG,EAAE,IAAI;;;;;;oBAET,qBAAM,IAAA,6BAAa,EAAC,EAAE,GAAG,KAAA,EAAE,UAAU,YAAA,EAAE,CAAC,EAAA;;oBAAjD,MAAM,GAAG,SAAwC;oBAExC,qBAAM,EAAE,CAAC,SAAS,CAAC;4BAChC,MAAM,EAAE,MAAM;4BACd,GAAG,EAAE,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;yBAClD,CAAC,EAAA;;oBAHI,MAAM,GAAG,SAGb;oBAEF,GAAG,CAAC,GAAG,CAAC;wBACN,gBAAgB,EAAE,MAAM,CAAC,aAAa;wBACtC,cAAc,EAAE,MAAM,CAAC,WAAW;wBAClC,IAAI,EAAE,MAAM,CAAC,IAAI;qBAClB,CAAC,CAAA;oBAEF,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,EAAE;wBAChB,sBAAQ,MAAM,CAAC,IAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAA;qBAC3C;oBAED,sBAAO,IAAI,EAAE,EAAA;;;oBAEb,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;oBAC7B,sBAAO,IAAI,EAAE,EAAA;;;;SAEhB,CAAA;AACH,CAAC,CAAA;AA1BY,QAAA,UAAU,cA0BtB"}

package/dist/fields/getFields.d.ts

@@ -3,7 +3,8 @@ import type { GeneratedAdapter } from '../types';
 interface Args {
     collection: CollectionConfig;
     disablePayloadAccessControl?: true;
+    prefix?: string;
     adapter: GeneratedAdapter;
 }
-export declare const getFields: ({ adapter, collection, disablePayloadAccessControl }: Args) => Field[];
+export declare const getFields: ({ adapter, collection, disablePayloadAccessControl, prefix, }: Args) => Field[];
 export {};

package/dist/fields/getFields.js

@@ -19,12 +19,16 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFields = void 0;
+var path_1 = __importDefault(require("path"));
 var afterRead_1 = require("../hooks/afterRead");
 var getFields = function (_a) {
     var _b;
-    var adapter = _a.adapter, collection = _a.collection, disablePayloadAccessControl = _a.disablePayloadAccessControl;
+    var adapter = _a.adapter, collection = _a.collection, disablePayloadAccessControl = _a.disablePayloadAccessControl, prefix = _a.prefix;
     var baseURLField = {
         name: 'url',
         label: 'URL',
@@ -34,6 +38,14 @@ var getFields = function (_a) {
             disabled: true,
         },
     };
+    var basePrefixField = {
+        name: 'prefix',
+        type: 'text',
+        admin: {
+            readOnly: true,
+            disabled: true,
+        },
+    };
     var fields = __spreadArray([], collection.fields, true);
     // If Payload access control is disabled,
     // inject a hook into all URL fields to point directly to the cloud source
@@ -83,6 +95,21 @@ var getFields = function (_a) {
             fields.push(sizesField);
         }
     }
+    // If prefix is enabled, save it to db
+    if (prefix) {
+        var existingPrefixFieldIndex_1 = -1;
+        var existingPrefixField = fields.find(function (existingField, i) {
+            if ('name' in existingField && existingField.name === 'prefix') {
+                existingPrefixFieldIndex_1 = i;
+                return true;
+            }
+            return false;
+        });
+        if (existingPrefixFieldIndex_1 > -1) {
+            fields.splice(existingPrefixFieldIndex_1, 1);
+        }
+        fields.push(__assign(__assign(__assign({}, basePrefixField), (existingPrefixField || {})), { defaultValue: path_1.default.posix.join(prefix) }));
+    }
     return fields;
 };
 exports.getFields = getFields;

package/dist/fields/getFields.js.map

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

package/dist/hooks/afterDelete.d.ts

@@ -1,10 +1,10 @@
 import type { TypeWithID } from 'payload/dist/globals/config/types';
 import type { FileData } from 'payload/dist/uploads/types';
 import type { CollectionAfterDeleteHook, CollectionConfig } from 'payload/types';
-import type { GeneratedAdapter } from '../types';
+import type { GeneratedAdapter, TypeWithPrefix } from '../types';
 interface Args {
     collection: CollectionConfig;
     adapter: GeneratedAdapter;
 }
-export declare const getAfterDeleteHook: ({ collection, adapter }: Args) => CollectionAfterDeleteHook<FileData & TypeWithID>;
+export declare const getAfterDeleteHook: ({ collection, adapter, }: Args) => CollectionAfterDeleteHook<FileData & TypeWithID & TypeWithPrefix>;
 export {};

package/dist/hooks/afterDelete.js.map

@@ -1 +1 @@
-{"version":3,"file":"afterDelete.js","sourceRoot":"","sources":["../../src/hooks/afterDelete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUO,IAAM,kBAAkB,GAC7B,UAAC,EAA6B;QAA3B,UAAU,gBAAA,EAAE,OAAO,aAAA;IACtB,OAAA,UAAO,EAAY;YAAV,GAAG,SAAA,EAAE,GAAG,SAAA;;;;;;;;wBAEP,aAAa;4BACjB,GAAG,CAAC,QAAQ;2BACT,MAAM,CAAC,MAAM,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC,GAAG,CAAC,UAAA,eAAe,IAAI,OAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,QAAQ,EAAzB,CAAyB,CAAC,OACrF,CAAA;wBAEK,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,UAAM,QAAQ;;;4CAC/C,qBAAM,OAAO,CAAC,YAAY,CAAC,EAAE,UAAU,YAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,QAAQ,UAAA,EAAE,CAAC,EAAA;;wCAA9D,SAA8D,CAAA;;;;6BAC/D,CAAC,CAAA;wBAEF,qBAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAA;;wBAA3B,SAA2B,CAAA;;;;wBAE3B,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACtB,uEAAgE,MAAA,UAAU,CAAC,MAAM,0CAAE,QAAQ,sBAAY,GAAG,CAAC,EAAE,MAAG,CACjH,CAAA;wBACD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;;4BAE/B,sBAAO,GAAG,EAAA;;;;KACX;AAnBD,CAmBC,CAAA;AArBU,QAAA,kBAAkB,sBAqB5B"}
+{"version":3,"file":"afterDelete.js","sourceRoot":"","sources":["../../src/hooks/afterDelete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUO,IAAM,kBAAkB,GAAG,UAAC,EAG5B;QAFL,UAAU,gBAAA,EACV,OAAO,aAAA;IAEP,OAAO,UAAO,EAAY;YAAV,GAAG,SAAA,EAAE,GAAG,SAAA;;;;;;;;wBAEd,aAAa;4BACjB,GAAG,CAAC,QAAQ;2BACT,MAAM,CAAC,MAAM,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC,GAAG,CAAC,UAAA,eAAe,IAAI,OAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,QAAQ,EAAzB,CAAyB,CAAC,OACrF,CAAA;wBAEK,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,UAAM,QAAQ;;;4CAC/C,qBAAM,OAAO,CAAC,YAAY,CAAC,EAAE,UAAU,YAAA,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,QAAQ,UAAA,EAAE,CAAC,EAAA;;wCAA9D,SAA8D,CAAA;;;;6BAC/D,CAAC,CAAA;wBAEF,qBAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAA;;wBAA3B,SAA2B,CAAA;;;;wBAE3B,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACtB,uEAAgE,MAAA,UAAU,CAAC,MAAM,0CAAE,QAAQ,sBAAY,GAAG,CAAC,EAAE,MAAG,CACjH,CAAA;wBACD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;;4BAE/B,sBAAO,GAAG,EAAA;;;;KACX,CAAA;AACH,CAAC,CAAA;AAxBY,QAAA,kBAAkB,sBAwB9B"}

package/dist/hooks/afterRead.js

@@ -42,15 +42,17 @@ var getAfterReadHook = function (_a) {
     return function (_a) {
         var data = _a.data, value = _a.value;
         return __awaiter(void 0, void 0, void 0, function () {
-            var filename, url;
+            var filename, prefix, url;
             var _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         filename = size ? (_c = (_b = data === null || data === void 0 ? void 0 : data.sizes) === null || _b === void 0 ? void 0 : _b[size.name]) === null || _c === void 0 ? void 0 : _c.filename : data === null || data === void 0 ? void 0 : data.filename;
+                        prefix = data === null || data === void 0 ? void 0 : data.prefix;
                         return [4 /*yield*/, adapter.generateURL({
                                 collection: collection,
                                 filename: filename,
+                                prefix: prefix,
                             })];
                     case 1:
                         url = _d.sent();

package/dist/hooks/afterRead.js.map

@@ -1 +1 @@
-{"version":3,"file":"afterRead.js","sourceRoot":"","sources":["../../src/hooks/afterRead.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUO,IAAM,gBAAgB,GAC3B,UAAC,EAAmC;QAAjC,UAAU,gBAAA,EAAE,OAAO,aAAA,EAAE,IAAI,UAAA;IAC5B,OAAA,UAAO,EAAe;YAAb,IAAI,UAAA,EAAE,KAAK,WAAA;;;;;;;wBACZ,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,0CAAG,IAAI,CAAC,IAAI,CAAC,0CAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAA;wBAE/D,qBAAM,OAAO,CAAC,WAAW,CAAC;gCACpC,UAAU,YAAA;gCACV,QAAQ,UAAA;6BACT,CAAC,EAAA;;wBAHI,GAAG,GAAG,SAGV;wBAEF,sBAAO,GAAG,IAAI,KAAK,EAAA;;;;KACpB;AATD,CASC,CAAA;AAXU,QAAA,gBAAgB,oBAW1B"}
+{"version":3,"file":"afterRead.js","sourceRoot":"","sources":["../../src/hooks/afterRead.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUO,IAAM,gBAAgB,GAC3B,UAAC,EAAmC;QAAjC,UAAU,gBAAA,EAAE,OAAO,aAAA,EAAE,IAAI,UAAA;IAC5B,OAAA,UAAO,EAAe;YAAb,IAAI,UAAA,EAAE,KAAK,WAAA;;;;;;;wBACZ,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,0CAAG,IAAI,CAAC,IAAI,CAAC,0CAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAA;wBACrE,MAAM,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAA;wBAEf,qBAAM,OAAO,CAAC,WAAW,CAAC;gCACpC,UAAU,YAAA;gCACV,QAAQ,UAAA;gCACR,MAAM,QAAA;6BACP,CAAC,EAAA;;wBAJI,GAAG,GAAG,SAIV;wBAEF,sBAAO,GAAG,IAAI,KAAK,EAAA;;;;KACpB;AAXD,CAWC,CAAA;AAbU,QAAA,gBAAgB,oBAa1B"}

package/dist/plugin.js

@@ -38,11 +38,15 @@ var cloudStorage = function (pluginOptions) {
         return __assign(__assign({}, config), { admin: __assign(__assign({}, (config.admin || {})), { webpack: webpack }), collections: (config.collections || []).map(function (existingCollection) {
                 var _a, _b;
                 var options = allCollectionOptions[existingCollection.slug];
-                if (options) {
-                    var adapter = options.adapter({ collection: existingCollection });
+                if (options === null || options === void 0 ? void 0 : options.adapter) {
+                    var adapter = options.adapter({
+                        collection: existingCollection,
+                        prefix: options.prefix,
+                    });
                     var fields = (0, getFields_1.getFields)({
                         collection: existingCollection,
                         disablePayloadAccessControl: options.disablePayloadAccessControl,
+                        prefix: options.prefix,
                         adapter: adapter,
                     });
                     var handlers = __spreadArray([], (typeof existingCollection.upload === 'object' &&

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AACA,qCAA+C;AAE/C,qDAA0D;AAC1D,mDAAwD;AACxD,gDAA8C;AAE9C,4EAA4E;AAC5E,4DAA4D;AAE5D,4FAA4F;AAC5F,iFAAiF;AACjF,qEAAqE;AAErE,0FAA0F;AAEnF,IAAM,YAAY,GACvB,UAAC,aAA4B;IAC7B,OAAA,UAAC,MAAc;QACL,IAAa,oBAAoB,GAAK,aAAa,YAAlB,CAAkB;QAE3D,IAAM,OAAO,GAAG,IAAA,6BAAmB,EAAC,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,QAAA,EAAE,CAAC,CAAA;QAEvE,6BACK,MAAM,KACT,KAAK,wBACA,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,KACvB,OAAO,SAAA,KAET,WAAW,EAAE,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,UAAA,kBAAkB;;gBAC5D,IAAM,OAAO,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;gBAE7D,IAAI,OAAO,EAAE;oBACX,IAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC,CAAA;oBAEnE,IAAM,MAAM,GAAG,IAAA,qBAAS,EAAC;wBACvB,UAAU,EAAE,kBAAkB;wBAC9B,2BAA2B,EAAE,OAAO,CAAC,2BAA2B;wBAChE,OAAO,SAAA;qBACR,CAAC,CAAA;oBAEF,IAAM,QAAQ,qBACT,CAAC,OAAO,kBAAkB,CAAC,MAAM,KAAK,QAAQ;wBACjD,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC;wBAC/C,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ;wBACpC,CAAC,CAAC,EAAE,CAAC,OACR,CAAA;oBAED,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE;wBACxC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;qBACrC;oBAED,6BACK,kBAAkB,KACrB,MAAM,wBACD,CAAC,OAAO,kBAAkB,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KACnF,QAAQ,UAAA,EACR,mBAAmB,EACjB,OAAO,OAAO,CAAC,mBAAmB,KAAK,SAAS;gCAC9C,CAAC,CAAC,OAAO,CAAC,mBAAmB;gCAC7B,CAAC,CAAC,IAAI,KAEZ,KAAK,wBACA,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE,CAAC,KACnC,YAAY,kCACP,CAAC,CAAA,MAAA,kBAAkB,CAAC,KAAK,0CAAE,YAAY,KAAI,EAAE,CAAC;gCACjD,IAAA,kCAAmB,EAAC,EAAE,OAAO,SAAA,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC;uCAElE,WAAW,kCACN,CAAC,CAAA,MAAA,kBAAkB,CAAC,KAAK,0CAAE,WAAW,KAAI,EAAE,CAAC;gCAChD,IAAA,gCAAkB,EAAC,EAAE,OAAO,SAAA,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC;0CAGnE,MAAM,QAAA,IACP;iBACF;gBAED,OAAO,kBAAkB,CAAA;YAC3B,CAAC,CAAC,IACH;IACH,CAAC;AA9DD,CA8DC,CAAA;AAhEU,QAAA,YAAY,gBAgEtB"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AACA,qCAA+C;AAE/C,qDAA0D;AAC1D,mDAAwD;AACxD,gDAA8C;AAE9C,4EAA4E;AAC5E,4DAA4D;AAE5D,4FAA4F;AAC5F,iFAAiF;AACjF,qEAAqE;AAErE,0FAA0F;AAEnF,IAAM,YAAY,GACvB,UAAC,aAA4B;IAC7B,OAAA,UAAC,MAAc;QACL,IAAa,oBAAoB,GAAK,aAAa,YAAlB,CAAkB;QAE3D,IAAM,OAAO,GAAG,IAAA,6BAAmB,EAAC,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,QAAA,EAAE,CAAC,CAAA;QAEvE,6BACK,MAAM,KACT,KAAK,wBACA,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,KACvB,OAAO,SAAA,KAET,WAAW,EAAE,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,UAAA,kBAAkB;;gBAC5D,IAAM,OAAO,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;gBAE7D,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,EAAE;oBACpB,IAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;wBAC9B,UAAU,EAAE,kBAAkB;wBAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;qBACvB,CAAC,CAAA;oBAEF,IAAM,MAAM,GAAG,IAAA,qBAAS,EAAC;wBACvB,UAAU,EAAE,kBAAkB;wBAC9B,2BAA2B,EAAE,OAAO,CAAC,2BAA2B;wBAChE,MAAM,EAAE,OAAO,CAAC,MAAM;wBACtB,OAAO,SAAA;qBACR,CAAC,CAAA;oBAEF,IAAM,QAAQ,qBACT,CAAC,OAAO,kBAAkB,CAAC,MAAM,KAAK,QAAQ;wBACjD,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC;wBAC/C,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ;wBACpC,CAAC,CAAC,EAAE,CAAC,OACR,CAAA;oBAED,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE;wBACxC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;qBACrC;oBAED,6BACK,kBAAkB,KACrB,MAAM,wBACD,CAAC,OAAO,kBAAkB,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KACnF,QAAQ,UAAA,EACR,mBAAmB,EACjB,OAAO,OAAO,CAAC,mBAAmB,KAAK,SAAS;gCAC9C,CAAC,CAAC,OAAO,CAAC,mBAAmB;gCAC7B,CAAC,CAAC,IAAI,KAEZ,KAAK,wBACA,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE,CAAC,KACnC,YAAY,kCACP,CAAC,CAAA,MAAA,kBAAkB,CAAC,KAAK,0CAAE,YAAY,KAAI,EAAE,CAAC;gCACjD,IAAA,kCAAmB,EAAC,EAAE,OAAO,SAAA,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC;uCAElE,WAAW,kCACN,CAAC,CAAA,MAAA,kBAAkB,CAAC,KAAK,0CAAE,WAAW,KAAI,EAAE,CAAC;gCAChD,IAAA,gCAAkB,EAAC,EAAE,OAAO,SAAA,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC;0CAGnE,MAAM,QAAA,IACP;iBACF;gBAED,OAAO,kBAAkB,CAAA;YAC3B,CAAC,CAAC,IACH;IACH,CAAC;AAlED,CAkEC,CAAA;AApEU,QAAA,YAAY,gBAoEtB"}

package/dist/types.d.ts

@@ -15,15 +15,19 @@ export declare type HandleUpload = (args: {
     data: any;
     file: File;
 }) => Promise<void> | void;
+export interface TypeWithPrefix {
+    prefix?: string;
+}
 export declare type HandleDelete = (args: {
     collection: CollectionConfig;
     req: PayloadRequest;
-    doc: TypeWithID & FileData;
+    doc: TypeWithID & FileData & TypeWithPrefix;
     filename: string;
 }) => Promise<void> | void;
 export declare type GenerateURL = (args: {
     filename: string;
     collection: CollectionConfig;
+    prefix?: string;
 }) => string | Promise<string>;
 export declare type StaticHandler = (req: PayloadRequest, res: Response, next: NextFunction) => Promise<unknown> | unknown;
 export interface GeneratedAdapter {
@@ -35,11 +39,13 @@ export interface GeneratedAdapter {
 }
 export declare type Adapter = (args: {
     collection: CollectionConfig;
+    prefix?: string;
 }) => GeneratedAdapter;
 export interface CollectionOptions {
     disableLocalStorage?: boolean;
     disablePayloadAccessControl?: true;
-    adapter: Adapter;
+    prefix?: string;
+    adapter: Adapter | null;
 }
 export interface PluginOptions {
     collections: Record<string, CollectionOptions>;

package/dist/utilities/getFilePrefix.d.ts

@@ -0,0 +1,5 @@
+import type { CollectionConfig, PayloadRequest } from 'payload/types';
+export declare function getFilePrefix({ req, collection, }: {
+    req: PayloadRequest;
+    collection: CollectionConfig;
+}): Promise<string>;

package/dist/utilities/getFilePrefix.js

@@ -0,0 +1,81 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFilePrefix = void 0;
+function getFilePrefix(_a) {
+    var _b, _c, _d;
+    var req = _a.req, collection = _a.collection;
+    return __awaiter(this, void 0, void 0, function () {
+        var imageSizes, files;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    imageSizes = ((_b = collection === null || collection === void 0 ? void 0 : collection.upload) === null || _b === void 0 ? void 0 : _b.imageSizes) || [];
+                    return [4 /*yield*/, req.payload.find({
+                            collection: collection.slug,
+                            where: {
+                                or: __spreadArray([
+                                    {
+                                        filename: { equals: req.params.filename },
+                                    }
+                                ], imageSizes.map(function (imageSize) {
+                                    var _a;
+                                    return (_a = {},
+                                        _a["sizes.".concat(imageSize.name, ".filename")] = { equals: req.params.filename },
+                                        _a);
+                                }), true),
+                            },
+                        })];
+                case 1:
+                    files = _e.sent();
+                    return [2 /*return*/, ((_d = (_c = files === null || files === void 0 ? void 0 : files.docs) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.prefix) || ''];
+            }
+        });
+    });
+}
+exports.getFilePrefix = getFilePrefix;
+//# sourceMappingURL=getFilePrefix.js.map

package/dist/utilities/getFilePrefix.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFilePrefix.js","sourceRoot":"","sources":["../../src/utilities/getFilePrefix.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,SAAsB,aAAa,CAAC,EAMnC;;QALC,GAAG,SAAA,EACH,UAAU,gBAAA;;;;;;oBAKJ,UAAU,GAAG,CAAA,MAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAA6B,0CAAE,UAAU,KAAI,EAAE,CAAA;oBACjE,qBAAM,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;4BACnC,UAAU,EAAE,UAAU,CAAC,IAAI;4BAC3B,KAAK,EAAE;gCACL,EAAE;oCACA;wCACE,QAAQ,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;qCAC1C;mCACE,UAAU,CAAC,GAAG,CAAC,UAAA,SAAS;;oCAAI,OAAA;wCAC7B,GAAC,gBAAS,SAAS,CAAC,IAAI,cAAW,IAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;2CACrE;gCAF6B,CAE7B,CAAC,OACJ;6BACF;yBACF,CAAC,EAAA;;oBAZI,KAAK,GAAG,SAYZ;oBACF,sBAAO,CAAA,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,0CAAG,CAAC,CAAC,0CAAE,MAAM,KAAI,EAAE,EAAA;;;;CACtC;AAtBD,sCAsBC"}

package/dist/webpack.js

@@ -24,7 +24,7 @@ var extendWebpackConfig = function (_a) {
             var _b;
             var slug = _a[0], collectionOptions = _a[1];
             var matchedCollection = (_b = config.collections) === null || _b === void 0 ? void 0 : _b.find(function (coll) { return coll.slug === slug; });
-            if (matchedCollection) {
+            if (matchedCollection && typeof collectionOptions.adapter === 'function') {
                 var adapter = collectionOptions.adapter({
                     collection: matchedCollection,
                 });

package/dist/webpack.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AASO,IAAM,mBAAmB,GAC9B,UAAC,EAAyB;QAAvB,MAAM,YAAA,EAAE,OAAO,aAAA;IAClB,OAAA,UAAA,aAAa;;QACX,IAAM,qBAAqB,GACzB,OAAO,CAAA,MAAA,MAAM,CAAC,KAAK,0CAAE,OAAO,CAAA,KAAK,UAAU;YACzC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;YACrC,CAAC,CAAC,aAAa,CAAA;QAEnB,IAAM,SAAS,yBACV,qBAAqB,KACxB,OAAO,wBACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,KAAK,eACA,CAAC,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,KAAK,EAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAGzF,CAAA;QAED,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAC/C,UAAC,sBAAsB,EAAE,EAAyB;;gBAAxB,IAAI,QAAA,EAAE,iBAAiB,QAAA;YAC/C,IAAM,iBAAiB,GAAG,MAAA,MAAM,CAAC,WAAW,0CAAE,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,IAAI,KAAK,IAAI,EAAlB,CAAkB,CAAC,CAAA;YAE9E,IAAI,iBAAiB,EAAE;gBACrB,IAAM,OAAO,GAAqB,iBAAiB,CAAC,OAAO,CAAC;oBAC1D,UAAU,EAAE,iBAAiB;iBAC9B,CAAC,CAAA;gBAEF,IAAI,OAAO,CAAC,OAAO,EAAE;oBACnB,OAAO,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAA;iBAC/C;aACF;YAED,OAAO,sBAAsB,CAAA;QAC/B,CAAC,EACD,SAAS,CACV,CAAA;IACH,CAAC;AAlCD,CAkCC,CAAA;AApCU,QAAA,mBAAmB,uBAoC7B"}
+{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AASO,IAAM,mBAAmB,GAC9B,UAAC,EAAyB;QAAvB,MAAM,YAAA,EAAE,OAAO,aAAA;IAClB,OAAA,UAAA,aAAa;;QACX,IAAM,qBAAqB,GACzB,OAAO,CAAA,MAAA,MAAM,CAAC,KAAK,0CAAE,OAAO,CAAA,KAAK,UAAU;YACzC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;YACrC,CAAC,CAAC,aAAa,CAAA;QAEnB,IAAM,SAAS,yBACV,qBAAqB,KACxB,OAAO,wBACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,KAAK,eACA,CAAC,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,KAAK,EAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAGzF,CAAA;QAED,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAC/C,UAAC,sBAAsB,EAAE,EAAyB;;gBAAxB,IAAI,QAAA,EAAE,iBAAiB,QAAA;YAC/C,IAAM,iBAAiB,GAAG,MAAA,MAAM,CAAC,WAAW,0CAAE,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,IAAI,KAAK,IAAI,EAAlB,CAAkB,CAAC,CAAA;YAE9E,IAAI,iBAAiB,IAAI,OAAO,iBAAiB,CAAC,OAAO,KAAK,UAAU,EAAE;gBACxE,IAAM,OAAO,GAAqB,iBAAiB,CAAC,OAAO,CAAC;oBAC1D,UAAU,EAAE,iBAAiB;iBAC9B,CAAC,CAAA;gBAEF,IAAI,OAAO,CAAC,OAAO,EAAE;oBACnB,OAAO,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAA;iBAC/C;aACF;YAED,OAAO,sBAAsB,CAAA;QAC/B,CAAC,EACD,SAAS,CACV,CAAA;IACH,CAAC;AAlCD,CAkCC,CAAA;AApCU,QAAA,mBAAmB,uBAoC7B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@payloadcms/plugin-cloud-storage",
   "description": "The official cloud storage plugin for Payload CMS",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "SEE LICENSE IN LICENSE.MD",
@@ -10,6 +10,7 @@
     "lint": "eslint src",
     "lint:fix": "eslint --fix --ext .ts,.tsx src"
   },
+  "prepublishOnly": "yarn build",
   "peerDependencies": {
     "@aws-sdk/client-s3": "^3.142.0",
     "@azure/storage-blob": "^12.11.0",