@payloadcms/plugin-cloud-storage 4.0.0-internal.e55ccef → 4.0.0-internal.ea6e8f8

package/dist/utilities/getFilePrefix.js

@@ -1,46 +1,101 @@
+import { buildPrefixWithObjectKey } from './buildPrefixWithObjectKey.js';
+import { buildUploadStoragePathData } from './buildStoragePathData.js';
 import { sanitizePrefix } from './sanitizePrefix.js';
 /**
- * Resolves the file prefix from the highest-priority available source and
- * always returns a sanitized value.
+ * Resolves the folder a stored object lives under (semantic `prefix` plus `_objectKey`).
  *
- * Resolution order:
- * 1. `prefixQueryParam`
- * 2. `clientUploadContext.prefix`
- * 3. Stored document `prefix` from the database
- *
- * Resolved values are passed through `sanitizePrefix`.
- */ export async function getFilePrefix({ clientUploadContext, collection, filename, prefixQueryParam, req }) {
-    if (typeof prefixQueryParam === 'string') {
-        return sanitizePrefix(prefixQueryParam);
+ * An already-authorized `doc` wins outright. Otherwise an `uploadReference` is used (its
+ * `prefix` re-contained with {@link buildUploadStoragePathData}, since it hasn't been verified against
+ * a signed receipt by every adapter). Otherwise the document is resolved with
+ * `overrideAccess: false`, any query-param prefix only narrows that lookup, and `_objectKey`
+ * is read from the resolved document via `showHiddenFields`.
+ */ export async function getFilePrefix({ collection, collectionPrefix, doc, filename, prefixQueryParam, req, uploadReference, useCompositePrefixes = false }) {
+    // The serve path already loaded and authorized this document — trust it over any
+    // client-supplied upload reference or query prefix.
+    if (doc) {
+        return getRepresentationPrefix({
+            doc,
+            filename
+        });
     }
-    // Prioritize from clientUploadContext if there is:
-    if (clientUploadContext && typeof clientUploadContext === 'object' && 'prefix' in clientUploadContext && typeof clientUploadContext.prefix === 'string') {
-        return sanitizePrefix(clientUploadContext.prefix);
+    // Upload instructions call handlers without a document yet. Re-contain the claimed
+    // prefix — it hasn't been verified against a signed receipt by every adapter.
+    if (uploadReference && typeof uploadReference === 'object' && 'prefix' in uploadReference && typeof uploadReference.prefix === 'string') {
+        const referenceObjectKey = '_objectKey' in uploadReference ? uploadReference._objectKey : undefined;
+        const containedPrefix = buildUploadStoragePathData({
+            collectionPrefix,
+            docPrefix: uploadReference.prefix,
+            filename,
+            useCompositePrefixes
+        }).sanitizedDocPrefix;
+        return buildPrefixWithObjectKey({
+            objectKey: referenceObjectKey,
+            prefix: containedPrefix
+        });
     }
-    const imageSizes = collection?.upload?.imageSizes || [];
+    // Reads without a query prefix or read-access constraints skip the endpoint's document lookup.
+    const variants = collection?.upload?.variants || [];
+    const filenameClause = {
+        or: [
+            {
+                filename: {
+                    equals: filename
+                }
+            },
+            {
+                'original.filename': {
+                    equals: filename
+                }
+            },
+            ...variants.map((imageSize)=>({
+                    [`variants.${imageSize.name}.filename`]: {
+                        equals: filename
+                    }
+                }))
+        ]
+    };
+    // Only filter by prefix when the collection persists a `prefix` field (querying a missing field throws).
+    const hasPrefixField = collection.fields?.some((field)=>'name' in field && field.name === 'prefix');
+    const where = typeof prefixQueryParam === 'string' && hasPrefixField ? {
+        and: [
+            filenameClause,
+            {
+                prefix: {
+                    equals: sanitizePrefix(prefixQueryParam)
+                }
+            }
+        ]
+    } : filenameClause;
     const files = await req.payload.find({
         collection: collection.slug,
         depth: 0,
         draft: true,
         limit: 1,
+        overrideAccess: false,
         pagination: false,
-        where: {
-            or: [
-                {
-                    filename: {
-                        equals: filename
-                    }
-                },
-                ...imageSizes.map((imageSize)=>({
-                        [`sizes.${imageSize.name}.filename`]: {
-                            equals: filename
-                        }
-                    }))
-            ]
-        }
+        req,
+        select: {
+            _objectKey: true,
+            filename: true,
+            original: true,
+            prefix: true,
+            variants: true
+        },
+        showHiddenFields: true,
+        where
     });
-    const prefix = files?.docs?.[0]?.prefix;
-    return prefix ? sanitizePrefix(prefix) : '';
+    const found = files?.docs?.[0];
+    return found ? getRepresentationPrefix({
+        doc: found,
+        filename
+    }) : '';
 }
+const getRepresentationPrefix = ({ doc, filename })=>{
+    const representation = doc.original?.filename === filename ? doc.original : Object.values(doc.variants ?? {}).find((variant)=>variant?.filename === filename) ?? doc;
+    return buildPrefixWithObjectKey({
+        objectKey: representation._objectKey ?? (!doc.original?.filename ? doc._objectKey : undefined),
+        prefix: representation.prefix ?? (!doc.original?.filename ? doc.prefix : undefined)
+    });
+};
 
 //# sourceMappingURL=getFilePrefix.js.map

package/dist/utilities/getFilePrefix.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getFilePrefix.ts"],"sourcesContent":["import type { CollectionConfig, PayloadRequest, UploadConfig } from 'payload'\n\nimport { sanitizePrefix } from './sanitizePrefix.js'\n\n/**\n * Resolves the file prefix from the highest-priority available source and\n * always returns a sanitized value.\n *\n * Resolution order:\n * 1. `prefixQueryParam`\n * 2. `clientUploadContext.prefix`\n * 3. Stored document `prefix` from the database\n *\n * Resolved values are passed through `sanitizePrefix`.\n */\nexport async function getFilePrefix({\n  clientUploadContext,\n  collection,\n  filename,\n  prefixQueryParam,\n  req,\n}: {\n  clientUploadContext?: unknown\n  collection: CollectionConfig\n  filename: string\n  prefixQueryParam?: string\n  req: PayloadRequest\n}): Promise<string> {\n  if (typeof prefixQueryParam === 'string') {\n    return sanitizePrefix(prefixQueryParam)\n  }\n\n  // Prioritize from clientUploadContext if there is:\n  if (\n    clientUploadContext &&\n    typeof clientUploadContext === 'object' &&\n    'prefix' in clientUploadContext &&\n    typeof clientUploadContext.prefix === 'string'\n  ) {\n    return sanitizePrefix(clientUploadContext.prefix)\n  }\n\n  const imageSizes = (collection?.upload as UploadConfig)?.imageSizes || []\n\n  const files = await req.payload.find({\n    collection: collection.slug,\n    depth: 0,\n    draft: true,\n    limit: 1,\n    pagination: false,\n    where: {\n      or: [\n        {\n          filename: { equals: filename },\n        },\n        ...imageSizes.map((imageSize) => ({\n          [`sizes.${imageSize.name}.filename`]: { equals: filename },\n        })),\n      ],\n    },\n  })\n  const prefix = files?.docs?.[0]?.prefix\n  return prefix ? sanitizePrefix(prefix as string) : ''\n}\n"],"names":["sanitizePrefix","getFilePrefix","clientUploadContext","collection","filename","prefixQueryParam","req","prefix","imageSizes","upload","files","payload","find","slug","depth","draft","limit","pagination","where","or","equals","map","imageSize","name","docs"],"mappings":"AAEA,SAASA,cAAc,QAAQ,sBAAqB;AAEpD;;;;;;;;;;CAUC,GACD,OAAO,eAAeC,cAAc,EAClCC,mBAAmB,EACnBC,UAAU,EACVC,QAAQ,EACRC,gBAAgB,EAChBC,GAAG,EAOJ;IACC,IAAI,OAAOD,qBAAqB,UAAU;QACxC,OAAOL,eAAeK;IACxB;IAEA,mDAAmD;IACnD,IACEH,uBACA,OAAOA,wBAAwB,YAC/B,YAAYA,uBACZ,OAAOA,oBAAoBK,MAAM,KAAK,UACtC;QACA,OAAOP,eAAeE,oBAAoBK,MAAM;IAClD;IAEA,MAAMC,aAAa,AAACL,YAAYM,QAAyBD,cAAc,EAAE;IAEzE,MAAME,QAAQ,MAAMJ,IAAIK,OAAO,CAACC,IAAI,CAAC;QACnCT,YAAYA,WAAWU,IAAI;QAC3BC,OAAO;QACPC,OAAO;QACPC,OAAO;QACPC,YAAY;QACZC,OAAO;YACLC,IAAI;gBACF;oBACEf,UAAU;wBAAEgB,QAAQhB;oBAAS;gBAC/B;mBACGI,WAAWa,GAAG,CAAC,CAACC,YAAe,CAAA;wBAChC,CAAC,CAAC,MAAM,EAAEA,UAAUC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE;4BAAEH,QAAQhB;wBAAS;oBAC3D,CAAA;aACD;QACH;IACF;IACA,MAAMG,SAASG,OAAOc,MAAM,CAAC,EAAE,EAAEjB;IACjC,OAAOA,SAASP,eAAeO,UAAoB;AACrD"}
+{"version":3,"sources":["../../src/utilities/getFilePrefix.ts"],"sourcesContent":["import type {\n  CollectionConfig,\n  FileData,\n  PayloadRequest,\n  SanitizedUploadConfig,\n  TypeWithID,\n} from 'payload'\n\nimport { buildPrefixWithObjectKey } from './buildPrefixWithObjectKey.js'\nimport { buildUploadStoragePathData } from './buildStoragePathData.js'\nimport { sanitizePrefix } from './sanitizePrefix.js'\n\n/**\n * Resolves the folder a stored object lives under (semantic `prefix` plus `_objectKey`).\n *\n * An already-authorized `doc` wins outright. Otherwise an `uploadReference` is used (its\n * `prefix` re-contained with {@link buildUploadStoragePathData}, since it hasn't been verified against\n * a signed receipt by every adapter). Otherwise the document is resolved with\n * `overrideAccess: false`, any query-param prefix only narrows that lookup, and `_objectKey`\n * is read from the resolved document via `showHiddenFields`.\n */\nexport async function getFilePrefix({\n  collection,\n  collectionPrefix,\n  doc,\n  filename,\n  prefixQueryParam,\n  req,\n  uploadReference,\n  useCompositePrefixes = false,\n}: {\n  collection: CollectionConfig\n  collectionPrefix?: string\n  doc?: Partial<FileData> & TypeWithID\n  filename: string\n  /**\n   * Only narrows the access-controlled fallback lookup below; never trusted or\n   * returned directly. Prefer passing the access-checked document as `doc` instead.\n   */\n  prefixQueryParam?: string\n  req: PayloadRequest\n  uploadReference?: unknown\n  useCompositePrefixes?: boolean\n}): Promise<string> {\n  // The serve path already loaded and authorized this document — trust it over any\n  // client-supplied upload reference or query prefix.\n  if (doc) {\n    return getRepresentationPrefix({ doc, filename })\n  }\n\n  // Upload instructions call handlers without a document yet. Re-contain the claimed\n  // prefix — it hasn't been verified against a signed receipt by every adapter.\n  if (\n    uploadReference &&\n    typeof uploadReference === 'object' &&\n    'prefix' in uploadReference &&\n    typeof uploadReference.prefix === 'string'\n  ) {\n    const referenceObjectKey =\n      '_objectKey' in uploadReference\n        ? (uploadReference as { _objectKey?: string })._objectKey\n        : undefined\n    const containedPrefix = buildUploadStoragePathData({\n      collectionPrefix,\n      docPrefix: uploadReference.prefix,\n      filename,\n      useCompositePrefixes,\n    }).sanitizedDocPrefix\n    return buildPrefixWithObjectKey({ objectKey: referenceObjectKey, prefix: containedPrefix })\n  }\n\n  // Reads without a query prefix or read-access constraints skip the endpoint's document lookup.\n  const variants = (collection?.upload as SanitizedUploadConfig)?.variants || []\n\n  const filenameClause = {\n    or: [\n      {\n        filename: { equals: filename },\n      },\n      { 'original.filename': { equals: filename } },\n      ...variants.map((imageSize) => ({\n        [`variants.${imageSize.name}.filename`]: { equals: filename },\n      })),\n    ],\n  }\n\n  // Only filter by prefix when the collection persists a `prefix` field (querying a missing field throws).\n  const hasPrefixField = collection.fields?.some(\n    (field) => 'name' in field && field.name === 'prefix',\n  )\n  const where =\n    typeof prefixQueryParam === 'string' && hasPrefixField\n      ? { and: [filenameClause, { prefix: { equals: sanitizePrefix(prefixQueryParam) } }] }\n      : filenameClause\n\n  const files = await req.payload.find({\n    collection: collection.slug,\n    depth: 0,\n    draft: true,\n    limit: 1,\n    overrideAccess: false,\n    pagination: false,\n    req,\n    select: {\n      _objectKey: true,\n      filename: true,\n      original: true,\n      prefix: true,\n      variants: true,\n    },\n    showHiddenFields: true,\n    where,\n  })\n\n  const found = files?.docs?.[0] as\n    | ({ _objectKey?: string; prefix?: string } & Partial<FileData>)\n    | undefined\n  return found ? getRepresentationPrefix({ doc: found, filename }) : ''\n}\n\nconst getRepresentationPrefix = ({\n  doc,\n  filename,\n}: {\n  doc: Partial<FileData>\n  filename: string\n}): string => {\n  const representation =\n    doc.original?.filename === filename\n      ? doc.original\n      : (Object.values(doc.variants ?? {}).find((variant) => variant?.filename === filename) ?? doc)\n  return buildPrefixWithObjectKey({\n    objectKey: representation._objectKey ?? (!doc.original?.filename ? doc._objectKey : undefined),\n    prefix: representation.prefix ?? (!doc.original?.filename ? doc.prefix : undefined),\n  })\n}\n"],"names":["buildPrefixWithObjectKey","buildUploadStoragePathData","sanitizePrefix","getFilePrefix","collection","collectionPrefix","doc","filename","prefixQueryParam","req","uploadReference","useCompositePrefixes","getRepresentationPrefix","prefix","referenceObjectKey","_objectKey","undefined","containedPrefix","docPrefix","sanitizedDocPrefix","objectKey","variants","upload","filenameClause","or","equals","map","imageSize","name","hasPrefixField","fields","some","field","where","and","files","payload","find","slug","depth","draft","limit","overrideAccess","pagination","select","original","showHiddenFields","found","docs","representation","Object","values","variant"],"mappings":"AAQA,SAASA,wBAAwB,QAAQ,gCAA+B;AACxE,SAASC,0BAA0B,QAAQ,4BAA2B;AACtE,SAASC,cAAc,QAAQ,sBAAqB;AAEpD;;;;;;;;CAQC,GACD,OAAO,eAAeC,cAAc,EAClCC,UAAU,EACVC,gBAAgB,EAChBC,GAAG,EACHC,QAAQ,EACRC,gBAAgB,EAChBC,GAAG,EACHC,eAAe,EACfC,uBAAuB,KAAK,EAc7B;IACC,iFAAiF;IACjF,oDAAoD;IACpD,IAAIL,KAAK;QACP,OAAOM,wBAAwB;YAAEN;YAAKC;QAAS;IACjD;IAEA,mFAAmF;IACnF,8EAA8E;IAC9E,IACEG,mBACA,OAAOA,oBAAoB,YAC3B,YAAYA,mBACZ,OAAOA,gBAAgBG,MAAM,KAAK,UAClC;QACA,MAAMC,qBACJ,gBAAgBJ,kBACZ,AAACA,gBAA4CK,UAAU,GACvDC;QACN,MAAMC,kBAAkBhB,2BAA2B;YACjDI;YACAa,WAAWR,gBAAgBG,MAAM;YACjCN;YACAI;QACF,GAAGQ,kBAAkB;QACrB,OAAOnB,yBAAyB;YAAEoB,WAAWN;YAAoBD,QAAQI;QAAgB;IAC3F;IAEA,+FAA+F;IAC/F,MAAMI,WAAW,AAACjB,YAAYkB,QAAkCD,YAAY,EAAE;IAE9E,MAAME,iBAAiB;QACrBC,IAAI;YACF;gBACEjB,UAAU;oBAAEkB,QAAQlB;gBAAS;YAC/B;YACA;gBAAE,qBAAqB;oBAAEkB,QAAQlB;gBAAS;YAAE;eACzCc,SAASK,GAAG,CAAC,CAACC,YAAe,CAAA;oBAC9B,CAAC,CAAC,SAAS,EAAEA,UAAUC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE;wBAAEH,QAAQlB;oBAAS;gBAC9D,CAAA;SACD;IACH;IAEA,yGAAyG;IACzG,MAAMsB,iBAAiBzB,WAAW0B,MAAM,EAAEC,KACxC,CAACC,QAAU,UAAUA,SAASA,MAAMJ,IAAI,KAAK;IAE/C,MAAMK,QACJ,OAAOzB,qBAAqB,YAAYqB,iBACpC;QAAEK,KAAK;YAACX;YAAgB;gBAAEV,QAAQ;oBAAEY,QAAQvB,eAAeM;gBAAkB;YAAE;SAAE;IAAC,IAClFe;IAEN,MAAMY,QAAQ,MAAM1B,IAAI2B,OAAO,CAACC,IAAI,CAAC;QACnCjC,YAAYA,WAAWkC,IAAI;QAC3BC,OAAO;QACPC,OAAO;QACPC,OAAO;QACPC,gBAAgB;QAChBC,YAAY;QACZlC;QACAmC,QAAQ;YACN7B,YAAY;YACZR,UAAU;YACVsC,UAAU;YACVhC,QAAQ;YACRQ,UAAU;QACZ;QACAyB,kBAAkB;QAClBb;IACF;IAEA,MAAMc,QAAQZ,OAAOa,MAAM,CAAC,EAAE;IAG9B,OAAOD,QAAQnC,wBAAwB;QAAEN,KAAKyC;QAAOxC;IAAS,KAAK;AACrE;AAEA,MAAMK,0BAA0B,CAAC,EAC/BN,GAAG,EACHC,QAAQ,EAIT;IACC,MAAM0C,iBACJ3C,IAAIuC,QAAQ,EAAEtC,aAAaA,WACvBD,IAAIuC,QAAQ,GACXK,OAAOC,MAAM,CAAC7C,IAAIe,QAAQ,IAAI,CAAC,GAAGgB,IAAI,CAAC,CAACe,UAAYA,SAAS7C,aAAaA,aAAaD;IAC9F,OAAON,yBAAyB;QAC9BoB,WAAW6B,eAAelC,UAAU,IAAK,CAAA,CAACT,IAAIuC,QAAQ,EAAEtC,WAAWD,IAAIS,UAAU,GAAGC,SAAQ;QAC5FH,QAAQoC,eAAepC,MAAM,IAAK,CAAA,CAACP,IAAIuC,QAAQ,EAAEtC,WAAWD,IAAIO,MAAM,GAAGG,SAAQ;IACnF;AACF"}

package/dist/utilities/getIncomingFiles.js

@@ -7,17 +7,17 @@ export function getIncomingFiles({ data, req }) {
     if (file && data.filename && data.mimeType) {
         const mainFile = {
             buffer: file.data,
-            clientUploadContext: file.clientUploadContext,
             filename: data.filename,
             filesize: file.size,
             mimeType: data.mimeType,
-            tempFilePath: file.tempFilePath
+            tempFilePath: file.tempFilePath,
+            uploadReference: file.uploadReference
         };
         files = [
             mainFile
         ];
-        if (data?.sizes) {
-            Object.entries(data.sizes).forEach(([key, resizedFileData])=>{
+        if (data?.variants) {
+            Object.entries(data.variants).forEach(([key, resizedFileData])=>{
                 if (payloadUploadSizes?.[key] && resizedFileData.mimeType) {
                     files = files.concat([
                         {

package/dist/utilities/getIncomingFiles.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getIncomingFiles.ts"],"sourcesContent":["import type { FileData, PayloadRequest } from 'payload'\n\nimport type { File } from '../types.js'\n\ninterface CloudStorageContext {\n  file: PayloadRequest['file']\n  uploadSizes: PayloadRequest['payloadUploadSizes']\n}\n\nexport function getIncomingFiles({\n  data,\n  req,\n}: {\n  data: Partial<FileData>\n  req: PayloadRequest\n}): File[] {\n  // Fall back to context if req.file was cleared\n  const ctx = req.context?._payloadCloudStorage as CloudStorageContext | undefined\n  const file = req.file ?? ctx?.file\n  const payloadUploadSizes = req.payloadUploadSizes ?? ctx?.uploadSizes\n\n  let files: File[] = []\n\n  if (file && data.filename && data.mimeType) {\n    const mainFile: File = {\n      buffer: file.data,\n      clientUploadContext: file.clientUploadContext,\n      filename: data.filename,\n      filesize: file.size,\n      mimeType: data.mimeType,\n      tempFilePath: file.tempFilePath,\n    }\n\n    files = [mainFile]\n\n    if (data?.sizes) {\n      Object.entries(data.sizes).forEach(([key, resizedFileData]) => {\n        if (payloadUploadSizes?.[key] && resizedFileData.mimeType) {\n          files = files.concat([\n            {\n              buffer: payloadUploadSizes[key],\n              filename: `${resizedFileData.filename}`,\n              filesize: payloadUploadSizes[key].length,\n              mimeType: resizedFileData.mimeType,\n            },\n          ])\n        }\n      })\n    }\n  }\n\n  return files\n}\n"],"names":["getIncomingFiles","data","req","ctx","context","_payloadCloudStorage","file","payloadUploadSizes","uploadSizes","files","filename","mimeType","mainFile","buffer","clientUploadContext","filesize","size","tempFilePath","sizes","Object","entries","forEach","key","resizedFileData","concat","length"],"mappings":"AASA,OAAO,SAASA,iBAAiB,EAC/BC,IAAI,EACJC,GAAG,EAIJ;IACC,+CAA+C;IAC/C,MAAMC,MAAMD,IAAIE,OAAO,EAAEC;IACzB,MAAMC,OAAOJ,IAAII,IAAI,IAAIH,KAAKG;IAC9B,MAAMC,qBAAqBL,IAAIK,kBAAkB,IAAIJ,KAAKK;IAE1D,IAAIC,QAAgB,EAAE;IAEtB,IAAIH,QAAQL,KAAKS,QAAQ,IAAIT,KAAKU,QAAQ,EAAE;QAC1C,MAAMC,WAAiB;YACrBC,QAAQP,KAAKL,IAAI;YACjBa,qBAAqBR,KAAKQ,mBAAmB;YAC7CJ,UAAUT,KAAKS,QAAQ;YACvBK,UAAUT,KAAKU,IAAI;YACnBL,UAAUV,KAAKU,QAAQ;YACvBM,cAAcX,KAAKW,YAAY;QACjC;QAEAR,QAAQ;YAACG;SAAS;QAElB,IAAIX,MAAMiB,OAAO;YACfC,OAAOC,OAAO,CAACnB,KAAKiB,KAAK,EAAEG,OAAO,CAAC,CAAC,CAACC,KAAKC,gBAAgB;gBACxD,IAAIhB,oBAAoB,CAACe,IAAI,IAAIC,gBAAgBZ,QAAQ,EAAE;oBACzDF,QAAQA,MAAMe,MAAM,CAAC;wBACnB;4BACEX,QAAQN,kBAAkB,CAACe,IAAI;4BAC/BZ,UAAU,GAAGa,gBAAgBb,QAAQ,EAAE;4BACvCK,UAAUR,kBAAkB,CAACe,IAAI,CAACG,MAAM;4BACxCd,UAAUY,gBAAgBZ,QAAQ;wBACpC;qBACD;gBACH;YACF;QACF;IACF;IAEA,OAAOF;AACT"}
+{"version":3,"sources":["../../src/utilities/getIncomingFiles.ts"],"sourcesContent":["import type { FileData, PayloadRequest } from 'payload'\n\nimport type { File } from '../types.js'\n\ninterface CloudStorageContext {\n  file: PayloadRequest['file']\n  uploadSizes: PayloadRequest['payloadUploadSizes']\n}\n\nexport function getIncomingFiles({\n  data,\n  req,\n}: {\n  data: Partial<FileData>\n  req: PayloadRequest\n}): File[] {\n  // Fall back to context if req.file was cleared\n  const ctx = req.context?._payloadCloudStorage as CloudStorageContext | undefined\n  const file = req.file ?? ctx?.file\n  const payloadUploadSizes = req.payloadUploadSizes ?? ctx?.uploadSizes\n\n  let files: File[] = []\n\n  if (file && data.filename && data.mimeType) {\n    const mainFile: File = {\n      buffer: file.data,\n      filename: data.filename,\n      filesize: file.size,\n      mimeType: data.mimeType,\n      tempFilePath: file.tempFilePath,\n      uploadReference: file.uploadReference,\n    }\n\n    files = [mainFile]\n\n    if (data?.variants) {\n      Object.entries(data.variants).forEach(([key, resizedFileData]) => {\n        if (payloadUploadSizes?.[key] && resizedFileData.mimeType) {\n          files = files.concat([\n            {\n              buffer: payloadUploadSizes[key],\n              filename: `${resizedFileData.filename}`,\n              filesize: payloadUploadSizes[key].length,\n              mimeType: resizedFileData.mimeType,\n            },\n          ])\n        }\n      })\n    }\n  }\n\n  return files\n}\n"],"names":["getIncomingFiles","data","req","ctx","context","_payloadCloudStorage","file","payloadUploadSizes","uploadSizes","files","filename","mimeType","mainFile","buffer","filesize","size","tempFilePath","uploadReference","variants","Object","entries","forEach","key","resizedFileData","concat","length"],"mappings":"AASA,OAAO,SAASA,iBAAiB,EAC/BC,IAAI,EACJC,GAAG,EAIJ;IACC,+CAA+C;IAC/C,MAAMC,MAAMD,IAAIE,OAAO,EAAEC;IACzB,MAAMC,OAAOJ,IAAII,IAAI,IAAIH,KAAKG;IAC9B,MAAMC,qBAAqBL,IAAIK,kBAAkB,IAAIJ,KAAKK;IAE1D,IAAIC,QAAgB,EAAE;IAEtB,IAAIH,QAAQL,KAAKS,QAAQ,IAAIT,KAAKU,QAAQ,EAAE;QAC1C,MAAMC,WAAiB;YACrBC,QAAQP,KAAKL,IAAI;YACjBS,UAAUT,KAAKS,QAAQ;YACvBI,UAAUR,KAAKS,IAAI;YACnBJ,UAAUV,KAAKU,QAAQ;YACvBK,cAAcV,KAAKU,YAAY;YAC/BC,iBAAiBX,KAAKW,eAAe;QACvC;QAEAR,QAAQ;YAACG;SAAS;QAElB,IAAIX,MAAMiB,UAAU;YAClBC,OAAOC,OAAO,CAACnB,KAAKiB,QAAQ,EAAEG,OAAO,CAAC,CAAC,CAACC,KAAKC,gBAAgB;gBAC3D,IAAIhB,oBAAoB,CAACe,IAAI,IAAIC,gBAAgBZ,QAAQ,EAAE;oBACzDF,QAAQA,MAAMe,MAAM,CAAC;wBACnB;4BACEX,QAAQN,kBAAkB,CAACe,IAAI;4BAC/BZ,UAAU,GAAGa,gBAAgBb,QAAQ,EAAE;4BACvCI,UAAUP,kBAAkB,CAACe,IAAI,CAACG,MAAM;4BACxCd,UAAUY,gBAAgBZ,QAAQ;wBACpC;qBACD;gBACH;YACF;QACF;IACF;IAEA,OAAOF;AACT"}

package/dist/utilities/getStorageLocationSelect.d.ts

@@ -0,0 +1,9 @@
+import type { CollectionConfig } from 'payload';
+/**
+ * URL hooks rebuild direct URLs from each representation's stored location, so a positive
+ * selection of a URL must also read the fields that location is built from.
+ */
+export declare const getStorageLocationSelect: ({ select: existingSelect, }: {
+    select: CollectionConfig['select'];
+}) => NonNullable<CollectionConfig['select']>;
+//# sourceMappingURL=getStorageLocationSelect.d.ts.map

package/dist/utilities/getStorageLocationSelect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getStorageLocationSelect.d.ts","sourceRoot":"","sources":["../../src/utilities/getStorageLocationSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAc,MAAM,SAAS,CAAA;AAQ3D;;;GAGG;AACH,eAAO,MAAM,wBAAwB,gCAGhC;IACD,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;CACnC,KAAG,WAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CASzC,CAAA"}

package/dist/utilities/getStorageLocationSelect.js

@@ -0,0 +1,54 @@
+import { getSelectMode } from 'payload/shared';
+const locationFieldNames = [
+    'filename',
+    'prefix',
+    '_objectKey'
+];
+/**
+ * URL hooks rebuild direct URLs from each representation's stored location, so a positive
+ * selection of a URL must also read the fields that location is built from.
+ */ export const getStorageLocationSelect = ({ select: existingSelect })=>(args)=>{
+        const select = existingSelect?.(args) ?? args.select;
+        if (!select || getSelectMode(select) === 'exclude') {
+            return select;
+        }
+        return withLocationFields({
+            select
+        });
+    };
+const withLocationFields = ({ select })=>{
+    const result = addLocationFields({
+        representation: {
+            ...select
+        }
+    });
+    if (isSelectRecord(result.original)) {
+        result.original = addLocationFields({
+            representation: {
+                ...result.original
+            }
+        });
+    }
+    if (isSelectRecord(result.variants)) {
+        result.variants = Object.fromEntries(Object.entries(result.variants).map(([name, variant])=>[
+                name,
+                isSelectRecord(variant) ? addLocationFields({
+                    representation: {
+                        ...variant
+                    }
+                }) : variant
+            ]));
+    }
+    return result;
+};
+const addLocationFields = ({ representation })=>{
+    if (representation.url === true) {
+        for (const fieldName of locationFieldNames){
+            representation[fieldName] = true;
+        }
+    }
+    return representation;
+};
+const isSelectRecord = (value)=>typeof value === 'object' && value !== null && !Array.isArray(value);
+
+//# sourceMappingURL=getStorageLocationSelect.js.map

package/dist/utilities/getStorageLocationSelect.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/getStorageLocationSelect.ts"],"sourcesContent":["import type { CollectionConfig, SelectType } from 'payload'\n\nimport { getSelectMode } from 'payload/shared'\n\ntype SelectRecord = Record<string, unknown>\n\nconst locationFieldNames = ['filename', 'prefix', '_objectKey'] as const\n\n/**\n * URL hooks rebuild direct URLs from each representation's stored location, so a positive\n * selection of a URL must also read the fields that location is built from.\n */\nexport const getStorageLocationSelect =\n  ({\n    select: existingSelect,\n  }: {\n    select: CollectionConfig['select']\n  }): NonNullable<CollectionConfig['select']> =>\n  (args) => {\n    const select = existingSelect?.(args) ?? args.select\n\n    if (!select || getSelectMode(select) === 'exclude') {\n      return select\n    }\n\n    return withLocationFields({ select })\n  }\n\nconst withLocationFields = ({ select }: { select: SelectType }): SelectType => {\n  const result = addLocationFields({ representation: { ...select } })\n\n  if (isSelectRecord(result.original)) {\n    result.original = addLocationFields({ representation: { ...result.original } })\n  }\n\n  if (isSelectRecord(result.variants)) {\n    result.variants = Object.fromEntries(\n      Object.entries(result.variants).map(([name, variant]) => [\n        name,\n        isSelectRecord(variant) ? addLocationFields({ representation: { ...variant } }) : variant,\n      ]),\n    )\n  }\n\n  return result as SelectType\n}\n\nconst addLocationFields = ({ representation }: { representation: SelectRecord }): SelectRecord => {\n  if (representation.url === true) {\n    for (const fieldName of locationFieldNames) {\n      representation[fieldName] = true\n    }\n  }\n\n  return representation\n}\n\nconst isSelectRecord = (value: unknown): value is SelectRecord =>\n  typeof value === 'object' && value !== null && !Array.isArray(value)\n"],"names":["getSelectMode","locationFieldNames","getStorageLocationSelect","select","existingSelect","args","withLocationFields","result","addLocationFields","representation","isSelectRecord","original","variants","Object","fromEntries","entries","map","name","variant","url","fieldName","value","Array","isArray"],"mappings":"AAEA,SAASA,aAAa,QAAQ,iBAAgB;AAI9C,MAAMC,qBAAqB;IAAC;IAAY;IAAU;CAAa;AAE/D;;;CAGC,GACD,OAAO,MAAMC,2BACX,CAAC,EACCC,QAAQC,cAAc,EAGvB,GACD,CAACC;QACC,MAAMF,SAASC,iBAAiBC,SAASA,KAAKF,MAAM;QAEpD,IAAI,CAACA,UAAUH,cAAcG,YAAY,WAAW;YAClD,OAAOA;QACT;QAEA,OAAOG,mBAAmB;YAAEH;QAAO;IACrC,EAAC;AAEH,MAAMG,qBAAqB,CAAC,EAAEH,MAAM,EAA0B;IAC5D,MAAMI,SAASC,kBAAkB;QAAEC,gBAAgB;YAAE,GAAGN,MAAM;QAAC;IAAE;IAEjE,IAAIO,eAAeH,OAAOI,QAAQ,GAAG;QACnCJ,OAAOI,QAAQ,GAAGH,kBAAkB;YAAEC,gBAAgB;gBAAE,GAAGF,OAAOI,QAAQ;YAAC;QAAE;IAC/E;IAEA,IAAID,eAAeH,OAAOK,QAAQ,GAAG;QACnCL,OAAOK,QAAQ,GAAGC,OAAOC,WAAW,CAClCD,OAAOE,OAAO,CAACR,OAAOK,QAAQ,EAAEI,GAAG,CAAC,CAAC,CAACC,MAAMC,QAAQ,GAAK;gBACvDD;gBACAP,eAAeQ,WAAWV,kBAAkB;oBAAEC,gBAAgB;wBAAE,GAAGS,OAAO;oBAAC;gBAAE,KAAKA;aACnF;IAEL;IAEA,OAAOX;AACT;AAEA,MAAMC,oBAAoB,CAAC,EAAEC,cAAc,EAAoC;IAC7E,IAAIA,eAAeU,GAAG,KAAK,MAAM;QAC/B,KAAK,MAAMC,aAAanB,mBAAoB;YAC1CQ,cAAc,CAACW,UAAU,GAAG;QAC9B;IACF;IAEA,OAAOX;AACT;AAEA,MAAMC,iBAAiB,CAACW,QACtB,OAAOA,UAAU,YAAYA,UAAU,QAAQ,CAACC,MAAMC,OAAO,CAACF"}

package/dist/utilities/resolveSignedURLKey.d.ts

@@ -1,4 +1,5 @@
 import type { PayloadRequest } from 'payload';
+import type { UploadReference } from '../types.js';
 type Args = {
     collectionPrefix?: string;
     collectionSlug: string;
@@ -8,17 +9,27 @@ type Args = {
     useCompositePrefixes?: boolean;
 };
 /**
- * Resolves the storage key for a clientUploads signed-URL request, deduping
+ * Resolves the storage key for an upload-instructions request, deduping
  * the filename via {@link getSafeFileName} so a duplicate upload does not
  * overwrite an existing blob.
  *
+ * A unique per-upload segment is included in the storage key so each issued
+ * key is distinct. The stored `filename` stays clean and the semantic `prefix`
+ * stays exactly what the collection configured — the per-upload entropy is
+ * persisted separately in `_objectKey`.
+ *
  * The resolved `sanitizedFilename` is returned so the browser-side handler
  * can update the form via `updateFilename`.
+ *
+ * The semantic prefix is resolved with {@link buildUploadPrefix} and the final
+ * key with {@link buildUploadStoragePathData}, so the receipt only ever signs a key
+ * beneath the configured collection prefix.
  */
 export declare function resolveSignedURLKey({ collectionPrefix, collectionSlug, docPrefix, filename, req, useCompositePrefixes, }: Args): Promise<{
-    fileKey: string;
     sanitizedDocPrefix: string;
     sanitizedFilename: string;
+    storageFilePath: string;
+    uploadReference: UploadReference;
 }>;
 export {};
 //# sourceMappingURL=resolveSignedURLKey.d.ts.map

package/dist/utilities/resolveSignedURLKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveSignedURLKey.d.ts","sourceRoot":"","sources":["../../src/utilities/resolveSignedURLKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAM7C,KAAK,IAAI,GAAG;IACV,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CAAC,EACxC,gBAAqB,EACrB,cAAc,EACd,SAAS,EACT,QAAQ,EACR,GAAG,EACH,oBAA4B,GAC7B,EAAE,IAAI;;;;GAgBN"}
+{"version":3,"file":"resolveSignedURLKey.d.ts","sourceRoot":"","sources":["../../src/utilities/resolveSignedURLKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAW7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,KAAK,IAAI,GAAG;IACV,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,mBAAmB,CAAC,EACxC,gBAAqB,EACrB,cAAc,EACd,SAAS,EACT,QAAQ,EACR,GAAG,EACH,oBAA4B,GAC7B,EAAE,IAAI,GAAG,OAAO,CAAC;IAChB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,iBAAiB,EAAE,MAAM,CAAA;IACzB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,eAAe,CAAA;CACjC,CAAC,CA6CD"}

package/dist/utilities/resolveSignedURLKey.js

@@ -1,29 +1,71 @@
-import { getSafeFileName } from 'payload/internal';
-import { getFileKey } from './getFileKey.js';
+import { randomUUID } from 'node:crypto';
+import { createClientUploadReceipt, getOriginalFilename, getSafeFileName, incrementName } from 'payload/internal';
+import { getSanitizedUploadFilename } from 'payload/shared';
+import { buildUploadPrefix, buildUploadStoragePathData } from './buildStoragePathData.js';
 /**
- * Resolves the storage key for a clientUploads signed-URL request, deduping
+ * Resolves the storage key for an upload-instructions request, deduping
  * the filename via {@link getSafeFileName} so a duplicate upload does not
  * overwrite an existing blob.
  *
+ * A unique per-upload segment is included in the storage key so each issued
+ * key is distinct. The stored `filename` stays clean and the semantic `prefix`
+ * stays exactly what the collection configured — the per-upload entropy is
+ * persisted separately in `_objectKey`.
+ *
  * The resolved `sanitizedFilename` is returned so the browser-side handler
  * can update the form via `updateFilename`.
+ *
+ * The semantic prefix is resolved with {@link buildUploadPrefix} and the final
+ * key with {@link buildUploadStoragePathData}, so the receipt only ever signs a key
+ * beneath the configured collection prefix.
  */ export async function resolveSignedURLKey({ collectionPrefix = '', collectionSlug, docPrefix, filename, req, useCompositePrefixes = false }) {
-    const sanitizedFilename = await getSafeFileName({
+    // The document stores the -original name, so check collisions against that name.
+    let sanitizedFilename = getSanitizedUploadFilename(filename);
+    let originalFilename = getOriginalFilename({
+        filename: sanitizedFilename
+    });
+    while(await getSafeFileName({
         collectionSlug,
-        desiredFilename: filename,
-        prefix: docPrefix,
+        desiredFilename: originalFilename,
         req
+    }) !== originalFilename){
+        sanitizedFilename = incrementName(sanitizedFilename);
+        originalFilename = getOriginalFilename({
+            filename: sanitizedFilename
+        });
+    }
+    const rawBaseDocPrefix = useCompositePrefixes ? docPrefix : docPrefix || collectionPrefix;
+    const { sanitizedDocPrefix } = buildUploadPrefix({
+        collectionPrefix,
+        docPrefix: rawBaseDocPrefix,
+        useCompositePrefixes
     });
-    const { fileKey, sanitizedDocPrefix } = getFileKey({
+    const _objectKey = randomUUID();
+    // Per-upload segment lives in the key; it is persisted in `_objectKey`, keeping `prefix` semantic.
+    const keyedDocPrefix = sanitizedDocPrefix ? `${sanitizedDocPrefix}/${_objectKey}` : _objectKey;
+    const { storageFilePath } = buildUploadStoragePathData({
         collectionPrefix,
-        docPrefix,
-        filename: sanitizedFilename,
+        docPrefix: keyedDocPrefix,
+        filename: originalFilename,
         useCompositePrefixes
     });
+    const uploadReference = {
+        _objectKey,
+        prefix: sanitizedDocPrefix,
+        signedReceipt: createClientUploadReceipt({
+            _objectKey,
+            collectionSlug,
+            filename: sanitizedFilename,
+            filePrefix: sanitizedDocPrefix,
+            req,
+            storageFilePath
+        })
+    };
     return {
-        fileKey,
         sanitizedDocPrefix,
-        sanitizedFilename
+        sanitizedFilename,
+        storageFilePath,
+        uploadReference
     };
 }
 

package/dist/utilities/resolveSignedURLKey.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/resolveSignedURLKey.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { getSafeFileName } from 'payload/internal'\n\nimport { getFileKey } from './getFileKey.js'\n\ntype Args = {\n  collectionPrefix?: string\n  collectionSlug: string\n  docPrefix?: string\n  filename: string\n  req: PayloadRequest\n  useCompositePrefixes?: boolean\n}\n\n/**\n * Resolves the storage key for a clientUploads signed-URL request, deduping\n * the filename via {@link getSafeFileName} so a duplicate upload does not\n * overwrite an existing blob.\n *\n * The resolved `sanitizedFilename` is returned so the browser-side handler\n * can update the form via `updateFilename`.\n */\nexport async function resolveSignedURLKey({\n  collectionPrefix = '',\n  collectionSlug,\n  docPrefix,\n  filename,\n  req,\n  useCompositePrefixes = false,\n}: Args) {\n  const sanitizedFilename = await getSafeFileName({\n    collectionSlug,\n    desiredFilename: filename,\n    prefix: docPrefix,\n    req,\n  })\n\n  const { fileKey, sanitizedDocPrefix } = getFileKey({\n    collectionPrefix,\n    docPrefix,\n    filename: sanitizedFilename,\n    useCompositePrefixes,\n  })\n\n  return { fileKey, sanitizedDocPrefix, sanitizedFilename }\n}\n"],"names":["getSafeFileName","getFileKey","resolveSignedURLKey","collectionPrefix","collectionSlug","docPrefix","filename","req","useCompositePrefixes","sanitizedFilename","desiredFilename","prefix","fileKey","sanitizedDocPrefix"],"mappings":"AAEA,SAASA,eAAe,QAAQ,mBAAkB;AAElD,SAASC,UAAU,QAAQ,kBAAiB;AAW5C;;;;;;;CAOC,GACD,OAAO,eAAeC,oBAAoB,EACxCC,mBAAmB,EAAE,EACrBC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,GAAG,EACHC,uBAAuB,KAAK,EACvB;IACL,MAAMC,oBAAoB,MAAMT,gBAAgB;QAC9CI;QACAM,iBAAiBJ;QACjBK,QAAQN;QACRE;IACF;IAEA,MAAM,EAAEK,OAAO,EAAEC,kBAAkB,EAAE,GAAGZ,WAAW;QACjDE;QACAE;QACAC,UAAUG;QACVD;IACF;IAEA,OAAO;QAAEI;QAASC;QAAoBJ;IAAkB;AAC1D"}
+{"version":3,"sources":["../../src/utilities/resolveSignedURLKey.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { randomUUID } from 'node:crypto'\nimport {\n  createClientUploadReceipt,\n  getOriginalFilename,\n  getSafeFileName,\n  incrementName,\n} from 'payload/internal'\nimport { getSanitizedUploadFilename } from 'payload/shared'\n\nimport type { UploadReference } from '../types.js'\n\nimport { buildUploadPrefix, buildUploadStoragePathData } from './buildStoragePathData.js'\n\ntype Args = {\n  collectionPrefix?: string\n  collectionSlug: string\n  docPrefix?: string\n  filename: string\n  req: PayloadRequest\n  useCompositePrefixes?: boolean\n}\n\n/**\n * Resolves the storage key for an upload-instructions request, deduping\n * the filename via {@link getSafeFileName} so a duplicate upload does not\n * overwrite an existing blob.\n *\n * A unique per-upload segment is included in the storage key so each issued\n * key is distinct. The stored `filename` stays clean and the semantic `prefix`\n * stays exactly what the collection configured — the per-upload entropy is\n * persisted separately in `_objectKey`.\n *\n * The resolved `sanitizedFilename` is returned so the browser-side handler\n * can update the form via `updateFilename`.\n *\n * The semantic prefix is resolved with {@link buildUploadPrefix} and the final\n * key with {@link buildUploadStoragePathData}, so the receipt only ever signs a key\n * beneath the configured collection prefix.\n */\nexport async function resolveSignedURLKey({\n  collectionPrefix = '',\n  collectionSlug,\n  docPrefix,\n  filename,\n  req,\n  useCompositePrefixes = false,\n}: Args): Promise<{\n  sanitizedDocPrefix: string\n  sanitizedFilename: string\n  storageFilePath: string\n  uploadReference: UploadReference\n}> {\n  // The document stores the -original name, so check collisions against that name.\n  let sanitizedFilename = getSanitizedUploadFilename(filename)\n  let originalFilename = getOriginalFilename({ filename: sanitizedFilename })\n\n  while (\n    (await getSafeFileName({ collectionSlug, desiredFilename: originalFilename, req })) !==\n    originalFilename\n  ) {\n    sanitizedFilename = incrementName(sanitizedFilename)\n    originalFilename = getOriginalFilename({ filename: sanitizedFilename })\n  }\n\n  const rawBaseDocPrefix = useCompositePrefixes ? docPrefix : docPrefix || collectionPrefix\n  const { sanitizedDocPrefix } = buildUploadPrefix({\n    collectionPrefix,\n    docPrefix: rawBaseDocPrefix,\n    useCompositePrefixes,\n  })\n\n  const _objectKey = randomUUID()\n  // Per-upload segment lives in the key; it is persisted in `_objectKey`, keeping `prefix` semantic.\n  const keyedDocPrefix = sanitizedDocPrefix ? `${sanitizedDocPrefix}/${_objectKey}` : _objectKey\n\n  const { storageFilePath } = buildUploadStoragePathData({\n    collectionPrefix,\n    docPrefix: keyedDocPrefix,\n    filename: originalFilename,\n    useCompositePrefixes,\n  })\n\n  const uploadReference = {\n    _objectKey,\n    prefix: sanitizedDocPrefix,\n    signedReceipt: createClientUploadReceipt({\n      _objectKey,\n      collectionSlug,\n      filename: sanitizedFilename,\n      filePrefix: sanitizedDocPrefix,\n      req,\n      storageFilePath,\n    }),\n  }\n\n  return { sanitizedDocPrefix, sanitizedFilename, storageFilePath, uploadReference }\n}\n"],"names":["randomUUID","createClientUploadReceipt","getOriginalFilename","getSafeFileName","incrementName","getSanitizedUploadFilename","buildUploadPrefix","buildUploadStoragePathData","resolveSignedURLKey","collectionPrefix","collectionSlug","docPrefix","filename","req","useCompositePrefixes","sanitizedFilename","originalFilename","desiredFilename","rawBaseDocPrefix","sanitizedDocPrefix","_objectKey","keyedDocPrefix","storageFilePath","uploadReference","prefix","signedReceipt","filePrefix"],"mappings":"AAEA,SAASA,UAAU,QAAQ,cAAa;AACxC,SACEC,yBAAyB,EACzBC,mBAAmB,EACnBC,eAAe,EACfC,aAAa,QACR,mBAAkB;AACzB,SAASC,0BAA0B,QAAQ,iBAAgB;AAI3D,SAASC,iBAAiB,EAAEC,0BAA0B,QAAQ,4BAA2B;AAWzF;;;;;;;;;;;;;;;;CAgBC,GACD,OAAO,eAAeC,oBAAoB,EACxCC,mBAAmB,EAAE,EACrBC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,GAAG,EACHC,uBAAuB,KAAK,EACvB;IAML,iFAAiF;IACjF,IAAIC,oBAAoBV,2BAA2BO;IACnD,IAAII,mBAAmBd,oBAAoB;QAAEU,UAAUG;IAAkB;IAEzE,MACE,AAAC,MAAMZ,gBAAgB;QAAEO;QAAgBO,iBAAiBD;QAAkBH;IAAI,OAChFG,iBACA;QACAD,oBAAoBX,cAAcW;QAClCC,mBAAmBd,oBAAoB;YAAEU,UAAUG;QAAkB;IACvE;IAEA,MAAMG,mBAAmBJ,uBAAuBH,YAAYA,aAAaF;IACzE,MAAM,EAAEU,kBAAkB,EAAE,GAAGb,kBAAkB;QAC/CG;QACAE,WAAWO;QACXJ;IACF;IAEA,MAAMM,aAAapB;IACnB,mGAAmG;IACnG,MAAMqB,iBAAiBF,qBAAqB,GAAGA,mBAAmB,CAAC,EAAEC,YAAY,GAAGA;IAEpF,MAAM,EAAEE,eAAe,EAAE,GAAGf,2BAA2B;QACrDE;QACAE,WAAWU;QACXT,UAAUI;QACVF;IACF;IAEA,MAAMS,kBAAkB;QACtBH;QACAI,QAAQL;QACRM,eAAexB,0BAA0B;YACvCmB;YACAV;YACAE,UAAUG;YACVW,YAAYP;YACZN;YACAS;QACF;IACF;IAEA,OAAO;QAAEH;QAAoBJ;QAAmBO;QAAiBC;IAAgB;AACnF"}

package/dist/utilities/sanitizePrefix.d.ts

@@ -1,10 +1,2 @@
-/**
- * Normalizes a storage prefix for use in object keys and URLs.
- *
- * Decodes URI components once (so query-style `%2F` becomes `/`), rejects
- * values that still contain percent-encodings after decoding (e.g. `%252f`),
- * then normalizes slashes, drops `.` / `..` segments, strips leading slashes,
- * and removes control characters.
- */
-export declare function sanitizePrefix(prefix: string): string;
+export { sanitizeUploadPrefix as sanitizePrefix } from 'payload/shared';
 //# sourceMappingURL=sanitizePrefix.d.ts.map

package/dist/utilities/sanitizePrefix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitizePrefix.d.ts","sourceRoot":"","sources":["../../src/utilities/sanitizePrefix.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwBrD"}
+{"version":3,"file":"sanitizePrefix.d.ts","sourceRoot":"","sources":["../../src/utilities/sanitizePrefix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,IAAI,cAAc,EAAE,MAAM,gBAAgB,CAAA"}

package/dist/utilities/sanitizePrefix.js

@@ -1,23 +1,3 @@
-/**
- * Normalizes a storage prefix for use in object keys and URLs.
- *
- * Decodes URI components once (so query-style `%2F` becomes `/`), rejects
- * values that still contain percent-encodings after decoding (e.g. `%252f`),
- * then normalizes slashes, drops `.` / `..` segments, strips leading slashes,
- * and removes control characters.
- */ export function sanitizePrefix(prefix) {
-    let decodedPrefix;
-    try {
-        decodedPrefix = decodeURIComponent(prefix);
-    } catch  {
-        return '';
-    }
-    // Reject multi-encoded values (e.g. `%252f`) by allowing only a single decode pass.
-    if (/%[0-9a-f]{2}/i.test(decodedPrefix)) {
-        return '';
-    }
-    return decodedPrefix.replace(/\\/g, '/').split('/').filter((segment)=>segment !== '..' && segment !== '.').join('/').replace(/^\/+/, '')// eslint-disable-next-line no-control-regex
-    .replace(/[\x00-\x1f\x80-\x9f]/g, '');
-}
+export { sanitizeUploadPrefix as sanitizePrefix } from 'payload/shared';
 
 //# sourceMappingURL=sanitizePrefix.js.map

package/dist/utilities/sanitizePrefix.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/sanitizePrefix.ts"],"sourcesContent":["/**\n * Normalizes a storage prefix for use in object keys and URLs.\n *\n * Decodes URI components once (so query-style `%2F` becomes `/`), rejects\n * values that still contain percent-encodings after decoding (e.g. `%252f`),\n * then normalizes slashes, drops `.` / `..` segments, strips leading slashes,\n * and removes control characters.\n */\nexport function sanitizePrefix(prefix: string): string {\n  let decodedPrefix: string\n\n  try {\n    decodedPrefix = decodeURIComponent(prefix)\n  } catch {\n    return ''\n  }\n\n  // Reject multi-encoded values (e.g. `%252f`) by allowing only a single decode pass.\n  if (/%[0-9a-f]{2}/i.test(decodedPrefix)) {\n    return ''\n  }\n\n  return (\n    decodedPrefix\n      .replace(/\\\\/g, '/')\n      .split('/')\n      .filter((segment) => segment !== '..' && segment !== '.')\n      .join('/')\n      .replace(/^\\/+/, '')\n      // eslint-disable-next-line no-control-regex\n      .replace(/[\\x00-\\x1f\\x80-\\x9f]/g, '')\n  )\n}\n"],"names":["sanitizePrefix","prefix","decodedPrefix","decodeURIComponent","test","replace","split","filter","segment","join"],"mappings":"AAAA;;;;;;;CAOC,GACD,OAAO,SAASA,eAAeC,MAAc;IAC3C,IAAIC;IAEJ,IAAI;QACFA,gBAAgBC,mBAAmBF;IACrC,EAAE,OAAM;QACN,OAAO;IACT;IAEA,oFAAoF;IACpF,IAAI,gBAAgBG,IAAI,CAACF,gBAAgB;QACvC,OAAO;IACT;IAEA,OACEA,cACGG,OAAO,CAAC,OAAO,KACfC,KAAK,CAAC,KACNC,MAAM,CAAC,CAACC,UAAYA,YAAY,QAAQA,YAAY,KACpDC,IAAI,CAAC,KACLJ,OAAO,CAAC,QAAQ,GACjB,4CAA4C;KAC3CA,OAAO,CAAC,yBAAyB;AAExC"}
+{"version":3,"sources":["../../src/utilities/sanitizePrefix.ts"],"sourcesContent":["export { sanitizeUploadPrefix as sanitizePrefix } from 'payload/shared'\n"],"names":["sanitizeUploadPrefix","sanitizePrefix"],"mappings":"AAAA,SAASA,wBAAwBC,cAAc,QAAQ,iBAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-cloud-storage",
-  "version": "4.0.0-internal.e55ccef",
+  "version": "4.0.0-internal.ea6e8f8",
   "description": "The official cloud storage plugin for Payload CMS",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -51,18 +51,18 @@
   "dependencies": {
     "find-node-modules": "^2.1.3",
     "range-parser": "^1.2.1",
-    "@payloadcms/ui": "4.0.0-internal.e55ccef"
+    "@payloadcms/ui": "4.0.0-internal.ea6e8f8"
   },
   "devDependencies": {
     "@types/find-node-modules": "^2.1.2",
-    "@types/react": "19.2.14",
-    "@types/react-dom": "19.2.3",
-    "payload": "4.0.0-internal.e55ccef"
+    "@types/react": "19.3.0",
+    "@types/react-dom": "19.3.0",
+    "payload": "4.0.0-internal.ea6e8f8"
   },
   "peerDependencies": {
     "react": "^19.0.1 || ^19.1.2 || ^19.2.1",
     "react-dom": "^19.0.1 || ^19.1.2 || ^19.2.1",
-    "payload": "4.0.0-internal.e55ccef"
+    "payload": "4.0.0-internal.ea6e8f8"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/dist/admin/fields/getFields.d.ts

@@ -1,17 +0,0 @@
-import type { CollectionConfig, Field } from 'payload';
-interface Args {
-    /**
-     * When true, always insert the prefix field regardless of whether a prefix is configured.
-     */
-    alwaysInsertFields?: boolean;
-    collection: CollectionConfig;
-    prefix?: string;
-    /**
-     * When true, do not default the `prefix` field to the collection prefix; the
-     * document field holds only the document-level segment.
-     */
-    useCompositePrefixes?: boolean;
-}
-export declare const getFields: ({ alwaysInsertFields, collection, prefix, useCompositePrefixes, }: Args) => Field[];
-export {};
-//# sourceMappingURL=getFields.d.ts.map

package/dist/admin/fields/getFields.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getFields.d.ts","sourceRoot":"","sources":["../../../src/admin/fields/getFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAyB,MAAM,SAAS,CAAA;AAI7E,UAAU,IAAI;IACZ;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,SAAS,sEAKnB,IAAI,KAAG,KAAK,EAsHd,CAAA"}