@infra-blocks/aws-dynamodb 0.68.0 → 0.69.0

package/lib/cjs/commands/expressions/filter/comparison.d.ts

@@ -0,0 +1,24 @@
+import { Comparison, type ComparisonInput } from "../comparisons/index.js";
+/**
+ * A type aggregating all values that can be used to produce a {@link FilterComparison}.
+ *
+ * Those include all available comparison expression inputs.
+ *
+ * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Query.FilterExpression.html
+ */
+export type FilterComparisonInput = ComparisonInput;
+export declare function isFilterComparisonInput(input: unknown): input is FilterComparisonInput;
+/**
+ * The {@link ExpressionFormatter} equivalents to their respective {@link FilterComparisonInput}.
+ */
+export type FilterComparison = Comparison;
+export declare const FilterComparison: {
+    /**
+     * Creates a {@link FilterComparison} from the provided input.
+     *
+     * @param input - The {@link FilterComparison}'s input.
+     *
+     * @returns The corresponding {@link FilterComparison}.
+     */
+    from(input: FilterComparisonInput): FilterComparison;
+};

package/lib/cjs/commands/expressions/filter/comparison.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilterComparison = void 0;
+exports.isFilterComparisonInput = isFilterComparisonInput;
+const index_js_1 = require("../comparisons/index.js");
+function isFilterComparisonInput(input) {
+    return (0, index_js_1.isComparisonInput)(input);
+}
+exports.FilterComparison = {
+    /**
+     * Creates a {@link FilterComparison} from the provided input.
+     *
+     * @param input - The {@link FilterComparison}'s input.
+     *
+     * @returns The corresponding {@link FilterComparison}.
+     */
+    from(input) {
+        return index_js_1.Comparison.from(input);
+    },
+};
+//# sourceMappingURL=comparison.js.map

package/lib/cjs/commands/expressions/filter/comparison.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"comparison.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/filter/comparison.ts"],"names":[],"mappings":";;;AAeA,0DAIC;AAnBD,sDAIiC;AAWjC,SAAgB,uBAAuB,CACrC,KAAc;IAEd,OAAO,IAAA,4BAAiB,EAAC,KAAK,CAAC,CAAC;AAClC,CAAC;AAOY,QAAA,gBAAgB,GAAG;IAC9B;;;;;;OAMG;IACH,IAAI,CAAC,KAA4B;QAC/B,OAAO,qBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF,CAAC"}

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

@@ -0,0 +1,39 @@
+import type { FunctionExpression } from "../functions/index.js";
+import type { Logic } from "../logic/index.js";
+import type { FilterComparison, FilterComparisonInput } from "./comparison.js";
+/**
+ * A type aggregating all usable inputs to produce a {@link Filter}.
+ */
+export type FilterInput = FilterComparisonInput | FilterFunction | FilterLogic;
+/**
+ * A type aggregating all usable functions in {@link Filter}s.
+ *
+ * This is an alias for all available functions.
+ *
+ * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Query.FilterExpression.html
+ */
+export type FilterFunction = FunctionExpression;
+/**
+ * A type aggregating all usable logic in {@link Filter}s.
+ *
+ * This is an alias for all available logic.
+ *
+ * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Query.FilterExpression.html
+ */
+export type FilterLogic = Logic;
+/**
+ * A type aggregating all valid {@link Filter}s.
+ *
+ * All variants are branded {@link ExpressionFormatter}s.
+ */
+export type Filter = FilterComparison | FilterFunction | FilterLogic;
+export declare const Filter: {
+    /**
+     * Creates a {@link Filter} from the provided input.
+     *
+     * @param input - The {@link Filter}'s input.
+     *
+     * @returns The corresponding {@link Filter}.
+     */
+    from(input: FilterInput): Filter;
+};

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Filter = void 0;
+const expression_js_1 = require("../expression.js");
+exports.Filter = {
+    /**
+     * Creates a {@link Filter} from the provided input.
+     *
+     * @param input - The {@link Filter}'s input.
+     *
+     * @returns The corresponding {@link Filter}.
+     */
+    from(input) {
+        return expression_js_1.Expression.from(input);
+    },
+};
+//# sourceMappingURL=filter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/filter/filter.ts"],"names":[],"mappings":";;;AAAA,oDAA8C;AAmCjC,QAAA,MAAM,GAAG;IACpB;;;;;;OAMG;IACH,IAAI,CAAC,KAAkB;QACrB,OAAO,0BAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF,CAAC"}

package/lib/cjs/commands/expressions/filter/index.d.ts

@@ -0,0 +1,2 @@
+export { FilterComparison, type FilterComparisonInput, } from "./comparison.js";
+export * from "./filter.js";

package/lib/cjs/commands/expressions/filter/index.js

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilterComparison = void 0;
+var comparison_js_1 = require("./comparison.js");
+Object.defineProperty(exports, "FilterComparison", { enumerable: true, get: function () { return comparison_js_1.FilterComparison; } });
+__exportStar(require("./filter.js"), exports);
+//# sourceMappingURL=index.js.map

package/lib/cjs/commands/expressions/filter/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/filter/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iDAGyB;AAFvB,iHAAA,gBAAgB,OAAA;AAGlB,8CAA4B"}

package/lib/cjs/commands/expressions/functions/contains.d.ts

@@ -1,7 +1,7 @@
 import { type Brand } from "@infra-blocks/types";
 import { ExpressionFormatter } from "../formatter.js";
+import { type OperandInput } from "../operands/operand.js";
 import { type PathOrValueInput } from "../operands/path-or-value.js";
-import { type Size } from "../operands/size.js";
 export type Contains = ExpressionFormatter & Brand<"Contains">;
 /**
  * Returns a condition that uses the `contains` function.
@@ -13,4 +13,4 @@ export type Contains = ExpressionFormatter & Brand<"Contains">;
  *
  * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.OperatorsAndFunctions.html#Expressions.OperatorsAndFunctions.Functions
  */
-export declare function contains(first: PathOrValueInput, second: PathOrValueInput | Size): Contains;
+export declare function contains(first: PathOrValueInput, second: OperandInput): Contains;

package/lib/cjs/commands/expressions/functions/contains.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.contains = contains;
 const types_1 = require("@infra-blocks/types");
 const formatter_js_1 = require("../formatter.js");
+const operand_js_1 = require("../operands/operand.js");
 const path_or_value_js_1 = require("../operands/path-or-value.js");
-const size_js_1 = require("../operands/size.js");
 /**
  * Returns a condition that uses the `contains` function.
  *
@@ -17,7 +17,7 @@ const size_js_1 = require("../operands/size.js");
  */
 function contains(first, second) {
     const firstOperand = path_or_value_js_1.PathOrValue.normalize(first);
-    const secondOperand = (0, size_js_1.isSize)(second) ? second : path_or_value_js_1.PathOrValue.normalize(second);
+    const secondOperand = operand_js_1.Operand.normalize(second);
     return (0, types_1.trusted)(formatter_js_1.ExpressionFormatter.from(({ names, values }) => `contains(${firstOperand.format({ names, values })}, ${secondOperand.format({ names, values })})`));
 }
 //# sourceMappingURL=contains.js.map

package/lib/cjs/commands/expressions/functions/contains.js.map

@@ -1 +1 @@
-{"version":3,"file":"contains.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/functions/contains.ts"],"names":[],"mappings":";;AAoBA,4BAaC;AAjCD,+CAA0D;AAC1D,kDAAsD;AACtD,mEAGsC;AACtC,iDAAwD;AAIxD;;;;;;;;;GASG;AACH,SAAgB,QAAQ,CACtB,KAAuB,EACvB,MAA+B;IAE/B,MAAM,YAAY,GAAG,8BAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,8BAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAE9E,OAAO,IAAA,eAAO,EACZ,kCAAmB,CAAC,IAAI,CACtB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CACpB,YAAY,YAAY,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,CACpG,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"contains.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/functions/contains.ts"],"names":[],"mappings":";;AAoBA,4BAaC;AAjCD,+CAA0D;AAC1D,kDAAsD;AACtD,uDAAoE;AACpE,mEAGsC;AAItC;;;;;;;;;GASG;AACH,SAAgB,QAAQ,CACtB,KAAuB,EACvB,MAAoB;IAEpB,MAAM,YAAY,GAAG,8BAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,oBAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAEhD,OAAO,IAAA,eAAO,EACZ,kCAAmB,CAAC,IAAI,CACtB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CACpB,YAAY,YAAY,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,CACpG,CACF,CAAC;AACJ,CAAC"}

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

@@ -1,5 +1,6 @@
 export type { BetweenInput, ComparableOperandInput, ComparableValue, EqualsInput, GreaterThanInput, GreaterThanOrEqualsInput, InInput, LowerThanInput, LowerThanOrEqualsInput, NotEqualsInput, } from "./comparisons/index.js";
 export * from "./condition/index.js";
+export * from "./filter/index.js";
 export * from "./functions/index.js";
 export * from "./key-condition/index.js";
 export * from "./logic/index.js";

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

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 // TODO: don't export the typeguards beyond here.
 __exportStar(require("./condition/index.js"), exports);
+__exportStar(require("./filter/index.js"), exports);
 __exportStar(require("./functions/index.js"), exports);
 __exportStar(require("./key-condition/index.js"), exports);
 __exportStar(require("./logic/index.js"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/expressions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAYA,iDAAiD;AACjD,uDAAqC;AACrC,uDAAqC;AACrC,2DAAyC;AACzC,mDAAiC;AACjC,sDAAoC;AACpC,kDAAgC;AAChC,oDAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/expressions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAYA,iDAAiD;AACjD,uDAAqC;AACrC,oDAAkC;AAClC,uDAAqC;AACrC,2DAAyC;AACzC,mDAAiC;AACjC,sDAAoC;AACpC,kDAAgC;AAChC,oDAAkC"}

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

@@ -1,11 +1,12 @@
 import type { QueryCommandInput } from "@aws-sdk/lib-dynamodb";
 import type { KeyAttributes } from "../../types.js";
-import { type KeyConditionInput, type ProjectionInput } from "../expressions/index.js";
+import { type FilterInput, type KeyConditionInput, type ProjectionInput } from "../expressions/index.js";
 export type QueryInput<K extends KeyAttributes = KeyAttributes> = {
     table: string;
     keyCondition: KeyConditionInput;
     consistentRead?: boolean;
     exclusiveStartKey?: K;
+    filter?: FilterInput;
     index?: string;
     limit?: number;
     projection?: ProjectionInput;

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

@@ -17,6 +17,9 @@ function encode(input) {
         Limit: input.limit,
         ScanIndexForward: input.scanIndexForward,
     };
+    if (input.filter != null) {
+        result.FilterExpression = formatter.format(index_js_1.Filter.from(input.filter));
+    }
     if (input.projection != null) {
         result.ProjectionExpression = formatter.format(index_js_1.Projection.from(input.projection));
     }

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

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/commands/inputs/query.ts"],"names":[],"mappings":";;;AAEA,sDAKiC;AACjC,qCAAgD;AAanC,QAAA,UAAU,GAAG;IACxB,MAAM;CACP,CAAC;AAEF,SAAS,MAAM,CACb,KAAoB;IAEpB,MAAM,SAAS,GAAG,6BAAoB,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,CACtC,uBAAY,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CACtC;QACD,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,qBAAU,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"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/commands/inputs/query.ts"],"names":[],"mappings":";;;AAEA,sDAOiC;AACjC,qCAAgD;AAcnC,QAAA,UAAU,GAAG;IACxB,MAAM;CACP,CAAC;AAEF,SAAS,MAAM,CACb,KAAoB;IAEpB,MAAM,SAAS,GAAG,6BAAoB,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,CACtC,uBAAY,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CACtC;QACD,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,MAAM,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,CAAC,gBAAgB,GAAG,SAAS,CAAC,MAAM,CAAC,iBAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,KAAK,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,CAAC,oBAAoB,GAAG,SAAS,CAAC,MAAM,CAC5C,qBAAU,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/expressions/filter/comparison.d.ts

@@ -0,0 +1,24 @@
+import { Comparison, type ComparisonInput } from "../comparisons/index.js";
+/**
+ * A type aggregating all values that can be used to produce a {@link FilterComparison}.
+ *
+ * Those include all available comparison expression inputs.
+ *
+ * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Query.FilterExpression.html
+ */
+export type FilterComparisonInput = ComparisonInput;
+export declare function isFilterComparisonInput(input: unknown): input is FilterComparisonInput;
+/**
+ * The {@link ExpressionFormatter} equivalents to their respective {@link FilterComparisonInput}.
+ */
+export type FilterComparison = Comparison;
+export declare const FilterComparison: {
+    /**
+     * Creates a {@link FilterComparison} from the provided input.
+     *
+     * @param input - The {@link FilterComparison}'s input.
+     *
+     * @returns The corresponding {@link FilterComparison}.
+     */
+    from(input: FilterComparisonInput): FilterComparison;
+};

package/lib/esm/commands/expressions/filter/comparison.js

@@ -0,0 +1,17 @@
+import { Comparison, isComparisonInput, } from "../comparisons/index.js";
+export function isFilterComparisonInput(input) {
+    return isComparisonInput(input);
+}
+export const FilterComparison = {
+    /**
+     * Creates a {@link FilterComparison} from the provided input.
+     *
+     * @param input - The {@link FilterComparison}'s input.
+     *
+     * @returns The corresponding {@link FilterComparison}.
+     */
+    from(input) {
+        return Comparison.from(input);
+    },
+};
+//# sourceMappingURL=comparison.js.map

package/lib/esm/commands/expressions/filter/comparison.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"comparison.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/filter/comparison.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AAWjC,MAAM,UAAU,uBAAuB,CACrC,KAAc;IAEd,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC;AAOD,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B;;;;;;OAMG;IACH,IAAI,CAAC,KAA4B;QAC/B,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF,CAAC"}

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

@@ -0,0 +1,39 @@
+import type { FunctionExpression } from "../functions/index.js";
+import type { Logic } from "../logic/index.js";
+import type { FilterComparison, FilterComparisonInput } from "./comparison.js";
+/**
+ * A type aggregating all usable inputs to produce a {@link Filter}.
+ */
+export type FilterInput = FilterComparisonInput | FilterFunction | FilterLogic;
+/**
+ * A type aggregating all usable functions in {@link Filter}s.
+ *
+ * This is an alias for all available functions.
+ *
+ * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Query.FilterExpression.html
+ */
+export type FilterFunction = FunctionExpression;
+/**
+ * A type aggregating all usable logic in {@link Filter}s.
+ *
+ * This is an alias for all available logic.
+ *
+ * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Query.FilterExpression.html
+ */
+export type FilterLogic = Logic;
+/**
+ * A type aggregating all valid {@link Filter}s.
+ *
+ * All variants are branded {@link ExpressionFormatter}s.
+ */
+export type Filter = FilterComparison | FilterFunction | FilterLogic;
+export declare const Filter: {
+    /**
+     * Creates a {@link Filter} from the provided input.
+     *
+     * @param input - The {@link Filter}'s input.
+     *
+     * @returns The corresponding {@link Filter}.
+     */
+    from(input: FilterInput): Filter;
+};

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

@@ -0,0 +1,14 @@
+import { Expression } from "../expression.js";
+export const Filter = {
+    /**
+     * Creates a {@link Filter} from the provided input.
+     *
+     * @param input - The {@link Filter}'s input.
+     *
+     * @returns The corresponding {@link Filter}.
+     */
+    from(input) {
+        return Expression.from(input);
+    },
+};
+//# sourceMappingURL=filter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/filter/filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAmC9C,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB;;;;;;OAMG;IACH,IAAI,CAAC,KAAkB;QACrB,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF,CAAC"}

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

@@ -0,0 +1,2 @@
+export { FilterComparison, type FilterComparisonInput, } from "./comparison.js";
+export * from "./filter.js";

package/lib/esm/commands/expressions/filter/index.js

@@ -0,0 +1,3 @@
+export { FilterComparison, } from "./comparison.js";
+export * from "./filter.js";
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/filter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,GAEjB,MAAM,iBAAiB,CAAC;AACzB,cAAc,aAAa,CAAC"}

package/lib/esm/commands/expressions/functions/contains.d.ts

@@ -1,7 +1,7 @@
 import { type Brand } from "@infra-blocks/types";
 import { ExpressionFormatter } from "../formatter.js";
+import { type OperandInput } from "../operands/operand.js";
 import { type PathOrValueInput } from "../operands/path-or-value.js";
-import { type Size } from "../operands/size.js";
 export type Contains = ExpressionFormatter & Brand<"Contains">;
 /**
  * Returns a condition that uses the `contains` function.
@@ -13,4 +13,4 @@ export type Contains = ExpressionFormatter & Brand<"Contains">;
  *
  * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.OperatorsAndFunctions.html#Expressions.OperatorsAndFunctions.Functions
  */
-export declare function contains(first: PathOrValueInput, second: PathOrValueInput | Size): Contains;
+export declare function contains(first: PathOrValueInput, second: OperandInput): Contains;

package/lib/esm/commands/expressions/functions/contains.js

@@ -1,7 +1,7 @@
 import { trusted } from "@infra-blocks/types";
 import { ExpressionFormatter } from "../formatter.js";
+import { Operand } from "../operands/operand.js";
 import { PathOrValue, } from "../operands/path-or-value.js";
-import { isSize } from "../operands/size.js";
 /**
  * Returns a condition that uses the `contains` function.
  *
@@ -14,7 +14,7 @@ import { isSize } from "../operands/size.js";
  */
 export function contains(first, second) {
     const firstOperand = PathOrValue.normalize(first);
-    const secondOperand = isSize(second) ? second : PathOrValue.normalize(second);
+    const secondOperand = Operand.normalize(second);
     return trusted(ExpressionFormatter.from(({ names, values }) => `contains(${firstOperand.format({ names, values })}, ${secondOperand.format({ names, values })})`));
 }
 //# sourceMappingURL=contains.js.map

package/lib/esm/commands/expressions/functions/contains.js.map

@@ -1 +1 @@
-{"version":3,"file":"contains.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/functions/contains.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,WAAW,GAEZ,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,MAAM,EAAa,MAAM,qBAAqB,CAAC;AAIxD;;;;;;;;;GASG;AACH,MAAM,UAAU,QAAQ,CACtB,KAAuB,EACvB,MAA+B;IAE/B,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAE9E,OAAO,OAAO,CACZ,mBAAmB,CAAC,IAAI,CACtB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CACpB,YAAY,YAAY,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,CACpG,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"contains.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/functions/contains.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAqB,MAAM,wBAAwB,CAAC;AACpE,OAAO,EACL,WAAW,GAEZ,MAAM,8BAA8B,CAAC;AAItC;;;;;;;;;GASG;AACH,MAAM,UAAU,QAAQ,CACtB,KAAuB,EACvB,MAAoB;IAEpB,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAEhD,OAAO,OAAO,CACZ,mBAAmB,CAAC,IAAI,CACtB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CACpB,YAAY,YAAY,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,CACpG,CACF,CAAC;AACJ,CAAC"}

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

@@ -1,5 +1,6 @@
 export type { BetweenInput, ComparableOperandInput, ComparableValue, EqualsInput, GreaterThanInput, GreaterThanOrEqualsInput, InInput, LowerThanInput, LowerThanOrEqualsInput, NotEqualsInput, } from "./comparisons/index.js";
 export * from "./condition/index.js";
+export * from "./filter/index.js";
 export * from "./functions/index.js";
 export * from "./key-condition/index.js";
 export * from "./logic/index.js";

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

@@ -1,5 +1,6 @@
 // TODO: don't export the typeguards beyond here.
 export * from "./condition/index.js";
+export * from "./filter/index.js";
 export * from "./functions/index.js";
 export * from "./key-condition/index.js";
 export * from "./logic/index.js";

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/expressions/index.ts"],"names":[],"mappings":"AAYA,iDAAiD;AACjD,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/expressions/index.ts"],"names":[],"mappings":"AAYA,iDAAiD;AACjD,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC"}

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

@@ -1,11 +1,12 @@
 import type { QueryCommandInput } from "@aws-sdk/lib-dynamodb";
 import type { KeyAttributes } from "../../types.js";
-import { type KeyConditionInput, type ProjectionInput } from "../expressions/index.js";
+import { type FilterInput, type KeyConditionInput, type ProjectionInput } from "../expressions/index.js";
 export type QueryInput<K extends KeyAttributes = KeyAttributes> = {
     table: string;
     keyCondition: KeyConditionInput;
     consistentRead?: boolean;
     exclusiveStartKey?: K;
+    filter?: FilterInput;
     index?: string;
     limit?: number;
     projection?: ProjectionInput;

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

@@ -1,4 +1,4 @@
-import { KeyCondition, Projection, } from "../expressions/index.js";
+import { Filter, KeyCondition, Projection, } from "../expressions/index.js";
 import { ExpressionsFormatter } from "./lib.js";
 export const QueryInput = {
     encode,
@@ -14,6 +14,9 @@ function encode(input) {
         Limit: input.limit,
         ScanIndexForward: input.scanIndexForward,
     };
+    if (input.filter != null) {
+        result.FilterExpression = formatter.format(Filter.from(input.filter));
+    }
     if (input.projection != null) {
         result.ProjectionExpression = formatter.format(Projection.from(input.projection));
     }

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

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/commands/inputs/query.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAEZ,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,CACtC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CACtC;QACD,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"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/commands/inputs/query.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EAEN,YAAY,EAEZ,UAAU,GAEX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAchD,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,CACtC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CACtC;QACD,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,MAAM,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,CAAC,gBAAgB,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,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/package.json

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

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

@@ -1,7 +0,0 @@
-import type { AttributeValue } from "../../../types.js";
-import { Operand, type OperandInput } from "../operands/index.js";
-export type ConditionOperand<T extends AttributeValue = AttributeValue> = Operand<T>;
-export type ConditionOperandInput<T extends AttributeValue = AttributeValue> = OperandInput<T>;
-export declare const ConditionOperand: {
-    normalize: <T extends AttributeValue = AttributeValue>(input: OperandInput<T>) => Operand<T>;
-};

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

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConditionOperand = void 0;
-const index_js_1 = require("../operands/index.js");
-exports.ConditionOperand = {
-    normalize: index_js_1.Operand.normalize,
-};
-//# sourceMappingURL=operand.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"operand.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/condition/operand.ts"],"names":[],"mappings":";;;AACA,mDAAkE;AAQrD,QAAA,gBAAgB,GAAG;IAC9B,SAAS,EAAE,kBAAO,CAAC,SAAS;CAC7B,CAAC"}

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

@@ -1,7 +0,0 @@
-import type { AttributeValue } from "../../../types.js";
-import { Operand, type OperandInput } from "../operands/index.js";
-export type ConditionOperand<T extends AttributeValue = AttributeValue> = Operand<T>;
-export type ConditionOperandInput<T extends AttributeValue = AttributeValue> = OperandInput<T>;
-export declare const ConditionOperand: {
-    normalize: <T extends AttributeValue = AttributeValue>(input: OperandInput<T>) => Operand<T>;
-};

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

@@ -1,5 +0,0 @@
-import { Operand } from "../operands/index.js";
-export const ConditionOperand = {
-    normalize: Operand.normalize,
-};
-//# sourceMappingURL=operand.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"operand.js","sourceRoot":"","sources":["../../../../../src/commands/expressions/condition/operand.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAqB,MAAM,sBAAsB,CAAC;AAQlE,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;CAC7B,CAAC"}