@infra-blocks/aws-dynamodb 0.64.0 → 0.65.0

package/lib/esm/commands/expressions/operands/operand.js

@@ -1,6 +1,7 @@
 import assert from "node:assert";
 import { isRawPath, Path } from "./path.js";
 import { isRawValue, Value, } from "./value.js";
+// TODO: namespace.
 export function operand(raw) {
     if (isRawPath(raw)) {
         return Path.normalize(raw);

package/lib/esm/commands/expressions/operands/operand.js.map

@@ -1 +1 @@
-{"version":3,"file":"operand.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/operands/operand.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAIjC,OAAO,EAAqB,SAAS,EAAE,IAAI,EAAgB,MAAM,WAAW,CAAC;AAC7E,OAAO,EAEL,UAAU,EAEV,KAAK,GACN,MAAM,YAAY,CAAC;AAmBpB,MAAM,UAAU,OAAO,CACrB,GAAkB;IAElB,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IACD,IAAI,UAAU,CAAI,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IACD,MAAM,CAAC,KAAK,EAAE,uBAAuB,GAAG,EAAE,CAAC,CAAC;AAC9C,CAAC"}
+{"version":3,"file":"operand.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/operands/operand.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAIjC,OAAO,EAAqB,SAAS,EAAE,IAAI,EAAgB,MAAM,WAAW,CAAC;AAC7E,OAAO,EAEL,UAAU,EAEV,KAAK,GACN,MAAM,YAAY,CAAC;AAqBpB,mBAAmB;AACnB,MAAM,UAAU,OAAO,CACrB,GAAkB;IAElB,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IACD,IAAI,UAAU,CAAI,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IACD,MAAM,CAAC,KAAK,EAAE,uBAAuB,GAAG,EAAE,CAAC,CAAC;AAC9C,CAAC"}

package/lib/{cjs/commands/expressions/condition → esm/commands/expressions/operands}/size.d.ts

@@ -1,6 +1,7 @@
 import type { NativeBinary, NativeList, NativeMap, NativeSet, NativeString } from "../../../types.js";
-import type { AttributeNames, AttributeValues } from "../../attributes/index.js";
-import { type IOperand, type Operand, type RawOperand } from "../operands/operand.js";
+import type { AttributeNames } from "../../attributes/names.js";
+import type { AttributeValues } from "../../attributes/values.js";
+import { type IOperand, type Operand, type RawOperand } from "./operand.js";
 export type SizeOperandValue = NativeBinary | NativeList | NativeMap | NativeSet | NativeString;
 /**
  * This type aggregates the types of operands that can be used with the {@link size} function.

package/lib/esm/commands/expressions/{condition → operands}/size.js

@@ -1,4 +1,4 @@
-import { operand, } from "../operands/operand.js";
+import { operand, } from "./operand.js";
 /**
  * A type representing the result of the {@link size} function as an operand to be used in expressions.
  */

package/lib/esm/commands/expressions/operands/size.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"size.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/operands/size.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,OAAO,GAER,MAAM,cAAc,CAAC;AAoBtB;;GAEG;AACH,MAAM,OAAO,IAAI;IACE,KAAK,CAAc;IAEpC,YAAY,OAAoB;QAC9B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;IACvB,CAAC;IAED,UAAU,CAAC,MAGV;QACC,OAAO,QAAQ,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,OAAoB;QAC9B,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;CACF;AACD;;;;;;;GAOG;AAEH,MAAM,UAAU,IAAI,CAAC,GAAmB;IACtC,MAAM,SAAS,GAAG,OAAO,CAAmB,GAAG,CAAC,CAAC;IACjD,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC9B,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,MAAM,CAAC,KAAc;IACnC,OAAO,KAAK,YAAY,IAAI,CAAC;AAC/B,CAAC"}

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

@@ -1,21 +1,22 @@
+import { type Brand } from "@infra-blocks/types";
 import type { AttributeNames } from "../attributes/names.js";
 import { type RawPath } from "./operands/index.js";
-export type ProjectionExpressionParams = ReadonlyArray<RawPath>;
-export type ProjectionExpression = {
-    stringify(params: {
+export type ProjectionParams = ReadonlyArray<RawPath>;
+export type Projection = {
+    format(params: {
         names: AttributeNames;
     }): string;
-};
-export declare const ProjectionExpression: {
+} & Brand<"Projection">;
+export declare const Projection: {
     /**
-     * Constructs a {@link ProjectionExpression} from the provided {@link ProjectionExpressionParams}.
+     * Constructs a {@link Projection} from the provided {@link ProjectionParams}.
      *
      * Note that an empty expression is an invalid value for the DynamoDB API. To catch this
      * mistake earlier, this function will throw if the provided list of paths is empty.
      *
      * @param expressionParams - The list of paths to include in the projection expression.
      *
-     * @returns The {@link ProjectionExpression} corresponding to the provided {@link ProjectionExpressionParams}.
+     * @returns The {@link Projection} corresponding to the provided {@link ProjectionParams}.
      */
-    from(expressionParams: ProjectionExpressionParams): ProjectionExpression;
+    from(expressionParams: ProjectionParams): Projection;
 };

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

@@ -1,28 +1,28 @@
 import assert from "node:assert";
+import { trusted } from "@infra-blocks/types";
+import { ExpressionFormatter } from "./expression.js";
 import { Path } from "./operands/index.js";
-export const ProjectionExpression = {
+export const Projection = {
     /**
-     * Constructs a {@link ProjectionExpression} from the provided {@link ProjectionExpressionParams}.
+     * Constructs a {@link Projection} from the provided {@link ProjectionParams}.
      *
      * Note that an empty expression is an invalid value for the DynamoDB API. To catch this
      * mistake earlier, this function will throw if the provided list of paths is empty.
      *
      * @param expressionParams - The list of paths to include in the projection expression.
      *
-     * @returns The {@link ProjectionExpression} corresponding to the provided {@link ProjectionExpressionParams}.
+     * @returns The {@link Projection} corresponding to the provided {@link ProjectionParams}.
      */
     from(expressionParams) {
         assert(expressionParams.length > 0, "expression params cannot be empty");
-        return {
-            stringify(stringifyParams) {
-                const { names } = stringifyParams;
-                const substitutions = [];
-                for (const path of expressionParams) {
-                    substitutions.push(Path.normalize(path).substitute({ names }));
-                }
-                return substitutions.join(",");
-            },
-        };
+        return trusted(ExpressionFormatter.from((formatterParams) => {
+            const { names } = formatterParams;
+            const substitutions = [];
+            for (const path of expressionParams) {
+                substitutions.push(Path.normalize(path).substitute({ names }));
+            }
+            return substitutions.join(",");
+        }));
     },
 };
 //# sourceMappingURL=projection.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"projection.js","sourceRoot":"","sources":["../../../../src/commands/expressions/projection.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,IAAI,EAAgB,MAAM,qBAAqB,CAAC;AAQzD,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC;;;;;;;;;OASG;IACH,IAAI,CAAC,gBAA4C;QAC/C,MAAM,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,mCAAmC,CAAC,CAAC;QAEzE,OAAO;YACL,SAAS,CAAC,eAAe;gBACvB,MAAM,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC;gBAClC,MAAM,aAAa,GAAG,EAAE,CAAC;gBACzB,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;oBACpC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBACjE,CAAC;gBACD,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACjC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"projection.js","sourceRoot":"","sources":["../../../../src/commands/expressions/projection.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAc,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAgB,MAAM,qBAAqB,CAAC;AAQzD,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB;;;;;;;;;OASG;IACH,IAAI,CAAC,gBAAkC;QACrC,MAAM,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,mCAAmC,CAAC,CAAC;QAEzE,OAAO,OAAO,CACZ,mBAAmB,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,EAAE;YAC3C,MAAM,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC;YAClC,MAAM,aAAa,GAAG,EAAE,CAAC;YACzB,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;gBACpC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAC"}

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

@@ -1,16 +1,16 @@
 import type { AttributeNames } from "../../attributes/names.js";
 import type { AttributeValues } from "../../attributes/values.js";
-import type { IExpression } from "../expression.js";
+import type { ExpressionFormatter } from "../expression.js";
 import type { UpdateAction } from "./action.js";
-export type UpdateExpressionParams = ReadonlyArray<UpdateAction>;
+export type UpdateParams = ReadonlyArray<UpdateAction>;
 /**
  *
  * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.UpdateExpressions.html
  */
-export declare class UpdateExpression implements IExpression {
+export declare class Update implements ExpressionFormatter {
     private readonly clauses;
     private constructor();
-    stringify(params: {
+    format(params: {
         names: AttributeNames;
         values: AttributeValues;
     }): string;
@@ -18,5 +18,5 @@ export declare class UpdateExpression implements IExpression {
     private pushDeleteActions;
     private pushRemoveActions;
     private pushSetActions;
-    static from(params: UpdateExpressionParams): UpdateExpression;
+    static from(params: UpdateParams): Update;
 }

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

@@ -3,12 +3,12 @@ import { UpdateExpressionClauses } from "./clauses.js";
  *
  * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.UpdateExpressions.html
  */
-export class UpdateExpression {
+export class Update {
     clauses;
     constructor(clauses) {
         this.clauses = clauses;
     }
-    stringify(params) {
+    format(params) {
         const { names, values } = params;
         const parts = [];
         this.pushAddActions({ parts, names, values });
@@ -59,7 +59,7 @@ export class UpdateExpression {
     }
     static from(params) {
         const clauses = UpdateExpressionClauses.from(params);
-        return new UpdateExpression(clauses);
+        return new Update(clauses);
     }
 }
 //# sourceMappingURL=expression.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/update/expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/update/expression.ts"],"names":[],"mappings":"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"}

package/lib/esm/commands/index.d.ts

@@ -3,7 +3,7 @@ export type { DynamoDbClientCommand } from "./command.js";
 export { CreateTable } from "./create-table.js";
 export { DeleteItem } from "./delete-item.js";
 export { DeleteTable } from "./delete-table.js";
-export * from "./expressions/index.js";
+export { type And, type AttributeExists, type AttributeNotExists, add, and, attributeExists, attributeNotExists, attributeType, type BeginsWith, type BeginsWithOperand, type BetweenParams, beginsWith, type ComparableOperand, type ComparableValue, type ConditionComparisonParams, type ConditionFunction, type ConditionLogic, type ConditionParams, type Contains, contains, deleteFrom, type EqualsParams, type GreaterThanOrEqualsParams, type GreaterThanParams, type InParams, type IsAttributeOfType, ifNotExists, type KeyConditionParams, type LowerThanOrEqualsParams, type LowerThanParams, literal, type Not, type NotEqualsParams, not, type Or, or, type ProjectionParams, path, type RawOperand, type RawPath, type RawValue, remove, set, size, type UpdateAction, type UpdateParams, value, } from "./expressions/index.js";
 export { GetItem } from "./get-item.js";
 export type { ConditionCheckInput, CreateTableInput, DeleteItemInput, DeleteItemReturnValue, DeleteTableInput, GetItemInput, PutItemInput, QueryInput, UpdateItemInput, UpdateTimeToLiveInput, WriteTransactionInput, WriteTransactionWrite, } from "./inputs/index.js";
 export type { CreateTableOutput, DeleteItemOutput, DeleteTableOutput, GetItemOutput, PutItemOutput, QueryOutput, UpdateItemOutput, UpdateTimeToLiveOutput, WriteTransactionOutput, } from "./outputs/index.js";

package/lib/esm/commands/index.js

@@ -1,7 +1,7 @@
 export { CreateTable } from "./create-table.js";
 export { DeleteItem } from "./delete-item.js";
 export { DeleteTable } from "./delete-table.js";
-export * from "./expressions/index.js";
+export { add, and, attributeExists, attributeNotExists, attributeType, beginsWith, contains, deleteFrom, ifNotExists, literal, not, or, path, remove, set, size, value, } from "./expressions/index.js";
 export { GetItem } from "./get-item.js";
 export { PutItem } from "./put-item.js";
 export { Query } from "./query.js";

package/lib/esm/commands/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AA0BxC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAIL,GAAG,EACH,GAAG,EACH,eAAe,EACf,kBAAkB,EAClB,aAAa,EAIb,UAAU,EAQV,QAAQ,EACR,UAAU,EAMV,WAAW,EAIX,OAAO,EAGP,GAAG,EAEH,EAAE,EAEF,IAAI,EAIJ,MAAM,EACN,GAAG,EACH,IAAI,EAGJ,KAAK,GACN,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AA0BxC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC"}

package/lib/esm/commands/inputs/condition-check.d.ts

@@ -1,7 +1,7 @@
 import type { TransactWriteCommandInput } from "@aws-sdk/lib-dynamodb";
 import type { UnpackedArray } from "@infra-blocks/types";
 import type { KeyAttributes } from "../../types.js";
-import type { ConditionParams } from "../expressions/index.js";
+import { type ConditionParams } from "../expressions/index.js";
 export type ConditionCheckInput<K extends KeyAttributes = KeyAttributes> = {
     table: string;
     key: K;

package/lib/esm/commands/inputs/condition-check.js

@@ -1,16 +1,16 @@
-import { intoExpressionComponents } from "./lib.js";
+import { Condition } from "../expressions/index.js";
+import { ExpressionsFormatter } from "./lib.js";
 export const ConditionCheckInput = {
     encode,
 };
 function encode(input) {
-    const { table, key, condition } = input;
-    const { expression, names, values } = intoExpressionComponents(condition);
+    const formatter = ExpressionsFormatter.create();
     return {
-        TableName: table,
-        Key: key,
-        ConditionExpression: expression,
-        ExpressionAttributeNames: names,
-        ExpressionAttributeValues: values,
+        TableName: input.table,
+        Key: input.key,
+        ConditionExpression: formatter.format(Condition.from(input.condition)),
+        ExpressionAttributeNames: formatter.getExpressionAttributeNames(),
+        ExpressionAttributeValues: formatter.getExpressionAttributeValues(),
     };
 }
 //# sourceMappingURL=condition-check.js.map

package/lib/esm/commands/inputs/condition-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition-check.js","sourceRoot":"","sources":["../../../../src/commands/inputs/condition-check.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAQpD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,MAAM;CACP,CAAC;AAMF,SAAS,MAAM,CACb,KAA6B;IAE7B,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAExC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAE1E,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,GAAG,EAAE,GAAG;QACR,mBAAmB,EAAE,UAAU;QAC/B,wBAAwB,EAAE,KAAK;QAC/B,yBAAyB,EAAE,MAAM;KAClC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"condition-check.js","sourceRoot":"","sources":["../../../../src/commands/inputs/condition-check.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAwB,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAQhD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,MAAM;CACP,CAAC;AAMF,SAAS,MAAM,CACb,KAA6B;IAE7B,MAAM,SAAS,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC;IAChD,OAAO;QACL,SAAS,EAAE,KAAK,CAAC,KAAK;QACtB,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,mBAAmB,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtE,wBAAwB,EAAE,SAAS,CAAC,2BAA2B,EAAE;QACjE,yBAAyB,EAAE,SAAS,CAAC,4BAA4B,EAAE;KACpE,CAAC;AACJ,CAAC"}

package/lib/esm/commands/inputs/delete-item.d.ts

@@ -1,7 +1,7 @@
 import type { DeleteCommandInput } from "@aws-sdk/lib-dynamodb";
 import type { KeyAttributes } from "../../types.js";
-import type { ConditionParams } from "../expressions/index.js";
-import { type ConditionCheckFailureReturnValue } from "./lib.js";
+import { type ConditionParams } from "../expressions/index.js";
+import type { ConditionCheckFailureReturnValue } from "./lib.js";
 export type DeleteItemReturnValue = ConditionCheckFailureReturnValue;
 export type DeleteItemInput<K extends KeyAttributes = KeyAttributes> = {
     table: string;

package/lib/esm/commands/inputs/delete-item.js

@@ -1,4 +1,5 @@
-import { intoExpressionComponents, } from "./lib.js";
+import { Condition } from "../expressions/index.js";
+import { ExpressionsFormatter } from "./lib.js";
 export const DeleteItemInput = {
     encode,
 };
@@ -19,12 +20,12 @@ function encode(input) {
     if (input.condition == null) {
         return result;
     }
-    const { expression, names, values } = intoExpressionComponents(input.condition);
+    const formatter = ExpressionsFormatter.create();
     return {
         ...result,
-        ConditionExpression: expression,
-        ExpressionAttributeNames: names,
-        ExpressionAttributeValues: values,
+        ConditionExpression: formatter.format(Condition.from(input.condition)),
+        ExpressionAttributeNames: formatter.getExpressionAttributeNames(),
+        ExpressionAttributeValues: formatter.getExpressionAttributeValues(),
     };
 }
 //# sourceMappingURL=delete-item.js.map

package/lib/esm/commands/inputs/delete-item.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-item.js","sourceRoot":"","sources":["../../../../src/commands/inputs/delete-item.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,wBAAwB,GACzB,MAAM,UAAU,CAAC;AAalB,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM;CACP,CAAC;AAEF,SAAS,MAAM,CACb,KAAyB;IAEzB,MAAM,MAAM,GAAuB;QACjC,SAAS,EAAE,KAAK,CAAC,KAAK;QACtB,GAAG,EAAE,KAAK,CAAC,GAAG;KACf,CAAC;IAEF,IAAI,KAAK,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;IAC3C,CAAC;IAED,IAAI,KAAK,CAAC,mCAAmC,IAAI,IAAI,EAAE,CAAC;QACtD,MAAM,CAAC,mCAAmC;YACxC,KAAK,CAAC,mCAAmC,CAAC;IAC9C,CAAC;IAED,4FAA4F;IAC5F,qBAAqB;IACrB,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,CAC5D,KAAK,CAAC,SAAS,CAChB,CAAC;IACF,OAAO;QACL,GAAG,MAAM;QACT,mBAAmB,EAAE,UAAU;QAC/B,wBAAwB,EAAE,KAAK;QAC/B,yBAAyB,EAAE,MAAM;KAClC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"delete-item.js","sourceRoot":"","sources":["../../../../src/commands/inputs/delete-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAwB,MAAM,yBAAyB,CAAC;AAE1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAahD,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM;CACP,CAAC;AAEF,SAAS,MAAM,CACb,KAAyB;IAEzB,MAAM,MAAM,GAAuB;QACjC,SAAS,EAAE,KAAK,CAAC,KAAK;QACtB,GAAG,EAAE,KAAK,CAAC,GAAG;KACf,CAAC;IAEF,IAAI,KAAK,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;IAC3C,CAAC;IAED,IAAI,KAAK,CAAC,mCAAmC,IAAI,IAAI,EAAE,CAAC;QACtD,MAAM,CAAC,mCAAmC;YACxC,KAAK,CAAC,mCAAmC,CAAC;IAC9C,CAAC;IAED,4FAA4F;IAC5F,qBAAqB;IACrB,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,SAAS,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC;IAChD,OAAO;QACL,GAAG,MAAM;QACT,mBAAmB,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtE,wBAAwB,EAAE,SAAS,CAAC,2BAA2B,EAAE;QACjE,yBAAyB,EAAE,SAAS,CAAC,4BAA4B,EAAE;KACpE,CAAC;AACJ,CAAC"}

package/lib/esm/commands/inputs/get-item.d.ts

@@ -1,6 +1,6 @@
 import type { GetCommandInput } from "@aws-sdk/lib-dynamodb";
 import type { KeyAttributes } from "../../types.js";
-import { type ProjectionExpressionParams } from "../expressions/projection.js";
+import { type ProjectionParams } from "../expressions/projection.js";
 /**
  * The input required to call the GetItem API.
  */
@@ -19,7 +19,7 @@ export interface GetItemInput<K extends KeyAttributes = KeyAttributes> {
     /**
      * The projection applied to the return item, if any.
      */
-    projection?: ProjectionExpressionParams;
+    projection?: ProjectionParams;
 }
 export declare const GetItemInput: {
     encode: typeof encode;

package/lib/esm/commands/inputs/get-item.js

@@ -1,5 +1,5 @@
-import { AttributeNames } from "../attributes/names.js";
-import { ProjectionExpression, } from "../expressions/projection.js";
+import { Projection, } from "../expressions/projection.js";
+import { ExpressionsFormatter } from "./lib.js";
 export const GetItemInput = {
     encode,
 };
@@ -8,15 +8,14 @@ function encode(input) {
         TableName: input.table,
         Key: input.key,
     };
-    if (input.projection != null) {
-        // There should be no values.
-        const names = AttributeNames.create();
-        const expression = ProjectionExpression.from(input.projection).stringify({
-            names,
-        });
-        result.ProjectionExpression = expression;
-        result.ExpressionAttributeNames = names.getSubstitutions();
+    if (input.projection == null) {
+        return result;
     }
-    return result;
+    const formatter = ExpressionsFormatter.create();
+    return {
+        ...result,
+        ProjectionExpression: formatter.format(Projection.from(input.projection)),
+        ExpressionAttributeNames: formatter.getExpressionAttributeNames(),
+    };
 }
 //# sourceMappingURL=get-item.js.map

package/lib/esm/commands/inputs/get-item.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-item.js","sourceRoot":"","sources":["../../../../src/commands/inputs/get-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EACL,oBAAoB,GAErB,MAAM,8BAA8B,CAAC;AAuBtC,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM;CACP,CAAC;AAEF,SAAS,MAAM,CACb,KAAsB;IAEtB,MAAM,MAAM,GAAoB;QAC9B,SAAS,EAAE,KAAK,CAAC,KAAK;QACtB,GAAG,EAAE,KAAK,CAAC,GAAG;KACf,CAAC;IAEF,IAAI,KAAK,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;QAC7B,6BAA6B;QAC7B,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC;YACvE,KAAK;SACN,CAAC,CAAC;QACH,MAAM,CAAC,oBAAoB,GAAG,UAAU,CAAC;QACzC,MAAM,CAAC,wBAAwB,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC7D,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"get-item.js","sourceRoot":"","sources":["../../../../src/commands/inputs/get-item.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,GAEX,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAuBhD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM;CACP,CAAC;AAEF,SAAS,MAAM,CACb,KAAsB;IAEtB,MAAM,MAAM,GAAoB;QAC9B,SAAS,EAAE,KAAK,CAAC,KAAK;QACtB,GAAG,EAAE,KAAK,CAAC,GAAG;KACf,CAAC;IAEF,IAAI,KAAK,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,SAAS,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC;IAChD,OAAO;QACL,GAAG,MAAM;QACT,oBAAoB,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACzE,wBAAwB,EAAE,SAAS,CAAC,2BAA2B,EAAE;KAClE,CAAC;AACJ,CAAC"}

package/lib/esm/commands/inputs/index.d.ts

@@ -3,7 +3,6 @@ export * from "./create-table.js";
 export * from "./delete-item.js";
 export * from "./delete-table.js";
 export * from "./get-item.js";
-export type { ConditionCheckFailureReturnValue } from "./lib.js";
 export * from "./put-item.js";
 export * from "./query.js";
 export * from "./update-item.js";

package/lib/esm/commands/inputs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/inputs/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAE9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/inputs/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC"}

package/lib/esm/commands/inputs/lib.d.ts

@@ -1,9 +1,15 @@
-import type { AttributePath, AttributeValue } from "../../types.js";
-import { type PathSubstitution, type ValueSubstitution } from "../attributes/index.js";
-import type { ConditionParams } from "../expressions/index.js";
+import { AttributeNames } from "../attributes/names.js";
+import { AttributeValues } from "../attributes/values.js";
+import type { ExpressionFormatter } from "../expressions/expression.js";
 export type ConditionCheckFailureReturnValue = "NONE" | "ALL_OLD";
-export declare function intoExpressionComponents(condition: ConditionParams): {
-    expression: string;
-    names?: Record<PathSubstitution, AttributePath>;
-    values?: Record<ValueSubstitution, AttributeValue>;
+export type ExpressionsFormatter = {
+    format(formatter: ExpressionFormatter): string;
+    getExpressionAttributeNames(): ReturnType<AttributeNames["getSubstitutions"]>;
+    getExpressionAttributeValues(): ReturnType<AttributeValues["getSubstitutions"]>;
+};
+export declare const ExpressionsFormatter: {
+    create(params?: {
+        names?: AttributeNames;
+        values?: AttributeValues;
+    }): ExpressionsFormatter;
 };

package/lib/esm/commands/inputs/lib.js

@@ -1,16 +1,13 @@
-import { AttributeNames, AttributeValues, } from "../attributes/index.js";
-import { conditionExpression } from "../expressions/condition/expression.js";
-export function intoExpressionComponents(condition) {
-    const names = AttributeNames.create();
-    const values = AttributeValues.create();
-    const expression = conditionExpression(condition).stringify({
-        names,
-        values,
-    });
-    return {
-        expression,
-        names: names.getSubstitutions(),
-        values: values.getSubstitutions(),
-    };
-}
+import { AttributeNames } from "../attributes/names.js";
+import { AttributeValues } from "../attributes/values.js";
+export const ExpressionsFormatter = {
+    create(params) {
+        const { names = AttributeNames.create(), values = AttributeValues.create(), } = params ?? {};
+        return {
+            format: (formatter) => formatter.format({ names, values }),
+            getExpressionAttributeNames: () => names.getSubstitutions(),
+            getExpressionAttributeValues: () => values.getSubstitutions(),
+        };
+    },
+};
 //# sourceMappingURL=lib.js.map

package/lib/esm/commands/inputs/lib.js.map

@@ -1 +1 @@
-{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/commands/inputs/lib.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,GAGhB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAK7E,MAAM,UAAU,wBAAwB,CAAC,SAA0B;IAKjE,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC;IACxC,MAAM,UAAU,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC;QAC1D,KAAK;QACL,MAAM;KACP,CAAC,CAAC;IACH,OAAO;QACL,UAAU;QACV,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAAE;QAC/B,MAAM,EAAE,MAAM,CAAC,gBAAgB,EAAE;KAClC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/commands/inputs/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAa1D,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,MAAM,CAAC,MAGN;QACC,MAAM,EACJ,KAAK,GAAG,cAAc,CAAC,MAAM,EAAE,EAC/B,MAAM,GAAG,eAAe,CAAC,MAAM,EAAE,GAClC,GAAG,MAAM,IAAI,EAAE,CAAC;QAEjB,OAAO;YACL,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;YAC1D,2BAA2B,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,gBAAgB,EAAE;YAC3D,4BAA4B,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE;SAC9D,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/esm/commands/inputs/put-item.d.ts

@@ -1,7 +1,7 @@
 import type { PutCommandInput } from "@aws-sdk/lib-dynamodb";
 import type { Attributes } from "../../types.js";
-import type { ConditionParams } from "../expressions/index.js";
-import { type ConditionCheckFailureReturnValue } from "./lib.js";
+import { type ConditionParams } from "../expressions/index.js";
+import type { ConditionCheckFailureReturnValue } from "./lib.js";
 export type PutItemReturnValue = ConditionCheckFailureReturnValue;
 export type PutItemInput<T extends Attributes = Attributes> = {
     table: string;

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

@@ -1,4 +1,5 @@
-import { intoExpressionComponents, } from "./lib.js";
+import { Condition } from "../expressions/index.js";
+import { ExpressionsFormatter } from "./lib.js";
 export const PutItemInput = {
     encode,
 };
@@ -19,12 +20,12 @@ function encode(input) {
     if (input.condition == null) {
         return result;
     }
-    const { expression, names, values } = intoExpressionComponents(input.condition);
+    const formatter = ExpressionsFormatter.create();
     return {
         ...result,
-        ConditionExpression: expression,
-        ExpressionAttributeNames: names,
-        ExpressionAttributeValues: values,
+        ConditionExpression: formatter.format(Condition.from(input.condition)),
+        ExpressionAttributeNames: formatter.getExpressionAttributeNames(),
+        ExpressionAttributeValues: formatter.getExpressionAttributeValues(),
     };
 }
 //# sourceMappingURL=put-item.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"put-item.js","sourceRoot":"","sources":["../../../../src/commands/inputs/put-item.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,wBAAwB,GACzB,MAAM,UAAU,CAAC;AAgBlB,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM;CACP,CAAC;AAEF,SAAS,MAAM,CACb,KAAsB;IAEtB,MAAM,MAAM,GAAoB;QAC9B,SAAS,EAAE,KAAK,CAAC,KAAK;QACtB,IAAI,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC;IAEF,IAAI,KAAK,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;IAC3C,CAAC;IAED,IAAI,KAAK,CAAC,mCAAmC,IAAI,IAAI,EAAE,CAAC;QACtD,MAAM,CAAC,mCAAmC;YACxC,KAAK,CAAC,mCAAmC,CAAC;IAC9C,CAAC;IAED,4FAA4F;IAC5F,qBAAqB;IACrB,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,CAC5D,KAAK,CAAC,SAAS,CAChB,CAAC;IAEF,OAAO;QACL,GAAG,MAAM;QACT,mBAAmB,EAAE,UAAU;QAC/B,wBAAwB,EAAE,KAAK;QAC/B,yBAAyB,EAAE,MAAM;KAClC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"put-item.js","sourceRoot":"","sources":["../../../../src/commands/inputs/put-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAwB,MAAM,yBAAyB,CAAC;AAE1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAgBhD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM;CACP,CAAC;AAEF,SAAS,MAAM,CACb,KAAsB;IAEtB,MAAM,MAAM,GAAoB;QAC9B,SAAS,EAAE,KAAK,CAAC,KAAK;QACtB,IAAI,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC;IAEF,IAAI,KAAK,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;IAC3C,CAAC;IAED,IAAI,KAAK,CAAC,mCAAmC,IAAI,IAAI,EAAE,CAAC;QACtD,MAAM,CAAC,mCAAmC;YACxC,KAAK,CAAC,mCAAmC,CAAC;IAC9C,CAAC;IAED,4FAA4F;IAC5F,qBAAqB;IACrB,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,SAAS,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC;IAChD,OAAO;QACL,GAAG,MAAM;QACT,mBAAmB,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtE,wBAAwB,EAAE,SAAS,CAAC,2BAA2B,EAAE;QACjE,yBAAyB,EAAE,SAAS,CAAC,4BAA4B,EAAE;KACpE,CAAC;AACJ,CAAC"}

package/lib/esm/commands/inputs/query.d.ts

@@ -1,13 +1,14 @@
 import type { QueryCommandInput } from "@aws-sdk/lib-dynamodb";
 import type { KeyAttributes } from "../../types.js";
-import type { KeyConditionExpression } from "../expressions/index.js";
+import { type KeyConditionParams, type ProjectionParams } from "../expressions/index.js";
 export type QueryInput<K extends KeyAttributes = KeyAttributes> = {
     table: string;
-    index?: string;
-    condition: KeyConditionExpression;
+    condition: KeyConditionParams;
     consistentRead?: boolean;
     exclusiveStartKey?: K;
+    index?: string;
     limit?: number;
+    projection?: ProjectionParams;
     scanIndexForward?: boolean;
 };
 export declare const QueryInput: {

package/lib/esm/commands/inputs/query.js

@@ -1,20 +1,24 @@
-import { intoExpressionComponents } from "./lib.js";
+import { Condition, Projection, } from "../expressions/index.js";
+import { ExpressionsFormatter } from "./lib.js";
 export const QueryInput = {
     encode,
 };
 function encode(input) {
-    const { table, index, condition, consistentRead, exclusiveStartKey, limit, scanIndexForward, } = input;
-    const { expression, names, values } = intoExpressionComponents(condition);
-    return {
-        TableName: table,
-        IndexName: index,
-        ConsistentRead: consistentRead,
-        KeyConditionExpression: expression,
-        ExpressionAttributeNames: names,
-        ExpressionAttributeValues: values,
-        ExclusiveStartKey: exclusiveStartKey,
-        Limit: limit,
-        ScanIndexForward: scanIndexForward,
+    const formatter = ExpressionsFormatter.create();
+    const result = {
+        TableName: input.table,
+        IndexName: input.index,
+        KeyConditionExpression: formatter.format(Condition.from(input.condition)),
+        ConsistentRead: input.consistentRead,
+        ExclusiveStartKey: input.exclusiveStartKey,
+        Limit: input.limit,
+        ScanIndexForward: input.scanIndexForward,
     };
+    if (input.projection != null) {
+        result.ProjectionExpression = formatter.format(Projection.from(input.projection));
+    }
+    result.ExpressionAttributeNames = formatter.getExpressionAttributeNames();
+    result.ExpressionAttributeValues = formatter.getExpressionAttributeValues();
+    return result;
 }
 //# sourceMappingURL=query.js.map

package/lib/esm/commands/inputs/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/commands/inputs/query.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAYpD,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM;CACP,CAAC;AAEF,SAAS,MAAM,CACb,KAAoB;IAEpB,MAAM,EACJ,KAAK,EACL,KAAK,EACL,SAAS,EACT,cAAc,EACd,iBAAiB,EACjB,KAAK,EACL,gBAAgB,GACjB,GAAG,KAAK,CAAC;IAEV,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAC1E,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,SAAS,EAAE,KAAK;QAChB,cAAc,EAAE,cAAc;QAC9B,sBAAsB,EAAE,UAAU;QAClC,wBAAwB,EAAE,KAAK;QAC/B,yBAAyB,EAAE,MAAM;QACjC,iBAAiB,EAAE,iBAAiB;QACpC,KAAK,EAAE,KAAK;QACZ,gBAAgB,EAAE,gBAAgB;KACnC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/commands/inputs/query.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,EAET,UAAU,GAEX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAahD,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM;CACP,CAAC;AAEF,SAAS,MAAM,CACb,KAAoB;IAEpB,MAAM,SAAS,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC;IAChD,MAAM,MAAM,GAAsB;QAChC,SAAS,EAAE,KAAK,CAAC,KAAK;QACtB,SAAS,EAAE,KAAK,CAAC,KAAK;QACtB,sBAAsB,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzE,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;KACzC,CAAC;IAEF,IAAI,KAAK,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,CAAC,oBAAoB,GAAG,SAAS,CAAC,MAAM,CAC5C,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAClC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,wBAAwB,GAAG,SAAS,CAAC,2BAA2B,EAAE,CAAC;IAC1E,MAAM,CAAC,yBAAyB,GAAG,SAAS,CAAC,4BAA4B,EAAE,CAAC;IAE5E,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/lib/esm/commands/inputs/update-item.d.ts

@@ -1,13 +1,13 @@
 import type { UpdateCommandInput as NativeUpdateCommandInput } from "@aws-sdk/lib-dynamodb";
 import type { WithRequired } from "@infra-blocks/types";
 import type { KeyAttributes } from "../../types.js";
-import { type ConditionParams, type UpdateExpressionParams } from "../expressions/index.js";
+import { type ConditionParams, type UpdateParams } from "../expressions/index.js";
 import type { ConditionCheckFailureReturnValue } from "./lib.js";
 export type UpdateItemReturnValue = "NONE" | "ALL_OLD" | "UPDATED_OLD" | "ALL_NEW" | "UPDATED_NEW";
 export interface UpdateItemInput<K extends KeyAttributes = KeyAttributes> {
     table: string;
     key: K;
-    update: UpdateExpressionParams;
+    update: UpdateParams;
     condition?: ConditionParams;
     returnValues?: UpdateItemReturnValue;
     returnValuesOnConditionCheckFailure?: ConditionCheckFailureReturnValue;