triangle-utils 1.4.9 → 1.4.10

package/dist/src/UtilsDynamoDB.d.ts

@@ -1,6 +1,7 @@
 export declare class UtilsDynamoDB {
     private readonly dynamodb;
     constructor(region: string);
+    get_table_key_names(table_name: string): Promise<string[] | undefined>;
     scan(table: string, options?: {
         filters?: Record<string, any>;
         undefined_attribute_names?: string[];
@@ -10,27 +11,30 @@ export declare class UtilsDynamoDB {
     }): Promise<Record<string, any>[]>;
     get(table: string, key: Record<string, any>, consistent?: boolean): Promise<Record<string, any> | undefined>;
     get_max(table: string, primary_key: Record<string, any>): Promise<Record<string, any> | undefined>;
-    query(table: string, primary_key: Record<string, any>, options?: {
-        index_name?: string;
+    query(table_index_name: string, primary_key: Record<string, any>, options?: {
         reverse?: boolean;
         compile?: boolean;
+        project?: boolean;
+        attribute_names?: string[];
     }): Promise<Record<string, any>[]>;
-    query_prefix(table: string, primary_key: Record<string, any>, secondary_key_prefix: Record<string, string>, options?: {
-        index_name?: string;
+    query_prefix(table_index_name: string, primary_key: Record<string, any>, secondary_key_prefix: Record<string, string>, options?: {
         reverse?: boolean;
         compile?: boolean;
+        project?: boolean;
+        attribute_names?: string[];
     }): Promise<Record<string, any>[]>;
-    query_range(table: string, primary_key: Record<string, any>, secondary_key_range: Record<string, (string | number)[]>, options?: {
-        index_name?: string;
+    query_range(table_index_name: string, primary_key: Record<string, any>, secondary_key_range: Record<string, (string | number)[]>, options?: {
         reverse?: boolean;
         compile?: boolean;
+        project?: boolean;
+        attribute_names?: string[];
     }): Promise<Record<string, any>[]>;
-    set(table: string, key: Record<string, any>, attributes: Record<string, any>): Promise<void>;
-    append(table: string, key: Record<string, any>, attributes: Record<string, any[]>): Promise<void>;
-    add(table: string, key: Record<string, any>, attributes: Record<string, any[]>): Promise<void>;
-    remove(table: string, key: Record<string, any>, attributes: string[]): Promise<void>;
-    create(table: string, key: Record<string, any>, attributes?: Record<string, any>): Promise<void>;
-    delete(table: string, key: Record<string, any>): Promise<void>;
-    duplicate_attribute(table: string, attribute_name: string, new_attribute_name: string): Promise<void>;
-    remove_attribute(table: string, attribute_name: string): Promise<void>;
+    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>;
+    add(table_name: string, key: Record<string, any>, attributes: Record<string, any[]>): Promise<void>;
+    remove(table_name: string, key: Record<string, any>, attributes: string[]): Promise<void>;
+    create(table_name: string, key: Record<string, any>, attributes?: Record<string, any>): Promise<void>;
+    delete(table_name: string, key: Record<string, any>): Promise<void>;
+    duplicate_attribute(table_name: string, attribute_name: string, new_attribute_name: string): Promise<void>;
+    remove_attribute(table_name: string, attribute_name: string): Promise<undefined>;
 }

package/dist/src/UtilsDynamoDB.js

@@ -87,6 +87,17 @@ export class UtilsDynamoDB {
     constructor(region) {
         this.dynamodb = new DynamoDB({ region: region });
     }
+    async get_table_key_names(table_name) {
+        const table_metadata = await this.dynamodb.describeTable({
+            TableName: table_name
+        });
+        if (table_metadata.Table === undefined || table_metadata.Table.KeySchema === undefined) {
+            return undefined;
+        }
+        const table_key_names = table_metadata.Table.KeySchema.map(key => key.AttributeName)
+            .filter(table_key_name => table_key_name !== undefined);
+        return table_key_names;
+    }
     async scan(table, options = {}) {
         const filters = options.filters !== undefined ? options.filters : {};
         const undefined_attribute_names = options.undefined_attribute_names !== undefined ? options.undefined_attribute_names : [];
@@ -173,11 +184,15 @@ export class UtilsDynamoDB {
         }
         return converted_output;
     }
-    async query(table, primary_key, options = {}) {
-        const index_name = options.index_name !== undefined ? options.index_name : undefined;
+    async query(table_index_name, primary_key, options = {}) {
+        const table_name = table_index_name.split(":")[0];
+        const index_name = table_index_name.split(":")[1];
         const reverse = options.reverse !== undefined ? options.reverse : false;
         const compile = options.compile !== undefined ? options.compile : true;
-        if (Object.keys(primary_key).length !== 1) {
+        const project = options.compile !== undefined ? options.project : true;
+        const attribute_names = options.attribute_names !== undefined ? options.attribute_names : [];
+        const table_key_names = await this.get_table_key_names(table_name);
+        if (table_key_names === undefined || Object.keys(primary_key).length !== 1) {
             return [];
         }
         const key = Object.keys(primary_key)[0];
@@ -185,8 +200,9 @@ export class UtilsDynamoDB {
         if (value === undefined) {
             return [];
         }
+        const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ");
         const request = {
-            TableName: table,
+            TableName: table_name,
             IndexName: index_name,
             ExpressionAttributeNames: {
                 "#a": key
@@ -194,16 +210,27 @@ export class UtilsDynamoDB {
             ExpressionAttributeValues: {
                 ":a": value
             },
+            ProjectionExpression: projection_expression.length > 0 ? projection_expression : undefined,
             KeyConditionExpression: "#a = :a",
             ScanIndexForward: !reverse
         };
-        return await compile_pages(request, (request) => this.dynamodb.query(request), compile);
+        const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
+            .then(async (items) => index_name === undefined || !project ? items :
+            await Promise.all(items.map(async (item) => {
+                return await this.get(table_name, Object.fromEntries(Object.entries(item).filter((([key_name, key_value]) => table_key_names.includes(key_name)))));
+            }))
+                .then(items => items.filter(item => item !== undefined)));
+        return items;
     }
-    async query_prefix(table, primary_key, secondary_key_prefix, options = {}) {
-        const index_name = options.index_name !== undefined ? options.index_name : undefined;
+    async query_prefix(table_index_name, primary_key, secondary_key_prefix, options = {}) {
+        const table_name = table_index_name.split(":")[0];
+        const index_name = table_index_name.split(":")[1];
         const reverse = options.reverse !== undefined ? options.reverse : false;
         const compile = options.compile !== undefined ? options.compile : true;
-        if (Object.keys(primary_key).length !== 1 || Object.keys(secondary_key_prefix).length !== 1) {
+        const project = options.compile !== undefined ? options.project : true;
+        const attribute_names = options.attribute_names !== undefined ? options.attribute_names : [];
+        const table_key_names = await this.get_table_key_names(table_name);
+        if (table_key_names === undefined || Object.keys(primary_key).length !== 1 || Object.keys(secondary_key_prefix).length !== 1) {
             return [];
         }
         const converted_primary_value = convert_input(Object.values(primary_key)[0]);
@@ -211,8 +238,9 @@ export class UtilsDynamoDB {
         if (converted_primary_value === undefined || converted_secondary_prefix_value === undefined) {
             return [];
         }
+        const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ");
         const request = {
-            TableName: table,
+            TableName: table_name,
             IndexName: index_name,
             ExpressionAttributeNames: {
                 "#a": Object.keys(primary_key)[0],
@@ -222,16 +250,27 @@ export class UtilsDynamoDB {
                 ":a": converted_primary_value,
                 ":b": converted_secondary_prefix_value
             },
+            ProjectionExpression: projection_expression.length > 0 ? projection_expression : undefined,
             KeyConditionExpression: "#a = :a AND begins_with(#b, :b)",
             ScanIndexForward: !reverse
         };
-        return await compile_pages(request, (request) => this.dynamodb.query(request), compile);
+        const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
+            .then(async (items) => index_name === undefined || !project ? items :
+            await Promise.all(items.map(async (item) => {
+                return await this.get(table_name, Object.fromEntries(Object.entries(item).filter((([key_name, key_value]) => table_key_names.includes(key_name)))));
+            }))
+                .then(items => items.filter(item => item !== undefined)));
+        return items;
     }
-    async query_range(table, primary_key, secondary_key_range, options = {}) {
-        const index_name = options.index_name !== undefined ? options.index_name : undefined;
+    async query_range(table_index_name, primary_key, secondary_key_range, options = {}) {
+        const table_name = table_index_name.split(":")[0];
+        const index_name = table_index_name.split(":")[1];
         const reverse = options.reverse !== undefined ? options.reverse : false;
         const compile = options.compile !== undefined ? options.compile : true;
-        if (Object.keys(primary_key).length !== 1 || Object.keys(secondary_key_range).length !== 1 || Object.values(secondary_key_range)[0].length !== 2) {
+        const project = options.compile !== undefined ? options.project : true;
+        const attribute_names = options.attribute_names !== undefined ? options.attribute_names : [];
+        const table_key_names = await this.get_table_key_names(table_name);
+        if (table_key_names === undefined || Object.keys(primary_key).length !== 1 || Object.keys(secondary_key_range).length !== 1 || Object.values(secondary_key_range)[0].length !== 2) {
             return [];
         }
         const converted_primary_value = convert_input(Object.values(primary_key)[0]);
@@ -240,8 +279,9 @@ export class UtilsDynamoDB {
         if (converted_primary_value === undefined || converted_secondary_range_start_value === undefined || converted_secondary_range_end_value === undefined) {
             return [];
         }
+        const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ");
         const request = {
-            TableName: table,
+            TableName: table_name,
             IndexName: index_name,
             ExpressionAttributeNames: {
                 "#a": Object.keys(primary_key)[0],
@@ -252,15 +292,22 @@ export class UtilsDynamoDB {
                 ":b1": converted_secondary_range_start_value,
                 ":b2": converted_secondary_range_end_value
             },
+            ProjectionExpression: projection_expression.length > 0 ? projection_expression : undefined,
             KeyConditionExpression: "#a = :a AND (#b BETWEEN :b1 AND :b2)",
             ScanIndexForward: !reverse
         };
-        return await compile_pages(request, (request) => this.dynamodb.query(request), compile);
+        const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
+            .then(async (items) => index_name === undefined || !project ? items :
+            await Promise.all(items.map(async (item) => {
+                return await this.get(table_name, Object.fromEntries(Object.entries(item).filter((([key_name, key_value]) => table_key_names.includes(key_name)))));
+            }))
+                .then(items => items.filter(item => item !== undefined)));
+        return items;
     }
-    async set(table, key, attributes) {
+    async set(table_name, key, attributes) {
         const converted_key = convert_input(key)?.M;
         const request = {
-            TableName: table,
+            TableName: table_name,
             Key: converted_key,
             UpdateExpression: "set " + Object.keys(attributes)
                 .filter(attribute_name => !Object.keys(key).includes(attribute_name))
@@ -277,10 +324,10 @@ export class UtilsDynamoDB {
         };
         await this.dynamodb.updateItem(request);
     }
-    async append(table, key, attributes) {
+    async append(table_name, key, attributes) {
         const converted_key = convert_input(key)?.M;
         const request = {
-            TableName: table,
+            TableName: table_name,
             Key: converted_key,
             UpdateExpression: "set " + Object.keys(attributes)
                 .filter(attribute_name => attributes[attribute_name] !== undefined)
@@ -295,8 +342,8 @@ export class UtilsDynamoDB {
         };
         this.dynamodb.updateItem(request);
     }
-    async add(table, key, attributes) {
-        const item = await this.get(table, key, true);
+    async add(table_name, key, attributes) {
+        const item = await this.get(table_name, key, true);
         if (item === undefined) {
             return;
         }
@@ -313,12 +360,12 @@ export class UtilsDynamoDB {
         if (Object.values(new_attributes).flat().length === 0) {
             return undefined;
         }
-        return await this.append(table, key, attributes);
+        return await this.append(table_name, key, attributes);
     }
-    async remove(table, key, attributes) {
+    async remove(table_name, key, attributes) {
         const converted_key = convert_input(key)?.M;
         const request = {
-            TableName: table,
+            TableName: table_name,
             Key: converted_key,
             UpdateExpression: "remove " + attributes
                 .map(attribute_name => "#" + attribute_name).join(", "),
@@ -327,35 +374,35 @@ export class UtilsDynamoDB {
         };
         await this.dynamodb.updateItem(request);
     }
-    async create(table, key, attributes = {}) {
-        const item = await this.get(table, key, true);
+    async create(table_name, key, attributes = {}) {
+        const item = await this.get(table_name, key, true);
         if (item !== undefined) {
             return;
         }
         const converted_key = convert_input(key)?.M;
         const converted_attributes = convert_input(attributes)?.M;
         await this.dynamodb.putItem({
-            TableName: table,
+            TableName: table_name,
             Item: { ...converted_key, ...converted_attributes }
         });
     }
-    async delete(table, key) {
+    async delete(table_name, key) {
         const converted_key = convert_input(key)?.M;
         await this.dynamodb.deleteItem({
-            TableName: table,
+            TableName: table_name,
             Key: converted_key
         });
     }
-    async duplicate_attribute(table, attribute_name, new_attribute_name) {
+    async duplicate_attribute(table_name, attribute_name, new_attribute_name) {
         const table_metadata = await this.dynamodb.describeTable({
-            TableName: table
+            TableName: table_name
         });
         if (table_metadata.Table === undefined || table_metadata.Table.KeySchema === undefined) {
             return;
         }
         const table_key_names = table_metadata.Table.KeySchema.map(key => key.AttributeName)
             .filter(table_key_name => table_key_name !== undefined);
-        const items = await this.scan(table, { attribute_names: table_key_names.concat([attribute_name, new_attribute_name]) });
+        const items = await this.scan(table_name, { attribute_names: table_key_names.concat([attribute_name, new_attribute_name]) });
         if (items.filter(item => item[new_attribute_name] !== undefined).length > 0) {
             console.log("Cannot rename.", new_attribute_name, "is an existing item.");
             return;
@@ -365,23 +412,19 @@ export class UtilsDynamoDB {
                 continue;
             }
             const key = Object.fromEntries(table_key_names.map(key_name => [key_name, item[key_name]]));
-            await this.set(table, key, { [new_attribute_name]: item[attribute_name] });
+            await this.set(table_name, key, { [new_attribute_name]: item[attribute_name] });
         }
     }
-    async remove_attribute(table, attribute_name) {
-        const table_metadata = await this.dynamodb.describeTable({
-            TableName: table
-        });
-        if (table_metadata.Table === undefined || table_metadata.Table.KeySchema === undefined) {
-            return;
+    async remove_attribute(table_name, attribute_name) {
+        const table_key_names = await this.get_table_key_names(table_name);
+        if (table_key_names === undefined) {
+            return undefined;
         }
-        const table_key_names = table_metadata.Table.KeySchema.map(key => key.AttributeName)
-            .filter(table_key_name => table_key_name !== undefined);
-        const items = await this.scan(table)
+        const items = await this.scan(table_name)
             .then(items => items.filter(item => item[attribute_name] !== undefined));
         for (const item of items) {
             const key = Object.fromEntries(table_key_names.map(key_name => [key_name, item[key_name]]));
-            await this.remove(table, key, [attribute_name]);
+            await this.remove(table_name, key, [attribute_name]);
         }
     }
 }

package/dist/src/f.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/f.js

@@ -0,0 +1,17 @@
+import { SecretsManager } from "@aws-sdk/client-secrets-manager";
+import { TriangleUtils } from "./index.js";
+const secret_name = "triage_config";
+const secrets_manager = new SecretsManager({ region: "us-east-1" });
+const response = await secrets_manager.getSecretValue({
+    SecretId: secret_name
+});
+const api_keys = JSON.parse(response?.SecretString || "");
+const config = {
+    google_email: "louishou@triangleanalytics.com",
+    alerts_email: "alerts@triangleanalytics.com",
+    region: "us-east-1",
+    ...api_keys
+};
+const utils = new TriangleUtils(config);
+const foods = await utils.dynamodb.query("triage_docket_documents:register_document_id", { register_document_id: "E6-17065" });
+console.log(foods);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.9",
+    "version": "1.4.10",
     "main": "dist/src/index.js",
     "directories": {
         "test": "vitest"

package/src/UtilsDynamoDB.ts

@@ -91,6 +91,20 @@ export class UtilsDynamoDB {
         this.dynamodb = new DynamoDB({ region : region })
     }
 
+    async get_table_key_names(
+        table_name : string
+    ) : Promise<string[] | undefined> {
+        const table_metadata = await this.dynamodb.describeTable({
+            TableName : table_name
+        })
+        if (table_metadata.Table === undefined || table_metadata.Table.KeySchema === undefined) {
+            return undefined
+        }
+        const table_key_names = table_metadata.Table.KeySchema.map(key => key.AttributeName)
+            .filter(table_key_name => table_key_name !== undefined)
+        return table_key_names
+    }
+
     async scan(
         table : string,
         options : {
@@ -201,18 +215,24 @@ export class UtilsDynamoDB {
     }
 
     async query(
-        table : string,
+        table_index_name : string,
         primary_key : Record<string, any>,
         options : {
-            index_name? : string,
             reverse? : boolean,
-            compile? : boolean
+            compile? : boolean,
+            project? : boolean,
+            attribute_names? : string[]
         } = {}
     ) : Promise<Record<string, any>[]>{
-        const index_name = options.index_name !== undefined ? options.index_name : undefined
+        const table_name : string = table_index_name.split(":")[0]
+        const index_name : string | undefined = table_index_name.split(":")[1]
         const reverse = options.reverse !== undefined ? options.reverse : false
         const compile = options.compile !== undefined ? options.compile : true
-        if (Object.keys(primary_key).length !== 1) {
+        const project = options.compile !== undefined ? options.project : true
+        const attribute_names : string[] = options.attribute_names !== undefined ? options.attribute_names : []
+
+        const table_key_names = await this.get_table_key_names(table_name)
+        if (table_key_names === undefined || Object.keys(primary_key).length !== 1) {
             return []
         }
         const key = Object.keys(primary_key)[0]
@@ -220,8 +240,9 @@ export class UtilsDynamoDB {
         if (value === undefined) {
             return []
         }
+        const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ")
         const request : QueryCommandInput = {
-            TableName : table,
+            TableName : table_name,
             IndexName : index_name,
             ExpressionAttributeNames: {
                 "#a": key
@@ -229,26 +250,42 @@ export class UtilsDynamoDB {
             ExpressionAttributeValues: {
                 ":a": value
             },
+            ProjectionExpression : projection_expression.length > 0 ? projection_expression : undefined,
             KeyConditionExpression: "#a = :a",
             ScanIndexForward : !reverse
         }
-        return await compile_pages(request, (request) => this.dynamodb.query(request), compile)
+        const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
+            .then(async items => index_name === undefined || !project ? items :
+                await Promise.all(items.map(async item => {
+                    return await this.get(table_name,
+                        Object.fromEntries(Object.entries(item).filter((([key_name, key_value]) => table_key_names.includes(key_name))))
+                    )
+                }))
+                    .then(items => items.filter(item => item !== undefined))
+            )
+        return items
     }
 
     async query_prefix(
-        table : string,
+        table_index_name : string,
         primary_key : Record<string, any>,
         secondary_key_prefix : Record<string, string>,
         options : {
-            index_name? : string,
             reverse? : boolean,
-            compile? : boolean
+            compile? : boolean,
+            project? : boolean,
+            attribute_names? : string[]
         } = {}
     ) : Promise<Record<string, any>[]>{
-        const index_name = options.index_name !== undefined ? options.index_name : undefined
+        const table_name : string = table_index_name.split(":")[0]
+        const index_name : string | undefined = table_index_name.split(":")[1]
         const reverse = options.reverse !== undefined ? options.reverse : false
         const compile = options.compile !== undefined ? options.compile : true
-        if (Object.keys(primary_key).length !== 1 || Object.keys(secondary_key_prefix).length !== 1) {
+        const project = options.compile !== undefined ? options.project : true
+        const attribute_names : string[] = options.attribute_names !== undefined ? options.attribute_names : []
+
+        const table_key_names = await this.get_table_key_names(table_name)
+        if (table_key_names === undefined || Object.keys(primary_key).length !== 1 || Object.keys(secondary_key_prefix).length !== 1) {
             return []
         }
         const converted_primary_value = convert_input(Object.values(primary_key)[0])
@@ -256,8 +293,9 @@ export class UtilsDynamoDB {
         if (converted_primary_value === undefined || converted_secondary_prefix_value === undefined) {
             return []
         }
+        const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ")
         const request : QueryCommandInput = {
-            TableName : table,
+            TableName : table_name,
             IndexName : index_name,
             ExpressionAttributeNames: {
                 "#a": Object.keys(primary_key)[0],
@@ -267,26 +305,42 @@ export class UtilsDynamoDB {
                 ":a": converted_primary_value,
                 ":b": converted_secondary_prefix_value
             },
+            ProjectionExpression : projection_expression.length > 0 ? projection_expression : undefined,
             KeyConditionExpression: "#a = :a AND begins_with(#b, :b)",
             ScanIndexForward : !reverse
         }
-        return await compile_pages(request, (request) => this.dynamodb.query(request), compile)
+        const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
+            .then(async items => index_name === undefined || !project ? items :
+                await Promise.all(items.map(async item => {
+                    return await this.get(table_name,
+                        Object.fromEntries(Object.entries(item).filter((([key_name, key_value]) => table_key_names.includes(key_name))))
+                    )
+                }))
+                    .then(items => items.filter(item => item !== undefined))
+            )
+        return items
     }
 
     async query_range(
-        table : string,
+        table_index_name : string,
         primary_key : Record<string, any>,
         secondary_key_range : Record<string, (string|number)[]>,
         options : {
-            index_name? : string,
             reverse? : boolean,
-            compile? : boolean
+            compile? : boolean,
+            project? : boolean,
+            attribute_names? : string[]
         } = {}
     ) : Promise<Record<string, any>[]>{
-        const index_name = options.index_name !== undefined ? options.index_name : undefined
+        const table_name : string = table_index_name.split(":")[0]
+        const index_name : string | undefined = table_index_name.split(":")[1]
         const reverse = options.reverse !== undefined ? options.reverse : false
         const compile = options.compile !== undefined ? options.compile : true
-        if (Object.keys(primary_key).length !== 1 || Object.keys(secondary_key_range).length !== 1 || Object.values(secondary_key_range)[0].length !== 2) {
+        const project = options.compile !== undefined ? options.project : true
+        const attribute_names : string[] = options.attribute_names !== undefined ? options.attribute_names : []
+
+        const table_key_names = await this.get_table_key_names(table_name)
+        if (table_key_names === undefined || Object.keys(primary_key).length !== 1 || Object.keys(secondary_key_range).length !== 1 || Object.values(secondary_key_range)[0].length !== 2) {
             return []
         }
         const converted_primary_value = convert_input(Object.values(primary_key)[0])
@@ -295,8 +349,9 @@ export class UtilsDynamoDB {
         if (converted_primary_value === undefined || converted_secondary_range_start_value === undefined || converted_secondary_range_end_value === undefined) {
             return []
         }
+        const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ")
         const request : QueryCommandInput = {
-            TableName : table,
+            TableName : table_name,
             IndexName : index_name,
             ExpressionAttributeNames: {
                 "#a": Object.keys(primary_key)[0],
@@ -307,17 +362,27 @@ export class UtilsDynamoDB {
                 ":b1": converted_secondary_range_start_value,
                 ":b2": converted_secondary_range_end_value
             },
+            ProjectionExpression : projection_expression.length > 0 ? projection_expression : undefined,
             KeyConditionExpression: "#a = :a AND (#b BETWEEN :b1 AND :b2)",
             ScanIndexForward : !reverse
         }
-        return await compile_pages(request, (request) => this.dynamodb.query(request), compile)
+        const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
+            .then(async items => index_name === undefined || !project ? items :
+                await Promise.all(items.map(async item => {
+                    return await this.get(table_name,
+                        Object.fromEntries(Object.entries(item).filter((([key_name, key_value]) => table_key_names.includes(key_name))))
+                    )
+                }))
+                    .then(items => items.filter(item => item !== undefined))
+            )
+        return items
     }
 
-    async set(table : string, key : Record<string, any>, attributes : Record<string, any>) : Promise<void> {
+    async set(table_name : string, key : Record<string, any>, attributes : Record<string, any>) : Promise<void> {
         const converted_key = convert_input(key)?.M
 
         const request : UpdateItemCommandInput = {
-            TableName : table,
+            TableName : table_name,
             Key : converted_key,
             UpdateExpression: "set " + Object.keys(attributes)
                 .filter(attribute_name => !Object.keys(key).includes(attribute_name))
@@ -338,11 +403,11 @@ export class UtilsDynamoDB {
         await this.dynamodb.updateItem(request)
     }
 
-    async append(table : string, key : Record<string, any>, attributes : Record<string, any[]>) : Promise<void>{
+    async append(table_name : string, key : Record<string, any>, attributes : Record<string, any[]>) : Promise<void>{
         const converted_key = convert_input(key)?.M
 
         const request : UpdateItemCommandInput = {
-            TableName : table,
+            TableName : table_name,
             Key : converted_key,
             UpdateExpression: "set " + Object.keys(attributes)
                 .filter(attribute_name => attributes[attribute_name] !== undefined)
@@ -360,8 +425,8 @@ export class UtilsDynamoDB {
         this.dynamodb.updateItem(request)
     }
 
-    async add(table : string, key : Record<string, any>, attributes : Record<string, any[]>) : Promise<void> {
-        const item = await this.get(table, key, true)
+    async add(table_name : string, key : Record<string, any>, attributes : Record<string, any[]>) : Promise<void> {
+        const item = await this.get(table_name, key, true)
         if (item === undefined) {
             return
         }
@@ -378,14 +443,14 @@ export class UtilsDynamoDB {
         if (Object.values(new_attributes).flat().length === 0) {
             return undefined
         }
-        return await this.append(table, key, attributes)
+        return await this.append(table_name, key, attributes)
     }
 
-    async remove(table : string, key : Record<string, any>, attributes : string[]) : Promise<void> {
+    async remove(table_name : string, key : Record<string, any>, attributes : string[]) : Promise<void> {
         const converted_key = convert_input(key)?.M
 
         const request : UpdateItemCommandInput = {
-            TableName : table,
+            TableName : table_name,
             Key : converted_key,
             UpdateExpression: "remove " + attributes
                 .map(attribute_name => "#" + attribute_name).join(", "),
@@ -396,37 +461,37 @@ export class UtilsDynamoDB {
         await this.dynamodb.updateItem(request)
     }
 
-    async create(table : string, key : Record<string, any>, attributes : Record<string, any> = {}) : Promise<void> {
-        const item = await this.get(table, key, true)
+    async create(table_name : string, key : Record<string, any>, attributes : Record<string, any> = {}) : Promise<void> {
+        const item = await this.get(table_name, key, true)
         if (item !== undefined) {
             return
         }
         const converted_key = convert_input(key)?.M
         const converted_attributes = convert_input(attributes)?.M
         await this.dynamodb.putItem({
-            TableName : table,
+            TableName : table_name,
             Item : { ...converted_key, ...converted_attributes }
         })
     }
 
-    async delete(table : string, key : Record<string, any>) : Promise<void> {
+    async delete(table_name : string, key : Record<string, any>) : Promise<void> {
         const converted_key = convert_input(key)?.M
         await this.dynamodb.deleteItem({
-            TableName: table,
+            TableName: table_name,
             Key: converted_key
         })
     }
 
-    async duplicate_attribute(table : string, attribute_name : string, new_attribute_name : string) : Promise<void>{
+    async duplicate_attribute(table_name : string, attribute_name : string, new_attribute_name : string) : Promise<void>{
         const table_metadata = await this.dynamodb.describeTable({
-            TableName : table
+            TableName : table_name
         })
         if (table_metadata.Table === undefined || table_metadata.Table.KeySchema === undefined) {
             return
         }
         const table_key_names = table_metadata.Table.KeySchema.map(key => key.AttributeName)
             .filter(table_key_name => table_key_name !== undefined)
-        const items = await this.scan(table, { attribute_names : table_key_names.concat([attribute_name, new_attribute_name]) })
+        const items = await this.scan(table_name, { attribute_names : table_key_names.concat([attribute_name, new_attribute_name]) })
         if (items.filter(item => item[new_attribute_name] !== undefined).length > 0) {
             console.log("Cannot rename.", new_attribute_name, "is an existing item.")
             return
@@ -436,24 +501,20 @@ export class UtilsDynamoDB {
                 continue
             }
             const key = Object.fromEntries(table_key_names.map(key_name => [key_name, item[key_name]]))
-            await this.set(table, key, { [new_attribute_name] : item[attribute_name] })
+            await this.set(table_name, key, { [new_attribute_name] : item[attribute_name] })
         }
     }
 
-    async remove_attribute(table : string, attribute_name : string) {
-        const table_metadata = await this.dynamodb.describeTable({
-            TableName : table
-        })
-        if (table_metadata.Table === undefined || table_metadata.Table.KeySchema === undefined) {
-            return
+    async remove_attribute(table_name : string, attribute_name : string) {
+        const table_key_names = await this.get_table_key_names(table_name)
+        if (table_key_names === undefined) {
+            return undefined
         }
-        const table_key_names = table_metadata.Table.KeySchema.map(key => key.AttributeName)
-            .filter(table_key_name => table_key_name !== undefined)
-        const items = await this.scan(table)
+        const items = await this.scan(table_name)
             .then(items => items.filter(item => item[attribute_name] !== undefined))
         for (const item of items) {
             const key = Object.fromEntries(table_key_names.map(key_name => [key_name, item[key_name]]))
-            await this.remove(table, key, [attribute_name])
+            await this.remove(table_name, key, [attribute_name])
         }
     }
 }

package/src/f.ts

@@ -0,0 +1,25 @@
+import { SecretsManager } from "@aws-sdk/client-secrets-manager"
+import { TriangleUtils } from "."
+
+const secret_name = "triage_config"
+
+const secrets_manager = new SecretsManager({ region: "us-east-1" })
+
+const response = await secrets_manager.getSecretValue({
+    SecretId: secret_name
+})
+
+const api_keys = JSON.parse(response?.SecretString || "")
+
+const config = {
+    google_email : "louishou@triangleanalytics.com",
+    alerts_email : "alerts@triangleanalytics.com",
+    region : "us-east-1",
+    ...api_keys
+}
+
+const utils = new TriangleUtils(config)
+
+const foods = await utils.dynamodb.query("triage_docket_documents:register_document_id", { register_document_id : "E6-17065" })
+
+console.log(foods)