@karmaniverous/entity-manager 2.1.0 → 2.1.1

package/README.md

@@ -221,10 +221,10 @@ This change can be accomplished with no breaking changes to existing implementat
             * [new exports.EntityManager(options)](#new_module_entity-manager.EntityManager_new)
             * [.addKeys(entityToken, item, [overwrite])](#module_entity-manager.EntityManager+addKeys) ⇒ <code>object</code>
             * [.calcShardKey(entityToken, item)](#module_entity-manager.EntityManager+calcShardKey) ⇒ <code>string</code>
-            * [.dehydrateIndex(entityToken, indexToken, item, [delimiter])](#module_entity-manager.EntityManager+dehydrateIndex) ⇒ <code>string</code>
-            * [.rehydrateIndex(entityToken, indexToken, value, [delimiter])](#module_entity-manager.EntityManager+rehydrateIndex) ⇒ <code>object</code>
+            * [.dehydrateIndex(entityToken, indexToken, index, [delimiter])](#module_entity-manager.EntityManager+dehydrateIndex) ⇒ <code>string</code>
             * [.getKeySpace(entityToken, keyToken, item, timestamp)](#module_entity-manager.EntityManager+getKeySpace) ⇒ <code>Array.&lt;string&gt;</code>
             * [.query(entityToken, keyToken, item, shardQuery, [options])](#module_entity-manager.EntityManager+query) ⇒ <code>Promise.&lt;ShardedQueryResult&gt;</code>
+            * [.rehydrateIndex(entityToken, indexToken, value, [delimiter])](#module_entity-manager.EntityManager+rehydrateIndex) ⇒ <code>object</code>
             * [.removeKeys(entityToken, item)](#module_entity-manager.EntityManager+removeKeys) ⇒ <code>object</code>
     * _inner_
         * [~ShardQueryResult](#module_entity-manager..ShardQueryResult) : <code>object</code>
@@ -242,10 +242,10 @@ Manage DynamoDb entities.
     * [new exports.EntityManager(options)](#new_module_entity-manager.EntityManager_new)
     * [.addKeys(entityToken, item, [overwrite])](#module_entity-manager.EntityManager+addKeys) ⇒ <code>object</code>
     * [.calcShardKey(entityToken, item)](#module_entity-manager.EntityManager+calcShardKey) ⇒ <code>string</code>
-    * [.dehydrateIndex(entityToken, indexToken, item, [delimiter])](#module_entity-manager.EntityManager+dehydrateIndex) ⇒ <code>string</code>
-    * [.rehydrateIndex(entityToken, indexToken, value, [delimiter])](#module_entity-manager.EntityManager+rehydrateIndex) ⇒ <code>object</code>
+    * [.dehydrateIndex(entityToken, indexToken, index, [delimiter])](#module_entity-manager.EntityManager+dehydrateIndex) ⇒ <code>string</code>
     * [.getKeySpace(entityToken, keyToken, item, timestamp)](#module_entity-manager.EntityManager+getKeySpace) ⇒ <code>Array.&lt;string&gt;</code>
     * [.query(entityToken, keyToken, item, shardQuery, [options])](#module_entity-manager.EntityManager+query) ⇒ <code>Promise.&lt;ShardedQueryResult&gt;</code>
+    * [.rehydrateIndex(entityToken, indexToken, value, [delimiter])](#module_entity-manager.EntityManager+rehydrateIndex) ⇒ <code>object</code>
     * [.removeKeys(entityToken, item)](#module_entity-manager.EntityManager+removeKeys) ⇒ <code>object</code>
 
 <a name="new_module_entity-manager.EntityManager_new"></a>
@@ -300,8 +300,8 @@ Calculated the shard key for an entity item.
 
 <a name="module_entity-manager.EntityManager+dehydrateIndex"></a>
 
-#### entityManager.dehydrateIndex(entityToken, indexToken, item, [delimiter]) ⇒ <code>string</code>
-Convert a item into a delimited string containing the properties of a named index.
+#### entityManager.dehydrateIndex(entityToken, indexToken, index, [delimiter]) ⇒ <code>string</code>
+Condense an index object into a delimited string.
 
 **Kind**: instance method of [<code>EntityManager</code>](#module_entity-manager.EntityManager)  
 **Returns**: <code>string</code> - Dehydrated index.  
@@ -316,27 +316,7 @@ Convert a item into a delimited string containing the properties of a named inde
 | --- | --- | --- | --- |
 | entityToken | <code>string</code> |  | Entity token. |
 | indexToken | <code>string</code> |  | Index token. |
-| item | <code>object</code> |  | Entity item. |
-| [delimiter] | <code>string</code> | <code>&quot;~&quot;</code> | Delimiter. |
-
-<a name="module_entity-manager.EntityManager+rehydrateIndex"></a>
-
-#### entityManager.rehydrateIndex(entityToken, indexToken, value, [delimiter]) ⇒ <code>object</code>
-Convert a delimited string into a named index key.
-
-**Kind**: instance method of [<code>EntityManager</code>](#module_entity-manager.EntityManager)  
-**Returns**: <code>object</code> - Rehydrated index key.  
-**Throws**:
-
-- <code>Error</code> If entityToken is invalid.
-- <code>Error</code> If indexToken is invalid.
-
-
-| Param | Type | Default | Description |
-| --- | --- | --- | --- |
-| entityToken | <code>string</code> |  | Entity token. |
-| indexToken | <code>string</code> |  | Index token. |
-| value | <code>string</code> |  | Dehydrated index value. |
+| index | <code>object</code> |  | Index object. |
 | [delimiter] | <code>string</code> | <code>&quot;~&quot;</code> | Delimiter. |
 
 <a name="module_entity-manager.EntityManager+getKeySpace"></a>
@@ -379,6 +359,26 @@ Query an entity across shards.
 | [options.limit] | <code>number</code> | Request limit. |
 | [options.pageKeys] | <code>object</code> | Map of shard page keys. |
 
+<a name="module_entity-manager.EntityManager+rehydrateIndex"></a>
+
+#### entityManager.rehydrateIndex(entityToken, indexToken, value, [delimiter]) ⇒ <code>object</code>
+Convert a delimited string into a named index key.
+
+**Kind**: instance method of [<code>EntityManager</code>](#module_entity-manager.EntityManager)  
+**Returns**: <code>object</code> - Rehydrated index key.  
+**Throws**:
+
+- <code>Error</code> If entityToken is invalid.
+- <code>Error</code> If indexToken is invalid.
+
+
+| Param | Type | Default | Description |
+| --- | --- | --- | --- |
+| entityToken | <code>string</code> |  | Entity token. |
+| indexToken | <code>string</code> |  | Index token. |
+| value | <code>string</code> |  | Dehydrated index value. |
+| [delimiter] | <code>string</code> | <code>&quot;~&quot;</code> | Delimiter. |
+
 <a name="module_entity-manager.EntityManager+removeKeys"></a>
 
 #### entityManager.removeKeys(entityToken, item) ⇒ <code>object</code>

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EntityManager = void 0;
+var _zipObject2 = _interopRequireDefault(require("lodash/zipObject"));
 var _map2 = _interopRequireDefault(require("lodash/map"));
 var _size2 = _interopRequireDefault(require("lodash/size"));
 var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
@@ -11,14 +12,11 @@ var _fromPairs2 = _interopRequireDefault(require("lodash/fromPairs"));
 var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
 var _isInteger2 = _interopRequireDefault(require("lodash/isInteger"));
 var _isUndefined2 = _interopRequireDefault(require("lodash/isUndefined"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _sortedUniq2 = _interopRequireDefault(require("lodash/sortedUniq"));
-var _zipObject2 = _interopRequireDefault(require("lodash/zipObject"));
-var _flatten2 = _interopRequireDefault(require("lodash/flatten"));
-var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
+var _entries2 = _interopRequireDefault(require("lodash/entries"));
 var _sortBy2 = _interopRequireDefault(require("lodash/sortBy"));
-var _pick2 = _interopRequireDefault(require("lodash/pick"));
-var _values2 = _interopRequireDefault(require("lodash/values"));
+var _sortedUniqBy2 = _interopRequireDefault(require("lodash/sortedUniqBy"));
+var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _forEach2 = _interopRequireDefault(require("lodash/forEach"));
 var _isNil2 = _interopRequireDefault(require("lodash/isNil"));
 var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
@@ -33,7 +31,6 @@ function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _
 function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
 function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
 var _entityManager = /*#__PURE__*/new WeakMap();
-var _getIndexProperties = /*#__PURE__*/new WeakMap();
 /**
  * Manage DynamoDb entities.
  *
@@ -59,10 +56,6 @@ class EntityManager {
       writable: true,
       value: void 0
     });
-    _classPrivateFieldInitSpec(this, _getIndexProperties, {
-      writable: true,
-      value: (entityToken, indexComponents) => (0, _sortBy2.default)((0, _uniq2.default)((0, _flatten2.default)(indexComponents.map(keyToken => (0, _inspectParametersDeclaration.getParametersNames)(_classPrivateFieldGet(this, _entityManager).getKeyGenerator(entityToken, keyToken))))))
-    });
     _classPrivateFieldSet(this, _entityManager, new _PrivateEntityManager.PrivateEntityManager({
       config,
       logger
@@ -103,8 +96,11 @@ class EntityManager {
     }
 
     // Add keys.
-    (0, _forEach2.default)(keys, (getValue, key) => {
-      if (overwrite || (0, _isNil2.default)(newItem[key])) newItem[key] = getValue(newItem);
+    (0, _forEach2.default)(keys, (_ref2, key) => {
+      let {
+        encode
+      } = _ref2;
+      if (overwrite || (0, _isNil2.default)(newItem[key])) newItem[key] = encode(newItem);
     });
     _classPrivateFieldGet(this, _entityManager).logger.debug('done', newItem);
 
@@ -130,52 +126,42 @@ class EntityManager {
   }
 
   /**
-   * Convert a item into a delimited string containing the properties of a named index.
+   * Condense an index object into a delimited string.
    *
    * @param {string} entityToken - Entity token.
    * @param {string} indexToken - Index token.
-   * @param {object} item - Entity item.
+   * @param {object} index - Index object.
    * @param {string} [delimiter] - Delimiter.
    * @returns {string} Dehydrated index.
    * @throws {Error} If entityToken is invalid.
    * @throws {Error} If indexToken is invalid.
    * @throws {Error} If item is invalid.
    */
-  dehydrateIndex(entityToken, indexToken, item) {
+  dehydrateIndex(entityToken, indexToken, index) {
     let delimiter = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '~';
     // Validate item.
-    _classPrivateFieldGet(this, _entityManager).validateItem(item);
+    _classPrivateFieldGet(this, _entityManager).validateItem(index);
     const indexComponents = _classPrivateFieldGet(this, _entityManager).getIndexComponents(entityToken, indexToken);
-    const indexProperties = _classPrivateFieldGet(this, _getIndexProperties).call(this, entityToken, indexComponents);
-    const {
-      shardKeyToken
-    } = _classPrivateFieldGet(this, _entityManager);
-    return (0, _values2.default)((0, _pick2.default)({
-      ...item,
-      [shardKeyToken]: this.calcShardKey(entityToken, item)
-    }, indexProperties)).join(delimiter);
-  }
-  /**
-   * Convert a delimited string into a named index key.
-   *
-   * @param {string} entityToken - Entity token.
-   * @param {string} indexToken - Index token.
-   * @param {string} value - Dehydrated index value.
-   * @param {string} [delimiter] - Delimiter.
-   * @returns {object} Rehydrated index key.
-   * @throws {Error} If entityToken is invalid.
-   * @throws {Error} If indexToken is invalid.
-   */
-  rehydrateIndex(entityToken, indexToken) {
-    let value = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-    let delimiter = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '~';
-    const indexComponents = _classPrivateFieldGet(this, _entityManager).getIndexComponents(entityToken, indexToken);
-    const indexProperties = _classPrivateFieldGet(this, _getIndexProperties).call(this, entityToken, indexComponents);
-    const item = (0, _zipObject2.default)(indexProperties, value.split(delimiter));
-    return indexComponents.reduce((index, component) => ({
-      ...index,
-      [component]: _classPrivateFieldGet(this, _entityManager).getKeyGenerator(entityToken, component)(item)
-    }), {});
+    const indexProperties = indexComponents.reduce((properties, component) => {
+      const {
+        decode
+      } = _classPrivateFieldGet(this, _entityManager).getKey(entityToken, component);
+      if (!(0, _isFunction2.default)(decode)) throw new Error(`no decode function defined on ${entityToken} entity key '${component}'`);
+      return {
+        ...properties,
+        ...decode(index[component])
+      };
+    }, {});
+    return (0, _sortedUniqBy2.default)((0, _sortBy2.default)((0, _entries2.default)(indexProperties), _ref3 => {
+      let [key] = _ref3;
+      return key;
+    }), _ref4 => {
+      let [key] = _ref4;
+      return key;
+    }).map(_ref5 => {
+      let [, value] = _ref5;
+      return value;
+    }).join(delimiter);
   }
 
   /**
@@ -195,7 +181,7 @@ class EntityManager {
     let timestamp = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : Date.now();
     _classPrivateFieldGet(this, _entityManager).logger.debug(`getting shard key space for ${entityToken} on key '${keyToken}' at timestamp ${timestamp}...`, item);
     const shardKeySpace = _classPrivateFieldGet(this, _entityManager).getShardKeySpace(entityToken, timestamp);
-    const result = (0, _sortedUniq2.default)(shardKeySpace.map(shardKey => _classPrivateFieldGet(this, _entityManager).getKeyGenerator(entityToken, keyToken)({
+    const result = (0, _sortedUniq2.default)(shardKeySpace.map(shardKey => _classPrivateFieldGet(this, _entityManager).getKey(entityToken, keyToken).encode({
       ...item,
       [_classPrivateFieldGet(this, _entityManager).shardKeyToken]: shardKey
     })));
@@ -266,11 +252,11 @@ class EntityManager {
     const shardQueryResults = await Promise.all((0, _map2.default)(pageKeys, (pageKey, shardedKey) => new Promise(resolve => shardQuery(shardedKey, {
       pageKey,
       limit: shardLimit
-    }).then(_ref2 => {
+    }).then(_ref6 => {
       let {
         items,
         pageKey
-      } = _ref2;
+      } = _ref6;
       return resolve({
         shardedKey,
         items,
@@ -279,12 +265,12 @@ class EntityManager {
     }))));
 
     // Reduce shardQueryResults into a single result.
-    const result = shardQueryResults.reduce((shardedQueryResult, _ref3) => {
+    const result = shardQueryResults.reduce((shardedQueryResult, _ref7) => {
       let {
         shardedKey,
         items,
         pageKey
-      } = _ref3;
+      } = _ref7;
       return {
         items: [...shardedQueryResult.items, ...items],
         pageKeys: {
@@ -301,6 +287,39 @@ class EntityManager {
     return result;
   }
 
+  /**
+   * Convert a delimited string into a named index key.
+   *
+   * @param {string} entityToken - Entity token.
+   * @param {string} indexToken - Index token.
+   * @param {string} value - Dehydrated index value.
+   * @param {string} [delimiter] - Delimiter.
+   * @returns {object} Rehydrated index key.
+   * @throws {Error} If entityToken is invalid.
+   * @throws {Error} If indexToken is invalid.
+   */
+  rehydrateIndex(entityToken, indexToken) {
+    let value = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+    let delimiter = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '~';
+    const indexComponents = _classPrivateFieldGet(this, _entityManager).getIndexComponents(entityToken, indexToken);
+    const indexKeys = (0, _sortBy2.default)(indexComponents.reduce((keys, component) => {
+      const {
+        encode
+      } = _classPrivateFieldGet(this, _entityManager).getKey(entityToken, component);
+      return [...new Set([...keys, ...(0, _inspectParametersDeclaration.getParametersNames)(encode)]).values()];
+    }, []));
+    const indexProperies = (0, _zipObject2.default)(indexKeys, value.split(delimiter));
+    return indexComponents.reduce((index, component) => {
+      const {
+        encode
+      } = _classPrivateFieldGet(this, _entityManager).getKey(entityToken, component);
+      return {
+        ...index,
+        [component]: encode(indexProperies)
+      };
+    }, {});
+  }
+
   /**
    * Remove sharded keys from an entity item. Does not mutate original item.
    *

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

@@ -12,8 +12,10 @@ var _filter2 = _interopRequireDefault(require("lodash/filter"));
 var _findLast2 = _interopRequireDefault(require("lodash/findLast"));
 var _has2 = _interopRequireDefault(require("lodash/has"));
 var _map2 = _interopRequireDefault(require("lodash/map"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _isNil2 = _interopRequireDefault(require("lodash/isNil"));
+var _isUndefined2 = _interopRequireDefault(require("lodash/isUndefined"));
+var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
+var _forEach2 = _interopRequireDefault(require("lodash/forEach"));
 var _keys2 = _interopRequireDefault(require("lodash/keys"));
 var _difference2 = _interopRequireDefault(require("lodash/difference"));
 var _some2 = _interopRequireDefault(require("lodash/some"));
@@ -102,6 +104,15 @@ const configSchema = {
   },
   additionalProperties: false
 };
+const keySchema = {
+  type: 'object',
+  properties: {
+    encode: {},
+    decode: {}
+  },
+  additionalProperties: false,
+  required: ['encode']
+};
 
 /**
  * Private EntityManager implementation.
@@ -197,7 +208,7 @@ class PrivateEntityManager {
       shardKeyToken
     };
 
-    // Validate entity properties.
+    // Conform & validate entity properties.
     (0, _some2.default)(conformedConfig.entities, (_ref2, entityToken) => {
       let {
         indexes,
@@ -220,13 +231,26 @@ class PrivateEntityManager {
         } else return false;
       });
 
-      // Validate entity keys are functions or undefined.
-      (0, _some2.default)(keys, (value, key) => {
-        if (!(0, _isNil2.default)(value) && !(0, _isFunction2.default)(value)) {
-          const message = `${entityToken} key '${key}' must be a function or nil.`;
+      // Conform & validate entity keys.
+      (0, _forEach2.default)(keys, (value, key) => {
+        keys[key] = (0, _isFunction2.default)(value) ? {
+          encode: value
+        } : value;
+
+        // 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);
+        }
+        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);
-        } else return false;
+        }
       });
 
       // Validate sharding bump values increase monotonically with keys.
@@ -320,7 +344,7 @@ class PrivateEntityManager {
     }
     return indexes[indexToken];
   }
-  getKeyGenerator(entityToken, keyToken) {
+  getKey(entityToken, keyToken) {
     const {
       keys
     } = this.getEntityConfig(entityToken);
@@ -416,30 +440,30 @@ class PrivateEntityManager {
   }
 
   /**
-   * Tests whether a key token is valid.
+   * Tests whether an item is valid.
    *
-   * @param {string} entityToken - Entity token.
-   * @param {string} keyToken - Key token.
-   * @returns {boolean} true if keyToken is valid.
+   * @param {string} item - Entity token.
+   * @returns {boolean} true if entityToken is valid.
    */
-  validateKeyToken(entityToken, keyToken) {
-    this.validateEntityToken(entityToken);
-    if (!this.config.entities[entityToken].keys[keyToken]) {
-      const message = `Invalid entity ${entityToken} keyToken: ${keyToken}`;
+  validateItem(item) {
+    if (!(0, _isPlainObject2.default)(item)) {
+      const message = `Invalid item: ${item}`;
       this.logger.error(message);
       throw new Error(message);
     } else return true;
   }
 
   /**
-   * Tests whether an item is valid.
+   * Tests whether a key token is valid.
    *
-   * @param {string} item - Entity token.
-   * @returns {boolean} true if entityToken is valid.
+   * @param {string} entityToken - Entity token.
+   * @param {string} keyToken - Key token.
+   * @returns {boolean} true if keyToken is valid.
    */
-  validateItem(item) {
-    if (!(0, _isPlainObject2.default)(item)) {
-      const message = `Invalid item: ${item}`;
+  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;

package/lib/EntityManager/EntityManager.js

@@ -63,8 +63,8 @@ export class EntityManager {
     }
 
     // Add keys.
-    _.forEach(keys, (getValue, key) => {
-      if (overwrite || _.isNil(newItem[key])) newItem[key] = getValue(newItem);
+    _.forEach(keys, ({ encode }, key) => {
+      if (overwrite || _.isNil(newItem[key])) newItem[key] = encode(newItem);
     });
     this.#entityManager.logger.debug('done', newItem);
 
@@ -90,90 +90,42 @@ export class EntityManager {
   }
 
   /**
-   * Convert a item into a delimited string containing the properties of a named index.
+   * Condense an index object into a delimited string.
    *
    * @param {string} entityToken - Entity token.
    * @param {string} indexToken - Index token.
-   * @param {object} item - Entity item.
+   * @param {object} index - Index object.
    * @param {string} [delimiter] - Delimiter.
    * @returns {string} Dehydrated index.
    * @throws {Error} If entityToken is invalid.
    * @throws {Error} If indexToken is invalid.
    * @throws {Error} If item is invalid.
    */
-  dehydrateIndex(entityToken, indexToken, item, delimiter = '~') {
+  dehydrateIndex(entityToken, indexToken, index, delimiter = '~') {
     // Validate item.
-    this.#entityManager.validateItem(item);
-
-    const indexComponents = this.#entityManager.getIndexComponents(
-      entityToken,
-      indexToken
-    );
+    this.#entityManager.validateItem(index);
 
-    const indexProperties = this.#getIndexProperties(
-      entityToken,
-      indexComponents
-    );
-
-    const { shardKeyToken } = this.#entityManager;
-    return _.values(
-      _.pick(
-        {
-          ...item,
-          [shardKeyToken]: this.calcShardKey(entityToken, item),
-        },
-        indexProperties
-      )
-    ).join(delimiter);
-  }
-
-  #getIndexProperties = (entityToken, indexComponents) =>
-    _.sortBy(
-      _.uniq(
-        _.flatten(
-          indexComponents.map((keyToken) =>
-            getParametersNames(
-              this.#entityManager.getKeyGenerator(entityToken, keyToken)
-            )
-          )
-        )
-      )
-    );
-
-  /**
-   * Convert a delimited string into a named index key.
-   *
-   * @param {string} entityToken - Entity token.
-   * @param {string} indexToken - Index token.
-   * @param {string} value - Dehydrated index value.
-   * @param {string} [delimiter] - Delimiter.
-   * @returns {object} Rehydrated index key.
-   * @throws {Error} If entityToken is invalid.
-   * @throws {Error} If indexToken is invalid.
-   */
-  rehydrateIndex(entityToken, indexToken, value = '', delimiter = '~') {
     const indexComponents = this.#entityManager.getIndexComponents(
       entityToken,
       indexToken
     );
 
-    const indexProperties = this.#getIndexProperties(
-      entityToken,
-      indexComponents
-    );
-
-    const item = _.zipObject(indexProperties, value.split(delimiter));
-
-    return indexComponents.reduce(
-      (index, component) => ({
-        ...index,
-        [component]: this.#entityManager.getKeyGenerator(
-          entityToken,
-          component
-        )(item),
-      }),
-      {}
-    );
+    const indexProperties = indexComponents.reduce((properties, component) => {
+      const { decode } = this.#entityManager.getKey(entityToken, component);
+      if (!_.isFunction(decode))
+        throw new Error(
+          `no decode function defined on ${entityToken} entity key '${component}'`
+        );
+
+      return { ...properties, ...decode(index[component]) };
+    }, {});
+
+    return _.sortedUniqBy(
+      _.sortBy(_.entries(indexProperties), ([key]) => key),
+      ([key]) => key
+    )
+      .map(([, value]) => value)
+      .join(delimiter);
   }
 
   /**
@@ -202,10 +154,7 @@ export class EntityManager {
 
     const result = _.sortedUniq(
       shardKeySpace.map((shardKey) =>
-        this.#entityManager.getKeyGenerator(
-          entityToken,
-          keyToken
-        )({
+        this.#entityManager.getKey(entityToken, keyToken).encode({
           ...item,
           [this.#entityManager.shardKeyToken]: shardKey,
         })
@@ -312,6 +261,38 @@ export class EntityManager {
     return result;
   }
 
+  /**
+   * Convert a delimited string into a named index key.
+   *
+   * @param {string} entityToken - Entity token.
+   * @param {string} indexToken - Index token.
+   * @param {string} value - Dehydrated index value.
+   * @param {string} [delimiter] - Delimiter.
+   * @returns {object} Rehydrated index key.
+   * @throws {Error} If entityToken is invalid.
+   * @throws {Error} If indexToken is invalid.
+   */
+  rehydrateIndex(entityToken, indexToken, value = '', delimiter = '~') {
+    const indexComponents = this.#entityManager.getIndexComponents(
+      entityToken,
+      indexToken
+    );
+
+    const indexKeys = _.sortBy(
+      indexComponents.reduce((keys, component) => {
+        const { encode } = this.#entityManager.getKey(entityToken, component);
+        return [...new Set([...keys, ...getParametersNames(encode)]).values()];
+      }, [])
+    );
+
+    const indexProperies = _.zipObject(indexKeys, value.split(delimiter));
+
+    return indexComponents.reduce((index, component) => {
+      const { encode } = this.#entityManager.getKey(entityToken, component);
+      return { ...index, [component]: encode(indexProperies) };
+    }, {});
+  }
+
   /**
    * Remove sharded keys from an entity item. Does not mutate original item.
    *

package/lib/EntityManager/PrivateEntityManager.js

@@ -67,6 +67,16 @@ const configSchema = {
   additionalProperties: false,
 };
 
+const keySchema = {
+  type: 'object',
+  properties: {
+    encode: {},
+    decode: {},
+  },
+  additionalProperties: false,
+  required: ['encode'],
+};
+
 /**
  * Private EntityManager implementation.
  *
@@ -151,7 +161,7 @@ export class PrivateEntityManager {
       shardKeyToken,
     };
 
-    // Validate entity properties.
+    // Conform & validate entity properties.
     _.some(
       conformedConfig.entities,
       (
@@ -172,13 +182,25 @@ export class PrivateEntityManager {
           } else return false;
         });
 
-        // Validate entity keys are functions or undefined.
-        _.some(keys, (value, key) => {
-          if (!_.isNil(value) && !_.isFunction(value)) {
-            const message = `${entityToken} key '${key}' must be a function or nil.`;
+        // Conform & validate entity keys.
+        _.forEach(keys, (value, key) => {
+          keys[key] = _.isFunction(value) ? { encode: value } : value;
+
+          // 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);
+          }
+
+          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);
-          } else return false;
+          }
         });
 
         // Validate sharding bump values increase monotonically with keys.
@@ -275,7 +297,7 @@ export class PrivateEntityManager {
     return indexes[indexToken];
   }
 
-  getKeyGenerator(entityToken, keyToken) {
+  getKey(entityToken, keyToken) {
     const { keys } = this.getEntityConfig(entityToken);
 
     if (!_.has(keys, keyToken)) {
@@ -383,6 +405,20 @@ export class PrivateEntityManager {
     } else return true;
   }
 
+  /**
+   * Tests whether an item is valid.
+   *
+   * @param {string} item - Entity token.
+   * @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;
+  }
+
   /**
    * Tests whether a key token is valid.
    *
@@ -400,20 +436,6 @@ export class PrivateEntityManager {
     } else return true;
   }
 
-  /**
-   * Tests whether an item is valid.
-   *
-   * @param {string} item - Entity token.
-   * @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;
-  }
-
   /**
    * Tests whether a timestamp is valid.
    *

package/package.json

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