@directus/api 35.0.2 → 35.1.0

package/dist/database/errors/dialects/oracle.js

@@ -12,14 +12,11 @@ function extractError(error) {
 	}
 }
 function containsNullValues(error) {
-	const betweenQuotes = /"([^"]+)"/g;
-	const matches = error.message.match(betweenQuotes);
+	const matches = error.message.match(/"([^"]+)"/g);
 	if (!matches) return error;
-	const collection = matches[0].slice(1, -1);
-	const field = matches[1].slice(1, -1);
 	return new ContainsNullValuesError({
-		collection,
-		field
+		collection: matches[0].slice(1, -1),
+		field: matches[1].slice(1, -1)
 	});
 }
 

package/dist/database/errors/dialects/postgres.js

@@ -20,8 +20,7 @@ function extractError(error, data) {
 	}
 	function uniqueViolation() {
 		const { table, detail } = error;
-		const betweenParens = /\(([^)]+)\)/g;
-		const matches = detail.match(betweenParens);
+		const matches = detail.match(/\(([^)]+)\)/g);
 		if (!matches) return error;
 		const collection = table;
 		const field = matches[0].slice(1, -1);
@@ -32,8 +31,7 @@ function extractError(error, data) {
 		});
 	}
 	function numericValueOutOfRange() {
-		const regex = /"(.*?)"/g;
-		const matches = error.message.match(regex);
+		const matches = error.message.match(/"(.*?)"/g);
 		if (!matches) return error;
 		const collection = matches[0].slice(1, -1);
 		const field = matches[1]?.slice(1, -1) ?? null;
@@ -44,12 +42,7 @@ function extractError(error, data) {
 		});
 	}
 	function valueLimitViolation() {
-		/**
-		* NOTE:
-		* Postgres doesn't return the offending column
-		*/
-		const regex = /"(.*?)"/g;
-		const matches = error.message.match(regex);
+		const matches = error.message.match(/"(.*?)"/g);
 		if (!matches) return error;
 		const collection = matches[0].slice(1, -1);
 		const field = matches[1]?.slice(1, -1) ?? null;
@@ -62,12 +55,10 @@ function extractError(error, data) {
 	function notNullViolation() {
 		const { table, column } = error;
 		if (!column) return error;
-		if (error.message.endsWith("contains null values")) {
-			return new ContainsNullValuesError({
-				collection: table,
-				field: column
-			});
-		}
+		if (error.message.endsWith("contains null values")) return new ContainsNullValuesError({
+			collection: table,
+			field: column
+		});
 		return new NotNullViolationError({
 			collection: table,
 			field: column
@@ -75,8 +66,7 @@ function extractError(error, data) {
 	}
 	function foreignKeyViolation() {
 		const { table, detail } = error;
-		const betweenParens = /\(([^)]+)\)/g;
-		const matches = detail.match(betweenParens);
+		const matches = detail.match(/\(([^)]+)\)/g);
 		if (!matches) return error;
 		const collection = table;
 		const field = matches[0].slice(1, -1);

package/dist/database/errors/dialects/sqlite.js

@@ -2,9 +2,7 @@ import { ContainsNullValuesError, InvalidForeignKeyError, NotNullViolationError,
 
 //#region src/database/errors/dialects/sqlite.ts
 function extractError(error, data) {
-	if (error.message.includes("SQLITE_CONSTRAINT: NOT NULL")) {
-		return notNullConstraint(error);
-	}
+	if (error.message.includes("SQLITE_CONSTRAINT: NOT NULL")) return notNullConstraint(error);
 	if (error.message.includes("SQLITE_CONSTRAINT: UNIQUE")) {
 		const errorParts = error.message.split(" ");
 		const [table, field] = errorParts[errorParts.length - 1].split(".");
@@ -15,30 +13,27 @@ function extractError(error, data) {
 			value: field ? data[field] : null
 		});
 	}
-	if (error.message.includes("SQLITE_CONSTRAINT: FOREIGN KEY")) {
-		/**
-		* NOTE:
-		* SQLite doesn't return any useful information in it's foreign key constraint failed error, so
-		* we can't extract the table/column/value accurately
-		*/
-		return new InvalidForeignKeyError({
-			collection: null,
-			field: null,
-			value: null
-		});
-	}
+	if (error.message.includes("SQLITE_CONSTRAINT: FOREIGN KEY"))
+ /**
+	* NOTE:
+	* SQLite doesn't return any useful information in it's foreign key constraint failed error, so
+	* we can't extract the table/column/value accurately
+	*/
+	return new InvalidForeignKeyError({
+		collection: null,
+		field: null,
+		value: null
+	});
 	return error;
 }
 function notNullConstraint(error) {
 	const errorParts = error.message.split(" ");
 	const [table, column] = errorParts[errorParts.length - 1].split(".");
 	if (table && column) {
-		if (table.startsWith("_knex_temp_alter")) {
-			return new ContainsNullValuesError({
-				collection: table,
-				field: column
-			});
-		}
+		if (table.startsWith("_knex_temp_alter")) return new ContainsNullValuesError({
+			collection: table,
+			field: column
+		});
 		return new NotNullViolationError({
 			collection: table,
 			field: column

package/dist/database/errors/translate.js

@@ -37,12 +37,11 @@ async function translateDatabaseError(error, data) {
 			defaultError = await extractError(error, data);
 			break;
 	}
-	const hookError = await emitter_default.emitFilter("database.error", defaultError, { client }, {
+	return await emitter_default.emitFilter("database.error", defaultError, { client }, {
 		database: database_default(),
 		schema: null,
 		accountability: null
 	});
-	return hookError;
 }
 
 //#endregion

package/dist/database/get-ast-from-query/get-ast-from-query.js

@@ -13,31 +13,23 @@ async function getAstFromQuery(options, context) {
 		cases: []
 	};
 	let fields = ["*"];
-	if (options.query.fields) {
-		fields = options.query.fields;
-	}
+	if (options.query.fields) fields = options.query.fields;
 	/**
 	* When using aggregate functions, you can't have any other regular fields
 	* selected. This makes sure you never end up in a non-aggregate fields selection error
 	*/
-	if (Object.keys(options.query.aggregate || {}).length > 0) {
-		fields = [];
-	}
+	if (Object.keys(options.query.aggregate || {}).length > 0) fields = [];
 	/**
 	* Similarly, when grouping on a specific field, you can't have other non-aggregated fields.
 	* The group query will override the fields query
 	*/
-	if (options.query.group) {
-		fields = options.query.group;
-	}
+	if (options.query.group) fields = options.query.group;
 	fields = uniq(fields);
 	const deep = options.query.deep || {};
 	delete options.query.fields;
 	delete options.query.deep;
 	options.query.sort ??= await getAllowedSort(options, context);
-	if (options.query.aggregate && Object.keys(options.query.aggregate).length && !options.query.group?.[0]) {
-		delete options.query.sort;
-	}
+	if (options.query.aggregate && Object.keys(options.query.aggregate).length && !options.query.group?.[0]) delete options.query.sort;
 	ast.children = await parseFields({
 		parentCollection: options.collection,
 		fields,

package/dist/database/get-ast-from-query/lib/convert-wildcards.js

@@ -8,13 +8,11 @@ async function convertWildcards(options, context) {
 	const fields = cloneDeep(options.fields);
 	const fieldsInCollection = Object.entries(context.schema.collections[options.collection].fields).map(([name]) => name);
 	let allowedFields = fieldsInCollection;
-	if (options.accountability && options.accountability.admin === false) {
-		allowedFields = await fetchAllowedFields({
-			collection: options.collection,
-			action: "read",
-			accountability: options.accountability
-		}, context);
-	}
+	if (options.accountability && options.accountability.admin === false) allowedFields = await fetchAllowedFields({
+		collection: options.collection,
+		action: "read",
+		accountability: options.accountability
+	}, context);
 	if (!allowedFields || allowedFields.length === 0) return [];
 	if (allowedFields[0] === "*") allowedFields = fieldsInCollection;
 	for (let index = 0; index < fields.length; index++) {
@@ -22,9 +20,8 @@ async function convertWildcards(options, context) {
 		if (fieldKey.includes("*") === false) continue;
 		if (fieldKey === "*") {
 			const aliases = Object.keys(options.alias ?? {});
-			if (allowedFields.includes("*")) {
-				fields.splice(index, 1, ...fieldsInCollection, ...aliases);
-			} else {
+			if (allowedFields.includes("*")) fields.splice(index, 1, ...fieldsInCollection, ...aliases);
+			else {
 				const allowedAliases = aliases.filter((fieldKey$1) => {
 					const { fieldName } = parseFilterKey(options.alias[fieldKey$1]);
 					return allowedFields.includes(fieldName);
@@ -35,28 +32,17 @@ async function convertWildcards(options, context) {
 		if (fieldKey.includes(".") && fieldKey.split(".")[0] === "*") {
 			const parts = fieldKey.split(".");
 			let relationalFields = [];
-			if (allowedFields.includes("*")) {
-				relationalFields = context.schema.relations.reduce((acc, relation) => {
-					if (relation.collection === options.collection && !acc.includes(relation.field)) {
-						acc.push(relation.field);
-					}
-					if (relation.related_collection === options.collection && !acc.includes(relation.meta.one_field)) {
-						acc.push(relation.meta.one_field);
-					}
-					return acc;
-				}, []);
-			} else {
-				relationalFields = allowedFields.filter((fieldKey$1) => getRelation(context.schema.relations, options.collection, fieldKey$1) !== undefined);
-			}
-			if (options.backlink === false) {
-				relationalFields = relationalFields.filter((relationField) => getRelation(context.schema.relations, options.collection, relationField) !== context.parentRelation);
-			}
+			if (allowedFields.includes("*")) relationalFields = context.schema.relations.reduce((acc, relation) => {
+				if (relation.collection === options.collection && !acc.includes(relation.field)) acc.push(relation.field);
+				if (relation.related_collection === options.collection && !acc.includes(relation.meta.one_field)) acc.push(relation.meta.one_field);
+				return acc;
+			}, []);
+			else relationalFields = allowedFields.filter((fieldKey$1) => getRelation(context.schema.relations, options.collection, fieldKey$1) !== void 0);
+			if (options.backlink === false) relationalFields = relationalFields.filter((relationField) => getRelation(context.schema.relations, options.collection, relationField) !== context.parentRelation);
 			const nonRelationalFields = allowedFields.filter((fieldKey$1) => relationalFields.includes(fieldKey$1) === false);
 			const aliasFields = Object.keys(options.alias ?? {}).map((fieldKey$1) => {
 				const name = options.alias[fieldKey$1];
-				if (relationalFields.includes(name)) {
-					return `${fieldKey$1}.${parts.slice(1).join(".")}`;
-				}
+				if (relationalFields.includes(name)) return `${fieldKey$1}.${parts.slice(1).join(".")}`;
 				return fieldKey$1;
 			});
 			fields.splice(index, 1, ...[

package/dist/database/get-ast-from-query/lib/parse-fields.js

@@ -67,8 +67,7 @@ async function parseFields(options, context) {
 			}
 		}
 		const isRelationalFunctionCall = isFunctionCall && name.includes(".") && name.indexOf(".") < name.indexOf("(");
-		const isRelational = (!isFunctionCall || isRelationalFunctionCall) && (name.includes(".") || !!context.schema.relations.find((relation) => relation.related_collection === options.parentCollection && relation.meta?.one_field === name));
-		if (isRelational) {
+		if ((!isFunctionCall || isRelationalFunctionCall) && (name.includes(".") || !!context.schema.relations.find((relation) => relation.related_collection === options.parentCollection && relation.meta?.one_field === name))) {
 			const parts = (isFunctionCall ? name : fieldKey).split(".");
 			let rootField = parts[0];
 			let collectionScope = null;
@@ -77,32 +76,20 @@ async function parseFields(options, context) {
 				rootField = key;
 				collectionScope = scope;
 			}
-			if (rootField in relationalStructure === false) {
-				if (collectionScope) {
-					relationalStructure[rootField] = { [collectionScope]: [] };
-				} else {
-					relationalStructure[rootField] = [];
-				}
-			}
+			if (rootField in relationalStructure === false) if (collectionScope) relationalStructure[rootField] = { [collectionScope]: [] };
+			else relationalStructure[rootField] = [];
 			if (parts.length > 1) {
 				const childKey = parts.slice(1).join(".");
 				if (collectionScope) {
-					if (collectionScope in relationalStructure[rootField] === false) {
-						relationalStructure[rootField][collectionScope] = [];
-					}
+					if (collectionScope in relationalStructure[rootField] === false) relationalStructure[rootField][collectionScope] = [];
 					relationalStructure[rootField][collectionScope].push(childKey);
-				} else {
-					relationalStructure[rootField].push(childKey);
-				}
+				} else relationalStructure[rootField].push(childKey);
 			}
 		} else {
 			if (name.includes(":")) {
 				const [key, scope] = name.split(":");
-				if (key in relationalStructure === false) {
-					relationalStructure[key] = { [scope]: [] };
-				} else if (scope in relationalStructure[key] === false) {
-					relationalStructure[key][scope] = [];
-				}
+				if (key in relationalStructure === false) relationalStructure[key] = { [scope]: [] };
+				else if (scope in relationalStructure[key] === false) relationalStructure[key][scope] = [];
 				continue;
 			}
 			children.push({
@@ -116,9 +103,7 @@ async function parseFields(options, context) {
 	}
 	for (const [fieldKey, nestedFields] of Object.entries(relationalStructure)) {
 		let fieldName = fieldKey;
-		if (options.query.alias && fieldKey in options.query.alias) {
-			fieldName = options.query.alias[fieldKey];
-		}
+		if (options.query.alias && fieldKey in options.query.alias) fieldName = options.query.alias[fieldKey];
 		const relatedCollection = getRelatedCollection(context.schema, options.parentCollection, fieldName);
 		const relation = getRelation(context.schema.relations, options.parentCollection, fieldName);
 		if (!relation) continue;
@@ -169,15 +154,12 @@ async function parseFields(options, context) {
 			}
 		} else if (relatedCollection) {
 			if (options.accountability && options.accountability.admin === false && policies) {
-				const permissions = await fetchPermissions({
+				if ((await fetchPermissions({
 					action: "read",
 					collections: [relatedCollection],
 					policies,
 					accountability: options.accountability
-				}, context);
-				if (permissions.length === 0) {
-					continue;
-				}
+				}, context)).length === 0) continue;
 			}
 			const childQuery = { ...options.query };
 			const deepAlias = getDeepQuery(options.deep?.[fieldKey] || {})?.["alias"];
@@ -203,20 +185,14 @@ async function parseFields(options, context) {
 				cases: [],
 				whenCase: []
 			};
-			if (isO2MNode(child) && !child.query.sort) {
-				child.query.sort = await getAllowedSort({
-					collection: relation.collection,
-					relation,
-					accountability: options.accountability
-				}, context);
-			}
-			if (isO2MNode(child) && child.query.group && child.query.group[0] !== relation.field) {
-				child.query.group.unshift(relation.field);
-			}
-		}
-		if (child) {
-			children.push(child);
+			if (isO2MNode(child) && !child.query.sort) child.query.sort = await getAllowedSort({
+				collection: relation.collection,
+				relation,
+				accountability: options.accountability
+			}, context);
+			if (isO2MNode(child) && child.query.group && child.query.group[0] !== relation.field) child.query.group.unshift(relation.field);
 		}
+		if (child) children.push(child);
 	}
 	const nestedCollectionNodes = children.filter((childNode) => childNode.type !== "field");
 	return children.filter((childNode) => {

package/dist/database/get-ast-from-query/utils/get-allowed-sort.js

@@ -3,27 +3,18 @@ import { fetchAllowedFields } from "../../../permissions/modules/fetch-allowed-f
 //#region src/database/get-ast-from-query/utils/get-allowed-sort.ts
 async function getAllowedSort(options, context) {
 	let sortField = context.schema.collections[options.collection].primary;
-	if (context.schema.collections[options.collection]?.sortField) {
-		sortField = context.schema.collections[options.collection].sortField;
-	}
-	if (options.relation?.meta?.sort_field) {
-		sortField = options.relation.meta.sort_field;
-	}
+	if (context.schema.collections[options.collection]?.sortField) sortField = context.schema.collections[options.collection].sortField;
+	if (options.relation?.meta?.sort_field) sortField = options.relation.meta.sort_field;
 	if (options.accountability && options.accountability.admin === false) {
 		const allowedFields = await fetchAllowedFields({
 			collection: options.collection,
 			action: "read",
 			accountability: options.accountability
 		}, context);
-		if (allowedFields.length === 0) {
-			sortField = null;
-		} else if (allowedFields.includes("*") === false && allowedFields.includes(sortField) === false) {
-			sortField = allowedFields[0];
-		}
-	}
-	if (options.query?.group?.[0]) {
-		sortField = options.query.group[0];
+		if (allowedFields.length === 0) sortField = null;
+		else if (allowedFields.includes("*") === false && allowedFields.includes(sortField) === false) sortField = allowedFields[0];
 	}
+	if (options.query?.group?.[0]) sortField = options.query.group[0];
 	if (sortField) return [sortField];
 	return null;
 }

package/dist/database/get-ast-from-query/utils/get-related-collection.js

@@ -4,12 +4,8 @@ import { getRelation } from "@directus/utils";
 function getRelatedCollection(schema, collection, field) {
 	const relation = getRelation(schema.relations, collection, field);
 	if (!relation) return null;
-	if (relation.collection === collection && relation.field === field) {
-		return relation.related_collection || null;
-	}
-	if (relation.related_collection === collection && relation.meta?.one_field === field) {
-		return relation.collection || null;
-	}
+	if (relation.collection === collection && relation.field === field) return relation.related_collection || null;
+	if (relation.related_collection === collection && relation.meta?.one_field === field) return relation.collection || null;
 	return null;
 }
 

package/dist/database/helpers/date/dialects/mysql.js

@@ -5,7 +5,7 @@ import { parseISO } from "date-fns";
 var DateHelperMySQL = class extends DateHelper {
 	readTimestampString(date) {
 		const parsedDate = new Date(date);
-		return new Date(parsedDate.getTime() - parsedDate.getTimezoneOffset() * 6e4).toISOString();
+		return (/* @__PURE__ */ new Date(parsedDate.getTime() - parsedDate.getTimezoneOffset() * 6e4)).toISOString();
 	}
 	writeTimestamp(date) {
 		const parsedDate = parseISO(date);

package/dist/database/helpers/date/dialects/oracle.js

@@ -3,15 +3,9 @@ import { DateHelper } from "../types.js";
 //#region src/database/helpers/date/dialects/oracle.ts
 var DateHelperOracle = class extends DateHelper {
 	parse(date) {
-		if (!date) {
-			return date;
-		}
-		if (date instanceof Date) {
-			return String(date.toISOString());
-		}
-		if (date.length <= 10 && date.includes("-")) {
-			return date;
-		}
+		if (!date) return date;
+		if (date instanceof Date) return String(date.toISOString());
+		if (date.length <= 10 && date.includes("-")) return date;
 		return String(new Date(date).toISOString());
 	}
 	fieldFlagForField(fieldType) {

package/dist/database/helpers/date/dialects/sqlite.js

@@ -3,15 +3,9 @@ import { DateHelper } from "../types.js";
 //#region src/database/helpers/date/dialects/sqlite.ts
 var DateHelperSQLite = class extends DateHelper {
 	parse(date) {
-		if (!date) {
-			return date;
-		}
-		if (date instanceof Date) {
-			return String(date.getTime());
-		}
-		if (date.length <= 8 && date.includes(":")) {
-			return date;
-		}
+		if (!date) return date;
+		if (date instanceof Date) return String(date.getTime());
+		if (date.length <= 8 && date.includes(":")) return date;
 		return String(new Date(date).getTime());
 	}
 	fieldFlagForField(fieldType) {

package/dist/database/helpers/date/types.js

@@ -4,9 +4,7 @@ import { parseISO } from "date-fns";
 //#region src/database/helpers/date/types.ts
 var DateHelper = class extends DatabaseHelper {
 	parse(date) {
-		if (date instanceof Date) {
-			return date.toISOString();
-		}
+		if (date instanceof Date) return date.toISOString();
 		return date;
 	}
 	readTimestampString(date) {

package/dist/database/helpers/fn/dialects/mssql.js

@@ -3,9 +3,7 @@ import { InvalidQueryError } from "@directus/errors";
 
 //#region src/database/helpers/fn/dialects/mssql.ts
 const parseLocaltime = (columnType) => {
-	if (columnType === "timestamp") {
-		return ` AT TIME ZONE 'UTC'`;
-	}
+	if (columnType === "timestamp") return ` AT TIME ZONE 'UTC'`;
 	return "";
 };
 var FnHelperMSSQL = class extends FnHelper {
@@ -36,20 +34,14 @@ var FnHelperMSSQL = class extends FnHelper {
 	count(table, column, options) {
 		const collectionName = options?.originalCollectionName || table;
 		const type = this.schema.collections?.[collectionName]?.fields?.[column]?.type ?? "unknown";
-		if (type === "json") {
-			return this.knex.raw(`(SELECT COUNT(*) FROM OPENJSON(??.??, '$'))`, [table, column]);
-		}
-		if (type === "alias") {
-			return this._relationalCount(table, column, options);
-		}
+		if (type === "json") return this.knex.raw(`(SELECT COUNT(*) FROM OPENJSON(??.??, '$'))`, [table, column]);
+		if (type === "alias") return this._relationalCount(table, column, options);
 		throw new Error(`Couldn't extract type from ${table}.${column}`);
 	}
 	json(table, column, options) {
 		const collectionName = options?.originalCollectionName || table;
 		const fieldSchema = this.schema.collections?.[collectionName]?.fields?.[column];
-		if (!fieldSchema || fieldSchema.type !== "json" || !options?.jsonPath) {
-			throw new InvalidQueryError({ reason: `${collectionName}.${column} is not a JSON field` });
-		}
+		if (!fieldSchema || fieldSchema.type !== "json" || !options?.jsonPath) throw new InvalidQueryError({ reason: `${collectionName}.${column} is not a JSON field` });
 		const jsonPath = "$" + options?.jsonPath;
 		return this.knex.raw(`COALESCE(JSON_QUERY(??.??, ?), JSON_VALUE(??.??, ?))`, [
 			table,

package/dist/database/helpers/fn/dialects/mysql.js

@@ -31,20 +31,14 @@ var FnHelperMySQL = class extends FnHelper {
 	count(table, column, options) {
 		const collectionName = options?.originalCollectionName || table;
 		const type = this.schema.collections?.[collectionName]?.fields?.[column]?.type ?? "unknown";
-		if (type === "json") {
-			return this.knex.raw("JSON_LENGTH(??.??)", [table, column]);
-		}
-		if (type === "alias") {
-			return this._relationalCount(table, column, options);
-		}
+		if (type === "json") return this.knex.raw("JSON_LENGTH(??.??)", [table, column]);
+		if (type === "alias") return this._relationalCount(table, column, options);
 		throw new Error(`Couldn't extract type from ${table}.${column}`);
 	}
 	json(table, column, options) {
 		const collectionName = options?.originalCollectionName || table;
 		const fieldSchema = this.schema.collections?.[collectionName]?.fields?.[column];
-		if (!fieldSchema || fieldSchema.type !== "json" || !options?.jsonPath) {
-			throw new InvalidQueryError({ reason: `${collectionName}.${column} is not a JSON field` });
-		}
+		if (!fieldSchema || fieldSchema.type !== "json" || !options?.jsonPath) throw new InvalidQueryError({ reason: `${collectionName}.${column} is not a JSON field` });
 		const jsonPath = convertToMySQLPath(options.jsonPath);
 		return this.knex.raw(`JSON_UNQUOTE(JSON_EXTRACT(??.??, ?))`, [
 			table,
@@ -58,11 +52,8 @@ function convertToMySQLPath(path) {
 	let result = "$";
 	for (const part of parts) {
 		const num = Number(part);
-		if (Number.isInteger(num) && num >= 0 && String(num) === part) {
-			result += `[${part}]`;
-		} else {
-			result += `.${part}`;
-		}
+		if (Number.isInteger(num) && num >= 0 && String(num) === part) result += `[${part}]`;
+		else result += `.${part}`;
 	}
 	return result;
 }

package/dist/database/helpers/fn/dialects/oracle.js

@@ -3,9 +3,7 @@ import { InvalidQueryError } from "@directus/errors";
 
 //#region src/database/helpers/fn/dialects/oracle.ts
 const parseLocaltime = (columnType) => {
-	if (columnType === "timestamp") {
-		return ` AT TIME ZONE 'UTC'`;
-	}
+	if (columnType === "timestamp") return ` AT TIME ZONE 'UTC'`;
 	return "";
 };
 var FnHelperOracle = class extends FnHelper {
@@ -36,20 +34,14 @@ var FnHelperOracle = class extends FnHelper {
 	count(table, column, options) {
 		const collectionName = options?.originalCollectionName || table;
 		const type = this.schema.collections?.[collectionName]?.fields?.[column]?.type ?? "unknown";
-		if (type === "json") {
-			return this.knex.raw("json_value(??.??, '$.size()')", [table, column]);
-		}
-		if (type === "alias") {
-			return this._relationalCount(table, column, options);
-		}
+		if (type === "json") return this.knex.raw("json_value(??.??, '$.size()')", [table, column]);
+		if (type === "alias") return this._relationalCount(table, column, options);
 		throw new Error(`Couldn't extract type from ${table}.${column}`);
 	}
 	json(table, column, options) {
 		const collectionName = options?.originalCollectionName || table;
 		const fieldSchema = this.schema.collections?.[collectionName]?.fields?.[column];
-		if (!fieldSchema || fieldSchema.type !== "json" || !options?.jsonPath) {
-			throw new InvalidQueryError({ reason: `${collectionName}.${column} is not a JSON field` });
-		}
+		if (!fieldSchema || fieldSchema.type !== "json" || !options?.jsonPath) throw new InvalidQueryError({ reason: `${collectionName}.${column} is not a JSON field` });
 		const jsonPath = "$" + options.jsonPath;
 		return this.knex.raw(`COALESCE(JSON_QUERY(??.??, ?), JSON_VALUE(??.??, ?))`, [
 			table,

package/dist/database/helpers/fn/dialects/postgres.js

@@ -4,9 +4,7 @@ import { toPath } from "lodash-es";
 
 //#region src/database/helpers/fn/dialects/postgres.ts
 const parseLocaltime = (columnType) => {
-	if (columnType === "timestamp") {
-		return ` AT TIME ZONE 'UTC'`;
-	}
+	if (columnType === "timestamp") return ` AT TIME ZONE 'UTC'`;
 	return "";
 };
 var FnHelperPostgres = class extends FnHelper {
@@ -41,9 +39,7 @@ var FnHelperPostgres = class extends FnHelper {
 			const { dbType } = this.schema.collections[table].fields[column];
 			return this.knex.raw(dbType === "jsonb" ? "jsonb_array_length(??.??)" : "json_array_length(??.??)", [table, column]);
 		}
-		if (type === "alias") {
-			return this._relationalCount(table, column, options);
-		}
+		if (type === "alias") return this._relationalCount(table, column, options);
 		throw new Error(`Couldn't extract type from ${table}.${column}`);
 	}
 	parseJsonResult(value) {
@@ -52,9 +48,7 @@ var FnHelperPostgres = class extends FnHelper {
 	json(table, column, options) {
 		const collectionName = options?.originalCollectionName || table;
 		const fieldSchema = this.schema.collections?.[collectionName]?.fields?.[column];
-		if (!fieldSchema || fieldSchema.type !== "json" || !options?.jsonPath) {
-			throw new InvalidQueryError({ reason: `${collectionName}.${column} is not a JSON field` });
-		}
+		if (!fieldSchema || fieldSchema.type !== "json" || !options?.jsonPath) throw new InvalidQueryError({ reason: `${collectionName}.${column} is not a JSON field` });
 		const { template, bindings } = buildPostgresJsonPath(options.jsonPath);
 		const cast = fieldSchema.dbType === "jsonb" ? "jsonb" : "json";
 		return this.knex.raw(`??::${cast}${template}`, [table + "." + column, ...bindings]);
@@ -75,11 +69,8 @@ function buildPostgresJsonPath(path) {
 	for (let i = 0; i < parts.length; i++) {
 		const num = Number(parts[i]);
 		template += "->?";
-		if (!isNaN(num) && num >= 0 && Number.isInteger(num)) {
-			bindings.push(num);
-		} else {
-			bindings.push(parts[i]);
-		}
+		if (!isNaN(num) && num >= 0 && Number.isInteger(num)) bindings.push(num);
+		else bindings.push(parts[i]);
 	}
 	return {
 		template,