dyno-table 2.1.0 → 2.1.1

package/dist/table.d.cts

@@ -1,13 +1,13 @@
 import './types.cjs';
 import './conditions-CC3NDfUU.cjs';
-import './query-builder-DZ9JKgBN.cjs';
+import './query-builder-DoZzZz_c.cjs';
 import './builders/put-builder.cjs';
 import './builders/delete-builder.cjs';
 import './builders/update-builder.cjs';
 import './builders/transaction-builder.cjs';
 import './batch-builder-CcxFDKhe.cjs';
 import './builders/condition-check-builder.cjs';
-export { T as Table } from './table-BpNOboD9.cjs';
+export { T as Table } from './table-D-xNCVFa.cjs';
 import '@aws-sdk/lib-dynamodb';
 import './builders/paginator.cjs';
 import './builder-types-BTVhQSHI.cjs';

package/dist/table.d.ts

@@ -1,13 +1,13 @@
 import './types.js';
 import './conditions-DD0bvyHm.js';
-import './query-builder-BNWRCrJW.js';
+import './query-builder-CUWdavZw.js';
 import './builders/put-builder.js';
 import './builders/delete-builder.js';
 import './builders/update-builder.js';
 import './builders/transaction-builder.js';
 import './batch-builder-BytHNL_u.js';
 import './builders/condition-check-builder.js';
-export { T as Table } from './table-BhEeYauU.js';
+export { T as Table } from './table-4UxlW_wD.js';
 import '@aws-sdk/lib-dynamodb';
 import './builders/paginator.js';
 import './builder-types-CzuLR4Th.js';

package/dist/table.js

@@ -519,30 +519,40 @@ var FilterBuilder = class {
    * @returns The builder instance for method chaining
    */
   filter(condition) {
-    if (typeof condition === "function") {
-      const conditionOperator = {
-        eq,
-        ne,
-        lt,
-        lte,
-        gt,
-        gte,
-        between,
-        inArray,
-        beginsWith,
-        contains,
-        attributeExists,
-        attributeNotExists,
-        and,
-        or,
-        not
-      };
-      this.options.filter = condition(conditionOperator);
+    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]
+        };
+      } else {
+        this.options.filter = and(this.options.filter, newCondition);
+      }
     } else {
-      this.options.filter = condition;
+      this.options.filter = newCondition;
     }
     return this;
   }
+  getConditionOperator() {
+    return {
+      eq,
+      ne,
+      lt,
+      lte,
+      gt,
+      gte,
+      between,
+      inArray,
+      beginsWith,
+      contains,
+      attributeExists,
+      attributeNotExists,
+      and,
+      or,
+      not
+    };
+  }
   /**
    * Specifies which attributes to return in the results.
    *
@@ -833,10 +843,23 @@ var QueryBuilder = class _QueryBuilder extends FilterBuilder {
    */
   clone() {
     const clone = new _QueryBuilder(this.executor, this.keyCondition);
-    clone.options = { ...this.options };
+    clone.options = {
+      ...this.options,
+      filter: this.deepCloneFilter(this.options.filter)
+    };
     clone.selectedFields = new Set(this.selectedFields);
     return clone;
   }
+  deepCloneFilter(filter) {
+    if (!filter) return filter;
+    if (filter.type === "and" || filter.type === "or") {
+      return {
+        ...filter,
+        conditions: filter.conditions?.map((condition) => this.deepCloneFilter(condition)).filter((c) => c !== void 0)
+      };
+    }
+    return { ...filter };
+  }
   /**
    * Executes the query against DynamoDB and returns a generator that behaves like an array.
    *
@@ -3155,10 +3178,23 @@ var ScanBuilder = class _ScanBuilder extends FilterBuilder {
    */
   clone() {
     const clone = new _ScanBuilder(this.executor);
-    clone.options = { ...this.options };
+    clone.options = {
+      ...this.options,
+      filter: this.deepCloneFilter(this.options.filter)
+    };
     clone.selectedFields = new Set(this.selectedFields);
     return clone;
   }
+  deepCloneFilter(filter) {
+    if (!filter) return filter;
+    if (filter.type === "and" || filter.type === "or") {
+      return {
+        ...filter,
+        conditions: filter.conditions?.map((condition) => this.deepCloneFilter(condition)).filter((c) => c !== void 0)
+      };
+    }
+    return { ...filter };
+  }
   /**
    * Executes the scan against DynamoDB and returns a generator that behaves like an array.
    *