Model.transaction.condition now accepts condition instance

docs/docs/api/Model.md

@@ -704,11 +704,15 @@ You can pass in the same parameters into each method that you do for the normal
 
 These methods are only meant to only be called to instantiate the `dynamoose.transaction` array.
 
-### Model.transaction.condition(key, additionalParameters)
+### Model.transaction.condition(key, condition)
 
-This method allows you to run a conditionCheck when running a DynamoDB transaction.
+This method allows you to run a `conditionCheck` when running a DynamoDB transaction.
 
-The `additionalParameters` property will be appended to the result to allow you to set custom conditions.
+The `condition` parameter is a `dynamoose.Condition` instance that represents the conditional you want to run.
+
+```js
+User.transaction.condition(1, new dynamoose.Condition("age").gt(13));
+```
 
 ## Model.methods.set(name, function)
 

lib/Model/index.js

@@ -95,10 +95,10 @@ class Model {
 				delete response.ReturnValues;
 				return response;
 			}},
-			{"key": "condition", "settingsIndex": -1, "dynamoKey": "ConditionCheck", "function": (key, options) => ({
-				...options,
+			{"key": "condition", "settingsIndex": -1, "dynamoKey": "ConditionCheck", "function": (key, condition) => ({
 				"Key": this.Document.toDynamo(convertObjectToKey.bind(this)(key)),
-				"TableName": this.name
+				"TableName": this.name,
+				...(condition ? condition.requestObject() : {})
 			})}
 		].reduce((accumulator, currentValue) => {
 			const {key, modifier} = currentValue;

test/Model.js

@@ -3184,12 +3184,28 @@ describe("Model", () => {
 				});
 			});
 
-			it("Should return correct result with options", async () => {
-				expect(await User.transaction.condition(1, {"hello": "world"})).to.eql({
+			it("Should return correct result for object based key", async () => {
+				User = dynamoose.model("User", {"id": Number, "name": {"type": String, "rangeKey": true}});
+				expect(await User.transaction.condition({"id": 1, "name": "Bob"})).to.eql({
 					"ConditionCheck": {
+						"Key": {"id": {"N": "1"}, "name": {"S": "Bob"}},
+						"TableName": "User"
+					}
+				});
+			});
+
+			it("Should return correct result with conditional", async () => {
+				expect(await User.transaction.condition(1, new dynamoose.Condition("age").gt(13))).to.eql({
+					"ConditionCheck": {
+						"ConditionExpression": "#a0 > :v0",
+						"ExpressionAttributeNames": {
+							"#a0": "age"
+						},
+						"ExpressionAttributeValues": {
+							":v0": {"N": "13"}
+						},
 						"Key": {"id": {"N": "1"}},
-						"TableName": "User",
-						"hello": "world"
+						"TableName": "User"
 					}
 				});
 			});