@payloadcms/plugin-cloud-storage 1.0.18 → 1.1.0-beta.0

package/dev/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "payload-plugin-cloud-storage-demo",
+  "version": "1.0.0",
+  "main": "dist/server.js",
+  "license": "MIT",
+  "private": true,
+  "scripts": {
+    "dev:azure": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER=azure nodemon",
+    "dev:s3": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER=s3 nodemon",
+    "dev:gcs": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER=gcs nodemon",
+    "build:payload": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload build",
+    "build:server": "tsc",
+    "build": "yarn build:payload && yarn build:server",
+    "serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js",
+    "generate:types": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types"
+  },
+  "dependencies": {
+    "@aws-sdk/client-s3": "^3.142.0",
+    "@azure/storage-blob": "^12.11.0",
+    "@google-cloud/storage": "^6.4.2",
+    "dotenv": "^8.2.0",
+    "express": "^4.17.1",
+    "image-size": "^1.0.2",
+    "payload": "^1.7.2",
+    "probe-image-size": "^7.2.3"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.9",
+    "cross-env": "^7.0.3",
+    "nodemon": "^2.0.6",
+    "ts-node": "^9.1.1",
+    "typescript": "^4.1.3"
+  }
+}

package/dev/src/collections/Media.ts

@@ -0,0 +1,56 @@
+/* eslint-disable no-console */
+import type { CollectionConfig, Field } from 'payload/types'
+
+const urlField: Field = {
+  name: 'url',
+  type: 'text',
+  hooks: {
+    afterRead: [
+      ({ value }) => {
+        console.log('hello from hook')
+        return value
+      },
+    ],
+  },
+}
+
+export const Media: CollectionConfig = {
+  slug: 'media',
+  upload: {
+    imageSizes: [
+      {
+        height: 400,
+        width: 400,
+        crop: 'center',
+        name: 'square',
+      },
+      {
+        width: 900,
+        height: 450,
+        crop: 'center',
+        name: 'sixteenByNineMedium',
+      },
+    ],
+  },
+  fields: [
+    {
+      name: 'alt',
+      label: 'Alt Text',
+      type: 'text',
+    },
+
+    // The following fields should be able to be merged in to default upload fields
+    urlField,
+    {
+      name: 'sizes',
+      type: 'group',
+      fields: [
+        {
+          name: 'square',
+          type: 'group',
+          fields: [urlField],
+        },
+      ],
+    },
+  ],
+}

package/dev/src/collections/Users.ts

@@ -0,0 +1,23 @@
+import type { CollectionConfig } from 'payload/types'
+
+const Users: CollectionConfig = {
+  slug: 'users',
+  auth: true,
+  access: {
+    read: () => true,
+  },
+  fields: [
+    {
+      name: 'avatar',
+      type: 'upload',
+      relationTo: 'media',
+    },
+    {
+      name: 'background',
+      type: 'upload',
+      relationTo: 'media',
+    },
+  ],
+}
+
+export default Users

package/dev/src/mocks/fsMock.js

@@ -0,0 +1 @@
+module.exports = { fs: { createReadStream: () => null } }

package/dev/src/mocks/promisifyMock.js

@@ -0,0 +1 @@
+export const promisify = () => {}

package/dev/src/payload.config.ts

@@ -0,0 +1,123 @@
+import { buildConfig } from 'payload/config'
+import path from 'path'
+import Users from './collections/Users'
+import { cloudStorage } from '../../src'
+import { s3Adapter } from '../../src/adapters/s3'
+import { gcsAdapter } from '../../src/adapters/gcs'
+import { azureBlobStorageAdapter } from '../../src/adapters/azure'
+import type { Adapter } from '../../src/types'
+import { Media } from './collections/Media'
+
+let adapter: Adapter
+let uploadOptions
+
+if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 'azure') {
+  adapter = azureBlobStorageAdapter({
+    connectionString: process.env.AZURE_STORAGE_CONNECTION_STRING,
+    containerName: process.env.AZURE_STORAGE_CONTAINER_NAME,
+    allowContainerCreate: process.env.AZURE_STORAGE_ALLOW_CONTAINER_CREATE === 'true',
+    baseURL: process.env.AZURE_STORAGE_ACCOUNT_BASEURL,
+  })
+  // uploadOptions = {
+  //   useTempFiles: true,
+  // }
+}
+
+if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 's3') {
+  // The s3 adapter supports using temp files for uploads
+  uploadOptions = {
+    useTempFiles: true,
+  }
+
+  adapter = s3Adapter({
+    config: {
+      endpoint: process.env.S3_ENDPOINT,
+      forcePathStyle: process.env.S3_FORCE_PATH_STYLE === 'true',
+      region: process.env.S3_REGION,
+      credentials: {
+        accessKeyId: process.env.S3_ACCESS_KEY_ID,
+        secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
+      },
+    },
+    bucket: process.env.S3_BUCKET,
+  })
+}
+
+if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 'gcs') {
+  adapter = gcsAdapter({
+    options: {
+      apiEndpoint: process.env.GCS_ENDPOINT,
+      projectId: process.env.GCS_PROJECT_ID,
+    },
+    bucket: process.env.GCS_BUCKET,
+  })
+}
+
+export default buildConfig({
+  serverURL: 'http://localhost:3000',
+  collections: [Media, Users],
+  upload: uploadOptions,
+  admin: {
+    // NOTE - these webpack extensions are only required
+    // for development of this plugin.
+    // No need to use these aliases within your own projects.
+    webpack: config => {
+      const newConfig = {
+        ...config,
+        resolve: {
+          ...(config.resolve || {}),
+          alias: {
+            ...(config.resolve.alias || {}),
+            react: path.resolve(__dirname, '../node_modules/react'),
+            [path.resolve(__dirname, '../../src/index')]: path.resolve(
+              __dirname,
+              '../../src/admin/index.ts',
+            ),
+            [path.resolve(__dirname, '../../src/adapters/s3/index')]: path.resolve(
+              __dirname,
+              '../../src/adapters/s3/mock.js',
+            ),
+            [path.resolve(__dirname, '../../src/adapters/gcs/index')]: path.resolve(
+              __dirname,
+              '../../src/adapters/gcs/mock.js',
+            ),
+            [path.resolve(__dirname, '../../src/adapters/azure/index')]: path.resolve(
+              __dirname,
+              '../../src/adapters/azure/mock.js',
+            ),
+          },
+        },
+      }
+      return newConfig
+    },
+  },
+  typescript: {
+    outputFile: path.resolve(__dirname, 'payload-types.ts'),
+  },
+  plugins: [
+    // @ts-expect-error Conflicting types for relative package
+    cloudStorage({
+      collections: {
+        media: {
+          adapter,
+        },
+      },
+    }),
+  ],
+  onInit: async payload => {
+    const users = await payload.find({
+      collection: 'users',
+      limit: 1,
+    })
+
+    if (!users.docs.length) {
+      await payload.create({
+        collection: 'users',
+        data: {
+          email: 'dev@payloadcms.com',
+          password: 'test',
+        },
+      })
+    }
+  },
+})

package/dev/src/server.ts

@@ -0,0 +1,26 @@
+import express from 'express'
+import payload from 'payload'
+
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+require('dotenv').config()
+
+const app = express()
+
+// Redirect root to Admin panel
+app.get('/', (_, res) => {
+  res.redirect('/admin')
+})
+
+// Initialize Payload
+payload.init({
+  secret: process.env.PAYLOAD_SECRET,
+  mongoURL: process.env.MONGODB_URI,
+  express: app,
+  onInit: () => {
+    payload.logger.info(`Payload Admin URL: ${payload.getAdminURL()}`)
+  },
+})
+
+// Add your own express routes here
+
+app.listen(3000)

package/dev/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "strict": false,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "outDir": "./dist",
+    "rootDir": "../",
+    "jsx": "react",
+    "sourceMap": true
+  },
+  "ts-node": {
+    "transpileOnly": true
+  }
+}

package/dist/adapters/azure/handleUpload.js

@@ -50,11 +50,12 @@ var getHandleUpload = function (_a) {
     return function (_a) {
         var data = _a.data, file = _a.file;
         return __awaiter(void 0, void 0, void 0, function () {
-            var blockBlobClient, fileBufferOrStream;
+            var fileKey, blockBlobClient, fileBufferOrStream;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        blockBlobClient = getStorageClient().getBlockBlobClient(path_1.default.posix.join(prefix, file.filename));
+                        fileKey = path_1.default.posix.join(data.prefix || prefix, file.filename);
+                        blockBlobClient = getStorageClient().getBlockBlobClient(fileKey);
                         if (!(!file.tempFilePath && file.buffer.length > 0 && file.buffer.length < multipartThreshold)) return [3 /*break*/, 2];
                         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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,0CAAmB;AACnB,iCAAiC;AAEjC,4DAAyD;AAUzD,IAAM,kBAAkB,GAAG,IAAI,GAAG,IAAI,GAAG,EAAE,CAAA,CAAC,OAAO;AAC5C,IAAM,eAAe,GAAG,UAAC,EAAuC;QAArC,gBAAgB,sBAAA,EAAE,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;IAC7D,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBAClB,eAAe,GAAG,gBAAgB,EAAE,CAAC,kBAAkB,CAC3D,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CACvC,CAAA;6BAGG,CAAA,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,kBAAkB,CAAA,EAAvF,wBAAuF;wBACzF,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;;wBAGP,kBAAkB,GAAa,IAAI,CAAC,YAAY;4BACpD,CAAC,CAAC,YAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC;4BACxC,CAAC,CAAC,iBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;wBAE9B,qBAAM,eAAe,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,EAAE;gCACzE,WAAW,EAAE,kCAAe,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;6BACrD,CAAC,EAAA;;wBAFF,SAEE,CAAA;wBAEF,sBAAO,IAAI,EAAA;;;;KACZ,CAAA;AACH,CAAC,CAAA;AAzBY,QAAA,eAAe,mBAyB3B"}
+{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/azure/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,0CAAmB;AACnB,iCAAiC;AAEjC,4DAAyD;AAUzD,IAAM,kBAAkB,GAAG,IAAI,GAAG,IAAI,GAAG,EAAE,CAAA,CAAC,OAAO;AAC5C,IAAM,eAAe,GAAG,UAAC,EAAuC;QAArC,gBAAgB,sBAAA,EAAE,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;IAC7D,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBAClB,OAAO,GAAG,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;wBAE/D,eAAe,GAAG,gBAAgB,EAAE,CAAC,kBAAkB,CAC3D,OAAO,CACR,CAAA;6BAGG,CAAA,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,kBAAkB,CAAA,EAAvF,wBAAuF;wBACzF,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;;wBAGP,kBAAkB,GAAa,IAAI,CAAC,YAAY;4BACpD,CAAC,CAAC,YAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC;4BACxC,CAAC,CAAC,iBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;wBAE9B,qBAAM,eAAe,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,EAAE;gCACzE,WAAW,EAAE,kCAAe,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;6BACrD,CAAC,EAAA;;wBAFF,SAEE,CAAA;wBAEF,sBAAO,IAAI,EAAA;;;;KACZ,CAAA;AACH,CAAC,CAAA;AA3BY,QAAA,eAAe,mBA2B3B"}

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

@@ -1,13 +1 @@
-export namespace BlobServiceClient {
-    function fromConnectionString(): {
-        getContainerClient: () => {
-            createIfNotExists: () => null;
-        };
-    };
-}
-export namespace AbortController {
-    function timeout(): null;
-}
-export namespace Readable {
-    function from(): null;
-}
+export function azureBlobStorageAdapter(): {};

package/dist/adapters/azure/mock.js

@@ -1,13 +1,6 @@
 "use strict";
-exports.BlobServiceClient = {
-    fromConnectionString: function () { return ({
-        getContainerClient: function () { return ({
-            createIfNotExists: function () { return null; },
-        }); },
-    }); },
-};
-exports.AbortController = {
-    timeout: function () { return null; },
-};
-exports.Readable = { from: function () { return null; } };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.azureBlobStorageAdapter = void 0;
+var azureBlobStorageAdapter = function () { return ({}); };
+exports.azureBlobStorageAdapter = azureBlobStorageAdapter;
 //# sourceMappingURL=mock.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/adapters/azure/mock.js"],"names":[],"mappings":";AAAA,OAAO,CAAC,iBAAiB,GAAG;IAC1B,oBAAoB,EAAE,cAAM,OAAA,CAAC;QAC3B,kBAAkB,EAAE,cAAM,OAAA,CAAC;YACzB,iBAAiB,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI;SAC9B,CAAC,EAFwB,CAExB;KACH,CAAC,EAJ0B,CAI1B;CACH,CAAA;AAED,OAAO,CAAC,eAAe,GAAG;IACxB,OAAO,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI;CACpB,CAAA;AAED,OAAO,CAAC,QAAQ,GAAG,EAAE,IAAI,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,EAAE,CAAA"}
+{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/adapters/azure/mock.js"],"names":[],"mappings":";;;AAAO,IAAM,uBAAuB,GAAG,cAAM,OAAA,CAAC,EAAE,CAAC,EAAJ,CAAI,CAAA;AAApC,QAAA,uBAAuB,2BAAa"}

package/dist/adapters/azure/webpack.js

@@ -18,7 +18,7 @@ exports.extendWebpackConfig = void 0;
 var path_1 = __importDefault(require("path"));
 var extendWebpackConfig = function (existingWebpackConfig) {
     var _a, _b;
-    var newConfig = __assign(__assign({}, existingWebpackConfig), { resolve: __assign(__assign({}, (existingWebpackConfig.resolve || {})), { fallback: __assign(__assign({}, (((_a = existingWebpackConfig.resolve) === null || _a === void 0 ? void 0 : _a.fallback) ? existingWebpackConfig.resolve.fallback : {})), { stream: false }), alias: __assign(__assign({}, (((_b = existingWebpackConfig.resolve) === null || _b === void 0 ? void 0 : _b.alias) ? existingWebpackConfig.resolve.alias : {})), { stream: path_1.default.resolve(__dirname, './mock.js'), '@azure/storage-blob': path_1.default.resolve(__dirname, './mock.js'), '@azure/abort-controller': path_1.default.resolve(__dirname, './mock.js'), fs: path_1.default.resolve(__dirname, './fileStub.js') }) }) });
+    var newConfig = __assign(__assign({}, existingWebpackConfig), { resolve: __assign(__assign({}, (existingWebpackConfig.resolve || {})), { fallback: __assign(__assign({}, (((_a = existingWebpackConfig.resolve) === null || _a === void 0 ? void 0 : _a.fallback) ? existingWebpackConfig.resolve.fallback : {})), { stream: false }), alias: __assign(__assign({}, (((_b = existingWebpackConfig.resolve) === null || _b === void 0 ? void 0 : _b.alias) ? existingWebpackConfig.resolve.alias : {})), { '@payloadcms/plugin-cloud-storage/azure': path_1.default.resolve(__dirname, './mock.js') }) }) });
     return newConfig;
 };
 exports.extendWebpackConfig = extendWebpackConfig;

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

@@ -1 +1 @@
-{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../src/adapters/azure/webpack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,8CAAuB;AAEhB,IAAM,mBAAmB,GAAG,UAAC,qBAAoC;;IACtE,IAAM,SAAS,yBACV,qBAAqB,KACxB,OAAO,wBACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,QAAQ,wBACH,CAAC,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,QAAQ,EAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAC1F,MAAM,EAAE,KAAK,KAEf,KAAK,wBACA,CAAC,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,KAAK,EAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KACpF,MAAM,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,EAC5C,qBAAqB,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,EAC3D,yBAAyB,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,EAC/D,EAAE,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,SAGjD,CAAA;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AApBY,QAAA,mBAAmB,uBAoB/B"}
+{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../src/adapters/azure/webpack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,8CAAuB;AAEhB,IAAM,mBAAmB,GAAG,UAAC,qBAAoC;;IACtE,IAAM,SAAS,yBACV,qBAAqB,KACxB,OAAO,wBACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,QAAQ,wBACH,CAAC,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,QAAQ,EAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAC1F,MAAM,EAAE,KAAK,KAEf,KAAK,wBACA,CAAC,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,KAAK,EAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KACpF,wCAAwC,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,SAGnF,CAAA;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAjBY,QAAA,mBAAmB,uBAiB/B"}

package/dist/adapters/gcs/handleUpload.js

@@ -46,11 +46,12 @@ var getHandleUpload = function (_a) {
     return function (_a) {
         var data = _a.data, file = _a.file;
         return __awaiter(void 0, void 0, void 0, function () {
-            var gcsFile;
+            var fileKey, gcsFile;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        gcsFile = getStorageClient().bucket(bucket).file(path_1.default.posix.join(prefix, file.filename));
+                        fileKey = path_1.default.posix.join(data.prefix || prefix, file.filename);
+                        gcsFile = getStorageClient().bucket(bucket).file(fileKey);
                         return [4 /*yield*/, gcsFile.save(file.buffer, {
                                 metadata: {
                                     contentType: file.mimeType,

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

@@ -1 +1 @@
-{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/gcs/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAahB,IAAM,eAAe,GAAG,UAAC,EAKzB;QAJL,gBAAgB,sBAAA,EAChB,MAAM,YAAA,EACN,GAAG,SAAA,EACH,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;IAEX,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBAClB,OAAO,GAAG,gBAAgB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;wBAC9F,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;AApBY,QAAA,eAAe,mBAoB3B"}
+{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/gcs/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAahB,IAAM,eAAe,GAAG,UAAC,EAKzB;QAJL,gBAAgB,sBAAA,EAChB,MAAM,YAAA,EACN,GAAG,SAAA,EACH,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;IAEX,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBAClB,OAAO,GAAG,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;wBAE/D,OAAO,GAAG,gBAAgB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;wBAC/D,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;AAtBY,QAAA,eAAe,mBAsB3B"}

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

@@ -1,4 +1,4 @@
-import { StorageOptions } from '@google-cloud/storage';
+import type { StorageOptions } from '@google-cloud/storage';
 import type { Adapter } from '../../types';
 export interface Args {
     options: StorageOptions;

package/dist/adapters/gcs/index.js

@@ -15,7 +15,8 @@ var gcsAdapter = function (_a) {
         var getStorageClient = function () {
             if (storageClient)
                 return storageClient;
-            return (storageClient = new storage_1.Storage(options));
+            storageClient = new storage_1.Storage(options);
+            return storageClient;
         };
         return {
             handleUpload: (0, handleUpload_1.getHandleUpload)({

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,EAAsB;YAApB,UAAU,gBAAA,EAAE,MAAM,YAAA;QACnB,IAAI,aAAa,GAAmB,IAAI,CAAA;QACxC,IAAM,gBAAgB,GAAG;YACvB,IAAI,aAAa;gBAAE,OAAO,aAAa,CAAA;YACvC,OAAO,CAAC,aAAa,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC,CAAA;QAC/C,CAAC,CAAA;QAED,OAAO;YACL,YAAY,EAAE,IAAA,8BAAe,EAAC;gBAC5B,UAAU,YAAA;gBACV,gBAAgB,kBAAA;gBAChB,MAAM,QAAA;gBACN,GAAG,KAAA;gBACH,MAAM,QAAA;aACP,CAAC;YACF,YAAY,EAAE,IAAA,8BAAe,EAAC,EAAE,gBAAgB,kBAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC3D,WAAW,EAAE,IAAA,4BAAc,EAAC,EAAE,gBAAgB,kBAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YACzD,aAAa,EAAE,IAAA,0BAAU,EAAC,EAAE,gBAAgB,kBAAA,EAAE,MAAM,QAAA,EAAE,UAAU,YAAA,EAAE,CAAC;YACnE,OAAO,EAAE,6BAAmB;SAC7B,CAAA;IACH,CAAC;AApBD,CAoBC,CAAA;AAtBU,QAAA,UAAU,cAsBpB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/gcs/index.ts"],"names":[],"mappings":";;;AACA,iDAA+C;AAE/C,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,IAAI,aAAa,GAAmB,IAAI,CAAA;QAExC,IAAM,gBAAgB,GAAG;YACvB,IAAI,aAAa;gBAAE,OAAO,aAAa,CAAA;YACvC,aAAa,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAA;YACpC,OAAO,aAAa,CAAA;QACtB,CAAC,CAAA;QAED,OAAO;YACL,YAAY,EAAE,IAAA,8BAAe,EAAC;gBAC5B,UAAU,YAAA;gBACV,gBAAgB,kBAAA;gBAChB,MAAM,QAAA;gBACN,GAAG,KAAA;gBACH,MAAM,QAAA;aACP,CAAC;YACF,YAAY,EAAE,IAAA,8BAAe,EAAC,EAAE,gBAAgB,kBAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YAC3D,WAAW,EAAE,IAAA,4BAAc,EAAC,EAAE,gBAAgB,kBAAA,EAAE,MAAM,QAAA,EAAE,CAAC;YACzD,aAAa,EAAE,IAAA,0BAAU,EAAC,EAAE,gBAAgB,kBAAA,EAAE,MAAM,QAAA,EAAE,UAAU,YAAA,EAAE,CAAC;YACnE,OAAO,EAAE,6BAAmB;SAC7B,CAAA;IACH,CAAC;AAtBD,CAsBC,CAAA;AAxBU,QAAA,UAAU,cAwBpB"}

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

@@ -1 +1 @@
-export function Storage(): null;
+export function gcsAdapter(): {};

package/dist/adapters/gcs/mock.js

@@ -1,5 +1,6 @@
 "use strict";
-exports.Storage = function () {
-    return null;
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gcsAdapter = void 0;
+var gcsAdapter = function () { return ({}); };
+exports.gcsAdapter = gcsAdapter;
 //# sourceMappingURL=mock.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/adapters/gcs/mock.js"],"names":[],"mappings":";AAAA,OAAO,CAAC,OAAO,GAAG;IAChB,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}
+{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/adapters/gcs/mock.js"],"names":[],"mappings":";;;AAAO,IAAM,UAAU,GAAG,cAAM,OAAA,CAAC,EAAE,CAAC,EAAJ,CAAI,CAAA;AAAvB,QAAA,UAAU,cAAa"}

package/dist/adapters/s3/handleUpload.js

@@ -53,7 +53,7 @@ var getHandleUpload = function (_a) {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        fileKey = path_1.default.posix.join(prefix, file.filename);
+                        fileKey = path_1.default.posix.join(data.prefix || prefix, file.filename);
                         fileBufferOrStream = file.tempFilePath
                             ? fs_1.default.createReadStream(file.tempFilePath)
                             : file.buffer;

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

@@ -1 +1 @@
-{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/s3/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAmB;AACnB,8CAAuB;AAKvB,oDAA6C;AAW7C,IAAM,kBAAkB,GAAG,IAAI,GAAG,IAAI,GAAG,EAAE,CAAA,CAAC,OAAO;AAE5C,IAAM,eAAe,GAAG,UAAC,EAKzB;QAJL,gBAAgB,sBAAA,EAChB,MAAM,YAAA,EACN,GAAG,SAAA,EACH,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;IAEX,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBAClB,OAAO,GAAG,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;wBAEhD,kBAAkB,GAA6B,IAAI,CAAC,YAAY;4BACpE,CAAC,CAAC,YAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC;4BACxC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAA;6BAEX,CAAA,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,kBAAkB,CAAA,EAAjE,wBAAiE;wBACnE,qBAAM,gBAAgB,EAAE,CAAC,SAAS,CAAC;gCACjC,MAAM,EAAE,MAAM;gCACd,GAAG,EAAE,OAAO;gCACZ,IAAI,EAAE,kBAAkB;gCACxB,GAAG,EAAE,GAAG;gCACR,WAAW,EAAE,IAAI,CAAC,QAAQ;6BAC3B,CAAC,EAAA;;wBANF,SAME,CAAA;wBAEF,sBAAO,IAAI,EAAA;;wBAGP,gBAAgB,GAAG,IAAI,oBAAM,CAAC;4BAClC,MAAM,EAAE,gBAAgB,EAAE;4BAC1B,MAAM,EAAE;gCACN,MAAM,EAAE,MAAM;gCACd,GAAG,EAAE,OAAO;gCACZ,IAAI,EAAE,kBAAkB;gCACxB,GAAG,EAAE,GAAG;gCACR,WAAW,EAAE,IAAI,CAAC,QAAQ;6BAC3B;4BACD,SAAS,EAAE,CAAC;4BACZ,QAAQ,EAAE,kBAAkB;yBAC7B,CAAC,CAAA;wBAEF,qBAAM,gBAAgB,CAAC,IAAI,EAAE,EAAA;;wBAA7B,SAA6B,CAAA;wBAE7B,sBAAO,IAAI,EAAA;;;;KACZ,CAAA;AACH,CAAC,CAAA;AA1CY,QAAA,eAAe,mBA0C3B"}
+{"version":3,"file":"handleUpload.js","sourceRoot":"","sources":["../../../src/adapters/s3/handleUpload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAmB;AACnB,8CAAuB;AAKvB,oDAA6C;AAW7C,IAAM,kBAAkB,GAAG,IAAI,GAAG,IAAI,GAAG,EAAE,CAAA,CAAC,OAAO;AAE5C,IAAM,eAAe,GAAG,UAAC,EAKzB;QAJL,gBAAgB,sBAAA,EAChB,MAAM,YAAA,EACN,GAAG,SAAA,EACH,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;IAEX,OAAO,UAAO,EAAc;YAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBAClB,OAAO,GAAG,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;wBAE/D,kBAAkB,GAA6B,IAAI,CAAC,YAAY;4BACpE,CAAC,CAAC,YAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC;4BACxC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAA;6BAEX,CAAA,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,kBAAkB,CAAA,EAAjE,wBAAiE;wBACnE,qBAAM,gBAAgB,EAAE,CAAC,SAAS,CAAC;gCACjC,MAAM,EAAE,MAAM;gCACd,GAAG,EAAE,OAAO;gCACZ,IAAI,EAAE,kBAAkB;gCACxB,GAAG,EAAE,GAAG;gCACR,WAAW,EAAE,IAAI,CAAC,QAAQ;6BAC3B,CAAC,EAAA;;wBANF,SAME,CAAA;wBAEF,sBAAO,IAAI,EAAA;;wBAGP,gBAAgB,GAAG,IAAI,oBAAM,CAAC;4BAClC,MAAM,EAAE,gBAAgB,EAAE;4BAC1B,MAAM,EAAE;gCACN,MAAM,EAAE,MAAM;gCACd,GAAG,EAAE,OAAO;gCACZ,IAAI,EAAE,kBAAkB;gCACxB,GAAG,EAAE,GAAG;gCACR,WAAW,EAAE,IAAI,CAAC,QAAQ;6BAC3B;4BACD,SAAS,EAAE,CAAC;4BACZ,QAAQ,EAAE,kBAAkB;yBAC7B,CAAC,CAAA;wBAEF,qBAAM,gBAAgB,CAAC,IAAI,EAAE,EAAA;;wBAA7B,SAA6B,CAAA;wBAE7B,sBAAO,IAAI,EAAA;;;;KACZ,CAAA;AACH,CAAC,CAAA;AA1CY,QAAA,eAAe,mBA0C3B"}

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

@@ -1,8 +1 @@
-export function S3(): null;
-export function Upload(): null;
-export function HeadObjectCommand(): null;
-export function PutObjectCommand(): null;
-export function UploadPartCommand(): null;
-export function CreateMultipartUploadCommand(): null;
-export function CompleteMultipartUploadCommand(): null;
-export function PutObjectTaggingCommand(): null;
+export function s3Adapter(): {};

package/dist/adapters/s3/mock.js

@@ -1,10 +1,6 @@
 "use strict";
-exports.S3 = function () { return null; };
-exports.Upload = function () { return null; };
-exports.HeadObjectCommand = function () { return null; };
-exports.PutObjectCommand = function () { return null; };
-exports.UploadPartCommand = function () { return null; };
-exports.CreateMultipartUploadCommand = function () { return null; };
-exports.CompleteMultipartUploadCommand = function () { return null; };
-exports.PutObjectTaggingCommand = function () { return null; };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.s3Adapter = void 0;
+var s3Adapter = function () { return ({}); };
+exports.s3Adapter = s3Adapter;
 //# 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,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAA;AACvB,OAAO,CAAC,MAAM,GAAG,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAA;AAE3B,OAAO,CAAC,iBAAiB,GAAG,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAA;AACtC,OAAO,CAAC,gBAAgB,GAAG,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAA;AACrC,OAAO,CAAC,iBAAiB,GAAG,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAA;AACtC,OAAO,CAAC,4BAA4B,GAAG,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAA;AACjD,OAAO,CAAC,8BAA8B,GAAG,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAA;AACnD,OAAO,CAAC,uBAAuB,GAAG,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAA"}
+{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/adapters/s3/mock.js"],"names":[],"mappings":";;;AAAO,IAAM,SAAS,GAAG,cAAM,OAAA,CAAC,EAAE,CAAC,EAAJ,CAAI,CAAA;AAAtB,QAAA,SAAS,aAAa"}

package/dist/adapters/s3/webpack.js

@@ -18,7 +18,7 @@ exports.extendWebpackConfig = void 0;
 var path_1 = __importDefault(require("path"));
 var extendWebpackConfig = function (existingWebpackConfig) {
     var _a, _b;
-    var newConfig = __assign(__assign({}, existingWebpackConfig), { resolve: __assign(__assign({}, (existingWebpackConfig.resolve || {})), { fallback: __assign(__assign({}, (((_a = existingWebpackConfig.resolve) === null || _a === void 0 ? void 0 : _a.fallback) ? existingWebpackConfig.resolve.fallback : {})), { stream: false }), alias: __assign(__assign({}, (((_b = existingWebpackConfig.resolve) === null || _b === void 0 ? void 0 : _b.alias) ? existingWebpackConfig.resolve.alias : {})), { '@aws-sdk/client-s3': path_1.default.resolve(__dirname, './mock.js'), '@aws-sdk/lib-storage': path_1.default.resolve(__dirname, './mock.js'), fs: path_1.default.resolve(__dirname, './fsMock.js') }) }) });
+    var newConfig = __assign(__assign({}, existingWebpackConfig), { resolve: __assign(__assign({}, (existingWebpackConfig.resolve || {})), { fallback: __assign(__assign({}, (((_a = existingWebpackConfig.resolve) === null || _a === void 0 ? void 0 : _a.fallback) ? existingWebpackConfig.resolve.fallback : {})), { stream: false }), alias: __assign(__assign({}, (((_b = existingWebpackConfig.resolve) === null || _b === void 0 ? void 0 : _b.alias) ? existingWebpackConfig.resolve.alias : {})), { '@payloadcms/plugin-cloud-storage/s3': path_1.default.resolve(__dirname, './mock.js') }) }) });
     return newConfig;
 };
 exports.extendWebpackConfig = extendWebpackConfig;

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

@@ -1 +1 @@
-{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../src/adapters/s3/webpack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,8CAAuB;AAEhB,IAAM,mBAAmB,GAAG,UAAC,qBAAoC;;IACtE,IAAM,SAAS,yBACV,qBAAqB,KACxB,OAAO,wBACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,QAAQ,wBACH,CAAC,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,QAAQ,EAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAC1F,MAAM,EAAE,KAAK,KAEf,KAAK,wBACA,CAAC,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,KAAK,EAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KACpF,oBAAoB,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,EAC1D,sBAAsB,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,EAC5D,EAAE,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,SAG/C,CAAA;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAnBY,QAAA,mBAAmB,uBAmB/B"}
+{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../src/adapters/s3/webpack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,8CAAuB;AAEhB,IAAM,mBAAmB,GAAG,UAAC,qBAAoC;;IACtE,IAAM,SAAS,yBACV,qBAAqB,KACxB,OAAO,wBACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,QAAQ,wBACH,CAAC,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,QAAQ,EAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAC1F,MAAM,EAAE,KAAK,KAEf,KAAK,wBACA,CAAC,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,KAAK,EAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KACpF,qCAAqC,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,SAGhF,CAAA;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAjBY,QAAA,mBAAmB,uBAiB/B"}

package/dist/admin/fields/getFields.d.ts

@@ -0,0 +1,7 @@
+import type { CollectionConfig, Field } from 'payload/types';
+interface Args {
+    collection: CollectionConfig;
+    prefix?: string;
+}
+export declare const getFields: ({ collection, prefix }: Args) => Field[];
+export {};

package/dist/admin/fields/getFields.js

@@ -0,0 +1,102 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+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));
+};
+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 getFields = function (_a) {
+    var collection = _a.collection, prefix = _a.prefix;
+    var baseURLField = {
+        name: 'url',
+        label: 'URL',
+        type: 'text',
+        admin: {
+            readOnly: true,
+            hidden: true,
+        },
+    };
+    var basePrefixField = {
+        name: 'prefix',
+        type: 'text',
+        admin: {
+            readOnly: true,
+            hidden: true,
+        },
+    };
+    var fields = __spreadArray([], collection.fields, true);
+    // Inject a hook into all URL fields to generate URLs
+    var existingURLFieldIndex = -1;
+    var existingURLField = fields.find(function (existingField, i) {
+        if ('name' in existingField && existingField.name === 'url') {
+            existingURLFieldIndex = i;
+            return true;
+        }
+        return false;
+    });
+    if (existingURLFieldIndex > -1) {
+        fields.splice(existingURLFieldIndex, 1);
+    }
+    fields.push(__assign(__assign({}, baseURLField), (existingURLField || {})));
+    if (typeof collection.upload === 'object' && collection.upload.imageSizes) {
+        var existingSizesFieldIndex_1 = -1;
+        var existingSizesField_1 = fields.find(function (existingField, i) {
+            if ('name' in existingField && existingField.name === 'sizes') {
+                existingSizesFieldIndex_1 = i;
+                return true;
+            }
+            return false;
+        });
+        if (existingSizesFieldIndex_1 > -1) {
+            fields.splice(existingSizesFieldIndex_1, 1);
+        }
+        var sizesField = __assign(__assign({}, (existingSizesField_1 || {})), { name: 'sizes', type: 'group', admin: {
+                hidden: true,
+            }, fields: collection.upload.imageSizes.map(function (size) {
+                var existingSizeField = existingSizesField_1 === null || existingSizesField_1 === void 0 ? void 0 : existingSizesField_1.fields.find(function (existingField) { return 'name' in existingField && existingField.name === size.name; });
+                var existingSizeURLField = existingSizeField === null || existingSizeField === void 0 ? void 0 : existingSizeField.fields.find(function (existingField) { return 'name' in existingField && existingField.name === 'url'; });
+                return __assign(__assign({}, existingSizeField), { name: size.name, type: 'group', fields: [
+                        __assign(__assign({}, (existingSizeURLField || {})), baseURLField),
+                    ] });
+            }) });
+        fields.push(sizesField);
+    }
+    // If prefix is enabled, save it to db
+    if (typeof prefix !== 'undefined') {
+        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;
+//# sourceMappingURL=getFields.js.map