electrodb 2.12.2 → 2.13.0

package/index.d.ts

@@ -2529,6 +2529,7 @@ export interface QueryOptions {
   params?: object;
   table?: string;
   limit?: number;
+  count?: number;
   originalErr?: boolean;
   ignoreOwnership?: boolean;
   pages?: number | "all";
@@ -2655,6 +2656,7 @@ interface GoQueryTerminalOptions<Attributes> {
   includeKeys?: boolean;
   table?: string;
   limit?: number;
+  count?: number;
   params?: object;
   originalErr?: boolean;
   ignoreOwnership?: boolean;

package/output.json

@@ -0,0 +1,12 @@
+
+> electrodb@2.12.3 test:unit /Users/tylerw.walch/Desktop/media/code/projects/electrodb
+> mocha -r ts-node/register ./test/**.spec.* "--grep" "Paginate without overlapping values with count"
+
+
+
+  Query Pagination
+    ✓ Paginate without overlapping values with count (44ms)
+
+
+  1 passing (6s)
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrodb",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "A library to more easily create and interact with multiple entities and heretical relationships in dynamodb",
   "main": "index.js",
   "scripts": {
@@ -10,14 +10,15 @@
     "test:ci": "npm install && npm test",
     "test:run": "npm run test:types && npm run test:init && npm run test:unit",
     "test:init": "node ./test/init.js",
+    "test:init:hard": "node ./test/init.js --recreate",
     "test:unit": "mocha -r ts-node/register ./test/**.spec.*",
     "test:types": "tsd",
     "test:format": "prettier -c src/**/*.js examples/**/*",
-    "coverage": "npm run test:init && nyc npm run test:unit && nyc report --reporter=text-lcov | coveralls",
-    "coverage:local:coveralls": "npm run test:init && nyc npm run test:unit && nyc report --reporter=text-lcov | coveralls",
-    "coverage:local:html": "npm run test:init && nyc npm run test:unit && nyc report --reporter=html",
+    "coverage": "npm run test:init:hard && nyc npm run test:unit && nyc report --reporter=text-lcov | coveralls",
+    "coverage:local:coveralls": "npm run test:init:hard && nyc npm run test:unit && nyc report --reporter=text-lcov | coveralls",
+    "coverage:local:html": "npm run test:init:hard && nyc npm run test:unit && nyc report --reporter=html",
     "ddb:start": "docker compose up -d dynamodb",
-    "ddb:load": "docker compose exec electro npm run test:init",
+    "ddb:load": "docker compose exec electro npm run test:init:hard",
     "ddb:stop": "docker compose stop",
     "examples:load:library": "npm run ddb:start && npm run local:init && ts-node ./examples/library/load.ts",
     "examples:query:library": "npm run ddb:start && npm run local:init && ts-node ./examples/library/query.ts",
@@ -28,7 +29,9 @@
     "examples:provisiontable": "npm run ddb:start && npm run local:init && ts-node ./examples/provisionTable",
     "examples:locks": "npm run ddb:start && npm run local:init && ts-node ./examples/locks",
     "local:init": "LOCAL_DYNAMO_ENDPOINT='http://localhost:8000' npm run test:init",
+    "local:init:hard": "LOCAL_DYNAMO_ENDPOINT='http://localhost:8000' npm run test:init:hard",
     "local:start": "npm run ddb:start && npm run local:init",
+    "local:fresh": "npm run ddb:start && npm run local:init:hard",
     "local:stop": "npm run ddb:stop",
     "local:exec": "LOCAL_DYNAMO_ENDPOINT='http://localhost:8000' ts-node ./test/debug.ts",
     "local:debug": "npm run local:start && npm run local:exec",

package/src/entity.js

@@ -343,6 +343,7 @@ class Entity {
   collection(collection = "", clauses = {}, facets = {}, options = {}) {
     const chainOptions = {
       ...options,
+      _isPagination: true,
       _isCollectionQuery: true,
     };
 
@@ -624,6 +625,21 @@ class Entity {
     });
   }
 
+  _safeMinimum(...values) {
+    let eligibleNumbers = [];
+    for (let value of values) {
+      if (typeof value === 'number') {
+        eligibleNumbers.push(value);
+      }
+    }
+
+    if (eligibleNumbers.length) {
+      return Math.min(...eligibleNumbers);
+    }
+
+    return undefined;
+  }
+
   async executeBulkGet(parameters, config) {
     if (!Array.isArray(parameters)) {
       parameters = [parameters];
@@ -702,10 +718,11 @@ class Entity {
   }
 
   async executeQuery(method, parameters, config = {}) {
+    const indexName = parameters.IndexName;
     let results = config._isCollectionQuery ? {} : [];
     let ExclusiveStartKey = this._formatExclusiveStartKey({
+      indexName,
       config,
-      indexName: parameters.IndexName,
     });
     if (ExclusiveStartKey === null) {
       ExclusiveStartKey = undefined;
@@ -723,7 +740,9 @@ class Entity {
         { ExclusiveStartKey, ...parameters, Limit: limit },
         config,
       );
+
       ExclusiveStartKey = response.LastEvaluatedKey;
+
       response = this.formatResponse(response, parameters.IndexName, {
         ...config,
         includeKeys: shouldHydrate || config.includeKeys,
@@ -754,10 +773,15 @@ class Entity {
           results[entity] = [...results[entity], ...items];
         }
       } else if (Array.isArray(response.data)) {
-        if (max) {
+        let prevCount = count
+        if (!!max || !!config.count) {
           count += response.data.length;
         }
         let items = response.data;
+        const moreItemsThanRequired = !!config.count && count > config.count;
+        if (moreItemsThanRequired) {
+          items = items.slice(0, config.count - prevCount);
+        }
         if (shouldHydrate) {
           const hydrated = await this.hydrate(
             parameters.IndexName,
@@ -770,14 +794,20 @@ class Entity {
           );
         }
         results = [...results, ...items];
+        if (moreItemsThanRequired || count === config.count) {
+          const lastItem = results[results.length - 1];
+          ExclusiveStartKey = this._fromCompositeToKeysByIndex({ indexName, provided: lastItem });
+          break;
+        }
       } else {
         return response;
       }
       iterations++;
     } while (
       ExclusiveStartKey &&
-      (pages === AllPages || iterations < pages) &&
-      (max === undefined || count < max)
+      (pages === AllPages || (config.count !== undefined || iterations < pages)) &&
+      (max === undefined || count < max) &&
+      (config.count === undefined || count < config.count)
     );
 
     const cursor = this._formatReturnPager(config, ExclusiveStartKey);
@@ -1653,6 +1683,7 @@ class Entity {
       _isPagination: false,
       _isCollectionQuery: false,
       pages: 1,
+      count: undefined,
       listeners: [],
       preserveBatchOrder: false,
       attributes: [],
@@ -1776,6 +1807,13 @@ class Entity {
         }
       }
 
+      if (option.count !== undefined) {
+        if (typeof option.count !== "number" || option.count < 1) {
+          throw new e.ElectroError(e.ErrorCodes.InvalidOptions, `Query option 'count' must be of type 'number' and greater than zero.`);
+        }
+        config.count = option.count;
+      }
+
       if (option.limit !== undefined) {
         config.limit = option.limit;
         config.params.Limit = option.limit;