Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dynamo",
"nosql"
],
"version": "0.6.2",
"version": "0.6.3",
"files": [
"lib",
"LICENSE",
Expand Down
8 changes: 8 additions & 0 deletions src/mutation/expressionBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ export const buildConditionExpressions = (
expression += `${expressionName} ${operator} :val${i}_1 AND :val${i}_2`;
attrValues[`:val${i}_1`] = value[0];
attrValues[`:val${i}_2`] = value[1];
} else if (operator === 'EXISTS') {
// For EXISTS, we don't need a value, just check if attribute exists or not
const existsValue = value as boolean;
if (existsValue) {
expression += `attribute_exists(${expressionName})`;
} else {
expression += `attribute_not_exists(${expressionName})`;
}
} else {
expression += `${expressionName} ${operator} :val${i}`;
attrValues[`:val${i}`] = value;
Expand Down
47 changes: 2 additions & 45 deletions src/mutation/putItem.ts
Original file line number Diff line number Diff line change
@@ -1,51 +1,8 @@
import { AnyObject, TableConfig, ConditionExpressionInput, ConditionExpressionKind } from '../types';
import { AnyObject, TableConfig, ConditionExpressionInput } from '../types';
import { DynamoDBDocumentClient, PutCommand, PutCommandOutput, PutCommandInput } from '@aws-sdk/lib-dynamodb';
import { keyOperatorLookup } from '../query/queryBuilder';
import { buildConditionExpressions } from './expressionBuilder';

const buildConditionExpressions = (
conditionExpression: ConditionExpressionInput[],
): { expression: string; attrValues: Record<string, unknown>; attrNames: Record<string, string> } => {
let expression = '';
const attrValues: Record<string, unknown> = {};
const attrNames: Record<string, string> = {};
for (let i = 0; i < conditionExpression.length; i++) {
const currentExpression = conditionExpression[i];
if (currentExpression.kind === ConditionExpressionKind.AndOr) {
if (i > 0) {
expression += ` ${currentExpression.value} `;
}
continue;
}
if (currentExpression.kind === ConditionExpressionKind.Comparison) {
const key = currentExpression.key;
const comparator = currentExpression.comparator;
const value = currentExpression.value;

if (!comparator) continue;
const operator = keyOperatorLookup(comparator);
const expressionName = `#key_${key}`;
attrNames[expressionName] = key;

if (operator === 'BETWEEN') {
expression += `${expressionName} ${operator} :val${i}_1 AND :val${i}_2`;
attrValues[`:val${i}_1`] = value[0];
attrValues[`:val${i}_2`] = value[1];
} else if (operator === 'EXISTS') {
// For EXISTS, we don't need a value, just check if attribute exists or not
const existsValue = value as boolean;
if (existsValue) {
expression += `attribute_exists(${expressionName})`;
} else {
expression += `attribute_not_exists(${expressionName})`;
}
} else {
expression += `${expressionName} ${operator} :val${i}`;
attrValues[`:val${i}`] = value;
}
}
}
return { expression, attrValues, attrNames };
};

/**
* Writes item in database.
Expand Down
11 changes: 5 additions & 6 deletions src/mutation/transactWriteItems.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ describe('transactWriteItems', () => {
ConditionCheck: {
Key: { pk: '1', sk: 'a' },
TableName: testTableConf.name,
ConditionExpression: '#key_pk EXISTS :val0',
ConditionExpression: 'attribute_exists(#key_pk)',
ExpressionAttributeNames: { '#key_pk': 'pk' },
ExpressionAttributeValues: { ':val0': true },
ExpressionAttributeValues: {},
},
},
],
Expand Down Expand Up @@ -214,9 +214,8 @@ describe('transactWriteItems', () => {
{
Put: {
Item: { pk: '1', sk: 'a', name: 'Alice' },
ConditionExpression: '#key_pk EXISTS :val0',
ConditionExpression: 'attribute_not_exists(#key_pk)',
ExpressionAttributeNames: { '#key_pk': 'pk' },
ExpressionAttributeValues: { ':val0': false },
TableName: testTableConf.name,
},
},
Expand Down Expand Up @@ -250,9 +249,9 @@ describe('transactWriteItems', () => {
{
Delete: {
Key: { pk: '1', sk: 'a' },
ConditionExpression: '#key_pk EXISTS :val0',
ConditionExpression: 'attribute_exists(#key_pk)',
ExpressionAttributeNames: { '#key_pk': 'pk' },
ExpressionAttributeValues: { ':val0': true },
ExpressionAttributeValues: {},
TableName: testTableConf.name,
},
},
Expand Down
5 changes: 3 additions & 2 deletions src/mutation/transactWriteItems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ export function transactWriteItems(
const conditionExpr = buildConditionExpressions(item.Put.conditions);
putItem.ConditionExpression = conditionExpr.expression;
putItem.ExpressionAttributeNames = conditionExpr.attrNames;
putItem.ExpressionAttributeValues = conditionExpr.attrValues;
if (Object.keys(conditionExpr.attrValues).length > 0) {
putItem.ExpressionAttributeValues = conditionExpr.attrValues;
}
}

return { Put: putItem };
}

Expand Down