@restura/core 0.1.1 → 0.1.3

package/dist/index.mjs

@@ -934,7 +934,7 @@ function convertTable(table) {
   let modelString = `	export interface ${StringUtils2.capitalizeFirst(table.name)} {
 `;
   for (const column of table.columns) {
-    modelString += `		${column.name}${column.isNullable ? "?" : ""}: ${SqlUtils.convertDatabaseTypeToTypescript(column.type, column.value)};
+    modelString += `		${column.name}: ${SqlUtils.convertDatabaseTypeToTypescript(column.type, column.value)}${column.isNullable ? " | null" : ""};
 `;
   }
   modelString += `	}
@@ -1538,6 +1538,7 @@ import pg from "pg";
 // src/restura/sql/PsqlConnection.ts
 import crypto from "crypto";
 import format3 from "pg-format";
+import { format as sqlFormat } from "sql-formatter";
 
 // src/restura/sql/PsqlUtils.ts
 import format2 from "pg-format";
@@ -1618,8 +1619,10 @@ var PsqlConnection = class {
     this.logSqlStatement(formattedQuery, options, meta);
     const queryMetadata = `--QUERY_METADATA(${JSON.stringify(meta)})
 `;
+    const startTime = process.hrtime();
     try {
       const response = await this.query(queryMetadata + formattedQuery, options);
+      this.logQueryDuration(startTime);
       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];
@@ -1638,8 +1641,10 @@ var PsqlConnection = class {
     this.logSqlStatement(formattedQuery, options, meta);
     const queryMetadata = `--QUERY_METADATA(${JSON.stringify(meta)})
 `;
+    const startTime = process.hrtime();
     try {
       const response = await this.query(queryMetadata + formattedQuery, options);
+      this.logQueryDuration(startTime);
       return response.rows;
     } catch (error) {
       if ((error == null ? void 0 : error.routine) === "_bt_check_unique") {
@@ -1648,6 +1653,13 @@ var PsqlConnection = class {
       throw new RsError("DATABASE_ERROR", `${error.message}`);
     }
   }
+  logQueryDuration(startTime) {
+    if (logger.level === "silly") {
+      const [seconds, nanoseconds] = process.hrtime(startTime);
+      const duration = seconds * 1e3 + nanoseconds / 1e6;
+      logger.silly(`Query duration: ${duration.toFixed(2)}ms`);
+    }
+  }
   logSqlStatement(query, options, queryMetadata, prefix = "") {
     if (logger.level !== "silly") return;
     let sqlStatement = "";
@@ -1661,12 +1673,20 @@ var PsqlConnection = class {
         return format3.literal(value);
       });
     }
+    const formattedSql = sqlFormat(sqlStatement, {
+      language: "postgresql",
+      linesBetweenQueries: 2,
+      indentStyle: "standard",
+      keywordCase: "upper",
+      useTabs: true,
+      tabWidth: 4
+    });
     let initiator = "Anonymous";
     if ("userId" in queryMetadata && queryMetadata.userId)
       initiator = `User Id (${queryMetadata.userId.toString()})`;
     if ("isSystemUser" in queryMetadata && queryMetadata.isSystemUser) initiator = "SYSTEM";
     logger.silly(`${prefix}query by ${initiator}, Query ->
- ${sqlStatement}`);
+${formattedSql}`);
   }
 };
 
@@ -1694,7 +1714,7 @@ import { ObjectUtils as ObjectUtils3 } from "@redskytech/core-utils";
 var SqlEngine = class {
   async runQueryForRoute(req, routeData, schema) {
     if (!this.doesRoleHavePermissionToTable(req.requesterDetails.role, schema, routeData.table))
-      throw new RsError("UNAUTHORIZED", "You do not have permission to access this table");
+      throw new RsError("FORBIDDEN", "You do not have permission to access this table");
     switch (routeData.method) {
       case "POST":
         return this.executeCreateRequest(req, routeData, schema);
@@ -2187,7 +2207,7 @@ var PsqlEngine = class extends SqlEngine {
       if (item.subquery || this.doesRoleHavePermissionToColumn(userRole, schema, item, routeData.joins))
         selectColumns.push(item);
     });
-    if (!selectColumns.length) throw new RsError("UNAUTHORIZED", `You do not have permission to access this data.`);
+    if (!selectColumns.length) throw new RsError("FORBIDDEN", `You do not have permission to access this data.`);
     let selectStatement = "SELECT \n";
     selectStatement += `	${selectColumns.map((item) => {
       if (item.subquery) {
@@ -2261,10 +2281,10 @@ var PsqlEngine = class extends SqlEngine {
     for (const assignment of routeData.assignments) {
       const column = table.columns.find((column2) => column2.name === assignment.name);
       if (!column) continue;
-      const assignmentWithPrefix = escapeColumnName(`${routeData.table}.${assignment.name}`);
+      const assignmentEscaped = escapeColumnName(assignment.name);
       if (SqlUtils.convertDatabaseTypeToTypescript(column.type) === "number")
-        bodyNoId[assignmentWithPrefix] = Number(assignment.value);
-      else bodyNoId[assignmentWithPrefix] = assignment.value;
+        bodyNoId[assignmentEscaped] = Number(assignment.value);
+      else bodyNoId[assignmentEscaped] = assignment.value;
     }
     const whereClause = this.generateWhereClause(req, routeData.where, routeData, sqlParams);
     const query = updateObjectQuery(routeData.table, bodyNoId, whereClause);
@@ -2295,10 +2315,10 @@ DELETE FROM "${routeData.table}" ${joinStatement} ${whereClause}`;
     let joinStatements = "";
     joins.forEach((item) => {
       if (!this.doesRoleHavePermissionToTable(userRole, schema, item.table))
-        throw new RsError("UNAUTHORIZED", "You do not have permission to access this table");
+        throw new RsError("FORBIDDEN", "You do not have permission to access this table");
       if (item.custom) {
         const customReplaced = this.replaceParamKeywords(item.custom, routeData, req, sqlParams);
-        joinStatements += `	${item.type} JOIN ${escapeColumnName(item.table)} ON ${customReplaced}
+        joinStatements += `	${item.type} JOIN ${escapeColumnName(item.table)}${item.alias ? `AS "${item.alias}"` : ""} ON ${customReplaced}
 `;
       } else {
         joinStatements += `	${item.type} JOIN ${escapeColumnName(item.table)}${item.alias ? `AS "${item.alias}"` : ""} ON "${baseTable}"."${item.localColumnName}" = ${escapeColumnName(item.alias ? item.alias : item.table)}.${escapeColumnName(
@@ -2938,8 +2958,7 @@ var ResturaEngine = class {
   validateAuthorization(req, routeData) {
     const role = req.requesterDetails.role;
     if (routeData.roles.length === 0 || !role) return;
-    if (!routeData.roles.includes(role))
-      throw new RsError("UNAUTHORIZED", "Not authorized to access this endpoint");
+    if (!routeData.roles.includes(role)) throw new RsError("FORBIDDEN", "Not authorized to access this endpoint");
   }
   getRouteData(method, baseUrl, path5) {
     const endpoint = this.schema.endpoints.find((item) => {