triangle-utils 1.4.73 → 1.4.75

package/dist/src/UtilsDynamoDB.d.ts

@@ -9,6 +9,7 @@ export declare class UtilsDynamoDB {
         attribute_names?: string[];
         segment_id?: number;
         num_segments?: number;
+        last_key?: Record<string, any>;
     }): Promise<Record<string, any>[]>;
     get(table: string, key: Record<string, any>, consistent?: boolean): Promise<Record<string, any> | undefined>;
     get_max(table_index_name: string, primary_key: Record<string, string | number>): Promise<Record<string, any> | undefined>;
@@ -19,6 +20,8 @@ export declare class UtilsDynamoDB {
         undefined_attribute_names?: string[];
         defined_attribute_names?: string[];
         attribute_names?: string[];
+        max_num_items?: number;
+        last_key?: Record<string, any>;
     }): Promise<Record<string, any>[]>;
     query_prefix(table_index_name: string, primary_key: Record<string, any>, secondary_key_prefix: Record<string, string>, options?: {
         reverse?: boolean;
@@ -27,6 +30,8 @@ export declare class UtilsDynamoDB {
         undefined_attribute_names?: string[];
         defined_attribute_names?: string[];
         attribute_names?: string[];
+        max_num_items?: number;
+        last_key?: Record<string, any>;
     }): Promise<Record<string, any>[]>;
     query_range(table_index_name: string, primary_key: Record<string, any>, secondary_key_range: Record<string, (string | number)[]>, options?: {
         reverse?: boolean;
@@ -35,6 +40,8 @@ export declare class UtilsDynamoDB {
         undefined_attribute_names?: string[];
         defined_attribute_names?: string[];
         attribute_names?: string[];
+        max_num_items?: number;
+        last_key?: Record<string, any>;
     }): Promise<Record<string, any>[]>;
     set(table_name: string, key: Record<string, any>, attributes: Record<string, any>): Promise<void>;
     append(table_name: string, key: Record<string, any>, attributes: Record<string, any[]>): Promise<void>;

package/dist/src/UtilsDynamoDB.js

@@ -64,7 +64,7 @@ function convert_input(input) {
 }
 async function compile_pages(request, f, compile = true) {
     const items = [];
-    let last_eval_key = undefined;
+    let last_eval_key = request.ExclusiveStartKey;
     while (true) {
         const request_page = {
             ...request,
@@ -130,7 +130,8 @@ export class UtilsDynamoDB {
                 FilterExpression: filter_expression.length > 0 ? filter_expression : undefined,
                 ProjectionExpression: projection_expression.length > 0 ? projection_expression : undefined,
                 Segment: i,
-                TotalSegments: num_segments
+                TotalSegments: num_segments,
+                ExclusiveStartKey: options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
             };
             iterators.push(compile_pages(request, (request) => this.dynamodb.scan(request)));
         }
@@ -227,7 +228,9 @@ export class UtilsDynamoDB {
             FilterExpression: filter_expression.length > 0 ? filter_expression : undefined,
             ProjectionExpression: projection_expression.length > 0 ? projection_expression : undefined,
             KeyConditionExpression: Object.keys(primary_key).map(key => "#" + key + " = :" + key).join(" AND "),
-            ScanIndexForward: !reverse
+            ScanIndexForward: !reverse,
+            Limit: options.max_num_items,
+            ExclusiveStartKey: options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         };
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile);
         // .then(async items => index_name === undefined || !project ? items :
@@ -287,7 +290,9 @@ export class UtilsDynamoDB {
                 ...Object.keys(primary_key).map(key => "#" + key + " = :" + key),
                 ...Object.keys(secondary_key_prefix).map(key => "begins_with(#" + key + ", :" + key + ")")
             ].join(" AND "),
-            ScanIndexForward: !reverse
+            ScanIndexForward: !reverse,
+            Limit: options.max_num_items,
+            ExclusiveStartKey: options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         };
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile);
         // .then(async items => index_name === undefined || !project ? items :
@@ -350,7 +355,9 @@ export class UtilsDynamoDB {
                 ...Object.keys(primary_key).map(key => "#" + key + " = :" + key),
                 ...Object.keys(secondary_key_range).map(key => "(#" + key + " BETWEEN :" + key + "_min AND :" + key + "_max)")
             ].join(" AND "),
-            ScanIndexForward: !reverse
+            ScanIndexForward: !reverse,
+            Limit: options.max_num_items,
+            ExclusiveStartKey: options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         };
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile);
         // .then(async items => index_name === undefined || !project ? items :

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.73",
+    "version": "1.4.75",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/UtilsDynamoDB.ts

@@ -64,7 +64,7 @@ async function compile_pages(
     compile : boolean = true
 ) : Promise<any[]> {
     const items = []
-    let last_eval_key : Record<string, AttributeValue> | undefined = undefined
+    let last_eval_key : Record<string, AttributeValue> | undefined = request.ExclusiveStartKey
     while (true) {
         const request_page : ScanCommandInput|QueryCommandInput = {
             ...request,
@@ -113,7 +113,8 @@ export class UtilsDynamoDB {
             defined_attribute_names? : string[],
             attribute_names? : string[],
             segment_id? : number
-            num_segments? : number
+            num_segments? : number,
+            last_key? : Record<string, any>
         } = {}
     ) : Promise<Record<string, any>[]> {
         const table_name : string = table_index_name.split(":")[0]
@@ -151,7 +152,8 @@ export class UtilsDynamoDB {
                 FilterExpression : filter_expression.length > 0 ? filter_expression : undefined,
                 ProjectionExpression : projection_expression.length > 0 ? projection_expression : undefined,
                 Segment : i,
-                TotalSegments : num_segments
+                TotalSegments : num_segments,
+                ExclusiveStartKey : options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
             }
             iterators.push(compile_pages(request, (request : ScanCommandInput) => this.dynamodb.scan(request)))
         }
@@ -231,7 +233,9 @@ export class UtilsDynamoDB {
             filters? : Record<string, any>,
             undefined_attribute_names? : string[],
             defined_attribute_names? : string[],
-            attribute_names? : string[]
+            attribute_names? : string[],
+            max_num_items? : number,
+            last_key? : Record<string, any>
         } = {}
     ) : Promise<Record<string, any>[]>{
         const table_name : string = table_index_name.split(":")[0]
@@ -275,7 +279,9 @@ export class UtilsDynamoDB {
             FilterExpression : filter_expression.length > 0 ? filter_expression : undefined,
             ProjectionExpression : projection_expression.length > 0 ? projection_expression : undefined,
             KeyConditionExpression: Object.keys(primary_key).map(key => "#" + key + " = :" + key).join(" AND "),
-            ScanIndexForward : !reverse
+            ScanIndexForward : !reverse,
+            Limit : options.max_num_items,
+            ExclusiveStartKey : options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         }
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
             // .then(async items => index_name === undefined || !project ? items :
@@ -300,7 +306,9 @@ export class UtilsDynamoDB {
             filters? : Record<string, any>,
             undefined_attribute_names? : string[],
             defined_attribute_names? : string[],
-            attribute_names? : string[]
+            attribute_names? : string[],
+            max_num_items? : number,
+            last_key? : Record<string, any>
         } = {}
     ) : Promise<Record<string, any>[]>{
         const table_name : string = table_index_name.split(":")[0]
@@ -351,7 +359,9 @@ export class UtilsDynamoDB {
                 ...Object.keys(primary_key).map(key => "#" + key + " = :" + key),
                 ...Object.keys(secondary_key_prefix).map(key => "begins_with(#" + key + ", :" + key + ")")
             ].join(" AND "),
-            ScanIndexForward : !reverse
+            ScanIndexForward : !reverse,
+            Limit : options.max_num_items,
+            ExclusiveStartKey : options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         }
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
             // .then(async items => index_name === undefined || !project ? items :
@@ -376,7 +386,9 @@ export class UtilsDynamoDB {
             filters? : Record<string, any>,
             undefined_attribute_names? : string[],
             defined_attribute_names? : string[],
-            attribute_names? : string[]
+            attribute_names? : string[],
+            max_num_items? : number,
+            last_key? : Record<string, any>
         } = {}
     ) : Promise<Record<string, any>[]>{
         const table_name : string = table_index_name.split(":")[0]
@@ -430,7 +442,9 @@ export class UtilsDynamoDB {
                 ...Object.keys(primary_key).map(key => "#" + key + " = :" + key),
                 ...Object.keys(secondary_key_range).map(key => "(#" + key + " BETWEEN :" + key + "_min AND :" + key + "_max)")
             ].join(" AND "),
-            ScanIndexForward : !reverse
+            ScanIndexForward : !reverse,
+            Limit : options.max_num_items,
+            ExclusiveStartKey : options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         }
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
             // .then(async items => index_name === undefined || !project ? items :