@restura/core 0.1.2 → 0.2.0

package/dist/index.mjs

@@ -572,7 +572,15 @@ var ResponseValidator = class _ResponseValidator {
     return { validator: map, isArray: route.type === "ARRAY" };
   }
   getFieldResponseType(field, tableName) {
-    if (field.selector) {
+    if (field.type) {
+      if (_ResponseValidator.validatorIsValidString(field.type)) {
+        return { validator: field.type };
+      }
+      if (field.type.includes("|")) {
+        return { validator: this.parseValidationEnum(field.type) };
+      }
+      return { validator: "object" };
+    } else if (field.selector) {
       return this.getTypeFromTable(field.selector, tableName);
     } else if (field.subquery) {
       const table = this.database.find((t) => t.name == tableName);
@@ -798,7 +806,9 @@ var ApiTree = class _ApiTree {
   }
   getNameAndType(p, routeBaseTable, joins) {
     let responseType = "any", isNullable = false, array = false;
-    if (p.selector) {
+    if (p.type) {
+      responseType = p.type;
+    } else if (p.selector) {
       ({ responseType, isNullable } = this.getTypeFromTable(p.selector, p.name));
       const selectorKey = p.selector.split(".")[0];
       if (selectorKey !== routeBaseTable) {
@@ -1082,7 +1092,8 @@ var responseDataSchema = z3.object({
     // Explicit type for the lazy schema
     groupBy: groupBySchema.optional(),
     orderBy: orderBySchema.optional()
-  }).optional()
+  }).optional(),
+  type: z3.string().optional()
 }).strict();
 var routeDataBaseSchema = z3.object({
   method: z3.enum(["GET", "POST", "PUT", "PATCH", "DELETE"]),
@@ -1714,7 +1725,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);
@@ -1733,6 +1744,7 @@ var SqlEngine = class {
     return tableSchema;
   }
   doesRoleHavePermissionToColumn(role, schema, item, joins) {
+    if (item.type) return true;
     if (item.selector) {
       let tableName = item.selector.split(".")[0];
       const columnName = item.selector.split(".")[1];
@@ -2207,7 +2219,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) {
@@ -2215,7 +2227,7 @@ var PsqlEngine = class extends SqlEngine {
           item.name
         )}`;
       }
-      return `${escapeColumnName(item.selector)} AS ${escapeColumnName(item.name)}`;
+      return `${item.type ? item.selector : escapeColumnName(item.selector)} AS ${escapeColumnName(item.name)}`;
     }).join(",\n	")}
 `;
     sqlStatement += `FROM "${routeData.table}"
@@ -2315,7 +2327,7 @@ 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)}${item.alias ? `AS "${item.alias}"` : ""} ON ${customReplaced}
@@ -2958,8 +2970,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) => {