payload 1.0.34 → 1.1.0

package/dist/mongoose/buildSchema.js

@@ -17,8 +17,8 @@ const formatBaseSchema = (field, buildSchemaOptions) => {
     }
     return schema;
 };
-const localizeSchema = (field, schema, localization) => {
-    if (field.localized && localization && Array.isArray(localization.locales)) {
+const localizeSchema = (entity, schema, localization) => {
+    if ((0, types_1.fieldIsLocalized)(entity) && localization && Array.isArray(localization.locales)) {
         return {
             type: localization.locales.reduce((localeSchema, locale) => ({
                 ...localeSchema,
@@ -233,12 +233,28 @@ const fieldToSchemaMap = {
     },
     tabs: (field, schema, config, buildSchemaOptions) => {
         field.tabs.forEach((tab) => {
-            tab.fields.forEach((subField) => {
-                const addFieldSchema = fieldToSchemaMap[subField.type];
-                if (addFieldSchema) {
-                    addFieldSchema(subField, schema, config, buildSchemaOptions);
-                }
-            });
+            if ((0, types_1.tabHasName)(tab)) {
+                const baseSchema = {
+                    type: buildSchema(config, tab.fields, {
+                        options: {
+                            _id: false,
+                            id: false,
+                        },
+                        disableUnique: buildSchemaOptions.disableUnique,
+                    }),
+                };
+                schema.add({
+                    [tab.name]: localizeSchema(tab, baseSchema, config.localization),
+                });
+            }
+            else {
+                tab.fields.forEach((subField) => {
+                    const addFieldSchema = fieldToSchemaMap[subField.type];
+                    if (addFieldSchema) {
+                        addFieldSchema(subField, schema, config, buildSchemaOptions);
+                    }
+                });
+            }
         });
     },
     array: (field, schema, config, buildSchemaOptions) => {
@@ -255,14 +271,9 @@ const fieldToSchemaMap = {
         });
     },
     group: (field, schema, config, buildSchemaOptions) => {
-        var _a, _b;
-        let { required } = field;
-        if (((_a = field === null || field === void 0 ? void 0 : field.admin) === null || _a === void 0 ? void 0 : _a.condition) || (field === null || field === void 0 ? void 0 : field.localized) || ((_b = field === null || field === void 0 ? void 0 : field.access) === null || _b === void 0 ? void 0 : _b.create))
-            required = false;
         const formattedBaseSchema = formatBaseSchema(field, buildSchemaOptions);
         const baseSchema = {
             ...formattedBaseSchema,
-            required: required && field.fields.some((subField) => { var _a, _b; return (!(0, types_1.fieldIsPresentationalOnly)(subField) && subField.required && !subField.localized && !((_a = subField === null || subField === void 0 ? void 0 : subField.admin) === null || _a === void 0 ? void 0 : _a.condition) && !((_b = subField === null || subField === void 0 ? void 0 : subField.access) === null || _b === void 0 ? void 0 : _b.create)); }),
             type: buildSchema(config, field.fields, {
                 options: {
                     _id: false,
@@ -319,4 +330,4 @@ const fieldToSchemaMap = {
     },
 };
 exports.default = buildSchema;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"buildSchema.js","sourceRoot":"","sources":["../../src/mongoose/buildSchema.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"buildSchema.js","sourceRoot":"","sources":["../../src/mongoose/buildSchema.ts"],"names":[],"mappings":"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"}

package/dist/types/index.d.ts

@@ -7,9 +7,9 @@ export declare type WhereField = {
     [key in Operator]?: unknown;
 };
 export declare type Where = {
+    [key: string]: WhereField | Where[];
     or?: Where[];
     and?: Where[];
-    [key: string]: Where[] | WhereField;
 };
 export declare type Document = any;
 export interface PayloadMongooseDocument extends MongooseDocument {

package/dist/uploads/getBaseFields.js

@@ -76,14 +76,14 @@ const getBaseUploadFields = ({ config, collection }) => {
         filename,
         mimeType,
         filesize,
+        width,
+        height,
     ];
     if (uploadOptions.mimeTypes) {
         mimeType.validate = (0, mimeTypeValidator_1.mimeTypeValidator)(uploadOptions.mimeTypes);
     }
     if (uploadOptions.imageSizes) {
         uploadFields = uploadFields.concat([
-            width,
-            height,
             {
                 name: 'sizes',
                 label: 'Sizes',
@@ -130,4 +130,4 @@ const getBaseUploadFields = ({ config, collection }) => {
     return uploadFields;
 };
 exports.default = getBaseUploadFields;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0QmFzZUZpZWxkcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91cGxvYWRzL2dldEJhc2VGaWVsZHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFHQSwyREFBd0Q7QUFReEQsTUFBTSxtQkFBbUIsR0FBRyxDQUFDLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBVyxFQUFXLEVBQUU7SUFDdkUsTUFBTSxhQUFhLEdBQXVCLE9BQU8sVUFBVSxDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUV6RyxNQUFNLFFBQVEsR0FBVTtRQUN0QixJQUFJLEVBQUUsVUFBVTtRQUNoQixLQUFLLEVBQUUsV0FBVztRQUNsQixJQUFJLEVBQUUsTUFBTTtRQUNaLEtBQUssRUFBRTtZQUNMLFFBQVEsRUFBRSxJQUFJO1lBQ2QsUUFBUSxFQUFFLElBQUk7U0FDZjtLQUNGLENBQUM7SUFFRixNQUFNLEdBQUcsR0FBVTtRQUNqQixJQUFJLEVBQUUsS0FBSztRQUNYLEtBQUssRUFBRSxLQUFLO1FBQ1osSUFBSSxFQUFFLE1BQU07UUFDWixLQUFLLEVBQUU7WUFDTCxRQUFRLEVBQUUsSUFBSTtZQUNkLFFBQVEsRUFBRSxJQUFJO1NBQ2Y7S0FDRixDQUFDO0lBRUYsTUFBTSxLQUFLLEdBQVU7UUFDbkIsSUFBSSxFQUFFLE9BQU87UUFDYixLQUFLLEVBQUUsT0FBTztRQUNkLElBQUksRUFBRSxRQUFRO1FBQ2QsS0FBSyxFQUFFO1lBQ0wsUUFBUSxFQUFFLElBQUk7WUFDZCxRQUFRLEVBQUUsSUFBSTtTQUNmO0tBQ0YsQ0FBQztJQUVGLE1BQU0sTUFBTSxHQUFVO1FBQ3BCLElBQUksRUFBRSxRQUFRO1FBQ2QsS0FBSyxFQUFFLFFBQVE7UUFDZixJQUFJLEVBQUUsUUFBUTtRQUNkLEtBQUssRUFBRTtZQUNMLFFBQVEsRUFBRSxJQUFJO1lBQ2QsUUFBUSxFQUFFLElB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0QmFzZUZpZWxkcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91cGxvYWRzL2dldEJhc2VGaWVsZHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFHQSwyREFBd0Q7QUFReEQsTUFBTSxtQkFBbUIsR0FBRyxDQUFDLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBVyxFQUFXLEVBQUU7SUFDdkUsTUFBTSxhQUFhLEdBQXVCLE9BQU8sVUFBVSxDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUV6RyxNQUFNLFFBQVEsR0FBVTtRQUN0QixJQUFJLEVBQUUsVUFBVTtRQUNoQixLQUFLLEVBQUUsV0FBVztRQUNsQixJQUFJLEVBQUUsTUFBTTtRQUNaLEtBQUssRUFBRTtZQUNMLFFBQVEsRUFBRSxJQUFJO1lBQ2QsUUFBUSxFQUFFLElBQUk7U0FDZjtLQUNGLENBQUM7SUFFRixNQUFNLEdBQUcsR0FBVTtRQUNqQixJQUFJLEVBQUUsS0FBSztRQUNYLEtBQUssRUFBRSxLQUFLO1FBQ1osSUFBSSxFQUFFLE1BQU07UUFDWixLQUFLLEVBQUU7WUFDTCxRQUFRLEVBQUUsSUFBSTtZQUNkLFFBQVEsRUFBRSxJQUFJO1NBQ2Y7S0FDRixDQUFDO0lBRUYsTUFBTSxLQUFLLEdBQVU7UUFDbkIsSUFBSSxFQUFFLE9BQU87UUFDYixLQUFLLEVBQUUsT0FBTztRQUNkLElBQUksRUFBRSxRQUFRO1FBQ2QsS0FBSyxFQUFFO1lBQ0wsUUFBUSxFQUFFLElBQUk7WUFDZCxRQUFRLEVBQUUsSUFBSTtTQUNmO0tBQ0YsQ0FBQztJQUVGLE1BQU0sTUFBTSxHQUFVO1FBQ3BCLElBQUksRUFBRSxRQUFRO1FBQ2QsS0FBSyxFQUFFLFFBQVE7UUFDZixJQUFJLEVBQUUsUUFBUTtRQUNkLEtBQUssRUFBRTtZQUNMLFFBQVEsRUFBRSxJQUFJO1lBQ2QsUUFBUSxFQUFFLElB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

package/dist/uploads/getFileByPath.d.ts

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

package/dist/uploads/getFileByPath.js

@@ -4,17 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const mime_1 = __importDefault(require("mime"));
+const file_type_1 = require("file-type");
 const path_1 = __importDefault(require("path"));
-const getFileByPath = (filePath) => {
+const getFileByPath = async (filePath) => {
     if (typeof filePath === 'string') {
         const data = fs_1.default.readFileSync(filePath);
-        const mimetype = mime_1.default.getType(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,
+            mimetype: (await mimetype).mime,
             name,
             size,
         };
@@ -22,4 +22,4 @@ const getFileByPath = (filePath) => {
     return undefined;
 };
 exports.default = getFileByPath;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0RmlsZUJ5UGF0aC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91cGxvYWRzL2dldEZpbGVCeVBhdGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw0Q0FBb0I7QUFDcEIsZ0RBQXdCO0FBQ3hCLGdEQUF3QjtBQUd4QixNQUFNLGFBQWEsR0FBRyxDQUFDLFFBQWdCLEVBQVEsRUFBRTtJQUMvQyxJQUFJLE9BQU8sUUFBUSxLQUFLLFFBQVEsRUFBRTtRQUNoQyxNQUFNLElBQUksR0FBRyxZQUFFLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sUUFBUSxHQUFHLGNBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDeEMsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLFlBQUUsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFdkMsTUFBTSxJQUFJLEdBQUcsY0FBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUVyQyxPQUFPO1lBQ0wsSUFBSTtZQUNKLFFBQVE7WUFDUixJQUFJO1lBQ0osSUFBSTtTQUNMLENBQUM7S0FDSDtJQUVELE9BQU8sU0FBUyxDQUFDO0FBQ25CLENBQUMsQ0FBQztBQUVGLGtCQUFlLGFBQWEsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0RmlsZUJ5UGF0aC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91cGxvYWRzL2dldEZpbGVCeVBhdGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw0Q0FBb0I7QUFDcEIseUNBQXFDO0FBQ3JDLGdEQUF3QjtBQUd4QixNQUFNLGFBQWEsR0FBRyxLQUFLLEVBQUUsUUFBZ0IsRUFBaUIsRUFBRTtJQUM5RCxJQUFJLE9BQU8sUUFBUSxLQUFLLFFBQVEsRUFBRTtRQUNoQyxNQUFNLElBQUksR0FBRyxZQUFFLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sUUFBUSxHQUFHLElBQUEsb0JBQVEsRUFBQyxRQUFRLENBQUMsQ0FBQztRQUNwQyxNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsWUFBRSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUV2QyxNQUFNLElBQUksR0FBRyxjQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBRXJDLE9BQU87WUFDTCxJQUFJO1lBQ0osUUFBUSxFQUFFLENBQUMsTUFBTSxRQUFRLENBQUMsQ0FBQyxJQUFJO1lBQy9CLElBQUk7WUFDSixJQUFJO1NBQ0wsQ0FBQztLQUNIO0lBRUQsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQyxDQUFDO0FBRUYsa0JBQWUsYUFBYSxDQUFDIn0=

package/dist/uploads/getSafeFilename.js

@@ -8,7 +8,7 @@ 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.substr(0, name.lastIndexOf('.')) || name);
+    const baseFilename = (0, sanitize_filename_1.default)(name.substring(0, name.lastIndexOf('.')) || name);
     let incrementedName = baseFilename;
     const regex = /(.*)-(\d)$/;
     const found = baseFilename.match(regex);
@@ -19,8 +19,7 @@ const incrementName = (name) => {
         const matchedName = found[1];
         const matchedNumber = found[2];
         const incremented = Number(matchedNumber) + 1;
-        const newName = `${matchedName}-${incremented}`;
-        incrementedName = newName;
+        incrementedName = `${matchedName}-${incremented}`;
     }
     return `${incrementedName}.${extension}`;
 };
@@ -33,4 +32,4 @@ async function getSafeFileName(Model, staticPath, desiredFilename) {
     return modifiedFilename;
 }
 exports.default = getSafeFileName;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0U2FmZUZpbGVuYW1lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwbG9hZHMvZ2V0U2FmZUZpbGVuYW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsMEVBQXlDO0FBRXpDLG9GQUE0RDtBQUM1RCw4REFBc0M7QUFFdEMsTUFBTSxhQUFhLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRTtJQUNyQyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ3hDLE1BQU0sWUFBWSxHQUFHLElBQUEsMkJBQVEsRUFBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUM7SUFDN0UsSUFBSSxlQUFlLEdBQUcsWUFBWSxDQUFDO0lBQ25DLE1BQU0sS0FBSyxHQUFHLFlBQVksQ0FBQztJQUMzQixNQUFNLEtBQUssR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3hDLElBQUksS0FBSyxLQUFLLElBQUksRUFBRTtRQUNsQixlQUFlLElBQUksSUFBSSxDQUFDO0tBQ3pCO1NBQU07UUFDTCxNQUFNLFdBQVcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDN0IsTUFBTSxhQUFhLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQy9CLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDOUMsTUFBTSxPQUFPLEdBQUcsR0FBRyxXQUFXLElBQUksV0FBVyxFQUFFLENBQUM7UUFDaEQsZUFBZSxHQUFHLE9BQU8sQ0FBQztLQUMzQjtJQUNELE9BQU8sR0FBRyxlQUFlLElBQUksU0FBUyxFQUFFLENBQUM7QUFDM0MsQ0FBQyxDQUFDO0FBRUYsS0FBSyxVQUFVLGVBQWUsQ0FBQyxLQUFzQixFQUFFLFVBQWtCLEVBQUUsZUFBdUI7SUFDaEcsSUFBSSxnQkFBZ0IsR0FBRyxlQUFlLENBQUM7SUFFdkMsNENBQTRDO0lBQzVDLE9BQU8sTUFBTSxJQUFBLCtCQUFxQixFQUFDLEtBQUssRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLENBQUMsSUFBSSxNQUFNLElBQUEsb0JBQVUsRUFBQyxHQUFHLFVBQVUsSUFBSSxnQkFBZ0IsRUFBRSxDQUFDLEVBQUU7UUFDaEksZ0JBQWdCLEdBQUcsYUFBYSxDQUFDLGdCQUFnQixDQUFDLENBQUM7S0FDcEQ7SUFDRCxPQUFPLGdCQUFnQixDQUFDO0FBQzFCLENBQUM7QUFFRCxrQkFBZSxlQUFlLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0U2FmZUZpbGVuYW1lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwbG9hZHMvZ2V0U2FmZUZpbGVuYW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsMEVBQXlDO0FBRXpDLG9GQUE0RDtBQUM1RCw4REFBc0M7QUFFdEMsTUFBTSxhQUFhLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRTtJQUNyQyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ3hDLE1BQU0sWUFBWSxHQUFHLElBQUEsMkJBQVEsRUFBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUM7SUFDaEYsSUFBSSxlQUFlLEdBQUcsWUFBWSxDQUFDO0lBQ25DLE1BQU0sS0FBSyxHQUFHLFlBQVksQ0FBQztJQUMzQixNQUFNLEtBQUssR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3hDLElBQUksS0FBSyxLQUFLLElBQUksRUFBRTtRQUNsQixlQUFlLElBQUksSUFBSSxDQUFDO0tBQ3pCO1NBQU07UUFDTCxNQUFNLFdBQVcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDN0IsTUFBTSxhQUFhLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQy9CLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDOUMsZUFBZSxHQUFHLEdBQUcsV0FBVyxJQUFJLFdBQVcsRUFBRSxDQUFDO0tBQ25EO0lBQ0QsT0FBTyxHQUFHLGVBQWUsSUFBSSxTQUFTLEVBQUUsQ0FBQztBQUMzQyxDQUFDLENBQUM7QUFFRixLQUFLLFVBQVUsZUFBZSxDQUFDLEtBQXNCLEVBQUUsVUFBa0IsRUFBRSxlQUF1QjtJQUNoRyxJQUFJLGdCQUFnQixHQUFHLGVBQWUsQ0FBQztJQUV2Qyw0Q0FBNEM7SUFDNUMsT0FBTyxNQUFNLElBQUEsK0JBQXFCLEVBQUMsS0FBSyxFQUFFLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQyxJQUFJLE1BQU0sSUFBQSxvQkFBVSxFQUFDLEdBQUcsVUFBVSxJQUFJLGdCQUFnQixFQUFFLENBQUMsRUFBRTtRQUNoSSxnQkFBZ0IsR0FBRyxhQUFhLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztLQUNwRDtJQUNELE9BQU8sZ0JBQWdCLENBQUM7QUFDMUIsQ0FBQztBQUVELGtCQUFlLGVBQWUsQ0FBQyJ9

package/dist/uploads/imageResizer.d.ts

@@ -12,13 +12,5 @@ declare type Args = {
     savedFilename: string;
     mimeType: string;
 };
-/**
- * @description
- * @param staticPath Path to save images
- * @param config Payload config
- * @param savedFilename
- * @param mimeType
- * @returns image sizes keyed to strings
- */
-export default function resizeAndSave({ req, file, dimensions, staticPath, config, savedFilename, mimeType, }: Args): Promise<FileSizes>;
+export default function resizeAndSave({ req, file, dimensions, staticPath, config, savedFilename, }: Args): Promise<FileSizes>;
 export {};

package/dist/uploads/imageResizer.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const sharp_1 = __importDefault(require("sharp"));
 const sanitize_filename_1 = __importDefault(require("sanitize-filename"));
+const file_type_1 = require("file-type");
 const fileExists_1 = __importDefault(require("./fileExists"));
 function getOutputImage(sourceImage, size) {
     const extension = sourceImage.split('.').pop();
-    const name = (0, sanitize_filename_1.default)(sourceImage.substr(0, sourceImage.lastIndexOf('.')) || sourceImage);
+    const name = (0, sanitize_filename_1.default)(sourceImage.substring(0, sourceImage.lastIndexOf('.')) || sourceImage);
     return {
         name,
         extension,
@@ -17,29 +18,21 @@ function getOutputImage(sourceImage, size) {
         height: size.height,
     };
 }
-/**
- * @description
- * @param staticPath Path to save images
- * @param config Payload config
- * @param savedFilename
- * @param mimeType
- * @returns image sizes keyed to strings
- */
-async function resizeAndSave({ req, file, dimensions, staticPath, config, savedFilename, mimeType, }) {
+async function resizeAndSave({ req, file, dimensions, staticPath, config, savedFilename, }) {
     const { imageSizes, disableLocalStorage } = config.upload;
     const sizes = imageSizes
-        .filter((desiredSize) => desiredSize.width <= dimensions.width || desiredSize.height <= dimensions.height)
+        .filter((desiredSize) => needsResize(desiredSize, dimensions))
         .map(async (desiredSize) => {
-        const resized = await (0, sharp_1.default)(file)
-            .resize(desiredSize.width, desiredSize.height, {
-            position: desiredSize.crop || 'centre',
-        });
+        let resized = await (0, sharp_1.default)(file).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 outputImage = getOutputImage(savedFilename, desiredSize);
-        const imageNameWithDimensions = `${outputImage.name}-${bufferObject.info.width}x${bufferObject.info.height}.${outputImage.extension}`;
+        const imageNameWithDimensions = createImageName(outputImage, bufferObject);
         const imagePath = `${staticPath}/${imageNameWithDimensions}`;
         const fileAlreadyExists = await (0, fileExists_1.default)(imagePath);
         if (fileAlreadyExists) {
@@ -54,7 +47,7 @@ async function resizeAndSave({ req, file, dimensions, staticPath, config, savedF
             height: bufferObject.info.height,
             filename: imageNameWithDimensions,
             filesize: bufferObject.info.size,
-            mimeType,
+            mimeType: (await (0, file_type_1.fromBuffer)(bufferObject.data)).mime,
         };
     });
     const savedSizes = await Promise.all(sizes);
@@ -70,4 +63,11 @@ async function resizeAndSave({ req, file, dimensions, staticPath, config, savedF
     }), {});
 }
 exports.default = resizeAndSave;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2VSZXNpemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwbG9hZHMvaW1hZ2VSZXNpemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsNENBQW9CO0FBQ3BCLGtEQUEwQjtBQUMxQiwwRUFBeUM7QUFFekMsOERBQXNDO0FBZXRDLFNBQVMsY0FBYyxDQUFDLFdBQW1CLEVBQUUsSUFBZTtJQUMxRCxNQUFNLFNBQVMsR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQy9DLE1BQU0sSUFBSSxHQUFHLElBQUEsMkJBQVEsRUFBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxXQUFXLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksV0FBVyxDQUFDLENBQUM7SUFFMUYsT0FBTztRQUNMLElBQUk7UUFDSixTQUFTO1FBQ1QsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLO1FBQ2pCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtLQUNwQixDQUFDO0FBQ0osQ0FBQztBQUVEOzs7Ozs7O0dBT0c7QUFDWSxLQUFLLFVBQVUsYUFBYSxDQUFDLEVBQzFDLEdBQUcsRUFDSCxJQUFJLEVBQ0osVUFBVSxFQUNWLFVBQVUsRUFDVixNQUFNLEVBQ04sYUFBYSxFQUNiLFFBQVEsR0FDSDtJQUNMLE1BQU0sRUFBRSxVQUFVLEVBQUUsbUJBQW1CLEVBQUUsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBRTFELE1BQU0sS0FBSyxHQUFHLFVBQVU7U0FDckIsTUFBTSxDQUFDLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxXQUFXLENBQUMsS0FBSyxJQUFJLFVBQVUsQ0FBQyxLQUFLLElBQUksV0FBVyxDQUFDLE1BQU0sSUFBSSxVQUFVLENBQUMsTUFBTSxDQUFDO1NBQ3pHLEdBQUcsQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLEVBQUU7UUFDekIsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFBLGVBQUssRUFBQyxJQUFJLENBQUM7YUFDOUIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsV0FBVyxDQUFDLE1BQU0sRUFBRTtZQUM3QyxRQUFRLEVBQUUsV0FBVyxDQUFDLElBQUksSUFBSSxRQUFRO1NBQ3ZDLENBQUMsQ0FBQztRQUVMLE1BQU0sWUFBWSxHQUFHLE1BQU0sT0FBTyxDQUFDLFFBQVEsQ0FBQztZQUMxQyxpQkFBaUIsRUFBRSxJQUFJO1NBQ3hCLENBQUMsQ0FBQztRQUVILEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLEdBQUcsWUFBWSxDQUFDLElBQUksQ0FBQztRQUU3RCxNQUFNLFdBQVcsR0FBRyxjQUFjLENBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBQy9ELE1BQU0sdUJBQXVCLEdBQUcsR0FBRyxXQUFXLENBQUMsSUFBSSxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsTUFBTSxJQUFJLFdBQVcsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUN0SSxNQUFNLFNBQVMsR0FBRyxHQUFHLFVBQVUsSUFBSSx1QkFBdUIsRUFBRSxDQUFDO1FBQzdELE1BQU0saUJBQWlCLEdBQUcsTUFBTSxJQUFBLG9CQUFVLEVBQUMsU0FBUyxDQUFDLENBQUM7UUFFdEQsSUFBSSxpQkFBaUIsRUFBRTtZQUNyQixZQUFFLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1NBQzFCO1FBRUQsSUFBSSxDQUFDLG1CQUFtQixFQUFFO1lBQ3hCLE1BQU0sT0FBTyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUNqQztRQUVELE9BQU87WUFDTCxJQUFJLEVBQUUsV0FBVyxDQUFDLElBQUk7WUFDdEIsS0FBSyxFQUFFLFlBQVksQ0FBQyxJQUFJLENBQUMsS0FBSztZQUM5QixNQUFNLEVBQUUsWUFBWSxDQUFDLElBQUksQ0FBQyxNQUFNO1lBQ2hDLFFBQVEsRUFBRSx1QkFBdUI7WUFDakMsUUFBUSxFQUFFLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSTtZQUNoQyxRQUFRO1NBQ1QsQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDO0lBRUwsTUFBTSxVQUFVLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRTVDLE9BQU8sVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQU8sRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDM0MsR0FBRyxPQUFPO1FBQ1YsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDWCxLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUs7WUFDakIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBUTtZQUN2QixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQVE7WUFDdkIsUUFBUSxFQUFFLElBQUksQ0FBQyxRQUFRO1NBQ3hCO0tBQ0YsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ1YsQ0FBQztBQTVERCxnQ0E0REMifQ==
+function createImageName(outputImage, bufferObject) {
+    return `${outputImage.name}-${bufferObject.info.width}x${bufferObject.info.height}.${outputImage.extension}`;
+}
+function needsResize(desiredSize, dimensions) {
+    return (typeof desiredSize.width === 'number' && desiredSize.width <= dimensions.width)
+        || (typeof desiredSize.height === 'number' && desiredSize.height <= dimensions.height);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2VSZXNpemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwbG9hZHMvaW1hZ2VSZXNpemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsNENBQW9CO0FBQ3BCLGtEQUEwQjtBQUMxQiwwRUFBeUM7QUFDekMseUNBQXVDO0FBRXZDLDhEQUFzQztBQXNCdEMsU0FBUyxjQUFjLENBQUMsV0FBbUIsRUFBRSxJQUFlO0lBQzFELE1BQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDL0MsTUFBTSxJQUFJLEdBQUcsSUFBQSwyQkFBUSxFQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLFdBQVcsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxXQUFXLENBQUMsQ0FBQztJQUU3RixPQUFPO1FBQ0wsSUFBSTtRQUNKLFNBQVM7UUFDVCxLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUs7UUFDakIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO0tBQ3BCLENBQUM7QUFDSixDQUFDO0FBRWMsS0FBSyxVQUFVLGFBQWEsQ0FBQyxFQUMxQyxHQUFHLEVBQ0gsSUFBSSxFQUNKLFVBQVUsRUFDVixVQUFVLEVBQ1YsTUFBTSxFQUNOLGFBQWEsR0FDUjtJQUNMLE1BQU0sRUFBRSxVQUFVLEVBQUUsbUJBQW1CLEVBQUUsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBRTFELE1BQU0sS0FBSyxHQUFHLFVBQVU7U0FDckIsTUFBTSxDQUFDLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxXQUFXLENBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1NBQzdELEdBQUcsQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLEVBQUU7UUFDekIsSUFBSSxPQUFPLEdBQUcsTUFBTSxJQUFBLGVBQUssRUFBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMs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

package/dist/uploads/types.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import express from 'express';
 import serveStatic from 'serve-static';
+import { Sharp, ResizeOptions } from 'sharp';
 export declare type FileSize = {
     filename: string;
     filesize: number;
@@ -21,10 +22,20 @@ export declare type FileData = {
     height: number;
     sizes: FileSizes;
 };
-export declare type ImageSize = {
+/**
+ * Params sent to the sharp toFormat() function
+ * @link https://sharp.pixelplumbing.com/api-output#toformat
+ */
+export declare type ImageUploadFormatOptions = {
+    format: Parameters<Sharp['toFormat']>[0];
+    options?: Parameters<Sharp['toFormat']>[1];
+};
+export declare type ImageSize = ResizeOptions & {
     name: string;
-    width: number | null;
-    height: number | null;
+    formatOptions?: ImageUploadFormatOptions;
+    /**
+     * @deprecated prefer position
+     */
     crop?: string;
 };
 export declare type GetAdminThumbnail = (args: {
@@ -39,6 +50,8 @@ export declare type IncomingUploadType = {
     mimeTypes?: string[];
     staticOptions?: serveStatic.ServeStaticOptions<express.Response<any, Record<string, any>>>;
     handlers?: any[];
+    resizeOptions?: ResizeOptions;
+    formatOptions?: ImageUploadFormatOptions;
 };
 export declare type Upload = {
     imageSizes?: ImageSize[];
@@ -49,6 +62,8 @@ export declare type Upload = {
     mimeTypes?: string[];
     staticOptions?: serveStatic.ServeStaticOptions<express.Response<any, Record<string, any>>>;
     handlers?: any[];
+    resizeOptions?: ResizeOptions;
+    formatOptions?: ImageUploadFormatOptions;
 };
 export declare type File = {
     data: Buffer;

package/dist/uploads/uploadFile.js

@@ -5,7 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const mkdirp_1 = __importDefault(require("mkdirp"));
 const path_1 = __importDefault(require("path"));
-const mime_1 = __importDefault(require("mime"));
+const sharp_1 = __importDefault(require("sharp"));
+const file_type_1 = require("file-type");
+const sanitize_filename_1 = __importDefault(require("sanitize-filename"));
 const errors_1 = require("../errors");
 const saveBufferToFile_1 = __importDefault(require("./saveBufferToFile"));
 const getSafeFilename_1 = __importDefault(require("./getSafeFilename"));
@@ -16,7 +18,7 @@ const uploadFile = async ({ config, collection: { config: collectionConfig, Mode
     let newData = data;
     if (collectionConfig.upload) {
         const fileData = {};
-        const { staticDir, imageSizes, disableLocalStorage } = collectionConfig.upload;
+        const { staticDir, imageSizes, disableLocalStorage, resizeOptions, formatOptions } = collectionConfig.upload;
         const { file } = req.files || {};
         if (throwOnMissingFile && !file) {
             throw new errors_1.MissingFile();
@@ -29,14 +31,33 @@ const uploadFile = async ({ config, collection: { config: collectionConfig, Mode
             mkdirp_1.default.sync(staticPath);
         }
         if (file) {
-            const fsSafeName = !overwriteExistingFiles ? await (0, getSafeFilename_1.default)(Model, staticPath, file.name) : file.name;
             try {
+                let fsSafeName;
+                let fileBuffer;
+                let mimeType;
+                let fileSize;
                 if (!disableLocalStorage) {
-                    await (0, saveBufferToFile_1.default)(file.data, `${staticPath}/${fsSafeName}`);
+                    let resized;
+                    if (resizeOptions) {
+                        resized = (0, sharp_1.default)(file.data).resize(resizeOptions);
+                    }
+                    if (formatOptions) {
+                        resized = (resized !== null && resized !== void 0 ? resized : (0, sharp_1.default)(file.data)).toFormat(formatOptions.format, formatOptions.options);
+                    }
+                    fileBuffer = resized ? (await resized.toBuffer()) : file.data;
+                    const { mime, ext } = await (0, file_type_1.fromBuffer)(fileBuffer);
+                    mimeType = mime;
+                    fileSize = fileBuffer.length;
+                    const baseFilename = (0, sanitize_filename_1.default)(file.name.substring(0, file.name.lastIndexOf('.')) || file.name);
+                    fsSafeName = `${baseFilename}.${ext}`;
+                    if (!overwriteExistingFiles) {
+                        fsSafeName = await (0, getSafeFilename_1.default)(Model, staticPath, fsSafeName);
+                    }
+                    await (0, saveBufferToFile_1.default)(fileBuffer, `${staticPath}/${fsSafeName}`);
                 }
-                fileData.filename = fsSafeName;
-                fileData.filesize = file.size;
-                fileData.mimeType = file.mimetype || mime_1.default.getType(fsSafeName);
+                fileData.filename = fsSafeName || (!overwriteExistingFiles ? await (0, getSafeFilename_1.default)(Model, staticPath, file.name) : file.name);
+                fileData.filesize = fileSize || file.size;
+                fileData.mimeType = mimeType || (await (0, file_type_1.fromBuffer)(file.data)).mime;
                 if ((0, isImage_1.default)(file.mimetype)) {
                     const dimensions = await (0, getImageSize_1.default)(file);
                     fileData.width = dimensions.width;
@@ -68,4 +89,4 @@ const uploadFile = async ({ config, collection: { config: collectionConfig, Mode
     return newData;
 };
 exports.default = uploadFile;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkRmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91cGxvYWRzL3VwbG9hZEZpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxvREFBNEI7QUFDNUIsZ0RBQXdCO0FBQ3hCLGdEQUF3QjtBQUd4QixzQ0FBeUQ7QUFHekQsMEVBQWtEO0FBQ2xELHdFQUFnRDtBQUNoRCxrRUFBMEM7QUFDMUMsa0VBQTJDO0FBQzNDLHdEQUFnQztBQVdoQyxNQUFNLFVBQVUsR0FBRyxLQUFLLEVBQUUsRUFDeEIsTUFBTSxFQUNOLFVBQVUsRUFBRSxFQUNWLE1BQU0sRUFBRSxnQkFBZ0IsRUFDeEIsS0FBSyxHQUNOLEVBQ0QsR0FBRyxFQUNILElBQUksRUFDSixrQkFBa0IsRUFDbEIsc0JBQXNCLEdBQ2pCLEVBQW9DLEVBQUU7SUFDM0MsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFDO0lBRW5CLElBQUksZ0JBQWdCLENBQUMsTUFBTSxFQUFFO1FBQzNCLE1BQU0sUUFBUSxHQUFzQixFQUFFLENBQUM7UUFFdkMsTUFBTSxFQUFFLFNBQVMsRUFBRSxVQUFVLEVBQUUsbUJBQW1CLEVBQUUsR0FBRyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUM7UUFFL0UsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLEdBQUcsQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO1FBRWpDLElBQUksa0JBQWtCLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDL0IsTUFBTSxJQUFJLG9CQUFXLEVBQUUsQ0FBQztTQUN6QjtRQUVELElBQUksVUFBVSxHQUFHLFNBQVMsQ0FBQztRQUUzQixJQUFJLFNBQVMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ2hDLFVBQVUsR0FBRyxjQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1NBQzlEO1FBRUQsSUFBSSxDQUFDLG1CQUFtQixFQUFFO1lBQ3hCLGdCQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1NBQ3pCO1FBRUQsSUFBSSxJQUFJLEVBQUU7WUFDUixNQUFNLFVBQVUsR0FBRyxDQUFDLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxNQUFNLElBQUEseUJBQWUsRUFBQyxLQUFLLEVBQUUsVUFBVSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztZQUU3RyxJQUFJO2dCQUNGLElBQUksQ0FBQyxtQkFBbUIsRUFBRTtvQkFDeEIsTUFBTSxJQUFBLDBCQUFnQixFQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsR0FBRyxVQUFVLElBQUksVUFBVSxFQUFFLENBQUMsQ0FBQztpQkFDbEU7Z0JBRUQsUUFBUSxDQUFDLFFBQVEsR0FBRyxVQUFVLENBQUM7Z0JBQy9CLFFBQVEsQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztnQkFDOUIsUUFBUSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxJQUFJLGNBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7Z0JBRTlELElBQUksSUFBQSxpQkFBTyxFQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRTtvQkFDMUIsTUFBTSxVQUFVLEdBQUcsTUFBTSxJQUFBLHNCQUFZLEVBQUMsSUFBSSxDQUFDLENBQUM7b0JBQzVDLFFBQVEsQ0FBQyxLQUFLLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQztvQkFDbEMsUUFBUSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDO29CQUVwQyxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsS0FBSyxlQUFlLEVBQUU7d0JBQ2xFLEdBQUcsQ0FBQyxrQkFBa0IsR0FBRyxFQUFFLENBQUM7d0JBQzVCLFFBQVEsQ0FBQyxLQUFLLEdBQUcsTUFBTSxJQUFBLHNCQUFhLEVBQUM7NEJBQ25DLEdBQUc7NEJBQ0gsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJOzRCQUNmLFVBQVU7NEJBQ1YsVUFBVTs0QkFDVixNQUFNLEVBQUUsZ0JBQWdCOzRCQUN4QixhQUFhLEVBQUUsVUFBVTs0QkFDekIsUUFBUSxFQUFFLFFBQVEsQ0FBQyxRQUFRO3lCQUM1QixDQUFDLENBQUM7cUJBQ0o7aUJBQ0Y7YUFDRjtZQUFDLE9BQU8sR0FBRyxFQUFFO2dCQUNaLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ25CLE1BQU0sSUFBSSx3QkFBZSxFQUFFLENBQUM7YUFDN0I7WUFFRCxPQUFPLEdBQUc7Z0JBQ1IsR0FBRyxPQUFPO2dCQUNWLEdBQUcsUUFBUTthQUNaLENBQUM7U0FDSDtLQUNGO0lBRUQsT0FBTyxPQUFPLENBQUM7QUFDakIsQ0FBQyxDQUFDO0FBRUYsa0JBQWUsVUFBVSxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkRmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91cGxvYWRzL3VwbG9hZEZpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxvREFBNEI7QUFDNUIsZ0RBQXdCO0FBQ3hCLGtEQUFxQztBQUNyQyx5Q0FBdUM7QUFDdkMsMEVBQXlDO0FBR3pDLHNDQUF5RDtBQUd6RCwwRUFBa0Q7QUFDbEQsd0VBQWdEO0FBQ2hELGtFQUEwQztBQUMxQyxrRUFBMkM7QUFDM0Msd0RBQWdDO0FBV2hDLE1BQU0sVUFBVSxHQUFHLEtBQUssRUFBRSxFQUN4QixNQUFNLEVBQ04sVUFBVSxFQUFFLEVBQ1YsTUFBTSxFQUFFLGdCQUFnQixFQUN4QixLQUFLLEdBQ04sRUFDRCxHQUFHLEVBQ0gsSUFBSSxFQUNKLGtCQUFrQixFQUNsQixzQkFBc0IsR0FDakIsRUFBb0MsRUFBRTtJQUMzQyxJQUFJLE9BQU8sR0FBRyxJQUFJLENBQUM7SUFFbkIsSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUU7UUFDM0IsTUFBTSxRQUFRLEdBQXNCLEVBQUUsQ0FBQztRQUV2QyxNQUFNLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxtQkFBbUIsRUFBRSxhQUFhLEVBQUUsYUFBYSxFQUFFLEdBQUcsZ0JBQWdCLENBQUMsTUFBTSxDQUFDO1FBRTdHLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxHQUFHLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUVqQyxJQUFJLGtCQUFrQixJQUFJLENBQUMsSUFBSSxFQUFFO1lBQy9CLE1BQU0sSUFBSSxvQkFBVyxFQUFFLENBQUM7U0FDekI7UUFFRCxJQUFJLFVBQVUsR0FBRyxTQUFTLENBQUM7UUFFM0IsSUFBSSxTQUFTLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNoQyxVQUFVLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMs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

package/dist/utilities/flattenTopLevelFields.js

@@ -21,7 +21,7 @@ const flattenFields = (fields, keepPresentationalFields) => {
                 ...field.tabs.reduce((tabFields, tab) => {
                     return [
                         ...tabFields,
-                        ...flattenFields(tab.fields, keepPresentationalFields),
+                        ...((0, types_1.tabHasName)(tab) ? [tab] : flattenFields(tab.fields, keepPresentationalFields)),
                     ];
                 }, []),
             ];
@@ -30,4 +30,4 @@ const flattenFields = (fields, keepPresentationalFields) => {
     }, []);
 };
 exports.default = flattenFields;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmxhdHRlblRvcExldmVsRmllbGRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxpdGllcy9mbGF0dGVuVG9wTGV2ZWxGaWVsZHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxrREFBNEo7QUFFNUosTUFBTSxhQUFhLEdBQUcsQ0FBQyxNQUFlLEVBQUUsd0JBQWtDLEVBQW9ELEVBQUU7SUFDOUgsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsV0FBVyxFQUFFLEtBQUssRUFBRSxFQUFFO1FBQzFDLElBQUksSUFBQSx3QkFBZ0IsRUFBQyxLQUFLLENBQUMsSUFBSSxDQUFDLHdCQUF3QixJQUFJLElBQUEsaUNBQXlCLEVBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtZQUM3RixPQUFPO2dCQUNMLEdBQUcsV0FBVztnQkFDZCxLQUFLO2FBQ04sQ0FBQztTQUNIO1FBRUQsSUFBSSxJQUFBLHlCQUFpQixFQUFDLEtBQUssQ0FBQyxFQUFFO1lBQzVCLE9BQU87Z0JBQ0wsR0FBRyxXQUFXO2dCQUNkLEdBQUcsYUFBYSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsd0JBQXdCLENBQUM7YUFDekQsQ0FBQztTQUNIO1FBRUQsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLE1BQU0sRUFBRTtZQUN6QixPQUFPO2dCQUNMLEdBQUcsV0FBVztnQkFDZCxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsU0FBUyxFQUFFLEdBQUcsRUFBRSxFQUFFO29CQUN0QyxPQUFPO3dCQUNMLEdBQUcsU0FBUzt3QkFDWixHQUFHLGFBQWEsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLHdCQUF3QixDQUFDO3FCQUN2RCxDQUFDO2dCQUNKLENBQUMsRUFBRSxFQUFFLENBQUM7YUFDUCxDQUFDO1NBQ0g7UUFFRCxPQUFPLFdBQVcsQ0FBQztJQUNyQixDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7QUFDVCxDQUFDLENBQUM7QUFFRixrQkFBZSxhQUFhLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmxhdHRlblRvcExldmVsRmllbGRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxpdGllcy9mbGF0dGVuVG9wTGV2ZWxGaWVsZHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxrREFRZ0M7QUFFaEMsTUFBTSxhQUFhLEdBQUcsQ0FBQyxNQUFlLEVBQUUsd0JBQWtDLEVBQW9ELEVBQUU7SUFDOUgsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsV0FBVyxFQUFFLEtBQUssRUFBRSxFQUFFO1FBQzFDLElBQUksSUFBQSx3QkFBZ0IsRUFBQyxLQUFLLENBQUMsSUFBSSxDQUFDLHdCQUF3QixJQUFJLElBQUEsaUNBQXlCLEVBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtZQUM3RixPQUFPO2dCQUNMLEdBQUcsV0FBVztnQkFDZCxLQUFLO2FBQ04sQ0FBQztTQUNIO1FBRUQsSUFBSSxJQUFBLHlCQUFpQixFQUFDLEtBQUssQ0FBQyxFQUFFO1lBQzVCLE9BQU87Z0JBQ0wsR0FBRyxXQUFXO2dCQUNkLEdBQUcsYUFBYSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsd0JBQXdCLENBQUM7YUFDekQsQ0FBQztTQUNIO1FBRUQsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLE1BQU0sRUFBRTtZQUN6QixPQUFPO2dCQUNMLEdBQUcsV0FBVztnQkFDZCxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsU0FBUyxFQUFFLEdBQUcsRUFBRSxFQUFFO29CQUN0QyxPQUFPO3dCQUNMLEdBQUcsU0FBUzt3QkFDWixHQUFHLENBQUMsSUFBQSxrQkFBVSxFQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO3FCQUNuRixDQUFDO2dCQUNKLENBQUMsRUFBRSxFQUFFLENBQUM7YUFDUCxDQUFDO1NBQ0g7UUFFRCxPQUFPLFdBQVcsQ0FBQztJQUNyQixDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7QUFDVCxDQUFDLENBQUM7QUFFRixrQkFBZSxhQUFhLENBQUMifQ==

package/dist/utilities/groupOrTabHasRequiredSubfield.d.ts

@@ -0,0 +1,2 @@
+import { Field, Tab } from '../fields/config/types';
+export declare const groupOrTabHasRequiredSubfield: (entity: Field | Tab) => boolean;

package/dist/utilities/groupOrTabHasRequiredSubfield.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.groupOrTabHasRequiredSubfield = void 0;
+const types_1 = require("../fields/config/types");
+const groupOrTabHasRequiredSubfield = (entity) => {
+    if ('type' in entity && entity.type === 'group') {
+        return entity.fields.some((subField) => {
+            return ((0, types_1.fieldAffectsData)(subField) && subField.required) || (0, exports.groupOrTabHasRequiredSubfield)(subField);
+        });
+    }
+    if ('fields' in entity && 'name' in entity) {
+        return entity.fields.some((subField) => (0, exports.groupOrTabHasRequiredSubfield)(subField));
+    }
+    return false;
+};
+exports.groupOrTabHasRequiredSubfield = groupOrTabHasRequiredSubfield;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3JvdXBPclRhYkhhc1JlcXVpcmVkU3ViZmllbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbGl0aWVzL2dyb3VwT3JUYWJIYXNSZXF1aXJlZFN1YmZpZWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGtEQUFzRTtBQUUvRCxNQUFNLDZCQUE2QixHQUFHLENBQUMsTUFBbUIsRUFBVyxFQUFFO0lBQzVFLElBQUksTUFBTSxJQUFJLE1BQU0sSUFBSSxNQUFNLENBQUMsSUFBSSxLQUFLLE9BQU8sRUFBRTtRQUMvQyxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUU7WUFDckMsT0FBTyxDQUFDLElBQUEsd0JBQWdCLEVBQUMsUUFBUSxDQUFDLElBQUksUUFBUSxDQUFDLFFBQVEsQ0FBQyxJQUFJLElBQUEscUNBQTZCLEVBQUMsUUFBUSxDQUFDLENBQUM7UUFDdEcsQ0FBQyxDQUFDLENBQUM7S0FDSjtJQUVELElBQUksUUFBUSxJQUFJLE1BQU0sSUFBSSxNQUFNLElBQUksTUFBTSxFQUFFO1FBQzFDLE9BQVEsTUFBYyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLElBQUEscUNBQTZCLEVBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztLQUMzRjtJQUVELE9BQU8sS0FBSyxDQUFDO0FBQ2YsQ0FBQyxDQUFDO0FBWlcsUUFBQSw2QkFBNkIsaUNBWXhDIn0=

package/dist/utilities/logger.js

@@ -3,12 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const falsey_1 = __importDefault(require("falsey"));
 const pino_1 = __importDefault(require("pino"));
 const micro_memoize_1 = __importDefault(require("micro-memoize"));
 exports.default = (0, micro_memoize_1.default)((name = 'payload', options) => (0, pino_1.default)({
     name,
-    enabled: (0, falsey_1.default)(process.env.DISABLE_LOGGING),
+    enabled: process.env.DISABLE_LOGGING !== 'true',
     ...(options
         ? { options }
         : {
@@ -18,4 +17,4 @@ exports.default = (0, micro_memoize_1.default)((name = 'payload', options) => (0
             },
         }),
 }));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxpdGllcy9sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxvREFBNEI7QUFDNUIsZ0RBQXdCO0FBQ3hCLGtFQUFvQztBQUlwQyxrQkFBZSxJQUFBLHVCQUFPLEVBQ3BCLENBQUMsSUFBSSxHQUFHLFNBQVMsRUFBRSxPQUE0QixFQUFFLEVBQUUsQ0FBQyxJQUFBLGNBQUksRUFBQztJQUN2RCxJQUFJO0lBQ0osT0FBTyxFQUFFLElBQUEsZ0JBQU0sRUFBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQztJQUM1QyxHQUFHLENBQUMsT0FBTztRQUNULENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRTtRQUNiLENBQUMsQ0FBQztZQUNBLFdBQVcsRUFBRTtnQkFDWCxNQUFNLEVBQUUsY0FBYztnQkFDdEIsYUFBYSxFQUFFLFVBQVU7YUFDMUI7U0FDRixDQUFDO0NBQ0wsQ0FBa0IsQ0FDcEIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxpdGllcy9sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxnREFBd0I7QUFDeEIsa0VBQW9DO0FBSXBDLGtCQUFlLElBQUEsdUJBQU8sRUFDcEIsQ0FBQyxJQUFJLEdBQUcsU0FBUyxFQUFFLE9BQTRCLEVBQUUsRUFBRSxDQUFDLElBQUEsY0FBSSxFQUFDO0lBQ3ZELElBQUk7SUFDSixPQUFPLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEtBQUssTUFBTTtJQUMvQyxHQUFHLENBQUMsT0FBTztRQUNULENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRTtRQUNiLENBQUMsQ0FBQztZQUNBLFdBQVcsRUFBRTtnQkFDWCxNQUFNLEVBQUUsY0FBYztnQkFDdEIsYUFBYSxFQUFFLFVBQVU7YUFDMUI7U0FDRixDQUFDO0NBQ0wsQ0FBa0IsQ0FDcEIsQ0FBQyJ9

package/dist/utilities/wordBoundariesRegex.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = (input) => {
     const words = input.split(' ');
     // Regex word boundaries that work for cyrillic characters - https://stackoverflow.com/a/47062016/1717697
-    const wordBoundaryBefore = '(?:(?<=[^\\p{L}\\p{N}])|^)';
+    const wordBoundaryBefore = '(?:(?:[^\\p{L}\\p{N}])|^)'; // Converted to a non-matching group instead of positive lookbehind for Safari
     const wordBoundaryAfter = '(?=[^\\p{L}\\p{N}]|$)';
     const regex = words.reduce((pattern, word, i) => {
         return `${pattern}(?=.*${wordBoundaryBefore}${word}.*${wordBoundaryAfter})${i + 1 === words.length ? '.+' : ''}`;
     }, '');
     return new RegExp(regex, 'i');
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29yZEJvdW5kYXJpZXNSZWdleC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvd29yZEJvdW5kYXJpZXNSZWdleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGtCQUFlLENBQUMsS0FBYSxFQUFVLEVBQUU7SUFDdkMsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUUvQix5R0FBeUc7SUFDekcsTUFBTSxrQkFBa0IsR0FBRyw0QkFBNEIsQ0FBQztJQUN4RCxNQUFNLGlCQUFpQixHQUFHLHVCQUF1QixDQUFDO0lBRWxELE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQzlDLE9BQU8sR0FBRyxPQUFPLFFBQVEsa0JBQWtCLEdBQUcsSUFBSSxLQUFLLGlCQUFpQixJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUNuSCxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDUCxPQUFPLElBQUksTUFBTSxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztBQUNoQyxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29yZEJvdW5kYXJpZXNSZWdleC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvd29yZEJvdW5kYXJpZXNSZWdleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGtCQUFlLENBQUMsS0FBYSxFQUFVLEVBQUU7SUFDdkMsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUUvQix5R0FBeUc7SUFDekcsTUFBTSxrQkFBa0IsR0FBRywyQkFBMkIsQ0FBQyxDQUFDLDhFQUE4RTtJQUN0SSxNQUFNLGlCQUFpQixHQUFHLHVCQUF1QixDQUFDO0lBRWxELE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQzlDLE9BQU8sR0FBRyxPQUFPLFFBQVEsa0JBQWtCLEdBQUcsSUFBSSxLQUFLLGlCQUFpQixJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUNuSCxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDUCxPQUFPLElBQUksTUFBTSxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztBQUNoQyxDQUFDLENBQUMifQ==

package/docs/admin/overview.mdx

@@ -30,7 +30,8 @@ All options for the Admin panel are defined in your base Payload config file.
 | `indexHTML`          | Optionally replace the entirety of the `index.html` file used by the Admin panel. Reference the [base index.html file](https://github.com/payloadcms/payload/blob/master/src/admin/index.html) to ensure your replacement has the appropriate HTML elements. |
 | `css`                | Absolute path to a stylesheet that you can use to override / customize the Admin panel styling. [More](/docs/admin/customizing-css). |
 | `scss`               | Absolute path to a Sass variables / mixins stylesheet meant to override Payload styles to make for an easy re-skinning of the Admin panel. [More](/docs/admin/customizing-css#overriding-scss-variables). |
-| `dateFormat`         | Global date format that will be used for all dates in the Admin panel. Any valid [date-fns](https://date-fns.org/) format pattern can be used.
+| `dateFormat`         | Global date format that will be used for all dates in the Admin panel. Any valid [date-fns](https://date-fns.org/) format pattern can be used. |
+| `avatar`             | Set account profile picture. Options: `gravatar`, `default` or a custom React component. |
 | `components`         | Component overrides that affect the entirety of the Admin panel. [More](/docs/admin/components) |
 | `webpack`            | Customize the Webpack config that's used to generate the Admin panel. [More](/docs/admin/webpack) |