@restura/core 0.1.0-alpha.12 → 0.1.0-alpha.14

package/dist/index.mjs

@@ -216,7 +216,7 @@ import { createHash } from "crypto";
 import * as express from "express";
 import fs3 from "fs";
 import path3 from "path";
-import pg2 from "pg";
+import pg3 from "pg";
 import * as prettier3 from "prettier";
 
 // src/restura/sql/SqlUtils.ts
@@ -1206,7 +1206,6 @@ import { ObjectUtils as ObjectUtils4 } from "@redskytech/core-utils";
 
 // src/restura/sql/PsqlPool.ts
 import pg from "pg";
-import format3 from "pg-format";
 
 // src/restura/sql/PsqlUtils.ts
 import format2 from "pg-format";
@@ -1255,25 +1254,17 @@ function SQL(strings, ...values) {
   return query;
 }
 
-// src/restura/sql/PsqlPool.ts
-var { Pool } = pg;
-var PsqlPool = class {
-  constructor(poolConfig) {
-    this.poolConfig = poolConfig;
-    this.pool = new Pool(poolConfig);
-    this.queryOne("SELECT NOW();", [], { isSystemUser: true, role: "", host: "localhost", ipAddress: "" }).then(() => {
-      logger.info("Connected to PostgreSQL database");
-    }).catch((error) => {
-      logger.error("Error connecting to database", error);
-      process.exit(1);
-    });
+// src/restura/sql/PsqlConnection.ts
+import format3 from "pg-format";
+var PsqlConnection = class {
+  constructor() {
   }
   // eslint-disable-next-line  @typescript-eslint/no-explicit-any
   async queryOne(query, options, requesterDetails) {
     const formattedQuery = questionMarksToOrderedParams(query);
     this.logSqlStatement(formattedQuery, options, requesterDetails);
     try {
-      const response = await this.pool.query(formattedQuery, options);
+      const response = await this.query(formattedQuery, options);
       if (response.rows.length === 0) throw new RsError("NOT_FOUND", "No results found");
       else if (response.rows.length > 1) throw new RsError("DUPLICATE", "More than one result found");
       return response.rows[0];
@@ -1290,10 +1281,8 @@ var PsqlPool = class {
   async runQuery(query, options, requesterDetails) {
     const formattedQuery = questionMarksToOrderedParams(query);
     this.logSqlStatement(formattedQuery, options, requesterDetails);
-    const queryUpdated = query.replace(/[\t\n]/g, " ");
-    console.log(queryUpdated, options);
     try {
-      const response = await this.pool.query(formattedQuery, options);
+      const response = await this.query(formattedQuery, options);
       return response.rows;
     } catch (error) {
       console.error(error, query, options);
@@ -1325,6 +1314,25 @@ var PsqlPool = class {
   }
 };
 
+// src/restura/sql/PsqlPool.ts
+var { Pool } = pg;
+var PsqlPool = class extends PsqlConnection {
+  constructor(poolConfig) {
+    super();
+    this.poolConfig = poolConfig;
+    this.pool = new Pool(poolConfig);
+    this.queryOne("SELECT NOW();", [], { isSystemUser: true, role: "", host: "localhost", ipAddress: "" }).then(() => {
+      logger.info("Connected to PostgreSQL database");
+    }).catch((error) => {
+      logger.error("Error connecting to database", error);
+      process.exit(1);
+    });
+  }
+  async query(query, values) {
+    return this.pool.query(query, values);
+  }
+};
+
 // src/restura/sql/SqlEngine.ts
 import { ObjectUtils as ObjectUtils3 } from "@redskytech/core-utils";
 var SqlEngine = class {
@@ -1489,9 +1497,9 @@ expressionList =
 
 expression = 
     negate:negate?"(" "column:" column:column ","? value:value? ","? type:type? ")" 
-    {return \`\${negate? "!" : ""}(\${type?  type(column, value) : \`\${column} = \${format.literal(value)}\`})\`;}
+    {return \`\${negate? " NOT " : ""}(\${type?  type(column, value) : \`\${column} = \${format.literal(value)}\`})\`;}
     /
-    negate:negate?"("expression:expressionList")" { return \`\${negate? "!" : ""}(\${expression})\`; }
+    negate:negate?"("expression:expressionList")" { return \`\${negate? " NOT " : ""}(\${expression})\`; }
 
 negate = "!"
     
@@ -1528,7 +1536,7 @@ var filterPsqlParser_default = filterPsqlParser;
 // src/restura/sql/PsqlEngine.ts
 import getDiff from "@wmfs/pg-diff-sync";
 import pgInfo from "@wmfs/pg-info";
-import { Client } from "pg";
+var { Client } = "pg";
 var systemUser = {
   role: "",
   host: "",
@@ -1671,7 +1679,6 @@ var PsqlEngine = class extends SqlEngine {
       schema: "public"
     });
     const diff = getDiff(info1, info2);
-    console.log("Schema differences:", diff);
     await originalClient.end();
     await scratchClient.end();
     return diff.join("\n");
@@ -1785,22 +1792,20 @@ var PsqlEngine = class extends SqlEngine {
       );
     } else if (routeData.type === "PAGED") {
       const data = req.data;
-      const pageResults = await this.psqlConnectionPool.runQuery(
-        `${selectStatement}${sqlStatement}${groupByOrderByStatement} LIMIT ? OFFSET ?;SELECT COUNT(${routeData.groupBy ? `DISTINCT ${routeData.groupBy.tableName}.${routeData.groupBy.columnName}` : "*"}) AS total
-${sqlStatement};`,
-        [
-          ...sqlParams,
-          data.perPage || DEFAULT_PAGED_PER_PAGE_NUMBER,
-          (data.page - 1) * data.perPage || DEFAULT_PAGED_PAGE_NUMBER,
-          ...sqlParams
-        ],
+      const pagePromise = this.psqlConnectionPool.runQuery(
+        `${selectStatement}${sqlStatement}${groupByOrderByStatement}` + SQL`LIMIT ${data.perPage || DEFAULT_PAGED_PER_PAGE_NUMBER} OFFSET ${(data.page - 1) * data.perPage || DEFAULT_PAGED_PAGE_NUMBER};`,
+        sqlParams,
         req.requesterDetails
       );
+      const totalQuery = `SELECT COUNT(${routeData.groupBy ? `DISTINCT ${routeData.groupBy.tableName}.${routeData.groupBy.columnName}` : "*"}) AS total
+ ${sqlStatement};`;
+      const totalPromise = await this.psqlConnectionPool.runQuery(totalQuery, sqlParams, req.requesterDetails);
+      const [pageResults, totalResponse] = await Promise.all([pagePromise, totalPromise]);
       let total = 0;
-      if (ObjectUtils4.isArrayWithData(pageResults)) {
-        total = pageResults[1][0].total;
+      if (ObjectUtils4.isArrayWithData(totalResponse)) {
+        total = totalResponse[0].total;
       }
-      return { data: pageResults[0], total };
+      return { data: pageResults, total };
     } else {
       throw new RsError("UNKNOWN_ERROR", "Unknown route type.");
     }
@@ -1958,8 +1963,127 @@ var schemaToPsqlType = (column, tableName) => {
   return column.type;
 };
 
+// src/restura/sql/PsqlTransaction.ts
+import pg2 from "pg";
+var { Client: Client2 } = pg2;
+var PsqlTransaction = class extends PsqlConnection {
+  constructor(clientConfig) {
+    super();
+    this.clientConfig = clientConfig;
+    this.client = new Client2(clientConfig);
+    this.beginTransactionPromise = this.beginTransaction();
+  }
+  async beginTransaction() {
+    return this.query("BEGIN");
+  }
+  async rollback() {
+    return this.query("ROLLBACK");
+  }
+  async commit() {
+    return this.query("COMMIT");
+  }
+  async release() {
+    return this.client.end();
+  }
+  async query(query, values) {
+    await this.client.connect();
+    await this.beginTransactionPromise;
+    return this.client.query(query, values);
+  }
+};
+
+// src/restura/compareSchema.ts
+import cloneDeep from "lodash.clonedeep";
+var CompareSchema = class {
+  async diffSchema(newSchema, latestSchema, psqlEngine) {
+    let endPoints = this.diffEndPoints(newSchema.endpoints[0].routes, latestSchema.endpoints[0].routes);
+    let globalParams = this.diffStringArray(newSchema.globalParams, latestSchema.globalParams);
+    let roles = this.diffStringArray(newSchema.roles, latestSchema.roles);
+    let commands = "";
+    if (JSON.stringify(newSchema.database) !== JSON.stringify(latestSchema.database))
+      commands = await psqlEngine.diffDatabaseToSchema(newSchema);
+    let customTypes = newSchema.customTypes !== latestSchema.customTypes;
+    const schemaPreview = { endPoints, globalParams, roles, commands, customTypes };
+    return schemaPreview;
+  }
+  diffStringArray(newArray, originalArray) {
+    let stringsDiff = [];
+    let originalClone = new Set(originalArray);
+    newArray.forEach((item) => {
+      let originalIndex = originalClone.has(item);
+      if (!originalIndex) {
+        stringsDiff.push({
+          name: item,
+          changeType: "NEW"
+        });
+      } else {
+        originalClone.delete(item);
+      }
+    });
+    originalClone.forEach((item) => {
+      stringsDiff.push({
+        name: item,
+        changeType: "DELETED"
+      });
+    });
+    return stringsDiff;
+  }
+  diffEndPoints(newEndPoints, originalEndpoints) {
+    let originalClone = cloneDeep(originalEndpoints);
+    let diffObj = [];
+    newEndPoints.forEach((endPoint) => {
+      let { path: path4, method } = endPoint;
+      let endPointIndex = originalClone.findIndex((original) => {
+        return original.path === endPoint.path && original.method === endPoint.method;
+      });
+      if (endPointIndex === -1) {
+        diffObj.push({
+          name: `${method} ${path4}`,
+          changeType: "NEW"
+        });
+      } else {
+        let original = originalClone.findIndex((original2) => {
+          return this.compareEndPoints(endPoint, original2);
+        });
+        if (original === -1) {
+          diffObj.push({
+            name: `${method} ${path4}`,
+            changeType: "MODIFIED"
+          });
+        }
+        originalClone.splice(endPointIndex, 1);
+      }
+    });
+    originalClone.forEach((original) => {
+      let { path: path4, method } = original;
+      diffObj.push({
+        name: `${method} ${path4}`,
+        changeType: "DELETED"
+      });
+    });
+    return diffObj;
+  }
+  compareEndPoints(endPoint1, endPoint2) {
+    return JSON.stringify(endPoint1) === JSON.stringify(endPoint2);
+  }
+};
+__decorateClass([
+  boundMethod
+], CompareSchema.prototype, "diffSchema", 1);
+__decorateClass([
+  boundMethod
+], CompareSchema.prototype, "diffStringArray", 1);
+__decorateClass([
+  boundMethod
+], CompareSchema.prototype, "diffEndPoints", 1);
+__decorateClass([
+  boundMethod
+], CompareSchema.prototype, "compareEndPoints", 1);
+var compareSchema = new CompareSchema();
+var compareSchema_default = compareSchema;
+
 // src/restura/restura.ts
-var { types } = pg2;
+var { types } = pg3;
 var ResturaEngine = class {
   constructor() {
     this.publicEndpoints = {
@@ -2163,7 +2287,7 @@ var ResturaEngine = class {
   }
   async previewCreateSchema(req, res) {
     try {
-      const schemaDiff = { commands: "", endPoints: [], globalParams: [], roles: [], customTypes: false };
+      const schemaDiff = await compareSchema_default.diffSchema(req.data, this.schema, this.psqlEngine);
       res.send({ data: schemaDiff });
     } catch (err) {
       res.status(400).send(err);
@@ -2336,7 +2460,9 @@ setupPgReturnTypes();
 var restura = new ResturaEngine();
 export {
   HtmlStatusCodes,
+  PsqlConnection,
   PsqlPool,
+  PsqlTransaction,
   RsError,
   SQL,
   escapeColumnName,