@payloadcms/storage-r2 4.0.0-canary.34 → 4.0.0-canary.36

package/dist/index.d.ts

@@ -2,16 +2,6 @@ import type { ClientUploadsConfig, CollectionOptions } from '@payloadcms/plugin-
 import type { StorageAdapter, UploadCollectionSlug } from 'payload';
 import type { R2Bucket } from './types.js';
 export interface R2StorageOptions {
-    /**
-     * When enabled, fields (like the prefix field) will always be inserted into
-     * the collection schema regardless of whether the plugin is enabled. This
-     * ensures a consistent schema across all environments.
-     *
-     * This will be enabled by default in Payload v4.
-     *
-     * @default false
-     */
-    alwaysInsertFields?: boolean;
     bucket: R2Bucket;
     /**
      * Upload files in chunks through Payload before document creation.

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"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,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAI3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAI1C,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B,MAAM,EAAE,QAAQ,CAAA;IAChB;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAC7F,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;;;;;;;;OAaG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,KAAK,gBAAgB,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,cAAc,CAAA;AAE3E,eAAO,MAAM,SAAS,EAAE,gBAyDtB,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,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAI3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAI1C,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,QAAQ,CAAA;IAChB;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAC7F,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;;;;;;;;OAaG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,KAAK,gBAAgB,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,cAAc,CAAA;AAE3E,eAAO,MAAM,SAAS,EAAE,gBAwEtB,CAAA"}

package/dist/index.js

@@ -12,7 +12,20 @@ export const r2Storage = (r2StorageOptions)=>({
             });
             const isPluginDisabled = r2StorageOptions.enabled === false;
             if (isPluginDisabled) {
-                return incomingConfig;
+                // Still call cloudStoragePlugin with adapter: null so fields (like prefix) are
+                // inserted into the schema, keeping it consistent across environments.
+                const collectionsWithoutAdapter = Object.entries(r2StorageOptions.collections).reduce((acc, [slug, collOptions])=>({
+                        ...acc,
+                        [slug]: {
+                            ...collOptions === true ? {} : collOptions,
+                            adapter: null
+                        }
+                    }), {});
+                return cloudStoragePlugin({
+                    collections: collectionsWithoutAdapter,
+                    enabled: false,
+                    useCompositePrefixes: r2StorageOptions.useCompositePrefixes
+                })(incomingConfig);
             }
             // Add adapter to each collection option object
             const collectionsWithAdapter = Object.entries(r2StorageOptions.collections).reduce((acc, [slug, collOptions])=>({
@@ -39,7 +52,6 @@ export const r2Storage = (r2StorageOptions)=>({
                 })
             };
             return cloudStoragePlugin({
-                alwaysInsertFields: r2StorageOptions.alwaysInsertFields,
                 collections: collectionsWithAdapter,
                 useCompositePrefixes: r2StorageOptions.useCompositePrefixes
             })(config);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, StorageAdapter, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\n\nimport type { R2Bucket } from './types.js'\n\nimport { createR2Adapter } from './adapter.js'\n\nexport interface R2StorageOptions {\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  bucket: R2Bucket\n  /**\n   * Upload files in chunks through Payload before document creation.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the R2 adapter to.\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n  enabled?: boolean\n  /**\n   * When true, the collection-level prefix and document-level prefix are combined\n   * (compositional). When false (default), a document prefix already within the\n   * collection prefix is used as-is for new uploads; otherwise it is nested beneath it.\n   * Existing files retain their stored prefixes for reads, URLs, and cleanup.\n   *\n   * Example with a document prefix already contained by the collection prefix:\n   * - collection prefix: `uploads/`\n   * - document prefix: `uploads/documents/`\n   * - resulting prefix with useCompositePrefixes=true: `uploads/uploads/documents/`\n   * - resulting prefix with useCompositePrefixes=false: `uploads/documents/`\n   *\n   * @default false\n   */\n  useCompositePrefixes?: boolean\n}\n\ntype R2StorageFactory = (r2StorageArgs: R2StorageOptions) => StorageAdapter\n\nexport const r2Storage: R2StorageFactory = (\n  r2StorageOptions: R2StorageOptions,\n): StorageAdapter => ({\n  name: 'r2',\n  collections: Object.keys(r2StorageOptions.collections),\n  init: (incomingConfig: Config): Config => {\n    const adapter = createR2Adapter({\n      bucket: r2StorageOptions.bucket,\n      clientUploads: r2StorageOptions.clientUploads,\n      collections: r2StorageOptions.collections,\n      useCompositePrefixes: r2StorageOptions.useCompositePrefixes,\n    })\n\n    const isPluginDisabled = r2StorageOptions.enabled === false\n\n    if (isPluginDisabled) {\n      return incomingConfig\n    }\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      r2StorageOptions.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\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: r2StorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: r2StorageOptions.useCompositePrefixes,\n    })(config)\n  },\n})\n"],"names":["cloudStoragePlugin","createR2Adapter","r2Storage","r2StorageOptions","name","collections","Object","keys","init","incomingConfig","adapter","bucket","clientUploads","useCompositePrefixes","isPluginDisabled","enabled","collectionsWithAdapter","entries","reduce","acc","slug","collOptions","config","map","collection","upload","disableLocalStorage","alwaysInsertFields"],"mappings":"AAOA,SAASA,kBAAkB,QAAQ,mCAAkC;AAIrE,SAASC,eAAe,QAAQ,eAAc;AA2C9C,OAAO,MAAMC,YAA8B,CACzCC,mBACoB,CAAA;QACpBC,MAAM;QACNC,aAAaC,OAAOC,IAAI,CAACJ,iBAAiBE,WAAW;QACrDG,MAAM,CAACC;YACL,MAAMC,UAAUT,gBAAgB;gBAC9BU,QAAQR,iBAAiBQ,MAAM;gBAC/BC,eAAeT,iBAAiBS,aAAa;gBAC7CP,aAAaF,iBAAiBE,WAAW;gBACzCQ,sBAAsBV,iBAAiBU,oBAAoB;YAC7D;YAEA,MAAMC,mBAAmBX,iBAAiBY,OAAO,KAAK;YAEtD,IAAID,kBAAkB;gBACpB,OAAOL;YACT;YAEA,+CAA+C;YAC/C,MAAMO,yBAAmEV,OAAOW,OAAO,CACrFd,iBAAiBE,WAAW,EAC5Ba,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;oBAC7B,GAAGF,GAAG;oBACN,CAACC,KAAK,EAAE;wBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;wBAC3CX;oBACF;gBACF,CAAA,GACA,CAAC;YAGH,gFAAgF;YAChF,MAAMY,SAAS;gBACb,GAAGb,cAAc;gBACjBJ,aAAa,AAACI,CAAAA,eAAeJ,WAAW,IAAI,EAAE,AAAD,EAAGkB,GAAG,CAAC,CAACC;oBACnD,IAAI,CAACR,sBAAsB,CAACQ,WAAWJ,IAAI,CAAC,EAAE;wBAC5C,OAAOI;oBACT;oBAEA,OAAO;wBACL,GAAGA,UAAU;wBACbC,QAAQ;4BACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;4BAClEC,qBAAqB;wBACvB;oBACF;gBACF;YACF;YAEA,OAAO1B,mBAAmB;gBACxB2B,oBAAoBxB,iBAAiBwB,kBAAkB;gBACvDtB,aAAaW;gBACbH,sBAAsBV,iBAAiBU,oBAAoB;YAC7D,GAAGS;QACL;IACF,CAAA,EAAE"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, StorageAdapter, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\n\nimport type { R2Bucket } from './types.js'\n\nimport { createR2Adapter } from './adapter.js'\n\nexport interface R2StorageOptions {\n  bucket: R2Bucket\n  /**\n   * Upload files in chunks through Payload before document creation.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the R2 adapter to.\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n  enabled?: boolean\n  /**\n   * When true, the collection-level prefix and document-level prefix are combined\n   * (compositional). When false (default), a document prefix already within the\n   * collection prefix is used as-is for new uploads; otherwise it is nested beneath it.\n   * Existing files retain their stored prefixes for reads, URLs, and cleanup.\n   *\n   * Example with a document prefix already contained by the collection prefix:\n   * - collection prefix: `uploads/`\n   * - document prefix: `uploads/documents/`\n   * - resulting prefix with useCompositePrefixes=true: `uploads/uploads/documents/`\n   * - resulting prefix with useCompositePrefixes=false: `uploads/documents/`\n   *\n   * @default false\n   */\n  useCompositePrefixes?: boolean\n}\n\ntype R2StorageFactory = (r2StorageArgs: R2StorageOptions) => StorageAdapter\n\nexport const r2Storage: R2StorageFactory = (\n  r2StorageOptions: R2StorageOptions,\n): StorageAdapter => ({\n  name: 'r2',\n  collections: Object.keys(r2StorageOptions.collections),\n  init: (incomingConfig: Config): Config => {\n    const adapter = createR2Adapter({\n      bucket: r2StorageOptions.bucket,\n      clientUploads: r2StorageOptions.clientUploads,\n      collections: r2StorageOptions.collections,\n      useCompositePrefixes: r2StorageOptions.useCompositePrefixes,\n    })\n\n    const isPluginDisabled = r2StorageOptions.enabled === false\n\n    if (isPluginDisabled) {\n      // Still call cloudStoragePlugin with adapter: null so fields (like prefix) are\n      // inserted into the schema, keeping it consistent across environments.\n      const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n        r2StorageOptions.collections,\n      ).reduce(\n        (acc, [slug, collOptions]) => ({\n          ...acc,\n          [slug]: { ...(collOptions === true ? {} : collOptions), adapter: null },\n        }),\n        {} as Record<string, CollectionOptions>,\n      )\n\n      return cloudStoragePlugin({\n        collections: collectionsWithoutAdapter,\n        enabled: false,\n        useCompositePrefixes: r2StorageOptions.useCompositePrefixes,\n      })(incomingConfig)\n    }\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      r2StorageOptions.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\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      useCompositePrefixes: r2StorageOptions.useCompositePrefixes,\n    })(config)\n  },\n})\n"],"names":["cloudStoragePlugin","createR2Adapter","r2Storage","r2StorageOptions","name","collections","Object","keys","init","incomingConfig","adapter","bucket","clientUploads","useCompositePrefixes","isPluginDisabled","enabled","collectionsWithoutAdapter","entries","reduce","acc","slug","collOptions","collectionsWithAdapter","config","map","collection","upload","disableLocalStorage"],"mappings":"AAOA,SAASA,kBAAkB,QAAQ,mCAAkC;AAIrE,SAASC,eAAe,QAAQ,eAAc;AAgC9C,OAAO,MAAMC,YAA8B,CACzCC,mBACoB,CAAA;QACpBC,MAAM;QACNC,aAAaC,OAAOC,IAAI,CAACJ,iBAAiBE,WAAW;QACrDG,MAAM,CAACC;YACL,MAAMC,UAAUT,gBAAgB;gBAC9BU,QAAQR,iBAAiBQ,MAAM;gBAC/BC,eAAeT,iBAAiBS,aAAa;gBAC7CP,aAAaF,iBAAiBE,WAAW;gBACzCQ,sBAAsBV,iBAAiBU,oBAAoB;YAC7D;YAEA,MAAMC,mBAAmBX,iBAAiBY,OAAO,KAAK;YAEtD,IAAID,kBAAkB;gBACpB,+EAA+E;gBAC/E,uEAAuE;gBACvE,MAAME,4BAAsEV,OAAOW,OAAO,CACxFd,iBAAiBE,WAAW,EAC5Ba,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;wBAC7B,GAAGF,GAAG;wBACN,CAACC,KAAK,EAAE;4BAAE,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;4BAAGX,SAAS;wBAAK;oBACxE,CAAA,GACA,CAAC;gBAGH,OAAOV,mBAAmB;oBACxBK,aAAaW;oBACbD,SAAS;oBACTF,sBAAsBV,iBAAiBU,oBAAoB;gBAC7D,GAAGJ;YACL;YAEA,+CAA+C;YAC/C,MAAMa,yBAAmEhB,OAAOW,OAAO,CACrFd,iBAAiBE,WAAW,EAC5Ba,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;oBAC7B,GAAGF,GAAG;oBACN,CAACC,KAAK,EAAE;wBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;wBAC3CX;oBACF;gBACF,CAAA,GACA,CAAC;YAGH,gFAAgF;YAChF,MAAMa,SAAS;gBACb,GAAGd,cAAc;gBACjBJ,aAAa,AAACI,CAAAA,eAAeJ,WAAW,IAAI,EAAE,AAAD,EAAGmB,GAAG,CAAC,CAACC;oBACnD,IAAI,CAACH,sBAAsB,CAACG,WAAWL,IAAI,CAAC,EAAE;wBAC5C,OAAOK;oBACT;oBAEA,OAAO;wBACL,GAAGA,UAAU;wBACbC,QAAQ;4BACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;4BAClEC,qBAAqB;wBACvB;oBACF;gBACF;YACF;YAEA,OAAO3B,mBAAmB;gBACxBK,aAAaiB;gBACbT,sBAAsBV,iBAAiBU,oBAAoB;YAC7D,GAAGU;QACL;IACF,CAAA,EAAE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-r2",
-  "version": "4.0.0-canary.34",
+  "version": "4.0.0-canary.36",
   "description": "Payload storage adapter for Cloudflare R2",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -37,14 +37,14 @@
     "dist"
   ],
   "dependencies": {
-    "@payloadcms/plugin-cloud-storage": "4.0.0-canary.34"
+    "@payloadcms/plugin-cloud-storage": "4.0.0-canary.36"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20260218.0",
-    "payload": "4.0.0-canary.34"
+    "payload": "4.0.0-canary.36"
   },
   "peerDependencies": {
-    "payload": "4.0.0-canary.34"
+    "payload": "4.0.0-canary.36"
   },
   "engines": {
     "node": ">=24.15.0"

package/dist/handleMultiPartUpload.createOnly.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=handleMultiPartUpload.createOnly.spec.d.ts.map

package/dist/handleMultiPartUpload.createOnly.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleMultiPartUpload.createOnly.spec.d.ts","sourceRoot":"","sources":["../src/handleMultiPartUpload.createOnly.spec.ts"],"names":[],"mappings":""}

package/dist/handleMultiPartUpload.createOnly.spec.js

@@ -1,51 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { getHandleMultiPartUpload } from './handleMultiPartUpload.js';
-describe('getHandleMultiPartUpload', ()=>{
-    it('should reject multipart uploads when the object already exists', async ()=>{
-        const createMultipartUpload = vi.fn().mockResolvedValue({
-            key: 'reference.png',
-            uploadId: 'upload-id'
-        });
-        const bucket = {
-            createMultipartUpload,
-            head: vi.fn().mockResolvedValue({
-                key: 'reference.png'
-            })
-        };
-        const req = {
-            payload: {
-                collections: {
-                    media: {
-                        config: {
-                            access: {},
-                            upload: true
-                        }
-                    }
-                },
-                db: {
-                    findOne: vi.fn().mockResolvedValue(null)
-                }
-            },
-            searchParams: new URLSearchParams({
-                collection: 'media',
-                fileName: 'reference.png',
-                fileType: 'image/png'
-            }),
-            user: {
-                id: 'user'
-            }
-        };
-        const handler = getHandleMultiPartUpload({
-            access: async ()=>true,
-            bucket,
-            collections: {
-                media: true
-            }
-        });
-        const response = await handler(req);
-        expect(response.status).toBe(412);
-        expect(createMultipartUpload).not.toHaveBeenCalled();
-    });
-});
-
-//# sourceMappingURL=handleMultiPartUpload.createOnly.spec.js.map

package/dist/handleMultiPartUpload.createOnly.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/handleMultiPartUpload.createOnly.spec.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { describe, expect, it, vi } from 'vitest'\n\nimport type { R2Bucket } from './types.js'\n\nimport { getHandleMultiPartUpload } from './handleMultiPartUpload.js'\n\ndescribe('getHandleMultiPartUpload', () => {\n  it('should reject multipart uploads when the object already exists', async () => {\n    const createMultipartUpload = vi.fn().mockResolvedValue({\n      key: 'reference.png',\n      uploadId: 'upload-id',\n    })\n    const bucket = {\n      createMultipartUpload,\n      head: vi.fn().mockResolvedValue({ key: 'reference.png' }),\n    } as unknown as R2Bucket\n    const req = {\n      payload: {\n        collections: {\n          media: { config: { access: {}, upload: true } },\n        },\n        db: { findOne: vi.fn().mockResolvedValue(null) },\n      },\n      searchParams: new URLSearchParams({\n        collection: 'media',\n        fileName: 'reference.png',\n        fileType: 'image/png',\n      }),\n      user: { id: 'user' },\n    } as unknown as PayloadRequest\n    const handler = getHandleMultiPartUpload({\n      access: async () => true,\n      bucket,\n      collections: { media: true },\n    })\n\n    const response = await handler(req)\n\n    expect(response.status).toBe(412)\n    expect(createMultipartUpload).not.toHaveBeenCalled()\n  })\n})\n"],"names":["describe","expect","it","vi","getHandleMultiPartUpload","createMultipartUpload","fn","mockResolvedValue","key","uploadId","bucket","head","req","payload","collections","media","config","access","upload","db","findOne","searchParams","URLSearchParams","collection","fileName","fileType","user","id","handler","response","status","toBe","not","toHaveBeenCalled"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAIjD,SAASC,wBAAwB,QAAQ,6BAA4B;AAErEJ,SAAS,4BAA4B;IACnCE,GAAG,kEAAkE;QACnE,MAAMG,wBAAwBF,GAAGG,EAAE,GAAGC,iBAAiB,CAAC;YACtDC,KAAK;YACLC,UAAU;QACZ;QACA,MAAMC,SAAS;YACbL;YACAM,MAAMR,GAAGG,EAAE,GAAGC,iBAAiB,CAAC;gBAAEC,KAAK;YAAgB;QACzD;QACA,MAAMI,MAAM;YACVC,SAAS;gBACPC,aAAa;oBACXC,OAAO;wBAAEC,QAAQ;4BAAEC,QAAQ,CAAC;4BAAGC,QAAQ;wBAAK;oBAAE;gBAChD;gBACAC,IAAI;oBAAEC,SAASjB,GAAGG,EAAE,GAAGC,iBAAiB,CAAC;gBAAM;YACjD;YACAc,cAAc,IAAIC,gBAAgB;gBAChCC,YAAY;gBACZC,UAAU;gBACVC,UAAU;YACZ;YACAC,MAAM;gBAAEC,IAAI;YAAO;QACrB;QACA,MAAMC,UAAUxB,yBAAyB;YACvCa,QAAQ,UAAY;YACpBP;YACAI,aAAa;gBAAEC,OAAO;YAAK;QAC7B;QAEA,MAAMc,WAAW,MAAMD,QAAQhB;QAE/BX,OAAO4B,SAASC,MAAM,EAAEC,IAAI,CAAC;QAC7B9B,OAAOI,uBAAuB2B,GAAG,CAACC,gBAAgB;IACpD;AACF"}

package/dist/handleMultiPartUpload.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=handleMultiPartUpload.spec.d.ts.map

package/dist/handleMultiPartUpload.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleMultiPartUpload.spec.d.ts","sourceRoot":"","sources":["../src/handleMultiPartUpload.spec.ts"],"names":[],"mappings":""}

package/dist/handleMultiPartUpload.spec.js

@@ -1,177 +0,0 @@
-import { createClientUploadReceipt } from 'payload/internal';
-import { describe, expect, it, vi } from 'vitest';
-import { getHandleMultiPartUpload } from './handleMultiPartUpload.js';
-const createRequest = (filename, mimeType)=>({
-        payload: {
-            collections: {
-                media: {
-                    config: {
-                        slug: 'media',
-                        access: {},
-                        upload: {
-                            staticDir: '/tmp'
-                        }
-                    }
-                }
-            }
-        },
-        searchParams: new URLSearchParams({
-            collection: 'media',
-            fileName: filename,
-            fileType: mimeType
-        }),
-        user: {
-            id: 'user'
-        }
-    });
-const createContinuationRequest = ({ multipartKey })=>{
-    const req = {
-        arrayBuffer: vi.fn().mockResolvedValue(new ArrayBuffer(0)),
-        user: {
-            id: 'user'
-        },
-        payload: {
-            collections: {
-                media: {
-                    config: {
-                        slug: 'media',
-                        access: {},
-                        upload: {
-                            staticDir: '/tmp'
-                        }
-                    }
-                }
-            },
-            secret: 'test-secret'
-        }
-    };
-    const signedReceipt = createClientUploadReceipt({
-        collectionSlug: 'media',
-        filePrefix: 'media/documents',
-        filename: 'photo.png',
-        req,
-        storageFilePath: 'media/documents/photo.png'
-    });
-    req.searchParams = new URLSearchParams({
-        collection: 'media',
-        fileName: 'photo.png',
-        fileType: 'image/png',
-        multipartId: 'upload-id',
-        multipartKey,
-        multipartNumber: '1',
-        signedReceipt
-    });
-    return req;
-};
-describe('getHandleMultiPartUpload', ()=>{
-    it.each([
-        [
-            'reference.svg',
-            'image/svg+xml'
-        ],
-        [
-            'reference.xml',
-            'application/xml'
-        ]
-    ])('should keep %s with %s in document uploads', async (filename, mimeType)=>{
-        const createMultipartUpload = vi.fn();
-        const handler = getHandleMultiPartUpload({
-            access: ()=>true,
-            bucket: {
-                createMultipartUpload
-            },
-            collections: {
-                media: {}
-            }
-        });
-        await expect(handler(createRequest(filename, mimeType))).rejects.toMatchObject({
-            status: 400
-        });
-        expect(createMultipartUpload).not.toHaveBeenCalled();
-    });
-    describe('continuation', ()=>{
-        const createHandler = ()=>{
-            const resumeMultipartUpload = vi.fn(()=>({
-                    uploadPart: vi.fn().mockResolvedValue({
-                        etag: 'etag',
-                        partNumber: 1
-                    })
-                }));
-            return {
-                handler: getHandleMultiPartUpload({
-                    access: ()=>true,
-                    bucket: {
-                        resumeMultipartUpload
-                    },
-                    collections: {
-                        media: {
-                            prefix: 'media'
-                        }
-                    }
-                }),
-                resumeMultipartUpload
-            };
-        };
-        it('should reject a continuation key outside the receipt', async ()=>{
-            const { handler, resumeMultipartUpload } = createHandler();
-            await expect(handler(createContinuationRequest({
-                multipartKey: 'media-archive/photo.png'
-            }))).rejects.toMatchObject({
-                status: 400
-            });
-            expect(resumeMultipartUpload).not.toHaveBeenCalled();
-        });
-        it('should resume the upload issued by the receipt', async ()=>{
-            const { handler, resumeMultipartUpload } = createHandler();
-            const response = await handler(createContinuationRequest({
-                multipartKey: 'media/documents/photo.png'
-            }));
-            expect(response.status).toBe(200);
-            expect(resumeMultipartUpload).toHaveBeenCalledWith('media/documents/photo.png', 'upload-id');
-        });
-    });
-    it('rejects multipart uploads when the object already exists', async ()=>{
-        const createMultipartUpload = vi.fn();
-        const bucket = {
-            createMultipartUpload,
-            head: vi.fn().mockResolvedValue({
-                key: 'protected.png'
-            })
-        };
-        const req = {
-            payload: {
-                collections: {
-                    media: {
-                        config: {
-                            access: {},
-                            upload: true
-                        }
-                    }
-                },
-                db: {
-                    findOne: vi.fn().mockResolvedValue(null)
-                }
-            },
-            searchParams: new URLSearchParams({
-                collection: 'media',
-                fileName: 'protected.png',
-                fileType: 'image/png'
-            }),
-            user: {
-                id: 'user'
-            }
-        };
-        const handler = getHandleMultiPartUpload({
-            access: async ()=>true,
-            bucket,
-            collections: {
-                media: true
-            }
-        });
-        const response = await handler(req);
-        expect(response.status).toBe(412);
-        expect(createMultipartUpload).not.toHaveBeenCalled();
-    });
-});
-
-//# sourceMappingURL=handleMultiPartUpload.spec.js.map

package/dist/handleMultiPartUpload.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/handleMultiPartUpload.spec.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { createClientUploadReceipt } from 'payload/internal'\nimport { describe, expect, it, vi } from 'vitest'\n\nimport type { R2Bucket } from './types.js'\n\nimport { getHandleMultiPartUpload } from './handleMultiPartUpload.js'\n\nconst createRequest = (filename: string, mimeType: string) =>\n  ({\n    payload: {\n      collections: {\n        media: {\n          config: {\n            slug: 'media',\n            access: {},\n            upload: { staticDir: '/tmp' },\n          },\n        },\n      },\n    },\n    searchParams: new URLSearchParams({\n      collection: 'media',\n      fileName: filename,\n      fileType: mimeType,\n    }),\n    user: { id: 'user' },\n  }) as unknown as PayloadRequest\n\nconst createContinuationRequest = ({ multipartKey }: { multipartKey: string }) => {\n  const req = {\n    arrayBuffer: vi.fn().mockResolvedValue(new ArrayBuffer(0)),\n    user: { id: 'user' },\n    payload: {\n      collections: {\n        media: { config: { slug: 'media', access: {}, upload: { staticDir: '/tmp' } } },\n      },\n      secret: 'test-secret',\n    },\n  } as unknown as PayloadRequest\n\n  const signedReceipt = createClientUploadReceipt({\n    collectionSlug: 'media',\n    filePrefix: 'media/documents',\n    filename: 'photo.png',\n    req,\n    storageFilePath: 'media/documents/photo.png',\n  })\n\n  ;(req as { searchParams?: URLSearchParams }).searchParams = new URLSearchParams({\n    collection: 'media',\n    fileName: 'photo.png',\n    fileType: 'image/png',\n    multipartId: 'upload-id',\n    multipartKey,\n    multipartNumber: '1',\n    signedReceipt,\n  })\n\n  return req\n}\n\ndescribe('getHandleMultiPartUpload', () => {\n  it.each([\n    ['reference.svg', 'image/svg+xml'],\n    ['reference.xml', 'application/xml'],\n  ])('should keep %s with %s in document uploads', async (filename, mimeType) => {\n    const createMultipartUpload = vi.fn()\n    const handler = getHandleMultiPartUpload({\n      access: () => true,\n      bucket: { createMultipartUpload } as unknown as R2Bucket,\n      collections: { media: {} },\n    })\n\n    await expect(handler(createRequest(filename, mimeType))).rejects.toMatchObject({\n      status: 400,\n    })\n    expect(createMultipartUpload).not.toHaveBeenCalled()\n  })\n\n  describe('continuation', () => {\n    const createHandler = () => {\n      const resumeMultipartUpload = vi.fn(() => ({\n        uploadPart: vi.fn().mockResolvedValue({ etag: 'etag', partNumber: 1 }),\n      }))\n\n      return {\n        handler: getHandleMultiPartUpload({\n          access: () => true,\n          bucket: { resumeMultipartUpload } as unknown as R2Bucket,\n          collections: { media: { prefix: 'media' } },\n        }),\n        resumeMultipartUpload,\n      }\n    }\n\n    it('should reject a continuation key outside the receipt', async () => {\n      const { handler, resumeMultipartUpload } = createHandler()\n\n      await expect(\n        handler(\n          createContinuationRequest({\n            multipartKey: 'media-archive/photo.png',\n          }),\n        ),\n      ).rejects.toMatchObject({ status: 400 })\n      expect(resumeMultipartUpload).not.toHaveBeenCalled()\n    })\n\n    it('should resume the upload issued by the receipt', async () => {\n      const { handler, resumeMultipartUpload } = createHandler()\n\n      const response = await handler(\n        createContinuationRequest({\n          multipartKey: 'media/documents/photo.png',\n        }),\n      )\n\n      expect(response.status).toBe(200)\n      expect(resumeMultipartUpload).toHaveBeenCalledWith('media/documents/photo.png', 'upload-id')\n    })\n  })\n\n  it('rejects multipart uploads when the object already exists', async () => {\n    const createMultipartUpload = vi.fn()\n    const bucket = {\n      createMultipartUpload,\n      head: vi.fn().mockResolvedValue({ key: 'protected.png' }),\n    } as unknown as R2Bucket\n    const req = {\n      payload: {\n        collections: {\n          media: { config: { access: {}, upload: true } },\n        },\n        db: { findOne: vi.fn().mockResolvedValue(null) },\n      },\n      searchParams: new URLSearchParams({\n        collection: 'media',\n        fileName: 'protected.png',\n        fileType: 'image/png',\n      }),\n      user: { id: 'user' },\n    } as unknown as PayloadRequest\n    const handler = getHandleMultiPartUpload({\n      access: async () => true,\n      bucket,\n      collections: { media: true },\n    })\n\n    const response = await handler(req)\n\n    expect(response.status).toBe(412)\n    expect(createMultipartUpload).not.toHaveBeenCalled()\n  })\n})\n"],"names":["createClientUploadReceipt","describe","expect","it","vi","getHandleMultiPartUpload","createRequest","filename","mimeType","payload","collections","media","config","slug","access","upload","staticDir","searchParams","URLSearchParams","collection","fileName","fileType","user","id","createContinuationRequest","multipartKey","req","arrayBuffer","fn","mockResolvedValue","ArrayBuffer","secret","signedReceipt","collectionSlug","filePrefix","storageFilePath","multipartId","multipartNumber","each","createMultipartUpload","handler","bucket","rejects","toMatchObject","status","not","toHaveBeenCalled","createHandler","resumeMultipartUpload","uploadPart","etag","partNumber","prefix","response","toBe","toHaveBeenCalledWith","head","key","db","findOne"],"mappings":"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"}

package/dist/staticHandler.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=staticHandler.spec.d.ts.map

package/dist/staticHandler.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"staticHandler.spec.d.ts","sourceRoot":"","sources":["../src/staticHandler.spec.ts"],"names":[],"mappings":""}

package/dist/staticHandler.spec.js

@@ -1,63 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { createR2Adapter } from './adapter.js';
-describe('static handler document locations', ()=>{
-    it('should read the checked document without another lookup', async ()=>{
-        const head = vi.fn(async ()=>({
-                size: 4
-            }));
-        const get = vi.fn(async ()=>({
-                body: 'file',
-                writeHttpMetadata: vi.fn()
-            }));
-        const adapter = createR2Adapter({
-            bucket: {
-                get,
-                head
-            },
-            collections: {
-                media: true
-            }
-        });
-        const find = vi.fn(async ()=>({
-                docs: [
-                    {
-                        prefix: 'database'
-                    }
-                ]
-            }));
-        const generatedAdapter = adapter({
-            collection: {
-                fields: [],
-                slug: 'media',
-                upload: {}
-            },
-            prefix: 'media'
-        });
-        const doc = {
-            id: 'authorized',
-            prefix: 'legacy'
-        };
-        const response = await generatedAdapter.staticHandler({
-            headers: new Headers(),
-            payload: {
-                find,
-                logger: {
-                    error: vi.fn()
-                }
-            }
-        }, {
-            doc,
-            params: {
-                collection: 'media',
-                filename: 'original.png'
-            }
-        });
-        expect(response.status).toBe(200);
-        expect(await response.text()).toBe('file');
-        expect(head).toHaveBeenCalledWith('legacy/original.png');
-        expect(get).toHaveBeenCalledWith('legacy/original.png');
-        expect(find).not.toHaveBeenCalled();
-    });
-});
-
-//# sourceMappingURL=staticHandler.spec.js.map

package/dist/staticHandler.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/staticHandler.spec.ts"],"sourcesContent":["import { describe, expect, it, vi } from 'vitest'\n\nimport { createR2Adapter } from './adapter.js'\n\ndescribe('static handler document locations', () => {\n  it('should read the checked document without another lookup', async () => {\n    const head = vi.fn(async () => ({ size: 4 }))\n    const get = vi.fn(async () => ({ body: 'file', writeHttpMetadata: vi.fn() }))\n    const adapter = createR2Adapter({\n      bucket: { get, head } as never,\n      collections: { media: true },\n    })\n    const find = vi.fn(async () => ({ docs: [{ prefix: 'database' }] }))\n    const generatedAdapter = adapter({\n      collection: {\n        fields: [],\n        slug: 'media',\n        upload: {},\n      },\n      prefix: 'media',\n    })\n    const doc = {\n      id: 'authorized',\n      prefix: 'legacy',\n    }\n    const response = await generatedAdapter.staticHandler(\n      {\n        headers: new Headers(),\n        payload: { find, logger: { error: vi.fn() } },\n      } as never,\n      {\n        doc,\n        params: { collection: 'media', filename: 'original.png' },\n      },\n    )\n\n    expect(response.status).toBe(200)\n    expect(await response.text()).toBe('file')\n    expect(head).toHaveBeenCalledWith('legacy/original.png')\n    expect(get).toHaveBeenCalledWith('legacy/original.png')\n    expect(find).not.toHaveBeenCalled()\n  })\n})\n"],"names":["describe","expect","it","vi","createR2Adapter","head","fn","size","get","body","writeHttpMetadata","adapter","bucket","collections","media","find","docs","prefix","generatedAdapter","collection","fields","slug","upload","doc","id","response","staticHandler","headers","Headers","payload","logger","error","params","filename","status","toBe","text","toHaveBeenCalledWith","not","toHaveBeenCalled"],"mappings":"AAAA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAEjD,SAASC,eAAe,QAAQ,eAAc;AAE9CJ,SAAS,qCAAqC;IAC5CE,GAAG,2DAA2D;QAC5D,MAAMG,OAAOF,GAAGG,EAAE,CAAC,UAAa,CAAA;gBAAEC,MAAM;YAAE,CAAA;QAC1C,MAAMC,MAAML,GAAGG,EAAE,CAAC,UAAa,CAAA;gBAAEG,MAAM;gBAAQC,mBAAmBP,GAAGG,EAAE;YAAG,CAAA;QAC1E,MAAMK,UAAUP,gBAAgB;YAC9BQ,QAAQ;gBAAEJ;gBAAKH;YAAK;YACpBQ,aAAa;gBAAEC,OAAO;YAAK;QAC7B;QACA,MAAMC,OAAOZ,GAAGG,EAAE,CAAC,UAAa,CAAA;gBAAEU,MAAM;oBAAC;wBAAEC,QAAQ;oBAAW;iBAAE;YAAC,CAAA;QACjE,MAAMC,mBAAmBP,QAAQ;YAC/BQ,YAAY;gBACVC,QAAQ,EAAE;gBACVC,MAAM;gBACNC,QAAQ,CAAC;YACX;YACAL,QAAQ;QACV;QACA,MAAMM,MAAM;YACVC,IAAI;YACJP,QAAQ;QACV;QACA,MAAMQ,WAAW,MAAMP,iBAAiBQ,aAAa,CACnD;YACEC,SAAS,IAAIC;YACbC,SAAS;gBAAEd;gBAAMe,QAAQ;oBAAEC,OAAO5B,GAAGG,EAAE;gBAAG;YAAE;QAC9C,GACA;YACEiB;YACAS,QAAQ;gBAAEb,YAAY;gBAASc,UAAU;YAAe;QAC1D;QAGFhC,OAAOwB,SAASS,MAAM,EAAEC,IAAI,CAAC;QAC7BlC,OAAO,MAAMwB,SAASW,IAAI,IAAID,IAAI,CAAC;QACnClC,OAAOI,MAAMgC,oBAAoB,CAAC;QAClCpC,OAAOO,KAAK6B,oBAAoB,CAAC;QACjCpC,OAAOc,MAAMuB,GAAG,CAACC,gBAAgB;IACnC;AACF"}