@karmaniverous/entity-manager 4.2.1 → 4.3.0-1

package/README.md

@@ -364,15 +364,16 @@ Query an entity across shards.
 **Kind**: instance method of [<code>EntityManager</code>](#module_entity-manager.EntityManager)  
 **Returns**: <code>Promise.&lt;ShardedQueryResult&gt;</code> - Sharded query result.  
 
-| Param | Type | Default | Description |
-| --- | --- | --- | --- |
-| options | <code>object</code> |  | Query options. |
-| options.entityToken | <code>string</code> |  | Entity token. |
-| [options.keyToken] | <code>string</code> | <code>&quot;entityPK&quot;</code> | Key token. |
-| [options.item] | <code>object</code> | <code>{}</code> | Entity item sufficiently populated to generate property keyToken. |
-| options.shardQuery | <code>ShardQueryFunction</code> |  | Sharded query function. |
-| [options.limit] | <code>number</code> |  | Request limit. |
-| [options.pageKeys] | <code>object</code> |  | Map of shard page keys. |
+| Param | Type | Description |
+| --- | --- | --- |
+| options | <code>object</code> | Query options. |
+| options.entityToken | <code>string</code> | Entity token. |
+| [options.keyToken] | <code>string</code> | Key token. |
+| [options.item] | <code>object</code> | Entity item sufficiently populated to generate property keyToken. |
+| options.shardQuery | <code>ShardQueryFunction</code> | Sharded query function. |
+| [options.limit] | <code>number</code> | Request limit. |
+| [options.pageKeys] | <code>object</code> | Map of shard page keys. |
+| [options.pages] | <code>number</code> \| <code>&#x27;all&#x27;</code> | Max number of pages to query. |
 
 <a name="module_entity-manager.EntityManager+rehydrateIndex"></a>
 

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

@@ -9,6 +9,8 @@ var _map2 = _interopRequireDefault(require("lodash/map"));
 var _size2 = _interopRequireDefault(require("lodash/size"));
 var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
 var _fromPairs2 = _interopRequireDefault(require("lodash/fromPairs"));
+var _parseInt2 = _interopRequireDefault(require("lodash/parseInt"));
+var _isString2 = _interopRequireDefault(require("lodash/isString"));
 var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
 var _isInteger2 = _interopRequireDefault(require("lodash/isInteger"));
 var _isUndefined2 = _interopRequireDefault(require("lodash/isUndefined"));
@@ -25,20 +27,18 @@ var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _inspectParametersDeclaration = require("inspect-parameters-declaration");
 var _PrivateEntityManager = require("./PrivateEntityManager.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
-function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
-function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
-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();
+/**
+ * @module entity-manager
+ */
+
 /**
  * Manage DynamoDb entities.
  *
  * @class
  */
 class EntityManager {
+  #entityManager;
+
   /**
    * Create an EntityManager instance.
    *
@@ -54,14 +54,10 @@ class EntityManager {
       config,
       logger
     } = _ref;
-    _classPrivateFieldInitSpec(this, _entityManager, {
-      writable: true,
-      value: void 0
-    });
-    _classPrivateFieldSet(this, _entityManager, new _PrivateEntityManager.PrivateEntityManager({
+    this.#entityManager = new _PrivateEntityManager.PrivateEntityManager({
       config,
       logger
-    }));
+    });
   }
 
   /**
@@ -69,17 +65,17 @@ class EntityManager {
    *
    * @param {string} entityToken - Entity token.
    * @param {object} item - Entity item.
-   * @param {boolean} [overwrite=false] - Overwrite existing properties.
+   * @param {boolean} [overwrite] - Overwrite existing properties.
    * @returns {object} Decorated entity item.
    * @throws {Error} If entityToken is invalid.
    * @throws {Error} If item is invalid.
    */
   addKeys(entityToken, item) {
     let overwrite = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    _classPrivateFieldGet(this, _entityManager).logger.debug(`adding sharded index keys to ${entityToken}${overwrite ? ' with overwrite' : ''}...`, item);
+    this.#entityManager.logger.debug(`adding sharded index keys to ${entityToken}${overwrite ? ' with overwrite' : ''}...`, item);
 
     // Validate item.
-    _classPrivateFieldGet(this, _entityManager).validateItem(item);
+    this.#entityManager.validateItem(item);
 
     // Clone item.
     const newItem = (0, _cloneDeep2.default)(item);
@@ -87,10 +83,10 @@ class EntityManager {
     // Get entity config.
     const {
       shardKeyToken
-    } = _classPrivateFieldGet(this, _entityManager);
+    } = this.#entityManager;
     const {
       keys
-    } = _classPrivateFieldGet(this, _entityManager).getEntityConfig(entityToken);
+    } = this.#entityManager.getEntityConfig(entityToken);
 
     // Add shardKey.
     if (overwrite || (0, _isNil2.default)(newItem[shardKeyToken])) {
@@ -104,7 +100,7 @@ class EntityManager {
       } = _ref2;
       if (overwrite || (0, _isNil2.default)(newItem[key])) newItem[key] = encode(newItem);
     });
-    _classPrivateFieldGet(this, _entityManager).logger.debug('done', newItem);
+    this.#entityManager.logger.debug('done', newItem);
 
     // Remove undefined shardKey.
     if ((0, _isNil2.default)(newItem[shardKeyToken])) delete newItem[shardKeyToken];
@@ -121,10 +117,10 @@ class EntityManager {
   calcShardKey(entityToken, item) {
     const {
       sharding
-    } = _classPrivateFieldGet(this, _entityManager).getEntityConfig(entityToken);
+    } = this.#entityManager.getEntityConfig(entityToken);
     const entityKey = sharding.entityKey(item);
     const timestamp = sharding.timestamp(item);
-    return _classPrivateFieldGet(this, _entityManager).getShardKey(entityToken, entityKey, timestamp);
+    return this.#entityManager.getShardKey(entityToken, entityKey, timestamp);
   }
 
   /**
@@ -142,8 +138,8 @@ class EntityManager {
   dehydrateIndex(entityToken, indexToken, index) {
     let delimiter = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '~';
     // Validate item.
-    _classPrivateFieldGet(this, _entityManager).validateItem(index);
-    const indexComponents = (0, _isArray2.default)(indexToken) ? indexToken : _classPrivateFieldGet(this, _entityManager).getIndexComponents(entityToken, indexToken);
+    this.#entityManager.validateItem(index);
+    const indexComponents = (0, _isArray2.default)(indexToken) ? indexToken : this.#entityManager.getIndexComponents(entityToken, indexToken);
     const indexProperties = indexComponents.reduce((properties, component) => {
       const {
         decode
@@ -176,7 +172,7 @@ class EntityManager {
   getKey(entityToken, keyToken) {
     const {
       keys
-    } = _classPrivateFieldGet(this, _entityManager).getEntityConfig(entityToken);
+    } = this.#entityManager.getEntityConfig(entityToken);
     if (!(0, _has2.default)(keys, keyToken)) throw new Error(`Key '${keyToken}' does not exist for entity '${entityToken}'.`);
     return keys[keyToken];
   }
@@ -196,13 +192,13 @@ class EntityManager {
    */
   getKeySpace(entityToken, keyToken, item) {
     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);
+    this.#entityManager.logger.debug(`getting shard key space for ${entityToken} on key '${keyToken}' at timestamp ${timestamp}...`, item);
+    const shardKeySpace = this.#entityManager.getShardKeySpace(entityToken, timestamp);
     const result = (0, _sortedUniq2.default)(shardKeySpace.map(shardKey => this.getKey(entityToken, keyToken).encode({
       ...item,
-      [_classPrivateFieldGet(this, _entityManager).shardKeyToken]: shardKey
+      [this.#entityManager.shardKeyToken]: shardKey
     })));
-    _classPrivateFieldGet(this, _entityManager).logger.debug('done', result);
+    this.#entityManager.logger.debug('done', result);
     return result;
   }
 
@@ -233,11 +229,12 @@ class EntityManager {
    *
    * @param {object} options - Query options.
    * @param {string} options.entityToken - Entity token.
-   * @param {string} [options.keyToken=entityPK] - Key token.
-   * @param {object} [options.item={}] - Entity item sufficiently populated to generate property keyToken.
+   * @param {string} [options.keyToken] - Key token.
+   * @param {object} [options.item] - Entity item sufficiently populated to generate property keyToken.
    * @param {ShardQueryFunction} options.shardQuery - Sharded query function.
    * @param {number} [options.limit] - Request limit.
    * @param {object} [options.pageKeys] - Map of shard page keys.
+   * @param {number|'all'} [options.pages] - Max number of pages to query.
    * @returns {Promise<ShardedQueryResult>} Sharded query result.
    */
   async query() {
@@ -247,14 +244,19 @@ class EntityManager {
       item = {},
       shardQuery,
       limit,
-      pageKeys
+      pageKeys,
+      pages = 1
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     // Validate params.
-    _classPrivateFieldGet(this, _entityManager).validateKeyToken(entityToken, keyToken);
-    _classPrivateFieldGet(this, _entityManager).validateItem(item);
+    this.#entityManager.validateKeyToken(entityToken, keyToken);
+    this.#entityManager.validateItem(item);
     if (!(0, _isFunction2.default)(shardQuery)) throw new Error('shardQuery must be a function');
-    if (!(0, _isUndefined2.default)(limit) && !(0, _isInteger2.default)(limit)) throw new Error('limit must be an integer');
+    if (!(0, _isUndefined2.default)(limit) && !((0, _isInteger2.default)(limit) && limit >= 1)) throw new Error('limit must be a positive integer');
     if (!(0, _isUndefined2.default)(pageKeys) && !(0, _isPlainObject2.default)(pageKeys)) throw new Error('pageKeys must be an object');
+    if (!(0, _isUndefined2.default)(pages) && !/^(?:\d+|all)$/i.test(pages.toString())) throw new Error("pages must be a positive integer or 'all'");
+
+    // Parse pages.
+    if ((0, _isString2.default)(pages)) pages = pages.toLowerCase() === 'all' ? Infinity : (0, _parseInt2.default)(pages);
 
     // Generate default pageKeys if not provided
     pageKeys ??= (0, _fromPairs2.default)(this.getKeySpace(entityToken, keyToken, item).map(shardedKey => [shardedKey, undefined]));
@@ -268,44 +270,57 @@ class EntityManager {
     // Calculate shard limit.
     const shardLimit = (0, _isUndefined2.default)(limit) ? undefined : Math.ceil(limit / (0, _size2.default)(pageKeys));
 
-    // Query every shard in pageKeys.
-    const shardQueryResults = await Promise.all((0, _map2.default)(pageKeys, (pageKey, shardedKey) => new Promise(resolve => shardQuery(shardedKey, pageKey, shardLimit).then(_ref6 => {
-      let {
-        count,
-        items,
-        pageKey
-      } = _ref6;
-      return resolve({
-        count,
-        items,
-        pageKey,
-        shardedKey
-      });
-    }))));
-
-    // Reduce shardQueryResults into a single result.
-    const result = shardQueryResults.reduce((shardedQueryResult, _ref7) => {
-      let {
-        count,
-        items,
-        pageKey,
-        shardedKey
-      } = _ref7;
-      return {
-        count: shardedQueryResult.count + count,
-        items: [...shardedQueryResult.items, ...items],
-        pageKeys: {
-          ...shardedQueryResult.pageKeys,
-          ...((0, _isUndefined2.default)(pageKey) ? {} : {
-            [shardedKey]: pageKey
-          })
-        }
-      };
-    }, {
+    // Iterate search over pages.
+    let page = 0;
+    const result = {
       count: 0,
       items: [],
-      pageKeys: {}
-    });
+      pageKeys
+    };
+    do {
+      // Query every shard in pageKeys.
+      const shardQueryResults = await Promise.all((0, _map2.default)(result.pageKeys, (pageKey, shardedKey) => new Promise(resolve => shardQuery(shardedKey, pageKey, shardLimit).then(_ref6 => {
+        let {
+          count,
+          items,
+          pageKey
+        } = _ref6;
+        return resolve({
+          count,
+          items,
+          pageKey,
+          shardedKey
+        });
+      }))));
+
+      // Reduce shardQueryResults into a single result.
+      const pageResult = shardQueryResults.reduce((shardedQueryResult, _ref7) => {
+        let {
+          count,
+          items,
+          pageKey,
+          shardedKey
+        } = _ref7;
+        return {
+          count: shardedQueryResult.count + count,
+          items: [...shardedQueryResult.items, ...items],
+          pageKeys: {
+            ...shardedQueryResult.pageKeys,
+            ...((0, _isUndefined2.default)(pageKey) ? {} : {
+              [shardedKey]: pageKey
+            })
+          }
+        };
+      }, {
+        count: 0,
+        items: [],
+        pageKeys: {}
+      });
+      result.count += pageResult.count;
+      result.items = [...result.items, ...pageResult.items];
+      result.pageKeys = pageResult.pageKeys;
+      page++;
+    } while (page < pages && !(0, _isEmpty2.default)(result.pageKeys));
     return result;
   }
 
@@ -323,7 +338,7 @@ class EntityManager {
   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 = (0, _isArray2.default)(indexToken) ? indexToken : _classPrivateFieldGet(this, _entityManager).getIndexComponents(entityToken, indexToken);
+    const indexComponents = (0, _isArray2.default)(indexToken) ? indexToken : this.#entityManager.getIndexComponents(entityToken, indexToken);
     const indexKeys = (0, _sortBy2.default)(indexComponents.reduce((keys, component) => {
       const {
         encode
@@ -352,10 +367,10 @@ class EntityManager {
    * @throws {Error} If item is invalid.
    */
   removeKeys(entityToken, item) {
-    _classPrivateFieldGet(this, _entityManager).logger.debug(`removing sharded index keys from ${entityToken}...`, item);
+    this.#entityManager.logger.debug(`removing sharded index keys from ${entityToken}...`, item);
 
     // Validate item.
-    _classPrivateFieldGet(this, _entityManager).validateItem(item);
+    this.#entityManager.validateItem(item);
 
     // Clone item.
     const newItem = (0, _cloneDeep2.default)(item);
@@ -363,10 +378,10 @@ class EntityManager {
     // Get entity config.
     const {
       shardKeyToken
-    } = _classPrivateFieldGet(this, _entityManager);
+    } = this.#entityManager;
     const {
       keys
-    } = _classPrivateFieldGet(this, _entityManager).getEntityConfig(entityToken);
+    } = this.#entityManager.getEntityConfig(entityToken);
 
     // Remove shardKey.
     delete newItem[shardKeyToken];
@@ -375,7 +390,7 @@ class EntityManager {
     (0, _forEach2.default)(keys, (value, key) => {
       if (!value.retain) delete newItem[key];
     });
-    _classPrivateFieldGet(this, _entityManager).logger.debug('done', newItem);
+    this.#entityManager.logger.debug('done', newItem);
     return newItem;
   }
 }

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

@@ -26,13 +26,6 @@ var _mapValues2 = _interopRequireDefault(require("lodash/mapValues"));
 var _jsonschema = require("jsonschema");
 var _stringHash = _interopRequireDefault(require("string-hash"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
-function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
-function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
-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; } }
 /**
  * EntityManager config validation schema.
  *
@@ -122,9 +115,10 @@ const keySchema = {
  *
  * @private
  */
-var _config = /*#__PURE__*/new WeakMap();
-var _logger = /*#__PURE__*/new WeakMap();
 class PrivateEntityManager {
+  #config;
+  #logger;
+
   /**
    * Create a PrivateEntityManager instance.
    *
@@ -139,17 +133,9 @@ class PrivateEntityManager {
       config = {},
       logger = console
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    _classPrivateFieldInitSpec(this, _config, {
-      writable: true,
-      value: void 0
-    });
-    _classPrivateFieldInitSpec(this, _logger, {
-      writable: true,
-      value: void 0
-    });
     // Validate logger.
     if (!logger.error || !logger.debug) throw new Error('logger must implement error & debug methods.');
-    _classPrivateFieldSet(this, _logger, logger);
+    this.#logger = logger;
     this.config = config;
   }
 
@@ -159,7 +145,7 @@ class PrivateEntityManager {
    * @returns {object} Current config.
    */
   get config() {
-    return _classPrivateFieldGet(this, _config);
+    return this.#config;
   }
 
   /**
@@ -266,7 +252,7 @@ class PrivateEntityManager {
       // Validate sharding timestamp is a function or undefined.
       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);
+    this.#config = conformedConfig;
   }
 
   /**
@@ -275,7 +261,7 @@ class PrivateEntityManager {
    * @returns {object} Logger instance.
    */
   get logger() {
-    return _classPrivateFieldGet(this, _logger);
+    return this.#logger;
   }
 
   /**
@@ -284,7 +270,7 @@ class PrivateEntityManager {
    * @returns {string} Shard key token.
    */
   get shardKeyToken() {
-    return _classPrivateFieldGet(this, _config).shardKeyToken;
+    return this.#config.shardKeyToken;
   }
 
   /**
@@ -411,7 +397,7 @@ class PrivateEntityManager {
    * Tests whether a timestamp is valid.
    *
    * @param {number} timestamp - timestamp.
-   * @param {boolean} [future=false] - true if timestamp must be in the future.
+   * @param {boolean} [future] - true if timestamp must be in the future.
    * @returns {boolean} true if timestamp is valid.
    */
   validateTimestamp(timestamp) {

package/lib/EntityManager/EntityManager.js

@@ -34,7 +34,7 @@ export class EntityManager {
    *
    * @param {string} entityToken - Entity token.
    * @param {object} item - Entity item.
-   * @param {boolean} [overwrite=false] - Overwrite existing properties.
+   * @param {boolean} [overwrite] - Overwrite existing properties.
    * @returns {object} Decorated entity item.
    * @throws {Error} If entityToken is invalid.
    * @throws {Error} If item is invalid.
@@ -212,11 +212,12 @@ export class EntityManager {
    *
    * @param {object} options - Query options.
    * @param {string} options.entityToken - Entity token.
-   * @param {string} [options.keyToken=entityPK] - Key token.
-   * @param {object} [options.item={}] - Entity item sufficiently populated to generate property keyToken.
+   * @param {string} [options.keyToken] - Key token.
+   * @param {object} [options.item] - Entity item sufficiently populated to generate property keyToken.
    * @param {ShardQueryFunction} options.shardQuery - Sharded query function.
    * @param {number} [options.limit] - Request limit.
    * @param {object} [options.pageKeys] - Map of shard page keys.
+   * @param {number|'all'} [options.pages] - Max number of pages to query.
    * @returns {Promise<ShardedQueryResult>} Sharded query result.
    */
   async query({
@@ -226,16 +227,23 @@ export class EntityManager {
     shardQuery,
     limit,
     pageKeys,
+    pages = 1,
   } = {}) {
     // Validate params.
     this.#entityManager.validateKeyToken(entityToken, keyToken);
     this.#entityManager.validateItem(item);
     if (!_.isFunction(shardQuery))
       throw new Error('shardQuery must be a function');
-    if (!_.isUndefined(limit) && !_.isInteger(limit))
-      throw new Error('limit must be an integer');
+    if (!_.isUndefined(limit) && !(_.isInteger(limit) && limit >= 1))
+      throw new Error('limit must be a positive integer');
     if (!_.isUndefined(pageKeys) && !_.isPlainObject(pageKeys))
       throw new Error('pageKeys must be an object');
+    if (!_.isUndefined(pages) && !/^(?:\d+|all)$/i.test(pages.toString()))
+      throw new Error("pages must be a positive integer or 'all'");
+
+    // Parse pages.
+    if (_.isString(pages))
+      pages = pages.toLowerCase() === 'all' ? Infinity : _.parseInt(pages);
 
     // Generate default pageKeys if not provided
     pageKeys ??= _.fromPairs(
@@ -253,32 +261,43 @@ export class EntityManager {
       ? undefined
       : Math.ceil(limit / _.size(pageKeys));
 
-    // Query every shard in pageKeys.
-    const shardQueryResults = await Promise.all(
-      _.map(
-        pageKeys,
-        (pageKey, shardedKey) =>
-          new Promise((resolve) =>
-            shardQuery(shardedKey, pageKey, shardLimit).then(
-              ({ count, items, pageKey }) =>
-                resolve({ count, items, pageKey, shardedKey })
+    // Iterate search over pages.
+    let page = 0;
+    const result = { count: 0, items: [], pageKeys };
+
+    do {
+      // Query every shard in pageKeys.
+      const shardQueryResults = await Promise.all(
+        _.map(
+          result.pageKeys,
+          (pageKey, shardedKey) =>
+            new Promise((resolve) =>
+              shardQuery(shardedKey, pageKey, shardLimit).then(
+                ({ count, items, pageKey }) =>
+                  resolve({ count, items, pageKey, shardedKey })
+              )
             )
-          )
-      )
-    );
+        )
+      );
 
-    // Reduce shardQueryResults into a single result.
-    const result = shardQueryResults.reduce(
-      (shardedQueryResult, { count, items, pageKey, shardedKey }) => ({
-        count: shardedQueryResult.count + count,
-        items: [...shardedQueryResult.items, ...items],
-        pageKeys: {
-          ...shardedQueryResult.pageKeys,
-          ...(_.isUndefined(pageKey) ? {} : { [shardedKey]: pageKey }),
-        },
-      }),
-      { count: 0, items: [], pageKeys: {} }
-    );
+      // Reduce shardQueryResults into a single result.
+      const pageResult = shardQueryResults.reduce(
+        (shardedQueryResult, { count, items, pageKey, shardedKey }) => ({
+          count: shardedQueryResult.count + count,
+          items: [...shardedQueryResult.items, ...items],
+          pageKeys: {
+            ...shardedQueryResult.pageKeys,
+            ...(_.isUndefined(pageKey) ? {} : { [shardedKey]: pageKey }),
+          },
+        }),
+        { count: 0, items: [], pageKeys: {} }
+      );
+
+      result.count += pageResult.count;
+      result.items = [...result.items, ...pageResult.items];
+      result.pageKeys = pageResult.pageKeys;
+      page++;
+    } while (page < pages && !_.isEmpty(result.pageKeys));
 
     return result;
   }

package/lib/EntityManager/PrivateEntityManager.js

@@ -408,7 +408,7 @@ export class PrivateEntityManager {
    * Tests whether a timestamp is valid.
    *
    * @param {number} timestamp - timestamp.
-   * @param {boolean} [future=false] - true if timestamp must be in the future.
+   * @param {boolean} [future] - true if timestamp must be in the future.
    * @returns {boolean} true if timestamp is valid.
    */
   validateTimestamp(timestamp, future = false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karmaniverous/entity-manager",
-  "version": "4.2.1",
+  "version": "4.3.0-1",
   "publishConfig": {
     "access": "public"
   },
@@ -26,27 +26,25 @@
     "string-hash": "^1.1.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.7",
-    "@babel/eslint-parser": "^7.19.1",
-    "@babel/plugin-syntax-import-assertions": "^7.20.0",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/register": "^7.18.9",
-    "@karmaniverous/edge-logger": "^1.0.2",
-    "@karmaniverous/get-dotenv": "^0.1.0",
-    "@karmaniverous/tagged-templates": "^0.0.4",
-    "@types/node": "^18.11.18",
+    "@babel/cli": "^7.22.5",
+    "@babel/core": "^7.22.5",
+    "@babel/eslint-parser": "^7.22.5",
+    "@babel/plugin-syntax-import-assertions": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
+    "@babel/register": "^7.22.5",
+    "@karmaniverous/edge-logger": "^1.2.1",
+    "@karmaniverous/tagged-templates": "^0.1.1",
+    "@types/node": "^20.3.1",
     "babel-plugin-lodash": "^3.3.4",
     "chai": "^4.3.7",
-    "concat-md": "^0.5.0",
-    "eslint": "^8.30.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-jsdoc": "^39.7.4",
+    "concat-md": "^0.5.1",
+    "eslint": "^8.43.0",
+    "eslint-plugin-jsdoc": "^46.2.6",
     "eslint-plugin-mocha": "^10.1.0",
+    "eslint-plugin-promise": "^6.1.1",
     "jsdoc-to-markdown": "^8.0.0",
     "mocha": "^10.2.0",
-    "prettier": "^2.8.1",
-    "release-it": "^15.6.0"
+    "release-it": "^15.11.0"
   },
   "exports": {
     ".": {
@@ -80,8 +78,8 @@
     "test": "mocha",
     "build": "babel lib -d dist/default/lib --delete-dir-on-start --config-file ./dist/default/.babelrc",
     "doc": "jsdoc2md -c doc/jsdoc.config.json -f lib/**/*.* -t doc/api-template.hbs > doc/2-api.jsdoc2.md && concat-md doc --hide-anchor-links > README.md",
-    "package": "npm run lint && npm run test && npm run build && npm run doc",
-    "release": "npm run package && getdotenv -- release-it"
+    "prerelease": "npm run lint && npm run test && npm run build && npm run doc",
+    "release": "release-it"
   },
   "type": "module"
 }