@directus/api 35.0.2 → 35.2.0

package/dist/utils/transaction.js

@@ -12,72 +12,43 @@ import "knex";
 * while preventing nested transactions.
 */
 const transaction = async (knex$1, handler) => {
-	if (knex$1.isTransaction) {
-		return handler(knex$1);
-	} else {
-		try {
-			return await knex$1.transaction((trx) => handler(trx));
-		} catch (error) {
-			const client = getDatabaseClient(knex$1);
-			if (!shouldRetryTransaction(client, error)) throw error;
-			const MAX_ATTEMPTS = 3;
-			const BASE_DELAY = 100;
-			const logger = useLogger();
-			for (let attempt = 0; attempt < MAX_ATTEMPTS; ++attempt) {
-				const delay = 2 ** attempt * BASE_DELAY;
-				await new Promise((resolve) => setTimeout(resolve, delay));
-				logger.trace(`Restarting failed transaction (attempt ${attempt + 1}/${MAX_ATTEMPTS})`);
-				try {
-					return await knex$1.transaction((trx) => handler(trx));
-				} catch (error$1) {
-					if (!shouldRetryTransaction(client, error$1)) throw error$1;
-				}
+	if (knex$1.isTransaction) return handler(knex$1);
+	else try {
+		return await knex$1.transaction((trx) => handler(trx));
+	} catch (error) {
+		const client = getDatabaseClient(knex$1);
+		if (!shouldRetryTransaction(client, error)) throw error;
+		const MAX_ATTEMPTS = 3;
+		const BASE_DELAY = 100;
+		const logger = useLogger();
+		for (let attempt = 0; attempt < MAX_ATTEMPTS; ++attempt) {
+			const delay = 2 ** attempt * BASE_DELAY;
+			await new Promise((resolve) => setTimeout(resolve, delay));
+			logger.trace(`Restarting failed transaction (attempt ${attempt + 1}/${MAX_ATTEMPTS})`);
+			try {
+				return await knex$1.transaction((trx) => handler(trx));
+			} catch (error$1) {
+				if (!shouldRetryTransaction(client, error$1)) throw error$1;
 			}
-			/** Initial execution + additional attempts */
-			const attempts = 1 + MAX_ATTEMPTS;
-			throw new Error(`Transaction failed after ${attempts} attempts`, { cause: error });
 		}
+		/** Initial execution + additional attempts */
+		const attempts = 1 + MAX_ATTEMPTS;
+		throw new Error(`Transaction failed after ${attempts} attempts`, { cause: error });
 	}
 };
 function shouldRetryTransaction(client, error) {
-	/**
-	* This error code indicates that the transaction failed due to another
-	* concurrent or recent transaction attempting to write to the same data.
-	* This can usually be solved by restarting the transaction on client-side
-	* after a short delay, so that it is executed against the latest state.
-	*
-	* @link https://www.cockroachlabs.com/docs/stable/transaction-retry-error-reference
-	*/
-	const COCKROACH_RETRY_ERROR_CODE = "40001";
-	/**
-	* SQLITE_BUSY is an error code returned by SQLite when an operation can't be
-	* performed due to a locked database file. This often arises due to multiple
-	* processes trying to simultaneously access the database, causing potential
-	* data inconsistencies. There are a few mechanisms to handle this case,
-	* one of which is to retry the complete transaction again
-	* on client-side after a short delay.
-	*
-	* @link https://www.sqlite.org/rescode.html#busy
-	*/
-	const SQLITE_BUSY_ERROR_CODE = "SQLITE_BUSY";
-	const MYSQL_DEADLOCK_CODE = "ER_LOCK_DEADLOCK";
-	const POSTGRES_DEADLOCK_CODE = "40P01";
-	const ORACLE_DEADLOCK_CODE = "ORA-00060";
-	const MSSQL_DEADLOCK_CODE = "EREQUEST";
-	const MSSQL_DEADLOCK_NUMBER = "1205";
-	const codes = {
-		cockroachdb: [{ code: COCKROACH_RETRY_ERROR_CODE }],
-		sqlite: [{ code: SQLITE_BUSY_ERROR_CODE }],
-		mysql: [{ code: MYSQL_DEADLOCK_CODE }],
+	return isObject(error) && {
+		cockroachdb: [{ code: "40001" }],
+		sqlite: [{ code: "SQLITE_BUSY" }],
+		mysql: [{ code: "ER_LOCK_DEADLOCK" }],
 		mssql: [{
-			code: MSSQL_DEADLOCK_CODE,
-			number: MSSQL_DEADLOCK_NUMBER
+			code: "EREQUEST",
+			number: "1205"
 		}],
-		oracle: [{ code: ORACLE_DEADLOCK_CODE }],
-		postgres: [{ code: POSTGRES_DEADLOCK_CODE }],
+		oracle: [{ code: "ORA-00060" }],
+		postgres: [{ code: "40P01" }],
 		redshift: []
-	};
-	return isObject(error) && codes[client].some((code) => {
+	}[client].some((code) => {
 		return Object.entries(code).every(([key, value]) => String(error[key]) === value);
 	});
 }

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

@@ -53,41 +53,31 @@ const applyJoiSchema = Joi.object({
 /**
 * Validates the diff against the current schema snapshot.
 *
+* @param applyDiff The diff to validate with the expected hash
+* @param currentSnapshotWithHash The current snapshot with hash to validate against
+* @param force When true bypass hash validation. Use with caution as this can lead to unintended consequences, only use when the diff can be applied irrespective of the current schema.
+*
 * @returns True if the diff can be applied (valid & not empty).
 */
-function validateApplyDiff(applyDiff, currentSnapshotWithHash) {
+function validateApplyDiff(applyDiff, currentSnapshotWithHash, force = false) {
 	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.hash === currentSnapshotWithHash.hash) return true;
+	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 || force) 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,34 +85,23 @@ 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` });
+	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 or use the "force" query parameter to bypass this check` });
 }
 
 //#endregion

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();
 	}
 }