payload 1.6.20 → 1.6.21

package/dist/uploads/getBaseFields.js

@@ -1,135 +1,135 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const mimeTypeValidator_1 = require("./mimeTypeValidator");
-const extractTranslations_1 = require("../translations/extractTranslations");
-const labels = (0, extractTranslations_1.extractTranslations)(['upload:width', 'upload:height', 'upload:fileSize', 'upload:fileName', 'upload:sizes']);
-const getBaseUploadFields = ({ config, collection }) => {
-    const uploadOptions = typeof collection.upload === 'object' ? collection.upload : {};
-    const mimeType = {
-        name: 'mimeType',
-        label: 'MIME Type',
-        type: 'text',
-        admin: {
-            readOnly: true,
-            hidden: true,
-        },
-    };
-    const url = {
-        name: 'url',
-        label: 'URL',
-        type: 'text',
-        admin: {
-            readOnly: true,
-            hidden: true,
-        },
-    };
-    const width = {
-        name: 'width',
-        label: labels['upload:width'],
-        type: 'number',
-        admin: {
-            readOnly: true,
-            hidden: true,
-        },
-    };
-    const height = {
-        name: 'height',
-        label: labels['upload:height'],
-        type: 'number',
-        admin: {
-            readOnly: true,
-            hidden: true,
-        },
-    };
-    const filesize = {
-        name: 'filesize',
-        label: labels['upload:fileSize'],
-        type: 'number',
-        admin: {
-            readOnly: true,
-            hidden: true,
-        },
-    };
-    const filename = {
-        name: 'filename',
-        label: labels['upload:fileName'],
-        type: 'text',
-        index: true,
-        unique: true,
-        admin: {
-            readOnly: true,
-            hidden: true,
-        },
-    };
-    let uploadFields = [
-        {
-            ...url,
-            hooks: {
-                afterRead: [
-                    ({ data }) => {
-                        if (data === null || data === void 0 ? void 0 : data.filename) {
-                            return `${config.serverURL}${uploadOptions.staticURL}/${data.filename}`;
-                        }
-                        return undefined;
-                    },
-                ],
-            },
-        },
-        filename,
-        mimeType,
-        filesize,
-        width,
-        height,
-    ];
-    if (uploadOptions.mimeTypes) {
-        mimeType.validate = (0, mimeTypeValidator_1.mimeTypeValidator)(uploadOptions.mimeTypes);
-    }
-    if (uploadOptions.imageSizes) {
-        uploadFields = uploadFields.concat([
-            {
-                name: 'sizes',
-                label: labels['upload:Sizes'],
-                type: 'group',
-                admin: {
-                    hidden: true,
-                },
-                fields: uploadOptions.imageSizes.map((size) => ({
-                    label: size.name,
-                    name: size.name,
-                    type: 'group',
-                    admin: {
-                        hidden: true,
-                    },
-                    fields: [
-                        {
-                            ...url,
-                            hooks: {
-                                afterRead: [
-                                    ({ data }) => {
-                                        var _a, _b;
-                                        const sizeFilename = (_b = (_a = data === null || data === void 0 ? void 0 : data.sizes) === null || _a === void 0 ? void 0 : _a[size.name]) === null || _b === void 0 ? void 0 : _b.filename;
-                                        if (sizeFilename) {
-                                            return `${config.serverURL}${uploadOptions.staticURL}/${sizeFilename}`;
-                                        }
-                                        return undefined;
-                                    },
-                                ],
-                            },
-                        },
-                        width,
-                        height,
-                        mimeType,
-                        filesize,
-                        {
-                            ...filename,
-                            unique: false,
-                        },
-                    ],
-                })),
-            },
-        ]);
-    }
-    return uploadFields;
-};
-exports.default = getBaseUploadFields;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mimeTypeValidator_1 = require("./mimeTypeValidator");
+const extractTranslations_1 = require("../translations/extractTranslations");
+const labels = (0, extractTranslations_1.extractTranslations)(['upload:width', 'upload:height', 'upload:fileSize', 'upload:fileName', 'upload:sizes']);
+const getBaseUploadFields = ({ config, collection }) => {
+    const uploadOptions = typeof collection.upload === 'object' ? collection.upload : {};
+    const mimeType = {
+        name: 'mimeType',
+        label: 'MIME Type',
+        type: 'text',
+        admin: {
+            readOnly: true,
+            hidden: true,
+        },
+    };
+    const url = {
+        name: 'url',
+        label: 'URL',
+        type: 'text',
+        admin: {
+            readOnly: true,
+            hidden: true,
+        },
+    };
+    const width = {
+        name: 'width',
+        label: labels['upload:width'],
+        type: 'number',
+        admin: {
+            readOnly: true,
+            hidden: true,
+        },
+    };
+    const height = {
+        name: 'height',
+        label: labels['upload:height'],
+        type: 'number',
+        admin: {
+            readOnly: true,
+            hidden: true,
+        },
+    };
+    const filesize = {
+        name: 'filesize',
+        label: labels['upload:fileSize'],
+        type: 'number',
+        admin: {
+            readOnly: true,
+            hidden: true,
+        },
+    };
+    const filename = {
+        name: 'filename',
+        label: labels['upload:fileName'],
+        type: 'text',
+        index: true,
+        unique: true,
+        admin: {
+            readOnly: true,
+            hidden: true,
+        },
+    };
+    let uploadFields = [
+        {
+            ...url,
+            hooks: {
+                afterRead: [
+                    ({ data }) => {
+                        if (data === null || data === void 0 ? void 0 : data.filename) {
+                            return `${config.serverURL}${uploadOptions.staticURL}/${data.filename}`;
+                        }
+                        return undefined;
+                    },
+                ],
+            },
+        },
+        filename,
+        mimeType,
+        filesize,
+        width,
+        height,
+    ];
+    if (uploadOptions.mimeTypes) {
+        mimeType.validate = (0, mimeTypeValidator_1.mimeTypeValidator)(uploadOptions.mimeTypes);
+    }
+    if (uploadOptions.imageSizes) {
+        uploadFields = uploadFields.concat([
+            {
+                name: 'sizes',
+                label: labels['upload:Sizes'],
+                type: 'group',
+                admin: {
+                    hidden: true,
+                },
+                fields: uploadOptions.imageSizes.map((size) => ({
+                    label: size.name,
+                    name: size.name,
+                    type: 'group',
+                    admin: {
+                        hidden: true,
+                    },
+                    fields: [
+                        {
+                            ...url,
+                            hooks: {
+                                afterRead: [
+                                    ({ data }) => {
+                                        var _a, _b;
+                                        const sizeFilename = (_b = (_a = data === null || data === void 0 ? void 0 : data.sizes) === null || _a === void 0 ? void 0 : _a[size.name]) === null || _b === void 0 ? void 0 : _b.filename;
+                                        if (sizeFilename) {
+                                            return `${config.serverURL}${uploadOptions.staticURL}/${sizeFilename}`;
+                                        }
+                                        return undefined;
+                                    },
+                                ],
+                            },
+                        },
+                        width,
+                        height,
+                        mimeType,
+                        filesize,
+                        {
+                            ...filename,
+                            unique: false,
+                        },
+                    ],
+                })),
+            },
+        ]);
+    }
+    return uploadFields;
+};
+exports.default = getBaseUploadFields;
 //# sourceMappingURL=getBaseFields.js.map

package/dist/uploads/getFileByPath.d.ts

@@ -1,3 +1,3 @@
-import { File } from './types';
-declare const getFileByPath: (filePath: string) => Promise<File>;
-export default getFileByPath;
+import { File } from './types';
+declare const getFileByPath: (filePath: string) => Promise<File>;
+export default getFileByPath;

package/dist/uploads/getFileByPath.js

@@ -1,25 +1,25 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const file_type_1 = require("file-type");
-const path_1 = __importDefault(require("path"));
-const getFileByPath = async (filePath) => {
-    if (typeof filePath === 'string') {
-        const data = fs_1.default.readFileSync(filePath);
-        const mimetype = (0, file_type_1.fromFile)(filePath);
-        const { size } = fs_1.default.statSync(filePath);
-        const name = path_1.default.basename(filePath);
-        return {
-            data,
-            mimetype: (await mimetype).mime,
-            name,
-            size,
-        };
-    }
-    return undefined;
-};
-exports.default = getFileByPath;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const file_type_1 = require("file-type");
+const path_1 = __importDefault(require("path"));
+const getFileByPath = async (filePath) => {
+    if (typeof filePath === 'string') {
+        const data = fs_1.default.readFileSync(filePath);
+        const mimetype = (0, file_type_1.fromFile)(filePath);
+        const { size } = fs_1.default.statSync(filePath);
+        const name = path_1.default.basename(filePath);
+        return {
+            data,
+            mimetype: (await mimetype).mime,
+            name,
+            size,
+        };
+    }
+    return undefined;
+};
+exports.default = getFileByPath;
 //# sourceMappingURL=getFileByPath.js.map

package/dist/uploads/getImageSize.d.ts

@@ -1,3 +1,3 @@
-import { UploadedFile } from 'express-fileupload';
-import { ProbedImageSize } from './types';
-export default function (file: UploadedFile): Promise<ProbedImageSize>;
+import { UploadedFile } from 'express-fileupload';
+import { ProbedImageSize } from './types';
+export default function (file: UploadedFile): Promise<ProbedImageSize>;

package/dist/uploads/getImageSize.js

@@ -1,14 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const probe_image_size_1 = __importDefault(require("probe-image-size"));
-async function default_1(file) {
-    return file.tempFilePath
-        ? (0, probe_image_size_1.default)(fs_1.default.createReadStream(file.tempFilePath))
-        : probe_image_size_1.default.sync(file.data);
-}
-exports.default = default_1;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const probe_image_size_1 = __importDefault(require("probe-image-size"));
+async function default_1(file) {
+    return file.tempFilePath
+        ? (0, probe_image_size_1.default)(fs_1.default.createReadStream(file.tempFilePath))
+        : probe_image_size_1.default.sync(file.data);
+}
+exports.default = default_1;
 //# sourceMappingURL=getImageSize.js.map

package/dist/uploads/getSafeFilename.d.ts

@@ -1,3 +1,3 @@
-import { CollectionModel } from '../collections/config/types';
-declare function getSafeFileName(Model: CollectionModel, staticPath: string, desiredFilename: string): Promise<string>;
-export default getSafeFileName;
+import { CollectionModel } from '../collections/config/types';
+declare function getSafeFileName(Model: CollectionModel, staticPath: string, desiredFilename: string): Promise<string>;
+export default getSafeFileName;

package/dist/uploads/getSafeFilename.js

@@ -1,35 +1,35 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const sanitize_filename_1 = __importDefault(require("sanitize-filename"));
-const docWithFilenameExists_1 = __importDefault(require("./docWithFilenameExists"));
-const fileExists_1 = __importDefault(require("./fileExists"));
-const incrementName = (name) => {
-    const extension = name.split('.').pop();
-    const baseFilename = (0, sanitize_filename_1.default)(name.substring(0, name.lastIndexOf('.')) || name);
-    let incrementedName = baseFilename;
-    const regex = /(.*)-(\d)$/;
-    const found = baseFilename.match(regex);
-    if (found === null) {
-        incrementedName += '-1';
-    }
-    else {
-        const matchedName = found[1];
-        const matchedNumber = found[2];
-        const incremented = Number(matchedNumber) + 1;
-        incrementedName = `${matchedName}-${incremented}`;
-    }
-    return `${incrementedName}.${extension}`;
-};
-async function getSafeFileName(Model, staticPath, desiredFilename) {
-    let modifiedFilename = desiredFilename;
-    // eslint-disable-next-line no-await-in-loop
-    while (await (0, docWithFilenameExists_1.default)(Model, staticPath, modifiedFilename) || await (0, fileExists_1.default)(`${staticPath}/${modifiedFilename}`)) {
-        modifiedFilename = incrementName(modifiedFilename);
-    }
-    return modifiedFilename;
-}
-exports.default = getSafeFileName;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const sanitize_filename_1 = __importDefault(require("sanitize-filename"));
+const docWithFilenameExists_1 = __importDefault(require("./docWithFilenameExists"));
+const fileExists_1 = __importDefault(require("./fileExists"));
+const incrementName = (name) => {
+    const extension = name.split('.').pop();
+    const baseFilename = (0, sanitize_filename_1.default)(name.substring(0, name.lastIndexOf('.')) || name);
+    let incrementedName = baseFilename;
+    const regex = /(.*)-(\d)$/;
+    const found = baseFilename.match(regex);
+    if (found === null) {
+        incrementedName += '-1';
+    }
+    else {
+        const matchedName = found[1];
+        const matchedNumber = found[2];
+        const incremented = Number(matchedNumber) + 1;
+        incrementedName = `${matchedName}-${incremented}`;
+    }
+    return `${incrementedName}.${extension}`;
+};
+async function getSafeFileName(Model, staticPath, desiredFilename) {
+    let modifiedFilename = desiredFilename;
+    // eslint-disable-next-line no-await-in-loop
+    while (await (0, docWithFilenameExists_1.default)(Model, staticPath, modifiedFilename) || await (0, fileExists_1.default)(`${staticPath}/${modifiedFilename}`)) {
+        modifiedFilename = incrementName(modifiedFilename);
+    }
+    return modifiedFilename;
+}
+exports.default = getSafeFileName;
 //# sourceMappingURL=getSafeFilename.js.map

package/dist/uploads/imageResizer.d.ts

@@ -1,23 +1,23 @@
-import { UploadedFile } from 'express-fileupload';
-import { SanitizedCollectionConfig } from '../collections/config/types';
-import { PayloadRequest } from '../express/types';
-import { FileSizes, FileToSave } from './types';
-type Dimensions = {
-    width?: number;
-    height?: number;
-};
-type Args = {
-    req: PayloadRequest;
-    file: UploadedFile;
-    dimensions: Dimensions;
-    staticPath: string;
-    config: SanitizedCollectionConfig;
-    savedFilename: string;
-    mimeType: string;
-};
-type Result = Promise<{
-    sizeData: FileSizes;
-    sizesToSave: FileToSave[];
-}>;
-export default function resizeAndSave({ req, file, dimensions, staticPath, config, savedFilename, }: Args): Promise<Result>;
-export {};
+import { UploadedFile } from 'express-fileupload';
+import { SanitizedCollectionConfig } from '../collections/config/types';
+import { PayloadRequest } from '../express/types';
+import { FileSizes, FileToSave } from './types';
+type Dimensions = {
+    width?: number;
+    height?: number;
+};
+type Args = {
+    req: PayloadRequest;
+    file: UploadedFile;
+    dimensions: Dimensions;
+    staticPath: string;
+    config: SanitizedCollectionConfig;
+    savedFilename: string;
+    mimeType: string;
+};
+type Result = Promise<{
+    sizeData: FileSizes;
+    sizesToSave: FileToSave[];
+}>;
+export default function resizeAndSave({ req, file, dimensions, staticPath, config, savedFilename, }: Args): Promise<Result>;
+export {};

package/dist/uploads/imageResizer.js

@@ -1,81 +1,81 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const file_type_1 = require("file-type");
-const fs_1 = __importDefault(require("fs"));
-const sanitize_filename_1 = __importDefault(require("sanitize-filename"));
-const sharp_1 = __importDefault(require("sharp"));
-const fileExists_1 = __importDefault(require("./fileExists"));
-function getOutputImage(sourceImage, size) {
-    const extension = sourceImage.split('.').pop();
-    const name = (0, sanitize_filename_1.default)(sourceImage.substring(0, sourceImage.lastIndexOf('.')) || sourceImage);
-    return {
-        name,
-        extension,
-        width: size.width,
-        height: size.height,
-    };
-}
-async function resizeAndSave({ req, file, dimensions, staticPath, config, savedFilename, }) {
-    const { imageSizes } = config.upload;
-    const sizesToSave = [];
-    const sizeData = {};
-    const sharpInstance = (0, sharp_1.default)(file.tempFilePath || file.data);
-    const promises = imageSizes
-        .map(async (desiredSize) => {
-        if (!needsResize(desiredSize, dimensions)) {
-            sizeData[desiredSize.name] = {
-                url: null,
-                width: null,
-                height: null,
-                filename: null,
-                filesize: null,
-                mimeType: null,
-            };
-            return;
-        }
-        let resized = sharpInstance.resize(desiredSize);
-        if (desiredSize.formatOptions) {
-            resized = resized.toFormat(desiredSize.formatOptions.format, desiredSize.formatOptions.options);
-        }
-        const bufferObject = await resized.toBuffer({
-            resolveWithObject: true,
-        });
-        req.payloadUploadSizes[desiredSize.name] = bufferObject.data;
-        const mimeType = (await (0, file_type_1.fromBuffer)(bufferObject.data));
-        const outputImage = getOutputImage(savedFilename, desiredSize);
-        const imageNameWithDimensions = createImageName(outputImage, bufferObject, mimeType.ext);
-        const imagePath = `${staticPath}/${imageNameWithDimensions}`;
-        const fileAlreadyExists = await (0, fileExists_1.default)(imagePath);
-        if (fileAlreadyExists) {
-            fs_1.default.unlinkSync(imagePath);
-        }
-        sizesToSave.push({
-            path: imagePath,
-            buffer: bufferObject.data,
-        });
-        sizeData[desiredSize.name] = {
-            width: bufferObject.info.width,
-            height: bufferObject.info.height,
-            filename: imageNameWithDimensions,
-            filesize: bufferObject.info.size,
-            mimeType: mimeType.mime,
-        };
-    });
-    await Promise.all(promises);
-    return {
-        sizeData,
-        sizesToSave,
-    };
-}
-exports.default = resizeAndSave;
-function createImageName(outputImage, bufferObject, extension) {
-    return `${outputImage.name}-${bufferObject.info.width}x${bufferObject.info.height}.${extension}`;
-}
-function needsResize(desiredSize, dimensions) {
-    return (typeof desiredSize.width === 'number' && desiredSize.width <= dimensions.width)
-        || (typeof desiredSize.height === 'number' && desiredSize.height <= dimensions.height);
-}
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const file_type_1 = require("file-type");
+const fs_1 = __importDefault(require("fs"));
+const sanitize_filename_1 = __importDefault(require("sanitize-filename"));
+const sharp_1 = __importDefault(require("sharp"));
+const fileExists_1 = __importDefault(require("./fileExists"));
+function getOutputImage(sourceImage, size) {
+    const extension = sourceImage.split('.').pop();
+    const name = (0, sanitize_filename_1.default)(sourceImage.substring(0, sourceImage.lastIndexOf('.')) || sourceImage);
+    return {
+        name,
+        extension,
+        width: size.width,
+        height: size.height,
+    };
+}
+async function resizeAndSave({ req, file, dimensions, staticPath, config, savedFilename, }) {
+    const { imageSizes } = config.upload;
+    const sizesToSave = [];
+    const sizeData = {};
+    const sharpInstance = (0, sharp_1.default)(file.tempFilePath || file.data);
+    const promises = imageSizes
+        .map(async (desiredSize) => {
+        if (!needsResize(desiredSize, dimensions)) {
+            sizeData[desiredSize.name] = {
+                url: null,
+                width: null,
+                height: null,
+                filename: null,
+                filesize: null,
+                mimeType: null,
+            };
+            return;
+        }
+        let resized = sharpInstance.resize(desiredSize);
+        if (desiredSize.formatOptions) {
+            resized = resized.toFormat(desiredSize.formatOptions.format, desiredSize.formatOptions.options);
+        }
+        const bufferObject = await resized.toBuffer({
+            resolveWithObject: true,
+        });
+        req.payloadUploadSizes[desiredSize.name] = bufferObject.data;
+        const mimeType = (await (0, file_type_1.fromBuffer)(bufferObject.data));
+        const outputImage = getOutputImage(savedFilename, desiredSize);
+        const imageNameWithDimensions = createImageName(outputImage, bufferObject, mimeType.ext);
+        const imagePath = `${staticPath}/${imageNameWithDimensions}`;
+        const fileAlreadyExists = await (0, fileExists_1.default)(imagePath);
+        if (fileAlreadyExists) {
+            fs_1.default.unlinkSync(imagePath);
+        }
+        sizesToSave.push({
+            path: imagePath,
+            buffer: bufferObject.data,
+        });
+        sizeData[desiredSize.name] = {
+            width: bufferObject.info.width,
+            height: bufferObject.info.height,
+            filename: imageNameWithDimensions,
+            filesize: bufferObject.info.size,
+            mimeType: mimeType.mime,
+        };
+    });
+    await Promise.all(promises);
+    return {
+        sizeData,
+        sizesToSave,
+    };
+}
+exports.default = resizeAndSave;
+function createImageName(outputImage, bufferObject, extension) {
+    return `${outputImage.name}-${bufferObject.info.width}x${bufferObject.info.height}.${extension}`;
+}
+function needsResize(desiredSize, dimensions) {
+    return (typeof desiredSize.width === 'number' && desiredSize.width <= dimensions.width)
+        || (typeof desiredSize.height === 'number' && desiredSize.height <= dimensions.height);
+}
 //# sourceMappingURL=imageResizer.js.map

package/dist/uploads/isImage.d.ts

@@ -1 +1 @@
-export default function isImage(mimeType: string): boolean;
+export default function isImage(mimeType: string): boolean;