@directus/api 35.0.2 → 35.1.0

package/dist/services/graphql/utils/process-error.js

@@ -3,38 +3,28 @@ import { isDirectusError } from "@directus/errors";
 
 //#region src/services/graphql/utils/process-error.ts
 const processError = (accountability, error) => {
-	const logger = useLogger();
-	logger.error(error);
+	useLogger().error(error);
 	let originalError = error.originalError;
-	if (originalError && "originalError" in originalError) {
-		originalError = originalError.originalError;
-	}
-	if (isDirectusError(originalError)) {
-		return {
-			message: originalError.message,
-			extensions: {
-				code: originalError.code,
-				...originalError.extensions ?? {}
-			},
-			...error.locations && { locations: error.locations },
-			...error.path && { path: error.path }
-		};
-	} else {
-		if (accountability?.admin === true) {
-			const graphqlFormattedError = {
-				message: error.message,
-				extensions: { code: "INTERNAL_SERVER_ERROR" },
-				...error.locations && { locations: error.locations },
-				...error.path && { path: error.path }
-			};
-			return graphqlFormattedError;
-		} else {
-			return {
-				message: "An unexpected error occurred.",
-				extensions: { code: "INTERNAL_SERVER_ERROR" }
-			};
-		}
-	}
+	if (originalError && "originalError" in originalError) originalError = originalError.originalError;
+	if (isDirectusError(originalError)) return {
+		message: originalError.message,
+		extensions: {
+			code: originalError.code,
+			...originalError.extensions ?? {}
+		},
+		...error.locations && { locations: error.locations },
+		...error.path && { path: error.path }
+	};
+	else if (accountability?.admin === true) return {
+		message: error.message,
+		extensions: { code: "INTERNAL_SERVER_ERROR" },
+		...error.locations && { locations: error.locations },
+		...error.path && { path: error.path }
+	};
+	else return {
+		message: "An unexpected error occurred.",
+		extensions: { code: "INTERNAL_SERVER_ERROR" }
+	};
 };
 var process_error_default = processError;
 

package/dist/services/graphql/utils/replace-fragments.js

@@ -7,7 +7,7 @@ import { flatten } from "lodash-es";
 */
 function replaceFragmentsInSelections(selections, fragments) {
 	if (!selections) return null;
-	const result = flatten(selections.map((selection) => {
+	return flatten(selections.map((selection) => {
 		if (selection.kind === "FragmentSpread") {
 			const fragment = fragments[selection.name.value];
 			const replacedSelections = replaceFragmentsInSelections(fragment.selectionSet.selections, fragments);
@@ -20,12 +20,9 @@ function replaceFragmentsInSelections(selections, fragments) {
 				}
 			}];
 		}
-		if ((selection.kind === "Field" || selection.kind === "InlineFragment") && selection.selectionSet) {
-			selection.selectionSet.selections = replaceFragmentsInSelections(selection.selectionSet.selections, fragments);
-		}
+		if ((selection.kind === "Field" || selection.kind === "InlineFragment") && selection.selectionSet) selection.selectionSet.selections = replaceFragmentsInSelections(selection.selectionSet.selections, fragments);
 		return selection;
 	})).filter((s) => s);
-	return result;
 }
 
 //#endregion

package/dist/services/graphql/utils/replace-funcs.js

@@ -9,14 +9,11 @@ function replaceFuncs(filter) {
 	return replaceFuncDeep(filter);
 	function replaceFuncDeep(filter$1) {
 		return transform(filter$1, (result, value, key) => {
-			const isFunctionKey = typeof key === "string" && key.endsWith("_func") && FUNCTIONS.includes(Object.keys(value)[0]);
-			if (isFunctionKey) {
+			if (typeof key === "string" && key.endsWith("_func") && FUNCTIONS.includes(Object.keys(value)[0])) {
 				const functionName = Object.keys(value)[0];
 				const fieldName = key.slice(0, -5);
 				result[`${functionName}(${fieldName})`] = Object.values(value)[0];
-			} else {
-				result[key] = value?.constructor === Object || value?.constructor === Array ? replaceFuncDeep(value) : value;
-			}
+			} else result[key] = value?.constructor === Object || value?.constructor === Array ? replaceFuncDeep(value) : value;
 		});
 	}
 }

package/dist/services/graphql/utils/sanitize-gql-schema.js

@@ -56,29 +56,18 @@ function sanitizeGraphqlSchema(schema) {
 		logger.warn(`GraphQL skipping relation "${relationName}" because it links to a non-existent or invalid collection.`);
 		return false;
 	};
-	const relations = schema.relations.filter((relation) => {
-		if (relation.collection && !collectionExists(relation.collection)) {
-			return skipRelation(relation);
-		}
-		if (relation.related_collection && !collectionExists(relation.related_collection)) {
-			return skipRelation(relation);
-		}
-		if (relation.meta) {
-			if (relation.meta.many_collection && !collectionExists(relation.meta.many_collection)) {
-				return skipRelation(relation);
-			}
-			if (relation.meta.one_collection && !collectionExists(relation.meta.one_collection)) {
-				return skipRelation(relation);
-			}
-			if (relation.meta.one_allowed_collections && relation.meta.one_allowed_collections.some((allowed_collection) => !collectionExists(allowed_collection))) {
-				return skipRelation(relation);
-			}
-		}
-		return true;
-	});
 	return {
 		collections,
-		relations
+		relations: schema.relations.filter((relation) => {
+			if (relation.collection && !collectionExists(relation.collection)) return skipRelation(relation);
+			if (relation.related_collection && !collectionExists(relation.related_collection)) return skipRelation(relation);
+			if (relation.meta) {
+				if (relation.meta.many_collection && !collectionExists(relation.meta.many_collection)) return skipRelation(relation);
+				if (relation.meta.one_collection && !collectionExists(relation.meta.one_collection)) return skipRelation(relation);
+				if (relation.meta.one_allowed_collections && relation.meta.one_allowed_collections.some((allowed_collection) => !collectionExists(allowed_collection))) return skipRelation(relation);
+			}
+			return true;
+		})
 	};
 }
 

package/dist/services/import-export.js

@@ -34,7 +34,7 @@ const logger = useLogger();
 const MAX_IMPORT_ERRORS = env["MAX_IMPORT_ERRORS"];
 function createErrorTracker() {
 	let genericError;
-	const fieldErrors = new Map();
+	const fieldErrors = /* @__PURE__ */ new Map();
 	let capturedErrorCount = 0;
 	let isLimitReached = false;
 	function convertToRanges(rows, minRangeSize = 4) {
@@ -46,17 +46,12 @@ function createErrorTracker() {
 		let count = 1;
 		const nonConsecutive = [];
 		const flush = () => {
-			if (count >= minRangeSize) {
-				result.push({
-					type: "range",
-					start,
-					end: prev
-				});
-			} else {
-				for (let i = start; i <= prev; i++) {
-					nonConsecutive.push(i);
-				}
-			}
+			if (count >= minRangeSize) result.push({
+				type: "range",
+				start,
+				end: prev
+			});
+			else for (let i = start; i <= prev; i++) nonConsecutive.push(i);
 		};
 		for (let i = 1; i < sorted.length; i++) {
 			const current = sorted[i];
@@ -70,12 +65,10 @@ function createErrorTracker() {
 			}
 		}
 		flush();
-		if (nonConsecutive.length > 0) {
-			result.push({
-				type: "lines",
-				rows: nonConsecutive
-			});
-		}
+		if (nonConsecutive.length > 0) result.push({
+			type: "lines",
+			rows: nonConsecutive
+		});
 		return result;
 	}
 	function addCapturedError(err, rowNumber) {
@@ -86,35 +79,25 @@ function createErrorTracker() {
 			const valid = err.extensions?.valid;
 			const invalid = err.extensions?.invalid;
 			let key = type ? `${field}|${type}` : field;
-			if (substring !== undefined) key += `|substring:${substring}`;
-			if (valid !== undefined) key += `|valid:${JSON.stringify(valid)}`;
-			if (invalid !== undefined) key += `|invalid:${JSON.stringify(invalid)}`;
-			if (!fieldErrors.has(err.code)) {
-				fieldErrors.set(err.code, new Map());
-			}
+			if (substring !== void 0) key += `|substring:${substring}`;
+			if (valid !== void 0) key += `|valid:${JSON.stringify(valid)}`;
+			if (invalid !== void 0) key += `|invalid:${JSON.stringify(invalid)}`;
+			if (!fieldErrors.has(err.code)) fieldErrors.set(err.code, /* @__PURE__ */ new Map());
 			const errorsByCode = fieldErrors.get(err.code);
-			if (!errorsByCode.has(key)) {
-				errorsByCode.set(key, {
-					message: err.message,
-					rowNumbers: []
-				});
-			}
+			if (!errorsByCode.has(key)) errorsByCode.set(key, {
+				message: err.message,
+				rowNumbers: []
+			});
 			errorsByCode.get(key).rowNumbers.push(rowNumber);
-		} else {
-			genericError = err;
-		}
+		} else genericError = err;
 		capturedErrorCount++;
-		if (capturedErrorCount >= MAX_IMPORT_ERRORS) {
-			isLimitReached = true;
-		}
+		if (capturedErrorCount >= MAX_IMPORT_ERRORS) isLimitReached = true;
 	}
 	function hasGenericError() {
-		return genericError !== undefined;
+		return genericError !== void 0;
 	}
 	function buildFinalErrors() {
-		if (genericError) {
-			return [genericError];
-		}
+		if (genericError) return [genericError];
 		return Array.from(fieldErrors.entries()).flatMap(([code, fieldMap]) => Array.from(fieldMap.entries()).map(([compositeKey, errorData]) => {
 			const parts = compositeKey.split("|");
 			const field = parts[0];
@@ -122,15 +105,14 @@ function createErrorTracker() {
 			const extensions = {};
 			for (let i = 2; i < parts.length; i++) {
 				const [paramType, paramValue] = parts[i]?.split(":", 2) ?? [];
-				if (!paramType || paramValue === undefined) continue;
+				if (!paramType || paramValue === void 0) continue;
 				try {
 					extensions[paramType] = JSON.parse(paramValue);
 				} catch {
 					extensions[paramType] = paramValue;
 				}
 			}
-			const ErrorClass = createError(code, errorData.message, 400);
-			return new ErrorClass({
+			return new (createError(code, errorData.message, 400))({
 				field,
 				type,
 				...extensions,
@@ -181,21 +163,16 @@ var ImportService = class {
 			"application/json",
 			"text/csv",
 			"application/vnd.ms-excel"
-		].includes(mimetype) === false) {
-			throw new UnsupportedMediaTypeError({
-				mediaType: mimetype,
-				where: "file import"
-			});
-		}
-		const limitReached = await store(async (store$1) => {
+		].includes(mimetype) === false) throw new UnsupportedMediaTypeError({
+			mediaType: mimetype,
+			where: "file import"
+		});
+		if (await store(async (store$1) => {
 			const count = await store$1.get("importCount") ?? 0;
 			if (count >= Number(env["IMPORT_MAX_CONCURRENCY"])) return true;
 			await store$1.set("importCount", count + 1);
 			return false;
-		});
-		if (limitReached) {
-			throw new LimitExceededError({ category: "Concurrent import" });
-		}
+		})) throw new LimitExceededError({ category: "Concurrent import" });
 		let promise;
 		const decrementImportCount = async () => {
 			try {
@@ -207,18 +184,14 @@ var ImportService = class {
 				logger.error(error, `Failed to decrement importCount`);
 			}
 		};
-		if (mimetype === "application/json") {
-			promise = this.importJSON(collection, stream);
-		} else {
-			promise = this.importCSV(collection, stream);
-		}
+		if (mimetype === "application/json") promise = this.importJSON(collection, stream);
+		else promise = this.importCSV(collection, stream);
 		if (options?.background) {
 			const notify = async (subject, message) => {
 				try {
 					if (!this.accountability?.user) return;
 					const notificationsService = new NotificationsService({ schema: this.schema });
-					const usersService = new UsersService({ schema: this.schema });
-					const user = await usersService.readOne(this.accountability.user, { fields: [
+					const user = await new UsersService({ schema: this.schema }).readOne(this.accountability.user, { fields: [
 						"first_name",
 						"last_name",
 						"email"
@@ -239,12 +212,10 @@ var ImportService = class {
 				logger.error(error, `Background import to ${collection} failed`);
 				await notify("Your import has failed", `Your import in ${collection} has failed.\n\n${error.message ?? ""}`);
 			}).finally(async () => await decrementImportCount());
-		} else {
-			try {
-				await promise;
-			} finally {
-				await decrementImportCount();
-			}
+		} else try {
+			await promise;
+		} finally {
+			await decrementImportCount();
 		}
 	}
 	async importJSON(collection, stream) {
@@ -265,17 +236,12 @@ var ImportService = class {
 					const saveQueue = queue(async (task) => {
 						if (errorTracker.shouldStop()) return;
 						try {
-							if (isSingleton) {
-								return await service.upsertSingleton(task.data, { bypassEmitAction: (params) => nestedActionEvents.push(params) });
-							} else {
-								return await service.upsertOne(task.data, { bypassEmitAction: (params) => nestedActionEvents.push(params) });
-							}
+							if (isSingleton) return await service.upsertSingleton(task.data, { bypassEmitAction: (params) => nestedActionEvents.push(params) });
+							else return await service.upsertOne(task.data, { bypassEmitAction: (params) => nestedActionEvents.push(params) });
 						} catch (error) {
 							for (const err of toArray(error)) {
 								errorTracker.addCapturedError(err, task.rowNumber);
-								if (errorTracker.shouldStop()) {
-									break;
-								}
+								if (errorTracker.shouldStop()) break;
 							}
 							if (errorTracker.shouldStop()) {
 								saveQueue.kill();
@@ -305,12 +271,8 @@ var ImportService = class {
 					extractJSON.on("end", () => {
 						if (!saveQueue.started) return resolve();
 						saveQueue.drain(() => {
-							if (errorTracker.hasErrors()) {
-								return reject();
-							}
-							for (const nestedActionEvent of nestedActionEvents) {
-								emitter_default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
-							}
+							if (errorTracker.hasErrors()) return reject();
+							for (const nestedActionEvent of nestedActionEvents) emitter_default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
 							return resolve();
 						});
 					});
@@ -325,9 +287,7 @@ var ImportService = class {
 					}, duration);
 				});
 			} catch (error) {
-				if (!error && errorTracker.hasErrors()) {
-					throw errorTracker.buildFinalErrors();
-				}
+				if (!error && errorTracker.hasErrors()) throw errorTracker.buildFinalErrors();
 				throw error;
 			} finally {
 				clearTimeout(timeout);
@@ -352,11 +312,7 @@ var ImportService = class {
 					const streams = [stream];
 					let rowNumber = 0;
 					const cleanup = (destroy = true) => {
-						if (destroy) {
-							for (const stream$1 of streams) {
-								stream$1.destroy();
-							}
-						}
+						if (destroy) for (const stream$1 of streams) stream$1.destroy();
 						tmpFile.cleanup().catch(() => {
 							logger.warn(`Failed to cleanup temporary import file (${tmpFile.path})`);
 						});
@@ -364,17 +320,12 @@ var ImportService = class {
 					const saveQueue = queue(async (task) => {
 						if (errorTracker.shouldStop()) return;
 						try {
-							if (isSingleton) {
-								return await service.upsertSingleton(task.data, { bypassEmitAction: (action) => nestedActionEvents.push(action) });
-							} else {
-								return await service.upsertOne(task.data, { bypassEmitAction: (action) => nestedActionEvents.push(action) });
-							}
+							if (isSingleton) return await service.upsertSingleton(task.data, { bypassEmitAction: (action) => nestedActionEvents.push(action) });
+							else return await service.upsertOne(task.data, { bypassEmitAction: (action) => nestedActionEvents.push(action) });
 						} catch (error) {
 							for (const err of toArray(error)) {
 								errorTracker.addCapturedError(err, task.rowNumber);
-								if (errorTracker.shouldStop()) {
-									break;
-								}
+								if (errorTracker.shouldStop()) break;
 							}
 							if (errorTracker.shouldStop()) {
 								saveQueue.kill();
@@ -400,9 +351,7 @@ var ImportService = class {
 								if (value.length === 0) return;
 								try {
 									const parsedJson = parseJSON(value);
-									if (typeof parsedJson === "number") {
-										return value;
-									}
+									if (typeof parsedJson === "number") return value;
 									return parsedJson;
 								} catch {
 									return value;
@@ -417,11 +366,7 @@ var ImportService = class {
 								return;
 							}
 							const result = {};
-							for (const field in obj) {
-								if (obj[field] !== undefined) {
-									set(result, field, obj[field]);
-								}
-							}
+							for (const field in obj) if (obj[field] !== void 0) set(result, field, obj[field]);
 							saveQueue.push({
 								data: result,
 								rowNumber
@@ -436,12 +381,8 @@ var ImportService = class {
 							}
 							saveQueue.drain(() => {
 								if (!errorTracker.shouldStop()) cleanup(false);
-								if (errorTracker.hasErrors()) {
-									return reject();
-								}
-								for (const nestedActionEvent of nestedActionEvents) {
-									emitter_default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
-								}
+								if (errorTracker.hasErrors()) return reject();
+								for (const nestedActionEvent of nestedActionEvents) emitter_default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
 								return resolve();
 							});
 						});
@@ -462,9 +403,7 @@ var ImportService = class {
 					}).pipe(fileWriteStream);
 				});
 			} catch (error) {
-				if (!error && errorTracker.hasErrors()) {
-					throw errorTracker.buildFinalErrors();
-				}
+				if (!error && errorTracker.hasErrors()) throw errorTracker.buildFinalErrors();
 				throw error;
 			} finally {
 				clearTimeout(timeout);
@@ -507,9 +446,7 @@ var ExportService = class {
 				});
 				const { primary } = this.schema.collections[collection];
 				const sort = query.sort ?? [];
-				if (sort.includes(primary) === false) {
-					sort.push(primary);
-				}
+				if (sort.includes(primary) === false) sort.push(primary);
 				const totalCount = await service.readByQuery({
 					...query,
 					aggregate: { count: ["*"] }
@@ -520,9 +457,7 @@ var ExportService = class {
 				let readCount = 0;
 				for (let batch = 0; batch < batchesRequired; batch++) {
 					let limit = env["EXPORT_BATCH_SIZE"];
-					if (requestedLimit > 0 && env["EXPORT_BATCH_SIZE"] > requestedLimit - readCount) {
-						limit = requestedLimit - readCount;
-					}
+					if (requestedLimit > 0 && env["EXPORT_BATCH_SIZE"] > requestedLimit - readCount) limit = requestedLimit - readCount;
 					const result = await service.readByQuery({
 						...query,
 						sort,
@@ -534,7 +469,7 @@ var ExportService = class {
 						let csvHeadings = null;
 						if (format.startsWith("csv")) {
 							if (!query.fields) query.fields = ["*"];
-							const parsedFields = await parseFields({
+							csvHeadings = getHeadingsForCsvExport(await parseFields({
 								parentCollection: collection,
 								fields: query.fields,
 								query,
@@ -542,8 +477,7 @@ var ExportService = class {
 							}, {
 								schema: this.schema,
 								knex: database
-							});
-							csvHeadings = getHeadingsForCsvExport(parsedFields);
+							}));
 						}
 						await appendFile(tmpFile.path, this.transform(result, format, {
 							includeHeader: batch === 0,
@@ -568,8 +502,7 @@ var ExportService = class {
 			const savedFile = await filesService.uploadOne(createReadStream(tmpFile.path), fileWithDefaults);
 			if (this.accountability?.user) {
 				const notificationsService = new NotificationsService({ schema: this.schema });
-				const usersService = new UsersService({ schema: this.schema });
-				const user = await usersService.readOne(this.accountability.user, { fields: [
+				const user = await new UsersService({ schema: this.schema }).readOne(this.accountability.user, { fields: [
 					"first_name",
 					"last_name",
 					"email"
@@ -591,15 +524,12 @@ Your export of ${collection} is ready. <a href="${href}">Click here to view.</a>
 			}
 		} catch (err) {
 			logger.error(err, `Couldn't export ${collection}: ${err.message}`);
-			if (this.accountability?.user) {
-				const notificationsService = new NotificationsService({ schema: this.schema });
-				await notificationsService.createOne({
-					recipient: this.accountability.user,
-					sender: this.accountability.user,
-					subject: `Your export of ${collection} failed`,
-					message: `Please contact your system administrator for more information.`
-				});
-			}
+			if (this.accountability?.user) await new NotificationsService({ schema: this.schema }).createOne({
+				recipient: this.accountability.user,
+				sender: this.accountability.user,
+				subject: `Your export of ${collection} failed`,
+				message: `Please contact your system administrator for more information.`
+			});
 		} finally {
 			await tmpFile?.cleanup();
 		}
@@ -633,7 +563,7 @@ Your export of ${collection} is ready. <a href="${href}">Click here to view.</a>
 			const transforms$1 = [transforms.flatten({ separator: "." })];
 			const header = options?.includeHeader !== false;
 			const withBOM = format === "csv_utf8";
-			const transformOptions = options?.fields ? {
+			let string = new Parser(options?.fields ? {
 				transforms: transforms$1,
 				header,
 				fields: options?.fields,
@@ -642,16 +572,11 @@ Your export of ${collection} is ready. <a href="${href}">Click here to view.</a>
 				transforms: transforms$1,
 				header,
 				withBOM
-			};
-			let string = new Parser(transformOptions).parse(input);
-			if (options?.includeHeader === false) {
-				string = "\n" + string;
-			}
+			}).parse(input);
+			if (options?.includeHeader === false) string = "\n" + string;
 			return string;
 		}
-		if (format === "yaml") {
-			return dump(input);
-		}
+		if (format === "yaml") return dump(input);
 		throw new ServiceUnavailableError({
 			service: "export",
 			reason: `Illegal export type used: "${format}"`