electrodb 1.4.0 → 1.4.4

package/package.json

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

package/src/clauses.js

@@ -38,7 +38,6 @@ let clauses = {
 				return state;
 			}
 			try {
-				entity._expectFacets(facets, Object.keys(facets), `"query collection" composite attributes`);
 				const {pk} = state.getCompositeAttributes();
 				return state
 					.setType(QueryTypes.collection)
@@ -381,7 +380,6 @@ let clauses = {
 			}
 			try {
 				const attributes = state.getCompositeAttributes();
-				entity._expectFacets(facets, Object.keys(facets), `"query" composite attributes`);
 				return state
 					.setMethod(MethodTypes.query)
 					.setType(QueryTypes.is)
@@ -404,16 +402,6 @@ let clauses = {
 			}
 			try {
 				const attributes = state.getCompositeAttributes();
-				entity._expectFacets(
-					startingFacets,
-					Object.keys(startingFacets),
-					`"between" composite attributes`,
-				);
-				entity._expectFacets(
-					endingFacets,
-					Object.keys(endingFacets),
-					`"and" composite attributes`,
-				);
 				return state
 					.setType(QueryTypes.and)
 					.setSK(entity._buildQueryFacets(endingFacets, attributes.sk))
@@ -433,8 +421,6 @@ let clauses = {
 				return state;
 			}
 			try {
-				entity._expectFacets(facets, Object.keys(facets), `"begins" composite attributes`);
-
 				return state
 					.setType(QueryTypes.begins)
 					.ifSK(state => {
@@ -455,7 +441,6 @@ let clauses = {
 				return state;
 			}
 			try {
-				entity._expectFacets(facets, Object.keys(facets), `"gt" composite attributes`);
 				return state
 					.setType(QueryTypes.gt)
 					.ifSK(state => {
@@ -476,7 +461,6 @@ let clauses = {
 				return state;
 			}
 			try {
-				entity._expectFacets(facets, Object.keys(facets), `"gte" composite attributes`);
 				return state
 					.setType(QueryTypes.gte)
 					.ifSK(state => {
@@ -497,7 +481,6 @@ let clauses = {
 				return state;
 			}
 			try {
-				entity._expectFacets(facets, Object.keys(facets), `"lt" composite attributes`);
 				return state.setType(QueryTypes.lt)
 					.ifSK(state => {
 						const attributes = state.getCompositeAttributes();
@@ -517,7 +500,6 @@ let clauses = {
 				return state;
 			}
 			try {
-				entity._expectFacets(facets, Object.keys(facets), `"lte" composite attributes`);
 				return state.setType(QueryTypes.lte)
 					.ifSK(state => {
 						const attributes = state.getCompositeAttributes();

package/src/entity.js

@@ -1003,6 +1003,7 @@ class Entity {
 	}
 
 	_makeUpdateParams(update = {}, pk = {}, sk = {}) {
+		let primaryIndexAttributes = {...pk, ...sk};
 		let modifiedAttributeValues = {};
 		let modifiedAttributeNames = {};
 		for (const path of Object.keys(update.paths)) {
@@ -1038,6 +1039,7 @@ class Entity {
 			const wasNotAlreadyModified = modifiedAttributeNames[indexKey] === undefined;
 			if (isNotTablePK && isNotTableSK && wasNotAlreadyModified) {
 				update.set(indexKey, updatedKeys[indexKey]);
+
 			}
 		}
 
@@ -1050,6 +1052,24 @@ class Entity {
 			}
 		}
 
+		// This loop adds the composite attributes to the Primary Index. This is important
+		// in the case an update results in an "upsert". We want to add the Primary Index
+		// composite attributes to the update so they will be included on the item when it
+		// is created. It is done after all of the above because it is not a true "update"
+		// so it should not be subject to the above "rules".
+		for (const primaryIndexAttribute of Object.keys(primaryIndexAttributes)) {
+			// isNotTablePK and isNotTableSK is important to check in case these properties
+			// are not also the name of the index (you cannot modify the PK or SK of an item
+			// after its creation)
+			const attribute = this.model.schema.attributes[primaryIndexAttribute];
+			const isNotTablePK = !!(attribute && attribute.field !== this.model.indexes[accessPattern].pk.field);
+			const isNotTableSK = !!(attribute && attribute.field !== this.model.indexes[accessPattern].sk.field);
+			const wasNotAlreadyModified = modifiedAttributeNames[primaryIndexAttribute] === undefined;
+			if (isNotTablePK && isNotTableSK && wasNotAlreadyModified) {
+				update.set(primaryIndexAttribute, primaryIndexAttributes[primaryIndexAttribute]);
+			}
+		}
+
 		return {
 			UpdateExpression: update.build(),
 			ExpressionAttributeNames: update.getNames(),
@@ -1095,12 +1115,14 @@ class Entity {
 		let restrict = ["pk"];
 		let keys = { pk };
 		sks = sks.filter(sk => sk !== undefined);
+
 		for (let i = 0; i < sks.length; i++) {
 			let id = `sk${i + 1}`;
 			keys[id] = sks[i];
 			restrict.push(id);
 			translate[id] = translate["sk"];
 		}
+
 		let keyExpressions = this._expressionAttributeBuilder(keys, ItemOperations.set, {
 			translate,
 			restrict,
@@ -1427,7 +1449,7 @@ class Entity {
 			{ ...keyAttributes },
 		);
 		const removedKeyImpact = this._expectIndexFacets(
-			{...removed},
+			{ ...removed },
 			{...keyAttributes}
 		)
 

package/src/schema.js

@@ -332,8 +332,11 @@ class Attribute {
 			};
 		} else if (definition instanceof RegExp) {
 			return (val) => {
+				if (val === undefined) {
+					return [true, ""];
+				}
 				let isValid = definition.test(val);
-				let reason = isValid ? "" : `Invalid value for attribute "${this.path}": Failed user defined regex`;
+				let reason = isValid ? "" : `Invalid value for attribute "${this.path}": Failed model defined regex`;
 				return [isValid, reason];
 			};
 		} else {