@karmaniverous/entity-manager 2.1.1 → 2.1.2

package/dist/default/lib/EntityManager/EntityManager.js

@@ -149,7 +149,7 @@ class EntityManager {
       if (!(0, _isFunction2.default)(decode)) throw new Error(`no decode function defined on ${entityToken} entity key '${component}'`);
       return {
         ...properties,
-        ...decode(index[component])
+        ...(decode(index[component])?.groups ?? [])
       };
     }, {});
     return (0, _sortedUniqBy2.default)((0, _sortBy2.default)((0, _entries2.default)(indexProperties), _ref3 => {

package/dist/default/lib/EntityManager/PrivateEntityManager.js

@@ -170,10 +170,7 @@ class PrivateEntityManager {
   set config(value) {
     // Validate config against schema.
     const validatorResult = (0, _jsonschema.validate)(value, configSchema);
-    if (!validatorResult.valid) {
-      validatorResult.errors.forEach(error => this.logger.error(error.message));
-      throw new Error(validatorResult.errors);
-    }
+    if (!validatorResult.valid) throw new Error(validatorResult.errors);
 
     // Conform config.
     const {
@@ -224,11 +221,7 @@ class PrivateEntityManager {
       // Validate entity index components are entity keys.
       (0, _some2.default)(indexes, (index, indexToken) => {
         const invalidIndexComponents = (0, _difference2.default)(index, (0, _keys2.default)(keys));
-        if (invalidIndexComponents.length) {
-          const message = `${entityToken} index '${indexToken}' components '${invalidIndexComponents}' are not entity keys.`;
-          this.logger.error(message);
-          throw new Error(message);
-        } else return false;
+        if (invalidIndexComponents.length) throw new Error(`${entityToken} index '${indexToken}' components '${invalidIndexComponents}' are not entity keys.`);else return false;
       });
 
       // Conform & validate entity keys.
@@ -239,67 +232,36 @@ class PrivateEntityManager {
 
         // Validate key against schema.
         const validatorResult = (0, _jsonschema.validate)(keys[key], keySchema);
-        if (!validatorResult.valid) {
-          validatorResult.errors.forEach(error => this.logger.error(error.message));
-          throw new Error(validatorResult.errors);
-        }
+        if (!validatorResult.valid) throw new Error(validatorResult.errors);
         const {
           decode
         } = keys[key];
-        if (!(0, _isUndefined2.default)(decode) && !(0, _isFunction2.default)(decode)) {
-          const message = `entity ${entityKey} key '${key}' decode must be a function or undefined.`;
-          this.logger.error(message);
-          throw new Error(message);
-        }
+        if (!(0, _isUndefined2.default)(decode) && !(0, _isFunction2.default)(decode)) throw new Error(`entity ${entityKey} key '${key}' decode must be a function or undefined.`);
       });
 
       // Validate sharding bump values increase monotonically with keys.
       (0, _some2.default)((0, _toPairs2.default)(bumps), (_ref3, i, c) => {
         let [bump, value] = _ref3;
         const [lastBump, lastValue] = i ? c[i - 1] : [];
-        if (value <= lastValue) {
-          const message = `${entityToken} sharding bumps do not monotonically increase from '${lastBump}: ${lastValue}' to '${bump}: ${value}'.)`;
-          this.logger.error(message);
-          throw new Error(message);
-        } else return false;
+        if (value <= lastValue) throw new Error(`${entityToken} sharding bumps do not monotonically increase from '${lastBump}: ${lastValue}' to '${bump}: ${value}'.)`);else return false;
       });
 
       // Validate sharding entityKey is a function or undefined.
-      if (!(0, _isNil2.default)(entityKey) && !(0, _isFunction2.default)(entityKey)) {
-        const message = `${entityToken} sharding entityKey must be a function or nil`;
-        this.logger.error(message);
-        throw new Error(message);
-      }
+      if (!(0, _isNil2.default)(entityKey) && !(0, _isFunction2.default)(entityKey)) throw new Error(`${entityToken} sharding entityKey must be a function or nil`);
 
       // Validate sharding nibbles do not exceed 32 bits.
-      if (nibbles * nibbleBits > 32) {
-        const message = `${entityToken} nibbles (${nibbles} nibbles at ${nibbleBits} nibbleBits) exceed 32 bits`;
-        this.logger.error(message);
-        throw new Error(message);
-      }
+      if (nibbles * nibbleBits > 32) throw new Error(`${entityToken} nibbles (${nibbles} nibbles at ${nibbleBits} nibbleBits) exceed 32 bits`);
 
       // Validate sharding nibbles are less than first bump value.
       const firstBumpValue = (0, _map2.default)(bumps)[0];
-      if (nibbles >= firstBumpValue) {
-        const message = `${entityToken} nibbles (${nibbles}) not less than minimum bump value (${firstBumpValue})`;
-        this.logger.error(message);
-        throw new Error(message);
-      }
+      if (nibbles >= firstBumpValue) throw new Error(`${entityToken} nibbles (${nibbles}) not less than minimum bump value (${firstBumpValue})`);
 
       // Validate last bump value does not exceed 32 bits.
       const lastBumpValue = (0, _map2.default)(bumps).slice(-1);
-      if (lastBumpValue * nibbleBits > 32) {
-        const message = `${entityToken} maximum bump value (${lastBumpValue} nibbles at ${nibbleBits} nibbleBits) exceed 32 bits`;
-        this.logger.error(message);
-        throw new Error(message);
-      }
+      if (lastBumpValue * nibbleBits > 32) throw new Error(`${entityToken} maximum bump value (${lastBumpValue} nibbles at ${nibbleBits} nibbleBits) exceed 32 bits`);
 
       // Validate sharding timestamp is a function or undefined.
-      if (!(0, _isNil2.default)(timestamp) && !(0, _isFunction2.default)(timestamp)) {
-        const message = `${entityToken} sharding timestamp must be a function or nil.`;
-        this.logger.error(message);
-        throw new Error(message);
-      } else return false;
+      if (!(0, _isNil2.default)(timestamp) && !(0, _isFunction2.default)(timestamp)) throw new Error(`${entityToken} sharding timestamp must be a function or nil.`);else return false;
     });
     _classPrivateFieldSet(this, _config, conformedConfig);
   }
@@ -337,22 +299,14 @@ class PrivateEntityManager {
     const {
       indexes
     } = this.getEntityConfig(entityToken);
-    if (!(0, _has2.default)(indexes, indexToken)) {
-      const message = `Index '${indexToken}' does not exist for entity '${entityToken}'.`;
-      this.logger.error(message);
-      throw new Error(message);
-    }
+    if (!(0, _has2.default)(indexes, indexToken)) throw new Error(`Index '${indexToken}' does not exist for entity '${entityToken}'.`);
     return indexes[indexToken];
   }
   getKey(entityToken, keyToken) {
     const {
       keys
     } = this.getEntityConfig(entityToken);
-    if (!(0, _has2.default)(keys, keyToken)) {
-      const message = `Key '${keyToken}' does not exist for entity '${entityToken}'.`;
-      this.logger.error(message);
-      throw new Error(message);
-    }
+    if (!(0, _has2.default)(keys, keyToken)) throw new Error(`Key '${keyToken}' does not exist for entity '${entityToken}'.`);
     return keys[keyToken];
   }
 
@@ -432,11 +386,7 @@ class PrivateEntityManager {
    * @returns {boolean} true if entityToken is valid.
    */
   validateEntityToken(entityToken) {
-    if (!this.config.entities[entityToken]) {
-      const message = `Invalid entityToken: ${entityToken}`;
-      this.logger.error(message);
-      throw new Error(message);
-    } else return true;
+    if (!this.config.entities[entityToken]) throw new Error(`Invalid entityToken: ${entityToken}`);else return true;
   }
 
   /**
@@ -446,11 +396,7 @@ class PrivateEntityManager {
    * @returns {boolean} true if entityToken is valid.
    */
   validateItem(item) {
-    if (!(0, _isPlainObject2.default)(item)) {
-      const message = `Invalid item: ${item}`;
-      this.logger.error(message);
-      throw new Error(message);
-    } else return true;
+    if (!(0, _isPlainObject2.default)(item)) throw new Error(`Invalid item: ${item}`);else return true;
   }
 
   /**
@@ -462,11 +408,7 @@ class PrivateEntityManager {
    */
   validateKeyToken(entityToken, keyToken) {
     this.validateEntityToken(entityToken);
-    if (!this.config.entities[entityToken].keys[keyToken]) {
-      const message = `Invalid entity ${entityToken} keyToken: ${keyToken}`;
-      this.logger.error(message);
-      throw new Error(message);
-    } else return true;
+    if (!this.config.entities[entityToken].keys[keyToken]) throw new Error(`Invalid entity ${entityToken} keyToken: ${keyToken}`);else return true;
   }
 
   /**

package/lib/EntityManager/EntityManager.js

@@ -117,7 +117,7 @@ export class EntityManager {
           `no decode function defined on ${entityToken} entity key '${component}'`
         );
 
-      return { ...properties, ...decode(index[component]) };
+      return { ...properties, ...(decode(index[component])?.groups ?? []) };
     }, {});
 
     return _.sortedUniqBy(

package/lib/EntityManager/PrivateEntityManager.js

@@ -124,12 +124,7 @@ export class PrivateEntityManager {
   set config(value) {
     // Validate config against schema.
     const validatorResult = validate(value, configSchema);
-    if (!validatorResult.valid) {
-      validatorResult.errors.forEach((error) =>
-        this.logger.error(error.message)
-      );
-      throw new Error(validatorResult.errors);
-    }
+    if (!validatorResult.valid) throw new Error(validatorResult.errors);
 
     // Conform config.
     const { entities = {}, shardKeyToken = 'shardId' } = value;
@@ -175,11 +170,11 @@ export class PrivateEntityManager {
         // Validate entity index components are entity keys.
         _.some(indexes, (index, indexToken) => {
           const invalidIndexComponents = _.difference(index, _.keys(keys));
-          if (invalidIndexComponents.length) {
-            const message = `${entityToken} index '${indexToken}' components '${invalidIndexComponents}' are not entity keys.`;
-            this.logger.error(message);
-            throw new Error(message);
-          } else return false;
+          if (invalidIndexComponents.length)
+            throw new Error(
+              `${entityToken} index '${indexToken}' components '${invalidIndexComponents}' are not entity keys.`
+            );
+          else return false;
         });
 
         // Conform & validate entity keys.
@@ -188,67 +183,57 @@ export class PrivateEntityManager {
 
           // Validate key against schema.
           const validatorResult = validate(keys[key], keySchema);
-          if (!validatorResult.valid) {
-            validatorResult.errors.forEach((error) =>
-              this.logger.error(error.message)
-            );
-            throw new Error(validatorResult.errors);
-          }
+          if (!validatorResult.valid) throw new Error(validatorResult.errors);
 
           const { decode } = keys[key];
-          if (!_.isUndefined(decode) && !_.isFunction(decode)) {
-            const message = `entity ${entityKey} key '${key}' decode must be a function or undefined.`;
-            this.logger.error(message);
-            throw new Error(message);
-          }
+          if (!_.isUndefined(decode) && !_.isFunction(decode))
+            throw new Error(
+              `entity ${entityKey} key '${key}' decode must be a function or undefined.`
+            );
         });
 
         // Validate sharding bump values increase monotonically with keys.
         _.some(_.toPairs(bumps), ([bump, value], i, c) => {
           const [lastBump, lastValue] = i ? c[i - 1] : [];
-          if (value <= lastValue) {
-            const message = `${entityToken} sharding bumps do not monotonically increase from '${lastBump}: ${lastValue}' to '${bump}: ${value}'.)`;
-            this.logger.error(message);
-            throw new Error(message);
-          } else return false;
+          if (value <= lastValue)
+            throw new Error(
+              `${entityToken} sharding bumps do not monotonically increase from '${lastBump}: ${lastValue}' to '${bump}: ${value}'.)`
+            );
+          else return false;
         });
 
         // Validate sharding entityKey is a function or undefined.
-        if (!_.isNil(entityKey) && !_.isFunction(entityKey)) {
-          const message = `${entityToken} sharding entityKey must be a function or nil`;
-          this.logger.error(message);
-          throw new Error(message);
-        }
+        if (!_.isNil(entityKey) && !_.isFunction(entityKey))
+          throw new Error(
+            `${entityToken} sharding entityKey must be a function or nil`
+          );
 
         // Validate sharding nibbles do not exceed 32 bits.
-        if (nibbles * nibbleBits > 32) {
-          const message = `${entityToken} nibbles (${nibbles} nibbles at ${nibbleBits} nibbleBits) exceed 32 bits`;
-          this.logger.error(message);
-          throw new Error(message);
-        }
+        if (nibbles * nibbleBits > 32)
+          throw new Error(
+            `${entityToken} nibbles (${nibbles} nibbles at ${nibbleBits} nibbleBits) exceed 32 bits`
+          );
 
         // Validate sharding nibbles are less than first bump value.
         const firstBumpValue = _.map(bumps)[0];
-        if (nibbles >= firstBumpValue) {
-          const message = `${entityToken} nibbles (${nibbles}) not less than minimum bump value (${firstBumpValue})`;
-          this.logger.error(message);
-          throw new Error(message);
-        }
+        if (nibbles >= firstBumpValue)
+          throw new Error(
+            `${entityToken} nibbles (${nibbles}) not less than minimum bump value (${firstBumpValue})`
+          );
 
         // Validate last bump value does not exceed 32 bits.
         const lastBumpValue = _.map(bumps).slice(-1);
-        if (lastBumpValue * nibbleBits > 32) {
-          const message = `${entityToken} maximum bump value (${lastBumpValue} nibbles at ${nibbleBits} nibbleBits) exceed 32 bits`;
-          this.logger.error(message);
-          throw new Error(message);
-        }
+        if (lastBumpValue * nibbleBits > 32)
+          throw new Error(
+            `${entityToken} maximum bump value (${lastBumpValue} nibbles at ${nibbleBits} nibbleBits) exceed 32 bits`
+          );
 
         // Validate sharding timestamp is a function or undefined.
-        if (!_.isNil(timestamp) && !_.isFunction(timestamp)) {
-          const message = `${entityToken} sharding timestamp must be a function or nil.`;
-          this.logger.error(message);
-          throw new Error(message);
-        } else return false;
+        if (!_.isNil(timestamp) && !_.isFunction(timestamp))
+          throw new Error(
+            `${entityToken} sharding timestamp must be a function or nil.`
+          );
+        else return false;
       }
     );
 
@@ -288,11 +273,10 @@ export class PrivateEntityManager {
   getIndexComponents(entityToken, indexToken) {
     const { indexes } = this.getEntityConfig(entityToken);
 
-    if (!_.has(indexes, indexToken)) {
-      const message = `Index '${indexToken}' does not exist for entity '${entityToken}'.`;
-      this.logger.error(message);
-      throw new Error(message);
-    }
+    if (!_.has(indexes, indexToken))
+      throw new Error(
+        `Index '${indexToken}' does not exist for entity '${entityToken}'.`
+      );
 
     return indexes[indexToken];
   }
@@ -300,11 +284,10 @@ export class PrivateEntityManager {
   getKey(entityToken, keyToken) {
     const { keys } = this.getEntityConfig(entityToken);
 
-    if (!_.has(keys, keyToken)) {
-      const message = `Key '${keyToken}' does not exist for entity '${entityToken}'.`;
-      this.logger.error(message);
-      throw new Error(message);
-    }
+    if (!_.has(keys, keyToken))
+      throw new Error(
+        `Key '${keyToken}' does not exist for entity '${entityToken}'.`
+      );
 
     return keys[keyToken];
   }
@@ -398,11 +381,9 @@ export class PrivateEntityManager {
    * @returns {boolean} true if entityToken is valid.
    */
   validateEntityToken(entityToken) {
-    if (!this.config.entities[entityToken]) {
-      const message = `Invalid entityToken: ${entityToken}`;
-      this.logger.error(message);
-      throw new Error(message);
-    } else return true;
+    if (!this.config.entities[entityToken])
+      throw new Error(`Invalid entityToken: ${entityToken}`);
+    else return true;
   }
 
   /**
@@ -412,11 +393,8 @@ export class PrivateEntityManager {
    * @returns {boolean} true if entityToken is valid.
    */
   validateItem(item) {
-    if (!_.isPlainObject(item)) {
-      const message = `Invalid item: ${item}`;
-      this.logger.error(message);
-      throw new Error(message);
-    } else return true;
+    if (!_.isPlainObject(item)) throw new Error(`Invalid item: ${item}`);
+    else return true;
   }
 
   /**
@@ -429,11 +407,9 @@ export class PrivateEntityManager {
   validateKeyToken(entityToken, keyToken) {
     this.validateEntityToken(entityToken);
 
-    if (!this.config.entities[entityToken].keys[keyToken]) {
-      const message = `Invalid entity ${entityToken} keyToken: ${keyToken}`;
-      this.logger.error(message);
-      throw new Error(message);
-    } else return true;
+    if (!this.config.entities[entityToken].keys[keyToken])
+      throw new Error(`Invalid entity ${entityToken} keyToken: ${keyToken}`);
+    else return true;
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karmaniverous/entity-manager",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "publishConfig": {
     "access": "public"
   },