dyno-table 2.1.0 → 2.1.1

package/dist/index.d.cts

@@ -1,7 +1,7 @@
-export { T as Table } from './table-BpNOboD9.cjs';
+export { T as Table } from './table-D-xNCVFa.cjs';
 export { EntityConfig, EntityRepository, IndexDefinition, QueryEntity, QueryRecord, createIndex, createQueries, defineEntity } from './entity.cjs';
 export { p as ComparisonOperator, C as Condition, q as ConditionOperator, E as ExpressionParams, K as KeyConditionOperator, L as LogicalOperator, P as PrimaryKey, r as PrimaryKeyWithoutExpression, k as and, h as attributeExists, j as attributeNotExists, d as beginsWith, c as between, f as contains, e as eq, g as gt, b as gte, i as inArray, l as lt, a as lte, n as ne, m as not, o as or } from './conditions-CC3NDfUU.cjs';
-export { Q as QueryBuilder, a as QueryOptions } from './query-builder-DZ9JKgBN.cjs';
+export { Q as QueryBuilder, a as QueryOptions } from './query-builder-DoZzZz_c.cjs';
 export { PutBuilder, PutOptions } from './builders/put-builder.cjs';
 export { UpdateBuilder, UpdateOptions } from './builders/update-builder.cjs';
 export { DeleteBuilder, DeleteOptions } from './builders/delete-builder.cjs';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-export { T as Table } from './table-BhEeYauU.js';
+export { T as Table } from './table-4UxlW_wD.js';
 export { EntityConfig, EntityRepository, IndexDefinition, QueryEntity, QueryRecord, createIndex, createQueries, defineEntity } from './entity.js';
 export { p as ComparisonOperator, C as Condition, q as ConditionOperator, E as ExpressionParams, K as KeyConditionOperator, L as LogicalOperator, P as PrimaryKey, r as PrimaryKeyWithoutExpression, k as and, h as attributeExists, j as attributeNotExists, d as beginsWith, c as between, f as contains, e as eq, g as gt, b as gte, i as inArray, l as lt, a as lte, n as ne, m as not, o as or } from './conditions-DD0bvyHm.js';
-export { Q as QueryBuilder, a as QueryOptions } from './query-builder-BNWRCrJW.js';
+export { Q as QueryBuilder, a as QueryOptions } from './query-builder-CUWdavZw.js';
 export { PutBuilder, PutOptions } from './builders/put-builder.js';
 export { UpdateBuilder, UpdateOptions } from './builders/update-builder.js';
 export { DeleteBuilder, DeleteOptions } from './builders/delete-builder.js';

package/dist/index.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.
    *
@@ -3839,31 +3875,30 @@ var IndexBuilder = class {
       if (!shouldUpdateIndex) {
         continue;
       }
+      let key;
       try {
-        const key = indexDef.generateKey(updatedItem);
-        if (this.hasUndefinedValues(key)) {
-          throw new Error(
-            `Cannot update entity: insufficient data to regenerate index "${indexName}". All attributes required by the index must be provided in the update operation, or the index must be marked as readOnly.`
-          );
-        }
-        const gsiConfig = this.table.gsis[indexName];
-        if (!gsiConfig) {
-          throw new Error(`GSI configuration not found for index: ${indexName}`);
-        }
-        if (key.pk) {
-          attributes[gsiConfig.partitionKey] = key.pk;
-        }
-        if (key.sk && gsiConfig.sortKey) {
-          attributes[gsiConfig.sortKey] = key.sk;
-        }
+        key = indexDef.generateKey(updatedItem);
       } catch (error) {
-        if (error instanceof Error && error.message.includes("insufficient data")) {
-          throw error;
+        if (error instanceof Error) {
+          throw new Error(`Missing attributes: ${error.message}`);
         }
+        throw error;
+      }
+      if (this.hasUndefinedValues(key)) {
         throw new Error(
-          `Cannot update entity: insufficient data to regenerate index "${indexName}". All attributes required by the index must be provided in the update operation, or the index must be readOnly.`
+          `Missing attributes: Cannot update entity: insufficient data to regenerate index "${indexName}". All attributes required by the index must be provided in the update operation, or the index must be marked as readOnly.`
         );
       }
+      const gsiConfig = this.table.gsis[indexName];
+      if (!gsiConfig) {
+        throw new Error(`GSI configuration not found for index: ${indexName}`);
+      }
+      if (key.pk) {
+        attributes[gsiConfig.partitionKey] = key.pk;
+      }
+      if (key.sk && gsiConfig.sortKey) {
+        attributes[gsiConfig.sortKey] = key.sk;
+      }
     }
     return attributes;
   }