@ftschopp/dynatable-core 1.4.3 → 1.4.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## @ftschopp/dynatable-core [1.4.4](https://github.com/ftschopp/dynatable/compare/@ftschopp/dynatable-core@1.4.3...@ftschopp/dynatable-core@1.4.4) (2026-05-09)
+
+
+### Bug Fixes
+
+* **core:** detect SET-collisions on auto-recomputed index keys; stripInternalKeys recurses ([#38](https://github.com/ftschopp/dynatable/issues/38)) ([d609c5b](https://github.com/ftschopp/dynatable/commit/d609c5bbeb566145ec034ec9883246a6d77d7cf6)), closes [#17](https://github.com/ftschopp/dynatable/issues/17) [#GSI1](https://github.com/ftschopp/dynatable/issues/GSI1) [#GSI1](https://github.com/ftschopp/dynatable/issues/GSI1)
+
 ## @ftschopp/dynatable-core [1.4.3](https://github.com/ftschopp/dynatable/compare/@ftschopp/dynatable-core@1.4.2...@ftschopp/dynatable-core@1.4.3) (2026-05-09)
 
 

package/dist/builders/update/create-update-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-update-builder.d.ts","sourceRoot":"","sources":["../../../src/builders/update/create-update-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAgC,SAAS,EAA4B,MAAM,WAAW,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EACvC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,EACnB,MAAM,EAAE,cAAc,EACtB,cAAc,GAAE,SAAS,EAAO,EAChC,aAAa,GAAE;IACb,GAAG,EAAE,YAAY,EAAE,CAAC;IACpB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,GAAG,EAAE,YAAY,EAAE,CAAC;IACpB,MAAM,EAAE,YAAY,EAAE,CAAC;CACuB,EAChD,UAAU,GAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,aAAa,GAAG,aAAsB,EACnF,YAAY,SAAI,EAChB,gBAAgB,UAAQ,EACxB,MAAM,CAAC,EAAE,cAAc,EACvB,YAAY,CAAC,EAAE,YAAY,EAC3B,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAClC,aAAa,CAAC,KAAK,CAAC,CAoVtB"}
+{"version":3,"file":"create-update-builder.d.ts","sourceRoot":"","sources":["../../../src/builders/update/create-update-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAgC,SAAS,EAA4B,MAAM,WAAW,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAa7D;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EACvC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,EACnB,MAAM,EAAE,cAAc,EACtB,cAAc,GAAE,SAAS,EAAO,EAChC,aAAa,GAAE;IACb,GAAG,EAAE,YAAY,EAAE,CAAC;IACpB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,GAAG,EAAE,YAAY,EAAE,CAAC;IACpB,MAAM,EAAE,YAAY,EAAE,CAAC;CACuB,EAChD,UAAU,GAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,aAAa,GAAG,aAAsB,EACnF,YAAY,SAAI,EAChB,gBAAgB,UAAQ,EACxB,MAAM,CAAC,EAAE,cAAc,EACvB,YAAY,CAAC,EAAE,YAAY,EAC3B,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAClC,aAAa,CAAC,KAAK,CAAC,CAsWtB"}

package/dist/builders/update/create-update-builder.js

@@ -4,6 +4,15 @@ exports.createUpdateBuilder = createUpdateBuilder;
 const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
 const shared_1 = require("../shared");
 const model_utils_1 = require("../../utils/model-utils");
+/**
+ * Pull the LHS attribute name out of a SET-action expression like
+ * `#GSI1PK = :v_0` → `'GSI1PK'`. Returns `undefined` for shapes the
+ * builder doesn't emit so callers can ignore them safely.
+ */
+function extractAttrName(action) {
+    const m = action.expression.match(/^\s*#([A-Za-z0-9_]+)\s*=/);
+    return m?.[1];
+}
 /**
  * Creates an UpdateBuilder for an item key and table.
  *
@@ -120,6 +129,22 @@ function createUpdateBuilder(tableName, key, client, prevConditions = [], update
                         `but the templates cannot be fully resolved from the update payload. ` +
                         `Include the missing fields in .set():\n${details}`);
                 }
+                // If the user's `.set()` already targets the same index-key
+                // attribute (e.g. `.set('GSI1PK', 'foo')`), refuse to silently
+                // emit a second SET against the same path. DynamoDB rejects
+                // `SET #GSI1PK = :a, #GSI1PK = :b` outright, and namespacing the
+                // placeholders only hides which one wins. Force the caller to
+                // resolve the conflict explicitly.
+                const userSetKeys = new Set(actionsToProcess.set.map(extractAttrName));
+                userSetKeys.delete(undefined);
+                const conflicts = Object.keys(idxActions).filter((k) => userSetKeys.has(k));
+                if (conflicts.length > 0) {
+                    throw new Error(`Update would write the same secondary-index key twice: ` +
+                        `[${conflicts.join(', ')}] is recomputed from the index template AND ` +
+                        `set explicitly via .set(). Either remove the explicit .set() and let ` +
+                        `the recomputation handle it, or include all template variables in ` +
+                        `.set() so you take full control.`);
+                }
                 for (const [indexName, resolved] of Object.entries(idxActions)) {
                     const valueName = getUniqueValueName(indexName);
                     actionsToProcess.set.push({

package/dist/utils/model-utils.d.ts

@@ -50,9 +50,15 @@ export declare const applyPostDefaults: <M extends ModelDefinition>(model: M, va
     timestamps?: boolean;
 }) => InferModel<M>;
 /**
- * Removes internal DynamoDB keys from an item or array of items
- * @param data - Single item or array of items from DynamoDB
- * @returns Data with internal keys removed
+ * Removes internal DynamoDB keys from an item or array of items.
+ *
+ * Recurses into nested plain objects and arrays so an `_type` / `PK` / `SK`
+ * field embedded inside an attribute value (e.g. a denormalized snapshot
+ * of another entity) is also stripped. Class instances such as `Date` are
+ * passed through untouched — recursing into them would lose their type.
+ *
+ * @param data - Single item, array of items, or any nested value from DynamoDB
+ * @returns Data with internal keys removed at every level
  */
 export declare const stripInternalKeys: <T>(data: T | T[] | undefined) => T | T[] | undefined;
 //# sourceMappingURL=model-utils.d.ts.map

package/dist/utils/model-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-utils.d.ts","sourceRoot":"","sources":["../../src/utils/model-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAiB,eAAe,EAAE,MAAM,cAAc,CAAC;AAG1E;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAI,UAAU,MAAM,KAAG,MAAM,EAG5D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAG,MAoB7E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,eAAe,EACnD,OAAO,CAAC,EACR,OAAO,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,OAAM,KAAK,GAAG,OAAO,GAAG,MAAc,KACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAWvB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;CACnE,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,eAAe,EAC3D,OAAO,CAAC,EACR,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAC3B,mBAwBF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,eAAe,EACzD,OAAO,CAAC,EACR,eAAe,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAClC,UAAU;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,KACrD,UAAU,CAAC,CAAC,CAiCd,CAAC;AAOF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS,KAAG,CAAC,GAAG,CAAC,EAAE,GAAG,SAoB1E,CAAC"}
+{"version":3,"file":"model-utils.d.ts","sourceRoot":"","sources":["../../src/utils/model-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAiB,eAAe,EAAE,MAAM,cAAc,CAAC;AAG1E;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAI,UAAU,MAAM,KAAG,MAAM,EAG5D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAG,MAoB7E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,eAAe,EACnD,OAAO,CAAC,EACR,OAAO,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,OAAM,KAAK,GAAG,OAAO,GAAG,MAAc,KACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAWvB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;CACnE,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,eAAe,EAC3D,OAAO,CAAC,EACR,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAC3B,mBAwBF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,eAAe,EACzD,OAAO,CAAC,EACR,eAAe,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAClC,UAAU;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,KACrD,UAAU,CAAC,CAAC,CAiCd,CAAC;AAOF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS,KAAG,CAAC,GAAG,CAAC,EAAE,GAAG,SAqB1E,CAAC"}

package/dist/utils/model-utils.js

@@ -125,9 +125,15 @@ exports.applyPostDefaults = applyPostDefaults;
  */
 const INTERNAL_KEYS = ['PK', 'SK', '_type'];
 /**
- * Removes internal DynamoDB keys from an item or array of items
- * @param data - Single item or array of items from DynamoDB
- * @returns Data with internal keys removed
+ * Removes internal DynamoDB keys from an item or array of items.
+ *
+ * Recurses into nested plain objects and arrays so an `_type` / `PK` / `SK`
+ * field embedded inside an attribute value (e.g. a denormalized snapshot
+ * of another entity) is also stripped. Class instances such as `Date` are
+ * passed through untouched — recursing into them would lose their type.
+ *
+ * @param data - Single item, array of items, or any nested value from DynamoDB
+ * @returns Data with internal keys removed at every level
  */
 const stripInternalKeys = (data) => {
     if (data === undefined || data === null) {
@@ -136,12 +142,14 @@ const stripInternalKeys = (data) => {
     if (Array.isArray(data)) {
         return data.map((item) => (0, exports.stripInternalKeys)(item));
     }
-    if (typeof data === 'object') {
+    // Only recurse into plain objects; preserve Date, Buffer, Set, Map,
+    // and anything else with a non-Object prototype.
+    if (typeof data === 'object' && Object.getPrototypeOf(data) === Object.prototype) {
         const cleaned = {};
         for (const [key, value] of Object.entries(data)) {
-            if (!INTERNAL_KEYS.includes(key)) {
-                cleaned[key] = value;
-            }
+            if (INTERNAL_KEYS.includes(key))
+                continue;
+            cleaned[key] = (0, exports.stripInternalKeys)(value);
         }
         return cleaned;
     }

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "@ftschopp/dynatable-core",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Core library for DynamoDB single table design",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
     "dist",
     "README.md",
@@ -15,6 +22,7 @@
   "scripts": {
     "build": "tsc && tsc-alias",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+    "lint": "eslint src",
     "test": "jest",
     "prepublishOnly": "yarn build"
   },