@directus/api 35.0.2 → 35.2.0

package/dist/websocket/handlers/subscribe.js

@@ -51,12 +51,8 @@ var SubscribeHandler = class {
 	*/
 	subscribe(subscription) {
 		const { collection } = subscription;
-		if ("item" in subscription && ["directus_fields", "directus_relations"].includes(collection)) {
-			throw new InvalidPayloadError({ reason: `Cannot subscribe to a specific item in the ${collection} collection.` });
-		}
-		if (!this.subscriptions[collection]) {
-			this.subscriptions[collection] = new Set();
-		}
+		if ("item" in subscription && ["directus_fields", "directus_relations"].includes(collection)) throw new InvalidPayloadError({ reason: `Cannot subscribe to a specific item in the ${collection} collection.` });
+		if (!this.subscriptions[collection]) this.subscriptions[collection] = /* @__PURE__ */ new Set();
 		this.subscriptions[collection]?.add(subscription);
 	}
 	/**
@@ -64,21 +60,15 @@ var SubscribeHandler = class {
 	* @param subscription
 	*/
 	unsubscribe(client, uid) {
-		if (uid !== undefined) {
+		if (uid !== void 0) {
 			const subscription = this.getSubscription(client, String(uid));
-			if (subscription) {
-				this.subscriptions[subscription.collection]?.delete(subscription);
-			}
-		} else {
-			for (const key of Object.keys(this.subscriptions)) {
-				const subscriptions = Array.from(this.subscriptions[key] || []);
-				for (let i = subscriptions.length - 1; i >= 0; i--) {
-					const subscription = subscriptions[i];
-					if (!subscription) continue;
-					if (subscription.client === client && (!uid || subscription.uid === uid)) {
-						this.subscriptions[key]?.delete(subscription);
-					}
-				}
+			if (subscription) this.subscriptions[subscription.collection]?.delete(subscription);
+		} else for (const key of Object.keys(this.subscriptions)) {
+			const subscriptions = Array.from(this.subscriptions[key] || []);
+			for (let i = subscriptions.length - 1; i >= 0; i--) {
+				const subscription = subscriptions[i];
+				if (!subscription) continue;
+				if (subscription.client === client && (!uid || subscription.uid === uid)) this.subscriptions[key]?.delete(subscription);
 			}
 		}
 	}
@@ -91,9 +81,7 @@ var SubscribeHandler = class {
 		const schema = await getSchema();
 		for (const subscription of subscriptions) {
 			const { client } = subscription;
-			if (subscription.event !== undefined && event.action !== subscription.event) {
-				continue;
-			}
+			if (subscription.event !== void 0 && event.action !== subscription.event) continue;
 			if ("item" in subscription) {
 				if ("keys" in event && !event.keys.includes(subscription.item)) continue;
 				if ("key" in event && event.key !== subscription.item) continue;
@@ -111,54 +99,37 @@ var SubscribeHandler = class {
 	* Handle incoming (un)subscribe requests
 	*/
 	async onMessage(client, message) {
-		if (getMessageType(message) === "subscribe") {
-			try {
-				const collection = String(message.collection);
-				const accountability = client.accountability;
-				const schema = await getSchema();
-				if (!accountability?.admin && !schema.collections[collection]) {
-					throw new WebSocketError("subscribe", "INVALID_COLLECTION", "The provided collection does not exists or is not accessible.", message.uid);
-				}
-				const subscription = {
-					client,
-					collection
-				};
-				if ("event" in message) {
-					subscription.event = message.event;
-				}
-				if (message.query) {
-					subscription.query = await sanitizeQuery(message.query, schema, accountability);
-				}
-				if ("item" in message) subscription.item = String(message.item);
-				if ("uid" in message) {
-					subscription.uid = String(message.uid);
-					this.unsubscribe(client, subscription.uid);
-				}
-				const data = subscription.event === undefined ? await getPayload(subscription, accountability, schema) : { event: "init" };
-				this.subscribe(subscription);
-				client.send(fmtMessage("subscription", data, subscription.uid));
-			} catch (err) {
-				handleWebSocketError(client, err, "subscribe");
+		if (getMessageType(message) === "subscribe") try {
+			const collection = String(message.collection);
+			const accountability = client.accountability;
+			const schema = await getSchema();
+			if (!accountability?.admin && !schema.collections[collection]) throw new WebSocketError("subscribe", "INVALID_COLLECTION", "The provided collection does not exists or is not accessible.", message.uid);
+			const subscription = {
+				client,
+				collection
+			};
+			if ("event" in message) subscription.event = message.event;
+			if (message.query) subscription.query = await sanitizeQuery(message.query, schema, accountability);
+			if ("item" in message) subscription.item = String(message.item);
+			if ("uid" in message) {
+				subscription.uid = String(message.uid);
+				this.unsubscribe(client, subscription.uid);
 			}
+			const data = subscription.event === void 0 ? await getPayload(subscription, accountability, schema) : { event: "init" };
+			this.subscribe(subscription);
+			client.send(fmtMessage("subscription", data, subscription.uid));
+		} catch (err) {
+			handleWebSocketError(client, err, "subscribe");
 		}
-		if (getMessageType(message) === "unsubscribe") {
-			try {
-				this.unsubscribe(client, message.uid);
-				client.send(fmtMessage("subscription", { event: "unsubscribe" }, message.uid));
-			} catch (err) {
-				handleWebSocketError(client, err, "unsubscribe");
-			}
+		if (getMessageType(message) === "unsubscribe") try {
+			this.unsubscribe(client, message.uid);
+			client.send(fmtMessage("subscription", { event: "unsubscribe" }, message.uid));
+		} catch (err) {
+			handleWebSocketError(client, err, "unsubscribe");
 		}
 	}
 	getSubscription(client, uid) {
-		for (const userSubscriptions of Object.values(this.subscriptions)) {
-			for (const subscription of userSubscriptions) {
-				if (subscription.client === client && subscription.uid === uid) {
-					return subscription;
-				}
-			}
-		}
-		return undefined;
+		for (const userSubscriptions of Object.values(this.subscriptions)) for (const subscription of userSubscriptions) if (subscription.client === client && subscription.uid === uid) return subscription;
 	}
 };
 

package/dist/websocket/utils/get-expires-at-for-token.js

@@ -3,9 +3,7 @@ import jwt from "jsonwebtoken";
 //#region src/websocket/utils/get-expires-at-for-token.ts
 function getExpiresAtForToken(token) {
 	const decoded = jwt.decode(token);
-	if (decoded && typeof decoded === "object" && decoded.exp) {
-		return decoded.exp;
-	}
+	if (decoded && typeof decoded === "object" && decoded.exp) return decoded.exp;
 	return null;
 }
 

package/dist/websocket/utils/items.js

@@ -37,9 +37,7 @@ async function getPayload(subscription, accountability, schema, event) {
 			break;
 	}
 	const query = subscription.query ?? {};
-	if ("meta" in query) {
-		result["meta"] = await metaService.getMetaForQuery(subscription.collection, query);
-	}
+	if ("meta" in query) result["meta"] = await metaService.getMetaForQuery(subscription.collection, query);
 	return result;
 }
 /**
@@ -55,18 +53,13 @@ async function getCollectionPayload(subscription, accountability, schema, event)
 		schema,
 		accountability
 	});
-	if ("item" in subscription) {
-		if (event?.action === "delete") {
-			return subscription.item;
-		} else {
-			return await service.readOne(String(subscription.item));
-		}
-	}
+	if ("item" in subscription) if (event?.action === "delete") return subscription.item;
+	else return await service.readOne(String(subscription.item));
 	switch (event?.action) {
 		case "create": return await service.readMany([String(event.key)]);
 		case "update": return await service.readMany(event.keys.map((key) => String(key)));
 		case "delete": return event.keys;
-		case undefined:
+		case void 0:
 		default: return await service.readByQuery();
 	}
 }
@@ -83,15 +76,10 @@ async function getFieldsPayload(subscription, accountability, schema, event) {
 		schema,
 		accountability
 	});
-	if ("item" in subscription) {
-		if (event?.action === "delete") {
-			return subscription.item;
-		} else {
-			return await service.readOne(subscription.collection, String(subscription.item));
-		}
-	}
+	if ("item" in subscription) if (event?.action === "delete") return subscription.item;
+	else return await service.readOne(subscription.collection, String(subscription.item));
 	switch (event?.action) {
-		case undefined: return await service.readAll();
+		case void 0: return await service.readAll();
 		case "delete": return event.keys;
 		default: return await service.readOne(event?.payload?.["collection"], event?.payload?.["field"]);
 	}
@@ -111,18 +99,13 @@ async function getItemsPayload(subscription, accountability, schema, event) {
 		schema,
 		accountability
 	});
-	if ("item" in subscription) {
-		if (event?.action === "delete") {
-			return subscription.item;
-		} else {
-			return await service.readOne(subscription.item, query);
-		}
-	}
+	if ("item" in subscription) if (event?.action === "delete") return subscription.item;
+	else return await service.readOne(subscription.item, query);
 	switch (event?.action) {
 		case "create": return await service.readMany([event.key], query);
 		case "update": return await service.readMany(event.keys, query);
 		case "delete": return event.keys;
-		case undefined:
+		case void 0:
 		default: return await service.readByQuery(query);
 	}
 }

package/dist/websocket/utils/message.js

@@ -4,20 +4,16 @@ const fmtMessage = (type, data = {}, uid) => {
 		type,
 		...data
 	};
-	if (uid !== undefined) {
-		message["uid"] = uid;
-	}
+	if (uid !== void 0) message["uid"] = uid;
 	return JSON.stringify(message);
 };
 const safeSend = async (client, data, delay = 100) => {
 	if (client.readyState !== client.OPEN) return false;
-	if (client.bufferedAmount > 0) {
-		return new Promise((resolve) => {
-			setTimeout(() => {
-				safeSend(client, data, delay).then((success) => resolve(success));
-			}, delay);
-		});
-	}
+	if (client.bufferedAmount > 0) return new Promise((resolve) => {
+		setTimeout(() => {
+			safeSend(client, data, delay).then((success) => resolve(success));
+		}, delay);
+	});
 	client.send(data);
 	return true;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "35.0.2",
+  "version": "35.2.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -59,7 +59,7 @@
   ],
   "dependencies": {
     "@ai-sdk/anthropic": "3.0.58",
-    "@ai-sdk/devtools": "0.0.13",
+    "@ai-sdk/devtools": "0.0.15",
     "@ai-sdk/google": "3.0.43",
     "@ai-sdk/openai": "3.0.41",
     "@ai-sdk/openai-compatible": "2.0.35",
@@ -68,7 +68,7 @@
     "@godaddy/terminus": "4.12.1",
     "@braintrust/otel": "0.2.0",
     "@langfuse/otel": "4.0.0",
-    "@modelcontextprotocol/sdk": "1.26.0",
+    "@modelcontextprotocol/sdk": "1.29.0",
     "@netlify/api": "14.0.14",
     "@opentelemetry/sdk-trace-node": "2.1.0",
     "@rollup/plugin-alias": "5.1.1",
@@ -81,7 +81,7 @@
     "argon2": "0.44.0",
     "async": "3.2.6",
     "async-mutex": "0.5.0",
-    "axios": "1.13.5",
+    "axios": "1.15.0",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
     "camelcase": "8.0.0",
@@ -121,17 +121,17 @@
     "keyv": "5.5.3",
     "knex": "3.1.0",
     "ldapts": "8.1.3",
-    "liquidjs": "10.25.0",
+    "liquidjs": "10.25.7",
     "lodash-es": "4.18.1",
     "marked": "16.4.1",
     "micromustache": "8.0.3",
     "mime-types": "3.0.1",
-    "minimatch": "10.2.4",
+    "minimatch": "10.2.5",
     "mnemonist": "0.40.3",
     "ms": "2.1.3",
     "nanoid": "5.1.6",
     "node-machine-id": "1.1.12",
-    "nodemailer": "7.0.11",
+    "nodemailer": "8.0.5",
     "object-hash": "3.0.0",
     "openapi3-ts": "4.5.0",
     "openid-client": "5.7.1",
@@ -166,30 +166,29 @@
     "zod": "4.1.12",
     "zod-validation-error": "4.0.2",
     "@directus/ai": "1.3.1",
-    "@directus/app": "15.8.0",
-    "@directus/env": "5.7.1",
-    "@directus/constants": "14.3.0",
+    "@directus/env": "5.8.0",
+    "@directus/app": "15.10.0",
     "@directus/errors": "2.3.1",
-    "@directus/extensions-registry": "3.0.24",
+    "@directus/extensions": "3.0.25",
+    "@directus/constants": "14.3.0",
+    "@directus/extensions-registry": "3.0.26",
+    "@directus/extensions-sdk": "17.1.4",
     "@directus/format-title": "12.1.2",
-    "@directus/extensions": "3.0.23",
-    "@directus/memory": "3.1.7",
-    "@directus/pressure": "3.0.21",
-    "@directus/extensions-sdk": "17.1.2",
-    "@directus/schema": "13.0.7",
-    "@directus/schema-builder": "0.0.18",
-    "@directus/specs": "13.0.0",
+    "@directus/memory": "3.1.8",
+    "@directus/schema": "13.0.8",
+    "@directus/pressure": "3.0.22",
     "@directus/storage": "12.0.4",
-    "@directus/storage-driver-gcs": "12.0.21",
-    "@directus/storage-driver-cloudinary": "12.0.21",
-    "@directus/storage-driver-azure": "12.0.21",
+    "@directus/storage-driver-cloudinary": "12.0.22",
+    "@directus/storage-driver-azure": "12.0.22",
+    "@directus/specs": "13.0.0",
+    "@directus/storage-driver-gcs": "12.0.22",
     "@directus/storage-driver-local": "12.0.4",
-    "@directus/storage-driver-s3": "12.1.7",
-    "@directus/storage-driver-supabase": "3.0.21",
-    "@directus/system-data": "4.4.0",
-    "@directus/validation": "2.0.22",
-    "directus": "11.17.2",
-    "@directus/utils": "13.4.0"
+    "@directus/storage-driver-s3": "12.1.8",
+    "@directus/storage-driver-supabase": "3.0.22",
+    "@directus/utils": "13.4.1",
+    "@directus/validation": "2.0.23",
+    "directus": "11.17.4",
+    "@directus/system-data": "4.4.0"
   },
   "devDependencies": {
     "@directus/tsconfig": "4.0.0",
@@ -231,8 +230,8 @@
     "knex-mock-client": "3.0.2",
     "typescript": "5.9.3",
     "vitest": "3.2.4",
-    "@directus/schema-builder": "0.0.18",
-    "@directus/types": "15.0.1"
+    "@directus/schema-builder": "0.0.20",
+    "@directus/types": "15.0.3"
   },
   "optionalDependencies": {
     "@keyv/redis": "3.0.1",

package/dist/__utils__/items-utils.js

@@ -1,32 +0,0 @@
-//#region src/__utils__/items-utils.ts
-const sqlFieldFormatter = (schema, table) => {
-	const fields = [];
-	for (const field of Object.keys(schema["collections"][table].fields)) {
-		if (schema["collections"][table].fields[field].type !== "alias") {
-			fields.push(field);
-		}
-	}
-	let sql = "";
-	for (const field of fields.slice(0, fields.length - 1)) {
-		sql += `"${table}"."${field}", `;
-	}
-	sql += `"${table}"."${fields[fields.length - 1]}"`;
-	return sql;
-};
-const sqlFieldList = (schema, table) => {
-	const fields = [];
-	for (const field of Object.keys(schema["collections"][table].fields)) {
-		if (schema["collections"][table].fields[field].type !== "alias") {
-			fields.push(field);
-		}
-	}
-	let sql = "";
-	for (const field of fields.slice(0, fields.length - 1)) {
-		sql += `"${field}", `;
-	}
-	sql += `"${fields[fields.length - 1]}"`;
-	return sql;
-};
-
-//#endregion
-export { sqlFieldFormatter, sqlFieldList };