npm - payload - Versions diffs - 4.0.0-internal.ea6e8f8 → 4.0.0-internal.ee5d8bd - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (703) hide show

package/dist/uploads/fileVersioning/cleanup.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../src/uploads/fileVersioning/cleanup.ts"],"sourcesContent":["import fs from 'node:fs/promises'\nimport path from 'node:path'\n\nimport type { SanitizedCollectionConfig } from '../../collections/config/types.js'\nimport type { JsonObject, PayloadRequest, SelectType, Where } from '../../types/index.js'\nimport type { StagedObject } from './fileOperationManager.js'\nimport type { StoredFile, StoredFileList } from './types.js'\n\nimport { deferFileCleanup } from './fileOperationManager.js'\nimport { normalizeStorageKey } from './naming.js'\nimport {\n collectStoredFiles as collectStoredFileLocations,\n getStoredFileIdentity,\n withLegacyCloudUploadFileData,\n} from './storedFiles.js'\n\nconst pageSize = 100\n\nexport const collectStoredFiles = async ({\n collection,\n doc,\n req,\n}: {\n collection: SanitizedCollectionConfig\n doc: JsonObject\n req: PayloadRequest\n}): Promise<StoredFileList> => {\n const stored = await withLegacyCloudUploadFileData({\n collection,\n doc,\n req,\n })\n\n return collectStoredFileLocations({ collection, doc: stored, req })\n}\n\n/** Reads all saved versions in batches before a parent or its history is deleted. /\nexport const collectVersionFiles = async ({\n collection,\n parentID,\n req,\n where,\n}: {\n collection: SanitizedCollectionConfig\n parentID: number \| string\n req: PayloadRequest\n where?: Where\n}): Promise<StoredFileList> => {\n const files: StoredFileList = []\n let page = 1\n\n while (true) {\n const versions = await req.payload.db.findVersions<JsonObject>({\n collection: collection.slug,\n limit: pageSize,\n page,\n req,\n where: where\n ? { and: [{ parent: { equals: parentID } }, where] }\n : { parent: { equals: parentID } },\n })\n\n for (const row of versions.docs) {\n files.push(...(await collectStoredFiles({ collection, doc: row.version, req })))\n }\n\n if (versions.docs.length < pageSize) {\n return files\n }\n page += 1\n }\n}\n\n/* Collects every stored file that can become unreferenced when a document is deleted. /\nexport const collectDocumentDeleteFileCandidates = async ({\n collection,\n doc,\n parentID,\n req,\n}: {\n collection: SanitizedCollectionConfig\n doc: JsonObject\n parentID: number \| string\n req: PayloadRequest\n}): Promise<StoredFileList> => [\n ...(await collectStoredFiles({ collection, doc, req })),\n ...(collection.versions ? await collectVersionFiles({ collection, parentID, req }) : []),\n]\n\n/* Confirms that deleted references have no survivors before and after commit. /\nexport const scheduleUnreferencedFileCleanup = async ({\n candidates,\n collection,\n req,\n}: {\n candidates: StoredFileList\n collection: SanitizedCollectionConfig\n req: PayloadRequest\n}): Promise<void> => {\n const unique = new Map(candidates.map((file) => [getStoredFileIdentity(file), file]))\n\n if (!unique.size) {\n return\n }\n\n const unreferenced = await findUnreferenced({ candidates: [...unique.values()], collection, req })\n\n if (!unreferenced.length) {\n return\n }\n\n await deferFileCleanup({\n cleanup: async () => {\n const stillUnreferenced = await findUnreferenced({\n candidates: unreferenced,\n collection,\n req,\n })\n\n for (const file of stillUnreferenced) {\n try {\n await deleteStoredFile({ collection, file, req })\n } catch (err) {\n req.payload.logger.error({\n err,\n msg: `Failed to delete unreferenced upload file ${file.key}. Verify the object is unreferenced and remove it manually.`,\n })\n }\n }\n },\n req,\n shouldCleanupAfterFailure: true,\n })\n}\n\n/* Removes objects staged by a failed write unless a persisted document or version references them. */\nexport const removeUnreferencedStagedObjects = async ({\n collection,\n objects,\n req,\n}: {\n collection: SanitizedCollectionConfig\n objects: StagedObject[]\n req: PayloadRequest\n}): Promise<void> => {\n const unreferenced = await findUnreferenced({\n candidates: objects.map(({ key }) => ({ key, roles: [] })),\n collection,\n req,\n })\n const identities = new Set(unreferenced.map(getStoredFileIdentity))\n\n for (const object of objects) {\n if (!identities.has(getStoredFileIdentity(object))) {\n continue\n }\n\n try {\n await object.remove()\n } catch (err) {\n req.payload.logger.error({\n err,\n msg: `Failed to remove staged upload file ${object.key}`,\n })\n }\n }\n}\n\nconst findUnreferenced = async ({\n candidates,\n collection,\n req,\n}: {\n candidates: StoredFileList\n collection: SanitizedCollectionConfig\n req: PayloadRequest\n}): Promise<StoredFileList> => {\n const variantsField = collection.flattenedFields.find((field) => field.name === 'variants')\n const variantNames =\n variantsField?.type === 'group'\n ? variantsField.flattenedFields\n .filter(\n (field) =>\n field.type === 'group' &&\n field.flattenedFields.some((nested) => nested.name === 'filename'),\n )\n .map((field) => field.name)\n : []\n const filenamePaths = [\n 'filename',\n 'original.filename',\n ...variantNames.map((name) => `variants.${name}.filename`),\n ]\n // A removed schema field cannot prove the absence of historical references.\n // Retain those variant objects until their saved location data is migrated.\n const remaining = new Map(\n candidates\n .filter((file) =>\n file.roles.every((role) => role.type !== 'size' \|\| variantNames.includes(role.sizeKey)),\n )\n .map((file) => [getStoredFileIdentity(file), file]),\n )\n const representationSelect: SelectType = {\n _objectKey: true,\n filename: true,\n prefix: true,\n url: true,\n }\n const select: SelectType = {\n ...representationSelect,\n filesize: true,\n mimeType: true,\n original: representationSelect,\n ...(variantNames.length\n ? { variants: Object.fromEntries(variantNames.map((name) => [name, representationSelect])) }\n : {}),\n }\n // Legacy filenames may include folders. Match every possible filename suffix,\n // then verify the adapter's complete key before accepting a reference.\n const filenames = [\n ...new Set(\n [...remaining.values()].flatMap(({ key }) => {\n const parts = normalizeStorageKey({ key }).split('/')\n return parts.map((_, index) => parts.slice(index).join('/'))\n }),\n ),\n ]\n\n for (let offset = 0; offset < filenames.length && remaining.size; offset += pageSize) {\n const batch = filenames.slice(offset, offset + pageSize)\n const where: Where = { or: filenamePaths.map((field) => ({ [field]: { in: batch } })) }\n let page = 1\n\n while (remaining.size) {\n const docs = await req.payload.db.find<JsonObject>({\n collection: collection.slug,\n limit: pageSize,\n page,\n pagination: true,\n req,\n select,\n sort: 'id',\n where,\n })\n\n for (const doc of docs.docs) {\n await removeReferenced({ collection, doc, remaining, req })\n }\n if (docs.docs.length < pageSize) {\n break\n }\n page += 1\n }\n\n if (collection.versions) {\n page = 1\n const versionWhere: Where = {\n or: filenamePaths.map((field) => ({ [`version.${field}`]: { in: batch } })),\n }\n\n while (remaining.size) {\n const versions = await req.payload.db.findVersions<JsonObject>({\n collection: collection.slug,\n limit: pageSize,\n page,\n pagination: true,\n req,\n select: { version: select },\n sort: 'id',\n where: versionWhere,\n })\n\n for (const row of versions.docs) {\n await removeReferenced({ collection, doc: row.version, remaining, req })\n }\n if (versions.docs.length < pageSize) {\n break\n }\n page += 1\n }\n }\n }\n\n return [...remaining.values()]\n}\n\nconst removeReferenced = async ({\n collection,\n doc,\n remaining,\n req,\n}: {\n collection: SanitizedCollectionConfig\n doc: JsonObject\n remaining: Map<string, StoredFile>\n req: PayloadRequest\n}): Promise<void> => {\n for (const file of await collectStoredFiles({ collection, doc, req })) {\n remaining.delete(getStoredFileIdentity(file))\n }\n}\n\nconst deleteStoredFile = async ({\n collection,\n file,\n req,\n}: {\n collection: SanitizedCollectionConfig\n file: StoredFile\n req: PayloadRequest\n}): Promise<void> => {\n const operations = collection.upload.fileOperations\n if (!operations) {\n const staticDir = collection.upload.staticDir\n\n if (!staticDir) {\n throw new Error(`No local storage directory is configured for ${collection.slug}`)\n }\n\n const key = normalizeStorageKey({ key: file.key })\n const directory = await fs.realpath(staticDir)\n const target = path.resolve(directory, key)\n const relative = path.relative(directory, target)\n\n if (!relative \|\| relative.startsWith('..') \|\| path.isAbsolute(relative)) {\n throw new Error(`Invalid local storage key: ${key}`)\n }\n\n try {\n const parent = await fs.realpath(path.dirname(target))\n const parentRelative = path.relative(directory, parent)\n\n if (parentRelative.startsWith('..') \|\| path.isAbsolute(parentRelative)) {\n throw new Error(`Local storage key escapes its directory: ${key}`)\n }\n\n await fs.unlink(target)\n } catch (err) {\n if ((err as NodeJS.ErrnoException).code !== 'ENOENT') {\n throw err\n }\n }\n\n return\n }\n\n await operations.delete({ key: file.key, req })\n}\n"],"names":["fs","path","deferFileCleanup","normalizeStorageKey","collectStoredFiles","collectStoredFileLocations","getStoredFileIdentity","withLegacyCloudUploadFileData","pageSize","collection","doc","req","stored","collectVersionFiles","parentID","where","files","page","versions","payload","db","findVersions","slug","limit","and","parent","equals","row","docs","push","version","length","collectDocumentDeleteFileCandidates","scheduleUnreferencedFileCleanup","candidates","unique","Map","map","file","size","unreferenced","findUnreferenced","values","cleanup","stillUnreferenced","deleteStoredFile","err","logger","error","msg","key","shouldCleanupAfterFailure","removeUnreferencedStagedObjects","objects","roles","identities","Set","object","has","remove","variantsField","flattenedFields","find","field","name","variantNames","type","filter","some","nested","filenamePaths","remaining","every","role","includes","sizeKey","representationSelect","_objectKey","filename","prefix","url","select","filesize","mimeType","original","variants","Object","fromEntries","filenames","flatMap","parts","split","_","index","slice","join","offset","batch","or","in","pagination","sort","removeReferenced","versionWhere","delete","operations","upload","fileOperations","staticDir","Error","directory","realpath","target","resolve","relative","startsWith","isAbsolute","dirname","parentRelative","unlink","code"],"mappings":"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"}
1	+ {"version":3,"sources":["../../../src/uploads/fileVersioning/cleanup.ts"],"sourcesContent":["import fs from 'node:fs/promises'\nimport path from 'node:path'\n\nimport type { SanitizedCollectionConfig } from '../../collections/config/types.js'\nimport type { JsonObject, PayloadRequest, SelectType, Where } from '../../types/index.js'\nimport type { StagedObject } from './fileOperationManager.js'\nimport type { StoredFile, StoredFileList } from './types.js'\n\nimport { deferFileCleanup } from './fileOperationManager.js'\nimport { normalizeStorageKey } from './naming.js'\nimport {\n collectStoredFiles as collectStoredFileLocations,\n getStoredFileIdentity,\n withLegacyCloudUploadFileData,\n} from './storedFiles.js'\n\nconst pageSize = 100\n\nexport const collectStoredFiles = async ({\n collection,\n doc,\n req,\n}: {\n collection: SanitizedCollectionConfig\n doc: JsonObject\n req: PayloadRequest\n}): Promise<StoredFileList> => {\n const stored = await withLegacyCloudUploadFileData({\n collection,\n doc,\n req,\n })\n\n return collectStoredFileLocations({ collection, doc: stored, req })\n}\n\n/** Reads all saved versions in batches before a parent or its history is deleted. /\nexport const collectVersionFiles = async ({\n collection,\n parentID,\n req,\n where,\n}: {\n collection: SanitizedCollectionConfig\n parentID: number \| string\n req: PayloadRequest\n where?: Where\n}): Promise<StoredFileList> => {\n const files: StoredFileList = []\n let page = 1\n\n while (true) {\n const versions = await req.payload.db.findVersions<JsonObject>({\n collection: collection.slug,\n limit: pageSize,\n page,\n req,\n where: where\n ? { and: [{ parent: { equals: parentID } }, where] }\n : { parent: { equals: parentID } },\n })\n\n for (const row of versions.docs) {\n files.push(...(await collectStoredFiles({ collection, doc: row.version, req })))\n }\n\n if (versions.docs.length < pageSize) {\n return files\n }\n page += 1\n }\n}\n\n/* Confirms that deleted references have no survivors before and after commit. /\nexport const scheduleUnreferencedFileCleanup = async ({\n candidates,\n collection,\n req,\n}: {\n candidates: StoredFileList\n collection: SanitizedCollectionConfig\n req: PayloadRequest\n}): Promise<void> => {\n const unique = new Map(candidates.map((file) => [getStoredFileIdentity(file), file]))\n\n if (!unique.size) {\n return\n }\n\n const unreferenced = await findUnreferenced({ candidates: [...unique.values()], collection, req })\n\n if (!unreferenced.length) {\n return\n }\n\n await deferFileCleanup({\n cleanup: async () => {\n const stillUnreferenced = await findUnreferenced({\n candidates: unreferenced,\n collection,\n req,\n })\n\n for (const file of stillUnreferenced) {\n try {\n await deleteStoredFile({ collection, file, req })\n } catch (err) {\n req.payload.logger.error({\n err,\n msg: `Failed to delete unreferenced upload file ${file.key}. Verify the object is unreferenced and remove it manually.`,\n })\n }\n }\n },\n req,\n shouldCleanupAfterFailure: true,\n })\n}\n\n/* Removes objects staged by a failed write unless a persisted document or version references them. */\nexport const removeUnreferencedStagedObjects = async ({\n collection,\n objects,\n req,\n}: {\n collection: SanitizedCollectionConfig\n objects: StagedObject[]\n req: PayloadRequest\n}): Promise<void> => {\n const unreferenced = await findUnreferenced({\n candidates: objects.map(({ key }) => ({ key, roles: [] })),\n collection,\n req,\n })\n const identities = new Set(unreferenced.map(getStoredFileIdentity))\n\n for (const object of objects) {\n if (!identities.has(getStoredFileIdentity(object))) {\n continue\n }\n\n try {\n await object.remove()\n } catch (err) {\n req.payload.logger.error({\n err,\n msg: `Failed to remove staged upload file ${object.key}`,\n })\n }\n }\n}\n\nconst findUnreferenced = async ({\n candidates,\n collection,\n req,\n}: {\n candidates: StoredFileList\n collection: SanitizedCollectionConfig\n req: PayloadRequest\n}): Promise<StoredFileList> => {\n const variantsField = collection.flattenedFields.find((field) => field.name === 'variants')\n const variantNames =\n variantsField?.type === 'group'\n ? variantsField.flattenedFields\n .filter(\n (field) =>\n field.type === 'group' &&\n field.flattenedFields.some((nested) => nested.name === 'filename'),\n )\n .map((field) => field.name)\n : []\n const filenamePaths = [\n 'filename',\n 'original.filename',\n ...variantNames.map((name) => `variants.${name}.filename`),\n ]\n // A removed schema field cannot prove the absence of historical references.\n // Retain those variant objects until their saved location data is migrated.\n const remaining = new Map(\n candidates\n .filter((file) =>\n file.roles.every((role) => role.type !== 'size' \|\| variantNames.includes(role.sizeKey)),\n )\n .map((file) => [getStoredFileIdentity(file), file]),\n )\n const representationSelect: SelectType = {\n _objectKey: true,\n filename: true,\n prefix: true,\n url: true,\n }\n const select: SelectType = {\n ...representationSelect,\n filesize: true,\n mimeType: true,\n original: representationSelect,\n ...(variantNames.length\n ? { variants: Object.fromEntries(variantNames.map((name) => [name, representationSelect])) }\n : {}),\n }\n // Legacy filenames may include folders. Match every possible filename suffix,\n // then verify the adapter's complete key before accepting a reference.\n const filenames = [\n ...new Set(\n [...remaining.values()].flatMap(({ key }) => {\n const parts = normalizeStorageKey({ key }).split('/')\n return parts.map((_, index) => parts.slice(index).join('/'))\n }),\n ),\n ]\n\n for (let offset = 0; offset < filenames.length && remaining.size; offset += pageSize) {\n const batch = filenames.slice(offset, offset + pageSize)\n const where: Where = { or: filenamePaths.map((field) => ({ [field]: { in: batch } })) }\n let page = 1\n\n while (remaining.size) {\n const docs = await req.payload.db.find<JsonObject>({\n collection: collection.slug,\n limit: pageSize,\n page,\n pagination: true,\n req,\n select,\n sort: 'id',\n where,\n })\n\n for (const doc of docs.docs) {\n await removeReferenced({ collection, doc, remaining, req })\n }\n if (docs.docs.length < pageSize) {\n break\n }\n page += 1\n }\n\n if (collection.versions) {\n page = 1\n const versionWhere: Where = {\n or: filenamePaths.map((field) => ({ [`version.${field}`]: { in: batch } })),\n }\n\n while (remaining.size) {\n const versions = await req.payload.db.findVersions<JsonObject>({\n collection: collection.slug,\n limit: pageSize,\n page,\n pagination: true,\n req,\n select: { version: select },\n sort: 'id',\n where: versionWhere,\n })\n\n for (const row of versions.docs) {\n await removeReferenced({ collection, doc: row.version, remaining, req })\n }\n if (versions.docs.length < pageSize) {\n break\n }\n page += 1\n }\n }\n }\n\n return [...remaining.values()]\n}\n\nconst removeReferenced = async ({\n collection,\n doc,\n remaining,\n req,\n}: {\n collection: SanitizedCollectionConfig\n doc: JsonObject\n remaining: Map<string, StoredFile>\n req: PayloadRequest\n}): Promise<void> => {\n for (const file of await collectStoredFiles({ collection, doc, req })) {\n remaining.delete(getStoredFileIdentity(file))\n }\n}\n\nconst deleteStoredFile = async ({\n collection,\n file,\n req,\n}: {\n collection: SanitizedCollectionConfig\n file: StoredFile\n req: PayloadRequest\n}): Promise<void> => {\n const operations = collection.upload.fileOperations\n if (!operations) {\n const staticDir = collection.upload.staticDir\n\n if (!staticDir) {\n throw new Error(`No local storage directory is configured for ${collection.slug}`)\n }\n\n const key = normalizeStorageKey({ key: file.key })\n const directory = await fs.realpath(staticDir)\n const target = path.resolve(directory, key)\n const relative = path.relative(directory, target)\n\n if (!relative \|\| relative.startsWith('..') \|\| path.isAbsolute(relative)) {\n throw new Error(`Invalid local storage key: ${key}`)\n }\n\n try {\n const parent = await fs.realpath(path.dirname(target))\n const parentRelative = path.relative(directory, parent)\n\n if (parentRelative.startsWith('..') \|\| path.isAbsolute(parentRelative)) {\n throw new Error(`Local storage key escapes its directory: ${key}`)\n }\n\n await fs.unlink(target)\n } catch (err) {\n if ((err as NodeJS.ErrnoException).code !== 'ENOENT') {\n throw err\n }\n }\n\n return\n }\n\n await operations.delete({ key: file.key, req })\n}\n"],"names":["fs","path","deferFileCleanup","normalizeStorageKey","collectStoredFiles","collectStoredFileLocations","getStoredFileIdentity","withLegacyCloudUploadFileData","pageSize","collection","doc","req","stored","collectVersionFiles","parentID","where","files","page","versions","payload","db","findVersions","slug","limit","and","parent","equals","row","docs","push","version","length","scheduleUnreferencedFileCleanup","candidates","unique","Map","map","file","size","unreferenced","findUnreferenced","values","cleanup","stillUnreferenced","deleteStoredFile","err","logger","error","msg","key","shouldCleanupAfterFailure","removeUnreferencedStagedObjects","objects","roles","identities","Set","object","has","remove","variantsField","flattenedFields","find","field","name","variantNames","type","filter","some","nested","filenamePaths","remaining","every","role","includes","sizeKey","representationSelect","_objectKey","filename","prefix","url","select","filesize","mimeType","original","variants","Object","fromEntries","filenames","flatMap","parts","split","_","index","slice","join","offset","batch","or","in","pagination","sort","removeReferenced","versionWhere","delete","operations","upload","fileOperations","staticDir","Error","directory","realpath","target","resolve","relative","startsWith","isAbsolute","dirname","parentRelative","unlink","code"],"mappings":"AAAA,OAAOA,QAAQ,mBAAkB;AACjC,OAAOC,UAAU,YAAW;AAO5B,SAASC,gBAAgB,QAAQ,4BAA2B;AAC5D,SAASC,mBAAmB,QAAQ,cAAa;AACjD,SACEC,sBAAsBC,0BAA0B,EAChDC,qBAAqB,EACrBC,6BAA6B,QACxB,mBAAkB;AAEzB,MAAMC,WAAW;AAEjB,OAAO,MAAMJ,qBAAqB,OAAO,EACvCK,UAAU,EACVC,GAAG,EACHC,GAAG,EAKJ;IACC,MAAMC,SAAS,MAAML,8BAA8B;QACjDE;QACAC;QACAC;IACF;IAEA,OAAON,2BAA2B;QAAEI;QAAYC,KAAKE;QAAQD;IAAI;AACnE,EAAC;AAED,mFAAmF,GACnF,OAAO,MAAME,sBAAsB,OAAO,EACxCJ,UAAU,EACVK,QAAQ,EACRH,GAAG,EACHI,KAAK,EAMN;IACC,MAAMC,QAAwB,EAAE;IAChC,IAAIC,OAAO;IAEX,MAAO,KAAM;QACX,MAAMC,WAAW,MAAMP,IAAIQ,OAAO,CAACC,EAAE,CAACC,YAAY,CAAa;YAC7DZ,YAAYA,WAAWa,IAAI;YAC3BC,OAAOf;YACPS;YACAN;YACAI,OAAOA,QACH;gBAAES,KAAK;oBAAC;wBAAEC,QAAQ;4BAAEC,QAAQZ;wBAAS;oBAAE;oBAAGC;iBAAM;YAAC,IACjD;gBAAEU,QAAQ;oBAAEC,QAAQZ;gBAAS;YAAE;QACrC;QAEA,KAAK,MAAMa,OAAOT,SAASU,IAAI,CAAE;YAC/BZ,MAAMa,IAAI,IAAK,MAAMzB,mBAAmB;gBAAEK;gBAAYC,KAAKiB,IAAIG,OAAO;gBAAEnB;YAAI;QAC9E;QAEA,IAAIO,SAASU,IAAI,CAACG,MAAM,GAAGvB,UAAU;YACnC,OAAOQ;QACT;QACAC,QAAQ;IACV;AACF,EAAC;AAED,gFAAgF,GAChF,OAAO,MAAMe,kCAAkC,OAAO,EACpDC,UAAU,EACVxB,UAAU,EACVE,GAAG,EAKJ;IACC,MAAMuB,SAAS,IAAIC,IAAIF,WAAWG,GAAG,CAAC,CAACC,OAAS;YAAC/B,sBAAsB+B;YAAOA;SAAK;IAEnF,IAAI,CAACH,OAAOI,IAAI,EAAE;QAChB;IACF;IAEA,MAAMC,eAAe,MAAMC,iBAAiB;QAAEP,YAAY;eAAIC,OAAOO,MAAM;SAAG;QAAEhC;QAAYE;IAAI;IAEhG,IAAI,CAAC4B,aAAaR,MAAM,EAAE;QACxB;IACF;IAEA,MAAM7B,iBAAiB;QACrBwC,SAAS;YACP,MAAMC,oBAAoB,MAAMH,iBAAiB;gBAC/CP,YAAYM;gBACZ9B;gBACAE;YACF;YAEA,KAAK,MAAM0B,QAAQM,kBAAmB;gBACpC,IAAI;oBACF,MAAMC,iBAAiB;wBAAEnC;wBAAY4B;wBAAM1B;oBAAI;gBACjD,EAAE,OAAOkC,KAAK;oBACZlC,IAAIQ,OAAO,CAAC2B,MAAM,CAACC,KAAK,CAAC;wBACvBF;wBACAG,KAAK,CAAC,0CAA0C,EAAEX,KAAKY,GAAG,CAAC,2DAA2D,CAAC;oBACzH;gBACF;YACF;QACF;QACAtC;QACAuC,2BAA2B;IAC7B;AACF,EAAC;AAED,qGAAqG,GACrG,OAAO,MAAMC,kCAAkC,OAAO,EACpD1C,UAAU,EACV2C,OAAO,EACPzC,GAAG,EAKJ;IACC,MAAM4B,eAAe,MAAMC,iBAAiB;QAC1CP,YAAYmB,QAAQhB,GAAG,CAAC,CAAC,EAAEa,GAAG,EAAE,GAAM,CAAA;gBAAEA;gBAAKI,OAAO,EAAE;YAAC,CAAA;QACvD5C;QACAE;IACF;IACA,MAAM2C,aAAa,IAAIC,IAAIhB,aAAaH,GAAG,CAAC9B;IAE5C,KAAK,MAAMkD,UAAUJ,QAAS;QAC5B,IAAI,CAACE,WAAWG,GAAG,CAACnD,sBAAsBkD,UAAU;YAClD;QACF;QAEA,IAAI;YACF,MAAMA,OAAOE,MAAM;QACrB,EAAE,OAAOb,KAAK;YACZlC,IAAIQ,OAAO,CAAC2B,MAAM,CAACC,KAAK,CAAC;gBACvBF;gBACAG,KAAK,CAAC,oCAAoC,EAAEQ,OAAOP,GAAG,EAAE;YAC1D;QACF;IACF;AACF,EAAC;AAED,MAAMT,mBAAmB,OAAO,EAC9BP,UAAU,EACVxB,UAAU,EACVE,GAAG,EAKJ;IACC,MAAMgD,gBAAgBlD,WAAWmD,eAAe,CAACC,IAAI,CAAC,CAACC,QAAUA,MAAMC,IAAI,KAAK;IAChF,MAAMC,eACJL,eAAeM,SAAS,UACpBN,cAAcC,eAAe,CAC1BM,MAAM,CACL,CAACJ,QACCA,MAAMG,IAAI,KAAK,WACfH,MAAMF,eAAe,CAACO,IAAI,CAAC,CAACC,SAAWA,OAAOL,IAAI,KAAK,aAE1D3B,GAAG,CAAC,CAAC0B,QAAUA,MAAMC,IAAI,IAC5B,EAAE;IACR,MAAMM,gBAAgB;QACpB;QACA;WACGL,aAAa5B,GAAG,CAAC,CAAC2B,OAAS,CAAC,SAAS,EAAEA,KAAK,SAAS,CAAC;KAC1D;IACD,4EAA4E;IAC5E,4EAA4E;IAC5E,MAAMO,YAAY,IAAInC,IACpBF,WACGiC,MAAM,CAAC,CAAC7B,OACPA,KAAKgB,KAAK,CAACkB,KAAK,CAAC,CAACC,OAASA,KAAKP,IAAI,KAAK,UAAUD,aAAaS,QAAQ,CAACD,KAAKE,OAAO,IAEtFtC,GAAG,CAAC,CAACC,OAAS;YAAC/B,sBAAsB+B;YAAOA;SAAK;IAEtD,MAAMsC,uBAAmC;QACvCC,YAAY;QACZC,UAAU;QACVC,QAAQ;QACRC,KAAK;IACP;IACA,MAAMC,SAAqB;QACzB,GAAGL,oBAAoB;QACvBM,UAAU;QACVC,UAAU;QACVC,UAAUR;QACV,GAAIX,aAAajC,MAAM,GACnB;YAAEqD,UAAUC,OAAOC,WAAW,CAACtB,aAAa5B,GAAG,CAAC,CAAC2B,OAAS;oBAACA;oBAAMY;iBAAqB;QAAG,IACzF,CAAC,CAAC;IACR;IACA,8EAA8E;IAC9E,uEAAuE;IACvE,MAAMY,YAAY;WACb,IAAIhC,IACL;eAAIe,UAAU7B,MAAM;SAAG,CAAC+C,OAAO,CAAC,CAAC,EAAEvC,GAAG,EAAE;YACtC,MAAMwC,QAAQtF,oBAAoB;gBAAE8C;YAAI,GAAGyC,KAAK,CAAC;YACjD,OAAOD,MAAMrD,GAAG,CAAC,CAACuD,GAAGC,QAAUH,MAAMI,KAAK,CAACD,OAAOE,IAAI,CAAC;QACzD;KAEH;IAED,IAAK,IAAIC,SAAS,GAAGA,SAASR,UAAUxD,MAAM,IAAIuC,UAAUhC,IAAI,EAAEyD,UAAUvF,SAAU;QACpF,MAAMwF,QAAQT,UAAUM,KAAK,CAACE,QAAQA,SAASvF;QAC/C,MAAMO,QAAe;YAAEkF,IAAI5B,cAAcjC,GAAG,CAAC,CAAC0B,QAAW,CAAA;oBAAE,CAACA,MAAM,EAAE;wBAAEoC,IAAIF;oBAAM;gBAAE,CAAA;QAAI;QACtF,IAAI/E,OAAO;QAEX,MAAOqD,UAAUhC,IAAI,CAAE;YACrB,MAAMV,OAAO,MAAMjB,IAAIQ,OAAO,CAACC,EAAE,CAACyC,IAAI,CAAa;gBACjDpD,YAAYA,WAAWa,IAAI;gBAC3BC,OAAOf;gBACPS;gBACAkF,YAAY;gBACZxF;gBACAqE;gBACAoB,MAAM;gBACNrF;YACF;YAEA,KAAK,MAAML,OAAOkB,KAAKA,IAAI,CAAE;gBAC3B,MAAMyE,iBAAiB;oBAAE5F;oBAAYC;oBAAK4D;oBAAW3D;gBAAI;YAC3D;YACA,IAAIiB,KAAKA,IAAI,CAACG,MAAM,GAAGvB,UAAU;gBAC/B;YACF;YACAS,QAAQ;QACV;QAEA,IAAIR,WAAWS,QAAQ,EAAE;YACvBD,OAAO;YACP,MAAMqF,eAAsB;gBAC1BL,IAAI5B,cAAcjC,GAAG,CAAC,CAAC0B,QAAW,CAAA;wBAAE,CAAC,CAAC,QAAQ,EAAEA,OAAO,CAAC,EAAE;4BAAEoC,IAAIF;wBAAM;oBAAE,CAAA;YAC1E;YAEA,MAAO1B,UAAUhC,IAAI,CAAE;gBACrB,MAAMpB,WAAW,MAAMP,IAAIQ,OAAO,CAACC,EAAE,CAACC,YAAY,CAAa;oBAC7DZ,YAAYA,WAAWa,IAAI;oBAC3BC,OAAOf;oBACPS;oBACAkF,YAAY;oBACZxF;oBACAqE,QAAQ;wBAAElD,SAASkD;oBAAO;oBAC1BoB,MAAM;oBACNrF,OAAOuF;gBACT;gBAEA,KAAK,MAAM3E,OAAOT,SAASU,IAAI,CAAE;oBAC/B,MAAMyE,iBAAiB;wBAAE5F;wBAAYC,KAAKiB,IAAIG,OAAO;wBAAEwC;wBAAW3D;oBAAI;gBACxE;gBACA,IAAIO,SAASU,IAAI,CAACG,MAAM,GAAGvB,UAAU;oBACnC;gBACF;gBACAS,QAAQ;YACV;QACF;IACF;IAEA,OAAO;WAAIqD,UAAU7B,MAAM;KAAG;AAChC;AAEA,MAAM4D,mBAAmB,OAAO,EAC9B5F,UAAU,EACVC,GAAG,EACH4D,SAAS,EACT3D,GAAG,EAMJ;IACC,KAAK,MAAM0B,QAAQ,CAAA,MAAMjC,mBAAmB;QAAEK;QAAYC;QAAKC;IAAI,EAAC,EAAG;QACrE2D,UAAUiC,MAAM,CAACjG,sBAAsB+B;IACzC;AACF;AAEA,MAAMO,mBAAmB,OAAO,EAC9BnC,UAAU,EACV4B,IAAI,EACJ1B,GAAG,EAKJ;IACC,MAAM6F,aAAa/F,WAAWgG,MAAM,CAACC,cAAc;IACnD,IAAI,CAACF,YAAY;QACf,MAAMG,YAAYlG,WAAWgG,MAAM,CAACE,SAAS;QAE7C,IAAI,CAACA,WAAW;YACd,MAAM,IAAIC,MAAM,CAAC,6CAA6C,EAAEnG,WAAWa,IAAI,EAAE;QACnF;QAEA,MAAM2B,MAAM9C,oBAAoB;YAAE8C,KAAKZ,KAAKY,GAAG;QAAC;QAChD,MAAM4D,YAAY,MAAM7G,GAAG8G,QAAQ,CAACH;QACpC,MAAMI,SAAS9G,KAAK+G,OAAO,CAACH,WAAW5D;QACvC,MAAMgE,WAAWhH,KAAKgH,QAAQ,CAACJ,WAAWE;QAE1C,IAAI,CAACE,YAAYA,SAASC,UAAU,CAAC,SAASjH,KAAKkH,UAAU,CAACF,WAAW;YACvE,MAAM,IAAIL,MAAM,CAAC,2BAA2B,EAAE3D,KAAK;QACrD;QAEA,IAAI;YACF,MAAMxB,SAAS,MAAMzB,GAAG8G,QAAQ,CAAC7G,KAAKmH,OAAO,CAACL;YAC9C,MAAMM,iBAAiBpH,KAAKgH,QAAQ,CAACJ,WAAWpF;YAEhD,IAAI4F,eAAeH,UAAU,CAAC,SAASjH,KAAKkH,UAAU,CAACE,iBAAiB;gBACtE,MAAM,IAAIT,MAAM,CAAC,yCAAyC,EAAE3D,KAAK;YACnE;YAEA,MAAMjD,GAAGsH,MAAM,CAACP;QAClB,EAAE,OAAOlE,KAAK;YACZ,IAAI,AAACA,IAA8B0E,IAAI,KAAK,UAAU;gBACpD,MAAM1E;YACR;QACF;QAEA;IACF;IAEA,MAAM2D,WAAWD,MAAM,CAAC;QAAEtD,KAAKZ,KAAKY,GAAG;QAAEtC;IAAI;AAC/C"}

package/dist/uploads/fileVersioning/cloudStorage.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cloudStorage.d.ts","sourceRoot":"","sources":["../../../src/uploads/fileVersioning/cloudStorage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;~~AAuB7C~~,yFAAyF;AACzF,eAAO,MAAM,qBAAqB,YAAa;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,KAAG,CAAC,MAAM,IAAI,CAmBnF,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAU,CAAC,4CAMzC;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAA;CACxB,KAAG,OAAO,CAAC,CAAC,CAqCZ,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,CAAC,yDAQvC;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,OAAO,EAAE,UAAU,CAAA;IACnB,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAA;CACxB,KAAG,OAAO,CAAC,CAAC,CAqEZ,CAAA"}
1	+ {"version":3,"file":"cloudStorage.d.ts","sourceRoot":"","sources":["../../../src/uploads/fileVersioning/cloudStorage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAgB7C,yFAAyF;AACzF,eAAO,MAAM,qBAAqB,YAAa;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,KAAG,CAAC,MAAM,IAAI,CAmBnF,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAU,CAAC,4CAMzC;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAA;CACxB,KAAG,OAAO,CAAC,CAAC,CAqCZ,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,CAAC,yDAQvC;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,OAAO,EAAE,UAAU,CAAA;IACnB,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAA;CACxB,KAAG,OAAO,CAAC,CAAC,CAqEZ,CAAA"}

package/dist/uploads/fileVersioning/cloudStorage.js CHANGED Viewed

@@ -1,5 +1,3 @@
-import { resolveBranchRowID } from '../../branching/resolveBranchRowID.js';
-import { branchField, branchParentField } from '../../branching/types.js';
 import { saveVersion } from '../../versions/saveVersion.js';
 import { collectStoredFiles as collectSavedFiles, removeUnreferencedStagedObjects, scheduleUnreferencedFileCleanup } from './cleanup.js';
 import { runFileCreationPlan, runFileOperationPlan } from './fileOperationManager.js';
@@ -180,28 +178,21 @@ export const runCloudFileUpdate = async ({ id, collection, current, data, files,
     });
 };
 const persistLegacyCloudVersions = async ({ id, collection, current, req })=>{
-    const versionParent = await resolveBranchRowID({
-        id,
-        collectionSlug: collection.slug,
-        req
-    });
     let page = 1;
     let hasVersions = false;
     while(true){
         const versions = await req.payload.db.findVersions({
-            branch: false,
             collection: collection.slug,
             limit: 100,
             page,
             req,
             where: {
                 parent: {
-                    equals: versionParent
+                    equals: id
                 }
             }
         });
         for (const row of versions.docs){
-            const branchVersion = row;
             hasVersions = true;
             if (hasStoredOriginal({
                 doc: row.version
@@ -223,12 +214,6 @@ const persistLegacyCloudVersions = async ({ id, collection, current, req })=>{
                 collection: collection.slug,
                 req,
                 versionData: {
-                    ...branchVersion[branchField] !== undefined ? {
-                        [branchField]: branchVersion[branchField]
-                    } : {},
-                    ...branchVersion[branchParentField] !== undefined ? {
-                        [branchParentField]: branchVersion[branchParentField]
-                    } : {},
                     createdAt: row.createdAt,
                     latest: row.latest,
                     parent: row.parent,

package/dist/uploads/fileVersioning/cloudStorage.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../src/uploads/fileVersioning/cloudStorage.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../../collections/config/types.js'\nimport type { JsonObject, PayloadRequest } from '../../types/index.js'\nimport type { FileToSave } from '../types.js'\nimport type { StagedObject } from './fileOperationManager.js'\n\nimport { resolveBranchRowID } from '../../branching/resolveBranchRowID.js'\nimport { branchField, branchParentField } from '../../branching/types.js'\nimport { saveVersion } from '../../versions/saveVersion.js'\nimport {\n collectStoredFiles as collectSavedFiles,\n removeUnreferencedStagedObjects,\n scheduleUnreferencedFileCleanup,\n} from './cleanup.js'\nimport { runFileCreationPlan, runFileOperationPlan } from './fileOperationManager.js'\nimport {\n collectStoredFiles,\n getStoredFileIdentity,\n withLegacyCloudUploadFileData,\n} from './storedFiles.js'\n\ntype BranchVersionMetadata = {\n [branchField]?: null \| string\n [branchParentField]?: null \| number \| string\n}\n\n/** Preserve the caller's cloud flags; nested Local API calls can replace req.context. /\nexport const captureCloudHookState = ({ req }: { req: PayloadRequest }): (() => void) => {\n const previousState = ['_payloadManagedCloudStorage', '_payloadManagedCloudMetadata'].map(\n (key) => ({\n hasProperty: Object.hasOwn(req.context ?? {}, key),\n key,\n value: req.context?.[key],\n }),\n )\n\n return () => {\n req.context ??= {}\n for (const { hasProperty, key, value } of previousState) {\n if (hasProperty) {\n req.context[key] = value\n } else {\n delete req.context[key]\n }\n }\n }\n}\n\nexport const runCloudFileCreation = async <T>({\n collection,\n data,\n files,\n req,\n write,\n}: {\n collection: SanitizedCollectionConfig\n data: JsonObject\n files: FileToSave[]\n req: PayloadRequest\n write: () => Promise<T>\n}): Promise<T> => {\n const operations = collection.upload.fileOperations\n\n if (\n !operations \|\|\n req.context?.skipCloudStorage \|\|\n (files.length === 0 && !req.context?._payloadVerifiedProviderOriginal)\n ) {\n return write()\n }\n\n let metadata: Record<string, unknown> = {}\n\n return runFileCreationPlan({\n cleanupStagedAfterWriteFailure: (objects) =>\n removeUnreferencedStagedObjects({ collection, objects, req }),\n req,\n stage: async ({ trackStagedObject }) => {\n trackClientUploadOriginal({ collection, data, req, trackStagedObject })\n const staged = await operations.stage({\n data,\n files,\n req,\n trackStagedObject,\n })\n metadata = staged.metadata\n Object.assign(data, metadata)\n },\n // Create's version and afterChange hooks run after the database insert. The\n // outer create operation restores the previous guard after those hooks finish.\n write: () => {\n req.context ??= {}\n req.context._payloadManagedCloudStorage = true\n req.context._payloadManagedCloudMetadata = metadata\n return write()\n },\n })\n}\n\nexport const runCloudFileUpdate = async <T>({\n id,\n collection,\n current,\n data,\n files,\n req,\n write,\n}: {\n collection: SanitizedCollectionConfig\n current: JsonObject\n data: JsonObject\n files: FileToSave[]\n id: number \| string\n req: PayloadRequest\n write: () => Promise<T>\n}): Promise<T> => {\n const operations = collection.upload.fileOperations\n const storedCurrent = operations\n ? await withLegacyCloudUploadFileData({ collection, doc: current, req })\n : current\n const nextFiles = collectStoredFiles({\n collection,\n doc: { ...storedCurrent, ...data },\n req,\n trustGenerated: true,\n })\n const currentFiles = collectStoredFiles({ collection, doc: storedCurrent, req })\n const nextIdentities = new Set(nextFiles.map(getStoredFileIdentity))\n const hasStoredFileChange =\n nextIdentities.size !== currentFiles.length \|\|\n currentFiles.some((file) => !nextIdentities.has(getStoredFileIdentity(file)))\n\n if (\n !operations \|\|\n req.context?.skipCloudStorage \|\|\n (files.length === 0 && !req.context?._payloadVerifiedProviderOriginal && !hasStoredFileChange)\n ) {\n return write()\n }\n\n let metadata: Record<string, unknown> = {}\n\n return runFileOperationPlan({\n cleanupStagedAfterWriteFailure: (objects) =>\n removeUnreferencedStagedObjects({ collection, objects, req }),\n req,\n stage: async ({ trackStagedObject }) => {\n if (files.length === 0 && !req.context?._payloadVerifiedProviderOriginal) {\n return\n }\n trackClientUploadOriginal({ collection, data, req, trackStagedObject })\n const staged = await operations.stage({\n data,\n files,\n req,\n trackStagedObject,\n })\n metadata = staged.metadata\n Object.assign(data, metadata)\n },\n write: async () => {\n if (\n collection.versions &&\n !hasStoredOriginal({ doc: current }) &&\n hasStoredOriginal({ doc: storedCurrent })\n ) {\n await persistLegacyCloudVersions({ id, collection, current: storedCurrent, req })\n }\n\n const result = await withCloudHookGuard({\n metadata,\n req,\n write,\n })\n\n await scheduleUnreferencedFileCleanup({\n candidates: await collectSavedFiles({ collection, doc: storedCurrent, req }),\n collection,\n req,\n })\n\n return result\n },\n })\n}\n\n/* Track a verified client-uploaded source, retaining it if another document still references it. */\nconst trackClientUploadOriginal = ({\n collection,\n data,\n req,\n trackStagedObject,\n}: {\n collection: SanitizedCollectionConfig\n data: JsonObject\n req: PayloadRequest\n trackStagedObject: (object: StagedObject) => void\n}): void => {\n const verifiedOriginal = req.context?._payloadVerifiedProviderOriginal as\n \| { key: string }\n \| undefined\n\n if (!verifiedOriginal) {\n return\n }\n\n const original = collectStoredFiles({ collection, doc: data, req, trustGenerated: true }).find(\n ({ key, roles }) =>\n key === verifiedOriginal.key && roles.some((role) => role.type === 'original'),\n )\n\n if (!original) {\n return\n }\n\n const object: StagedObject = {\n key: original.key,\n remove: () => collection.upload.fileOperations!.delete({ key: original.key, req }),\n }\n\n trackStagedObject({\n key: object.key,\n remove: () => removeUnreferencedStagedObjects({ collection, objects: [object], req }),\n })\n}\n\nconst persistLegacyCloudVersions = async ({\n id,\n collection,\n current,\n req,\n}: {\n collection: SanitizedCollectionConfig\n current: JsonObject\n id: number \| string\n req: PayloadRequest\n}): Promise<void> => {\n const versionParent = await resolveBranchRowID({\n id,\n collectionSlug: collection.slug,\n req,\n })\n let page = 1\n let hasVersions = false\n\n while (true) {\n const versions = await req.payload.db.findVersions<JsonObject>({\n branch: false,\n collection: collection.slug,\n limit: 100,\n page,\n req,\n where: { parent: { equals: versionParent } },\n })\n\n for (const row of versions.docs) {\n const branchVersion = row as BranchVersionMetadata & typeof row\n\n hasVersions = true\n if (hasStoredOriginal({ doc: row.version })) {\n continue\n }\n\n const version = await withLegacyCloudUploadFileData({\n collection,\n doc: row.version,\n req,\n })\n if (!hasStoredOriginal({ doc: version })) {\n continue\n }\n\n await req.payload.db.updateVersion({\n id: row.id,\n collection: collection.slug,\n req,\n versionData: {\n ...(branchVersion[branchField] !== undefined\n ? { [branchField]: branchVersion[branchField] }\n : {}),\n ...(branchVersion[branchParentField] !== undefined\n ? { [branchParentField]: branchVersion[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 if (versions.docs.length < 100) {\n break\n }\n page += 1\n }\n\n if (!hasVersions && hasStoredOriginal({ doc: current })) {\n await saveVersion({\n id,\n collection,\n docWithLocales: current,\n draft: false,\n operation: 'update',\n payload: req.payload,\n req,\n })\n }\n}\n\nconst hasStoredOriginal = ({ doc }: { doc: JsonObject }): boolean =>\n Boolean(\n doc.original &&\n typeof doc.original === 'object' &&\n typeof (doc.original as Record<string, unknown>).filename === 'string',\n )\n\nconst withCloudHookGuard = async <T>({\n metadata,\n req,\n write,\n}: {\n metadata: Record<string, unknown>\n req: PayloadRequest\n write: () => Promise<T>\n}): Promise<T> => {\n const restoreCloudHookState = captureCloudHookState({ req })\n req.context ??= {}\n req.context._payloadManagedCloudStorage = true\n req.context._payloadManagedCloudMetadata = metadata\n\n try {\n return await write()\n } finally {\n restoreCloudHookState()\n }\n}\n"],"names":["resolveBranchRowID","branchField","branchParentField","saveVersion","collectStoredFiles","collectSavedFiles","removeUnreferencedStagedObjects","scheduleUnreferencedFileCleanup","runFileCreationPlan","runFileOperationPlan","getStoredFileIdentity","withLegacyCloudUploadFileData","captureCloudHookState","req","previousState","map","key","hasProperty","Object","hasOwn","context","value","runCloudFileCreation","collection","data","files","write","operations","upload","fileOperations","skipCloudStorage","length","_payloadVerifiedProviderOriginal","metadata","cleanupStagedAfterWriteFailure","objects","stage","trackStagedObject","trackClientUploadOriginal","staged","assign","_payloadManagedCloudStorage","_payloadManagedCloudMetadata","runCloudFileUpdate","id","current","storedCurrent","doc","nextFiles","trustGenerated","currentFiles","nextIdentities","Set","hasStoredFileChange","size","some","file","has","versions","hasStoredOriginal","persistLegacyCloudVersions","result","withCloudHookGuard","candidates","verifiedOriginal","original","find","roles","role","type","object","remove","delete","versionParent","collectionSlug","slug","page","hasVersions","payload","db","findVersions","branch","limit","where","parent","equals","row","docs","branchVersion","version","updateVersion","versionData","undefined","createdAt","latest","publishedLocale","updatedAt","docWithLocales","draft","operation","Boolean","filename","restoreCloudHookState"],"mappings":"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"}
1	+ {"version":3,"sources":["../../../src/uploads/fileVersioning/cloudStorage.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../../collections/config/types.js'\nimport type { JsonObject, PayloadRequest } from '../../types/index.js'\nimport type { FileToSave } from '../types.js'\nimport type { StagedObject } from './fileOperationManager.js'\n\nimport { saveVersion } from '../../versions/saveVersion.js'\nimport {\n collectStoredFiles as collectSavedFiles,\n removeUnreferencedStagedObjects,\n scheduleUnreferencedFileCleanup,\n} from './cleanup.js'\nimport { runFileCreationPlan, runFileOperationPlan } from './fileOperationManager.js'\nimport {\n collectStoredFiles,\n getStoredFileIdentity,\n withLegacyCloudUploadFileData,\n} from './storedFiles.js'\n\n/** Preserve the caller's cloud flags; nested Local API calls can replace req.context. /\nexport const captureCloudHookState = ({ req }: { req: PayloadRequest }): (() => void) => {\n const previousState = ['_payloadManagedCloudStorage', '_payloadManagedCloudMetadata'].map(\n (key) => ({\n hasProperty: Object.hasOwn(req.context ?? {}, key),\n key,\n value: req.context?.[key],\n }),\n )\n\n return () => {\n req.context ??= {}\n for (const { hasProperty, key, value } of previousState) {\n if (hasProperty) {\n req.context[key] = value\n } else {\n delete req.context[key]\n }\n }\n }\n}\n\nexport const runCloudFileCreation = async <T>({\n collection,\n data,\n files,\n req,\n write,\n}: {\n collection: SanitizedCollectionConfig\n data: JsonObject\n files: FileToSave[]\n req: PayloadRequest\n write: () => Promise<T>\n}): Promise<T> => {\n const operations = collection.upload.fileOperations\n\n if (\n !operations \|\|\n req.context?.skipCloudStorage \|\|\n (files.length === 0 && !req.context?._payloadVerifiedProviderOriginal)\n ) {\n return write()\n }\n\n let metadata: Record<string, unknown> = {}\n\n return runFileCreationPlan({\n cleanupStagedAfterWriteFailure: (objects) =>\n removeUnreferencedStagedObjects({ collection, objects, req }),\n req,\n stage: async ({ trackStagedObject }) => {\n trackClientUploadOriginal({ collection, data, req, trackStagedObject })\n const staged = await operations.stage({\n data,\n files,\n req,\n trackStagedObject,\n })\n metadata = staged.metadata\n Object.assign(data, metadata)\n },\n // Create's version and afterChange hooks run after the database insert. The\n // outer create operation restores the previous guard after those hooks finish.\n write: () => {\n req.context ??= {}\n req.context._payloadManagedCloudStorage = true\n req.context._payloadManagedCloudMetadata = metadata\n return write()\n },\n })\n}\n\nexport const runCloudFileUpdate = async <T>({\n id,\n collection,\n current,\n data,\n files,\n req,\n write,\n}: {\n collection: SanitizedCollectionConfig\n current: JsonObject\n data: JsonObject\n files: FileToSave[]\n id: number \| string\n req: PayloadRequest\n write: () => Promise<T>\n}): Promise<T> => {\n const operations = collection.upload.fileOperations\n const storedCurrent = operations\n ? await withLegacyCloudUploadFileData({ collection, doc: current, req })\n : current\n const nextFiles = collectStoredFiles({\n collection,\n doc: { ...storedCurrent, ...data },\n req,\n trustGenerated: true,\n })\n const currentFiles = collectStoredFiles({ collection, doc: storedCurrent, req })\n const nextIdentities = new Set(nextFiles.map(getStoredFileIdentity))\n const hasStoredFileChange =\n nextIdentities.size !== currentFiles.length \|\|\n currentFiles.some((file) => !nextIdentities.has(getStoredFileIdentity(file)))\n\n if (\n !operations \|\|\n req.context?.skipCloudStorage \|\|\n (files.length === 0 && !req.context?._payloadVerifiedProviderOriginal && !hasStoredFileChange)\n ) {\n return write()\n }\n\n let metadata: Record<string, unknown> = {}\n\n return runFileOperationPlan({\n cleanupStagedAfterWriteFailure: (objects) =>\n removeUnreferencedStagedObjects({ collection, objects, req }),\n req,\n stage: async ({ trackStagedObject }) => {\n if (files.length === 0 && !req.context?._payloadVerifiedProviderOriginal) {\n return\n }\n trackClientUploadOriginal({ collection, data, req, trackStagedObject })\n const staged = await operations.stage({\n data,\n files,\n req,\n trackStagedObject,\n })\n metadata = staged.metadata\n Object.assign(data, metadata)\n },\n write: async () => {\n if (\n collection.versions &&\n !hasStoredOriginal({ doc: current }) &&\n hasStoredOriginal({ doc: storedCurrent })\n ) {\n await persistLegacyCloudVersions({ id, collection, current: storedCurrent, req })\n }\n\n const result = await withCloudHookGuard({\n metadata,\n req,\n write,\n })\n\n await scheduleUnreferencedFileCleanup({\n candidates: await collectSavedFiles({ collection, doc: storedCurrent, req }),\n collection,\n req,\n })\n\n return result\n },\n })\n}\n\n/* Track a verified client-uploaded source, retaining it if another document still references it. */\nconst trackClientUploadOriginal = ({\n collection,\n data,\n req,\n trackStagedObject,\n}: {\n collection: SanitizedCollectionConfig\n data: JsonObject\n req: PayloadRequest\n trackStagedObject: (object: StagedObject) => void\n}): void => {\n const verifiedOriginal = req.context?._payloadVerifiedProviderOriginal as\n \| { key: string }\n \| undefined\n\n if (!verifiedOriginal) {\n return\n }\n\n const original = collectStoredFiles({ collection, doc: data, req, trustGenerated: true }).find(\n ({ key, roles }) =>\n key === verifiedOriginal.key && roles.some((role) => role.type === 'original'),\n )\n\n if (!original) {\n return\n }\n\n const object: StagedObject = {\n key: original.key,\n remove: () => collection.upload.fileOperations!.delete({ key: original.key, req }),\n }\n\n trackStagedObject({\n key: object.key,\n remove: () => removeUnreferencedStagedObjects({ collection, objects: [object], req }),\n })\n}\n\nconst persistLegacyCloudVersions = async ({\n id,\n collection,\n current,\n req,\n}: {\n collection: SanitizedCollectionConfig\n current: JsonObject\n id: number \| string\n req: PayloadRequest\n}): Promise<void> => {\n let page = 1\n let hasVersions = false\n\n while (true) {\n const versions = await req.payload.db.findVersions<JsonObject>({\n collection: collection.slug,\n limit: 100,\n page,\n req,\n where: { parent: { equals: id } },\n })\n\n for (const row of versions.docs) {\n hasVersions = true\n if (hasStoredOriginal({ doc: row.version })) {\n continue\n }\n\n const version = await withLegacyCloudUploadFileData({\n collection,\n doc: row.version,\n req,\n })\n if (!hasStoredOriginal({ doc: 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 if (versions.docs.length < 100) {\n break\n }\n page += 1\n }\n\n if (!hasVersions && hasStoredOriginal({ doc: current })) {\n await saveVersion({\n id,\n collection,\n docWithLocales: current,\n draft: false,\n operation: 'update',\n payload: req.payload,\n req,\n })\n }\n}\n\nconst hasStoredOriginal = ({ doc }: { doc: JsonObject }): boolean =>\n Boolean(\n doc.original &&\n typeof doc.original === 'object' &&\n typeof (doc.original as Record<string, unknown>).filename === 'string',\n )\n\nconst withCloudHookGuard = async <T>({\n metadata,\n req,\n write,\n}: {\n metadata: Record<string, unknown>\n req: PayloadRequest\n write: () => Promise<T>\n}): Promise<T> => {\n const restoreCloudHookState = captureCloudHookState({ req })\n req.context ??= {}\n req.context._payloadManagedCloudStorage = true\n req.context._payloadManagedCloudMetadata = metadata\n\n try {\n return await write()\n } finally {\n restoreCloudHookState()\n }\n}\n"],"names":["saveVersion","collectStoredFiles","collectSavedFiles","removeUnreferencedStagedObjects","scheduleUnreferencedFileCleanup","runFileCreationPlan","runFileOperationPlan","getStoredFileIdentity","withLegacyCloudUploadFileData","captureCloudHookState","req","previousState","map","key","hasProperty","Object","hasOwn","context","value","runCloudFileCreation","collection","data","files","write","operations","upload","fileOperations","skipCloudStorage","length","_payloadVerifiedProviderOriginal","metadata","cleanupStagedAfterWriteFailure","objects","stage","trackStagedObject","trackClientUploadOriginal","staged","assign","_payloadManagedCloudStorage","_payloadManagedCloudMetadata","runCloudFileUpdate","id","current","storedCurrent","doc","nextFiles","trustGenerated","currentFiles","nextIdentities","Set","hasStoredFileChange","size","some","file","has","versions","hasStoredOriginal","persistLegacyCloudVersions","result","withCloudHookGuard","candidates","verifiedOriginal","original","find","roles","role","type","object","remove","delete","page","hasVersions","payload","db","findVersions","slug","limit","where","parent","equals","row","docs","version","updateVersion","versionData","createdAt","latest","publishedLocale","updatedAt","docWithLocales","draft","operation","Boolean","filename","restoreCloudHookState"],"mappings":"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"}

package/dist/uploads/fileVersioning/resolveHistoricalFile.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../src/uploads/fileVersioning/resolveHistoricalFile.ts"],"sourcesContent":["import type { Collection, TypeWithID } from '../../collections/config/types.js'\nimport type { JsonObject, PayloadRequest } from '../../types/index.js'\n\nimport { Forbidden } from '../../errors/Forbidden.js'\nimport { NotFound } from '../../errors/NotFound.js'\nimport { checkFileAccess } from '../checkFileAccess.js'\nimport { collectStoredFiles, withLegacyCloudUploadFileData } from './storedFiles.js'\n\ntype StoredVersion = {\n id: number \| string\n parent: number \| string\n version: JsonObject\n}\n\n/** Finds an exact saved object reference, including sizes removed from the current config. */\nexport const resolveHistoricalFile = async ({\n collection,\n filename,\n prefix,\n req,\n versionID,\n}: {\n collection: Collection\n filename: string\n prefix?: string\n req: PayloadRequest\n versionID: string\n}): Promise<TypeWithID> => {\n const { docs } = await req.payload.db.findVersions<JsonObject>({\n collection: collection.config.slug,\n limit: 1,\n req,\n where: { id: { equals: versionID } },\n })\n const matched = docs[0]\n\n // Check both policies before exposing a missing version or a filename mismatch.\n await checkFileAccess({ collection, documentID: matched?.parent, filename, req })\n const authorized = await req.payload.findVersionByID({\n id: versionID,\n collection: collection.config.slug,\n depth: 0,\n overrideAccess: false,\n req,\n showHiddenFields: true,\n })\n\n if (!authorized) {\n throw new Forbidden(req.t)\n }\n\n if (!matched) {\n throw new NotFound(req.t)\n }\n\n const historical = await resolveVersionFile({ collection, filename, prefix, req, row: matched })\n\n if (!historical) {\n throw new NotFound(req.t)\n }\n\n return historical\n}\n\nconst resolveVersionFile = async ({\n collection,\n filename,\n prefix,\n req,\n row,\n}: {\n collection: Collection\n filename: string\n prefix?: string\n req: PayloadRequest\n row: StoredVersion\n}): Promise<TypeWithID \| undefined> => {\n const saved = await withLegacyCloudUploadFileData({\n collection: collection.config,\n doc: row.version,\n req,\n })\n const hasFile = collectStoredFiles({ collection: collection.config, doc: saved, req }).some(\n (file) =>\n file.roles.some((role) => {\n const representation =\n role.type === 'size'\n ? (saved.variants as Record<string, JsonObject> \| undefined)?.[role.sizeKey]\n : role.type === 'original'\n ? (saved.original as JsonObject \| undefined)\n : saved\n return (\n representation?.filename === filename && (!prefix \|\| representation.prefix === prefix)\n )\n }),\n )\n\n if (!hasFile) {\n return\n }\n\n return { ...saved, id: row.parent } ~~as TypeWithID~~\n}\n"],"names":["Forbidden","NotFound","checkFileAccess","collectStoredFiles","withLegacyCloudUploadFileData","resolveHistoricalFile","collection","filename","prefix","req","versionID","docs","payload","db","findVersions","config","slug","limit","where","id","equals","matched","documentID","parent","authorized","findVersionByID","depth","overrideAccess","showHiddenFields","t","historical","resolveVersionFile","row","saved","doc","version","hasFile","some","file","roles","role","representation","type","variants","sizeKey","original"],"mappings":"AAGA,SAASA,SAAS,QAAQ,4BAA2B;AACrD,SAASC,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,eAAe,QAAQ,wBAAuB;AACvD,SAASC,kBAAkB,EAAEC,6BAA6B,QAAQ,mBAAkB;AAQpF,4FAA4F,GAC5F,OAAO,MAAMC,wBAAwB,OAAO,EAC1CC,UAAU,EACVC,QAAQ,EACRC,MAAM,EACNC,GAAG,EACHC,SAAS,EAOV;IACC,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAMF,IAAIG,OAAO,CAACC,EAAE,CAACC,YAAY,CAAa;QAC7DR,YAAYA,WAAWS,MAAM,CAACC,IAAI;QAClCC,OAAO;QACPR;QACAS,OAAO;YAAEC,IAAI;gBAAEC,QAAQV;YAAU;QAAE;IACrC;IACA,MAAMW,UAAUV,IAAI,CAAC,EAAE;IAEvB,gFAAgF;IAChF,MAAMT,gBAAgB;QAAEI;QAAYgB,YAAYD,SAASE;QAAQhB;QAAUE;IAAI;IAC/E,MAAMe,aAAa,MAAMf,IAAIG,OAAO,CAACa,eAAe,CAAC;QACnDN,IAAIT;QACJJ,YAAYA,WAAWS,MAAM,CAACC,IAAI;QAClCU,OAAO;QACPC,gBAAgB;QAChBlB;QACAmB,kBAAkB;IACpB;IAEA,IAAI,CAACJ,YAAY;QACf,MAAM,IAAIxB,UAAUS,IAAIoB,CAAC;IAC3B;IAEA,IAAI,CAACR,SAAS;QACZ,MAAM,IAAIpB,SAASQ,IAAIoB,CAAC;IAC1B;IAEA,MAAMC,aAAa,MAAMC,mBAAmB;QAAEzB;QAAYC;QAAUC;QAAQC;QAAKuB,KAAKX;IAAQ;IAE9F,IAAI,CAACS,YAAY;QACf,MAAM,IAAI7B,SAASQ,IAAIoB,CAAC;IAC1B;IAEA,OAAOC;AACT,EAAC;AAED,MAAMC,qBAAqB,OAAO,EAChCzB,UAAU,EACVC,QAAQ,EACRC,MAAM,EACNC,GAAG,EACHuB,GAAG,EAOJ;IACC,MAAMC,QAAQ,MAAM7B,8BAA8B;QAChDE,YAAYA,WAAWS,MAAM;QAC7BmB,KAAKF,IAAIG,OAAO;QAChB1B;IACF;IACA,MAAM2B,UAAUjC,mBAAmB;QAAEG,YAAYA,WAAWS,MAAM;QAAEmB,KAAKD;QAAOxB;IAAI,GAAG4B,IAAI,CACzF,CAACC,OACCA,KAAKC,KAAK,CAACF,IAAI,CAAC,CAACG;YACf,MAAMC,iBACJD,KAAKE,IAAI,KAAK,SACTT,MAAMU,QAAQ,EAA6C,CAACH,KAAKI,OAAO,CAAC,GAC1EJ,KAAKE,IAAI,KAAK,aACXT,MAAMY,QAAQ,GACfZ;YACR,OACEQ,gBAAgBlC,aAAaA,YAAa,CAAA,CAACC,UAAUiC,eAAejC,MAAM,KAAKA,MAAK;QAExF;IAGJ,IAAI,CAAC4B,SAAS;QACZ;IACF;IAEA,OAAO;QAAE,GAAGH,KAAK;QAAEd,IAAIa,IAAIT,MAAM;IAAC;AACpC"}
1	+ {"version":3,"sources":["../../../src/uploads/fileVersioning/resolveHistoricalFile.ts"],"sourcesContent":["import type { Collection, TypeWithID } from '../../collections/config/types.js'\nimport type { JsonObject, PayloadRequest } from '../../types/index.js'\n\nimport { Forbidden } from '../../errors/Forbidden.js'\nimport { NotFound } from '../../errors/NotFound.js'\nimport { checkFileAccess } from '../checkFileAccess.js'\nimport { collectStoredFiles, withLegacyCloudUploadFileData } from './storedFiles.js'\n\ntype StoredVersion = {\n id: number \| string\n parent: number \| string\n version: JsonObject\n}\n\n/** Finds an exact saved object reference, including sizes removed from the current config. */\nexport const resolveHistoricalFile = async ({\n collection,\n filename,\n prefix,\n req,\n versionID,\n}: {\n collection: Collection\n filename: string\n prefix?: string\n req: PayloadRequest\n versionID: string\n}): Promise<TypeWithID> => {\n const { docs } = await req.payload.db.findVersions<JsonObject>({\n collection: collection.config.slug,\n limit: 1,\n req,\n where: { id: { equals: versionID } },\n })\n const matched = docs[0]\n\n // Check both policies before exposing a missing version or a filename mismatch.\n await checkFileAccess({ collection, documentID: matched?.parent, filename, req })\n const authorized = await req.payload.findVersionByID({\n id: versionID,\n collection: collection.config.slug,\n depth: 0,\n overrideAccess: false,\n req,\n showHiddenFields: true,\n })\n\n if (!authorized) {\n throw new Forbidden(req.t)\n }\n\n if (!matched) {\n throw new NotFound(req.t)\n }\n\n const historical = await resolveVersionFile({ collection, filename, prefix, req, row: matched })\n\n if (!historical) {\n throw new NotFound(req.t)\n }\n\n return historical\n}\n\nconst resolveVersionFile = async ({\n collection,\n filename,\n prefix,\n req,\n row,\n}: {\n collection: Collection\n filename: string\n prefix?: string\n req: PayloadRequest\n row: StoredVersion\n}): Promise<TypeWithID \| undefined> => {\n const saved = await withLegacyCloudUploadFileData({\n collection: collection.config,\n doc: row.version,\n req,\n })\n const hasFile = collectStoredFiles({ collection: collection.config, doc: saved, req }).some(\n (file) =>\n file.roles.some((role) => {\n const representation =\n role.type === 'size'\n ? (saved.variants as Record<string, JsonObject> \| undefined)?.[role.sizeKey]\n : role.type === 'original'\n ? (saved.original as JsonObject \| undefined)\n : saved\n return (\n representation?.filename === filename && (!prefix \|\| representation.prefix === prefix)\n )\n }),\n )\n\n if (!hasFile) {\n return\n }\n\n return { ...saved, id: row.parent }\n}\n"],"names":["Forbidden","NotFound","checkFileAccess","collectStoredFiles","withLegacyCloudUploadFileData","resolveHistoricalFile","collection","filename","prefix","req","versionID","docs","payload","db","findVersions","config","slug","limit","where","id","equals","matched","documentID","parent","authorized","findVersionByID","depth","overrideAccess","showHiddenFields","t","historical","resolveVersionFile","row","saved","doc","version","hasFile","some","file","roles","role","representation","type","variants","sizeKey","original"],"mappings":"AAGA,SAASA,SAAS,QAAQ,4BAA2B;AACrD,SAASC,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,eAAe,QAAQ,wBAAuB;AACvD,SAASC,kBAAkB,EAAEC,6BAA6B,QAAQ,mBAAkB;AAQpF,4FAA4F,GAC5F,OAAO,MAAMC,wBAAwB,OAAO,EAC1CC,UAAU,EACVC,QAAQ,EACRC,MAAM,EACNC,GAAG,EACHC,SAAS,EAOV;IACC,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAMF,IAAIG,OAAO,CAACC,EAAE,CAACC,YAAY,CAAa;QAC7DR,YAAYA,WAAWS,MAAM,CAACC,IAAI;QAClCC,OAAO;QACPR;QACAS,OAAO;YAAEC,IAAI;gBAAEC,QAAQV;YAAU;QAAE;IACrC;IACA,MAAMW,UAAUV,IAAI,CAAC,EAAE;IAEvB,gFAAgF;IAChF,MAAMT,gBAAgB;QAAEI;QAAYgB,YAAYD,SAASE;QAAQhB;QAAUE;IAAI;IAC/E,MAAMe,aAAa,MAAMf,IAAIG,OAAO,CAACa,eAAe,CAAC;QACnDN,IAAIT;QACJJ,YAAYA,WAAWS,MAAM,CAACC,IAAI;QAClCU,OAAO;QACPC,gBAAgB;QAChBlB;QACAmB,kBAAkB;IACpB;IAEA,IAAI,CAACJ,YAAY;QACf,MAAM,IAAIxB,UAAUS,IAAIoB,CAAC;IAC3B;IAEA,IAAI,CAACR,SAAS;QACZ,MAAM,IAAIpB,SAASQ,IAAIoB,CAAC;IAC1B;IAEA,MAAMC,aAAa,MAAMC,mBAAmB;QAAEzB;QAAYC;QAAUC;QAAQC;QAAKuB,KAAKX;IAAQ;IAE9F,IAAI,CAACS,YAAY;QACf,MAAM,IAAI7B,SAASQ,IAAIoB,CAAC;IAC1B;IAEA,OAAOC;AACT,EAAC;AAED,MAAMC,qBAAqB,OAAO,EAChCzB,UAAU,EACVC,QAAQ,EACRC,MAAM,EACNC,GAAG,EACHuB,GAAG,EAOJ;IACC,MAAMC,QAAQ,MAAM7B,8BAA8B;QAChDE,YAAYA,WAAWS,MAAM;QAC7BmB,KAAKF,IAAIG,OAAO;QAChB1B;IACF;IACA,MAAM2B,UAAUjC,mBAAmB;QAAEG,YAAYA,WAAWS,MAAM;QAAEmB,KAAKD;QAAOxB;IAAI,GAAG4B,IAAI,CACzF,CAACC,OACCA,KAAKC,KAAK,CAACF,IAAI,CAAC,CAACG;YACf,MAAMC,iBACJD,KAAKE,IAAI,KAAK,SACTT,MAAMU,QAAQ,EAA6C,CAACH,KAAKI,OAAO,CAAC,GAC1EJ,KAAKE,IAAI,KAAK,aACXT,MAAMY,QAAQ,GACfZ;YACR,OACEQ,gBAAgBlC,aAAaA,YAAa,CAAA,CAACC,UAAUiC,eAAejC,MAAM,KAAKA,MAAK;QAExF;IAGJ,IAAI,CAAC4B,SAAS;QACZ;IACF;IAEA,OAAO;QAAE,GAAGH,KAAK;QAAEd,IAAIa,IAAIT,MAAM;IAAC;AACpC"}

package/dist/uploads/formatFilesize.js CHANGED Viewed

@@ -1,4 +1,4 @@
-export function formatFilesize(bytes, decimals = 0) {
+export function formatFilesize(bytes, decimals = 1) {
     if (bytes === 0) {
         return '0 bytes';
     }

package/dist/uploads/formatFilesize.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../src/uploads/formatFilesize.ts"],"sourcesContent":["export function formatFilesize(bytes: number, decimals = 0): string {\n if (bytes === 0) {\n return '0 bytes'\n }\n\n const k = 1024\n const dm = decimals < 0 ? 0 : decimals\n const sizes = [' bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']\n\n const i = Math.floor(Math.log(bytes) / Math.log(k))\n\n return `${parseFloat((bytes / k ** i).toFixed(dm))}${sizes[i]}`\n}\n"],"names":["formatFilesize","bytes","decimals","k","dm","sizes","i","Math","floor","log","parseFloat","toFixed"],"mappings":"AAAA,OAAO,SAASA,eAAeC,KAAa,EAAEC,WAAW,CAAC;IACxD,IAAID,UAAU,GAAG;QACf,OAAO;IACT;IAEA,MAAME,IAAI;IACV,MAAMC,KAAKF,WAAW,IAAI,IAAIA;IAC9B,MAAMG,QAAQ;QAAC;QAAU;QAAM;QAAM;QAAM;QAAM;QAAM;QAAM;QAAM;KAAK;IAExE,MAAMC,IAAIC,KAAKC,KAAK,CAACD,KAAKE,GAAG,CAACR,SAASM,KAAKE,GAAG,CAACN;IAEhD,OAAO,GAAGO,WAAW,AAACT,CAAAA,QAAQE,KAAKG,CAAAA,EAAGK,OAAO,CAACP,OAAOC,KAAK,CAACC,EAAE,EAAE;AACjE"}
1	+ {"version":3,"sources":["../../src/uploads/formatFilesize.ts"],"sourcesContent":["export function formatFilesize(bytes: number, decimals = 1): string {\n if (bytes === 0) {\n return '0 bytes'\n }\n\n const k = 1024\n const dm = decimals < 0 ? 0 : decimals\n const sizes = [' bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']\n\n const i = Math.floor(Math.log(bytes) / Math.log(k))\n\n return `${parseFloat((bytes / k ** i).toFixed(dm))}${sizes[i]}`\n}\n"],"names":["formatFilesize","bytes","decimals","k","dm","sizes","i","Math","floor","log","parseFloat","toFixed"],"mappings":"AAAA,OAAO,SAASA,eAAeC,KAAa,EAAEC,WAAW,CAAC;IACxD,IAAID,UAAU,GAAG;QACf,OAAO;IACT;IAEA,MAAME,IAAI;IACV,MAAMC,KAAKF,WAAW,IAAI,IAAIA;IAC9B,MAAMG,QAAQ;QAAC;QAAU;QAAM;QAAM;QAAM;QAAM;QAAM;QAAM;QAAM;KAAK;IAExE,MAAMC,IAAIC,KAAKC,KAAK,CAACD,KAAKE,GAAG,CAACR,SAASM,KAAKE,GAAG,CAACN;IAEhD,OAAO,GAAGO,WAAW,AAACT,CAAAA,QAAQE,KAAKG,CAAAA,EAAGK,OAAO,CAACP,OAAOC,KAAK,CAACC,EAAE,EAAE;AACjE"}

package/dist/uploads/generateFileData.d.ts CHANGED Viewed

@@ -49,10 +49,5 @@ export declare const resolveTempFileHandling: ({ disableLocalStorage, hasProcess
  * storage is disabled, and copies it straight to its destination when local storage is enabled.
  */
 export declare const generateFileData: <T>({ collection: { config: collectionConfig }, data, draft, externalUploadSource, isDuplicating, operation, originalDoc, overwriteExistingFiles, req, throwOnMissingFile, }: Args<T>) => Result<T>;
-/** Adds a stable branch suffix without exceeding the common filesystem filename byte limit. */
-export declare const getBranchUploadFilename: ({ branch, filename, }: {
-    branch: string;
-    filename: string;
-}) => string;
 export {};
 //# sourceMappingURL=generateFileData.d.ts.map

package/dist/uploads/generateFileData.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generateFileData.d.ts","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,gCAAgC,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAY,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAEnE,OAAO,KAAK,EAAuB,UAAU,EAAe,MAAM,YAAY,CAAA;~~AA0B9E~~,KAAK,IAAI,CAAC,CAAC,IAAI;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,CAAC,CAAA;IACP,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,oBAAoB,CAAC,EAAE,oBAAoB,CAAA;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,SAAS,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAC9B,WAAW,CAAC,EAAE,CAAC,CAAA;IACf,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,GAAG,EAAE,cAAc,CAAA;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,KAAK,MAAM,CAAC,CAAC,IAAI,OAAO,CAAC;IACvB,IAAI,EAAE,CAAC,CAAA;IACP,KAAK,EAAE,UAAU,EAAE,CAAA;CACpB,CAAC,CAAA;AA6BF,MAAM,MAAM,gBAAgB,GACxB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,kBAAkB,CAAA;CAAE,GAChD;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAA;AAEzB;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,+DAIjC;IACD,mBAAmB,EAAE,OAAO,CAAA;IAC5B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;CACjC,KAAG,gBAQH,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,GAAU,CAAC,4KAWrC,IAAI,CAAC,CAAC,CAAC,KAAG,MAAM,CAAC,CAAC,~~CAmqBpB~~,CAAA~~;AAMD,+FAA+F;AAC/F,eAAO,MAAM,uBAAuB,0BAGjC;IACD,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB,KAAG,MA2CH,CAAA~~"}
1	+ {"version":3,"file":"generateFileData.d.ts","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,gCAAgC,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAY,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAEnE,OAAO,KAAK,EAAuB,UAAU,EAAe,MAAM,YAAY,CAAA;AAwB9E,KAAK,IAAI,CAAC,CAAC,IAAI;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,CAAC,CAAA;IACP,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,oBAAoB,CAAC,EAAE,oBAAoB,CAAA;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,SAAS,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAC9B,WAAW,CAAC,EAAE,CAAC,CAAA;IACf,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,GAAG,EAAE,cAAc,CAAA;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,KAAK,MAAM,CAAC,CAAC,IAAI,OAAO,CAAC;IACvB,IAAI,EAAE,CAAC,CAAA;IACP,KAAK,EAAE,UAAU,EAAE,CAAA;CACpB,CAAC,CAAA;AA6BF,MAAM,MAAM,gBAAgB,GACxB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,kBAAkB,CAAA;CAAE,GAChD;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAA;AAEzB;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,+DAIjC;IACD,mBAAmB,EAAE,OAAO,CAAA;IAC5B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;CACjC,KAAG,gBAQH,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,GAAU,CAAC,4KAWrC,IAAI,CAAC,CAAC,CAAC,KAAG,MAAM,CAAC,CAAC,CAooBpB,CAAA"}

package/dist/uploads/generateFileData.js CHANGED Viewed

@@ -1,9 +1,7 @@
 import { fileTypeFromBuffer } from 'file-type';
 import fs from 'fs/promises';
-import { createHash, randomUUID } from 'node:crypto';
+import { randomUUID } from 'node:crypto';
 import { openAsBlob } from 'node:fs';
-import { resolveBranch } from '../branching/resolveBranch.js';
-import { MAIN_BRANCH } from '../branching/types.js';
 import { FileRetrievalError, FileUploadError, Forbidden, MissingFile } from '../errors/index.js';
 import { formatAdminURL } from '../utilities/formatAdminURL.js';
 import { isNumber } from '../utilities/isNumber.js';
@@ -273,7 +271,6 @@ const shouldReupload = (uploadEdits, fileData)=>{
         }
         const fileWasTransformed = Boolean(mainWebFile && mainWebFile !== originalWebFile);
         const hasReusableOriginalMain = Boolean(isResettingCrop && !fileWasTransformed && retainedOriginal);
-        const hasReusableCurrentMain = Boolean(!hasReusableOriginalMain && !fileWasTransformed && retainedOriginal && currentFileData?.filename);
         if (hasReusableOriginalMain && !hasFocalPointChange && retainedOriginal) {
             return {
                 data: {
@@ -335,16 +332,6 @@ const shouldReupload = (uploadEdits, fileData)=>{
             }
         }
         let fsSafeName = getSanitizedUploadFilename(outputName, ext);
-        const branch = resolveBranch(req);
-        const isIsolatedProviderUpload = Boolean(file.uploadReference && typeof file.uploadReference === 'object' && !Array.isArray(file.uploadReference) && '_objectKey' in file.uploadReference && typeof file.uploadReference._objectKey === 'string');
-        const shouldIsolateBranchFile = branch !== MAIN_BRANCH && !isIsolatedProviderUpload;
-        if (shouldIsolateBranchFile) {
-            fsSafeName = getBranchUploadFilename({
-                branch,
-                filename: fsSafeName
-            });
-            overwriteExistingFiles = false;
-        }
         const isDuplicatingAnOriginal = isDuplicating && file.name === originalDoc?.original?.filename;
         // A provider reference without a receipt names an object the client already stored; renaming
         // it would point the document at a key that was never uploaded.
@@ -356,8 +343,6 @@ const shouldReupload = (uploadEdits, fileData)=>{
         }
         if (hasReusableOriginalMain) {
             fsSafeName = retainedOriginal.filename;
-        } else if (hasReusableCurrentMain) {
-            fsSafeName = currentFileData.filename;
         } else if (!overwriteExistingFiles || !disableLocalStorage || shouldStageCloudFiles && retainedOriginal) {
             // Extract prefix if present (added by plugin-cloud-storage)
             const prefix = data?.prefix;
@@ -372,16 +357,6 @@ const shouldReupload = (uploadEdits, fileData)=>{
         fileData.filename = fsSafeName;
         if (hasReusableOriginalMain) {
             fileData.url = retainedOriginal.url;
-        } else if (hasReusableCurrentMain) {
-            fileData.filesize = currentFileData.filesize;
-            fileData.height = currentFileData.height;
-            fileData.mimeType = currentFileData.mimeType;
-            fileData.url = currentFileData.url;
-            fileData.width = currentFileData.width;
-            req.file = {
-                ...file,
-                name: currentFileData.filename
-            };
         }
         const hasGeneratedProviderRepresentations = Boolean(providerOriginal && (fileWasTransformed || sizeResults.some((result)=>Boolean(result.file))));
         const newObjectKey = hasManagedCloudStorage && (shouldStageCloudFiles || hasGeneratedProviderRepresentations) ? randomUUID() : undefined;
@@ -459,7 +434,7 @@ const shouldReupload = (uploadEdits, fileData)=>{
                     size: mainBuffer.length
                 };
             }
-        } else if (!hasReusableOriginalMain && !hasReusableCurrentMain) {
+        } else if (!hasReusableOriginalMain) {
             // file.data is empty when useTempFiles is on, so the real content lives at
             // file.tempFilePath instead (see the function doc for why we avoid buffering it).
             const tempFileHandling = resolveTempFileHandling({
@@ -595,53 +570,6 @@ const shouldReupload = (uploadEdits, fileData)=>{
         files: filesToSave
     };
 };
-const maximumFilesystemFilenameByteLength = 255;
-// `getSafeFileName` can add a numeric suffix. Reserve `-` plus 11 digits for that step.
-const deduplicationSuffixByteReserve = 12;
-/** Adds a stable branch suffix without exceeding the common filesystem filename byte limit. */ export const getBranchUploadFilename = ({ branch, filename })=>{
-    const maximumInitialFilenameByteLength = maximumFilesystemFilenameByteLength - deduplicationSuffixByteReserve;
-    const ext = getFileExtension(filename);
-    let extension = ext ? `.${ext}` : '';
-    const name = extension ? filename.slice(0, -extension.length) : filename;
-    const escapedBranch = branch.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const unscopedName = name.replace(new RegExp(`-${escapedBranch}(?:-\\d+)?$`), '');
-    const branchHash = createHash('sha256').update(branch).digest('hex').slice(0, 12);
-    const minimumBranchSuffix = `-${branchHash}`;
-    const maximumExtensionByteLength = maximumInitialFilenameByteLength - Buffer.byteLength(minimumBranchSuffix) - 1;
-    extension = truncateUtf8ByByteLength({
-        maximumByteLength: maximumExtensionByteLength,
-        value: extension
-    });
-    const maximumBranchSuffixByteLength = maximumInitialFilenameByteLength - Buffer.byteLength(extension) - 1;
-    let branchSuffix = `-${branch}`;
-    if (Buffer.byteLength(branchSuffix) > maximumBranchSuffixByteLength) {
-        const maximumBranchPrefixByteLength = maximumBranchSuffixByteLength - Buffer.byteLength(minimumBranchSuffix) - 1;
-        const branchPrefix = truncateUtf8ByByteLength({
-            maximumByteLength: maximumBranchPrefixByteLength,
-            value: branch
-        });
-        branchSuffix = branchPrefix ? `-${branchPrefix}${minimumBranchSuffix}` : minimumBranchSuffix;
-    }
-    const maximumNameByteLength = maximumInitialFilenameByteLength - Buffer.byteLength(branchSuffix) - Buffer.byteLength(extension);
-    const truncatedName = truncateUtf8ByByteLength({
-        maximumByteLength: maximumNameByteLength,
-        value: unscopedName
-    });
-    return `${truncatedName}${branchSuffix}${extension}`;
-};
-const truncateUtf8ByByteLength = ({ maximumByteLength, value })=>{
-    let byteLength = 0;
-    let result = '';
-    for (const character of value){
-        const characterByteLength = Buffer.byteLength(character);
-        if (byteLength + characterByteLength > maximumByteLength) {
-            break;
-        }
-        byteLength += characterByteLength;
-        result += character;
-    }
-    return result;
-};
 /**
  * Parse upload edits from req or incoming data
  */ function parseUploadEditsFromReqOrIncomingData(args) {