electrodb 2.10.4 → 2.10.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrodb",
-  "version": "2.10.4",
+  "version": "2.10.6",
   "description": "A library to more easily create and interact with multiple entities and heretical relationships in dynamodb",
   "main": "index.js",
   "scripts": {

package/src/entity.js

@@ -1014,13 +1014,17 @@ class Entity {
 
       return { data: results };
     } catch (err) {
-      if (config.originalErr || stackTrace === undefined || err.isElectroError) {
+      if (
+        config.originalErr ||
+        stackTrace === undefined ||
+        err.isElectroError
+      ) {
         throw err;
       } else {
         const error = new e.ElectroError(
-            e.ErrorCodes.AWSError,
-            err.message,
-            err,
+          e.ErrorCodes.AWSError,
+          err.message,
+          err,
         );
         error.stack = stackTrace;
 
@@ -2317,7 +2321,7 @@ class Entity {
           // TODO: This will only work with root attributes and should be refactored for nested attributes.
           update.set(attr.field, preparedUpdateValues[path]);
         } else {
-          // this could be fields added by electro that don't apeear in the schema
+          // this could be fields added by electro that don't appear in the schema
           update.set(path, preparedUpdateValues[path]);
         }
       }
@@ -2369,7 +2373,7 @@ class Entity {
         modifiedAttributeNames[primaryIndexAttribute] === undefined;
       if (isNotTablePK && isNotTableSK && wasNotAlreadyModified) {
         update.set(
-          primaryIndexAttribute,
+          attribute.field,
           primaryIndexAttributes[primaryIndexAttribute],
         );
       }

package/src/operations.js

@@ -28,8 +28,21 @@ class ExpressionState {
     return `${this.prefix}${this.counts[name]++}`;
   }
 
+  formatName(name = "") {
+    const nameWasNotANumber = isNaN(name);
+    name = `${name}`.replaceAll(/[^\w]/g, "");
+    if (name.length === 0) {
+      name = "p";
+    } else if (nameWasNotANumber !== isNaN(name)) {
+      // name became number due to replace
+      name = `p${name}`;
+    }
+    return name;
+  }
+
   // todo: make the structure: name, value, paths
   setName(paths, name, value) {
+    name = this.formatName(name);
     let json = "";
     let expression = "";
     const prop = `#${name}`;
@@ -53,6 +66,7 @@ class ExpressionState {
   }
 
   setValue(name, value) {
+    name = this.formatName(name);
     let valueCount = this.incrementName(name);
     let expression = `:${name}${valueCount}`;
     this.values[expression] = value;