@strapi/upload 5.56.0 → 5.58.0

package/dist/server/controllers/content-api.js

@@ -11,7 +11,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var ___default = /*#__PURE__*/_interopDefault(_);
 
-const { ValidationError } = utils.errors;
+const { ValidationError, NotFoundError } = utils.errors;
 var contentApi = (({ strapi })=>{
     const sanitizeOutput = async (data, ctx)=>{
         const schema = strapi.getModel(constants.FILE_MODEL_UID);
@@ -36,6 +36,21 @@ var contentApi = (({ strapi })=>{
             route
         });
     };
+    // Files can be addressed by numeric id or documentId (1:1, files have no draft & publish)
+    const resolveFileId = async (id)=>{
+        if (/^\d+$/.test(String(id))) {
+            return id;
+        }
+        const file = await strapi.db.query(constants.FILE_MODEL_UID).findOne({
+            where: {
+                documentId: id
+            },
+            select: [
+                'id'
+            ]
+        });
+        return file?.id;
+    };
     return {
         async find (ctx) {
             await validateQuery(ctx.query, ctx);
@@ -57,10 +72,10 @@ var contentApi = (({ strapi })=>{
             };
         },
         async findOne (ctx) {
-            const { params: { id } } = ctx;
             await validateQuery(ctx.query, ctx);
             const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);
-            const file = await index.getService('upload').findOne(id, sanitizedQuery.populate);
+            const id = await resolveFileId(ctx.params.id);
+            const file = id ? await index.getService('upload').findOne(id, sanitizedQuery.populate) : null;
             if (!file) {
                 return ctx.notFound('file.notFound');
             }
@@ -68,8 +83,8 @@ var contentApi = (({ strapi })=>{
             ctx.body = await sanitizeOutput(signedFile, ctx);
         },
         async destroy (ctx) {
-            const { params: { id } } = ctx;
-            const file = await index.getService('upload').findOne(id);
+            const id = await resolveFileId(ctx.params.id);
+            const file = id ? await index.getService('upload').findOne(id) : null;
             if (!file) {
                 return ctx.notFound('file.notFound');
             }
@@ -83,7 +98,11 @@ var contentApi = (({ strapi })=>{
             if (!id || typeof id !== 'string' && typeof id !== 'number') {
                 throw new ValidationError('File id is required and must be a single value');
             }
-            const result = await index.getService('upload').updateFileInfo(id, data.fileInfo);
+            const fileId = await resolveFileId(id);
+            if (!fileId) {
+                throw new NotFoundError();
+            }
+            const result = await index.getService('upload').updateFileInfo(fileId, data.fileInfo);
             const signedResult = await index.getService('file').signFileUrls(result);
             ctx.body = await sanitizeOutput(signedResult, ctx);
         },
@@ -101,8 +120,12 @@ var contentApi = (({ strapi })=>{
             if (!id || typeof id !== 'string' && typeof id !== 'number') {
                 throw new ValidationError('File id is required and must be a single value');
             }
+            const fileId = await resolveFileId(id);
+            if (!fileId) {
+                throw new NotFoundError();
+            }
             const data = await upload.validateUploadBody(filteredBody);
-            const replacedFiles = await index.getService('upload').replace(id, {
+            const replacedFiles = await index.getService('upload').replace(fileId, {
                 data,
                 file: validFiles[0]
             });

package/dist/server/controllers/content-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"content-api.js","sources":["../../../server/src/controllers/content-api.ts"],"sourcesContent":["import _ from 'lodash';\nimport { async, errors } from '@strapi/utils';\n\nimport type { Context } from 'koa';\nimport type { Core } from '@strapi/types';\n\nimport { getService } from '../utils';\nimport { FILE_MODEL_UID } from '../constants';\nimport { validateUploadBody } from './validation/content-api/upload';\nimport { FileInfo } from '../types';\nimport { prepareUploadRequest } from '../utils/mime-validation';\n\nconst { ValidationError } = errors;\n\nexport default ({ strapi }: { strapi: Core.Strapi }) => {\n  const sanitizeOutput = async (data: unknown | unknown[], ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth } = ctx.state;\n\n    return strapi.contentAPI.sanitize.output(data, schema, { auth });\n  };\n\n  const validateQuery = async (data: Record<string, unknown>, ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth, route } = ctx.state;\n\n    return strapi.contentAPI.validate.query(data, schema, { auth, route });\n  };\n\n  const sanitizeQuery = async (data: Record<string, unknown>, ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth, route } = ctx.state;\n\n    return strapi.contentAPI.sanitize.query(data, schema, { auth, route });\n  };\n\n  return {\n    async find(ctx: Context) {\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const files = await getService('upload').findMany(sanitizedQuery);\n\n      const signedFiles = await async.map(files, getService('file').signFileUrls);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n    },\n\n    async findPage(ctx: Context) {\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const { results, pagination } = await getService('upload').findAndCountPage(sanitizedQuery);\n\n      const data = await sanitizeOutput(results, ctx);\n\n      ctx.body = { data, meta: { pagination } };\n    },\n\n    async findOne(ctx: Context) {\n      const {\n        params: { id },\n      } = ctx;\n\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const file = await getService('upload').findOne(id, sanitizedQuery.populate!);\n\n      if (!file) {\n        return ctx.notFound('file.notFound');\n      }\n\n      const signedFile = await getService('file').signFileUrls(file);\n\n      ctx.body = await sanitizeOutput(signedFile, ctx);\n    },\n\n    async destroy(ctx: Context) {\n      const {\n        params: { id },\n      } = ctx;\n\n      const file = await getService('upload').findOne(id);\n\n      if (!file) {\n        return ctx.notFound('file.notFound');\n      }\n\n      await getService('upload').remove(file);\n\n      const signedFile = await getService('file').signFileUrls(file);\n\n      ctx.body = await sanitizeOutput(signedFile, ctx);\n    },\n\n    async updateFileInfo(ctx: Context) {\n      const {\n        query: { id },\n        request: { body },\n      } = ctx;\n      const data = await validateUploadBody(body);\n\n      if (!id || (typeof id !== 'string' && typeof id !== 'number')) {\n        throw new ValidationError('File id is required and must be a single value');\n      }\n\n      const result = await getService('upload').updateFileInfo(id, data.fileInfo as any);\n\n      const signedResult = await getService('file').signFileUrls(result);\n\n      ctx.body = await sanitizeOutput(signedResult, ctx);\n    },\n\n    async replaceFile(ctx: Context) {\n      const {\n        query: { id },\n        request: { body, files: { files: filesInput } = {} },\n      } = ctx;\n\n      // cannot replace with more than one file\n      if (Array.isArray(filesInput) && filesInput.length > 1) {\n        throw new ValidationError('Cannot replace a file with multiple ones');\n      }\n\n      const files = Array.isArray(filesInput) ? filesInput[0] : filesInput;\n\n      const {\n        validFiles,\n        filteredBody,\n        errors: validationErrors,\n      } = await prepareUploadRequest(files, body, strapi);\n      if (validFiles.length === 0) {\n        throw new errors.ValidationError(validationErrors[0].message);\n      }\n\n      if (!id || (typeof id !== 'string' && typeof id !== 'number')) {\n        throw new ValidationError('File id is required and must be a single value');\n      }\n\n      const data = (await validateUploadBody(filteredBody)) as { fileInfo: FileInfo };\n\n      const replacedFiles = await getService('upload').replace(id, { data, file: validFiles[0] });\n\n      const signedFiles = await getService('file').signFileUrls(replacedFiles);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n    },\n\n    async uploadFiles(ctx: Context) {\n      const {\n        request: { body, files: { files: filesInput } = {} },\n      } = ctx;\n\n      const {\n        validFiles,\n        filteredBody,\n        errors: validationErrors,\n      } = await prepareUploadRequest(filesInput, body, strapi);\n      if (validFiles.length === 0) {\n        throw new errors.ValidationError(validationErrors[0].message);\n      }\n\n      const isMultipleFiles = validFiles.length > 1;\n      const data: any = await validateUploadBody(filteredBody, isMultipleFiles);\n\n      const apiUploadFolderService = getService('api-upload-folder');\n\n      const apiUploadFolder = await apiUploadFolderService.getAPIUploadFolder();\n\n      if (isMultipleFiles) {\n        data.fileInfo = data.fileInfo || [];\n        data.fileInfo = validFiles.map((_f, i) => ({\n          ...data.fileInfo[i],\n          folder: apiUploadFolder.id,\n        }));\n      } else {\n        data.fileInfo = { ...data.fileInfo, folder: apiUploadFolder.id };\n      }\n\n      const uploadedFiles = await getService('upload').upload({\n        data,\n        files: validFiles,\n      });\n\n      const signedFiles = await async.map(uploadedFiles as any[], getService('file').signFileUrls);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n      ctx.status = 201;\n    },\n\n    // TODO: split into multiple endpoints\n    async upload(ctx: Context) {\n      const {\n        query: { id },\n        request: { files: { files } = {} },\n      } = ctx;\n\n      if (_.isEmpty(files) || (!Array.isArray(files) && files.size === 0)) {\n        if (id) {\n          return this.updateFileInfo(ctx);\n        }\n\n        throw new ValidationError('Files are empty');\n      }\n\n      await (id ? this.replaceFile : this.uploadFiles)(ctx);\n    },\n  };\n};\n"],"names":["ValidationError","errors","strapi","sanitizeOutput","data","ctx","schema","getModel","FILE_MODEL_UID","auth","state","contentAPI","sanitize","output","validateQuery","route","validate","query","sanitizeQuery","find","sanitizedQuery","files","getService","findMany","signedFiles","async","map","signFileUrls","body","findPage","results","pagination","findAndCountPage","meta","findOne","params","id","file","populate","notFound","signedFile","destroy","remove","updateFileInfo","request","validateUploadBody","result","fileInfo","signedResult","replaceFile","filesInput","Array","isArray","length","validFiles","filteredBody","validationErrors","prepareUploadRequest","message","replacedFiles","replace","uploadFiles","isMultipleFiles","apiUploadFolderService","apiUploadFolder","getAPIUploadFolder","_f","i","folder","uploadedFiles","upload","status","_","isEmpty","size"],"mappings":"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"}
+{"version":3,"file":"content-api.js","sources":["../../../server/src/controllers/content-api.ts"],"sourcesContent":["import _ from 'lodash';\nimport { async, errors } from '@strapi/utils';\n\nimport type { Context } from 'koa';\nimport type { Core } from '@strapi/types';\n\nimport { getService } from '../utils';\nimport { FILE_MODEL_UID } from '../constants';\nimport { validateUploadBody } from './validation/content-api/upload';\nimport { FileInfo } from '../types';\nimport { prepareUploadRequest } from '../utils/mime-validation';\n\nconst { ValidationError, NotFoundError } = errors;\n\nexport default ({ strapi }: { strapi: Core.Strapi }) => {\n  const sanitizeOutput = async (data: unknown | unknown[], ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth } = ctx.state;\n\n    return strapi.contentAPI.sanitize.output(data, schema, { auth });\n  };\n\n  const validateQuery = async (data: Record<string, unknown>, ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth, route } = ctx.state;\n\n    return strapi.contentAPI.validate.query(data, schema, { auth, route });\n  };\n\n  const sanitizeQuery = async (data: Record<string, unknown>, ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth, route } = ctx.state;\n\n    return strapi.contentAPI.sanitize.query(data, schema, { auth, route });\n  };\n\n  // Files can be addressed by numeric id or documentId (1:1, files have no draft & publish)\n  const resolveFileId = async (id: string | number) => {\n    if (/^\\d+$/.test(String(id))) {\n      return id;\n    }\n\n    const file = await strapi.db\n      .query(FILE_MODEL_UID)\n      .findOne({ where: { documentId: id }, select: ['id'] });\n\n    return file?.id;\n  };\n\n  return {\n    async find(ctx: Context) {\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const files = await getService('upload').findMany(sanitizedQuery);\n\n      const signedFiles = await async.map(files, getService('file').signFileUrls);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n    },\n\n    async findPage(ctx: Context) {\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const { results, pagination } = await getService('upload').findAndCountPage(sanitizedQuery);\n\n      const data = await sanitizeOutput(results, ctx);\n\n      ctx.body = { data, meta: { pagination } };\n    },\n\n    async findOne(ctx: Context) {\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const id = await resolveFileId(ctx.params.id);\n      const file = id ? await getService('upload').findOne(id, sanitizedQuery.populate!) : null;\n\n      if (!file) {\n        return ctx.notFound('file.notFound');\n      }\n\n      const signedFile = await getService('file').signFileUrls(file);\n\n      ctx.body = await sanitizeOutput(signedFile, ctx);\n    },\n\n    async destroy(ctx: Context) {\n      const id = await resolveFileId(ctx.params.id);\n      const file = id ? await getService('upload').findOne(id) : null;\n\n      if (!file) {\n        return ctx.notFound('file.notFound');\n      }\n\n      await getService('upload').remove(file);\n\n      const signedFile = await getService('file').signFileUrls(file);\n\n      ctx.body = await sanitizeOutput(signedFile, ctx);\n    },\n\n    async updateFileInfo(ctx: Context) {\n      const {\n        query: { id },\n        request: { body },\n      } = ctx;\n      const data = await validateUploadBody(body);\n\n      if (!id || (typeof id !== 'string' && typeof id !== 'number')) {\n        throw new ValidationError('File id is required and must be a single value');\n      }\n\n      const fileId = await resolveFileId(id);\n\n      if (!fileId) {\n        throw new NotFoundError();\n      }\n\n      const result = await getService('upload').updateFileInfo(fileId, data.fileInfo as any);\n\n      const signedResult = await getService('file').signFileUrls(result);\n\n      ctx.body = await sanitizeOutput(signedResult, ctx);\n    },\n\n    async replaceFile(ctx: Context) {\n      const {\n        query: { id },\n        request: { body, files: { files: filesInput } = {} },\n      } = ctx;\n\n      // cannot replace with more than one file\n      if (Array.isArray(filesInput) && filesInput.length > 1) {\n        throw new ValidationError('Cannot replace a file with multiple ones');\n      }\n\n      const files = Array.isArray(filesInput) ? filesInput[0] : filesInput;\n\n      const {\n        validFiles,\n        filteredBody,\n        errors: validationErrors,\n      } = await prepareUploadRequest(files, body, strapi);\n      if (validFiles.length === 0) {\n        throw new errors.ValidationError(validationErrors[0].message);\n      }\n\n      if (!id || (typeof id !== 'string' && typeof id !== 'number')) {\n        throw new ValidationError('File id is required and must be a single value');\n      }\n\n      const fileId = await resolveFileId(id);\n\n      if (!fileId) {\n        throw new NotFoundError();\n      }\n\n      const data = (await validateUploadBody(filteredBody)) as { fileInfo: FileInfo };\n\n      const replacedFiles = await getService('upload').replace(fileId, {\n        data,\n        file: validFiles[0],\n      });\n\n      const signedFiles = await getService('file').signFileUrls(replacedFiles);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n    },\n\n    async uploadFiles(ctx: Context) {\n      const {\n        request: { body, files: { files: filesInput } = {} },\n      } = ctx;\n\n      const {\n        validFiles,\n        filteredBody,\n        errors: validationErrors,\n      } = await prepareUploadRequest(filesInput, body, strapi);\n      if (validFiles.length === 0) {\n        throw new errors.ValidationError(validationErrors[0].message);\n      }\n\n      const isMultipleFiles = validFiles.length > 1;\n      const data: any = await validateUploadBody(filteredBody, isMultipleFiles);\n\n      const apiUploadFolderService = getService('api-upload-folder');\n\n      const apiUploadFolder = await apiUploadFolderService.getAPIUploadFolder();\n\n      if (isMultipleFiles) {\n        data.fileInfo = data.fileInfo || [];\n        data.fileInfo = validFiles.map((_f, i) => ({\n          ...data.fileInfo[i],\n          folder: apiUploadFolder.id,\n        }));\n      } else {\n        data.fileInfo = { ...data.fileInfo, folder: apiUploadFolder.id };\n      }\n\n      const uploadedFiles = await getService('upload').upload({\n        data,\n        files: validFiles,\n      });\n\n      const signedFiles = await async.map(uploadedFiles as any[], getService('file').signFileUrls);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n      ctx.status = 201;\n    },\n\n    // TODO: split into multiple endpoints\n    async upload(ctx: Context) {\n      const {\n        query: { id },\n        request: { files: { files } = {} },\n      } = ctx;\n\n      if (_.isEmpty(files) || (!Array.isArray(files) && files.size === 0)) {\n        if (id) {\n          return this.updateFileInfo(ctx);\n        }\n\n        throw new ValidationError('Files are empty');\n      }\n\n      await (id ? this.replaceFile : this.uploadFiles)(ctx);\n    },\n  };\n};\n"],"names":["ValidationError","NotFoundError","errors","strapi","sanitizeOutput","data","ctx","schema","getModel","FILE_MODEL_UID","auth","state","contentAPI","sanitize","output","validateQuery","route","validate","query","sanitizeQuery","resolveFileId","id","test","String","file","db","findOne","where","documentId","select","find","sanitizedQuery","files","getService","findMany","signedFiles","async","map","signFileUrls","body","findPage","results","pagination","findAndCountPage","meta","params","populate","notFound","signedFile","destroy","remove","updateFileInfo","request","validateUploadBody","fileId","result","fileInfo","signedResult","replaceFile","filesInput","Array","isArray","length","validFiles","filteredBody","validationErrors","prepareUploadRequest","message","replacedFiles","replace","uploadFiles","isMultipleFiles","apiUploadFolderService","apiUploadFolder","getAPIUploadFolder","_f","i","folder","uploadedFiles","upload","status","_","isEmpty","size"],"mappings":"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"}

package/dist/server/controllers/content-api.mjs

@@ -5,7 +5,7 @@ import { FILE_MODEL_UID } from '../constants.mjs';
 import { validateUploadBody } from './validation/content-api/upload.mjs';
 import { prepareUploadRequest } from '../utils/mime-validation.mjs';
 
-const { ValidationError } = errors;
+const { ValidationError, NotFoundError } = errors;
 var contentApi = (({ strapi })=>{
     const sanitizeOutput = async (data, ctx)=>{
         const schema = strapi.getModel(FILE_MODEL_UID);
@@ -30,6 +30,21 @@ var contentApi = (({ strapi })=>{
             route
         });
     };
+    // Files can be addressed by numeric id or documentId (1:1, files have no draft & publish)
+    const resolveFileId = async (id)=>{
+        if (/^\d+$/.test(String(id))) {
+            return id;
+        }
+        const file = await strapi.db.query(FILE_MODEL_UID).findOne({
+            where: {
+                documentId: id
+            },
+            select: [
+                'id'
+            ]
+        });
+        return file?.id;
+    };
     return {
         async find (ctx) {
             await validateQuery(ctx.query, ctx);
@@ -51,10 +66,10 @@ var contentApi = (({ strapi })=>{
             };
         },
         async findOne (ctx) {
-            const { params: { id } } = ctx;
             await validateQuery(ctx.query, ctx);
             const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);
-            const file = await getService('upload').findOne(id, sanitizedQuery.populate);
+            const id = await resolveFileId(ctx.params.id);
+            const file = id ? await getService('upload').findOne(id, sanitizedQuery.populate) : null;
             if (!file) {
                 return ctx.notFound('file.notFound');
             }
@@ -62,8 +77,8 @@ var contentApi = (({ strapi })=>{
             ctx.body = await sanitizeOutput(signedFile, ctx);
         },
         async destroy (ctx) {
-            const { params: { id } } = ctx;
-            const file = await getService('upload').findOne(id);
+            const id = await resolveFileId(ctx.params.id);
+            const file = id ? await getService('upload').findOne(id) : null;
             if (!file) {
                 return ctx.notFound('file.notFound');
             }
@@ -77,7 +92,11 @@ var contentApi = (({ strapi })=>{
             if (!id || typeof id !== 'string' && typeof id !== 'number') {
                 throw new ValidationError('File id is required and must be a single value');
             }
-            const result = await getService('upload').updateFileInfo(id, data.fileInfo);
+            const fileId = await resolveFileId(id);
+            if (!fileId) {
+                throw new NotFoundError();
+            }
+            const result = await getService('upload').updateFileInfo(fileId, data.fileInfo);
             const signedResult = await getService('file').signFileUrls(result);
             ctx.body = await sanitizeOutput(signedResult, ctx);
         },
@@ -95,8 +114,12 @@ var contentApi = (({ strapi })=>{
             if (!id || typeof id !== 'string' && typeof id !== 'number') {
                 throw new ValidationError('File id is required and must be a single value');
             }
+            const fileId = await resolveFileId(id);
+            if (!fileId) {
+                throw new NotFoundError();
+            }
             const data = await validateUploadBody(filteredBody);
-            const replacedFiles = await getService('upload').replace(id, {
+            const replacedFiles = await getService('upload').replace(fileId, {
                 data,
                 file: validFiles[0]
             });

package/dist/server/controllers/content-api.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"content-api.mjs","sources":["../../../server/src/controllers/content-api.ts"],"sourcesContent":["import _ from 'lodash';\nimport { async, errors } from '@strapi/utils';\n\nimport type { Context } from 'koa';\nimport type { Core } from '@strapi/types';\n\nimport { getService } from '../utils';\nimport { FILE_MODEL_UID } from '../constants';\nimport { validateUploadBody } from './validation/content-api/upload';\nimport { FileInfo } from '../types';\nimport { prepareUploadRequest } from '../utils/mime-validation';\n\nconst { ValidationError } = errors;\n\nexport default ({ strapi }: { strapi: Core.Strapi }) => {\n  const sanitizeOutput = async (data: unknown | unknown[], ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth } = ctx.state;\n\n    return strapi.contentAPI.sanitize.output(data, schema, { auth });\n  };\n\n  const validateQuery = async (data: Record<string, unknown>, ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth, route } = ctx.state;\n\n    return strapi.contentAPI.validate.query(data, schema, { auth, route });\n  };\n\n  const sanitizeQuery = async (data: Record<string, unknown>, ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth, route } = ctx.state;\n\n    return strapi.contentAPI.sanitize.query(data, schema, { auth, route });\n  };\n\n  return {\n    async find(ctx: Context) {\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const files = await getService('upload').findMany(sanitizedQuery);\n\n      const signedFiles = await async.map(files, getService('file').signFileUrls);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n    },\n\n    async findPage(ctx: Context) {\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const { results, pagination } = await getService('upload').findAndCountPage(sanitizedQuery);\n\n      const data = await sanitizeOutput(results, ctx);\n\n      ctx.body = { data, meta: { pagination } };\n    },\n\n    async findOne(ctx: Context) {\n      const {\n        params: { id },\n      } = ctx;\n\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const file = await getService('upload').findOne(id, sanitizedQuery.populate!);\n\n      if (!file) {\n        return ctx.notFound('file.notFound');\n      }\n\n      const signedFile = await getService('file').signFileUrls(file);\n\n      ctx.body = await sanitizeOutput(signedFile, ctx);\n    },\n\n    async destroy(ctx: Context) {\n      const {\n        params: { id },\n      } = ctx;\n\n      const file = await getService('upload').findOne(id);\n\n      if (!file) {\n        return ctx.notFound('file.notFound');\n      }\n\n      await getService('upload').remove(file);\n\n      const signedFile = await getService('file').signFileUrls(file);\n\n      ctx.body = await sanitizeOutput(signedFile, ctx);\n    },\n\n    async updateFileInfo(ctx: Context) {\n      const {\n        query: { id },\n        request: { body },\n      } = ctx;\n      const data = await validateUploadBody(body);\n\n      if (!id || (typeof id !== 'string' && typeof id !== 'number')) {\n        throw new ValidationError('File id is required and must be a single value');\n      }\n\n      const result = await getService('upload').updateFileInfo(id, data.fileInfo as any);\n\n      const signedResult = await getService('file').signFileUrls(result);\n\n      ctx.body = await sanitizeOutput(signedResult, ctx);\n    },\n\n    async replaceFile(ctx: Context) {\n      const {\n        query: { id },\n        request: { body, files: { files: filesInput } = {} },\n      } = ctx;\n\n      // cannot replace with more than one file\n      if (Array.isArray(filesInput) && filesInput.length > 1) {\n        throw new ValidationError('Cannot replace a file with multiple ones');\n      }\n\n      const files = Array.isArray(filesInput) ? filesInput[0] : filesInput;\n\n      const {\n        validFiles,\n        filteredBody,\n        errors: validationErrors,\n      } = await prepareUploadRequest(files, body, strapi);\n      if (validFiles.length === 0) {\n        throw new errors.ValidationError(validationErrors[0].message);\n      }\n\n      if (!id || (typeof id !== 'string' && typeof id !== 'number')) {\n        throw new ValidationError('File id is required and must be a single value');\n      }\n\n      const data = (await validateUploadBody(filteredBody)) as { fileInfo: FileInfo };\n\n      const replacedFiles = await getService('upload').replace(id, { data, file: validFiles[0] });\n\n      const signedFiles = await getService('file').signFileUrls(replacedFiles);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n    },\n\n    async uploadFiles(ctx: Context) {\n      const {\n        request: { body, files: { files: filesInput } = {} },\n      } = ctx;\n\n      const {\n        validFiles,\n        filteredBody,\n        errors: validationErrors,\n      } = await prepareUploadRequest(filesInput, body, strapi);\n      if (validFiles.length === 0) {\n        throw new errors.ValidationError(validationErrors[0].message);\n      }\n\n      const isMultipleFiles = validFiles.length > 1;\n      const data: any = await validateUploadBody(filteredBody, isMultipleFiles);\n\n      const apiUploadFolderService = getService('api-upload-folder');\n\n      const apiUploadFolder = await apiUploadFolderService.getAPIUploadFolder();\n\n      if (isMultipleFiles) {\n        data.fileInfo = data.fileInfo || [];\n        data.fileInfo = validFiles.map((_f, i) => ({\n          ...data.fileInfo[i],\n          folder: apiUploadFolder.id,\n        }));\n      } else {\n        data.fileInfo = { ...data.fileInfo, folder: apiUploadFolder.id };\n      }\n\n      const uploadedFiles = await getService('upload').upload({\n        data,\n        files: validFiles,\n      });\n\n      const signedFiles = await async.map(uploadedFiles as any[], getService('file').signFileUrls);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n      ctx.status = 201;\n    },\n\n    // TODO: split into multiple endpoints\n    async upload(ctx: Context) {\n      const {\n        query: { id },\n        request: { files: { files } = {} },\n      } = ctx;\n\n      if (_.isEmpty(files) || (!Array.isArray(files) && files.size === 0)) {\n        if (id) {\n          return this.updateFileInfo(ctx);\n        }\n\n        throw new ValidationError('Files are empty');\n      }\n\n      await (id ? this.replaceFile : this.uploadFiles)(ctx);\n    },\n  };\n};\n"],"names":["ValidationError","errors","strapi","sanitizeOutput","data","ctx","schema","getModel","FILE_MODEL_UID","auth","state","contentAPI","sanitize","output","validateQuery","route","validate","query","sanitizeQuery","find","sanitizedQuery","files","getService","findMany","signedFiles","async","map","signFileUrls","body","findPage","results","pagination","findAndCountPage","meta","findOne","params","id","file","populate","notFound","signedFile","destroy","remove","updateFileInfo","request","validateUploadBody","result","fileInfo","signedResult","replaceFile","filesInput","Array","isArray","length","validFiles","filteredBody","validationErrors","prepareUploadRequest","message","replacedFiles","replace","uploadFiles","isMultipleFiles","apiUploadFolderService","apiUploadFolder","getAPIUploadFolder","_f","i","folder","uploadedFiles","upload","status","_","isEmpty","size"],"mappings":"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"}
+{"version":3,"file":"content-api.mjs","sources":["../../../server/src/controllers/content-api.ts"],"sourcesContent":["import _ from 'lodash';\nimport { async, errors } from '@strapi/utils';\n\nimport type { Context } from 'koa';\nimport type { Core } from '@strapi/types';\n\nimport { getService } from '../utils';\nimport { FILE_MODEL_UID } from '../constants';\nimport { validateUploadBody } from './validation/content-api/upload';\nimport { FileInfo } from '../types';\nimport { prepareUploadRequest } from '../utils/mime-validation';\n\nconst { ValidationError, NotFoundError } = errors;\n\nexport default ({ strapi }: { strapi: Core.Strapi }) => {\n  const sanitizeOutput = async (data: unknown | unknown[], ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth } = ctx.state;\n\n    return strapi.contentAPI.sanitize.output(data, schema, { auth });\n  };\n\n  const validateQuery = async (data: Record<string, unknown>, ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth, route } = ctx.state;\n\n    return strapi.contentAPI.validate.query(data, schema, { auth, route });\n  };\n\n  const sanitizeQuery = async (data: Record<string, unknown>, ctx: Context) => {\n    const schema = strapi.getModel(FILE_MODEL_UID);\n    const { auth, route } = ctx.state;\n\n    return strapi.contentAPI.sanitize.query(data, schema, { auth, route });\n  };\n\n  // Files can be addressed by numeric id or documentId (1:1, files have no draft & publish)\n  const resolveFileId = async (id: string | number) => {\n    if (/^\\d+$/.test(String(id))) {\n      return id;\n    }\n\n    const file = await strapi.db\n      .query(FILE_MODEL_UID)\n      .findOne({ where: { documentId: id }, select: ['id'] });\n\n    return file?.id;\n  };\n\n  return {\n    async find(ctx: Context) {\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const files = await getService('upload').findMany(sanitizedQuery);\n\n      const signedFiles = await async.map(files, getService('file').signFileUrls);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n    },\n\n    async findPage(ctx: Context) {\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const { results, pagination } = await getService('upload').findAndCountPage(sanitizedQuery);\n\n      const data = await sanitizeOutput(results, ctx);\n\n      ctx.body = { data, meta: { pagination } };\n    },\n\n    async findOne(ctx: Context) {\n      await validateQuery(ctx.query, ctx);\n      const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);\n\n      const id = await resolveFileId(ctx.params.id);\n      const file = id ? await getService('upload').findOne(id, sanitizedQuery.populate!) : null;\n\n      if (!file) {\n        return ctx.notFound('file.notFound');\n      }\n\n      const signedFile = await getService('file').signFileUrls(file);\n\n      ctx.body = await sanitizeOutput(signedFile, ctx);\n    },\n\n    async destroy(ctx: Context) {\n      const id = await resolveFileId(ctx.params.id);\n      const file = id ? await getService('upload').findOne(id) : null;\n\n      if (!file) {\n        return ctx.notFound('file.notFound');\n      }\n\n      await getService('upload').remove(file);\n\n      const signedFile = await getService('file').signFileUrls(file);\n\n      ctx.body = await sanitizeOutput(signedFile, ctx);\n    },\n\n    async updateFileInfo(ctx: Context) {\n      const {\n        query: { id },\n        request: { body },\n      } = ctx;\n      const data = await validateUploadBody(body);\n\n      if (!id || (typeof id !== 'string' && typeof id !== 'number')) {\n        throw new ValidationError('File id is required and must be a single value');\n      }\n\n      const fileId = await resolveFileId(id);\n\n      if (!fileId) {\n        throw new NotFoundError();\n      }\n\n      const result = await getService('upload').updateFileInfo(fileId, data.fileInfo as any);\n\n      const signedResult = await getService('file').signFileUrls(result);\n\n      ctx.body = await sanitizeOutput(signedResult, ctx);\n    },\n\n    async replaceFile(ctx: Context) {\n      const {\n        query: { id },\n        request: { body, files: { files: filesInput } = {} },\n      } = ctx;\n\n      // cannot replace with more than one file\n      if (Array.isArray(filesInput) && filesInput.length > 1) {\n        throw new ValidationError('Cannot replace a file with multiple ones');\n      }\n\n      const files = Array.isArray(filesInput) ? filesInput[0] : filesInput;\n\n      const {\n        validFiles,\n        filteredBody,\n        errors: validationErrors,\n      } = await prepareUploadRequest(files, body, strapi);\n      if (validFiles.length === 0) {\n        throw new errors.ValidationError(validationErrors[0].message);\n      }\n\n      if (!id || (typeof id !== 'string' && typeof id !== 'number')) {\n        throw new ValidationError('File id is required and must be a single value');\n      }\n\n      const fileId = await resolveFileId(id);\n\n      if (!fileId) {\n        throw new NotFoundError();\n      }\n\n      const data = (await validateUploadBody(filteredBody)) as { fileInfo: FileInfo };\n\n      const replacedFiles = await getService('upload').replace(fileId, {\n        data,\n        file: validFiles[0],\n      });\n\n      const signedFiles = await getService('file').signFileUrls(replacedFiles);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n    },\n\n    async uploadFiles(ctx: Context) {\n      const {\n        request: { body, files: { files: filesInput } = {} },\n      } = ctx;\n\n      const {\n        validFiles,\n        filteredBody,\n        errors: validationErrors,\n      } = await prepareUploadRequest(filesInput, body, strapi);\n      if (validFiles.length === 0) {\n        throw new errors.ValidationError(validationErrors[0].message);\n      }\n\n      const isMultipleFiles = validFiles.length > 1;\n      const data: any = await validateUploadBody(filteredBody, isMultipleFiles);\n\n      const apiUploadFolderService = getService('api-upload-folder');\n\n      const apiUploadFolder = await apiUploadFolderService.getAPIUploadFolder();\n\n      if (isMultipleFiles) {\n        data.fileInfo = data.fileInfo || [];\n        data.fileInfo = validFiles.map((_f, i) => ({\n          ...data.fileInfo[i],\n          folder: apiUploadFolder.id,\n        }));\n      } else {\n        data.fileInfo = { ...data.fileInfo, folder: apiUploadFolder.id };\n      }\n\n      const uploadedFiles = await getService('upload').upload({\n        data,\n        files: validFiles,\n      });\n\n      const signedFiles = await async.map(uploadedFiles as any[], getService('file').signFileUrls);\n\n      ctx.body = await sanitizeOutput(signedFiles, ctx);\n      ctx.status = 201;\n    },\n\n    // TODO: split into multiple endpoints\n    async upload(ctx: Context) {\n      const {\n        query: { id },\n        request: { files: { files } = {} },\n      } = ctx;\n\n      if (_.isEmpty(files) || (!Array.isArray(files) && files.size === 0)) {\n        if (id) {\n          return this.updateFileInfo(ctx);\n        }\n\n        throw new ValidationError('Files are empty');\n      }\n\n      await (id ? this.replaceFile : this.uploadFiles)(ctx);\n    },\n  };\n};\n"],"names":["ValidationError","NotFoundError","errors","strapi","sanitizeOutput","data","ctx","schema","getModel","FILE_MODEL_UID","auth","state","contentAPI","sanitize","output","validateQuery","route","validate","query","sanitizeQuery","resolveFileId","id","test","String","file","db","findOne","where","documentId","select","find","sanitizedQuery","files","getService","findMany","signedFiles","async","map","signFileUrls","body","findPage","results","pagination","findAndCountPage","meta","params","populate","notFound","signedFile","destroy","remove","updateFileInfo","request","validateUploadBody","fileId","result","fileInfo","signedResult","replaceFile","filesInput","Array","isArray","length","validFiles","filteredBody","validationErrors","prepareUploadRequest","message","replacedFiles","replace","uploadFiles","isMultipleFiles","apiUploadFolderService","apiUploadFolder","getAPIUploadFolder","_f","i","folder","uploadedFiles","upload","status","_","isEmpty","size"],"mappings":"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"}

package/dist/server/controllers/validation/admin/folder-file.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var fp = require('lodash/fp');
+var _ = require('lodash');
 var utils = require('@strapi/utils');
 var constants = require('../../../constants.js');
 var utils$1 = require('./utils.js');
@@ -17,7 +17,7 @@ const validateStructureMoveManyFoldersFilesSchema = utils.yup.object().shape({
 }).noUnknown().required();
 const validateDuplicatesMoveManyFoldersFilesSchema = utils.yup.object().test('are-folders-unique', 'some folders already exist', async function areFoldersUnique(value) {
     const { folderIds, destinationFolderId } = value;
-    if (fp.isEmpty(folderIds)) return true;
+    if (_.isEmpty(folderIds)) return true;
     const folders = await strapi.db.query(constants.FOLDER_MODEL_UID).findMany({
         select: [
             'name'
@@ -38,7 +38,7 @@ const validateDuplicatesMoveManyFoldersFilesSchema = utils.yup.object().test('ar
             }
         }
     });
-    const duplicatedNames = fp.intersection(fp.map('name', folders), fp.map('name', existingFolders));
+    const duplicatedNames = _.intersection(_.map(existingFolders, 'name'), _.map(folders, 'name'));
     if (duplicatedNames.length > 0) {
         return this.createError({
             message: `some folders already exists: ${duplicatedNames.join(', ')}`
@@ -48,7 +48,7 @@ const validateDuplicatesMoveManyFoldersFilesSchema = utils.yup.object().test('ar
 });
 const validateMoveFoldersNotInsideThemselvesSchema = utils.yup.object().test('dont-move-inside-self', 'folders cannot be moved inside themselves or one of its children', async function validateMoveFoldersNotInsideThemselves(value) {
     const { folderIds, destinationFolderId } = value;
-    if (destinationFolderId === null || fp.isEmpty(folderIds)) return true;
+    if (destinationFolderId === null || _.isEmpty(folderIds)) return true;
     const destinationFolder = await strapi.db.query(constants.FOLDER_MODEL_UID).findOne({
         select: [
             'path'

package/dist/server/controllers/validation/admin/folder-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"folder-file.js","sources":["../../../../../server/src/controllers/validation/admin/folder-file.ts"],"sourcesContent":["import { intersection, map, isEmpty } from 'lodash/fp';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nimport type { Folder } from '../../../types';\n\nconst validateDeleteManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateStructureMoveManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    destinationFolderId: yup\n      .strapiID()\n      .nullable()\n      .defined()\n      .test('folder-exists', 'destination folder does not exist', folderExists),\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateDuplicatesMoveManyFoldersFilesSchema = yup\n  .object()\n  .test('are-folders-unique', 'some folders already exist', async function areFoldersUnique(value) {\n    const { folderIds, destinationFolderId } = value;\n    if (isEmpty(folderIds)) return true;\n\n    const folders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { id: { $in: folderIds } },\n    });\n\n    const existingFolders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { parent: { id: destinationFolderId } },\n    });\n\n    const duplicatedNames = intersection(map('name', folders), map('name', existingFolders));\n    if (duplicatedNames.length > 0) {\n      return this.createError({\n        message: `some folders already exists: ${duplicatedNames.join(', ')}`,\n      });\n    }\n\n    return true;\n  });\n\nconst validateMoveFoldersNotInsideThemselvesSchema = yup\n  .object()\n  .test(\n    'dont-move-inside-self',\n    'folders cannot be moved inside themselves or one of its children',\n    async function validateMoveFoldersNotInsideThemselves(value) {\n      const { folderIds, destinationFolderId } = value;\n      if (destinationFolderId === null || isEmpty(folderIds)) return true;\n\n      const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n        select: ['path'],\n        where: { id: destinationFolderId },\n      });\n\n      const folders: Folder[] = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n        select: ['name', 'path'],\n        where: { id: { $in: folderIds } },\n      });\n\n      const unmovableFoldersNames = folders\n        .filter((folder) => isFolderOrChild(destinationFolder, folder))\n        .map((f) => f.name);\n\n      if (unmovableFoldersNames.length > 0) {\n        return this.createError({\n          message: `folders cannot be moved inside themselves or one of its children: ${unmovableFoldersNames.join(\n            ', '\n          )}`,\n        });\n      }\n\n      return true;\n    }\n  );\n\nexport const validateDeleteManyFoldersFiles = validateYupSchema(\n  validateDeleteManyFoldersFilesSchema\n);\n\nexport async function validateMoveManyFoldersFiles(body: unknown) {\n  await validateYupSchema(validateStructureMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateDuplicatesMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateMoveFoldersNotInsideThemselvesSchema)(body);\n}\n"],"names":["validateDeleteManyFoldersFilesSchema","yup","object","shape","fileIds","array","of","strapiID","required","folderIds","noUnknown","validateStructureMoveManyFoldersFilesSchema","destinationFolderId","nullable","defined","test","folderExists","validateDuplicatesMoveManyFoldersFilesSchema","areFoldersUnique","value","isEmpty","folders","strapi","db","query","FOLDER_MODEL_UID","findMany","select","where","id","$in","existingFolders","parent","duplicatedNames","intersection","map","length","createError","message","join","validateMoveFoldersNotInsideThemselvesSchema","validateMoveFoldersNotInsideThemselves","destinationFolder","findOne","unmovableFoldersNames","filter","folder","isFolderOrChild","f","name","validateDeleteManyFoldersFiles","validateYupSchema","validateMoveManyFoldersFiles","body"],"mappings":"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"}
+{"version":3,"file":"folder-file.js","sources":["../../../../../server/src/controllers/validation/admin/folder-file.ts"],"sourcesContent":["import { isEmpty, map, intersection } from 'lodash';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nimport type { Folder } from '../../../types';\n\nconst validateDeleteManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateStructureMoveManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    destinationFolderId: yup\n      .strapiID()\n      .nullable()\n      .defined()\n      .test('folder-exists', 'destination folder does not exist', folderExists),\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateDuplicatesMoveManyFoldersFilesSchema = yup\n  .object()\n  .test('are-folders-unique', 'some folders already exist', async function areFoldersUnique(value) {\n    const { folderIds, destinationFolderId } = value;\n    if (isEmpty(folderIds)) return true;\n\n    const folders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { id: { $in: folderIds } },\n    });\n\n    const existingFolders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { parent: { id: destinationFolderId } },\n    });\n\n    const duplicatedNames = intersection(map(existingFolders, 'name'), map(folders, 'name'));\n    if (duplicatedNames.length > 0) {\n      return this.createError({\n        message: `some folders already exists: ${duplicatedNames.join(', ')}`,\n      });\n    }\n\n    return true;\n  });\n\nconst validateMoveFoldersNotInsideThemselvesSchema = yup\n  .object()\n  .test(\n    'dont-move-inside-self',\n    'folders cannot be moved inside themselves or one of its children',\n    async function validateMoveFoldersNotInsideThemselves(value) {\n      const { folderIds, destinationFolderId } = value;\n      if (destinationFolderId === null || isEmpty(folderIds)) return true;\n\n      const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n        select: ['path'],\n        where: { id: destinationFolderId },\n      });\n\n      const folders: Folder[] = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n        select: ['name', 'path'],\n        where: { id: { $in: folderIds } },\n      });\n\n      const unmovableFoldersNames = folders\n        .filter((folder) => isFolderOrChild(destinationFolder, folder))\n        .map((f) => f.name);\n\n      if (unmovableFoldersNames.length > 0) {\n        return this.createError({\n          message: `folders cannot be moved inside themselves or one of its children: ${unmovableFoldersNames.join(\n            ', '\n          )}`,\n        });\n      }\n\n      return true;\n    }\n  );\n\nexport const validateDeleteManyFoldersFiles = validateYupSchema(\n  validateDeleteManyFoldersFilesSchema\n);\n\nexport async function validateMoveManyFoldersFiles(body: unknown) {\n  await validateYupSchema(validateStructureMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateDuplicatesMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateMoveFoldersNotInsideThemselvesSchema)(body);\n}\n"],"names":["validateDeleteManyFoldersFilesSchema","yup","object","shape","fileIds","array","of","strapiID","required","folderIds","noUnknown","validateStructureMoveManyFoldersFilesSchema","destinationFolderId","nullable","defined","test","folderExists","validateDuplicatesMoveManyFoldersFilesSchema","areFoldersUnique","value","isEmpty","folders","strapi","db","query","FOLDER_MODEL_UID","findMany","select","where","id","$in","existingFolders","parent","duplicatedNames","intersection","map","length","createError","message","join","validateMoveFoldersNotInsideThemselvesSchema","validateMoveFoldersNotInsideThemselves","destinationFolder","findOne","unmovableFoldersNames","filter","folder","isFolderOrChild","f","name","validateDeleteManyFoldersFiles","validateYupSchema","validateMoveManyFoldersFiles","body"],"mappings":";;;;;;;;AAQA,MAAMA,oCAAAA,GAAuCC,SAAAA,CAC1CC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,OAAAA,EAASH,SAAAA,CAAII,KAAK,EAAA,CAAGC,EAAE,CAACL,SAAAA,CAAIM,QAAQ,GAAGC,QAAQ,EAAA,CAAA;IAC/CC,SAAAA,EAAWR,SAAAA,CAAII,KAAK,EAAA,CAAGC,EAAE,CAACL,SAAAA,CAAIM,QAAQ,GAAGC,QAAQ,EAAA;AACnD,CAAA,CAAA,CACCE,SAAS,GACTF,QAAQ,EAAA;AAEX,MAAMG,2CAAAA,GAA8CV,SAAAA,CACjDC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLS,mBAAAA,EAAqBX,SAAAA,CAClBM,QAAQ,EAAA,CACRM,QAAQ,EAAA,CACRC,OAAO,EAAA,CACPC,IAAI,CAAC,eAAA,EAAiB,mCAAA,EAAqCC,oBAAAA,CAAAA;IAC9DZ,OAAAA,EAASH,SAAAA,CAAII,KAAK,EAAA,CAAGC,EAAE,CAACL,SAAAA,CAAIM,QAAQ,GAAGC,QAAQ,EAAA,CAAA;IAC/CC,SAAAA,EAAWR,SAAAA,CAAII,KAAK,EAAA,CAAGC,EAAE,CAACL,SAAAA,CAAIM,QAAQ,GAAGC,QAAQ,EAAA;AACnD,CAAA,CAAA,CACCE,SAAS,GACTF,QAAQ,EAAA;AAEX,MAAMS,4CAAAA,GAA+ChB,SAAAA,CAClDC,MAAM,EAAA,CACNa,IAAI,CAAC,oBAAA,EAAsB,4BAAA,EAA8B,eAAeG,gBAAAA,CAAiBC,KAAK,EAAA;AAC7F,IAAA,MAAM,EAAEV,SAAS,EAAEG,mBAAmB,EAAE,GAAGO,KAAAA;IAC3C,IAAIC,SAAAA,CAAQX,YAAY,OAAO,IAAA;IAE/B,MAAMY,OAAAA,GAAU,MAAMC,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAACC,0BAAAA,CAAAA,CAAkBC,QAAQ,CAAC;QAC/DC,MAAAA,EAAQ;AAAC,YAAA;AAAO,SAAA;QAChBC,KAAAA,EAAO;YAAEC,EAAAA,EAAI;gBAAEC,GAAAA,EAAKrB;AAAU;AAAE;AAClC,KAAA,CAAA;IAEA,MAAMsB,eAAAA,GAAkB,MAAMT,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAACC,0BAAAA,CAAAA,CAAkBC,QAAQ,CAAC;QACvEC,MAAAA,EAAQ;AAAC,YAAA;AAAO,SAAA;QAChBC,KAAAA,EAAO;YAAEI,MAAAA,EAAQ;gBAAEH,EAAAA,EAAIjB;AAAoB;AAAE;AAC/C,KAAA,CAAA;AAEA,IAAA,MAAMqB,kBAAkBC,cAAAA,CAAaC,KAAAA,CAAIJ,eAAAA,EAAiB,MAAA,CAAA,EAASI,MAAId,OAAAA,EAAS,MAAA,CAAA,CAAA;IAChF,IAAIY,eAAAA,CAAgBG,MAAM,GAAG,CAAA,EAAG;QAC9B,OAAO,IAAI,CAACC,WAAW,CAAC;AACtBC,YAAAA,OAAAA,EAAS,CAAC,6BAA6B,EAAEL,eAAAA,CAAgBM,IAAI,CAAC,IAAA,CAAA,CAAA;AAChE,SAAA,CAAA;AACF,IAAA;IAEA,OAAO,IAAA;AACT,CAAA,CAAA;AAEF,MAAMC,4CAAAA,GAA+CvC,SAAAA,CAClDC,MAAM,EAAA,CACNa,IAAI,CACH,uBAAA,EACA,kEAAA,EACA,eAAe0B,sCAAAA,CAAuCtB,KAAK,EAAA;AACzD,IAAA,MAAM,EAAEV,SAAS,EAAEG,mBAAmB,EAAE,GAAGO,KAAAA;AAC3C,IAAA,IAAIP,mBAAAA,KAAwB,IAAA,IAAQQ,SAAAA,CAAQX,SAAAA,CAAAA,EAAY,OAAO,IAAA;IAE/D,MAAMiC,iBAAAA,GAAoB,MAAMpB,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAACC,0BAAAA,CAAAA,CAAkBkB,OAAO,CAAC;QACxEhB,MAAAA,EAAQ;AAAC,YAAA;AAAO,SAAA;QAChBC,KAAAA,EAAO;YAAEC,EAAAA,EAAIjB;AAAoB;AACnC,KAAA,CAAA;IAEA,MAAMS,SAAAA,GAAoB,MAAMC,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAACC,0BAAAA,CAAAA,CAAkBC,QAAQ,CAAC;QACzEC,MAAAA,EAAQ;AAAC,YAAA,MAAA;AAAQ,YAAA;AAAO,SAAA;QACxBC,KAAAA,EAAO;YAAEC,EAAAA,EAAI;gBAAEC,GAAAA,EAAKrB;AAAU;AAAE;AAClC,KAAA,CAAA;AAEA,IAAA,MAAMmC,qBAAAA,GAAwBvB,SAAAA,CAC3BwB,MAAM,CAAC,CAACC,MAAAA,GAAWC,uBAAAA,CAAgBL,iBAAAA,EAAmBI,MAAAA,CAAAA,CAAAA,CACtDX,GAAG,CAAC,CAACa,CAAAA,GAAMA,EAAEC,IAAI,CAAA;IAEpB,IAAIL,qBAAAA,CAAsBR,MAAM,GAAG,CAAA,EAAG;QACpC,OAAO,IAAI,CAACC,WAAW,CAAC;AACtBC,YAAAA,OAAAA,EAAS,CAAC,kEAAkE,EAAEM,qBAAAA,CAAsBL,IAAI,CACtG,IAAA,CAAA,CAAA;AAEJ,SAAA,CAAA;AACF,IAAA;IAEA,OAAO,IAAA;AACT,CAAA,CAAA;AAGG,MAAMW,8BAAAA,GAAiCC,uBAAAA,CAC5CnD,oCAAAA;AAGK,eAAeoD,6BAA6BC,IAAa,EAAA;AAC9D,IAAA,MAAMF,wBAAkBxC,2CAAAA,CAAAA,CAA6C0C,IAAAA,CAAAA;AACrE,IAAA,MAAMF,wBAAkBlC,4CAAAA,CAAAA,CAA8CoC,IAAAA,CAAAA;AACtE,IAAA,MAAMF,wBAAkBX,4CAAAA,CAAAA,CAA8Ca,IAAAA,CAAAA;AACxE;;;;;"}

package/dist/server/controllers/validation/admin/folder-file.mjs

@@ -1,4 +1,4 @@
-import { isEmpty, intersection, map } from 'lodash/fp';
+import { isEmpty, intersection, map } from 'lodash';
 import { yup, validateYupSchema } from '@strapi/utils';
 import { FOLDER_MODEL_UID } from '../../../constants.mjs';
 import { folderExists } from './utils.mjs';
@@ -36,7 +36,7 @@ const validateDuplicatesMoveManyFoldersFilesSchema = yup.object().test('are-fold
             }
         }
     });
-    const duplicatedNames = intersection(map('name', folders), map('name', existingFolders));
+    const duplicatedNames = intersection(map(existingFolders, 'name'), map(folders, 'name'));
     if (duplicatedNames.length > 0) {
         return this.createError({
             message: `some folders already exists: ${duplicatedNames.join(', ')}`

package/dist/server/controllers/validation/admin/folder-file.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"folder-file.mjs","sources":["../../../../../server/src/controllers/validation/admin/folder-file.ts"],"sourcesContent":["import { intersection, map, isEmpty } from 'lodash/fp';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nimport type { Folder } from '../../../types';\n\nconst validateDeleteManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateStructureMoveManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    destinationFolderId: yup\n      .strapiID()\n      .nullable()\n      .defined()\n      .test('folder-exists', 'destination folder does not exist', folderExists),\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateDuplicatesMoveManyFoldersFilesSchema = yup\n  .object()\n  .test('are-folders-unique', 'some folders already exist', async function areFoldersUnique(value) {\n    const { folderIds, destinationFolderId } = value;\n    if (isEmpty(folderIds)) return true;\n\n    const folders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { id: { $in: folderIds } },\n    });\n\n    const existingFolders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { parent: { id: destinationFolderId } },\n    });\n\n    const duplicatedNames = intersection(map('name', folders), map('name', existingFolders));\n    if (duplicatedNames.length > 0) {\n      return this.createError({\n        message: `some folders already exists: ${duplicatedNames.join(', ')}`,\n      });\n    }\n\n    return true;\n  });\n\nconst validateMoveFoldersNotInsideThemselvesSchema = yup\n  .object()\n  .test(\n    'dont-move-inside-self',\n    'folders cannot be moved inside themselves or one of its children',\n    async function validateMoveFoldersNotInsideThemselves(value) {\n      const { folderIds, destinationFolderId } = value;\n      if (destinationFolderId === null || isEmpty(folderIds)) return true;\n\n      const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n        select: ['path'],\n        where: { id: destinationFolderId },\n      });\n\n      const folders: Folder[] = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n        select: ['name', 'path'],\n        where: { id: { $in: folderIds } },\n      });\n\n      const unmovableFoldersNames = folders\n        .filter((folder) => isFolderOrChild(destinationFolder, folder))\n        .map((f) => f.name);\n\n      if (unmovableFoldersNames.length > 0) {\n        return this.createError({\n          message: `folders cannot be moved inside themselves or one of its children: ${unmovableFoldersNames.join(\n            ', '\n          )}`,\n        });\n      }\n\n      return true;\n    }\n  );\n\nexport const validateDeleteManyFoldersFiles = validateYupSchema(\n  validateDeleteManyFoldersFilesSchema\n);\n\nexport async function validateMoveManyFoldersFiles(body: unknown) {\n  await validateYupSchema(validateStructureMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateDuplicatesMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateMoveFoldersNotInsideThemselvesSchema)(body);\n}\n"],"names":["validateDeleteManyFoldersFilesSchema","yup","object","shape","fileIds","array","of","strapiID","required","folderIds","noUnknown","validateStructureMoveManyFoldersFilesSchema","destinationFolderId","nullable","defined","test","folderExists","validateDuplicatesMoveManyFoldersFilesSchema","areFoldersUnique","value","isEmpty","folders","strapi","db","query","FOLDER_MODEL_UID","findMany","select","where","id","$in","existingFolders","parent","duplicatedNames","intersection","map","length","createError","message","join","validateMoveFoldersNotInsideThemselvesSchema","validateMoveFoldersNotInsideThemselves","destinationFolder","findOne","unmovableFoldersNames","filter","folder","isFolderOrChild","f","name","validateDeleteManyFoldersFiles","validateYupSchema","validateMoveManyFoldersFiles","body"],"mappings":"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"}
+{"version":3,"file":"folder-file.mjs","sources":["../../../../../server/src/controllers/validation/admin/folder-file.ts"],"sourcesContent":["import { isEmpty, map, intersection } from 'lodash';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nimport type { Folder } from '../../../types';\n\nconst validateDeleteManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateStructureMoveManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    destinationFolderId: yup\n      .strapiID()\n      .nullable()\n      .defined()\n      .test('folder-exists', 'destination folder does not exist', folderExists),\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateDuplicatesMoveManyFoldersFilesSchema = yup\n  .object()\n  .test('are-folders-unique', 'some folders already exist', async function areFoldersUnique(value) {\n    const { folderIds, destinationFolderId } = value;\n    if (isEmpty(folderIds)) return true;\n\n    const folders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { id: { $in: folderIds } },\n    });\n\n    const existingFolders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { parent: { id: destinationFolderId } },\n    });\n\n    const duplicatedNames = intersection(map(existingFolders, 'name'), map(folders, 'name'));\n    if (duplicatedNames.length > 0) {\n      return this.createError({\n        message: `some folders already exists: ${duplicatedNames.join(', ')}`,\n      });\n    }\n\n    return true;\n  });\n\nconst validateMoveFoldersNotInsideThemselvesSchema = yup\n  .object()\n  .test(\n    'dont-move-inside-self',\n    'folders cannot be moved inside themselves or one of its children',\n    async function validateMoveFoldersNotInsideThemselves(value) {\n      const { folderIds, destinationFolderId } = value;\n      if (destinationFolderId === null || isEmpty(folderIds)) return true;\n\n      const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n        select: ['path'],\n        where: { id: destinationFolderId },\n      });\n\n      const folders: Folder[] = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n        select: ['name', 'path'],\n        where: { id: { $in: folderIds } },\n      });\n\n      const unmovableFoldersNames = folders\n        .filter((folder) => isFolderOrChild(destinationFolder, folder))\n        .map((f) => f.name);\n\n      if (unmovableFoldersNames.length > 0) {\n        return this.createError({\n          message: `folders cannot be moved inside themselves or one of its children: ${unmovableFoldersNames.join(\n            ', '\n          )}`,\n        });\n      }\n\n      return true;\n    }\n  );\n\nexport const validateDeleteManyFoldersFiles = validateYupSchema(\n  validateDeleteManyFoldersFilesSchema\n);\n\nexport async function validateMoveManyFoldersFiles(body: unknown) {\n  await validateYupSchema(validateStructureMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateDuplicatesMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateMoveFoldersNotInsideThemselvesSchema)(body);\n}\n"],"names":["validateDeleteManyFoldersFilesSchema","yup","object","shape","fileIds","array","of","strapiID","required","folderIds","noUnknown","validateStructureMoveManyFoldersFilesSchema","destinationFolderId","nullable","defined","test","folderExists","validateDuplicatesMoveManyFoldersFilesSchema","areFoldersUnique","value","isEmpty","folders","strapi","db","query","FOLDER_MODEL_UID","findMany","select","where","id","$in","existingFolders","parent","duplicatedNames","intersection","map","length","createError","message","join","validateMoveFoldersNotInsideThemselvesSchema","validateMoveFoldersNotInsideThemselves","destinationFolder","findOne","unmovableFoldersNames","filter","folder","isFolderOrChild","f","name","validateDeleteManyFoldersFiles","validateYupSchema","validateMoveManyFoldersFiles","body"],"mappings":"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"}

package/dist/server/controllers/validation/admin/folder.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var fp = require('lodash/fp');
 var utils = require('@strapi/utils');
 var index = require('../../../utils/index.js');
 var constants = require('../../../constants.js');
@@ -20,13 +19,13 @@ const isNameUniqueInFolder = (id)=>{
             filters.id = {
                 $ne: id
             };
-            if (fp.isUndefined(name)) {
+            if (name === undefined) {
                 const existingFolder = await strapi.db.query(constants.FOLDER_MODEL_UID).findOne({
                     where: {
                         id
                     }
                 });
-                filters.name = fp.get('name', existingFolder);
+                filters.name = existingFolder?.name;
             }
         }
         const doesExist = await exists(filters);
@@ -40,7 +39,7 @@ const validateCreateFolderSchema = utils.yup.object().shape({
 const validateUpdateFolderSchema = (id)=>utils.yup.object().shape({
         name: utils.yup.string().min(1).matches(NO_SLASH_REGEX, 'name cannot contain slashes').matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace').test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder(id)),
         parent: utils.yup.strapiID().nullable().test('folder-exists', 'parent folder does not exist', utils$1.folderExists).test('dont-move-inside-self', 'folder cannot be moved inside itself', async function test(parent) {
-            if (fp.isNil(parent)) return true;
+            if (parent == null) return true;
             const destinationFolder = await strapi.db.query(constants.FOLDER_MODEL_UID).findOne({
                 select: [
                     'path'

package/dist/server/controllers/validation/admin/folder.js.map

@@ -1 +1 @@
-{"version":3,"file":"folder.js","sources":["../../../../../server/src/controllers/validation/admin/folder.ts"],"sourcesContent":["import { isUndefined, get, isNil } from 'lodash/fp';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { getService } from '../../../utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nconst NO_SLASH_REGEX = /^[^/]+$/;\nconst NO_SPACES_AROUND = /^(?! ).+(?<! )$/;\n\nconst isNameUniqueInFolder = (id?: number): yup.TestFunction<string | undefined> => {\n  return async function test(name?: string) {\n    const { exists } = getService('folder');\n    const filters: Record<string, unknown> = { name, parent: this.parent.parent || null };\n    if (id) {\n      filters.id = { $ne: id };\n\n      if (isUndefined(name)) {\n        const existingFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id } });\n        filters.name = get('name', existingFolder);\n      }\n    }\n\n    const doesExist = await exists(filters);\n    return !doesExist;\n  };\n};\n\nconst validateCreateFolderSchema = yup\n  .object()\n  .shape({\n    name: yup\n      .string()\n      .min(1)\n      .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n      .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n      .required()\n      .test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder()),\n    parent: yup\n      .strapiID()\n      .nullable()\n      .test('folder-exists', 'parent folder does not exist', folderExists),\n  })\n  .noUnknown()\n  .required();\n\nconst validateUpdateFolderSchema = (id: number) =>\n  yup\n    .object()\n    .shape({\n      name: yup\n        .string()\n        .min(1)\n        .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n        .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n        .test(\n          'is-folder-unique',\n          'A folder with this name already exists',\n          isNameUniqueInFolder(id)\n        ),\n      parent: yup\n        .strapiID()\n        .nullable()\n        .test('folder-exists', 'parent folder does not exist', folderExists)\n        .test(\n          'dont-move-inside-self',\n          'folder cannot be moved inside itself',\n          async function test(parent) {\n            if (isNil(parent)) return true;\n\n            const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id: parent },\n            });\n\n            const currentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id },\n            });\n\n            if (!destinationFolder || !currentFolder) return true;\n\n            return !isFolderOrChild(destinationFolder, currentFolder);\n          }\n        ),\n    })\n    .noUnknown()\n    .required();\n\nexport const validateCreateFolder = validateYupSchema(validateCreateFolderSchema);\nexport const validateUpdateFolder = (id: number) =>\n  validateYupSchema(validateUpdateFolderSchema(id));\n"],"names":["NO_SLASH_REGEX","NO_SPACES_AROUND","isNameUniqueInFolder","id","test","name","exists","getService","filters","parent","$ne","isUndefined","existingFolder","strapi","db","query","FOLDER_MODEL_UID","findOne","where","get","doesExist","validateCreateFolderSchema","yup","object","shape","string","min","matches","required","strapiID","nullable","folderExists","noUnknown","validateUpdateFolderSchema","isNil","destinationFolder","select","currentFolder","isFolderOrChild","validateCreateFolder","validateYupSchema","validateUpdateFolder"],"mappings":"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"}
+{"version":3,"file":"folder.js","sources":["../../../../../server/src/controllers/validation/admin/folder.ts"],"sourcesContent":["import { yup, validateYupSchema } from '@strapi/utils';\nimport { getService } from '../../../utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nconst NO_SLASH_REGEX = /^[^/]+$/;\nconst NO_SPACES_AROUND = /^(?! ).+(?<! )$/;\n\nconst isNameUniqueInFolder = (id?: number): yup.TestFunction<string | undefined> => {\n  return async function test(name?: string) {\n    const { exists } = getService('folder');\n    const filters: Record<string, unknown> = { name, parent: this.parent.parent || null };\n    if (id) {\n      filters.id = { $ne: id };\n\n      if (name === undefined) {\n        const existingFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id } });\n        filters.name = existingFolder?.name;\n      }\n    }\n\n    const doesExist = await exists(filters);\n    return !doesExist;\n  };\n};\n\nconst validateCreateFolderSchema = yup\n  .object()\n  .shape({\n    name: yup\n      .string()\n      .min(1)\n      .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n      .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n      .required()\n      .test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder()),\n    parent: yup\n      .strapiID()\n      .nullable()\n      .test('folder-exists', 'parent folder does not exist', folderExists),\n  })\n  .noUnknown()\n  .required();\n\nconst validateUpdateFolderSchema = (id: number) =>\n  yup\n    .object()\n    .shape({\n      name: yup\n        .string()\n        .min(1)\n        .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n        .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n        .test(\n          'is-folder-unique',\n          'A folder with this name already exists',\n          isNameUniqueInFolder(id)\n        ),\n      parent: yup\n        .strapiID()\n        .nullable()\n        .test('folder-exists', 'parent folder does not exist', folderExists)\n        .test(\n          'dont-move-inside-self',\n          'folder cannot be moved inside itself',\n          async function test(parent) {\n            if (parent == null) return true;\n\n            const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id: parent },\n            });\n\n            const currentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id },\n            });\n\n            if (!destinationFolder || !currentFolder) return true;\n\n            return !isFolderOrChild(destinationFolder, currentFolder);\n          }\n        ),\n    })\n    .noUnknown()\n    .required();\n\nexport const validateCreateFolder = validateYupSchema(validateCreateFolderSchema);\nexport const validateUpdateFolder = (id: number) =>\n  validateYupSchema(validateUpdateFolderSchema(id));\n"],"names":["NO_SLASH_REGEX","NO_SPACES_AROUND","isNameUniqueInFolder","id","test","name","exists","getService","filters","parent","$ne","undefined","existingFolder","strapi","db","query","FOLDER_MODEL_UID","findOne","where","doesExist","validateCreateFolderSchema","yup","object","shape","string","min","matches","required","strapiID","nullable","folderExists","noUnknown","validateUpdateFolderSchema","destinationFolder","select","currentFolder","isFolderOrChild","validateCreateFolder","validateYupSchema","validateUpdateFolder"],"mappings":"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"}

package/dist/server/controllers/validation/admin/folder.mjs

@@ -1,4 +1,3 @@
-import { isNil, isUndefined, get } from 'lodash/fp';
 import { yup, validateYupSchema } from '@strapi/utils';
 import { getService } from '../../../utils/index.mjs';
 import { FOLDER_MODEL_UID } from '../../../constants.mjs';
@@ -18,13 +17,13 @@ const isNameUniqueInFolder = (id)=>{
             filters.id = {
                 $ne: id
             };
-            if (isUndefined(name)) {
+            if (name === undefined) {
                 const existingFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({
                     where: {
                         id
                     }
                 });
-                filters.name = get('name', existingFolder);
+                filters.name = existingFolder?.name;
             }
         }
         const doesExist = await exists(filters);
@@ -38,7 +37,7 @@ const validateCreateFolderSchema = yup.object().shape({
 const validateUpdateFolderSchema = (id)=>yup.object().shape({
         name: yup.string().min(1).matches(NO_SLASH_REGEX, 'name cannot contain slashes').matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace').test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder(id)),
         parent: yup.strapiID().nullable().test('folder-exists', 'parent folder does not exist', folderExists).test('dont-move-inside-self', 'folder cannot be moved inside itself', async function test(parent) {
-            if (isNil(parent)) return true;
+            if (parent == null) return true;
             const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({
                 select: [
                     'path'

package/dist/server/controllers/validation/admin/folder.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"folder.mjs","sources":["../../../../../server/src/controllers/validation/admin/folder.ts"],"sourcesContent":["import { isUndefined, get, isNil } from 'lodash/fp';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { getService } from '../../../utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nconst NO_SLASH_REGEX = /^[^/]+$/;\nconst NO_SPACES_AROUND = /^(?! ).+(?<! )$/;\n\nconst isNameUniqueInFolder = (id?: number): yup.TestFunction<string | undefined> => {\n  return async function test(name?: string) {\n    const { exists } = getService('folder');\n    const filters: Record<string, unknown> = { name, parent: this.parent.parent || null };\n    if (id) {\n      filters.id = { $ne: id };\n\n      if (isUndefined(name)) {\n        const existingFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id } });\n        filters.name = get('name', existingFolder);\n      }\n    }\n\n    const doesExist = await exists(filters);\n    return !doesExist;\n  };\n};\n\nconst validateCreateFolderSchema = yup\n  .object()\n  .shape({\n    name: yup\n      .string()\n      .min(1)\n      .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n      .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n      .required()\n      .test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder()),\n    parent: yup\n      .strapiID()\n      .nullable()\n      .test('folder-exists', 'parent folder does not exist', folderExists),\n  })\n  .noUnknown()\n  .required();\n\nconst validateUpdateFolderSchema = (id: number) =>\n  yup\n    .object()\n    .shape({\n      name: yup\n        .string()\n        .min(1)\n        .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n        .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n        .test(\n          'is-folder-unique',\n          'A folder with this name already exists',\n          isNameUniqueInFolder(id)\n        ),\n      parent: yup\n        .strapiID()\n        .nullable()\n        .test('folder-exists', 'parent folder does not exist', folderExists)\n        .test(\n          'dont-move-inside-self',\n          'folder cannot be moved inside itself',\n          async function test(parent) {\n            if (isNil(parent)) return true;\n\n            const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id: parent },\n            });\n\n            const currentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id },\n            });\n\n            if (!destinationFolder || !currentFolder) return true;\n\n            return !isFolderOrChild(destinationFolder, currentFolder);\n          }\n        ),\n    })\n    .noUnknown()\n    .required();\n\nexport const validateCreateFolder = validateYupSchema(validateCreateFolderSchema);\nexport const validateUpdateFolder = (id: number) =>\n  validateYupSchema(validateUpdateFolderSchema(id));\n"],"names":["NO_SLASH_REGEX","NO_SPACES_AROUND","isNameUniqueInFolder","id","test","name","exists","getService","filters","parent","$ne","isUndefined","existingFolder","strapi","db","query","FOLDER_MODEL_UID","findOne","where","get","doesExist","validateCreateFolderSchema","yup","object","shape","string","min","matches","required","strapiID","nullable","folderExists","noUnknown","validateUpdateFolderSchema","isNil","destinationFolder","select","currentFolder","isFolderOrChild","validateCreateFolder","validateYupSchema","validateUpdateFolder"],"mappings":"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"}
+{"version":3,"file":"folder.mjs","sources":["../../../../../server/src/controllers/validation/admin/folder.ts"],"sourcesContent":["import { yup, validateYupSchema } from '@strapi/utils';\nimport { getService } from '../../../utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nconst NO_SLASH_REGEX = /^[^/]+$/;\nconst NO_SPACES_AROUND = /^(?! ).+(?<! )$/;\n\nconst isNameUniqueInFolder = (id?: number): yup.TestFunction<string | undefined> => {\n  return async function test(name?: string) {\n    const { exists } = getService('folder');\n    const filters: Record<string, unknown> = { name, parent: this.parent.parent || null };\n    if (id) {\n      filters.id = { $ne: id };\n\n      if (name === undefined) {\n        const existingFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id } });\n        filters.name = existingFolder?.name;\n      }\n    }\n\n    const doesExist = await exists(filters);\n    return !doesExist;\n  };\n};\n\nconst validateCreateFolderSchema = yup\n  .object()\n  .shape({\n    name: yup\n      .string()\n      .min(1)\n      .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n      .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n      .required()\n      .test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder()),\n    parent: yup\n      .strapiID()\n      .nullable()\n      .test('folder-exists', 'parent folder does not exist', folderExists),\n  })\n  .noUnknown()\n  .required();\n\nconst validateUpdateFolderSchema = (id: number) =>\n  yup\n    .object()\n    .shape({\n      name: yup\n        .string()\n        .min(1)\n        .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n        .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n        .test(\n          'is-folder-unique',\n          'A folder with this name already exists',\n          isNameUniqueInFolder(id)\n        ),\n      parent: yup\n        .strapiID()\n        .nullable()\n        .test('folder-exists', 'parent folder does not exist', folderExists)\n        .test(\n          'dont-move-inside-self',\n          'folder cannot be moved inside itself',\n          async function test(parent) {\n            if (parent == null) return true;\n\n            const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id: parent },\n            });\n\n            const currentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id },\n            });\n\n            if (!destinationFolder || !currentFolder) return true;\n\n            return !isFolderOrChild(destinationFolder, currentFolder);\n          }\n        ),\n    })\n    .noUnknown()\n    .required();\n\nexport const validateCreateFolder = validateYupSchema(validateCreateFolderSchema);\nexport const validateUpdateFolder = (id: number) =>\n  validateYupSchema(validateUpdateFolderSchema(id));\n"],"names":["NO_SLASH_REGEX","NO_SPACES_AROUND","isNameUniqueInFolder","id","test","name","exists","getService","filters","parent","$ne","undefined","existingFolder","strapi","db","query","FOLDER_MODEL_UID","findOne","where","doesExist","validateCreateFolderSchema","yup","object","shape","string","min","matches","required","strapiID","nullable","folderExists","noUnknown","validateUpdateFolderSchema","destinationFolder","select","currentFolder","isFolderOrChild","validateCreateFolder","validateYupSchema","validateUpdateFolder"],"mappings":";;;;;;AAMA,MAAMA,cAAAA,GAAiB,SAAA;AACvB,MAAMC,gBAAAA,GAAmB,iBAAA;AAEzB,MAAMC,uBAAuB,CAACC,EAAAA,GAAAA;IAC5B,OAAO,eAAeC,KAAKC,IAAa,EAAA;AACtC,QAAA,MAAM,EAAEC,MAAM,EAAE,GAAGC,UAAAA,CAAW,QAAA,CAAA;AAC9B,QAAA,MAAMC,OAAAA,GAAmC;AAAEH,YAAAA,IAAAA;AAAMI,YAAAA,MAAAA,EAAQ,IAAI,CAACA,MAAM,CAACA,MAAM,IAAI;AAAK,SAAA;AACpF,QAAA,IAAIN,EAAAA,EAAI;AACNK,YAAAA,OAAAA,CAAQL,EAAE,GAAG;gBAAEO,GAAAA,EAAKP;AAAG,aAAA;AAEvB,YAAA,IAAIE,SAASM,SAAAA,EAAW;gBACtB,MAAMC,cAAAA,GAAiB,MAAMC,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAACC,gBAAAA,CAAAA,CAAkBC,OAAO,CAAC;oBAAEC,KAAAA,EAAO;AAAEf,wBAAAA;AAAG;AAAE,iBAAA,CAAA;gBACvFK,OAAAA,CAAQH,IAAI,GAAGO,cAAAA,EAAgBP,IAAAA;AACjC,YAAA;AACF,QAAA;QAEA,MAAMc,SAAAA,GAAY,MAAMb,MAAAA,CAAOE,OAAAA,CAAAA;AAC/B,QAAA,OAAO,CAACW,SAAAA;AACV,IAAA,CAAA;AACF,CAAA;AAEA,MAAMC,0BAAAA,GAA6BC,GAAAA,CAChCC,MAAM,EAAA,CACNC,KAAK,CAAC;AACLlB,IAAAA,IAAAA,EAAMgB,IACHG,MAAM,EAAA,CACNC,GAAG,CAAC,CAAA,CAAA,CACJC,OAAO,CAAC1B,cAAAA,EAAgB,+BACxB0B,OAAO,CAACzB,kBAAkB,4CAAA,CAAA,CAC1B0B,QAAQ,GACRvB,IAAI,CAAC,oBAAoB,wCAAA,EAA0CF,oBAAAA,EAAAA,CAAAA;IACtEO,MAAAA,EAAQY,GAAAA,CACLO,QAAQ,EAAA,CACRC,QAAQ,GACRzB,IAAI,CAAC,iBAAiB,8BAAA,EAAgC0B,YAAAA;AAC3D,CAAA,CAAA,CACCC,SAAS,GACTJ,QAAQ,EAAA;AAEX,MAAMK,6BAA6B,CAAC7B,EAAAA,GAClCkB,IACGC,MAAM,EAAA,CACNC,KAAK,CAAC;AACLlB,QAAAA,IAAAA,EAAMgB,IACHG,MAAM,EAAA,CACNC,GAAG,CAAC,CAAA,CAAA,CACJC,OAAO,CAAC1B,cAAAA,EAAgB,6BAAA,CAAA,CACxB0B,OAAO,CAACzB,gBAAAA,EAAkB,4CAAA,CAAA,CAC1BG,IAAI,CACH,kBAAA,EACA,0CACAF,oBAAAA,CAAqBC,EAAAA,CAAAA,CAAAA;AAEzBM,QAAAA,MAAAA,EAAQY,IACLO,QAAQ,EAAA,CACRC,QAAQ,EAAA,CACRzB,IAAI,CAAC,eAAA,EAAiB,8BAAA,EAAgC0B,YAAAA,CAAAA,CACtD1B,IAAI,CACH,uBAAA,EACA,sCAAA,EACA,eAAeA,KAAKK,MAAM,EAAA;YACxB,IAAIA,MAAAA,IAAU,MAAM,OAAO,IAAA;YAE3B,MAAMwB,iBAAAA,GAAoB,MAAMpB,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAACC,gBAAAA,CAAAA,CAAkBC,OAAO,CAAC;gBACxEiB,MAAAA,EAAQ;AAAC,oBAAA;AAAO,iBAAA;gBAChBhB,KAAAA,EAAO;oBAAEf,EAAAA,EAAIM;AAAO;AACtB,aAAA,CAAA;YAEA,MAAM0B,aAAAA,GAAgB,MAAMtB,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAACC,gBAAAA,CAAAA,CAAkBC,OAAO,CAAC;gBACpEiB,MAAAA,EAAQ;AAAC,oBAAA;AAAO,iBAAA;gBAChBhB,KAAAA,EAAO;AAAEf,oBAAAA;AAAG;AACd,aAAA,CAAA;AAEA,YAAA,IAAI,CAAC8B,iBAAAA,IAAqB,CAACE,aAAAA,EAAe,OAAO,IAAA;YAEjD,OAAO,CAACC,gBAAgBH,iBAAAA,EAAmBE,aAAAA,CAAAA;AAC7C,QAAA,CAAA;KAEN,CAAA,CACCJ,SAAS,GACTJ,QAAQ,EAAA;AAEN,MAAMU,oBAAAA,GAAuBC,iBAAAA,CAAkBlB,0BAAAA;MACzCmB,oBAAAA,GAAuB,CAACpC,EAAAA,GACnCmC,iBAAAA,CAAkBN,2BAA2B7B,EAAAA,CAAAA;;;;"}

package/dist/server/controllers/validation/admin/upload.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var utils = require('@strapi/utils');
-var fp = require('lodash/fp');
 var index = require('../../../utils/index.js');
 
 const focalPointSchema = utils.yup.object({
@@ -14,7 +13,7 @@ const fileInfoSchema = utils.yup.object({
     caption: utils.yup.string().nullable(),
     focalPoint: focalPointSchema,
     folder: utils.yup.strapiID().nullable().test('folder-exists', 'the folder does not exist', async (folderId)=>{
-        if (fp.isNil(folderId)) {
+        if (folderId == null) {
             return true;
         }
         const exists = await index.getService('folder').exists({