dyno-table 2.1.0 → 2.1.1

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

@@ -143,6 +143,7 @@ declare abstract class FilterBuilder<T extends DynamoItem, TConfig extends Table
      * @returns The builder instance for method chaining
      */
     filter(condition: Condition | ((op: ConditionOperator<T>) => Condition)): this;
+    private getConditionOperator;
     /**
      * Specifies which attributes to return in the results.
      *
@@ -431,6 +432,7 @@ declare class QueryBuilder<T extends DynamoItem, TConfig extends TableConfig = T
      * @returns A new QueryBuilder instance with the same configuration
      */
     clone(): QueryBuilder<T, TConfig>;
+    private deepCloneFilter;
     /**
      * Executes the query against DynamoDB and returns a generator that behaves like an array.
      *

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

@@ -143,6 +143,7 @@ declare abstract class FilterBuilder<T extends DynamoItem, TConfig extends Table
      * @returns The builder instance for method chaining
      */
     filter(condition: Condition | ((op: ConditionOperator<T>) => Condition)): this;
+    private getConditionOperator;
     /**
      * Specifies which attributes to return in the results.
      *
@@ -431,6 +432,7 @@ declare class QueryBuilder<T extends DynamoItem, TConfig extends TableConfig = T
      * @returns A new QueryBuilder instance with the same configuration
      */
     clone(): QueryBuilder<T, TConfig>;
+    private deepCloneFilter;
     /**
      * Executes the query against DynamoDB and returns a generator that behaves like an array.
      *

package/dist/{table-BhEeYauU.d.ts → table-4UxlW_wD.d.ts}

@@ -1,6 +1,6 @@
 import { DynamoItem, TableConfig, Index } from './types.js';
 import { r as PrimaryKeyWithoutExpression, P as PrimaryKey } from './conditions-DD0bvyHm.js';
-import { F as FilterBuilder, b as FilterOptions, Q as QueryBuilder } from './query-builder-BNWRCrJW.js';
+import { F as FilterBuilder, b as FilterOptions, Q as QueryBuilder } from './query-builder-CUWdavZw.js';
 import { PutBuilder } from './builders/put-builder.js';
 import { DeleteBuilder } from './builders/delete-builder.js';
 import { UpdateBuilder } from './builders/update-builder.js';
@@ -76,6 +76,7 @@ declare class ScanBuilder<T extends DynamoItem, TConfig extends TableConfig = Ta
      * @returns A new ScanBuilder instance with the same configuration
      */
     clone(): ScanBuilder<T, TConfig>;
+    private deepCloneFilter;
     /**
      * Executes the scan against DynamoDB and returns a generator that behaves like an array.
      *

package/dist/{table-BpNOboD9.d.cts → table-D-xNCVFa.d.cts}

@@ -1,6 +1,6 @@
 import { DynamoItem, TableConfig, Index } from './types.cjs';
 import { r as PrimaryKeyWithoutExpression, P as PrimaryKey } from './conditions-CC3NDfUU.cjs';
-import { F as FilterBuilder, b as FilterOptions, Q as QueryBuilder } from './query-builder-DZ9JKgBN.cjs';
+import { F as FilterBuilder, b as FilterOptions, Q as QueryBuilder } from './query-builder-DoZzZz_c.cjs';
 import { PutBuilder } from './builders/put-builder.cjs';
 import { DeleteBuilder } from './builders/delete-builder.cjs';
 import { UpdateBuilder } from './builders/update-builder.cjs';
@@ -76,6 +76,7 @@ declare class ScanBuilder<T extends DynamoItem, TConfig extends TableConfig = Ta
      * @returns A new ScanBuilder instance with the same configuration
      */
     clone(): ScanBuilder<T, TConfig>;
+    private deepCloneFilter;
     /**
      * Executes the scan against DynamoDB and returns a generator that behaves like an array.
      *

package/dist/table.cjs

@@ -521,30 +521,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.
    *
@@ -835,10 +845,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.
    *
@@ -3157,10 +3180,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.
    *