payload 3.0.0-alpha.7 → 3.0.0-alpha.70

package/dist/uploads/generateFileData.js

@@ -1,42 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "generateFileData", {
-    enumerable: true,
-    get: function() {
-        return generateFileData;
-    }
-});
-const _filetype = require("file-type");
-const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
-const _mkdirp = /*#__PURE__*/ _interop_require_default(require("mkdirp"));
-const _sanitizefilename = /*#__PURE__*/ _interop_require_default(require("sanitize-filename"));
-const _sharp = /*#__PURE__*/ _interop_require_default(require("sharp"));
-const _errors = require("../errors");
-const _canResizeImage = /*#__PURE__*/ _interop_require_default(require("./canResizeImage"));
-const _cropImage = /*#__PURE__*/ _interop_require_default(require("./cropImage"));
-const _getExternalFile = require("./getExternalFile");
-const _getFileByPath = /*#__PURE__*/ _interop_require_default(require("./getFileByPath"));
-const _getImageSize = /*#__PURE__*/ _interop_require_default(require("./getImageSize"));
-const _getSafeFilename = /*#__PURE__*/ _interop_require_default(require("./getSafeFilename"));
-const _imageResizer = /*#__PURE__*/ _interop_require_default(require("./imageResizer"));
-const _isImage = /*#__PURE__*/ _interop_require_default(require("./isImage"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const generateFileData = async ({ collection: { config: collectionConfig }, data, overwriteExistingFiles, req, throwOnMissingFile })=>{
+import fileType from 'file-type';
+const { fromBuffer } = fileType;
+import fs from 'fs';
+import mkdirp from 'mkdirp';
+import sanitize from 'sanitize-filename';
+import { FileRetrievalError, FileUploadError, MissingFile } from '../errors/index.js';
+import canResizeImage from './canResizeImage.js';
+import cropImage from './cropImage.js';
+import { getExternalFile } from './getExternalFile.js';
+import { getFileByPath } from './getFileByPath.js';
+import { getImageSize } from './getImageSize.js';
+import getSafeFileName from './getSafeFilename.js';
+import resizeAndTransformImageSizes from './imageResizer.js';
+import isImage from './isImage.js';
+export const generateFileData = async ({ collection: { config: collectionConfig }, data, overwriteExistingFiles, req, throwOnMissingFile })=>{
     if (!collectionConfig.upload) {
         return {
             data,
             files: []
         };
     }
+    const { sharp } = req.payload.config;
     let file = req.file;
-    const { searchParams } = req;
-    const uploadEdits = searchParams.get('uploadEdits') || {};
+    const uploadEdits = req.query['uploadEdits'] || {};
     const { disableLocalStorage, formatOptions, imageSizes, resizeOptions, staticDir, trimOptions } = collectionConfig.upload;
     const staticPath = staticDir;
     if (!file && uploadEdits && data) {
@@ -44,29 +29,30 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
         try {
             if (url && url.startsWith('/') && !disableLocalStorage) {
                 const filePath = `${staticPath}/${filename}`;
-                const response = await (0, _getFileByPath.default)(filePath);
+                const response = await getFileByPath(filePath);
                 file = response;
                 overwriteExistingFiles = true;
             } else if (filename && url) {
-                file = await (0, _getExternalFile.getExternalFile)({
+                file = await getExternalFile({
                     data: data,
-                    req
+                    req,
+                    uploadConfig: collectionConfig.upload
                 });
                 overwriteExistingFiles = true;
             }
         } catch (err) {
-            throw new _errors.FileUploadError(req.t);
+            throw new FileRetrievalError(req.t, err instanceof Error ? err.message : undefined);
         }
     }
     if (!file) {
-        if (throwOnMissingFile) throw new _errors.MissingFile(req.t);
+        if (throwOnMissingFile) throw new MissingFile(req.t);
         return {
             data,
             files: []
         };
     }
     if (!disableLocalStorage) {
-        _mkdirp.default.sync(staticPath);
+        mkdirp.sync(staticPath);
     }
     let newData = data;
     const filesToSave = [];
@@ -74,7 +60,7 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
     const fileIsAnimated = file.mimetype === 'image/gif' || file.mimetype === 'image/webp';
     const cropData = typeof uploadEdits === 'object' && 'crop' in uploadEdits ? uploadEdits.crop : undefined;
     try {
-        const fileSupportsResize = (0, _canResizeImage.default)(file.mimetype);
+        const fileSupportsResize = canResizeImage(file.mimetype);
         let fsSafeName;
         let sharpFile;
         let dimensions;
@@ -84,12 +70,12 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
         const fileHasAdjustments = fileSupportsResize && Boolean(resizeOptions || formatOptions || trimOptions || file.tempFilePath);
         const sharpOptions = {};
         if (fileIsAnimated) sharpOptions.animated = true;
-        if (fileHasAdjustments) {
+        if (fileHasAdjustments && sharp) {
             if (file.tempFilePath) {
-                sharpFile = (0, _sharp.default)(file.tempFilePath, sharpOptions).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081
+                sharpFile = sharp(file.tempFilePath, sharpOptions).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081
                 ;
             } else {
-                sharpFile = (0, _sharp.default)(file.data, sharpOptions).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081
+                sharpFile = sharp(file.data, sharpOptions).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081
                 ;
             }
             if (resizeOptions) {
@@ -102,8 +88,8 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
                 sharpFile = sharpFile.trim(trimOptions);
             }
         }
-        if ((0, _isImage.default)(file.mimetype)) {
-            dimensions = await (0, _getImageSize.default)(file);
+        if (fileSupportsResize || isImage(file.mimetype)) {
+            dimensions = await getImageSize(file);
             fileData.width = dimensions.width;
             fileData.height = dimensions.height;
         }
@@ -112,7 +98,7 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
             fileBuffer = await sharpFile.toBuffer({
                 resolveWithObject: true
             });
-            ({ ext, mime } = await (0, _filetype.fromBuffer)(fileBuffer.data) // This is getting an incorrect gif height back.
+            ({ ext, mime } = await fromBuffer(fileBuffer.data) // This is getting an incorrect gif height back.
             );
             fileData.width = fileBuffer.info.width;
             fileData.height = fileBuffer.info.height;
@@ -134,10 +120,10 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
         // Adust SVG mime type. fromBuffer modifies it.
         if (mime === 'application/xml' && ext === 'svg') mime = 'image/svg+xml';
         fileData.mimeType = mime;
-        const baseFilename = (0, _sanitizefilename.default)(file.name.substring(0, file.name.lastIndexOf('.')) || file.name);
+        const baseFilename = sanitize(file.name.substring(0, file.name.lastIndexOf('.')) || file.name);
         fsSafeName = `${baseFilename}${ext ? `.${ext}` : ''}`;
         if (!overwriteExistingFiles) {
-            fsSafeName = await (0, _getSafeFilename.default)({
+            fsSafeName = await getSafeFileName({
                 collectionSlug: collectionConfig.slug,
                 desiredFilename: fsSafeName,
                 req,
@@ -146,11 +132,12 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
         }
         fileData.filename = fsSafeName;
         let fileForResize = file;
-        if (cropData) {
-            const { data: croppedImage, info } = await (0, _cropImage.default)({
+        if (cropData && sharp) {
+            const { data: croppedImage, info } = await cropImage({
                 cropData,
                 dimensions,
-                file
+                file,
+                sharp
             });
             filesToSave.push({
                 buffer: croppedImage,
@@ -165,7 +152,7 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
             fileData.height = info.height;
             fileData.filesize = info.size;
             if (file.tempFilePath) {
-                await _fs.default.promises.writeFile(file.tempFilePath, croppedImage) // write fileBuffer to the temp path
+                await fs.promises.writeFile(file.tempFilePath, croppedImage) // write fileBuffer to the temp path
                 ;
             } else {
                 req.file = fileForResize;
@@ -178,7 +165,7 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
             // If using temp files and the image is being resized, write the file to the temp path
             if (fileBuffer?.data || file.data.length > 0) {
                 if (file.tempFilePath) {
-                    await _fs.default.promises.writeFile(file.tempFilePath, fileBuffer?.data || file.data) // write fileBuffer to the temp path
+                    await fs.promises.writeFile(file.tempFilePath, fileBuffer?.data || file.data) // write fileBuffer to the temp path
                     ;
                 } else {
                     // Assign the _possibly modified_ file to the request object
@@ -190,9 +177,9 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
                 }
             }
         }
-        if (Array.isArray(imageSizes) && fileSupportsResize) {
+        if (Array.isArray(imageSizes) && fileSupportsResize && sharp) {
             req.payloadUploadSizes = {};
-            const { sizeData, sizesToSave } = await (0, _imageResizer.default)({
+            const { sizeData, sizesToSave } = await resizeAndTransformImageSizes({
                 config: collectionConfig,
                 dimensions: !cropData ? dimensions : {
                     ...dimensions,
@@ -203,6 +190,7 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
                 mimeType: fileData.mimeType,
                 req,
                 savedFilename: fsSafeName || file.name,
+                sharp,
                 staticPath
             });
             fileData.sizes = sizeData;
@@ -210,7 +198,7 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
         }
     } catch (err) {
         console.error(err);
-        throw new _errors.FileUploadError(req.t);
+        throw new FileUploadError(req.t);
     }
     newData = {
         ...newData,
@@ -222,4 +210,4 @@ const generateFileData = async ({ collection: { config: collectionConfig }, data
     };
 };
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/uploads/generateFileData.ts"],"sourcesContent":["import type { OutputInfo, Sharp, SharpOptions } from 'sharp'\n\nimport { fromBuffer } from 'file-type'\nimport fs from 'fs'\nimport mkdirp from 'mkdirp'\nimport sanitize from 'sanitize-filename'\nimport sharp from 'sharp'\n\nimport type { Collection } from '../collections/config/types'\nimport type { SanitizedConfig } from '../config/types'\nimport type { PayloadRequest } from '../types'\nimport type { FileData, FileToSave, ProbedImageSize } from './types'\n\nimport { FileUploadError, MissingFile } from '../errors'\nimport canResizeImage from './canResizeImage'\nimport cropImage from './cropImage'\nimport { getExternalFile } from './getExternalFile'\nimport getFileByPath from './getFileByPath'\nimport getImageSize from './getImageSize'\nimport getSafeFileName from './getSafeFilename'\nimport resizeAndTransformImageSizes from './imageResizer'\nimport isImage from './isImage'\n\ntype Args<T> = {\n  collection: Collection\n  config: SanitizedConfig\n  data: T\n  overwriteExistingFiles?: boolean\n  req: PayloadRequest\n  throwOnMissingFile?: boolean\n}\n\ntype Result<T> = Promise<{\n  data: T\n  files: FileToSave[]\n}>\n\nexport const generateFileData = async <T>({\n  collection: { config: collectionConfig },\n  data,\n  overwriteExistingFiles,\n  req,\n  throwOnMissingFile,\n}: Args<T>): Result<T> => {\n  if (!collectionConfig.upload) {\n    return {\n      data,\n      files: [],\n    }\n  }\n\n  let file = req.file\n\n  const { searchParams } = req\n  const uploadEdits = searchParams.get('uploadEdits') || {}\n\n  const { disableLocalStorage, formatOptions, imageSizes, resizeOptions, staticDir, trimOptions } =\n    collectionConfig.upload\n\n  const staticPath = staticDir\n\n  if (!file && uploadEdits && data) {\n    const { filename, url } = data as FileData\n\n    try {\n      if (url && url.startsWith('/') && !disableLocalStorage) {\n        const filePath = `${staticPath}/${filename}`\n        const response = await getFileByPath(filePath)\n        file = response\n        overwriteExistingFiles = true\n      } else if (filename && url) {\n        file = await getExternalFile({ data: data as FileData, req })\n        overwriteExistingFiles = true\n      }\n    } catch (err) {\n      throw new FileUploadError(req.t)\n    }\n  }\n\n  if (!file) {\n    if (throwOnMissingFile) throw new MissingFile(req.t)\n\n    return {\n      data,\n      files: [],\n    }\n  }\n\n  if (!disableLocalStorage) {\n    mkdirp.sync(staticPath)\n  }\n\n  let newData = data\n  const filesToSave: FileToSave[] = []\n  const fileData: Partial<FileData> = {}\n  const fileIsAnimated = file.mimetype === 'image/gif' || file.mimetype === 'image/webp'\n  const cropData =\n    typeof uploadEdits === 'object' && 'crop' in uploadEdits ? uploadEdits.crop : undefined\n\n  try {\n    const fileSupportsResize = canResizeImage(file.mimetype)\n    let fsSafeName: string\n    let sharpFile: Sharp | undefined\n    let dimensions: ProbedImageSize | undefined\n    let fileBuffer: { data: Buffer; info: OutputInfo }\n    let ext\n    let mime: string\n    const fileHasAdjustments =\n      fileSupportsResize &&\n      Boolean(resizeOptions || formatOptions || trimOptions || file.tempFilePath)\n\n    const sharpOptions: SharpOptions = {}\n\n    if (fileIsAnimated) sharpOptions.animated = true\n\n    if (fileHasAdjustments) {\n      if (file.tempFilePath) {\n        sharpFile = sharp(file.tempFilePath, sharpOptions).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081\n      } else {\n        sharpFile = sharp(file.data, sharpOptions).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081\n      }\n\n      if (resizeOptions) {\n        sharpFile = sharpFile.resize(resizeOptions)\n      }\n      if (formatOptions) {\n        sharpFile = sharpFile.toFormat(formatOptions.format, formatOptions.options)\n      }\n      if (trimOptions) {\n        sharpFile = sharpFile.trim(trimOptions)\n      }\n    }\n\n    if (isImage(file.mimetype)) {\n      dimensions = await getImageSize(file)\n      fileData.width = dimensions.width\n      fileData.height = dimensions.height\n    }\n\n    if (sharpFile) {\n      const metadata = await sharpFile.metadata()\n      fileBuffer = await sharpFile.toBuffer({ resolveWithObject: true })\n      ;({ ext, mime } = await fromBuffer(fileBuffer.data)) // This is getting an incorrect gif height back.\n      fileData.width = fileBuffer.info.width\n      fileData.height = fileBuffer.info.height\n      fileData.filesize = fileBuffer.info.size\n\n      // Animated GIFs + WebP aggregate the height from every frame, so we need to use divide by number of pages\n      if (metadata.pages) {\n        fileData.height = fileBuffer.info.height / metadata.pages\n        fileData.filesize = fileBuffer.data.length\n      }\n    } else {\n      mime = file.mimetype\n      fileData.filesize = file.size\n\n      if (file.name.includes('.')) {\n        ext = file.name.split('.').pop()\n      } else {\n        ext = ''\n      }\n    }\n\n    // Adust SVG mime type. fromBuffer modifies it.\n    if (mime === 'application/xml' && ext === 'svg') mime = 'image/svg+xml'\n    fileData.mimeType = mime\n\n    const baseFilename = sanitize(file.name.substring(0, file.name.lastIndexOf('.')) || file.name)\n    fsSafeName = `${baseFilename}${ext ? `.${ext}` : ''}`\n\n    if (!overwriteExistingFiles) {\n      fsSafeName = await getSafeFileName({\n        collectionSlug: collectionConfig.slug,\n        desiredFilename: fsSafeName,\n        req,\n        staticPath,\n      })\n    }\n\n    fileData.filename = fsSafeName\n    let fileForResize = file\n\n    if (cropData) {\n      const { data: croppedImage, info } = await cropImage({ cropData, dimensions, file })\n\n      filesToSave.push({\n        buffer: croppedImage,\n        path: `${staticPath}/${fsSafeName}`,\n      })\n\n      fileForResize = {\n        ...file,\n        data: croppedImage,\n        size: info.size,\n      }\n      fileData.width = info.width\n      fileData.height = info.height\n      fileData.filesize = info.size\n\n      if (file.tempFilePath) {\n        await fs.promises.writeFile(file.tempFilePath, croppedImage) // write fileBuffer to the temp path\n      } else {\n        req.file = fileForResize\n      }\n    } else {\n      filesToSave.push({\n        buffer: fileBuffer?.data || file.data,\n        path: `${staticPath}/${fsSafeName}`,\n      })\n\n      // If using temp files and the image is being resized, write the file to the temp path\n      if (fileBuffer?.data || file.data.length > 0) {\n        if (file.tempFilePath) {\n          await fs.promises.writeFile(file.tempFilePath, fileBuffer?.data || file.data) // write fileBuffer to the temp path\n        } else {\n          // Assign the _possibly modified_ file to the request object\n          req.file = {\n            ...file,\n            data: fileBuffer?.data || file.data,\n            size: fileBuffer?.info.size,\n          }\n        }\n      }\n    }\n\n    if (Array.isArray(imageSizes) && fileSupportsResize) {\n      req.payloadUploadSizes = {}\n      const { sizeData, sizesToSave } = await resizeAndTransformImageSizes({\n        config: collectionConfig,\n        dimensions: !cropData\n          ? dimensions\n          : {\n              ...dimensions,\n              height: fileData.height,\n              width: fileData.width,\n            },\n        file: fileForResize,\n        mimeType: fileData.mimeType,\n        req,\n        savedFilename: fsSafeName || file.name,\n        staticPath,\n      })\n\n      fileData.sizes = sizeData\n      filesToSave.push(...sizesToSave)\n    }\n  } catch (err) {\n    console.error(err)\n    throw new FileUploadError(req.t)\n  }\n\n  newData = {\n    ...newData,\n    ...fileData,\n  }\n\n  return {\n    data: newData,\n    files: filesToSave,\n  }\n}\n"],"names":["generateFileData","collection","config","collectionConfig","data","overwriteExistingFiles","req","throwOnMissingFile","upload","files","file","searchParams","uploadEdits","get","disableLocalStorage","formatOptions","imageSizes","resizeOptions","staticDir","trimOptions","staticPath","filename","url","startsWith","filePath","response","getFileByPath","getExternalFile","err","FileUploadError","t","MissingFile","mkdirp","sync","newData","filesToSave","fileData","fileIsAnimated","mimetype","cropData","crop","undefined","fileSupportsResize","canResizeImage","fsSafeName","sharpFile","dimensions","fileBuffer","ext","mime","fileHasAdjustments","Boolean","tempFilePath","sharpOptions","animated","sharp","rotate","resize","toFormat","format","options","trim","isImage","getImageSize","width","height","metadata","toBuffer","resolveWithObject","fromBuffer","info","filesize","size","pages","length","name","includes","split","pop","mimeType","baseFilename","sanitize","substring","lastIndexOf","getSafeFileName","collectionSlug","slug","desiredFilename","fileForResize","croppedImage","cropImage","push","buffer","path","fs","promises","writeFile","Array","isArray","payloadUploadSizes","sizeData","sizesToSave","resizeAndTransformImageSizes","savedFilename","sizes","console","error"],"mappings":"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"}
+//# sourceMappingURL=generateFileData.js.map

package/dist/uploads/generateFileData.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/generateFileData.ts"],"sourcesContent":["import type { OutputInfo, Sharp, SharpOptions } from 'sharp'\n\nimport fileType from 'file-type'\nconst { fromBuffer } = fileType\nimport fs from 'fs'\nimport mkdirp from 'mkdirp'\nimport sanitize from 'sanitize-filename'\n\nimport type { Collection } from '../collections/config/types.js'\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { PayloadRequestWithData } from '../types/index.js'\nimport type { FileData, FileToSave, ProbedImageSize } from './types.js'\n\nimport { FileRetrievalError, FileUploadError, MissingFile } from '../errors/index.js'\nimport canResizeImage from './canResizeImage.js'\nimport cropImage from './cropImage.js'\nimport { getExternalFile } from './getExternalFile.js'\nimport { getFileByPath } from './getFileByPath.js'\nimport { getImageSize } from './getImageSize.js'\nimport getSafeFileName from './getSafeFilename.js'\nimport resizeAndTransformImageSizes from './imageResizer.js'\nimport isImage from './isImage.js'\n\ntype Args<T> = {\n  collection: Collection\n  config: SanitizedConfig\n  data: T\n  overwriteExistingFiles?: boolean\n  req: PayloadRequestWithData\n  throwOnMissingFile?: boolean\n}\n\ntype Result<T> = Promise<{\n  data: T\n  files: FileToSave[]\n}>\n\nexport const generateFileData = async <T>({\n  collection: { config: collectionConfig },\n  data,\n  overwriteExistingFiles,\n  req,\n  throwOnMissingFile,\n}: Args<T>): Result<T> => {\n  if (!collectionConfig.upload) {\n    return {\n      data,\n      files: [],\n    }\n  }\n\n  const { sharp } = req.payload.config\n\n  let file = req.file\n\n  const uploadEdits = req.query['uploadEdits'] || {}\n\n  const { disableLocalStorage, formatOptions, imageSizes, resizeOptions, staticDir, trimOptions } =\n    collectionConfig.upload\n\n  const staticPath = staticDir\n\n  if (!file && uploadEdits && data) {\n    const { filename, url } = data as FileData\n\n    try {\n      if (url && url.startsWith('/') && !disableLocalStorage) {\n        const filePath = `${staticPath}/${filename}`\n        const response = await getFileByPath(filePath)\n        file = response\n        overwriteExistingFiles = true\n      } else if (filename && url) {\n        file = await getExternalFile({\n          data: data as FileData,\n          req,\n          uploadConfig: collectionConfig.upload,\n        })\n        overwriteExistingFiles = true\n      }\n    } catch (err: unknown) {\n      throw new FileRetrievalError(req.t, err instanceof Error ? err.message : undefined)\n    }\n  }\n\n  if (!file) {\n    if (throwOnMissingFile) throw new MissingFile(req.t)\n\n    return {\n      data,\n      files: [],\n    }\n  }\n\n  if (!disableLocalStorage) {\n    mkdirp.sync(staticPath)\n  }\n\n  let newData = data\n  const filesToSave: FileToSave[] = []\n  const fileData: Partial<FileData> = {}\n  const fileIsAnimated = file.mimetype === 'image/gif' || file.mimetype === 'image/webp'\n  const cropData =\n    typeof uploadEdits === 'object' && 'crop' in uploadEdits ? uploadEdits.crop : undefined\n\n  try {\n    const fileSupportsResize = canResizeImage(file.mimetype)\n    let fsSafeName: string\n    let sharpFile: Sharp | undefined\n    let dimensions: ProbedImageSize | undefined\n    let fileBuffer: { data: Buffer; info: OutputInfo }\n    let ext\n    let mime: string\n    const fileHasAdjustments =\n      fileSupportsResize &&\n      Boolean(resizeOptions || formatOptions || trimOptions || file.tempFilePath)\n\n    const sharpOptions: SharpOptions = {}\n\n    if (fileIsAnimated) sharpOptions.animated = true\n\n    if (fileHasAdjustments && sharp) {\n      if (file.tempFilePath) {\n        sharpFile = sharp(file.tempFilePath, sharpOptions).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081\n      } else {\n        sharpFile = sharp(file.data, sharpOptions).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081\n      }\n\n      if (resizeOptions) {\n        sharpFile = sharpFile.resize(resizeOptions)\n      }\n      if (formatOptions) {\n        sharpFile = sharpFile.toFormat(formatOptions.format, formatOptions.options)\n      }\n      if (trimOptions) {\n        sharpFile = sharpFile.trim(trimOptions)\n      }\n    }\n\n    if (fileSupportsResize || isImage(file.mimetype)) {\n      dimensions = await getImageSize(file)\n      fileData.width = dimensions.width\n      fileData.height = dimensions.height\n    }\n\n    if (sharpFile) {\n      const metadata = await sharpFile.metadata()\n      fileBuffer = await sharpFile.toBuffer({ resolveWithObject: true })\n      ;({ ext, mime } = await fromBuffer(fileBuffer.data)) // This is getting an incorrect gif height back.\n      fileData.width = fileBuffer.info.width\n      fileData.height = fileBuffer.info.height\n      fileData.filesize = fileBuffer.info.size\n\n      // Animated GIFs + WebP aggregate the height from every frame, so we need to use divide by number of pages\n      if (metadata.pages) {\n        fileData.height = fileBuffer.info.height / metadata.pages\n        fileData.filesize = fileBuffer.data.length\n      }\n    } else {\n      mime = file.mimetype\n      fileData.filesize = file.size\n\n      if (file.name.includes('.')) {\n        ext = file.name.split('.').pop()\n      } else {\n        ext = ''\n      }\n    }\n\n    // Adust SVG mime type. fromBuffer modifies it.\n    if (mime === 'application/xml' && ext === 'svg') mime = 'image/svg+xml'\n    fileData.mimeType = mime\n\n    const baseFilename = sanitize(file.name.substring(0, file.name.lastIndexOf('.')) || file.name)\n    fsSafeName = `${baseFilename}${ext ? `.${ext}` : ''}`\n\n    if (!overwriteExistingFiles) {\n      fsSafeName = await getSafeFileName({\n        collectionSlug: collectionConfig.slug,\n        desiredFilename: fsSafeName,\n        req,\n        staticPath,\n      })\n    }\n\n    fileData.filename = fsSafeName\n    let fileForResize = file\n\n    if (cropData && sharp) {\n      const { data: croppedImage, info } = await cropImage({ cropData, dimensions, file, sharp })\n\n      filesToSave.push({\n        buffer: croppedImage,\n        path: `${staticPath}/${fsSafeName}`,\n      })\n\n      fileForResize = {\n        ...file,\n        data: croppedImage,\n        size: info.size,\n      }\n      fileData.width = info.width\n      fileData.height = info.height\n      fileData.filesize = info.size\n\n      if (file.tempFilePath) {\n        await fs.promises.writeFile(file.tempFilePath, croppedImage) // write fileBuffer to the temp path\n      } else {\n        req.file = fileForResize\n      }\n    } else {\n      filesToSave.push({\n        buffer: fileBuffer?.data || file.data,\n        path: `${staticPath}/${fsSafeName}`,\n      })\n\n      // If using temp files and the image is being resized, write the file to the temp path\n      if (fileBuffer?.data || file.data.length > 0) {\n        if (file.tempFilePath) {\n          await fs.promises.writeFile(file.tempFilePath, fileBuffer?.data || file.data) // write fileBuffer to the temp path\n        } else {\n          // Assign the _possibly modified_ file to the request object\n          req.file = {\n            ...file,\n            data: fileBuffer?.data || file.data,\n            size: fileBuffer?.info.size,\n          }\n        }\n      }\n    }\n\n    if (Array.isArray(imageSizes) && fileSupportsResize && sharp) {\n      req.payloadUploadSizes = {}\n      const { sizeData, sizesToSave } = await resizeAndTransformImageSizes({\n        config: collectionConfig,\n        dimensions: !cropData\n          ? dimensions\n          : {\n              ...dimensions,\n              height: fileData.height,\n              width: fileData.width,\n            },\n        file: fileForResize,\n        mimeType: fileData.mimeType,\n        req,\n        savedFilename: fsSafeName || file.name,\n        sharp,\n        staticPath,\n      })\n\n      fileData.sizes = sizeData\n      filesToSave.push(...sizesToSave)\n    }\n  } catch (err) {\n    console.error(err)\n    throw new FileUploadError(req.t)\n  }\n\n  newData = {\n    ...newData,\n    ...fileData,\n  }\n\n  return {\n    data: newData,\n    files: filesToSave,\n  }\n}\n"],"names":["fileType","fromBuffer","fs","mkdirp","sanitize","FileRetrievalError","FileUploadError","MissingFile","canResizeImage","cropImage","getExternalFile","getFileByPath","getImageSize","getSafeFileName","resizeAndTransformImageSizes","isImage","generateFileData","collection","config","collectionConfig","data","overwriteExistingFiles","req","throwOnMissingFile","upload","files","sharp","payload","file","uploadEdits","query","disableLocalStorage","formatOptions","imageSizes","resizeOptions","staticDir","trimOptions","staticPath","filename","url","startsWith","filePath","response","uploadConfig","err","t","Error","message","undefined","sync","newData","filesToSave","fileData","fileIsAnimated","mimetype","cropData","crop","fileSupportsResize","fsSafeName","sharpFile","dimensions","fileBuffer","ext","mime","fileHasAdjustments","Boolean","tempFilePath","sharpOptions","animated","rotate","resize","toFormat","format","options","trim","width","height","metadata","toBuffer","resolveWithObject","info","filesize","size","pages","length","name","includes","split","pop","mimeType","baseFilename","substring","lastIndexOf","collectionSlug","slug","desiredFilename","fileForResize","croppedImage","push","buffer","path","promises","writeFile","Array","isArray","payloadUploadSizes","sizeData","sizesToSave","savedFilename","sizes","console","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/uploads/getBaseFields.d.ts

@@ -1,10 +1,10 @@
-import type { CollectionConfig } from '../collections/config/types';
-import type { Config } from '../config/types';
-import type { Field } from '../fields/config/types';
+import type { CollectionConfig } from '../collections/config/types.js';
+import type { Config } from '../config/types.js';
+import type { Field } from '../fields/config/types.js';
 type Options = {
     collection: CollectionConfig;
     config: Config;
 };
-declare const getBaseUploadFields: ({ collection, config }: Options) => Field[];
-export default getBaseUploadFields;
+export declare const getBaseUploadFields: ({ collection, config }: Options) => Field[];
+export {};
 //# sourceMappingURL=getBaseFields.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getBaseFields.d.ts","sourceRoot":"","sources":["../../src/uploads/getBaseFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAcnD,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,gBAAgB,CAAA;IAC5B,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,QAAA,MAAM,mBAAmB,2BAA4B,OAAO,KAAG,KAAK,EA2InE,CAAA;AAED,eAAe,mBAAmB,CAAA"}
+{"version":3,"file":"getBaseFields.d.ts","sourceRoot":"","sources":["../../src/uploads/getBaseFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAiBtD,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,gBAAgB,CAAA;IAC5B,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,mBAAmB,2BAA4B,OAAO,KAAG,KAAK,EA+K1E,CAAA"}

package/dist/uploads/getBaseFields.js

@@ -1,23 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return _default;
+import { mimeTypeValidator } from './mimeTypeValidator.js';
+const generateURL = ({ collectionSlug, config, filename })=>{
+    if (filename) {
+        return `${config.serverURL || ''}${config.routes.api || ''}/${collectionSlug}/file/${filename}`;
     }
-});
-const _extractTranslations = require("../translations/extractTranslations");
-const _mimeTypeValidator = require("./mimeTypeValidator");
-const labels = (0, _extractTranslations.extractTranslations)([
-    'upload:width',
-    'upload:height',
-    'upload:fileSize',
-    'upload:fileName',
-    'upload:sizes'
-]);
-const getBaseUploadFields = ({ collection, config })=>{
+    return undefined;
+};
+export const getBaseUploadFields = ({ collection, config })=>{
     const uploadOptions = typeof collection.upload === 'object' ? collection.upload : {};
     const mimeType = {
         name: 'mimeType',
@@ -28,14 +16,34 @@ const getBaseUploadFields = ({ collection, config })=>{
         },
         label: 'MIME Type'
     };
-    const url = {
-        name: 'url',
+    const thumbnailURL = {
+        name: 'thumbnailURL',
         type: 'text',
         admin: {
             hidden: true,
             readOnly: true
         },
-        label: 'URL'
+        hooks: {
+            afterRead: [
+                ({ originalDoc })=>{
+                    const adminThumbnail = typeof collection.upload !== 'boolean' ? collection.upload?.adminThumbnail : undefined;
+                    if (typeof adminThumbnail === 'function') {
+                        return adminThumbnail({
+                            doc: originalDoc
+                        });
+                    }
+                    if (typeof adminThumbnail === 'string' && 'sizes' in originalDoc && originalDoc.sizes?.[adminThumbnail]?.filename) {
+                        return generateURL({
+                            collectionSlug: collection.slug,
+                            config,
+                            filename: originalDoc.sizes?.[adminThumbnail].filename
+                        });
+                    }
+                    return null;
+                }
+            ]
+        },
+        label: 'Thumbnail URL'
     };
     const width = {
         name: 'width',
@@ -44,7 +52,7 @@ const getBaseUploadFields = ({ collection, config })=>{
             hidden: true,
             readOnly: true
         },
-        label: labels['upload:width']
+        label: ({ t })=>t('upload:width')
     };
     const height = {
         name: 'height',
@@ -53,7 +61,7 @@ const getBaseUploadFields = ({ collection, config })=>{
             hidden: true,
             readOnly: true
         },
-        label: labels['upload:height']
+        label: ({ t })=>t('upload:height')
     };
     const filesize = {
         name: 'filesize',
@@ -62,7 +70,7 @@ const getBaseUploadFields = ({ collection, config })=>{
             hidden: true,
             readOnly: true
         },
-        label: labels['upload:fileSize']
+        label: ({ t })=>t('upload:fileSize')
     };
     const filename = {
         name: 'filename',
@@ -73,23 +81,32 @@ const getBaseUploadFields = ({ collection, config })=>{
             readOnly: true
         },
         index: true,
-        label: labels['upload:fileName'],
+        label: ({ t })=>t('upload:fileName'),
         unique: true
     };
+    const url = {
+        name: 'url',
+        type: 'text',
+        admin: {
+            hidden: true,
+            readOnly: true
+        },
+        label: 'URL'
+    };
     let uploadFields = [
         {
             ...url,
             hooks: {
                 afterRead: [
-                    ({ data })=>{
-                        if (data?.filename) {
-                            return `${config.serverURL}${config.routes.api}/${collection.slug}/file/${data.filename}`;
-                        }
-                        return undefined;
-                    }
+                    ({ data })=>generateURL({
+                            collectionSlug: collection.slug,
+                            config,
+                            filename: data?.filename
+                        })
                 ]
             }
         },
+        thumbnailURL,
         filename,
         mimeType,
         filesize,
@@ -97,7 +114,7 @@ const getBaseUploadFields = ({ collection, config })=>{
         height
     ];
     if (uploadOptions.mimeTypes) {
-        mimeType.validate = (0, _mimeTypeValidator.mimeTypeValidator)(uploadOptions.mimeTypes);
+        mimeType.validate = mimeTypeValidator(uploadOptions.mimeTypes);
     }
     if (uploadOptions.imageSizes) {
         uploadFields = uploadFields.concat([
@@ -139,12 +156,11 @@ const getBaseUploadFields = ({ collection, config })=>{
                         ],
                         label: size.name
                     })),
-                label: labels['upload:Sizes']
+                label: ({ t })=>t('upload:Sizes')
             }
         ]);
     }
     return uploadFields;
 };
-const _default = getBaseUploadFields;
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/uploads/getBaseFields.ts"],"sourcesContent":["import type { CollectionConfig } from '../collections/config/types'\nimport type { Config } from '../config/types'\nimport type { Field } from '../fields/config/types'\nimport type { UploadConfig } from './types'\n\nimport { extractTranslations } from '../translations/extractTranslations'\nimport { mimeTypeValidator } from './mimeTypeValidator'\n\nconst labels = extractTranslations([\n  'upload:width',\n  'upload:height',\n  'upload:fileSize',\n  'upload:fileName',\n  'upload:sizes',\n])\n\ntype Options = {\n  collection: CollectionConfig\n  config: Config\n}\n\nconst getBaseUploadFields = ({ collection, config }: Options): Field[] => {\n  const uploadOptions: UploadConfig = typeof collection.upload === 'object' ? collection.upload : {}\n\n  const mimeType: Field = {\n    name: 'mimeType',\n    type: 'text',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: 'MIME Type',\n  }\n\n  const url: Field = {\n    name: 'url',\n    type: 'text',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: 'URL',\n  }\n\n  const width: Field = {\n    name: 'width',\n    type: 'number',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: labels['upload:width'],\n  }\n\n  const height: Field = {\n    name: 'height',\n    type: 'number',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: labels['upload:height'],\n  }\n\n  const filesize: Field = {\n    name: 'filesize',\n    type: 'number',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: labels['upload:fileSize'],\n  }\n\n  const filename: Field = {\n    name: 'filename',\n    type: 'text',\n    admin: {\n      disableBulkEdit: true,\n      hidden: true,\n      readOnly: true,\n    },\n    index: true,\n    label: labels['upload:fileName'],\n    unique: true,\n  }\n\n  let uploadFields: Field[] = [\n    {\n      ...url,\n      hooks: {\n        afterRead: [\n          ({ data }) => {\n            if (data?.filename) {\n              return `${config.serverURL}${config.routes.api}/${collection.slug}/file/${data.filename}`\n            }\n\n            return undefined\n          },\n        ],\n      },\n    },\n    filename,\n    mimeType,\n    filesize,\n    width,\n    height,\n  ]\n\n  if (uploadOptions.mimeTypes) {\n    mimeType.validate = mimeTypeValidator(uploadOptions.mimeTypes)\n  }\n\n  if (uploadOptions.imageSizes) {\n    uploadFields = uploadFields.concat([\n      {\n        name: 'sizes',\n        type: 'group',\n        admin: {\n          hidden: true,\n        },\n        fields: uploadOptions.imageSizes.map((size) => ({\n          name: size.name,\n          type: 'group',\n          admin: {\n            hidden: true,\n          },\n          fields: [\n            {\n              ...url,\n              hooks: {\n                afterRead: [\n                  ({ data }) => {\n                    const sizeFilename = data?.sizes?.[size.name]?.filename\n\n                    if (sizeFilename) {\n                      return `${config.serverURL}${config.routes.api}/${collection.slug}/file/${sizeFilename}`\n                    }\n\n                    return null\n                  },\n                ],\n              },\n            },\n            width,\n            height,\n            mimeType,\n            filesize,\n            {\n              ...filename,\n              unique: false,\n            },\n          ],\n          label: size.name,\n        })),\n        label: labels['upload:Sizes'],\n      },\n    ])\n  }\n  return uploadFields\n}\n\nexport default getBaseUploadFields\n"],"names":["labels","extractTranslations","getBaseUploadFields","collection","config","uploadOptions","upload","mimeType","name","type","admin","hidden","readOnly","label","url","width","height","filesize","filename","disableBulkEdit","index","unique","uploadFields","hooks","afterRead","data","serverURL","routes","api","slug","undefined","mimeTypes","validate","mimeTypeValidator","imageSizes","concat","fields","map","size","sizeFilename","sizes"],"mappings":"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"}
+//# sourceMappingURL=getBaseFields.js.map

package/dist/uploads/getBaseFields.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/getBaseFields.ts"],"sourcesContent":["import type { CollectionConfig } from '../collections/config/types.js'\nimport type { Config } from '../config/types.js'\nimport type { Field } from '../fields/config/types.js'\nimport type { UploadConfig } from './types.js'\n\nimport { mimeTypeValidator } from './mimeTypeValidator.js'\n\ntype GenerateURLArgs = {\n  collectionSlug: string\n  config: Config\n  filename?: string\n}\nconst generateURL = ({ collectionSlug, config, filename }: GenerateURLArgs) => {\n  if (filename) {\n    return `${config.serverURL || ''}${config.routes.api || ''}/${collectionSlug}/file/${filename}`\n  }\n  return undefined\n}\n\ntype Options = {\n  collection: CollectionConfig\n  config: Config\n}\n\nexport const getBaseUploadFields = ({ collection, config }: Options): Field[] => {\n  const uploadOptions: UploadConfig = typeof collection.upload === 'object' ? collection.upload : {}\n\n  const mimeType: Field = {\n    name: 'mimeType',\n    type: 'text',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: 'MIME Type',\n  }\n\n  const thumbnailURL: Field = {\n    name: 'thumbnailURL',\n    type: 'text',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    hooks: {\n      afterRead: [\n        ({ originalDoc }) => {\n          const adminThumbnail =\n            typeof collection.upload !== 'boolean' ? collection.upload?.adminThumbnail : undefined\n\n          if (typeof adminThumbnail === 'function') {\n            return adminThumbnail({ doc: originalDoc })\n          }\n\n          if (\n            typeof adminThumbnail === 'string' &&\n            'sizes' in originalDoc &&\n            originalDoc.sizes?.[adminThumbnail]?.filename\n          ) {\n            return generateURL({\n              collectionSlug: collection.slug,\n              config,\n              filename: originalDoc.sizes?.[adminThumbnail].filename as string,\n            })\n          }\n\n          return null\n        },\n      ],\n    },\n    label: 'Thumbnail URL',\n  }\n\n  const width: Field = {\n    name: 'width',\n    type: 'number',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: ({ t }) => t('upload:width'),\n  }\n\n  const height: Field = {\n    name: 'height',\n    type: 'number',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: ({ t }) => t('upload:height'),\n  }\n\n  const filesize: Field = {\n    name: 'filesize',\n    type: 'number',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: ({ t }) => t('upload:fileSize'),\n  }\n\n  const filename: Field = {\n    name: 'filename',\n    type: 'text',\n    admin: {\n      disableBulkEdit: true,\n      hidden: true,\n      readOnly: true,\n    },\n    index: true,\n    label: ({ t }) => t('upload:fileName'),\n    unique: true,\n  }\n\n  const url: Field = {\n    name: 'url',\n    type: 'text',\n    admin: {\n      hidden: true,\n      readOnly: true,\n    },\n    label: 'URL',\n  }\n\n  let uploadFields: Field[] = [\n    {\n      ...url,\n      hooks: {\n        afterRead: [\n          ({ data }) =>\n            generateURL({\n              collectionSlug: collection.slug,\n              config,\n              filename: data?.filename,\n            }),\n        ],\n      },\n    },\n    thumbnailURL,\n    filename,\n    mimeType,\n    filesize,\n    width,\n    height,\n  ]\n\n  if (uploadOptions.mimeTypes) {\n    mimeType.validate = mimeTypeValidator(uploadOptions.mimeTypes)\n  }\n\n  if (uploadOptions.imageSizes) {\n    uploadFields = uploadFields.concat([\n      {\n        name: 'sizes',\n        type: 'group',\n        admin: {\n          hidden: true,\n        },\n        fields: uploadOptions.imageSizes.map((size) => ({\n          name: size.name,\n          type: 'group',\n          admin: {\n            hidden: true,\n          },\n          fields: [\n            {\n              ...url,\n              hooks: {\n                afterRead: [\n                  ({ data }) => {\n                    const sizeFilename = data?.sizes?.[size.name]?.filename\n\n                    if (sizeFilename) {\n                      return `${config.serverURL}${config.routes.api}/${collection.slug}/file/${sizeFilename}`\n                    }\n\n                    return null\n                  },\n                ],\n              },\n            },\n            width,\n            height,\n            mimeType,\n            filesize,\n            {\n              ...filename,\n              unique: false,\n            },\n          ],\n          label: size.name,\n        })),\n        label: ({ t }) => t('upload:Sizes'),\n      },\n    ])\n  }\n  return uploadFields\n}\n"],"names":["mimeTypeValidator","generateURL","collectionSlug","config","filename","serverURL","routes","api","undefined","getBaseUploadFields","collection","uploadOptions","upload","mimeType","name","type","admin","hidden","readOnly","label","thumbnailURL","hooks","afterRead","originalDoc","adminThumbnail","doc","sizes","slug","width","t","height","filesize","disableBulkEdit","index","unique","url","uploadFields","data","mimeTypes","validate","imageSizes","concat","fields","map","size","sizeFilename"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/uploads/getExternalFile.d.ts

@@ -1,9 +1,10 @@
-import type { PayloadRequest } from '../exports/types';
-import type { File, FileData } from './types';
+import type { PayloadRequestWithData } from '../types/index.js';
+import type { File, FileData, UploadConfig } from './types.js';
 type Args = {
     data: FileData;
-    req: PayloadRequest;
+    req: PayloadRequestWithData;
+    uploadConfig: UploadConfig;
 };
-export declare const getExternalFile: ({ data, req }: Args) => Promise<File>;
+export declare const getExternalFile: ({ data, req, uploadConfig }: Args) => Promise<File>;
 export {};
 //# sourceMappingURL=getExternalFile.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getExternalFile.d.ts","sourceRoot":"","sources":["../../src/uploads/getExternalFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAI7C,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,QAAQ,CAAA;IACd,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AACD,eAAO,MAAM,eAAe,kBAAyB,IAAI,KAAG,QAAQ,IAAI,CA4BvE,CAAA"}
+{"version":3,"file":"getExternalFile.d.ts","sourceRoot":"","sources":["../../src/uploads/getExternalFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAI9D,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,QAAQ,CAAA;IACd,GAAG,EAAE,sBAAsB,CAAA;IAC3B,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AACD,eAAO,MAAM,eAAe,gCAAuC,IAAI,KAAG,QAAQ,IAAI,CAiCrF,CAAA"}

package/dist/uploads/getExternalFile.js

@@ -1,27 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "getExternalFile", {
-    enumerable: true,
-    get: function() {
-        return getExternalFile;
-    }
-});
-const _errors = require("../errors");
-const getExternalFile = async ({ data, req })=>{
-    const baseUrl = req.origin || `${req.protocol}://${req.host}`;
+import { APIError } from '../errors/index.js';
+export const getExternalFile = async ({ data, req, uploadConfig })=>{
     const { filename, url } = data;
     if (typeof url === 'string') {
-        const fileURL = `${baseUrl}${url}`;
+        let fileURL = url;
+        if (!url.startsWith('http')) {
+            const baseUrl = req.headers.get('origin') || `${req.protocol}://${req.headers.get('host')}`;
+            fileURL = `${baseUrl}${url}`;
+        }
+        const headers = uploadConfig.externalFileHeaderFilter ? uploadConfig.externalFileHeaderFilter(Object.fromEntries(new Headers(req.headers))) : {
+            cookie: req.headers.get('cookie')
+        };
         const res = await fetch(fileURL, {
             credentials: 'include',
-            headers: {
-                ...req.headers
-            },
+            headers,
             method: 'GET'
         });
-        if (!res.ok) throw new _errors.APIError(`Failed to fetch file from ${fileURL}`, res.status);
+        if (!res.ok) throw new APIError(`Failed to fetch file from ${fileURL}`, res.status);
         const data = await res.arrayBuffer();
         return {
             name: filename,
@@ -30,7 +24,7 @@ const getExternalFile = async ({ data, req })=>{
             size: Number(res.headers.get('content-length')) || 0
         };
     }
-    throw new _errors.APIError('Invalid file url', 400);
+    throw new APIError('Invalid file url', 400);
 };
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91cGxvYWRzL2dldEV4dGVybmFsRmlsZS50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IFBheWxvYWRSZXF1ZXN0IH0gZnJvbSAnLi4vZXhwb3J0cy90eXBlcydcbmltcG9ydCB0eXBlIHsgRmlsZSwgRmlsZURhdGEgfSBmcm9tICcuL3R5cGVzJ1xuXG5pbXBvcnQgeyBBUElFcnJvciB9IGZyb20gJy4uL2Vycm9ycydcblxudHlwZSBBcmdzID0ge1xuICBkYXRhOiBGaWxlRGF0YVxuICByZXE6IFBheWxvYWRSZXF1ZXN0XG59XG5leHBvcnQgY29uc3QgZ2V0RXh0ZXJuYWxGaWxlID0gYXN5bmMgKHsgZGF0YSwgcmVxIH06IEFyZ3MpOiBQcm9taXNlPEZpbGU+ID0+IHtcbiAgY29uc3QgYmFzZVVybCA9IHJlcS5vcmlnaW4gfHwgYCR7cmVxLnByb3RvY29sfTovLyR7cmVxLmhvc3R9YFxuICBjb25zdCB7IGZpbGVuYW1lLCB1cmwgfSA9IGRhdGFcblxuICBpZiAodHlwZW9mIHVybCA9PT0gJ3N0cmluZycpIHtcbiAgICBjb25zdCBmaWxlVVJMID0gYCR7YmFzZVVybH0ke3VybH1gXG5cbiAgICBjb25zdCByZXMgPSBhd2FpdCBmZXRjaChmaWxlVVJMLCB7XG4gICAgICBjcmVkZW50aWFsczogJ2luY2x1ZGUnLFxuICAgICAgaGVhZGVyczoge1xuICAgICAgICAuLi5yZXEuaGVhZGVycyxcbiAgICAgIH0sXG4gICAgICBtZXRob2Q6ICdHRVQnLFxuICAgIH0pXG5cbiAgICBpZiAoIXJlcy5vaykgdGhyb3cgbmV3IEFQSUVycm9yKGBGYWlsZWQgdG8gZmV0Y2ggZmlsZSBmcm9tICR7ZmlsZVVSTH1gLCByZXMuc3RhdHVzKVxuXG4gICAgY29uc3QgZGF0YSA9IGF3YWl0IHJlcy5hcnJheUJ1ZmZlcigpXG5cbiAgICByZXR1cm4ge1xuICAgICAgbmFtZTogZmlsZW5hbWUsXG4gICAgICBkYXRhOiBCdWZmZXIuZnJvbShkYXRhKSxcbiAgICAgIG1pbWV0eXBlOiByZXMuaGVhZGVycy5nZXQoJ2NvbnRlbnQtdHlwZScpIHx8IHVuZGVmaW5lZCxcbiAgICAgIHNpemU6IE51bWJlcihyZXMuaGVhZGVycy5nZXQoJ2NvbnRlbnQtbGVuZ3RoJykpIHx8IDAsXG4gICAgfVxuICB9XG5cbiAgdGhyb3cgbmV3IEFQSUVycm9yKCdJbnZhbGlkIGZpbGUgdXJsJywgNDAwKVxufVxuIl0sIm5hbWVzIjpbImdldEV4dGVybmFsRmlsZSIsImRhdGEiLCJyZXEiLCJiYXNlVXJsIiwib3JpZ2luIiwicHJvdG9jb2wiLCJob3N0IiwiZmlsZW5hbWUiLCJ1cmwiLCJmaWxlVVJMIiwicmVzIiwiZmV0Y2giLCJjcmVkZW50aWFscyIsImhlYWRlcnMiLCJtZXRob2QiLCJvayIsIkFQSUVycm9yIiwic3RhdHVzIiwiYXJyYXlCdWZmZXIiLCJuYW1lIiwiQnVmZmVyIiwiZnJvbSIsIm1pbWV0eXBlIiwiZ2V0IiwidW5kZWZpbmVkIiwic2l6ZSIsIk51bWJlciJdLCJtYXBwaW5ncyI6Ijs7OzsrQkFTYUE7OztlQUFBQTs7O3dCQU5ZO0FBTWxCLE1BQU1BLGtCQUFrQixPQUFPLEVBQUVDLElBQUksRUFBRUMsR0FBRyxFQUFRO0lBQ3ZELE1BQU1DLFVBQVVELElBQUlFLE1BQU0sSUFBSSxDQUFDLEVBQUVGLElBQUlHLFFBQVEsQ0FBQyxHQUFHLEVBQUVILElBQUlJLElBQUksQ0FBQyxDQUFDO0lBQzdELE1BQU0sRUFBRUMsUUFBUSxFQUFFQyxHQUFHLEVBQUUsR0FBR1A7SUFFMUIsSUFBSSxPQUFPTyxRQUFRLFVBQVU7UUFDM0IsTUFBTUMsVUFBVSxDQUFDLEVBQUVOLFFBQVEsRUFBRUssSUFBSSxDQUFDO1FBRWxDLE1BQU1FLE1BQU0sTUFBTUMsTUFBTUYsU0FBUztZQUMvQkcsYUFBYTtZQUNiQyxTQUFTO2dCQUNQLEdBQUdYLElBQUlXLE9BQU87WUFDaEI7WUFDQUMsUUFBUTtRQUNWO1FBRUEsSUFBSSxDQUFDSixJQUFJSyxFQUFFLEVBQUUsTUFBTSxJQUFJQyxnQkFBUSxDQUFDLENBQUMsMEJBQTBCLEVBQUVQLFFBQVEsQ0FBQyxFQUFFQyxJQUFJTyxNQUFNO1FBRWxGLE1BQU1oQixPQUFPLE1BQU1TLElBQUlRLFdBQVc7UUFFbEMsT0FBTztZQUNMQyxNQUFNWjtZQUNOTixNQUFNbUIsT0FBT0MsSUFBSSxDQUFDcEI7WUFDbEJxQixVQUFVWixJQUFJRyxPQUFPLENBQUNVLEdBQUcsQ0FBQyxtQkFBbUJDO1lBQzdDQyxNQUFNQyxPQUFPaEIsSUFBSUcsT0FBTyxDQUFDVSxHQUFHLENBQUMsc0JBQXNCO1FBQ3JEO0lBQ0Y7SUFFQSxNQUFNLElBQUlQLGdCQUFRLENBQUMsb0JBQW9CO0FBQ3pDIn0=
+//# sourceMappingURL=getExternalFile.js.map

package/dist/uploads/getExternalFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/getExternalFile.ts"],"sourcesContent":["import type { PayloadRequestWithData } from '../types/index.js'\nimport type { File, FileData, UploadConfig } from './types.js'\n\nimport { APIError } from '../errors/index.js'\n\ntype Args = {\n  data: FileData\n  req: PayloadRequestWithData\n  uploadConfig: UploadConfig\n}\nexport const getExternalFile = async ({ data, req, uploadConfig }: Args): Promise<File> => {\n  const { filename, url } = data\n\n  if (typeof url === 'string') {\n    let fileURL = url\n    if (!url.startsWith('http')) {\n      const baseUrl = req.headers.get('origin') || `${req.protocol}://${req.headers.get('host')}`\n      fileURL = `${baseUrl}${url}`\n    }\n\n    const headers = uploadConfig.externalFileHeaderFilter\n      ? uploadConfig.externalFileHeaderFilter(Object.fromEntries(new Headers(req.headers)))\n      : { cookie: req.headers.get('cookie') }\n\n    const res = await fetch(fileURL, {\n      credentials: 'include',\n      headers,\n      method: 'GET',\n    })\n\n    if (!res.ok) throw new APIError(`Failed to fetch file from ${fileURL}`, res.status)\n\n    const data = await res.arrayBuffer()\n\n    return {\n      name: filename,\n      data: Buffer.from(data),\n      mimetype: res.headers.get('content-type') || undefined,\n      size: Number(res.headers.get('content-length')) || 0,\n    }\n  }\n\n  throw new APIError('Invalid file url', 400)\n}\n"],"names":["APIError","getExternalFile","data","req","uploadConfig","filename","url","fileURL","startsWith","baseUrl","headers","get","protocol","externalFileHeaderFilter","Object","fromEntries","Headers","cookie","res","fetch","credentials","method","ok","status","arrayBuffer","name","Buffer","from","mimetype","undefined","size","Number"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,QAAQ,QAAQ,qBAAoB;AAO7C,OAAO,MAAMC,kBAAkB,OAAO,EAAEC,IAAI,EAAEC,GAAG,EAAEC,YAAY,EAAQ;IACrE,MAAM,EAAEC,QAAQ,EAAEC,GAAG,EAAE,GAAGJ;IAE1B,IAAI,OAAOI,QAAQ,UAAU;QAC3B,IAAIC,UAAUD;QACd,IAAI,CAACA,IAAIE,UAAU,CAAC,SAAS;YAC3B,MAAMC,UAAUN,IAAIO,OAAO,CAACC,GAAG,CAAC,aAAa,CAAC,EAAER,IAAIS,QAAQ,CAAC,GAAG,EAAET,IAAIO,OAAO,CAACC,GAAG,CAAC,QAAQ,CAAC;YAC3FJ,UAAU,CAAC,EAAEE,QAAQ,EAAEH,IAAI,CAAC;QAC9B;QAEA,MAAMI,UAAUN,aAAaS,wBAAwB,GACjDT,aAAaS,wBAAwB,CAACC,OAAOC,WAAW,CAAC,IAAIC,QAAQb,IAAIO,OAAO,MAChF;YAAEO,QAAQd,IAAIO,OAAO,CAACC,GAAG,CAAC;QAAU;QAExC,MAAMO,MAAM,MAAMC,MAAMZ,SAAS;YAC/Ba,aAAa;YACbV;YACAW,QAAQ;QACV;QAEA,IAAI,CAACH,IAAII,EAAE,EAAE,MAAM,IAAItB,SAAS,CAAC,0BAA0B,EAAEO,QAAQ,CAAC,EAAEW,IAAIK,MAAM;QAElF,MAAMrB,OAAO,MAAMgB,IAAIM,WAAW;QAElC,OAAO;YACLC,MAAMpB;YACNH,MAAMwB,OAAOC,IAAI,CAACzB;YAClB0B,UAAUV,IAAIR,OAAO,CAACC,GAAG,CAAC,mBAAmBkB;YAC7CC,MAAMC,OAAOb,IAAIR,OAAO,CAACC,GAAG,CAAC,sBAAsB;QACrD;IACF;IAEA,MAAM,IAAIX,SAAS,oBAAoB;AACzC,EAAC"}

package/dist/uploads/getFileByPath.d.ts

@@ -1,4 +1,3 @@
-import type { CustomPayloadRequest } from '../exports/types';
-declare const getFileByPath: (filePath: string) => Promise<CustomPayloadRequest['file']>;
-export default getFileByPath;
+import type { PayloadRequestWithData } from '../types/index.js';
+export declare const getFileByPath: (filePath: string) => Promise<PayloadRequestWithData['file']>;
 //# sourceMappingURL=getFileByPath.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getFileByPath.d.ts","sourceRoot":"","sources":["../../src/uploads/getFileByPath.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAM5D,QAAA,MAAM,aAAa,aAAoB,MAAM,KAAG,QAAQ,oBAAoB,CAAC,MAAM,CAAC,CAoBnF,CAAA;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"getFileByPath.d.ts","sourceRoot":"","sources":["../../src/uploads/getFileByPath.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAM/D,eAAO,MAAM,aAAa,aAAoB,MAAM,KAAG,QAAQ,sBAAsB,CAAC,MAAM,CAAC,CAoB5F,CAAA"}