@lafken/dynamo 0.11.12 → 0.11.14

package/lib/service/query-builder/base/base.js

@@ -83,8 +83,13 @@ class QueryBuilderBase {
                 }
                 case 'AND': {
                     const andFilter = filter;
-                    const expression = this.getFilterExpression(andFilter.AND, names, 'and', counter);
-                    filterExpression.join(`(${expression})`);
+                    const andExpressions = [];
+                    for (const condition of andFilter.AND) {
+                        const expression = this.getFilterExpression(condition, names, 'and', counter);
+                        counter += 1;
+                        andExpressions.push(expression);
+                    }
+                    filterExpression.push(`(${andExpressions.join(' and ')})`);
                     break;
                 }
                 default: {
@@ -129,7 +134,7 @@ class QueryBuilderBase {
         return {
             ExpressionAttributeNames: Object.keys(this.attributeNames).length > 0 ? this.attributeNames : undefined,
             ExpressionAttributeValues: Object.keys(this.attributeValues).length > 0
-                ? (0, util_dynamodb_1.marshall)(this.attributeValues)
+                ? (0, util_dynamodb_1.marshall)(this.attributeValues, { removeUndefinedValues: true })
                 : undefined,
         };
     }

package/lib/service/query-builder/bulk-create/bulk-create.js

@@ -13,7 +13,7 @@ class BulkCreateBuilder extends batch_write_1.BatchWriteBuilder {
                         [queryOptions.modelProps.name]: items.map((item) => {
                             return {
                                 PutRequest: {
-                                    Item: (0, util_dynamodb_1.marshall)(item),
+                                    Item: (0, util_dynamodb_1.marshall)(item, { removeUndefinedValues: true }),
                                 },
                             };
                         }),

package/lib/service/query-builder/bulk-delete/bulk-delete.js

@@ -14,7 +14,7 @@ class BulkDeleteBuilder extends batch_write_1.BatchWriteBuilder {
                         [queryOptions.modelProps.name]: items.map((item) => {
                             return {
                                 DeleteRequest: {
-                                    Key: (0, util_dynamodb_1.marshall)(item),
+                                    Key: (0, util_dynamodb_1.marshall)(item, { removeUndefinedValues: true }),
                                 },
                             };
                         }),

package/lib/service/query-builder/delete/delete.js

@@ -26,7 +26,9 @@ class DeleteBuilder extends base_1.QueryBuilderBase {
     prepare() {
         this.command = {
             TableName: this.queryOptions.modelProps.name,
-            Key: (0, util_dynamodb_1.marshall)(this.queryOptions.key),
+            Key: (0, util_dynamodb_1.marshall)(this.queryOptions.key, {
+                removeUndefinedValues: true,
+            }),
         };
     }
 }

package/lib/service/query-builder/find/find.js

@@ -29,7 +29,9 @@ class FindBuilder extends base_1.QueryBuilderBase {
             IndexName: index?.name,
             KeyConditionExpression: keyConditionExpression,
             FilterExpression: filterExpression,
-            ExclusiveStartKey: cursor ? (0, util_dynamodb_1.marshall)(cursor) : undefined,
+            ExclusiveStartKey: cursor
+                ? (0, util_dynamodb_1.marshall)(cursor, { removeUndefinedValues: true })
+                : undefined,
             Limit: limit,
             ScanIndexForward: sortDirection === 'asc',
             ProjectionExpression: projection === 'ALL' ? undefined : projection.join(', '),

package/lib/service/query-builder/query-builder.types.d.ts

@@ -30,13 +30,13 @@ export type CommonExpression<E> = OnlyOne<{
     notEqual: E;
 } & NullExpression>;
 export type Filter<E> = {
-    [key in keyof E]?: E[key] extends PrimaryPartition<number> ? E[key] | OnlyOne<OperationExpression<number> & CommonExpression<number> & InExpression<number>> : E[key] extends PrimaryPartition<string> ? E[key] | OnlyOne<StringExpression & StringFilterExpression & CommonExpression<string> & InExpression<string>> : E[key] extends string | number | boolean | Date | null ? E[key] | (E[key] extends number ? OnlyOne<OperationExpression<number> & CommonExpression<number> & InExpression<number>> : E[key] extends boolean ? CommonExpression<boolean> : E[key] extends null ? NullExpression : OnlyOne<StringExpression & StringFilterExpression & CommonExpression<string> & InExpression<string>>) : DeepPartial<Filter<E[key]>>;
+    [key in keyof E]?: NonNullable<E[key]> extends PrimaryPartition<number> ? NonNullable<E[key]> | OnlyOne<OperationExpression<number> & CommonExpression<number> & InExpression<number>> : NonNullable<E[key]> extends PrimaryPartition<string> ? NonNullable<E[key]> | OnlyOne<StringExpression & StringFilterExpression & CommonExpression<string> & InExpression<string>> : NonNullable<E[key]> extends string | number | boolean | Date | null ? NonNullable<E[key]> | (NonNullable<E[key]> extends number ? OnlyOne<OperationExpression<number> & CommonExpression<number> & InExpression<number>> : NonNullable<E[key]> extends boolean ? CommonExpression<boolean> : NonNullable<E[key]> extends null ? NullExpression : OnlyOne<StringExpression & StringFilterExpression & CommonExpression<string> & InExpression<string>>) : DeepPartial<Filter<E[key]>>;
 };
 export type OrFilter<E> = {
     OR: Array<Filter<E> | AndFilter<E>>;
 };
 export type AndFilter<E> = {
-    AND: Filter<E> | OrFilter<E>;
+    AND: Array<Filter<E> | OrFilter<E>>;
 };
 export type SortDirectionType = 'asc' | 'desc';
 export type KeyCondition<E> = {
@@ -72,7 +72,7 @@ export interface FindProps<E extends Function> {
      *   },
      * }
      */
-    filter?: Filter<E['prototype']> | OrFilter<E['prototype']>;
+    filter?: Filter<E['prototype']> | OrFilter<E['prototype']> | AndFilter<E['prototype']>;
     /**
      * Specifies the sort order to apply to the query results.
      * This determines whether items are returned in ascending or descending order.
@@ -248,7 +248,7 @@ export interface UpsertProps<E extends Function> {
      *   foo: 'bar'
      * }
      */
-    condition?: Filter<E['prototype']>;
+    condition?: Filter<E['prototype']> | OrFilter<E['prototype']> | AndFilter<E['prototype']>;
 }
 export interface ModelInformation<E extends ClassResource> {
     modelProps: ModelMetadata<E>;

package/lib/service/query-builder/scan/scan.js

@@ -30,7 +30,9 @@ class ScanBuilder extends base_1.QueryBuilderBase {
         this.command = {
             TableName: this.queryOptions.modelProps.name,
             FilterExpression: filterExpression,
-            ExclusiveStartKey: cursor ? (0, util_dynamodb_1.marshall)(cursor) : undefined,
+            ExclusiveStartKey: cursor
+                ? (0, util_dynamodb_1.marshall)(cursor, { removeUndefinedValues: true })
+                : undefined,
             Limit: limit,
             ProjectionExpression: projection === 'ALL' ? undefined : projection.join(', '),
             ...this.getAttributesAndNames(),

package/lib/service/query-builder/update/update.js

@@ -46,7 +46,7 @@ class UpdateBuilder extends base_1.QueryBuilderBase {
         const keyCondition = this.queryOptions.inputProps.keyCondition;
         this.command = {
             TableName: this.queryOptions.modelProps.name,
-            Key: (0, util_dynamodb_1.marshall)(keyCondition),
+            Key: (0, util_dynamodb_1.marshall)(keyCondition, { removeUndefinedValues: true }),
             ConditionExpression: condition
                 ? this.getFilterExpression(condition, [], 'and', this.expressionGroupCounter++)
                 : undefined,

package/lib/service/query-builder/upsert/upsert.js

@@ -31,7 +31,7 @@ class UpsertBuilder extends base_1.QueryBuilderBase {
         }
         this.command = {
             TableName: this.queryOptions.modelProps.name,
-            Item: (0, util_dynamodb_1.marshall)(this.queryOptions.item),
+            Item: (0, util_dynamodb_1.marshall)(this.queryOptions.item, { removeUndefinedValues: true }),
             ConditionExpression: conditionExpression,
             ...this.getAttributesAndNames(),
         };

package/lib/service/repository/repository.js

@@ -84,6 +84,9 @@ const createRepository = (model) => {
                 keys,
             });
         },
+        sendRawCommand(command) {
+            return queryBuilderProps.client.send(command);
+        },
     };
 };
 exports.createRepository = createRepository;

package/lib/service/repository/repository.types.d.ts

@@ -1,3 +1,4 @@
+import type { DynamoDBClient } from '@aws-sdk/client-dynamodb';
 import type { ClassResource } from '@lafken/common';
 import type { TablePartition } from '../../main';
 import type { FindProps, Item, QueryOneProps, QueryProps, ReturnValueOption, UpdateProps, UpsertProps } from '../query-builder';
@@ -22,4 +23,5 @@ export type RepositoryReturn<E extends ClassResource> = {
     delete(key: TablePartition<Item<E>>): DeleteBuilder<E>;
     bulkCreate(items: Item<E>[]): BulkCreateBuilder<E>;
     bulkDelete(keys: TablePartition<Item<E>>[]): BulkDeleteBuilder<E>;
+    sendRawCommand<T = unknown>(command: Parameters<DynamoDBClient['send']>[0]): Promise<T>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lafken/dynamo",
-  "version": "0.11.12",
+  "version": "0.11.14",
   "private": false,
   "description": "Define DynamoDB tables using TypeScript decorators - type-safe, declarative infrastructure with Lafken",
   "keywords": [
@@ -60,7 +60,7 @@
     "@aws-sdk/util-dynamodb": "^3.996.2",
     "aws-xray-sdk": "^3.12.0",
     "reflect-metadata": "^0.2.2",
-    "@lafken/resolver": "0.11.12"
+    "@lafken/resolver": "0.11.14"
   },
   "devDependencies": {
     "@cdktn/provider-aws": "^23.9.0",
@@ -75,13 +75,13 @@
     "typescript": "6.0.3",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.5",
-    "@lafken/common": "0.11.12"
+    "@lafken/common": "0.11.14"
   },
   "peerDependencies": {
     "@cdktn/provider-aws": ">=23.0.0",
     "cdktn": ">=0.22.0",
     "constructs": "^10.4.5",
-    "@lafken/common": "0.11.12"
+    "@lafken/common": "0.11.14"
   },
   "engines": {
     "node": ">=20.19"