@payloadcms/storage-vercel-blob 4.0.0-canary.32 → 4.0.0-canary.34

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.
Files changed (41) hide show
  1. package/dist/adapter.d.ts +3 -1
  2. package/dist/adapter.d.ts.map +1 -1
  3. package/dist/adapter.js +54 -24
  4. package/dist/adapter.js.map +1 -1
  5. package/dist/adapter.spec.js +124 -0
  6. package/dist/adapter.spec.js.map +1 -0
  7. package/dist/authorizeFileOverwrite.d.ts +16 -0
  8. package/dist/authorizeFileOverwrite.d.ts.map +1 -0
  9. package/dist/authorizeFileOverwrite.js +117 -0
  10. package/dist/authorizeFileOverwrite.js.map +1 -0
  11. package/dist/authorizeFileOverwrite.spec.js +92 -0
  12. package/dist/authorizeFileOverwrite.spec.js.map +1 -0
  13. package/dist/deleteFile.d.ts +2 -5
  14. package/dist/deleteFile.d.ts.map +1 -1
  15. package/dist/deleteFile.js +3 -10
  16. package/dist/deleteFile.js.map +1 -1
  17. package/dist/generateURL.d.ts +1 -0
  18. package/dist/generateURL.d.ts.map +1 -1
  19. package/dist/generateURL.js +13 -9
  20. package/dist/generateURL.js.map +1 -1
  21. package/dist/getCollectionSources.d.ts +20 -0
  22. package/dist/getCollectionSources.d.ts.map +1 -0
  23. package/dist/getCollectionSources.js +27 -0
  24. package/dist/getCollectionSources.js.map +1 -0
  25. package/dist/getCollectionSources.spec.js +67 -0
  26. package/dist/getCollectionSources.spec.js.map +1 -0
  27. package/dist/getFile.d.ts +3 -3
  28. package/dist/getFile.d.ts.map +1 -1
  29. package/dist/getFile.js +9 -7
  30. package/dist/getFile.js.map +1 -1
  31. package/dist/index.d.ts +8 -7
  32. package/dist/index.d.ts.map +1 -1
  33. package/dist/index.js +18 -5
  34. package/dist/index.js.map +1 -1
  35. package/dist/staticHandler.spec.js +71 -0
  36. package/dist/staticHandler.spec.js.map +1 -0
  37. package/dist/uploadFile.d.ts +2 -5
  38. package/dist/uploadFile.d.ts.map +1 -1
  39. package/dist/uploadFile.js +2 -9
  40. package/dist/uploadFile.js.map +1 -1
  41. package/package.json +4 -4
@@ -1,14 +1,7 @@
1
1
  import { del } from '@vercel/blob';
2
- import { generateURL } from './generateURL.js';
3
- export async function deleteFile({ baseUrl, collectionPrefix = '', docPrefix, filename, token, useCompositePrefixes = false }) {
4
- const fileUrl = generateURL({
5
- baseUrl,
6
- collectionPrefix,
7
- filename,
8
- prefix: docPrefix,
9
- useCompositePrefixes
10
- });
11
- await del(fileUrl, {
2
+ import { buildBlobUrl } from './generateURL.js';
3
+ export async function deleteFile({ baseUrl, storageFilePath, token }) {
4
+ await del(buildBlobUrl(baseUrl, storageFilePath), {
12
5
  token
13
6
  });
14
7
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import { del } from '@vercel/blob'\n\nimport { generateURL } from './generateURL.js'\n\ninterface DeleteFileArgs {\n baseUrl: string\n collectionPrefix?: string\n docPrefix: string\n filename: string\n token: string\n useCompositePrefixes?: boolean\n}\n\nexport async function deleteFile({\n baseUrl,\n collectionPrefix = '',\n docPrefix,\n filename,\n token,\n useCompositePrefixes = false,\n}: DeleteFileArgs): Promise<void> {\n const fileUrl = generateURL({\n baseUrl,\n collectionPrefix,\n filename,\n prefix: docPrefix,\n useCompositePrefixes,\n })\n\n await del(fileUrl, { token })\n}\n"],"names":["del","generateURL","deleteFile","baseUrl","collectionPrefix","docPrefix","filename","token","useCompositePrefixes","fileUrl","prefix"],"mappings":"AAAA,SAASA,GAAG,QAAQ,eAAc;AAElC,SAASC,WAAW,QAAQ,mBAAkB;AAW9C,OAAO,eAAeC,WAAW,EAC/BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,KAAK,EACLC,uBAAuB,KAAK,EACb;IACf,MAAMC,UAAUR,YAAY;QAC1BE;QACAC;QACAE;QACAI,QAAQL;QACRG;IACF;IAEA,MAAMR,IAAIS,SAAS;QAAEF;IAAM;AAC7B"}
1
+ {"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import { del } from '@vercel/blob'\n\nimport { buildBlobUrl } from './generateURL.js'\n\ninterface DeleteFileArgs {\n baseUrl: string\n storageFilePath: string\n token: string\n}\n\nexport async function deleteFile({\n baseUrl,\n storageFilePath,\n token,\n}: DeleteFileArgs): Promise<void> {\n await del(buildBlobUrl(baseUrl, storageFilePath), { token })\n}\n"],"names":["del","buildBlobUrl","deleteFile","baseUrl","storageFilePath","token"],"mappings":"AAAA,SAASA,GAAG,QAAQ,eAAc;AAElC,SAASC,YAAY,QAAQ,mBAAkB;AAQ/C,OAAO,eAAeC,WAAW,EAC/BC,OAAO,EACPC,eAAe,EACfC,KAAK,EACU;IACf,MAAML,IAAIC,aAAaE,SAASC,kBAAkB;QAAEC;IAAM;AAC5D"}
@@ -5,6 +5,7 @@ interface GenerateURLArgs {
5
5
  prefix: string;
6
6
  useCompositePrefixes?: boolean;
7
7
  }
8
+ export declare function buildBlobUrl(baseUrl: string, storageFilePath: string): string;
8
9
  export declare function generateURL({ baseUrl, collectionPrefix, filename, prefix, useCompositePrefixes, }: GenerateURLArgs): string;
9
10
  export {};
10
11
  //# sourceMappingURL=generateURL.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"generateURL.d.ts","sourceRoot":"","sources":["../src/generateURL.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,gBAAqB,EACrB,QAAQ,EACR,MAAM,EACN,oBAA4B,GAC7B,EAAE,eAAe,GAAG,MAAM,CAgB1B"}
1
+ {"version":3,"file":"generateURL.d.ts","sourceRoot":"","sources":["../src/generateURL.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAGD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAU7E;AAED,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,gBAAqB,EACrB,QAAQ,EACR,MAAM,EACN,oBAA4B,GAC7B,EAAE,eAAe,GAAG,MAAM,CAS1B"}
@@ -1,19 +1,23 @@
1
- import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
1
+ import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities';
2
2
  import path from 'path';
3
+ // Builds the public blob URL for a storage path, URL-encoding only the filename segment.
4
+ export function buildBlobUrl(baseUrl, storageFilePath) {
5
+ // example: "my-collection/my-doc/my file.jpg" -> "my-collection/my-doc"
6
+ const dir = path.posix.dirname(storageFilePath);
7
+ // example: "my file.jpg" -> "my%20file.jpg"
8
+ const encodedFilename = encodeURIComponent(path.posix.basename(storageFilePath));
9
+ // example: "my-collection/my-doc/my%20file.jpg"
10
+ const storageFilePathWithEncodedFilename = dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename);
11
+ return `${baseUrl}/${storageFilePathWithEncodedFilename}`;
12
+ }
3
13
  export function generateURL({ baseUrl, collectionPrefix = '', filename, prefix, useCompositePrefixes = false }) {
4
- const { fileKey: fileKeyWithPrefix } = getFileKey({
14
+ const { storageFilePath } = buildStoragePathData({
5
15
  collectionPrefix,
6
16
  docPrefix: prefix,
7
17
  filename,
8
18
  useCompositePrefixes
9
19
  });
10
- // example: "my-collection/my-doc/my file.jpg" -> "my-collection/my-doc"
11
- const dir = path.posix.dirname(fileKeyWithPrefix);
12
- // example: "my file.jpg" -> "my%20file.jpg"
13
- const encodedFilename = encodeURIComponent(path.posix.basename(fileKeyWithPrefix));
14
- // example: "my-collection/my-doc/my%20file.jpg"
15
- const fileKeyWithEncodedFilename = dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename);
16
- return `${baseUrl}/${fileKeyWithEncodedFilename}`;
20
+ return buildBlobUrl(baseUrl, storageFilePath);
17
21
  }
18
22
 
19
23
  //# sourceMappingURL=generateURL.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\ninterface GenerateURLArgs {\n baseUrl: string\n collectionPrefix?: string\n filename: string\n prefix: string\n useCompositePrefixes?: boolean\n}\n\nexport function generateURL({\n baseUrl,\n collectionPrefix = '',\n filename,\n prefix,\n useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n const { fileKey: fileKeyWithPrefix } = getFileKey({\n collectionPrefix,\n docPrefix: prefix,\n filename,\n useCompositePrefixes,\n })\n // example: \"my-collection/my-doc/my file.jpg\" -> \"my-collection/my-doc\"\n const dir = path.posix.dirname(fileKeyWithPrefix)\n // example: \"my file.jpg\" -> \"my%20file.jpg\"\n const encodedFilename = encodeURIComponent(path.posix.basename(fileKeyWithPrefix))\n // example: \"my-collection/my-doc/my%20file.jpg\"\n const fileKeyWithEncodedFilename =\n dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename)\n\n return `${baseUrl}/${fileKeyWithEncodedFilename}`\n}\n"],"names":["getFileKey","path","generateURL","baseUrl","collectionPrefix","filename","prefix","useCompositePrefixes","fileKey","fileKeyWithPrefix","docPrefix","dir","posix","dirname","encodedFilename","encodeURIComponent","basename","fileKeyWithEncodedFilename","join"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,OAAOC,UAAU,OAAM;AAUvB,OAAO,SAASC,YAAY,EAC1BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEC,SAASC,iBAAiB,EAAE,GAAGT,WAAW;QAChDI;QACAM,WAAWJ;QACXD;QACAE;IACF;IACA,wEAAwE;IACxE,MAAMI,MAAMV,KAAKW,KAAK,CAACC,OAAO,CAACJ;IAC/B,4CAA4C;IAC5C,MAAMK,kBAAkBC,mBAAmBd,KAAKW,KAAK,CAACI,QAAQ,CAACP;IAC/D,gDAAgD;IAChD,MAAMQ,6BACJN,QAAQ,MAAMG,kBAAkBb,KAAKW,KAAK,CAACM,IAAI,CAACP,KAAKG;IAEvD,OAAO,GAAGX,QAAQ,CAAC,EAAEc,4BAA4B;AACnD"}
1
+ {"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\ninterface GenerateURLArgs {\n baseUrl: string\n collectionPrefix?: string\n filename: string\n prefix: string\n useCompositePrefixes?: boolean\n}\n\n// Builds the public blob URL for a storage path, URL-encoding only the filename segment.\nexport function buildBlobUrl(baseUrl: string, storageFilePath: string): string {\n // example: \"my-collection/my-doc/my file.jpg\" -> \"my-collection/my-doc\"\n const dir = path.posix.dirname(storageFilePath)\n // example: \"my file.jpg\" -> \"my%20file.jpg\"\n const encodedFilename = encodeURIComponent(path.posix.basename(storageFilePath))\n // example: \"my-collection/my-doc/my%20file.jpg\"\n const storageFilePathWithEncodedFilename =\n dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename)\n\n return `${baseUrl}/${storageFilePathWithEncodedFilename}`\n}\n\nexport function generateURL({\n baseUrl,\n collectionPrefix = '',\n filename,\n prefix,\n useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n const { storageFilePath } = buildStoragePathData({\n collectionPrefix,\n docPrefix: prefix,\n filename,\n useCompositePrefixes,\n })\n\n return buildBlobUrl(baseUrl, storageFilePath)\n}\n"],"names":["buildStoragePathData","path","buildBlobUrl","baseUrl","storageFilePath","dir","posix","dirname","encodedFilename","encodeURIComponent","basename","storageFilePathWithEncodedFilename","join","generateURL","collectionPrefix","filename","prefix","useCompositePrefixes","docPrefix"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,6CAA4C;AACjF,OAAOC,UAAU,OAAM;AAUvB,yFAAyF;AACzF,OAAO,SAASC,aAAaC,OAAe,EAAEC,eAAuB;IACnE,wEAAwE;IACxE,MAAMC,MAAMJ,KAAKK,KAAK,CAACC,OAAO,CAACH;IAC/B,4CAA4C;IAC5C,MAAMI,kBAAkBC,mBAAmBR,KAAKK,KAAK,CAACI,QAAQ,CAACN;IAC/D,gDAAgD;IAChD,MAAMO,qCACJN,QAAQ,MAAMG,kBAAkBP,KAAKK,KAAK,CAACM,IAAI,CAACP,KAAKG;IAEvD,OAAO,GAAGL,QAAQ,CAAC,EAAEQ,oCAAoC;AAC3D;AAEA,OAAO,SAASE,YAAY,EAC1BV,OAAO,EACPW,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEb,eAAe,EAAE,GAAGJ,qBAAqB;QAC/Cc;QACAI,WAAWF;QACXD;QACAE;IACF;IAEA,OAAOf,aAAaC,SAASC;AAC/B"}
@@ -0,0 +1,20 @@
1
+ import type { StorageAdapter } from 'payload';
2
+ import type { VercelBlobCollectionSource } from './authorizeFileOverwrite.js';
3
+ type VercelBlobStorageMetadata = {
4
+ collections: Record<string, {
5
+ prefix?: string;
6
+ } | true | undefined>;
7
+ enabled: boolean;
8
+ storeId?: string;
9
+ useCompositePrefixes: boolean;
10
+ };
11
+ export declare const vercelBlobStorageMetadata: unique symbol;
12
+ export type InternalVercelBlobStorageAdapter = {
13
+ [vercelBlobStorageMetadata]: VercelBlobStorageMetadata;
14
+ } & StorageAdapter;
15
+ export declare const getCollectionSources: ({ currentAdapter, storageAdapters, }: {
16
+ currentAdapter: InternalVercelBlobStorageAdapter;
17
+ storageAdapters?: StorageAdapter[];
18
+ }) => VercelBlobCollectionSource[];
19
+ export {};
20
+ //# sourceMappingURL=getCollectionSources.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getCollectionSources.d.ts","sourceRoot":"","sources":["../src/getCollectionSources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAA;AAE7E,KAAK,yBAAyB,GAAG;IAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;IACnE,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,oBAAoB,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,yBAAyB,eAAsC,CAAA;AAE5E,MAAM,MAAM,gCAAgC,GAAG;IAC7C,CAAC,yBAAyB,CAAC,EAAE,yBAAyB,CAAA;CACvD,GAAG,cAAc,CAAA;AAMlB,eAAO,MAAM,oBAAoB,yCAG9B;IACD,cAAc,EAAE,gCAAgC,CAAA;IAChD,eAAe,CAAC,EAAE,cAAc,EAAE,CAAA;CACnC,KAAG,0BAA0B,EAoB7B,CAAA"}
@@ -0,0 +1,27 @@
1
+ export const vercelBlobStorageMetadata = Symbol('vercelBlobStorageMetadata');
2
+ const isInternalVercelBlobStorageAdapter = (adapter)=>vercelBlobStorageMetadata in adapter;
3
+ export const getCollectionSources = ({ currentAdapter, storageAdapters = [] })=>{
4
+ const currentMetadata = currentAdapter[vercelBlobStorageMetadata];
5
+ const adapters = new Set([
6
+ currentAdapter,
7
+ ...storageAdapters
8
+ ]);
9
+ return [
10
+ ...adapters
11
+ ].flatMap((adapter)=>{
12
+ if (!isInternalVercelBlobStorageAdapter(adapter)) {
13
+ return [];
14
+ }
15
+ const metadata = adapter[vercelBlobStorageMetadata];
16
+ if (!metadata.enabled || metadata.storeId !== currentMetadata.storeId) {
17
+ return [];
18
+ }
19
+ return Object.entries(metadata.collections).map(([collectionSlug, options])=>({
20
+ collectionPrefix: options === true ? '' : options?.prefix || '',
21
+ collectionSlug,
22
+ useCompositePrefixes: metadata.useCompositePrefixes
23
+ }));
24
+ });
25
+ };
26
+
27
+ //# sourceMappingURL=getCollectionSources.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../src/getCollectionSources.ts"],"sourcesContent":["import type { StorageAdapter } from 'payload'\n\nimport type { VercelBlobCollectionSource } from './authorizeFileOverwrite.js'\n\ntype VercelBlobStorageMetadata = {\n collections: Record<string, { prefix?: string } | true | undefined>\n enabled: boolean\n storeId?: string\n useCompositePrefixes: boolean\n}\n\nexport const vercelBlobStorageMetadata = Symbol('vercelBlobStorageMetadata')\n\nexport type InternalVercelBlobStorageAdapter = {\n [vercelBlobStorageMetadata]: VercelBlobStorageMetadata\n} & StorageAdapter\n\nconst isInternalVercelBlobStorageAdapter = (\n adapter: StorageAdapter,\n): adapter is InternalVercelBlobStorageAdapter => vercelBlobStorageMetadata in adapter\n\nexport const getCollectionSources = ({\n currentAdapter,\n storageAdapters = [],\n}: {\n currentAdapter: InternalVercelBlobStorageAdapter\n storageAdapters?: StorageAdapter[]\n}): VercelBlobCollectionSource[] => {\n const currentMetadata = currentAdapter[vercelBlobStorageMetadata]\n const adapters = new Set([currentAdapter, ...storageAdapters])\n\n return [...adapters].flatMap((adapter) => {\n if (!isInternalVercelBlobStorageAdapter(adapter)) {\n return []\n }\n\n const metadata = adapter[vercelBlobStorageMetadata]\n if (!metadata.enabled || metadata.storeId !== currentMetadata.storeId) {\n return []\n }\n\n return Object.entries(metadata.collections).map(([collectionSlug, options]) => ({\n collectionPrefix: options === true ? '' : options?.prefix || '',\n collectionSlug,\n useCompositePrefixes: metadata.useCompositePrefixes,\n }))\n })\n}\n"],"names":["vercelBlobStorageMetadata","Symbol","isInternalVercelBlobStorageAdapter","adapter","getCollectionSources","currentAdapter","storageAdapters","currentMetadata","adapters","Set","flatMap","metadata","enabled","storeId","Object","entries","collections","map","collectionSlug","options","collectionPrefix","prefix","useCompositePrefixes"],"mappings":"AAWA,OAAO,MAAMA,4BAA4BC,OAAO,6BAA4B;AAM5E,MAAMC,qCAAqC,CACzCC,UACgDH,6BAA6BG;AAE/E,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,cAAc,EACdC,kBAAkB,EAAE,EAIrB;IACC,MAAMC,kBAAkBF,cAAc,CAACL,0BAA0B;IACjE,MAAMQ,WAAW,IAAIC,IAAI;QAACJ;WAAmBC;KAAgB;IAE7D,OAAO;WAAIE;KAAS,CAACE,OAAO,CAAC,CAACP;QAC5B,IAAI,CAACD,mCAAmCC,UAAU;YAChD,OAAO,EAAE;QACX;QAEA,MAAMQ,WAAWR,OAAO,CAACH,0BAA0B;QACnD,IAAI,CAACW,SAASC,OAAO,IAAID,SAASE,OAAO,KAAKN,gBAAgBM,OAAO,EAAE;YACrE,OAAO,EAAE;QACX;QAEA,OAAOC,OAAOC,OAAO,CAACJ,SAASK,WAAW,EAAEC,GAAG,CAAC,CAAC,CAACC,gBAAgBC,QAAQ,GAAM,CAAA;gBAC9EC,kBAAkBD,YAAY,OAAO,KAAKA,SAASE,UAAU;gBAC7DH;gBACAI,sBAAsBX,SAASW,oBAAoB;YACrD,CAAA;IACF;AACF,EAAC"}
@@ -0,0 +1,67 @@
1
+ import { describe, expect, it } from 'vitest';
2
+ import { getCollectionSources } from './getCollectionSources.js';
3
+ import { vercelBlobStorage } from './index.js';
4
+ describe('getCollectionSources', ()=>{
5
+ it('includes collections from adapter instances that share a store', ()=>{
6
+ const mediaAdapter = vercelBlobStorage({
7
+ collections: {
8
+ media: true
9
+ },
10
+ token: 'vercel_blob_rw_shared_abc123'
11
+ });
12
+ const protectedAdapter = vercelBlobStorage({
13
+ collections: {
14
+ protected: {
15
+ prefix: 'assets'
16
+ }
17
+ },
18
+ token: 'vercel_blob_rw_shared_def456',
19
+ useCompositePrefixes: true
20
+ });
21
+ const otherStoreAdapter = vercelBlobStorage({
22
+ collections: {
23
+ archive: true
24
+ },
25
+ token: 'vercel_blob_rw_other_abc123'
26
+ });
27
+ expect(getCollectionSources({
28
+ currentAdapter: mediaAdapter,
29
+ storageAdapters: [
30
+ mediaAdapter,
31
+ protectedAdapter,
32
+ otherStoreAdapter
33
+ ]
34
+ })).toEqual([
35
+ {
36
+ collectionPrefix: '',
37
+ collectionSlug: 'media',
38
+ useCompositePrefixes: false
39
+ },
40
+ {
41
+ collectionPrefix: 'assets',
42
+ collectionSlug: 'protected',
43
+ useCompositePrefixes: true
44
+ }
45
+ ]);
46
+ });
47
+ it('includes the current adapter when config storage is unavailable', ()=>{
48
+ const adapter = vercelBlobStorage({
49
+ collections: {
50
+ media: true
51
+ },
52
+ token: 'vercel_blob_rw_shared_abc123'
53
+ });
54
+ expect(getCollectionSources({
55
+ currentAdapter: adapter,
56
+ storageAdapters: undefined
57
+ })).toEqual([
58
+ {
59
+ collectionPrefix: '',
60
+ collectionSlug: 'media',
61
+ useCompositePrefixes: false
62
+ }
63
+ ]);
64
+ });
65
+ });
66
+
67
+ //# sourceMappingURL=getCollectionSources.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../src/getCollectionSources.spec.ts"],"sourcesContent":["import { describe, expect, it } from 'vitest'\n\nimport {\n getCollectionSources,\n type InternalVercelBlobStorageAdapter,\n} from './getCollectionSources.js'\nimport { vercelBlobStorage } from './index.js'\n\ndescribe('getCollectionSources', () => {\n it('includes collections from adapter instances that share a store', () => {\n const mediaAdapter = vercelBlobStorage({\n collections: { media: true },\n token: 'vercel_blob_rw_shared_abc123',\n }) as InternalVercelBlobStorageAdapter\n const protectedAdapter = vercelBlobStorage({\n collections: { protected: { prefix: 'assets' } },\n token: 'vercel_blob_rw_shared_def456',\n useCompositePrefixes: true,\n }) as InternalVercelBlobStorageAdapter\n const otherStoreAdapter = vercelBlobStorage({\n collections: { archive: true },\n token: 'vercel_blob_rw_other_abc123',\n })\n\n expect(\n getCollectionSources({\n currentAdapter: mediaAdapter,\n storageAdapters: [mediaAdapter, protectedAdapter, otherStoreAdapter],\n }),\n ).toEqual([\n { collectionPrefix: '', collectionSlug: 'media', useCompositePrefixes: false },\n { collectionPrefix: 'assets', collectionSlug: 'protected', useCompositePrefixes: true },\n ])\n })\n\n it('includes the current adapter when config storage is unavailable', () => {\n const adapter = vercelBlobStorage({\n collections: { media: true },\n token: 'vercel_blob_rw_shared_abc123',\n }) as InternalVercelBlobStorageAdapter\n\n expect(getCollectionSources({ currentAdapter: adapter, storageAdapters: undefined })).toEqual([\n { collectionPrefix: '', collectionSlug: 'media', useCompositePrefixes: false },\n ])\n })\n})\n"],"names":["describe","expect","it","getCollectionSources","vercelBlobStorage","mediaAdapter","collections","media","token","protectedAdapter","protected","prefix","useCompositePrefixes","otherStoreAdapter","archive","currentAdapter","storageAdapters","toEqual","collectionPrefix","collectionSlug","adapter","undefined"],"mappings":"AAAA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,SAAQ;AAE7C,SACEC,oBAAoB,QAEf,4BAA2B;AAClC,SAASC,iBAAiB,QAAQ,aAAY;AAE9CJ,SAAS,wBAAwB;IAC/BE,GAAG,kEAAkE;QACnE,MAAMG,eAAeD,kBAAkB;YACrCE,aAAa;gBAAEC,OAAO;YAAK;YAC3BC,OAAO;QACT;QACA,MAAMC,mBAAmBL,kBAAkB;YACzCE,aAAa;gBAAEI,WAAW;oBAAEC,QAAQ;gBAAS;YAAE;YAC/CH,OAAO;YACPI,sBAAsB;QACxB;QACA,MAAMC,oBAAoBT,kBAAkB;YAC1CE,aAAa;gBAAEQ,SAAS;YAAK;YAC7BN,OAAO;QACT;QAEAP,OACEE,qBAAqB;YACnBY,gBAAgBV;YAChBW,iBAAiB;gBAACX;gBAAcI;gBAAkBI;aAAkB;QACtE,IACAI,OAAO,CAAC;YACR;gBAAEC,kBAAkB;gBAAIC,gBAAgB;gBAASP,sBAAsB;YAAM;YAC7E;gBAAEM,kBAAkB;gBAAUC,gBAAgB;gBAAaP,sBAAsB;YAAK;SACvF;IACH;IAEAV,GAAG,mEAAmE;QACpE,MAAMkB,UAAUhB,kBAAkB;YAChCE,aAAa;gBAAEC,OAAO;YAAK;YAC3BC,OAAO;QACT;QAEAP,OAAOE,qBAAqB;YAAEY,gBAAgBK;YAASJ,iBAAiBK;QAAU,IAAIJ,OAAO,CAAC;YAC5F;gBAAEC,kBAAkB;gBAAIC,gBAAgB;gBAASP,sBAAsB;YAAM;SAC9E;IACH;AACF"}
package/dist/getFile.d.ts CHANGED
@@ -1,17 +1,17 @@
1
- import type { CollectionConfig, PayloadRequest } from 'payload';
1
+ import type { CollectionConfig, PayloadRequest, TypeWithID } from 'payload';
2
2
  interface GetFileArgs {
3
3
  baseUrl: string;
4
4
  cacheControlMaxAge: number;
5
5
  collection: CollectionConfig;
6
6
  collectionPrefix?: string;
7
+ doc?: TypeWithID;
7
8
  filename: string;
8
9
  incomingHeaders?: Headers;
9
- prefixQueryParam?: string;
10
10
  req: PayloadRequest;
11
11
  token: string;
12
12
  uploadReference?: unknown;
13
13
  useCompositePrefixes?: boolean;
14
14
  }
15
- export declare function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix, filename, incomingHeaders, prefixQueryParam, req, token, uploadReference, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
15
+ export declare function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix, doc, filename, incomingHeaders, req, token, uploadReference, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
16
16
  export {};
17
17
  //# sourceMappingURL=getFile.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAQ/D,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,OAAO,EACP,kBAAkB,EAClB,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,KAAK,EACL,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8FjC"}
1
+ {"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAQ3E,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,CAAC,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,OAAO,EACP,kBAAkB,EAClB,UAAU,EACV,gBAAqB,EACrB,GAAG,EACH,QAAQ,EACR,eAAe,EACf,GAAG,EACH,KAAK,EACL,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAgGjC"}
package/dist/getFile.js CHANGED
@@ -1,15 +1,17 @@
1
1
  import { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities';
2
2
  import { BlobNotFoundError, head } from '@vercel/blob';
3
- import { getRangeRequestInfo } from 'payload/internal';
3
+ import { getRangeRequestInfo, isXmlMimeType, uploadContentSecurityPolicy } from 'payload/internal';
4
4
  import { generateURL } from './generateURL.js';
5
- export async function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix = '', filename, incomingHeaders, prefixQueryParam, req, token, uploadReference, useCompositePrefixes = false }) {
5
+ export async function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix = '', doc, filename, incomingHeaders, req, token, uploadReference, useCompositePrefixes = false }) {
6
6
  try {
7
7
  const docPrefix = await getDocPrefix({
8
8
  collection,
9
+ collectionPrefix,
10
+ doc,
9
11
  filename,
10
- prefixQueryParam,
11
12
  req,
12
- uploadReference
13
+ uploadReference,
14
+ useCompositePrefixes
13
15
  });
14
16
  const fileUrl = generateURL({
15
17
  baseUrl,
@@ -47,9 +49,9 @@ export async function getFile({ baseUrl, cacheControlMaxAge, collection, collect
47
49
  headers.append('Content-Disposition', contentDisposition);
48
50
  headers.append('Content-Type', contentType);
49
51
  headers.append('ETag', ETag);
50
- // Add Content-Security-Policy header for SVG files to prevent executable code
51
- if (contentType === 'image/svg+xml') {
52
- headers.append('Content-Security-Policy', "script-src 'none'");
52
+ // Apply a restrictive policy to XML-family responses served through Payload.
53
+ if (isXmlMimeType(contentType)) {
54
+ headers.append('Content-Security-Policy', uploadContentSecurityPolicy);
53
55
  }
54
56
  if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
55
57
  headers = collection.upload.modifyResponseHeaders({
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { CollectionConfig, PayloadRequest } from 'payload'\n\nimport { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { BlobNotFoundError, head } from '@vercel/blob'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport { generateURL } from './generateURL.js'\n\ninterface GetFileArgs {\n baseUrl: string\n cacheControlMaxAge: number\n collection: CollectionConfig\n collectionPrefix?: string\n filename: string\n incomingHeaders?: Headers\n prefixQueryParam?: string\n req: PayloadRequest\n token: string\n uploadReference?: unknown\n useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n baseUrl,\n cacheControlMaxAge,\n collection,\n collectionPrefix = '',\n filename,\n incomingHeaders,\n prefixQueryParam,\n req,\n token,\n uploadReference,\n useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n try {\n const docPrefix = await getDocPrefix({\n collection,\n filename,\n prefixQueryParam,\n req,\n uploadReference,\n })\n\n const fileUrl = generateURL({\n baseUrl,\n collectionPrefix,\n filename,\n prefix: docPrefix,\n useCompositePrefixes,\n })\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const blobMetadata = await head(fileUrl, { token })\n const { contentDisposition, contentType, size, uploadedAt } = blobMetadata\n const uploadedAtString = uploadedAt.toISOString()\n const fileKeyForETag = fileUrl.replace(`${baseUrl}/`, '')\n const ETag = `\"${fileKeyForETag}-${uploadedAtString}\"`\n\n // Handle range request\n const rangeHeader = req.headers.get('range')\n const rangeResult = getRangeRequestInfo({ fileSize: size, 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 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 headers.append('Cache-Control', `public, max-age=${cacheControlMaxAge}`)\n headers.append('Content-Disposition', contentDisposition)\n headers.append('Content-Type', contentType)\n headers.append('ETag', ETag)\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 collection.upload &&\n typeof collection.upload === 'object' &&\n typeof collection.upload.modifyResponseHeaders === 'function'\n ) {\n headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n }\n\n if (etagFromHeaders && etagFromHeaders === ETag) {\n return new Response(null, {\n headers,\n status: 304,\n })\n }\n\n const response = await fetch(`${fileUrl}?${uploadedAtString}`, {\n headers: {\n 'Cache-Control': 'no-store, no-cache, must-revalidate',\n Pragma: 'no-cache',\n ...(rangeResult.type === 'partial' && {\n Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`,\n }),\n },\n })\n\n if (!response.ok || !response.body) {\n return new Response(null, { status: 204, statusText: 'No Content' })\n }\n\n headers.append('Last-Modified', uploadedAtString)\n\n return new Response(response.body, {\n headers,\n status: rangeResult.status,\n })\n } catch (err: unknown) {\n if (err instanceof BlobNotFoundError) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n return new Response('Internal Server Error', { status: 500 })\n }\n}\n"],"names":["getFilePrefix","getDocPrefix","BlobNotFoundError","head","getRangeRequestInfo","generateURL","getFile","baseUrl","cacheControlMaxAge","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","token","uploadReference","useCompositePrefixes","docPrefix","fileUrl","prefix","etagFromHeaders","headers","get","blobMetadata","contentDisposition","contentType","size","uploadedAt","uploadedAtString","toISOString","fileKeyForETag","replace","ETag","rangeHeader","rangeResult","fileSize","type","Response","Headers","status","key","value","Object","entries","append","upload","modifyResponseHeaders","response","fetch","Pragma","Range","rangeStart","rangeEnd","ok","body","statusText","err","payload","logger","error","msg"],"mappings":"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"}
1
+ {"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { CollectionConfig, PayloadRequest, TypeWithID } from 'payload'\n\nimport { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { BlobNotFoundError, head } from '@vercel/blob'\nimport { getRangeRequestInfo, isXmlMimeType, uploadContentSecurityPolicy } from 'payload/internal'\n\nimport { generateURL } from './generateURL.js'\n\ninterface GetFileArgs {\n baseUrl: string\n cacheControlMaxAge: number\n collection: CollectionConfig\n collectionPrefix?: string\n doc?: TypeWithID\n filename: string\n incomingHeaders?: Headers\n req: PayloadRequest\n token: string\n uploadReference?: unknown\n useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n baseUrl,\n cacheControlMaxAge,\n collection,\n collectionPrefix = '',\n doc,\n filename,\n incomingHeaders,\n req,\n token,\n uploadReference,\n useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n try {\n const docPrefix = await getDocPrefix({\n collection,\n collectionPrefix,\n doc,\n filename,\n req,\n uploadReference,\n useCompositePrefixes,\n })\n\n const fileUrl = generateURL({\n baseUrl,\n collectionPrefix,\n filename,\n prefix: docPrefix,\n useCompositePrefixes,\n })\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const blobMetadata = await head(fileUrl, { token })\n const { contentDisposition, contentType, size, uploadedAt } = blobMetadata\n const uploadedAtString = uploadedAt.toISOString()\n const fileKeyForETag = fileUrl.replace(`${baseUrl}/`, '')\n const ETag = `\"${fileKeyForETag}-${uploadedAtString}\"`\n\n // Handle range request\n const rangeHeader = req.headers.get('range')\n const rangeResult = getRangeRequestInfo({ fileSize: size, 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 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 headers.append('Cache-Control', `public, max-age=${cacheControlMaxAge}`)\n headers.append('Content-Disposition', contentDisposition)\n headers.append('Content-Type', contentType)\n headers.append('ETag', ETag)\n\n // Apply a restrictive policy to XML-family responses served through Payload.\n if (isXmlMimeType(contentType)) {\n headers.append('Content-Security-Policy', uploadContentSecurityPolicy)\n }\n\n if (\n collection.upload &&\n typeof collection.upload === 'object' &&\n typeof collection.upload.modifyResponseHeaders === 'function'\n ) {\n headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n }\n\n if (etagFromHeaders && etagFromHeaders === ETag) {\n return new Response(null, {\n headers,\n status: 304,\n })\n }\n\n const response = await fetch(`${fileUrl}?${uploadedAtString}`, {\n headers: {\n 'Cache-Control': 'no-store, no-cache, must-revalidate',\n Pragma: 'no-cache',\n ...(rangeResult.type === 'partial' && {\n Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`,\n }),\n },\n })\n\n if (!response.ok || !response.body) {\n return new Response(null, { status: 204, statusText: 'No Content' })\n }\n\n headers.append('Last-Modified', uploadedAtString)\n\n return new Response(response.body, {\n headers,\n status: rangeResult.status,\n })\n } catch (err: unknown) {\n if (err instanceof BlobNotFoundError) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n return new Response('Internal Server Error', { status: 500 })\n }\n}\n"],"names":["getFilePrefix","getDocPrefix","BlobNotFoundError","head","getRangeRequestInfo","isXmlMimeType","uploadContentSecurityPolicy","generateURL","getFile","baseUrl","cacheControlMaxAge","collection","collectionPrefix","doc","filename","incomingHeaders","req","token","uploadReference","useCompositePrefixes","docPrefix","fileUrl","prefix","etagFromHeaders","headers","get","blobMetadata","contentDisposition","contentType","size","uploadedAt","uploadedAtString","toISOString","fileKeyForETag","replace","ETag","rangeHeader","rangeResult","fileSize","type","Response","Headers","status","key","value","Object","entries","append","upload","modifyResponseHeaders","response","fetch","Pragma","Range","rangeStart","rangeEnd","ok","body","statusText","err","payload","logger","error","msg"],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -54,14 +54,15 @@ export type VercelBlobStorageOptions = {
54
54
  token: string | undefined;
55
55
  /**
56
56
  * When true, the collection-level prefix and document-level prefix are combined
57
- * (compositional). When false (default), document prefix overrides collection
58
- * prefix entirely.
57
+ * (compositional). When false (default), a document prefix already within the
58
+ * collection prefix is used as-is for new uploads; otherwise it is nested beneath it.
59
+ * Existing files retain their stored prefixes for reads, URLs, and cleanup.
59
60
  *
60
- * Example:
61
- * - collection prefix: `collection-prefix/`
62
- * - document prefix: `document-prefix/`
63
- * - resulting prefix with useCompositePrefixes=true: `collection-prefix/document-prefix/`
64
- * - resulting prefix with useCompositePrefixes=false: `document-prefix/`
61
+ * Example with a document prefix already contained by the collection prefix:
62
+ * - collection prefix: `uploads/`
63
+ * - document prefix: `uploads/documents/`
64
+ * - resulting prefix with useCompositePrefixes=true: `uploads/uploads/documents/`
65
+ * - resulting prefix with useCompositePrefixes=false: `uploads/documents/`
65
66
  *
66
67
  * @default false
67
68
  */
@@ -1 +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;AAM3E,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;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;IACjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAEzB;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AASD,KAAK,wBAAwB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,cAAc,CAAA;AAEnG,eAAO,MAAM,iBAAiB,EAAE,wBAoG9B,CAAA"}
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;AAW3E,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;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;IACjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAEzB;;;;;;;;;;;;;OAaG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AASD,KAAK,wBAAwB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,cAAc,CAAA;AAEnG,eAAO,MAAM,iBAAiB,EAAE,wBA4G/B,CAAA"}
package/dist/index.js CHANGED
@@ -1,18 +1,19 @@
1
1
  import { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage';
2
2
  import { createVercelBlobAdapter } from './adapter.js';
3
+ import { getCollectionSources, vercelBlobStorageMetadata } from './getCollectionSources.js';
3
4
  const defaultUploadOptions = {
4
5
  access: 'public',
5
6
  addRandomSuffix: false,
6
7
  cacheControlMaxAge: 60 * 60 * 24 * 365,
7
8
  enabled: true
8
9
  };
9
- export const vercelBlobStorage = (options)=>({
10
+ export const vercelBlobStorage = (options)=>{
11
+ const storeId = options.token?.match(/^vercel_blob_rw_([a-z\d]+)_[a-z\d]+$/i)?.[1]?.toLowerCase();
12
+ const isPluginDisabled = options.enabled === false || !options.token;
13
+ const storageAdapter = {
10
14
  name: 'vercel-blob',
11
15
  collections: Object.keys(options.collections),
12
16
  init: (incomingConfig)=>{
13
- // Parse storeId from token
14
- const storeId = options.token?.match(/^vercel_blob_rw_([a-z\d]+)_[a-z\d]+$/i)?.[1]?.toLowerCase();
15
- const isPluginDisabled = options.enabled === false || !options.token;
16
17
  // Don't throw if the plugin is disabled
17
18
  if (!storeId && !isPluginDisabled) {
18
19
  throw new Error('Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.');
@@ -48,6 +49,10 @@ export const vercelBlobStorage = (options)=>({
48
49
  baseUrl,
49
50
  cacheControlMaxAge: optionsWithDefaults.cacheControlMaxAge ?? 60 * 60 * 24 * 365,
50
51
  clientUploads: optionsWithDefaults.clientUploads,
52
+ collectionSources: getCollectionSources({
53
+ currentAdapter: storageAdapter,
54
+ storageAdapters: incomingConfig.storage
55
+ }),
51
56
  token: options.token,
52
57
  useCompositePrefixes: options.useCompositePrefixes
53
58
  });
@@ -80,7 +85,15 @@ export const vercelBlobStorage = (options)=>({
80
85
  collections: collectionsWithAdapter,
81
86
  useCompositePrefixes: options.useCompositePrefixes
82
87
  })(config);
88
+ },
89
+ [vercelBlobStorageMetadata]: {
90
+ collections: options.collections,
91
+ enabled: !isPluginDisabled,
92
+ storeId,
93
+ useCompositePrefixes: Boolean(options.useCompositePrefixes)
83
94
  }
84
- });
95
+ };
96
+ return storageAdapter;
97
+ };
85
98
 
86
99
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +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 { createVercelBlobAdapter } from './adapter.js'\n\nexport type VercelBlobStorageOptions = {\n /**\n * Access control level. Currently, only 'public' is supported.\n * Vercel plans on adding support for private blobs in the future.\n *\n * @default 'public'\n */\n access?: 'public'\n\n /**\n * Add a random suffix to the uploaded file name in Vercel Blob storage\n *\n * @default false\n */\n addRandomSuffix?: boolean\n\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 * Cache-Control max-age in seconds\n *\n * @default 365 * 24 * 60 * 60 // (1 Year)\n */\n cacheControlMaxAge?: number\n\n /**\n * Upload directly to Vercel Blob instead of through Payload.\n */\n clientUploads?: ClientUploadsConfig\n\n /**\n * Collections to apply the Vercel Blob 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 * Vercel Blob storage read/write token\n *\n * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n *\n * If unset, the plugin will be disabled and will fallback to local storage\n */\n token: string | undefined\n\n /**\n * When true, the collection-level prefix and document-level prefix are combined\n * (compositional). When false (default), document prefix overrides collection\n * prefix entirely.\n *\n * Example:\n * - collection prefix: `collection-prefix/`\n * - document prefix: `document-prefix/`\n * - resulting prefix with useCompositePrefixes=true: `collection-prefix/document-prefix/`\n * - resulting prefix with useCompositePrefixes=false: `document-prefix/`\n *\n * @default false\n */\n useCompositePrefixes?: boolean\n}\n\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n access: 'public',\n addRandomSuffix: false,\n cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n enabled: true,\n}\n\ntype VercelBlobStorageFactory = (vercelBlobStorageOpts: VercelBlobStorageOptions) => StorageAdapter\n\nexport const vercelBlobStorage: VercelBlobStorageFactory = (\n options: VercelBlobStorageOptions,\n): StorageAdapter => ({\n name: 'vercel-blob',\n collections: Object.keys(options.collections),\n init: (incomingConfig: Config): Config => {\n // Parse storeId from token\n const storeId = options.token\n ?.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]\n ?.toLowerCase()\n\n const isPluginDisabled = options.enabled === false || !options.token\n\n // Don't throw if the plugin is disabled\n if (!storeId && !isPluginDisabled) {\n throw new Error(\n 'Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.',\n )\n }\n\n const optionsWithDefaults = {\n ...defaultUploadOptions,\n ...options,\n }\n\n // support overriding the base URL for emulator https://github.com/payloadcms/vercel-blob-emulator\n const baseUrl =\n process.env.STORAGE_VERCEL_BLOB_BASE_URL ||\n `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n // If the plugin is disabled or no token is provided, do not enable the plugin\n if (isPluginDisabled) {\n if (options.alwaysInsertFields) {\n const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n options.collections,\n ).reduce(\n (acc, [slug, collOptions]) => ({\n ...acc,\n [slug]: { ...(collOptions === true ? {} : collOptions), adapter: null },\n }),\n {} as Record<string, CollectionOptions>,\n )\n return cloudStoragePlugin({\n alwaysInsertFields: true,\n collections: collectionsWithoutAdapter,\n enabled: false,\n useCompositePrefixes: options.useCompositePrefixes,\n })(incomingConfig)\n }\n return incomingConfig\n }\n\n const adapter = createVercelBlobAdapter({\n access: optionsWithDefaults.access ?? 'public',\n addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n baseUrl,\n cacheControlMaxAge: optionsWithDefaults.cacheControlMaxAge ?? 60 * 60 * 24 * 365,\n clientUploads: optionsWithDefaults.clientUploads,\n token: options.token!,\n useCompositePrefixes: options.useCompositePrefixes,\n })\n\n // Add adapter to each collection option object\n const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n options.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: options.alwaysInsertFields,\n collections: collectionsWithAdapter,\n useCompositePrefixes: options.useCompositePrefixes,\n })(config)\n },\n})\n"],"names":["cloudStoragePlugin","createVercelBlobAdapter","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","name","collections","Object","keys","init","incomingConfig","storeId","token","match","toLowerCase","isPluginDisabled","Error","optionsWithDefaults","baseUrl","process","env","STORAGE_VERCEL_BLOB_BASE_URL","alwaysInsertFields","collectionsWithoutAdapter","entries","reduce","acc","slug","collOptions","adapter","useCompositePrefixes","clientUploads","collectionsWithAdapter","config","map","collection","upload","disableLocalStorage"],"mappings":"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"}
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 { createVercelBlobAdapter } from './adapter.js'\nimport {\n getCollectionSources,\n type InternalVercelBlobStorageAdapter,\n vercelBlobStorageMetadata,\n} from './getCollectionSources.js'\n\nexport type VercelBlobStorageOptions = {\n /**\n * Access control level. Currently, only 'public' is supported.\n * Vercel plans on adding support for private blobs in the future.\n *\n * @default 'public'\n */\n access?: 'public'\n\n /**\n * Add a random suffix to the uploaded file name in Vercel Blob storage\n *\n * @default false\n */\n addRandomSuffix?: boolean\n\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 * Cache-Control max-age in seconds\n *\n * @default 365 * 24 * 60 * 60 // (1 Year)\n */\n cacheControlMaxAge?: number\n\n /**\n * Upload directly to Vercel Blob instead of through Payload.\n */\n clientUploads?: ClientUploadsConfig\n\n /**\n * Collections to apply the Vercel Blob 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 * Vercel Blob storage read/write token\n *\n * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n *\n * If unset, the plugin will be disabled and will fallback to local storage\n */\n token: string | undefined\n\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\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n access: 'public',\n addRandomSuffix: false,\n cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n enabled: true,\n}\n\ntype VercelBlobStorageFactory = (vercelBlobStorageOpts: VercelBlobStorageOptions) => StorageAdapter\n\nexport const vercelBlobStorage: VercelBlobStorageFactory = (\n options: VercelBlobStorageOptions,\n): StorageAdapter => {\n const storeId = options.token?.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]?.toLowerCase()\n const isPluginDisabled = options.enabled === false || !options.token\n const storageAdapter: InternalVercelBlobStorageAdapter = {\n name: 'vercel-blob',\n collections: Object.keys(options.collections),\n init: (incomingConfig: Config): Config => {\n // Don't throw if the plugin is disabled\n if (!storeId && !isPluginDisabled) {\n throw new Error(\n 'Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.',\n )\n }\n\n const optionsWithDefaults = {\n ...defaultUploadOptions,\n ...options,\n }\n\n // support overriding the base URL for emulator https://github.com/payloadcms/vercel-blob-emulator\n const baseUrl =\n process.env.STORAGE_VERCEL_BLOB_BASE_URL ||\n `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n // If the plugin is disabled or no token is provided, do not enable the plugin\n if (isPluginDisabled) {\n if (options.alwaysInsertFields) {\n const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] =\n Object.entries(options.collections).reduce(\n (acc, [slug, collOptions]) => ({\n ...acc,\n [slug]: { ...(collOptions === true ? {} : collOptions), adapter: null },\n }),\n {} as Record<string, CollectionOptions>,\n )\n return cloudStoragePlugin({\n alwaysInsertFields: true,\n collections: collectionsWithoutAdapter,\n enabled: false,\n useCompositePrefixes: options.useCompositePrefixes,\n })(incomingConfig)\n }\n return incomingConfig\n }\n\n const adapter = createVercelBlobAdapter({\n access: optionsWithDefaults.access ?? 'public',\n addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n baseUrl,\n cacheControlMaxAge: optionsWithDefaults.cacheControlMaxAge ?? 60 * 60 * 24 * 365,\n clientUploads: optionsWithDefaults.clientUploads,\n collectionSources: getCollectionSources({\n currentAdapter: storageAdapter,\n storageAdapters: incomingConfig.storage,\n }),\n token: options.token!,\n useCompositePrefixes: options.useCompositePrefixes,\n })\n\n // Add adapter to each collection option object\n const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n options.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: options.alwaysInsertFields,\n collections: collectionsWithAdapter,\n useCompositePrefixes: options.useCompositePrefixes,\n })(config)\n },\n [vercelBlobStorageMetadata]: {\n collections: options.collections,\n enabled: !isPluginDisabled,\n storeId,\n useCompositePrefixes: Boolean(options.useCompositePrefixes),\n },\n }\n\n return storageAdapter\n}\n"],"names":["cloudStoragePlugin","createVercelBlobAdapter","getCollectionSources","vercelBlobStorageMetadata","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","storeId","token","match","toLowerCase","isPluginDisabled","storageAdapter","name","collections","Object","keys","init","incomingConfig","Error","optionsWithDefaults","baseUrl","process","env","STORAGE_VERCEL_BLOB_BASE_URL","alwaysInsertFields","collectionsWithoutAdapter","entries","reduce","acc","slug","collOptions","adapter","useCompositePrefixes","clientUploads","collectionSources","currentAdapter","storageAdapters","storage","collectionsWithAdapter","config","map","collection","upload","disableLocalStorage","Boolean"],"mappings":"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"}
@@ -0,0 +1,71 @@
1
+ import { afterEach, describe, expect, it, vi } from 'vitest';
2
+ import { head } from '@vercel/blob';
3
+ vi.mock('@vercel/blob', async (importOriginal)=>({
4
+ ...await importOriginal(),
5
+ head: vi.fn(async ()=>({
6
+ contentDisposition: 'inline',
7
+ contentType: 'image/png',
8
+ size: 4,
9
+ uploadedAt: new Date('2026-01-01')
10
+ }))
11
+ }));
12
+ afterEach(()=>{
13
+ vi.unstubAllGlobals();
14
+ vi.clearAllMocks();
15
+ });
16
+ import { createVercelBlobAdapter } from './adapter.js';
17
+ describe('static handler document locations', ()=>{
18
+ it('should read the checked document without another lookup', async ()=>{
19
+ const fetchMock = vi.fn(async ()=>new Response('file'));
20
+ vi.stubGlobal('fetch', fetchMock);
21
+ const adapter = createVercelBlobAdapter({
22
+ access: 'public',
23
+ baseUrl: 'https://example.com',
24
+ cacheControlMaxAge: 60,
25
+ token: 'token'
26
+ });
27
+ const find = vi.fn(async ()=>({
28
+ docs: [
29
+ {
30
+ prefix: 'database'
31
+ }
32
+ ]
33
+ }));
34
+ const generatedAdapter = adapter({
35
+ collection: {
36
+ fields: [],
37
+ slug: 'media',
38
+ upload: {}
39
+ },
40
+ prefix: 'media'
41
+ });
42
+ const doc = {
43
+ id: 'authorized',
44
+ prefix: 'legacy'
45
+ };
46
+ const response = await generatedAdapter.staticHandler({
47
+ headers: new Headers(),
48
+ payload: {
49
+ find,
50
+ logger: {
51
+ error: vi.fn()
52
+ }
53
+ }
54
+ }, {
55
+ doc,
56
+ params: {
57
+ collection: 'media',
58
+ filename: 'original.png'
59
+ }
60
+ });
61
+ expect(response.status).toBe(200);
62
+ expect(await response.text()).toBe('file');
63
+ expect(head).toHaveBeenCalledWith(`https://example.com/legacy/original.png`, {
64
+ token: 'token'
65
+ });
66
+ expect(fetchMock).toHaveBeenCalledWith(`https://example.com/legacy/original.png?2026-01-01T00:00:00.000Z`, expect.any(Object));
67
+ expect(find).not.toHaveBeenCalled();
68
+ });
69
+ });
70
+
71
+ //# sourceMappingURL=staticHandler.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../src/staticHandler.spec.ts"],"sourcesContent":["import { afterEach, describe, expect, it, vi } from 'vitest'\n\nimport { head } from '@vercel/blob'\n\nvi.mock('@vercel/blob', async (importOriginal) => ({\n ...(await importOriginal<typeof import('@vercel/blob')>()),\n head: vi.fn(async () => ({\n contentDisposition: 'inline',\n contentType: 'image/png',\n size: 4,\n uploadedAt: new Date('2026-01-01'),\n })),\n}))\n\nafterEach(() => {\n vi.unstubAllGlobals()\n vi.clearAllMocks()\n})\n\nimport { createVercelBlobAdapter } from './adapter.js'\n\ndescribe('static handler document locations', () => {\n it('should read the checked document without another lookup', async () => {\n const fetchMock = vi.fn(async () => new Response('file'))\n\n vi.stubGlobal('fetch', fetchMock)\n const adapter = createVercelBlobAdapter({\n access: 'public',\n baseUrl: 'https://example.com',\n cacheControlMaxAge: 60,\n token: 'token',\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(`https://example.com/legacy/original.png`, { token: 'token' })\n expect(fetchMock).toHaveBeenCalledWith(\n `https://example.com/legacy/original.png?2026-01-01T00:00:00.000Z`,\n expect.any(Object),\n )\n expect(find).not.toHaveBeenCalled()\n })\n})\n"],"names":["afterEach","describe","expect","it","vi","head","mock","importOriginal","fn","contentDisposition","contentType","size","uploadedAt","Date","unstubAllGlobals","clearAllMocks","createVercelBlobAdapter","fetchMock","Response","stubGlobal","adapter","access","baseUrl","cacheControlMaxAge","token","find","docs","prefix","generatedAdapter","collection","fields","slug","upload","doc","id","response","staticHandler","headers","Headers","payload","logger","error","params","filename","status","toBe","text","toHaveBeenCalledWith","any","Object","not","toHaveBeenCalled"],"mappings":"AAAA,SAASA,SAAS,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAE5D,SAASC,IAAI,QAAQ,eAAc;AAEnCD,GAAGE,IAAI,CAAC,gBAAgB,OAAOC,iBAAoB,CAAA;QACjD,GAAI,MAAMA,gBAA+C;QACzDF,MAAMD,GAAGI,EAAE,CAAC,UAAa,CAAA;gBACvBC,oBAAoB;gBACpBC,aAAa;gBACbC,MAAM;gBACNC,YAAY,IAAIC,KAAK;YACvB,CAAA;IACF,CAAA;AAEAb,UAAU;IACRI,GAAGU,gBAAgB;IACnBV,GAAGW,aAAa;AAClB;AAEA,SAASC,uBAAuB,QAAQ,eAAc;AAEtDf,SAAS,qCAAqC;IAC5CE,GAAG,2DAA2D;QAC5D,MAAMc,YAAYb,GAAGI,EAAE,CAAC,UAAY,IAAIU,SAAS;QAEjDd,GAAGe,UAAU,CAAC,SAASF;QACvB,MAAMG,UAAUJ,wBAAwB;YACtCK,QAAQ;YACRC,SAAS;YACTC,oBAAoB;YACpBC,OAAO;QACT;QACA,MAAMC,OAAOrB,GAAGI,EAAE,CAAC,UAAa,CAAA;gBAAEkB,MAAM;oBAAC;wBAAEC,QAAQ;oBAAW;iBAAE;YAAC,CAAA;QACjE,MAAMC,mBAAmBR,QAAQ;YAC/BS,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,OAAOrC,GAAGI,EAAE;gBAAG;YAAE;QAC9C,GACA;YACEyB;YACAS,QAAQ;gBAAEb,YAAY;gBAASc,UAAU;YAAe;QAC1D;QAGFzC,OAAOiC,SAASS,MAAM,EAAEC,IAAI,CAAC;QAC7B3C,OAAO,MAAMiC,SAASW,IAAI,IAAID,IAAI,CAAC;QACnC3C,OAAOG,MAAM0C,oBAAoB,CAAC,CAAC,uCAAuC,CAAC,EAAE;YAAEvB,OAAO;QAAQ;QAC9FtB,OAAOe,WAAW8B,oBAAoB,CACpC,CAAC,gEAAgE,CAAC,EAClE7C,OAAO8C,GAAG,CAACC;QAEb/C,OAAOuB,MAAMyB,GAAG,CAACC,gBAAgB;IACnC;AACF"}
@@ -3,16 +3,13 @@ interface UploadFileArgs {
3
3
  addRandomSuffix?: boolean;
4
4
  buffer: Buffer;
5
5
  cacheControlMaxAge?: number;
6
- collectionPrefix?: string;
7
- docPrefix?: string;
8
- filename: string;
9
6
  mimeType: string;
7
+ storageFilePath: string;
10
8
  token: string;
11
- useCompositePrefixes?: boolean;
12
9
  }
13
10
  interface UploadFileResult {
14
11
  filename?: string;
15
12
  }
16
- export declare function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, collectionPrefix, docPrefix, filename, mimeType, token, useCompositePrefixes, }: UploadFileArgs): Promise<UploadFileResult>;
13
+ export declare function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, mimeType, storageFilePath, token, }: UploadFileArgs): Promise<UploadFileResult>;
17
14
  export {};
18
15
  //# sourceMappingURL=uploadFile.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAIA,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,EACN,kBAAkB,EAClB,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,oBAA4B,GAC7B,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwB5C"}
1
+ {"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAGA,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,EACN,kBAAkB,EAClB,QAAQ,EACR,eAAe,EACf,KAAK,GACN,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiB5C"}
@@ -1,14 +1,7 @@
1
- import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
2
1
  import { put } from '@vercel/blob';
3
2
  import path from 'path';
4
- export async function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, collectionPrefix = '', docPrefix, filename, mimeType, token, useCompositePrefixes = false }) {
5
- const { fileKey } = getFileKey({
6
- collectionPrefix,
7
- docPrefix,
8
- filename,
9
- useCompositePrefixes
10
- });
11
- const result = await put(fileKey, buffer, {
3
+ export async function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, mimeType, storageFilePath, token }) {
4
+ const result = await put(storageFilePath, buffer, {
12
5
  access,
13
6
  addRandomSuffix,
14
7
  allowOverwrite: true,