triangle-utils 1.4.129 → 1.4.132

package/dist/src/UtilsRDS.d.ts

@@ -10,48 +10,34 @@ export declare class UtilsRDS {
     disconnect(): Promise<void>;
     query(sql: string, options?: {
         is_verbose?: boolean;
-    }): Promise<import("pg").QueryResult<any>>;
-    exec(sql: string, options?: {
-        is_verbose?: boolean;
     }): Promise<{
         [k: string]: unknown;
     }[]>;
+    exec(sql: string, options?: {
+        is_verbose?: boolean;
+    }): Promise<any[]>;
     get(table_id: string, primary_key: Record<string, any>, attribute_names?: string[], options?: {
         is_verbose?: boolean;
-    }): Promise<Record<string, any>>;
+    }): Promise<Record<string, any> | undefined>;
     batch_get(table_id: string, primary_key: Record<string, any[]>, attribute_names?: string[], options?: {
         is_verbose?: boolean;
-    }): Promise<{
-        [k: string]: unknown;
-    }[]>;
+    }): Promise<any[]>;
     create(table_id: string, item: Record<string, any>, options?: {
         is_verbose?: boolean;
-    }): Promise<{
-        [k: string]: unknown;
-    }[] | undefined>;
+    }): Promise<any[] | undefined>;
     batch_create(table_id: string, items: Record<string, any>[], options?: {
         is_verbose?: boolean;
-    }): Promise<{
-        [k: string]: unknown;
-    }[] | undefined>;
+    }): Promise<any[] | undefined>;
     put(table_id: string, item: Record<string, any>, options?: {
         is_verbose?: boolean;
-    }): Promise<{
-        [k: string]: unknown;
-    }[] | undefined>;
+    }): Promise<any[] | undefined>;
     batch_put(table_id: string, items: Record<string, any>[], options?: {
         is_verbose?: boolean;
-    }): Promise<{
-        [k: string]: unknown;
-    }[] | undefined>;
+    }): Promise<any[] | undefined>;
     delete(table_id: string, primary_key: Record<string, any>, options?: {
         is_verbose?: boolean;
-    }): Promise<{
-        [k: string]: unknown;
-    }[]>;
+    }): Promise<any[]>;
     batch_delete(table_id: string, primary_key: Record<string, any[]>, options?: {
         is_verbose?: boolean;
-    }): Promise<{
-        [k: string]: unknown;
-    }[]>;
+    }): Promise<any[]>;
 }

package/dist/src/UtilsRDS.js

@@ -46,10 +46,12 @@ export class UtilsRDS {
         if (this.is_connected) {
             return;
         }
+        this.is_connected = true;
         return await this.postgres.connect();
     }
     async disconnect() {
-        return await this.postgres.end();
+        await this.postgres.end();
+        this.is_connected = false;
     }
     async query(sql, options = {}) {
         const is_verbose = Boolean(options.is_verbose);
@@ -63,7 +65,7 @@ export class UtilsRDS {
             }
         }
         const response = await this.postgres.query(sql);
-        return response;
+        return response.rows.map(item => Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== null)));
     }
     async exec(sql, options = {}) {
         const is_verbose = Boolean(options.is_verbose);
@@ -79,6 +81,7 @@ export class UtilsRDS {
                 formatRecordsAs: "JSON"
             })
                 .then(response => JSON.parse(response.formattedRecords || "[]"))
+                .then(items => items.map((item) => Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== null))))
             :
                 await this.query(sql, options);
         if (!Array.isArray(items)) {
@@ -87,7 +90,7 @@ export class UtilsRDS {
             }
             return [];
         }
-        return items.map(item => Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== null)));
+        return items;
     }
     async get(table_id, primary_key, attribute_names, options = {}) {
         const sql = "SELECT " + (attribute_names === undefined ? "*" : attribute_names.join(", ")) + " FROM " + table_id + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_rds_input(value)).join(" AND ");

package/dist/src/f.js

@@ -67,3 +67,5 @@ const utils = new TriangleUtils(config);
 //     }, { is_verbose : true })
 //     console.log(response)
 // }
+const lal_file_voters = await utils.rds.query("SELECT * FROM lal_file_voters LIMIT 3;");
+console.log(lal_file_voters);

package/package.json

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

package/src/UtilsRDS.ts

@@ -54,11 +54,13 @@ export class UtilsRDS {
         if (this.is_connected) {
             return
         }
+        this.is_connected = true
         return await this.postgres.connect()
     }
 
     async disconnect() {
-        return await this.postgres.end()
+        await this.postgres.end()
+        this.is_connected = false
     }
 
     async query(
@@ -78,7 +80,7 @@ export class UtilsRDS {
             }
         }
         const response = await this.postgres.query(sql)
-        return response
+        return response.rows.map(item => Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== null)))
     }
 
     async exec(
@@ -100,6 +102,7 @@ export class UtilsRDS {
                 formatRecordsAs : "JSON"
             })
                 .then(response => JSON.parse(response.formattedRecords || "[]"))
+                .then(items => items.map((item : any) => Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== null))))
         :
             await this.query(sql, options)
         if (!Array.isArray(items)) {
@@ -108,7 +111,7 @@ export class UtilsRDS {
             }
             return []
         }
-        return items.map(item => Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== null)))
+        return items
     }
 
     async get(

package/src/f.ts

@@ -82,4 +82,7 @@ const utils = new TriangleUtils(config)
 //         }
 //     }, { is_verbose : true })
 //     console.log(response)
-// }
+// }
+
+const lal_file_voters = await utils.rds.query("SELECT * FROM lal_file_voters LIMIT 3;")
+    console.log(lal_file_voters)