@directus/api 35.0.2 → 35.1.0

package/dist/ai/tools/schema/index.js

@@ -22,8 +22,7 @@ const schema = defineTool({
 			schema: schema$1,
 			accountability
 		};
-		const collectionsService = new CollectionsService(serviceOptions);
-		const collections = await collectionsService.readByQuery();
+		const collections = await new CollectionsService(serviceOptions).readByQuery();
 		if (!args.keys || args.keys.length === 0) {
 			const lightweightOverview = {
 				collections: [],
@@ -31,14 +30,9 @@ const schema = defineTool({
 				notes: {}
 			};
 			collections.forEach((collection) => {
-				if (!collection.schema) {
-					lightweightOverview.collection_folders.push(collection.collection);
-				} else {
-					lightweightOverview.collections.push(collection.collection);
-				}
-				if (collection.meta?.note && !collection.meta.note.startsWith("$t")) {
-					lightweightOverview.notes[collection.collection] = collection.meta.note;
-				}
+				if (!collection.schema) lightweightOverview.collection_folders.push(collection.collection);
+				else lightweightOverview.collections.push(collection.collection);
+				if (collection.meta?.note && !collection.meta.note.startsWith("$t")) lightweightOverview.notes[collection.collection] = collection.meta.note;
 			});
 			return {
 				type: "text",
@@ -46,39 +40,24 @@ const schema = defineTool({
 			};
 		}
 		const overview = {};
-		const fieldsService = new FieldsService(serviceOptions);
-		const fields = await fieldsService.readAll();
-		const relationsService = new RelationsService(serviceOptions);
-		const relations = await relationsService.readAll();
+		const fields = await new FieldsService(serviceOptions).readAll();
 		const snapshot = {
 			collections,
 			fields,
-			relations
+			relations: await new RelationsService(serviceOptions).readAll()
 		};
 		fields.forEach((field) => {
 			if (!args.keys?.includes(field.collection)) return;
 			if (field.type === "alias" && field.meta?.special?.includes("no-data")) return;
-			if (!overview[field.collection]) {
-				overview[field.collection] = {};
-			}
+			if (!overview[field.collection]) overview[field.collection] = {};
 			const fieldOverview = { type: field.type };
-			if (field.schema?.is_primary_key) {
-				fieldOverview.primary_key = field.schema?.is_primary_key;
-			}
-			if (field.meta?.required) {
-				fieldOverview.required = field.meta.required;
-			}
-			if (field.meta?.readonly) {
-				fieldOverview.readonly = field.meta.readonly;
-			}
-			if (field.meta?.note) {
-				fieldOverview.note = field.meta.note;
-			}
+			if (field.schema?.is_primary_key) fieldOverview.primary_key = field.schema?.is_primary_key;
+			if (field.meta?.required) fieldOverview.required = field.meta.required;
+			if (field.meta?.readonly) fieldOverview.readonly = field.meta.readonly;
+			if (field.meta?.note) fieldOverview.note = field.meta.note;
 			if (field.meta?.interface) {
 				fieldOverview.interface = { type: field.meta.interface };
-				if (field.meta.options?.["choices"]) {
-					fieldOverview.interface.choices = field.meta.options["choices"].map((choice) => choice.value);
-				}
+				if (field.meta.options?.["choices"]) fieldOverview.interface.choices = field.meta.options["choices"].map((choice) => choice.value);
 			}
 			if (field.type === "json" && field.meta?.options?.["fields"]) {
 				const nestedFields = field.meta.options["fields"];
@@ -89,17 +68,13 @@ const schema = defineTool({
 					snapshot
 				});
 			}
-			if (field.type === "json" && field.meta?.interface === "collection-item-dropdown") {
-				fieldOverview.fields = processCollectionItemDropdown({
-					field,
-					snapshot
-				});
-			}
+			if (field.type === "json" && field.meta?.interface === "collection-item-dropdown") fieldOverview.fields = processCollectionItemDropdown({
+				field,
+				snapshot
+			});
 			if (field.meta?.special) {
 				const relationshipType = getRelationType(field.meta.special);
-				if (relationshipType) {
-					fieldOverview.relation = buildRelationInfo(field, relationshipType, snapshot);
-				}
+				if (relationshipType) fieldOverview.relation = buildRelationInfo(field, relationshipType, snapshot);
 			}
 			overview[field.collection][field.field] = fieldOverview;
 		});
@@ -112,12 +87,8 @@ const schema = defineTool({
 function processNestedFields(options) {
 	const { fields, maxDepth = 5, currentDepth = 0, snapshot } = options;
 	const result = {};
-	if (currentDepth >= maxDepth) {
-		return result;
-	}
-	if (!Array.isArray(fields)) {
-		return result;
-	}
+	if (currentDepth >= maxDepth) return result;
+	if (!Array.isArray(fields)) return result;
 	for (const field of fields) {
 		const fieldKey = field.field || field.name;
 		if (!fieldKey) continue;
@@ -129,26 +100,20 @@ function processNestedFields(options) {
 			if (note) fieldOverview.note = note;
 			if (interfaceConfig) {
 				fieldOverview.interface = { type: interfaceConfig };
-				if (options$1?.choices) {
-					fieldOverview.interface.choices = options$1.choices;
-				}
+				if (options$1?.choices) fieldOverview.interface.choices = options$1.choices;
 			}
 		}
 		const nestedFields = field.meta?.options?.fields || field.options?.fields;
-		if (field.type === "json" && nestedFields) {
-			fieldOverview.fields = processNestedFields({
-				fields: nestedFields,
-				maxDepth,
-				currentDepth: currentDepth + 1,
-				snapshot
-			});
-		}
-		if (field.type === "json" && field.meta?.interface === "collection-item-dropdown") {
-			fieldOverview.fields = processCollectionItemDropdown({
-				field,
-				snapshot
-			});
-		}
+		if (field.type === "json" && nestedFields) fieldOverview.fields = processNestedFields({
+			fields: nestedFields,
+			maxDepth,
+			currentDepth: currentDepth + 1,
+			snapshot
+		});
+		if (field.type === "json" && field.meta?.interface === "collection-item-dropdown") fieldOverview.fields = processCollectionItemDropdown({
+			field,
+			snapshot
+		});
 		result[fieldKey] = fieldOverview;
 	}
 	return result;
@@ -159,9 +124,7 @@ function processCollectionItemDropdown(options) {
 	let keyType = "string | number | uuid";
 	if (selectedCollection && snapshot?.fields) {
 		const primaryKeyField = snapshot.fields.find((f) => f.collection === selectedCollection && f.schema?.is_primary_key);
-		if (primaryKeyField) {
-			keyType = primaryKeyField.type;
-		}
+		if (primaryKeyField) keyType = primaryKeyField.type;
 	}
 	return {
 		collection: {
@@ -189,17 +152,14 @@ function buildRelationInfo(field, type, snapshot) {
 }
 function buildManyToOneRelation(field, snapshot) {
 	const relation = snapshot.relations.find((r) => r.collection === field.collection && r.field === field.field);
-	const targetCollection = relation?.related_collection || relation?.schema?.foreign_key_table || field.schema?.foreign_key_table;
 	return {
 		type: "m2o",
-		collection: targetCollection
+		collection: relation?.related_collection || relation?.schema?.foreign_key_table || field.schema?.foreign_key_table
 	};
 }
 function buildOneToManyRelation(field, snapshot) {
 	const reverseRelation = snapshot.relations.find((r) => r.meta?.one_collection === field.collection && r.meta?.one_field === field.field);
-	if (!reverseRelation) {
-		return { type: "o2m" };
-	}
+	if (!reverseRelation) return { type: "o2m" };
 	return {
 		type: "o2m",
 		collection: reverseRelation.collection,
@@ -208,34 +168,24 @@ function buildOneToManyRelation(field, snapshot) {
 }
 function buildManyToManyRelation(field, snapshot) {
 	const junctionRelation = snapshot.relations.find((r) => r.meta?.one_field === field.field && r.meta?.one_collection === field.collection && r.collection !== field.collection);
-	if (!junctionRelation) {
-		return { type: "m2m" };
-	}
-	const targetRelation = snapshot.relations.find((r) => r.collection === junctionRelation.collection && r.field === junctionRelation.meta?.junction_field);
-	const targetCollection = targetRelation?.related_collection || "directus_files";
+	if (!junctionRelation) return { type: "m2m" };
 	const result = {
 		type: "m2m",
-		collection: targetCollection,
+		collection: snapshot.relations.find((r) => r.collection === junctionRelation.collection && r.field === junctionRelation.meta?.junction_field)?.related_collection || "directus_files",
 		junction: {
 			collection: junctionRelation.collection,
 			many_field: junctionRelation.field,
 			junction_field: junctionRelation.meta?.junction_field
 		}
 	};
-	if (junctionRelation.meta?.sort_field) {
-		result.junction.sort_field = junctionRelation.meta.sort_field;
-	}
+	if (junctionRelation.meta?.sort_field) result.junction.sort_field = junctionRelation.meta.sort_field;
 	return result;
 }
 function buildManyToAnyRelation(field, snapshot) {
 	const junctionRelation = snapshot.relations.find((r) => r.meta?.one_field === field.field && r.meta?.one_collection === field.collection);
-	if (!junctionRelation) {
-		return { type: "m2a" };
-	}
+	if (!junctionRelation) return { type: "m2a" };
 	const polymorphicRelation = snapshot.relations.find((r) => r.collection === junctionRelation.collection && r.meta?.one_allowed_collections && r.meta.one_allowed_collections.length > 0);
-	if (!polymorphicRelation) {
-		return { type: "m2a" };
-	}
+	if (!polymorphicRelation) return { type: "m2a" };
 	const parentRelation = snapshot.relations.find((r) => r.collection === junctionRelation.collection && r.related_collection === field.collection && r.field !== polymorphicRelation.field);
 	const result = {
 		type: "m2a",
@@ -248,9 +198,7 @@ function buildManyToAnyRelation(field, snapshot) {
 		}
 	};
 	const sortField = parentRelation?.meta?.sort_field || polymorphicRelation.meta?.sort_field;
-	if (sortField) {
-		result.junction.sort_field = sortField;
-	}
+	if (sortField) result.junction.sort_field = sortField;
 	return result;
 }
 

package/dist/ai/tools/trigger-flow/index.js

@@ -17,29 +17,22 @@ const triggerFlow = defineTool({
 	inputSchema: TriggerFlowInputSchema,
 	validateSchema: TriggerFlowValidateSchema,
 	async handler({ args, schema, accountability }) {
-		const flowsService = new FlowsService({
+		/**
+		* Collection and Required selection are validated by the server.
+		* Required fields is an additional validation we do.
+		*/
+		const requiredFields = ((await new FlowsService({
 			schema,
 			accountability
-		});
-		const flow = await flowsService.readOne(args.id, {
+		}).readOne(args.id, {
 			filter: {
 				status: { _eq: "active" },
 				trigger: { _eq: "manual" }
 			},
 			fields: ["options"]
-		});
-		/**
-		* Collection and Required selection are validated by the server.
-		* Required fields is an additional validation we do.
-		*/
-		const requiredFields = (flow.options?.["fields"] ?? []).filter((field) => field.meta?.required).map((field) => field.field);
-		for (const fieldName of requiredFields) {
-			if (!args.data || !(fieldName in args.data)) {
-				throw new InvalidPayloadError({ reason: `Required field "${fieldName}" is missing` });
-			}
-		}
-		const flowManager = getFlowManager();
-		const { result } = await flowManager.runWebhookFlow(`POST-${args.id}`, {
+		})).options?.["fields"] ?? []).filter((field) => field.meta?.required).map((field) => field.field);
+		for (const fieldName of requiredFields) if (!args.data || !(fieldName in args.data)) throw new InvalidPayloadError({ reason: `Required field "${fieldName}" is missing` });
+		const { result } = await getFlowManager().runWebhookFlow(`POST-${args.id}`, {
 			path: `/trigger/${args.id}`,
 			query: args.query ?? {},
 			method: "POST",

package/dist/ai/tools/utils.js

@@ -14,13 +14,9 @@ const JSON_COERCE_FIELDS = [
 */
 function coerceJsonFields(args) {
 	const coerced = { ...args };
-	for (const field of JSON_COERCE_FIELDS) {
-		if (typeof coerced[field] === "string") {
-			try {
-				coerced[field] = parseJSON(coerced[field]);
-			} catch {}
-		}
-	}
+	for (const field of JSON_COERCE_FIELDS) if (typeof coerced[field] === "string") try {
+		coerced[field] = parseJSON(coerced[field]);
+	} catch {}
 	return coerced;
 }
 /**
@@ -35,7 +31,7 @@ async function buildSanitizedQueryFromArgs(args, schema, accountability) {
 		sanitizedQuery = await sanitizeQuery({
 			fields: q["fields"] ?? "*",
 			...q
-		}, schema, accountability ?? undefined);
+		}, schema, accountability ?? void 0);
 	}
 	return sanitizedQuery;
 }

package/dist/app.js

@@ -11,7 +11,7 @@ import { ensureDeploymentWebhooks, registerDeploymentDrivers } from "./deploymen
 import rate_limiter_global_default from "./middleware/rate-limiter-global.js";
 import rate_limiter_ip_default from "./middleware/rate-limiter-ip.js";
 import { getFlowManager } from "./flows.js";
-import { aiChatRouter } from "./ai/chat/router.js";
+import { aiRouter } from "./ai/chat/router.js";
 import { aiFilesRouter } from "./ai/files/router.js";
 import access_default from "./controllers/access.js";
 import activity_default from "./controllers/activity.js";
@@ -87,18 +87,10 @@ async function createApp() {
 		logger.error(`Database doesn't have Directus tables installed.`);
 		process.exit(1);
 	}
-	if (await validateMigrations() === false) {
-		logger.warn(`Database migrations have not all been run`);
-	}
-	if (!env["SECRET"]) {
-		logger.warn(`"SECRET" env variable is missing. Using a random value instead. Tokens will not persist between restarts. This is not appropriate for production usage.`);
-	}
-	if (typeof env["SECRET"] === "string" && Buffer.byteLength(env["SECRET"]) < 32) {
-		logger.warn("\"SECRET\" env variable is shorter than 32 bytes which is insecure. This is not appropriate for production usage.");
-	}
-	if (!new Url(env["PUBLIC_URL"]).isAbsolute()) {
-		logger.warn("\"PUBLIC_URL\" should be a full URL");
-	}
+	if (await validateMigrations() === false) logger.warn(`Database migrations have not all been run`);
+	if (!env["SECRET"]) logger.warn(`"SECRET" env variable is missing. Using a random value instead. Tokens will not persist between restarts. This is not appropriate for production usage.`);
+	if (typeof env["SECRET"] === "string" && Buffer.byteLength(env["SECRET"]) < 32) logger.warn("\"SECRET\" env variable is shorter than 32 bytes which is insecure. This is not appropriate for production usage.");
+	if (!new Url(env["PUBLIC_URL"]).isAbsolute()) logger.warn("\"PUBLIC_URL\" should be a full URL");
 	await validateDatabaseExtensions();
 	await validateStorage();
 	await registerAuthProviders();
@@ -117,9 +109,7 @@ async function createApp() {
 	}));
 	if (env["PRESSURE_LIMITER_ENABLED"]) {
 		const sampleInterval = Number(env["PRESSURE_LIMITER_SAMPLE_INTERVAL"]);
-		if (Number.isNaN(sampleInterval) === true || Number.isFinite(sampleInterval) === false) {
-			throw new Error(`Invalid value for PRESSURE_LIMITER_SAMPLE_INTERVAL environment variable`);
-		}
+		if (Number.isNaN(sampleInterval) === true || Number.isFinite(sampleInterval) === false) throw new Error(`Invalid value for PRESSURE_LIMITER_SAMPLE_INTERVAL environment variable`);
 		app.use(handlePressure({
 			sampleInterval,
 			maxEventLoopUtilization: env["PRESSURE_LIMITER_MAX_EVENT_LOOP_UTILIZATION"],
@@ -155,12 +145,8 @@ async function createApp() {
 			]
 		}
 	}, getConfigFromEnv("CONTENT_SECURITY_POLICY_"))));
-	if (env["CROSS_ORIGIN_OPENER_POLICY_ENABLED"]) {
-		app.use(helmet.crossOriginOpenerPolicy({ policy: env["CROSS_ORIGIN_OPENER_POLICY"] ?? "same-origin-allow-popups" }));
-	}
-	if (env["HSTS_ENABLED"]) {
-		app.use(helmet.hsts(getConfigFromEnv("HSTS_", { omitPrefix: "HSTS_ENABLED" })));
-	}
+	if (env["CROSS_ORIGIN_OPENER_POLICY_ENABLED"]) app.use(helmet.crossOriginOpenerPolicy({ policy: env["CROSS_ORIGIN_OPENER_POLICY"] ?? "same-origin-allow-popups" }));
+	if (env["HSTS_ENABLED"]) app.use(helmet.hsts(getConfigFromEnv("HSTS_", { omitPrefix: "HSTS_ENABLED" })));
 	await emitter_default.emitInit("app.before", { app });
 	await emitter_default.emitInit("middlewares.before", { app });
 	app.use(createExpressLogger());
@@ -168,9 +154,7 @@ async function createApp() {
 		res.setHeader("X-Powered-By", "Directus");
 		next();
 	});
-	if (env["CORS_ENABLED"] === true) {
-		app.use(cors_default);
-	}
+	if (env["CORS_ENABLED"] === true) app.use(cors_default);
 	app.use((req, res, next) => {
 		express.json({
 			limit: env["MAX_PAYLOAD_SIZE"],
@@ -178,20 +162,15 @@ async function createApp() {
 				req$1.rawBody = buf;
 			}
 		})(req, res, (err) => {
-			if (err) {
-				return next(new InvalidPayloadError({ reason: err.message }));
-			}
+			if (err) return next(new InvalidPayloadError({ reason: err.message }));
 			return next();
 		});
 	});
 	app.use(cookieParser());
 	app.use(extract_token_default);
 	app.get("/", (_req, res, next) => {
-		if (env["ROOT_REDIRECT"]) {
-			res.redirect(env["ROOT_REDIRECT"]);
-		} else {
-			next();
-		}
+		if (env["ROOT_REDIRECT"]) res.redirect(env["ROOT_REDIRECT"]);
+		else next();
 	});
 	app.get("/robots.txt", (_, res) => {
 		res.set("Content-Type", "text/plain");
@@ -202,8 +181,7 @@ async function createApp() {
 		const adminPath = require.resolve("@directus/app");
 		const adminUrl = new Url(env["PUBLIC_URL"]).addPath("admin");
 		const embeds = extensionManager.getEmbeds();
-		const html = await readFile(adminPath, "utf8");
-		const htmlWithVars = html.replace(/<base \/>/, `<base href="${adminUrl.toString({ rootRelative: true })}/" />`).replace("<!-- directus-embed-head -->", embeds.head).replace("<!-- directus-embed-body -->", embeds.body);
+		const htmlWithVars = (await readFile(adminPath, "utf8")).replace(/<base \/>/, `<base href="${adminUrl.toString({ rootRelative: true })}/" />`).replace("<!-- directus-embed-head -->", embeds.head).replace("<!-- directus-embed-body -->", embeds.body);
 		const sendHtml = (_req, res) => {
 			res.setHeader("Cache-Control", "no-cache");
 			res.setHeader("Vary", "Origin, Cache-Control");
@@ -217,12 +195,8 @@ async function createApp() {
 		app.use("/admin", express.static(path.join(adminPath, ".."), { setHeaders: setStaticHeaders }));
 		app.use("/admin/*", sendHtml);
 	}
-	if (env["RATE_LIMITER_GLOBAL_ENABLED"] === true) {
-		app.use(rate_limiter_global_default);
-	}
-	if (env["RATE_LIMITER_ENABLED"] === true) {
-		app.use(rate_limiter_ip_default);
-	}
+	if (env["RATE_LIMITER_GLOBAL_ENABLED"] === true) app.use(rate_limiter_global_default);
+	if (env["RATE_LIMITER_ENABLED"] === true) app.use(rate_limiter_ip_default);
 	app.get("/server/ping", (_req, res) => res.send("pong"));
 	app.use("/deployments/webhooks", deployment_webhooks_default);
 	app.use(authenticate_default);
@@ -243,25 +217,19 @@ async function createApp() {
 	app.use("/deployments", deployment_default);
 	app.use("/extensions", extensions_default);
 	app.use("/fields", fields_default);
-	if (env["TUS_ENABLED"] === true) {
-		app.use("/files/tus", tus_default);
-	}
+	if (env["TUS_ENABLED"] === true) app.use("/files/tus", tus_default);
 	app.use("/files", files_default);
 	app.use("/flows", flows_default);
 	app.use("/folders", folders_default);
 	app.use("/items", items_default);
-	if (toBoolean(env["MCP_ENABLED"]) === true) {
-		app.use("/mcp", mcp_default);
-	}
+	if (toBoolean(env["MCP_ENABLED"]) === true) app.use("/mcp", mcp_default);
 	if (toBoolean(env["AI_ENABLED"]) === true) {
 		await initAIDevTools();
 		await initAITelemetry();
-		app.use("/ai/chat", aiChatRouter);
+		app.use("/ai", aiRouter);
 		app.use("/ai/files", aiFilesRouter);
 	}
-	if (env["METRICS_ENABLED"] === true) {
-		app.use("/metrics", metrics_default);
-	}
+	if (env["METRICS_ENABLED"] === true) app.use("/metrics", metrics_default);
 	app.use("/notifications", notifications_default);
 	app.use("/operations", operations_default);
 	app.use("/panels", panels_default);

package/dist/auth/auth.js

@@ -20,26 +20,20 @@ var AuthDriver = class {
 	* @throws InvalidCredentialsError
 	* @returns Data to be stored with the session
 	*/
-	async login(_user, _payload) {
-		return;
-	}
+	async login(_user, _payload) {}
 	/**
 	* Handle user session refresh
 	*
 	* @param _user User information
 	* @throws InvalidCredentialsError
 	*/
-	async refresh(_user) {
-		return;
-	}
+	async refresh(_user) {}
 	/**
 	* Handle user session termination
 	*
 	* @param _user User information
 	*/
-	async logout(_user) {
-		return;
-	}
+	async logout(_user) {}
 };
 
 //#endregion