@quillsql/node 0.4.8 → 0.5.0

package/dist/index.d.ts

@@ -37,3 +37,4 @@ export declare class Quill {
     private postQuill;
     close(): Promise<void>;
 }
+export { QuillQueryParams as QuillRequest } from "./models/Quill";

package/dist/index.js

@@ -103,7 +103,7 @@ class Quill {
                 databaseType.toLowerCase() !== pkDatabaseType.toLowerCase()) {
                 return {
                     dbMismatched: true,
-                    backendDatbaseType: pkDatabaseType,
+                    backendDatabaseType: pkDatabaseType,
                     queryResults: [],
                 };
             }
@@ -144,8 +144,10 @@ class Quill {
                     return yield this.targetConnection.query(query);
                 })));
                 results = Object.assign(Object.assign({}, results), { queryResults });
-                if (runQueryConfig === null || runQueryConfig === void 0 ? void 0 : runQueryConfig.removeFields) {
-                    results = Object.assign(Object.assign({}, results), { queryResults: (0, RunQueryProcesses_1.removeFields)(queryResults, runQueryConfig.removeFields) });
+                if (runQueryConfig === null || runQueryConfig === void 0 ? void 0 : runQueryConfig.fieldsToRemove) {
+                    results = Object.assign(Object.assign({}, results), { queryResults: queryResults.map((queryResult) => {
+                            return (0, RunQueryProcesses_1.removeFields)(queryResult, runQueryConfig.fieldsToRemove);
+                        }) });
                 }
                 if (runQueryConfig === null || runQueryConfig === void 0 ? void 0 : runQueryConfig.convertDatatypes) {
                     results = queryResults.map((result) => {

package/dist/models/Quill.d.ts

@@ -52,7 +52,7 @@ export interface AdditionalProcessing {
     schema?: string;
     schemaNames?: string[];
     table?: string;
-    removeFields?: string[];
+    fieldsToRemove?: string[];
     arrayToMap?: {
         arrayName: string;
         field: string;

package/dist/utils/RunQueryProcesses.js

@@ -11,13 +11,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapQueries = exports.removeFields = void 0;
 function removeFields(queryResults, fieldsToRemove) {
-    const fields = queryResults.fields.filter((field) => fieldsToRemove.includes(field.name));
-    const rows = queryResults.map((row) => {
+    const fields = queryResults.fields.filter((field) => !fieldsToRemove.includes(field.name));
+    const rows = queryResults.rows.map((row) => {
         fieldsToRemove.forEach((field) => {
             delete row[field];
         });
-        return { fields, rows };
+        return row;
     });
+    return { fields, rows };
 }
 exports.removeFields = removeFields;
 function mapQueries(queries, targetConnection) {

package/examples/node-server/app.ts

@@ -4,7 +4,7 @@ import express from "express";
 import cors from "cors";
 
 const app = express();
-const port = 3000;
+const port = 3001;
 
 // postgresqlConfigExample {
 //   connectionString: process.env.DB_URL,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/node",
-  "version": "0.4.8",
+  "version": "0.5.0",
   "description": "Quill Server SDK for Node.js",
   "main": "dist/index.js",
   "module": "./dist/index.js",

package/src/index.ts

@@ -171,7 +171,7 @@ export class Quill {
     ) {
       return {
         dbMismatched: true,
-        backendDatbaseType: pkDatabaseType,
+        backendDatabaseType: pkDatabaseType,
         queryResults: [],
       };
     }
@@ -221,10 +221,12 @@ export class Quill {
         })
       );
       results = { ...results, queryResults };
-      if (runQueryConfig?.removeFields) {
+      if (runQueryConfig?.fieldsToRemove) {
         results = {
           ...results,
-          queryResults: removeFields(queryResults, runQueryConfig.removeFields),
+          queryResults: queryResults.map((queryResult) => {
+            return removeFields(queryResult, runQueryConfig.fieldsToRemove!);
+          }),
         };
       }
       if (runQueryConfig?.convertDatatypes) {
@@ -303,3 +305,5 @@ module.exports.getColumnInfoBySchemaByDatabase =
 module.exports.connectToDatabase = connectToDatabase;
 module.exports.runQueryByDatabase = runQueryByDatabase;
 module.exports.DatabaseType = DatabaseType;
+
+export { QuillQueryParams as QuillRequest } from "./models/Quill";

package/src/models/Quill.ts

@@ -58,7 +58,7 @@ export interface AdditionalProcessing {
   schema?: string;
   schemaNames?: string[];
   table?: string;
-  removeFields?: string[];
+  fieldsToRemove?: string[];
   arrayToMap?: { arrayName: string; field: string };
   overridePost?: boolean;
   convertDatatypes?: boolean;

package/src/utils/RunQueryProcesses.ts

@@ -8,15 +8,16 @@ interface TableSchemaInfo {
 }
 
 export function removeFields(queryResults: any, fieldsToRemove: string[]): any {
-  const fields = queryResults.fields.filter((field: { name: any }) =>
-    fieldsToRemove.includes(field.name)
+  const fields = queryResults.fields.filter(
+    (field: { name: any }) => !fieldsToRemove.includes(field.name)
   );
-  const rows = queryResults.map((row: any) => {
+  const rows = queryResults.rows.map((row: any) => {
     fieldsToRemove.forEach((field) => {
       delete row[field];
     });
-    return { fields, rows };
+    return row;
   });
+  return { fields, rows };
 }
 
 export async function mapQueries(