dyno-table 2.2.0 → 2.2.1

package/dist/{query-builder-DoZzZz_c.d.cts → query-builder-D3URwK9k.d.cts}

@@ -1,7 +1,7 @@
-import { C as Condition, q as ConditionOperator, s as Path } from './conditions-CC3NDfUU.cjs';
-import { Paginator } from './builders/paginator.cjs';
+import { a as Condition, b as ConditionOperator, s as Path } from './conditions-CcZL0sR2.cjs';
 import { DynamoItem, TableConfig, GSINames } from './types.cjs';
 import { F as FilterBuilderInterface, R as ResultIterator, Q as QueryBuilderInterface } from './builder-types-BTVhQSHI.cjs';
+import { Paginator } from './builders/paginator.cjs';
 
 /**
  * Configuration options for DynamoDB filter operations.

package/dist/{query-builder-CUWdavZw.d.ts → query-builder-cfEkU0_w.d.ts}

@@ -1,7 +1,7 @@
-import { C as Condition, q as ConditionOperator, s as Path } from './conditions-DD0bvyHm.js';
-import { Paginator } from './builders/paginator.js';
+import { a as Condition, b as ConditionOperator, s as Path } from './conditions-D_w7vVYG.js';
 import { DynamoItem, TableConfig, GSINames } from './types.js';
 import { F as FilterBuilderInterface, R as ResultIterator, Q as QueryBuilderInterface } from './builder-types-CzuLR4Th.js';
+import { Paginator } from './builders/paginator.js';
 
 /**
  * Configuration options for DynamoDB filter operations.

package/dist/{table-f-3wsT7K.d.cts → table-ClST8nkR.d.cts}

@@ -1,13 +1,13 @@
-import { G as GetBuilder, B as BatchBuilder, c as BatchWriteOperation } from './batch-builder-BPoHyN_Q.cjs';
+import { G as GetBuilder, B as BatchBuilder, c as BatchWriteOperation } from './batch-builder-BiQDIZ7p.cjs';
 import { ConditionCheckBuilder } from './builders/condition-check-builder.cjs';
 import { DeleteBuilder } from './builders/delete-builder.cjs';
 import { PutBuilder } from './builders/put-builder.cjs';
-import { F as FilterBuilder, b as FilterOptions, Q as QueryBuilder } from './query-builder-DoZzZz_c.cjs';
+import { F as FilterBuilder, b as FilterOptions, Q as QueryBuilder } from './query-builder-D3URwK9k.cjs';
 import { DynamoItem, TableConfig, Index } from './types.cjs';
 import { S as ScanBuilderInterface, R as ResultIterator } from './builder-types-BTVhQSHI.cjs';
 import { TransactionBuilder, TransactionOptions } from './builders/transaction-builder.cjs';
 import { UpdateBuilder } from './builders/update-builder.cjs';
-import { r as PrimaryKeyWithoutExpression, P as PrimaryKey } from './conditions-CC3NDfUU.cjs';
+import { c as PrimaryKeyWithoutExpression, P as PrimaryKey } from './conditions-CcZL0sR2.cjs';
 
 /**
  * Configuration options for DynamoDB scan operations.

package/dist/{table-CZBMkW2Z.d.ts → table-vE3cGoDy.d.ts}

@@ -1,13 +1,13 @@
-import { G as GetBuilder, B as BatchBuilder, c as BatchWriteOperation } from './batch-builder-Cdo49C2r.js';
+import { G as GetBuilder, B as BatchBuilder, c as BatchWriteOperation } from './batch-builder-CNsLS6sR.js';
 import { ConditionCheckBuilder } from './builders/condition-check-builder.js';
 import { DeleteBuilder } from './builders/delete-builder.js';
 import { PutBuilder } from './builders/put-builder.js';
-import { F as FilterBuilder, b as FilterOptions, Q as QueryBuilder } from './query-builder-CUWdavZw.js';
+import { F as FilterBuilder, b as FilterOptions, Q as QueryBuilder } from './query-builder-cfEkU0_w.js';
 import { DynamoItem, TableConfig, Index } from './types.js';
 import { S as ScanBuilderInterface, R as ResultIterator } from './builder-types-CzuLR4Th.js';
 import { TransactionBuilder, TransactionOptions } from './builders/transaction-builder.js';
 import { UpdateBuilder } from './builders/update-builder.js';
-import { r as PrimaryKeyWithoutExpression, P as PrimaryKey } from './conditions-DD0bvyHm.js';
+import { c as PrimaryKeyWithoutExpression, P as PrimaryKey } from './conditions-D_w7vVYG.js';
 
 /**
  * Configuration options for DynamoDB scan operations.

package/dist/table.cjs

@@ -1671,12 +1671,26 @@ var FilterBuilder = class {
     const newCondition = typeof condition === "function" ? condition(this.getConditionOperator()) : condition;
     if (this.options.filter) {
       if (this.options.filter.type === "and" && this.options.filter.conditions) {
-        this.options.filter = {
-          type: "and",
-          conditions: [...this.options.filter.conditions, newCondition]
-        };
+        if (newCondition.type === "and" && newCondition.conditions) {
+          this.options.filter = {
+            type: "and",
+            conditions: [...this.options.filter.conditions, ...newCondition.conditions]
+          };
+        } else {
+          this.options.filter = {
+            type: "and",
+            conditions: [...this.options.filter.conditions, newCondition]
+          };
+        }
       } else {
-        this.options.filter = and(this.options.filter, newCondition);
+        if (newCondition.type === "and" && newCondition.conditions) {
+          this.options.filter = {
+            type: "and",
+            conditions: [this.options.filter, ...newCondition.conditions]
+          };
+        } else {
+          this.options.filter = and(this.options.filter, newCondition);
+        }
       }
     } else {
       this.options.filter = newCondition;