triangle-utils 1.4.35 → 1.4.37

package/dist/src/UtilsDynamoDB.js

@@ -169,7 +169,7 @@ export class UtilsDynamoDB {
             ExpressionAttributeValues: Object.fromEntries(Object.entries(primary_key)
                 .map(([key, value]) => [":" + key, convert_input(value)])
                 .filter(([key, value]) => value !== undefined)),
-            KeyConditionExpression: Object.keys(primary_key).map(key => ["#" + key, ":" + key]).join(", "),
+            KeyConditionExpression: Object.keys(primary_key).map(key => "#" + key + " = :" + key).join(" AND "),
             Limit: 1,
             ScanIndexForward: false
         };

package/dist/src/UtilsS3.d.ts

@@ -3,6 +3,9 @@ export declare class UtilsS3 {
     private readonly s3;
     constructor(region: string);
     file_exists(s3_filename: string): Promise<boolean | undefined>;
+    get_s3_filenames(s3_filename_prefix: string, options: {
+        compile?: boolean;
+    }): Promise<string[] | undefined>;
     get_file(s3_filename: string, encoding?: string): Promise<string | undefined>;
     get_file_buffer(s3_filename: string): Promise<Buffer | undefined>;
     get_file_stream(s3_filename: string): Promise<Readable | undefined>;

package/dist/src/UtilsS3.js

@@ -28,6 +28,32 @@ export class UtilsS3 {
             return false;
         }
     }
+    async get_s3_filenames(s3_filename_prefix, options) {
+        const compile = options.compile !== undefined ? options.compile : false;
+        const s3_key = parse_s3_filename(s3_filename_prefix);
+        if (s3_key === undefined) {
+            return undefined;
+        }
+        const s3_filenames = [];
+        let last_token = undefined;
+        while (true) {
+            const response = await this.s3.listObjectsV2({
+                Bucket: s3_key.Bucket,
+                Delimiter: "/",
+                Prefix: s3_key.Key,
+                ContinuationToken: last_token
+            });
+            if (response.Contents === undefined) {
+                return [];
+            }
+            const new_s3_filenames = response.Contents.map(content => content.Key).filter(key => key !== undefined).map(key => "s3://" + s3_key.Bucket + "/" + key);
+            s3_filenames.push(...new_s3_filenames);
+            if (response.ContinuationToken === undefined || !compile) {
+                return s3_filenames;
+            }
+            last_token = response.ContinuationToken;
+        }
+    }
     async get_file(s3_filename, encoding = "utf-8") {
         const s3_key = parse_s3_filename(s3_filename);
         if (s3_key === undefined) {

package/package.json

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

package/src/UtilsDynamoDB.ts

@@ -201,7 +201,7 @@ export class UtilsDynamoDB {
                     .map(([key, value]) => [":" + key, convert_input(value)])
                     .filter(([key, value]) => value !== undefined)
             ),
-            KeyConditionExpression: Object.keys(primary_key).map(key => ["#" + key, ":" + key]).join(", "),
+            KeyConditionExpression: Object.keys(primary_key).map(key => "#" + key + " = :" + key).join(" AND "),
             Limit : 1,
             ScanIndexForward : false
         }

package/src/UtilsS3.ts

@@ -1,4 +1,4 @@
-import { S3, NoSuchKey, GetObjectCommand, PutObjectCommand } from "@aws-sdk/client-s3"
+import { S3, NoSuchKey, GetObjectCommand, PutObjectCommand, ListObjectsV2CommandOutput } from "@aws-sdk/client-s3"
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner"
 import { Readable } from "stream"
 
@@ -38,6 +38,33 @@ export class UtilsS3 {
         }
     }
 
+    async get_s3_filenames(s3_filename_prefix : string, options : { compile? : boolean }) {
+        const compile = options.compile !== undefined ? options.compile : false
+        const s3_key = parse_s3_filename(s3_filename_prefix)
+        if (s3_key === undefined) {
+            return undefined
+        }
+        const s3_filenames = []
+        let last_token : string | undefined = undefined
+        while (true) {
+            const response : ListObjectsV2CommandOutput = await this.s3.listObjectsV2({
+                Bucket : s3_key.Bucket,
+                Delimiter : "/",
+                Prefix : s3_key.Key,
+                ContinuationToken : last_token
+            })
+            if (response.Contents === undefined) {
+                return []
+            }
+            const new_s3_filenames = response.Contents.map(content => content.Key).filter(key => key !== undefined).map(key => "s3://" + s3_key.Bucket + "/" + key)
+            s3_filenames.push(...new_s3_filenames)
+            if (response.ContinuationToken === undefined || !compile) {
+                return s3_filenames
+            }
+            last_token = response.ContinuationToken
+        }
+    }
+
     async get_file(s3_filename : string, encoding : string = "utf-8") : Promise<string | undefined> {
         const s3_key = parse_s3_filename(s3_filename)
         if (s3_key === undefined) {