@directus/api 35.0.2 → 35.1.0

package/dist/services/payload.js

@@ -39,37 +39,27 @@ var PayloadService = class {
 	transformers = {
 		async hash({ action, value }) {
 			if (!value) return;
-			if (action === "create" || action === "update") {
-				return await generateHash(String(value));
-			}
+			if (action === "create" || action === "update") return await generateHash(String(value));
 			return value;
 		},
 		async uuid({ action, value }) {
-			if (action === "create" && !value) {
-				return randomUUID();
-			}
+			if (action === "create" && !value) return randomUUID();
 			return value;
 		},
 		async "cast-boolean"({ action, value }) {
 			if (action === "read") {
-				if (value === true || value === 1 || value === "1") {
-					return true;
-				} else if (value === false || value === 0 || value === "0") {
-					return false;
-				} else if (value === null || value === "") {
-					return null;
-				}
+				if (value === true || value === 1 || value === "1") return true;
+				else if (value === false || value === 0 || value === "0") return false;
+				else if (value === null || value === "") return null;
 			}
 			return value;
 		},
 		async "cast-json"({ action, value }) {
 			if (action === "read") {
-				if (typeof value === "string") {
-					try {
-						return parseJSON(value);
-					} catch {
-						return value;
-					}
+				if (typeof value === "string") try {
+					return parseJSON(value);
+				} catch {
+					return value;
 				}
 			}
 			return value;
@@ -95,11 +85,11 @@ var PayloadService = class {
 			return value;
 		},
 		async "date-created"({ action, value, helpers, overwriteDefaults }) {
-			if (action === "create") return new Date(overwriteDefaults ? overwriteDefaults._date : helpers.date.writeTimestamp(new Date().toISOString()));
+			if (action === "create") return new Date(overwriteDefaults ? overwriteDefaults._date : helpers.date.writeTimestamp((/* @__PURE__ */ new Date()).toISOString()));
 			return value;
 		},
 		async "date-updated"({ action, value, helpers, overwriteDefaults }) {
-			if (action === "update") return new Date(overwriteDefaults ? overwriteDefaults._date : helpers.date.writeTimestamp(new Date().toISOString()));
+			if (action === "update") return new Date(overwriteDefaults ? overwriteDefaults._date : helpers.date.writeTimestamp((/* @__PURE__ */ new Date()).toISOString()));
 			return value;
 		},
 		async "cast-csv"({ action, value }) {
@@ -109,9 +99,7 @@ var PayloadService = class {
 				if (value === "") return [];
 				return value.split(",");
 			}
-			if (Array.isArray(value)) {
-				return value.join(",");
-			}
+			if (Array.isArray(value)) return value.join(",");
 			return value;
 		},
 		async encrypt({ action, value, accountability }) {
@@ -128,10 +116,7 @@ var PayloadService = class {
 				}
 				return "**********";
 			}
-			if (typeof value === "string") {
-				const key = getSecret();
-				return await encrypt(value, key);
-			}
+			if (typeof value === "string") return await encrypt(value, getSecret());
 			return value;
 		}
 	};
@@ -142,52 +127,30 @@ var PayloadService = class {
 		const fieldEntries = Object.entries(this.schema.collections[this.collection].fields);
 		const aliasEntries = Object.entries(aliasMap);
 		let specialFields = [];
-		for (const [name, field] of fieldEntries) {
-			if (field.special && field.special.length > 0) {
-				specialFields.push([name, field]);
-				for (const [aliasName, fieldName] of aliasEntries) {
-					if (fieldName === name) {
-						specialFields.push([aliasName, {
-							...field,
-							field: aliasName
-						}]);
-					}
-				}
-			}
+		for (const [name, field] of fieldEntries) if (field.special && field.special.length > 0) {
+			specialFields.push([name, field]);
+			for (const [aliasName, fieldName] of aliasEntries) if (fieldName === name) specialFields.push([aliasName, {
+				...field,
+				field: aliasName
+			}]);
 		}
-		if (action === "read") {
-			specialFields = specialFields.filter(([name]) => {
-				return fieldsInPayload.includes(name);
-			});
-		}
-		for (const record of processedPayload) {
-			for (const [name, field] of specialFields) {
-				const newValue = await this.processField(field, record, action, this.accountability);
-				if (newValue !== undefined) record[name] = newValue;
-			}
+		if (action === "read") specialFields = specialFields.filter(([name]) => {
+			return fieldsInPayload.includes(name);
+		});
+		for (const record of processedPayload) for (const [name, field] of specialFields) {
+			const newValue = await this.processField(field, record, action, this.accountability);
+			if (newValue !== void 0) record[name] = newValue;
 		}
 		this.processGeometries(fieldEntries, processedPayload, action);
 		this.processDates(fieldEntries, processedPayload, action, aliasMap, aggregate);
-		if (action === "read") {
-			this.processJsonFunctionResults(processedPayload, aliasMap);
-		}
-		if (["create", "update"].includes(action)) {
-			processedPayload.forEach((record) => {
-				for (const [key, value] of Object.entries(record)) {
-					if (Array.isArray(value) || typeof value === "object" && !(value instanceof Date) && value !== null) {
-						if (!value.isRawInstance) {
-							record[key] = JSON.stringify(value);
-						}
-					}
-				}
-			});
-		}
-		if (action === "read") {
-			await this.processAggregates(processedPayload, aggregate);
-		}
-		if (Array.isArray(payload)) {
-			return processedPayload;
-		}
+		if (action === "read") this.processJsonFunctionResults(processedPayload, aliasMap);
+		if (["create", "update"].includes(action)) processedPayload.forEach((record) => {
+			for (const [key, value] of Object.entries(record)) if (Array.isArray(value) || typeof value === "object" && !(value instanceof Date) && value !== null) {
+				if (!value.isRawInstance) record[key] = JSON.stringify(value);
+			}
+		});
+		if (action === "read") await this.processAggregates(processedPayload, aggregate);
+		if (Array.isArray(payload)) return processedPayload;
 		return processedPayload[0];
 	}
 	async processAggregates(payload, aggregate = {}) {
@@ -208,40 +171,32 @@ var PayloadService = class {
 		* before: { "min->date": "2025-04-09", "min->datetime": "2025-04-08T12:00:00", "min->timestamp": "2025-04-17T23:18:00.000Z" }
 		* after: { "min": { "date": "2025-04-09", "datetime": "2025-04-08T12:00:00", "timestamp": "2025-04-17T23:18:00.000Z" } }
 		*/
-		if (aggregateKeys.length) {
-			for (const item of payload) {
-				for (const key of aggregateKeys) {
-					if (key in item === false) continue;
-					const [operation, fieldName] = key.split("->");
-					const aggregateResult = { [fieldName]: item[key] };
-					if (fieldEntries[fieldName]?.special?.length > 0) {
-						const newValue = await this.processField(fieldEntries[fieldName], aggregateResult, "read", this.accountability);
-						if (newValue !== undefined) aggregateResult[fieldName] = newValue;
-					}
-					if (!isPlainObject(item[operation])) item[operation] = {};
-					item[operation][fieldName] = aggregateResult[fieldName];
-					delete item[key];
-				}
+		if (aggregateKeys.length) for (const item of payload) for (const key of aggregateKeys) {
+			if (key in item === false) continue;
+			const [operation, fieldName] = key.split("->");
+			const aggregateResult = { [fieldName]: item[key] };
+			if (fieldEntries[fieldName]?.special?.length > 0) {
+				const newValue = await this.processField(fieldEntries[fieldName], aggregateResult, "read", this.accountability);
+				if (newValue !== void 0) aggregateResult[fieldName] = newValue;
 			}
+			if (!isPlainObject(item[operation])) item[operation] = {};
+			item[operation][fieldName] = aggregateResult[fieldName];
+			delete item[key];
 		}
 	}
 	async processField(field, payload, action, accountability) {
 		if (!field.special) return payload[field.field];
 		const fieldSpecials = field.special ? toArray(field.special) : [];
 		let value = clone(payload[field.field]);
-		for (const special of fieldSpecials) {
-			if (special in this.transformers) {
-				value = await this.transformers[special]({
-					action,
-					value,
-					payload,
-					accountability,
-					specials: fieldSpecials,
-					helpers: this.helpers,
-					overwriteDefaults: this.overwriteDefaults
-				});
-			}
-		}
+		for (const special of fieldSpecials) if (special in this.transformers) value = await this.transformers[special]({
+			action,
+			value,
+			payload,
+			accountability,
+			specials: fieldSpecials,
+			helpers: this.helpers,
+			overwriteDefaults: this.overwriteDefaults
+		});
 		return value;
 	}
 	/**
@@ -253,13 +208,7 @@ var PayloadService = class {
 	processGeometries(fieldEntries, payloads, action) {
 		const process = action == "read" ? (value) => typeof value === "string" ? parse(value) : value : (value) => this.helpers.st.fromGeoJSON(typeof value == "string" ? parseJSON(value) : value);
 		const geometryColumns = fieldEntries.filter(([_, field]) => field.type.startsWith("geometry"));
-		for (const [name] of geometryColumns) {
-			for (const payload of payloads) {
-				if (payload[name]) {
-					payload[name] = process(payload[name]);
-				}
-			}
-		}
+		for (const [name] of geometryColumns) for (const payload of payloads) if (payload[name]) payload[name] = process(payload[name]);
 		return payloads;
 	}
 	/**
@@ -271,9 +220,7 @@ var PayloadService = class {
 		const fn = getFunctions(this.knex, this.schema);
 		for (const [aliasField, originalField] of Object.entries(aliasMap)) {
 			if (!originalField.startsWith("json(") || !originalField.endsWith(")")) continue;
-			for (const payload of payloads) {
-				payload[aliasField] = fn.parseJsonResult(payload[aliasField]);
-			}
+			for (const payload of payloads) payload[aliasField] = fn.parseJsonResult(payload[aliasField]);
 		}
 	}
 	/**
@@ -292,12 +239,10 @@ var PayloadService = class {
 		for (const aliasField in aliasFields) {
 			const schemaField = aliasFields[aliasField];
 			const field = this.schema.collections[this.collection].fields[schemaField];
-			if (field) {
-				fieldEntries.push([aliasField, {
-					...field,
-					field: aliasField
-				}]);
-			}
+			if (field) fieldEntries.push([aliasField, {
+				...field,
+				field: aliasField
+			}]);
 		}
 		const dateColumns = fieldEntries.filter(([_name, field]) => [
 			"dateTime",
@@ -308,74 +253,41 @@ var PayloadService = class {
 			return field.type === "time";
 		});
 		if (dateColumns.length === 0 && timeColumns.length === 0) return payloads;
-		for (const [name, dateColumn] of dateColumns) {
-			for (const payload of payloads) {
-				let value = payload[name];
-				if (value === null || typeof value === "string" && /^[.0 :-]{10,}$/.test(value)) {
-					payload[name] = null;
-					continue;
+		for (const [name, dateColumn] of dateColumns) for (const payload of payloads) {
+			let value = payload[name];
+			if (value === null || typeof value === "string" && /^[.0 :-]{10,}$/.test(value)) {
+				payload[name] = null;
+				continue;
+			}
+			if (!value) continue;
+			if (action === "read") {
+				if (typeof value === "number" || typeof value === "string") value = new Date(value);
+				if (dateColumn.type === "timestamp") payload[name] = this.helpers.date.readTimestampString(value.toISOString());
+				if (dateColumn.type === "dateTime") payload[name] = `${String(value.getFullYear()).padStart(4, "0")}-${String(value.getMonth() + 1).padStart(2, "0")}-${String(value.getDate()).padStart(2, "0")}T${String(value.getHours()).padStart(2, "0")}:${String(value.getMinutes()).padStart(2, "0")}:${String(value.getSeconds()).padStart(2, "0")}`;
+				if (dateColumn.type === "date") payload[name] = `${String(value.getFullYear()).padStart(4, "0")}-${String(value.getMonth() + 1).padStart(2, "0")}-${String(value.getDate()).padStart(2, "0")}`;
+			} else if (value instanceof Date === false && typeof value === "string") {
+				if (dateColumn.type === "date") {
+					const parsedDate = parseISO(value);
+					if (!isValid(parsedDate)) throw new InvalidPayloadError({ reason: `Invalid Date format in field "${dateColumn.field}"` });
+					payload[name] = parsedDate;
 				}
-				if (!value) continue;
-				if (action === "read") {
-					if (typeof value === "number" || typeof value === "string") {
-						value = new Date(value);
-					}
-					if (dateColumn.type === "timestamp") {
-						const newValue = this.helpers.date.readTimestampString(value.toISOString());
-						payload[name] = newValue;
-					}
-					if (dateColumn.type === "dateTime") {
-						const year = String(value.getFullYear()).padStart(4, "0");
-						const month = String(value.getMonth() + 1).padStart(2, "0");
-						const day = String(value.getDate()).padStart(2, "0");
-						const hours = String(value.getHours()).padStart(2, "0");
-						const minutes = String(value.getMinutes()).padStart(2, "0");
-						const seconds = String(value.getSeconds()).padStart(2, "0");
-						const newValue = `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
-						payload[name] = newValue;
-					}
-					if (dateColumn.type === "date") {
-						const year = String(value.getFullYear()).padStart(4, "0");
-						const month = String(value.getMonth() + 1).padStart(2, "0");
-						const day = String(value.getDate()).padStart(2, "0");
-						const newValue = `${year}-${month}-${day}`;
-						payload[name] = newValue;
-					}
-				} else {
-					if (value instanceof Date === false && typeof value === "string") {
-						if (dateColumn.type === "date") {
-							const parsedDate = parseISO(value);
-							if (!isValid(parsedDate)) {
-								throw new InvalidPayloadError({ reason: `Invalid Date format in field "${dateColumn.field}"` });
-							}
-							payload[name] = parsedDate;
-						}
-						if (dateColumn.type === "dateTime") {
-							const parsedDate = parseISO(value);
-							if (!isValid(parsedDate)) {
-								throw new InvalidPayloadError({ reason: `Invalid DateTime format in field "${dateColumn.field}"` });
-							}
-							payload[name] = parsedDate;
-						}
-						if (dateColumn.type === "timestamp") {
-							const newValue = this.helpers.date.writeTimestamp(value);
-							payload[name] = newValue;
-						}
-					}
+				if (dateColumn.type === "dateTime") {
+					const parsedDate = parseISO(value);
+					if (!isValid(parsedDate)) throw new InvalidPayloadError({ reason: `Invalid DateTime format in field "${dateColumn.field}"` });
+					payload[name] = parsedDate;
 				}
+				if (dateColumn.type === "timestamp") payload[name] = this.helpers.date.writeTimestamp(value);
 			}
 		}
 		/**
 		* Some DB drivers (MS SQL f.e.) return time values as Date objects. For consistencies sake,
 		* we'll abstract those back to hh:mm:ss
 		*/
-		for (const [name] of timeColumns) {
-			for (const payload of payloads) {
-				const value = payload[name];
-				if (!value) continue;
-				if (action === "read") {
-					if (value instanceof Date) payload[name] = format(value, "HH:mm:ss");
-				}
+		for (const [name] of timeColumns) for (const payload of payloads) {
+			const value = payload[name];
+			if (!value) continue;
+			if (action === "read") {
+				if (value instanceof Date) payload[name] = format(value, "HH:mm:ss");
 			}
 		}
 		return payloads;
@@ -397,13 +309,8 @@ var PayloadService = class {
 		for (const relation of relationsToProcess) {
 			if (!relation.meta?.one_collection_field || !relation.meta?.one_allowed_collections) continue;
 			const relatedCollection = payload[relation.meta.one_collection_field];
-			if (!relatedCollection) {
-				throw new InvalidPayloadError({ reason: `Can't update nested record "${relation.collection}.${relation.field}" without field "${relation.collection}.${relation.meta.one_collection_field}" being set` });
-			}
-			const allowedCollections = relation.meta.one_allowed_collections;
-			if (allowedCollections.includes(relatedCollection) === false) {
-				throw new InvalidPayloadError({ reason: `"${relation.collection}.${relation.field}" can't be linked to collection "${relatedCollection}"` });
-			}
+			if (!relatedCollection) throw new InvalidPayloadError({ reason: `Can't update nested record "${relation.collection}.${relation.field}" without field "${relation.collection}.${relation.meta.one_collection_field}" being set` });
+			if (relation.meta.one_allowed_collections.includes(relatedCollection) === false) throw new InvalidPayloadError({ reason: `"${relation.collection}.${relation.field}" can't be linked to collection "${relatedCollection}"` });
 			const { getService } = await import("../utils/get-service.js");
 			const service = getService(relatedCollection, {
 				accountability: this.accountability,
@@ -416,25 +323,9 @@ var PayloadService = class {
 			if (["string", "number"].includes(typeof relatedRecord)) continue;
 			const hasPrimaryKey = relatedPrimaryKeyField in relatedRecord;
 			let relatedPrimaryKey = relatedRecord[relatedPrimaryKeyField];
-			const exists = hasPrimaryKey && !!await this.knex.select(relatedPrimaryKeyField).from(relatedCollection).where({ [relatedPrimaryKeyField]: relatedPrimaryKey }).first();
-			if (exists) {
+			if (hasPrimaryKey && !!await this.knex.select(relatedPrimaryKeyField).from(relatedCollection).where({ [relatedPrimaryKeyField]: relatedPrimaryKey }).first()) {
 				const { [relatedPrimaryKeyField]: _,...record } = relatedRecord;
-				if (Object.keys(record).length > 0) {
-					await service.updateOne(relatedPrimaryKey, record, {
-						onRevisionCreate: (pk) => revisions.push(pk),
-						onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
-						bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
-						emitEvents: opts?.emitEvents,
-						autoPurgeCache: opts?.autoPurgeCache,
-						autoPurgeSystemCache: opts?.autoPurgeSystemCache,
-						skipTracking: opts?.skipTracking,
-						overwriteDefaults: opts?.overwriteDefaults?.[relation.field],
-						onItemCreate: opts?.onItemCreate,
-						mutationTracker: opts?.mutationTracker
-					});
-				}
-			} else {
-				relatedPrimaryKey = await service.createOne(relatedRecord, {
+				if (Object.keys(record).length > 0) await service.updateOne(relatedPrimaryKey, record, {
 					onRevisionCreate: (pk) => revisions.push(pk),
 					onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
 					bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
@@ -446,7 +337,18 @@ var PayloadService = class {
 					onItemCreate: opts?.onItemCreate,
 					mutationTracker: opts?.mutationTracker
 				});
-			}
+			} else relatedPrimaryKey = await service.createOne(relatedRecord, {
+				onRevisionCreate: (pk) => revisions.push(pk),
+				onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
+				bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+				emitEvents: opts?.emitEvents,
+				autoPurgeCache: opts?.autoPurgeCache,
+				autoPurgeSystemCache: opts?.autoPurgeSystemCache,
+				skipTracking: opts?.skipTracking,
+				overwriteDefaults: opts?.overwriteDefaults?.[relation.field],
+				onItemCreate: opts?.onItemCreate,
+				mutationTracker: opts?.mutationTracker
+			});
 			payload[relation.field] = relatedPrimaryKey;
 		}
 		return {
@@ -464,10 +366,9 @@ var PayloadService = class {
 		const revisions = [];
 		let userIntegrityCheckFlags = UserIntegrityCheckFlag.None;
 		const nestedActionEvents = [];
-		const relations = this.schema.relations.filter((relation) => {
+		const relationsToProcess = this.schema.relations.filter((relation) => {
 			return relation.collection === this.collection;
-		});
-		const relationsToProcess = relations.filter((relation) => {
+		}).filter((relation) => {
 			return relation.field in payload && isObject$1(payload[relation.field]);
 		});
 		for (const relation of relationsToProcess) {
@@ -484,25 +385,9 @@ var PayloadService = class {
 			if (["string", "number"].includes(typeof relatedRecord)) continue;
 			const hasPrimaryKey = relatedPrimaryKeyField in relatedRecord;
 			let relatedPrimaryKey = relatedRecord[relatedPrimaryKeyField];
-			const exists = hasPrimaryKey && !!await this.knex.select(relatedPrimaryKeyField).from(relation.related_collection).where({ [relatedPrimaryKeyField]: relatedPrimaryKey }).first();
-			if (exists) {
+			if (hasPrimaryKey && !!await this.knex.select(relatedPrimaryKeyField).from(relation.related_collection).where({ [relatedPrimaryKeyField]: relatedPrimaryKey }).first()) {
 				const { [relatedPrimaryKeyField]: _,...record } = relatedRecord;
-				if (Object.keys(record).length > 0) {
-					await service.updateOne(relatedPrimaryKey, record, {
-						onRevisionCreate: (pk) => revisions.push(pk),
-						onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
-						bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
-						emitEvents: opts?.emitEvents,
-						autoPurgeCache: opts?.autoPurgeCache,
-						autoPurgeSystemCache: opts?.autoPurgeSystemCache,
-						skipTracking: opts?.skipTracking,
-						overwriteDefaults: opts?.overwriteDefaults?.[relation.field],
-						onItemCreate: opts?.onItemCreate,
-						mutationTracker: opts?.mutationTracker
-					});
-				}
-			} else {
-				relatedPrimaryKey = await service.createOne(relatedRecord, {
+				if (Object.keys(record).length > 0) await service.updateOne(relatedPrimaryKey, record, {
 					onRevisionCreate: (pk) => revisions.push(pk),
 					onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
 					bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
@@ -514,7 +399,18 @@ var PayloadService = class {
 					onItemCreate: opts?.onItemCreate,
 					mutationTracker: opts?.mutationTracker
 				});
-			}
+			} else relatedPrimaryKey = await service.createOne(relatedRecord, {
+				onRevisionCreate: (pk) => revisions.push(pk),
+				onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
+				bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+				emitEvents: opts?.emitEvents,
+				autoPurgeCache: opts?.autoPurgeCache,
+				autoPurgeSystemCache: opts?.autoPurgeSystemCache,
+				skipTracking: opts?.skipTracking,
+				overwriteDefaults: opts?.overwriteDefaults?.[relation.field],
+				onItemCreate: opts?.onItemCreate,
+				mutationTracker: opts?.mutationTracker
+			});
 			payload[relation.field] = relatedPrimaryKey;
 		}
 		return {
@@ -566,22 +462,16 @@ var PayloadService = class {
 					const relatedId = typeof relatedRecord === "string" || typeof relatedRecord === "number" ? relatedRecord : relatedRecord[relatedPrimaryKeyField];
 					let record = cloneDeep(relatedRecord);
 					let existingRecord;
-					if (relatedId) {
-						existingRecord = await this.knex.select(relatedPrimaryKeyField, relation.field).from(relation.collection).where({ [relatedPrimaryKeyField]: relatedId }).first();
-					}
+					if (relatedId) existingRecord = await this.knex.select(relatedPrimaryKeyField, relation.field).from(relation.collection).where({ [relatedPrimaryKeyField]: relatedId }).first();
 					if (typeof relatedRecord === "string" || typeof relatedRecord === "number") {
-						if (!existingRecord) {
-							throw new ForbiddenError();
-						}
+						if (!existingRecord) throw new ForbiddenError();
 						if (isNil(existingRecord[relation.field]) === false && existingRecord[relation.field] == currentId) {
 							savedPrimaryKeys.push(existingRecord[relatedPrimaryKeyField]);
 							continue;
 						}
 						record = { [relatedPrimaryKeyField]: relatedRecord };
 					}
-					if (!existingRecord || existingRecord[relation.field] != parent) {
-						record[relation.field] = currentId;
-					}
+					if (!existingRecord || existingRecord[relation.field] != parent) record[relation.field] = currentId;
 					recordsToUpsert.push(record);
 				}
 				savedPrimaryKeys.push(...await service.upsertMany(recordsToUpsert, {
@@ -600,32 +490,29 @@ var PayloadService = class {
 					filter: { _and: [{ [relation.field]: { _eq: parent } }, { [relatedPrimaryKeyField]: { _nin: savedPrimaryKeys } }] },
 					limit: -1
 				};
-				if (relation.meta.one_deselect_action === "delete") {
-					await service.deleteByQuery(query, {
-						onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
-						bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
-						emitEvents: opts?.emitEvents,
-						autoPurgeCache: opts?.autoPurgeCache,
-						autoPurgeSystemCache: opts?.autoPurgeSystemCache,
-						skipTracking: opts?.skipTracking,
-						overwriteDefaults: opts?.overwriteDefaults?.[relation.meta.one_field],
-						onItemCreate: opts?.onItemCreate,
-						mutationTracker: opts?.mutationTracker
-					});
-				} else {
-					await service.updateByQuery(query, { [relation.field]: null }, {
-						onRevisionCreate: (pk) => revisions.push(pk),
-						onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
-						bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
-						emitEvents: opts?.emitEvents,
-						autoPurgeCache: opts?.autoPurgeCache,
-						autoPurgeSystemCache: opts?.autoPurgeSystemCache,
-						skipTracking: opts?.skipTracking,
-						overwriteDefaults: opts?.overwriteDefaults?.[relation.meta.one_field],
-						onItemCreate: opts?.onItemCreate,
-						mutationTracker: opts?.mutationTracker
-					});
-				}
+				if (relation.meta.one_deselect_action === "delete") await service.deleteByQuery(query, {
+					onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
+					bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+					emitEvents: opts?.emitEvents,
+					autoPurgeCache: opts?.autoPurgeCache,
+					autoPurgeSystemCache: opts?.autoPurgeSystemCache,
+					skipTracking: opts?.skipTracking,
+					overwriteDefaults: opts?.overwriteDefaults?.[relation.meta.one_field],
+					onItemCreate: opts?.onItemCreate,
+					mutationTracker: opts?.mutationTracker
+				});
+				else await service.updateByQuery(query, { [relation.field]: null }, {
+					onRevisionCreate: (pk) => revisions.push(pk),
+					onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
+					bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+					emitEvents: opts?.emitEvents,
+					autoPurgeCache: opts?.autoPurgeCache,
+					autoPurgeSystemCache: opts?.autoPurgeSystemCache,
+					skipTracking: opts?.skipTracking,
+					overwriteDefaults: opts?.overwriteDefaults?.[relation.meta.one_field],
+					onItemCreate: opts?.onItemCreate,
+					mutationTracker: opts?.mutationTracker
+				});
 			} else {
 				const alterations = field;
 				const { error } = nestedUpdateSchema.validate(alterations);
@@ -637,20 +524,16 @@ var PayloadService = class {
 						const highestOrderNumber = await this.knex.from(relation.collection).where({ [relation.field]: parent }).whereNotNull(sortField).max(sortField, { as: "max" }).first();
 						createPayload = alterations.create.map((item, index) => {
 							const record = cloneDeep(item);
-							if (parent !== null && record[sortField] === undefined) {
-								record[sortField] = highestOrderNumber?.max ? highestOrderNumber.max + index + 1 : index + 1;
-							}
+							if (parent !== null && record[sortField] === void 0) record[sortField] = highestOrderNumber?.max ? highestOrderNumber.max + index + 1 : index + 1;
 							return {
 								...record,
 								[relation.field]: parent || payload[currentPrimaryKeyField]
 							};
 						});
-					} else {
-						createPayload = alterations.create.map((item) => ({
-							...item,
-							[relation.field]: parent || payload[currentPrimaryKeyField]
-						}));
-					}
+					} else createPayload = alterations.create.map((item) => ({
+						...item,
+						[relation.field]: parent || payload[currentPrimaryKeyField]
+					}));
 					await service.createMany(createPayload, {
 						onRevisionCreate: (pk) => revisions.push(pk),
 						onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
@@ -664,58 +547,51 @@ var PayloadService = class {
 						mutationTracker: opts?.mutationTracker
 					});
 				}
-				if (alterations.update) {
-					for (const index in alterations.update) {
-						const { [relatedPrimaryKeyField]: key,...record } = alterations.update[index];
-						const existingRecord = await this.knex.select(relatedPrimaryKeyField, relation.field).from(relation.collection).where({ [relatedPrimaryKeyField]: key }).first();
-						if (!existingRecord || existingRecord[relation.field] != parent) {
-							record[relation.field] = parent || payload[currentPrimaryKeyField];
-						}
-						await service.updateOne(key, record, {
-							onRevisionCreate: (pk) => revisions.push(pk),
-							onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
-							bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
-							emitEvents: opts?.emitEvents,
-							autoPurgeCache: opts?.autoPurgeCache,
-							autoPurgeSystemCache: opts?.autoPurgeSystemCache,
-							skipTracking: opts?.skipTracking,
-							overwriteDefaults: opts?.overwriteDefaults?.[relation.meta.one_field]?.["update"][index],
-							onItemCreate: opts?.onItemCreate,
-							mutationTracker: opts?.mutationTracker
-						});
-					}
+				if (alterations.update) for (const index in alterations.update) {
+					const { [relatedPrimaryKeyField]: key,...record } = alterations.update[index];
+					const existingRecord = await this.knex.select(relatedPrimaryKeyField, relation.field).from(relation.collection).where({ [relatedPrimaryKeyField]: key }).first();
+					if (!existingRecord || existingRecord[relation.field] != parent) record[relation.field] = parent || payload[currentPrimaryKeyField];
+					await service.updateOne(key, record, {
+						onRevisionCreate: (pk) => revisions.push(pk),
+						onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
+						bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+						emitEvents: opts?.emitEvents,
+						autoPurgeCache: opts?.autoPurgeCache,
+						autoPurgeSystemCache: opts?.autoPurgeSystemCache,
+						skipTracking: opts?.skipTracking,
+						overwriteDefaults: opts?.overwriteDefaults?.[relation.meta.one_field]?.["update"][index],
+						onItemCreate: opts?.onItemCreate,
+						mutationTracker: opts?.mutationTracker
+					});
 				}
 				if (alterations.delete) {
 					const query = {
 						filter: { _and: [{ [relation.field]: { _eq: parent } }, { [relatedPrimaryKeyField]: { _in: alterations.delete } }] },
 						limit: -1
 					};
-					if (relation.meta.one_deselect_action === "delete") {
-						await service.deleteByQuery(query, {
-							onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
-							bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
-							emitEvents: opts?.emitEvents,
-							autoPurgeCache: opts?.autoPurgeCache,
-							autoPurgeSystemCache: opts?.autoPurgeSystemCache,
-							skipTracking: opts?.skipTracking,
-							overwriteDefaults: opts?.overwriteDefaults?.[relation.meta.one_field]?.["delete"],
-							onItemCreate: opts?.onItemCreate,
-							mutationTracker: opts?.mutationTracker
-						});
-					} else {
-						await service.updateByQuery(query, { [relation.field]: null }, {
-							onRevisionCreate: (pk) => revisions.push(pk),
-							onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
-							bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
-							emitEvents: opts?.emitEvents,
-							autoPurgeCache: opts?.autoPurgeCache,
-							autoPurgeSystemCache: opts?.autoPurgeSystemCache,
-							skipTracking: opts?.skipTracking,
-							overwriteDefaults: opts?.overwriteDefaults?.[relation.meta.one_field]?.["delete"],
-							onItemCreate: opts?.onItemCreate,
-							mutationTracker: opts?.mutationTracker
-						});
-					}
+					if (relation.meta.one_deselect_action === "delete") await service.deleteByQuery(query, {
+						onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
+						bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+						emitEvents: opts?.emitEvents,
+						autoPurgeCache: opts?.autoPurgeCache,
+						autoPurgeSystemCache: opts?.autoPurgeSystemCache,
+						skipTracking: opts?.skipTracking,
+						overwriteDefaults: opts?.overwriteDefaults?.[relation.meta.one_field]?.["delete"],
+						onItemCreate: opts?.onItemCreate,
+						mutationTracker: opts?.mutationTracker
+					});
+					else await service.updateByQuery(query, { [relation.field]: null }, {
+						onRevisionCreate: (pk) => revisions.push(pk),
+						onRequireUserIntegrityCheck: (flags) => userIntegrityCheckFlags |= flags,
+						bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+						emitEvents: opts?.emitEvents,
+						autoPurgeCache: opts?.autoPurgeCache,
+						autoPurgeSystemCache: opts?.autoPurgeSystemCache,
+						skipTracking: opts?.skipTracking,
+						overwriteDefaults: opts?.overwriteDefaults?.[relation.meta.one_field]?.["delete"],
+						onItemCreate: opts?.onItemCreate,
+						mutationTracker: opts?.mutationTracker
+					});
 				}
 			}
 		}
@@ -731,11 +607,7 @@ var PayloadService = class {
 	*/
 	async prepareDelta(delta) {
 		let payload = cloneDeep(delta);
-		for (const key in payload) {
-			if (payload[key]?.isRawInstance) {
-				payload[key] = payload[key].bindings[0];
-			}
-		}
+		for (const key in payload) if (payload[key]?.isRawInstance) payload[key] = payload[key].bindings[0];
 		payload = await this.processValues("read", payload);
 		if (Object.keys(payload).length === 0) return null;
 		return payload;