v1.3.7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navy.gif/wrappers",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "Various wrapper classes I use in my projects",
   "repository": "https://git.corgi.wtf/Navy.gif/wrappers.git",
   "author": "Navy.gif",

src/MariaDB.ts

@@ -175,10 +175,10 @@ class MariaDB {
      * @throws {MariaError}
      * @private 
      * */
-    async #_query (query: string, values: (string | number | string[] | number[])[], timeout?: number, attempts = 0): Promise<object[] | FieldInfo[] | null> {
+    async #_query<T> (query: string, values: (string | number | string[] | number[])[], timeout?: number, attempts = 0): Promise<T[] | FieldInfo[]> {
         const connection = await this.getConnection();
         try {
-            const result = await new Promise<object[] | FieldInfo[] | undefined>((resolve, reject) => {
+            const result = await new Promise<T[] | FieldInfo[] | undefined>((resolve, reject) => {
                 const q = connection.query({ timeout, sql: query }, values, (err, results, fields) => {
                     if (err) 
                         reject(err);
@@ -190,7 +190,7 @@ class MariaDB {
                 });
                 this.#logger.debug(`Constructed query: ${q.sql}`);
             });
-            return Promise.resolve(result ?? null);
+            return Promise.resolve(result || []);
         } catch (err) {
             const error = err as MariaError;
             // Retry safe errors                  // (Galera) Instance not ready for query
@@ -200,7 +200,7 @@ class MariaDB {
         }
     }
 
-    async query (query: string, values: (string | number | string[] | number[])[], timeout?: number) {
+    async query<T> (query: string, values: (string | number | string[] | number[])[], timeout?: number): Promise<T[] | FieldInfo[]> {
 
         if (!this.ready)
             return Promise.reject(new Error('MariaDB not ready'));
@@ -210,7 +210,7 @@ class MariaDB {
             batch = values.some(val => val instanceof Array);
         this.#logger.debug(`Incoming query (batch: ${batch})\n${query}\n${inspect(values)}`);
 
-        return this.#_query(query, values, timeout);
+        return this.#_query<T>(query, values, timeout);
 
     }