@payloadcms/storage-uploadthing 3.82.1 → 3.83.0-canary.1

package/dist/adapter.d.ts

@@ -0,0 +1,11 @@
+import type { Adapter, ClientUploadsConfig } from '@payloadcms/plugin-cloud-storage/types';
+import type { UTApi } from 'uploadthing/server';
+import type { ACL } from './index.js';
+interface CreateUploadthingAdapterArgs {
+    acl: ACL;
+    clientUploads?: ClientUploadsConfig;
+    utApi: UTApi;
+}
+export declare function createUploadthingAdapter({ acl, clientUploads, utApi, }: CreateUploadthingAdapterArgs): Adapter;
+export {};
+//# sourceMappingURL=adapter.d.ts.map

package/dist/adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAE/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAOrC,UAAU,4BAA4B;IACpC,GAAG,EAAE,GAAG,CAAA;IACR,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,KAAK,CAAA;CACb;AAED,wBAAgB,wBAAwB,CAAC,EACvC,GAAG,EACH,aAAa,EACb,KAAK,GACN,EAAE,4BAA4B,GAAG,OAAO,CAiDxC"}

package/dist/adapter.js

@@ -0,0 +1,53 @@
+import { deleteFile } from './deleteFile.js';
+import { generateURL } from './generateURL.js';
+import { getFile } from './getFile.js';
+import { uploadFile } from './uploadFile.js';
+export function createUploadthingAdapter({ acl, clientUploads, utApi }) {
+    const fields = [
+        {
+            name: '_key',
+            type: 'text',
+            admin: {
+                disableBulkEdit: true,
+                disableListColumn: true,
+                disableListFilter: true,
+                hidden: true
+            }
+        }
+    ];
+    return ()=>({
+            name: 'uploadthing',
+            clientUploads,
+            fields,
+            generateURL,
+            handleDelete: ({ doc, filename, req })=>deleteFile({
+                    doc: doc,
+                    filename,
+                    req,
+                    utApi
+                }),
+            handleUpload: async ({ clientUploadContext, data, file })=>{
+                const result = await uploadFile({
+                    acl,
+                    buffer: file.buffer,
+                    clientUploadContext,
+                    data,
+                    filename: file.filename,
+                    mimeType: file.mimeType,
+                    utApi
+                });
+                return result;
+            },
+            staticHandler: (req, { doc, headers, params: { clientUploadContext, collection, filename } })=>getFile({
+                    clientUploadContext,
+                    collection,
+                    doc: doc,
+                    filename,
+                    incomingHeaders: headers || new Headers(),
+                    req,
+                    utApi
+                })
+        });
+}
+
+//# sourceMappingURL=adapter.js.map

package/dist/adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Field } from 'payload'\nimport type { UTApi } from 'uploadthing/server'\n\nimport type { ACL } from './index.js'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateUploadthingAdapterArgs {\n  acl: ACL\n  clientUploads?: ClientUploadsConfig\n  utApi: UTApi\n}\n\nexport function createUploadthingAdapter({\n  acl,\n  clientUploads,\n  utApi,\n}: CreateUploadthingAdapterArgs): Adapter {\n  const fields: Field[] = [\n    {\n      name: '_key',\n      type: 'text',\n      admin: {\n        disableBulkEdit: true,\n        disableListColumn: true,\n        disableListFilter: true,\n        hidden: true,\n      },\n    },\n  ]\n\n  return (): GeneratedAdapter => ({\n    name: 'uploadthing',\n    clientUploads,\n    fields,\n\n    generateURL,\n\n    handleDelete: ({ doc, filename, req }) =>\n      deleteFile({ doc: doc as unknown as Record<string, unknown>, filename, req, utApi }),\n\n    handleUpload: async ({ clientUploadContext, data, file }) => {\n      const result = await uploadFile({\n        acl,\n        buffer: file.buffer,\n        clientUploadContext,\n        data,\n        filename: file.filename,\n        mimeType: file.mimeType,\n        utApi,\n      })\n\n      return result\n    },\n\n    staticHandler: (req, { doc, headers, params: { clientUploadContext, collection, filename } }) =>\n      getFile({\n        clientUploadContext,\n        collection,\n        doc: doc as unknown as Record<string, unknown> | undefined,\n        filename,\n        incomingHeaders: headers || new Headers(),\n        req,\n        utApi,\n      }),\n  })\n}\n"],"names":["deleteFile","generateURL","getFile","uploadFile","createUploadthingAdapter","acl","clientUploads","utApi","fields","name","type","admin","disableBulkEdit","disableListColumn","disableListFilter","hidden","handleDelete","doc","filename","req","handleUpload","clientUploadContext","data","file","result","buffer","mimeType","staticHandler","headers","params","collection","incomingHeaders","Headers"],"mappings":"AAUA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAQ5C,OAAO,SAASC,yBAAyB,EACvCC,GAAG,EACHC,aAAa,EACbC,KAAK,EACwB;IAC7B,MAAMC,SAAkB;QACtB;YACEC,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,iBAAiB;gBACjBC,mBAAmB;gBACnBC,mBAAmB;gBACnBC,QAAQ;YACV;QACF;KACD;IAED,OAAO,IAAyB,CAAA;YAC9BN,MAAM;YACNH;YACAE;YAEAP;YAEAe,cAAc,CAAC,EAAEC,GAAG,EAAEC,QAAQ,EAAEC,GAAG,EAAE,GACnCnB,WAAW;oBAAEiB,KAAKA;oBAA2CC;oBAAUC;oBAAKZ;gBAAM;YAEpFa,cAAc,OAAO,EAAEC,mBAAmB,EAAEC,IAAI,EAAEC,IAAI,EAAE;gBACtD,MAAMC,SAAS,MAAMrB,WAAW;oBAC9BE;oBACAoB,QAAQF,KAAKE,MAAM;oBACnBJ;oBACAC;oBACAJ,UAAUK,KAAKL,QAAQ;oBACvBQ,UAAUH,KAAKG,QAAQ;oBACvBnB;gBACF;gBAEA,OAAOiB;YACT;YAEAG,eAAe,CAACR,KAAK,EAAEF,GAAG,EAAEW,OAAO,EAAEC,QAAQ,EAAER,mBAAmB,EAAES,UAAU,EAAEZ,QAAQ,EAAE,EAAE,GAC1FhB,QAAQ;oBACNmB;oBACAS;oBACAb,KAAKA;oBACLC;oBACAa,iBAAiBH,WAAW,IAAII;oBAChCb;oBACAZ;gBACF;QACJ,CAAA;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"UploadthingClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/UploadthingClientUploadHandler.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,8BAA8B;;;;;;;aAmBiE,OAAO,aADjH,CAAA"}
+{"version":3,"file":"UploadthingClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/UploadthingClientUploadHandler.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,8BAA8B;;;;;;;aAmB6F,OAAO,aAD7I,CAAA"}

package/dist/deleteFile.d.ts

@@ -0,0 +1,11 @@
+import type { PayloadRequest } from 'payload';
+import type { UTApi } from 'uploadthing/server';
+interface DeleteFileArgs {
+    doc: Record<string, unknown>;
+    filename: string;
+    req: PayloadRequest;
+    utApi: UTApi;
+}
+export declare function deleteFile({ doc, filename, req, utApi }: DeleteFileArgs): Promise<void>;
+export {};
+//# sourceMappingURL=deleteFile.d.ts.map

package/dist/deleteFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAM/C,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,wBAAsB,UAAU,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB7F"}

package/dist/deleteFile.js

@@ -0,0 +1,22 @@
+import { APIError } from 'payload';
+import { getKeyFromFilename } from './utilities.js';
+export async function deleteFile({ doc, filename, req, utApi }) {
+    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 {
+        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=deleteFile.js.map

package/dist/deleteFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\nimport type { UTApi } from 'uploadthing/server'\n\nimport { APIError } from 'payload'\n\nimport { getKeyFromFilename } from './utilities.js'\n\ninterface DeleteFileArgs {\n  doc: Record<string, unknown>\n  filename: string\n  req: PayloadRequest\n  utApi: UTApi\n}\n\nexport async function deleteFile({ doc, filename, req, utApi }: DeleteFileArgs): Promise<void> {\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    await utApi.deleteFiles(key)\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"],"names":["APIError","getKeyFromFilename","deleteFile","doc","filename","req","utApi","key","payload","logger","error","msg","deleteFiles","err"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,UAAS;AAElC,SAASC,kBAAkB,QAAQ,iBAAgB;AASnD,OAAO,eAAeC,WAAW,EAAEC,GAAG,EAAEC,QAAQ,EAAEC,GAAG,EAAEC,KAAK,EAAkB;IAC5E,MAAMC,MAAMN,mBAAmBE,KAAKC;IAEpC,IAAI,CAACG,KAAK;QACRF,IAAIG,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;YACvBC,KAAK,CAAC,qBAAqB,EAAEP,SAAS,iCAAiC,CAAC;QAC1E;QACA,MAAM,IAAIJ,SAAS,CAAC,qBAAqB,EAAEI,UAAU;IACvD;IAEA,IAAI;QACF,MAAME,MAAMM,WAAW,CAACL;IAC1B,EAAE,OAAOM,KAAK;QACZR,IAAIG,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;YACvBG;YACAF,KAAK,CAAC,8BAA8B,EAAEP,SAAS,QAAQ,EAAEG,KAAK;QAChE;QACA,MAAM,IAAIP,SAAS,CAAC,qBAAqB,EAAEI,UAAU;IACvD;AACF"}

package/dist/getFile.d.ts

@@ -0,0 +1,14 @@
+import type { PayloadRequest } from 'payload';
+import type { UTApi } from 'uploadthing/server';
+interface GetFileArgs {
+    clientUploadContext?: unknown;
+    collection: string;
+    doc?: Record<string, unknown>;
+    filename: string;
+    incomingHeaders: Headers;
+    req: PayloadRequest;
+    utApi: UTApi;
+}
+export declare function getFile({ clientUploadContext, collection, doc, filename, incomingHeaders, req, utApi, }: GetFileArgs): Promise<Response>;
+export {};
+//# sourceMappingURL=getFile.d.ts.map

package/dist/getFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,SAAS,CAAA;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAM/C,UAAU,WAAW;IACnB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,wBAAsB,OAAO,CAAC,EAC5B,mBAAmB,EACnB,UAAU,EACV,GAAG,EACH,QAAQ,EACR,eAAe,EACf,GAAG,EACH,KAAK,GACN,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuIjC"}

package/dist/getFile.js

@@ -0,0 +1,134 @@
+import { getRangeRequestInfo } from 'payload/internal';
+import { getKeyFromFilename } from './utilities.js';
+export async function getFile({ clientUploadContext, collection, doc, filename, incomingHeaders, req, utApi }) {
+    try {
+        let key;
+        const collectionConfig = req.payload.collections[collection]?.config;
+        if (clientUploadContext && typeof clientUploadContext === 'object' && 'key' in clientUploadContext && typeof clientUploadContext.key === 'string') {
+            key = clientUploadContext.key;
+        } else {
+            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'
+                });
+            }
+            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 headResponse = await fetch(signedURL, {
+            method: 'HEAD'
+        });
+        if (!headResponse.ok) {
+            return new Response(null, {
+                status: 404,
+                statusText: 'Not Found'
+            });
+        }
+        const fileSize = Number(headResponse.headers.get('content-length'));
+        const rangeHeader = req.headers.get('range');
+        const rangeResult = getRangeRequestInfo({
+            fileSize,
+            rangeHeader
+        });
+        if (rangeResult.type === 'invalid') {
+            return new Response(null, {
+                headers: new Headers(rangeResult.headers),
+                status: rangeResult.status
+            });
+        }
+        const response = await fetch(signedURL, {
+            headers: rangeResult.type === 'partial' ? {
+                Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`
+            } : undefined
+        });
+        if (!response.ok || !response.body) {
+            return new Response(null, {
+                status: 404,
+                statusText: 'Not Found'
+            });
+        }
+        const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
+        const objectEtag = response.headers.get('etag');
+        let headers = new Headers(incomingHeaders);
+        for (const [headerKey, value] of Object.entries(rangeResult.headers)){
+            headers.append(headerKey, value);
+        }
+        const contentType = response.headers.get('content-type');
+        if (contentType) {
+            headers.append('Content-Type', contentType);
+        }
+        if (objectEtag) {
+            headers.append('ETag', objectEtag);
+        }
+        if (contentType === 'image/svg+xml') {
+            headers.append('Content-Security-Policy', "script-src 'none'");
+        }
+        if (collectionConfig?.upload && typeof collectionConfig.upload === 'object' && typeof collectionConfig.upload.modifyResponseHeaders === 'function') {
+            headers = collectionConfig.upload.modifyResponseHeaders({
+                headers
+            }) || headers;
+        }
+        if (etagFromHeaders && etagFromHeaders === objectEtag) {
+            return new Response(null, {
+                headers,
+                status: 304
+            });
+        }
+        return new Response(response.body, {
+            headers,
+            status: rangeResult.status
+        });
+    } catch (err) {
+        req.payload.logger.error({
+            err,
+            msg: 'Unexpected error in staticHandler'
+        });
+        return new Response('Internal Server Error', {
+            status: 500
+        });
+    }
+}
+
+//# sourceMappingURL=getFile.js.map

package/dist/getFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { PayloadRequest, Where } from 'payload'\nimport type { UTApi } from 'uploadthing/server'\n\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport { getKeyFromFilename } from './utilities.js'\n\ninterface GetFileArgs {\n  clientUploadContext?: unknown\n  collection: string\n  doc?: Record<string, unknown>\n  filename: string\n  incomingHeaders: Headers\n  req: PayloadRequest\n  utApi: UTApi\n}\n\nexport async function getFile({\n  clientUploadContext,\n  collection,\n  doc,\n  filename,\n  incomingHeaders,\n  req,\n  utApi,\n}: GetFileArgs): Promise<Response> {\n  try {\n    let key: string\n    const collectionConfig = req.payload.collections[collection]?.config\n\n    if (\n      clientUploadContext &&\n      typeof clientUploadContext === 'object' &&\n      'key' in clientUploadContext &&\n      typeof clientUploadContext.key === 'string'\n    ) {\n      key = clientUploadContext.key\n    } else {\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) {\n          retrievedDoc = result as Record<string, unknown>\n        }\n      }\n\n      if (!retrievedDoc) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      key = getKeyFromFilename(retrievedDoc, filename)!\n    }\n\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 headResponse = await fetch(signedURL, { method: 'HEAD' })\n    if (!headResponse.ok) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n\n    const fileSize = Number(headResponse.headers.get('content-length'))\n\n    const rangeHeader = req.headers.get('range')\n    const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n    if (rangeResult.type === 'invalid') {\n      return new Response(null, {\n        headers: new Headers(rangeResult.headers),\n        status: rangeResult.status,\n      })\n    }\n\n    const response = await fetch(signedURL, {\n      headers:\n        rangeResult.type === 'partial'\n          ? { Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}` }\n          : undefined,\n    })\n\n    if (!response.ok || !response.body) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const objectEtag = response.headers.get('etag')\n\n    let headers = new Headers(incomingHeaders)\n\n    for (const [headerKey, value] of Object.entries(rangeResult.headers)) {\n      headers.append(headerKey, value)\n    }\n\n    const contentType = response.headers.get('content-type')\n    if (contentType) {\n      headers.append('Content-Type', contentType)\n    }\n\n    if (objectEtag) {\n      headers.append('ETag', objectEtag)\n    }\n\n    if (contentType === 'image/svg+xml') {\n      headers.append('Content-Security-Policy', \"script-src 'none'\")\n    }\n\n    if (\n      collectionConfig?.upload &&\n      typeof collectionConfig.upload === 'object' &&\n      typeof collectionConfig.upload.modifyResponseHeaders === 'function'\n    ) {\n      headers = collectionConfig.upload.modifyResponseHeaders({ headers }) || headers\n    }\n\n    if (etagFromHeaders && etagFromHeaders === objectEtag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    return new Response(response.body, {\n      headers,\n      status: rangeResult.status,\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"],"names":["getRangeRequestInfo","getKeyFromFilename","getFile","clientUploadContext","collection","doc","filename","incomingHeaders","req","utApi","key","collectionConfig","payload","collections","config","retrievedDoc","or","equals","upload","imageSizes","forEach","name","push","result","db","findOne","where","Response","status","statusText","url","signedURL","getSignedURL","headResponse","fetch","method","ok","fileSize","Number","headers","get","rangeHeader","rangeResult","type","Headers","response","Range","rangeStart","rangeEnd","undefined","body","etagFromHeaders","objectEtag","headerKey","value","Object","entries","append","contentType","modifyResponseHeaders","err","logger","error","msg"],"mappings":"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"}

package/dist/index.d.ts

@@ -23,6 +23,8 @@ export type UploadthingStorageOptions = {
     } | boolean;
     /**
      * Collection options to apply the adapter to.
+     *
+     * TODO V4: OMIT 'prefix' from the collection options - uploadthing does not support prefixes
      */
     collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>;
     /**

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EAEnB,iBAAiB,EAElB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAiB,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAYrD,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAEvF,MAAM,MAAM,yBAAyB,GAAG;IACtC;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;OAEG;IACH,aAAa,CAAC,EACV;QACE,MAAM,CAAC,EAAE,mBAAmB,CAAA;QAC5B,iBAAiB,CAAC,EAAE,qBAAqB,CAAA;KAC1C,GACD,OAAO,CAAA;IAEX;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;OAEG;IACH,OAAO,EAAE;QACP;;WAEG;QACH,GAAG,CAAC,EAAE,GAAG,CAAA;KACV,GAAG,YAAY,CAAA;CACjB,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,iBA8E9B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AASrD,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAEvF,MAAM,MAAM,yBAAyB,GAAG;IACtC;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;OAEG;IACH,aAAa,CAAC,EACV;QACE,MAAM,CAAC,EAAE,mBAAmB,CAAA;QAC5B,iBAAiB,CAAC,EAAE,qBAAqB,CAAA;KAC1C,GACD,OAAO,CAAA;IAEX;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;OAEG;IACH,OAAO,EAAE;QACP;;WAEG;QACH,GAAG,CAAC,EAAE,GAAG,CAAA;KACV,GAAG,YAAY,CAAA;CACjB,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,iBA6E9B,CAAA"}

package/dist/index.js

@@ -1,11 +1,8 @@
 import { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage';
 import { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities';
 import { UTApi } from 'uploadthing/server';
-import { generateURL } from './generateURL.js';
+import { createUploadthingAdapter } from './adapter.js';
 import { getClientUploadRoute } from './getClientUploadRoute.js';
-import { getHandleDelete } from './handleDelete.js';
-import { getHandleUpload } from './handleUpload.js';
-import { getHandler } from './staticHandler.js';
 export const uploadthingStorage = (uploadthingStorageOptions)=>(incomingConfig)=>{
         const isPluginDisabled = uploadthingStorageOptions.enabled === false;
         initClientUploads({
@@ -24,24 +21,24 @@ export const uploadthingStorage = (uploadthingStorageOptions)=>(incomingConfig)=
         if (isPluginDisabled) {
             return incomingConfig;
         }
-        // Default ACL to public-read
-        if (!uploadthingStorageOptions.options.acl) {
-            uploadthingStorageOptions.options.acl = 'public-read';
-        }
-        const adapter = uploadthingInternal(uploadthingStorageOptions);
-        // Add adapter to each collection option object
-        const collectionsWithAdapter = Object.entries(uploadthingStorageOptions.collections).reduce((acc, [slug, collOptions])=>({
+        const { acl = 'public-read', ...utOptions } = uploadthingStorageOptions.options;
+        const utApi = new UTApi(utOptions);
+        const adapter = createUploadthingAdapter({
+            acl,
+            clientUploads: uploadthingStorageOptions.clientUploads,
+            utApi
+        });
+        const collectionsWithAdapter = Object.entries(uploadthingStorageOptions.collections).reduce((acc, [slug, collOptions])=>{
+            const mergedOptions = {
+                ...collOptions === true ? {} : collOptions,
+                adapter,
+                prefix: ''
+            };
+            return {
                 ...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
+                [slug]: mergedOptions
+            };
+        }, {});
         const config = {
             ...incomingConfig,
             collections: (incomingConfig.collections || []).map((collection)=>{
@@ -59,42 +56,9 @@ export const uploadthingStorage = (uploadthingStorageOptions)=>(incomingConfig)=
         };
         return cloudStoragePlugin({
             alwaysInsertFields: uploadthingStorageOptions.alwaysInsertFields,
-            collections: collectionsWithAdapter
+            collections: collectionsWithAdapter,
+            useCompositePrefixes: false
         })(config);
     };
-function uploadthingInternal(options) {
-    const fields = [
-        {
-            name: '_key',
-            type: 'text',
-            admin: {
-                disableBulkEdit: true,
-                disableListColumn: true,
-                disableListFilter: true,
-                hidden: true
-            }
-        }
-    ];
-    return ()=>{
-        const { clientUploads, options: { acl = 'public-read', ...utOptions } } = options;
-        const utApi = new UTApi(utOptions);
-        return {
-            name: 'uploadthing',
-            clientUploads,
-            fields,
-            generateURL,
-            handleDelete: getHandleDelete({
-                utApi
-            }),
-            handleUpload: getHandleUpload({
-                acl,
-                utApi
-            }),
-            staticHandler: getHandler({
-                utApi
-            })
-        };
-    };
-}
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  Adapter,\n  ClientUploadsAccess,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Field, Plugin, UploadCollectionSlug } from 'payload'\nimport type { createUploadthing } from 'uploadthing/server'\nimport type { UTApiOptions } from 'uploadthing/types'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { UTApi } from 'uploadthing/server'\n\nimport { generateURL } from './generateURL.js'\nimport { getClientUploadRoute } from './getClientUploadRoute.js'\nimport { getHandleDelete } from './handleDelete.js'\nimport { getHandleUpload } from './handleUpload.js'\nimport { getHandler } from './staticHandler.js'\n\nexport type FileRouterInputConfig = Parameters<ReturnType<typeof createUploadthing>>[0]\n\nexport type UploadthingStorageOptions = {\n  /**\n   * When enabled, fields (like the prefix field) will always be inserted into\n   * the collection schema regardless of whether the plugin is enabled. This\n   * ensures a consistent schema across all environments.\n   *\n   * This will be enabled by default in Payload v4.\n   *\n   * @default false\n   */\n  alwaysInsertFields?: boolean\n\n  /**\n   * Do uploads directly on the client, to bypass limits on Vercel.\n   */\n  clientUploads?:\n    | {\n        access?: ClientUploadsAccess\n        routerInputConfig?: FileRouterInputConfig\n      }\n    | boolean\n\n  /**\n   * Collection options to apply the adapter to.\n   */\n  collections: Partial<Record<UploadCollectionSlug, 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: {\n    /**\n     * @default 'public-read'\n     */\n    acl?: ACL\n  } & UTApiOptions\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    const isPluginDisabled = uploadthingStorageOptions.enabled === false\n\n    initClientUploads({\n      clientHandler: '@payloadcms/storage-uploadthing/client#UploadthingClientUploadHandler',\n      collections: uploadthingStorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(uploadthingStorageOptions.clientUploads),\n      serverHandler: getClientUploadRoute({\n        access:\n          typeof uploadthingStorageOptions.clientUploads === 'object'\n            ? uploadthingStorageOptions.clientUploads.access\n            : undefined,\n        acl: uploadthingStorageOptions.options.acl || 'public-read',\n        routerInputConfig:\n          typeof uploadthingStorageOptions.clientUploads === 'object'\n            ? uploadthingStorageOptions.clientUploads.routerInputConfig\n            : undefined,\n        token: uploadthingStorageOptions.options.token,\n      }),\n      serverHandlerPath: '/storage-uploadthing-client-upload-route',\n    })\n\n    if (isPluginDisabled) {\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)\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      alwaysInsertFields: uploadthingStorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n    })(config)\n  }\n\nfunction uploadthingInternal(options: UploadthingStorageOptions): Adapter {\n  const fields: Field[] = [\n    {\n      name: '_key',\n      type: 'text',\n      admin: {\n        disableBulkEdit: true,\n        disableListColumn: true,\n        disableListFilter: true,\n        hidden: true,\n      },\n    },\n  ]\n\n  return (): GeneratedAdapter => {\n    const {\n      clientUploads,\n      options: { acl = 'public-read', ...utOptions },\n    } = options\n\n    const utApi = new UTApi(utOptions)\n\n    return {\n      name: 'uploadthing',\n      clientUploads,\n      fields,\n      generateURL,\n      handleDelete: getHandleDelete({ utApi }),\n      handleUpload: getHandleUpload({ acl, utApi }),\n      staticHandler: getHandler({ utApi }),\n    }\n  }\n}\n"],"names":["cloudStoragePlugin","initClientUploads","UTApi","generateURL","getClientUploadRoute","getHandleDelete","getHandleUpload","getHandler","uploadthingStorage","uploadthingStorageOptions","incomingConfig","isPluginDisabled","enabled","clientHandler","collections","config","Boolean","clientUploads","serverHandler","access","undefined","acl","options","routerInputConfig","token","serverHandlerPath","adapter","uploadthingInternal","collectionsWithAdapter","Object","entries","reduce","acc","slug","collOptions","map","collection","upload","disableLocalStorage","alwaysInsertFields","fields","name","type","admin","disableBulkEdit","disableListColumn","disableListFilter","hidden","utOptions","utApi","handleDelete","handleUpload","staticHandler"],"mappings":"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"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  ClientUploadsAccess,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\nimport type { createUploadthing } from 'uploadthing/server'\nimport type { UTApiOptions } from 'uploadthing/types'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { UTApi } from 'uploadthing/server'\n\nimport { createUploadthingAdapter } from './adapter.js'\nimport { getClientUploadRoute } from './getClientUploadRoute.js'\n\nexport type FileRouterInputConfig = Parameters<ReturnType<typeof createUploadthing>>[0]\n\nexport type UploadthingStorageOptions = {\n  /**\n   * When enabled, fields (like the prefix field) will always be inserted into\n   * the collection schema regardless of whether the plugin is enabled. This\n   * ensures a consistent schema across all environments.\n   *\n   * This will be enabled by default in Payload v4.\n   *\n   * @default false\n   */\n  alwaysInsertFields?: boolean\n\n  /**\n   * Do uploads directly on the client, to bypass limits on Vercel.\n   */\n  clientUploads?:\n    | {\n        access?: ClientUploadsAccess\n        routerInputConfig?: FileRouterInputConfig\n      }\n    | boolean\n\n  /**\n   * Collection options to apply the adapter to.\n   *\n   * TODO V4: OMIT 'prefix' from the collection options - uploadthing does not support prefixes\n   */\n  collections: Partial<Record<UploadCollectionSlug, 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: {\n    /**\n     * @default 'public-read'\n     */\n    acl?: ACL\n  } & UTApiOptions\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    const isPluginDisabled = uploadthingStorageOptions.enabled === false\n\n    initClientUploads({\n      clientHandler: '@payloadcms/storage-uploadthing/client#UploadthingClientUploadHandler',\n      collections: uploadthingStorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(uploadthingStorageOptions.clientUploads),\n      serverHandler: getClientUploadRoute({\n        access:\n          typeof uploadthingStorageOptions.clientUploads === 'object'\n            ? uploadthingStorageOptions.clientUploads.access\n            : undefined,\n        acl: uploadthingStorageOptions.options.acl || 'public-read',\n        routerInputConfig:\n          typeof uploadthingStorageOptions.clientUploads === 'object'\n            ? uploadthingStorageOptions.clientUploads.routerInputConfig\n            : undefined,\n        token: uploadthingStorageOptions.options.token,\n      }),\n      serverHandlerPath: '/storage-uploadthing-client-upload-route',\n    })\n\n    if (isPluginDisabled) {\n      return incomingConfig\n    }\n\n    const { acl = 'public-read', ...utOptions } = uploadthingStorageOptions.options\n    const utApi = new UTApi(utOptions)\n\n    const adapter = createUploadthingAdapter({\n      acl,\n      clientUploads: uploadthingStorageOptions.clientUploads,\n      utApi,\n    })\n\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      uploadthingStorageOptions.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => {\n        const mergedOptions = {\n          ...(collOptions === true ? {} : collOptions),\n          adapter,\n          prefix: '', // upload thing does not support prefixes\n        }\n        return {\n          ...acc,\n          [slug]: mergedOptions,\n        }\n      },\n      {} as Record<string, CollectionOptions>,\n    )\n\n    const config = {\n      ...incomingConfig,\n      collections: (incomingConfig.collections || []).map((collection) => {\n        if (!collectionsWithAdapter[collection.slug]) {\n          return collection\n        }\n\n        return {\n          ...collection,\n          upload: {\n            ...(typeof collection.upload === 'object' ? collection.upload : {}),\n            disableLocalStorage: true,\n          },\n        }\n      }),\n    }\n\n    return cloudStoragePlugin({\n      alwaysInsertFields: uploadthingStorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: false, // uploadthing does not support prefixes\n    })(config)\n  }\n"],"names":["cloudStoragePlugin","initClientUploads","UTApi","createUploadthingAdapter","getClientUploadRoute","uploadthingStorage","uploadthingStorageOptions","incomingConfig","isPluginDisabled","enabled","clientHandler","collections","config","Boolean","clientUploads","serverHandler","access","undefined","acl","options","routerInputConfig","token","serverHandlerPath","utOptions","utApi","adapter","collectionsWithAdapter","Object","entries","reduce","acc","slug","collOptions","mergedOptions","prefix","map","collection","upload","disableLocalStorage","alwaysInsertFields","useCompositePrefixes"],"mappings":"AASA,SAASA,kBAAkB,QAAQ,mCAAkC;AACrE,SAASC,iBAAiB,QAAQ,6CAA4C;AAC9E,SAASC,KAAK,QAAQ,qBAAoB;AAE1C,SAASC,wBAAwB,QAAQ,eAAc;AACvD,SAASC,oBAAoB,QAAQ,4BAA2B;AAwDhE,OAAO,MAAMC,qBACX,CAACC,4BACD,CAACC;QACC,MAAMC,mBAAmBF,0BAA0BG,OAAO,KAAK;QAE/DR,kBAAkB;YAChBS,eAAe;YACfC,aAAaL,0BAA0BK,WAAW;YAClDC,QAAQL;YACRE,SAAS,CAACD,oBAAoBK,QAAQP,0BAA0BQ,aAAa;YAC7EC,eAAeX,qBAAqB;gBAClCY,QACE,OAAOV,0BAA0BQ,aAAa,KAAK,WAC/CR,0BAA0BQ,aAAa,CAACE,MAAM,GAC9CC;gBACNC,KAAKZ,0BAA0Ba,OAAO,CAACD,GAAG,IAAI;gBAC9CE,mBACE,OAAOd,0BAA0BQ,aAAa,KAAK,WAC/CR,0BAA0BQ,aAAa,CAACM,iBAAiB,GACzDH;gBACNI,OAAOf,0BAA0Ba,OAAO,CAACE,KAAK;YAChD;YACAC,mBAAmB;QACrB;QAEA,IAAId,kBAAkB;YACpB,OAAOD;QACT;QAEA,MAAM,EAAEW,MAAM,aAAa,EAAE,GAAGK,WAAW,GAAGjB,0BAA0Ba,OAAO;QAC/E,MAAMK,QAAQ,IAAItB,MAAMqB;QAExB,MAAME,UAAUtB,yBAAyB;YACvCe;YACAJ,eAAeR,0BAA0BQ,aAAa;YACtDU;QACF;QAEA,MAAME,yBAAmEC,OAAOC,OAAO,CACrFtB,0BAA0BK,WAAW,EACrCkB,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY;YACvB,MAAMC,gBAAgB;gBACpB,GAAID,gBAAgB,OAAO,CAAC,IAAIA,WAAW;gBAC3CP;gBACAS,QAAQ;YACV;YACA,OAAO;gBACL,GAAGJ,GAAG;gBACN,CAACC,KAAK,EAAEE;YACV;QACF,GACA,CAAC;QAGH,MAAMrB,SAAS;YACb,GAAGL,cAAc;YACjBI,aAAa,AAACJ,CAAAA,eAAeI,WAAW,IAAI,EAAE,AAAD,EAAGwB,GAAG,CAAC,CAACC;gBACnD,IAAI,CAACV,sBAAsB,CAACU,WAAWL,IAAI,CAAC,EAAE;oBAC5C,OAAOK;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,OAAOtC,mBAAmB;YACxBuC,oBAAoBjC,0BAA0BiC,kBAAkB;YAChE5B,aAAae;YACbc,sBAAsB;QACxB,GAAG5B;IACL,EAAC"}

package/dist/uploadFile.d.ts

@@ -0,0 +1,14 @@
+import type { UTApi } from 'uploadthing/server';
+import type { ACL } from './index.js';
+interface UploadFileArgs {
+    acl: ACL;
+    buffer: Buffer;
+    clientUploadContext?: unknown;
+    data: Record<string, unknown>;
+    filename: string;
+    mimeType: string;
+    utApi: UTApi;
+}
+export declare function uploadFile({ acl, buffer, clientUploadContext, data, filename, mimeType, utApi, }: UploadFileArgs): Promise<Record<string, unknown>>;
+export {};
+//# sourceMappingURL=uploadFile.d.ts.map

package/dist/uploadFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAK/C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAErC,UAAU,cAAc;IACtB,GAAG,EAAE,GAAG,CAAA;IACR,MAAM,EAAE,MAAM,CAAA;IACd,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,wBAAsB,UAAU,CAAC,EAC/B,GAAG,EACH,MAAM,EACN,mBAAmB,EACnB,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,KAAK,GACN,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAkDnD"}

package/dist/uploadFile.js

@@ -0,0 +1,47 @@
+import { APIError } from 'payload';
+import { UTFile } from 'uploadthing/server';
+export async function uploadFile({ acl, buffer, clientUploadContext, data, filename, mimeType, utApi }) {
+    try {
+        if (clientUploadContext && typeof clientUploadContext === 'object' && 'key' in clientUploadContext && typeof clientUploadContext.key === 'string') {
+            await utApi.deleteFiles(clientUploadContext.key);
+        }
+        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}`);
+        }
+        const sizes = data.sizes;
+        const foundSize = Object.keys(sizes || {}).find((key)=>sizes?.[key]?.filename === filename);
+        if (foundSize && sizes && sizes[foundSize]) {
+            sizes[foundSize]._key = res.data?.key;
+        } else {
+            data._key = res.data?.key;
+            data.filename = res.data?.name;
+        }
+        return data;
+    } catch (error) {
+        if (error instanceof APIError) {
+            throw error;
+        }
+        if (error instanceof Error) {
+            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}`);
+                }
+            }
+            throw new APIError(`Error uploading file with uploadthing: ${error.message}`);
+        }
+        throw new APIError('Error uploading file with uploadthing: Unknown error');
+    }
+}
+
+//# sourceMappingURL=uploadFile.js.map

package/dist/uploadFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import type { UTApi } from 'uploadthing/server'\n\nimport { APIError } from 'payload'\nimport { UTFile } from 'uploadthing/server'\n\nimport type { ACL } from './index.js'\n\ninterface UploadFileArgs {\n  acl: ACL\n  buffer: Buffer\n  clientUploadContext?: unknown\n  data: Record<string, unknown>\n  filename: string\n  mimeType: string\n  utApi: UTApi\n}\n\nexport async function uploadFile({\n  acl,\n  buffer,\n  clientUploadContext,\n  data,\n  filename,\n  mimeType,\n  utApi,\n}: UploadFileArgs): Promise<Record<string, unknown>> {\n  try {\n    if (\n      clientUploadContext &&\n      typeof clientUploadContext === 'object' &&\n      'key' in clientUploadContext &&\n      typeof clientUploadContext.key === 'string'\n    ) {\n      await utApi.deleteFiles(clientUploadContext.key)\n    }\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    const sizes = data.sizes as Record<string, { _key?: string; filename?: string }> | undefined\n    const foundSize = Object.keys(sizes || {}).find((key) => sizes?.[key]?.filename === filename)\n\n    if (foundSize && sizes && sizes[foundSize]) {\n      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 APIError) {\n      throw error\n    }\n\n    if (error instanceof Error) {\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      }\n      throw new APIError(`Error uploading file with uploadthing: ${error.message}`)\n    }\n\n    throw new APIError('Error uploading file with uploadthing: Unknown error')\n  }\n}\n"],"names":["APIError","UTFile","uploadFile","acl","buffer","clientUploadContext","data","filename","mimeType","utApi","key","deleteFiles","blob","Blob","type","res","uploadFiles","error","code","message","sizes","foundSize","Object","keys","find","_key","name","Error","toJSON","json","cause","defect"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,UAAS;AAClC,SAASC,MAAM,QAAQ,qBAAoB;AAc3C,OAAO,eAAeC,WAAW,EAC/BC,GAAG,EACHC,MAAM,EACNC,mBAAmB,EACnBC,IAAI,EACJC,QAAQ,EACRC,QAAQ,EACRC,KAAK,EACU;IACf,IAAI;QACF,IACEJ,uBACA,OAAOA,wBAAwB,YAC/B,SAASA,uBACT,OAAOA,oBAAoBK,GAAG,KAAK,UACnC;YACA,MAAMD,MAAME,WAAW,CAACN,oBAAoBK,GAAG;QACjD;QAEA,MAAME,OAAO,IAAIC,KAAK;YAACT;SAAO,EAAE;YAAEU,MAAMN;QAAS;QACjD,MAAMO,MAAM,MAAMN,MAAMO,WAAW,CAAC,IAAIf,OAAO;YAACW;SAAK,EAAEL,WAAW;YAAEJ;QAAI;QAExE,IAAIY,IAAIE,KAAK,EAAE;YACb,MAAM,IAAIjB,SAAS,CAAC,sBAAsB,EAAEe,IAAIE,KAAK,CAACC,IAAI,CAAC,GAAG,EAAEH,IAAIE,KAAK,CAACE,OAAO,EAAE;QACrF;QAEA,MAAMC,QAAQd,KAAKc,KAAK;QACxB,MAAMC,YAAYC,OAAOC,IAAI,CAACH,SAAS,CAAC,GAAGI,IAAI,CAAC,CAACd,MAAQU,OAAO,CAACV,IAAI,EAAEH,aAAaA;QAEpF,IAAIc,aAAaD,SAASA,KAAK,CAACC,UAAU,EAAE;YAC1CD,KAAK,CAACC,UAAU,CAACI,IAAI,GAAGV,IAAIT,IAAI,EAAEI;QACpC,OAAO;YACLJ,KAAKmB,IAAI,GAAGV,IAAIT,IAAI,EAAEI;YACtBJ,KAAKC,QAAQ,GAAGQ,IAAIT,IAAI,EAAEoB;QAC5B;QAEA,OAAOpB;IACT,EAAE,OAAOW,OAAgB;QACvB,IAAIA,iBAAiBjB,UAAU;YAC7B,MAAMiB;QACR;QAEA,IAAIA,iBAAiBU,OAAO;YAC1B,IAAI,YAAYV,SAAS,OAAOA,MAAMW,MAAM,KAAK,YAAY;gBAC3D,MAAMC,OAAOZ,MAAMW,MAAM;gBAGzB,IAAIC,KAAKC,KAAK,EAAEC,QAAQd,SAASY,KAAKC,KAAK,CAACC,MAAM,CAACzB,IAAI,EAAEW,OAAO;oBAC9D,MAAM,IAAIjB,SACR,CAAC,uCAAuC,EAAE6B,KAAKC,KAAK,CAACC,MAAM,CAACd,KAAK,CAAC,GAAG,EAAEY,KAAKC,KAAK,CAACC,MAAM,CAACzB,IAAI,CAACW,KAAK,EAAE;gBAEzG;YACF;YACA,MAAM,IAAIjB,SAAS,CAAC,uCAAuC,EAAEiB,MAAME,OAAO,EAAE;QAC9E;QAEA,MAAM,IAAInB,SAAS;IACrB;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-uploadthing",
-  "version": "3.82.1",
+  "version": "3.83.0-canary.1",
   "description": "Payload storage adapter for uploadthing",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -38,13 +38,13 @@
   ],
   "dependencies": {
     "uploadthing": "7.3.0",
-    "@payloadcms/plugin-cloud-storage": "3.82.1"
+    "@payloadcms/plugin-cloud-storage": "3.83.0-canary.1"
   },
   "devDependencies": {
-    "payload": "3.82.1"
+    "payload": "3.83.0-canary.1"
   },
   "peerDependencies": {
-    "payload": "3.82.1"
+    "payload": "3.83.0-canary.1"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"

package/dist/handleDelete.d.ts

@@ -1,8 +0,0 @@
-import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types';
-import type { 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

@@ -1 +0,0 @@
-{"version":3,"file":"handleDelete.d.ts","sourceRoot":"","sources":["../src/handleDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;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

@@ -1,26 +0,0 @@
-import { APIError } from 'payload';
-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

@@ -1 +0,0 @@
-{"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'\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"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,UAAS;AAElC,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,UAAU;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,KAAK;YAChE;YACA,MAAM,IAAIP,SAAS,CAAC,qBAAqB,EAAEK,UAAU;QACvD;IACF;AACF,EAAC"}

package/dist/handleUpload.d.ts

@@ -1,10 +0,0 @@
-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

@@ -1 +0,0 @@
-{"version":3,"file":"handleUpload.d.ts","sourceRoot":"","sources":["../src/handleUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,KAAK,EAAE,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,YAqDlE,CAAA"}

package/dist/handleUpload.js

@@ -1,49 +0,0 @@
-import { APIError } from 'payload';
-import { UTFile } from 'uploadthing/server';
-export const getHandleUpload = ({ acl, utApi })=>{
-    return async ({ clientUploadContext, data, file })=>{
-        try {
-            if (clientUploadContext && typeof clientUploadContext === 'object' && 'key' in clientUploadContext && typeof clientUploadContext.key === 'string') {
-                // Clear the old file
-                await utApi.deleteFiles(clientUploadContext.key);
-            }
-            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

@@ -1 +0,0 @@
-{"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'\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 ({ clientUploadContext, data, file }) => {\n    try {\n      if (\n        clientUploadContext &&\n        typeof clientUploadContext === 'object' &&\n        'key' in clientUploadContext &&\n        typeof clientUploadContext.key === 'string'\n      ) {\n        // Clear the old file\n        await utApi.deleteFiles(clientUploadContext.key)\n      }\n\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","clientUploadContext","data","file","key","deleteFiles","buffer","filename","mimeType","blob","Blob","type","res","uploadFiles","error","code","message","foundSize","Object","keys","sizes","find","_key","name","Error","toJSON","json","cause","defect"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,UAAS;AAClC,SAASC,MAAM,QAAQ,qBAAoB;AAS3C,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,GAAG,EAAEC,KAAK,EAAoB;IAC9D,OAAO,OAAO,EAAEC,mBAAmB,EAAEC,IAAI,EAAEC,IAAI,EAAE;QAC/C,IAAI;YACF,IACEF,uBACA,OAAOA,wBAAwB,YAC/B,SAASA,uBACT,OAAOA,oBAAoBG,GAAG,KAAK,UACnC;gBACA,qBAAqB;gBACrB,MAAMJ,MAAMK,WAAW,CAACJ,oBAAoBG,GAAG;YACjD;YAEA,MAAM,EAAEE,MAAM,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAGL;YAEvC,MAAMM,OAAO,IAAIC,KAAK;gBAACJ;aAAO,EAAE;gBAAEK,MAAMH;YAAS;YACjD,MAAMI,MAAM,MAAMZ,MAAMa,WAAW,CAAC,IAAIhB,OAAO;gBAACY;aAAK,EAAEF,WAAW;gBAAER;YAAI;YAExE,IAAIa,IAAIE,KAAK,EAAE;gBACb,MAAM,IAAIlB,SAAS,CAAC,sBAAsB,EAAEgB,IAAIE,KAAK,CAACC,IAAI,CAAC,GAAG,EAAEH,IAAIE,KAAK,CAACE,OAAO,EAAE;YACrF;YAEA,iCAAiC;YACjC,MAAMC,YAAYC,OAAOC,IAAI,CAACjB,KAAKkB,KAAK,IAAI,CAAC,GAAGC,IAAI,CAClD,CAACjB,MAAQF,KAAKkB,KAAK,EAAE,CAAChB,IAAI,EAAEG,aAAaA;YAG3C,IAAIU,WAAW;gBACbf,KAAKkB,KAAK,CAACH,UAAU,CAACK,IAAI,GAAGV,IAAIV,IAAI,EAAEE;YACzC,OAAO;gBACLF,KAAKoB,IAAI,GAAGV,IAAIV,IAAI,EAAEE;gBACtBF,KAAKK,QAAQ,GAAGK,IAAIV,IAAI,EAAEqB;YAC5B;YAEA,OAAOrB;QACT,EAAE,OAAOY,OAAgB;YACvB,IAAIA,iBAAiBU,OAAO;gBAC1B,2DAA2D;gBAC3D,IAAI,YAAYV,SAAS,OAAOA,MAAMW,MAAM,KAAK,YAAY;oBAC3D,MAAMC,OAAOZ,MAAMW,MAAM;oBAGzB,IAAIC,KAAKC,KAAK,EAAEC,QAAQd,SAASY,KAAKC,KAAK,CAACC,MAAM,CAAC1B,IAAI,EAAEY,OAAO;wBAC9D,MAAM,IAAIlB,SACR,CAAC,uCAAuC,EAAE8B,KAAKC,KAAK,CAACC,MAAM,CAACd,KAAK,CAAC,GAAG,EAAEY,KAAKC,KAAK,CAACC,MAAM,CAAC1B,IAAI,CAACY,KAAK,EAAE;oBAEzG;gBACF,OAAO;oBACL,MAAM,IAAIlB,SAAS,CAAC,uCAAuC,EAAEkB,MAAME,OAAO,EAAE;gBAC9E;YACF;QACF;IACF;AACF,EAAC"}

package/dist/staticHandler.d.ts

@@ -1,8 +0,0 @@
-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

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

package/dist/staticHandler.js

@@ -1,140 +0,0 @@
-import { getRangeRequestInfo } from 'payload/internal';
-import { getKeyFromFilename } from './utilities.js';
-export const getHandler = ({ utApi })=>{
-    return async (req, { doc, headers: incomingHeaders, params: { clientUploadContext, collection, filename } })=>{
-        try {
-            let key;
-            const collectionConfig = req.payload.collections[collection]?.config;
-            if (clientUploadContext && typeof clientUploadContext === 'object' && 'key' in clientUploadContext && typeof clientUploadContext.key === 'string') {
-                key = clientUploadContext.key;
-            } else {
-                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'
-                    });
-                }
-                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'
-                });
-            }
-            // Get file metadata first for range validation
-            const headResponse = await fetch(signedURL, {
-                method: 'HEAD'
-            });
-            if (!headResponse.ok) {
-                return new Response(null, {
-                    status: 404,
-                    statusText: 'Not Found'
-                });
-            }
-            const fileSize = Number(headResponse.headers.get('content-length'));
-            // Handle range request
-            const rangeHeader = req.headers.get('range');
-            const rangeResult = getRangeRequestInfo({
-                fileSize,
-                rangeHeader
-            });
-            if (rangeResult.type === 'invalid') {
-                return new Response(null, {
-                    headers: new Headers(rangeResult.headers),
-                    status: rangeResult.status
-                });
-            }
-            const response = await fetch(signedURL, {
-                headers: rangeResult.type === 'partial' ? {
-                    Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`
-                } : undefined
-            });
-            if (!response.ok || !response.body) {
-                return new Response(null, {
-                    status: 404,
-                    statusText: 'Not Found'
-                });
-            }
-            const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
-            const objectEtag = response.headers.get('etag');
-            let headers = new Headers(incomingHeaders);
-            // Add range-related headers from the result
-            for (const [key, value] of Object.entries(rangeResult.headers)){
-                headers.append(key, value);
-            }
-            const contentType = response.headers.get('content-type');
-            if (contentType) {
-                headers.append('Content-Type', contentType);
-            }
-            if (objectEtag) {
-                headers.append('ETag', objectEtag);
-            }
-            // Add Content-Security-Policy header for SVG files to prevent executable code
-            if (contentType === 'image/svg+xml') {
-                headers.append('Content-Security-Policy', "script-src 'none'");
-            }
-            if (collectionConfig?.upload && typeof collectionConfig.upload === 'object' && typeof collectionConfig.upload.modifyResponseHeaders === 'function') {
-                headers = collectionConfig.upload.modifyResponseHeaders({
-                    headers
-                }) || headers;
-            }
-            if (etagFromHeaders && etagFromHeaders === objectEtag) {
-                return new Response(null, {
-                    headers,
-                    status: 304
-                });
-            }
-            return new Response(response.body, {
-                headers,
-                status: rangeResult.status
-            });
-        } 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

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { Where } from 'payload'\nimport type { UTApi } from 'uploadthing/server'\n\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport { getKeyFromFilename } from './utilities.js'\n\ntype Args = {\n  utApi: UTApi\n}\n\nexport const getHandler = ({ utApi }: Args): StaticHandler => {\n  return async (\n    req,\n    { doc, headers: incomingHeaders, params: { clientUploadContext, collection, filename } },\n  ) => {\n    try {\n      let key: string\n      const collectionConfig = req.payload.collections[collection]?.config\n\n      if (\n        clientUploadContext &&\n        typeof clientUploadContext === 'object' &&\n        'key' in clientUploadContext &&\n        typeof clientUploadContext.key === 'string'\n      ) {\n        key = clientUploadContext.key\n      } else {\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) {\n            retrievedDoc = result\n          }\n        }\n\n        if (!retrievedDoc) {\n          return new Response(null, { status: 404, statusText: 'Not Found' })\n        }\n\n        key = getKeyFromFilename(retrievedDoc, filename)!\n      }\n\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      // Get file metadata first for range validation\n      const headResponse = await fetch(signedURL, { method: 'HEAD' })\n      if (!headResponse.ok) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const fileSize = Number(headResponse.headers.get('content-length'))\n\n      // Handle range request\n      const rangeHeader = req.headers.get('range')\n      const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n      if (rangeResult.type === 'invalid') {\n        return new Response(null, {\n          headers: new Headers(rangeResult.headers),\n          status: rangeResult.status,\n        })\n      }\n\n      const response = await fetch(signedURL, {\n        headers:\n          rangeResult.type === 'partial'\n            ? { Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}` }\n            : undefined,\n      })\n\n      if (!response.ok || !response.body) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n      const objectEtag = response.headers.get('etag')\n\n      let headers = new Headers(incomingHeaders)\n\n      // Add range-related headers from the result\n      for (const [key, value] of Object.entries(rangeResult.headers)) {\n        headers.append(key, value)\n      }\n\n      const contentType = response.headers.get('content-type')\n      if (contentType) {\n        headers.append('Content-Type', contentType)\n      }\n\n      if (objectEtag) {\n        headers.append('ETag', objectEtag)\n      }\n\n      // Add Content-Security-Policy header for SVG files to prevent executable code\n      if (contentType === 'image/svg+xml') {\n        headers.append('Content-Security-Policy', \"script-src 'none'\")\n      }\n\n      if (\n        collectionConfig?.upload &&\n        typeof collectionConfig.upload === 'object' &&\n        typeof collectionConfig.upload.modifyResponseHeaders === 'function'\n      ) {\n        headers = collectionConfig.upload.modifyResponseHeaders({ headers }) || headers\n      }\n\n      if (etagFromHeaders && etagFromHeaders === objectEtag) {\n        return new Response(null, {\n          headers,\n          status: 304,\n        })\n      }\n\n      return new Response(response.body, {\n        headers,\n        status: rangeResult.status,\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":["getRangeRequestInfo","getKeyFromFilename","getHandler","utApi","req","doc","headers","incomingHeaders","params","clientUploadContext","collection","filename","key","collectionConfig","payload","collections","config","retrievedDoc","or","equals","upload","imageSizes","forEach","name","push","result","db","findOne","where","Response","status","statusText","url","signedURL","getSignedURL","headResponse","fetch","method","ok","fileSize","Number","get","rangeHeader","rangeResult","type","Headers","response","Range","rangeStart","rangeEnd","undefined","body","etagFromHeaders","objectEtag","value","Object","entries","append","contentType","modifyResponseHeaders","err","logger","error","msg"],"mappings":"AAIA,SAASA,mBAAmB,QAAQ,mBAAkB;AAEtD,SAASC,kBAAkB,QAAQ,iBAAgB;AAMnD,OAAO,MAAMC,aAAa,CAAC,EAAEC,KAAK,EAAQ;IACxC,OAAO,OACLC,KACA,EAAEC,GAAG,EAAEC,SAASC,eAAe,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEC,UAAU,EAAEC,QAAQ,EAAE,EAAE;QAExF,IAAI;YACF,IAAIC;YACJ,MAAMC,mBAAmBT,IAAIU,OAAO,CAACC,WAAW,CAACL,WAAW,EAAEM;YAE9D,IACEP,uBACA,OAAOA,wBAAwB,YAC/B,SAASA,uBACT,OAAOA,oBAAoBG,GAAG,KAAK,UACnC;gBACAA,MAAMH,oBAAoBG,GAAG;YAC/B,OAAO;gBACL,IAAIK,eAAeZ;gBAEnB,IAAI,CAACY,cAAc;oBACjB,MAAMC,KAAc;wBAClB;4BACEP,UAAU;gCACRQ,QAAQR;4BACV;wBACF;qBACD;oBAED,IAAIE,kBAAkBO,OAAOC,YAAY;wBACvCR,iBAAiBO,MAAM,CAACC,UAAU,CAACC,OAAO,CAAC,CAAC,EAAEC,IAAI,EAAE;4BAClDL,GAAGM,IAAI,CAAC;gCACN,CAAC,CAAC,MAAM,EAAED,KAAK,SAAS,CAAC,CAAC,EAAE;oCAC1BJ,QAAQR;gCACV;4BACF;wBACF;oBACF;oBAEA,MAAMc,SAAS,MAAMrB,IAAIU,OAAO,CAACY,EAAE,CAACC,OAAO,CAAC;wBAC1CjB;wBACAN;wBACAwB,OAAO;4BAAEV;wBAAG;oBACd;oBAEA,IAAIO,QAAQ;wBACVR,eAAeQ;oBACjB;gBACF;gBAEA,IAAI,CAACR,cAAc;oBACjB,OAAO,IAAIY,SAAS,MAAM;wBAAEC,QAAQ;wBAAKC,YAAY;oBAAY;gBACnE;gBAEAnB,MAAMX,mBAAmBgB,cAAcN;YACzC;YAEA,IAAI,CAACC,KAAK;gBACR,OAAO,IAAIiB,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAM,EAAEC,KAAKC,SAAS,EAAE,GAAG,MAAM9B,MAAM+B,YAAY,CAACtB;YAEpD,IAAI,CAACqB,WAAW;gBACd,OAAO,IAAIJ,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,+CAA+C;YAC/C,MAAMI,eAAe,MAAMC,MAAMH,WAAW;gBAAEI,QAAQ;YAAO;YAC7D,IAAI,CAACF,aAAaG,EAAE,EAAE;gBACpB,OAAO,IAAIT,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAMQ,WAAWC,OAAOL,aAAa7B,OAAO,CAACmC,GAAG,CAAC;YAEjD,uBAAuB;YACvB,MAAMC,cAActC,IAAIE,OAAO,CAACmC,GAAG,CAAC;YACpC,MAAME,cAAc3C,oBAAoB;gBAAEuC;gBAAUG;YAAY;YAEhE,IAAIC,YAAYC,IAAI,KAAK,WAAW;gBAClC,OAAO,IAAIf,SAAS,MAAM;oBACxBvB,SAAS,IAAIuC,QAAQF,YAAYrC,OAAO;oBACxCwB,QAAQa,YAAYb,MAAM;gBAC5B;YACF;YAEA,MAAMgB,WAAW,MAAMV,MAAMH,WAAW;gBACtC3B,SACEqC,YAAYC,IAAI,KAAK,YACjB;oBAAEG,OAAO,CAAC,MAAM,EAAEJ,YAAYK,UAAU,CAAC,CAAC,EAAEL,YAAYM,QAAQ,EAAE;gBAAC,IACnEC;YACR;YAEA,IAAI,CAACJ,SAASR,EAAE,IAAI,CAACQ,SAASK,IAAI,EAAE;gBAClC,OAAO,IAAItB,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAMqB,kBAAkBhD,IAAIE,OAAO,CAACmC,GAAG,CAAC,WAAWrC,IAAIE,OAAO,CAACmC,GAAG,CAAC;YACnE,MAAMY,aAAaP,SAASxC,OAAO,CAACmC,GAAG,CAAC;YAExC,IAAInC,UAAU,IAAIuC,QAAQtC;YAE1B,4CAA4C;YAC5C,KAAK,MAAM,CAACK,KAAK0C,MAAM,IAAIC,OAAOC,OAAO,CAACb,YAAYrC,OAAO,EAAG;gBAC9DA,QAAQmD,MAAM,CAAC7C,KAAK0C;YACtB;YAEA,MAAMI,cAAcZ,SAASxC,OAAO,CAACmC,GAAG,CAAC;YACzC,IAAIiB,aAAa;gBACfpD,QAAQmD,MAAM,CAAC,gBAAgBC;YACjC;YAEA,IAAIL,YAAY;gBACd/C,QAAQmD,MAAM,CAAC,QAAQJ;YACzB;YAEA,8EAA8E;YAC9E,IAAIK,gBAAgB,iBAAiB;gBACnCpD,QAAQmD,MAAM,CAAC,2BAA2B;YAC5C;YAEA,IACE5C,kBAAkBO,UAClB,OAAOP,iBAAiBO,MAAM,KAAK,YACnC,OAAOP,iBAAiBO,MAAM,CAACuC,qBAAqB,KAAK,YACzD;gBACArD,UAAUO,iBAAiBO,MAAM,CAACuC,qBAAqB,CAAC;oBAAErD;gBAAQ,MAAMA;YAC1E;YAEA,IAAI8C,mBAAmBA,oBAAoBC,YAAY;gBACrD,OAAO,IAAIxB,SAAS,MAAM;oBACxBvB;oBACAwB,QAAQ;gBACV;YACF;YAEA,OAAO,IAAID,SAASiB,SAASK,IAAI,EAAE;gBACjC7C;gBACAwB,QAAQa,YAAYb,MAAM;YAC5B;QACF,EAAE,OAAO8B,KAAK;YACZxD,IAAIU,OAAO,CAAC+C,MAAM,CAACC,KAAK,CAAC;gBAAEF;gBAAKG,KAAK;YAAoC;YACzE,OAAO,IAAIlC,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;IACF;AACF,EAAC"}