@payloadcms/storage-uploadthing 3.0.0-beta.30

package/LICENSE.md

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2018-2022 Payload CMS, LLC <info@payloadcms.com>
+Portions Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,32 @@
+# Uploadthing Storage for Payload (beta)
+
+This package provides a way to use [uploadthing](https://uploadthing.com) with Payload.
+
+## Installation
+
+```sh
+pnpm add @paylaodcms/storage-uploadthing
+```
+
+## Usage
+
+- Configure the `collections` object to specify which collections should use uploadthing. The slug _must_ match one of your existing collection slugs and be an `upload` type.
+- Get an API key from Uploadthing and set it as `apiKey` in the `options` object.
+- `acl` is optional and defaults to `public-read`.
+
+```ts
+export default buildConfig({
+  collections: [Media],
+  plugins: [
+    uploadthingStorage({
+      collections: {
+        [mediaSlug]: true,
+      },
+      options: {
+        apiKey: process.env.UPLOADTHING_SECRET,
+        acl: 'public-read',
+      },
+    }),
+  ],
+})
+```

package/dist/generateURL.d.ts

@@ -0,0 +1,3 @@
+import type { GenerateURL } from '@payloadcms/plugin-cloud-storage/types';
+export declare const generateURL: GenerateURL;
+//# sourceMappingURL=generateURL.d.ts.map

package/dist/generateURL.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateURL.d.ts","sourceRoot":"","sources":["../src/generateURL.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AAMzE,eAAO,MAAM,WAAW,EAAE,WAGzB,CAAA"}

package/dist/generateURL.js

@@ -0,0 +1,8 @@
+import path from 'path';
+import { getKeyFromFilename } from './utilities.js';
+export const generateURL = ({ data, filename, prefix = '' })=>{
+    const key = getKeyFromFilename(data, filename);
+    return `https://utfs.io/f/${path.posix.join(prefix, key || '')}`;
+};
+
+//# sourceMappingURL=generateURL.js.map

package/dist/generateURL.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import type { GenerateURL } from '@payloadcms/plugin-cloud-storage/types'\n\nimport path from 'path'\n\nimport { getKeyFromFilename } from './utilities.js'\n\nexport const generateURL: GenerateURL = ({ data, filename, prefix = '' }) => {\n  const key = getKeyFromFilename(data, filename)\n  return `https://utfs.io/f/${path.posix.join(prefix, key || '')}`\n}\n"],"names":["path","getKeyFromFilename","generateURL","data","filename","prefix","key","posix","join"],"rangeMappings":";;;;;","mappings":"AAEA,OAAOA,UAAU,OAAM;AAEvB,SAASC,kBAAkB,QAAQ,iBAAgB;AAEnD,OAAO,MAAMC,cAA2B,CAAC,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,SAAS,EAAE,EAAE;IACtE,MAAMC,MAAML,mBAAmBE,MAAMC;IACrC,OAAO,CAAC,kBAAkB,EAAEJ,KAAKO,KAAK,CAACC,IAAI,CAACH,QAAQC,OAAO,IAAI,CAAC;AAClE,EAAC"}

package/dist/handleDelete.d.ts

@@ -0,0 +1,8 @@
+import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types';
+import type { UTApi } from 'uploadthing/server';
+type Args = {
+    utApi: UTApi;
+};
+export declare const getHandleDelete: ({ utApi }: Args) => HandleDelete;
+export {};
+//# sourceMappingURL=handleDelete.d.ts.map

package/dist/handleDelete.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleDelete.d.ts","sourceRoot":"","sources":["../src/handleDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAM/C,KAAK,IAAI,GAAG;IACV,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,eAAO,MAAM,eAAe,cAAe,IAAI,KAAG,YAuBjD,CAAA"}

package/dist/handleDelete.js

@@ -0,0 +1,26 @@
+import { APIError } from 'payload/errors';
+import { getKeyFromFilename } from './utilities.js';
+export const getHandleDelete = ({ utApi })=>{
+    return async ({ doc, filename, req })=>{
+        const key = getKeyFromFilename(doc, filename);
+        if (!key) {
+            req.payload.logger.error({
+                msg: `Error deleting file: ${filename} - unable to extract key from doc`
+            });
+            throw new APIError(`Error deleting file: ${filename}`);
+        }
+        try {
+            if (key) {
+                await utApi.deleteFiles(key);
+            }
+        } catch (err) {
+            req.payload.logger.error({
+                err,
+                msg: `Error deleting file with key: ${filename} - key: ${key}`
+            });
+            throw new APIError(`Error deleting file: ${filename}`);
+        }
+    };
+};
+
+//# sourceMappingURL=handleDelete.js.map

package/dist/handleDelete.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/handleDelete.ts"],"sourcesContent":["import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types'\nimport type { UTApi } from 'uploadthing/server'\n\nimport { APIError } from 'payload/errors'\n\nimport { getKeyFromFilename } from './utilities.js'\n\ntype Args = {\n  utApi: UTApi\n}\n\nexport const getHandleDelete = ({ utApi }: Args): HandleDelete => {\n  return async ({ doc, filename, req }) => {\n    const key = getKeyFromFilename(doc, filename)\n\n    if (!key) {\n      req.payload.logger.error({\n        msg: `Error deleting file: ${filename} - unable to extract key from doc`,\n      })\n      throw new APIError(`Error deleting file: ${filename}`)\n    }\n\n    try {\n      if (key) {\n        await utApi.deleteFiles(key)\n      }\n    } catch (err) {\n      req.payload.logger.error({\n        err,\n        msg: `Error deleting file with key: ${filename} - key: ${key}`,\n      })\n      throw new APIError(`Error deleting file: ${filename}`)\n    }\n  }\n}\n"],"names":["APIError","getKeyFromFilename","getHandleDelete","utApi","doc","filename","req","key","payload","logger","error","msg","deleteFiles","err"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,QAAQ,QAAQ,iBAAgB;AAEzC,SAASC,kBAAkB,QAAQ,iBAAgB;AAMnD,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,KAAK,EAAQ;IAC7C,OAAO,OAAO,EAAEC,GAAG,EAAEC,QAAQ,EAAEC,GAAG,EAAE;QAClC,MAAMC,MAAMN,mBAAmBG,KAAKC;QAEpC,IAAI,CAACE,KAAK;YACRD,IAAIE,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBACvBC,KAAK,CAAC,qBAAqB,EAAEN,SAAS,iCAAiC,CAAC;YAC1E;YACA,MAAM,IAAIL,SAAS,CAAC,qBAAqB,EAAEK,SAAS,CAAC;QACvD;QAEA,IAAI;YACF,IAAIE,KAAK;gBACP,MAAMJ,MAAMS,WAAW,CAACL;YAC1B;QACF,EAAE,OAAOM,KAAK;YACZP,IAAIE,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBACvBG;gBACAF,KAAK,CAAC,8BAA8B,EAAEN,SAAS,QAAQ,EAAEE,IAAI,CAAC;YAChE;YACA,MAAM,IAAIP,SAAS,CAAC,qBAAqB,EAAEK,SAAS,CAAC;QACvD;IACF;AACF,EAAC"}

package/dist/handleUpload.d.ts

@@ -0,0 +1,10 @@
+import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types';
+import type { UTApi } from 'uploadthing/server';
+import type { ACL } from './index.js';
+type HandleUploadArgs = {
+    acl: ACL;
+    utApi: UTApi;
+};
+export declare const getHandleUpload: ({ acl, utApi }: HandleUploadArgs) => HandleUpload;
+export {};
+//# sourceMappingURL=handleUpload.d.ts.map

package/dist/handleUpload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleUpload.d.ts","sourceRoot":"","sources":["../src/handleUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAK/C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAErC,KAAK,gBAAgB,GAAG;IACtB,GAAG,EAAE,GAAG,CAAA;IACR,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,eAAO,MAAM,eAAe,mBAAoB,gBAAgB,KAAG,YA2ClE,CAAA"}

package/dist/handleUpload.js

@@ -0,0 +1,45 @@
+import { APIError } from 'payload/errors';
+import { UTFile } from 'uploadthing/server';
+export const getHandleUpload = ({ acl, utApi })=>{
+    return async ({ data, file })=>{
+        try {
+            const { buffer, filename, mimeType } = file;
+            const blob = new Blob([
+                buffer
+            ], {
+                type: mimeType
+            });
+            const res = await utApi.uploadFiles(new UTFile([
+                blob
+            ], filename), {
+                acl
+            });
+            if (res.error) {
+                throw new APIError(`Error uploading file: ${res.error.code} - ${res.error.message}`);
+            }
+            // Find matching data.sizes entry
+            const foundSize = Object.keys(data.sizes || {}).find((key)=>data.sizes?.[key]?.filename === filename);
+            if (foundSize) {
+                data.sizes[foundSize]._key = res.data?.key;
+            } else {
+                data._key = res.data?.key;
+                data.filename = res.data?.name;
+            }
+            return data;
+        } catch (error) {
+            if (error instanceof Error) {
+                // Interrogate uploadthing error which returns FiberFailure
+                if ('toJSON' in error && typeof error.toJSON === 'function') {
+                    const json = error.toJSON();
+                    if (json.cause?.defect?.error && json.cause.defect.data?.error) {
+                        throw new APIError(`Error uploading file with uploadthing: ${json.cause.defect.error} - ${json.cause.defect.data.error}`);
+                    }
+                } else {
+                    throw new APIError(`Error uploading file with uploadthing: ${error.message}`);
+                }
+            }
+        }
+    };
+};
+
+//# sourceMappingURL=handleUpload.js.map

package/dist/handleUpload.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/handleUpload.ts"],"sourcesContent":["import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types'\nimport type { UTApi } from 'uploadthing/server'\n\nimport { APIError } from 'payload/errors'\nimport { UTFile } from 'uploadthing/server'\n\nimport type { ACL } from './index.js'\n\ntype HandleUploadArgs = {\n  acl: ACL\n  utApi: UTApi\n}\n\nexport const getHandleUpload = ({ acl, utApi }: HandleUploadArgs): HandleUpload => {\n  return async ({ data, file }) => {\n    try {\n      const { buffer, filename, mimeType } = file\n\n      const blob = new Blob([buffer], { type: mimeType })\n      const res = await utApi.uploadFiles(new UTFile([blob], filename), { acl })\n\n      if (res.error) {\n        throw new APIError(`Error uploading file: ${res.error.code} - ${res.error.message}`)\n      }\n\n      // Find matching data.sizes entry\n      const foundSize = Object.keys(data.sizes || {}).find(\n        (key) => data.sizes?.[key]?.filename === filename,\n      )\n\n      if (foundSize) {\n        data.sizes[foundSize]._key = res.data?.key\n      } else {\n        data._key = res.data?.key\n        data.filename = res.data?.name\n      }\n\n      return data\n    } catch (error: unknown) {\n      if (error instanceof Error) {\n        // Interrogate uploadthing error which returns FiberFailure\n        if ('toJSON' in error && typeof error.toJSON === 'function') {\n          const json = error.toJSON() as {\n            cause?: { defect?: { _id?: string; data?: { error?: string }; error?: string } }\n          }\n          if (json.cause?.defect?.error && json.cause.defect.data?.error) {\n            throw new APIError(\n              `Error uploading file with uploadthing: ${json.cause.defect.error} - ${json.cause.defect.data.error}`,\n            )\n          }\n        } else {\n          throw new APIError(`Error uploading file with uploadthing: ${error.message}`)\n        }\n      }\n    }\n  }\n}\n"],"names":["APIError","UTFile","getHandleUpload","acl","utApi","data","file","buffer","filename","mimeType","blob","Blob","type","res","uploadFiles","error","code","message","foundSize","Object","keys","sizes","find","key","_key","name","Error","toJSON","json","cause","defect"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,QAAQ,QAAQ,iBAAgB;AACzC,SAASC,MAAM,QAAQ,qBAAoB;AAS3C,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,GAAG,EAAEC,KAAK,EAAoB;IAC9D,OAAO,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;QAC1B,IAAI;YACF,MAAM,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAGH;YAEvC,MAAMI,OAAO,IAAIC,KAAK;gBAACJ;aAAO,EAAE;gBAAEK,MAAMH;YAAS;YACjD,MAAMI,MAAM,MAAMT,MAAMU,WAAW,CAAC,IAAIb,OAAO;gBAACS;aAAK,EAAEF,WAAW;gBAAEL;YAAI;YAExE,IAAIU,IAAIE,KAAK,EAAE;gBACb,MAAM,IAAIf,SAAS,CAAC,sBAAsB,EAAEa,IAAIE,KAAK,CAACC,IAAI,CAAC,GAAG,EAAEH,IAAIE,KAAK,CAACE,OAAO,CAAC,CAAC;YACrF;YAEA,iCAAiC;YACjC,MAAMC,YAAYC,OAAOC,IAAI,CAACf,KAAKgB,KAAK,IAAI,CAAC,GAAGC,IAAI,CAClD,CAACC,MAAQlB,KAAKgB,KAAK,EAAE,CAACE,IAAI,EAAEf,aAAaA;YAG3C,IAAIU,WAAW;gBACbb,KAAKgB,KAAK,CAACH,UAAU,CAACM,IAAI,GAAGX,IAAIR,IAAI,EAAEkB;YACzC,OAAO;gBACLlB,KAAKmB,IAAI,GAAGX,IAAIR,IAAI,EAAEkB;gBACtBlB,KAAKG,QAAQ,GAAGK,IAAIR,IAAI,EAAEoB;YAC5B;YAEA,OAAOpB;QACT,EAAE,OAAOU,OAAgB;YACvB,IAAIA,iBAAiBW,OAAO;gBAC1B,2DAA2D;gBAC3D,IAAI,YAAYX,SAAS,OAAOA,MAAMY,MAAM,KAAK,YAAY;oBAC3D,MAAMC,OAAOb,MAAMY,MAAM;oBAGzB,IAAIC,KAAKC,KAAK,EAAEC,QAAQf,SAASa,KAAKC,KAAK,CAACC,MAAM,CAACzB,IAAI,EAAEU,OAAO;wBAC9D,MAAM,IAAIf,SACR,CAAC,uCAAuC,EAAE4B,KAAKC,KAAK,CAACC,MAAM,CAACf,KAAK,CAAC,GAAG,EAAEa,KAAKC,KAAK,CAACC,MAAM,CAACzB,IAAI,CAACU,KAAK,CAAC,CAAC;oBAEzG;gBACF,OAAO;oBACL,MAAM,IAAIf,SAAS,CAAC,uCAAuC,EAAEe,MAAME,OAAO,CAAC,CAAC;gBAC9E;YACF;QACF;IACF;AACF,EAAC"}

package/dist/index.d.ts

@@ -0,0 +1,30 @@
+import type { CollectionOptions } from '@payloadcms/plugin-cloud-storage/types';
+import type { Plugin } from 'payload/config';
+import type { UTApiOptions } from 'uploadthing/types';
+export type UploadthingStorageOptions = {
+    /**
+     * Collection options to apply the adapter to.
+     */
+    collections: Record<string, Omit<CollectionOptions, 'adapter'> | true>;
+    /**
+     * Whether or not to enable the plugin
+     *
+     * Default: true
+     */
+    enabled?: boolean;
+    /**
+     * Uploadthing Options
+     */
+    options: UTApiOptions & {
+        /**
+         * @default 'public-read'
+         */
+        acl?: ACL;
+    };
+};
+type UploadthingPlugin = (uploadthingStorageOptions: UploadthingStorageOptions) => Plugin;
+/** NOTE: not synced with uploadthing's internal types. Need to modify if more options added */
+export type ACL = 'private' | 'public-read';
+export declare const uploadthingStorage: UploadthingPlugin;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,iBAAiB,EAElB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAUrD,MAAM,MAAM,yBAAyB,GAAG;IACtC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAA;IAEtE;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;OAEG;IACH,OAAO,EAAE,YAAY,GAAG;QACtB;;WAEG;QACH,GAAG,CAAC,EAAE,GAAG,CAAA;KACV,CAAA;CACF,CAAA;AAED,KAAK,iBAAiB,GAAG,CAAC,yBAAyB,EAAE,yBAAyB,KAAK,MAAM,CAAA;AAEzF,+FAA+F;AAC/F,MAAM,MAAM,GAAG,GAAG,SAAS,GAAG,aAAa,CAAA;AAE3C,eAAO,MAAM,kBAAkB,EAAE,iBAuD9B,CAAA"}

package/dist/index.js

@@ -0,0 +1,79 @@
+import { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage';
+import { UTApi } from 'uploadthing/server';
+import { generateURL } from './generateURL.js';
+import { getHandleDelete } from './handleDelete.js';
+import { getHandleUpload } from './handleUpload.js';
+import { getHandler } from './staticHandler.js';
+export const uploadthingStorage = (uploadthingStorageOptions)=>(incomingConfig)=>{
+        if (uploadthingStorageOptions.enabled === false) {
+            return incomingConfig;
+        }
+        // Default ACL to public-read
+        if (!uploadthingStorageOptions.options.acl) {
+            uploadthingStorageOptions.options.acl = 'public-read';
+        }
+        const adapter = uploadthingInternal(uploadthingStorageOptions, incomingConfig);
+        // Add adapter to each collection option object
+        const collectionsWithAdapter = Object.entries(uploadthingStorageOptions.collections).reduce((acc, [slug, collOptions])=>({
+                ...acc,
+                [slug]: {
+                    ...collOptions === true ? {} : collOptions,
+                    // Disable payload access control if the ACL is public-read or not set
+                    // ...(uploadthingStorageOptions.options.acl === 'public-read'
+                    //   ? { disablePayloadAccessControl: true }
+                    //   : {}),
+                    adapter
+                }
+            }), {});
+        // Set disableLocalStorage: true for collections specified in the plugin options
+        const config = {
+            ...incomingConfig,
+            collections: (incomingConfig.collections || []).map((collection)=>{
+                if (!collectionsWithAdapter[collection.slug]) {
+                    return collection;
+                }
+                return {
+                    ...collection,
+                    upload: {
+                        ...typeof collection.upload === 'object' ? collection.upload : {},
+                        disableLocalStorage: true
+                    }
+                };
+            })
+        };
+        return cloudStoragePlugin({
+            collections: collectionsWithAdapter
+        })(config);
+    };
+function uploadthingInternal(options, incomingConfig) {
+    const fields = [
+        {
+            name: '_key',
+            type: 'text',
+            admin: {
+                hidden: true
+            }
+        }
+    ];
+    return ()=>{
+        const { options: { acl = 'public-read', ...utOptions } } = options;
+        const utApi = new UTApi(utOptions);
+        return {
+            name: 'uploadthing',
+            fields,
+            generateURL,
+            handleDelete: getHandleDelete({
+                utApi
+            }),
+            handleUpload: getHandleUpload({
+                acl,
+                utApi
+            }),
+            staticHandler: getHandler({
+                utApi
+            })
+        };
+    };
+}
+
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  Adapter,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin } from 'payload/config'\nimport type { Field } from 'payload/types'\nimport type { UTApiOptions } from 'uploadthing/types'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { UTApi } from 'uploadthing/server'\n\nimport { generateURL } from './generateURL.js'\nimport { getHandleDelete } from './handleDelete.js'\nimport { getHandleUpload } from './handleUpload.js'\nimport { getHandler } from './staticHandler.js'\n\nexport type UploadthingStorageOptions = {\n  /**\n   * Collection options to apply the adapter to.\n   */\n  collections: Record<string, Omit<CollectionOptions, 'adapter'> | true>\n\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n\n  /**\n   * Uploadthing Options\n   */\n  options: UTApiOptions & {\n    /**\n     * @default 'public-read'\n     */\n    acl?: ACL\n  }\n}\n\ntype UploadthingPlugin = (uploadthingStorageOptions: UploadthingStorageOptions) => Plugin\n\n/** NOTE: not synced with uploadthing's internal types. Need to modify if more options added */\nexport type ACL = 'private' | 'public-read'\n\nexport const uploadthingStorage: UploadthingPlugin =\n  (uploadthingStorageOptions: UploadthingStorageOptions) =>\n  (incomingConfig: Config): Config => {\n    if (uploadthingStorageOptions.enabled === false) {\n      return incomingConfig\n    }\n\n    // Default ACL to public-read\n    if (!uploadthingStorageOptions.options.acl) {\n      uploadthingStorageOptions.options.acl = 'public-read'\n    }\n\n    const adapter = uploadthingInternal(uploadthingStorageOptions, incomingConfig)\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      uploadthingStorageOptions.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\n\n          // Disable payload access control if the ACL is public-read or not set\n          // ...(uploadthingStorageOptions.options.acl === 'public-read'\n          //   ? { disablePayloadAccessControl: true }\n          //   : {}),\n\n          adapter,\n        },\n      }),\n      {} as Record<string, CollectionOptions>,\n    )\n\n    // Set disableLocalStorage: true for collections specified in the plugin options\n    const config = {\n      ...incomingConfig,\n      collections: (incomingConfig.collections || []).map((collection) => {\n        if (!collectionsWithAdapter[collection.slug]) {\n          return collection\n        }\n\n        return {\n          ...collection,\n          upload: {\n            ...(typeof collection.upload === 'object' ? collection.upload : {}),\n            disableLocalStorage: true,\n          },\n        }\n      }),\n    }\n\n    return cloudStoragePlugin({\n      collections: collectionsWithAdapter,\n    })(config)\n  }\n\nfunction uploadthingInternal(options: UploadthingStorageOptions, incomingConfig: Config): Adapter {\n  const fields: Field[] = [\n    {\n      name: '_key',\n      type: 'text',\n      admin: {\n        hidden: true,\n      },\n    },\n  ]\n\n  return (): GeneratedAdapter => {\n    const {\n      options: { acl = 'public-read', ...utOptions },\n    } = options\n\n    const utApi = new UTApi(utOptions)\n\n    return {\n      name: 'uploadthing',\n      fields,\n      generateURL,\n      handleDelete: getHandleDelete({ utApi }),\n      handleUpload: getHandleUpload({ acl, utApi }),\n      staticHandler: getHandler({ utApi }),\n    }\n  }\n}\n"],"names":["cloudStoragePlugin","UTApi","generateURL","getHandleDelete","getHandleUpload","getHandler","uploadthingStorage","uploadthingStorageOptions","incomingConfig","enabled","options","acl","adapter","uploadthingInternal","collectionsWithAdapter","Object","entries","collections","reduce","acc","slug","collOptions","config","map","collection","upload","disableLocalStorage","fields","name","type","admin","hidden","utOptions","utApi","handleDelete","handleUpload","staticHandler"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAUA,SAASA,kBAAkB,QAAQ,mCAAkC;AACrE,SAASC,KAAK,QAAQ,qBAAoB;AAE1C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,UAAU,QAAQ,qBAAoB;AA+B/C,OAAO,MAAMC,qBACX,CAACC,4BACD,CAACC;QACC,IAAID,0BAA0BE,OAAO,KAAK,OAAO;YAC/C,OAAOD;QACT;QAEA,6BAA6B;QAC7B,IAAI,CAACD,0BAA0BG,OAAO,CAACC,GAAG,EAAE;YAC1CJ,0BAA0BG,OAAO,CAACC,GAAG,GAAG;QAC1C;QAEA,MAAMC,UAAUC,oBAAoBN,2BAA2BC;QAE/D,+CAA+C;QAC/C,MAAMM,yBAAmEC,OAAOC,OAAO,CACrFT,0BAA0BU,WAAW,EACrCC,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;gBAC7B,GAAGF,GAAG;gBACN,CAACC,KAAK,EAAE;oBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;oBAE3C,sEAAsE;oBACtE,8DAA8D;oBAC9D,4CAA4C;oBAC5C,WAAW;oBAEXT;gBACF;YACF,CAAA,GACA,CAAC;QAGH,gFAAgF;QAChF,MAAMU,SAAS;YACb,GAAGd,cAAc;YACjBS,aAAa,AAACT,CAAAA,eAAeS,WAAW,IAAI,EAAE,AAAD,EAAGM,GAAG,CAAC,CAACC;gBACnD,IAAI,CAACV,sBAAsB,CAACU,WAAWJ,IAAI,CAAC,EAAE;oBAC5C,OAAOI;gBACT;gBAEA,OAAO;oBACL,GAAGA,UAAU;oBACbC,QAAQ;wBACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;wBAClEC,qBAAqB;oBACvB;gBACF;YACF;QACF;QAEA,OAAO1B,mBAAmB;YACxBiB,aAAaH;QACf,GAAGQ;IACL,EAAC;AAEH,SAAST,oBAAoBH,OAAkC,EAAEF,cAAsB;IACrF,MAAMmB,SAAkB;QACtB;YACEC,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,QAAQ;YACV;QACF;KACD;IAED,OAAO;QACL,MAAM,EACJrB,SAAS,EAAEC,MAAM,aAAa,EAAE,GAAGqB,WAAW,EAC/C,GAAGtB;QAEJ,MAAMuB,QAAQ,IAAIhC,MAAM+B;QAExB,OAAO;YACLJ,MAAM;YACND;YACAzB;YACAgC,cAAc/B,gBAAgB;gBAAE8B;YAAM;YACtCE,cAAc/B,gBAAgB;gBAAEO;gBAAKsB;YAAM;YAC3CG,eAAe/B,WAAW;gBAAE4B;YAAM;QACpC;IACF;AACF"}

package/dist/staticHandler.d.ts

@@ -0,0 +1,8 @@
+import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types';
+import type { UTApi } from 'uploadthing/server';
+type Args = {
+    utApi: UTApi;
+};
+export declare const getHandler: ({ utApi }: Args) => StaticHandler;
+export {};
+//# sourceMappingURL=staticHandler.d.ts.map

package/dist/staticHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"staticHandler.d.ts","sourceRoot":"","sources":["../src/staticHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAE3E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAI/C,KAAK,IAAI,GAAG;IACV,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,eAAO,MAAM,UAAU,cAAe,IAAI,KAAG,aAqE5C,CAAA"}

package/dist/staticHandler.js

@@ -0,0 +1,80 @@
+import { getKeyFromFilename } from './utilities.js';
+export const getHandler = ({ utApi })=>{
+    return async (req, { doc, params: { collection, filename } })=>{
+        try {
+            const collectionConfig = req.payload.collections[collection]?.config;
+            let retrievedDoc = doc;
+            if (!retrievedDoc) {
+                const or = [
+                    {
+                        filename: {
+                            equals: filename
+                        }
+                    }
+                ];
+                if (collectionConfig.upload.imageSizes) {
+                    collectionConfig.upload.imageSizes.forEach(({ name })=>{
+                        or.push({
+                            [`sizes.${name}.filename`]: {
+                                equals: filename
+                            }
+                        });
+                    });
+                }
+                const result = await req.payload.db.findOne({
+                    collection,
+                    req,
+                    where: {
+                        or
+                    }
+                });
+                if (result) retrievedDoc = result;
+            }
+            if (!retrievedDoc) {
+                return new Response(null, {
+                    status: 404,
+                    statusText: 'Not Found'
+                });
+            }
+            const key = getKeyFromFilename(retrievedDoc, filename);
+            if (!key) {
+                return new Response(null, {
+                    status: 404,
+                    statusText: 'Not Found'
+                });
+            }
+            const { url: signedURL } = await utApi.getSignedURL(key);
+            if (!signedURL) {
+                return new Response(null, {
+                    status: 404,
+                    statusText: 'Not Found'
+                });
+            }
+            const response = await fetch(signedURL);
+            if (!response.ok) {
+                return new Response(null, {
+                    status: 404,
+                    statusText: 'Not Found'
+                });
+            }
+            const blob = await response.blob();
+            return new Response(blob, {
+                headers: new Headers({
+                    'Content-Length': String(blob.size),
+                    'Content-Type': blob.type
+                }),
+                status: 200
+            });
+        } catch (err) {
+            req.payload.logger.error({
+                err,
+                msg: 'Unexpected error in staticHandler'
+            });
+            return new Response('Internal Server Error', {
+                status: 500
+            });
+        }
+    };
+};
+
+//# sourceMappingURL=staticHandler.js.map

package/dist/staticHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { Where } from 'payload/types'\nimport type { UTApi } from 'uploadthing/server'\n\nimport { getKeyFromFilename } from './utilities.js'\n\ntype Args = {\n  utApi: UTApi\n}\n\nexport const getHandler = ({ utApi }: Args): StaticHandler => {\n  return async (req, { doc, params: { collection, filename } }) => {\n    try {\n      const collectionConfig = req.payload.collections[collection]?.config\n      let retrievedDoc = doc\n\n      if (!retrievedDoc) {\n        const or: Where[] = [\n          {\n            filename: {\n              equals: filename,\n            },\n          },\n        ]\n\n        if (collectionConfig.upload.imageSizes) {\n          collectionConfig.upload.imageSizes.forEach(({ name }) => {\n            or.push({\n              [`sizes.${name}.filename`]: {\n                equals: filename,\n              },\n            })\n          })\n        }\n\n        const result = await req.payload.db.findOne({\n          collection,\n          req,\n          where: { or },\n        })\n\n        if (result) retrievedDoc = result\n      }\n\n      if (!retrievedDoc) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const key = getKeyFromFilename(retrievedDoc, filename)\n      if (!key) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const { url: signedURL } = await utApi.getSignedURL(key)\n\n      if (!signedURL) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const response = await fetch(signedURL)\n\n      if (!response.ok) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const blob = await response.blob()\n\n      return new Response(blob, {\n        headers: new Headers({\n          'Content-Length': String(blob.size),\n          'Content-Type': blob.type,\n        }),\n        status: 200,\n      })\n    } catch (err) {\n      req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n      return new Response('Internal Server Error', { status: 500 })\n    }\n  }\n}\n"],"names":["getKeyFromFilename","getHandler","utApi","req","doc","params","collection","filename","collectionConfig","payload","collections","config","retrievedDoc","or","equals","upload","imageSizes","forEach","name","push","result","db","findOne","where","Response","status","statusText","key","url","signedURL","getSignedURL","response","fetch","ok","blob","headers","Headers","String","size","type","err","logger","error","msg"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,kBAAkB,QAAQ,iBAAgB;AAMnD,OAAO,MAAMC,aAAa,CAAC,EAAEC,KAAK,EAAQ;IACxC,OAAO,OAAOC,KAAK,EAAEC,GAAG,EAAEC,QAAQ,EAAEC,UAAU,EAAEC,QAAQ,EAAE,EAAE;QAC1D,IAAI;YACF,MAAMC,mBAAmBL,IAAIM,OAAO,CAACC,WAAW,CAACJ,WAAW,EAAEK;YAC9D,IAAIC,eAAeR;YAEnB,IAAI,CAACQ,cAAc;gBACjB,MAAMC,KAAc;oBAClB;wBACEN,UAAU;4BACRO,QAAQP;wBACV;oBACF;iBACD;gBAED,IAAIC,iBAAiBO,MAAM,CAACC,UAAU,EAAE;oBACtCR,iBAAiBO,MAAM,CAACC,UAAU,CAACC,OAAO,CAAC,CAAC,EAAEC,IAAI,EAAE;wBAClDL,GAAGM,IAAI,CAAC;4BACN,CAAC,CAAC,MAAM,EAAED,KAAK,SAAS,CAAC,CAAC,EAAE;gCAC1BJ,QAAQP;4BACV;wBACF;oBACF;gBACF;gBAEA,MAAMa,SAAS,MAAMjB,IAAIM,OAAO,CAACY,EAAE,CAACC,OAAO,CAAC;oBAC1ChB;oBACAH;oBACAoB,OAAO;wBAAEV;oBAAG;gBACd;gBAEA,IAAIO,QAAQR,eAAeQ;YAC7B;YAEA,IAAI,CAACR,cAAc;gBACjB,OAAO,IAAIY,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAMC,MAAM3B,mBAAmBY,cAAcL;YAC7C,IAAI,CAACoB,KAAK;gBACR,OAAO,IAAIH,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAM,EAAEE,KAAKC,SAAS,EAAE,GAAG,MAAM3B,MAAM4B,YAAY,CAACH;YAEpD,IAAI,CAACE,WAAW;gBACd,OAAO,IAAIL,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAMK,WAAW,MAAMC,MAAMH;YAE7B,IAAI,CAACE,SAASE,EAAE,EAAE;gBAChB,OAAO,IAAIT,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAMQ,OAAO,MAAMH,SAASG,IAAI;YAEhC,OAAO,IAAIV,SAASU,MAAM;gBACxBC,SAAS,IAAIC,QAAQ;oBACnB,kBAAkBC,OAAOH,KAAKI,IAAI;oBAClC,gBAAgBJ,KAAKK,IAAI;gBAC3B;gBACAd,QAAQ;YACV;QACF,EAAE,OAAOe,KAAK;YACZrC,IAAIM,OAAO,CAACgC,MAAM,CAACC,KAAK,CAAC;gBAAEF;gBAAKG,KAAK;YAAoC;YACzE,OAAO,IAAInB,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;IACF;AACF,EAAC"}

package/dist/utilities.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Extract '_key' value from the doc safely
+ */
+export declare const getKeyFromFilename: (doc: unknown, filename: string) => string | undefined;
+//# sourceMappingURL=utilities.d.ts.map

package/dist/utilities.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,kBAAkB,QAAS,OAAO,YAAY,MAAM,uBAoBhE,CAAA"}

package/dist/utilities.js

@@ -0,0 +1,19 @@
+/**
+ * Extract '_key' value from the doc safely
+ */ export const getKeyFromFilename = (doc, filename)=>{
+    if (doc && typeof doc === 'object' && 'filename' in doc && doc.filename === filename && '_key' in doc) {
+        return doc._key;
+    }
+    if (doc && typeof doc === 'object' && 'sizes' in doc) {
+        const sizes = doc.sizes;
+        if (typeof sizes === 'object' && sizes !== null) {
+            for (const size of Object.values(sizes)){
+                if (size?.filename === filename && '_key' in size) {
+                    return size._key;
+                }
+            }
+        }
+    }
+};
+
+//# sourceMappingURL=utilities.js.map

package/dist/utilities.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/utilities.ts"],"sourcesContent":["/**\n * Extract '_key' value from the doc safely\n */\nexport const getKeyFromFilename = (doc: unknown, filename: string) => {\n  if (\n    doc &&\n    typeof doc === 'object' &&\n    'filename' in doc &&\n    doc.filename === filename &&\n    '_key' in doc\n  ) {\n    return doc._key as string\n  }\n  if (doc && typeof doc === 'object' && 'sizes' in doc) {\n    const sizes = doc.sizes\n    if (typeof sizes === 'object' && sizes !== null) {\n      for (const size of Object.values(sizes)) {\n        if (size?.filename === filename && '_key' in size) {\n          return size._key as string\n        }\n      }\n    }\n  }\n}\n"],"names":["getKeyFromFilename","doc","filename","_key","sizes","size","Object","values"],"rangeMappings":";;;;;;;;;;;;;;;;","mappings":"AAAA;;CAEC,GACD,OAAO,MAAMA,qBAAqB,CAACC,KAAcC;IAC/C,IACED,OACA,OAAOA,QAAQ,YACf,cAAcA,OACdA,IAAIC,QAAQ,KAAKA,YACjB,UAAUD,KACV;QACA,OAAOA,IAAIE,IAAI;IACjB;IACA,IAAIF,OAAO,OAAOA,QAAQ,YAAY,WAAWA,KAAK;QACpD,MAAMG,QAAQH,IAAIG,KAAK;QACvB,IAAI,OAAOA,UAAU,YAAYA,UAAU,MAAM;YAC/C,KAAK,MAAMC,QAAQC,OAAOC,MAAM,CAACH,OAAQ;gBACvC,IAAIC,MAAMH,aAAaA,YAAY,UAAUG,MAAM;oBACjD,OAAOA,KAAKF,IAAI;gBAClB;YACF;QACF;IACF;AACF,EAAC"}

package/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@payloadcms/storage-uploadthing",
+  "version": "3.0.0-beta.30",
+  "description": "Payload storage adapter for uploadthing",
+  "homepage": "https://payloadcms.com",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/payloadcms/payload.git",
+    "directory": "packages/storage-uploadthing"
+  },
+  "license": "MIT",
+  "author": "Payload <dev@payloadcms.com> (https://payloadcms.com)",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "dependencies": {
+    "uploadthing": "^6.10.1",
+    "@payloadcms/plugin-cloud-storage": "3.0.0-beta.30"
+  },
+  "devDependencies": {
+    "payload": "3.0.0-beta.30"
+  },
+  "peerDependencies": {
+    "payload": "3.0.0-beta.30"
+  },
+  "engines": {
+    "node": ">=18.20.2"
+  },
+  "scripts": {
+    "build": "pnpm build:swc && pnpm build:types",
+    "build:clean": "find . \\( -type d \\( -name build -o -name dist -o -name .cache \\) -o -type f -name tsconfig.tsbuildinfo \\) -exec rm -rf {} + && pnpm build",
+    "build:swc": "swc ./src -d ./dist --config-file .swcrc",
+    "build:types": "tsc --emitDeclarationOnly --outDir dist",
+    "clean": "rimraf {dist,*.tsbuildinfo}"
+  }
+}