@payloadcms/storage-r2 4.0.0-internal.8867dba → 4.0.0-internal.9726517

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
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,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAO1C,UAAU,mBAAmB;IAC3B,MAAM,EAAE,QAAQ,CAAA;IAChB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,WAAW,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAA;IAC5C,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,aAAa,EACb,WAAW,EACX,oBAA4B,GAC7B,EAAE,mBAAmB,GAAG,OAAO,CAyE/B"}
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,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAO1C,UAAU,mBAAmB;IAC3B,MAAM,EAAE,QAAQ,CAAA;IAChB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,WAAW,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAA;IAC5C,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,aAAa,EACb,WAAW,EACX,oBAA4B,GAC7B,EAAE,mBAAmB,GAAG,OAAO,CAwE/B"}
package/dist/adapter.js CHANGED
@@ -4,10 +4,11 @@ import { defaultR2ClientUploadsAccess, getHandleMultiPartUpload } from './handle
4
4
  import { uploadFile } from './uploadFile.js';
5
5
  export function createR2Adapter({ bucket, clientUploads, collections, useCompositePrefixes = false }) {
6
6
  const access = typeof clientUploads === 'object' && clientUploads.access ? clientUploads.access : defaultR2ClientUploadsAccess;
7
- const uploadInstructions = clientUploads ? {
7
+ const uploadInstructions = {
8
8
  adminHandler: {
9
9
  path: '@payloadcms/storage-r2/client#R2ClientUploadHandler'
10
10
  },
11
+ enabled: Boolean(clientUploads),
11
12
  endpoint: {
12
13
  handler: getHandleMultiPartUpload({
13
14
  access,
@@ -28,7 +29,7 @@ export function createR2Adapter({ bucket, clientUploads, collections, useComposi
28
29
  }
29
30
  }),
30
31
  useInAdmin: true
31
- } : undefined;
32
+ };
32
33
  return ({ collection, prefix = '' })=>({
33
34
  name: 'r2',
34
35
  uploadInstructions,
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n Adapter,\n ClientUploadsConfig,\n GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport type { R2StorageOptions } from './index.js'\nimport type { R2Bucket } from './types.js'\n\nimport { deleteFile } from './deleteFile.js'\nimport { getFile } from './getFile.js'\nimport { defaultR2ClientUploadsAccess, getHandleMultiPartUpload } from './handleMultiPartUpload.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateR2AdapterArgs {\n bucket: R2Bucket\n clientUploads?: ClientUploadsConfig\n collections: R2StorageOptions['collections']\n useCompositePrefixes?: boolean\n}\n\nexport function createR2Adapter({\n bucket,\n clientUploads,\n collections,\n useCompositePrefixes = false,\n}: CreateR2AdapterArgs): Adapter {\n const access =\n typeof clientUploads === 'object' && clientUploads.access\n ? clientUploads.access\n : defaultR2ClientUploadsAccess\n const uploadInstructions: GeneratedAdapter['uploadInstructions'] = clientUploads\n ? {\n adminHandler: {\n path: '@payloadcms/storage-r2/client#R2ClientUploadHandler',\n },\n endpoint: {\n handler: getHandleMultiPartUpload({\n access,\n bucket,\n collections,\n useCompositePrefixes,\n }),\n path: '/storage-r2-multi-part-upload',\n },\n generate: ({ filename, filesize, mimeType }) => ({\n name: 'uploadToR2',\n type: 'dispatch',\n file: {\n filename,\n mimeType,\n size: filesize,\n uploadReference: {},\n },\n }),\n useInAdmin: true,\n }\n : undefined\n\n return ({ collection, prefix = '' }): GeneratedAdapter => ({\n name: 'r2',\n uploadInstructions,\n\n handleDelete: ({ doc: { prefix: docPrefix = '' }, filename }) =>\n deleteFile({\n bucket,\n collectionPrefix: prefix,\n docPrefix,\n filename,\n useCompositePrefixes,\n }),\n\n handleUpload: ({ data, file }) =>\n uploadFile({\n bucket,\n buffer: file.buffer,\n collectionPrefix: prefix,\n docPrefix: data.prefix,\n filename: file.filename,\n mimeType: file.mimeType,\n useCompositePrefixes,\n }),\n\n staticHandler: (\n req,\n { headers, params: { filename, prefix: prefixQueryParam, uploadReference } },\n ) =>\n getFile({\n bucket,\n collection,\n filename,\n incomingHeaders: headers,\n prefix,\n prefixQueryParam,\n req,\n uploadReference,\n useCompositePrefixes,\n }),\n })\n}\n"],"names":["deleteFile","getFile","defaultR2ClientUploadsAccess","getHandleMultiPartUpload","uploadFile","createR2Adapter","bucket","clientUploads","collections","useCompositePrefixes","access","uploadInstructions","adminHandler","path","endpoint","handler","generate","filename","filesize","mimeType","name","type","file","size","uploadReference","useInAdmin","undefined","collection","prefix","handleDelete","doc","docPrefix","collectionPrefix","handleUpload","data","buffer","staticHandler","req","headers","params","prefixQueryParam","incomingHeaders"],"mappings":"AASA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,4BAA4B,EAAEC,wBAAwB,QAAQ,6BAA4B;AACnG,SAASC,UAAU,QAAQ,kBAAiB;AAS5C,OAAO,SAASC,gBAAgB,EAC9BC,MAAM,EACNC,aAAa,EACbC,WAAW,EACXC,uBAAuB,KAAK,EACR;IACpB,MAAMC,SACJ,OAAOH,kBAAkB,YAAYA,cAAcG,MAAM,GACrDH,cAAcG,MAAM,GACpBR;IACN,MAAMS,qBAA6DJ,gBAC/D;QACEK,cAAc;YACZC,MAAM;QACR;QACAC,UAAU;YACRC,SAASZ,yBAAyB;gBAChCO;gBACAJ;gBACAE;gBACAC;YACF;YACAI,MAAM;QACR;QACAG,UAAU,CAAC,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAM,CAAA;gBAC/CC,MAAM;gBACNC,MAAM;gBACNC,MAAM;oBACJL;oBACAE;oBACAI,MAAML;oBACNM,iBAAiB,CAAC;gBACpB;YACF,CAAA;QACAC,YAAY;IACd,IACAC;IAEJ,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDR,MAAM;YACNT;YAEAkB,cAAc,CAAC,EAAEC,KAAK,EAAEF,QAAQG,YAAY,EAAE,EAAE,EAAEd,QAAQ,EAAE,GAC1DjB,WAAW;oBACTM;oBACA0B,kBAAkBJ;oBAClBG;oBACAd;oBACAR;gBACF;YAEFwB,cAAc,CAAC,EAAEC,IAAI,EAAEZ,IAAI,EAAE,GAC3BlB,WAAW;oBACTE;oBACA6B,QAAQb,KAAKa,MAAM;oBACnBH,kBAAkBJ;oBAClBG,WAAWG,KAAKN,MAAM;oBACtBX,UAAUK,KAAKL,QAAQ;oBACvBE,UAAUG,KAAKH,QAAQ;oBACvBV;gBACF;YAEF2B,eAAe,CACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAEtB,QAAQ,EAAEW,QAAQY,gBAAgB,EAAEhB,eAAe,EAAE,EAAE,GAE5EvB,QAAQ;oBACNK;oBACAqB;oBACAV;oBACAwB,iBAAiBH;oBACjBV;oBACAY;oBACAH;oBACAb;oBACAf;gBACF;QACJ,CAAA;AACF"}
1
+ {"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n Adapter,\n ClientUploadsConfig,\n GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport type { R2StorageOptions } from './index.js'\nimport type { R2Bucket } from './types.js'\n\nimport { deleteFile } from './deleteFile.js'\nimport { getFile } from './getFile.js'\nimport { defaultR2ClientUploadsAccess, getHandleMultiPartUpload } from './handleMultiPartUpload.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateR2AdapterArgs {\n bucket: R2Bucket\n clientUploads?: ClientUploadsConfig\n collections: R2StorageOptions['collections']\n useCompositePrefixes?: boolean\n}\n\nexport function createR2Adapter({\n bucket,\n clientUploads,\n collections,\n useCompositePrefixes = false,\n}: CreateR2AdapterArgs): Adapter {\n const access =\n typeof clientUploads === 'object' && clientUploads.access\n ? clientUploads.access\n : defaultR2ClientUploadsAccess\n const uploadInstructions: GeneratedAdapter['uploadInstructions'] = {\n adminHandler: {\n path: '@payloadcms/storage-r2/client#R2ClientUploadHandler',\n },\n enabled: Boolean(clientUploads),\n endpoint: {\n handler: getHandleMultiPartUpload({\n access,\n bucket,\n collections,\n useCompositePrefixes,\n }),\n path: '/storage-r2-multi-part-upload',\n },\n generate: ({ filename, filesize, mimeType }) => ({\n name: 'uploadToR2',\n type: 'dispatch',\n file: {\n filename,\n mimeType,\n size: filesize,\n uploadReference: {},\n },\n }),\n useInAdmin: true,\n }\n\n return ({ collection, prefix = '' }): GeneratedAdapter => ({\n name: 'r2',\n uploadInstructions,\n\n handleDelete: ({ doc: { prefix: docPrefix = '' }, filename }) =>\n deleteFile({\n bucket,\n collectionPrefix: prefix,\n docPrefix,\n filename,\n useCompositePrefixes,\n }),\n\n handleUpload: ({ data, file }) =>\n uploadFile({\n bucket,\n buffer: file.buffer,\n collectionPrefix: prefix,\n docPrefix: data.prefix,\n filename: file.filename,\n mimeType: file.mimeType,\n useCompositePrefixes,\n }),\n\n staticHandler: (\n req,\n { headers, params: { filename, prefix: prefixQueryParam, uploadReference } },\n ) =>\n getFile({\n bucket,\n collection,\n filename,\n incomingHeaders: headers,\n prefix,\n prefixQueryParam,\n req,\n uploadReference,\n useCompositePrefixes,\n }),\n })\n}\n"],"names":["deleteFile","getFile","defaultR2ClientUploadsAccess","getHandleMultiPartUpload","uploadFile","createR2Adapter","bucket","clientUploads","collections","useCompositePrefixes","access","uploadInstructions","adminHandler","path","enabled","Boolean","endpoint","handler","generate","filename","filesize","mimeType","name","type","file","size","uploadReference","useInAdmin","collection","prefix","handleDelete","doc","docPrefix","collectionPrefix","handleUpload","data","buffer","staticHandler","req","headers","params","prefixQueryParam","incomingHeaders"],"mappings":"AASA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,4BAA4B,EAAEC,wBAAwB,QAAQ,6BAA4B;AACnG,SAASC,UAAU,QAAQ,kBAAiB;AAS5C,OAAO,SAASC,gBAAgB,EAC9BC,MAAM,EACNC,aAAa,EACbC,WAAW,EACXC,uBAAuB,KAAK,EACR;IACpB,MAAMC,SACJ,OAAOH,kBAAkB,YAAYA,cAAcG,MAAM,GACrDH,cAAcG,MAAM,GACpBR;IACN,MAAMS,qBAA6D;QACjEC,cAAc;YACZC,MAAM;QACR;QACAC,SAASC,QAAQR;QACjBS,UAAU;YACRC,SAASd,yBAAyB;gBAChCO;gBACAJ;gBACAE;gBACAC;YACF;YACAI,MAAM;QACR;QACAK,UAAU,CAAC,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAM,CAAA;gBAC/CC,MAAM;gBACNC,MAAM;gBACNC,MAAM;oBACJL;oBACAE;oBACAI,MAAML;oBACNM,iBAAiB,CAAC;gBACpB;YACF,CAAA;QACAC,YAAY;IACd;IAEA,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDP,MAAM;YACNX;YAEAmB,cAAc,CAAC,EAAEC,KAAK,EAAEF,QAAQG,YAAY,EAAE,EAAE,EAAEb,QAAQ,EAAE,GAC1DnB,WAAW;oBACTM;oBACA2B,kBAAkBJ;oBAClBG;oBACAb;oBACAV;gBACF;YAEFyB,cAAc,CAAC,EAAEC,IAAI,EAAEX,IAAI,EAAE,GAC3BpB,WAAW;oBACTE;oBACA8B,QAAQZ,KAAKY,MAAM;oBACnBH,kBAAkBJ;oBAClBG,WAAWG,KAAKN,MAAM;oBACtBV,UAAUK,KAAKL,QAAQ;oBACvBE,UAAUG,KAAKH,QAAQ;oBACvBZ;gBACF;YAEF4B,eAAe,CACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAErB,QAAQ,EAAEU,QAAQY,gBAAgB,EAAEf,eAAe,EAAE,EAAE,GAE5EzB,QAAQ;oBACNK;oBACAsB;oBACAT;oBACAuB,iBAAiBH;oBACjBV;oBACAY;oBACAH;oBACAZ;oBACAjB;gBACF;QACJ,CAAA;AACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@payloadcms/storage-r2",
3
- "version": "4.0.0-internal.8867dba",
3
+ "version": "4.0.0-internal.9726517",
4
4
  "description": "Payload storage adapter for Cloudflare R2",
5
5
  "homepage": "https://payloadcms.com",
6
6
  "repository": {
@@ -37,14 +37,14 @@
37
37
  "dist"
38
38
  ],
39
39
  "dependencies": {
40
- "@payloadcms/plugin-cloud-storage": "4.0.0-internal.8867dba"
40
+ "@payloadcms/plugin-cloud-storage": "4.0.0-internal.9726517"
41
41
  },
42
42
  "devDependencies": {
43
43
  "@cloudflare/workers-types": "4.20260218.0",
44
- "payload": "4.0.0-internal.8867dba"
44
+ "payload": "4.0.0-internal.9726517"
45
45
  },
46
46
  "peerDependencies": {
47
- "payload": "4.0.0-internal.8867dba"
47
+ "payload": "4.0.0-internal.9726517"
48
48
  },
49
49
  "engines": {
50
50
  "node": ">=24.15.0"