@restura/core 0.1.3 → 0.2.1

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) {
@@ -1048,7 +1058,22 @@ var groupBySchema = z3.object({
 var whereDataSchema = z3.object({
   tableName: z3.string().optional(),
   columnName: z3.string().optional(),
-  operator: z3.enum(["=", "<", ">", "<=", ">=", "!=", "LIKE", "IN", "NOT IN", "STARTS WITH", "ENDS WITH", "IS", "IS NOT"]).optional(),
+  operator: z3.enum([
+    "=",
+    "<",
+    ">",
+    "<=",
+    ">=",
+    "!=",
+    "LIKE",
+    "NOT LIKE",
+    "IN",
+    "NOT IN",
+    "STARTS WITH",
+    "ENDS WITH",
+    "IS",
+    "IS NOT"
+  ]).optional(),
   value: z3.string().or(z3.number()).optional(),
   custom: z3.string().optional(),
   conjunction: z3.enum(["AND", "OR"]).optional()
@@ -1082,7 +1107,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"]),
@@ -1733,6 +1759,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];
@@ -2215,7 +2242,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}"
@@ -2369,16 +2396,19 @@ DELETE FROM "${routeData.table}" ${joinStatement} ${whereClause}`;
           `Invalid where clause in route ${routeData.name}, missing required fields if not custom`
         );
       let operator = item.operator;
+      let value = item.value;
       if (operator === "LIKE") {
-        item.value = `'%${item.value}%'`;
+        value = `'%${value}%'`;
+      } else if (operator === "NOT LIKE") {
+        value = `'%${value}%'`;
       } else if (operator === "STARTS WITH") {
         operator = "LIKE";
-        item.value = `'${item.value}%'`;
+        value = `'${value}%'`;
       } else if (operator === "ENDS WITH") {
         operator = "LIKE";
-        item.value = `'%${item.value}'`;
+        value = `'%${value}'`;
       }
-      const replacedValue = this.replaceParamKeywords(item.value, routeData, req, sqlParams);
+      const replacedValue = this.replaceParamKeywords(value, routeData, req, sqlParams);
       whereClause += `	${item.conjunction || ""} "${item.tableName}"."${item.columnName}" ${operator.replace("LIKE", "ILIKE")} ${["IN", "NOT IN"].includes(operator) ? `(${replacedValue})` : replacedValue}
 `;
     });