electrodb 1.9.0 → 1.10.2

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "electrodb",
-  "version": "1.9.0",
+  "version": "1.10.2",
   "description": "A library to more easily create and interact with multiple entities and heretical relationships in dynamodb",
   "main": "index.js",
   "scripts": {
     "test": "mocha ./test/offline**.spec.js",
     "test-ts": "mocha -r ts-node/register ./test/**.spec.ts",
     "test-all": "mocha ./test/**.spec.js",
-    "test-all-local": "LOCAL_DYNAMO_ENDPOINT=http://localhost:8000 node ./test/init.js && LOCAL_DYNAMO_ENDPOINT=http://localhost:8000 mocha ./test/**.spec.js && npm run test-types && LOCAL_DYNAMO_ENDPOINT=http://localhost:8000 npm run test-ts",
-    "test-types": "node ./node_modules/tsd/dist/cli.js",
+    "test-all-local": "LOCAL_DYNAMO_ENDPOINT=http://localhost:8000 node ./test/init.js && LOCAL_DYNAMO_ENDPOINT=http://localhost:8000 mocha ./test/**.spec.js && LOCAL_DYNAMO_ENDPOINT=http://localhost:8000 npm run test-ts && npm run test-types",
+    "test-types": "tsd",
     "coverage": "nyc npm run test-all && nyc report --reporter=text-lcov | coveralls",
     "coverage-coveralls-local": "nyc npm run test-all-local && nyc report --reporter=text-lcov | coveralls",
     "coverage-html-local": "nyc npm run test-all-local && nyc report --reporter=html",
@@ -43,9 +43,9 @@
     "moment": "2.24.0",
     "nyc": "^15.1.0",
     "source-map-support": "^0.5.19",
-    "ts-node": "^9.0.0",
-    "tsd": "^0.14.0",
-    "typescript": "^4.2.4",
+    "ts-node": "^10.8.1",
+    "tsd": "^0.21.0",
+    "typescript": "^4.7.4",
     "uuid": "7.0.1"
   },
   "keywords": [
@@ -61,7 +61,7 @@
     "directory": "test"
   },
   "dependencies": {
-    "jsonschema": "1.2.7",
-    "@aws-sdk/lib-dynamodb": "^3.54.1"
+    "@aws-sdk/lib-dynamodb": "^3.54.1",
+    "jsonschema": "1.2.7"
   }
 }

package/src/entity.js

@@ -702,14 +702,16 @@ class Entity {
 		let pattern = `^${this._regexpEscape(prefix)}`;
 		let labels = this.model.facets.labels[index][keyType] || [];
 		for (let {name, label} of labels) {
-			let { type } = this.model.schema.attributes[name];
-			if (isCustom) {
-				pattern += `${this._regexpEscape(label === undefined ? "" : label)}(.+)`;
-			} else {
-				pattern += `#${this._regexpEscape(label === undefined ? name : label)}_(.+)`;
+			let attr = this.model.schema.attributes[name];
+			if (attr) {
+				if (isCustom) {
+					pattern += `${this._regexpEscape(label === undefined ? "" : label)}(.+)`;
+				} else {
+					pattern += `#${this._regexpEscape(label === undefined ? name : label)}_(.+)`;
+				}
+				names.push(name);
+				types.push(attr.type);
 			}
-			names.push(name);
-			types.push(type);
 		}
 		pattern += "$";
 		let regex = RegExp(pattern);

package/src/util.js

@@ -133,14 +133,18 @@ class BatchGetOrderMaintainer {
 
   getOrder(item) {
     const key = this.keyFormatter(item);
-    return this.batchIndexMap.get(key) ?? -1;
+    const value = this.batchIndexMap.get(key);
+    if (value === undefined) {
+      return -1;
+    }
+    return value;
   }
 
   defineOrder(parameters = []) {
     if (this.enabled) {
       for (let i = 0; i < parameters.length; i++) {
         const batchParams = parameters[i];
-        const recordKeys = batchParams?.RequestItems?.[this.table]?.Keys ?? [];
+        const recordKeys = (batchParams && batchParams.RequestItems && batchParams.RequestItems[this.table] && batchParams.RequestItems[this.table].Keys) || [];
         for (const recordKey of recordKeys) {
           const indexMapKey = this.keyFormatter(recordKey);
           this.batchIndexMap.set(indexMapKey, this.currentSlot++);