@directus/api 35.0.2 → 35.1.0

package/dist/services/items.js

@@ -55,9 +55,7 @@ var ItemsService = class ItemsService {
 			nested: this.nested,
 			...options
 		};
-		if (isItemsService) {
-			return new ItemsService(this.collection, newOptions);
-		}
+		if (isItemsService) return new ItemsService(this.collection, newOptions);
 		return new Service(newOptions);
 	}
 	createMutationTracker(initialCount = 0) {
@@ -66,9 +64,7 @@ var ItemsService = class ItemsService {
 		return {
 			trackMutations(count) {
 				mutationCount += count;
-				if (mutationCount > maxCount) {
-					throw new InvalidPayloadError({ reason: `Exceeded max batch mutation limit of ${maxCount}` });
-				}
+				if (mutationCount > maxCount) throw new InvalidPayloadError({ reason: `Exceeded max batch mutation limit of ${maxCount}` });
 			},
 			getCount() {
 				return mutationCount;
@@ -79,21 +75,17 @@ var ItemsService = class ItemsService {
 		const primaryKeyField = this.schema.collections[this.collection].primary;
 		const readQuery = cloneDeep(query);
 		readQuery.fields = [primaryKeyField];
-		const itemsService = new ItemsService(this.collection, {
+		return (await new ItemsService(this.collection, {
 			knex: this.knex,
 			schema: this.schema
-		});
-		const items = await itemsService.readByQuery(readQuery);
-		return items.map((item) => item[primaryKeyField]).filter((pk) => pk);
+		}).readByQuery(readQuery)).map((item) => item[primaryKeyField]).filter((pk) => pk);
 	}
 	/**
 	* Create a single new item.
 	*/
 	async createOne(data, opts = {}) {
 		if (!opts.mutationTracker) opts.mutationTracker = this.createMutationTracker();
-		if (!opts.bypassLimits) {
-			opts.mutationTracker.trackMutations(1);
-		}
+		if (!opts.bypassLimits) opts.mutationTracker.trackMutations(1);
 		const primaryKeyField = this.schema.collections[this.collection].primary;
 		const fields = Object.keys(this.schema.collections[this.collection].fields);
 		const aliases = Object.values(this.schema.collections[this.collection].fields).filter((field) => field.alias === true).map((field) => field.field);
@@ -122,9 +114,7 @@ var ItemsService = class ItemsService {
 				knex: trx,
 				schema: this.schema
 			}) : payloadAfterHooks;
-			if (opts.preMutationError) {
-				throw opts.preMutationError;
-			}
+			if (opts.preMutationError) throw opts.preMutationError;
 			actionHookPayload = payloadWithPresets;
 			const payloadService = new PayloadService(this.collection, {
 				accountability: this.accountability,
@@ -136,28 +126,18 @@ var ItemsService = class ItemsService {
 			const { payload: payloadWithM2O, revisions: revisionsM2O, nestedActionEvents: nestedActionEventsM2O, userIntegrityCheckFlags: userIntegrityCheckFlagsM2O } = await payloadService.processM2O(payloadWithPresets, opts);
 			const { payload: payloadWithA2O, revisions: revisionsA2O, nestedActionEvents: nestedActionEventsA2O, userIntegrityCheckFlags: userIntegrityCheckFlagsA2O } = await payloadService.processA2O(payloadWithM2O, opts);
 			const payloadWithoutAliases = pick(payloadWithA2O, without(fields, ...aliases));
-			const payloadWithTypeCasting = await payloadService.processValues("create", payloadWithoutAliases);
-			let primaryKey$1 = payloadWithTypeCasting[primaryKeyField];
-			if (primaryKey$1) {
-				validateKeys(this.schema, this.collection, primaryKeyField, primaryKey$1);
-			}
+			let primaryKey$1 = (await payloadService.processValues("create", payloadWithoutAliases))[primaryKeyField];
+			if (primaryKey$1) validateKeys(this.schema, this.collection, primaryKeyField, primaryKey$1);
 			let autoIncrementSequenceNeedsToBeReset = false;
 			const pkField = this.schema.collections[this.collection].fields[primaryKeyField];
-			if (primaryKey$1 && pkField && !opts.bypassAutoIncrementSequenceReset && ["integer", "bigInteger"].includes(pkField.type) && pkField.defaultValue === "AUTO_INCREMENT") {
-				autoIncrementSequenceNeedsToBeReset = true;
-			}
+			if (primaryKey$1 && pkField && !opts.bypassAutoIncrementSequenceReset && ["integer", "bigInteger"].includes(pkField.type) && pkField.defaultValue === "AUTO_INCREMENT") autoIncrementSequenceNeedsToBeReset = true;
 			try {
-				let returningOptions = undefined;
-				if (getDatabaseClient(trx) === "mssql") {
-					returningOptions = { includeTriggerModifications: true };
-				}
+				let returningOptions = void 0;
+				if (getDatabaseClient(trx) === "mssql") returningOptions = { includeTriggerModifications: true };
 				const result = await trx.insert(payloadWithoutAliases).into(this.collection).returning(primaryKeyField, returningOptions).then((result$1) => result$1[0]);
 				const returnedKey = typeof result === "object" ? result[primaryKeyField] : result;
-				if (pkField.type === "uuid") {
-					primaryKey$1 = getHelpers(trx).schema.formatUUID(primaryKey$1 ?? returnedKey);
-				} else {
-					primaryKey$1 = primaryKey$1 ?? returnedKey;
-				}
+				if (pkField.type === "uuid") primaryKey$1 = getHelpers(trx).schema.formatUUID(primaryKey$1 ?? returnedKey);
+				else primaryKey$1 = primaryKey$1 ?? returnedKey;
 			} catch (err) {
 				const dbError = await translateDatabaseError(err, data);
 				if (isDirectusError(dbError, ErrorCode.RecordNotUnique) && dbError.extensions.primaryKey) {
@@ -167,8 +147,7 @@ var ItemsService = class ItemsService {
 				throw dbError;
 			}
 			if (!primaryKey$1) {
-				const result = await trx.max(primaryKeyField, { as: "id" }).from(this.collection).first();
-				primaryKey$1 = result.id;
+				primaryKey$1 = (await trx.max(primaryKeyField, { as: "id" }).from(this.collection).first()).id;
 				actionHookPayload[primaryKeyField] = primaryKey$1;
 			}
 			primaryKey$1 = primaryKey$1;
@@ -177,24 +156,18 @@ var ItemsService = class ItemsService {
 			nestedActionEvents.push(...nestedActionEventsA2O);
 			nestedActionEvents.push(...nestedActionEventsO2M);
 			const userIntegrityCheckFlags = (opts.userIntegrityCheckFlags ?? UserIntegrityCheckFlag.None) | userIntegrityCheckFlagsM2O | userIntegrityCheckFlagsA2O | userIntegrityCheckFlagsO2M;
-			if (userIntegrityCheckFlags) {
-				if (opts.onRequireUserIntegrityCheck) {
-					opts.onRequireUserIntegrityCheck(userIntegrityCheckFlags);
-				} else {
-					await validateUserCountIntegrity({
-						flags: userIntegrityCheckFlags,
-						knex: trx
-					});
-				}
-			}
+			if (userIntegrityCheckFlags) if (opts.onRequireUserIntegrityCheck) opts.onRequireUserIntegrityCheck(userIntegrityCheckFlags);
+			else await validateUserCountIntegrity({
+				flags: userIntegrityCheckFlags,
+				knex: trx
+			});
 			if (opts.skipTracking !== true && this.accountability && this.schema.collections[this.collection].accountability !== null) {
 				const { ActivityService } = await import("./activity.js");
 				const { RevisionsService } = await import("./revisions.js");
-				const activityService = new ActivityService({
+				const activity = await new ActivityService({
 					knex: trx,
 					schema: this.schema
-				});
-				const activity = await activityService.createOne({
+				}).createOne({
 					action: Action.CREATE,
 					user: this.accountability.user,
 					collection: this.collection,
@@ -222,20 +195,12 @@ var ItemsService = class ItemsService {
 						...revisionsA2O,
 						...revisionsO2M
 					];
-					if (childrenRevisions.length > 0) {
-						await revisionsService.updateMany(childrenRevisions, { parent: revision });
-					}
-					if (opts.onRevisionCreate) {
-						opts.onRevisionCreate(revision);
-					}
+					if (childrenRevisions.length > 0) await revisionsService.updateMany(childrenRevisions, { parent: revision });
+					if (opts.onRevisionCreate) opts.onRevisionCreate(revision);
 				}
 			}
-			if (autoIncrementSequenceNeedsToBeReset) {
-				await getHelpers(trx).sequence.resetAutoIncrementSequence(this.collection, primaryKeyField);
-			}
-			if (opts.onItemCreate) {
-				opts.onItemCreate(this.collection, primaryKey$1);
-			}
+			if (autoIncrementSequenceNeedsToBeReset) await getHelpers(trx).sequence.resetAutoIncrementSequence(this.collection, primaryKeyField);
+			if (opts.onItemCreate) opts.onItemCreate(this.collection, primaryKey$1);
 			return primaryKey$1;
 		});
 		if (opts.emitEvents !== false) {
@@ -252,22 +217,12 @@ var ItemsService = class ItemsService {
 					accountability: this.accountability
 				}
 			};
-			if (opts.bypassEmitAction) {
-				opts.bypassEmitAction(actionEvent);
-			} else {
-				emitter_default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
-			}
-			for (const nestedActionEvent of nestedActionEvents) {
-				if (opts.bypassEmitAction) {
-					opts.bypassEmitAction(nestedActionEvent);
-				} else {
-					emitter_default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
-				}
-			}
-		}
-		if (shouldClearCache(this.cache, opts, this.collection)) {
-			await this.cache.clear();
+			if (opts.bypassEmitAction) opts.bypassEmitAction(actionEvent);
+			else emitter_default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
+			for (const nestedActionEvent of nestedActionEvents) if (opts.bypassEmitAction) opts.bypassEmitAction(nestedActionEvent);
+			else emitter_default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
 		}
+		if (shouldClearCache(this.cache, opts, this.collection)) await this.cache.clear();
 		return primaryKey;
 	}
 	/**
@@ -285,9 +240,7 @@ var ItemsService = class ItemsService {
 			const pkField = this.schema.collections[this.collection].primary;
 			for (const [index, payload] of data.entries()) {
 				let bypassAutoIncrementSequenceReset = true;
-				if (payload[pkField] && (index === data.length - 1 || !data[index + 1]?.[pkField])) {
-					bypassAutoIncrementSequenceReset = false;
-				}
+				if (payload[pkField] && (index === data.length - 1 || !data[index + 1]?.[pkField])) bypassAutoIncrementSequenceReset = false;
 				const primaryKey = await service.createOne(payload, {
 					...opts || {},
 					autoPurgeCache: false,
@@ -299,33 +252,19 @@ var ItemsService = class ItemsService {
 				});
 				primaryKeys$1.push(primaryKey);
 			}
-			if (userIntegrityCheckFlags) {
-				if (opts.onRequireUserIntegrityCheck) {
-					opts.onRequireUserIntegrityCheck(userIntegrityCheckFlags);
-				} else {
-					await validateUserCountIntegrity({
-						flags: userIntegrityCheckFlags,
-						knex
-					});
-				}
-			}
+			if (userIntegrityCheckFlags) if (opts.onRequireUserIntegrityCheck) opts.onRequireUserIntegrityCheck(userIntegrityCheckFlags);
+			else await validateUserCountIntegrity({
+				flags: userIntegrityCheckFlags,
+				knex
+			});
 			return {
 				primaryKeys: primaryKeys$1,
 				nestedActionEvents: nestedActionEvents$1
 			};
 		});
-		if (opts.emitEvents !== false) {
-			for (const nestedActionEvent of nestedActionEvents) {
-				if (opts.bypassEmitAction) {
-					opts.bypassEmitAction(nestedActionEvent);
-				} else {
-					emitter_default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
-				}
-			}
-		}
-		if (shouldClearCache(this.cache, opts, this.collection)) {
-			await this.cache.clear();
-		}
+		if (opts.emitEvents !== false) for (const nestedActionEvent of nestedActionEvents) if (opts.bypassEmitAction) opts.bypassEmitAction(nestedActionEvent);
+		else emitter_default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+		if (shouldClearCache(this.cache, opts, this.collection)) await this.cache.clear();
 		return primaryKeys;
 	}
 	/**
@@ -355,11 +294,9 @@ var ItemsService = class ItemsService {
 		});
 		const records = await runAst(ast, this.schema, this.accountability, {
 			knex: this.knex,
-			stripNonRequested: opts?.stripNonRequested !== undefined ? opts.stripNonRequested : true
+			stripNonRequested: opts?.stripNonRequested !== void 0 ? opts.stripNonRequested : true
 		});
-		if (records === null) {
-			throw new ForbiddenError();
-		}
+		if (records === null) throw new ForbiddenError();
 		const filteredRecords = opts?.emitEvents !== false ? await emitter_default.emitFilter(this.eventScope === "items" ? ["items.read", `${this.collection}.items.read`] : `${this.eventScope}.read`, records, {
 			query: updatedQuery,
 			collection: this.collection
@@ -368,17 +305,15 @@ var ItemsService = class ItemsService {
 			schema: this.schema,
 			accountability: this.accountability
 		}) : records;
-		if (opts?.emitEvents !== false) {
-			emitter_default.emitAction(this.eventScope === "items" ? ["items.read", `${this.collection}.items.read`] : `${this.eventScope}.read`, {
-				payload: filteredRecords,
-				query: updatedQuery,
-				collection: this.collection
-			}, {
-				database: this.knex || database_default(),
-				schema: this.schema,
-				accountability: this.accountability
-			});
-		}
+		if (opts?.emitEvents !== false) emitter_default.emitAction(this.eventScope === "items" ? ["items.read", `${this.collection}.items.read`] : `${this.eventScope}.read`, {
+			payload: filteredRecords,
+			query: updatedQuery,
+			collection: this.collection
+		}, {
+			database: this.knex || database_default(),
+			schema: this.schema,
+			accountability: this.accountability
+		});
 		return filteredRecords;
 	}
 	/**
@@ -389,17 +324,11 @@ var ItemsService = class ItemsService {
 	async readOne(key, query = {}, opts) {
 		const primaryKeyField = this.schema.collections[this.collection].primary;
 		validateKeys(this.schema, this.collection, primaryKeyField, key);
-		const filterWithKey = assign({}, query.filter, { [primaryKeyField]: { _eq: key } });
-		const queryWithKey = assign({}, query, { filter: filterWithKey });
+		const queryWithKey = assign({}, query, { filter: assign({}, query.filter, { [primaryKeyField]: { _eq: key } }) });
 		let results = [];
-		if (query.version && query.version !== "main") {
-			results = [await handleVersion(this, key, queryWithKey, opts)];
-		} else {
-			results = await this.readByQuery(queryWithKey, opts);
-		}
-		if (results.length === 0) {
-			throw new ForbiddenError();
-		}
+		if (query.version && query.version !== "main") results = [await handleVersion(this, key, queryWithKey, opts)];
+		else results = await this.readByQuery(queryWithKey, opts);
+		if (results.length === 0) throw new ForbiddenError();
 		return results[0];
 	}
 	/**
@@ -410,13 +339,9 @@ var ItemsService = class ItemsService {
 	async readMany(keys, query = {}, opts) {
 		const primaryKeyField = this.schema.collections[this.collection].primary;
 		validateKeys(this.schema, this.collection, primaryKeyField, keys);
-		const filterWithKey = { _and: [{ [primaryKeyField]: { _in: keys } }, query.filter ?? {}] };
-		const queryWithKey = assign({}, query, { filter: filterWithKey });
-		if (Array.isArray(keys) && keys.length > 0 && !queryWithKey.limit) {
-			queryWithKey.limit = keys.length;
-		}
-		const results = await this.readByQuery(queryWithKey, opts);
-		return results;
+		const queryWithKey = assign({}, query, { filter: { _and: [{ [primaryKeyField]: { _in: keys } }, query.filter ?? {}] } });
+		if (Array.isArray(keys) && keys.length > 0 && !queryWithKey.limit) queryWithKey.limit = keys.length;
+		return await this.readByQuery(queryWithKey, opts);
 	}
 	/**
 	* Update multiple items by query.
@@ -442,9 +367,7 @@ var ItemsService = class ItemsService {
 	* Uses `this.updateOne` under the hood.
 	*/
 	async updateBatch(data, opts = {}) {
-		if (!Array.isArray(data)) {
-			throw new InvalidPayloadError({ reason: "Input should be an array of items" });
-		}
+		if (!Array.isArray(data)) throw new InvalidPayloadError({ reason: "Input should be an array of items" });
 		if (!opts.mutationTracker) opts.mutationTracker = this.createMutationTracker();
 		const primaryKeyField = this.schema.collections[this.collection].primary;
 		const keys = [];
@@ -464,21 +387,14 @@ var ItemsService = class ItemsService {
 					};
 					keys.push(await service.updateOne(primaryKey, omit(item, primaryKeyField), combinedOpts));
 				}
-				if (userIntegrityCheckFlags) {
-					if (opts.onRequireUserIntegrityCheck) {
-						opts.onRequireUserIntegrityCheck(userIntegrityCheckFlags);
-					} else {
-						await validateUserCountIntegrity({
-							flags: userIntegrityCheckFlags,
-							knex
-						});
-					}
-				}
+				if (userIntegrityCheckFlags) if (opts.onRequireUserIntegrityCheck) opts.onRequireUserIntegrityCheck(userIntegrityCheckFlags);
+				else await validateUserCountIntegrity({
+					flags: userIntegrityCheckFlags,
+					knex
+				});
 			});
 		} finally {
-			if (shouldClearCache(this.cache, opts, this.collection)) {
-				await this.cache.clear();
-			}
+			if (shouldClearCache(this.cache, opts, this.collection)) await this.cache.clear();
 		}
 		return keys;
 	}
@@ -487,9 +403,7 @@ var ItemsService = class ItemsService {
 	*/
 	async updateMany(keys, data, opts = {}) {
 		if (!opts.mutationTracker) opts.mutationTracker = this.createMutationTracker();
-		if (!opts.bypassLimits) {
-			opts.mutationTracker.trackMutations(keys.length);
-		}
+		if (!opts.bypassLimits) opts.mutationTracker.trackMutations(keys.length);
 		const primaryKeyField = this.schema.collections[this.collection].primary;
 		validateKeys(this.schema, this.collection, primaryKeyField, keys);
 		const fields = Object.keys(this.schema.collections[this.collection].fields);
@@ -505,18 +419,16 @@ var ItemsService = class ItemsService {
 			accountability: this.accountability
 		}) : payload;
 		keys.sort();
-		if (this.accountability) {
-			await validateAccess({
-				accountability: this.accountability,
-				action: "update",
-				collection: this.collection,
-				primaryKeys: keys,
-				fields: Object.keys(payloadAfterHooks)
-			}, {
-				schema: this.schema,
-				knex: this.knex
-			});
-		}
+		if (this.accountability) await validateAccess({
+			accountability: this.accountability,
+			action: "update",
+			collection: this.collection,
+			primaryKeys: keys,
+			fields: Object.keys(payloadAfterHooks)
+		}, {
+			schema: this.schema,
+			knex: this.knex
+		});
 		const payloadWithPresets = this.accountability ? await processPayload({
 			accountability: this.accountability,
 			action: "update",
@@ -527,9 +439,7 @@ var ItemsService = class ItemsService {
 			knex: this.knex,
 			schema: this.schema
 		}) : payloadAfterHooks;
-		if (opts.preMutationError) {
-			throw opts.preMutationError;
-		}
+		if (opts.preMutationError) throw opts.preMutationError;
 		await transaction(this.knex, async (trx) => {
 			const payloadService = new PayloadService(this.collection, {
 				accountability: this.accountability,
@@ -542,12 +452,10 @@ var ItemsService = class ItemsService {
 			const { payload: payloadWithA2O, revisions: revisionsA2O, nestedActionEvents: nestedActionEventsA2O, userIntegrityCheckFlags: userIntegrityCheckFlagsA2O } = await payloadService.processA2O(payloadWithM2O, opts);
 			const payloadWithoutAliasAndPK = pick(payloadWithA2O, without(fields, primaryKeyField, ...aliases));
 			const payloadWithTypeCasting = await payloadService.processValues("update", payloadWithoutAliasAndPK);
-			if (Object.keys(payloadWithTypeCasting).length > 0) {
-				try {
-					await trx(this.collection).update(payloadWithTypeCasting).whereIn(primaryKeyField, keys);
-				} catch (err) {
-					throw await translateDatabaseError(err, data);
-				}
+			if (Object.keys(payloadWithTypeCasting).length > 0) try {
+				await trx(this.collection).update(payloadWithTypeCasting).whereIn(primaryKeyField, keys);
+			} catch (err) {
+				throw await translateDatabaseError(err, data);
 			}
 			const childrenRevisions = [...revisionsM2O, ...revisionsA2O];
 			let userIntegrityCheckFlags = opts.userIntegrityCheckFlags ?? UserIntegrityCheckFlag.None | userIntegrityCheckFlagsM2O | userIntegrityCheckFlagsA2O;
@@ -559,24 +467,18 @@ var ItemsService = class ItemsService {
 				nestedActionEvents.push(...nestedActionEventsO2M);
 				userIntegrityCheckFlags |= userIntegrityCheckFlagsO2M;
 			}
-			if (userIntegrityCheckFlags) {
-				if (opts?.onRequireUserIntegrityCheck) {
-					opts.onRequireUserIntegrityCheck(userIntegrityCheckFlags);
-				} else {
-					await validateUserCountIntegrity({
-						flags: userIntegrityCheckFlags,
-						knex: trx
-					});
-				}
-			}
+			if (userIntegrityCheckFlags) if (opts?.onRequireUserIntegrityCheck) opts.onRequireUserIntegrityCheck(userIntegrityCheckFlags);
+			else await validateUserCountIntegrity({
+				flags: userIntegrityCheckFlags,
+				knex: trx
+			});
 			if (opts.skipTracking !== true && this.accountability && this.schema.collections[this.collection].accountability !== null) {
 				const { ActivityService } = await import("./activity.js");
 				const { RevisionsService } = await import("./revisions.js");
-				const activityService = new ActivityService({
+				const activity = await new ActivityService({
 					knex: trx,
 					schema: this.schema
-				});
-				const activity = await activityService.createMany(keys.map((key) => ({
+				}).createMany(keys.map((key) => ({
 					action: Action.UPDATE,
 					user: this.accountability.user,
 					collection: this.collection,
@@ -590,8 +492,7 @@ var ItemsService = class ItemsService {
 						knex: trx,
 						schema: this.schema
 					});
-					const relationalFields = getRelationsForCollection(this.schema, this.collection);
-					const snapshotFields = difference(fields, relationalFields);
+					const snapshotFields = difference(fields, getRelationsForCollection(this.schema, this.collection));
 					const snapshots = await itemsService.readMany(keys, { fields: snapshotFields.length > 0 ? snapshotFields : ["*"] });
 					const revisionsService = new RevisionsService({
 						knex: trx,
@@ -607,21 +508,15 @@ var ItemsService = class ItemsService {
 					const revisionIDs = await revisionsService.createMany(revisions);
 					for (let i = 0; i < revisionIDs.length; i++) {
 						const revisionID = revisionIDs[i];
-						if (opts.onRevisionCreate) {
-							opts.onRevisionCreate(revisionID);
-						}
+						if (opts.onRevisionCreate) opts.onRevisionCreate(revisionID);
 						if (i === 0) {
-							if (childrenRevisions.length > 0) {
-								await revisionsService.updateMany(childrenRevisions, { parent: revisionID });
-							}
+							if (childrenRevisions.length > 0) await revisionsService.updateMany(childrenRevisions, { parent: revisionID });
 						}
 					}
 				}
 			}
 		});
-		if (shouldClearCache(this.cache, opts, this.collection)) {
-			await this.cache.clear();
-		}
+		if (shouldClearCache(this.cache, opts, this.collection)) await this.cache.clear();
 		if (opts.emitEvents !== false) {
 			const actionEvent = {
 				event: this.eventScope === "items" ? ["items.update", `${this.collection}.items.update`] : `${this.eventScope}.update`,
@@ -636,18 +531,10 @@ var ItemsService = class ItemsService {
 					accountability: this.accountability
 				}
 			};
-			if (opts.bypassEmitAction) {
-				opts.bypassEmitAction(actionEvent);
-			} else {
-				emitter_default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
-			}
-			for (const nestedActionEvent of nestedActionEvents) {
-				if (opts.bypassEmitAction) {
-					opts.bypassEmitAction(nestedActionEvent);
-				} else {
-					emitter_default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
-				}
-			}
+			if (opts.bypassEmitAction) opts.bypassEmitAction(actionEvent);
+			else emitter_default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
+			for (const nestedActionEvent of nestedActionEvents) if (opts.bypassEmitAction) opts.bypassEmitAction(nestedActionEvent);
+			else emitter_default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
 		}
 		return keys;
 	}
@@ -659,16 +546,11 @@ var ItemsService = class ItemsService {
 	async upsertOne(payload, opts) {
 		const primaryKeyField = this.schema.collections[this.collection].primary;
 		const primaryKey = payload[primaryKeyField];
-		if (primaryKey) {
-			validateKeys(this.schema, this.collection, primaryKeyField, primaryKey);
-		}
-		const exists = primaryKey && !!await this.knex.select(primaryKeyField).from(this.collection).where({ [primaryKeyField]: primaryKey }).first();
-		if (exists) {
+		if (primaryKey) validateKeys(this.schema, this.collection, primaryKeyField, primaryKey);
+		if (primaryKey && !!await this.knex.select(primaryKeyField).from(this.collection).where({ [primaryKeyField]: primaryKey }).first()) {
 			const { [primaryKeyField]: _,...data } = payload;
 			return await this.updateOne(primaryKey, data, opts);
-		} else {
-			return await this.createOne(payload, opts);
-		}
+		} else return await this.createOne(payload, opts);
 	}
 	/**
 	* Upsert many items.
@@ -691,9 +573,7 @@ var ItemsService = class ItemsService {
 			}
 			return primaryKeys$1;
 		});
-		if (shouldClearCache(this.cache, opts, this.collection)) {
-			await this.cache.clear();
-		}
+		if (shouldClearCache(this.cache, opts, this.collection)) await this.cache.clear();
 		return primaryKeys;
 	}
 	/**
@@ -723,9 +603,7 @@ var ItemsService = class ItemsService {
 	*/
 	async deleteMany(keys, opts = {}) {
 		if (!opts.mutationTracker) opts.mutationTracker = this.createMutationTracker();
-		if (!opts.bypassLimits) {
-			opts.mutationTracker.trackMutations(keys.length);
-		}
+		if (!opts.bypassLimits) opts.mutationTracker.trackMutations(keys.length);
 		const primaryKeyField = this.schema.collections[this.collection].primary;
 		validateKeys(this.schema, this.collection, primaryKeyField, keys);
 		const keysAfterHooks = opts.emitEvents !== false ? await emitter_default.emitFilter(this.eventScope === "items" ? ["items.delete", `${this.collection}.items.delete`] : `${this.eventScope}.delete`, keys, { collection: this.collection }, {
@@ -733,39 +611,29 @@ var ItemsService = class ItemsService {
 			schema: this.schema,
 			accountability: this.accountability
 		}) : keys;
-		if (this.accountability) {
-			await validateAccess({
-				accountability: this.accountability,
-				action: "delete",
-				collection: this.collection,
-				primaryKeys: keysAfterHooks
-			}, {
-				knex: this.knex,
-				schema: this.schema
-			});
-		}
-		if (opts.preMutationError) {
-			throw opts.preMutationError;
-		}
+		if (this.accountability) await validateAccess({
+			accountability: this.accountability,
+			action: "delete",
+			collection: this.collection,
+			primaryKeys: keysAfterHooks
+		}, {
+			knex: this.knex,
+			schema: this.schema
+		});
+		if (opts.preMutationError) throw opts.preMutationError;
 		await transaction(this.knex, async (trx) => {
 			await trx(this.collection).whereIn(primaryKeyField, keysAfterHooks).delete();
-			if (opts.userIntegrityCheckFlags) {
-				if (opts.onRequireUserIntegrityCheck) {
-					opts.onRequireUserIntegrityCheck(opts.userIntegrityCheckFlags);
-				} else {
-					await validateUserCountIntegrity({
-						flags: opts.userIntegrityCheckFlags,
-						knex: trx
-					});
-				}
-			}
+			if (opts.userIntegrityCheckFlags) if (opts.onRequireUserIntegrityCheck) opts.onRequireUserIntegrityCheck(opts.userIntegrityCheckFlags);
+			else await validateUserCountIntegrity({
+				flags: opts.userIntegrityCheckFlags,
+				knex: trx
+			});
 			if (opts.skipTracking !== true && this.accountability && this.schema.collections[this.collection].accountability !== null) {
 				const { ActivityService } = await import("./activity.js");
-				const activityService = new ActivityService({
+				await new ActivityService({
 					knex: trx,
 					schema: this.schema
-				});
-				await activityService.createMany(keysAfterHooks.map((key) => ({
+				}).createMany(keysAfterHooks.map((key) => ({
 					action: Action.DELETE,
 					user: this.accountability.user,
 					collection: this.collection,
@@ -776,9 +644,7 @@ var ItemsService = class ItemsService {
 				})), { bypassLimits: true });
 			}
 		});
-		if (shouldClearCache(this.cache, opts, this.collection)) {
-			await this.cache.clear();
-		}
+		if (shouldClearCache(this.cache, opts, this.collection)) await this.cache.clear();
 		if (opts.emitEvents !== false) {
 			const actionEvent = {
 				event: this.eventScope === "items" ? ["items.delete", `${this.collection}.items.delete`] : `${this.eventScope}.delete`,
@@ -793,11 +659,8 @@ var ItemsService = class ItemsService {
 					accountability: this.accountability
 				}
 			};
-			if (opts.bypassEmitAction) {
-				opts.bypassEmitAction(actionEvent);
-			} else {
-				emitter_default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
-			}
+			if (opts.bypassEmitAction) opts.bypassEmitAction(actionEvent);
+			else emitter_default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
 		}
 		return keysAfterHooks;
 	}
@@ -811,20 +674,14 @@ var ItemsService = class ItemsService {
 		if (query.version && query.version !== "main") {
 			const primaryKeyField = this.schema.collections[this.collection].primary;
 			const key = (await this.knex.select(primaryKeyField).from(this.collection).first())?.[primaryKeyField];
-			if (key) {
-				record = await handleVersion(this, key, query, opts);
-			}
-		} else {
-			record = (await this.readByQuery(query, opts))[0];
-		}
+			if (key) record = await handleVersion(this, key, query, opts);
+		} else record = (await this.readByQuery(query, opts))[0];
 		if (!record) {
 			let fields = Object.entries(this.schema.collections[this.collection].fields);
 			const defaults = {};
-			if (query.fields && query.fields.includes("*") === false) {
-				fields = fields.filter(([name]) => {
-					return query.fields.includes(name);
-				});
-			}
+			if (query.fields && query.fields.includes("*") === false) fields = fields.filter(([name]) => {
+				return query.fields.includes(name);
+			});
 			for (const [name, field] of fields) {
 				if (this.schema.collections[this.collection].primary === name) {
 					defaults[name] = null;
@@ -844,9 +701,7 @@ var ItemsService = class ItemsService {
 	async upsertSingleton(data, opts) {
 		const primaryKeyField = this.schema.collections[this.collection].primary;
 		const record = await this.knex.select(primaryKeyField).from(this.collection).limit(1).first();
-		if (record) {
-			return await this.updateOne(record[primaryKeyField], data, opts);
-		}
+		if (record) return await this.updateOne(record[primaryKeyField], data, opts);
 		return await this.createOne(data, opts);
 	}
 };