@directus/api 35.0.2 → 35.1.0

package/dist/controllers/files.js

@@ -23,25 +23,22 @@ router.use(use_collection_default("directus_files"));
 const multipartHandler = (req, res, next) => {
 	if (req.is("multipart/form-data") === false) return next();
 	let headers;
-	if (req.headers["content-type"]) {
-		headers = req.headers;
-	} else {
-		headers = {
-			...req.headers,
-			"content-type": "application/octet-stream"
-		};
-	}
+	if (req.headers["content-type"]) headers = req.headers;
+	else headers = {
+		...req.headers,
+		"content-type": "application/octet-stream"
+	};
 	const busboy = Busboy({
 		headers,
 		defParamCharset: "utf8",
-		limits: { fileSize: bytes.parse(env["FILES_MAX_UPLOAD_SIZE"]) ?? undefined }
+		limits: { fileSize: bytes.parse(env["FILES_MAX_UPLOAD_SIZE"]) ?? void 0 }
 	});
 	const savedFiles = [];
 	const service = new FilesService({
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	const existingPrimaryKey = req.params["pk"] || undefined;
+	const existingPrimaryKey = req.params["pk"] || void 0;
 	/**
 	* The order of the fields in multipart/form-data is important. We require that all fields
 	* are provided _before_ the files. This allows us to set the storage location, and create
@@ -57,19 +54,11 @@ const multipartHandler = (req, res, next) => {
 		payload[fieldname] = fieldValue;
 	});
 	busboy.on("file", async (_fieldname, fileStream, { filename, mimeType }) => {
-		if (!filename) {
-			return busboy.emit("error", new InvalidPayloadError({ reason: `File is missing filename` }));
-		}
-		const allowedPatterns = toArray(env["FILES_MIME_TYPE_ALLOW_LIST"]);
-		const mimeTypeAllowed = allowedPatterns.some((pattern) => minimatch(mimeType, pattern));
-		if (mimeTypeAllowed === false) {
-			return busboy.emit("error", new InvalidPayloadError({ reason: `File is of invalid content type` }));
-		}
+		if (!filename) return busboy.emit("error", new InvalidPayloadError({ reason: `File is missing filename` }));
+		if (toArray(env["FILES_MIME_TYPE_ALLOW_LIST"]).some((pattern) => minimatch(mimeType, pattern)) === false) return busboy.emit("error", new InvalidPayloadError({ reason: `File is of invalid content type` }));
 		fileCount++;
 		if (!existingPrimaryKey) {
-			if (!payload.title) {
-				payload.title = formatTitle(path.parse(filename).name);
-			}
+			if (!payload.title) payload.title = formatTitle(path.parse(filename).name);
 		}
 		payload.filename_download ||= filename;
 		const payloadWithRequiredFields = {
@@ -84,7 +73,6 @@ const multipartHandler = (req, res, next) => {
 		} catch (error) {
 			busboy.emit("error", error);
 		}
-		return undefined;
 	});
 	busboy.on("error", (error) => {
 		next(error);
@@ -95,9 +83,7 @@ const multipartHandler = (req, res, next) => {
 	req.pipe(busboy);
 	function tryDone() {
 		if (savedFiles.length === fileCount) {
-			if (fileCount === 0) {
-				return next(new InvalidPayloadError({ reason: `No files were included in the body` }));
-			}
+			if (fileCount === 0) return next(new InvalidPayloadError({ reason: `No files were included in the body` }));
 			res.locals["savedFiles"] = savedFiles;
 			return next();
 		}
@@ -109,11 +95,8 @@ router.post("/", async_handler_default(multipartHandler), async_handler_default(
 		schema: req.schema
 	});
 	let keys = [];
-	if (req.is("multipart/form-data")) {
-		keys = res.locals["savedFiles"];
-	} else {
-		keys = await service.createOne(req.body);
-	}
+	if (req.is("multipart/form-data")) keys = res.locals["savedFiles"];
+	else keys = await service.createOne(req.body);
 	try {
 		if (Array.isArray(keys) && keys.length > 1) {
 			const records = await service.readMany(keys, req.sanitizedQuery);
@@ -124,9 +107,7 @@ router.post("/", async_handler_default(multipartHandler), async_handler_default(
 			res.locals["payload"] = { data: record };
 		}
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -138,9 +119,7 @@ const importSchema = Joi.object({
 });
 router.post("/import", async_handler_default(async (req, res, next) => {
 	const { error } = importSchema.validate(req.body);
-	if (error) {
-		throw new InvalidPayloadError({ reason: error.message });
-	}
+	if (error) throw new InvalidPayloadError({ reason: error.message });
 	const service = new FilesService({
 		accountability: req.accountability,
 		schema: req.schema
@@ -150,9 +129,7 @@ router.post("/import", async_handler_default(async (req, res, next) => {
 		const record = await service.readOne(primaryKey, req.sanitizedQuery);
 		res.locals["payload"] = { data: record || null };
 	} catch (error$1) {
-		if (isDirectusError(error$1, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error$1, ErrorCode.Forbidden)) return next();
 		throw error$1;
 	}
 	return next();
@@ -167,13 +144,9 @@ const readHandler = async_handler_default(async (req, res, next) => {
 		schema: req.schema
 	});
 	let result;
-	if (req.singleton) {
-		result = await service.readSingleton(req.sanitizedQuery);
-	} else if (req.body.keys) {
-		result = await service.readMany(req.body.keys, req.sanitizedQuery);
-	} else {
-		result = await service.readByQuery(req.sanitizedQuery);
-	}
+	if (req.singleton) result = await service.readSingleton(req.sanitizedQuery);
+	else if (req.body.keys) result = await service.readMany(req.body.keys, req.sanitizedQuery);
+	else result = await service.readByQuery(req.sanitizedQuery);
 	const meta = await metaService.getMetaForQuery("directus_files", req.sanitizedQuery);
 	res.locals["payload"] = {
 		data: result,
@@ -184,11 +157,10 @@ const readHandler = async_handler_default(async (req, res, next) => {
 router.get("/", validateBatch("read"), readHandler, respond);
 router.search("/", validateBatch("read"), readHandler, respond);
 router.get("/:pk", async_handler_default(async (req, res, next) => {
-	const service = new FilesService({
+	const record = await new FilesService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const record = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: record || null };
 	return next();
 }), respond);
@@ -198,11 +170,9 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		schema: req.schema
 	});
 	let keys = [];
-	if (Array.isArray(req.body)) {
-		keys = await service.updateBatch(req.body);
-	} else if (req.body.keys) {
-		keys = await service.updateMany(req.body.keys, req.body.data);
-	} else {
+	if (Array.isArray(req.body)) keys = await service.updateBatch(req.body);
+	else if (req.body.keys) keys = await service.updateMany(req.body.keys, req.body.data);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		keys = await service.updateByQuery(sanitizedQuery, req.body.data);
 	}
@@ -210,9 +180,7 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		const result = await service.readMany(keys, req.sanitizedQuery);
 		res.locals["payload"] = { data: result || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -227,9 +195,7 @@ router.patch("/:pk", async_handler_default(multipartHandler), async_handler_defa
 		const record = await service.readOne(req.params["pk"], req.sanitizedQuery);
 		res.locals["payload"] = { data: record || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -239,22 +205,19 @@ router.delete("/", validateBatch("delete"), async_handler_default(async (req, _r
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	if (Array.isArray(req.body)) {
-		await service.deleteMany(req.body);
-	} else if (req.body.keys) {
-		await service.deleteMany(req.body.keys);
-	} else {
+	if (Array.isArray(req.body)) await service.deleteMany(req.body);
+	else if (req.body.keys) await service.deleteMany(req.body.keys);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		await service.deleteByQuery(sanitizedQuery);
 	}
 	return next();
 }), respond);
 router.delete("/:pk", async_handler_default(async (req, _res, next) => {
-	const service = new FilesService({
+	await new FilesService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 var files_default = router;

package/dist/controllers/flows.js

@@ -14,8 +14,7 @@ import express from "express";
 const router = express.Router();
 router.use(use_collection_default("directus_flows"));
 const webhookFlowHandler = async_handler_default(async (req, res, next) => {
-	const flowManager = getFlowManager();
-	const { result, cacheEnabled } = await flowManager.runWebhookFlow(`${req.method}-${req.params["pk"]}`, {
+	const { result, cacheEnabled } = await getFlowManager().runWebhookFlow(`${req.method}-${req.params["pk"]}`, {
 		path: req.path,
 		query: req.query,
 		body: req.body,
@@ -25,9 +24,7 @@ const webhookFlowHandler = async_handler_default(async (req, res, next) => {
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	if (!cacheEnabled) {
-		res.locals["cache"] = false;
-	}
+	if (!cacheEnabled) res.locals["cache"] = false;
 	res.locals["payload"] = result;
 	return next();
 });
@@ -55,9 +52,7 @@ router.post("/", async_handler_default(async (req, res, next) => {
 			res.locals["payload"] = { data: item };
 		}
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -82,11 +77,10 @@ const readHandler = async_handler_default(async (req, res, next) => {
 router.get("/", validateBatch("read"), readHandler, respond);
 router.search("/", validateBatch("read"), readHandler, respond);
 router.get("/:pk", async_handler_default(async (req, res, next) => {
-	const service = new FlowsService({
+	const record = await new FlowsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const record = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: record || null };
 	return next();
 }), respond);
@@ -96,11 +90,9 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		schema: req.schema
 	});
 	let keys = [];
-	if (Array.isArray(req.body)) {
-		keys = await service.updateBatch(req.body);
-	} else if (req.body.keys) {
-		keys = await service.updateMany(req.body.keys, req.body.data);
-	} else {
+	if (Array.isArray(req.body)) keys = await service.updateBatch(req.body);
+	else if (req.body.keys) keys = await service.updateMany(req.body.keys, req.body.data);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		keys = await service.updateByQuery(sanitizedQuery, req.body.data);
 	}
@@ -108,9 +100,7 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		const result = await service.readMany(keys, req.sanitizedQuery);
 		res.locals["payload"] = { data: result };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -125,9 +115,7 @@ router.patch("/:pk", async_handler_default(async (req, res, next) => {
 		const item = await service.readOne(primaryKey, req.sanitizedQuery);
 		res.locals["payload"] = { data: item || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -137,22 +125,19 @@ router.delete("/", async_handler_default(async (req, _res, next) => {
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	if (Array.isArray(req.body)) {
-		await service.deleteMany(req.body);
-	} else if (req.body.keys) {
-		await service.deleteMany(req.body.keys);
-	} else {
+	if (Array.isArray(req.body)) await service.deleteMany(req.body);
+	else if (req.body.keys) await service.deleteMany(req.body.keys);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		await service.deleteByQuery(sanitizedQuery);
 	}
 	return next();
 }), respond);
 router.delete("/:pk", async_handler_default(async (req, _res, next) => {
-	const service = new FlowsService({
+	await new FlowsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 var flows_default = router;

package/dist/controllers/folders.js

@@ -33,9 +33,7 @@ router.post("/", async_handler_default(async (req, res, next) => {
 			res.locals["payload"] = { data: record };
 		}
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -50,13 +48,9 @@ const readHandler = async_handler_default(async (req, res, next) => {
 		schema: req.schema
 	});
 	let result;
-	if (req.singleton) {
-		result = await service.readSingleton(req.sanitizedQuery);
-	} else if (req.body.keys) {
-		result = await service.readMany(req.body.keys, req.sanitizedQuery);
-	} else {
-		result = await service.readByQuery(req.sanitizedQuery);
-	}
+	if (req.singleton) result = await service.readSingleton(req.sanitizedQuery);
+	else if (req.body.keys) result = await service.readMany(req.body.keys, req.sanitizedQuery);
+	else result = await service.readByQuery(req.sanitizedQuery);
 	const meta = await metaService.getMetaForQuery("directus_folders", req.sanitizedQuery);
 	res.locals["payload"] = {
 		data: result,
@@ -67,11 +61,10 @@ const readHandler = async_handler_default(async (req, res, next) => {
 router.get("/", validateBatch("read"), readHandler, respond);
 router.search("/", validateBatch("read"), readHandler, respond);
 router.get("/:pk", async_handler_default(async (req, res, next) => {
-	const service = new FoldersService({
+	const record = await new FoldersService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const record = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: record || null };
 	return next();
 }), respond);
@@ -81,11 +74,9 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		schema: req.schema
 	});
 	let keys = [];
-	if (Array.isArray(req.body)) {
-		keys = await service.updateBatch(req.body);
-	} else if (req.body.keys) {
-		keys = await service.updateMany(req.body.keys, req.body.data);
-	} else {
+	if (Array.isArray(req.body)) keys = await service.updateBatch(req.body);
+	else if (req.body.keys) keys = await service.updateMany(req.body.keys, req.body.data);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		keys = await service.updateByQuery(sanitizedQuery, req.body.data);
 	}
@@ -93,9 +84,7 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		const result = await service.readMany(keys, req.sanitizedQuery);
 		res.locals["payload"] = { data: result || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -110,9 +99,7 @@ router.patch("/:pk", async_handler_default(async (req, res, next) => {
 		const record = await service.readOne(primaryKey, req.sanitizedQuery);
 		res.locals["payload"] = { data: record || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -122,22 +109,19 @@ router.delete("/", validateBatch("delete"), async_handler_default(async (req, _r
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	if (Array.isArray(req.body)) {
-		await service.deleteMany(req.body);
-	} else if (req.body.keys) {
-		await service.deleteMany(req.body.keys);
-	} else {
+	if (Array.isArray(req.body)) await service.deleteMany(req.body);
+	else if (req.body.keys) await service.deleteMany(req.body.keys);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		await service.deleteByQuery(sanitizedQuery);
 	}
 	return next();
 }), respond);
 router.delete("/:pk", async_handler_default(async (req, _res, next) => {
-	const service = new FoldersService({
+	await new FoldersService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 var folders_default = router;

package/dist/controllers/graphql.js

@@ -13,9 +13,7 @@ router.use("/system", parseGraphQL, async_handler_default(async (req, res, next)
 		scope: "system"
 	});
 	res.locals["payload"] = await service.execute(res.locals["graphqlParams"]);
-	if (res.locals["payload"]?.errors?.length > 0) {
-		res.locals["cache"] = false;
-	}
+	if (res.locals["payload"]?.errors?.length > 0) res.locals["cache"] = false;
 	return next();
 }), respond);
 router.use("/", parseGraphQL, async_handler_default(async (req, res, next) => {
@@ -25,9 +23,7 @@ router.use("/", parseGraphQL, async_handler_default(async (req, res, next) => {
 		scope: "items"
 	});
 	res.locals["payload"] = await service.execute(res.locals["graphqlParams"]);
-	if (res.locals["payload"]?.errors?.length > 0) {
-		res.locals["cache"] = false;
-	}
+	if (res.locals["payload"]?.errors?.length > 0) res.locals["cache"] = false;
 	return next();
 }), respond);
 var graphql_default = router;

package/dist/controllers/items.js

@@ -13,9 +13,7 @@ import { isSystemCollection } from "@directus/system-data";
 const router = express.Router();
 router.post("/:collection", collection_exists_default, async_handler_default(async (req, res, next) => {
 	if (isSystemCollection(req.params["collection"])) throw new ForbiddenError();
-	if (req.singleton) {
-		throw new RouteNotFoundError({ path: req.path });
-	}
+	if (req.singleton) throw new RouteNotFoundError({ path: req.path });
 	const service = new ItemsService(req.collection, {
 		accountability: req.accountability,
 		schema: req.schema
@@ -37,9 +35,7 @@ router.post("/:collection", collection_exists_default, async_handler_default(asy
 			res.locals["payload"] = { data: result || null };
 		}
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -55,13 +51,9 @@ const readHandler = async_handler_default(async (req, res, next) => {
 		schema: req.schema
 	});
 	let result;
-	if (req.singleton) {
-		result = await service.readSingleton(req.sanitizedQuery);
-	} else if (req.body.keys) {
-		result = await service.readMany(req.body.keys, req.sanitizedQuery);
-	} else {
-		result = await service.readByQuery(req.sanitizedQuery);
-	}
+	if (req.singleton) result = await service.readSingleton(req.sanitizedQuery);
+	else if (req.body.keys) result = await service.readMany(req.body.keys, req.sanitizedQuery);
+	else result = await service.readByQuery(req.sanitizedQuery);
 	const meta = await metaService.getMetaForQuery(req.collection, req.sanitizedQuery);
 	res.locals["payload"] = {
 		meta,
@@ -73,11 +65,10 @@ router.search("/:collection", collection_exists_default, validateBatch("read"),
 router.get("/:collection", collection_exists_default, readHandler, respond);
 router.get("/:collection/:pk", collection_exists_default, async_handler_default(async (req, res, next) => {
 	if (isSystemCollection(req.params["collection"])) throw new ForbiddenError();
-	const service = new ItemsService(req.collection, {
+	const result = await new ItemsService(req.collection, {
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const result = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: result || null };
 	return next();
 }), respond);
@@ -94,11 +85,9 @@ router.patch("/:collection", collection_exists_default, validateBatch("update"),
 		return next();
 	}
 	let keys = [];
-	if (Array.isArray(req.body)) {
-		keys = await service.updateBatch(req.body);
-	} else if (req.body.keys) {
-		keys = await service.updateMany(req.body.keys, req.body.data);
-	} else {
+	if (Array.isArray(req.body)) keys = await service.updateBatch(req.body);
+	else if (req.body.keys) keys = await service.updateMany(req.body.keys, req.body.data);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		keys = await service.updateByQuery(sanitizedQuery, req.body.data);
 	}
@@ -106,18 +95,14 @@ router.patch("/:collection", collection_exists_default, validateBatch("update"),
 		const result = await service.readMany(keys, req.sanitizedQuery);
 		res.locals["payload"] = { data: result };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
 }), respond);
 router.patch("/:collection/:pk", collection_exists_default, async_handler_default(async (req, res, next) => {
 	if (isSystemCollection(req.params["collection"])) throw new ForbiddenError();
-	if (req.singleton) {
-		throw new RouteNotFoundError({ path: req.path });
-	}
+	if (req.singleton) throw new RouteNotFoundError({ path: req.path });
 	const service = new ItemsService(req.collection, {
 		accountability: req.accountability,
 		schema: req.schema
@@ -127,9 +112,7 @@ router.patch("/:collection/:pk", collection_exists_default, async_handler_defaul
 		const result = await service.readOne(updatedPrimaryKey, req.sanitizedQuery);
 		res.locals["payload"] = { data: result || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -140,11 +123,9 @@ router.delete("/:collection", collection_exists_default, validateBatch("delete")
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	if (Array.isArray(req.body)) {
-		await service.deleteMany(req.body);
-	} else if (req.body.keys) {
-		await service.deleteMany(req.body.keys);
-	} else {
+	if (Array.isArray(req.body)) await service.deleteMany(req.body);
+	else if (req.body.keys) await service.deleteMany(req.body.keys);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		await service.deleteByQuery(sanitizedQuery);
 	}
@@ -152,11 +133,10 @@ router.delete("/:collection", collection_exists_default, validateBatch("delete")
 }), respond);
 router.delete("/:collection/:pk", collection_exists_default, async_handler_default(async (req, _res, next) => {
 	if (isSystemCollection(req.params["collection"])) throw new ForbiddenError();
-	const service = new ItemsService(req.collection, {
+	await new ItemsService(req.collection, {
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 var items_default = router;

package/dist/controllers/mcp.js

@@ -8,24 +8,20 @@ import { Router } from "express";
 //#region src/controllers/mcp.ts
 const router = Router();
 const mcpHandler = async_handler_default(async (req, res) => {
-	const settings = new SettingsService({ schema: req.schema });
-	const { mcp_enabled, mcp_allow_deletes, mcp_prompts_collection, mcp_system_prompt, mcp_system_prompt_enabled } = await settings.readSingleton({ fields: [
+	const { mcp_enabled, mcp_allow_deletes, mcp_prompts_collection, mcp_system_prompt, mcp_system_prompt_enabled } = await new SettingsService({ schema: req.schema }).readSingleton({ fields: [
 		"mcp_enabled",
 		"mcp_allow_deletes",
 		"mcp_prompts_collection",
 		"mcp_system_prompt",
 		"mcp_system_prompt_enabled"
 	] });
-	if (!mcp_enabled) {
-		throw new ForbiddenError({ reason: "MCP must be enabled" });
-	}
-	const mcp = new DirectusMCP({
+	if (!mcp_enabled) throw new ForbiddenError({ reason: "MCP must be enabled" });
+	new DirectusMCP({
 		promptsCollection: mcp_prompts_collection,
 		allowDeletes: mcp_allow_deletes,
 		systemPromptEnabled: mcp_system_prompt_enabled,
 		systemPrompt: mcp_system_prompt
-	});
-	mcp.handleRequest(req, res);
+	}).handleRequest(req, res);
 });
 router.get("/", mcpHandler);
 router.post("/", mcpHandler);

package/dist/controllers/metrics.js

@@ -10,20 +10,12 @@ const env = useEnv();
 const router = Router();
 const metrics = useMetrics();
 router.get("/", async_handler_default(async (req, _res, next) => {
-	if (req.accountability?.admin === true) {
-		return next();
-	}
+	if (req.accountability?.admin === true) return next();
 	const metricTokens = env["METRICS_TOKENS"];
-	if (!req.headers || !req.headers.authorization || !metricTokens) {
-		throw new ForbiddenError();
-	}
+	if (!req.headers || !req.headers.authorization || !metricTokens) throw new ForbiddenError();
 	const parts = req.headers.authorization.split(" ");
-	if (parts.length !== 2 || parts[0].toLowerCase() !== "metrics") {
-		throw new ForbiddenError();
-	}
-	if (metricTokens.find((mt) => mt.toString() === parts[1]) !== undefined) {
-		return next();
-	}
+	if (parts.length !== 2 || parts[0].toLowerCase() !== "metrics") throw new ForbiddenError();
+	if (metricTokens.find((mt) => mt.toString() === parts[1]) !== void 0) return next();
 	throw new ForbiddenError();
 }), async_handler_default(async (_req, res) => {
 	res.set("Content-Type", "text/plain");

package/dist/controllers/not-found.js

@@ -16,17 +16,14 @@ import { RouteNotFoundError } from "@directus/errors";
 */
 const notFound = async (req, res, next) => {
 	try {
-		const hooksResult = await emitter_default.emitFilter("request.not_found", false, {
+		if (await emitter_default.emitFilter("request.not_found", false, {
 			request: req,
 			response: res
 		}, {
 			database: database_default(),
 			schema: req.schema,
 			accountability: req.accountability ?? null
-		});
-		if (hooksResult) {
-			return next();
-		}
+		})) return next();
 		next(new RouteNotFoundError({ path: req.path }));
 	} catch (err) {
 		next(err);