dyno-table 2.2.0 → 2.2.1

package/dist/table.d.cts

@@ -1,12 +1,12 @@
-import './batch-builder-BPoHyN_Q.cjs';
+import './batch-builder-BiQDIZ7p.cjs';
 import './builders/condition-check-builder.cjs';
 import './builders/delete-builder.cjs';
 import './builders/put-builder.cjs';
-import './query-builder-DoZzZz_c.cjs';
-export { T as Table } from './table-f-3wsT7K.cjs';
+import './query-builder-D3URwK9k.cjs';
+export { T as Table } from './table-ClST8nkR.cjs';
 import './builders/transaction-builder.cjs';
 import './builders/update-builder.cjs';
-import './conditions-CC3NDfUU.cjs';
+import './conditions-CcZL0sR2.cjs';
 import './types.cjs';
 import './builder-types-BTVhQSHI.cjs';
 import '@aws-sdk/lib-dynamodb';

package/dist/table.d.ts

@@ -1,12 +1,12 @@
-import './batch-builder-Cdo49C2r.js';
+import './batch-builder-CNsLS6sR.js';
 import './builders/condition-check-builder.js';
 import './builders/delete-builder.js';
 import './builders/put-builder.js';
-import './query-builder-CUWdavZw.js';
-export { T as Table } from './table-CZBMkW2Z.js';
+import './query-builder-cfEkU0_w.js';
+export { T as Table } from './table-vE3cGoDy.js';
 import './builders/transaction-builder.js';
 import './builders/update-builder.js';
-import './conditions-DD0bvyHm.js';
+import './conditions-D_w7vVYG.js';
 import './types.js';
 import './builder-types-CzuLR4Th.js';
 import '@aws-sdk/lib-dynamodb';

package/dist/table.js

@@ -1669,12 +1669,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;