payload 4.0.0-internal.ea6e8f8 → 4.0.0-internal.ee5d8bd

package/dist/uploads/deleteAssociatedFiles.js

@@ -2,10 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import { APIError, ErrorDeletingFile } from '../errors/index.js';
 import { httpStatus } from '../utilities/httpStatus.js';
-import { beginDeferredCleanupScopeIfNeeded, clearDeferredCleanupScope, flushDeferredCleanupScope, scheduleAfterTransactionCommit } from '../utilities/transactionCallbacks.js';
 import { fileExists } from './fileExists.js';
-import { getFileIdentity, hasRenameStableFileIdentity } from './fileIdentity.js';
-import { discardQuarantinedFile, quarantineFile, restoreQuarantinedFile } from './fileQuarantine.js';
 import { withLegacyUploadFileData } from './fileVersioning/storedFiles.js';
 export const deleteAssociatedFiles = async ({ collectionConfig, config, doc, files = [], overrideDelete, req })=>{
     if (!collectionConfig.upload) {
@@ -19,94 +16,42 @@ export const deleteAssociatedFiles = async ({ collectionConfig, config, doc, fil
     if (collectionConfig.versions || stored.original) {
         return;
     }
-    const cleanupScope = await beginDeferredCleanupScopeIfNeeded({
-        req
-    });
-    const replacementFilePaths = new Set(files.map((file)=>path.resolve(file.path)));
-    try {
-        if (overrideDelete || files.length > 0) {
-            const { staticDir: staticPath } = collectionConfig.upload;
-            const fileToDelete = resolveFilePath({
-                filename: doc.filename,
+    if (overrideDelete || files.length > 0) {
+        const { staticDir: staticPath } = collectionConfig.upload;
+        const fileToDelete = resolveFilePath({
+            filename: doc.filename,
+            staticPath
+        });
+        try {
+            await deleteFile({
+                filePath: fileToDelete,
                 staticPath
             });
-            if (fileToDelete && !replacementFilePaths.has(fileToDelete)) {
-                await scheduleFileDeletion({
-                    filePath: fileToDelete,
-                    req,
+        } catch (ignore) {
+            throw new ErrorDeletingFile(req.t);
+        }
+        if (doc.variants) {
+            const sizes = Object.values(doc.variants);
+            // Since forEach will not wait until unlink is finished it could
+            // happen that two operations will try to delete the same file.
+            // To avoid this it is recommended to use "sync" instead
+            for (const size of sizes){
+                const sizeToDelete = resolveFilePath({
+                    filename: size.filename,
                     staticPath
                 });
-            }
-            if (doc.variants) {
-                const variants = Object.values(doc.variants);
-                // Since forEach will not wait until unlink is finished it could
-                // happen that two operations will try to delete the same file.
-                // To avoid this it is recommended to use "sync" instead
-                for (const variant of variants){
-                    const variantToDelete = resolveFilePath({
-                        filename: variant.filename,
+                try {
+                    await deleteFile({
+                        filePath: sizeToDelete,
                         staticPath
                     });
-                    if (variantToDelete && !replacementFilePaths.has(variantToDelete)) {
-                        await scheduleFileDeletion({
-                            filePath: variantToDelete,
-                            req,
-                            staticPath
-                        });
-                    }
+                } catch (ignore) {
+                    throw new ErrorDeletingFile(req.t);
                 }
             }
         }
-        if (cleanupScope) {
-            await flushDeferredCleanupScope({
-                req,
-                scope: cleanupScope
-            });
-        }
-    } catch (error) {
-        if (cleanupScope) {
-            clearDeferredCleanupScope({
-                req,
-                scope: cleanupScope
-            });
-        }
-        throw error;
     }
 };
-const scheduleFileDeletion = async ({ filePath, req, staticPath })=>{
-    let isFileDeletionSafe;
-    try {
-        isFileDeletionSafe = await assertFileDeletionIsSafe({
-            filePath,
-            staticPath
-        });
-    } catch (ignore) {
-        throw new ErrorDeletingFile(req.t);
-    }
-    if (!isFileDeletionSafe) {
-        return;
-    }
-    const fileIdentity = await getFileIdentity({
-        filePath: filePath
-    });
-    if (!fileIdentity) {
-        return;
-    }
-    await scheduleAfterTransactionCommit({
-        callback: async ()=>{
-            try {
-                await deleteFile({
-                    fileIdentity,
-                    filePath,
-                    staticPath
-                });
-            } catch (ignore) {
-                throw new ErrorDeletingFile(req.t);
-            }
-        },
-        req
-    });
-};
 const resolveFilePath = ({ filename, staticPath })=>{
     if (!filename || !staticPath) {
         return;
@@ -121,37 +66,13 @@ const resolveFilePath = ({ filename, staticPath })=>{
     }
     return filePath;
 };
-const deleteFile = async ({ fileIdentity, filePath, staticPath })=>{
-    if (!await assertFileDeletionIsSafe({
-        filePath,
-        staticPath
-    })) {
+const deleteFile = async ({ filePath, staticPath })=>{
+    if (!filePath || !staticPath) {
         return;
     }
-    const quarantinedFile = await quarantineFile({
-        filePath: filePath
-    });
-    if (!quarantinedFile) {
+    if (!await fileExists(filePath)) {
         return;
     }
-    if (!hasRenameStableFileIdentity({
-        actual: quarantinedFile.fileIdentity,
-        expected: fileIdentity
-    })) {
-        await restoreQuarantinedFile({
-            quarantinedFile,
-            targetFilePath: filePath
-        });
-        return;
-    }
-    await discardQuarantinedFile({
-        quarantinedFile
-    });
-};
-const assertFileDeletionIsSafe = async ({ filePath, staticPath })=>{
-    if (!filePath || !staticPath || !await fileExists(filePath)) {
-        return false;
-    }
     const [resolvedDir, resolvedParent] = await Promise.all([
         fs.realpath(staticPath),
         fs.realpath(path.dirname(filePath))
@@ -163,7 +84,7 @@ const assertFileDeletionIsSafe = async ({ filePath, staticPath })=>{
     })) {
         throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST);
     }
-    return true;
+    await fs.unlink(filePath);
 };
 const isWithinDirectory = ({ directory, target })=>{
     const relativePath = path.relative(directory, target);

package/dist/uploads/deleteAssociatedFiles.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/deleteAssociatedFiles.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { FileIdentity } from './fileIdentity.js'\nimport type { FileData, FileToSave } from './types.js'\n\nimport { APIError, ErrorDeletingFile } from '../errors/index.js'\nimport { httpStatus } from '../utilities/httpStatus.js'\nimport {\n  beginDeferredCleanupScopeIfNeeded,\n  clearDeferredCleanupScope,\n  flushDeferredCleanupScope,\n  scheduleAfterTransactionCommit,\n} from '../utilities/transactionCallbacks.js'\nimport { fileExists } from './fileExists.js'\nimport { getFileIdentity, hasRenameStableFileIdentity } from './fileIdentity.js'\nimport { discardQuarantinedFile, quarantineFile, restoreQuarantinedFile } from './fileQuarantine.js'\nimport { withLegacyUploadFileData } from './fileVersioning/storedFiles.js'\n\ntype Args = {\n  collectionConfig: SanitizedCollectionConfig\n  config: SanitizedConfig\n  doc: Record<string, unknown>\n  files?: FileToSave[]\n  overrideDelete: boolean\n  req: PayloadRequest\n}\n\nexport const deleteAssociatedFiles: (args: Args) => Promise<void> = async ({\n  collectionConfig,\n  config,\n  doc,\n  files = [],\n  overrideDelete,\n  req,\n}) => {\n  if (!collectionConfig.upload) {\n    return\n  }\n  const stored = withLegacyUploadFileData({ collection: collectionConfig, config, doc })\n\n  if (collectionConfig.versions || stored.original) {\n    return\n  }\n\n  const cleanupScope = await beginDeferredCleanupScopeIfNeeded({ req })\n  const replacementFilePaths = new Set(files.map((file) => path.resolve(file.path)))\n\n  try {\n    if (overrideDelete || files.length > 0) {\n      const { staticDir: staticPath } = collectionConfig.upload\n\n      const fileToDelete = resolveFilePath({\n        filename: doc.filename as string,\n        staticPath,\n      })\n\n      if (fileToDelete && !replacementFilePaths.has(fileToDelete)) {\n        await scheduleFileDeletion({ filePath: fileToDelete, req, staticPath })\n      }\n\n      if (doc.variants) {\n        const variants: FileData[] = Object.values(doc.variants)\n        // Since forEach will not wait until unlink is finished it could\n        // happen that two operations will try to delete the same file.\n        // To avoid this it is recommended to use \"sync\" instead\n\n        for (const variant of variants) {\n          const variantToDelete = resolveFilePath({ filename: variant.filename, staticPath })\n          if (variantToDelete && !replacementFilePaths.has(variantToDelete)) {\n            await scheduleFileDeletion({ filePath: variantToDelete, req, staticPath })\n          }\n        }\n      }\n    }\n\n    if (cleanupScope) {\n      await flushDeferredCleanupScope({ req, scope: cleanupScope })\n    }\n  } catch (error) {\n    if (cleanupScope) {\n      clearDeferredCleanupScope({ req, scope: cleanupScope })\n    }\n\n    throw error\n  }\n}\n\nconst scheduleFileDeletion = async ({\n  filePath,\n  req,\n  staticPath,\n}: {\n  filePath?: string\n  req: PayloadRequest\n  staticPath?: string\n}): Promise<void> => {\n  let isFileDeletionSafe: boolean\n\n  try {\n    isFileDeletionSafe = await assertFileDeletionIsSafe({ filePath, staticPath })\n  } catch (ignore) {\n    throw new ErrorDeletingFile(req.t)\n  }\n\n  if (!isFileDeletionSafe) {\n    return\n  }\n\n  const fileIdentity = await getFileIdentity({ filePath: filePath! })\n\n  if (!fileIdentity) {\n    return\n  }\n\n  await scheduleAfterTransactionCommit({\n    callback: async () => {\n      try {\n        await deleteFile({ fileIdentity, filePath, staticPath })\n      } catch (ignore) {\n        throw new ErrorDeletingFile(req.t)\n      }\n    },\n    req,\n  })\n}\n\nconst resolveFilePath = ({\n  filename,\n  staticPath,\n}: {\n  filename?: null | string\n  staticPath?: string\n}) => {\n  if (!filename || !staticPath) {\n    return\n  }\n\n  const resolvedDir = path.resolve(staticPath)\n  const filePath = path.resolve(resolvedDir, filename)\n\n  if (!isWithinDirectory({ directory: resolvedDir, target: filePath })) {\n    throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST)\n  }\n\n  return filePath\n}\n\nconst deleteFile = async ({\n  fileIdentity,\n  filePath,\n  staticPath,\n}: {\n  fileIdentity: FileIdentity\n  filePath?: string\n  staticPath?: string\n}) => {\n  if (!(await assertFileDeletionIsSafe({ filePath, staticPath }))) {\n    return\n  }\n\n  const quarantinedFile = await quarantineFile({ filePath: filePath! })\n\n  if (!quarantinedFile) {\n    return\n  }\n\n  if (\n    !hasRenameStableFileIdentity({ actual: quarantinedFile.fileIdentity, expected: fileIdentity })\n  ) {\n    await restoreQuarantinedFile({ quarantinedFile, targetFilePath: filePath! })\n    return\n  }\n\n  await discardQuarantinedFile({ quarantinedFile })\n}\n\nconst assertFileDeletionIsSafe = async ({\n  filePath,\n  staticPath,\n}: {\n  filePath?: string\n  staticPath?: string\n}): Promise<boolean> => {\n  if (!filePath || !staticPath || !(await fileExists(filePath))) {\n    return false\n  }\n\n  const [resolvedDir, resolvedParent] = await Promise.all([\n    fs.realpath(staticPath),\n    fs.realpath(path.dirname(filePath)),\n  ])\n  const resolvedTarget = path.join(resolvedParent, path.basename(filePath))\n\n  if (!isWithinDirectory({ directory: resolvedDir, target: resolvedTarget })) {\n    throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST)\n  }\n\n  return true\n}\n\nconst isWithinDirectory = ({ directory, target }: { directory: string; target: string }) => {\n  const relativePath = path.relative(directory, target)\n\n  return (\n    relativePath === '' ||\n    (relativePath !== '..' &&\n      !relativePath.startsWith(`..${path.sep}`) &&\n      !path.isAbsolute(relativePath))\n  )\n}\n"],"names":["fs","path","APIError","ErrorDeletingFile","httpStatus","beginDeferredCleanupScopeIfNeeded","clearDeferredCleanupScope","flushDeferredCleanupScope","scheduleAfterTransactionCommit","fileExists","getFileIdentity","hasRenameStableFileIdentity","discardQuarantinedFile","quarantineFile","restoreQuarantinedFile","withLegacyUploadFileData","deleteAssociatedFiles","collectionConfig","config","doc","files","overrideDelete","req","upload","stored","collection","versions","original","cleanupScope","replacementFilePaths","Set","map","file","resolve","length","staticDir","staticPath","fileToDelete","resolveFilePath","filename","has","scheduleFileDeletion","filePath","variants","Object","values","variant","variantToDelete","scope","error","isFileDeletionSafe","assertFileDeletionIsSafe","ignore","t","fileIdentity","callback","deleteFile","resolvedDir","isWithinDirectory","directory","target","BAD_REQUEST","quarantinedFile","actual","expected","targetFilePath","resolvedParent","Promise","all","realpath","dirname","resolvedTarget","join","basename","relativePath","relative","startsWith","sep","isAbsolute"],"mappings":"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"}
+{"version":3,"sources":["../../src/uploads/deleteAssociatedFiles.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { FileData, FileToSave } from './types.js'\n\nimport { APIError, ErrorDeletingFile } from '../errors/index.js'\nimport { httpStatus } from '../utilities/httpStatus.js'\nimport { fileExists } from './fileExists.js'\nimport { withLegacyUploadFileData } from './fileVersioning/storedFiles.js'\n\ntype Args = {\n  collectionConfig: SanitizedCollectionConfig\n  config: SanitizedConfig\n  doc: Record<string, unknown>\n  files?: FileToSave[]\n  overrideDelete: boolean\n  req: PayloadRequest\n}\n\nexport const deleteAssociatedFiles: (args: Args) => Promise<void> = async ({\n  collectionConfig,\n  config,\n  doc,\n  files = [],\n  overrideDelete,\n  req,\n}) => {\n  if (!collectionConfig.upload) {\n    return\n  }\n  const stored = withLegacyUploadFileData({ collection: collectionConfig, config, doc })\n\n  if (collectionConfig.versions || stored.original) {\n    return\n  }\n  if (overrideDelete || files.length > 0) {\n    const { staticDir: staticPath } = collectionConfig.upload\n\n    const fileToDelete = resolveFilePath({\n      filename: doc.filename as string,\n      staticPath,\n    })\n\n    try {\n      await deleteFile({ filePath: fileToDelete, staticPath })\n    } catch (ignore) {\n      throw new ErrorDeletingFile(req.t)\n    }\n\n    if (doc.variants) {\n      const sizes: FileData[] = Object.values(doc.variants)\n      // Since forEach will not wait until unlink is finished it could\n      // happen that two operations will try to delete the same file.\n      // To avoid this it is recommended to use \"sync\" instead\n\n      for (const size of sizes) {\n        const sizeToDelete = resolveFilePath({ filename: size.filename, staticPath })\n        try {\n          await deleteFile({ filePath: sizeToDelete, staticPath })\n        } catch (ignore) {\n          throw new ErrorDeletingFile(req.t)\n        }\n      }\n    }\n  }\n}\n\nconst resolveFilePath = ({\n  filename,\n  staticPath,\n}: {\n  filename?: null | string\n  staticPath?: string\n}) => {\n  if (!filename || !staticPath) {\n    return\n  }\n\n  const resolvedDir = path.resolve(staticPath)\n  const filePath = path.resolve(resolvedDir, filename)\n\n  if (!isWithinDirectory({ directory: resolvedDir, target: filePath })) {\n    throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST)\n  }\n\n  return filePath\n}\n\nconst deleteFile = async ({ filePath, staticPath }: { filePath?: string; staticPath?: string }) => {\n  if (!filePath || !staticPath) {\n    return\n  }\n\n  if (!(await fileExists(filePath))) {\n    return\n  }\n\n  const [resolvedDir, resolvedParent] = await Promise.all([\n    fs.realpath(staticPath),\n    fs.realpath(path.dirname(filePath)),\n  ])\n  const resolvedTarget = path.join(resolvedParent, path.basename(filePath))\n\n  if (!isWithinDirectory({ directory: resolvedDir, target: resolvedTarget })) {\n    throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST)\n  }\n\n  await fs.unlink(filePath)\n}\n\nconst isWithinDirectory = ({ directory, target }: { directory: string; target: string }) => {\n  const relativePath = path.relative(directory, target)\n\n  return (\n    relativePath === '' ||\n    (relativePath !== '..' &&\n      !relativePath.startsWith(`..${path.sep}`) &&\n      !path.isAbsolute(relativePath))\n  )\n}\n"],"names":["fs","path","APIError","ErrorDeletingFile","httpStatus","fileExists","withLegacyUploadFileData","deleteAssociatedFiles","collectionConfig","config","doc","files","overrideDelete","req","upload","stored","collection","versions","original","length","staticDir","staticPath","fileToDelete","resolveFilePath","filename","deleteFile","filePath","ignore","t","variants","sizes","Object","values","size","sizeToDelete","resolvedDir","resolve","isWithinDirectory","directory","target","BAD_REQUEST","resolvedParent","Promise","all","realpath","dirname","resolvedTarget","join","basename","unlink","relativePath","relative","startsWith","sep","isAbsolute"],"mappings":"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"}

package/dist/uploads/endpoints/getFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../../../src/uploads/endpoints/getFile.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAkBvD,eAAO,MAAM,cAAc,EAAE,cAqD5B,CAAA;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,UAAU,EACV,GAAG,EACH,QAAQ,EACR,SAAkB,EAClB,MAAM,EACN,GAAG,GACJ,EAAE;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,GAAG,CAAC,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,oBAAoB,CAAA;IAChC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,cAAc,CAAA;CACpB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiJpB"}
+{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../../../src/uploads/endpoints/getFile.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAiBvD,eAAO,MAAM,cAAc,EAAE,cAmD5B,CAAA;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,UAAU,EACV,GAAG,EACH,QAAQ,EACR,SAAkB,EAClB,MAAM,EACN,GAAG,GACJ,EAAE;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,GAAG,CAAC,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,oBAAoB,CAAA;IAChC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,cAAc,CAAA;CACpB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiJpB"}

package/dist/uploads/endpoints/getFile.js

@@ -1,7 +1,6 @@
 import { fileTypeFromFile } from 'file-type';
 import fsPromises from 'fs/promises';
 import path from 'path';
-import { assertBranchReadable } from '../../branching/assertBranchReadable.js';
 import { APIError } from '../../errors/APIError.js';
 import { NotFound } from '../../errors/NotFound.js';
 import { getRequestCollection } from '../../utilities/getRequestEntity.js';
@@ -23,10 +22,6 @@ export const getFileHandler = async (req)=>{
     if (!collection.config.upload) {
         throw new APIError(`This collection is not an upload collection: ${collection.config.slug}`, httpStatus.BAD_REQUEST);
     }
-    await assertBranchReadable({
-        collectionSlug: collection.config.slug,
-        req
-    });
     const versionID = req.searchParams?.get('version');
     if (collection.config.versions && versionID) {
         const historical = await resolveHistoricalFile({

package/dist/uploads/endpoints/getFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/uploads/endpoints/getFile.ts"],"sourcesContent":["import type { Stats } from 'fs'\n\nimport { fileTypeFromFile } from 'file-type'\nimport fsPromises from 'fs/promises'\nimport path from 'path'\n\nimport type { Collection, TypeWithID } from '../../collections/config/types.js'\nimport type { PayloadHandler } from '../../config/types.js'\nimport type { PayloadRequest } from '../../types/index.js'\nimport type { FileHandlerOperation } from '../types.js'\n\nimport { assertBranchReadable } from '../../branching/assertBranchReadable.js'\nimport { APIError } from '../../errors/APIError.js'\nimport { NotFound } from '../../errors/NotFound.js'\nimport { getRequestCollection } from '../../utilities/getRequestEntity.js'\nimport { headersWithCors } from '../../utilities/headersWithCors.js'\nimport { httpStatus } from '../../utilities/httpStatus.js'\nimport { checkFileAccess } from '../checkFileAccess.js'\nimport { streamFile } from '../fetchAPI-stream-file/index.js'\nimport { resolveHistoricalFile } from '../fileVersioning/resolveHistoricalFile.js'\nimport { getFileTypeFallback } from '../getFileTypeFallback.js'\nimport { getFileExtension, isXmlMimeType } from '../getFileTypeIdentity.js'\nimport { parseRangeHeader } from '../parseRangeHeader.js'\nimport { handleDynamicFileRequest } from '../transformers/handleDynamicFileRequest.js'\nimport { resolveUploadDocument } from '../transformers/resolveUploadDocument.js'\nimport { uploadContentSecurityPolicy } from '../uploadContentSecurityPolicy.js'\n\nexport const getFileHandler: PayloadHandler = async (req) => {\n  const collection = getRequestCollection(req)\n\n  const filename = req.routeParams?.filename as string\n  const prefix = req.searchParams?.get('prefix') ?? undefined\n\n  if (!collection.config.upload) {\n    throw new APIError(\n      `This collection is not an upload collection: ${collection.config.slug}`,\n      httpStatus.BAD_REQUEST,\n    )\n  }\n\n  await assertBranchReadable({ collectionSlug: collection.config.slug, req })\n\n  const versionID = req.searchParams?.get('version')\n\n  if (collection.config.versions && versionID) {\n    const historical = await resolveHistoricalFile({\n      collection,\n      filename,\n      prefix,\n      req,\n      versionID,\n    })\n\n    return retrieveFileResponse({ collection, doc: historical, filename, prefix, req })\n  }\n\n  if (req.payload.config.upload.transformers.length > 0) {\n    return handleDynamicFileRequest({ collection, filename, prefix, req })\n  }\n\n  const accessResult = (await checkFileAccess({\n    collection,\n    filename,\n    prefix,\n    req,\n  }))!\n\n  if (accessResult instanceof Response) {\n    return accessResult\n  }\n\n  const current = collection.config.versions\n    ? (accessResult ?? (await resolveUploadDocument({ collection, filename, prefix, req })))\n    : undefined\n\n  if (collection.config.versions && !current) {\n    throw new NotFound(req.t)\n  }\n\n  return retrieveFileResponse({ collection, doc: accessResult ?? current, filename, prefix, req })\n}\n\n/**\n * Shared by the ordinary `read` endpoint and, via `operation: 'transform'`, by\n * `getSourceFileResponse` for internal source retrieval. `transform` ignores the\n * `Range` header and skips `modifyResponseHeaders`/CORS wrapping, since those are\n * applied once, later, to the transformer pipeline's final response.\n */\nexport async function retrieveFileResponse({\n  collection,\n  doc,\n  filename,\n  operation = 'read',\n  prefix,\n  req,\n}: {\n  collection: Collection\n  doc?: TypeWithID\n  filename: string\n  operation?: FileHandlerOperation\n  prefix?: string\n  req: PayloadRequest\n}): Promise<Response> {\n  if (collection.config.upload && collection.config.upload.handlers?.length) {\n    let customResponse: null | Response | void = null\n    const headers = new Headers()\n\n    for (const handler of collection.config.upload.handlers) {\n      customResponse = await handler(req, {\n        doc: doc!,\n        headers,\n        params: {\n          collection: collection.config.slug,\n          filename,\n          operation,\n          prefix,\n        },\n      })\n      if (customResponse && customResponse instanceof Response) {\n        break\n      }\n    }\n\n    if (customResponse instanceof Response) {\n      return customResponse\n    }\n  }\n\n  // Local filesystem fallback — cloud storage handlers return a Response above\n  // and have their own filename validation via sanitizeFilename.\n  const fileDir = collection.config.upload?.staticDir || collection.config.slug\n  const resolvedDir = path.resolve(fileDir)\n  const filePath = path.resolve(resolvedDir, filename)\n\n  if (!filePath.startsWith(resolvedDir + path.sep)) {\n    throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST)\n  }\n\n  let stats: Stats\n\n  try {\n    stats = await fsPromises.stat(filePath)\n  } catch (err) {\n    if ((err as { code?: string }).code === 'ENOENT') {\n      req.payload.logger.error(\n        `File ${filename} for collection ${collection.config.slug} is missing on the disk. Expected path: ${filePath}`,\n      )\n\n      // Omit going to the routeError handler by returning response instead of\n      // throwing an error to cut down log noise. The response still matches what you get with APIError to not leak details to the user.\n      return Response.json(\n        {\n          errors: [\n            {\n              message: 'Something went wrong.',\n            },\n          ],\n        },\n        {\n          headers: headersWithCors({\n            headers: new Headers(),\n            req,\n          }),\n          status: 500,\n        },\n      )\n    }\n\n    throw err\n  }\n\n  const fileTypeResult = (await fileTypeFromFile(filePath)) || getFileTypeFallback(filePath)\n  let mimeType = fileTypeResult.mime\n\n  if (\n    getFileExtension(filePath).toLowerCase() === 'svg' &&\n    fileTypeResult.mime === 'application/xml'\n  ) {\n    mimeType = 'image/svg+xml'\n  }\n\n  const isTransformSource = operation === 'transform'\n\n  // The client's Range header must never leak into an internal source retrieval —\n  // a transformer needs the complete original bytes to decode.\n  const rangeHeader = isTransformSource ? null : req.headers.get('range')\n  const rangeResult = parseRangeHeader({\n    fileSize: stats.size,\n    rangeHeader,\n  })\n\n  if (rangeResult.type === 'invalid') {\n    let headers = new Headers()\n    headers.set('Content-Range', `bytes */${stats.size}`)\n    headers = collection.config.upload?.modifyResponseHeaders\n      ? collection.config.upload.modifyResponseHeaders({ headers }) || headers\n      : headers\n\n    return new Response(null, {\n      headers: headersWithCors({\n        headers,\n        req,\n      }),\n      status: httpStatus.REQUESTED_RANGE_NOT_SATISFIABLE,\n    })\n  }\n\n  let headers = new Headers()\n  headers.set('Content-Type', mimeType)\n  headers.set('Accept-Ranges', 'bytes')\n\n  if (isXmlMimeType(mimeType)) {\n    headers.set('Content-Security-Policy', uploadContentSecurityPolicy)\n  }\n\n  let data: ReadableStream\n  let status: number\n  const isPartial = rangeResult.type === 'partial'\n  const range = rangeResult.range\n\n  if (isPartial && range) {\n    const contentLength = range.end - range.start + 1\n    headers.set('Content-Length', String(contentLength))\n    headers.set('Content-Range', `bytes ${range.start}-${range.end}/${stats.size}`)\n    data = streamFile({ filePath, options: { end: range.end, start: range.start } })\n    status = httpStatus.PARTIAL_CONTENT\n  } else {\n    headers.set('Content-Length', String(stats.size))\n    data = streamFile({ filePath })\n    status = httpStatus.OK\n  }\n\n  if (isTransformSource) {\n    return new Response(data, { headers, status })\n  }\n\n  headers = collection.config.upload?.modifyResponseHeaders\n    ? collection.config.upload.modifyResponseHeaders({ headers }) || headers\n    : headers\n\n  return new Response(data, {\n    headers: headersWithCors({\n      headers,\n      req,\n    }),\n    status,\n  })\n}\n"],"names":["fileTypeFromFile","fsPromises","path","assertBranchReadable","APIError","NotFound","getRequestCollection","headersWithCors","httpStatus","checkFileAccess","streamFile","resolveHistoricalFile","getFileTypeFallback","getFileExtension","isXmlMimeType","parseRangeHeader","handleDynamicFileRequest","resolveUploadDocument","uploadContentSecurityPolicy","getFileHandler","req","collection","filename","routeParams","prefix","searchParams","get","undefined","config","upload","slug","BAD_REQUEST","collectionSlug","versionID","versions","historical","retrieveFileResponse","doc","payload","transformers","length","accessResult","Response","current","t","operation","handlers","customResponse","headers","Headers","handler","params","fileDir","staticDir","resolvedDir","resolve","filePath","startsWith","sep","stats","stat","err","code","logger","error","json","errors","message","status","fileTypeResult","mimeType","mime","toLowerCase","isTransformSource","rangeHeader","rangeResult","fileSize","size","type","set","modifyResponseHeaders","REQUESTED_RANGE_NOT_SATISFIABLE","data","isPartial","range","contentLength","end","start","String","options","PARTIAL_CONTENT","OK"],"mappings":"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"}
+{"version":3,"sources":["../../../src/uploads/endpoints/getFile.ts"],"sourcesContent":["import type { Stats } from 'fs'\n\nimport { fileTypeFromFile } from 'file-type'\nimport fsPromises from 'fs/promises'\nimport path from 'path'\n\nimport type { Collection, TypeWithID } from '../../collections/config/types.js'\nimport type { PayloadHandler } from '../../config/types.js'\nimport type { PayloadRequest } from '../../types/index.js'\nimport type { FileHandlerOperation } from '../types.js'\n\nimport { APIError } from '../../errors/APIError.js'\nimport { NotFound } from '../../errors/NotFound.js'\nimport { getRequestCollection } from '../../utilities/getRequestEntity.js'\nimport { headersWithCors } from '../../utilities/headersWithCors.js'\nimport { httpStatus } from '../../utilities/httpStatus.js'\nimport { checkFileAccess } from '../checkFileAccess.js'\nimport { streamFile } from '../fetchAPI-stream-file/index.js'\nimport { resolveHistoricalFile } from '../fileVersioning/resolveHistoricalFile.js'\nimport { getFileTypeFallback } from '../getFileTypeFallback.js'\nimport { getFileExtension, isXmlMimeType } from '../getFileTypeIdentity.js'\nimport { parseRangeHeader } from '../parseRangeHeader.js'\nimport { handleDynamicFileRequest } from '../transformers/handleDynamicFileRequest.js'\nimport { resolveUploadDocument } from '../transformers/resolveUploadDocument.js'\nimport { uploadContentSecurityPolicy } from '../uploadContentSecurityPolicy.js'\n\nexport const getFileHandler: PayloadHandler = async (req) => {\n  const collection = getRequestCollection(req)\n\n  const filename = req.routeParams?.filename as string\n  const prefix = req.searchParams?.get('prefix') ?? undefined\n\n  if (!collection.config.upload) {\n    throw new APIError(\n      `This collection is not an upload collection: ${collection.config.slug}`,\n      httpStatus.BAD_REQUEST,\n    )\n  }\n\n  const versionID = req.searchParams?.get('version')\n\n  if (collection.config.versions && versionID) {\n    const historical = await resolveHistoricalFile({\n      collection,\n      filename,\n      prefix,\n      req,\n      versionID,\n    })\n\n    return retrieveFileResponse({ collection, doc: historical, filename, prefix, req })\n  }\n\n  if (req.payload.config.upload.transformers.length > 0) {\n    return handleDynamicFileRequest({ collection, filename, prefix, req })\n  }\n\n  const accessResult = (await checkFileAccess({\n    collection,\n    filename,\n    prefix,\n    req,\n  }))!\n\n  if (accessResult instanceof Response) {\n    return accessResult\n  }\n\n  const current = collection.config.versions\n    ? (accessResult ?? (await resolveUploadDocument({ collection, filename, prefix, req })))\n    : undefined\n\n  if (collection.config.versions && !current) {\n    throw new NotFound(req.t)\n  }\n\n  return retrieveFileResponse({ collection, doc: accessResult ?? current, filename, prefix, req })\n}\n\n/**\n * Shared by the ordinary `read` endpoint and, via `operation: 'transform'`, by\n * `getSourceFileResponse` for internal source retrieval. `transform` ignores the\n * `Range` header and skips `modifyResponseHeaders`/CORS wrapping, since those are\n * applied once, later, to the transformer pipeline's final response.\n */\nexport async function retrieveFileResponse({\n  collection,\n  doc,\n  filename,\n  operation = 'read',\n  prefix,\n  req,\n}: {\n  collection: Collection\n  doc?: TypeWithID\n  filename: string\n  operation?: FileHandlerOperation\n  prefix?: string\n  req: PayloadRequest\n}): Promise<Response> {\n  if (collection.config.upload && collection.config.upload.handlers?.length) {\n    let customResponse: null | Response | void = null\n    const headers = new Headers()\n\n    for (const handler of collection.config.upload.handlers) {\n      customResponse = await handler(req, {\n        doc: doc!,\n        headers,\n        params: {\n          collection: collection.config.slug,\n          filename,\n          operation,\n          prefix,\n        },\n      })\n      if (customResponse && customResponse instanceof Response) {\n        break\n      }\n    }\n\n    if (customResponse instanceof Response) {\n      return customResponse\n    }\n  }\n\n  // Local filesystem fallback — cloud storage handlers return a Response above\n  // and have their own filename validation via sanitizeFilename.\n  const fileDir = collection.config.upload?.staticDir || collection.config.slug\n  const resolvedDir = path.resolve(fileDir)\n  const filePath = path.resolve(resolvedDir, filename)\n\n  if (!filePath.startsWith(resolvedDir + path.sep)) {\n    throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST)\n  }\n\n  let stats: Stats\n\n  try {\n    stats = await fsPromises.stat(filePath)\n  } catch (err) {\n    if ((err as { code?: string }).code === 'ENOENT') {\n      req.payload.logger.error(\n        `File ${filename} for collection ${collection.config.slug} is missing on the disk. Expected path: ${filePath}`,\n      )\n\n      // Omit going to the routeError handler by returning response instead of\n      // throwing an error to cut down log noise. The response still matches what you get with APIError to not leak details to the user.\n      return Response.json(\n        {\n          errors: [\n            {\n              message: 'Something went wrong.',\n            },\n          ],\n        },\n        {\n          headers: headersWithCors({\n            headers: new Headers(),\n            req,\n          }),\n          status: 500,\n        },\n      )\n    }\n\n    throw err\n  }\n\n  const fileTypeResult = (await fileTypeFromFile(filePath)) || getFileTypeFallback(filePath)\n  let mimeType = fileTypeResult.mime\n\n  if (\n    getFileExtension(filePath).toLowerCase() === 'svg' &&\n    fileTypeResult.mime === 'application/xml'\n  ) {\n    mimeType = 'image/svg+xml'\n  }\n\n  const isTransformSource = operation === 'transform'\n\n  // The client's Range header must never leak into an internal source retrieval —\n  // a transformer needs the complete original bytes to decode.\n  const rangeHeader = isTransformSource ? null : req.headers.get('range')\n  const rangeResult = parseRangeHeader({\n    fileSize: stats.size,\n    rangeHeader,\n  })\n\n  if (rangeResult.type === 'invalid') {\n    let headers = new Headers()\n    headers.set('Content-Range', `bytes */${stats.size}`)\n    headers = collection.config.upload?.modifyResponseHeaders\n      ? collection.config.upload.modifyResponseHeaders({ headers }) || headers\n      : headers\n\n    return new Response(null, {\n      headers: headersWithCors({\n        headers,\n        req,\n      }),\n      status: httpStatus.REQUESTED_RANGE_NOT_SATISFIABLE,\n    })\n  }\n\n  let headers = new Headers()\n  headers.set('Content-Type', mimeType)\n  headers.set('Accept-Ranges', 'bytes')\n\n  if (isXmlMimeType(mimeType)) {\n    headers.set('Content-Security-Policy', uploadContentSecurityPolicy)\n  }\n\n  let data: ReadableStream\n  let status: number\n  const isPartial = rangeResult.type === 'partial'\n  const range = rangeResult.range\n\n  if (isPartial && range) {\n    const contentLength = range.end - range.start + 1\n    headers.set('Content-Length', String(contentLength))\n    headers.set('Content-Range', `bytes ${range.start}-${range.end}/${stats.size}`)\n    data = streamFile({ filePath, options: { end: range.end, start: range.start } })\n    status = httpStatus.PARTIAL_CONTENT\n  } else {\n    headers.set('Content-Length', String(stats.size))\n    data = streamFile({ filePath })\n    status = httpStatus.OK\n  }\n\n  if (isTransformSource) {\n    return new Response(data, { headers, status })\n  }\n\n  headers = collection.config.upload?.modifyResponseHeaders\n    ? collection.config.upload.modifyResponseHeaders({ headers }) || headers\n    : headers\n\n  return new Response(data, {\n    headers: headersWithCors({\n      headers,\n      req,\n    }),\n    status,\n  })\n}\n"],"names":["fileTypeFromFile","fsPromises","path","APIError","NotFound","getRequestCollection","headersWithCors","httpStatus","checkFileAccess","streamFile","resolveHistoricalFile","getFileTypeFallback","getFileExtension","isXmlMimeType","parseRangeHeader","handleDynamicFileRequest","resolveUploadDocument","uploadContentSecurityPolicy","getFileHandler","req","collection","filename","routeParams","prefix","searchParams","get","undefined","config","upload","slug","BAD_REQUEST","versionID","versions","historical","retrieveFileResponse","doc","payload","transformers","length","accessResult","Response","current","t","operation","handlers","customResponse","headers","Headers","handler","params","fileDir","staticDir","resolvedDir","resolve","filePath","startsWith","sep","stats","stat","err","code","logger","error","json","errors","message","status","fileTypeResult","mimeType","mime","toLowerCase","isTransformSource","rangeHeader","rangeResult","fileSize","size","type","set","modifyResponseHeaders","REQUESTED_RANGE_NOT_SATISFIABLE","data","isPartial","range","contentLength","end","start","String","options","PARTIAL_CONTENT","OK"],"mappings":"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"}

package/dist/uploads/fileExists.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileExists.d.ts","sourceRoot":"","sources":["../../src/uploads/fileExists.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,aAAoB,MAAM,KAAG,OAAO,CAAC,OAAO,CAYlE,CAAA"}
+{"version":3,"file":"fileExists.d.ts","sourceRoot":"","sources":["../../src/uploads/fileExists.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,aAAoB,MAAM,KAAG,OAAO,CAAC,OAAO,CAQlE,CAAA"}

package/dist/uploads/fileExists.js

@@ -3,11 +3,8 @@ export const fileExists = async (filename)=>{
     try {
         await fs.stat(filename);
         return true;
-    } catch (error) {
-        if (error.code === 'ENOENT') {
-            return false;
-        }
-        throw error;
+    } catch (ignore) {
+        return false;
     }
 };
 

package/dist/uploads/fileExists.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/fileExists.ts"],"sourcesContent":["import fs from 'fs/promises'\n\nexport const fileExists = async (filename: string): Promise<boolean> => {\n  try {\n    await fs.stat(filename)\n\n    return true\n  } catch (error) {\n    if ((error as NodeJS.ErrnoException).code === 'ENOENT') {\n      return false\n    }\n\n    throw error\n  }\n}\n"],"names":["fs","fileExists","filename","stat","error","code"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAE5B,OAAO,MAAMC,aAAa,OAAOC;IAC/B,IAAI;QACF,MAAMF,GAAGG,IAAI,CAACD;QAEd,OAAO;IACT,EAAE,OAAOE,OAAO;QACd,IAAI,AAACA,MAAgCC,IAAI,KAAK,UAAU;YACtD,OAAO;QACT;QAEA,MAAMD;IACR;AACF,EAAC"}
+{"version":3,"sources":["../../src/uploads/fileExists.ts"],"sourcesContent":["import fs from 'fs/promises'\n\nexport const fileExists = async (filename: string): Promise<boolean> => {\n  try {\n    await fs.stat(filename)\n\n    return true\n  } catch (ignore) {\n    return false\n  }\n}\n"],"names":["fs","fileExists","filename","stat","ignore"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAE5B,OAAO,MAAMC,aAAa,OAAOC;IAC/B,IAAI;QACF,MAAMF,GAAGG,IAAI,CAACD;QAEd,OAAO;IACT,EAAE,OAAOE,QAAQ;QACf,OAAO;IACT;AACF,EAAC"}

package/dist/uploads/fileVersioning/archive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../../src/uploads/fileVersioning/archive.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AA2BhD,eAAO,MAAM,kBAAkB,GAAU,CAAC,yDAQvC;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,OAAO,EAAE,UAAU,CAAA;IACnB,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,IAAI,EAAE,UAAU,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAA;CACxB,KAAG,OAAO,CAAC,CAAC,CA0DZ,CAAA;AA4BD,gGAAgG;AAChG,eAAO,MAAM,yBAAyB,+DAOnC;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,OAAO,EAAE,UAAU,CAAA;IACnB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,IAAI,EAAE,UAAU,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,iBAAiB,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAA;CAClD,KAAG,OAAO,CAAC,IAAI,CAsHf,CAAA;AAiDD,eAAO,MAAM,2BAA2B,sCAIrC;IACD,KAAK,EAAE,cAAc,CAAA;IACrB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,OAAO,EAAE,UAAU,CAAA;CACpB,KAAG,UAAU,GAAG,SA+ChB,CAAA"}
+{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../../src/uploads/fileVersioning/archive.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAuBhD,eAAO,MAAM,kBAAkB,GAAU,CAAC,yDAQvC;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,OAAO,EAAE,UAAU,CAAA;IACnB,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,IAAI,EAAE,UAAU,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAA;CACxB,KAAG,OAAO,CAAC,CAAC,CA0DZ,CAAA;AA4BD,gGAAgG;AAChG,eAAO,MAAM,yBAAyB,+DAOnC;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,OAAO,EAAE,UAAU,CAAA;IACnB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,IAAI,EAAE,UAAU,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,iBAAiB,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAA;CAClD,KAAG,OAAO,CAAC,IAAI,CAkHf,CAAA;AA2CD,eAAO,MAAM,2BAA2B,sCAIrC;IACD,KAAK,EAAE,cAAc,CAAA;IACrB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,OAAO,EAAE,UAAU,CAAA;CACpB,KAAG,UAAU,GAAG,SA+ChB,CAAA"}

package/dist/uploads/fileVersioning/archive.js

@@ -1,7 +1,5 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { resolveBranchRowID } from '../../branching/resolveBranchRowID.js';
-import { branchField, branchParentField } from '../../branching/types.js';
 import { saveVersion } from '../../versions/saveVersion.js';
 import { removeUnreferencedStagedObjects, scheduleUnreferencedFileCleanup } from './cleanup.js';
 import { runFileOperationPlan, stageLocalUploadFiles } from './fileOperationManager.js';
@@ -181,12 +179,6 @@ export const runLocalFileUpdate = async ({ id, collection, current, files, next,
             collection: collection.slug,
             req,
             versionData: {
-                ...row[branchField] !== undefined ? {
-                    [branchField]: row[branchField]
-                } : {},
-                ...row[branchParentField] !== undefined ? {
-                    [branchParentField]: row[branchParentField]
-                } : {},
                 createdAt: row.createdAt,
                 latest: row.latest,
                 parent: row.parent,
@@ -218,13 +210,7 @@ const getOutgoingLocalFiles = ({ collection, config, current, next, req })=>{
     return currentFiles.filter((file)=>!nextIdentities.has(getStoredFileIdentity(file)));
 };
 const getVersions = async ({ id, collection, req })=>{
-    const versionParent = await resolveBranchRowID({
-        id,
-        collectionSlug: collection.slug,
-        req
-    });
     const { docs } = await req.payload.db.findVersions({
-        branch: false,
         collection: collection.slug,
         limit: 0,
         pagination: false,
@@ -232,7 +218,7 @@ const getVersions = async ({ id, collection, req })=>{
         sort: '-updatedAt',
         where: {
             parent: {
-                equals: versionParent
+                equals: id
             }
         }
     });

package/dist/uploads/fileVersioning/archive.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/uploads/fileVersioning/archive.ts"],"sourcesContent":["import fs from 'node:fs/promises'\nimport path from 'node:path'\n\nimport type { SanitizedCollectionConfig } from '../../collections/config/types.js'\nimport type { Config } from '../../config/types.js'\nimport type { JsonObject, PayloadRequest } from '../../types/index.js'\nimport type { FileToSave } from '../types.js'\nimport type { StagedObject } from './fileOperationManager.js'\nimport type { StoredFileList } from './types.js'\n\nimport { resolveBranchRowID } from '../../branching/resolveBranchRowID.js'\nimport { branchField, branchParentField } from '../../branching/types.js'\nimport { saveVersion } from '../../versions/saveVersion.js'\nimport { removeUnreferencedStagedObjects, scheduleUnreferencedFileCleanup } from './cleanup.js'\nimport { runFileOperationPlan, stageLocalUploadFiles } from './fileOperationManager.js'\nimport { copyLocalFile } from './localStorage.js'\nimport { getArchivedFilename } from './naming.js'\nimport {\n  collectStoredFiles,\n  getStoredFileIdentity,\n  withLegacyUploadFileData,\n} from './storedFiles.js'\n\ntype VersionRow = {\n  [branchField]?: null | string\n  [branchParentField]?: null | number | string\n  createdAt: string\n  id: number | string\n  latest?: boolean\n  parent: number | string\n  publishedLocale?: string\n  updatedAt: string\n  version: JsonObject\n}\n\nexport const runLocalFileUpdate = async <T>({\n  id,\n  collection,\n  current,\n  files,\n  next,\n  req,\n  write,\n}: {\n  collection: SanitizedCollectionConfig\n  current: JsonObject\n  files: FileToSave[]\n  id: number | string\n  next: JsonObject\n  req: PayloadRequest\n  write: () => Promise<T>\n}): Promise<T> => {\n  const storedCurrent = withLegacyUploadFileData({\n    collection,\n    config: req.payload.config,\n    doc: current,\n  })\n  const nextDoc = { ...storedCurrent, ...next }\n\n  if (\n    !hasLocalFileChange({\n      collection,\n      config: req.payload.config,\n      current,\n      hasNewFiles: files.length > 0,\n      next: nextDoc,\n      req,\n    })\n  ) {\n    return write()\n  }\n\n  return runFileOperationPlan({\n    cleanupStagedAfterWriteFailure: (objects) =>\n      removeUnreferencedStagedObjects({ collection, objects, req }),\n    req,\n    stage: ({ trackStagedObject }) =>\n      stageLocalUploadFiles({\n        files,\n        staticDir: collection.upload.staticDir!,\n        trackStagedObject,\n      }),\n    write: async ({ trackStagedObject }) => {\n      await archiveOutgoingLocalFiles({\n        id,\n        collection,\n        current,\n        next: nextDoc,\n        req,\n        trackStagedObject,\n      })\n\n      const result = await write()\n\n      await scheduleUnreferencedFileCleanup({\n        candidates: getOutgoingLocalFiles({\n          collection,\n          config: req.payload.config,\n          current,\n          next: nextDoc,\n          req,\n        }),\n        collection,\n        req,\n      })\n\n      return result\n    },\n  })\n}\n\n/** Also detects removals, which have no new upload to stage. */\nconst hasLocalFileChange = ({\n  collection,\n  config,\n  current,\n  hasNewFiles,\n  next,\n  req,\n}: {\n  collection: SanitizedCollectionConfig\n  config: Pick<Config, 'routes' | 'serverURL'>\n  current: JsonObject\n  hasNewFiles: boolean\n  next: JsonObject\n  req: PayloadRequest\n}): boolean =>\n  !collection.upload.disableLocalStorage &&\n  (hasNewFiles ||\n    getOutgoingLocalFiles({\n      collection,\n      config,\n      current,\n      next,\n      req,\n    }).length > 0)\n\n/** Preserves outgoing local objects and repairs every retained version that referenced them. */\nexport const archiveOutgoingLocalFiles = async ({\n  id,\n  collection,\n  current,\n  next,\n  req,\n  trackStagedObject,\n}: {\n  collection: SanitizedCollectionConfig\n  current: JsonObject\n  id: number | string\n  next: JsonObject\n  req: PayloadRequest\n  trackStagedObject: (object: StagedObject) => void\n}): Promise<void> => {\n  const outgoing = getOutgoingLocalFiles({\n    collection,\n    config: req.payload.config,\n    current,\n    next,\n    req,\n  })\n\n  if (!outgoing.length || !collection.versions) {\n    return\n  }\n\n  const currentWithState = withLegacyUploadFileData({\n    collection,\n    config: req.payload.config,\n    doc: current,\n  })\n  let versions = await getVersions({ id, collection, req })\n\n  if (!versions.length) {\n    await saveVersion({\n      id,\n      collection,\n      docWithLocales: currentWithState,\n      draft: false,\n      operation: 'update',\n      payload: req.payload,\n      req,\n    })\n    versions = await getVersions({ id, collection, req })\n  }\n\n  const replacements = new Map<string, string>()\n  for (const file of outgoing) {\n    const identity = getStoredFileIdentity(file)\n    const newestVersion = versions.find(({ version }) => {\n      const stored = withLegacyUploadFileData({\n        collection,\n        config: req.payload.config,\n        doc: version,\n      })\n\n      return collectStoredFiles({ collection, doc: stored, req }).some(\n        (candidate) => getStoredFileIdentity(candidate) === identity,\n      )\n    })\n\n    if (!newestVersion) {\n      continue\n    }\n\n    const directory = path.posix.dirname(file.key)\n    let archivedKey: string\n    let suffix = 0\n\n    while (true) {\n      const archivedFilename = getArchivedFilename({\n        filename: path.posix.basename(file.key),\n        versionID: suffix ? `${newestVersion.id}-${suffix}` : newestVersion.id,\n      })\n      archivedKey = directory === '.' ? archivedFilename : `${directory}/${archivedFilename}`\n\n      try {\n        await copyLocalFile({\n          from: file.key,\n          staticDir: collection.upload.staticDir!,\n          to: archivedKey,\n        })\n        break\n      } catch (err) {\n        if ((err as NodeJS.ErrnoException).code !== 'EEXIST') {\n          throw err\n        }\n        suffix += 1\n      }\n    }\n    trackStagedObject({\n      key: archivedKey,\n      remove: () => fs.rm(path.join(collection.upload.staticDir!, archivedKey), { force: true }),\n    })\n    replacements.set(identity, archivedKey)\n  }\n\n  for (const row of versions) {\n    const stored = withLegacyUploadFileData({\n      collection,\n      config: req.payload.config,\n      doc: row.version,\n    })\n    const version = replaceStoredFileReferences({\n      files: collectStoredFiles({ collection, doc: stored, req }),\n      replacements,\n      version: stored,\n    })\n\n    if (!version) {\n      continue\n    }\n\n    await req.payload.db.updateVersion({\n      id: row.id,\n      collection: collection.slug,\n      req,\n      versionData: {\n        ...(row[branchField] !== undefined ? { [branchField]: row[branchField] } : {}),\n        ...(row[branchParentField] !== undefined\n          ? { [branchParentField]: row[branchParentField] }\n          : {}),\n        createdAt: row.createdAt,\n        latest: row.latest,\n        parent: row.parent,\n        publishedLocale: row.publishedLocale,\n        updatedAt: row.updatedAt,\n        version,\n      },\n    })\n  }\n}\n\nconst getOutgoingLocalFiles = ({\n  collection,\n  config,\n  current,\n  next,\n  req,\n}: {\n  collection: SanitizedCollectionConfig\n  config: Pick<Config, 'routes' | 'serverURL'>\n  current: JsonObject\n  next: JsonObject\n  req: PayloadRequest\n}): StoredFileList => {\n  const currentWithState = withLegacyUploadFileData({ collection, config, doc: current })\n  const currentFiles = collectStoredFiles({ collection, doc: currentWithState, req })\n  const nextFiles = collectStoredFiles({ collection, doc: next, req, trustGenerated: true })\n  const nextIdentities = new Set(nextFiles.map(getStoredFileIdentity))\n  return currentFiles.filter((file) => !nextIdentities.has(getStoredFileIdentity(file)))\n}\n\nconst getVersions = async ({\n  id,\n  collection,\n  req,\n}: {\n  collection: SanitizedCollectionConfig\n  id: number | string\n  req: PayloadRequest\n}): Promise<VersionRow[]> => {\n  const versionParent = await resolveBranchRowID({\n    id,\n    collectionSlug: collection.slug,\n    req,\n  })\n  const { docs } = await req.payload.db.findVersions<JsonObject>({\n    branch: false,\n    collection: collection.slug,\n    limit: 0,\n    pagination: false,\n    req,\n    sort: '-updatedAt',\n    where: { parent: { equals: versionParent } },\n  })\n\n  return docs as VersionRow[]\n}\n\nexport const replaceStoredFileReferences = ({\n  files,\n  replacements,\n  version,\n}: {\n  files: StoredFileList\n  replacements: Map<string, string>\n  version: JsonObject\n}): JsonObject | undefined => {\n  if (!files.length) {\n    return\n  }\n\n  const archived = structuredClone(version)\n  let hasChanged = false\n\n  for (const file of files) {\n    const archivedKey = replacements.get(getStoredFileIdentity(file))\n\n    if (!archivedKey) {\n      continue\n    }\n\n    const archivedFilename = path.posix.basename(archivedKey)\n\n    for (const role of file.roles) {\n      let stored: JsonObject | undefined\n      switch (role.type) {\n        case 'default':\n          stored = archived\n          break\n        case 'original':\n          stored = archived.original as JsonObject | undefined\n          break\n        case 'size':\n          stored = (archived.variants as Record<string, JsonObject> | undefined)?.[role.sizeKey]\n          break\n      }\n\n      if (typeof stored?.filename === 'string') {\n        const previousFilename = stored.filename\n        const directory = path.posix.dirname(previousFilename)\n        const filename = directory === '.' ? archivedFilename : `${directory}/${archivedFilename}`\n        stored.filename = filename\n        stored.url = replaceURLFilename({\n          filename,\n          previousFilename,\n          url: stored.url,\n        })\n        hasChanged = true\n      }\n    }\n  }\n\n  return hasChanged ? archived : undefined\n}\n\nconst replaceURLFilename = ({\n  filename,\n  previousFilename,\n  url,\n}: {\n  filename: string\n  previousFilename: string\n  url: unknown\n}): unknown => {\n  if (typeof url !== 'string') {\n    return url\n  }\n\n  const previous = encodeURIComponent(previousFilename)\n  const index = url.lastIndexOf(`/${previous}`)\n\n  return index < 0\n    ? url\n    : `${url.slice(0, index + 1)}${encodeURIComponent(filename)}${url.slice(index + 1 + previous.length)}`\n}\n"],"names":["fs","path","resolveBranchRowID","branchField","branchParentField","saveVersion","removeUnreferencedStagedObjects","scheduleUnreferencedFileCleanup","runFileOperationPlan","stageLocalUploadFiles","copyLocalFile","getArchivedFilename","collectStoredFiles","getStoredFileIdentity","withLegacyUploadFileData","runLocalFileUpdate","id","collection","current","files","next","req","write","storedCurrent","config","payload","doc","nextDoc","hasLocalFileChange","hasNewFiles","length","cleanupStagedAfterWriteFailure","objects","stage","trackStagedObject","staticDir","upload","archiveOutgoingLocalFiles","result","candidates","getOutgoingLocalFiles","disableLocalStorage","outgoing","versions","currentWithState","getVersions","docWithLocales","draft","operation","replacements","Map","file","identity","newestVersion","find","version","stored","some","candidate","directory","posix","dirname","key","archivedKey","suffix","archivedFilename","filename","basename","versionID","from","to","err","code","remove","rm","join","force","set","row","replaceStoredFileReferences","db","updateVersion","slug","versionData","undefined","createdAt","latest","parent","publishedLocale","updatedAt","currentFiles","nextFiles","trustGenerated","nextIdentities","Set","map","filter","has","versionParent","collectionSlug","docs","findVersions","branch","limit","pagination","sort","where","equals","archived","structuredClone","hasChanged","get","role","roles","type","original","variants","sizeKey","previousFilename","url","replaceURLFilename","previous","encodeURIComponent","index","lastIndexOf","slice"],"mappings":"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"}
+{"version":3,"sources":["../../../src/uploads/fileVersioning/archive.ts"],"sourcesContent":["import fs from 'node:fs/promises'\nimport path from 'node:path'\n\nimport type { SanitizedCollectionConfig } from '../../collections/config/types.js'\nimport type { Config } from '../../config/types.js'\nimport type { JsonObject, PayloadRequest } from '../../types/index.js'\nimport type { FileToSave } from '../types.js'\nimport type { StagedObject } from './fileOperationManager.js'\nimport type { StoredFileList } from './types.js'\n\nimport { saveVersion } from '../../versions/saveVersion.js'\nimport { removeUnreferencedStagedObjects, scheduleUnreferencedFileCleanup } from './cleanup.js'\nimport { runFileOperationPlan, stageLocalUploadFiles } from './fileOperationManager.js'\nimport { copyLocalFile } from './localStorage.js'\nimport { getArchivedFilename } from './naming.js'\nimport {\n  collectStoredFiles,\n  getStoredFileIdentity,\n  withLegacyUploadFileData,\n} from './storedFiles.js'\n\ntype VersionRow = {\n  createdAt: string\n  id: number | string\n  latest?: boolean\n  parent: number | string\n  publishedLocale?: string\n  updatedAt: string\n  version: JsonObject\n}\n\nexport const runLocalFileUpdate = async <T>({\n  id,\n  collection,\n  current,\n  files,\n  next,\n  req,\n  write,\n}: {\n  collection: SanitizedCollectionConfig\n  current: JsonObject\n  files: FileToSave[]\n  id: number | string\n  next: JsonObject\n  req: PayloadRequest\n  write: () => Promise<T>\n}): Promise<T> => {\n  const storedCurrent = withLegacyUploadFileData({\n    collection,\n    config: req.payload.config,\n    doc: current,\n  })\n  const nextDoc = { ...storedCurrent, ...next }\n\n  if (\n    !hasLocalFileChange({\n      collection,\n      config: req.payload.config,\n      current,\n      hasNewFiles: files.length > 0,\n      next: nextDoc,\n      req,\n    })\n  ) {\n    return write()\n  }\n\n  return runFileOperationPlan({\n    cleanupStagedAfterWriteFailure: (objects) =>\n      removeUnreferencedStagedObjects({ collection, objects, req }),\n    req,\n    stage: ({ trackStagedObject }) =>\n      stageLocalUploadFiles({\n        files,\n        staticDir: collection.upload.staticDir!,\n        trackStagedObject,\n      }),\n    write: async ({ trackStagedObject }) => {\n      await archiveOutgoingLocalFiles({\n        id,\n        collection,\n        current,\n        next: nextDoc,\n        req,\n        trackStagedObject,\n      })\n\n      const result = await write()\n\n      await scheduleUnreferencedFileCleanup({\n        candidates: getOutgoingLocalFiles({\n          collection,\n          config: req.payload.config,\n          current,\n          next: nextDoc,\n          req,\n        }),\n        collection,\n        req,\n      })\n\n      return result\n    },\n  })\n}\n\n/** Also detects removals, which have no new upload to stage. */\nconst hasLocalFileChange = ({\n  collection,\n  config,\n  current,\n  hasNewFiles,\n  next,\n  req,\n}: {\n  collection: SanitizedCollectionConfig\n  config: Pick<Config, 'routes' | 'serverURL'>\n  current: JsonObject\n  hasNewFiles: boolean\n  next: JsonObject\n  req: PayloadRequest\n}): boolean =>\n  !collection.upload.disableLocalStorage &&\n  (hasNewFiles ||\n    getOutgoingLocalFiles({\n      collection,\n      config,\n      current,\n      next,\n      req,\n    }).length > 0)\n\n/** Preserves outgoing local objects and repairs every retained version that referenced them. */\nexport const archiveOutgoingLocalFiles = async ({\n  id,\n  collection,\n  current,\n  next,\n  req,\n  trackStagedObject,\n}: {\n  collection: SanitizedCollectionConfig\n  current: JsonObject\n  id: number | string\n  next: JsonObject\n  req: PayloadRequest\n  trackStagedObject: (object: StagedObject) => void\n}): Promise<void> => {\n  const outgoing = getOutgoingLocalFiles({\n    collection,\n    config: req.payload.config,\n    current,\n    next,\n    req,\n  })\n\n  if (!outgoing.length || !collection.versions) {\n    return\n  }\n\n  const currentWithState = withLegacyUploadFileData({\n    collection,\n    config: req.payload.config,\n    doc: current,\n  })\n  let versions = await getVersions({ id, collection, req })\n\n  if (!versions.length) {\n    await saveVersion({\n      id,\n      collection,\n      docWithLocales: currentWithState,\n      draft: false,\n      operation: 'update',\n      payload: req.payload,\n      req,\n    })\n    versions = await getVersions({ id, collection, req })\n  }\n\n  const replacements = new Map<string, string>()\n  for (const file of outgoing) {\n    const identity = getStoredFileIdentity(file)\n    const newestVersion = versions.find(({ version }) => {\n      const stored = withLegacyUploadFileData({\n        collection,\n        config: req.payload.config,\n        doc: version,\n      })\n\n      return collectStoredFiles({ collection, doc: stored, req }).some(\n        (candidate) => getStoredFileIdentity(candidate) === identity,\n      )\n    })\n\n    if (!newestVersion) {\n      continue\n    }\n\n    const directory = path.posix.dirname(file.key)\n    let archivedKey: string\n    let suffix = 0\n\n    while (true) {\n      const archivedFilename = getArchivedFilename({\n        filename: path.posix.basename(file.key),\n        versionID: suffix ? `${newestVersion.id}-${suffix}` : newestVersion.id,\n      })\n      archivedKey = directory === '.' ? archivedFilename : `${directory}/${archivedFilename}`\n\n      try {\n        await copyLocalFile({\n          from: file.key,\n          staticDir: collection.upload.staticDir!,\n          to: archivedKey,\n        })\n        break\n      } catch (err) {\n        if ((err as NodeJS.ErrnoException).code !== 'EEXIST') {\n          throw err\n        }\n        suffix += 1\n      }\n    }\n    trackStagedObject({\n      key: archivedKey,\n      remove: () => fs.rm(path.join(collection.upload.staticDir!, archivedKey), { force: true }),\n    })\n    replacements.set(identity, archivedKey)\n  }\n\n  for (const row of versions) {\n    const stored = withLegacyUploadFileData({\n      collection,\n      config: req.payload.config,\n      doc: row.version,\n    })\n    const version = replaceStoredFileReferences({\n      files: collectStoredFiles({ collection, doc: stored, req }),\n      replacements,\n      version: stored,\n    })\n\n    if (!version) {\n      continue\n    }\n\n    await req.payload.db.updateVersion({\n      id: row.id,\n      collection: collection.slug,\n      req,\n      versionData: {\n        createdAt: row.createdAt,\n        latest: row.latest,\n        parent: row.parent,\n        publishedLocale: row.publishedLocale,\n        updatedAt: row.updatedAt,\n        version,\n      },\n    })\n  }\n}\n\nconst getOutgoingLocalFiles = ({\n  collection,\n  config,\n  current,\n  next,\n  req,\n}: {\n  collection: SanitizedCollectionConfig\n  config: Pick<Config, 'routes' | 'serverURL'>\n  current: JsonObject\n  next: JsonObject\n  req: PayloadRequest\n}): StoredFileList => {\n  const currentWithState = withLegacyUploadFileData({ collection, config, doc: current })\n  const currentFiles = collectStoredFiles({ collection, doc: currentWithState, req })\n  const nextFiles = collectStoredFiles({ collection, doc: next, req, trustGenerated: true })\n  const nextIdentities = new Set(nextFiles.map(getStoredFileIdentity))\n  return currentFiles.filter((file) => !nextIdentities.has(getStoredFileIdentity(file)))\n}\n\nconst getVersions = async ({\n  id,\n  collection,\n  req,\n}: {\n  collection: SanitizedCollectionConfig\n  id: number | string\n  req: PayloadRequest\n}): Promise<VersionRow[]> => {\n  const { docs } = await req.payload.db.findVersions<JsonObject>({\n    collection: collection.slug,\n    limit: 0,\n    pagination: false,\n    req,\n    sort: '-updatedAt',\n    where: { parent: { equals: id } },\n  })\n\n  return docs\n}\n\nexport const replaceStoredFileReferences = ({\n  files,\n  replacements,\n  version,\n}: {\n  files: StoredFileList\n  replacements: Map<string, string>\n  version: JsonObject\n}): JsonObject | undefined => {\n  if (!files.length) {\n    return\n  }\n\n  const archived = structuredClone(version)\n  let hasChanged = false\n\n  for (const file of files) {\n    const archivedKey = replacements.get(getStoredFileIdentity(file))\n\n    if (!archivedKey) {\n      continue\n    }\n\n    const archivedFilename = path.posix.basename(archivedKey)\n\n    for (const role of file.roles) {\n      let stored: JsonObject | undefined\n      switch (role.type) {\n        case 'default':\n          stored = archived\n          break\n        case 'original':\n          stored = archived.original as JsonObject | undefined\n          break\n        case 'size':\n          stored = (archived.variants as Record<string, JsonObject> | undefined)?.[role.sizeKey]\n          break\n      }\n\n      if (typeof stored?.filename === 'string') {\n        const previousFilename = stored.filename\n        const directory = path.posix.dirname(previousFilename)\n        const filename = directory === '.' ? archivedFilename : `${directory}/${archivedFilename}`\n        stored.filename = filename\n        stored.url = replaceURLFilename({\n          filename,\n          previousFilename,\n          url: stored.url,\n        })\n        hasChanged = true\n      }\n    }\n  }\n\n  return hasChanged ? archived : undefined\n}\n\nconst replaceURLFilename = ({\n  filename,\n  previousFilename,\n  url,\n}: {\n  filename: string\n  previousFilename: string\n  url: unknown\n}): unknown => {\n  if (typeof url !== 'string') {\n    return url\n  }\n\n  const previous = encodeURIComponent(previousFilename)\n  const index = url.lastIndexOf(`/${previous}`)\n\n  return index < 0\n    ? url\n    : `${url.slice(0, index + 1)}${encodeURIComponent(filename)}${url.slice(index + 1 + previous.length)}`\n}\n"],"names":["fs","path","saveVersion","removeUnreferencedStagedObjects","scheduleUnreferencedFileCleanup","runFileOperationPlan","stageLocalUploadFiles","copyLocalFile","getArchivedFilename","collectStoredFiles","getStoredFileIdentity","withLegacyUploadFileData","runLocalFileUpdate","id","collection","current","files","next","req","write","storedCurrent","config","payload","doc","nextDoc","hasLocalFileChange","hasNewFiles","length","cleanupStagedAfterWriteFailure","objects","stage","trackStagedObject","staticDir","upload","archiveOutgoingLocalFiles","result","candidates","getOutgoingLocalFiles","disableLocalStorage","outgoing","versions","currentWithState","getVersions","docWithLocales","draft","operation","replacements","Map","file","identity","newestVersion","find","version","stored","some","candidate","directory","posix","dirname","key","archivedKey","suffix","archivedFilename","filename","basename","versionID","from","to","err","code","remove","rm","join","force","set","row","replaceStoredFileReferences","db","updateVersion","slug","versionData","createdAt","latest","parent","publishedLocale","updatedAt","currentFiles","nextFiles","trustGenerated","nextIdentities","Set","map","filter","has","docs","findVersions","limit","pagination","sort","where","equals","archived","structuredClone","hasChanged","get","role","roles","type","original","variants","sizeKey","previousFilename","url","replaceURLFilename","undefined","previous","encodeURIComponent","index","lastIndexOf","slice"],"mappings":"AAAA,OAAOA,QAAQ,mBAAkB;AACjC,OAAOC,UAAU,YAAW;AAS5B,SAASC,WAAW,QAAQ,gCAA+B;AAC3D,SAASC,+BAA+B,EAAEC,+BAA+B,QAAQ,eAAc;AAC/F,SAASC,oBAAoB,EAAEC,qBAAqB,QAAQ,4BAA2B;AACvF,SAASC,aAAa,QAAQ,oBAAmB;AACjD,SAASC,mBAAmB,QAAQ,cAAa;AACjD,SACEC,kBAAkB,EAClBC,qBAAqB,EACrBC,wBAAwB,QACnB,mBAAkB;AAYzB,OAAO,MAAMC,qBAAqB,OAAU,EAC1CC,EAAE,EACFC,UAAU,EACVC,OAAO,EACPC,KAAK,EACLC,IAAI,EACJC,GAAG,EACHC,KAAK,EASN;IACC,MAAMC,gBAAgBT,yBAAyB;QAC7CG;QACAO,QAAQH,IAAII,OAAO,CAACD,MAAM;QAC1BE,KAAKR;IACP;IACA,MAAMS,UAAU;QAAE,GAAGJ,aAAa;QAAE,GAAGH,IAAI;IAAC;IAE5C,IACE,CAACQ,mBAAmB;QAClBX;QACAO,QAAQH,IAAII,OAAO,CAACD,MAAM;QAC1BN;QACAW,aAAaV,MAAMW,MAAM,GAAG;QAC5BV,MAAMO;QACNN;IACF,IACA;QACA,OAAOC;IACT;IAEA,OAAOd,qBAAqB;QAC1BuB,gCAAgC,CAACC,UAC/B1B,gCAAgC;gBAAEW;gBAAYe;gBAASX;YAAI;QAC7DA;QACAY,OAAO,CAAC,EAAEC,iBAAiB,EAAE,GAC3BzB,sBAAsB;gBACpBU;gBACAgB,WAAWlB,WAAWmB,MAAM,CAACD,SAAS;gBACtCD;YACF;QACFZ,OAAO,OAAO,EAAEY,iBAAiB,EAAE;YACjC,MAAMG,0BAA0B;gBAC9BrB;gBACAC;gBACAC;gBACAE,MAAMO;gBACNN;gBACAa;YACF;YAEA,MAAMI,SAAS,MAAMhB;YAErB,MAAMf,gCAAgC;gBACpCgC,YAAYC,sBAAsB;oBAChCvB;oBACAO,QAAQH,IAAII,OAAO,CAACD,MAAM;oBAC1BN;oBACAE,MAAMO;oBACNN;gBACF;gBACAJ;gBACAI;YACF;YAEA,OAAOiB;QACT;IACF;AACF,EAAC;AAED,8DAA8D,GAC9D,MAAMV,qBAAqB,CAAC,EAC1BX,UAAU,EACVO,MAAM,EACNN,OAAO,EACPW,WAAW,EACXT,IAAI,EACJC,GAAG,EAQJ,GACC,CAACJ,WAAWmB,MAAM,CAACK,mBAAmB,IACrCZ,CAAAA,eACCW,sBAAsB;QACpBvB;QACAO;QACAN;QACAE;QACAC;IACF,GAAGS,MAAM,GAAG,CAAA;AAEhB,8FAA8F,GAC9F,OAAO,MAAMO,4BAA4B,OAAO,EAC9CrB,EAAE,EACFC,UAAU,EACVC,OAAO,EACPE,IAAI,EACJC,GAAG,EACHa,iBAAiB,EAQlB;IACC,MAAMQ,WAAWF,sBAAsB;QACrCvB;QACAO,QAAQH,IAAII,OAAO,CAACD,MAAM;QAC1BN;QACAE;QACAC;IACF;IAEA,IAAI,CAACqB,SAASZ,MAAM,IAAI,CAACb,WAAW0B,QAAQ,EAAE;QAC5C;IACF;IAEA,MAAMC,mBAAmB9B,yBAAyB;QAChDG;QACAO,QAAQH,IAAII,OAAO,CAACD,MAAM;QAC1BE,KAAKR;IACP;IACA,IAAIyB,WAAW,MAAME,YAAY;QAAE7B;QAAIC;QAAYI;IAAI;IAEvD,IAAI,CAACsB,SAASb,MAAM,EAAE;QACpB,MAAMzB,YAAY;YAChBW;YACAC;YACA6B,gBAAgBF;YAChBG,OAAO;YACPC,WAAW;YACXvB,SAASJ,IAAII,OAAO;YACpBJ;QACF;QACAsB,WAAW,MAAME,YAAY;YAAE7B;YAAIC;YAAYI;QAAI;IACrD;IAEA,MAAM4B,eAAe,IAAIC;IACzB,KAAK,MAAMC,QAAQT,SAAU;QAC3B,MAAMU,WAAWvC,sBAAsBsC;QACvC,MAAME,gBAAgBV,SAASW,IAAI,CAAC,CAAC,EAAEC,OAAO,EAAE;YAC9C,MAAMC,SAAS1C,yBAAyB;gBACtCG;gBACAO,QAAQH,IAAII,OAAO,CAACD,MAAM;gBAC1BE,KAAK6B;YACP;YAEA,OAAO3C,mBAAmB;gBAAEK;gBAAYS,KAAK8B;gBAAQnC;YAAI,GAAGoC,IAAI,CAC9D,CAACC,YAAc7C,sBAAsB6C,eAAeN;QAExD;QAEA,IAAI,CAACC,eAAe;YAClB;QACF;QAEA,MAAMM,YAAYvD,KAAKwD,KAAK,CAACC,OAAO,CAACV,KAAKW,GAAG;QAC7C,IAAIC;QACJ,IAAIC,SAAS;QAEb,MAAO,KAAM;YACX,MAAMC,mBAAmBtD,oBAAoB;gBAC3CuD,UAAU9D,KAAKwD,KAAK,CAACO,QAAQ,CAAChB,KAAKW,GAAG;gBACtCM,WAAWJ,SAAS,GAAGX,cAAcrC,EAAE,CAAC,CAAC,EAAEgD,QAAQ,GAAGX,cAAcrC,EAAE;YACxE;YACA+C,cAAcJ,cAAc,MAAMM,mBAAmB,GAAGN,UAAU,CAAC,EAAEM,kBAAkB;YAEvF,IAAI;gBACF,MAAMvD,cAAc;oBAClB2D,MAAMlB,KAAKW,GAAG;oBACd3B,WAAWlB,WAAWmB,MAAM,CAACD,SAAS;oBACtCmC,IAAIP;gBACN;gBACA;YACF,EAAE,OAAOQ,KAAK;gBACZ,IAAI,AAACA,IAA8BC,IAAI,KAAK,UAAU;oBACpD,MAAMD;gBACR;gBACAP,UAAU;YACZ;QACF;QACA9B,kBAAkB;YAChB4B,KAAKC;YACLU,QAAQ,IAAMtE,GAAGuE,EAAE,CAACtE,KAAKuE,IAAI,CAAC1D,WAAWmB,MAAM,CAACD,SAAS,EAAG4B,cAAc;oBAAEa,OAAO;gBAAK;QAC1F;QACA3B,aAAa4B,GAAG,CAACzB,UAAUW;IAC7B;IAEA,KAAK,MAAMe,OAAOnC,SAAU;QAC1B,MAAMa,SAAS1C,yBAAyB;YACtCG;YACAO,QAAQH,IAAII,OAAO,CAACD,MAAM;YAC1BE,KAAKoD,IAAIvB,OAAO;QAClB;QACA,MAAMA,UAAUwB,4BAA4B;YAC1C5D,OAAOP,mBAAmB;gBAAEK;gBAAYS,KAAK8B;gBAAQnC;YAAI;YACzD4B;YACAM,SAASC;QACX;QAEA,IAAI,CAACD,SAAS;YACZ;QACF;QAEA,MAAMlC,IAAII,OAAO,CAACuD,EAAE,CAACC,aAAa,CAAC;YACjCjE,IAAI8D,IAAI9D,EAAE;YACVC,YAAYA,WAAWiE,IAAI;YAC3B7D;YACA8D,aAAa;gBACXC,WAAWN,IAAIM,SAAS;gBACxBC,QAAQP,IAAIO,MAAM;gBAClBC,QAAQR,IAAIQ,MAAM;gBAClBC,iBAAiBT,IAAIS,eAAe;gBACpCC,WAAWV,IAAIU,SAAS;gBACxBjC;YACF;QACF;IACF;AACF,EAAC;AAED,MAAMf,wBAAwB,CAAC,EAC7BvB,UAAU,EACVO,MAAM,EACNN,OAAO,EACPE,IAAI,EACJC,GAAG,EAOJ;IACC,MAAMuB,mBAAmB9B,yBAAyB;QAAEG;QAAYO;QAAQE,KAAKR;IAAQ;IACrF,MAAMuE,eAAe7E,mBAAmB;QAAEK;QAAYS,KAAKkB;QAAkBvB;IAAI;IACjF,MAAMqE,YAAY9E,mBAAmB;QAAEK;QAAYS,KAAKN;QAAMC;QAAKsE,gBAAgB;IAAK;IACxF,MAAMC,iBAAiB,IAAIC,IAAIH,UAAUI,GAAG,CAACjF;IAC7C,OAAO4E,aAAaM,MAAM,CAAC,CAAC5C,OAAS,CAACyC,eAAeI,GAAG,CAACnF,sBAAsBsC;AACjF;AAEA,MAAMN,cAAc,OAAO,EACzB7B,EAAE,EACFC,UAAU,EACVI,GAAG,EAKJ;IACC,MAAM,EAAE4E,IAAI,EAAE,GAAG,MAAM5E,IAAII,OAAO,CAACuD,EAAE,CAACkB,YAAY,CAAa;QAC7DjF,YAAYA,WAAWiE,IAAI;QAC3BiB,OAAO;QACPC,YAAY;QACZ/E;QACAgF,MAAM;QACNC,OAAO;YAAEhB,QAAQ;gBAAEiB,QAAQvF;YAAG;QAAE;IAClC;IAEA,OAAOiF;AACT;AAEA,OAAO,MAAMlB,8BAA8B,CAAC,EAC1C5D,KAAK,EACL8B,YAAY,EACZM,OAAO,EAKR;IACC,IAAI,CAACpC,MAAMW,MAAM,EAAE;QACjB;IACF;IAEA,MAAM0E,WAAWC,gBAAgBlD;IACjC,IAAImD,aAAa;IAEjB,KAAK,MAAMvD,QAAQhC,MAAO;QACxB,MAAM4C,cAAcd,aAAa0D,GAAG,CAAC9F,sBAAsBsC;QAE3D,IAAI,CAACY,aAAa;YAChB;QACF;QAEA,MAAME,mBAAmB7D,KAAKwD,KAAK,CAACO,QAAQ,CAACJ;QAE7C,KAAK,MAAM6C,QAAQzD,KAAK0D,KAAK,CAAE;YAC7B,IAAIrD;YACJ,OAAQoD,KAAKE,IAAI;gBACf,KAAK;oBACHtD,SAASgD;oBACT;gBACF,KAAK;oBACHhD,SAASgD,SAASO,QAAQ;oBAC1B;gBACF,KAAK;oBACHvD,SAAUgD,SAASQ,QAAQ,EAA6C,CAACJ,KAAKK,OAAO,CAAC;oBACtF;YACJ;YAEA,IAAI,OAAOzD,QAAQU,aAAa,UAAU;gBACxC,MAAMgD,mBAAmB1D,OAAOU,QAAQ;gBACxC,MAAMP,YAAYvD,KAAKwD,KAAK,CAACC,OAAO,CAACqD;gBACrC,MAAMhD,WAAWP,cAAc,MAAMM,mBAAmB,GAAGN,UAAU,CAAC,EAAEM,kBAAkB;gBAC1FT,OAAOU,QAAQ,GAAGA;gBAClBV,OAAO2D,GAAG,GAAGC,mBAAmB;oBAC9BlD;oBACAgD;oBACAC,KAAK3D,OAAO2D,GAAG;gBACjB;gBACAT,aAAa;YACf;QACF;IACF;IAEA,OAAOA,aAAaF,WAAWa;AACjC,EAAC;AAED,MAAMD,qBAAqB,CAAC,EAC1BlD,QAAQ,EACRgD,gBAAgB,EAChBC,GAAG,EAKJ;IACC,IAAI,OAAOA,QAAQ,UAAU;QAC3B,OAAOA;IACT;IAEA,MAAMG,WAAWC,mBAAmBL;IACpC,MAAMM,QAAQL,IAAIM,WAAW,CAAC,CAAC,CAAC,EAAEH,UAAU;IAE5C,OAAOE,QAAQ,IACXL,MACA,GAAGA,IAAIO,KAAK,CAAC,GAAGF,QAAQ,KAAKD,mBAAmBrD,YAAYiD,IAAIO,KAAK,CAACF,QAAQ,IAAIF,SAASxF,MAAM,GAAG;AAC1G"}

package/dist/uploads/fileVersioning/cleanup.d.ts

@@ -14,13 +14,6 @@ export declare const collectVersionFiles: ({ collection, parentID, req, where, }
     req: PayloadRequest;
     where?: Where;
 }) => Promise<StoredFileList>;
-/** Collects every stored file that can become unreferenced when a document is deleted. */
-export declare const collectDocumentDeleteFileCandidates: ({ collection, doc, parentID, req, }: {
-    collection: SanitizedCollectionConfig;
-    doc: JsonObject;
-    parentID: number | string;
-    req: PayloadRequest;
-}) => Promise<StoredFileList>;
 /** Confirms that deleted references have no survivors before and after commit. */
 export declare const scheduleUnreferencedFileCleanup: ({ candidates, collection, req, }: {
     candidates: StoredFileList;

package/dist/uploads/fileVersioning/cleanup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup.d.ts","sourceRoot":"","sources":["../../../src/uploads/fileVersioning/cleanup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAc,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,YAAY,CAAA;AAY5D,eAAO,MAAM,kBAAkB,8BAI5B;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,GAAG,EAAE,UAAU,CAAA;IACf,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,cAAc,CAQzB,CAAA;AAED,qFAAqF;AACrF,eAAO,MAAM,mBAAmB,0CAK7B;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,KAAG,OAAO,CAAC,cAAc,CAwBzB,CAAA;AAED,0FAA0F;AAC1F,eAAO,MAAM,mCAAmC,wCAK7C;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,GAAG,EAAE,UAAU,CAAA;IACf,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,cAAc,CAGzB,CAAA;AAED,kFAAkF;AAClF,eAAO,MAAM,+BAA+B,qCAIzC;IACD,UAAU,EAAE,cAAc,CAAA;IAC1B,UAAU,EAAE,yBAAyB,CAAA;IACrC,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CAmCf,CAAA;AAED,uGAAuG;AACvG,eAAO,MAAM,+BAA+B,kCAIzC;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CAsBf,CAAA"}
+{"version":3,"file":"cleanup.d.ts","sourceRoot":"","sources":["../../../src/uploads/fileVersioning/cleanup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAc,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,YAAY,CAAA;AAY5D,eAAO,MAAM,kBAAkB,8BAI5B;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,GAAG,EAAE,UAAU,CAAA;IACf,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,cAAc,CAQzB,CAAA;AAED,qFAAqF;AACrF,eAAO,MAAM,mBAAmB,0CAK7B;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,KAAG,OAAO,CAAC,cAAc,CAwBzB,CAAA;AAED,kFAAkF;AAClF,eAAO,MAAM,+BAA+B,qCAIzC;IACD,UAAU,EAAE,cAAc,CAAA;IAC1B,UAAU,EAAE,yBAAyB,CAAA;IACrC,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CAmCf,CAAA;AAED,uGAAuG;AACvG,eAAO,MAAM,+BAA+B,kCAIzC;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CAsBf,CAAA"}

package/dist/uploads/fileVersioning/cleanup.js

@@ -53,18 +53,6 @@ export const collectStoredFiles = async ({ collection, doc, req })=>{
         page += 1;
     }
 };
-/** Collects every stored file that can become unreferenced when a document is deleted. */ export const collectDocumentDeleteFileCandidates = async ({ collection, doc, parentID, req })=>[
-        ...await collectStoredFiles({
-            collection,
-            doc,
-            req
-        }),
-        ...collection.versions ? await collectVersionFiles({
-            collection,
-            parentID,
-            req
-        }) : []
-    ];
 /** Confirms that deleted references have no survivors before and after commit. */ export const scheduleUnreferencedFileCleanup = async ({ candidates, collection, req })=>{
     const unique = new Map(candidates.map((file)=>[
             getStoredFileIdentity(file),