dinah 0.13.1 → 0.15.0

package/dist/index.mjs

@@ -4,8 +4,9 @@ import * as Lib from "@aws-sdk/lib-dynamodb";
 //#region src/error.ts
 function dinahErrorMessage(details) {
 	switch (details.type) {
-		case "NOT_FOUND": return `${details.resource ?? "Item"} not found: ${JSON.stringify(details.key)}`;
-		case "CONDITIONAL_CHECK_FAILED": return details.key ? `${details.resource ?? "Item"} condition check failed: ${JSON.stringify(details.key)}` : `${details.resource ?? "Item"} condition check failed`;
+		case "NOT_FOUND": return `${details.resource ?? "Item"} not found.`;
+		case "ALREADY_EXISTS": return `${details.resource ?? "Item"} already exists.`;
+		case "CONDITIONAL_CHECK_FAILED": return `${details.resource ?? "Item"} condition check failed.`;
 		case "VALIDATION": return `Validation error: ${details.message}`;
 		case "DATA_INTEGRITY": return `Data integrity error: ${details.message}`;
 		case "TRANSACTION_CANCELED": return `Transaction canceled: ${details.reasons.map((r) => r.type).join(", ")}`;
@@ -114,7 +115,10 @@ var ExpressionBuilder = class {
 		const setDelOperations = [];
 		for (const [path, valOrOperation] of Object.entries(expression)) {
 			const placeholder = this.getPathSub(path);
-			if (valOrOperation === void 0) removeOperations.push(placeholder);
+			if (valOrOperation === void 0) throw new DinahError({
+				type: "VALIDATION",
+				message: `Field "${path}" cannot be set to undefined in an update expression. Use { $remove: true } to remove an optional attribute.`
+			});
 			else if (isOperation(valOrOperation)) if (valOrOperation.$remove === true) removeOperations.push(placeholder);
 			else if (valOrOperation.$setAdd !== void 0 || valOrOperation.$setDel !== void 0) {
 				const operations = valOrOperation.$setAdd ? setAddOperations : setDelOperations;
@@ -202,7 +206,10 @@ var ExpressionBuilder = class {
 		const sets = [];
 		const removes = [];
 		const params = [];
-		for (const [path, valOrOp] of Object.entries(expression)) if (valOrOp === void 0) removes.push(`"${path}"`);
+		for (const [path, valOrOp] of Object.entries(expression)) if (valOrOp === void 0) throw new DinahError({
+			type: "VALIDATION",
+			message: `Field "${path}" cannot be set to undefined in an update expression. Use { $remove: true } to remove an optional attribute.`
+		});
 		else if (isOperation(valOrOp)) if (valOrOp.$remove === true) removes.push(`"${path}"`);
 		else sets.push(`"${path}"=${this.resolvePartiQLSetOperand(path, valOrOp, params)}`);
 		else {
@@ -309,18 +316,25 @@ var Repo = class {
 		});
 		return this.applyTransformIfNeeded(result);
 	}
-	async create(item, options) {
-		const { condition: otherCondition, ...otherOptions } = options ?? {};
+	async create(item) {
 		const condition = { $and: [{ [this.table.def.partitionKey]: { $exists: false } }] };
-		if (otherCondition) condition.$and.push(otherCondition);
 		const normalizedItem = this.applyCreateTransforms(item);
-		const result = await this.db.put({
-			table: this.tableName,
-			item: normalizedItem,
-			resource: this.resourceName,
-			condition,
-			...otherOptions
-		});
+		let result;
+		try {
+			result = await this.db.put({
+				table: this.tableName,
+				item: normalizedItem,
+				resource: this.resourceName,
+				condition
+			});
+		} catch (err) {
+			if (err instanceof DinahError && err.details.type === "CONDITIONAL_CHECK_FAILED") throw new DinahError({
+				type: "ALREADY_EXISTS",
+				key: this.extractKey(item),
+				resource: this.resourceName
+			}, { cause: err });
+			throw err;
+		}
 		return this.applyTransformIfNeeded(result);
 	}
 	async delete(key, options) {
@@ -555,8 +569,8 @@ var Repo = class {
 	async trxUpdate(keys, update, options) {
 		return this.db.trxWrite(...keys.map((key) => this.trxUpdateRequest(key, update, options)));
 	}
-	async trxCreate(items, options) {
-		return this.db.trxWrite(...items.map((item) => this.trxCreateRequest(item, options)));
+	async trxCreate(items) {
+		return this.db.trxWrite(...items.map((item) => this.trxCreateRequest(item)));
 	}
 	trxGetRequest(key, options) {
 		return {
@@ -600,17 +614,14 @@ var Repo = class {
 			condition: this.withDiscriminatorCondition(key, options?.condition)
 		};
 	}
-	trxCreateRequest(item, options) {
-		const { condition: otherCondition, ...otherOptions } = options ?? {};
+	trxCreateRequest(item) {
 		const condition = { $and: [{ [this.table.def.partitionKey]: { $exists: false } }] };
-		if (otherCondition) condition.$and.push(otherCondition);
 		const normalizedItem = this.applyCreateTransforms(item);
 		return {
 			table: this.tableName,
 			type: "PUT",
 			item: normalizedItem,
-			condition,
-			...otherOptions
+			condition
 		};
 	}
 	applyCreateTransforms(item) {
@@ -630,7 +641,7 @@ var Repo = class {
 		}
 		if (computedAttributes) for (const [key, def] of Object.entries(computedAttributes)) {
 			const { from, compute } = def;
-			const computed = compute(merged[from]);
+			const computed = compute(...Array.isArray(from) ? from.map((k) => merged[k]) : [merged[from]]);
 			if (computed !== void 0) merged[key] = computed;
 			else delete merged[key];
 		}
@@ -671,15 +682,42 @@ var Repo = class {
 		}
 		if (computedAttributes) for (const [computedKey, def] of Object.entries(computedAttributes)) {
 			const { from, compute } = def;
-			if (!(from in result)) continue;
-			const val = result[from];
-			if (val === void 0 || isOperation(val) && val.$remove === true) result[computedKey] = void 0;
-			else if (!isOperation(val)) result[computedKey] = compute(val);
-			else if (val.$set !== void 0) result[computedKey] = compute(val.$set);
-			else throw new DinahError({
-				type: "VALIDATION",
-				message: `Field "${from}" drives computed field "${computedKey}" and cannot use arithmetic or list operators in updates.`
-			});
+			if (Array.isArray(from)) {
+				const fromArr = from;
+				if (fromArr.filter((k) => k in result).length === 0) continue;
+				const missingKeys = fromArr.filter((k) => !(k in result));
+				if (missingKeys.length > 0) throw new DinahError({
+					type: "VALIDATION",
+					message: `Field "${computedKey}" is computed from [${fromArr.join(", ")}]. All source fields must be included in the update or none. Missing: [${missingKeys.join(", ")}].`
+				});
+				const args = [];
+				for (const key of fromArr) {
+					const val = result[key];
+					if (val === void 0 || isOperation(val) && val.$remove === true) args.push(void 0);
+					else if (!isOperation(val)) args.push(val);
+					else if (val.$set !== void 0) args.push(val.$set);
+					else throw new DinahError({
+						type: "VALIDATION",
+						message: `Field "${key}" drives computed field "${computedKey}" and cannot use arithmetic or list operators in updates.`
+					});
+				}
+				const computed = compute(...args);
+				result[computedKey] = computed !== void 0 ? computed : { $remove: true };
+			} else {
+				const fromKey = from;
+				if (!(fromKey in result)) continue;
+				const val = result[fromKey];
+				let resolvedVal;
+				if (val === void 0 || isOperation(val) && val.$remove === true) resolvedVal = void 0;
+				else if (!isOperation(val)) resolvedVal = val;
+				else if (val.$set !== void 0) resolvedVal = val.$set;
+				else throw new DinahError({
+					type: "VALIDATION",
+					message: `Field "${fromKey}" drives computed field "${computedKey}" and cannot use arithmetic or list operators in updates.`
+				});
+				const computed = compute(resolvedVal);
+				result[computedKey] = computed !== void 0 ? computed : { $remove: true };
+			}
 		}
 		return result;
 	}
@@ -723,12 +761,19 @@ var Db = class {
 		else {
 			const { endpoint, ...clientConfig } = clientOrConfig;
 			this.client = Lib.DynamoDBDocumentClient.from(new DynamoDBClient({
-				endpoint: endpoint || void 0,
+				...endpoint ? { endpoint } : {},
 				...clientConfig
 			}));
 		}
 		this.config = dbConfig;
 	}
+	normalizeUpdate(expression) {
+		const behavior = this.config?.updateUndefinedBehavior ?? "throw";
+		if (behavior === "throw") return expression;
+		const entries = Object.entries(expression);
+		if (behavior === "strip") return Object.fromEntries(entries.filter(([, v]) => v !== void 0));
+		return Object.fromEntries(entries.map(([k, v]) => [k, v === void 0 ? { $remove: true } : v]));
+	}
 	makeRepo(table, config) {
 		return new Repo(this, table, config);
 	}
@@ -805,7 +850,7 @@ var Db = class {
 			Key: data.key,
 			ReturnValues: "ALL_NEW",
 			ReturnValuesOnConditionCheckFailure: "ALL_OLD",
-			UpdateExpression: exp.update(data.update),
+			UpdateExpression: exp.update(this.normalizeUpdate(data.update)),
 			ConditionExpression: exp.condition(condition),
 			ExpressionAttributeNames: exp.attributeNames,
 			ExpressionAttributeValues: exp.attributeValues
@@ -1072,7 +1117,7 @@ var Db = class {
 		while (queue.length && retryCount < 5) {
 			const batch = queue.splice(0, batchSize || 1);
 			const statements = batch.map(([table, key, update]) => {
-				const { sets, removes, params } = new ExpressionBuilder().partiqlUpdate(update);
+				const { sets, removes, params } = new ExpressionBuilder().partiqlUpdate(this.normalizeUpdate(update));
 				const whereParts = [];
 				for (const [field, value] of Object.entries(key)) {
 					whereParts.push(`"${field}"=?`);
@@ -1157,7 +1202,7 @@ var Db = class {
 			return { Update: {
 				Key: request.key,
 				TableName: request.table,
-				UpdateExpression: exp.update(request.update),
+				UpdateExpression: exp.update(this.normalizeUpdate(request.update)),
 				ConditionExpression: exp.condition(request.condition),
 				ExpressionAttributeNames: exp.attributeNames,
 				ExpressionAttributeValues: exp.attributeValues