@quillsql/node 0.3.4 → 0.3.6

package/dist/clients/QuillServerClient.js

@@ -12,8 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = __importDefault(require("axios"));
 /** This client is currently not used but is a good design pratice */
-const node_fetch_1 = __importDefault(require("node-fetch"));
 class QuillServerClient {
     constructor(privateKey) {
         this.baseUrl = "";
@@ -21,12 +21,7 @@ class QuillServerClient {
     }
     postQuill(route, payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield (0, node_fetch_1.default)(`${this.baseUrl}/${route}`, {
-                method: "POST",
-                headers: Object.assign(Object.assign({}, this.config.headers), { "Content-Type": "application/json" }),
-                body: JSON.stringify(payload),
-            });
-            return response.json();
+            return axios_1.default.post(`${this.baseUrl}/${route}`, payload, this.config);
         });
     }
 }

package/dist/index.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const CachedPools_1 = require("./db/CachedPools");
-const node_fetch_1 = __importDefault(require("node-fetch"));
+const axios_1 = __importDefault(require("axios"));
 require("dotenv/config");
 const RunQueryProcesses_1 = require("./utils/RunQueryProcesses");
 const HOST = process.env.ENV === "development"
@@ -32,6 +32,7 @@ class QuillClass {
         this.targetPool = new CachedPools_1.CachedPool({ connectionString: this.connectionString, ssl: this.ssl }, cache);
     }
     query({ orgId, metadata }) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             this.targetPool.orgId = orgId;
             try {
@@ -39,11 +40,21 @@ class QuillClass {
                 const preQueryResults = yield this.runQueries(metadata.preQueries);
                 const response = yield this.postQuill(metadata.task, Object.assign(Object.assign({}, metadata), { orgId,
                     preQueryResults }));
-                const results = yield this.runQueries(response.queries, response.runQueryConfig);
                 // if there is no metadata object in the response, create one
                 if (!response.metadata) {
                     response.metadata = {};
                 }
+                const results = yield this.runQueries(response.queries, response.metadata.runQueryConfig);
+                // QUICK JANKY FIX TO UPDATE METADATA AFTER GETTING MAPPED ARRAYS
+                if (results.mappedArray &&
+                    ((_b = (_a = response.metadata) === null || _a === void 0 ? void 0 : _a.runQueryConfig) === null || _b === void 0 ? void 0 : _b.arrayToMap)) {
+                    const arrayToMap = response.metadata.runQueryConfig.arrayToMap;
+                    results.mappedArray.forEach((array, index) => {
+                        response.metadata[arrayToMap.arrayName][index][arrayToMap.field] =
+                            array;
+                    });
+                    delete results.mappedArray;
+                }
                 // if there is a single query array in queryResults and the rows and field objects to metadata
                 if ((results === null || results === void 0 ? void 0 : results.queryResults.length) === 1) {
                     const queryResults = results.queryResults[0];
@@ -71,7 +82,8 @@ class QuillClass {
             if (!queries)
                 return Object.assign(Object.assign({}, results), { queryResults: [] });
             if (runQueryConfig === null || runQueryConfig === void 0 ? void 0 : runQueryConfig.arrayToMap) {
-                return Object.assign(Object.assign({}, results), { mappedQueries: yield (0, RunQueryProcesses_1.mapQueries)(queries, runQueryConfig.arrayToMap, this.targetPool) });
+                const mappedArray = yield (0, RunQueryProcesses_1.mapQueries)(queries, runQueryConfig.arrayToMap, this.targetPool);
+                return Object.assign(Object.assign({}, results), { queryResults: [], mappedArray });
             }
             else {
                 const queryResults = yield Promise.all(queries.map((query) => __awaiter(this, void 0, void 0, function* () {
@@ -90,13 +102,8 @@ class QuillClass {
     }
     postQuill(path, payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield (0, node_fetch_1.default)(`${this.baseUrl}/sdk/${path}`, {
-                method: "POST",
-                headers: this.config.headers,
-                body: JSON.stringify(payload),
-            });
-            const data = yield response.json();
-            return data;
+            const response = yield axios_1.default.post(`${this.baseUrl}/sdk/${path}`, payload, this.config);
+            return response.data;
         });
     }
     close() {

package/dist/utils/RunQueryProcesses.js

@@ -37,12 +37,12 @@ function removeFields(queryResults, fieldsToRemove) {
 exports.removeFields = removeFields;
 function mapQueries(queries, arrayToMap, targetPool) {
     return __awaiter(this, void 0, void 0, function* () {
-        let arrayToMapResult = [];
+        const mappedArray = [];
         for (let i = 0; i < queries.length; i++) {
             const queryResult = yield targetPool.query(queries[i]);
-            arrayToMapResult.push(Object.assign(Object.assign({}, arrayToMap.arr[i]), { [arrayToMap.field]: queryResult.rows }));
+            mappedArray.push(queryResult.rows);
         }
-        return arrayToMapResult;
+        return mappedArray;
     });
 }
 exports.mapQueries = mapQueries;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/node",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Quill's client SDK for node backends.",
   "main": "dist/index.js",
   "module": "./dist/index.js",
@@ -26,8 +26,8 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
+    "axios": "^1.6.5",
     "dotenv": "^16.3.1",
-    "node-fetch": "^3.3.2",
     "pg": "^8.11.3",
     "redis": "^4.6.12",
     "ts-jest": "^29.1.1"

package/src/clients/QuillServerClient.ts

@@ -1,5 +1,6 @@
+import axios from "axios";
+
 /** This client is currently not used but is a good design pratice */
-import fetch from "node-fetch";
 
 class QuillServerClient {
   private baseUrl: string;
@@ -15,15 +16,7 @@ class QuillServerClient {
   }
 
   public async postQuill(route: string, payload: any): Promise<any> {
-    const response = await fetch(`${this.baseUrl}/${route}`, {
-      method: "POST",
-      headers: {
-        ...this.config.headers,
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(payload),
-    });
-    return response.json();
+    return axios.post(`${this.baseUrl}/${route}`, payload, this.config);
   }
 }
 

package/src/index.ts

@@ -6,7 +6,7 @@ import {
   QuillQueryParams,
 } from "./models/Quill";
 import { CachedPool } from "./db/CachedPools";
-import fetch from "node-fetch";
+import axios from "axios";
 import "dotenv/config";
 import {
   getTableSchema,
@@ -61,14 +61,26 @@ export default class QuillClass {
         orgId,
         preQueryResults,
       });
-      const results = await this.runQueries(
-        response.queries,
-        response.runQueryConfig
-      );
       // if there is no metadata object in the response, create one
       if (!response.metadata) {
         response.metadata = {};
       }
+      const results = await this.runQueries(
+        response.queries,
+        response.metadata.runQueryConfig
+      );
+      // QUICK JANKY FIX TO UPDATE METADATA AFTER GETTING MAPPED ARRAYS
+      if (
+        results.mappedArray &&
+        response.metadata?.runQueryConfig?.arrayToMap
+      ) {
+        const arrayToMap = response.metadata.runQueryConfig.arrayToMap;
+        results.mappedArray.forEach((array: any, index: number) => {
+          response.metadata[arrayToMap.arrayName][index][arrayToMap.field] =
+            array;
+        });
+        delete results.mappedArray;
+      }
       // if there is a single query array in queryResults and the rows and field objects to metadata
       if (results?.queryResults.length === 1) {
         const queryResults = results.queryResults[0];
@@ -96,14 +108,12 @@ export default class QuillClass {
     let results: any;
     if (!queries) return { ...results, queryResults: [] };
     if (runQueryConfig?.arrayToMap) {
-      return {
-        ...results,
-        mappedQueries: await mapQueries(
-          queries,
-          runQueryConfig.arrayToMap,
-          this.targetPool
-        ),
-      };
+      const mappedArray = await mapQueries(
+        queries,
+        runQueryConfig.arrayToMap,
+        this.targetPool
+      );
+      return { ...results, queryResults: [], mappedArray };
     } else {
       const queryResults = await Promise.all(
         queries.map(async (query) => {
@@ -131,13 +141,12 @@ export default class QuillClass {
     path: string,
     payload: any
   ): Promise<QuillClientResponse> {
-    const response = await fetch(`${this.baseUrl}/sdk/${path}`, {
-      method: "POST",
-      headers: this.config.headers,
-      body: JSON.stringify(payload),
-    });
-    const data = await response.json();
-    return data as QuillClientResponse;
+    const response = await axios.post(
+      `${this.baseUrl}/sdk/${path}`,
+      payload,
+      this.config
+    );
+    return response.data;
   }
 
   public async close() {

package/src/models/Quill.ts

@@ -58,7 +58,7 @@ export interface QuillConfig {
 export interface AdditionalProcessing {
   getSchema?: boolean;
   removeFields?: string[];
-  arrayToMap?: { arr: any; field: string };
+  arrayToMap?: { arrayName: string; field: string };
 }
 
 export interface QuillClientResponse {

package/src/utils/RunQueryProcesses.ts

@@ -43,16 +43,13 @@ export function removeFields(queryResults: any, fieldsToRemove: string[]): any {
 
 export async function mapQueries(
   queries: string[],
-  arrayToMap: { arr: any; field: string },
+  arrayToMap: { arrayName: string; field: string },
   targetPool: CachedPool
-) {
-  let arrayToMapResult = [];
+): Promise<any[]> {
+  const mappedArray = [];
   for (let i = 0; i < queries.length; i++) {
     const queryResult = await targetPool.query(queries[i]);
-    arrayToMapResult.push({
-      ...arrayToMap.arr[i],
-      [arrayToMap.field]: queryResult.rows,
-    });
+    mappedArray.push(queryResult.rows);
   }
-  return arrayToMapResult;
+  return mappedArray;
 }