@karmaniverous/entity-manager 4.3.0-0 → 4.3.0-2

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"));
@@ -251,13 +253,17 @@ class EntityManager {
     if (!(0, _isFunction2.default)(shardQuery)) throw new Error('shardQuery must be a function');
     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)(pageKeys) && !((0, _isInteger2.default)(pages) && pages >= 1) && pages !== 'all') throw new Error("pages must be a positive integer or 'all'");
+    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]));
 
     // Return empty result if no pageKeys.
     if ((0, _isEmpty2.default)(pageKeys)) return {
+      count: 0,
       items: [],
       pageKeys: {}
     };
@@ -315,7 +321,7 @@ class EntityManager {
       result.items = [...result.items, ...pageResult.items];
       result.pageKeys = pageResult.pageKeys;
       page++;
-    } while ((pages === 'all' || page < pages) && !(0, _isEmpty2.default)(result.pageKeys));
+    } while (page < pages && !(0, _isEmpty2.default)(result.pageKeys));
     return result;
   }
 

package/lib/EntityManager/EntityManager.js

@@ -238,13 +238,13 @@ export class EntityManager {
       throw new Error('limit must be a positive integer');
     if (!_.isUndefined(pageKeys) && !_.isPlainObject(pageKeys))
       throw new Error('pageKeys must be an object');
-    if (
-      !_.isUndefined(pageKeys) &&
-      !(_.isInteger(pages) && pages >= 1) &&
-      pages !== 'all'
-    )
+    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(
       this.getKeySpace(entityToken, keyToken, item).map((shardedKey) => [
@@ -254,7 +254,7 @@ export class EntityManager {
     );
 
     // Return empty result if no pageKeys.
-    if (_.isEmpty(pageKeys)) return { items: [], pageKeys: {} };
+    if (_.isEmpty(pageKeys)) return { count: 0, items: [], pageKeys: {} };
 
     // Calculate shard limit.
     const shardLimit = _.isUndefined(limit)
@@ -297,7 +297,7 @@ export class EntityManager {
       result.items = [...result.items, ...pageResult.items];
       result.pageKeys = pageResult.pageKeys;
       page++;
-    } while ((pages === 'all' || page < pages) && !_.isEmpty(result.pageKeys));
+    } while (page < pages && !_.isEmpty(result.pageKeys));
 
     return result;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karmaniverous/entity-manager",
-  "version": "4.3.0-0",
+  "version": "4.3.0-2",
   "publishConfig": {
     "access": "public"
   },