@directus/api 35.0.2 → 35.1.0

package/dist/controllers/tus.js

@@ -18,9 +18,8 @@ const mapAction = (method) => {
 };
 const checkFileAccess = async_handler_default(async (req, _res, next) => {
 	if (req.accountability) {
-		const action = mapAction(req.method);
 		const validateAccessOptions = {
-			action,
+			action: mapAction(req.method),
 			collection: "directus_files",
 			accountability: req.accountability
 		};
@@ -37,16 +36,10 @@ const checkFileAccess = async_handler_default(async (req, _res, next) => {
 			}
 			const fields = [];
 			for (const field of Object.keys(req.schema.collections["directus_files"].fields)) {
-				if (field === "id") {
-					continue;
-				}
-				if (field in metadata) {
-					fields.push(field);
-				}
-			}
-			if (fields.length > 0) {
-				validateAccessOptions.fields = fields;
+				if (field === "id") continue;
+				if (field in metadata) fields.push(field);
 			}
+			if (fields.length > 0) validateAccessOptions.fields = fields;
 		}
 		await validateAccess(validateAccessOptions, {
 			schema: req.schema,

package/dist/controllers/users.js

@@ -39,9 +39,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();
@@ -70,9 +68,7 @@ router.get("/me", async_handler_default(async (req, res, next) => {
 		res.locals["payload"] = { data: { share: req.accountability?.share } };
 		return next();
 	}
-	if (!req.accountability?.user) {
-		throw new InvalidCredentialsError();
-	}
+	if (!req.accountability?.user) throw new InvalidCredentialsError();
 	const service = new UsersService({
 		accountability: req.accountability,
 		schema: req.schema
@@ -91,18 +87,15 @@ router.get("/me", async_handler_default(async (req, res, next) => {
 }), respond);
 router.get("/:pk", async_handler_default(async (req, res, next) => {
 	if (req.path.endsWith("me")) return next();
-	const service = new UsersService({
+	const items = await new UsersService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const items = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: items || null };
 	return next();
 }), respond);
 router.patch("/me", async_handler_default(async (req, res, next) => {
-	if (!req.accountability?.user) {
-		throw new InvalidCredentialsError();
-	}
+	if (!req.accountability?.user) throw new InvalidCredentialsError();
 	const service = new UsersService({
 		accountability: req.accountability,
 		schema: req.schema
@@ -113,14 +106,9 @@ router.patch("/me", async_handler_default(async (req, res, next) => {
 	return next();
 }), respond);
 router.patch("/me/track/page", async_handler_default(async (req, _res, next) => {
-	if (!req.accountability?.user) {
-		throw new InvalidCredentialsError();
-	}
-	if (!req.body.last_page) {
-		throw new InvalidPayloadError({ reason: `"last_page" key is required` });
-	}
-	const service = new UsersService({ schema: req.schema });
-	await service.updateOne(req.accountability.user, { last_page: req.body.last_page }, { autoPurgeCache: false });
+	if (!req.accountability?.user) throw new InvalidCredentialsError();
+	if (!req.body.last_page) throw new InvalidPayloadError({ reason: `"last_page" key is required` });
+	await new UsersService({ schema: req.schema }).updateOne(req.accountability.user, { last_page: req.body.last_page }, { autoPurgeCache: false });
 	return next();
 }), respond);
 router.patch("/", validateBatch("update"), async_handler_default(async (req, res, next) => {
@@ -129,11 +117,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);
 	}
@@ -141,9 +127,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();
@@ -158,9 +142,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();
@@ -170,22 +152,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 UsersService({
+	await new UsersService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 const inviteSchema = Joi.object({
@@ -196,11 +175,10 @@ const inviteSchema = Joi.object({
 router.post("/invite", async_handler_default(async (req, _res, next) => {
 	const { error } = inviteSchema.validate(req.body);
 	if (error) throw new InvalidPayloadError({ reason: error.message });
-	const service = new UsersService({
+	await new UsersService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.inviteUser(req.body.email, req.body.role, req.body.invite_url || null);
+	}).inviteUser(req.body.email, req.body.role, req.body.invite_url || null);
 	return next();
 }), respond);
 const acceptInviteSchema = Joi.object({
@@ -210,33 +188,24 @@ const acceptInviteSchema = Joi.object({
 router.post("/invite/accept", async_handler_default(async (req, _res, next) => {
 	const { error } = acceptInviteSchema.validate(req.body);
 	if (error) throw new InvalidPayloadError({ reason: error.message });
-	const service = new UsersService({
+	await new UsersService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.acceptInvite(req.body.token, req.body.password);
+	}).acceptInvite(req.body.token, req.body.password);
 	return next();
 }), respond);
 router.post("/me/tfa/generate/", async_handler_default(async (req, res, next) => {
-	if (!req.accountability?.user) {
-		throw new InvalidCredentialsError();
-	}
-	const currentUser = await getDatabase().select("provider").from("directus_users").where({ id: req.accountability.user }).first();
-	const requiresPassword = currentUser?.["provider"] === DEFAULT_AUTH_PROVIDER;
-	if (requiresPassword && !req.body.password) {
-		throw new InvalidPayloadError({ reason: `"password" is required` });
-	}
+	if (!req.accountability?.user) throw new InvalidCredentialsError();
+	const requiresPassword = (await getDatabase().select("provider").from("directus_users").where({ id: req.accountability.user }).first())?.["provider"] === DEFAULT_AUTH_PROVIDER;
+	if (requiresPassword && !req.body.password) throw new InvalidPayloadError({ reason: `"password" is required` });
 	const service = new TFAService({
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	if (requiresPassword) {
-		const authService = new AuthenticationService({
-			accountability: req.accountability,
-			schema: req.schema
-		});
-		await authService.verifyPassword(req.accountability.user, req.body.password);
-	}
+	if (requiresPassword) await new AuthenticationService({
+		accountability: req.accountability,
+		schema: req.schema
+	}).verifyPassword(req.accountability.user, req.body.password);
 	const { url, secret } = await service.generateTFA(req.accountability.user, requiresPassword);
 	res.locals["payload"] = { data: {
 		secret,
@@ -245,52 +214,33 @@ router.post("/me/tfa/generate/", async_handler_default(async (req, res, next) =>
 	return next();
 }), respond);
 router.post("/me/tfa/enable/", async_handler_default(async (req, _res, next) => {
-	if (!req.accountability?.user) {
-		throw new InvalidCredentialsError();
-	}
-	if (!req.body.secret) {
-		throw new InvalidPayloadError({ reason: `"secret" is required` });
-	}
-	if (!req.body.otp) {
-		throw new InvalidPayloadError({ reason: `"otp" is required` });
-	}
-	const service = new TFAService({
+	if (!req.accountability?.user) throw new InvalidCredentialsError();
+	if (!req.body.secret) throw new InvalidPayloadError({ reason: `"secret" is required` });
+	if (!req.body.otp) throw new InvalidPayloadError({ reason: `"otp" is required` });
+	await new TFAService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.enableTFA(req.accountability.user, req.body.otp, req.body.secret);
+	}).enableTFA(req.accountability.user, req.body.otp, req.body.secret);
 	return next();
 }), respond);
 router.post("/me/tfa/disable", async_handler_default(async (req, _res, next) => {
-	if (!req.accountability?.user) {
-		throw new InvalidCredentialsError();
-	}
-	if (!req.body.otp) {
-		throw new InvalidPayloadError({ reason: `"otp" is required` });
-	}
+	if (!req.accountability?.user) throw new InvalidCredentialsError();
+	if (!req.body.otp) throw new InvalidPayloadError({ reason: `"otp" is required` });
 	const service = new TFAService({
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	const otpValid = await service.verifyOTP(req.accountability.user, req.body.otp);
-	if (otpValid === false) {
-		throw new InvalidPayloadError({ reason: `"otp" is invalid` });
-	}
+	if (await service.verifyOTP(req.accountability.user, req.body.otp) === false) throw new InvalidPayloadError({ reason: `"otp" is invalid` });
 	await service.disableTFA(req.accountability.user);
 	return next();
 }), respond);
 router.post("/:pk/tfa/disable", async_handler_default(async (req, _res, next) => {
-	if (!req.accountability?.user) {
-		throw new InvalidCredentialsError();
-	}
-	if (!req.accountability.admin || !req.params["pk"]) {
-		throw new ForbiddenError();
-	}
-	const service = new TFAService({
+	if (!req.accountability?.user) throw new InvalidCredentialsError();
+	if (!req.accountability.admin || !req.params["pk"]) throw new ForbiddenError();
+	await new TFAService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.disableTFA(req.params["pk"]);
+	}).disableTFA(req.params["pk"]);
 	return next();
 }), respond);
 const registerSchema = Joi.object({
@@ -303,24 +253,20 @@ const registerSchema = Joi.object({
 router.post("/register", rate_limiter_registration_default, async_handler_default(async (req, _res, next) => {
 	const { error, value } = registerSchema.validate(req.body);
 	if (error) throw new InvalidPayloadError({ reason: error.message });
-	const usersService = new UsersService({
+	await new UsersService({
 		accountability: null,
 		schema: req.schema
-	});
-	await usersService.registerUser(value);
+	}).registerUser(value);
 	return next();
 }), respond);
 const verifyRegistrationSchema = Joi.string();
 router.get("/register/verify-email", async_handler_default(async (req, res, _next) => {
 	const { error, value } = verifyRegistrationSchema.validate(req.query["token"]);
-	if (error) {
-		return res.redirect("/admin/login");
-	}
-	const service = new UsersService({
+	if (error) return res.redirect("/admin/login");
+	const id = await new UsersService({
 		accountability: null,
 		schema: req.schema
-	});
-	const id = await service.verifyRegistration(value);
+	}).verifyRegistration(value);
 	return res.redirect(`/admin/users/${id}`);
 }), respond);
 var users_default = router;

package/dist/controllers/utils/handle-registry-error.js

@@ -0,0 +1,26 @@
+import { ServiceUnavailableError } from "@directus/errors";
+
+//#region src/controllers/utils/handle-registry-error.ts
+function handleRegistryError(error) {
+	if (error instanceof Error) {
+		if (error.name === "TimeoutError") throw new ServiceUnavailableError({
+			service: "marketplace",
+			reason: "The registry server is not responding"
+		});
+		if (error.name === "TypeError" && error.message.includes("fetch")) throw new ServiceUnavailableError({
+			service: "marketplace",
+			reason: "Unable to connect to the registry server"
+		});
+		throw new ServiceUnavailableError({
+			service: "marketplace",
+			reason: error.message
+		});
+	}
+	throw new ServiceUnavailableError({
+		service: "marketplace",
+		reason: "An unknown error occurred"
+	});
+}
+
+//#endregion
+export { handleRegistryError };

package/dist/controllers/utils.js

@@ -28,19 +28,13 @@ router.get("/random/string", async_handler_default(async (req, res) => {
 	return res.json({ data: nanoid(value.length) });
 }));
 router.post("/hash/generate", async_handler_default(async (req, res) => {
-	if (!req.body?.string) {
-		throw new InvalidPayloadError({ reason: `"string" is required` });
-	}
+	if (!req.body?.string) throw new InvalidPayloadError({ reason: `"string" is required` });
 	const hash = await generateHash(req.body.string);
 	return res.json({ data: hash });
 }));
 router.post("/hash/verify", async_handler_default(async (req, res) => {
-	if (!req.body?.string) {
-		throw new InvalidPayloadError({ reason: `"string" is required` });
-	}
-	if (!req.body?.hash) {
-		throw new InvalidPayloadError({ reason: `"hash" is required` });
-	}
+	if (!req.body?.string) throw new InvalidPayloadError({ reason: `"string" is required` });
+	if (!req.body?.hash) throw new InvalidPayloadError({ reason: `"hash" is required` });
 	try {
 		const result = await argon2.verify(req.body.hash, req.body.string);
 		return res.json({ data: result });
@@ -55,41 +49,34 @@ const SortSchema = Joi.object({
 router.post("/sort/:collection", collection_exists_default, async_handler_default(async (req, res) => {
 	const { error } = SortSchema.validate(req.body);
 	if (error) throw new InvalidPayloadError({ reason: error.message });
-	const service = new UtilsService({
+	await new UtilsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.sort(req.collection, req.body);
+	}).sort(req.collection, req.body);
 	return res.status(200).end();
 }));
 router.post("/revert/:revision", async_handler_default(async (req, _res, next) => {
-	const service = new RevisionsService({
+	await new RevisionsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.revert(req.params["revision"]);
+	}).revert(req.params["revision"]);
 	next();
 }), respond);
 router.post("/import/:collection", collection_exists_default, async_handler_default(async (req, res, next) => {
-	if (req.is("multipart/form-data") === false) {
-		throw new UnsupportedMediaTypeError({
-			mediaType: req.headers["content-type"],
-			where: "Content-Type header"
-		});
-	}
+	if (req.is("multipart/form-data") === false) throw new UnsupportedMediaTypeError({
+		mediaType: req.headers["content-type"],
+		where: "Content-Type header"
+	});
 	const service = new ImportService({
 		accountability: req.accountability,
 		schema: req.schema
 	});
 	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 });
 	busboy.on("file", async (_fieldname, fileStream, { mimeType }) => {
 		try {
@@ -103,12 +90,8 @@ router.post("/import/:collection", collection_exists_default, async_handler_defa
 	req.pipe(busboy);
 }));
 router.post("/export/:collection", collection_exists_default, async_handler_default(async (req, _res, next) => {
-	if (!req.body.query) {
-		throw new InvalidPayloadError({ reason: `"query" is required` });
-	}
-	if (!req.body.format) {
-		throw new InvalidPayloadError({ reason: `"format" is required` });
-	}
+	if (!req.body.query) throw new InvalidPayloadError({ reason: `"query" is required` });
+	if (!req.body.format) throw new InvalidPayloadError({ reason: `"format" is required` });
 	const service = new ExportService({
 		accountability: req.accountability,
 		schema: req.schema
@@ -142,12 +125,8 @@ router.post("/cache/clear", async_handler_default(async (req, res) => {
 	res.status(200).end();
 }));
 router.post("/resolve-redirect", async_handler_default(async (req, res) => {
-	if (!req.body?.redirect) {
-		throw new InvalidPayloadError({ reason: `"redirect" is required` });
-	}
-	if (req.body?.provider && typeof req.body.provider !== "string") {
-		throw new InvalidPayloadError({ reason: `"provider" must be a string` });
-	}
+	if (!req.body?.redirect) throw new InvalidPayloadError({ reason: `"redirect" is required` });
+	if (req.body?.provider && typeof req.body.provider !== "string") throw new InvalidPayloadError({ reason: `"provider" must be a string` });
 	try {
 		const resolved = resolveLoginRedirect(req.body.redirect, { provider: req.body.provider });
 		return res.json({ data: resolved });

package/dist/controllers/versions.js

@@ -34,9 +34,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();
@@ -51,13 +49,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"] = {
 		data: result,
@@ -68,11 +62,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 VersionsService({
+	const record = await new VersionsService({
 		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);
@@ -82,11 +75,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);
 	}
@@ -94,9 +85,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();
@@ -111,9 +100,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();
@@ -123,22 +110,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 VersionsService({
+	await new VersionsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 router.get("/:pk/compare", async_handler_default(async (req, res, next) => {
@@ -165,21 +149,16 @@ router.post("/:pk/save", async_handler_default(async (req, res, next) => {
 		schema: req.schema
 	});
 	const version = await service.readOne(req.params["pk"]);
-	const mainItem = await service.getMainItem(version["collection"], version["item"]);
-	const updatedVersion = await service.save(req.params["pk"], req.body);
-	const result = assign(mainItem, updatedVersion);
+	const result = assign(await service.getMainItem(version["collection"], version["item"]), await service.save(req.params["pk"], req.body));
 	res.locals["payload"] = { data: result || null };
 	return next();
 }), respond);
 router.post("/:pk/promote", async_handler_default(async (req, res, next) => {
-	if (typeof req.body.mainHash !== "string") {
-		throw new InvalidPayloadError({ reason: `"mainHash" field is required` });
-	}
-	const service = new VersionsService({
+	if (typeof req.body.mainHash !== "string") throw new InvalidPayloadError({ reason: `"mainHash" field is required` });
+	const updatedItemKey = await new VersionsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const updatedItemKey = await service.promote(req.params["pk"], req.body.mainHash, req.body?.["fields"]);
+	}).promote(req.params["pk"], req.body.mainHash, req.body?.["fields"]);
 	res.locals["payload"] = { data: updatedItemKey || null };
 	return next();
 }), respond);

package/dist/database/errors/dialects/mssql.js

@@ -65,23 +65,12 @@ async function extractError(error, data) {
 		});
 	}
 	function numericValueOutOfRange() {
-		const betweenBrackets = /\[([^\]]+)\]/g;
-		const bracketMatches = error.message.match(betweenBrackets);
+		const bracketMatches = error.message.match(/\[([^\]]+)\]/g);
 		if (!bracketMatches) return error;
-		const collection = bracketMatches[0].slice(1, -1);
-		/**
-		* NOTE
-		* MS SQL Doesn't return the offending column name in the error, nor any other identifying information
-		* we can use to extract the column name :(
-		*
-		* insert into [test1] ([small]) values (@p0)
-		* - Arithmetic overflow error for data type tinyint, value = 50000.
-		*/
-		const field = null;
 		return new ValueOutOfRangeError({
-			collection,
-			field,
-			value: field ? data[field] : null
+			collection: bracketMatches[0].slice(1, -1),
+			field: null,
+			value: null
 		});
 	}
 	function valueLimitViolation() {
@@ -106,12 +95,10 @@ async function extractError(error, data) {
 		if (!bracketMatches || !quoteMatches) return error;
 		const collection = bracketMatches[0].slice(1, -1);
 		const field = quoteMatches[0].slice(1, -1);
-		if (error.message.includes("Cannot insert the value NULL into column")) {
-			return new ContainsNullValuesError({
-				collection,
-				field
-			});
-		}
+		if (error.message.includes("Cannot insert the value NULL into column")) return new ContainsNullValuesError({
+			collection,
+			field
+		});
 		return new NotNullViolationError({
 			collection,
 			field

package/dist/database/errors/dialects/mysql.js

@@ -23,8 +23,7 @@ function extractError(error, data) {
 	}
 	return error;
 	function uniqueViolation() {
-		const betweenQuotes = /'([^']+)'/g;
-		const matches = error.sqlMessage.match(betweenQuotes);
+		const matches = error.sqlMessage.match(/'([^']+)'/g);
 		if (!matches) return error;
 		/**
 		* MySQL's error doesn't return the field name in the error. In case the field is created through
@@ -36,15 +35,12 @@ function extractError(error, data) {
 		let collection;
 		let indexName;
 		let field = null;
-		if (matches[1].includes(".")) {
-			[collection, indexName] = matches[1].slice(1, -1).split(".");
-		} else {
+		if (matches[1].includes(".")) [collection, indexName] = matches[1].slice(1, -1).split(".");
+		else {
 			indexName = matches[1].slice(1, -1);
 			collection = indexName.includes("_") ? indexName.split("_")[0] : null;
 		}
-		if (collection !== null && indexName.startsWith(`${collection}_`) && indexName.endsWith("_unique")) {
-			field = indexName?.slice(collection.length + 1, -7);
-		}
+		if (collection !== null && indexName.startsWith(`${collection}_`) && indexName.endsWith("_unique")) field = indexName?.slice(collection.length + 1, -7);
 		return new RecordNotUniqueError({
 			collection,
 			field,
@@ -108,14 +104,11 @@ function extractError(error, data) {
 		});
 	}
 	function containsNullValues() {
-		const betweenTicks = /`([^`]+)`/g;
-		const tickMatches = error.sql.match(betweenTicks);
+		const tickMatches = error.sql.match(/`([^`]+)`/g);
 		if (!tickMatches) return error;
-		const collection = tickMatches[0].slice(1, -1);
-		const field = tickMatches[1].slice(1, -1);
 		return new ContainsNullValuesError({
-			collection,
-			field
+			collection: tickMatches[0].slice(1, -1),
+			field: tickMatches[1].slice(1, -1)
 		});
 	}
 }