@infra-blocks/aws-dynamodb 0.5.0 → 0.6.0-alpha.0

package/lib/cjs/commands/attributes/names.d.ts

@@ -0,0 +1,22 @@
+import type { AttributePath } from "../../types.js";
+/**
+ * A substitution always starts with the `#` character.
+ */
+export type Substitution = `#${string}`;
+/**
+ * Represents a set of attribute names used in a condition expression.
+ *
+ * The uses cases for using attribute names are:
+ * - To access an attribute whose name conflicts with a DynamoDB reserved word.
+ * - To create a placeholder for repeating occurrences of an attribute name in an expression.
+ * - To prevent special characters in an attribute name from being misinterpreted in an expression.
+ */
+export declare class AttributeNames {
+    private readonly names;
+    private constructor();
+    add(...attributes: AttributePath[]): void;
+    getSubstitute(attribute: AttributePath): Substitution;
+    getSubstitutions(): Record<Substitution, AttributePath> | undefined;
+    private generateSubstitute;
+    static create(): AttributeNames;
+}

package/lib/cjs/commands/attributes/names.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AttributeNames = void 0;
+/**
+ * Represents a set of attribute names used in a condition expression.
+ *
+ * The uses cases for using attribute names are:
+ * - To access an attribute whose name conflicts with a DynamoDB reserved word.
+ * - To create a placeholder for repeating occurrences of an attribute name in an expression.
+ * - To prevent special characters in an attribute name from being misinterpreted in an expression.
+ */
+class AttributeNames {
+    names;
+    constructor() {
+        this.names = new Map();
+    }
+    add(...attributes) {
+        for (const attribute of attributes) {
+            if (this.names.has(attribute)) {
+                continue;
+            }
+            const substitute = this.generateSubstitute(attribute);
+            this.names.set(attribute, substitute);
+        }
+    }
+    getSubstitute(attribute) {
+        const substitute = this.names.get(attribute);
+        if (substitute == null) {
+            throw new Error(`no substitution found for attribute: ${attribute}`);
+        }
+        return substitute;
+    }
+    getSubstitutions() {
+        if (this.names.size === 0) {
+            return undefined;
+        }
+        const result = {};
+        for (const [attribute, substitute] of this.names.entries()) {
+            result[substitute] = attribute;
+        }
+        return result;
+    }
+    generateSubstitute(attribute) {
+        return `#${attribute}`;
+    }
+    static create() {
+        return new AttributeNames();
+    }
+}
+exports.AttributeNames = AttributeNames;
+//# sourceMappingURL=names.js.map

package/lib/cjs/commands/attributes/names.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../../src/commands/attributes/names.ts"],"names":[],"mappings":";;;AAOA;;;;;;;GAOG;AACH,MAAa,cAAc;IACR,KAAK,CAAmC;IAEzD;QACE,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAA+B,CAAC;IACtD,CAAC;IAED,GAAG,CAAC,GAAG,UAA2B;QAChC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,SAAS;YACX,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,aAAa,CAAC,SAAwB;QACpC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,wCAAwC,SAAS,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,gBAAgB;QACd,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAAwC,EAAE,CAAC;QACvD,KAAK,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3D,MAAM,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QACjC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,kBAAkB,CAAC,SAAwB;QACjD,OAAO,IAAI,SAAS,EAAkB,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,MAAM;QACX,OAAO,IAAI,cAAc,EAAE,CAAC;IAC9B,CAAC;CACF;AA5CD,wCA4CC"}

package/lib/cjs/commands/attributes/values.d.ts

@@ -0,0 +1,12 @@
+import type { AttributeValue } from "../../types.js";
+export type ValueReference = `:${string}`;
+export declare class AttributeValues {
+    private readonly values;
+    private counter;
+    private constructor();
+    add(...values: AttributeValue[]): void;
+    getReference(value: AttributeValue): ValueReference;
+    getReferences(): Record<ValueReference, AttributeValue> | undefined;
+    private nextReference;
+    static create(): AttributeValues;
+}

package/lib/cjs/commands/attributes/values.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AttributeValues = void 0;
+class AttributeValues {
+    values;
+    counter;
+    constructor() {
+        this.values = new Map();
+        this.counter = 0;
+    }
+    add(...values) {
+        for (const value of values) {
+            if (this.values.has(value)) {
+                continue;
+            }
+            const reference = this.nextReference();
+            this.values.set(value, reference);
+        }
+    }
+    getReference(value) {
+        const existing = this.values.get(value);
+        if (existing != null) {
+            return existing;
+        }
+        const reference = this.nextReference();
+        this.values.set(value, reference);
+        return reference;
+    }
+    getReferences() {
+        if (this.values.size === 0) {
+            return undefined;
+        }
+        const result = {};
+        for (const [value, reference] of this.values.entries()) {
+            result[reference] = value;
+        }
+        return result;
+    }
+    nextReference() {
+        const reference = `:${this.counter}`;
+        this.counter += 1;
+        return reference;
+    }
+    static create() {
+        return new AttributeValues();
+    }
+}
+exports.AttributeValues = AttributeValues;
+//# sourceMappingURL=values.js.map

package/lib/cjs/commands/attributes/values.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"values.js","sourceRoot":"","sources":["../../../../src/commands/attributes/values.ts"],"names":[],"mappings":";;;AAIA,MAAa,eAAe;IACT,MAAM,CAAsC;IACrD,OAAO,CAAS;IAExB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAkC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,GAAG,CAAC,GAAG,MAAwB;QAC7B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,SAAS;YACX,CAAC;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,YAAY,CAAC,KAAqB;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,aAAa;QACX,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAA2C,EAAE,CAAC;QAC1D,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,aAAa;QACnB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,OAAO,EAAoB,CAAC;QACvD,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,MAAM;QACX,OAAO,IAAI,eAAe,EAAE,CAAC;IAC/B,CAAC;CACF;AAlDD,0CAkDC"}

package/lib/cjs/commands/expressions/condition.d.ts

@@ -1,19 +1,15 @@
-import type { AttributePath, AttributeType, AttributeValue } from "../../types.js";
-type AttributeSubstitution = `#${string}`;
-type ValueReference = `:${string}`;
-export type ExpressionAwsInput = {
-    ConditionExpression: string;
-    ExpressionAttributeNames?: Record<AttributeSubstitution, AttributePath>;
-    ExpressionAttributeValues?: Record<ValueReference, AttributeValue>;
-};
-export declare class ConditionExpression {
-    private readonly expression;
-    private readonly substitutions?;
-    private readonly values?;
+import type { AttributePath, AttributeType } from "../../types.js";
+import type { AttributeNames } from "../attributes/names.js";
+import type { AttributeValues } from "../attributes/values.js";
+import type { Expression } from "./expression.js";
+export declare class ConditionExpression implements Expression {
+    private readonly inner;
     private constructor();
-    toAwsInput(): ExpressionAwsInput;
+    stringify(params: {
+        attributeNames: AttributeNames;
+        attributeValues: AttributeValues;
+    }): string;
     static attributeNotExists(attribute: AttributePath): ConditionExpression;
     static attributeExists(attribute: AttributePath): ConditionExpression;
     static attributeType(attribute: AttributePath, type: AttributeType): ConditionExpression;
 }
-export {};

package/lib/cjs/commands/expressions/condition.js

@@ -1,115 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConditionExpression = void 0;
-/**
- * Represents a set of attribute names used in a condition expression.
- *
- * The uses cases for using attribute names are:
- * - To access an attribute whose name conflicts with a DynamoDB reserved word.
- * - To create a placeholder for repeating occurrences of an attribute name in an expression.
- * - To prevent special characters in an attribute name from being misinterpreted in an expression.
- */
-class AttributeSubstitutions {
-    names;
-    constructor() {
-        this.names = new Map();
-    }
-    substitute(attribute) {
-        const existing = this.names.get(attribute);
-        if (existing != null) {
-            return existing;
-        }
-        const substitute = this.generateSubstitute(attribute);
-        this.names.set(attribute, substitute);
-        return substitute;
-    }
-    toAwsInput() {
-        const result = {};
-        for (const [attribute, substitute] of this.names.entries()) {
-            result[substitute] = attribute;
-        }
-        return result;
-    }
-    generateSubstitute(attribute) {
-        return `#${attribute}`;
-    }
-}
-class AttributeValues {
-    values;
-    counter;
-    constructor() {
-        this.values = new Map();
-        this.counter = 0;
-    }
-    referenceBy(value) {
-        const existing = this.values.get(value);
-        if (existing != null) {
-            return existing;
-        }
-        const reference = this.generateReference();
-        this.values.set(value, reference);
-        return reference;
-    }
-    toAwsInput() {
-        const result = {};
-        for (const [value, reference] of this.values.entries()) {
-            result[reference] = value;
-        }
-        return result;
-    }
-    generateReference() {
-        const reference = `:${this.counter}`;
-        this.counter += 1;
-        return reference;
-    }
-}
 class ConditionExpression {
-    expression;
-    substitutions;
-    values;
+    inner;
     constructor(params) {
-        const { expression, substitutions, values } = params;
-        this.expression = expression;
-        this.substitutions = substitutions;
-        this.values = values;
+        const { inner } = params;
+        this.inner = inner;
     }
-    toAwsInput() {
-        const result = {
-            ConditionExpression: this.expression,
-        };
-        if (this.substitutions != null) {
-            result.ExpressionAttributeNames = this.substitutions.toAwsInput();
-        }
-        if (this.values != null) {
-            result.ExpressionAttributeValues = this.values.toAwsInput();
-        }
-        return result;
+    stringify(params) {
+        return this.inner.stringify(params);
     }
     static attributeNotExists(attribute) {
-        const substitutions = new AttributeSubstitutions();
-        const sub = substitutions.substitute(attribute);
         return new ConditionExpression({
-            expression: `attribute_not_exists(${sub})`,
-            substitutions,
+            inner: {
+                stringify: ({ attributeNames }) => {
+                    attributeNames.add(attribute);
+                    return `attribute_not_exists(${attributeNames.getSubstitute(attribute)})`;
+                },
+            },
         });
     }
     static attributeExists(attribute) {
-        const substitutions = new AttributeSubstitutions();
-        const sub = substitutions.substitute(attribute);
         return new ConditionExpression({
-            expression: `attribute_exists(${sub})`,
-            substitutions,
+            inner: {
+                stringify: ({ attributeNames }) => {
+                    attributeNames.add(attribute);
+                    return `attribute_exists(${attributeNames.getSubstitute(attribute)})`;
+                },
+            },
         });
     }
     static attributeType(attribute, type) {
-        const substitutions = new AttributeSubstitutions();
-        const sub = substitutions.substitute(attribute);
-        const values = new AttributeValues();
-        const valueRef = values.referenceBy(type);
         return new ConditionExpression({
-            expression: `attribute_type(${sub}, ${valueRef})`,
-            substitutions,
-            values,
+            inner: {
+                stringify: ({ attributeNames, attributeValues }) => {
+                    attributeNames.add(attribute);
+                    attributeValues.add(type);
+                    return `attribute_type(${attributeNames.getSubstitute(attribute)}, ${attributeValues.getReference(type)})`;
+                },
+            },
         });
     }
 }

package/lib/cjs/commands/expressions/condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition.js","sourceRoot":"","sources":["../../../../src/commands/expressions/condition.ts"],"names":[],"mappings":";;;AAQA;;;;;;;GAOG;AACH,MAAM,sBAAsB;IACT,KAAK,CAA4C;IAElE;QACE,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAAwC,CAAC;IAC/D,CAAC;IAED,UAAU,CAAC,SAAwB;QACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3C,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACtC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,UAAU;QACR,MAAM,MAAM,GAAiD,EAAE,CAAC;QAChE,KAAK,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3D,MAAM,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QACjC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,kBAAkB,CAAC,SAAwB;QACjD,OAAO,IAAI,SAAS,EAA2B,CAAC;IAClD,CAAC;CACF;AAID,MAAM,eAAe;IACF,MAAM,CAAsC;IACrD,OAAO,CAAS;IAExB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAkC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,WAAW,CAAC,KAAqB;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,UAAU;QACR,MAAM,MAAM,GAA2C,EAAE,CAAC;QAC1D,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,iBAAiB;QACvB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,OAAO,EAAoB,CAAC;QACvD,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAQD,MAAa,mBAAmB;IACb,UAAU,CAAS;IACnB,aAAa,CAA0B;IACvC,MAAM,CAAmB;IAE1C,YAAoB,MAInB;QACC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;QACrD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,UAAU;QACR,MAAM,MAAM,GAAuB;YACjC,mBAAmB,EAAE,IAAI,CAAC,UAAU;SACrC,CAAC;QACF,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,EAAE,CAAC;YAC/B,MAAM,CAAC,wBAAwB,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;QACpE,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,CAAC,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAC9D,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,SAAwB;QAChD,MAAM,aAAa,GAAG,IAAI,sBAAsB,EAAE,CAAC;QACnD,MAAM,GAAG,GAAG,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAChD,OAAO,IAAI,mBAAmB,CAAC;YAC7B,UAAU,EAAE,wBAAwB,GAAG,GAAG;YAC1C,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,SAAwB;QAC7C,MAAM,aAAa,GAAG,IAAI,sBAAsB,EAAE,CAAC;QACnD,MAAM,GAAG,GAAG,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAChD,OAAO,IAAI,mBAAmB,CAAC;YAC7B,UAAU,EAAE,oBAAoB,GAAG,GAAG;YACtC,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,aAAa,CAClB,SAAwB,EACxB,IAAmB;QAEnB,MAAM,aAAa,GAAG,IAAI,sBAAsB,EAAE,CAAC;QACnD,MAAM,GAAG,GAAG,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,IAAI,mBAAmB,CAAC;YAC7B,UAAU,EAAE,kBAAkB,GAAG,KAAK,QAAQ,GAAG;YACjD,aAAa;YACb,MAAM;SACP,CAAC,CAAC;IACL,CAAC;CACF;AA7DD,kDA6DC"}
+{"version":3,"file":"condition.js","sourceRoot":"","sources":["../../../../src/commands/expressions/condition.ts"],"names":[],"mappings":";;;AAKA,MAAa,mBAAmB;IACb,KAAK,CAAa;IAEnC,YAAoB,MAA6B;QAC/C,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,SAAS,CAAC,MAGT;QACC,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,SAAwB;QAChD,OAAO,IAAI,mBAAmB,CAAC;YAC7B,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;oBAChC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC9B,OAAO,wBAAwB,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC;gBAC5E,CAAC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,SAAwB;QAC7C,OAAO,IAAI,mBAAmB,CAAC;YAC7B,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;oBAChC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC9B,OAAO,oBAAoB,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC;gBACxE,CAAC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,aAAa,CAClB,SAAwB,EACxB,IAAmB;QAEnB,OAAO,IAAI,mBAAmB,CAAC;YAC7B,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,EAAE;oBACjD,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC9B,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC1B,OAAO,kBAAkB,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC7G,CAAC;aACF;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAnDD,kDAmDC"}

package/lib/cjs/commands/expressions/expression.d.ts

@@ -0,0 +1,8 @@
+import type { AttributeNames } from "../attributes/names.js";
+import type { AttributeValues } from "../attributes/values.js";
+export interface Expression {
+    stringify(params: {
+        attributeNames: AttributeNames;
+        attributeValues: AttributeValues;
+    }): string;
+}

package/lib/cjs/commands/expressions/expression.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=expression.js.map

package/lib/cjs/commands/expressions/expression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../../src/commands/expressions/expression.ts"],"names":[],"mappings":""}

package/lib/cjs/commands/put-item.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PutItem = void 0;
 const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
+const names_js_1 = require("./attributes/names.js");
+const values_js_1 = require("./attributes/values.js");
 class PutItem {
     table;
     item;
@@ -14,11 +16,27 @@ class PutItem {
     }
     toAwsCommandInput() {
         const { table, item, condition } = this;
-        const conditionPayload = condition != null ? condition.toAwsInput() : {};
-        return {
+        const input = {
             TableName: table,
             Item: item,
-            ...conditionPayload,
+        };
+        // Expression attribute names and values can only be specified when a condition is provided,
+        // which is optional.
+        if (condition == null) {
+            return input;
+        }
+        const attributeNames = names_js_1.AttributeNames.create();
+        const attributeValues = values_js_1.AttributeValues.create();
+        // Ask the expression to stringify itself, applying the substitutions by itself.
+        const expression = condition.stringify({
+            attributeNames,
+            attributeValues,
+        });
+        return {
+            ...input,
+            ConditionExpression: expression,
+            ExpressionAttributeNames: attributeNames.getSubstitutions(),
+            ExpressionAttributeValues: attributeValues.getReferences(),
         };
     }
     toAwsCommand() {

package/lib/cjs/commands/put-item.js.map

@@ -1 +1 @@
-{"version":3,"file":"put-item.js","sourceRoot":"","sources":["../../../src/commands/put-item.ts"],"names":[],"mappings":";;;AAAA,wDAAyE;AAWzE,MAAa,OAAO;IACD,KAAK,CAAS;IACd,IAAI,CAAa;IACjB,SAAS,CAAuB;IAEjD,YAAoB,MAAqB;QACvC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,iBAAiB;QACf,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QACxC,MAAM,gBAAgB,GAAG,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,IAAI,EAAE,IAAI;YACV,GAAG,gBAAgB;SACpB,CAAC;IACJ,CAAC;IAED,YAAY;QACV,OAAO,IAAI,yBAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAqB;QAC/B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;CACF;AA7BD,0BA6BC"}
+{"version":3,"file":"put-item.js","sourceRoot":"","sources":["../../../src/commands/put-item.ts"],"names":[],"mappings":";;;AAAA,wDAAyE;AAEzE,oDAAuD;AACvD,sDAAyD;AAUzD,MAAa,OAAO;IACD,KAAK,CAAS;IACd,IAAI,CAAa;IACjB,SAAS,CAAuB;IAEjD,YAAoB,MAAqB;QACvC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,iBAAiB;QACf,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAExC,MAAM,KAAK,GAAoB;YAC7B,SAAS,EAAE,KAAK;YAChB,IAAI,EAAE,IAAI;SACX,CAAC;QAEF,4FAA4F;QAC5F,qBAAqB;QACrB,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,cAAc,GAAG,yBAAc,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,eAAe,GAAG,2BAAe,CAAC,MAAM,EAAE,CAAC;QACjD,gFAAgF;QAChF,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC;YACrC,cAAc;YACd,eAAe;SAChB,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,KAAK;YACR,mBAAmB,EAAE,UAAU;YAC/B,wBAAwB,EAAE,cAAc,CAAC,gBAAgB,EAAE;YAC3D,yBAAyB,EAAE,eAAe,CAAC,aAAa,EAAE;SAC3D,CAAC;IACJ,CAAC;IAED,YAAY;QACV,OAAO,IAAI,yBAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAqB;QAC/B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;CACF;AAjDD,0BAiDC"}

package/lib/cjs/types.d.ts

@@ -8,7 +8,7 @@ export interface Attribute {
     name: AttributeName;
     value: AttributeValue;
 }
-export type Attributes = Record<AttributeName, NativeAttributeValue>;
+export type Attributes = Record<AttributeName, AttributeValue>;
 export type IndexFieldType = ScalarAttributeType;
 export interface IndexField {
     name: string;

package/lib/esm/commands/attributes/names.d.ts

@@ -0,0 +1,22 @@
+import type { AttributePath } from "../../types.js";
+/**
+ * A substitution always starts with the `#` character.
+ */
+export type Substitution = `#${string}`;
+/**
+ * Represents a set of attribute names used in a condition expression.
+ *
+ * The uses cases for using attribute names are:
+ * - To access an attribute whose name conflicts with a DynamoDB reserved word.
+ * - To create a placeholder for repeating occurrences of an attribute name in an expression.
+ * - To prevent special characters in an attribute name from being misinterpreted in an expression.
+ */
+export declare class AttributeNames {
+    private readonly names;
+    private constructor();
+    add(...attributes: AttributePath[]): void;
+    getSubstitute(attribute: AttributePath): Substitution;
+    getSubstitutions(): Record<Substitution, AttributePath> | undefined;
+    private generateSubstitute;
+    static create(): AttributeNames;
+}

package/lib/esm/commands/attributes/names.js

@@ -0,0 +1,47 @@
+/**
+ * Represents a set of attribute names used in a condition expression.
+ *
+ * The uses cases for using attribute names are:
+ * - To access an attribute whose name conflicts with a DynamoDB reserved word.
+ * - To create a placeholder for repeating occurrences of an attribute name in an expression.
+ * - To prevent special characters in an attribute name from being misinterpreted in an expression.
+ */
+export class AttributeNames {
+    names;
+    constructor() {
+        this.names = new Map();
+    }
+    add(...attributes) {
+        for (const attribute of attributes) {
+            if (this.names.has(attribute)) {
+                continue;
+            }
+            const substitute = this.generateSubstitute(attribute);
+            this.names.set(attribute, substitute);
+        }
+    }
+    getSubstitute(attribute) {
+        const substitute = this.names.get(attribute);
+        if (substitute == null) {
+            throw new Error(`no substitution found for attribute: ${attribute}`);
+        }
+        return substitute;
+    }
+    getSubstitutions() {
+        if (this.names.size === 0) {
+            return undefined;
+        }
+        const result = {};
+        for (const [attribute, substitute] of this.names.entries()) {
+            result[substitute] = attribute;
+        }
+        return result;
+    }
+    generateSubstitute(attribute) {
+        return `#${attribute}`;
+    }
+    static create() {
+        return new AttributeNames();
+    }
+}
+//# sourceMappingURL=names.js.map

package/lib/esm/commands/attributes/names.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../../src/commands/attributes/names.ts"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AACH,MAAM,OAAO,cAAc;IACR,KAAK,CAAmC;IAEzD;QACE,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAA+B,CAAC;IACtD,CAAC;IAED,GAAG,CAAC,GAAG,UAA2B;QAChC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,SAAS;YACX,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,aAAa,CAAC,SAAwB;QACpC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,wCAAwC,SAAS,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,gBAAgB;QACd,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAAwC,EAAE,CAAC;QACvD,KAAK,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3D,MAAM,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QACjC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,kBAAkB,CAAC,SAAwB;QACjD,OAAO,IAAI,SAAS,EAAkB,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,MAAM;QACX,OAAO,IAAI,cAAc,EAAE,CAAC;IAC9B,CAAC;CACF"}

package/lib/esm/commands/attributes/values.d.ts

@@ -0,0 +1,12 @@
+import type { AttributeValue } from "../../types.js";
+export type ValueReference = `:${string}`;
+export declare class AttributeValues {
+    private readonly values;
+    private counter;
+    private constructor();
+    add(...values: AttributeValue[]): void;
+    getReference(value: AttributeValue): ValueReference;
+    getReferences(): Record<ValueReference, AttributeValue> | undefined;
+    private nextReference;
+    static create(): AttributeValues;
+}

package/lib/esm/commands/attributes/values.js

@@ -0,0 +1,45 @@
+export class AttributeValues {
+    values;
+    counter;
+    constructor() {
+        this.values = new Map();
+        this.counter = 0;
+    }
+    add(...values) {
+        for (const value of values) {
+            if (this.values.has(value)) {
+                continue;
+            }
+            const reference = this.nextReference();
+            this.values.set(value, reference);
+        }
+    }
+    getReference(value) {
+        const existing = this.values.get(value);
+        if (existing != null) {
+            return existing;
+        }
+        const reference = this.nextReference();
+        this.values.set(value, reference);
+        return reference;
+    }
+    getReferences() {
+        if (this.values.size === 0) {
+            return undefined;
+        }
+        const result = {};
+        for (const [value, reference] of this.values.entries()) {
+            result[reference] = value;
+        }
+        return result;
+    }
+    nextReference() {
+        const reference = `:${this.counter}`;
+        this.counter += 1;
+        return reference;
+    }
+    static create() {
+        return new AttributeValues();
+    }
+}
+//# sourceMappingURL=values.js.map

package/lib/esm/commands/attributes/values.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"values.js","sourceRoot":"","sources":["../../../../src/commands/attributes/values.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,eAAe;IACT,MAAM,CAAsC;IACrD,OAAO,CAAS;IAExB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAkC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,GAAG,CAAC,GAAG,MAAwB;QAC7B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,SAAS;YACX,CAAC;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,YAAY,CAAC,KAAqB;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,aAAa;QACX,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAA2C,EAAE,CAAC;QAC1D,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,aAAa;QACnB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,OAAO,EAAoB,CAAC;QACvD,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,MAAM;QACX,OAAO,IAAI,eAAe,EAAE,CAAC;IAC/B,CAAC;CACF"}

package/lib/esm/commands/expressions/condition.d.ts

@@ -1,19 +1,15 @@
-import type { AttributePath, AttributeType, AttributeValue } from "../../types.js";
-type AttributeSubstitution = `#${string}`;
-type ValueReference = `:${string}`;
-export type ExpressionAwsInput = {
-    ConditionExpression: string;
-    ExpressionAttributeNames?: Record<AttributeSubstitution, AttributePath>;
-    ExpressionAttributeValues?: Record<ValueReference, AttributeValue>;
-};
-export declare class ConditionExpression {
-    private readonly expression;
-    private readonly substitutions?;
-    private readonly values?;
+import type { AttributePath, AttributeType } from "../../types.js";
+import type { AttributeNames } from "../attributes/names.js";
+import type { AttributeValues } from "../attributes/values.js";
+import type { Expression } from "./expression.js";
+export declare class ConditionExpression implements Expression {
+    private readonly inner;
     private constructor();
-    toAwsInput(): ExpressionAwsInput;
+    stringify(params: {
+        attributeNames: AttributeNames;
+        attributeValues: AttributeValues;
+    }): string;
     static attributeNotExists(attribute: AttributePath): ConditionExpression;
     static attributeExists(attribute: AttributePath): ConditionExpression;
     static attributeType(attribute: AttributePath, type: AttributeType): ConditionExpression;
 }
-export {};

package/lib/esm/commands/expressions/condition.js

@@ -1,112 +1,41 @@
-/**
- * Represents a set of attribute names used in a condition expression.
- *
- * The uses cases for using attribute names are:
- * - To access an attribute whose name conflicts with a DynamoDB reserved word.
- * - To create a placeholder for repeating occurrences of an attribute name in an expression.
- * - To prevent special characters in an attribute name from being misinterpreted in an expression.
- */
-class AttributeSubstitutions {
-    names;
-    constructor() {
-        this.names = new Map();
-    }
-    substitute(attribute) {
-        const existing = this.names.get(attribute);
-        if (existing != null) {
-            return existing;
-        }
-        const substitute = this.generateSubstitute(attribute);
-        this.names.set(attribute, substitute);
-        return substitute;
-    }
-    toAwsInput() {
-        const result = {};
-        for (const [attribute, substitute] of this.names.entries()) {
-            result[substitute] = attribute;
-        }
-        return result;
-    }
-    generateSubstitute(attribute) {
-        return `#${attribute}`;
-    }
-}
-class AttributeValues {
-    values;
-    counter;
-    constructor() {
-        this.values = new Map();
-        this.counter = 0;
-    }
-    referenceBy(value) {
-        const existing = this.values.get(value);
-        if (existing != null) {
-            return existing;
-        }
-        const reference = this.generateReference();
-        this.values.set(value, reference);
-        return reference;
-    }
-    toAwsInput() {
-        const result = {};
-        for (const [value, reference] of this.values.entries()) {
-            result[reference] = value;
-        }
-        return result;
-    }
-    generateReference() {
-        const reference = `:${this.counter}`;
-        this.counter += 1;
-        return reference;
-    }
-}
 export class ConditionExpression {
-    expression;
-    substitutions;
-    values;
+    inner;
     constructor(params) {
-        const { expression, substitutions, values } = params;
-        this.expression = expression;
-        this.substitutions = substitutions;
-        this.values = values;
+        const { inner } = params;
+        this.inner = inner;
     }
-    toAwsInput() {
-        const result = {
-            ConditionExpression: this.expression,
-        };
-        if (this.substitutions != null) {
-            result.ExpressionAttributeNames = this.substitutions.toAwsInput();
-        }
-        if (this.values != null) {
-            result.ExpressionAttributeValues = this.values.toAwsInput();
-        }
-        return result;
+    stringify(params) {
+        return this.inner.stringify(params);
     }
     static attributeNotExists(attribute) {
-        const substitutions = new AttributeSubstitutions();
-        const sub = substitutions.substitute(attribute);
         return new ConditionExpression({
-            expression: `attribute_not_exists(${sub})`,
-            substitutions,
+            inner: {
+                stringify: ({ attributeNames }) => {
+                    attributeNames.add(attribute);
+                    return `attribute_not_exists(${attributeNames.getSubstitute(attribute)})`;
+                },
+            },
         });
     }
     static attributeExists(attribute) {
-        const substitutions = new AttributeSubstitutions();
-        const sub = substitutions.substitute(attribute);
         return new ConditionExpression({
-            expression: `attribute_exists(${sub})`,
-            substitutions,
+            inner: {
+                stringify: ({ attributeNames }) => {
+                    attributeNames.add(attribute);
+                    return `attribute_exists(${attributeNames.getSubstitute(attribute)})`;
+                },
+            },
         });
     }
     static attributeType(attribute, type) {
-        const substitutions = new AttributeSubstitutions();
-        const sub = substitutions.substitute(attribute);
-        const values = new AttributeValues();
-        const valueRef = values.referenceBy(type);
         return new ConditionExpression({
-            expression: `attribute_type(${sub}, ${valueRef})`,
-            substitutions,
-            values,
+            inner: {
+                stringify: ({ attributeNames, attributeValues }) => {
+                    attributeNames.add(attribute);
+                    attributeValues.add(type);
+                    return `attribute_type(${attributeNames.getSubstitute(attribute)}, ${attributeValues.getReference(type)})`;
+                },
+            },
         });
     }
 }

package/lib/esm/commands/expressions/condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition.js","sourceRoot":"","sources":["../../../../src/commands/expressions/condition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"condition.js","sourceRoot":"","sources":["../../../../src/commands/expressions/condition.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,mBAAmB;IACb,KAAK,CAAa;IAEnC,YAAoB,MAA6B;QAC/C,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,SAAS,CAAC,MAGT;QACC,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,SAAwB;QAChD,OAAO,IAAI,mBAAmB,CAAC;YAC7B,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;oBAChC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC9B,OAAO,wBAAwB,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC;gBAC5E,CAAC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,SAAwB;QAC7C,OAAO,IAAI,mBAAmB,CAAC;YAC7B,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;oBAChC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC9B,OAAO,oBAAoB,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC;gBACxE,CAAC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,aAAa,CAClB,SAAwB,EACxB,IAAmB;QAEnB,OAAO,IAAI,mBAAmB,CAAC;YAC7B,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,EAAE;oBACjD,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC9B,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC1B,OAAO,kBAAkB,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC7G,CAAC;aACF;SACF,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/esm/commands/expressions/expression.d.ts

@@ -0,0 +1,8 @@
+import type { AttributeNames } from "../attributes/names.js";
+import type { AttributeValues } from "../attributes/values.js";
+export interface Expression {
+    stringify(params: {
+        attributeNames: AttributeNames;
+        attributeValues: AttributeValues;
+    }): string;
+}

package/lib/esm/commands/expressions/expression.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=expression.js.map

package/lib/esm/commands/expressions/expression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../../src/commands/expressions/expression.ts"],"names":[],"mappings":""}

package/lib/esm/commands/put-item.js

@@ -1,4 +1,6 @@
 import { PutCommand } from "@aws-sdk/lib-dynamodb";
+import { AttributeNames } from "./attributes/names.js";
+import { AttributeValues } from "./attributes/values.js";
 export class PutItem {
     table;
     item;
@@ -11,11 +13,27 @@ export class PutItem {
     }
     toAwsCommandInput() {
         const { table, item, condition } = this;
-        const conditionPayload = condition != null ? condition.toAwsInput() : {};
-        return {
+        const input = {
             TableName: table,
             Item: item,
-            ...conditionPayload,
+        };
+        // Expression attribute names and values can only be specified when a condition is provided,
+        // which is optional.
+        if (condition == null) {
+            return input;
+        }
+        const attributeNames = AttributeNames.create();
+        const attributeValues = AttributeValues.create();
+        // Ask the expression to stringify itself, applying the substitutions by itself.
+        const expression = condition.stringify({
+            attributeNames,
+            attributeValues,
+        });
+        return {
+            ...input,
+            ConditionExpression: expression,
+            ExpressionAttributeNames: attributeNames.getSubstitutions(),
+            ExpressionAttributeValues: attributeValues.getReferences(),
         };
     }
     toAwsCommand() {

package/lib/esm/commands/put-item.js.map

@@ -1 +1 @@
-{"version":3,"file":"put-item.js","sourceRoot":"","sources":["../../../src/commands/put-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAwB,MAAM,uBAAuB,CAAC;AAWzE,MAAM,OAAO,OAAO;IACD,KAAK,CAAS;IACd,IAAI,CAAa;IACjB,SAAS,CAAuB;IAEjD,YAAoB,MAAqB;QACvC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,iBAAiB;QACf,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QACxC,MAAM,gBAAgB,GAAG,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,IAAI,EAAE,IAAI;YACV,GAAG,gBAAgB;SACpB,CAAC;IACJ,CAAC;IAED,YAAY;QACV,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAqB;QAC/B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;CACF"}
+{"version":3,"file":"put-item.js","sourceRoot":"","sources":["../../../src/commands/put-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAwB,MAAM,uBAAuB,CAAC;AAEzE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAUzD,MAAM,OAAO,OAAO;IACD,KAAK,CAAS;IACd,IAAI,CAAa;IACjB,SAAS,CAAuB;IAEjD,YAAoB,MAAqB;QACvC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,iBAAiB;QACf,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAExC,MAAM,KAAK,GAAoB;YAC7B,SAAS,EAAE,KAAK;YAChB,IAAI,EAAE,IAAI;SACX,CAAC;QAEF,4FAA4F;QAC5F,qBAAqB;QACrB,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC;QACjD,gFAAgF;QAChF,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC;YACrC,cAAc;YACd,eAAe;SAChB,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,KAAK;YACR,mBAAmB,EAAE,UAAU;YAC/B,wBAAwB,EAAE,cAAc,CAAC,gBAAgB,EAAE;YAC3D,yBAAyB,EAAE,eAAe,CAAC,aAAa,EAAE;SAC3D,CAAC;IACJ,CAAC;IAED,YAAY;QACV,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAqB;QAC/B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;CACF"}

package/lib/esm/types.d.ts

@@ -8,7 +8,7 @@ export interface Attribute {
     name: AttributeName;
     value: AttributeValue;
 }
-export type Attributes = Record<AttributeName, NativeAttributeValue>;
+export type Attributes = Record<AttributeName, AttributeValue>;
 export type IndexFieldType = ScalarAttributeType;
 export interface IndexField {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infra-blocks/aws-dynamodb",
-  "version": "0.5.0",
+  "version": "0.6.0-alpha.0",
   "description": "A convenience wrapper over @aws-sdk/client-dynamodb and @aws-sdk/lib-dynamodb.",
   "keywords": [
     "aws",