@quillsql/node 0.3.1 → 0.3.3

package/dist/clients/QuillServerClient.js

@@ -1,4 +1,5 @@
 "use strict";
+/** This client is currently not used but is a good design pratice */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,12 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-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 */
 class QuillServerClient {
     constructor(privateKey) {
         this.baseUrl = "";
@@ -21,7 +17,12 @@ class QuillServerClient {
     }
     postQuill(route, payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            return axios_1.default.post(`${this.baseUrl}/${route}`, payload, this.config);
+            const response = yield fetch(`${this.baseUrl}/${route}`, {
+                method: "POST",
+                headers: Object.assign(Object.assign({}, this.config.headers), { "Content-Type": "application/json" }),
+                body: JSON.stringify(payload),
+            });
+            return response.json();
         });
     }
 }

package/dist/index.ispec.js

@@ -1,41 +1,32 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const _1 = __importDefault(require("."));
-require("dotenv/config");
-const HOST = process.env.ENV === "development"
-    ? "http://localhost:8080"
-    : "https://quill-344421.uc.r.appspot.com";
-describe("Quill", () => {
-    let quill;
-    beforeEach(() => {
-        quill = new _1.default(process.env.QUILL_PRIVATE_KEY, process.env.DB_URL);
-    });
-    afterAll(() => {
-        jest.restoreAllMocks();
-    });
-    describe("query", () => {
-        it("org - should return ", () => __awaiter(void 0, void 0, void 0, function* () {
-            const metadata = {
-                task: "orgs",
-                clientId: "62cda15d7c9fcca7bc0a3689",
-            };
-            const result = yield quill.query({
-                orgId: "2",
-                metadata,
-            });
-            // TODO - add assertions
-        }));
-    });
-});
+// import Quill from ".";
+// import "dotenv/config";
+// const HOST =
+//   process.env.ENV === "development"
+//     ? "http://localhost:8080"
+//     : "https://quill-344421.uc.r.appspot.com";
+// describe("Quill", () => {
+//   let quill: Quill;
+//   beforeEach(() => {
+//     quill = new Quill(
+//       process.env.QUILL_PRIVATE_KEY as string,
+//       process.env.DB_URL as string
+//     );
+//   });
+//   afterAll(() => {
+//     jest.restoreAllMocks();
+//   });
+//   describe("query", () => {
+//     it("org - should return ", async () => {
+//       const metadata = {
+//         task: "orgs",
+//         clientId: "62cda15d7c9fcca7bc0a3689",
+//       };
+//       const result = await quill.query({
+//         orgId: "2",
+//         metadata,
+//       });
+//       // TODO - add assertions
+//     });
+//   });
+// });

package/dist/index.js

@@ -8,12 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const CachedPools_1 = require("./db/CachedPools");
-const axios_1 = __importDefault(require("axios"));
 require("dotenv/config");
 const RunQueryProcesses_1 = require("./utils/RunQueryProcesses");
 const HOST = process.env.ENV === "development"
@@ -22,7 +18,7 @@ const HOST = process.env.ENV === "development"
 /**
  * Quill - Fullstack API Platform for Dashboards and Reporting.
  */
-class Quill {
+class QuillClass {
     constructor(privateKey, databaseConnectionString, cache = {}) {
         this.ssl = { rejectUnauthorized: false };
         this.baseUrl = HOST;
@@ -90,8 +86,13 @@ class Quill {
     }
     postQuill(path, payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield axios_1.default.post(`${this.baseUrl}/sdk/${path}`, payload, this.config);
-            return response.data;
+            const response = yield fetch(`${this.baseUrl}/sdk/${path}`, {
+                method: "POST",
+                headers: this.config.headers,
+                body: JSON.stringify(payload),
+            });
+            const data = yield response.json();
+            return data;
         });
     }
     close() {
@@ -100,4 +101,10 @@ class Quill {
         });
     }
 }
-exports.default = Quill;
+exports.default = QuillClass;
+const Quill = ({ privateKey, databaseConnectionString, cache, }) => {
+    return new QuillClass(privateKey, databaseConnectionString, cache);
+};
+module.exports = Quill;
+module.exports.Quill = Quill;
+module.exports.default = Quill;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/node",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Quill's client SDK for node backends.",
   "main": "dist/index.js",
   "module": "./dist/index.js",
@@ -26,7 +26,6 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "axios": "^1.6.5",
     "dotenv": "^16.3.1",
     "pg": "^8.11.3",
     "redis": "^4.6.12",

package/src/clients/QuillServerClient.ts

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

package/src/index.ispec.ts

@@ -1,36 +1,36 @@
-import Quill from ".";
-import "dotenv/config";
+// import Quill from ".";
+// import "dotenv/config";
 
-const HOST =
-  process.env.ENV === "development"
-    ? "http://localhost:8080"
-    : "https://quill-344421.uc.r.appspot.com";
+// const HOST =
+//   process.env.ENV === "development"
+//     ? "http://localhost:8080"
+//     : "https://quill-344421.uc.r.appspot.com";
 
-describe("Quill", () => {
-  let quill: Quill;
+// describe("Quill", () => {
+//   let quill: Quill;
 
-  beforeEach(() => {
-    quill = new Quill(
-      process.env.QUILL_PRIVATE_KEY as string,
-      process.env.DB_URL as string
-    );
-  });
+//   beforeEach(() => {
+//     quill = new Quill(
+//       process.env.QUILL_PRIVATE_KEY as string,
+//       process.env.DB_URL as string
+//     );
+//   });
 
-  afterAll(() => {
-    jest.restoreAllMocks();
-  });
+//   afterAll(() => {
+//     jest.restoreAllMocks();
+//   });
 
-  describe("query", () => {
-    it("org - should return ", async () => {
-      const metadata = {
-        task: "orgs",
-        clientId: "62cda15d7c9fcca7bc0a3689",
-      };
-      const result = await quill.query({
-        orgId: "2",
-        metadata,
-      });
-      // TODO - add assertions
-    });
-  });
-});
+//   describe("query", () => {
+//     it("org - should return ", async () => {
+//       const metadata = {
+//         task: "orgs",
+//         clientId: "62cda15d7c9fcca7bc0a3689",
+//       };
+//       const result = await quill.query({
+//         orgId: "2",
+//         metadata,
+//       });
+//       // TODO - add assertions
+//     });
+//   });
+// });

package/src/index.ts

@@ -6,7 +6,6 @@ import {
   QuillQueryParams,
 } from "./models/Quill";
 import { CachedPool } from "./db/CachedPools";
-import axios from "axios";
 import "dotenv/config";
 import {
   getTableSchema,
@@ -22,7 +21,8 @@ const HOST =
 /**
  * Quill - Fullstack API Platform for Dashboards and Reporting.
  */
-export default class Quill {
+
+export default class QuillClass {
   // Configure cached connection pools with the given config.
   private connectionString;
   private ssl = { rejectUnauthorized: false };
@@ -130,15 +130,32 @@ export default class Quill {
     path: string,
     payload: any
   ): Promise<QuillClientResponse> {
-    const response = await axios.post(
-      `${this.baseUrl}/sdk/${path}`,
-      payload,
-      this.config
-    );
-    return response.data;
+    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;
   }
 
   public async close() {
     await this.targetPool.close();
   }
 }
+
+const Quill = ({
+  privateKey,
+  databaseConnectionString,
+  cache,
+}: {
+  privateKey: string;
+  databaseConnectionString: string;
+  cache?: Partial<CacheCredentials>;
+}) => {
+  return new QuillClass(privateKey, databaseConnectionString, cache);
+};
+
+module.exports = Quill;
+module.exports.Quill = Quill;
+module.exports.default = Quill;