@directus/api 35.0.2 → 35.1.0

package/dist/cli/commands/init/questions.js

@@ -18,14 +18,13 @@ const port = ({ client }) => ({
 	name: "port",
 	message: "Port:",
 	default() {
-		const ports = {
+		return {
 			pg: 5432,
 			cockroachdb: 26257,
 			mysql2: 3306,
 			oracledb: 1521,
 			mssql: 1433
-		};
-		return ports[client];
+		}[client];
 	}
 });
 const database = () => ({

package/dist/cli/commands/schema/apply.js

@@ -20,13 +20,12 @@ function filterSnapshotDiff(snapshot, filters) {
 		if (item.field && filterSet.has(`${item.collection}.${item.field}`)) return false;
 		return true;
 	}
-	const filteredDiff = {
+	return {
 		collections: snapshot.collections.filter((item) => shouldKeep(item)),
 		fields: snapshot.fields.filter((item) => shouldKeep(item)),
 		systemFields: snapshot.systemFields.filter((item) => shouldKeep(item)),
 		relations: snapshot.relations.filter((item) => shouldKeep(item))
 	};
-	return filteredDiff;
 }
 async function apply(snapshotPath, options) {
 	const logger = useLogger();
@@ -41,16 +40,11 @@ async function apply(snapshotPath, options) {
 	let snapshot;
 	try {
 		const fileContents = await promises.readFile(filename, "utf8");
-		if (filename.endsWith(".yaml") || filename.endsWith(".yml")) {
-			snapshot = await load(fileContents);
-		} else {
-			snapshot = parseJSON(fileContents);
-		}
+		if (filename.endsWith(".yaml") || filename.endsWith(".yml")) snapshot = await load(fileContents);
+		else snapshot = parseJSON(fileContents);
 		const currentSnapshot = await getSnapshot({ database });
 		let snapshotDiff = getSnapshotDiff(currentSnapshot, snapshot);
-		if (options?.ignoreRules) {
-			snapshotDiff = filterSnapshotDiff(snapshotDiff, options.ignoreRules.split(","));
-		}
+		if (options?.ignoreRules) snapshotDiff = filterSnapshotDiff(snapshotDiff, options.ignoreRules.split(","));
 		if (snapshotDiff.collections.length === 0 && snapshotDiff.fields.length === 0 && snapshotDiff.systemFields.length === 0 && snapshotDiff.relations.length === 0) {
 			logger.info("No changes to apply.");
 			database.destroy();
@@ -62,65 +56,41 @@ async function apply(snapshotPath, options) {
 			const sections = [];
 			if (snapshotDiff.collections.length > 0) {
 				const lines = [chalk.underline.bold("Collections:")];
-				for (const { collection, diff } of snapshotDiff.collections) {
-					if (diff[0]?.kind === DiffKind.EDIT) {
-						lines.push(`  - ${chalk.magenta("Update")} ${collection}`);
-						for (const change of diff) {
-							if (change.kind === DiffKind.EDIT) {
-								const path$1 = formatPath(change.path);
-								lines.push(`    - Set ${path$1} to ${change.rhs}`);
-							}
-						}
-					} else if (diff[0]?.kind === DiffKind.DELETE) {
-						lines.push(`  - ${chalk.red("Delete")} ${collection}`);
-					} else if (diff[0]?.kind === DiffKind.NEW) {
-						lines.push(`  - ${chalk.green("Create")} ${collection}`);
-					} else if (diff[0]?.kind === DiffKind.ARRAY) {
-						lines.push(`  - ${chalk.magenta("Update")} ${collection}`);
+				for (const { collection, diff } of snapshotDiff.collections) if (diff[0]?.kind === DiffKind.EDIT) {
+					lines.push(`  - ${chalk.magenta("Update")} ${collection}`);
+					for (const change of diff) if (change.kind === DiffKind.EDIT) {
+						const path$1 = formatPath(change.path);
+						lines.push(`    - Set ${path$1} to ${change.rhs}`);
 					}
-				}
+				} else if (diff[0]?.kind === DiffKind.DELETE) lines.push(`  - ${chalk.red("Delete")} ${collection}`);
+				else if (diff[0]?.kind === DiffKind.NEW) lines.push(`  - ${chalk.green("Create")} ${collection}`);
+				else if (diff[0]?.kind === DiffKind.ARRAY) lines.push(`  - ${chalk.magenta("Update")} ${collection}`);
 				sections.push(lines.join("\n"));
 			}
 			if (snapshotDiff.fields.length > 0) {
 				const lines = [chalk.underline.bold("Fields:")];
-				for (const { collection, field, diff } of snapshotDiff.fields) {
-					if (diff[0]?.kind === DiffKind.EDIT || isNestedMetaUpdate(diff[0])) {
-						lines.push(`  - ${chalk.magenta("Update")} ${collection}.${field}`);
-						for (const change of diff) {
-							const path$1 = formatPath(change.path);
-							if (change.kind === DiffKind.EDIT) {
-								lines.push(`    - Set ${path$1} to ${change.rhs}`);
-							} else if (change.kind === DiffKind.DELETE) {
-								lines.push(`    - Remove ${path$1}`);
-							} else if (change.kind === DiffKind.NEW) {
-								lines.push(`    - Add ${path$1} and set it to ${change.rhs}`);
-							}
-						}
-					} else if (diff[0]?.kind === DiffKind.DELETE) {
-						lines.push(`  - ${chalk.red("Delete")} ${collection}.${field}`);
-					} else if (diff[0]?.kind === DiffKind.NEW) {
-						lines.push(`  - ${chalk.green("Create")} ${collection}.${field}`);
-					} else if (diff[0]?.kind === DiffKind.ARRAY) {
-						lines.push(`  - ${chalk.magenta("Update")} ${collection}.${field}`);
+				for (const { collection, field, diff } of snapshotDiff.fields) if (diff[0]?.kind === DiffKind.EDIT || isNestedMetaUpdate(diff[0])) {
+					lines.push(`  - ${chalk.magenta("Update")} ${collection}.${field}`);
+					for (const change of diff) {
+						const path$1 = formatPath(change.path);
+						if (change.kind === DiffKind.EDIT) lines.push(`    - Set ${path$1} to ${change.rhs}`);
+						else if (change.kind === DiffKind.DELETE) lines.push(`    - Remove ${path$1}`);
+						else if (change.kind === DiffKind.NEW) lines.push(`    - Add ${path$1} and set it to ${change.rhs}`);
 					}
-				}
+				} else if (diff[0]?.kind === DiffKind.DELETE) lines.push(`  - ${chalk.red("Delete")} ${collection}.${field}`);
+				else if (diff[0]?.kind === DiffKind.NEW) lines.push(`  - ${chalk.green("Create")} ${collection}.${field}`);
+				else if (diff[0]?.kind === DiffKind.ARRAY) lines.push(`  - ${chalk.magenta("Update")} ${collection}.${field}`);
 				sections.push(lines.join("\n"));
 			}
 			if (snapshotDiff.systemFields.length > 0) {
 				const lines = [chalk.underline.bold("System Fields:")];
-				for (const { collection, field, diff } of snapshotDiff.systemFields) {
-					if (diff[0]?.kind === DiffKind.EDIT) {
-						lines.push(`  - ${chalk.magenta("Update")} ${collection}.${field}`);
-						for (const change of diff) {
-							const path$1 = formatPath(change.path);
-							if (change.kind === DiffKind.EDIT) {
-								lines.push(`    - Set ${path$1} to ${change.rhs}`);
-							} else if (change.kind === DiffKind.DELETE) {
-								lines.push(`    - Remove ${path$1}`);
-							} else if (change.kind === DiffKind.NEW) {
-								lines.push(`    - Add ${path$1} and set it to ${change.rhs}`);
-							}
-						}
+				for (const { collection, field, diff } of snapshotDiff.systemFields) if (diff[0]?.kind === DiffKind.EDIT) {
+					lines.push(`  - ${chalk.magenta("Update")} ${collection}.${field}`);
+					for (const change of diff) {
+						const path$1 = formatPath(change.path);
+						if (change.kind === DiffKind.EDIT) lines.push(`    - Set ${path$1} to ${change.rhs}`);
+						else if (change.kind === DiffKind.DELETE) lines.push(`    - Remove ${path$1}`);
+						else if (change.kind === DiffKind.NEW) lines.push(`    - Add ${path$1} and set it to ${change.rhs}`);
 					}
 				}
 				sections.push(lines.join("\n"));
@@ -131,19 +101,13 @@ async function apply(snapshotPath, options) {
 					const relatedCollection = formatRelatedCollection(related_collection);
 					if (diff[0]?.kind === DiffKind.EDIT) {
 						lines.push(`  - ${chalk.magenta("Update")} ${collection}.${field}${relatedCollection}`);
-						for (const change of diff) {
-							if (change.kind === DiffKind.EDIT) {
-								const path$1 = formatPath(change.path);
-								lines.push(`    - Set ${path$1} to ${change.rhs}`);
-							}
+						for (const change of diff) if (change.kind === DiffKind.EDIT) {
+							const path$1 = formatPath(change.path);
+							lines.push(`    - Set ${path$1} to ${change.rhs}`);
 						}
-					} else if (diff[0]?.kind === DiffKind.DELETE) {
-						lines.push(`  - ${chalk.red("Delete")} ${collection}.${field}${relatedCollection}`);
-					} else if (diff[0]?.kind === DiffKind.NEW) {
-						lines.push(`  - ${chalk.green("Create")} ${collection}.${field}${relatedCollection}`);
-					} else if (diff[0]?.kind === DiffKind.ARRAY) {
-						lines.push(`  - ${chalk.magenta("Update")} ${collection}.${field}${relatedCollection}`);
-					}
+					} else if (diff[0]?.kind === DiffKind.DELETE) lines.push(`  - ${chalk.red("Delete")} ${collection}.${field}${relatedCollection}`);
+					else if (diff[0]?.kind === DiffKind.NEW) lines.push(`  - ${chalk.green("Create")} ${collection}.${field}${relatedCollection}`);
+					else if (diff[0]?.kind === DiffKind.ARRAY) lines.push(`  - ${chalk.magenta("Update")} ${collection}.${field}${relatedCollection}`);
 				}
 				sections.push(lines.join("\n"));
 			}
@@ -155,11 +119,9 @@ async function apply(snapshotPath, options) {
 			const { proceed } = await inquirer.prompt([{
 				type: "confirm",
 				name: "proceed",
-				message: message + "\n\n" + "Would you like to continue?"
+				message: message + "\n\nWould you like to continue?"
 			}]);
-			if (proceed === false) {
-				process.exit(0);
-			}
+			if (proceed === false) process.exit(0);
 		}
 		await applySnapshot(snapshot, {
 			current: currentSnapshot,
@@ -176,15 +138,11 @@ async function apply(snapshotPath, options) {
 	}
 }
 function formatPath(path$1) {
-	if (path$1.length === 1) {
-		return path$1.toString();
-	}
+	if (path$1.length === 1) return path$1.toString();
 	return path$1.slice(1).join(".");
 }
 function formatRelatedCollection(relatedCollection) {
-	if (relatedCollection) {
-		return ` → ${relatedCollection}`;
-	}
+	if (relatedCollection) return ` → ${relatedCollection}`;
 	return "";
 }
 

package/dist/cli/commands/schema/snapshot.js

@@ -13,11 +13,8 @@ async function snapshot(snapshotPath, options) {
 	try {
 		const snapshot$1 = await getSnapshot({ database });
 		let snapshotString;
-		if (options?.format === "yaml") {
-			snapshotString = dump(snapshot$1);
-		} else {
-			snapshotString = JSON.stringify(snapshot$1);
-		}
+		if (options?.format === "yaml") snapshotString = dump(snapshot$1);
+		else snapshotString = JSON.stringify(snapshot$1);
 		if (snapshotPath) {
 			const filename = path.resolve(process.cwd(), snapshotPath);
 			let snapshotExists;
@@ -40,9 +37,7 @@ async function snapshot(snapshotPath, options) {
 			}
 			await promises.writeFile(filename, snapshotString);
 			logger.info(`Snapshot saved to ${filename}`);
-		} else {
-			process.stdout.write(snapshotString);
-		}
+		} else process.stdout.write(snapshotString);
 		database.destroy();
 		process.exit(0);
 	} catch (err) {

package/dist/cli/commands/users/create.js

@@ -12,12 +12,10 @@ async function usersCreate({ email, password, role }) {
 		process.exit(1);
 	}
 	try {
-		const schema = await getSchema();
-		const service = new UsersService({
-			schema,
+		const id = await new UsersService({
+			schema: await getSchema(),
 			knex: database
-		});
-		const id = await service.createOne({
+		}).createOne({
 			email,
 			password,
 			role,

package/dist/cli/commands/users/passwd.js

@@ -14,18 +14,15 @@ async function usersPasswd({ email, password }) {
 	}
 	try {
 		const passwordHashed = await generateHash(password);
-		const schema = await getSchema();
 		const service = new UsersService({
-			schema,
+			schema: await getSchema(),
 			knex: database
 		});
 		const user = await service.knex.select("id").from("directus_users").whereRaw("LOWER(??) = ?", ["email", email.toLowerCase()]).first();
 		if (user) {
 			await service.knex("directus_users").update({ password: passwordHashed }).where({ id: user.id });
 			logger.info(`Password is updated for user ${user.id}`);
-		} else {
-			logger.error("No such user by this email");
-		}
+		} else logger.error("No such user by this email");
 		await database.destroy();
 		process.exit(user ? 0 : 1);
 	} catch (err) {

package/dist/cli/index.js

@@ -38,8 +38,7 @@ async function createCli() {
 	const usersCommand = program.command("users");
 	usersCommand.command("create").description("Create a new user").option("--email <value>", `user's email`).option("--password <value>", `user's password`).option("--role <value>", `user's role`).action(usersCreate);
 	usersCommand.command("passwd").description("Set user password").option("--email <value>", `user's email`).option("--password <value>", `user's new password`).action(usersPasswd);
-	const rolesCommand = program.command("roles");
-	rolesCommand.command("create").description("Create a new role").option("--role <value>", `name for the role`).option("--admin", `whether or not the role has admin access`).option("--app", `whether or not the role has app access`).action(rolesCreate);
+	program.command("roles").command("create").description("Create a new role").option("--role <value>", `name for the role`).option("--admin", `whether or not the role has admin access`).option("--app", `whether or not the role has app access`).action(rolesCreate);
 	program.command("cache").command("clear").description("Clear the data and system caches").option("--system", "Clear the system cache only (schema, permissions)").option("--data", "Clear the data cache only").action(cacheClear);
 	program.command("count <collection>").description("Count the amount of items in a given collection").action(count);
 	program.command("bootstrap").description("Initialize or update the database").option("--skipAdminInit", "Skips the creation of the default Admin Role and User").action(bootstrap);

package/dist/cli/load-extensions.js

@@ -8,15 +8,12 @@ const loadExtensions = async () => {
 	const env = useEnv();
 	const logger = useLogger();
 	if (!("DB_CLIENT" in env)) return;
-	const installed = await isInstalled();
-	if (!installed) return;
-	const migrationsValid = await validateMigrations();
-	if (!migrationsValid) {
+	if (!await isInstalled()) return;
+	if (!await validateMigrations()) {
 		logger.info("Skipping CLI extensions initialization due to outstanding migrations.");
 		return;
 	}
-	const extensionManager = getExtensionManager();
-	await extensionManager.initialize({
+	await getExtensionManager().initialize({
 		schedule: false,
 		watch: false
 	});

package/dist/cli/utils/create-db-connection.js

@@ -40,18 +40,13 @@ function createDBConnection(client, credentials) {
 		},
 		pool: {}
 	};
-	if (client === "sqlite3") {
-		knexConfig.useNullAsDefault = true;
-	}
-	if (client === "cockroachdb") {
-		knexConfig.pool.afterCreate = (conn, callback) => {
-			conn.query("SET serial_normalization = \"sql_sequence\"");
-			conn.query("SET default_int_size = 4");
-			callback(null, conn);
-		};
-	}
-	const db = knex.default(knexConfig);
-	return db;
+	if (client === "sqlite3") knexConfig.useNullAsDefault = true;
+	if (client === "cockroachdb") knexConfig.pool.afterCreate = (conn, callback) => {
+		conn.query("SET serial_normalization = \"sql_sequence\"");
+		conn.query("SET default_int_size = 4");
+		callback(null, conn);
+	};
+	return knex.default(knexConfig);
 }
 
 //#endregion

package/dist/cli/utils/create-env/index.js

@@ -19,15 +19,11 @@ async function createEnv(client, credentials, directory) {
 		security: { SECRET: nanoid(32) },
 		database: { DB_CLIENT: dbClient }
 	};
-	for (const [key, value] of Object.entries(credentials)) {
-		config["database"][`DB_${key.toUpperCase()}`] = value;
-	}
+	for (const [key, value] of Object.entries(credentials)) config["database"][`DB_${key.toUpperCase()}`] = value;
 	const configAsStrings = {};
 	for (const [key, value] of Object.entries(config)) {
 		configAsStrings[key] = "";
-		for (const [envKey, envValue] of Object.entries(value)) {
-			configAsStrings[key] += `${envKey}="${envValue}"\n`;
-		}
+		for (const [envKey, envValue] of Object.entries(value)) configAsStrings[key] += `${envKey}="${envValue}"\n`;
 	}
 	const templateString = await readFile(path.join(__dirname, "env-stub.liquid"), "utf8");
 	const text = await liquidEngine.parseAndRender(templateString, configAsStrings);

package/dist/cli/utils/drivers.js

@@ -8,9 +8,7 @@ const drivers = {
 	oracledb: "Oracle Database"
 };
 function getDriverForClient(client) {
-	for (const [key, value] of Object.entries(drivers)) {
-		if (value === client) return key;
-	}
+	for (const [key, value] of Object.entries(drivers)) if (value === client) return key;
 	return null;
 }
 

package/dist/controllers/access.js

@@ -33,9 +33,7 @@ router.post("/", async_handler_default(async (req, res, next) => {
 			res.locals["payload"] = { data: item };
 		}
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -50,11 +48,8 @@ const readHandler = async_handler_default(async (req, res, next) => {
 		schema: req.schema
 	});
 	let result;
-	if (req.body.keys) {
-		result = await service.readMany(req.body.keys, req.sanitizedQuery);
-	} else {
-		result = await service.readByQuery(req.sanitizedQuery);
-	}
+	if (req.body.keys) result = await service.readMany(req.body.keys, req.sanitizedQuery);
+	else result = await service.readByQuery(req.sanitizedQuery);
 	const meta = await metaService.getMetaForQuery("directus_access", req.sanitizedQuery);
 	res.locals["payload"] = {
 		data: result,
@@ -66,11 +61,10 @@ router.get("/", validateBatch("read"), readHandler, respond);
 router.search("/", validateBatch("read"), readHandler, respond);
 router.get("/:pk", async_handler_default(async (req, res, next) => {
 	if (req.path.endsWith("me")) return next();
-	const service = new AccessService({
+	const record = await new AccessService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const record = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: record };
 	return next();
 }), respond);
@@ -80,11 +74,9 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		schema: req.schema
 	});
 	let keys = [];
-	if (Array.isArray(req.body)) {
-		keys = await service.updateBatch(req.body);
-	} else if (req.body.keys) {
-		keys = await service.updateMany(req.body.keys, req.body.data);
-	} else {
+	if (Array.isArray(req.body)) keys = await service.updateBatch(req.body);
+	else if (req.body.keys) keys = await service.updateMany(req.body.keys, req.body.data);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		keys = await service.updateByQuery(sanitizedQuery, req.body.data);
 	}
@@ -92,9 +84,7 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		const result = await service.readMany(keys, req.sanitizedQuery);
 		res.locals["payload"] = { data: result };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -109,9 +99,7 @@ router.patch("/:pk", async_handler_default(async (req, res, next) => {
 		const item = await service.readOne(primaryKey, req.sanitizedQuery);
 		res.locals["payload"] = { data: item || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -121,22 +109,19 @@ router.delete("/", validateBatch("delete"), async_handler_default(async (req, _r
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	if (Array.isArray(req.body)) {
-		await service.deleteMany(req.body);
-	} else if (req.body.keys) {
-		await service.deleteMany(req.body.keys);
-	} else {
+	if (Array.isArray(req.body)) await service.deleteMany(req.body);
+	else if (req.body.keys) await service.deleteMany(req.body.keys);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		await service.deleteByQuery(sanitizedQuery);
 	}
 	return next();
 }), respond);
 router.delete("/:pk", async_handler_default(async (req, _res, next) => {
-	const service = new AccessService({
+	await new AccessService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 var access_default = router;

package/dist/controllers/activity.js

@@ -19,13 +19,9 @@ const readHandler = async_handler_default(async (req, res, next) => {
 		schema: req.schema
 	});
 	let result;
-	if (req.singleton) {
-		result = await service.readSingleton(req.sanitizedQuery);
-	} else if (req.body.keys) {
-		result = await service.readMany(req.body.keys, req.sanitizedQuery);
-	} else {
-		result = await service.readByQuery(req.sanitizedQuery);
-	}
+	if (req.singleton) result = await service.readSingleton(req.sanitizedQuery);
+	else if (req.body.keys) result = await service.readMany(req.body.keys, req.sanitizedQuery);
+	else result = await service.readByQuery(req.sanitizedQuery);
 	const meta = await metaService.getMetaForQuery("directus_activity", req.sanitizedQuery);
 	res.locals["payload"] = {
 		data: result,
@@ -36,11 +32,10 @@ const readHandler = async_handler_default(async (req, res, next) => {
 router.search("/", validateBatch("read"), readHandler, respond);
 router.get("/", readHandler, respond);
 router.get("/:pk", async_handler_default(async (req, res, next) => {
-	const service = new ActivityService({
+	const record = await new ActivityService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const record = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: record || null };
 	return next();
 }), respond);