@payloadcms/plugin-cloud-storage 4.0.0-beta.5 → 4.0.0-beta.7

package/dist/hooks/afterDelete.js

@@ -41,7 +41,7 @@ export const getAfterDeleteHook = ({ adapter, collection, collectionPrefix, useC
         } catch (err) {
             req.payload.logger.error({
                 err,
-                msg: `There was an error while deleting files corresponding to the ${collection.labels?.singular} with ID ${doc.id}.`
+                msg: `There was an error while deleting files corresponding to the ${typeof collection.labels?.singular === 'string' ? collection.labels.singular : collection.slug} with ID ${doc.id}.`
             });
         }
         return doc;

package/dist/hooks/afterDelete.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/afterDelete.ts"],"sourcesContent":["import type { CollectionAfterDeleteHook, CollectionConfig, FileData, TypeWithID } from 'payload'\n\nimport type { GeneratedAdapter, TypeWithPrefix } from '../types.js'\n\nimport { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js'\nimport { buildStoragePathData } from '../utilities/buildStoragePathData.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  collectionPrefix?: string\n  useCompositePrefixes?: boolean\n}\n\nexport const getAfterDeleteHook = ({\n  adapter,\n  collection,\n  collectionPrefix,\n  useCompositePrefixes,\n}: Args): CollectionAfterDeleteHook<FileData & TypeWithID & TypeWithPrefix> => {\n  return async ({ id, doc, req }) => {\n    // Managed objects are deleted after the operation commits and all references are checked.\n    const managedDeletedUploads = req.context?._payloadManagedDeletedUploads as\n      | Set<string>\n      | undefined\n    if (\n      collection.versions ||\n      (Boolean(doc.original) && typeof doc.original?.filename === 'string') ||\n      managedDeletedUploads?.has(JSON.stringify([collection.slug, String(id)]))\n    ) {\n      return doc\n    }\n\n    try {\n      // Fold `_objectKey` so deletes target the real object folder.\n      const docPrefix = buildPrefixWithObjectKey({\n        objectKey: (doc as { _objectKey?: string })._objectKey,\n        prefix: doc.prefix,\n      })\n\n      const filesToDelete: string[] = [\n        doc.filename,\n        ...Object.values(doc?.variants || []).map(\n          (resizedFileData) => resizedFileData?.filename as string,\n        ),\n      ]\n\n      const promises = filesToDelete.map(async (filename) => {\n        if (filename) {\n          const { storageFilePath } = buildStoragePathData({\n            collectionPrefix,\n            docPrefix,\n            filename,\n            useCompositePrefixes,\n          })\n          await adapter.handleDelete({ collection, doc, filename, req, storageFilePath })\n        }\n      })\n\n      await Promise.all(promises)\n    } catch (err: unknown) {\n      req.payload.logger.error({\n        err,\n        msg: `There was an error while deleting files corresponding to the ${collection.labels?.singular} with ID ${doc.id}.`,\n      })\n    }\n    return doc\n  }\n}\n"],"names":["buildPrefixWithObjectKey","buildStoragePathData","getAfterDeleteHook","adapter","collection","collectionPrefix","useCompositePrefixes","id","doc","req","managedDeletedUploads","context","_payloadManagedDeletedUploads","versions","Boolean","original","filename","has","JSON","stringify","slug","String","docPrefix","objectKey","_objectKey","prefix","filesToDelete","Object","values","variants","map","resizedFileData","promises","storageFilePath","handleDelete","Promise","all","err","payload","logger","error","msg","labels","singular"],"mappings":"AAIA,SAASA,wBAAwB,QAAQ,2CAA0C;AACnF,SAASC,oBAAoB,QAAQ,uCAAsC;AAS3E,OAAO,MAAMC,qBAAqB,CAAC,EACjCC,OAAO,EACPC,UAAU,EACVC,gBAAgB,EAChBC,oBAAoB,EACf;IACL,OAAO,OAAO,EAAEC,EAAE,EAAEC,GAAG,EAAEC,GAAG,EAAE;QAC5B,0FAA0F;QAC1F,MAAMC,wBAAwBD,IAAIE,OAAO,EAAEC;QAG3C,IACER,WAAWS,QAAQ,IAClBC,QAAQN,IAAIO,QAAQ,KAAK,OAAOP,IAAIO,QAAQ,EAAEC,aAAa,YAC5DN,uBAAuBO,IAAIC,KAAKC,SAAS,CAAC;YAACf,WAAWgB,IAAI;YAAEC,OAAOd;SAAI,IACvE;YACA,OAAOC;QACT;QAEA,IAAI;YACF,8DAA8D;YAC9D,MAAMc,YAAYtB,yBAAyB;gBACzCuB,WAAW,AAACf,IAAgCgB,UAAU;gBACtDC,QAAQjB,IAAIiB,MAAM;YACpB;YAEA,MAAMC,gBAA0B;gBAC9BlB,IAAIQ,QAAQ;mBACTW,OAAOC,MAAM,CAACpB,KAAKqB,YAAY,EAAE,EAAEC,GAAG,CACvC,CAACC,kBAAoBA,iBAAiBf;aAEzC;YAED,MAAMgB,WAAWN,cAAcI,GAAG,CAAC,OAAOd;gBACxC,IAAIA,UAAU;oBACZ,MAAM,EAAEiB,eAAe,EAAE,GAAGhC,qBAAqB;wBAC/CI;wBACAiB;wBACAN;wBACAV;oBACF;oBACA,MAAMH,QAAQ+B,YAAY,CAAC;wBAAE9B;wBAAYI;wBAAKQ;wBAAUP;wBAAKwB;oBAAgB;gBAC/E;YACF;YAEA,MAAME,QAAQC,GAAG,CAACJ;QACpB,EAAE,OAAOK,KAAc;YACrB5B,IAAI6B,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBACvBH;gBACAI,KAAK,CAAC,6DAA6D,EAAErC,WAAWsC,MAAM,EAAEC,SAAS,SAAS,EAAEnC,IAAID,EAAE,CAAC,CAAC,CAAC;YACvH;QACF;QACA,OAAOC;IACT;AACF,EAAC"}
+{"version":3,"sources":["../../src/hooks/afterDelete.ts"],"sourcesContent":["import type { CollectionAfterDeleteHook, CollectionConfig, FileData, TypeWithID } from 'payload'\n\nimport type { GeneratedAdapter, TypeWithPrefix } from '../types.js'\n\nimport { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js'\nimport { buildStoragePathData } from '../utilities/buildStoragePathData.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  collectionPrefix?: string\n  useCompositePrefixes?: boolean\n}\n\nexport const getAfterDeleteHook = ({\n  adapter,\n  collection,\n  collectionPrefix,\n  useCompositePrefixes,\n}: Args): CollectionAfterDeleteHook<FileData & TypeWithID & TypeWithPrefix> => {\n  return async ({ id, doc, req }) => {\n    // Managed objects are deleted after the operation commits and all references are checked.\n    const managedDeletedUploads = req.context?._payloadManagedDeletedUploads as\n      | Set<string>\n      | undefined\n    if (\n      collection.versions ||\n      (Boolean(doc.original) && typeof doc.original?.filename === 'string') ||\n      managedDeletedUploads?.has(JSON.stringify([collection.slug, String(id)]))\n    ) {\n      return doc\n    }\n\n    try {\n      // Fold `_objectKey` so deletes target the real object folder.\n      const docPrefix = buildPrefixWithObjectKey({\n        objectKey: (doc as { _objectKey?: string })._objectKey,\n        prefix: doc.prefix,\n      })\n\n      const filesToDelete: string[] = [\n        doc.filename,\n        ...Object.values(doc?.variants || []).map(\n          (resizedFileData) => resizedFileData?.filename as string,\n        ),\n      ]\n\n      const promises = filesToDelete.map(async (filename) => {\n        if (filename) {\n          const { storageFilePath } = buildStoragePathData({\n            collectionPrefix,\n            docPrefix,\n            filename,\n            useCompositePrefixes,\n          })\n          await adapter.handleDelete({ collection, doc, filename, req, storageFilePath })\n        }\n      })\n\n      await Promise.all(promises)\n    } catch (err: unknown) {\n      req.payload.logger.error({\n        err,\n        msg: `There was an error while deleting files corresponding to the ${typeof collection.labels?.singular === 'string' ? collection.labels.singular : collection.slug} with ID ${doc.id}.`,\n      })\n    }\n    return doc\n  }\n}\n"],"names":["buildPrefixWithObjectKey","buildStoragePathData","getAfterDeleteHook","adapter","collection","collectionPrefix","useCompositePrefixes","id","doc","req","managedDeletedUploads","context","_payloadManagedDeletedUploads","versions","Boolean","original","filename","has","JSON","stringify","slug","String","docPrefix","objectKey","_objectKey","prefix","filesToDelete","Object","values","variants","map","resizedFileData","promises","storageFilePath","handleDelete","Promise","all","err","payload","logger","error","msg","labels","singular"],"mappings":"AAIA,SAASA,wBAAwB,QAAQ,2CAA0C;AACnF,SAASC,oBAAoB,QAAQ,uCAAsC;AAS3E,OAAO,MAAMC,qBAAqB,CAAC,EACjCC,OAAO,EACPC,UAAU,EACVC,gBAAgB,EAChBC,oBAAoB,EACf;IACL,OAAO,OAAO,EAAEC,EAAE,EAAEC,GAAG,EAAEC,GAAG,EAAE;QAC5B,0FAA0F;QAC1F,MAAMC,wBAAwBD,IAAIE,OAAO,EAAEC;QAG3C,IACER,WAAWS,QAAQ,IAClBC,QAAQN,IAAIO,QAAQ,KAAK,OAAOP,IAAIO,QAAQ,EAAEC,aAAa,YAC5DN,uBAAuBO,IAAIC,KAAKC,SAAS,CAAC;YAACf,WAAWgB,IAAI;YAAEC,OAAOd;SAAI,IACvE;YACA,OAAOC;QACT;QAEA,IAAI;YACF,8DAA8D;YAC9D,MAAMc,YAAYtB,yBAAyB;gBACzCuB,WAAW,AAACf,IAAgCgB,UAAU;gBACtDC,QAAQjB,IAAIiB,MAAM;YACpB;YAEA,MAAMC,gBAA0B;gBAC9BlB,IAAIQ,QAAQ;mBACTW,OAAOC,MAAM,CAACpB,KAAKqB,YAAY,EAAE,EAAEC,GAAG,CACvC,CAACC,kBAAoBA,iBAAiBf;aAEzC;YAED,MAAMgB,WAAWN,cAAcI,GAAG,CAAC,OAAOd;gBACxC,IAAIA,UAAU;oBACZ,MAAM,EAAEiB,eAAe,EAAE,GAAGhC,qBAAqB;wBAC/CI;wBACAiB;wBACAN;wBACAV;oBACF;oBACA,MAAMH,QAAQ+B,YAAY,CAAC;wBAAE9B;wBAAYI;wBAAKQ;wBAAUP;wBAAKwB;oBAAgB;gBAC/E;YACF;YAEA,MAAME,QAAQC,GAAG,CAACJ;QACpB,EAAE,OAAOK,KAAc;YACrB5B,IAAI6B,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBACvBH;gBACAI,KAAK,CAAC,6DAA6D,EAAE,OAAOrC,WAAWsC,MAAM,EAAEC,aAAa,WAAWvC,WAAWsC,MAAM,CAACC,QAAQ,GAAGvC,WAAWgB,IAAI,CAAC,SAAS,EAAEZ,IAAID,EAAE,CAAC,CAAC,CAAC;YAC1L;QACF;QACA,OAAOC;IACT;AACF,EAAC"}

package/dist/types.d.ts

@@ -77,6 +77,8 @@ export type StaticHandler = (req: PayloadRequest, args: {
     params: {
         collection: string;
         filename: string;
+        /** True when the request asks for the original with `?original=true`. */
+        isOriginal?: boolean;
         operation?: FileHandlerOperation;
         prefix?: string;
         uploadReference?: unknown;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types.ts"],"sourcesContent":["import type {\n  CollectionConfig,\n  Field,\n  FileData,\n  FileHandlerOperation,\n  ImageSize,\n  PayloadHandler,\n  PayloadRequest,\n  SanitizedCollectionConfig,\n  TypeWithID,\n  UploadCollectionSlug,\n  UploadInstructionsAccess,\n  UploadInstructionsCapability,\n} from 'payload'\n\nexport type { FileHandlerOperation } from 'payload'\n\nexport interface File {\n  buffer: Buffer\n  filename: string\n  filesize: number\n  mimeType: string\n  tempFilePath?: string\n  uploadReference?: unknown\n}\n\nexport type ClientUploadsConfig = { access?: UploadInstructionsAccess } | boolean\n\n/**\n * Reference to a client-uploaded object, returned by an upload handler and\n * submitted with the document. Always carries the signed receipt; `prefix`\n * locates the stored object.\n */\nexport type UploadReference = {\n  _objectKey?: string\n  /** Data the adapter signed into the receipt with `resolveSignedURLKey`. Not stored on the document. */\n  adapterData?: Record<string, unknown>\n  /** Fields the client added to `uploadReference`. Not verified; check them before use. */\n  clientData?: Record<string, unknown>\n  prefix: string\n  signedReceipt: `${string}.${string}`\n}\n\nexport type HandleUpload = (args: {\n  collection: CollectionConfig\n  data: any\n  file: File\n  req: PayloadRequest\n  /**\n   * Pre-resolved storage path (`_objectKey` folded in, contained beneath the collection prefix).\n   */\n  storageFilePath: string\n}) =>\n  | Partial<FileData & TypeWithID>\n  | Promise<Partial<FileData & TypeWithID>>\n  | Promise<void>\n  | void\n\nexport interface TypeWithPrefix {\n  prefix?: string\n}\n\nexport type HandleDelete = (args: {\n  collection: CollectionConfig\n  doc: FileData & TypeWithID & TypeWithPrefix\n  filename: string\n  req: PayloadRequest\n  /**\n   * Pre-resolved storage path of the object to delete.\n   */\n  storageFilePath: string\n}) => Promise<void> | void\n\n/** Deletes a stored object without requiring a saved document. */\nexport type DeleteFile = (args: {\n  collection: CollectionConfig\n  req: PayloadRequest\n  /** Complete storage path, with prefixes and `_objectKey` already resolved. */\n  storageFilePath: string\n}) => Promise<void> | void\n\n/** Complete storage keys are resolved before invoking a provider operation. */\nexport type FileOperationArgs = {\n  collection: SanitizedCollectionConfig\n  from: string\n  mimeType?: string\n  req: PayloadRequest\n  to: string\n}\n\nexport type CopyFile = (args: FileOperationArgs) => Promise<void>\nexport type MoveFile = (args: FileOperationArgs) => Promise<void>\n\nexport type GenerateURL = (args: {\n  collection: CollectionConfig\n  data: any\n  filename: string\n  prefix?: string\n}) => Promise<string> | string\n\nexport type StaticHandler = (\n  req: PayloadRequest,\n  args: {\n    doc?: TypeWithID\n    headers?: Headers\n    params: {\n      collection: string\n      filename: string\n      operation?: FileHandlerOperation\n      prefix?: string\n      uploadReference?: unknown\n    }\n  },\n) => Promise<Response> | Response\n\nexport interface GeneratedAdapter {\n  /** Preserve object metadata and fail if `to` already exists. Rename retains `from` for history. */\n  copyFile: CopyFile\n  deleteFile: DeleteFile\n  /**\n   * Additional fields to be injected into the base collection and image sizes\n   */\n  fields?: Field[]\n  /**\n   * Generates the public URL for a file\n   */\n  generateURL?: GenerateURL\n  handleDelete: HandleDelete\n  handleUpload: HandleUpload\n  moveFile?: MoveFile\n  name: string\n  onInit?: () => Promise<void> | void\n  staticHandler: StaticHandler\n  /** Reads source files by path when staging server-mediated uploads. */\n  supportsTempFiles?: boolean\n  /** Generates upload instructions when supported. */\n  uploadInstructions?: {\n    adminHandler?: {\n      path: string\n      props?: Record<string, unknown>\n    }\n    enabled: boolean\n    endpoint?: {\n      handler: PayloadHandler\n      path: `/${string}`\n    }\n  } & UploadInstructionsCapability\n}\n\nexport type Adapter = (args: { collection: CollectionConfig; prefix?: string }) => GeneratedAdapter\n\nexport type AllowList = Array<{\n  hostname: string\n  pathname?: string\n  port?: string\n  protocol?: 'http' | 'https'\n  search?: string\n}>\n\nexport type GenerateFileURL = (args: {\n  collection: CollectionConfig\n  filename: string\n  prefix?: string\n  size?: ImageSize\n}) => Promise<string> | string\n\nexport interface CollectionOptions {\n  adapter: Adapter | null\n  disableLocalStorage?: boolean\n  disablePayloadAccessControl?: true\n  generateFileURL?: GenerateFileURL\n  prefix?: string\n}\n\nexport interface PluginOptions {\n  collections: Partial<Record<UploadCollectionSlug, CollectionOptions>>\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * When true (compositional prefixes), the stored `prefix` field is only the\n   * document-level segment; the collection prefix comes from plugin options and\n   * must not be pre-filled as the field default.\n   *\n   * Set by storage adapters that support compositional prefixes (e.g. S3, Azure, R2, Vercel Blob, GCS).\n   *\n   * @default false\n   */\n  useCompositePrefixes?: boolean\n}\n"],"names":[],"mappings":"AA8KA,WAkBC"}
+{"version":3,"sources":["../src/types.ts"],"sourcesContent":["import type {\n  CollectionConfig,\n  Field,\n  FileData,\n  FileHandlerOperation,\n  ImageSize,\n  PayloadHandler,\n  PayloadRequest,\n  SanitizedCollectionConfig,\n  TypeWithID,\n  UploadCollectionSlug,\n  UploadInstructionsAccess,\n  UploadInstructionsCapability,\n} from 'payload'\n\nexport type { FileHandlerOperation } from 'payload'\n\nexport interface File {\n  buffer: Buffer\n  filename: string\n  filesize: number\n  mimeType: string\n  tempFilePath?: string\n  uploadReference?: unknown\n}\n\nexport type ClientUploadsConfig = { access?: UploadInstructionsAccess } | boolean\n\n/**\n * Reference to a client-uploaded object, returned by an upload handler and\n * submitted with the document. Always carries the signed receipt; `prefix`\n * locates the stored object.\n */\nexport type UploadReference = {\n  _objectKey?: string\n  /** Data the adapter signed into the receipt with `resolveSignedURLKey`. Not stored on the document. */\n  adapterData?: Record<string, unknown>\n  /** Fields the client added to `uploadReference`. Not verified; check them before use. */\n  clientData?: Record<string, unknown>\n  prefix: string\n  signedReceipt: `${string}.${string}`\n}\n\nexport type HandleUpload = (args: {\n  collection: CollectionConfig\n  data: any\n  file: File\n  req: PayloadRequest\n  /**\n   * Pre-resolved storage path (`_objectKey` folded in, contained beneath the collection prefix).\n   */\n  storageFilePath: string\n}) =>\n  | Partial<FileData & TypeWithID>\n  | Promise<Partial<FileData & TypeWithID>>\n  | Promise<void>\n  | void\n\nexport interface TypeWithPrefix {\n  prefix?: string\n}\n\nexport type HandleDelete = (args: {\n  collection: CollectionConfig\n  doc: FileData & TypeWithID & TypeWithPrefix\n  filename: string\n  req: PayloadRequest\n  /**\n   * Pre-resolved storage path of the object to delete.\n   */\n  storageFilePath: string\n}) => Promise<void> | void\n\n/** Deletes a stored object without requiring a saved document. */\nexport type DeleteFile = (args: {\n  collection: CollectionConfig\n  req: PayloadRequest\n  /** Complete storage path, with prefixes and `_objectKey` already resolved. */\n  storageFilePath: string\n}) => Promise<void> | void\n\n/** Complete storage keys are resolved before invoking a provider operation. */\nexport type FileOperationArgs = {\n  collection: SanitizedCollectionConfig\n  from: string\n  mimeType?: string\n  req: PayloadRequest\n  to: string\n}\n\nexport type CopyFile = (args: FileOperationArgs) => Promise<void>\nexport type MoveFile = (args: FileOperationArgs) => Promise<void>\n\nexport type GenerateURL = (args: {\n  collection: CollectionConfig\n  data: any\n  filename: string\n  prefix?: string\n}) => Promise<string> | string\n\nexport type StaticHandler = (\n  req: PayloadRequest,\n  args: {\n    doc?: TypeWithID\n    headers?: Headers\n    params: {\n      collection: string\n      filename: string\n      /** True when the request asks for the original with `?original=true`. */\n      isOriginal?: boolean\n      operation?: FileHandlerOperation\n      prefix?: string\n      uploadReference?: unknown\n    }\n  },\n) => Promise<Response> | Response\n\nexport interface GeneratedAdapter {\n  /** Preserve object metadata and fail if `to` already exists. Rename retains `from` for history. */\n  copyFile: CopyFile\n  deleteFile: DeleteFile\n  /**\n   * Additional fields to be injected into the base collection and image sizes\n   */\n  fields?: Field[]\n  /**\n   * Generates the public URL for a file\n   */\n  generateURL?: GenerateURL\n  handleDelete: HandleDelete\n  handleUpload: HandleUpload\n  moveFile?: MoveFile\n  name: string\n  onInit?: () => Promise<void> | void\n  staticHandler: StaticHandler\n  /** Reads source files by path when staging server-mediated uploads. */\n  supportsTempFiles?: boolean\n  /** Generates upload instructions when supported. */\n  uploadInstructions?: {\n    adminHandler?: {\n      path: string\n      props?: Record<string, unknown>\n    }\n    enabled: boolean\n    endpoint?: {\n      handler: PayloadHandler\n      path: `/${string}`\n    }\n  } & UploadInstructionsCapability\n}\n\nexport type Adapter = (args: { collection: CollectionConfig; prefix?: string }) => GeneratedAdapter\n\nexport type AllowList = Array<{\n  hostname: string\n  pathname?: string\n  port?: string\n  protocol?: 'http' | 'https'\n  search?: string\n}>\n\nexport type GenerateFileURL = (args: {\n  collection: CollectionConfig\n  filename: string\n  prefix?: string\n  size?: ImageSize\n}) => Promise<string> | string\n\nexport interface CollectionOptions {\n  adapter: Adapter | null\n  disableLocalStorage?: boolean\n  disablePayloadAccessControl?: true\n  generateFileURL?: GenerateFileURL\n  prefix?: string\n}\n\nexport interface PluginOptions {\n  collections: Partial<Record<UploadCollectionSlug, CollectionOptions>>\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * When true (compositional prefixes), the stored `prefix` field is only the\n   * document-level segment; the collection prefix comes from plugin options and\n   * must not be pre-filled as the field default.\n   *\n   * Set by storage adapters that support compositional prefixes (e.g. S3, Azure, R2, Vercel Blob, GCS).\n   *\n   * @default false\n   */\n  useCompositePrefixes?: boolean\n}\n"],"names":[],"mappings":"AAgLA,WAkBC"}

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

@@ -1 +1 @@
-{"version":3,"file":"createFileOperations.d.ts","sourceRoot":"","sources":["../../src/utilities/createFileOperations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAyB,YAAY,EAAE,MAAM,SAAS,CAAA;AAOpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AASpE,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,gBAAgB,CAAA;IACzB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED,eAAO,MAAM,oBAAoB,mHAO9B,IAAI,KAAG,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC,CA+OnD,CAAA"}
+{"version":3,"file":"createFileOperations.d.ts","sourceRoot":"","sources":["../../src/utilities/createFileOperations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAqC,YAAY,EAAE,MAAM,SAAS,CAAA;AAOhG,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AASpE,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,gBAAgB,CAAA;IACzB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED,eAAO,MAAM,oBAAoB,mHAO9B,IAAI,KAAG,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAmOnD,CAAA"}

package/dist/utilities/createFileOperations.js

@@ -122,21 +122,16 @@ export const createFileOperations = ({ adapter, collection, collectionPrefix, di
             }
         },
         stage: async ({ data, files, req, trackStagedObject })=>{
-            const uploadedNames = new Set();
+            const uploadedKeys = new Set();
             const metadata = {};
             const verifiedOriginal = req.context?._payloadVerifiedProviderOriginal;
             for (const file of files){
                 const filename = path.basename(file.path);
-                const representations = [
-                    data
-                ];
-                if (data.original && typeof data.original === 'object') {
-                    representations.push(data.original);
-                }
-                if (data.variants && typeof data.variants === 'object') {
-                    representations.push(...Object.values(data.variants).filter((value)=>Boolean(value) && typeof value === 'object'));
-                }
-                const destinations = representations.filter((value)=>value.filename === filename);
+                const destinations = getStageDestinations({
+                    data,
+                    file,
+                    filename
+                });
                 // Provider-direct uploads already placed the source object at its verified location.
                 // A bounded content probe can still appear in files, but it is not a representation
                 // Payload should upload again.
@@ -174,10 +169,10 @@ export const createFileOperations = ({ adapter, collection, collectionPrefix, di
                     filename,
                     useCompositePrefixes
                 }).storageFilePath;
-                if (uploadedNames.has(filename)) {
-                    throw new Error(`Duplicate managed cloud filename: ${filename}`);
+                if (uploadedKeys.has(storageFilePath)) {
+                    throw new Error(`Duplicate managed cloud file: ${storageFilePath}`);
                 }
-                uploadedNames.add(filename);
+                uploadedKeys.add(storageFilePath);
                 const buffer = 'buffer' in file ? file.buffer : adapter.supportsTempFiles ? Buffer.alloc(0) : await fs.readFile(file.sourcePath);
                 const uploadFile = {
                     buffer,
@@ -185,6 +180,7 @@ export const createFileOperations = ({ adapter, collection, collectionPrefix, di
                     filesize: 'buffer' in file ? file.buffer.length : (await fs.stat(file.sourcePath)).size,
                     mimeType: getMimeType({
                         data,
+                        destination: destinations[0],
                         filename
                     }),
                     ...'sourcePath' in file ? {
@@ -228,7 +224,46 @@ export const createFileOperations = ({ adapter, collection, collectionPrefix, di
         }
     };
 };
-const getMimeType = ({ data, filename })=>{
+/**
+ * The document fields a staged file is stored for. The file's role names its field, because the
+ * main file and the original can share a filename in different folders. Fields with the same
+ * filename and `_objectKey` describe the same object, so they share its location.
+ */ const getStageDestinations = ({ data, file, filename })=>{
+    const representations = [
+        data
+    ];
+    if (data.original && typeof data.original === 'object') {
+        representations.push(data.original);
+    }
+    if (data.variants && typeof data.variants === 'object') {
+        representations.push(...Object.values(data.variants).filter((value)=>Boolean(value) && typeof value === 'object'));
+    }
+    const namedDestinations = representations.filter((value)=>value.filename === filename);
+    const roleDestination = file.role ? getRoleRepresentation({
+        data,
+        role: file.role
+    }) : undefined;
+    if (roleDestination?.filename !== filename) {
+        return namedDestinations;
+    }
+    return [
+        roleDestination,
+        ...namedDestinations.filter((value)=>value !== roleDestination && value._objectKey === roleDestination._objectKey)
+    ];
+};
+const getRoleRepresentation = ({ data, role })=>{
+    let representation = data;
+    if (role.type === 'original') {
+        representation = data.original;
+    } else if (role.type === 'size') {
+        representation = data.variants?.[role.sizeKey];
+    }
+    return representation && typeof representation === 'object' ? representation : undefined;
+};
+const getMimeType = ({ data, destination, filename })=>{
+    if (typeof destination.mimeType === 'string') {
+        return destination.mimeType;
+    }
     if (data.original && typeof data.original === 'object') {
         const original = data.original;
         if (original.filename === filename && original.mimeType) {

package/dist/utilities/createFileOperations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/createFileOperations.ts"],"sourcesContent":["import type { CollectionConfig, ImageSize, JsonObject, UploadConfig } from 'payload'\n\nimport fs from 'node:fs/promises'\nimport path from 'node:path'\nimport { isDeepStrictEqual } from 'node:util'\nimport { deepCopyObjectSimple, generatePayloadFileURL } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { buildPrefixWithObjectKey } from './buildPrefixWithObjectKey.js'\nimport {\n  buildStoragePathData,\n  buildUploadPrefix,\n  buildUploadStoragePathData,\n} from './buildStoragePathData.js'\n\ntype Args = {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  collectionPrefix?: string\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  useCompositePrefixes?: boolean\n}\n\nexport const createFileOperations = ({\n  adapter,\n  collection,\n  collectionPrefix,\n  disablePayloadAccessControl,\n  generateFileURL,\n  useCompositePrefixes,\n}: Args): NonNullable<UploadConfig['fileOperations']> => {\n  if (typeof adapter.deleteFile !== 'function') {\n    throw new Error(\n      `Storage adapter \"${adapter.name}\" must implement deleteFile for collection \"${collection.slug}\".`,\n    )\n  }\n\n  return {\n    copy: async ({ from, req, to, trackStagedObject }) => {\n      await adapter.copyFile({\n        collection: req.payload.collections[collection.slug]!.config,\n        from,\n        req,\n        to,\n      })\n      trackStagedObject({\n        key: to,\n        remove: async () => {\n          await adapter.deleteFile({\n            collection,\n            req,\n            storageFilePath: to,\n          })\n        },\n      })\n    },\n    delete: async ({ key, req }) => {\n      await adapter.deleteFile({\n        collection,\n        req,\n        storageFilePath: key,\n      })\n    },\n    hasLegacyFile: async ({ doc, req }) => {\n      if (typeof doc.filename !== 'string' || typeof doc.url !== 'string') {\n        return false\n      }\n\n      const docPrefix = typeof doc.prefix === 'string' ? doc.prefix : undefined\n      const objectFolder = buildPrefixWithObjectKey({\n        objectKey: typeof doc._objectKey === 'string' ? doc._objectKey : undefined,\n        prefix: docPrefix,\n      })\n      const expectedURL = async ({ filename, size }: { filename: string; size?: ImageSize }) => {\n        if (generateFileURL) {\n          return generateFileURL({ collection, filename, prefix: objectFolder, size })\n        }\n        if (disablePayloadAccessControl && adapter.generateURL) {\n          return adapter.generateURL({ collection, data: doc, filename, prefix: objectFolder })\n        }\n        return generatePayloadFileURL({\n          collectionSlug: collection.slug,\n          config: req.payload.config as unknown as Parameters<\n            typeof generatePayloadFileURL\n          >[0]['config'],\n          filename,\n          relative: true,\n        })\n      }\n      if (\n        !isSameFileLocation({\n          actual: doc.url,\n          expected: await expectedURL({ filename: doc.filename }),\n        })\n      ) {\n        return false\n      }\n      if (doc.variants && typeof doc.variants === 'object' && !Array.isArray(doc.variants)) {\n        for (const [sizeKey, size] of Object.entries(doc.variants)) {\n          if (\n            size &&\n            typeof size === 'object' &&\n            'filename' in size &&\n            typeof size.filename === 'string'\n          ) {\n            const imageSize = req.payload.collections[\n              collection.slug\n            ]?.config.upload.variants?.find(({ name }) => name === sizeKey)\n            if (\n              !('url' in size) ||\n              typeof size.url !== 'string' ||\n              !isSameFileLocation({\n                actual: size.url,\n                expected: await expectedURL({ filename: size.filename, size: imageSize }),\n              })\n            ) {\n              return false\n            }\n          }\n        }\n      }\n      return true\n    },\n    resolveStorageKey: ({ _objectKey, filename, prefix }) =>\n      buildStoragePathData({\n        collectionPrefix,\n        docPrefix: buildPrefixWithObjectKey({ objectKey: _objectKey, prefix }),\n        filename,\n        useCompositePrefixes,\n      }).storageFilePath,\n    ...(adapter.moveFile && {\n      move: async ({ from, req, to, trackStagedObject }) => {\n        await adapter.moveFile!({\n          collection: req.payload.collections[collection.slug]!.config,\n          from,\n          req,\n          to,\n        })\n        trackStagedObject({\n          key: to,\n          remove: () =>\n            adapter.moveFile!({\n              collection: req.payload.collections[collection.slug]!.config,\n              from: to,\n              req,\n              to: from,\n            }),\n        })\n      },\n    }),\n    stage: async ({ data, files, req, trackStagedObject }) => {\n      const uploadedNames = new Set<string>()\n      const metadata: Record<string, unknown> = {}\n      const verifiedOriginal = req.context?._payloadVerifiedProviderOriginal as\n        | { filename: string }\n        | undefined\n      for (const file of files) {\n        const filename = path.basename(file.path)\n        const representations: Record<string, unknown>[] = [data]\n        if (data.original && typeof data.original === 'object') {\n          representations.push(data.original as Record<string, unknown>)\n        }\n        if (data.variants && typeof data.variants === 'object') {\n          representations.push(\n            ...Object.values(data.variants).filter(\n              (value): value is Record<string, unknown> =>\n                Boolean(value) && typeof value === 'object',\n            ),\n          )\n        }\n        const destinations = representations.filter((value) => value.filename === filename)\n        // Provider-direct uploads already placed the source object at its verified location.\n        // A bounded content probe can still appear in files, but it is not a representation\n        // Payload should upload again.\n        if (!destinations.length && verifiedOriginal) {\n          continue\n        }\n        if (!destinations.length) {\n          throw new Error(`No stored representation describes ${filename}`)\n        }\n        const prefixLocation = destinations.find(\n          (destination) => typeof destination.prefix === 'string',\n        )\n        const objectKeyLocation = destinations.find(\n          (destination) => typeof destination._objectKey === 'string',\n        )\n        const prefix =\n          typeof prefixLocation?.prefix === 'string' ? prefixLocation.prefix : undefined\n        const objectKey =\n          typeof objectKeyLocation?._objectKey === 'string'\n            ? objectKeyLocation._objectKey\n            : undefined\n        const prefixData = buildUploadPrefix({\n          collectionPrefix,\n          docPrefix: typeof prefix === 'string' ? prefix : undefined,\n          useCompositePrefixes,\n        })\n        const uploadPrefix = useCompositePrefixes\n          ? prefixData.sanitizedDocPrefix\n          : prefixData.uploadPrefix\n        for (const destination of destinations) {\n          destination.prefix = uploadPrefix\n          destination._objectKey = objectKey\n        }\n        const docPrefix = buildPrefixWithObjectKey({ objectKey, prefix: uploadPrefix })\n        const dataForUpload = { ...data, prefix: docPrefix }\n        const storageFilePath = buildUploadStoragePathData({\n          collectionPrefix,\n          docPrefix,\n          filename,\n          useCompositePrefixes,\n        }).storageFilePath\n\n        if (uploadedNames.has(filename)) {\n          throw new Error(`Duplicate managed cloud filename: ${filename}`)\n        }\n\n        uploadedNames.add(filename)\n        const buffer =\n          'buffer' in file\n            ? file.buffer\n            : adapter.supportsTempFiles\n              ? Buffer.alloc(0)\n              : await fs.readFile(file.sourcePath)\n        const uploadFile = {\n          buffer,\n          filename,\n          filesize: 'buffer' in file ? file.buffer.length : (await fs.stat(file.sourcePath)).size,\n          mimeType: getMimeType({ data, filename }),\n          ...('sourcePath' in file ? { tempFilePath: file.sourcePath } : {}),\n        }\n\n        // A new object folder is allocated for every server upload, so an interrupted\n        // provider write can be removed without touching an earlier revision.\n        trackStagedObject({\n          key: storageFilePath,\n          remove: async () => {\n            await adapter.deleteFile({\n              collection,\n              req,\n              storageFilePath,\n            })\n          },\n        })\n\n        const dataBeforeUpload = deepCopyObjectSimple(dataForUpload as JsonObject)\n        const result = await adapter.handleUpload({\n          collection,\n          data: dataForUpload,\n          file: uploadFile,\n          req,\n          storageFilePath,\n        })\n\n        if (result && typeof result === 'object') {\n          // Adapters may return the entire input document, including fields made stale by this upload.\n          for (const [key, value] of Object.entries(result)) {\n            if (!isDeepStrictEqual(value, dataBeforeUpload[key])) {\n              metadata[key] = value\n            }\n          }\n        }\n      }\n\n      delete metadata.prefix\n      delete metadata._objectKey\n      return { metadata }\n    },\n  }\n}\n\nconst getMimeType = ({\n  data,\n  filename,\n}: {\n  data: Record<string, unknown>\n  filename: string\n}): string => {\n  if (data.original && typeof data.original === 'object') {\n    const original = data.original as { filename?: string; mimeType?: string }\n    if (original.filename === filename && original.mimeType) {\n      return original.mimeType\n    }\n  }\n  if (data.variants && typeof data.variants === 'object') {\n    for (const size of Object.values(data.variants)) {\n      const candidate = size as { filename?: string; mimeType?: string } | null\n      if (candidate?.filename === filename && candidate.mimeType) {\n        return candidate.mimeType\n      }\n    }\n  }\n  return typeof data.mimeType === 'string' ? data.mimeType : 'application/octet-stream'\n}\n\n/** Signed and time-limited URLs change their query on every generation, so only the location is compared. */\nconst isSameFileLocation = ({\n  actual,\n  expected,\n}: {\n  actual: string\n  expected: null | string | undefined\n}): boolean =>\n  typeof expected === 'string' &&\n  getFileLocation({ url: actual }) === getFileLocation({ url: expected })\n\nconst getFileLocation = ({ url }: { url: string }): string => {\n  const parsed = new URL(url, 'http://payload.local')\n\n  return url.startsWith('/') ? parsed.pathname : `${parsed.origin}${parsed.pathname}`\n}\n"],"names":["fs","path","isDeepStrictEqual","deepCopyObjectSimple","generatePayloadFileURL","buildPrefixWithObjectKey","buildStoragePathData","buildUploadPrefix","buildUploadStoragePathData","createFileOperations","adapter","collection","collectionPrefix","disablePayloadAccessControl","generateFileURL","useCompositePrefixes","deleteFile","Error","name","slug","copy","from","req","to","trackStagedObject","copyFile","payload","collections","config","key","remove","storageFilePath","delete","hasLegacyFile","doc","filename","url","docPrefix","prefix","undefined","objectFolder","objectKey","_objectKey","expectedURL","size","generateURL","data","collectionSlug","relative","isSameFileLocation","actual","expected","variants","Array","isArray","sizeKey","Object","entries","imageSize","upload","find","resolveStorageKey","moveFile","move","stage","files","uploadedNames","Set","metadata","verifiedOriginal","context","_payloadVerifiedProviderOriginal","file","basename","representations","original","push","values","filter","value","Boolean","destinations","length","prefixLocation","destination","objectKeyLocation","prefixData","uploadPrefix","sanitizedDocPrefix","dataForUpload","has","add","buffer","supportsTempFiles","Buffer","alloc","readFile","sourcePath","uploadFile","filesize","stat","mimeType","getMimeType","tempFilePath","dataBeforeUpload","result","handleUpload","candidate","getFileLocation","parsed","URL","startsWith","pathname","origin"],"mappings":"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"}
+{"version":3,"sources":["../../src/utilities/createFileOperations.ts"],"sourcesContent":["import type { CollectionConfig, FileToSave, ImageSize, JsonObject, UploadConfig } from 'payload'\n\nimport fs from 'node:fs/promises'\nimport path from 'node:path'\nimport { isDeepStrictEqual } from 'node:util'\nimport { deepCopyObjectSimple, generatePayloadFileURL } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { buildPrefixWithObjectKey } from './buildPrefixWithObjectKey.js'\nimport {\n  buildStoragePathData,\n  buildUploadPrefix,\n  buildUploadStoragePathData,\n} from './buildStoragePathData.js'\n\ntype Args = {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  collectionPrefix?: string\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  useCompositePrefixes?: boolean\n}\n\nexport const createFileOperations = ({\n  adapter,\n  collection,\n  collectionPrefix,\n  disablePayloadAccessControl,\n  generateFileURL,\n  useCompositePrefixes,\n}: Args): NonNullable<UploadConfig['fileOperations']> => {\n  if (typeof adapter.deleteFile !== 'function') {\n    throw new Error(\n      `Storage adapter \"${adapter.name}\" must implement deleteFile for collection \"${collection.slug}\".`,\n    )\n  }\n\n  return {\n    copy: async ({ from, req, to, trackStagedObject }) => {\n      await adapter.copyFile({\n        collection: req.payload.collections[collection.slug]!.config,\n        from,\n        req,\n        to,\n      })\n      trackStagedObject({\n        key: to,\n        remove: async () => {\n          await adapter.deleteFile({\n            collection,\n            req,\n            storageFilePath: to,\n          })\n        },\n      })\n    },\n    delete: async ({ key, req }) => {\n      await adapter.deleteFile({\n        collection,\n        req,\n        storageFilePath: key,\n      })\n    },\n    hasLegacyFile: async ({ doc, req }) => {\n      if (typeof doc.filename !== 'string' || typeof doc.url !== 'string') {\n        return false\n      }\n\n      const docPrefix = typeof doc.prefix === 'string' ? doc.prefix : undefined\n      const objectFolder = buildPrefixWithObjectKey({\n        objectKey: typeof doc._objectKey === 'string' ? doc._objectKey : undefined,\n        prefix: docPrefix,\n      })\n      const expectedURL = async ({ filename, size }: { filename: string; size?: ImageSize }) => {\n        if (generateFileURL) {\n          return generateFileURL({ collection, filename, prefix: objectFolder, size })\n        }\n        if (disablePayloadAccessControl && adapter.generateURL) {\n          return adapter.generateURL({ collection, data: doc, filename, prefix: objectFolder })\n        }\n        return generatePayloadFileURL({\n          collectionSlug: collection.slug,\n          config: req.payload.config as unknown as Parameters<\n            typeof generatePayloadFileURL\n          >[0]['config'],\n          filename,\n          relative: true,\n        })\n      }\n      if (\n        !isSameFileLocation({\n          actual: doc.url,\n          expected: await expectedURL({ filename: doc.filename }),\n        })\n      ) {\n        return false\n      }\n      if (doc.variants && typeof doc.variants === 'object' && !Array.isArray(doc.variants)) {\n        for (const [sizeKey, size] of Object.entries(doc.variants)) {\n          if (\n            size &&\n            typeof size === 'object' &&\n            'filename' in size &&\n            typeof size.filename === 'string'\n          ) {\n            const imageSize = req.payload.collections[\n              collection.slug\n            ]?.config.upload.variants?.find(({ name }) => name === sizeKey)\n            if (\n              !('url' in size) ||\n              typeof size.url !== 'string' ||\n              !isSameFileLocation({\n                actual: size.url,\n                expected: await expectedURL({ filename: size.filename, size: imageSize }),\n              })\n            ) {\n              return false\n            }\n          }\n        }\n      }\n      return true\n    },\n    resolveStorageKey: ({ _objectKey, filename, prefix }) =>\n      buildStoragePathData({\n        collectionPrefix,\n        docPrefix: buildPrefixWithObjectKey({ objectKey: _objectKey, prefix }),\n        filename,\n        useCompositePrefixes,\n      }).storageFilePath,\n    ...(adapter.moveFile && {\n      move: async ({ from, req, to, trackStagedObject }) => {\n        await adapter.moveFile!({\n          collection: req.payload.collections[collection.slug]!.config,\n          from,\n          req,\n          to,\n        })\n        trackStagedObject({\n          key: to,\n          remove: () =>\n            adapter.moveFile!({\n              collection: req.payload.collections[collection.slug]!.config,\n              from: to,\n              req,\n              to: from,\n            }),\n        })\n      },\n    }),\n    stage: async ({ data, files, req, trackStagedObject }) => {\n      const uploadedKeys = new Set<string>()\n      const metadata: Record<string, unknown> = {}\n      const verifiedOriginal = req.context?._payloadVerifiedProviderOriginal as\n        | { filename: string }\n        | undefined\n      for (const file of files) {\n        const filename = path.basename(file.path)\n        const destinations = getStageDestinations({ data, file, filename })\n        // Provider-direct uploads already placed the source object at its verified location.\n        // A bounded content probe can still appear in files, but it is not a representation\n        // Payload should upload again.\n        if (!destinations.length && verifiedOriginal) {\n          continue\n        }\n        if (!destinations.length) {\n          throw new Error(`No stored representation describes ${filename}`)\n        }\n        const prefixLocation = destinations.find(\n          (destination) => typeof destination.prefix === 'string',\n        )\n        const objectKeyLocation = destinations.find(\n          (destination) => typeof destination._objectKey === 'string',\n        )\n        const prefix =\n          typeof prefixLocation?.prefix === 'string' ? prefixLocation.prefix : undefined\n        const objectKey =\n          typeof objectKeyLocation?._objectKey === 'string'\n            ? objectKeyLocation._objectKey\n            : undefined\n        const prefixData = buildUploadPrefix({\n          collectionPrefix,\n          docPrefix: typeof prefix === 'string' ? prefix : undefined,\n          useCompositePrefixes,\n        })\n        const uploadPrefix = useCompositePrefixes\n          ? prefixData.sanitizedDocPrefix\n          : prefixData.uploadPrefix\n        for (const destination of destinations) {\n          destination.prefix = uploadPrefix\n          destination._objectKey = objectKey\n        }\n        const docPrefix = buildPrefixWithObjectKey({ objectKey, prefix: uploadPrefix })\n        const dataForUpload = { ...data, prefix: docPrefix }\n        const storageFilePath = buildUploadStoragePathData({\n          collectionPrefix,\n          docPrefix,\n          filename,\n          useCompositePrefixes,\n        }).storageFilePath\n\n        if (uploadedKeys.has(storageFilePath)) {\n          throw new Error(`Duplicate managed cloud file: ${storageFilePath}`)\n        }\n\n        uploadedKeys.add(storageFilePath)\n        const buffer =\n          'buffer' in file\n            ? file.buffer\n            : adapter.supportsTempFiles\n              ? Buffer.alloc(0)\n              : await fs.readFile(file.sourcePath)\n        const uploadFile = {\n          buffer,\n          filename,\n          filesize: 'buffer' in file ? file.buffer.length : (await fs.stat(file.sourcePath)).size,\n          mimeType: getMimeType({ data, destination: destinations[0]!, filename }),\n          ...('sourcePath' in file ? { tempFilePath: file.sourcePath } : {}),\n        }\n\n        // A new object folder is allocated for every server upload, so an interrupted\n        // provider write can be removed without touching an earlier revision.\n        trackStagedObject({\n          key: storageFilePath,\n          remove: async () => {\n            await adapter.deleteFile({\n              collection,\n              req,\n              storageFilePath,\n            })\n          },\n        })\n\n        const dataBeforeUpload = deepCopyObjectSimple(dataForUpload as JsonObject)\n        const result = await adapter.handleUpload({\n          collection,\n          data: dataForUpload,\n          file: uploadFile,\n          req,\n          storageFilePath,\n        })\n\n        if (result && typeof result === 'object') {\n          // Adapters may return the entire input document, including fields made stale by this upload.\n          for (const [key, value] of Object.entries(result)) {\n            if (!isDeepStrictEqual(value, dataBeforeUpload[key])) {\n              metadata[key] = value\n            }\n          }\n        }\n      }\n\n      delete metadata.prefix\n      delete metadata._objectKey\n      return { metadata }\n    },\n  }\n}\n\n/**\n * The document fields a staged file is stored for. The file's role names its field, because the\n * main file and the original can share a filename in different folders. Fields with the same\n * filename and `_objectKey` describe the same object, so they share its location.\n */\nconst getStageDestinations = ({\n  data,\n  file,\n  filename,\n}: {\n  data: Record<string, unknown>\n  file: FileToSave\n  filename: string\n}): Record<string, unknown>[] => {\n  const representations: Record<string, unknown>[] = [data]\n  if (data.original && typeof data.original === 'object') {\n    representations.push(data.original as Record<string, unknown>)\n  }\n  if (data.variants && typeof data.variants === 'object') {\n    representations.push(\n      ...Object.values(data.variants).filter(\n        (value): value is Record<string, unknown> => Boolean(value) && typeof value === 'object',\n      ),\n    )\n  }\n  const namedDestinations = representations.filter((value) => value.filename === filename)\n  const roleDestination = file.role ? getRoleRepresentation({ data, role: file.role }) : undefined\n\n  if (roleDestination?.filename !== filename) {\n    return namedDestinations\n  }\n\n  return [\n    roleDestination,\n    ...namedDestinations.filter(\n      (value) => value !== roleDestination && value._objectKey === roleDestination._objectKey,\n    ),\n  ]\n}\n\nconst getRoleRepresentation = ({\n  data,\n  role,\n}: {\n  data: Record<string, unknown>\n  role: NonNullable<FileToSave['role']>\n}): Record<string, unknown> | undefined => {\n  let representation: unknown = data\n\n  if (role.type === 'original') {\n    representation = data.original\n  } else if (role.type === 'size') {\n    representation = (data.variants as Record<string, unknown> | undefined)?.[role.sizeKey]\n  }\n\n  return representation && typeof representation === 'object'\n    ? (representation as Record<string, unknown>)\n    : undefined\n}\n\nconst getMimeType = ({\n  data,\n  destination,\n  filename,\n}: {\n  data: Record<string, unknown>\n  destination: Record<string, unknown>\n  filename: string\n}): string => {\n  if (typeof destination.mimeType === 'string') {\n    return destination.mimeType\n  }\n  if (data.original && typeof data.original === 'object') {\n    const original = data.original as { filename?: string; mimeType?: string }\n    if (original.filename === filename && original.mimeType) {\n      return original.mimeType\n    }\n  }\n  if (data.variants && typeof data.variants === 'object') {\n    for (const size of Object.values(data.variants)) {\n      const candidate = size as { filename?: string; mimeType?: string } | null\n      if (candidate?.filename === filename && candidate.mimeType) {\n        return candidate.mimeType\n      }\n    }\n  }\n  return typeof data.mimeType === 'string' ? data.mimeType : 'application/octet-stream'\n}\n\n/** Signed and time-limited URLs change their query on every generation, so only the location is compared. */\nconst isSameFileLocation = ({\n  actual,\n  expected,\n}: {\n  actual: string\n  expected: null | string | undefined\n}): boolean =>\n  typeof expected === 'string' &&\n  getFileLocation({ url: actual }) === getFileLocation({ url: expected })\n\nconst getFileLocation = ({ url }: { url: string }): string => {\n  const parsed = new URL(url, 'http://payload.local')\n\n  return url.startsWith('/') ? parsed.pathname : `${parsed.origin}${parsed.pathname}`\n}\n"],"names":["fs","path","isDeepStrictEqual","deepCopyObjectSimple","generatePayloadFileURL","buildPrefixWithObjectKey","buildStoragePathData","buildUploadPrefix","buildUploadStoragePathData","createFileOperations","adapter","collection","collectionPrefix","disablePayloadAccessControl","generateFileURL","useCompositePrefixes","deleteFile","Error","name","slug","copy","from","req","to","trackStagedObject","copyFile","payload","collections","config","key","remove","storageFilePath","delete","hasLegacyFile","doc","filename","url","docPrefix","prefix","undefined","objectFolder","objectKey","_objectKey","expectedURL","size","generateURL","data","collectionSlug","relative","isSameFileLocation","actual","expected","variants","Array","isArray","sizeKey","Object","entries","imageSize","upload","find","resolveStorageKey","moveFile","move","stage","files","uploadedKeys","Set","metadata","verifiedOriginal","context","_payloadVerifiedProviderOriginal","file","basename","destinations","getStageDestinations","length","prefixLocation","destination","objectKeyLocation","prefixData","uploadPrefix","sanitizedDocPrefix","dataForUpload","has","add","buffer","supportsTempFiles","Buffer","alloc","readFile","sourcePath","uploadFile","filesize","stat","mimeType","getMimeType","tempFilePath","dataBeforeUpload","result","handleUpload","value","representations","original","push","values","filter","Boolean","namedDestinations","roleDestination","role","getRoleRepresentation","representation","type","candidate","getFileLocation","parsed","URL","startsWith","pathname","origin"],"mappings":"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"}

package/dist/utilities/getFilePrefix.d.ts

@@ -8,11 +8,13 @@ import type { CollectionConfig, FileData, PayloadRequest, TypeWithID } from 'pay
  * `overrideAccess: false`, any query-param prefix only narrows that lookup, and `_objectKey`
  * is read from the resolved document via `showHiddenFields`.
  */
-export declare function getFilePrefix({ collection, collectionPrefix, doc, filename, prefixQueryParam, req, uploadReference, useCompositePrefixes, }: {
+export declare function getFilePrefix({ collection, collectionPrefix, doc, filename, isOriginal, prefixQueryParam, req, uploadReference, useCompositePrefixes, }: {
     collection: CollectionConfig;
     collectionPrefix?: string;
     doc?: Partial<FileData> & TypeWithID;
     filename: string;
+    /** Serves the original when it shares the main file's name. */
+    isOriginal?: boolean;
     /**
      * Only narrows the access-controlled fallback lookup below; never trusted or
      * returned directly. Prefer passing the access-checked document as `doc` instead.

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

@@ -1 +1 @@
-{"version":3,"file":"getFilePrefix.d.ts","sourceRoot":"","sources":["../../src/utilities/getFilePrefix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,QAAQ,EACR,cAAc,EAEd,UAAU,EACX,MAAM,SAAS,CAAA;AAMhB;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,UAAU,EACV,gBAAgB,EAChB,GAAG,EACH,QAAQ,EACR,gBAAgB,EAChB,GAAG,EACH,eAAe,EACf,oBAA4B,GAC7B,EAAE;IACD,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAA;IACpC,QAAQ,EAAE,MAAM,CAAA;IAChB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,GAAG,OAAO,CAAC,MAAM,CAAC,CA2ElB"}
+{"version":3,"file":"getFilePrefix.d.ts","sourceRoot":"","sources":["../../src/utilities/getFilePrefix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,QAAQ,EACR,cAAc,EAEd,UAAU,EACX,MAAM,SAAS,CAAA;AAQhB;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,UAAU,EACV,gBAAgB,EAChB,GAAG,EACH,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,GAAG,EACH,eAAe,EACf,oBAA4B,GAC7B,EAAE;IACD,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAA;IACpC,QAAQ,EAAE,MAAM,CAAA;IAChB,+DAA+D;IAC/D,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,GAAG,OAAO,CAAC,MAAM,CAAC,CA2ElB"}

package/dist/utilities/getFilePrefix.js

@@ -1,3 +1,4 @@
+import { isOriginalFileRequest } from 'payload/internal';
 import { buildPrefixWithObjectKey } from './buildPrefixWithObjectKey.js';
 import { buildUploadStoragePathData } from './buildStoragePathData.js';
 import { sanitizePrefix } from './sanitizePrefix.js';
@@ -9,13 +10,14 @@ import { sanitizePrefix } from './sanitizePrefix.js';
  * 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 }) {
+ */ export async function getFilePrefix({ collection, collectionPrefix, doc, filename, isOriginal, 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
+            filename,
+            isOriginal
         });
     }
     // Upload instructions call handlers without a document yet. Re-contain the claimed
@@ -87,11 +89,16 @@ import { sanitizePrefix } from './sanitizePrefix.js';
     const found = files?.docs?.[0];
     return found ? getRepresentationPrefix({
         doc: found,
-        filename
+        filename,
+        isOriginal
     }) : '';
 }
-const getRepresentationPrefix = ({ doc, filename })=>{
-    const representation = doc.original?.filename === filename ? doc.original : Object.values(doc.variants ?? {}).find((variant)=>variant?.filename === filename) ?? doc;
+/** The main file wins a shared filename unless the original is asked for. */ const getRepresentationPrefix = ({ doc, filename, isOriginal })=>{
+    const representation = isOriginalFileRequest({
+        doc,
+        filename,
+        isOriginal
+    }) ? 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)

package/dist/utilities/getFilePrefix.js.map

@@ -1 +1 @@
-{"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"}
+{"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 { isOriginalFileRequest } from 'payload/internal'\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  isOriginal,\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  /** Serves the original when it shares the main file's name. */\n  isOriginal?: boolean\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, isOriginal })\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, isOriginal }) : ''\n}\n\n/** The main file wins a shared filename unless the original is asked for. */\nconst getRepresentationPrefix = ({\n  doc,\n  filename,\n  isOriginal,\n}: {\n  doc: Partial<FileData>\n  filename: string\n  isOriginal?: boolean\n}): string => {\n  const representation = isOriginalFileRequest({ doc, filename, isOriginal })\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":["isOriginalFileRequest","buildPrefixWithObjectKey","buildUploadStoragePathData","sanitizePrefix","getFilePrefix","collection","collectionPrefix","doc","filename","isOriginal","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":"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"}

package/dist/utilities/getStorageLocationSelect.js

@@ -23,11 +23,17 @@ const withLocationFields = ({ select })=>{
         }
     });
     if (isSelectRecord(result.original)) {
-        result.original = addLocationFields({
+        const original = addLocationFields({
             representation: {
                 ...result.original
             }
         });
+        result.original = original;
+        // The original URL compares the original's location with the main file's location.
+        if (original.url === true) {
+            result.filename = true;
+            result._objectKey = true;
+        }
     }
     if (isSelectRecord(result.variants)) {
         result.variants = Object.fromEntries(Object.entries(result.variants).map(([name, variant])=>[

package/dist/utilities/getStorageLocationSelect.js.map

@@ -1 +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"}
+{"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    const original = addLocationFields({ representation: { ...result.original } })\n    result.original = original\n\n    // The original URL compares the original's location with the main file's location.\n    if (original.url === true) {\n      result.filename = true\n      result._objectKey = true\n    }\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","url","filename","_objectKey","variants","Object","fromEntries","entries","map","name","variant","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;QACnC,MAAMA,WAAWH,kBAAkB;YAAEC,gBAAgB;gBAAE,GAAGF,OAAOI,QAAQ;YAAC;QAAE;QAC5EJ,OAAOI,QAAQ,GAAGA;QAElB,mFAAmF;QACnF,IAAIA,SAASC,GAAG,KAAK,MAAM;YACzBL,OAAOM,QAAQ,GAAG;YAClBN,OAAOO,UAAU,GAAG;QACtB;IACF;IAEA,IAAIJ,eAAeH,OAAOQ,QAAQ,GAAG;QACnCR,OAAOQ,QAAQ,GAAGC,OAAOC,WAAW,CAClCD,OAAOE,OAAO,CAACX,OAAOQ,QAAQ,EAAEI,GAAG,CAAC,CAAC,CAACC,MAAMC,QAAQ,GAAK;gBACvDD;gBACAV,eAAeW,WAAWb,kBAAkB;oBAAEC,gBAAgB;wBAAE,GAAGY,OAAO;oBAAC;gBAAE,KAAKA;aACnF;IAEL;IAEA,OAAOd;AACT;AAEA,MAAMC,oBAAoB,CAAC,EAAEC,cAAc,EAAoC;IAC7E,IAAIA,eAAeG,GAAG,KAAK,MAAM;QAC/B,KAAK,MAAMU,aAAarB,mBAAoB;YAC1CQ,cAAc,CAACa,UAAU,GAAG;QAC9B;IACF;IAEA,OAAOb;AACT;AAEA,MAAMC,iBAAiB,CAACa,QACtB,OAAOA,UAAU,YAAYA,UAAU,QAAQ,CAACC,MAAMC,OAAO,CAACF"}

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;AAW7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,KAAK,IAAI,GAAG;IACV,mGAAmG;IACnG,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,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,WAAW,EACX,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,CA8CD"}
+{"version":3,"file":"resolveSignedURLKey.d.ts","sourceRoot":"","sources":["../../src/utilities/resolveSignedURLKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAM7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,KAAK,IAAI,GAAG;IACV,mGAAmG;IACnG,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,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,WAAW,EACX,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,CAwCD"}

package/dist/utilities/resolveSignedURLKey.js

@@ -1,5 +1,5 @@
 import { randomUUID } from 'node:crypto';
-import { createClientUploadReceipt, getOriginalFilename, getSafeFileName, incrementName } from 'payload/internal';
+import { createClientUploadReceipt, getSafeFileName } from 'payload/internal';
 import { getSanitizedUploadFilename } from 'payload/shared';
 import { buildUploadPrefix, buildUploadStoragePathData } from './buildStoragePathData.js';
 /**
@@ -19,21 +19,11 @@ import { buildUploadPrefix, buildUploadStoragePathData } from './buildStoragePat
  * key with {@link buildUploadStoragePathData}, so the receipt only ever signs a key
  * beneath the configured collection prefix.
  */ export async function resolveSignedURLKey({ adapterData, collectionPrefix = '', collectionSlug, docPrefix, filename, req, useCompositePrefixes = false }) {
-    // The document stores the -original name, so check collisions against that name.
-    let sanitizedFilename = getSanitizedUploadFilename(filename);
-    let originalFilename = getOriginalFilename({
-        filename: sanitizedFilename
-    });
-    while(await getSafeFileName({
+    const sanitizedFilename = await getSafeFileName({
         collectionSlug,
-        desiredFilename: originalFilename,
+        desiredFilename: getSanitizedUploadFilename(filename),
         req
-    }) !== originalFilename){
-        sanitizedFilename = incrementName(sanitizedFilename);
-        originalFilename = getOriginalFilename({
-            filename: sanitizedFilename
-        });
-    }
+    });
     const rawBaseDocPrefix = useCompositePrefixes ? docPrefix : docPrefix || collectionPrefix;
     const { sanitizedDocPrefix } = buildUploadPrefix({
         collectionPrefix,
@@ -46,7 +36,7 @@ import { buildUploadPrefix, buildUploadStoragePathData } from './buildStoragePat
     const { storageFilePath } = buildUploadStoragePathData({
         collectionPrefix,
         docPrefix: keyedDocPrefix,
-        filename: originalFilename,
+        filename: sanitizedFilename,
         useCompositePrefixes
     });
     const uploadReference = {

package/dist/utilities/resolveSignedURLKey.js.map

@@ -1 +1 @@
-{"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  /** Signed into the receipt and returned to the upload handler as `uploadReference.adapterData`. */\n  adapterData?: Record<string, unknown>\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  adapterData,\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      ...(adapterData !== undefined && { adapterData }),\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","adapterData","collectionPrefix","collectionSlug","docPrefix","filename","req","useCompositePrefixes","sanitizedFilename","originalFilename","desiredFilename","rawBaseDocPrefix","sanitizedDocPrefix","_objectKey","keyedDocPrefix","storageFilePath","uploadReference","prefix","signedReceipt","undefined","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;AAazF;;;;;;;;;;;;;;;;CAgBC,GACD,OAAO,eAAeC,oBAAoB,EACxCC,WAAW,EACXC,mBAAmB,EAAE,EACrBC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,GAAG,EACHC,uBAAuB,KAAK,EACvB;IAML,iFAAiF;IACjF,IAAIC,oBAAoBX,2BAA2BQ;IACnD,IAAII,mBAAmBf,oBAAoB;QAAEW,UAAUG;IAAkB;IAEzE,MACE,AAAC,MAAMb,gBAAgB;QAAEQ;QAAgBO,iBAAiBD;QAAkBH;IAAI,OAChFG,iBACA;QACAD,oBAAoBZ,cAAcY;QAClCC,mBAAmBf,oBAAoB;YAAEW,UAAUG;QAAkB;IACvE;IAEA,MAAMG,mBAAmBJ,uBAAuBH,YAAYA,aAAaF;IACzE,MAAM,EAAEU,kBAAkB,EAAE,GAAGd,kBAAkB;QAC/CI;QACAE,WAAWO;QACXJ;IACF;IAEA,MAAMM,aAAarB;IACnB,mGAAmG;IACnG,MAAMsB,iBAAiBF,qBAAqB,GAAGA,mBAAmB,CAAC,EAAEC,YAAY,GAAGA;IAEpF,MAAM,EAAEE,eAAe,EAAE,GAAGhB,2BAA2B;QACrDG;QACAE,WAAWU;QACXT,UAAUI;QACVF;IACF;IAEA,MAAMS,kBAAkB;QACtBH;QACAI,QAAQL;QACRM,eAAezB,0BAA0B;YACvCoB;YACA,GAAIZ,gBAAgBkB,aAAa;gBAAElB;YAAY,CAAC;YAChDE;YACAE,UAAUG;YACVY,YAAYR;YACZN;YACAS;QACF;IACF;IAEA,OAAO;QAAEH;QAAoBJ;QAAmBO;QAAiBC;IAAgB;AACnF"}
+{"version":3,"sources":["../../src/utilities/resolveSignedURLKey.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { randomUUID } from 'node:crypto'\nimport { createClientUploadReceipt, getSafeFileName } 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  /** Signed into the receipt and returned to the upload handler as `uploadReference.adapterData`. */\n  adapterData?: Record<string, unknown>\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  adapterData,\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  const sanitizedFilename = await getSafeFileName({\n    collectionSlug,\n    desiredFilename: getSanitizedUploadFilename(filename),\n    req,\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: sanitizedFilename,\n    useCompositePrefixes,\n  })\n\n  const uploadReference = {\n    _objectKey,\n    prefix: sanitizedDocPrefix,\n    signedReceipt: createClientUploadReceipt({\n      _objectKey,\n      ...(adapterData !== undefined && { adapterData }),\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","getSafeFileName","getSanitizedUploadFilename","buildUploadPrefix","buildUploadStoragePathData","resolveSignedURLKey","adapterData","collectionPrefix","collectionSlug","docPrefix","filename","req","useCompositePrefixes","sanitizedFilename","desiredFilename","rawBaseDocPrefix","sanitizedDocPrefix","_objectKey","keyedDocPrefix","storageFilePath","uploadReference","prefix","signedReceipt","undefined","filePrefix"],"mappings":"AAEA,SAASA,UAAU,QAAQ,cAAa;AACxC,SAASC,yBAAyB,EAAEC,eAAe,QAAQ,mBAAkB;AAC7E,SAASC,0BAA0B,QAAQ,iBAAgB;AAI3D,SAASC,iBAAiB,EAAEC,0BAA0B,QAAQ,4BAA2B;AAazF;;;;;;;;;;;;;;;;CAgBC,GACD,OAAO,eAAeC,oBAAoB,EACxCC,WAAW,EACXC,mBAAmB,EAAE,EACrBC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,GAAG,EACHC,uBAAuB,KAAK,EACvB;IAML,MAAMC,oBAAoB,MAAMZ,gBAAgB;QAC9CO;QACAM,iBAAiBZ,2BAA2BQ;QAC5CC;IACF;IAEA,MAAMI,mBAAmBH,uBAAuBH,YAAYA,aAAaF;IACzE,MAAM,EAAES,kBAAkB,EAAE,GAAGb,kBAAkB;QAC/CI;QACAE,WAAWM;QACXH;IACF;IAEA,MAAMK,aAAalB;IACnB,mGAAmG;IACnG,MAAMmB,iBAAiBF,qBAAqB,GAAGA,mBAAmB,CAAC,EAAEC,YAAY,GAAGA;IAEpF,MAAM,EAAEE,eAAe,EAAE,GAAGf,2BAA2B;QACrDG;QACAE,WAAWS;QACXR,UAAUG;QACVD;IACF;IAEA,MAAMQ,kBAAkB;QACtBH;QACAI,QAAQL;QACRM,eAAetB,0BAA0B;YACvCiB;YACA,GAAIX,gBAAgBiB,aAAa;gBAAEjB;YAAY,CAAC;YAChDE;YACAE,UAAUG;YACVW,YAAYR;YACZL;YACAQ;QACF;IACF;IAEA,OAAO;QAAEH;QAAoBH;QAAmBM;QAAiBC;IAAgB;AACnF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-cloud-storage",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.7",
   "description": "The official cloud storage plugin for Payload CMS",
   "homepage": "https://payloadcms.com",
   "license": "MIT",
@@ -52,7 +52,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@payloadcms/ui": "4.0.0-beta.5",
+    "@payloadcms/ui": "4.0.0-beta.7",
     "find-node-modules": "^2.1.3",
     "range-parser": "^1.2.1"
   },
@@ -60,10 +60,10 @@
     "@types/find-node-modules": "^2.1.2",
     "@types/react": "19.3.0",
     "@types/react-dom": "19.3.0",
-    "payload": "4.0.0-beta.5"
+    "payload": "4.0.0-beta.7"
   },
   "peerDependencies": {
-    "payload": "4.0.0-beta.5",
+    "payload": "4.0.0-beta.7",
     "react": "^19.0.1 || ^19.1.2 || ^19.2.1",
     "react-dom": "^19.0.1 || ^19.1.2 || ^19.2.1"
   },