@directus/api 35.0.2 → 35.2.0

package/dist/database/run-ast/utils/get-inner-query-column-pre-processor.js

@@ -7,9 +7,7 @@ function getInnerQueryColumnPreProcessor(knex, schema, table, cases, permissions
 		const alias = getNodeAlias(fieldNode);
 		if (fieldNode.whenCase && fieldNode.whenCase.length > 0) {
 			const columnCases = [];
-			for (const index of fieldNode.whenCase) {
-				columnCases.push(cases[index]);
-			}
+			for (const index of fieldNode.whenCase) columnCases.push(cases[index]);
 			const caseWhen = applyCaseWhen({
 				column: knex.raw(1),
 				columnCases,

package/dist/database/run-ast/utils/merge-with-parent-items.js

@@ -8,66 +8,45 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode, fieldA
 	const nestedItems = toArray(nestedItem);
 	const parentItems = clone(toArray(parentItem));
 	if (nestedNode.type === "m2o") {
-		const parentsByForeignKey = new Map();
+		const parentsByForeignKey = /* @__PURE__ */ new Map();
 		for (const parentItem$1 of parentItems) {
 			const relationKey = parentItem$1[nestedNode.relation.field];
-			if (!parentsByForeignKey.has(relationKey)) {
-				parentsByForeignKey.set(relationKey, []);
-			}
+			if (!parentsByForeignKey.has(relationKey)) parentsByForeignKey.set(relationKey, []);
 			parentItem$1[nestedNode.fieldKey] = null;
 			parentsByForeignKey.get(relationKey).push(parentItem$1);
 		}
 		const nestedPrimaryKeyField = schema.collections[nestedNode.relation.related_collection].primary;
 		for (const nestedItem$1 of nestedItems) {
 			const nestedPK = nestedItem$1[nestedPrimaryKeyField];
-			if (nestedPK === null) {
-				continue;
-			}
-			if (!parentsByForeignKey.has(nestedPK)) {
-				continue;
-			}
-			for (const parentItem$1 of parentsByForeignKey.get(nestedPK)) {
-				parentItem$1[nestedNode.fieldKey] = nestedItem$1;
-			}
+			if (nestedPK === null) continue;
+			if (!parentsByForeignKey.has(nestedPK)) continue;
+			for (const parentItem$1 of parentsByForeignKey.get(nestedPK)) parentItem$1[nestedNode.fieldKey] = nestedItem$1;
 		}
 	} else if (nestedNode.type === "o2m") {
 		const parentCollectionName = nestedNode.relation.related_collection;
 		const parentPrimaryKeyField = schema.collections[parentCollectionName].primary;
 		const parentRelationField = nestedNode.fieldKey;
 		const nestedParentKeyField = nestedNode.relation.field;
-		const parentsByPrimaryKey = new Map();
+		const parentsByPrimaryKey = /* @__PURE__ */ new Map();
 		for (const parentItem$1 of parentItems) {
-			if (!parentItem$1[parentRelationField]) {
-				parentItem$1[parentRelationField] = [];
-			}
+			if (!parentItem$1[parentRelationField]) parentItem$1[parentRelationField] = [];
 			let parentPrimaryKey = parentItem$1[parentPrimaryKeyField];
-			if (parentPrimaryKey === null) {
-				continue;
-			} else {
-				parentPrimaryKey = parentPrimaryKey.toString();
-			}
-			if (parentsByPrimaryKey.has(parentPrimaryKey)) {
-				throw new Error(`Duplicate parent primary key '${parentPrimaryKey}' of '${parentCollectionName}' when merging o2m nested items`);
-			}
+			if (parentPrimaryKey === null) continue;
+			else parentPrimaryKey = parentPrimaryKey.toString();
+			if (parentsByPrimaryKey.has(parentPrimaryKey)) throw new Error(`Duplicate parent primary key '${parentPrimaryKey}' of '${parentCollectionName}' when merging o2m nested items`);
 			parentsByPrimaryKey.set(parentPrimaryKey, parentItem$1);
 		}
 		const toAddToAllParents = [];
 		for (const nestedItem$1 of nestedItems) {
-			if (nestedItem$1 === null) {
-				continue;
-			}
+			if (nestedItem$1 === null) continue;
 			if (Array.isArray(nestedItem$1[nestedParentKeyField])) {
 				toAddToAllParents.push(nestedItem$1);
 				continue;
 			}
 			const parentPrimaryKey = nestedItem$1[nestedParentKeyField]?.[parentPrimaryKeyField] ?? nestedItem$1[nestedParentKeyField];
-			if (parentPrimaryKey === null) {
-				continue;
-			}
+			if (parentPrimaryKey === null) continue;
 			const parentItem$1 = parentsByPrimaryKey.get(parentPrimaryKey.toString());
-			if (!parentItem$1) {
-				continue;
-			}
+			if (!parentItem$1) continue;
 			parentItem$1[parentRelationField].push(nestedItem$1);
 		}
 		for (const [index, parentItem$1] of parentItems.entries()) {
@@ -77,15 +56,9 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode, fieldA
 			}
 			parentItem$1[parentRelationField].push(...toAddToAllParents);
 			const limit = nestedNode.query.limit ?? Number(env["QUERY_LIMIT_DEFAULT"]);
-			if (nestedNode.query.page && nestedNode.query.page > 1) {
-				parentItem$1[nestedNode.fieldKey] = parentItem$1[nestedNode.fieldKey].slice(limit * (nestedNode.query.page - 1));
-			}
-			if (nestedNode.query.offset && nestedNode.query.offset >= 0) {
-				parentItem$1[nestedNode.fieldKey] = parentItem$1[nestedNode.fieldKey].slice(nestedNode.query.offset);
-			}
-			if (limit !== -1) {
-				parentItem$1[nestedNode.fieldKey] = parentItem$1[nestedNode.fieldKey].slice(0, limit);
-			}
+			if (nestedNode.query.page && nestedNode.query.page > 1) parentItem$1[nestedNode.fieldKey] = parentItem$1[nestedNode.fieldKey].slice(limit * (nestedNode.query.page - 1));
+			if (nestedNode.query.offset && nestedNode.query.offset >= 0) parentItem$1[nestedNode.fieldKey] = parentItem$1[nestedNode.fieldKey].slice(nestedNode.query.offset);
+			if (limit !== -1) parentItem$1[nestedNode.fieldKey] = parentItem$1[nestedNode.fieldKey].slice(0, limit);
 			parentItem$1[nestedNode.fieldKey] = parentItem$1[nestedNode.fieldKey].sort((a, b) => {
 				const sortField = nestedNode.query.sort[0];
 				let column = sortField;
@@ -97,29 +70,24 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode, fieldA
 				if (a[column] === b[column]) return 0;
 				if (a[column] === null) return 1;
 				if (b[column] === null) return -1;
-				if (order === "asc") {
-					return a[column] < b[column] ? -1 : 1;
-				} else {
-					return a[column] < b[column] ? 1 : -1;
-				}
+				if (order === "asc") return a[column] < b[column] ? -1 : 1;
+				else return a[column] < b[column] ? 1 : -1;
 			});
 		}
-	} else if (nestedNode.type === "a2o") {
-		for (const parentItem$1 of parentItems) {
-			if (!nestedNode.relation.meta?.one_collection_field) {
-				parentItem$1[nestedNode.fieldKey] = null;
-				continue;
-			}
-			const relatedCollection = parentItem$1[nestedNode.relation.meta.one_collection_field];
-			if (!nestedItem[relatedCollection]) {
-				parentItem$1[nestedNode.fieldKey] = null;
-				continue;
-			}
-			const itemChild = nestedItem[relatedCollection].find((nestedItem$1) => {
-				return nestedItem$1[nestedNode.relatedKey[relatedCollection]] == parentItem$1[nestedNode.fieldKey];
-			});
-			parentItem$1[nestedNode.fieldKey] = itemChild || null;
+	} else if (nestedNode.type === "a2o") for (const parentItem$1 of parentItems) {
+		if (!nestedNode.relation.meta?.one_collection_field) {
+			parentItem$1[nestedNode.fieldKey] = null;
+			continue;
+		}
+		const relatedCollection = parentItem$1[nestedNode.relation.meta.one_collection_field];
+		if (!nestedItem[relatedCollection]) {
+			parentItem$1[nestedNode.fieldKey] = null;
+			continue;
 		}
+		const itemChild = nestedItem[relatedCollection].find((nestedItem$1) => {
+			return nestedItem$1[nestedNode.relatedKey[relatedCollection]] == parentItem$1[nestedNode.fieldKey];
+		});
+		parentItem$1[nestedNode.fieldKey] = itemChild || null;
 	}
 	return Array.isArray(parentItem) ? parentItems : parentItems[0];
 }

package/dist/database/run-ast/utils/remove-temporary-fields.js

@@ -12,22 +12,17 @@ function removeTemporaryFields(schema, rawItem, ast, primaryKeyField, parentItem
 		for (const relatedCollection of ast.names) {
 			if (!fields[relatedCollection]) fields[relatedCollection] = [];
 			if (!nestedCollectionNodes[relatedCollection]) nestedCollectionNodes[relatedCollection] = [];
-			for (const child of ast.children[relatedCollection]) {
-				if (child.type === "field" || child.type === "functionField") {
-					fields[relatedCollection].push(child.name);
-				} else {
-					fields[relatedCollection].push(child.fieldKey);
-					nestedCollectionNodes[relatedCollection].push(child);
-				}
+			for (const child of ast.children[relatedCollection]) if (child.type === "field" || child.type === "functionField") fields[relatedCollection].push(child.name);
+			else {
+				fields[relatedCollection].push(child.fieldKey);
+				nestedCollectionNodes[relatedCollection].push(child);
 			}
 		}
 		for (const rawItem$1 of rawItems) {
 			const relatedCollection = parentItem?.[ast.relation.meta.one_collection_field];
-			if (rawItem$1 === null || rawItem$1 === undefined) return rawItem$1;
+			if (rawItem$1 === null || rawItem$1 === void 0) return rawItem$1;
 			let item = rawItem$1;
-			for (const nestedNode of nestedCollectionNodes[relatedCollection]) {
-				item[nestedNode.fieldKey] = removeTemporaryFields(schema, item[nestedNode.fieldKey], nestedNode, schema.collections[nestedNode.relation.collection].primary, item);
-			}
+			for (const nestedNode of nestedCollectionNodes[relatedCollection]) item[nestedNode.fieldKey] = removeTemporaryFields(schema, item[nestedNode.fieldKey], nestedNode, schema.collections[nestedNode.relation.collection].primary, item);
 			const fieldsWithFunctionsApplied = fields[relatedCollection].map((field) => applyFunctionToColumnName(field));
 			item = fields[relatedCollection].length > 0 ? pick(rawItem$1, fieldsWithFunctionsApplied) : rawItem$1[primaryKeyField];
 			items.push(item);
@@ -37,28 +32,19 @@ function removeTemporaryFields(schema, rawItem, ast, primaryKeyField, parentItem
 		const aliasFields = [];
 		const nestedCollectionNodes = [];
 		for (const child of ast.children) {
-			if ("alias" in child && child.alias === true) {
-				aliasFields.push(child.fieldKey);
-			} else {
-				fields.push(child.fieldKey);
-			}
-			if (child.type !== "field" && child.type !== "functionField") {
-				nestedCollectionNodes.push(child);
-			}
+			if ("alias" in child && child.alias === true) aliasFields.push(child.fieldKey);
+			else fields.push(child.fieldKey);
+			if (child.type !== "field" && child.type !== "functionField") nestedCollectionNodes.push(child);
 		}
-		if (ast.query?.aggregate) {
-			for (const [operation, aggregateFields] of Object.entries(ast.query.aggregate)) {
-				if (!fields) continue;
-				if (operation === "count" && aggregateFields.includes("*")) fields.push("count");
-				fields.push(...aggregateFields.map((field) => `${operation}.${field}`));
-			}
+		if (ast.query?.aggregate) for (const [operation, aggregateFields] of Object.entries(ast.query.aggregate)) {
+			if (!fields) continue;
+			if (operation === "count" && aggregateFields.includes("*")) fields.push("count");
+			fields.push(...aggregateFields.map((field) => `${operation}.${field}`));
 		}
 		for (const rawItem$1 of rawItems) {
-			if (rawItem$1 === null || rawItem$1 === undefined) return rawItem$1;
+			if (rawItem$1 === null || rawItem$1 === void 0) return rawItem$1;
 			let item = rawItem$1;
-			for (const nestedNode of nestedCollectionNodes) {
-				item[nestedNode.fieldKey] = removeTemporaryFields(schema, item[nestedNode.fieldKey], nestedNode, nestedNode.type === "m2o" ? schema.collections[nestedNode.relation.related_collection].primary : schema.collections[nestedNode.relation.collection].primary, item);
-			}
+			for (const nestedNode of nestedCollectionNodes) item[nestedNode.fieldKey] = removeTemporaryFields(schema, item[nestedNode.fieldKey], nestedNode, nestedNode.type === "m2o" ? schema.collections[nestedNode.relation.related_collection].primary : schema.collections[nestedNode.relation.collection].primary, item);
 			const fieldsWithFunctionsApplied = fields.map((field) => applyFunctionToColumnName(field));
 			item = fields.length > 0 ? pick(rawItem$1, fieldsWithFunctionsApplied, aliasFields) : rawItem$1[primaryKeyField];
 			items.push(item);

package/dist/database/run-ast/utils/with-preprocess-bindings.js

@@ -4,12 +4,8 @@ import { getHelpers } from "../../helpers/index.js";
 function withPreprocessBindings(knex, dbQuery) {
 	const schemaHelper = getHelpers(knex).schema;
 	dbQuery.client = new Proxy(dbQuery.client, { get(target, prop, receiver) {
-		if (prop === "query") {
-			return (connection, queryParams) => Reflect.get(target, prop, receiver).bind(dbQuery.client)(connection, schemaHelper.prepQueryParams(queryParams));
-		}
-		if (prop === "prepBindings") {
-			return (bindings) => schemaHelper.prepBindings(Reflect.get(target, prop, receiver).bind(dbQuery.client)(bindings));
-		}
+		if (prop === "query") return (connection, queryParams) => Reflect.get(target, prop, receiver).bind(dbQuery.client)(connection, schemaHelper.prepQueryParams(queryParams));
+		if (prop === "prepBindings") return (bindings) => schemaHelper.prepBindings(Reflect.get(target, prop, receiver).bind(dbQuery.client)(bindings));
 		return Reflect.get(target, prop, receiver);
 	} });
 }

package/dist/database/seeds/run.js

@@ -10,10 +10,7 @@ import yaml from "js-yaml";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 async function runSeed(database) {
 	const helpers = getHelpers(database);
-	const exists$1 = await database.schema.hasTable("directus_collections");
-	if (exists$1) {
-		throw new Error("Database is already installed");
-	}
+	if (await database.schema.hasTable("directus_collections")) throw new Error("Database is already installed");
 	const tableSeeds = await fse.readdir(path.resolve(__dirname));
 	for (const tableSeedFile of tableSeeds) {
 		if (tableSeedFile.startsWith("run")) continue;
@@ -25,51 +22,28 @@ async function runSeed(database) {
 				if (columnInfo.type === "alias" || columnInfo.type === "unknown") return;
 				if (columnInfo.type === "string") {
 					let length = columnInfo.length;
-					if (length === "MAX_TABLE_NAME_LENGTH") {
-						length = helpers.schema.getTableNameMaxLength();
-					} else if (length === "MAX_COLUMN_NAME_LENGTH") {
-						length = helpers.schema.getColumnNameMaxLength();
-					}
+					if (length === "MAX_TABLE_NAME_LENGTH") length = helpers.schema.getTableNameMaxLength();
+					else if (length === "MAX_COLUMN_NAME_LENGTH") length = helpers.schema.getColumnNameMaxLength();
 					column = tableBuilder.string(columnName, Number(length));
-				} else if (columnInfo.increments) {
-					column = tableBuilder.increments();
-				} else if (columnInfo.type === "csv") {
-					column = tableBuilder.text(columnName);
-				} else if (columnInfo.type === "hash") {
-					column = tableBuilder.string(columnName, 255);
-				} else if (columnInfo.type?.startsWith("geometry")) {
-					column = helpers.st.createColumn(tableBuilder, {
-						field: columnName,
-						type: columnInfo.type
-					});
-				} else {
-					column = tableBuilder[columnInfo.type](columnName);
-				}
-				if (columnInfo.primary) {
-					column.primary();
-				}
-				if (columnInfo.nullable !== undefined && columnInfo.nullable === false) {
-					column.notNullable();
-				}
-				if (columnInfo.default !== undefined) {
+				} else if (columnInfo.increments) column = tableBuilder.increments();
+				else if (columnInfo.type === "csv") column = tableBuilder.text(columnName);
+				else if (columnInfo.type === "hash") column = tableBuilder.string(columnName, 255);
+				else if (columnInfo.type?.startsWith("geometry")) column = helpers.st.createColumn(tableBuilder, {
+					field: columnName,
+					type: columnInfo.type
+				});
+				else column = tableBuilder[columnInfo.type](columnName);
+				if (columnInfo.primary) column.primary();
+				if (columnInfo.nullable !== void 0 && columnInfo.nullable === false) column.notNullable();
+				if (columnInfo.default !== void 0) {
 					let defaultValue = columnInfo.default;
-					if (isObject(defaultValue) || Array.isArray(defaultValue)) {
-						defaultValue = JSON.stringify(defaultValue);
-					}
-					if (defaultValue === "$now") {
-						defaultValue = database.fn.now();
-					}
+					if (isObject(defaultValue) || Array.isArray(defaultValue)) defaultValue = JSON.stringify(defaultValue);
+					if (defaultValue === "$now") defaultValue = database.fn.now();
 					column.defaultTo(defaultValue);
 				}
-				if (columnInfo.unique) {
-					column.unique();
-				}
-				if (columnInfo.unsigned) {
-					column.unsigned();
-				}
-				if (columnInfo.references) {
-					column.references(columnInfo.references.column).inTable(columnInfo.references.table);
-				}
+				if (columnInfo.unique) column.unique();
+				if (columnInfo.unsigned) column.unsigned();
+				if (columnInfo.references) column.references(columnInfo.references.column).inTable(columnInfo.references.table);
 			}
 		});
 	}

package/dist/deployment/deployment.js

@@ -11,11 +11,7 @@ var DeploymentDriver = class {
 	async axiosRequest(apiUrl, endpoint, options = {}) {
 		const { params,...requestOptions } = options;
 		const url = new URL(endpoint, apiUrl);
-		if (params) {
-			for (const [key, value] of Object.entries(params)) {
-				url.searchParams.set(key, value);
-			}
-		}
+		if (params) for (const [key, value] of Object.entries(params)) url.searchParams.set(key, value);
 		const axios = await getAxios();
 		const requestConfig = {
 			url: url.toString(),
@@ -23,9 +19,7 @@ var DeploymentDriver = class {
 			validateStatus: () => true,
 			headers: requestOptions.headers ?? {}
 		};
-		if (requestOptions.body) {
-			requestConfig.data = requestOptions.body;
-		}
+		if (requestOptions.body) requestConfig.data = requestOptions.body;
 		return await axios.request(requestConfig);
 	}
 };

package/dist/deployment/drivers/netlify.js

@@ -6,7 +6,7 @@ import { randomBytes, timingSafeEqual } from "node:crypto";
 import { NetlifyAPI } from "@netlify/api";
 
 //#region src/deployment/drivers/netlify.ts
-const WS_CONNECTIONS = new Map();
+const WS_CONNECTIONS = /* @__PURE__ */ new Map();
 const WS_IDLE_TIMEOUT = 6e4;
 const WS_CONNECTION_TIMEOUT = 1e4;
 const ANSI_REGEX = /[\x1b]\[[0-9;]*m/g;
@@ -42,9 +42,7 @@ var NetlifyDriver = class extends DeploymentDriver {
 			return await cb(this.api);
 		} catch (error) {
 			if (error instanceof Error && "status" in error && isNumber(error.status) && error.status >= 400) {
-				if (error.status === 401 || error.status === 403) {
-					throw new InvalidCredentialsError();
-				}
+				if (error.status === 401 || error.status === 403) throw new InvalidCredentialsError();
 				throw new ServiceUnavailableError({
 					service: "netlify",
 					reason: "Netlify API error: " + error.message
@@ -54,8 +52,7 @@ var NetlifyDriver = class extends DeploymentDriver {
 		}
 	}
 	mapStatus(netlifyState) {
-		const normalized = netlifyState?.toLowerCase();
-		switch (normalized) {
+		switch (netlifyState?.toLowerCase()) {
 			case "ready": return "ready";
 			case "error": return "error";
 			case "canceled": return "canceled";
@@ -71,13 +68,9 @@ var NetlifyDriver = class extends DeploymentDriver {
 			name: site.name,
 			deployable: Boolean(site.build_settings?.provider && site.build_settings?.repo_url)
 		};
-		if (site.custom_domain) {
-			result.url = `https://${site.custom_domain}`;
-		} else if (site.ssl_url) {
-			result.url = site.ssl_url;
-		} else if (site.url) {
-			result.url = site.url;
-		}
+		if (site.custom_domain) result.url = `https://${site.custom_domain}`;
+		else if (site.ssl_url) result.url = site.ssl_url;
+		else if (site.url) result.url = site.url;
 		return result;
 	}
 	async listProjects() {
@@ -105,31 +98,24 @@ var NetlifyDriver = class extends DeploymentDriver {
 		const result = this.mapSiteBase(site);
 		if (site.published_deploy) {
 			const deploy = site.published_deploy;
-			if (deploy.state && deploy.created_at) {
-				result.latest_deployment = {
-					status: this.mapStatus(deploy.state),
-					created_at: new Date(deploy.created_at),
-					...deploy.published_at && { finished_at: new Date(deploy.published_at) }
-				};
-			}
-		}
-		if (site.created_at) {
-			result.created_at = new Date(site.created_at);
-		}
-		if (site.updated_at) {
-			result.updated_at = new Date(site.updated_at);
+			if (deploy.state && deploy.created_at) result.latest_deployment = {
+				status: this.mapStatus(deploy.state),
+				created_at: new Date(deploy.created_at),
+				...deploy.published_at && { finished_at: new Date(deploy.published_at) }
+			};
 		}
+		if (site.created_at) result.created_at = new Date(site.created_at);
+		if (site.updated_at) result.updated_at = new Date(site.updated_at);
 		return result;
 	}
 	mapDeployUrl(deploy) {
 		return deploy["ssl_url"] ?? deploy["deploy_ssl_url"] ?? deploy["deploy_url"] ?? deploy["url"];
 	}
 	async listDeployments(projectId, limit = 20) {
-		const response = await this.handleApiError((api) => api.listSiteDeploys({
+		return (await this.handleApiError((api) => api.listSiteDeploys({
 			site_id: projectId,
 			per_page: limit
-		}));
-		return response.map((deploy) => {
+		}))).map((deploy) => {
 			const result = {
 				id: deploy.id,
 				project_id: deploy.site_id,
@@ -138,12 +124,8 @@ var NetlifyDriver = class extends DeploymentDriver {
 			};
 			const url = this.mapDeployUrl(deploy);
 			if (url) result.url = url;
-			if (deploy.published_at) {
-				result.finished_at = new Date(deploy.published_at);
-			}
-			if (deploy.error_message) {
-				result.error_message = deploy.error_message;
-			}
+			if (deploy.published_at) result.finished_at = new Date(deploy.published_at);
+			if (deploy.error_message) result.error_message = deploy.error_message;
 			return result;
 		});
 	}
@@ -157,12 +139,8 @@ var NetlifyDriver = class extends DeploymentDriver {
 		};
 		const url = this.mapDeployUrl(deploy);
 		if (url) result.url = url;
-		if (deploy.published_at) {
-			result.finished_at = new Date(deploy.published_at);
-		}
-		if (deploy.error_message) {
-			result.error_message = deploy.error_message;
-		}
+		if (deploy.published_at) result.finished_at = new Date(deploy.published_at);
+		if (deploy.error_message) result.error_message = deploy.error_message;
 		return result;
 	}
 	async triggerDeployment(projectId, options) {
@@ -171,12 +149,11 @@ var NetlifyDriver = class extends DeploymentDriver {
 			clear_cache: options?.clearCache || false
 		}));
 		const deployState = await this.handleApiError((api) => api.getDeploy({ deployId: buildResponse.deploy_id }));
-		const triggerResult = {
+		return {
 			deployment_id: buildResponse.deploy_id,
 			status: this.mapStatus(deployState.state),
 			created_at: new Date(deployState.created_at)
 		};
-		return triggerResult;
 	}
 	async cancelDeployment(deploymentId) {
 		try {
@@ -199,22 +176,16 @@ var NetlifyDriver = class extends DeploymentDriver {
 		const connection = WS_CONNECTIONS.get(deploymentId);
 		if (!connection) return;
 		connection.ws.close();
-		if (remove) {
-			WS_CONNECTIONS.delete(deploymentId);
-		}
+		if (remove) WS_CONNECTIONS.delete(deploymentId);
 	}
 	setupWsIdleTimeout(connection) {
-		if (connection.idleTimeout) {
-			clearTimeout(connection.idleTimeout);
-		}
+		if (connection.idleTimeout) clearTimeout(connection.idleTimeout);
 		connection.idleTimeout = setTimeout(() => {
 			this.closeWsConnection(connection.deploymentId);
 		}, WS_IDLE_TIMEOUT);
 	}
 	setupWsConnectionTimeout(connection, reject) {
-		if (connection.connectionTimeout) {
-			clearTimeout(connection.connectionTimeout);
-		}
+		if (connection.connectionTimeout) clearTimeout(connection.connectionTimeout);
 		connection.connectionTimeout = setTimeout(() => {
 			this.closeWsConnection(connection.deploymentId);
 			reject(new ServiceUnavailableError({
@@ -245,7 +216,7 @@ var NetlifyDriver = class extends DeploymentDriver {
 			connection.ws.addEventListener("open", () => {
 				if (connection.connectionTimeout) {
 					clearTimeout(connection.connectionTimeout);
-					connection.connectionTimeout = undefined;
+					connection.connectionTimeout = void 0;
 				}
 				this.setupWsIdleTimeout(connection);
 				const payload = JSON.stringify({
@@ -260,9 +231,7 @@ var NetlifyDriver = class extends DeploymentDriver {
 				const data = JSON.parse(event.data);
 				const cleanMessage = data.message.replace(/\r/g, "").replace(ANSI_REGEX, "");
 				let logType = "stdout";
-				if (data.type === "report") {
-					logType = cleanMessage.includes("Failing build") ? "stderr" : "info";
-				}
+				if (data.type === "report") logType = cleanMessage.includes("Failing build") ? "stderr" : "info";
 				connection.logs.push({
 					timestamp: new Date(data.ts),
 					type: logType,
@@ -281,9 +250,7 @@ var NetlifyDriver = class extends DeploymentDriver {
 				}));
 			});
 			connection.ws.addEventListener("close", () => {
-				if (connection.connectionTimeout) {
-					clearTimeout(connection.connectionTimeout);
-				}
+				if (connection.connectionTimeout) clearTimeout(connection.connectionTimeout);
 			});
 		});
 	}
@@ -292,22 +259,18 @@ var NetlifyDriver = class extends DeploymentDriver {
 		const secret = randomBytes(32).toString("hex");
 		const hookIds = [];
 		const signedUrl = `${webhookUrl}?token=${secret}`;
-		for (const siteId of projectIds) {
-			await this.cleanupStaleHooks(siteId, webhookUrl);
-		}
-		for (const siteId of projectIds) {
-			for (const event of NETLIFY_WEBHOOK_EVENTS) {
-				const hook = await this.handleApiError((api) => api.createHookBySiteId({
-					site_id: siteId,
-					body: {
-						type: "url",
-						event,
-						data: { url: signedUrl }
-					}
-				}));
-				logger.debug(`[webhook:netlify] Created hook ${hook.id} for event ${event}`);
-				hookIds.push(hook.id);
-			}
+		for (const siteId of projectIds) await this.cleanupStaleHooks(siteId, webhookUrl);
+		for (const siteId of projectIds) for (const event of NETLIFY_WEBHOOK_EVENTS) {
+			const hook = await this.handleApiError((api) => api.createHookBySiteId({
+				site_id: siteId,
+				body: {
+					type: "url",
+					event,
+					data: { url: signedUrl }
+				}
+			}));
+			logger.debug(`[webhook:netlify] Created hook ${hook.id} for event ${event}`);
+			hookIds.push(hook.id);
 		}
 		return {
 			webhook_ids: hookIds,
@@ -316,8 +279,7 @@ var NetlifyDriver = class extends DeploymentDriver {
 	}
 	async cleanupStaleHooks(siteId, webhookUrl) {
 		const logger = useLogger();
-		const hooks = await this.handleApiError((api) => api.listHooksBySiteId({ site_id: siteId }));
-		const staleHooks = hooks.filter((h) => h.data?.url?.startsWith(webhookUrl));
+		const staleHooks = (await this.handleApiError((api) => api.listHooksBySiteId({ site_id: siteId }))).filter((h) => h.data?.url?.startsWith(webhookUrl));
 		if (staleHooks.length > 0) {
 			logger.debug(`[webhook:netlify] Cleaning up ${staleHooks.length} stale hook(s) for site ${siteId}`);
 			await Promise.allSettled(staleHooks.map((h) => this.api.deleteHook({ hook_id: h.id })));
@@ -340,11 +302,8 @@ var NetlifyDriver = class extends DeploymentDriver {
 			return null;
 		}
 		const deploy = JSON.parse(rawBody.toString("utf-8"));
-		const state = this.mapStatus(deploy.state);
-		const mapping = STATE_TO_EVENT[state];
-		if (!mapping) {
-			return null;
-		}
+		const mapping = STATE_TO_EVENT[this.mapStatus(deploy.state)];
+		if (!mapping) return null;
 		const url = deploy.ssl_url || deploy.deploy_ssl_url || deploy.url;
 		const timestamp = deploy.published_at || deploy.updated_at || deploy.created_at;
 		return {
@@ -362,12 +321,8 @@ var NetlifyDriver = class extends DeploymentDriver {
 	async getDeploymentLogs(deploymentId, options) {
 		const deploy = await this.handleApiError((api) => api.getDeploy({ deployId: deploymentId }));
 		const connection = await this.getWsConnection(deploymentId);
-		if (this.mapStatus(deploy.state) !== "building") {
-			await connection.completed;
-		}
-		if (options?.since) {
-			return connection.logs.filter((log) => log.timestamp >= options.since);
-		}
+		if (this.mapStatus(deploy.state) !== "building") await connection.completed;
+		if (options?.since) return connection.logs.filter((log) => log.timestamp >= options.since);
 		return connection.logs;
 	}
 };