payload 4.0.0-internal.e7d4ebc → 4.0.0-internal.ee5d8bd

package/dist/collections/operations/renameFile.js

@@ -0,0 +1,298 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { executeAccess } from '../../auth/executeAccess.js';
+import { hasWhereAccessResult } from '../../auth/types.js';
+import { combineQueries } from '../../database/combineQueries.js';
+import { APIError, Forbidden, NotFound } from '../../errors/index.js';
+import { replaceStoredFileReferences } from '../../uploads/fileVersioning/archive.js';
+import { removeUnreferencedStagedObjects, scheduleUnreferencedFileCleanup } from '../../uploads/fileVersioning/cleanup.js';
+import { abortFileOperationScope, beginFileOperationScope, completeFileOperationScope, runFileOperationPlan } from '../../uploads/fileVersioning/fileOperationManager.js';
+import { copyLocalFile } from '../../uploads/fileVersioning/localStorage.js';
+import { getOriginalFilename, normalizeStorageKey } from '../../uploads/fileVersioning/naming.js';
+import { collectStoredFiles, getStoredFileIdentity, withLegacyCloudUploadFileData } from '../../uploads/fileVersioning/storedFiles.js';
+import { commitTransaction } from '../../utilities/commitTransaction.js';
+import { initTransaction } from '../../utilities/initTransaction.js';
+import { killTransaction } from '../../utilities/killTransaction.js';
+import { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion.js';
+import { saveVersion } from '../../versions/saveVersion.js';
+import { buildAfterOperation } from './utilities/buildAfterOperation.js';
+import { buildBeforeOperation } from './utilities/buildBeforeOperation.js';
+import { updateDocument } from './utilities/update.js';
+/** Renames the current managed file set without changing its bytes. */ export const renameFileOperation = async (incomingArgs)=>{
+    let args = {
+        ...incomingArgs,
+        data: {
+            filename: incomingArgs.filename
+        }
+    };
+    const { req } = args;
+    beginFileOperationScope({
+        req
+    });
+    try {
+        const shouldCommit = !args.disableTransaction && await initTransaction(req);
+        args = await buildBeforeOperation({
+            args,
+            collection: args.collection.config,
+            operation: 'updateByID',
+            overrideAccess: args.overrideAccess ?? false
+        });
+        const { id, collection, draft = false, overrideAccess = false } = args;
+        const { filename } = args.data;
+        if (!collection.config.upload) {
+            throw new APIError('This collection does not support file rename.', 400);
+        }
+        const access = overrideAccess ? true : await executeAccess({
+            id,
+            slug: collection.config.slug,
+            data: {
+                filename
+            },
+            req
+        }, collection.config.access.update);
+        const where = combineQueries({
+            id: {
+                equals: id
+            }
+        }, access);
+        const query = {
+            collection: collection.config.slug,
+            locale: 'all',
+            req,
+            where
+        };
+        const current = draft ? await getLatestCollectionVersion({
+            id,
+            config: collection.config,
+            payload: req.payload,
+            query,
+            req
+        }) : await req.payload.db.findOne(query);
+        if (!current) {
+            throw hasWhereAccessResult(access) ? new Forbidden(req.t) : new NotFound(req.t);
+        }
+        const stored = await withLegacyCloudUploadFileData({
+            collection: collection.config,
+            doc: current,
+            req
+        });
+        const operations = collection.config.upload.fileOperations;
+        const storedFiles = collectStoredFiles({
+            collection: collection.config,
+            doc: stored,
+            req
+        });
+        const oldOriginal = stored.original?.filename;
+        const oldFilename = oldOriginal ?? stored.filename;
+        if (!oldFilename || !storedFiles.length) {
+            throw new APIError('This upload has no managed files to rename.', 400);
+        }
+        const { newStem } = validateRename({
+            filename,
+            oldFilename
+        });
+        const originalStem = path.posix.parse(oldFilename).name;
+        const originalMarkerIndex = originalStem.lastIndexOf('-original');
+        const oldStem = originalMarkerIndex > 0 ? originalStem.slice(0, originalMarkerIndex) : path.posix.parse(stored.filename).name;
+        if (filename === `${oldStem}${path.posix.extname(oldFilename)}`) {
+            throw new APIError('The upload already has this filename.', 400);
+        }
+        const originalFilename = getOriginalFilename({
+            filename
+        });
+        const plannedKeys = new Set(storedFiles.filter(({ roles })=>roles.some(({ type })=>type === 'original')).map(({ key })=>getStoredFileIdentity({
+                key: path.posix.join(path.posix.dirname(key), originalFilename)
+            })));
+        const replacements = new Map();
+        for (const file of storedFiles){
+            const previousFilename = path.posix.basename(file.key);
+            const hasOriginalRole = file.roles.some(({ type })=>type === 'original');
+            const suffix = previousFilename.startsWith(oldStem) ? previousFilename.slice(oldStem.length) : `-${previousFilename}`;
+            let nextFilename = hasOriginalRole ? originalFilename : `${newStem}${suffix}`;
+            const directory = path.posix.dirname(file.key);
+            let nextKey = path.posix.join(directory, nextFilename);
+            let nextIdentity = getStoredFileIdentity({
+                key: nextKey
+            });
+            const extension = path.posix.extname(nextFilename);
+            const stem = nextFilename.slice(0, -extension.length || undefined);
+            let collisionNumber = 1;
+            while(!hasOriginalRole && plannedKeys.has(nextIdentity)){
+                nextFilename = `${stem}-${collisionNumber}${extension}`;
+                nextKey = path.posix.join(directory, nextFilename);
+                nextIdentity = getStoredFileIdentity({
+                    key: nextKey
+                });
+                collisionNumber++;
+            }
+            plannedKeys.add(nextIdentity);
+            const key = normalizeStorageKey({
+                key: nextKey
+            });
+            replacements.set(getStoredFileIdentity(file), key);
+        }
+        const renamed = replaceStoredFileReferences({
+            files: storedFiles,
+            replacements,
+            version: stored
+        });
+        if (!renamed) {
+            throw new APIError('The upload has no files to rename.', 400);
+        }
+        const staticDir = collection.config.upload.staticDir;
+        const result = await runFileOperationPlan({
+            cleanupStagedAfterWriteFailure: (objects)=>removeUnreferencedStagedObjects({
+                    collection: collection.config,
+                    objects,
+                    req
+                }),
+            req,
+            stage: async ({ trackStagedObject })=>{
+                for (const file of storedFiles){
+                    const to = replacements.get(getStoredFileIdentity(file));
+                    if (!operations && staticDir) {
+                        try {
+                            await copyLocalFile({
+                                from: file.key,
+                                staticDir,
+                                to
+                            });
+                        } catch (err) {
+                            if (err.code === 'EEXIST') {
+                                throw new APIError(`A file named ${path.posix.basename(to)} already exists.`, 409);
+                            }
+                            throw err;
+                        }
+                        trackStagedObject({
+                            key: to,
+                            remove: ()=>fs.rm(path.join(staticDir, to), {
+                                    force: true
+                                })
+                        });
+                    } else if (operations?.copy) {
+                        // Keep source files readable until the document update and its transaction succeed.
+                        try {
+                            await operations.copy({
+                                from: file.key,
+                                req,
+                                to,
+                                trackStagedObject
+                            });
+                        } catch (err) {
+                            if (isStorageCollision({
+                                err
+                            })) {
+                                throw new APIError(`A file named ${path.posix.basename(to)} already exists.`, 409);
+                            }
+                            throw err;
+                        }
+                    } else {
+                        throw new APIError('No safe copy operation is available for this upload.', 400);
+                    }
+                }
+            },
+            write: async ()=>{
+                if (collection.config.versions) {
+                    const previousVersions = await req.payload.db.findVersions({
+                        collection: collection.config.slug,
+                        limit: 1,
+                        req,
+                        where: {
+                            parent: {
+                                equals: id
+                            }
+                        }
+                    });
+                    if (!previousVersions.docs.length) {
+                        await saveVersion({
+                            id,
+                            collection: collection.config,
+                            docWithLocales: stored,
+                            draft: false,
+                            operation: 'update',
+                            payload: req.payload,
+                            req
+                        });
+                    }
+                }
+                const data = {
+                    filename: renamed.filename,
+                    original: renamed.original,
+                    url: renamed.url,
+                    variants: renamed.variants,
+                    ...draft ? {
+                        _status: 'draft'
+                    } : {}
+                };
+                const updated = await updateDocument({
+                    id,
+                    autosave: false,
+                    collectionConfig: collection.config,
+                    config: req.payload.config,
+                    data,
+                    depth: args.depth ?? 0,
+                    docWithLocales: stored,
+                    draftArg: draft,
+                    fallbackLocale: req.fallbackLocale,
+                    filesToUpload: [],
+                    locale: req.locale,
+                    overrideAccess,
+                    overrideLock: false,
+                    payload: req.payload,
+                    req,
+                    select: undefined,
+                    shouldManageLocalFiles: false,
+                    showHiddenFields: false
+                });
+                await scheduleUnreferencedFileCleanup({
+                    candidates: storedFiles,
+                    collection: collection.config,
+                    req
+                });
+                return updated;
+            }
+        });
+        const finalResult = await buildAfterOperation({
+            args,
+            collection: collection.config,
+            operation: 'updateByID',
+            overrideAccess,
+            result
+        });
+        if (shouldCommit) {
+            await commitTransaction(req);
+        }
+        await completeFileOperationScope({
+            req
+        });
+        return finalResult;
+    } catch (err) {
+        await killTransaction(req);
+        await abortFileOperationScope({
+            req
+        });
+        throw err;
+    }
+};
+const validateRename = ({ filename, oldFilename })=>{
+    if (typeof filename !== 'string' || !filename || filename === '.' || filename === '..' || filename.includes('/') || filename.includes('\\') || filename.includes('\0')) {
+        throw new APIError('Invalid filename.', 400);
+    }
+    const oldExtension = path.posix.extname(oldFilename);
+    const newExtension = path.posix.extname(filename);
+    if (oldExtension.toLowerCase() !== newExtension.toLowerCase()) {
+        throw new APIError('The new filename must keep the original file extension.', 400);
+    }
+    return {
+        newStem: filename.slice(0, -newExtension.length || undefined)
+    };
+};
+const isStorageCollision = ({ err })=>{
+    if (!err || typeof err !== 'object') {
+        return false;
+    }
+    const { name, code, message, statusCode } = err;
+    return code === 'EEXIST' || code === 'PreconditionFailed' || code === 412 || name === 'PreconditionFailed' || statusCode === 409 || statusCode === 412 || Boolean(message?.includes('Storage destination already exists'));
+};
+
+//# sourceMappingURL=renameFile.js.map

package/dist/collections/operations/renameFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/collections/operations/renameFile.ts"],"sourcesContent":["import fs from 'node:fs/promises'\nimport path from 'node:path'\n\nimport type { JsonObject, PayloadRequest } from '../../types/index.js'\nimport type { Collection } from '../config/types.js'\n\nimport { executeAccess } from '../../auth/executeAccess.js'\nimport { hasWhereAccessResult } from '../../auth/types.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { APIError, Forbidden, NotFound } from '../../errors/index.js'\nimport { replaceStoredFileReferences } from '../../uploads/fileVersioning/archive.js'\nimport {\n  removeUnreferencedStagedObjects,\n  scheduleUnreferencedFileCleanup,\n} from '../../uploads/fileVersioning/cleanup.js'\nimport {\n  abortFileOperationScope,\n  beginFileOperationScope,\n  completeFileOperationScope,\n  runFileOperationPlan,\n} from '../../uploads/fileVersioning/fileOperationManager.js'\nimport { copyLocalFile } from '../../uploads/fileVersioning/localStorage.js'\nimport { getOriginalFilename, normalizeStorageKey } from '../../uploads/fileVersioning/naming.js'\nimport {\n  collectStoredFiles,\n  getStoredFileIdentity,\n  withLegacyCloudUploadFileData,\n} from '../../uploads/fileVersioning/storedFiles.js'\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion.js'\nimport { saveVersion } from '../../versions/saveVersion.js'\nimport { buildAfterOperation } from './utilities/buildAfterOperation.js'\nimport { buildBeforeOperation } from './utilities/buildBeforeOperation.js'\nimport { updateDocument } from './utilities/update.js'\n\nexport type RenameFileArguments = {\n  collection: Collection\n  depth?: number\n  disableTransaction?: boolean\n  draft?: boolean\n  filename: string\n  id: number | string\n  overrideAccess?: boolean\n  req: PayloadRequest\n}\n\n/** Renames the current managed file set without changing its bytes. */\nexport const renameFileOperation = async (\n  incomingArgs: RenameFileArguments,\n): Promise<JsonObject> => {\n  let args = { ...incomingArgs, data: { filename: incomingArgs.filename } }\n  const { req } = args\n  beginFileOperationScope({ req })\n\n  try {\n    const shouldCommit = !args.disableTransaction && (await initTransaction(req))\n    args = await buildBeforeOperation({\n      args,\n      collection: args.collection.config,\n      operation: 'updateByID',\n      overrideAccess: args.overrideAccess ?? false,\n    })\n\n    const { id, collection, draft = false, overrideAccess = false } = args\n    const { filename } = args.data\n    if (!collection.config.upload) {\n      throw new APIError('This collection does not support file rename.', 400)\n    }\n\n    const access = overrideAccess\n      ? true\n      : await executeAccess(\n          { id, slug: collection.config.slug, data: { filename }, req },\n          collection.config.access.update,\n        )\n    const where = combineQueries({ id: { equals: id } }, access)\n    const query = { collection: collection.config.slug, locale: 'all' as const, req, where }\n    const current = draft\n      ? await getLatestCollectionVersion({\n          id,\n          config: collection.config,\n          payload: req.payload,\n          query,\n          req,\n        })\n      : await req.payload.db.findOne(query)\n\n    if (!current) {\n      throw hasWhereAccessResult(access) ? new Forbidden(req.t) : new NotFound(req.t)\n    }\n    const stored = await withLegacyCloudUploadFileData({\n      collection: collection.config,\n      doc: current as JsonObject,\n      req,\n    })\n    const operations = collection.config.upload.fileOperations\n    const storedFiles = collectStoredFiles({ collection: collection.config, doc: stored, req })\n    const oldOriginal = (stored.original as { filename?: string } | undefined)?.filename\n    const oldFilename = oldOriginal ?? (stored.filename as string | undefined)\n\n    if (!oldFilename || !storedFiles.length) {\n      throw new APIError('This upload has no managed files to rename.', 400)\n    }\n\n    const { newStem } = validateRename({ filename, oldFilename })\n    const originalStem = path.posix.parse(oldFilename).name\n    const originalMarkerIndex = originalStem.lastIndexOf('-original')\n    const oldStem =\n      originalMarkerIndex > 0\n        ? originalStem.slice(0, originalMarkerIndex)\n        : path.posix.parse(stored.filename as string).name\n    if (filename === `${oldStem}${path.posix.extname(oldFilename)}`) {\n      throw new APIError('The upload already has this filename.', 400)\n    }\n\n    const originalFilename = getOriginalFilename({ filename })\n    const plannedKeys = new Set(\n      storedFiles\n        .filter(({ roles }) => roles.some(({ type }) => type === 'original'))\n        .map(({ key }) =>\n          getStoredFileIdentity({\n            key: path.posix.join(path.posix.dirname(key), originalFilename),\n          }),\n        ),\n    )\n    const replacements = new Map<string, string>()\n    for (const file of storedFiles) {\n      const previousFilename = path.posix.basename(file.key)\n      const hasOriginalRole = file.roles.some(({ type }) => type === 'original')\n      const suffix = previousFilename.startsWith(oldStem)\n        ? previousFilename.slice(oldStem.length)\n        : `-${previousFilename}`\n      let nextFilename = hasOriginalRole ? originalFilename : `${newStem}${suffix}`\n      const directory = path.posix.dirname(file.key)\n      let nextKey = path.posix.join(directory, nextFilename)\n      let nextIdentity = getStoredFileIdentity({\n        key: nextKey,\n      })\n      const extension = path.posix.extname(nextFilename)\n      const stem = nextFilename.slice(0, -extension.length || undefined)\n      let collisionNumber = 1\n      while (!hasOriginalRole && plannedKeys.has(nextIdentity)) {\n        nextFilename = `${stem}-${collisionNumber}${extension}`\n        nextKey = path.posix.join(directory, nextFilename)\n        nextIdentity = getStoredFileIdentity({\n          key: nextKey,\n        })\n        collisionNumber++\n      }\n      plannedKeys.add(nextIdentity)\n      const key = normalizeStorageKey({ key: nextKey })\n      replacements.set(getStoredFileIdentity(file), key)\n    }\n\n    const renamed = replaceStoredFileReferences({\n      files: storedFiles,\n      replacements,\n      version: stored,\n    })\n    if (!renamed) {\n      throw new APIError('The upload has no files to rename.', 400)\n    }\n\n    const staticDir = collection.config.upload.staticDir\n    const result = await runFileOperationPlan({\n      cleanupStagedAfterWriteFailure: (objects) =>\n        removeUnreferencedStagedObjects({ collection: collection.config, objects, req }),\n      req,\n      stage: async ({ trackStagedObject }) => {\n        for (const file of storedFiles) {\n          const to = replacements.get(getStoredFileIdentity(file))!\n          if (!operations && staticDir) {\n            try {\n              await copyLocalFile({ from: file.key, staticDir, to })\n            } catch (err) {\n              if ((err as NodeJS.ErrnoException).code === 'EEXIST') {\n                throw new APIError(`A file named ${path.posix.basename(to)} already exists.`, 409)\n              }\n              throw err\n            }\n            trackStagedObject({\n              key: to,\n              remove: () => fs.rm(path.join(staticDir, to), { force: true }),\n            })\n          } else if (operations?.copy) {\n            // Keep source files readable until the document update and its transaction succeed.\n            try {\n              await operations.copy({ from: file.key, req, to, trackStagedObject })\n            } catch (err) {\n              if (isStorageCollision({ err })) {\n                throw new APIError(`A file named ${path.posix.basename(to)} already exists.`, 409)\n              }\n              throw err\n            }\n          } else {\n            throw new APIError('No safe copy operation is available for this upload.', 400)\n          }\n        }\n      },\n      write: async () => {\n        if (collection.config.versions) {\n          const previousVersions = await req.payload.db.findVersions({\n            collection: collection.config.slug,\n            limit: 1,\n            req,\n            where: { parent: { equals: id } },\n          })\n\n          if (!previousVersions.docs.length) {\n            await saveVersion({\n              id,\n              collection: collection.config,\n              docWithLocales: stored,\n              draft: false,\n              operation: 'update',\n              payload: req.payload,\n              req,\n            })\n          }\n        }\n\n        const data = {\n          filename: renamed.filename,\n          original: renamed.original,\n          url: renamed.url,\n          variants: renamed.variants,\n          ...(draft ? { _status: 'draft' } : {}),\n        }\n        const updated = await updateDocument({\n          id,\n          autosave: false,\n          collectionConfig: collection.config,\n          config: req.payload.config,\n          data,\n          depth: args.depth ?? 0,\n          docWithLocales: stored as never,\n          draftArg: draft,\n          fallbackLocale: req.fallbackLocale!,\n          filesToUpload: [],\n          locale: req.locale!,\n          overrideAccess,\n          overrideLock: false,\n          payload: req.payload,\n          req,\n          select: undefined!,\n          shouldManageLocalFiles: false,\n          showHiddenFields: false,\n        })\n\n        await scheduleUnreferencedFileCleanup({\n          candidates: storedFiles,\n          collection: collection.config,\n          req,\n        })\n        return updated\n      },\n    })\n\n    const finalResult = await buildAfterOperation({\n      args,\n      collection: collection.config,\n      operation: 'updateByID',\n      overrideAccess,\n      result,\n    })\n\n    if (shouldCommit) {\n      await commitTransaction(req)\n    }\n    await completeFileOperationScope({ req })\n    return finalResult as JsonObject\n  } catch (err) {\n    await killTransaction(req)\n    await abortFileOperationScope({ req })\n    throw err\n  }\n}\n\nconst validateRename = ({ filename, oldFilename }: { filename: string; oldFilename: string }) => {\n  if (\n    typeof filename !== 'string' ||\n    !filename ||\n    filename === '.' ||\n    filename === '..' ||\n    filename.includes('/') ||\n    filename.includes('\\\\') ||\n    filename.includes('\\0')\n  ) {\n    throw new APIError('Invalid filename.', 400)\n  }\n\n  const oldExtension = path.posix.extname(oldFilename)\n  const newExtension = path.posix.extname(filename)\n  if (oldExtension.toLowerCase() !== newExtension.toLowerCase()) {\n    throw new APIError('The new filename must keep the original file extension.', 400)\n  }\n\n  return {\n    newStem: filename.slice(0, -newExtension.length || undefined),\n  }\n}\n\nconst isStorageCollision = ({ err }: { err: unknown }): boolean => {\n  if (!err || typeof err !== 'object') {\n    return false\n  }\n\n  const { name, code, message, statusCode } = err as {\n    code?: number | string\n    message?: string\n    name?: string\n    statusCode?: number\n  }\n\n  return (\n    code === 'EEXIST' ||\n    code === 'PreconditionFailed' ||\n    code === 412 ||\n    name === 'PreconditionFailed' ||\n    statusCode === 409 ||\n    statusCode === 412 ||\n    Boolean(message?.includes('Storage destination already exists'))\n  )\n}\n"],"names":["fs","path","executeAccess","hasWhereAccessResult","combineQueries","APIError","Forbidden","NotFound","replaceStoredFileReferences","removeUnreferencedStagedObjects","scheduleUnreferencedFileCleanup","abortFileOperationScope","beginFileOperationScope","completeFileOperationScope","runFileOperationPlan","copyLocalFile","getOriginalFilename","normalizeStorageKey","collectStoredFiles","getStoredFileIdentity","withLegacyCloudUploadFileData","commitTransaction","initTransaction","killTransaction","getLatestCollectionVersion","saveVersion","buildAfterOperation","buildBeforeOperation","updateDocument","renameFileOperation","incomingArgs","args","data","filename","req","shouldCommit","disableTransaction","collection","config","operation","overrideAccess","id","draft","upload","access","slug","update","where","equals","query","locale","current","payload","db","findOne","t","stored","doc","operations","fileOperations","storedFiles","oldOriginal","original","oldFilename","length","newStem","validateRename","originalStem","posix","parse","name","originalMarkerIndex","lastIndexOf","oldStem","slice","extname","originalFilename","plannedKeys","Set","filter","roles","some","type","map","key","join","dirname","replacements","Map","file","previousFilename","basename","hasOriginalRole","suffix","startsWith","nextFilename","directory","nextKey","nextIdentity","extension","stem","undefined","collisionNumber","has","add","set","renamed","files","version","staticDir","result","cleanupStagedAfterWriteFailure","objects","stage","trackStagedObject","to","get","from","err","code","remove","rm","force","copy","isStorageCollision","write","versions","previousVersions","findVersions","limit","parent","docs","docWithLocales","url","variants","_status","updated","autosave","collectionConfig","depth","draftArg","fallbackLocale","filesToUpload","overrideLock","select","shouldManageLocalFiles","showHiddenFields","candidates","finalResult","includes","oldExtension","newExtension","toLowerCase","message","statusCode","Boolean"],"mappings":"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"}

package/dist/collections/operations/restoreVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restoreVersion.d.ts","sourceRoot":"","sources":["../../../src/collections/operations/restoreVersion.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAChG,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAqBlD,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAA;AAEnD,eAAO,MAAM,uBAAuB,GAClC,KAAK,SAAS,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,QAEzD,SAAS,KACd,OAAO,CAAC,KAAK,CA8Vf,CAAA"}
+{"version":3,"file":"restoreVersion.d.ts","sourceRoot":"","sources":["../../../src/collections/operations/restoreVersion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,YAAY,EACZ,UAAU,EAEX,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAiClD,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAA;AAEnD,eAAO,MAAM,uBAAuB,GAClC,KAAK,SAAS,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,QAEzD,SAAS,KACd,OAAO,CAAC,KAAK,CAgaf,CAAA"}

package/dist/collections/operations/restoreVersion.js

@@ -1,4 +1,3 @@
-import { status as httpStatus } from 'http-status';
 import { executeAccess } from '../../auth/executeAccess.js';
 import { hasWhereAccessResult } from '../../auth/types.js';
 import { combineQueries } from '../../database/combineQueries.js';
@@ -7,19 +6,33 @@ import { afterChange } from '../../fields/hooks/afterChange/index.js';
 import { afterRead } from '../../fields/hooks/afterRead/index.js';
 import { beforeChange } from '../../fields/hooks/beforeChange/index.js';
 import { beforeValidate } from '../../fields/hooks/beforeValidate/index.js';
+import { abortFileOperationScope, beginFileOperationScope, completeFileOperationScope, shareFileOperationScope } from '../../uploads/fileVersioning/fileOperationManager.js';
+import { runStoredFileRestore } from '../../uploads/fileVersioning/restore.js';
+import { restoreUploadDataFromDocument } from '../../uploads/sanitizeUploadData.js';
+import { assertNoValidationWrite } from '../../utilities/assertNoValidationWrite.js';
 import { commitTransaction } from '../../utilities/commitTransaction.js';
 import { deepCopyObjectSimple } from '../../utilities/deepCopyObject.js';
 import { hasDraftValidationEnabled } from '../../utilities/getVersionsConfig.js';
+import { httpStatus } from '../../utilities/httpStatus.js';
 import { initTransaction } from '../../utilities/initTransaction.js';
+import { isolateObjectProperty } from '../../utilities/isolateObjectProperty.js';
 import { killTransaction } from '../../utilities/killTransaction.js';
 import { resolveSelect } from '../../utilities/resolveSelect.js';
 import { sanitizeSelect } from '../../utilities/sanitizeSelect.js';
 import { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion.js';
+import { getRestoredStatusesToAuthorize } from '../../versions/getRestoredStatusesToAuthorize.js';
 import { saveVersion } from '../../versions/saveVersion.js';
 import { buildAfterOperation } from './utilities/buildAfterOperation.js';
 import { buildBeforeOperation } from './utilities/buildBeforeOperation.js';
 export const restoreVersionOperation = async (args)=>{
+    assertNoValidationWrite(args.req);
     const { id, collection: { config: collectionConfig }, depth, draft: draftArg = false, overrideAccess = false, populate, req, req: { fallbackLocale, locale, payload }, select: incomingSelect, showHiddenFields } = args;
+    const hasFileOperationScope = Boolean(collectionConfig.upload);
+    if (hasFileOperationScope) {
+        beginFileOperationScope({
+            req
+        });
+    }
     try {
         const shouldCommit = !args.disableTransaction && await initTransaction(args.req);
         // /////////////////////////////////////
@@ -53,15 +66,36 @@ export const restoreVersionOperation = async (args)=>{
         if (!rawVersionToRestore) {
             throw new NotFound(req.t);
         }
-        const { parent: parentDocID, version: versionToRestoreWithLocales } = rawVersionToRestore;
+        const { parent: parentDocID } = rawVersionToRestore;
+        const versionToRestoreWithLocales = rawVersionToRestore.version;
         // /////////////////////////////////////
         // Access
         // /////////////////////////////////////
-        const accessResults = !overrideAccess ? await executeAccess({
-            id: parentDocID,
-            req
-        }, collectionConfig.access.update) : true;
-        const hasWherePolicy = hasWhereAccessResult(accessResults);
+        const restoredStatuses = draftArg ? [
+            'draft'
+        ] : getRestoredStatusesToAuthorize(versionToRestoreWithLocales?._status);
+        // A localized `_status` can publish and unpublish locales in one restore, so authorize every
+        // status it writes. executeAccess throws Forbidden on the first denial; Where constraints are
+        // AND-combined into the lookup below.
+        const accessResultsList = [];
+        if (overrideAccess) {
+            accessResultsList.push(true);
+        } else {
+            const statusesToAuthorize = restoredStatuses.length > 0 ? restoredStatuses : [
+                undefined
+            ];
+            for (const status of statusesToAuthorize){
+                accessResultsList.push(await executeAccess({
+                    id: parentDocID,
+                    slug: collectionConfig.slug,
+                    data: {
+                        _status: status
+                    },
+                    req
+                }, collectionConfig.access.update));
+            }
+        }
+        const hasWherePolicy = accessResultsList.some((result)=>hasWhereAccessResult(result));
         // /////////////////////////////////////
         // Retrieve document
         // /////////////////////////////////////
@@ -69,11 +103,11 @@ export const restoreVersionOperation = async (args)=>{
             collection: collectionConfig.slug,
             locale: 'all',
             req,
-            where: combineQueries({
+            where: accessResultsList.reduce((where, result)=>combineQueries(where, result), {
                 id: {
                     equals: parentDocID
                 }
-            }, accessResults)
+            })
         };
         // Get the document from the non versioned collection
         const doc = await req.payload.db.findOne(findOneArgs);
@@ -86,6 +120,15 @@ export const restoreVersionOperation = async (args)=>{
         if (collectionConfig.trash && doc?.deletedAt) {
             throw new APIError(`Cannot restore a version of a trashed document (ID: ${parentDocID}). Restore the document first.`, httpStatus.FORBIDDEN);
         }
+        if (collectionConfig.upload && !overrideAccess) {
+            await req.payload.findVersionByID({
+                id: String(id),
+                collection: collectionConfig.slug,
+                depth: 0,
+                overrideAccess: false,
+                req
+            });
+        }
         // /////////////////////////////////////
         // fetch previousDoc
         // /////////////////////////////////////
@@ -129,10 +172,16 @@ export const restoreVersionOperation = async (args)=>{
         // beforeValidate - Fields
         // /////////////////////////////////////
         req.context.isRestoringVersion = true;
-        const reqWithValidationLocale = Object.assign(Object.create(req), req, {
-            fallbackLocale: null,
-            locale: validationLocale
+        const reqWithValidationLocale = isolateObjectProperty(req, [
+            'fallbackLocale',
+            'locale'
+        ]);
+        shareFileOperationScope({
+            owner: req,
+            req: reqWithValidationLocale
         });
+        reqWithValidationLocale.fallbackLocale = null;
+        reqWithValidationLocale.locale = validationLocale;
         let data = await beforeValidate({
             id: parentDocID,
             collection: collectionConfig,
@@ -209,29 +258,42 @@ export const restoreVersionOperation = async (args)=>{
         result.updatedAt = new Date().toISOString();
         // Ensure status respects restoreAsDraft arg
         result._status = draftArg ? 'draft' : result._status;
-        if (!draftArg) {
-            result = await req.payload.db.updateOne({
+        const writeRestoredVersion = async (restored)=>{
+            if (collectionConfig.upload) {
+                result = restoreUploadDataFromDocument(result, restored, {
+                    clearMissing: true
+                });
+            }
+            if (!draftArg) {
+                result = await req.payload.db.updateOne({
+                    id: parentDocID,
+                    collection: collectionConfig.slug,
+                    data: result,
+                    req: reqWithValidationLocale,
+                    select
+                });
+            }
+            const savedVersion = await saveVersion({
                 id: parentDocID,
-                collection: collectionConfig.slug,
-                data: result,
+                autosave: false,
+                collection: collectionConfig,
+                docWithLocales: result,
+                draft: draftArg,
+                operation: 'restoreVersion',
+                payload,
                 req: reqWithValidationLocale,
                 select
             });
-        }
-        // /////////////////////////////////////
-        // Save restored doc as a new version
-        // /////////////////////////////////////
-        result = await saveVersion({
+            return savedVersion;
+        };
+        result = collectionConfig.upload ? await runStoredFileRestore({
             id: parentDocID,
-            autosave: false,
             collection: collectionConfig,
-            docWithLocales: result,
-            draft: draftArg,
-            operation: 'restoreVersion',
-            payload,
-            req: reqWithValidationLocale,
-            select
-        });
+            current: prevDocWithLocales,
+            req,
+            selected: versionToRestoreWithLocales,
+            write: writeRestoredVersion
+        }) : await writeRestoredVersion(versionToRestoreWithLocales);
         // /////////////////////////////////////
         // afterRead - Fields
         // /////////////////////////////////////
@@ -308,9 +370,19 @@ export const restoreVersionOperation = async (args)=>{
         if (shouldCommit) {
             await commitTransaction(req);
         }
+        if (hasFileOperationScope) {
+            await completeFileOperationScope({
+                req
+            });
+        }
         return result;
     } catch (error) {
         await killTransaction(req);
+        if (hasFileOperationScope) {
+            await abortFileOperationScope({
+                req
+            });
+        }
         throw error;
     }
 };