@karmaniverous/entity-manager 4.3.3 → 4.4.1

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

@@ -245,7 +245,7 @@ class EntityManager {
       shardQuery,
       limit,
       pageKeys,
-      pages = 1
+      pages = 'all'
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     // Validate params.
     this.#entityManager.validateKeyToken(entityToken, keyToken);
@@ -255,6 +255,9 @@ class EntityManager {
     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'");
 
+    // Apply default limit.
+    limit ??= this.#entityManager.getEntityConfig(entityToken).defaultLimit;
+
     // Parse pages.
     if ((0, _isString2.default)(pages)) pages = pages.toLowerCase() === 'all' ? Infinity : (0, _parseInt2.default)(pages);
 
@@ -331,7 +334,7 @@ class EntityManager {
       result.items = [...result.items, ...pageResult.items];
       result.pageKeys = pageResult.pageKeys;
       page++;
-    } while (page < pages && !(0, _isEmpty2.default)(result.pageKeys));
+    } while (page < pages && result.items.length < limit && !(0, _isEmpty2.default)(result.pageKeys));
     return result;
   }
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PrivateEntityManager = void 0;
+exports.PrivateEntityManager = exports.DEFAULT_LIMIT = void 0;
 var _isInteger2 = _interopRequireDefault(require("lodash/isInteger"));
 var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
 var _range2 = _interopRequireDefault(require("lodash/range"));
@@ -26,6 +26,8 @@ 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 }; }
+const DEFAULT_LIMIT = exports.DEFAULT_LIMIT = 25;
+
 /**
  * EntityManager config validation schema.
  *
@@ -40,6 +42,9 @@ const configSchema = {
         '^\\w+$': {
           type: 'object',
           properties: {
+            defaultLimit: {
+              type: 'integer'
+            },
             indexes: {
               type: 'object',
               additionalProperties: {
@@ -169,6 +174,7 @@ class PrivateEntityManager {
     const conformedConfig = {
       entities: (0, _mapValues2.default)(entities, _ref => {
         let {
+          defaultLimit = DEFAULT_LIMIT,
           indexes = {},
           keys = {},
           sharding: {
@@ -180,6 +186,7 @@ class PrivateEntityManager {
           } = {}
         } = _ref;
         return {
+          defaultLimit,
           indexes,
           keys,
           sharding: {

package/lib/EntityManager/EntityManager.js

@@ -227,7 +227,7 @@ export class EntityManager {
     shardQuery,
     limit,
     pageKeys,
-    pages = 1,
+    pages = 'all',
   } = {}) {
     // Validate params.
     this.#entityManager.validateKeyToken(entityToken, keyToken);
@@ -241,6 +241,9 @@ export class EntityManager {
     if (!_.isUndefined(pages) && !/^(?:\d+|all)$/i.test(pages.toString()))
       throw new Error("pages must be a positive integer or 'all'");
 
+    // Apply default limit.
+    limit ??= this.#entityManager.getEntityConfig(entityToken).defaultLimit;
+
     // Parse pages.
     if (_.isString(pages))
       pages = pages.toLowerCase() === 'all' ? Infinity : _.parseInt(pages);
@@ -312,7 +315,11 @@ export class EntityManager {
       result.items = [...result.items, ...pageResult.items];
       result.pageKeys = pageResult.pageKeys;
       page++;
-    } while (page < pages && !_.isEmpty(result.pageKeys));
+    } while (
+      page < pages &&
+      result.items.length < limit &&
+      !_.isEmpty(result.pageKeys)
+    );
 
     return result;
   }

package/lib/EntityManager/PrivateEntityManager.js

@@ -2,6 +2,8 @@ import { validate } from 'jsonschema';
 import _ from 'lodash';
 import stringHash from 'string-hash';
 
+export const DEFAULT_LIMIT = 25;
+
 /**
  * EntityManager config validation schema.
  *
@@ -16,6 +18,9 @@ const configSchema = {
         '^\\w+$': {
           type: 'object',
           properties: {
+            defaultLimit: {
+              type: 'integer',
+            },
             indexes: {
               type: 'object',
               additionalProperties: {
@@ -135,6 +140,7 @@ export class PrivateEntityManager {
       entities: _.mapValues(
         entities,
         ({
+          defaultLimit = DEFAULT_LIMIT,
           indexes = {},
           keys = {},
           sharding: {
@@ -145,6 +151,7 @@ export class PrivateEntityManager {
             timestamp,
           } = {},
         }) => ({
+          defaultLimit,
           indexes,
           keys,
           sharding: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karmaniverous/entity-manager",
-  "version": "4.3.3",
+  "version": "4.4.1",
   "publishConfig": {
     "access": "public"
   },
@@ -27,24 +27,24 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.3",
+    "@babel/core": "^7.23.7",
     "@babel/eslint-parser": "^7.23.3",
     "@babel/plugin-syntax-import-assertions": "^7.23.3",
-    "@babel/preset-env": "^7.23.3",
-    "@babel/register": "^7.22.15",
-    "@karmaniverous/edge-logger": "^1.3.5",
+    "@babel/preset-env": "^7.23.7",
+    "@babel/register": "^7.23.7",
+    "@karmaniverous/edge-logger": "^1.3.7",
     "@karmaniverous/tagged-templates": "^0.1.2",
-    "@types/node": "^20.9.5",
+    "@types/node": "^20.10.6",
     "babel-plugin-lodash": "^3.3.4",
-    "chai": "^4.3.10",
+    "chai": "^5.0.0",
     "concat-md": "^0.5.1",
-    "eslint": "^8.54.0",
-    "eslint-plugin-jsdoc": "^46.9.0",
+    "eslint": "^8.56.0",
+    "eslint-plugin-jsdoc": "^48.0.2",
     "eslint-plugin-mocha": "^10.2.0",
     "eslint-plugin-promise": "^6.1.1",
     "jsdoc-to-markdown": "^8.0.0",
     "mocha": "^10.2.0",
-    "release-it": "^17.0.0"
+    "release-it": "^17.0.1"
   },
   "exports": {
     ".": {