@directus/api 35.0.2 → 35.1.0

package/dist/utils/transformations.js

@@ -3,27 +3,21 @@ import { clamp } from "lodash-es";
 //#region src/utils/transformations.ts
 function resolvePreset({ transformationParams, acceptFormat }, file) {
 	const transforms = transformationParams.transforms ? [...transformationParams.transforms] : [];
-	if (transformationParams.format || transformationParams.quality) {
-		transforms.push([
-			"toFormat",
-			getFormat(file, transformationParams.format, acceptFormat),
-			{ quality: transformationParams.quality ? Number(transformationParams.quality) : undefined }
-		]);
-	}
+	if (transformationParams.format || transformationParams.quality) transforms.push([
+		"toFormat",
+		getFormat(file, transformationParams.format, acceptFormat),
+		{ quality: transformationParams.quality ? Number(transformationParams.quality) : void 0 }
+	]);
 	if ((transformationParams.width || transformationParams.height) && file.width && file.height) {
-		let toWidth = transformationParams.width ? Number(transformationParams.width) : undefined;
-		let toHeight = transformationParams.height ? Number(transformationParams.height) : undefined;
+		let toWidth = transformationParams.width ? Number(transformationParams.width) : void 0;
+		let toHeight = transformationParams.height ? Number(transformationParams.height) : void 0;
 		if (transformationParams.withoutEnlargement) {
-			if (toWidth !== undefined) {
-				toWidth = Math.min(toWidth, file.width);
-			}
-			if (toHeight !== undefined) {
-				toHeight = Math.min(toHeight, file.height);
-			}
+			if (toWidth !== void 0) toWidth = Math.min(toWidth, file.width);
+			if (toHeight !== void 0) toHeight = Math.min(toHeight, file.height);
 		}
 		const toFocalPointX = transformationParams.focal_point_x ? Number(transformationParams.focal_point_x) : file.focal_point_x;
 		const toFocalPointY = transformationParams.focal_point_y ? Number(transformationParams.focal_point_y) : file.focal_point_y;
-		if ((transformationParams.fit === undefined || transformationParams.fit === "cover") && toWidth && toHeight && toFocalPointX !== null && toFocalPointY !== null) {
+		if ((transformationParams.fit === void 0 || transformationParams.fit === "cover") && toWidth && toHeight && toFocalPointX !== null && toFocalPointY !== null) {
 			const transformArgs = getResizeArguments({
 				w: file.width,
 				h: file.height
@@ -38,35 +32,27 @@ function resolvePreset({ transformationParams, acceptFormat }, file) {
 				width: transformArgs.width,
 				height: transformArgs.height,
 				fit: transformationParams.fit,
-				withoutEnlargement: transformationParams.withoutEnlargement ? Boolean(transformationParams.withoutEnlargement) : undefined
+				withoutEnlargement: transformationParams.withoutEnlargement ? Boolean(transformationParams.withoutEnlargement) : void 0
 			}], ["extract", transformArgs.region]);
-		} else {
-			transforms.push(["resize", {
-				width: toWidth,
-				height: toHeight,
-				fit: transformationParams.fit,
-				withoutEnlargement: transformationParams.withoutEnlargement ? Boolean(transformationParams.withoutEnlargement) : undefined
-			}]);
-		}
+		} else transforms.push(["resize", {
+			width: toWidth,
+			height: toHeight,
+			fit: transformationParams.fit,
+			withoutEnlargement: transformationParams.withoutEnlargement ? Boolean(transformationParams.withoutEnlargement) : void 0
+		}]);
 	}
 	return transforms;
 }
 function getFormat(file, format, acceptFormat) {
 	const fileType = file.type?.split("/")[1];
 	if (format) {
-		if (format !== "auto") {
-			return format;
-		}
-		if (acceptFormat) {
-			return acceptFormat;
-		}
+		if (format !== "auto") return format;
+		if (acceptFormat) return acceptFormat;
 		if (fileType && [
 			"avif",
 			"webp",
 			"tiff"
-		].includes(fileType)) {
-			return "png";
-		}
+		].includes(fileType)) return "png";
 	}
 	return fileType || "jpg";
 }
@@ -76,7 +62,7 @@ function getFormat(file, format, acceptFormat) {
 function maybeExtractFormat(transforms) {
 	const toFormats = transforms.filter((t) => t[0] === "toFormat");
 	const lastToFormat = toFormats[toFormats.length - 1];
-	return lastToFormat ? lastToFormat[1]?.toString() : undefined;
+	return lastToFormat ? lastToFormat[1]?.toString() : void 0;
 }
 /**
 * Resize an image but keep it centered on the focal point.
@@ -84,17 +70,16 @@ function maybeExtractFormat(transforms) {
 */
 function getResizeArguments(original, target, focalPoint) {
 	const { width, height, factor } = getIntermediateDimensions(original, target);
-	const region = getExtractionRegion(factor, focalPoint ?? {
-		x: original.w / 2,
-		y: original.h / 2
-	}, target, {
-		w: width,
-		h: height
-	});
 	return {
 		width,
 		height,
-		region
+		region: getExtractionRegion(factor, focalPoint ?? {
+			x: original.w / 2,
+			y: original.h / 2
+		}, target, {
+			w: width,
+			h: height
+		})
 	};
 }
 /**

package/dist/utils/translations-shared.js

@@ -8,21 +8,15 @@ const STRIPPED_ON_CLONE_SPECIALS = new Set(TRANSLATIONS_STRIPPED_ON_CLONE_SPECIA
 function validateFieldsEligibility(sourceFields) {
 	for (const sourceField of sourceFields) {
 		const specials = Array.isArray(sourceField.meta?.special) ? sourceField.meta.special : [];
-		if (sourceField.type === "alias" || sourceField.meta?.system === true || sourceField.schema?.has_auto_increment === true) {
-			throw new InvalidPayloadError({ reason: `Field "${sourceField.field}" is not eligible for translations` });
-		}
-		if (specials.some((special) => DANGEROUS_SPECIALS.has(special) || RELATIONAL_SPECIALS.has(special))) {
-			throw new InvalidPayloadError({ reason: `Field "${sourceField.field}" is not eligible for translations` });
-		}
+		if (sourceField.type === "alias" || sourceField.meta?.system === true || sourceField.schema?.has_auto_increment === true) throw new InvalidPayloadError({ reason: `Field "${sourceField.field}" is not eligible for translations` });
+		if (specials.some((special) => DANGEROUS_SPECIALS.has(special) || RELATIONAL_SPECIALS.has(special))) throw new InvalidPayloadError({ reason: `Field "${sourceField.field}" is not eligible for translations` });
 	}
 }
 function cloneFields(options) {
 	const { fields: fieldNames, sourceFields } = options;
 	return fieldNames.map((fieldName) => {
 		const sourceField = sourceFields.find((field) => field.field === fieldName);
-		if (!sourceField) {
-			throw new InvalidPayloadError({ reason: `Field "${fieldName}" does not exist in source fields` });
-		}
+		if (!sourceField) throw new InvalidPayloadError({ reason: `Field "${fieldName}" does not exist in source fields` });
 		const clonedMeta = { ...sourceField.meta ?? {} };
 		delete clonedMeta.id;
 		delete clonedMeta.collection;
@@ -33,9 +27,7 @@ function cloneFields(options) {
 		clonedMeta.readonly = false;
 		if (Array.isArray(clonedMeta.special)) {
 			clonedMeta.special = clonedMeta.special.filter((special) => !STRIPPED_ON_CLONE_SPECIALS.has(special));
-			if (clonedMeta.special.length === 0) {
-				clonedMeta.special = null;
-			}
+			if (clonedMeta.special.length === 0) clonedMeta.special = null;
 		}
 		return {
 			field: fieldName,

package/dist/utils/url.js

@@ -33,17 +33,10 @@ var Url = class {
 	}
 	addPath(...paths) {
 		const pathToAdd = paths.flatMap((p) => String(p).split("/")).filter((p) => p !== "");
-		for (const pathSegment of pathToAdd) {
-			if (pathSegment === "..") {
-				this.path.pop();
-			} else if (pathSegment !== ".") {
-				this.path.push(pathSegment);
-			}
-		}
+		for (const pathSegment of pathToAdd) if (pathSegment === "..") this.path.pop();
+		else if (pathSegment !== ".") this.path.push(pathSegment);
 		const lastPath = paths.at(-1);
-		if (pathToAdd.length > 0 && lastPath !== "." && lastPath !== "..") {
-			this.hasTrailingSlash = typeof lastPath === "string" && lastPath.endsWith("/");
-		}
+		if (pathToAdd.length > 0 && lastPath !== "." && lastPath !== "..") this.hasTrailingSlash = typeof lastPath === "string" && lastPath.endsWith("/");
 		return this;
 	}
 	setQuery(key, value) {

package/dist/utils/user-name.js

@@ -1,17 +1,9 @@
 //#region src/utils/user-name.ts
 function userName(user) {
-	if (!user) {
-		return "Unknown User";
-	}
-	if (user.first_name && user.last_name) {
-		return `${user.first_name} ${user.last_name}`;
-	}
-	if (user.first_name) {
-		return user.first_name;
-	}
-	if (user.email) {
-		return user.email;
-	}
+	if (!user) return "Unknown User";
+	if (user.first_name && user.last_name) return `${user.first_name} ${user.last_name}`;
+	if (user.first_name) return user.first_name;
+	if (user.email) return user.email;
 	return "Unknown User";
 }
 

package/dist/utils/validate-diff.js

@@ -58,36 +58,22 @@ const applyJoiSchema = Joi.object({
 function validateApplyDiff(applyDiff, currentSnapshotWithHash) {
 	const { error } = applyJoiSchema.validate(applyDiff);
 	if (error) throw new InvalidPayloadError({ reason: error.message });
-	if (applyDiff.diff.collections.length === 0 && applyDiff.diff.fields.length === 0 && applyDiff.diff.systemFields.length === 0 && applyDiff.diff.relations.length === 0) {
-		return false;
-	}
+	if (applyDiff.diff.collections.length === 0 && applyDiff.diff.fields.length === 0 && applyDiff.diff.systemFields.length === 0 && applyDiff.diff.relations.length === 0) return false;
 	if (applyDiff.hash === currentSnapshotWithHash.hash) return true;
 	for (const diffCollection of applyDiff.diff.collections) {
 		const collection = diffCollection.collection;
 		if (diffCollection.diff[0]?.kind === DiffKind.NEW) {
-			const existingCollection = currentSnapshotWithHash.collections.find((c) => c.collection === diffCollection.collection);
-			if (existingCollection) {
-				throw new InvalidPayloadError({ reason: `Provided diff is trying to create collection "${collection}" but it already exists. Please generate a new diff and try again` });
-			}
+			if (currentSnapshotWithHash.collections.find((c) => c.collection === diffCollection.collection)) throw new InvalidPayloadError({ reason: `Provided diff is trying to create collection "${collection}" but it already exists. Please generate a new diff and try again` });
 		} else if (diffCollection.diff[0]?.kind === DiffKind.DELETE) {
-			const existingCollection = currentSnapshotWithHash.collections.find((c) => c.collection === diffCollection.collection);
-			if (!existingCollection) {
-				throw new InvalidPayloadError({ reason: `Provided diff is trying to delete collection "${collection}" but it does not exist. Please generate a new diff and try again` });
-			}
+			if (!currentSnapshotWithHash.collections.find((c) => c.collection === diffCollection.collection)) throw new InvalidPayloadError({ reason: `Provided diff is trying to delete collection "${collection}" but it does not exist. Please generate a new diff and try again` });
 		}
 	}
 	for (const diffField of applyDiff.diff.fields) {
 		const field = `${diffField.collection}.${diffField.field}`;
 		if (diffField.diff[0]?.kind === DiffKind.NEW) {
-			const existingField = currentSnapshotWithHash.fields.find((f) => f.collection === diffField.collection && f.field === diffField.field);
-			if (existingField) {
-				throw new InvalidPayloadError({ reason: `Provided diff is trying to create field "${field}" but it already exists. Please generate a new diff and try again` });
-			}
+			if (currentSnapshotWithHash.fields.find((f) => f.collection === diffField.collection && f.field === diffField.field)) throw new InvalidPayloadError({ reason: `Provided diff is trying to create field "${field}" but it already exists. Please generate a new diff and try again` });
 		} else if (diffField.diff[0]?.kind === DiffKind.DELETE) {
-			const existingField = currentSnapshotWithHash.fields.find((f) => f.collection === diffField.collection && f.field === diffField.field);
-			if (!existingField) {
-				throw new InvalidPayloadError({ reason: `Provided diff is trying to delete field "${field}" but it does not exist. Please generate a new diff and try again` });
-			}
+			if (!currentSnapshotWithHash.fields.find((f) => f.collection === diffField.collection && f.field === diffField.field)) throw new InvalidPayloadError({ reason: `Provided diff is trying to delete field "${field}" but it does not exist. Please generate a new diff and try again` });
 		}
 	}
 	for (const diffSystemField of applyDiff.diff.systemFields) {
@@ -95,31 +81,20 @@ function validateApplyDiff(applyDiff, currentSnapshotWithHash) {
 		if (!diffSystemField.diff[0]) continue;
 		if (diffSystemField.diff[0].kind !== DiffKind.EDIT) {
 			let action = "update array";
-			if (diffSystemField.diff[0].kind === DiffKind.NEW) {
-				action = "create";
-			} else if (diffSystemField.diff[0].kind === DiffKind.DELETE) {
-				action = "delete";
-			}
+			if (diffSystemField.diff[0].kind === DiffKind.NEW) action = "create";
+			else if (diffSystemField.diff[0].kind === DiffKind.DELETE) action = "delete";
 			throw new InvalidPayloadError({ reason: `Provided diff is trying to ${action} field "${systemField}" but this action is not supported. Please generate a new diff and try again` });
 		}
 		const pathString = diffSystemField.diff[0].path?.join(".") ?? "";
-		if (pathString.length === 0 || pathString !== "schema.is_indexed") {
-			throw new InvalidPayloadError({ reason: `Provided diff is trying to alter property "${pathString}" on "${systemField}" but currently only "schema.is_indexed" is supported. Please generate a new diff and try again` });
-		}
+		if (pathString.length === 0 || pathString !== "schema.is_indexed") throw new InvalidPayloadError({ reason: `Provided diff is trying to alter property "${pathString}" on "${systemField}" but currently only "schema.is_indexed" is supported. Please generate a new diff and try again` });
 	}
 	for (const diffRelation of applyDiff.diff.relations) {
 		let relation = `${diffRelation.collection}.${diffRelation.field}`;
 		if (diffRelation.related_collection) relation += `-> ${diffRelation.related_collection}`;
 		if (diffRelation.diff[0]?.kind === DiffKind.NEW) {
-			const existingRelation = currentSnapshotWithHash.relations.find((r) => r.collection === diffRelation.collection && r.field === diffRelation.field);
-			if (existingRelation) {
-				throw new InvalidPayloadError({ reason: `Provided diff is trying to create relation "${relation}" but it already exists. Please generate a new diff and try again` });
-			}
+			if (currentSnapshotWithHash.relations.find((r) => r.collection === diffRelation.collection && r.field === diffRelation.field)) throw new InvalidPayloadError({ reason: `Provided diff is trying to create relation "${relation}" but it already exists. Please generate a new diff and try again` });
 		} else if (diffRelation.diff[0]?.kind === DiffKind.DELETE) {
-			const existingRelation = currentSnapshotWithHash.relations.find((r) => r.collection === diffRelation.collection && r.field === diffRelation.field);
-			if (!existingRelation) {
-				throw new InvalidPayloadError({ reason: `Provided diff is trying to delete relation "${relation}" but it does not exist. Please generate a new diff and try again` });
-			}
+			if (!currentSnapshotWithHash.relations.find((r) => r.collection === diffRelation.collection && r.field === diffRelation.field)) throw new InvalidPayloadError({ reason: `Provided diff is trying to delete relation "${relation}" but it does not exist. Please generate a new diff and try again` });
 		}
 	}
 	throw new InvalidPayloadError({ reason: `Provided hash does not match the current instance's schema hash, indicating the schema has changed after this diff was generated. Please generate a new diff and try again` });

package/dist/utils/validate-env.js

@@ -5,11 +5,9 @@ import { useEnv } from "@directus/env";
 function validateEnv(requiredKeys) {
 	const env = useEnv();
 	const logger = useLogger();
-	for (const requiredKey of requiredKeys) {
-		if (requiredKey in env === false) {
-			logger.error(`"${requiredKey}" Environment Variable is missing.`);
-			process.exit(1);
-		}
+	for (const requiredKey of requiredKeys) if (requiredKey in env === false) {
+		logger.error(`"${requiredKey}" Environment Variable is missing.`);
+		process.exit(1);
 	}
 }
 

package/dist/utils/validate-keys.js

@@ -6,17 +6,11 @@ import { ForbiddenError } from "@directus/errors";
 * Validate keys based on its type
 */
 function validateKeys(schema, collection, keyField, keys) {
-	if (Array.isArray(keys)) {
-		for (const key of keys) {
-			validateKeys(schema, collection, keyField, key);
-		}
-	} else {
+	if (Array.isArray(keys)) for (const key of keys) validateKeys(schema, collection, keyField, key);
+	else {
 		const primaryKeyFieldType = schema.collections[collection]?.fields[keyField]?.type;
-		if (primaryKeyFieldType === "uuid" && !isValidUuid(String(keys))) {
-			throw new ForbiddenError();
-		} else if (primaryKeyFieldType === "integer" && !Number.isInteger(Number(keys))) {
-			throw new ForbiddenError();
-		}
+		if (primaryKeyFieldType === "uuid" && !isValidUuid(String(keys))) throw new ForbiddenError();
+		else if (primaryKeyFieldType === "integer" && !Number.isInteger(Number(keys))) throw new ForbiddenError();
 	}
 }
 

package/dist/utils/validate-query.js

@@ -28,100 +28,77 @@ const querySchema = Joi.object({
 }).id("query");
 function validateQuery(query) {
 	const { error } = querySchema.validate(query);
-	if (query.filter && Object.keys(query.filter).length > 0) {
-		validateFilter(query.filter);
-	}
-	if (query.alias) {
-		validateAlias(query.alias);
-	}
+	if (query.filter && Object.keys(query.filter).length > 0) validateFilter(query.filter);
+	if (query.alias) validateAlias(query.alias);
 	validateRelationalDepth(query);
-	if (error) {
-		throw new InvalidQueryError({ reason: error.message });
-	}
+	if (error) throw new InvalidQueryError({ reason: error.message });
 	return query;
 }
 function validateFilter(filter) {
-	for (const [key, nested] of Object.entries(filter)) {
-		if (key === "_and" || key === "_or") {
-			nested.forEach(validateFilter);
-		} else if (key.startsWith("_")) {
-			const value = nested;
-			switch (key) {
-				case "_in":
-				case "_nin":
-				case "_between":
-				case "_nbetween":
-					validateList(value, key);
-					break;
-				case "_null":
-				case "_nnull":
-				case "_empty":
-				case "_nempty":
-					validateBoolean(value, key);
-					break;
-				case "_intersects":
-				case "_nintersects":
-				case "_intersects_bbox":
-				case "_nintersects_bbox":
-					validateGeometry(value, key);
-					break;
-				case "_none":
-				case "_some":
-					validateFilter(nested);
-					break;
-				case "_eq":
-				case "_neq":
-				case "_contains":
-				case "_ncontains":
-				case "_starts_with":
-				case "_nstarts_with":
-				case "_istarts_with":
-				case "_nistarts_with":
-				case "_ends_with":
-				case "_nends_with":
-				case "_iends_with":
-				case "_niends_with":
-				case "_gt":
-				case "_gte":
-				case "_lt":
-				case "_lte":
-				default:
-					validateFilterPrimitive(value, key);
-					break;
-			}
-		} else if (isPlainObject(nested)) {
-			validateFilter(nested);
-		} else if (Array.isArray(nested) === false) {
-			validateFilterPrimitive(nested, "_eq");
-		} else {
-			validateFilter(nested);
+	for (const [key, nested] of Object.entries(filter)) if (key === "_and" || key === "_or") nested.forEach(validateFilter);
+	else if (key.startsWith("_")) {
+		const value = nested;
+		switch (key) {
+			case "_in":
+			case "_nin":
+			case "_between":
+			case "_nbetween":
+				validateList(value, key);
+				break;
+			case "_null":
+			case "_nnull":
+			case "_empty":
+			case "_nempty":
+				validateBoolean(value, key);
+				break;
+			case "_intersects":
+			case "_nintersects":
+			case "_intersects_bbox":
+			case "_nintersects_bbox":
+				validateGeometry(value, key);
+				break;
+			case "_none":
+			case "_some":
+				validateFilter(nested);
+				break;
+			case "_eq":
+			case "_neq":
+			case "_contains":
+			case "_ncontains":
+			case "_starts_with":
+			case "_nstarts_with":
+			case "_istarts_with":
+			case "_nistarts_with":
+			case "_ends_with":
+			case "_nends_with":
+			case "_iends_with":
+			case "_niends_with":
+			case "_gt":
+			case "_gte":
+			case "_lt":
+			case "_lte":
+			default:
+				validateFilterPrimitive(value, key);
+				break;
 		}
-	}
+	} else if (isPlainObject(nested)) validateFilter(nested);
+	else if (Array.isArray(nested) === false) validateFilterPrimitive(nested, "_eq");
+	else validateFilter(nested);
 }
 function validateFilterPrimitive(value, key) {
 	if (value === null) return true;
-	if ((typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value instanceof Date) === false) {
-		throw new InvalidQueryError({ reason: `The filter value for "${key}" has to be a string, number, or boolean` });
-	}
-	if (typeof value === "number" && (Number.isNaN(value) || value > Number.MAX_SAFE_INTEGER)) {
-		throw new InvalidQueryError({ reason: `The filter value for "${key}" is not a valid number` });
-	}
-	if (typeof value === "string" && value.length === 0) {
-		throw new InvalidQueryError({ reason: `You can't filter for an empty string in "${key}". Use "_empty" or "_nempty" instead` });
-	}
+	if ((typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value instanceof Date) === false) throw new InvalidQueryError({ reason: `The filter value for "${key}" has to be a string, number, or boolean` });
+	if (typeof value === "number" && (Number.isNaN(value) || value > Number.MAX_SAFE_INTEGER)) throw new InvalidQueryError({ reason: `The filter value for "${key}" is not a valid number` });
+	if (typeof value === "string" && value.length === 0) throw new InvalidQueryError({ reason: `You can't filter for an empty string in "${key}". Use "_empty" or "_nempty" instead` });
 	return true;
 }
 function validateList(value, key) {
-	if (Array.isArray(value) === false || value.length === 0) {
-		throw new InvalidQueryError({ reason: `"${key}" has to be an array of values` });
-	}
+	if (Array.isArray(value) === false || value.length === 0) throw new InvalidQueryError({ reason: `"${key}" has to be an array of values` });
 	return true;
 }
 function validateBoolean(value, key) {
 	if (value === null || value === "") return true;
-	if (typeof value !== "boolean") {
-		throw new InvalidQueryError({ reason: `"${key}" has to be a boolean` });
-	}
+	if (typeof value !== "boolean") throw new InvalidQueryError({ reason: `"${key}" has to be a boolean` });
 	return true;
 }
 function validateGeometry(value, key) {
@@ -134,65 +111,37 @@ function validateGeometry(value, key) {
 	return true;
 }
 function validateAlias(alias) {
-	if (isPlainObject(alias) === false) {
-		throw new InvalidQueryError({ reason: `"alias" has to be an object` });
-	}
+	if (isPlainObject(alias) === false) throw new InvalidQueryError({ reason: `"alias" has to be an object` });
 	for (const [key, value] of Object.entries(alias)) {
-		if (typeof key !== "string") {
-			throw new InvalidQueryError({ reason: `"alias" key has to be a string. "${typeof key}" given` });
-		}
-		if (typeof value !== "string") {
-			throw new InvalidQueryError({ reason: `"alias" value has to be a string. "${typeof key}" given` });
-		}
-		if (key.includes(".") || value.includes(".")) {
-			throw new InvalidQueryError({ reason: `"alias" key/value can't contain a period character \`.\`` });
-		}
+		if (typeof key !== "string") throw new InvalidQueryError({ reason: `"alias" key has to be a string. "${typeof key}" given` });
+		if (typeof value !== "string") throw new InvalidQueryError({ reason: `"alias" value has to be a string. "${typeof key}" given` });
+		if (key.includes(".") || value.includes(".")) throw new InvalidQueryError({ reason: `"alias" key/value can't contain a period character \`.\`` });
 	}
 }
 function validateRelationalDepth(query) {
 	const maxRelationalDepth = Number(env["MAX_RELATIONAL_DEPTH"]) > 2 ? Number(env["MAX_RELATIONAL_DEPTH"]) : 2;
 	let fields = ["*"];
-	if (query.fields) {
-		fields = query.fields;
-	}
+	if (query.fields) fields = query.fields;
 	/**
 	* When using aggregate functions, you can't have any other regular fields
 	* selected. This makes sure you never end up in a non-aggregate fields selection error
 	*/
-	if (Object.keys(query.aggregate || {}).length > 0) {
-		fields = [];
-	}
+	if (Object.keys(query.aggregate || {}).length > 0) fields = [];
 	/**
 	* Similarly, when grouping on a specific field, you can't have other non-aggregated fields.
 	* The group query will override the fields query
 	*/
-	if (query.group) {
-		fields = query.group;
-	}
+	if (query.group) fields = query.group;
 	fields = uniq(fields);
-	for (const field of fields) {
-		if (getFieldRelationalDepth(field) > maxRelationalDepth) {
-			throw new InvalidQueryError({ reason: "Max relational depth exceeded" });
-		}
-	}
+	for (const field of fields) if (getFieldRelationalDepth(field) > maxRelationalDepth) throw new InvalidQueryError({ reason: "Max relational depth exceeded" });
 	if (query.filter) {
-		const filterRelationalDepth = calculateFieldDepth(query.filter);
-		if (filterRelationalDepth > maxRelationalDepth) {
-			throw new InvalidQueryError({ reason: "Max relational depth exceeded" });
-		}
+		if (calculateFieldDepth(query.filter) > maxRelationalDepth) throw new InvalidQueryError({ reason: "Max relational depth exceeded" });
 	}
 	if (query.sort) {
-		for (const sort of query.sort) {
-			if (sort.split(".").length > maxRelationalDepth) {
-				throw new InvalidQueryError({ reason: "Max relational depth exceeded" });
-			}
-		}
+		for (const sort of query.sort) if (sort.split(".").length > maxRelationalDepth) throw new InvalidQueryError({ reason: "Max relational depth exceeded" });
 	}
 	if (query.deep) {
-		const deepRelationalDepth = calculateFieldDepth(query.deep, ["_sort"]);
-		if (deepRelationalDepth > maxRelationalDepth) {
-			throw new InvalidQueryError({ reason: "Max relational depth exceeded" });
-		}
+		if (calculateFieldDepth(query.deep, ["_sort"]) > maxRelationalDepth) throw new InvalidQueryError({ reason: "Max relational depth exceeded" });
 	}
 }
 

package/dist/utils/validate-snapshot.js

@@ -51,16 +51,10 @@ function validateSnapshot(snapshot, force = false) {
 	const { error } = snapshotJoiSchema.validate(snapshot);
 	if (error) throw new InvalidPayloadError({ reason: error.message });
 	if (force) return;
-	if (snapshot.directus !== version) {
-		throw new InvalidPayloadError({ reason: `Provided snapshot's directus version ${snapshot.directus} does not match the current instance's version ${version}. You can bypass this check by passing the "force" query parameter` });
-	}
-	if (!snapshot.vendor) {
-		throw new InvalidPayloadError({ reason: "Provided snapshot does not contain the \"vendor\" property. You can bypass this check by passing the \"force\" query parameter" });
-	}
+	if (snapshot.directus !== version) throw new InvalidPayloadError({ reason: `Provided snapshot's directus version ${snapshot.directus} does not match the current instance's version ${version}. You can bypass this check by passing the "force" query parameter` });
+	if (!snapshot.vendor) throw new InvalidPayloadError({ reason: "Provided snapshot does not contain the \"vendor\" property. You can bypass this check by passing the \"force\" query parameter" });
 	const currentVendor = getDatabaseClient();
-	if (snapshot.vendor !== currentVendor) {
-		throw new InvalidPayloadError({ reason: `Provided snapshot's vendor ${snapshot.vendor} does not match the current instance's vendor ${currentVendor}. You can bypass this check by passing the "force" query parameter` });
-	}
+	if (snapshot.vendor !== currentVendor) throw new InvalidPayloadError({ reason: `Provided snapshot's vendor ${snapshot.vendor} does not match the current instance's vendor ${currentVendor}. You can bypass this check by passing the "force" query parameter` });
 }
 
 //#endregion

package/dist/utils/validate-storage.js

@@ -10,27 +10,20 @@ import { constants } from "fs";
 async function validateStorage() {
 	const env = useEnv();
 	const logger = useLogger();
-	if (env["DB_CLIENT"] === "sqlite3") {
-		try {
-			await access(path.dirname(env["DB_FILENAME"]), constants.R_OK | constants.W_OK);
-		} catch {
-			logger.warn(`Directory for SQLite database file (${path.resolve(path.dirname(env["DB_FILENAME"]))}) is not read/writeable!`);
-		}
+	if (env["DB_CLIENT"] === "sqlite3") try {
+		await access(path.dirname(env["DB_FILENAME"]), constants.R_OK | constants.W_OK);
+	} catch {
+		logger.warn(`Directory for SQLite database file (${path.resolve(path.dirname(env["DB_FILENAME"]))}) is not read/writeable!`);
 	}
-	const usedStorageDrivers = toArray(env["STORAGE_LOCATIONS"]).map((location) => env[`STORAGE_${location.toUpperCase()}_DRIVER`]);
-	if (usedStorageDrivers.includes("local")) {
-		try {
-			await access(env["STORAGE_LOCAL_ROOT"], constants.R_OK | constants.W_OK);
-		} catch {
-			logger.warn(`Upload directory (${path.resolve(env["STORAGE_LOCAL_ROOT"])}) is not read/writeable!`);
-		}
+	if (toArray(env["STORAGE_LOCATIONS"]).map((location) => env[`STORAGE_${location.toUpperCase()}_DRIVER`]).includes("local")) try {
+		await access(env["STORAGE_LOCAL_ROOT"], constants.R_OK | constants.W_OK);
+	} catch {
+		logger.warn(`Upload directory (${path.resolve(env["STORAGE_LOCAL_ROOT"])}) is not read/writeable!`);
 	}
-	if (!env["EXTENSIONS_LOCATION"]) {
-		try {
-			await access(getExtensionsPath(), constants.R_OK);
-		} catch {
-			logger.warn(`Extensions directory (${path.resolve(getExtensionsPath())}) is not readable!`);
-		}
+	if (!env["EXTENSIONS_LOCATION"]) try {
+		await access(getExtensionsPath(), constants.R_OK);
+	} catch {
+		logger.warn(`Extensions directory (${path.resolve(getExtensionsPath())}) is not readable!`);
 	}
 }
 

package/dist/utils/validate-user-count-integrity.js

@@ -9,20 +9,14 @@ async function validateUserCountIntegrity(options) {
 	const validateUserLimits = (options.flags & UserIntegrityCheckFlag.UserLimits) !== 0;
 	const validateRemainingAdminUsers = (options.flags & UserIntegrityCheckFlag.RemainingAdmins) !== 0;
 	const limitCheck = validateUserLimits && shouldCheckUserLimits();
-	if (!validateRemainingAdminUsers && !limitCheck) {
-		return;
-	}
+	if (!validateRemainingAdminUsers && !limitCheck) return;
 	const adminOnly = validateRemainingAdminUsers && !limitCheck;
 	const userCounts = await fetchUserCount({
 		...options,
 		adminOnly
 	});
-	if (limitCheck) {
-		await checkUserLimits(userCounts);
-	}
-	if (validateRemainingAdminUsers) {
-		validateRemainingAdminCount(userCounts.admin);
-	}
+	if (limitCheck) await checkUserLimits(userCounts);
+	if (validateRemainingAdminUsers) validateRemainingAdminCount(userCounts.admin);
 }
 
 //#endregion