@payloadcms/storage-gcs 3.83.0 → 3.84.0-canary.1

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

@@ -1 +1 @@
-{"version":3,"file":"GcsClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/GcsClientUploadHandler.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB;;;;;;;aAyB/B,OAAM,aAIR,CAAA"}
+{"version":3,"file":"GcsClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/GcsClientUploadHandler.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB;;;;;;;aAyBJ,OAAO,aAQpC,CAAA"}

package/dist/client/GcsClientUploadHandler.js

@@ -2,7 +2,7 @@
 import { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client';
 import { formatAdminURL } from 'payload/shared';
 export const GcsClientUploadHandler = createClientUploadHandler({
-    handler: async ({ apiRoute, collectionSlug, file, prefix, serverHandlerPath, serverURL })=>{
+    handler: async ({ apiRoute, collectionSlug, docPrefix, file, serverHandlerPath, serverURL })=>{
         const endpointRoute = formatAdminURL({
             apiRoute,
             path: serverHandlerPath,
@@ -11,13 +11,14 @@ export const GcsClientUploadHandler = createClientUploadHandler({
         const response = await fetch(endpointRoute, {
             body: JSON.stringify({
                 collectionSlug,
+                docPrefix,
                 filename: file.name,
                 mimeType: file.type
             }),
             credentials: 'include',
             method: 'POST'
         });
-        const { url } = await response.json();
+        const { docPrefix: sanitizedDocPrefix, url } = await response.json();
         await fetch(url, {
             body: file,
             headers: {
@@ -27,7 +28,7 @@ export const GcsClientUploadHandler = createClientUploadHandler({
             method: 'PUT'
         });
         return {
-            prefix
+            prefix: sanitizedDocPrefix
         };
     }
 });

package/dist/client/GcsClientUploadHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/client/GcsClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { formatAdminURL } from 'payload/shared'\n\nexport const GcsClientUploadHandler = createClientUploadHandler({\n  handler: async ({ apiRoute, collectionSlug, file, prefix, serverHandlerPath, serverURL }) => {\n    const endpointRoute = formatAdminURL({\n      apiRoute,\n      path: serverHandlerPath,\n      serverURL,\n    })\n    const response = await fetch(endpointRoute, {\n      body: JSON.stringify({\n        collectionSlug,\n        filename: file.name,\n        mimeType: file.type,\n      }),\n      credentials: 'include',\n      method: 'POST',\n    })\n\n    const { url } = (await response.json()) as { url: string }\n\n    await fetch(url, {\n      body: file,\n      headers: { 'Content-Length': file.size.toString(), 'Content-Type': file.type },\n      method: 'PUT',\n    })\n\n    return {\n      prefix,\n    }\n  },\n})\n"],"names":["createClientUploadHandler","formatAdminURL","GcsClientUploadHandler","handler","apiRoute","collectionSlug","file","prefix","serverHandlerPath","serverURL","endpointRoute","path","response","fetch","body","JSON","stringify","filename","name","mimeType","type","credentials","method","url","json","headers","size","toString"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,cAAc,QAAQ,iBAAgB;AAE/C,OAAO,MAAMC,yBAAyBF,0BAA0B;IAC9DG,SAAS,OAAO,EAAEC,QAAQ,EAAEC,cAAc,EAAEC,IAAI,EAAEC,MAAM,EAAEC,iBAAiB,EAAEC,SAAS,EAAE;QACtF,MAAMC,gBAAgBT,eAAe;YACnCG;YACAO,MAAMH;YACNC;QACF;QACA,MAAMG,WAAW,MAAMC,MAAMH,eAAe;YAC1CI,MAAMC,KAAKC,SAAS,CAAC;gBACnBX;gBACAY,UAAUX,KAAKY,IAAI;gBACnBC,UAAUb,KAAKc,IAAI;YACrB;YACAC,aAAa;YACbC,QAAQ;QACV;QAEA,MAAM,EAAEC,GAAG,EAAE,GAAI,MAAMX,SAASY,IAAI;QAEpC,MAAMX,MAAMU,KAAK;YACfT,MAAMR;YACNmB,SAAS;gBAAE,kBAAkBnB,KAAKoB,IAAI,CAACC,QAAQ;gBAAI,gBAAgBrB,KAAKc,IAAI;YAAC;YAC7EE,QAAQ;QACV;QAEA,OAAO;YACLf;QACF;IACF;AACF,GAAE"}
+{"version":3,"sources":["../../src/client/GcsClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { formatAdminURL } from 'payload/shared'\n\nexport const GcsClientUploadHandler = createClientUploadHandler({\n  handler: async ({ apiRoute, collectionSlug, docPrefix, file, serverHandlerPath, serverURL }) => {\n    const endpointRoute = formatAdminURL({\n      apiRoute,\n      path: serverHandlerPath,\n      serverURL,\n    })\n    const response = await fetch(endpointRoute, {\n      body: JSON.stringify({\n        collectionSlug,\n        docPrefix,\n        filename: file.name,\n        mimeType: file.type,\n      }),\n      credentials: 'include',\n      method: 'POST',\n    })\n\n    const { docPrefix: sanitizedDocPrefix, url } = (await response.json()) as {\n      docPrefix: string\n      url: string\n    }\n\n    await fetch(url, {\n      body: file,\n      headers: { 'Content-Length': file.size.toString(), 'Content-Type': file.type },\n      method: 'PUT',\n    })\n\n    return {\n      prefix: sanitizedDocPrefix,\n    }\n  },\n})\n"],"names":["createClientUploadHandler","formatAdminURL","GcsClientUploadHandler","handler","apiRoute","collectionSlug","docPrefix","file","serverHandlerPath","serverURL","endpointRoute","path","response","fetch","body","JSON","stringify","filename","name","mimeType","type","credentials","method","sanitizedDocPrefix","url","json","headers","size","toString","prefix"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,cAAc,QAAQ,iBAAgB;AAE/C,OAAO,MAAMC,yBAAyBF,0BAA0B;IAC9DG,SAAS,OAAO,EAAEC,QAAQ,EAAEC,cAAc,EAAEC,SAAS,EAAEC,IAAI,EAAEC,iBAAiB,EAAEC,SAAS,EAAE;QACzF,MAAMC,gBAAgBT,eAAe;YACnCG;YACAO,MAAMH;YACNC;QACF;QACA,MAAMG,WAAW,MAAMC,MAAMH,eAAe;YAC1CI,MAAMC,KAAKC,SAAS,CAAC;gBACnBX;gBACAC;gBACAW,UAAUV,KAAKW,IAAI;gBACnBC,UAAUZ,KAAKa,IAAI;YACrB;YACAC,aAAa;YACbC,QAAQ;QACV;QAEA,MAAM,EAAEhB,WAAWiB,kBAAkB,EAAEC,GAAG,EAAE,GAAI,MAAMZ,SAASa,IAAI;QAKnE,MAAMZ,MAAMW,KAAK;YACfV,MAAMP;YACNmB,SAAS;gBAAE,kBAAkBnB,KAAKoB,IAAI,CAACC,QAAQ;gBAAI,gBAAgBrB,KAAKa,IAAI;YAAC;YAC7EE,QAAQ;QACV;QAEA,OAAO;YACLO,QAAQN;QACV;IACF;AACF,GAAE"}

package/dist/deleteFile.js

@@ -1,6 +1,6 @@
 import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 export async function deleteFile({ bucket, client, collectionPrefix = '', docPrefix, filename, useCompositePrefixes = false }) {
-    const fileKey = getFileKey({
+    const { fileKey } = getFileKey({
         collectionPrefix,
         docPrefix,
         filename,

package/dist/deleteFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface DeleteFileArgs {\n  bucket: string\n  client: Storage\n  collectionPrefix?: string\n  docPrefix: string\n  filename: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function deleteFile({\n  bucket,\n  client,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  useCompositePrefixes = false,\n}: DeleteFileArgs): Promise<void> {\n  const fileKey = getFileKey({\n    collectionPrefix,\n    docPrefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  await client.bucket(bucket).file(fileKey).delete({\n    ignoreNotFound: true,\n  })\n}\n"],"names":["getFileKey","deleteFile","bucket","client","collectionPrefix","docPrefix","filename","useCompositePrefixes","fileKey","file","delete","ignoreNotFound"],"mappings":"AAEA,SAASA,UAAU,QAAQ,6CAA4C;AAWvE,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,uBAAuB,KAAK,EACb;IACf,MAAMC,UAAUR,WAAW;QACzBI;QACAC;QACAC;QACAC;IACF;IAEA,MAAMJ,OAAOD,MAAM,CAACA,QAAQO,IAAI,CAACD,SAASE,MAAM,CAAC;QAC/CC,gBAAgB;IAClB;AACF"}
+{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface DeleteFileArgs {\n  bucket: string\n  client: Storage\n  collectionPrefix?: string\n  docPrefix: string\n  filename: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function deleteFile({\n  bucket,\n  client,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  useCompositePrefixes = false,\n}: DeleteFileArgs): Promise<void> {\n  const { fileKey } = getFileKey({\n    collectionPrefix,\n    docPrefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  await client.bucket(bucket).file(fileKey).delete({\n    ignoreNotFound: true,\n  })\n}\n"],"names":["getFileKey","deleteFile","bucket","client","collectionPrefix","docPrefix","filename","useCompositePrefixes","fileKey","file","delete","ignoreNotFound"],"mappings":"AAEA,SAASA,UAAU,QAAQ,6CAA4C;AAWvE,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,uBAAuB,KAAK,EACb;IACf,MAAM,EAAEC,OAAO,EAAE,GAAGR,WAAW;QAC7BI;QACAC;QACAC;QACAC;IACF;IAEA,MAAMJ,OAAOD,MAAM,CAACA,QAAQO,IAAI,CAACD,SAASE,MAAM,CAAC;QAC/CC,gBAAgB;IAClB;AACF"}

package/dist/generateSignedURL.d.ts

@@ -8,7 +8,8 @@ interface Args {
     bucket: string;
     collections: GcsStorageOptions['collections'];
     getStorageClient: () => Storage;
+    useCompositePrefixes?: boolean;
 }
-export declare const getGenerateSignedURLHandler: ({ access, bucket, collections, getStorageClient, }: Args) => PayloadHandler;
+export declare const getGenerateSignedURLHandler: ({ access, bucket, collections, getStorageClient, useCompositePrefixes, }: Args) => PayloadHandler;
 export {};
 //# sourceMappingURL=generateSignedURL.d.ts.map

package/dist/generateSignedURL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateSignedURL.d.ts","sourceRoot":"","sources":["../src/generateSignedURL.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAM7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAA;IAC7C,gBAAgB,EAAE,MAAM,OAAO,CAAA;CAChC;AAID,eAAO,MAAM,2BAA2B,uDAKrC,IAAI,KAAG,cAsCT,CAAA"}
+{"version":3,"file":"generateSignedURL.d.ts","sourceRoot":"","sources":["../src/generateSignedURL.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAK7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAA;IAC7C,gBAAgB,EAAE,MAAM,OAAO,CAAA;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAID,eAAO,MAAM,2BAA2B,6EAMrC,IAAI,KAAG,cA+CT,CAAA"}

package/dist/generateSignedURL.js

@@ -1,26 +1,29 @@
-import path from 'path';
+import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { APIError, Forbidden } from 'payload';
-import { sanitizeFilename } from 'payload/shared';
 const defaultAccess = ({ req })=>!!req.user;
-export const getGenerateSignedURLHandler = ({ access = defaultAccess, bucket, collections, getStorageClient })=>{
+export const getGenerateSignedURLHandler = ({ access = defaultAccess, bucket, collections, getStorageClient, useCompositePrefixes = false })=>{
     return async (req)=>{
         if (!req.json) {
             throw new APIError('Unreachable');
         }
-        const { collectionSlug, filename, mimeType } = await req.json();
-        const collectionS3Config = collections[collectionSlug];
-        if (!collectionS3Config) {
-            throw new APIError(`Collection ${collectionSlug} was not found in S3 options`);
+        const { collectionSlug, docPrefix, filename, mimeType } = await req.json();
+        const collectionStorageConfig = collections[collectionSlug];
+        if (!collectionStorageConfig) {
+            throw new APIError(`Collection ${collectionSlug} was not found in GCS storage options`);
         }
-        const prefix = typeof collectionS3Config === 'object' && collectionS3Config.prefix || '';
+        const collectionPrefix = typeof collectionStorageConfig === 'object' && collectionStorageConfig.prefix || '';
         if (!await access({
             collectionSlug,
             req
         })) {
             throw new Forbidden();
         }
-        const sanitizedFilename = sanitizeFilename(filename);
-        const fileKey = path.posix.join(prefix, sanitizedFilename);
+        const { fileKey, sanitizedDocPrefix } = getFileKey({
+            collectionPrefix,
+            docPrefix,
+            filename,
+            useCompositePrefixes
+        });
         const [url] = await getStorageClient().bucket(bucket).file(fileKey).getSignedUrl({
             action: 'write',
             contentType: mimeType,
@@ -28,6 +31,7 @@ export const getGenerateSignedURLHandler = ({ access = defaultAccess, bucket, co
             version: 'v4'
         });
         return Response.json({
+            docPrefix: sanitizedDocPrefix,
             url
         });
     };

package/dist/generateSignedURL.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateSignedURL.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\nimport type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport path from 'path'\nimport { APIError, Forbidden } from 'payload'\nimport { sanitizeFilename } from 'payload/shared'\n\nimport type { GcsStorageOptions } from './index.js'\n\ninterface Args {\n  access?: ClientUploadsAccess\n  acl?: 'private' | 'public-read'\n  bucket: string\n  collections: GcsStorageOptions['collections']\n  getStorageClient: () => Storage\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getGenerateSignedURLHandler = ({\n  access = defaultAccess,\n  bucket,\n  collections,\n  getStorageClient,\n}: Args): PayloadHandler => {\n  return async (req) => {\n    if (!req.json) {\n      throw new APIError('Unreachable')\n    }\n\n    const { collectionSlug, filename, mimeType } = (await req.json()) as {\n      collectionSlug: string\n      filename: string\n      mimeType: string\n    }\n\n    const collectionS3Config = collections[collectionSlug]\n    if (!collectionS3Config) {\n      throw new APIError(`Collection ${collectionSlug} was not found in S3 options`)\n    }\n\n    const prefix = (typeof collectionS3Config === 'object' && collectionS3Config.prefix) || ''\n\n    if (!(await access({ collectionSlug, req }))) {\n      throw new Forbidden()\n    }\n\n    const sanitizedFilename = sanitizeFilename(filename)\n    const fileKey = path.posix.join(prefix, sanitizedFilename)\n\n    const [url] = await getStorageClient()\n      .bucket(bucket)\n      .file(fileKey)\n      .getSignedUrl({\n        action: 'write',\n        contentType: mimeType,\n        expires: Date.now() + 60 * 60 * 5,\n        version: 'v4',\n      })\n\n    return Response.json({ url })\n  }\n}\n"],"names":["path","APIError","Forbidden","sanitizeFilename","defaultAccess","req","user","getGenerateSignedURLHandler","access","bucket","collections","getStorageClient","json","collectionSlug","filename","mimeType","collectionS3Config","prefix","sanitizedFilename","fileKey","posix","join","url","file","getSignedUrl","action","contentType","expires","Date","now","version","Response"],"mappings":"AAIA,OAAOA,UAAU,OAAM;AACvB,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAC7C,SAASC,gBAAgB,QAAQ,iBAAgB;AAYjD,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAE7D,OAAO,MAAMC,8BAA8B,CAAC,EAC1CC,SAASJ,aAAa,EACtBK,MAAM,EACNC,WAAW,EACXC,gBAAgB,EACX;IACL,OAAO,OAAON;QACZ,IAAI,CAACA,IAAIO,IAAI,EAAE;YACb,MAAM,IAAIX,SAAS;QACrB;QAEA,MAAM,EAAEY,cAAc,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAI,MAAMV,IAAIO,IAAI;QAM9D,MAAMI,qBAAqBN,WAAW,CAACG,eAAe;QACtD,IAAI,CAACG,oBAAoB;YACvB,MAAM,IAAIf,SAAS,CAAC,WAAW,EAAEY,eAAe,4BAA4B,CAAC;QAC/E;QAEA,MAAMI,SAAS,AAAC,OAAOD,uBAAuB,YAAYA,mBAAmBC,MAAM,IAAK;QAExF,IAAI,CAAE,MAAMT,OAAO;YAAEK;YAAgBR;QAAI,IAAK;YAC5C,MAAM,IAAIH;QACZ;QAEA,MAAMgB,oBAAoBf,iBAAiBW;QAC3C,MAAMK,UAAUnB,KAAKoB,KAAK,CAACC,IAAI,CAACJ,QAAQC;QAExC,MAAM,CAACI,IAAI,GAAG,MAAMX,mBACjBF,MAAM,CAACA,QACPc,IAAI,CAACJ,SACLK,YAAY,CAAC;YACZC,QAAQ;YACRC,aAAaX;YACbY,SAASC,KAAKC,GAAG,KAAK,KAAK,KAAK;YAChCC,SAAS;QACX;QAEF,OAAOC,SAASnB,IAAI,CAAC;YAAEU;QAAI;IAC7B;AACF,EAAC"}
+{"version":3,"sources":["../src/generateSignedURL.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\nimport type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { APIError, Forbidden } from 'payload'\n\nimport type { GcsStorageOptions } from './index.js'\n\ninterface Args {\n  access?: ClientUploadsAccess\n  acl?: 'private' | 'public-read'\n  bucket: string\n  collections: GcsStorageOptions['collections']\n  getStorageClient: () => Storage\n  useCompositePrefixes?: boolean\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getGenerateSignedURLHandler = ({\n  access = defaultAccess,\n  bucket,\n  collections,\n  getStorageClient,\n  useCompositePrefixes = false,\n}: Args): PayloadHandler => {\n  return async (req) => {\n    if (!req.json) {\n      throw new APIError('Unreachable')\n    }\n\n    const { collectionSlug, docPrefix, filename, mimeType } = (await req.json()) as {\n      collectionSlug: string\n      docPrefix?: string\n      filename: string\n      mimeType: string\n    }\n\n    const collectionStorageConfig = collections[collectionSlug]\n    if (!collectionStorageConfig) {\n      throw new APIError(`Collection ${collectionSlug} was not found in GCS storage options`)\n    }\n\n    const collectionPrefix =\n      (typeof collectionStorageConfig === 'object' && collectionStorageConfig.prefix) || ''\n\n    if (!(await access({ collectionSlug, req }))) {\n      throw new Forbidden()\n    }\n\n    const { fileKey, sanitizedDocPrefix } = getFileKey({\n      collectionPrefix,\n      docPrefix,\n      filename,\n      useCompositePrefixes,\n    })\n\n    const [url] = await getStorageClient()\n      .bucket(bucket)\n      .file(fileKey)\n      .getSignedUrl({\n        action: 'write',\n        contentType: mimeType,\n        expires: Date.now() + 60 * 60 * 5,\n        version: 'v4',\n      })\n\n    return Response.json({\n      docPrefix: sanitizedDocPrefix,\n      url,\n    })\n  }\n}\n"],"names":["getFileKey","APIError","Forbidden","defaultAccess","req","user","getGenerateSignedURLHandler","access","bucket","collections","getStorageClient","useCompositePrefixes","json","collectionSlug","docPrefix","filename","mimeType","collectionStorageConfig","collectionPrefix","prefix","fileKey","sanitizedDocPrefix","url","file","getSignedUrl","action","contentType","expires","Date","now","version","Response"],"mappings":"AAIA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAa7C,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAE7D,OAAO,MAAMC,8BAA8B,CAAC,EAC1CC,SAASJ,aAAa,EACtBK,MAAM,EACNC,WAAW,EACXC,gBAAgB,EAChBC,uBAAuB,KAAK,EACvB;IACL,OAAO,OAAOP;QACZ,IAAI,CAACA,IAAIQ,IAAI,EAAE;YACb,MAAM,IAAIX,SAAS;QACrB;QAEA,MAAM,EAAEY,cAAc,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAI,MAAMZ,IAAIQ,IAAI;QAOzE,MAAMK,0BAA0BR,WAAW,CAACI,eAAe;QAC3D,IAAI,CAACI,yBAAyB;YAC5B,MAAM,IAAIhB,SAAS,CAAC,WAAW,EAAEY,eAAe,qCAAqC,CAAC;QACxF;QAEA,MAAMK,mBACJ,AAAC,OAAOD,4BAA4B,YAAYA,wBAAwBE,MAAM,IAAK;QAErF,IAAI,CAAE,MAAMZ,OAAO;YAAEM;YAAgBT;QAAI,IAAK;YAC5C,MAAM,IAAIF;QACZ;QAEA,MAAM,EAAEkB,OAAO,EAAEC,kBAAkB,EAAE,GAAGrB,WAAW;YACjDkB;YACAJ;YACAC;YACAJ;QACF;QAEA,MAAM,CAACW,IAAI,GAAG,MAAMZ,mBACjBF,MAAM,CAACA,QACPe,IAAI,CAACH,SACLI,YAAY,CAAC;YACZC,QAAQ;YACRC,aAAaV;YACbW,SAASC,KAAKC,GAAG,KAAK,KAAK,KAAK;YAChCC,SAAS;QACX;QAEF,OAAOC,SAASnB,IAAI,CAAC;YACnBE,WAAWO;YACXC;QACF;IACF;AACF,EAAC"}

package/dist/generateURL.js

@@ -1,12 +1,12 @@
 import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 export function generateURL({ bucket, client, collectionPrefix = '', filename, prefix, useCompositePrefixes = false }) {
-    const fileKey = getFileKey({
+    const { fileKey } = getFileKey({
         collectionPrefix,
         docPrefix: prefix,
         filename,
         useCompositePrefixes
     });
-    return decodeURIComponent(client.bucket(bucket).file(fileKey).publicUrl());
+    return client.bucket(bucket).file(fileKey).publicUrl();
 }
 
 //# sourceMappingURL=generateURL.js.map

package/dist/generateURL.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface GenerateURLArgs {\n  bucket: string\n  client: Storage\n  collectionPrefix?: string\n  filename: string\n  prefix: string\n  useCompositePrefixes?: boolean\n}\n\nexport function generateURL({\n  bucket,\n  client,\n  collectionPrefix = '',\n  filename,\n  prefix,\n  useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n  const fileKey = getFileKey({\n    collectionPrefix,\n    docPrefix: prefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  return decodeURIComponent(client.bucket(bucket).file(fileKey).publicUrl())\n}\n"],"names":["getFileKey","generateURL","bucket","client","collectionPrefix","filename","prefix","useCompositePrefixes","fileKey","docPrefix","decodeURIComponent","file","publicUrl"],"mappings":"AAEA,SAASA,UAAU,QAAQ,6CAA4C;AAWvE,OAAO,SAASC,YAAY,EAC1BC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAMC,UAAUR,WAAW;QACzBI;QACAK,WAAWH;QACXD;QACAE;IACF;IAEA,OAAOG,mBAAmBP,OAAOD,MAAM,CAACA,QAAQS,IAAI,CAACH,SAASI,SAAS;AACzE"}
+{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface GenerateURLArgs {\n  bucket: string\n  client: Storage\n  collectionPrefix?: string\n  filename: string\n  prefix: string\n  useCompositePrefixes?: boolean\n}\n\nexport function generateURL({\n  bucket,\n  client,\n  collectionPrefix = '',\n  filename,\n  prefix,\n  useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n  const { fileKey } = getFileKey({\n    collectionPrefix,\n    docPrefix: prefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  return client.bucket(bucket).file(fileKey).publicUrl()\n}\n"],"names":["getFileKey","generateURL","bucket","client","collectionPrefix","filename","prefix","useCompositePrefixes","fileKey","docPrefix","file","publicUrl"],"mappings":"AAEA,SAASA,UAAU,QAAQ,6CAA4C;AAWvE,OAAO,SAASC,YAAY,EAC1BC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEC,OAAO,EAAE,GAAGR,WAAW;QAC7BI;QACAK,WAAWH;QACXD;QACAE;IACF;IAEA,OAAOJ,OAAOD,MAAM,CAACA,QAAQQ,IAAI,CAACF,SAASG,SAAS;AACtD"}

package/dist/getFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAU/D,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,CAAA;IACf,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,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,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,MAAM,EACN,mBAAmB,EACnB,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiGjC"}
+{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAS/D,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,CAAA;IACf,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,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,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,MAAM,EACN,mBAAmB,EACnB,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiGjC"}

package/dist/getFile.js

@@ -1,7 +1,6 @@
 import { ApiError } from '@google-cloud/storage';
 import { getFilePrefix as getDocPrefix, getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { getRangeRequestInfo } from 'payload/internal';
-import { sanitizeFilename } from 'payload/shared';
 export async function getFile({ bucket, client, clientUploadContext, collection, collectionPrefix = '', filename, incomingHeaders, prefixQueryParam, req, useCompositePrefixes = false }) {
     try {
         const docPrefix = await getDocPrefix({
@@ -11,13 +10,13 @@ export async function getFile({ bucket, client, clientUploadContext, collection,
             prefixQueryParam,
             req
         });
-        const key = getFileKey({
+        const { fileKey } = getFileKey({
             collectionPrefix,
             docPrefix,
-            filename: sanitizeFilename(filename),
+            filename,
             useCompositePrefixes
         });
-        const file = client.bucket(bucket).file(key);
+        const file = client.bucket(bucket).file(fileKey);
         const [metadata] = await file.getMetadata();
         // Handle range request
         const rangeHeader = req.headers.get('range');

package/dist/getFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\nimport type { CollectionConfig, PayloadRequest } from 'payload'\n\nimport { ApiError } from '@google-cloud/storage'\nimport {\n  getFilePrefix as getDocPrefix,\n  getFileKey,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { getRangeRequestInfo } from 'payload/internal'\nimport { sanitizeFilename } from 'payload/shared'\n\ninterface GetFileArgs {\n  bucket: string\n  client: Storage\n  clientUploadContext?: unknown\n  collection: CollectionConfig\n  collectionPrefix?: string\n  filename: string\n  incomingHeaders?: Headers\n  prefixQueryParam?: string\n  req: PayloadRequest\n  useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n  bucket,\n  client,\n  clientUploadContext,\n  collection,\n  collectionPrefix = '',\n  filename,\n  incomingHeaders,\n  prefixQueryParam,\n  req,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  try {\n    const docPrefix = await getDocPrefix({\n      clientUploadContext,\n      collection,\n      filename,\n      prefixQueryParam,\n      req,\n    })\n\n    const key = getFileKey({\n      collectionPrefix,\n      docPrefix,\n      filename: sanitizeFilename(filename),\n      useCompositePrefixes,\n    })\n\n    const file = client.bucket(bucket).file(key)\n\n    const [metadata] = await file.getMetadata()\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const fileSize = Number(metadata.size)\n    const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n    if (rangeResult.type === 'invalid') {\n      return new Response(null, {\n        headers: new Headers(rangeResult.headers),\n        status: rangeResult.status,\n      })\n    }\n\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const objectEtag = metadata.etag\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [key, value] of Object.entries(rangeResult.headers)) {\n      headers.append(key, value)\n    }\n\n    headers.append('Content-Type', String(metadata.contentType))\n    headers.append('ETag', String(metadata.etag))\n\n    // Add Content-Security-Policy header for SVG files to prevent executable code\n    if (metadata.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 === objectEtag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    // Manually create a ReadableStream for the web from a Node.js stream.\n    const readableStream = new ReadableStream({\n      start(controller) {\n        const streamOptions =\n          rangeResult.type === 'partial'\n            ? { end: rangeResult.rangeEnd, start: rangeResult.rangeStart }\n            : {}\n        const nodeStream = file.createReadStream(streamOptions)\n        nodeStream.on('data', (chunk) => {\n          controller.enqueue(new Uint8Array(chunk))\n        })\n        nodeStream.on('end', () => {\n          controller.close()\n        })\n        nodeStream.on('error', (err) => {\n          controller.error(err)\n        })\n      },\n    })\n\n    return new Response(readableStream, {\n      headers,\n      status: rangeResult.status,\n    })\n  } catch (err: unknown) {\n    if (err instanceof ApiError && err.code === 404) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n    req.payload.logger.error(err)\n    return new Response('Internal Server Error', { status: 500 })\n  }\n}\n"],"names":["ApiError","getFilePrefix","getDocPrefix","getFileKey","getRangeRequestInfo","sanitizeFilename","getFile","bucket","client","clientUploadContext","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","useCompositePrefixes","docPrefix","key","file","metadata","getMetadata","rangeHeader","headers","get","fileSize","Number","size","rangeResult","type","Response","Headers","status","etagFromHeaders","objectEtag","etag","value","Object","entries","append","String","contentType","upload","modifyResponseHeaders","readableStream","ReadableStream","start","controller","streamOptions","end","rangeEnd","rangeStart","nodeStream","createReadStream","on","chunk","enqueue","Uint8Array","close","err","error","code","statusText","payload","logger"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,wBAAuB;AAChD,SACEC,iBAAiBC,YAAY,EAC7BC,UAAU,QACL,6CAA4C;AACnD,SAASC,mBAAmB,QAAQ,mBAAkB;AACtD,SAASC,gBAAgB,QAAQ,iBAAgB;AAejD,OAAO,eAAeC,QAAQ,EAC5BC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EACnBC,UAAU,EACVC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,eAAe,EACfC,gBAAgB,EAChBC,GAAG,EACHC,uBAAuB,KAAK,EAChB;IACZ,IAAI;QACF,MAAMC,YAAY,MAAMf,aAAa;YACnCO;YACAC;YACAE;YACAE;YACAC;QACF;QAEA,MAAMG,MAAMf,WAAW;YACrBQ;YACAM;YACAL,UAAUP,iBAAiBO;YAC3BI;QACF;QAEA,MAAMG,OAAOX,OAAOD,MAAM,CAACA,QAAQY,IAAI,CAACD;QAExC,MAAM,CAACE,SAAS,GAAG,MAAMD,KAAKE,WAAW;QAEzC,uBAAuB;QACvB,MAAMC,cAAcP,IAAIQ,OAAO,CAACC,GAAG,CAAC;QACpC,MAAMC,WAAWC,OAAON,SAASO,IAAI;QACrC,MAAMC,cAAcxB,oBAAoB;YAAEqB;YAAUH;QAAY;QAEhE,IAAIM,YAAYC,IAAI,KAAK,WAAW;YAClC,OAAO,IAAIC,SAAS,MAAM;gBACxBP,SAAS,IAAIQ,QAAQH,YAAYL,OAAO;gBACxCS,QAAQJ,YAAYI,MAAM;YAC5B;QACF;QAEA,MAAMC,kBAAkBlB,IAAIQ,OAAO,CAACC,GAAG,CAAC,WAAWT,IAAIQ,OAAO,CAACC,GAAG,CAAC;QACnE,MAAMU,aAAad,SAASe,IAAI;QAEhC,IAAIZ,UAAU,IAAIQ,QAAQlB;QAE1B,4CAA4C;QAC5C,KAAK,MAAM,CAACK,KAAKkB,MAAM,IAAIC,OAAOC,OAAO,CAACV,YAAYL,OAAO,EAAG;YAC9DA,QAAQgB,MAAM,CAACrB,KAAKkB;QACtB;QAEAb,QAAQgB,MAAM,CAAC,gBAAgBC,OAAOpB,SAASqB,WAAW;QAC1DlB,QAAQgB,MAAM,CAAC,QAAQC,OAAOpB,SAASe,IAAI;QAE3C,8EAA8E;QAC9E,IAAIf,SAASqB,WAAW,KAAK,iBAAiB;YAC5ClB,QAAQgB,MAAM,CAAC,2BAA2B;QAC5C;QAEA,IACE7B,WAAWgC,MAAM,IACjB,OAAOhC,WAAWgC,MAAM,KAAK,YAC7B,OAAOhC,WAAWgC,MAAM,CAACC,qBAAqB,KAAK,YACnD;YACApB,UAAUb,WAAWgC,MAAM,CAACC,qBAAqB,CAAC;gBAAEpB;YAAQ,MAAMA;QACpE;QAEA,IAAIU,mBAAmBA,oBAAoBC,YAAY;YACrD,OAAO,IAAIJ,SAAS,MAAM;gBACxBP;gBACAS,QAAQ;YACV;QACF;QAEA,sEAAsE;QACtE,MAAMY,iBAAiB,IAAIC,eAAe;YACxCC,OAAMC,UAAU;gBACd,MAAMC,gBACJpB,YAAYC,IAAI,KAAK,YACjB;oBAAEoB,KAAKrB,YAAYsB,QAAQ;oBAAEJ,OAAOlB,YAAYuB,UAAU;gBAAC,IAC3D,CAAC;gBACP,MAAMC,aAAajC,KAAKkC,gBAAgB,CAACL;gBACzCI,WAAWE,EAAE,CAAC,QAAQ,CAACC;oBACrBR,WAAWS,OAAO,CAAC,IAAIC,WAAWF;gBACpC;gBACAH,WAAWE,EAAE,CAAC,OAAO;oBACnBP,WAAWW,KAAK;gBAClB;gBACAN,WAAWE,EAAE,CAAC,SAAS,CAACK;oBACtBZ,WAAWa,KAAK,CAACD;gBACnB;YACF;QACF;QAEA,OAAO,IAAI7B,SAASc,gBAAgB;YAClCrB;YACAS,QAAQJ,YAAYI,MAAM;QAC5B;IACF,EAAE,OAAO2B,KAAc;QACrB,IAAIA,eAAe3D,YAAY2D,IAAIE,IAAI,KAAK,KAAK;YAC/C,OAAO,IAAI/B,SAAS,MAAM;gBAAEE,QAAQ;gBAAK8B,YAAY;YAAY;QACnE;QACA/C,IAAIgD,OAAO,CAACC,MAAM,CAACJ,KAAK,CAACD;QACzB,OAAO,IAAI7B,SAAS,yBAAyB;YAAEE,QAAQ;QAAI;IAC7D;AACF"}
+{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\nimport type { CollectionConfig, PayloadRequest } from 'payload'\n\nimport { ApiError } from '@google-cloud/storage'\nimport {\n  getFilePrefix as getDocPrefix,\n  getFileKey,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { getRangeRequestInfo } from 'payload/internal'\n\ninterface GetFileArgs {\n  bucket: string\n  client: Storage\n  clientUploadContext?: unknown\n  collection: CollectionConfig\n  collectionPrefix?: string\n  filename: string\n  incomingHeaders?: Headers\n  prefixQueryParam?: string\n  req: PayloadRequest\n  useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n  bucket,\n  client,\n  clientUploadContext,\n  collection,\n  collectionPrefix = '',\n  filename,\n  incomingHeaders,\n  prefixQueryParam,\n  req,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  try {\n    const docPrefix = await getDocPrefix({\n      clientUploadContext,\n      collection,\n      filename,\n      prefixQueryParam,\n      req,\n    })\n\n    const { fileKey } = getFileKey({\n      collectionPrefix,\n      docPrefix,\n      filename,\n      useCompositePrefixes,\n    })\n\n    const file = client.bucket(bucket).file(fileKey)\n\n    const [metadata] = await file.getMetadata()\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const fileSize = Number(metadata.size)\n    const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n    if (rangeResult.type === 'invalid') {\n      return new Response(null, {\n        headers: new Headers(rangeResult.headers),\n        status: rangeResult.status,\n      })\n    }\n\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const objectEtag = metadata.etag\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [key, value] of Object.entries(rangeResult.headers)) {\n      headers.append(key, value)\n    }\n\n    headers.append('Content-Type', String(metadata.contentType))\n    headers.append('ETag', String(metadata.etag))\n\n    // Add Content-Security-Policy header for SVG files to prevent executable code\n    if (metadata.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 === objectEtag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    // Manually create a ReadableStream for the web from a Node.js stream.\n    const readableStream = new ReadableStream({\n      start(controller) {\n        const streamOptions =\n          rangeResult.type === 'partial'\n            ? { end: rangeResult.rangeEnd, start: rangeResult.rangeStart }\n            : {}\n        const nodeStream = file.createReadStream(streamOptions)\n        nodeStream.on('data', (chunk) => {\n          controller.enqueue(new Uint8Array(chunk))\n        })\n        nodeStream.on('end', () => {\n          controller.close()\n        })\n        nodeStream.on('error', (err) => {\n          controller.error(err)\n        })\n      },\n    })\n\n    return new Response(readableStream, {\n      headers,\n      status: rangeResult.status,\n    })\n  } catch (err: unknown) {\n    if (err instanceof ApiError && err.code === 404) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n    req.payload.logger.error(err)\n    return new Response('Internal Server Error', { status: 500 })\n  }\n}\n"],"names":["ApiError","getFilePrefix","getDocPrefix","getFileKey","getRangeRequestInfo","getFile","bucket","client","clientUploadContext","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","useCompositePrefixes","docPrefix","fileKey","file","metadata","getMetadata","rangeHeader","headers","get","fileSize","Number","size","rangeResult","type","Response","Headers","status","etagFromHeaders","objectEtag","etag","key","value","Object","entries","append","String","contentType","upload","modifyResponseHeaders","readableStream","ReadableStream","start","controller","streamOptions","end","rangeEnd","rangeStart","nodeStream","createReadStream","on","chunk","enqueue","Uint8Array","close","err","error","code","statusText","payload","logger"],"mappings":"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"}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AASnE,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;IAE1B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IACd;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;;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;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;OAIG;IACH,OAAO,EAAE,cAAc,CAAA;IAEvB;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,KAAK,gBAAgB,GAAG,CAAC,cAAc,EAAE,iBAAiB,KAAK,MAAM,CAAA;AAIrE,eAAO,MAAM,UAAU,EAAE,gBAkFtB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AASnE,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;IAE1B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IACd;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;;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;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;OAIG;IACH,OAAO,EAAE,cAAc,CAAA;IAEvB;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,KAAK,gBAAgB,GAAG,CAAC,cAAc,EAAE,iBAAiB,KAAK,MAAM,CAAA;AAIrE,eAAO,MAAM,UAAU,EAAE,gBAmFtB,CAAA"}

package/dist/index.js

@@ -30,7 +30,8 @@ export const gcsStorage = (gcsStorageOptions)=>(incomingConfig)=>{
                 access: typeof gcsStorageOptions.clientUploads === 'object' ? gcsStorageOptions.clientUploads.access : undefined,
                 bucket: gcsStorageOptions.bucket,
                 collections: gcsStorageOptions.collections,
-                getStorageClient
+                getStorageClient,
+                useCompositePrefixes: gcsStorageOptions.useCompositePrefixes
             }),
             serverHandlerPath: '/storage-gcs-generate-signed-url'
         });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type { StorageOptions } from '@google-cloud/storage'\nimport type {\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { Storage } from '@google-cloud/storage'\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport { createGcsAdapter } from './adapter.js'\nimport { getGenerateSignedURLHandler } from './generateSignedURL.js'\n\nexport interface GcsStorageOptions {\n  acl?: 'Private' | 'Public'\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   * The name of the bucket to use.\n   */\n  bucket: string\n  /**\n   * Optional cache key to identify the GCS storage client instance.\n   * If not provided, a default key will be used.\n   *\n   * @default `gcs:containerName`\n   */\n  clientCacheKey?: string\n  /**\n   * Do uploads directly on the client to bypass limits on Vercel. You must allow CORS PUT method for the bucket to your website.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the S3 adapter to.\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * Google Cloud Storage client configuration.\n   *\n   * @see https://github.com/googleapis/nodejs-storage\n   */\n  options: StorageOptions\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\ntype GcsStoragePlugin = (gcsStorageArgs: GcsStorageOptions) => Plugin\n\nconst gcsClients = new Map<string, Storage>()\n\nexport const gcsStorage: GcsStoragePlugin =\n  (gcsStorageOptions: GcsStorageOptions) =>\n  (incomingConfig: Config): Config => {\n    const cacheKey = gcsStorageOptions.clientCacheKey || `gcs:${gcsStorageOptions.bucket}`\n\n    const getStorageClient = (): Storage => {\n      if (gcsClients.has(cacheKey)) {\n        return gcsClients.get(cacheKey)!\n      }\n      gcsClients.set(cacheKey, new Storage(gcsStorageOptions.options))\n\n      return gcsClients.get(cacheKey)!\n    }\n\n    const adapter = createGcsAdapter({\n      acl: gcsStorageOptions.acl,\n      bucket: gcsStorageOptions.bucket,\n      clientUploads: gcsStorageOptions.clientUploads,\n      getStorageClient,\n      useCompositePrefixes: gcsStorageOptions.useCompositePrefixes,\n    })\n\n    const isPluginDisabled = gcsStorageOptions.enabled === false\n\n    initClientUploads({\n      clientHandler: '@payloadcms/storage-gcs/client#GcsClientUploadHandler',\n      collections: gcsStorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(gcsStorageOptions.clientUploads),\n      serverHandler: getGenerateSignedURLHandler({\n        access:\n          typeof gcsStorageOptions.clientUploads === 'object'\n            ? gcsStorageOptions.clientUploads.access\n            : undefined,\n        bucket: gcsStorageOptions.bucket,\n        collections: gcsStorageOptions.collections,\n        getStorageClient,\n      }),\n      serverHandlerPath: '/storage-gcs-generate-signed-url',\n    })\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      gcsStorageOptions.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: gcsStorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: gcsStorageOptions.useCompositePrefixes,\n    })(config)\n  }\n"],"names":["Storage","cloudStoragePlugin","initClientUploads","createGcsAdapter","getGenerateSignedURLHandler","gcsClients","Map","gcsStorage","gcsStorageOptions","incomingConfig","cacheKey","clientCacheKey","bucket","getStorageClient","has","get","set","options","adapter","acl","clientUploads","useCompositePrefixes","isPluginDisabled","enabled","clientHandler","collections","config","Boolean","serverHandler","access","undefined","serverHandlerPath","collectionsWithAdapter","Object","entries","reduce","acc","slug","collOptions","map","collection","upload","disableLocalStorage","alwaysInsertFields"],"mappings":"AAQA,SAASA,OAAO,QAAQ,wBAAuB;AAC/C,SAASC,kBAAkB,QAAQ,mCAAkC;AACrE,SAASC,iBAAiB,QAAQ,6CAA4C;AAE9E,SAASC,gBAAgB,QAAQ,eAAc;AAC/C,SAASC,2BAA2B,QAAQ,yBAAwB;AAkEpE,MAAMC,aAAa,IAAIC;AAEvB,OAAO,MAAMC,aACX,CAACC,oBACD,CAACC;QACC,MAAMC,WAAWF,kBAAkBG,cAAc,IAAI,CAAC,IAAI,EAAEH,kBAAkBI,MAAM,EAAE;QAEtF,MAAMC,mBAAmB;YACvB,IAAIR,WAAWS,GAAG,CAACJ,WAAW;gBAC5B,OAAOL,WAAWU,GAAG,CAACL;YACxB;YACAL,WAAWW,GAAG,CAACN,UAAU,IAAIV,QAAQQ,kBAAkBS,OAAO;YAE9D,OAAOZ,WAAWU,GAAG,CAACL;QACxB;QAEA,MAAMQ,UAAUf,iBAAiB;YAC/BgB,KAAKX,kBAAkBW,GAAG;YAC1BP,QAAQJ,kBAAkBI,MAAM;YAChCQ,eAAeZ,kBAAkBY,aAAa;YAC9CP;YACAQ,sBAAsBb,kBAAkBa,oBAAoB;QAC9D;QAEA,MAAMC,mBAAmBd,kBAAkBe,OAAO,KAAK;QAEvDrB,kBAAkB;YAChBsB,eAAe;YACfC,aAAajB,kBAAkBiB,WAAW;YAC1CC,QAAQjB;YACRc,SAAS,CAACD,oBAAoBK,QAAQnB,kBAAkBY,aAAa;YACrEQ,eAAexB,4BAA4B;gBACzCyB,QACE,OAAOrB,kBAAkBY,aAAa,KAAK,WACvCZ,kBAAkBY,aAAa,CAACS,MAAM,GACtCC;gBACNlB,QAAQJ,kBAAkBI,MAAM;gBAChCa,aAAajB,kBAAkBiB,WAAW;gBAC1CZ;YACF;YACAkB,mBAAmB;QACrB;QAEA,IAAIT,kBAAkB;YACpB,OAAOb;QACT;QAEA,+CAA+C;QAC/C,MAAMuB,yBAAmEC,OAAOC,OAAO,CACrF1B,kBAAkBiB,WAAW,EAC7BU,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;gBAC7B,GAAGF,GAAG;gBACN,CAACC,KAAK,EAAE;oBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;oBAC3CpB;gBACF;YACF,CAAA,GACA,CAAC;QAGH,gFAAgF;QAChF,MAAMQ,SAAS;YACb,GAAGjB,cAAc;YACjBgB,aAAa,AAAChB,CAAAA,eAAegB,WAAW,IAAI,EAAE,AAAD,EAAGc,GAAG,CAAC,CAACC;gBACnD,IAAI,CAACR,sBAAsB,CAACQ,WAAWH,IAAI,CAAC,EAAE;oBAC5C,OAAOG;gBACT;gBAEA,OAAO;oBACL,GAAGA,UAAU;oBACbC,QAAQ;wBACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;wBAClEC,qBAAqB;oBACvB;gBACF;YACF;QACF;QAEA,OAAOzC,mBAAmB;YACxB0C,oBAAoBnC,kBAAkBmC,kBAAkB;YACxDlB,aAAaO;YACbX,sBAAsBb,kBAAkBa,oBAAoB;QAC9D,GAAGK;IACL,EAAC"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type { StorageOptions } from '@google-cloud/storage'\nimport type {\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { Storage } from '@google-cloud/storage'\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport { createGcsAdapter } from './adapter.js'\nimport { getGenerateSignedURLHandler } from './generateSignedURL.js'\n\nexport interface GcsStorageOptions {\n  acl?: 'Private' | 'Public'\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   * The name of the bucket to use.\n   */\n  bucket: string\n  /**\n   * Optional cache key to identify the GCS storage client instance.\n   * If not provided, a default key will be used.\n   *\n   * @default `gcs:containerName`\n   */\n  clientCacheKey?: string\n  /**\n   * Do uploads directly on the client to bypass limits on Vercel. You must allow CORS PUT method for the bucket to your website.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the S3 adapter to.\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * Google Cloud Storage client configuration.\n   *\n   * @see https://github.com/googleapis/nodejs-storage\n   */\n  options: StorageOptions\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\ntype GcsStoragePlugin = (gcsStorageArgs: GcsStorageOptions) => Plugin\n\nconst gcsClients = new Map<string, Storage>()\n\nexport const gcsStorage: GcsStoragePlugin =\n  (gcsStorageOptions: GcsStorageOptions) =>\n  (incomingConfig: Config): Config => {\n    const cacheKey = gcsStorageOptions.clientCacheKey || `gcs:${gcsStorageOptions.bucket}`\n\n    const getStorageClient = (): Storage => {\n      if (gcsClients.has(cacheKey)) {\n        return gcsClients.get(cacheKey)!\n      }\n      gcsClients.set(cacheKey, new Storage(gcsStorageOptions.options))\n\n      return gcsClients.get(cacheKey)!\n    }\n\n    const adapter = createGcsAdapter({\n      acl: gcsStorageOptions.acl,\n      bucket: gcsStorageOptions.bucket,\n      clientUploads: gcsStorageOptions.clientUploads,\n      getStorageClient,\n      useCompositePrefixes: gcsStorageOptions.useCompositePrefixes,\n    })\n\n    const isPluginDisabled = gcsStorageOptions.enabled === false\n\n    initClientUploads({\n      clientHandler: '@payloadcms/storage-gcs/client#GcsClientUploadHandler',\n      collections: gcsStorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(gcsStorageOptions.clientUploads),\n      serverHandler: getGenerateSignedURLHandler({\n        access:\n          typeof gcsStorageOptions.clientUploads === 'object'\n            ? gcsStorageOptions.clientUploads.access\n            : undefined,\n        bucket: gcsStorageOptions.bucket,\n        collections: gcsStorageOptions.collections,\n        getStorageClient,\n        useCompositePrefixes: gcsStorageOptions.useCompositePrefixes,\n      }),\n      serverHandlerPath: '/storage-gcs-generate-signed-url',\n    })\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      gcsStorageOptions.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: gcsStorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: gcsStorageOptions.useCompositePrefixes,\n    })(config)\n  }\n"],"names":["Storage","cloudStoragePlugin","initClientUploads","createGcsAdapter","getGenerateSignedURLHandler","gcsClients","Map","gcsStorage","gcsStorageOptions","incomingConfig","cacheKey","clientCacheKey","bucket","getStorageClient","has","get","set","options","adapter","acl","clientUploads","useCompositePrefixes","isPluginDisabled","enabled","clientHandler","collections","config","Boolean","serverHandler","access","undefined","serverHandlerPath","collectionsWithAdapter","Object","entries","reduce","acc","slug","collOptions","map","collection","upload","disableLocalStorage","alwaysInsertFields"],"mappings":"AAQA,SAASA,OAAO,QAAQ,wBAAuB;AAC/C,SAASC,kBAAkB,QAAQ,mCAAkC;AACrE,SAASC,iBAAiB,QAAQ,6CAA4C;AAE9E,SAASC,gBAAgB,QAAQ,eAAc;AAC/C,SAASC,2BAA2B,QAAQ,yBAAwB;AAkEpE,MAAMC,aAAa,IAAIC;AAEvB,OAAO,MAAMC,aACX,CAACC,oBACD,CAACC;QACC,MAAMC,WAAWF,kBAAkBG,cAAc,IAAI,CAAC,IAAI,EAAEH,kBAAkBI,MAAM,EAAE;QAEtF,MAAMC,mBAAmB;YACvB,IAAIR,WAAWS,GAAG,CAACJ,WAAW;gBAC5B,OAAOL,WAAWU,GAAG,CAACL;YACxB;YACAL,WAAWW,GAAG,CAACN,UAAU,IAAIV,QAAQQ,kBAAkBS,OAAO;YAE9D,OAAOZ,WAAWU,GAAG,CAACL;QACxB;QAEA,MAAMQ,UAAUf,iBAAiB;YAC/BgB,KAAKX,kBAAkBW,GAAG;YAC1BP,QAAQJ,kBAAkBI,MAAM;YAChCQ,eAAeZ,kBAAkBY,aAAa;YAC9CP;YACAQ,sBAAsBb,kBAAkBa,oBAAoB;QAC9D;QAEA,MAAMC,mBAAmBd,kBAAkBe,OAAO,KAAK;QAEvDrB,kBAAkB;YAChBsB,eAAe;YACfC,aAAajB,kBAAkBiB,WAAW;YAC1CC,QAAQjB;YACRc,SAAS,CAACD,oBAAoBK,QAAQnB,kBAAkBY,aAAa;YACrEQ,eAAexB,4BAA4B;gBACzCyB,QACE,OAAOrB,kBAAkBY,aAAa,KAAK,WACvCZ,kBAAkBY,aAAa,CAACS,MAAM,GACtCC;gBACNlB,QAAQJ,kBAAkBI,MAAM;gBAChCa,aAAajB,kBAAkBiB,WAAW;gBAC1CZ;gBACAQ,sBAAsBb,kBAAkBa,oBAAoB;YAC9D;YACAU,mBAAmB;QACrB;QAEA,IAAIT,kBAAkB;YACpB,OAAOb;QACT;QAEA,+CAA+C;QAC/C,MAAMuB,yBAAmEC,OAAOC,OAAO,CACrF1B,kBAAkBiB,WAAW,EAC7BU,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;gBAC7B,GAAGF,GAAG;gBACN,CAACC,KAAK,EAAE;oBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;oBAC3CpB;gBACF;YACF,CAAA,GACA,CAAC;QAGH,gFAAgF;QAChF,MAAMQ,SAAS;YACb,GAAGjB,cAAc;YACjBgB,aAAa,AAAChB,CAAAA,eAAegB,WAAW,IAAI,EAAE,AAAD,EAAGc,GAAG,CAAC,CAACC;gBACnD,IAAI,CAACR,sBAAsB,CAACQ,WAAWH,IAAI,CAAC,EAAE;oBAC5C,OAAOG;gBACT;gBAEA,OAAO;oBACL,GAAGA,UAAU;oBACbC,QAAQ;wBACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;wBAClEC,qBAAqB;oBACvB;gBACF;YACF;QACF;QAEA,OAAOzC,mBAAmB;YACxB0C,oBAAoBnC,kBAAkBmC,kBAAkB;YACxDlB,aAAaO;YACbX,sBAAsBb,kBAAkBa,oBAAoB;QAC9D,GAAGK;IACL,EAAC"}

package/dist/uploadFile.js

@@ -1,6 +1,6 @@
 import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 export async function uploadFile({ acl, bucket, buffer, client, collectionPrefix = '', docPrefix, filename, mimeType, useCompositePrefixes = false }) {
-    const fileKey = getFileKey({
+    const { fileKey } = getFileKey({
         collectionPrefix,
         docPrefix: docPrefix || '',
         filename,

package/dist/uploadFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface UploadFileArgs {\n  acl?: 'Private' | 'Public'\n  bucket: string\n  buffer: Buffer\n  client: Storage\n  collectionPrefix?: string\n  docPrefix?: string\n  filename: string\n  mimeType: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function uploadFile({\n  acl,\n  bucket,\n  buffer,\n  client,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  mimeType,\n  useCompositePrefixes = false,\n}: UploadFileArgs): Promise<void> {\n  const fileKey = getFileKey({\n    collectionPrefix,\n    docPrefix: docPrefix || '',\n    filename,\n    useCompositePrefixes,\n  })\n\n  const gcsFile = client.bucket(bucket).file(fileKey)\n\n  await gcsFile.save(buffer, {\n    metadata: {\n      contentType: mimeType,\n    },\n  })\n\n  if (acl) {\n    await gcsFile[`make${acl}`]()\n  }\n}\n"],"names":["getFileKey","uploadFile","acl","bucket","buffer","client","collectionPrefix","docPrefix","filename","mimeType","useCompositePrefixes","fileKey","gcsFile","file","save","metadata","contentType"],"mappings":"AAEA,SAASA,UAAU,QAAQ,6CAA4C;AAcvE,OAAO,eAAeC,WAAW,EAC/BC,GAAG,EACHC,MAAM,EACNC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,uBAAuB,KAAK,EACb;IACf,MAAMC,UAAUX,WAAW;QACzBM;QACAC,WAAWA,aAAa;QACxBC;QACAE;IACF;IAEA,MAAME,UAAUP,OAAOF,MAAM,CAACA,QAAQU,IAAI,CAACF;IAE3C,MAAMC,QAAQE,IAAI,CAACV,QAAQ;QACzBW,UAAU;YACRC,aAAaP;QACf;IACF;IAEA,IAAIP,KAAK;QACP,MAAMU,OAAO,CAAC,CAAC,IAAI,EAAEV,KAAK,CAAC;IAC7B;AACF"}
+{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface UploadFileArgs {\n  acl?: 'Private' | 'Public'\n  bucket: string\n  buffer: Buffer\n  client: Storage\n  collectionPrefix?: string\n  docPrefix?: string\n  filename: string\n  mimeType: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function uploadFile({\n  acl,\n  bucket,\n  buffer,\n  client,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  mimeType,\n  useCompositePrefixes = false,\n}: UploadFileArgs): Promise<void> {\n  const { fileKey } = getFileKey({\n    collectionPrefix,\n    docPrefix: docPrefix || '',\n    filename,\n    useCompositePrefixes,\n  })\n\n  const gcsFile = client.bucket(bucket).file(fileKey)\n\n  await gcsFile.save(buffer, {\n    metadata: {\n      contentType: mimeType,\n    },\n  })\n\n  if (acl) {\n    await gcsFile[`make${acl}`]()\n  }\n}\n"],"names":["getFileKey","uploadFile","acl","bucket","buffer","client","collectionPrefix","docPrefix","filename","mimeType","useCompositePrefixes","fileKey","gcsFile","file","save","metadata","contentType"],"mappings":"AAEA,SAASA,UAAU,QAAQ,6CAA4C;AAcvE,OAAO,eAAeC,WAAW,EAC/BC,GAAG,EACHC,MAAM,EACNC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,uBAAuB,KAAK,EACb;IACf,MAAM,EAAEC,OAAO,EAAE,GAAGX,WAAW;QAC7BM;QACAC,WAAWA,aAAa;QACxBC;QACAE;IACF;IAEA,MAAME,UAAUP,OAAOF,MAAM,CAACA,QAAQU,IAAI,CAACF;IAE3C,MAAMC,QAAQE,IAAI,CAACV,QAAQ;QACzBW,UAAU;YACRC,aAAaP;QACf;IACF;IAEA,IAAIP,KAAK;QACP,MAAMU,OAAO,CAAC,CAAC,IAAI,EAAEV,KAAK,CAAC;IAC7B;AACF"}

package/package.json

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

package/dist/handleDelete.d.ts

@@ -1,9 +0,0 @@
-import type { Storage } from '@google-cloud/storage';
-import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types';
-interface Args {
-    bucket: string;
-    getStorageClient: () => Storage;
-}
-export declare const getHandleDelete: ({ bucket, getStorageClient }: Args) => HandleDelete;
-export {};
-//# sourceMappingURL=handleDelete.d.ts.map

package/dist/handleDelete.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleDelete.d.ts","sourceRoot":"","sources":["../src/handleDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAI1E,UAAU,IAAI;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,EAAE,MAAM,OAAO,CAAA;CAChC;AAED,eAAO,MAAM,eAAe,iCAAkC,IAAI,KAAG,YAMpE,CAAA"}

package/dist/handleDelete.js

@@ -1,10 +0,0 @@
-import path from 'path';
-export const getHandleDelete = ({ bucket, getStorageClient })=>{
-    return async ({ doc: { prefix = '' }, filename })=>{
-        await getStorageClient().bucket(bucket).file(path.posix.join(prefix, filename)).delete({
-            ignoreNotFound: true
-        });
-    };
-};
-
-//# sourceMappingURL=handleDelete.js.map

package/dist/handleDelete.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/handleDelete.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\nimport type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types'\n\nimport path from 'path'\n\ninterface Args {\n  bucket: string\n  getStorageClient: () => Storage\n}\n\nexport const getHandleDelete = ({ bucket, getStorageClient }: Args): HandleDelete => {\n  return async ({ doc: { prefix = '' }, filename }) => {\n    await getStorageClient().bucket(bucket).file(path.posix.join(prefix, filename)).delete({\n      ignoreNotFound: true,\n    })\n  }\n}\n"],"names":["path","getHandleDelete","bucket","getStorageClient","doc","prefix","filename","file","posix","join","delete","ignoreNotFound"],"mappings":"AAGA,OAAOA,UAAU,OAAM;AAOvB,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,MAAM,EAAEC,gBAAgB,EAAQ;IAChE,OAAO,OAAO,EAAEC,KAAK,EAAEC,SAAS,EAAE,EAAE,EAAEC,QAAQ,EAAE;QAC9C,MAAMH,mBAAmBD,MAAM,CAACA,QAAQK,IAAI,CAACP,KAAKQ,KAAK,CAACC,IAAI,CAACJ,QAAQC,WAAWI,MAAM,CAAC;YACrFC,gBAAgB;QAClB;IACF;AACF,EAAC"}

package/dist/handleUpload.d.ts

@@ -1,13 +0,0 @@
-import type { Storage } from '@google-cloud/storage';
-import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types';
-import type { CollectionConfig } from 'payload';
-interface Args {
-    acl?: 'Private' | 'Public';
-    bucket: string;
-    collection: CollectionConfig;
-    getStorageClient: () => Storage;
-    prefix?: string;
-}
-export declare const getHandleUpload: ({ acl, bucket, getStorageClient, prefix, }: Args) => HandleUpload;
-export {};
-//# sourceMappingURL=handleUpload.d.ts.map

package/dist/handleUpload.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleUpload.d.ts","sourceRoot":"","sources":["../src/handleUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAI/C,UAAU,IAAI;IACZ,GAAG,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,EAAE,MAAM,OAAO,CAAA;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,eAAe,+CAKzB,IAAI,KAAG,YAiBT,CAAA"}

package/dist/handleUpload.js

@@ -1,18 +0,0 @@
-import path from 'path';
-export const getHandleUpload = ({ acl, bucket, getStorageClient, prefix = '' })=>{
-    return async ({ data, file })=>{
-        const fileKey = path.posix.join(data.prefix || prefix, file.filename);
-        const gcsFile = getStorageClient().bucket(bucket).file(fileKey);
-        await gcsFile.save(file.buffer, {
-            metadata: {
-                contentType: file.mimeType
-            }
-        });
-        if (acl) {
-            await gcsFile[`make${acl}`]();
-        }
-        return data;
-    };
-};
-
-//# sourceMappingURL=handleUpload.js.map

package/dist/handleUpload.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/handleUpload.ts"],"sourcesContent":["import type { Storage } from '@google-cloud/storage'\nimport type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport path from 'path'\n\ninterface Args {\n  acl?: 'Private' | 'Public'\n  bucket: string\n  collection: CollectionConfig\n  getStorageClient: () => Storage\n  prefix?: string\n}\n\nexport const getHandleUpload = ({\n  acl,\n  bucket,\n  getStorageClient,\n  prefix = '',\n}: Args): HandleUpload => {\n  return async ({ data, file }) => {\n    const fileKey = path.posix.join(data.prefix || prefix, file.filename)\n\n    const gcsFile = getStorageClient().bucket(bucket).file(fileKey)\n    await gcsFile.save(file.buffer, {\n      metadata: {\n        contentType: file.mimeType,\n      },\n    })\n\n    if (acl) {\n      await gcsFile[`make${acl}`]()\n    }\n\n    return data\n  }\n}\n"],"names":["path","getHandleUpload","acl","bucket","getStorageClient","prefix","data","file","fileKey","posix","join","filename","gcsFile","save","buffer","metadata","contentType","mimeType"],"mappings":"AAIA,OAAOA,UAAU,OAAM;AAUvB,OAAO,MAAMC,kBAAkB,CAAC,EAC9BC,GAAG,EACHC,MAAM,EACNC,gBAAgB,EAChBC,SAAS,EAAE,EACN;IACL,OAAO,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;QAC1B,MAAMC,UAAUR,KAAKS,KAAK,CAACC,IAAI,CAACJ,KAAKD,MAAM,IAAIA,QAAQE,KAAKI,QAAQ;QAEpE,MAAMC,UAAUR,mBAAmBD,MAAM,CAACA,QAAQI,IAAI,CAACC;QACvD,MAAMI,QAAQC,IAAI,CAACN,KAAKO,MAAM,EAAE;YAC9BC,UAAU;gBACRC,aAAaT,KAAKU,QAAQ;YAC5B;QACF;QAEA,IAAIf,KAAK;YACP,MAAMU,OAAO,CAAC,CAAC,IAAI,EAAEV,KAAK,CAAC;QAC7B;QAEA,OAAOI;IACT;AACF,EAAC"}

package/dist/staticHandler.d.ts

@@ -1,11 +0,0 @@
-import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types';
-import type { CollectionConfig } from 'payload';
-import { type Storage } from '@google-cloud/storage';
-interface Args {
-    bucket: string;
-    collection: CollectionConfig;
-    getStorageClient: () => Storage;
-}
-export declare const getHandler: ({ bucket, collection, getStorageClient }: Args) => StaticHandler;
-export {};
-//# sourceMappingURL=staticHandler.d.ts.map

package/dist/staticHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"staticHandler.d.ts","sourceRoot":"","sources":["../src/staticHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,OAAO,EAAY,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAM9D,UAAU,IAAI;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,EAAE,MAAM,OAAO,CAAA;CAChC;AAED,eAAO,MAAM,UAAU,6CAA8C,IAAI,KAAG,aAuF3E,CAAA"}

package/dist/staticHandler.js

@@ -1,92 +0,0 @@
-import { ApiError } from '@google-cloud/storage';
-import { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities';
-import path from 'path';
-import { getRangeRequestInfo } from 'payload/internal';
-import { sanitizeFilename } from 'payload/shared';
-export const getHandler = ({ bucket, collection, getStorageClient })=>{
-    return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } })=>{
-        try {
-            const prefix = await getFilePrefix({
-                clientUploadContext,
-                collection,
-                filename,
-                req
-            });
-            const file = getStorageClient().bucket(bucket).file(path.posix.join(prefix, sanitizeFilename(filename)));
-            const [metadata] = await file.getMetadata();
-            // Handle range request
-            const rangeHeader = req.headers.get('range');
-            const fileSize = Number(metadata.size);
-            const rangeResult = getRangeRequestInfo({
-                fileSize,
-                rangeHeader
-            });
-            if (rangeResult.type === 'invalid') {
-                return new Response(null, {
-                    headers: new Headers(rangeResult.headers),
-                    status: rangeResult.status
-                });
-            }
-            const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
-            const objectEtag = metadata.etag;
-            let headers = new Headers(incomingHeaders);
-            // Add range-related headers from the result
-            for (const [key, value] of Object.entries(rangeResult.headers)){
-                headers.append(key, value);
-            }
-            headers.append('Content-Type', String(metadata.contentType));
-            headers.append('ETag', String(metadata.etag));
-            // Add Content-Security-Policy header for SVG files to prevent executable code
-            if (metadata.contentType === 'image/svg+xml') {
-                headers.append('Content-Security-Policy', "script-src 'none'");
-            }
-            if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
-                headers = collection.upload.modifyResponseHeaders({
-                    headers
-                }) || headers;
-            }
-            if (etagFromHeaders && etagFromHeaders === objectEtag) {
-                return new Response(null, {
-                    headers,
-                    status: 304
-                });
-            }
-            // Manually create a ReadableStream for the web from a Node.js stream.
-            const readableStream = new ReadableStream({
-                start (controller) {
-                    const streamOptions = rangeResult.type === 'partial' ? {
-                        end: rangeResult.rangeEnd,
-                        start: rangeResult.rangeStart
-                    } : {};
-                    const nodeStream = file.createReadStream(streamOptions);
-                    nodeStream.on('data', (chunk)=>{
-                        controller.enqueue(new Uint8Array(chunk));
-                    });
-                    nodeStream.on('end', ()=>{
-                        controller.close();
-                    });
-                    nodeStream.on('error', (err)=>{
-                        controller.error(err);
-                    });
-                }
-            });
-            return new Response(readableStream, {
-                headers,
-                status: rangeResult.status
-            });
-        } catch (err) {
-            if (err instanceof ApiError && err.code === 404) {
-                return new Response(null, {
-                    status: 404,
-                    statusText: 'Not Found'
-                });
-            }
-            req.payload.logger.error(err);
-            return new Response('Internal Server Error', {
-                status: 500
-            });
-        }
-    };
-};
-
-//# sourceMappingURL=staticHandler.js.map

package/dist/staticHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport { ApiError, type Storage } from '@google-cloud/storage'\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\nimport { getRangeRequestInfo } from 'payload/internal'\nimport { sanitizeFilename } from 'payload/shared'\n\ninterface Args {\n  bucket: string\n  collection: CollectionConfig\n  getStorageClient: () => Storage\n}\n\nexport const getHandler = ({ bucket, collection, getStorageClient }: Args): StaticHandler => {\n  return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } }) => {\n    try {\n      const prefix = await getFilePrefix({ clientUploadContext, collection, filename, req })\n      const file = getStorageClient()\n        .bucket(bucket)\n        .file(path.posix.join(prefix, sanitizeFilename(filename)))\n\n      const [metadata] = await file.getMetadata()\n\n      // Handle range request\n      const rangeHeader = req.headers.get('range')\n      const fileSize = Number(metadata.size)\n      const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n      if (rangeResult.type === 'invalid') {\n        return new Response(null, {\n          headers: new Headers(rangeResult.headers),\n          status: rangeResult.status,\n        })\n      }\n\n      const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n      const objectEtag = metadata.etag\n\n      let headers = new Headers(incomingHeaders)\n\n      // Add range-related headers from the result\n      for (const [key, value] of Object.entries(rangeResult.headers)) {\n        headers.append(key, value)\n      }\n\n      headers.append('Content-Type', String(metadata.contentType))\n      headers.append('ETag', String(metadata.etag))\n\n      // Add Content-Security-Policy header for SVG files to prevent executable code\n      if (metadata.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 === objectEtag) {\n        return new Response(null, {\n          headers,\n          status: 304,\n        })\n      }\n\n      // Manually create a ReadableStream for the web from a Node.js stream.\n      const readableStream = new ReadableStream({\n        start(controller) {\n          const streamOptions =\n            rangeResult.type === 'partial'\n              ? { end: rangeResult.rangeEnd, start: rangeResult.rangeStart }\n              : {}\n          const nodeStream = file.createReadStream(streamOptions)\n          nodeStream.on('data', (chunk) => {\n            controller.enqueue(new Uint8Array(chunk))\n          })\n          nodeStream.on('end', () => {\n            controller.close()\n          })\n          nodeStream.on('error', (err) => {\n            controller.error(err)\n          })\n        },\n      })\n\n      return new Response(readableStream, {\n        headers,\n        status: rangeResult.status,\n      })\n    } catch (err: unknown) {\n      if (err instanceof ApiError && err.code === 404) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n      req.payload.logger.error(err)\n      return new Response('Internal Server Error', { status: 500 })\n    }\n  }\n}\n"],"names":["ApiError","getFilePrefix","path","getRangeRequestInfo","sanitizeFilename","getHandler","bucket","collection","getStorageClient","req","headers","incomingHeaders","params","clientUploadContext","filename","prefix","file","posix","join","metadata","getMetadata","rangeHeader","get","fileSize","Number","size","rangeResult","type","Response","Headers","status","etagFromHeaders","objectEtag","etag","key","value","Object","entries","append","String","contentType","upload","modifyResponseHeaders","readableStream","ReadableStream","start","controller","streamOptions","end","rangeEnd","rangeStart","nodeStream","createReadStream","on","chunk","enqueue","Uint8Array","close","err","error","code","statusText","payload","logger"],"mappings":"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"}