@quillsql/node 0.5.9 → 0.6.0

package/src/index.ts

@@ -1,4 +1,3 @@
-import QuillServerClient from "./clients/QuillServerClient";
 import { CacheCredentials } from "./models/Cache";
 import {
   AdditionalProcessing,
@@ -92,6 +91,11 @@ export class Quill {
   }: QuillQueryParams): Promise<QuillQueryResult> {
     this.targetConnection.orgId = orgId;
     let responseMetadata: any = {};
+
+    if (!metadata.task) {
+      return { error: "Missing task.", status: "error", data: {} };
+    }
+
     try {
       const preQueryResults = metadata.preQueries
         ? await this.runQueries(
@@ -114,7 +118,11 @@ export class Quill {
         viewQuery: metadata.preQueries ? metadata.preQueries[0] : undefined,
       });
       if (response.error) {
-        return { status: "error", error: response.error };
+        return {
+          status: "error",
+          error: response.error,
+          data: response.metadata || {},
+        };
       }
       // if there is no metadata object in the response, create one
       if (response.metadata) {
@@ -153,8 +161,8 @@ export class Quill {
     } catch (err) {
       return {
         status: "error",
-        error: (err as any).message,
-        data: responseMetadata,
+        error: (err as any).response?.data?.error ?? (err as any).message,
+        data: responseMetadata || {},
       };
     }
   }
@@ -177,6 +185,7 @@ export class Quill {
         queryResults: [],
       };
     }
+
     if (runQueryConfig?.arrayToMap) {
       const mappedArray = await mapQueries(queries, this.targetConnection);
       return { ...results, queryResults: [], mappedArray };
@@ -221,8 +230,13 @@ export class Quill {
               };
             });
             return { ...table, columns: columns, rows: queryResult.rows };
-          } catch (err) {
-            return { ...table, error: "Error fetching columns" };
+          } catch (err: any) {
+            return {
+              ...table,
+              error: err.message
+                ? `Error fetching columns: ${err.message}`
+                : "Error fetching columns",
+            };
           }
         }),
       );

package/src/models/Cache.ts

@@ -4,7 +4,7 @@ export interface Mapable {
     key: string,
     value: string,
     type?: string,
-    ttl?: number
+    ttl?: number,
   ): Promise<string | null>;
 }
 
@@ -15,4 +15,4 @@ export interface CacheCredentials {
   port: string;
   cacheType: string;
   ttl?: number;
-}
+}

package/src/utils/Error.ts

@@ -4,18 +4,32 @@ export class PgError extends Error {
   hint?: string;
   position?: string;
   // Add other properties if needed
+  constructor(
+    message: string,
+    detail?: string,
+    hint?: string,
+    position?: string,
+    code?: string,
+  ) {
+    super(message);
+    this.code = code;
+    this.detail = detail;
+    this.hint = hint;
+    this.position = position;
+  }
 }
 
 export function isSuperset(obj: any, baseClass: any): boolean {
-  // Get the property names of the base class
-  const baseProps = Object.getOwnPropertyNames(baseClass.prototype);
+  // Get the property names of the base class instance
+  const baseInstance = new baseClass();
+  const baseProps = Object.keys(baseInstance);
 
   // Check if the object has all the properties of the base class
   for (const prop of baseProps) {
-    if (!obj.hasOwnProperty(prop)) {
+    if (!Object.prototype.hasOwnProperty.call(obj, prop)) {
       return false;
     }
   }
 
   return true;
-}
+}

package/src/utils/RunQueryProcesses.ts

@@ -1,6 +1,6 @@
 import { CachedConnection } from "../db/CachedConnection";
 
-interface TableSchemaInfo {
+export interface TableSchemaInfo {
   fieldType: string;
   name: string;
   displayName: string;
@@ -9,7 +9,7 @@ interface TableSchemaInfo {
 
 export function removeFields(queryResults: any, fieldsToRemove: string[]): any {
   const fields = queryResults.fields.filter(
-    (field: { name: any }) => !fieldsToRemove.includes(field.name)
+    (field: { name: any }) => !fieldsToRemove.includes(field.name),
   );
   const rows = queryResults.rows.map((row: any) => {
     fieldsToRemove.forEach((field) => {
@@ -22,7 +22,7 @@ export function removeFields(queryResults: any, fieldsToRemove: string[]): any {
 
 export async function mapQueries(
   queries: string[],
-  targetConnection: CachedConnection
+  targetConnection: CachedConnection,
 ): Promise<any[]> {
   const mappedArray = [];
   for (let i = 0; i < queries.length; i++) {

package/src/utils/textProcessing.ts

@@ -10,4 +10,4 @@ export function depluralize(text: string): string {
     return text.slice(0, -1);
   }
   return text;
-}
+}