@restura/core 0.1.0-alpha.8 → 0.1.0-alpha.9

package/dist/index.js

@@ -67,9 +67,17 @@ var __decorateClass = (decorators, target, key, kind) => {
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  HtmlStatusCodes: () => HtmlStatusCodes,
   PsqlPool: () => PsqlPool,
+  RsError: () => RsError,
+  SQL: () => SQL,
+  escapeColumnName: () => escapeColumnName,
+  insertObjectQuery: () => insertObjectQuery,
+  isValueNumber: () => isValueNumber2,
   logger: () => logger,
-  restura: () => restura
+  questionMarksToOrderedParams: () => questionMarksToOrderedParams,
+  restura: () => restura,
+  updateObjectQuery: () => updateObjectQuery
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -81,12 +89,13 @@ var import_logform = require("logform");
 // src/config.schema.ts
 var import_zod = require("zod");
 var loggerConfigSchema = import_zod.z.object({
-  level: import_zod.z.enum(["info", "warn", "error", "debug"]).default("info")
+  level: import_zod.z.enum(["info", "warn", "error", "debug", "silly"]).default("info")
 });
 var resturaConfigSchema = import_zod.z.object({
   authToken: import_zod.z.string().min(1, "Missing Restura Auth Token"),
   sendErrorStackTrace: import_zod.z.boolean().default(false),
   schemaFilePath: import_zod.z.string().default(process.cwd() + "/restura.schema.json"),
+  customApiFolderPath: import_zod.z.string().default(process.cwd() + "/dist/api"),
   generatedTypesPath: import_zod.z.string().default(process.cwd() + "/src/@types")
 });
 
@@ -125,6 +134,72 @@ var logger = import_winston.default.createLogger({
   ]
 });
 
+// src/restura/errors.ts
+var HtmlStatusCodes = /* @__PURE__ */ ((HtmlStatusCodes2) => {
+  HtmlStatusCodes2[HtmlStatusCodes2["BAD_REQUEST"] = 400] = "BAD_REQUEST";
+  HtmlStatusCodes2[HtmlStatusCodes2["UNAUTHORIZED"] = 401] = "UNAUTHORIZED";
+  HtmlStatusCodes2[HtmlStatusCodes2["FORBIDDEN"] = 403] = "FORBIDDEN";
+  HtmlStatusCodes2[HtmlStatusCodes2["NOT_FOUND"] = 404] = "NOT_FOUND";
+  HtmlStatusCodes2[HtmlStatusCodes2["METHOD_NOT_ALLOWED"] = 405] = "METHOD_NOT_ALLOWED";
+  HtmlStatusCodes2[HtmlStatusCodes2["CONFLICT"] = 409] = "CONFLICT";
+  HtmlStatusCodes2[HtmlStatusCodes2["VERSION_OUT_OF_DATE"] = 418] = "VERSION_OUT_OF_DATE";
+  HtmlStatusCodes2[HtmlStatusCodes2["SERVER_ERROR"] = 500] = "SERVER_ERROR";
+  HtmlStatusCodes2[HtmlStatusCodes2["SERVICE_UNAVAILABLE"] = 503] = "SERVICE_UNAVAILABLE";
+  HtmlStatusCodes2[HtmlStatusCodes2["NETWORK_CONNECT_TIMEOUT"] = 599] = "NETWORK_CONNECT_TIMEOUT";
+  return HtmlStatusCodes2;
+})(HtmlStatusCodes || {});
+var RsError = class _RsError {
+  constructor(errCode, message) {
+    this.err = errCode;
+    this.msg = message || "";
+    this.status = _RsError.htmlStatus(errCode);
+    this.stack = new Error().stack || "";
+  }
+  static htmlStatus(code) {
+    return htmlStatusMap[code];
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  static isRsError(error) {
+    return error instanceof _RsError;
+  }
+};
+var htmlStatusMap = {
+  UNKNOWN_ERROR: 500 /* SERVER_ERROR */,
+  NOT_FOUND: 404 /* NOT_FOUND */,
+  EMAIL_TAKEN: 409 /* CONFLICT */,
+  FORBIDDEN: 403 /* FORBIDDEN */,
+  CONFLICT: 409 /* CONFLICT */,
+  UNAUTHORIZED: 401 /* UNAUTHORIZED */,
+  UPDATE_FORBIDDEN: 403 /* FORBIDDEN */,
+  CREATE_FORBIDDEN: 403 /* FORBIDDEN */,
+  DELETE_FORBIDDEN: 403 /* FORBIDDEN */,
+  DELETE_FAILURE: 500 /* SERVER_ERROR */,
+  BAD_REQUEST: 400 /* BAD_REQUEST */,
+  INVALID_TOKEN: 401 /* UNAUTHORIZED */,
+  INCORRECT_EMAIL_OR_PASSWORD: 401 /* UNAUTHORIZED */,
+  DUPLICATE_TOKEN: 409 /* CONFLICT */,
+  DUPLICATE_USERNAME: 409 /* CONFLICT */,
+  DUPLICATE_EMAIL: 409 /* CONFLICT */,
+  DUPLICATE: 409 /* CONFLICT */,
+  EMAIL_NOT_VERIFIED: 400 /* BAD_REQUEST */,
+  UPDATE_WITHOUT_ID: 400 /* BAD_REQUEST */,
+  CONNECTION_ERROR: 599 /* NETWORK_CONNECT_TIMEOUT */,
+  INVALID_PAYMENT: 403 /* FORBIDDEN */,
+  DECLINED_PAYMENT: 403 /* FORBIDDEN */,
+  INTEGRATION_ERROR: 500 /* SERVER_ERROR */,
+  CANNOT_RESERVE: 403 /* FORBIDDEN */,
+  REFUND_FAILURE: 403 /* FORBIDDEN */,
+  INVALID_INVOICE: 403 /* FORBIDDEN */,
+  INVALID_COUPON: 403 /* FORBIDDEN */,
+  SERVICE_UNAVAILABLE: 503 /* SERVICE_UNAVAILABLE */,
+  METHOD_UNALLOWED: 405 /* METHOD_NOT_ALLOWED */,
+  LOGIN_EXPIRED: 401 /* UNAUTHORIZED */,
+  THIRD_PARTY_ERROR: 400 /* BAD_REQUEST */,
+  ACCESS_DENIED: 403 /* FORBIDDEN */,
+  DATABASE_ERROR: 500 /* SERVER_ERROR */,
+  SCHEMA_ERROR: 500 /* SERVER_ERROR */
+};
+
 // src/restura/restura.ts
 var import_core_utils6 = require("@redskytech/core-utils");
 var import_internal2 = require("@restura/internal");
@@ -181,59 +256,11 @@ var import_compression = __toESM(require("compression"));
 var import_cookie_parser = __toESM(require("cookie-parser"));
 var import_crypto = require("crypto");
 var express = __toESM(require("express"));
-var import_fs2 = __toESM(require("fs"));
-var import_path2 = __toESM(require("path"));
+var import_fs3 = __toESM(require("fs"));
+var import_path3 = __toESM(require("path"));
+var import_pg2 = __toESM(require("pg"));
 var prettier3 = __toESM(require("prettier"));
 
-// src/restura/errors.ts
-var RsError = class _RsError {
-  constructor(errCode, message) {
-    this.err = errCode;
-    this.msg = message || "";
-    this.status = _RsError.htmlStatus(errCode);
-    this.stack = new Error().stack || "";
-  }
-  static htmlStatus(code) {
-    return htmlStatusMap[code];
-  }
-};
-var htmlStatusMap = {
-  UNKNOWN_ERROR: 500 /* SERVER_ERROR */,
-  NOT_FOUND: 404 /* NOT_FOUND */,
-  EMAIL_TAKEN: 409 /* CONFLICT */,
-  FORBIDDEN: 403 /* FORBIDDEN */,
-  CONFLICT: 409 /* CONFLICT */,
-  UNAUTHORIZED: 401 /* UNAUTHORIZED */,
-  UPDATE_FORBIDDEN: 403 /* FORBIDDEN */,
-  CREATE_FORBIDDEN: 403 /* FORBIDDEN */,
-  DELETE_FORBIDDEN: 403 /* FORBIDDEN */,
-  DELETE_FAILURE: 500 /* SERVER_ERROR */,
-  BAD_REQUEST: 400 /* BAD_REQUEST */,
-  INVALID_TOKEN: 401 /* UNAUTHORIZED */,
-  INCORRECT_EMAIL_OR_PASSWORD: 401 /* UNAUTHORIZED */,
-  DUPLICATE_TOKEN: 409 /* CONFLICT */,
-  DUPLICATE_USERNAME: 409 /* CONFLICT */,
-  DUPLICATE_EMAIL: 409 /* CONFLICT */,
-  DUPLICATE: 409 /* CONFLICT */,
-  EMAIL_NOT_VERIFIED: 400 /* BAD_REQUEST */,
-  UPDATE_WITHOUT_ID: 400 /* BAD_REQUEST */,
-  CONNECTION_ERROR: 599 /* NETWORK_CONNECT_TIMEOUT */,
-  INVALID_PAYMENT: 403 /* FORBIDDEN */,
-  DECLINED_PAYMENT: 403 /* FORBIDDEN */,
-  INTEGRATION_ERROR: 500 /* SERVER_ERROR */,
-  CANNOT_RESERVE: 403 /* FORBIDDEN */,
-  REFUND_FAILURE: 403 /* FORBIDDEN */,
-  INVALID_INVOICE: 403 /* FORBIDDEN */,
-  INVALID_COUPON: 403 /* FORBIDDEN */,
-  SERVICE_UNAVAILABLE: 503 /* SERVICE_UNAVAILABLE */,
-  METHOD_UNALLOWED: 405 /* METHOD_NOT_ALLOWED */,
-  LOGIN_EXPIRED: 401 /* UNAUTHORIZED */,
-  THIRD_PARTY_ERROR: 400 /* BAD_REQUEST */,
-  ACCESS_DENIED: 403 /* FORBIDDEN */,
-  DATABASE_ERROR: 500 /* SERVER_ERROR */,
-  SCHEMA_ERROR: 500 /* SERVER_ERROR */
-};
-
 // src/restura/sql/SqlUtils.ts
 var SqlUtils = class _SqlUtils {
   static convertDatabaseTypeToTypescript(type, value) {
@@ -325,9 +352,9 @@ var ResponseValidator = class _ResponseValidator {
     return { validator: "any" };
   }
   getTypeFromTable(selector, name) {
-    const path3 = selector.split(".");
-    if (path3.length === 0 || path3.length > 2 || path3[0] === "") return { validator: "any", isOptional: false };
-    const tableName = path3.length == 2 ? path3[0] : name, columnName = path3.length == 2 ? path3[1] : path3[0];
+    const path4 = selector.split(".");
+    if (path4.length === 0 || path4.length > 2 || path4[0] === "") return { validator: "any", isOptional: false };
+    const tableName = path4.length == 2 ? path4[0] : name, columnName = path4.length == 2 ? path4[1] : path4[0];
     const table = this.database.find((t) => t.name == tableName);
     const column = table == null ? void 0 : table.columns.find((c) => c.name == columnName);
     if (!table || !column) return { validator: "any", isOptional: false };
@@ -543,10 +570,10 @@ var ApiTree = class _ApiTree {
     return `${p.name}${optional ? "?" : ""}:${responseType}${array ? "[]" : ""}`;
   }
   getTypeFromTable(selector, name) {
-    const path3 = selector.split(".");
-    if (path3.length === 0 || path3.length > 2 || path3[0] === "") return { responseType: "any", optional: false };
-    let tableName = path3.length == 2 ? path3[0] : name;
-    const columnName = path3.length == 2 ? path3[1] : path3[0];
+    const path4 = selector.split(".");
+    if (path4.length === 0 || path4.length > 2 || path4[0] === "") return { responseType: "any", optional: false };
+    let tableName = path4.length == 2 ? path4[0] : name;
+    const columnName = path4.length == 2 ? path4[1] : path4[0];
     let table = this.database.find((t) => t.name == tableName);
     if (!table && tableName.includes("_")) {
       const tableAliasSplit = tableName.split("_");
@@ -561,8 +588,8 @@ var ApiTree = class _ApiTree {
     };
   }
 };
-function pathToNamespaces(path3) {
-  return path3.split("/").map((e) => import_core_utils.StringUtils.toPascalCasing(e)).filter((e) => e);
+function pathToNamespaces(path4) {
+  return path4.split("/").map((e) => import_core_utils.StringUtils.toPascalCasing(e)).filter((e) => e);
 }
 function apiGenerator(schema, schemaHash) {
   let apiString = `/** Auto generated file from Schema Hash (${schemaHash}). DO NOT MODIFY **/`;
@@ -595,6 +622,92 @@ function apiGenerator(schema, schemaHash) {
   }));
 }
 
+// src/restura/customApiFactory.ts
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var CustomApiFactory = class {
+  constructor() {
+    this.customApis = {};
+  }
+  async loadApiFiles(baseFolderPath) {
+    const apiVersions = ["v1"];
+    for (const apiVersion of apiVersions) {
+      const apiVersionFolderPath = import_path.default.join(baseFolderPath, apiVersion);
+      if (!import_fs.default.existsSync(apiVersionFolderPath)) continue;
+      await this.addDirectory(apiVersionFolderPath, apiVersion);
+    }
+  }
+  getCustomApi(customApiName) {
+    return this.customApis[customApiName];
+  }
+  async addDirectory(directoryPath, apiVersion) {
+    const entries = import_fs.default.readdirSync(directoryPath, {
+      withFileTypes: true
+    });
+    for (const entry of entries) {
+      if (entry.isFile()) {
+        if (entry.name.endsWith(`.api.${apiVersion}.js`) === false) continue;
+        try {
+          const importPath = `${import_path.default.join(directoryPath, entry.name)}`;
+          const ApiImport = await import(importPath);
+          const customApiClass = new ApiImport.default();
+          logger.info(`Registering custom API: ${ApiImport.default.name}`);
+          this.bindMethodsToInstance(customApiClass);
+          this.customApis[ApiImport.default.name] = customApiClass;
+        } catch (e) {
+          console.error(e);
+        }
+      }
+    }
+  }
+  bindMethodsToInstance(instance) {
+    const proto = Object.getPrototypeOf(instance);
+    Object.getOwnPropertyNames(proto).forEach((key) => {
+      const property = instance[key];
+      if (typeof property === "function" && key !== "constructor") {
+        instance[key] = property.bind(instance);
+      }
+    });
+  }
+};
+var customApiFactory = new CustomApiFactory();
+var customApiFactory_default = customApiFactory;
+
+// src/restura/customTypeValidationGenerator.ts
+var import_fs2 = __toESM(require("fs"));
+var TJS = __toESM(require("typescript-json-schema"));
+var import_path2 = __toESM(require("path"));
+var import_tmp = __toESM(require("tmp"));
+var process2 = __toESM(require("process"));
+function customTypeValidationGenerator(currentSchema) {
+  const schemaObject = {};
+  const customInterfaceNames = currentSchema.customTypes.match(new RegExp("(?<=interface\\s)(\\w+)|(?<=type\\s)(\\w+)", "g"));
+  if (!customInterfaceNames) return {};
+  const temporaryFile = import_tmp.default.fileSync({ mode: 420, prefix: "prefix-", postfix: ".ts" });
+  import_fs2.default.writeFileSync(temporaryFile.name, currentSchema.customTypes);
+  const compilerOptions = {
+    strictNullChecks: true,
+    skipLibCheck: true
+  };
+  const program = TJS.getProgramFromFiles(
+    [
+      (0, import_path2.resolve)(temporaryFile.name),
+      // find a way to remove
+      import_path2.default.join(process2.cwd(), "src/@types/models.d.ts"),
+      import_path2.default.join(process2.cwd(), "src/@types/api.d.ts")
+    ],
+    compilerOptions
+  );
+  customInterfaceNames.forEach((item) => {
+    const ddlSchema = TJS.generateSchema(program, item, {
+      required: true
+    });
+    schemaObject[item] = ddlSchema || {};
+  });
+  temporaryFile.removeCallback();
+  return schemaObject;
+}
+
 // src/restura/middleware/addApiResponseFunctions.ts
 function addApiResponseFunctions(req, res, next) {
   res.sendData = function(data, statusCode = 200) {
@@ -623,9 +736,17 @@ function addApiResponseFunctions(req, res, next) {
   next();
 }
 
-// src/restura/validateRequestParams.ts
-var import_core_utils2 = require("@redskytech/core-utils");
-var import_jsonschema = __toESM(require("jsonschema"));
+// src/restura/middleware/authenticateUser.ts
+function authenticateUser(applicationAuthenticateHandler) {
+  return (req, res, next) => {
+    applicationAuthenticateHandler(req, res, (userDetails) => {
+      req.requesterDetails = __spreadValues(__spreadValues({}, req.requesterDetails), userDetails);
+      next();
+    });
+  };
+}
+
+// src/restura/restura.schema.ts
 var import_zod3 = require("zod");
 
 // src/restura/types/validation.types.ts
@@ -636,264 +757,83 @@ var validatorDataSchema = import_zod2.z.object({
   value: validatorDataSchemeValue
 }).strict();
 
-// src/restura/utils/addQuotesToStrings.ts
-function addQuotesToStrings(variable) {
-  if (typeof variable === "string") {
-    return `'${variable}'`;
-  } else if (Array.isArray(variable)) {
-    const arrayWithQuotes = variable.map(addQuotesToStrings);
-    return arrayWithQuotes;
-  } else {
-    return variable;
-  }
-}
-
-// src/restura/validateRequestParams.ts
-function validateRequestParams(req, routeData, validationSchema) {
-  const requestData = getRequestData(req);
-  req.data = requestData;
-  if (routeData.request === void 0) {
-    if (routeData.type !== "CUSTOM_ONE" && routeData.type !== "CUSTOM_ARRAY" && routeData.type !== "CUSTOM_PAGED")
-      throw new RsError("BAD_REQUEST", `No request parameters provided for standard request.`);
-    if (!routeData.responseType) throw new RsError("BAD_REQUEST", `No response type defined for custom request.`);
-    if (!routeData.requestType) throw new RsError("BAD_REQUEST", `No request type defined for custom request.`);
-    const currentInterface = validationSchema[routeData.requestType];
-    const validator = new import_jsonschema.default.Validator();
-    const executeValidation = validator.validate(req.data, currentInterface);
-    if (!executeValidation.valid) {
-      throw new RsError(
-        "BAD_REQUEST",
-        `Request custom setup has failed the following check: (${executeValidation.errors})`
-      );
-    }
-    return;
-  }
-  Object.keys(req.data).forEach((requestParamName) => {
-    const requestParam = routeData.request.find((param) => param.name === requestParamName);
-    if (!requestParam) {
-      throw new RsError("BAD_REQUEST", `Request param (${requestParamName}) is not allowed`);
-    }
-  });
-  routeData.request.forEach((requestParam) => {
-    const requestValue = requestData[requestParam.name];
-    if (requestParam.required && requestValue === void 0)
-      throw new RsError("BAD_REQUEST", `Request param (${requestParam.name}) is required but missing`);
-    else if (!requestParam.required && requestValue === void 0) return;
-    validateRequestSingleParam(requestValue, requestParam);
-  });
-}
-function validateRequestSingleParam(requestValue, requestParam) {
-  requestParam.validator.forEach((validator) => {
-    switch (validator.type) {
-      case "TYPE_CHECK":
-        performTypeCheck(requestValue, validator, requestParam.name);
-        break;
-      case "MIN":
-        performMinCheck(requestValue, validator, requestParam.name);
-        break;
-      case "MAX":
-        performMaxCheck(requestValue, validator, requestParam.name);
-        break;
-      case "ONE_OF":
-        performOneOfCheck(requestValue, validator, requestParam.name);
-        break;
-    }
-  });
-}
-function isValidType(type, requestValue) {
-  try {
-    expectValidType(type, requestValue);
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-function expectValidType(type, requestValue) {
-  if (type === "number") {
-    return import_zod3.z.number().parse(requestValue);
-  }
-  if (type === "string") {
-    return import_zod3.z.string().parse(requestValue);
-  }
-  if (type === "boolean") {
-    return import_zod3.z.boolean().parse(requestValue);
-  }
-  if (type === "string[]") {
-    return import_zod3.z.array(import_zod3.z.string()).parse(requestValue);
-  }
-  if (type === "number[]") {
-    return import_zod3.z.array(import_zod3.z.number()).parse(requestValue);
-  }
-  if (type === "any[]") {
-    return import_zod3.z.array(import_zod3.z.any()).parse(requestValue);
-  }
-  if (type === "object") {
-    return import_zod3.z.object({}).strict().parse(requestValue);
-  }
-}
-function performTypeCheck(requestValue, validator, requestParamName) {
-  if (!isValidType(validator.value, requestValue)) {
-    throw new RsError(
-      "BAD_REQUEST",
-      `Request param (${requestParamName}) with value (${addQuotesToStrings(requestValue)}) is not of type (${validator.value})`
-    );
-  }
-  try {
-    validatorDataSchemeValue.parse(validator.value);
-  } catch (e) {
-    throw new RsError("SCHEMA_ERROR", `Schema validator value (${validator.value}) is not a valid type`);
-  }
-}
-function expectOnlyNumbers(requestValue, validator, requestParamName) {
-  if (!isValueNumber(requestValue))
-    throw new RsError(
-      "BAD_REQUEST",
-      `Request param (${requestParamName}) with value (${requestValue}) is not of type number`
-    );
-  if (!isValueNumber(validator.value))
-    throw new RsError("SCHEMA_ERROR", `Schema validator value (${validator.value} is not of type number`);
-}
-function performMinCheck(requestValue, validator, requestParamName) {
-  expectOnlyNumbers(requestValue, validator, requestParamName);
-  if (requestValue < validator.value)
-    throw new RsError(
-      "BAD_REQUEST",
-      `Request param (${requestParamName}) with value (${requestValue}) is less than (${validator.value})`
-    );
-}
-function performMaxCheck(requestValue, validator, requestParamName) {
-  expectOnlyNumbers(requestValue, validator, requestParamName);
-  if (requestValue > validator.value)
-    throw new RsError(
-      "BAD_REQUEST",
-      `Request param (${requestParamName}) with value (${requestValue}) is more than (${validator.value})`
-    );
-}
-function performOneOfCheck(requestValue, validator, requestParamName) {
-  if (!import_core_utils2.ObjectUtils.isArrayWithData(validator.value))
-    throw new RsError("SCHEMA_ERROR", `Schema validator value (${validator.value}) is not of type array`);
-  if (typeof requestValue === "object")
-    throw new RsError("BAD_REQUEST", `Request param (${requestParamName}) is not of type string or number`);
-  if (!validator.value.includes(requestValue))
-    throw new RsError(
-      "BAD_REQUEST",
-      `Request param (${requestParamName}) with value (${requestValue}) is not one of (${validator.value.join(", ")})`
-    );
-}
-function isValueNumber(value) {
-  return !isNaN(Number(value));
-}
-function getRequestData(req) {
-  let body = "";
-  if (req.method === "GET" || req.method === "DELETE") {
-    body = "query";
-  } else {
-    body = "body";
-  }
-  const bodyData = req[body];
-  if (bodyData) {
-    for (const attr in bodyData) {
-      if (attr === "token") {
-        delete bodyData[attr];
-        continue;
-      }
-      if (bodyData[attr] instanceof Array) {
-        const attrList = [];
-        for (const value of bodyData[attr]) {
-          if (isNaN(Number(value))) continue;
-          attrList.push(Number(value));
-        }
-        if (import_core_utils2.ObjectUtils.isArrayWithData(attrList)) {
-          bodyData[attr] = attrList;
-        }
-      } else {
-        bodyData[attr] = import_core_utils2.ObjectUtils.safeParse(bodyData[attr]);
-        if (isNaN(Number(bodyData[attr]))) continue;
-        bodyData[attr] = Number(bodyData[attr]);
-      }
-    }
-  }
-  return bodyData;
-}
-
 // src/restura/restura.schema.ts
-var import_zod4 = require("zod");
-var orderBySchema = import_zod4.z.object({
-  columnName: import_zod4.z.string(),
-  order: import_zod4.z.enum(["ASC", "DESC"]),
-  tableName: import_zod4.z.string()
+var orderBySchema = import_zod3.z.object({
+  columnName: import_zod3.z.string(),
+  order: import_zod3.z.enum(["ASC", "DESC"]),
+  tableName: import_zod3.z.string()
 }).strict();
-var groupBySchema = import_zod4.z.object({
-  columnName: import_zod4.z.string(),
-  tableName: import_zod4.z.string()
+var groupBySchema = import_zod3.z.object({
+  columnName: import_zod3.z.string(),
+  tableName: import_zod3.z.string()
 }).strict();
-var whereDataSchema = import_zod4.z.object({
-  tableName: import_zod4.z.string().optional(),
-  columnName: import_zod4.z.string().optional(),
-  operator: import_zod4.z.enum(["=", "<", ">", "<=", ">=", "!=", "LIKE", "IN", "NOT IN", "STARTS WITH", "ENDS WITH"]).optional(),
-  value: import_zod4.z.string().or(import_zod4.z.number()).optional(),
-  custom: import_zod4.z.string().optional(),
-  conjunction: import_zod4.z.enum(["AND", "OR"]).optional()
+var whereDataSchema = import_zod3.z.object({
+  tableName: import_zod3.z.string().optional(),
+  columnName: import_zod3.z.string().optional(),
+  operator: import_zod3.z.enum(["=", "<", ">", "<=", ">=", "!=", "LIKE", "IN", "NOT IN", "STARTS WITH", "ENDS WITH"]).optional(),
+  value: import_zod3.z.string().or(import_zod3.z.number()).optional(),
+  custom: import_zod3.z.string().optional(),
+  conjunction: import_zod3.z.enum(["AND", "OR"]).optional()
 }).strict();
-var assignmentDataSchema = import_zod4.z.object({
-  name: import_zod4.z.string(),
-  value: import_zod4.z.string()
+var assignmentDataSchema = import_zod3.z.object({
+  name: import_zod3.z.string(),
+  value: import_zod3.z.string()
 }).strict();
-var joinDataSchema = import_zod4.z.object({
-  table: import_zod4.z.string(),
-  localColumnName: import_zod4.z.string().optional(),
-  foreignColumnName: import_zod4.z.string().optional(),
-  custom: import_zod4.z.string().optional(),
-  type: import_zod4.z.enum(["LEFT", "INNER"]),
-  alias: import_zod4.z.string().optional()
+var joinDataSchema = import_zod3.z.object({
+  table: import_zod3.z.string(),
+  localColumnName: import_zod3.z.string().optional(),
+  foreignColumnName: import_zod3.z.string().optional(),
+  custom: import_zod3.z.string().optional(),
+  type: import_zod3.z.enum(["LEFT", "INNER"]),
+  alias: import_zod3.z.string().optional()
 }).strict();
-var requestDataSchema = import_zod4.z.object({
-  name: import_zod4.z.string(),
-  required: import_zod4.z.boolean(),
-  validator: import_zod4.z.array(validatorDataSchema)
+var requestDataSchema = import_zod3.z.object({
+  name: import_zod3.z.string(),
+  required: import_zod3.z.boolean(),
+  validator: import_zod3.z.array(validatorDataSchema)
 }).strict();
-var responseDataSchema = import_zod4.z.object({
-  name: import_zod4.z.string(),
-  selector: import_zod4.z.string().optional(),
-  subquery: import_zod4.z.object({
-    table: import_zod4.z.string(),
-    joins: import_zod4.z.array(joinDataSchema),
-    where: import_zod4.z.array(whereDataSchema),
-    properties: import_zod4.z.array(import_zod4.z.lazy(() => responseDataSchema)),
+var responseDataSchema = import_zod3.z.object({
+  name: import_zod3.z.string(),
+  selector: import_zod3.z.string().optional(),
+  subquery: import_zod3.z.object({
+    table: import_zod3.z.string(),
+    joins: import_zod3.z.array(joinDataSchema),
+    where: import_zod3.z.array(whereDataSchema),
+    properties: import_zod3.z.array(import_zod3.z.lazy(() => responseDataSchema)),
     // Explicit type for the lazy schema
     groupBy: groupBySchema.optional(),
     orderBy: orderBySchema.optional()
   }).optional()
 }).strict();
-var routeDataBaseSchema = import_zod4.z.object({
-  method: import_zod4.z.enum(["GET", "POST", "PUT", "PATCH", "DELETE"]),
-  name: import_zod4.z.string(),
-  description: import_zod4.z.string(),
-  path: import_zod4.z.string(),
-  roles: import_zod4.z.array(import_zod4.z.string())
+var routeDataBaseSchema = import_zod3.z.object({
+  method: import_zod3.z.enum(["GET", "POST", "PUT", "PATCH", "DELETE"]),
+  name: import_zod3.z.string(),
+  description: import_zod3.z.string(),
+  path: import_zod3.z.string(),
+  roles: import_zod3.z.array(import_zod3.z.string())
 }).strict();
 var standardRouteSchema = routeDataBaseSchema.extend({
-  type: import_zod4.z.enum(["ONE", "ARRAY", "PAGED"]),
-  table: import_zod4.z.string(),
-  joins: import_zod4.z.array(joinDataSchema),
-  assignments: import_zod4.z.array(assignmentDataSchema),
-  where: import_zod4.z.array(whereDataSchema),
-  request: import_zod4.z.array(requestDataSchema),
-  response: import_zod4.z.array(responseDataSchema),
+  type: import_zod3.z.enum(["ONE", "ARRAY", "PAGED"]),
+  table: import_zod3.z.string(),
+  joins: import_zod3.z.array(joinDataSchema),
+  assignments: import_zod3.z.array(assignmentDataSchema),
+  where: import_zod3.z.array(whereDataSchema),
+  request: import_zod3.z.array(requestDataSchema),
+  response: import_zod3.z.array(responseDataSchema),
   groupBy: groupBySchema.optional(),
   orderBy: orderBySchema.optional()
 }).strict();
 var customRouteSchema = routeDataBaseSchema.extend({
-  type: import_zod4.z.enum(["CUSTOM_ONE", "CUSTOM_ARRAY", "CUSTOM_PAGED"]),
-  responseType: import_zod4.z.union([import_zod4.z.string(), import_zod4.z.enum(["string", "number", "boolean"])]),
-  requestType: import_zod4.z.string().optional(),
-  request: import_zod4.z.array(requestDataSchema).optional(),
-  table: import_zod4.z.undefined(),
-  joins: import_zod4.z.undefined(),
-  assignments: import_zod4.z.undefined(),
-  fileUploadType: import_zod4.z.enum(["SINGLE", "MULTIPLE"]).optional()
+  type: import_zod3.z.enum(["CUSTOM_ONE", "CUSTOM_ARRAY", "CUSTOM_PAGED"]),
+  responseType: import_zod3.z.union([import_zod3.z.string(), import_zod3.z.enum(["string", "number", "boolean"])]),
+  requestType: import_zod3.z.string().optional(),
+  request: import_zod3.z.array(requestDataSchema).optional(),
+  table: import_zod3.z.undefined(),
+  joins: import_zod3.z.undefined(),
+  assignments: import_zod3.z.undefined(),
+  fileUploadType: import_zod3.z.enum(["SINGLE", "MULTIPLE"]).optional()
 }).strict();
-var postgresColumnNumericTypesSchema = import_zod4.z.enum([
+var postgresColumnNumericTypesSchema = import_zod3.z.enum([
   "SMALLINT",
   // 2 bytes, -32,768 to 32,767
   "INTEGER",
@@ -913,7 +853,7 @@ var postgresColumnNumericTypesSchema = import_zod4.z.enum([
   "BIGSERIAL"
   // auto-incrementing big integer
 ]);
-var postgresColumnStringTypesSchema = import_zod4.z.enum([
+var postgresColumnStringTypesSchema = import_zod3.z.enum([
   "CHAR",
   // fixed-length, blank-padded
   "VARCHAR",
@@ -923,7 +863,7 @@ var postgresColumnStringTypesSchema = import_zod4.z.enum([
   "BYTEA"
   // binary data
 ]);
-var postgresColumnDateTypesSchema = import_zod4.z.enum([
+var postgresColumnDateTypesSchema = import_zod3.z.enum([
   "DATE",
   // calendar date (year, month, day)
   "TIMESTAMP",
@@ -935,7 +875,7 @@ var postgresColumnDateTypesSchema = import_zod4.z.enum([
   "INTERVAL"
   // time span
 ]);
-var mariaDbColumnNumericTypesSchema = import_zod4.z.enum([
+var mariaDbColumnNumericTypesSchema = import_zod3.z.enum([
   "BOOLEAN",
   // 1-byte A synonym for "TINYINT(1)". Supported from version 1.2.0 onwards.
   "TINYINT",
@@ -955,7 +895,7 @@ var mariaDbColumnNumericTypesSchema = import_zod4.z.enum([
   "DOUBLE"
   // 8 bytes Stored in 64-bit IEEE-754 floating point format. As such, the number of significant digits is about 15 and the range of values is approximately +/-1e308.
 ]);
-var mariaDbColumnStringTypesSchema = import_zod4.z.enum([
+var mariaDbColumnStringTypesSchema = import_zod3.z.enum([
   "CHAR",
   // 1, 2, 4, or 8 bytes Holds letters and special characters of fixed length. Max length is 255. Default and minimum size is 1 byte.
   "VARCHAR",
@@ -981,7 +921,7 @@ var mariaDbColumnStringTypesSchema = import_zod4.z.enum([
   "ENUM"
   // Enum type
 ]);
-var mariaDbColumnDateTypesSchema = import_zod4.z.enum([
+var mariaDbColumnDateTypesSchema = import_zod3.z.enum([
   "DATE",
   // 4-bytes Date has year, month, and day.
   "DATETIME",
@@ -991,9 +931,9 @@ var mariaDbColumnDateTypesSchema = import_zod4.z.enum([
   "TIMESTAMP"
   // 4-bytes Values are stored as the number of seconds since 1970-01-01 00:00:00 UTC, and optionally microseconds.
 ]);
-var columnDataSchema = import_zod4.z.object({
-  name: import_zod4.z.string(),
-  type: import_zod4.z.union([
+var columnDataSchema = import_zod3.z.object({
+  name: import_zod3.z.string(),
+  type: import_zod3.z.union([
     postgresColumnNumericTypesSchema,
     postgresColumnStringTypesSchema,
     postgresColumnDateTypesSchema,
@@ -1001,24 +941,24 @@ var columnDataSchema = import_zod4.z.object({
     mariaDbColumnStringTypesSchema,
     mariaDbColumnDateTypesSchema
   ]),
-  isNullable: import_zod4.z.boolean(),
-  roles: import_zod4.z.array(import_zod4.z.string()),
-  comment: import_zod4.z.string().optional(),
-  default: import_zod4.z.string().optional(),
-  value: import_zod4.z.string().optional(),
-  isPrimary: import_zod4.z.boolean().optional(),
-  isUnique: import_zod4.z.boolean().optional(),
-  hasAutoIncrement: import_zod4.z.boolean().optional(),
-  length: import_zod4.z.number().optional()
+  isNullable: import_zod3.z.boolean(),
+  roles: import_zod3.z.array(import_zod3.z.string()),
+  comment: import_zod3.z.string().optional(),
+  default: import_zod3.z.string().optional(),
+  value: import_zod3.z.string().optional(),
+  isPrimary: import_zod3.z.boolean().optional(),
+  isUnique: import_zod3.z.boolean().optional(),
+  hasAutoIncrement: import_zod3.z.boolean().optional(),
+  length: import_zod3.z.number().optional()
 }).strict();
-var indexDataSchema = import_zod4.z.object({
-  name: import_zod4.z.string(),
-  columns: import_zod4.z.array(import_zod4.z.string()),
-  isUnique: import_zod4.z.boolean(),
-  isPrimaryKey: import_zod4.z.boolean(),
-  order: import_zod4.z.enum(["ASC", "DESC"])
+var indexDataSchema = import_zod3.z.object({
+  name: import_zod3.z.string(),
+  columns: import_zod3.z.array(import_zod3.z.string()),
+  isUnique: import_zod3.z.boolean(),
+  isPrimaryKey: import_zod3.z.boolean(),
+  order: import_zod3.z.enum(["ASC", "DESC"])
 }).strict();
-var foreignKeyActionsSchema = import_zod4.z.enum([
+var foreignKeyActionsSchema = import_zod3.z.enum([
   "CASCADE",
   // CASCADE action for foreign keys
   "SET NULL",
@@ -1030,48 +970,229 @@ var foreignKeyActionsSchema = import_zod4.z.enum([
   "SET DEFAULT"
   // SET DEFAULT action for foreign keys
 ]);
-var foreignKeyDataSchema = import_zod4.z.object({
-  name: import_zod4.z.string(),
-  column: import_zod4.z.string(),
-  refTable: import_zod4.z.string(),
-  refColumn: import_zod4.z.string(),
+var foreignKeyDataSchema = import_zod3.z.object({
+  name: import_zod3.z.string(),
+  column: import_zod3.z.string(),
+  refTable: import_zod3.z.string(),
+  refColumn: import_zod3.z.string(),
   onDelete: foreignKeyActionsSchema,
   onUpdate: foreignKeyActionsSchema
 }).strict();
-var checkConstraintDataSchema = import_zod4.z.object({
-  name: import_zod4.z.string(),
-  check: import_zod4.z.string()
+var checkConstraintDataSchema = import_zod3.z.object({
+  name: import_zod3.z.string(),
+  check: import_zod3.z.string()
 }).strict();
-var tableDataSchema = import_zod4.z.object({
-  name: import_zod4.z.string(),
-  columns: import_zod4.z.array(columnDataSchema),
-  indexes: import_zod4.z.array(indexDataSchema),
-  foreignKeys: import_zod4.z.array(foreignKeyDataSchema),
-  checkConstraints: import_zod4.z.array(checkConstraintDataSchema),
-  roles: import_zod4.z.array(import_zod4.z.string())
+var tableDataSchema = import_zod3.z.object({
+  name: import_zod3.z.string(),
+  columns: import_zod3.z.array(columnDataSchema),
+  indexes: import_zod3.z.array(indexDataSchema),
+  foreignKeys: import_zod3.z.array(foreignKeyDataSchema),
+  checkConstraints: import_zod3.z.array(checkConstraintDataSchema),
+  roles: import_zod3.z.array(import_zod3.z.string())
 }).strict();
-var endpointDataSchema = import_zod4.z.object({
-  name: import_zod4.z.string(),
-  description: import_zod4.z.string(),
-  baseUrl: import_zod4.z.string(),
-  routes: import_zod4.z.array(import_zod4.z.union([standardRouteSchema, customRouteSchema]))
+var endpointDataSchema = import_zod3.z.object({
+  name: import_zod3.z.string(),
+  description: import_zod3.z.string(),
+  baseUrl: import_zod3.z.string(),
+  routes: import_zod3.z.array(import_zod3.z.union([standardRouteSchema, customRouteSchema]))
 }).strict();
-var resturaZodSchema = import_zod4.z.object({
-  database: import_zod4.z.array(tableDataSchema),
-  endpoints: import_zod4.z.array(endpointDataSchema),
-  globalParams: import_zod4.z.array(import_zod4.z.string()),
-  roles: import_zod4.z.array(import_zod4.z.string()),
-  customTypes: import_zod4.z.string()
+var resturaZodSchema = import_zod3.z.object({
+  database: import_zod3.z.array(tableDataSchema),
+  endpoints: import_zod3.z.array(endpointDataSchema),
+  globalParams: import_zod3.z.array(import_zod3.z.string()),
+  roles: import_zod3.z.array(import_zod3.z.string()),
+  customTypes: import_zod3.z.string()
 }).strict();
 async function isSchemaValid(schemaToCheck) {
   try {
     resturaZodSchema.parse(schemaToCheck);
     return true;
-  } catch (error) {
-    logger.error(error);
+  } catch (error) {
+    logger.error(error);
+    return false;
+  }
+}
+
+// src/restura/validateRequestParams.ts
+var import_core_utils2 = require("@redskytech/core-utils");
+var import_jsonschema = __toESM(require("jsonschema"));
+var import_zod4 = require("zod");
+
+// src/restura/utils/addQuotesToStrings.ts
+function addQuotesToStrings(variable) {
+  if (typeof variable === "string") {
+    return `'${variable}'`;
+  } else if (Array.isArray(variable)) {
+    const arrayWithQuotes = variable.map(addQuotesToStrings);
+    return arrayWithQuotes;
+  } else {
+    return variable;
+  }
+}
+
+// src/restura/validateRequestParams.ts
+function validateRequestParams(req, routeData, validationSchema) {
+  const requestData = getRequestData(req);
+  req.data = requestData;
+  if (routeData.request === void 0) {
+    if (routeData.type !== "CUSTOM_ONE" && routeData.type !== "CUSTOM_ARRAY" && routeData.type !== "CUSTOM_PAGED")
+      throw new RsError("BAD_REQUEST", `No request parameters provided for standard request.`);
+    if (!routeData.responseType) throw new RsError("BAD_REQUEST", `No response type defined for custom request.`);
+    if (!routeData.requestType) throw new RsError("BAD_REQUEST", `No request type defined for custom request.`);
+    const currentInterface = validationSchema[routeData.requestType];
+    const validator = new import_jsonschema.default.Validator();
+    const executeValidation = validator.validate(req.data, currentInterface);
+    if (!executeValidation.valid) {
+      throw new RsError(
+        "BAD_REQUEST",
+        `Request custom setup has failed the following check: (${executeValidation.errors})`
+      );
+    }
+    return;
+  }
+  Object.keys(req.data).forEach((requestParamName) => {
+    const requestParam = routeData.request.find((param) => param.name === requestParamName);
+    if (!requestParam) {
+      throw new RsError("BAD_REQUEST", `Request param (${requestParamName}) is not allowed`);
+    }
+  });
+  routeData.request.forEach((requestParam) => {
+    const requestValue = requestData[requestParam.name];
+    if (requestParam.required && requestValue === void 0)
+      throw new RsError("BAD_REQUEST", `Request param (${requestParam.name}) is required but missing`);
+    else if (!requestParam.required && requestValue === void 0) return;
+    validateRequestSingleParam(requestValue, requestParam);
+  });
+}
+function validateRequestSingleParam(requestValue, requestParam) {
+  requestParam.validator.forEach((validator) => {
+    switch (validator.type) {
+      case "TYPE_CHECK":
+        performTypeCheck(requestValue, validator, requestParam.name);
+        break;
+      case "MIN":
+        performMinCheck(requestValue, validator, requestParam.name);
+        break;
+      case "MAX":
+        performMaxCheck(requestValue, validator, requestParam.name);
+        break;
+      case "ONE_OF":
+        performOneOfCheck(requestValue, validator, requestParam.name);
+        break;
+    }
+  });
+}
+function isValidType(type, requestValue) {
+  try {
+    expectValidType(type, requestValue);
+    return true;
+  } catch (e) {
     return false;
   }
 }
+function expectValidType(type, requestValue) {
+  if (type === "number") {
+    return import_zod4.z.number().parse(requestValue);
+  }
+  if (type === "string") {
+    return import_zod4.z.string().parse(requestValue);
+  }
+  if (type === "boolean") {
+    return import_zod4.z.boolean().parse(requestValue);
+  }
+  if (type === "string[]") {
+    return import_zod4.z.array(import_zod4.z.string()).parse(requestValue);
+  }
+  if (type === "number[]") {
+    return import_zod4.z.array(import_zod4.z.number()).parse(requestValue);
+  }
+  if (type === "any[]") {
+    return import_zod4.z.array(import_zod4.z.any()).parse(requestValue);
+  }
+  if (type === "object") {
+    return import_zod4.z.object({}).strict().parse(requestValue);
+  }
+}
+function performTypeCheck(requestValue, validator, requestParamName) {
+  if (!isValidType(validator.value, requestValue)) {
+    throw new RsError(
+      "BAD_REQUEST",
+      `Request param (${requestParamName}) with value (${addQuotesToStrings(requestValue)}) is not of type (${validator.value})`
+    );
+  }
+  try {
+    validatorDataSchemeValue.parse(validator.value);
+  } catch (e) {
+    throw new RsError("SCHEMA_ERROR", `Schema validator value (${validator.value}) is not a valid type`);
+  }
+}
+function expectOnlyNumbers(requestValue, validator, requestParamName) {
+  if (!isValueNumber(requestValue))
+    throw new RsError(
+      "BAD_REQUEST",
+      `Request param (${requestParamName}) with value (${requestValue}) is not of type number`
+    );
+  if (!isValueNumber(validator.value))
+    throw new RsError("SCHEMA_ERROR", `Schema validator value (${validator.value} is not of type number`);
+}
+function performMinCheck(requestValue, validator, requestParamName) {
+  expectOnlyNumbers(requestValue, validator, requestParamName);
+  if (requestValue < validator.value)
+    throw new RsError(
+      "BAD_REQUEST",
+      `Request param (${requestParamName}) with value (${requestValue}) is less than (${validator.value})`
+    );
+}
+function performMaxCheck(requestValue, validator, requestParamName) {
+  expectOnlyNumbers(requestValue, validator, requestParamName);
+  if (requestValue > validator.value)
+    throw new RsError(
+      "BAD_REQUEST",
+      `Request param (${requestParamName}) with value (${requestValue}) is more than (${validator.value})`
+    );
+}
+function performOneOfCheck(requestValue, validator, requestParamName) {
+  if (!import_core_utils2.ObjectUtils.isArrayWithData(validator.value))
+    throw new RsError("SCHEMA_ERROR", `Schema validator value (${validator.value}) is not of type array`);
+  if (typeof requestValue === "object")
+    throw new RsError("BAD_REQUEST", `Request param (${requestParamName}) is not of type string or number`);
+  if (!validator.value.includes(requestValue))
+    throw new RsError(
+      "BAD_REQUEST",
+      `Request param (${requestParamName}) with value (${requestValue}) is not one of (${validator.value.join(", ")})`
+    );
+}
+function isValueNumber(value) {
+  return !isNaN(Number(value));
+}
+function getRequestData(req) {
+  let body = "";
+  if (req.method === "GET" || req.method === "DELETE") {
+    body = "query";
+  } else {
+    body = "body";
+  }
+  const bodyData = req[body];
+  if (bodyData && body === "query") {
+    for (const attr in bodyData) {
+      if (bodyData[attr] instanceof Array) {
+        const attrList = [];
+        for (const value of bodyData[attr]) {
+          if (isNaN(Number(value))) continue;
+          attrList.push(Number(value));
+        }
+        if (import_core_utils2.ObjectUtils.isArrayWithData(attrList)) {
+          bodyData[attr] = attrList;
+        }
+      } else {
+        bodyData[attr] = import_core_utils2.ObjectUtils.safeParse(bodyData[attr]);
+        if (isNaN(Number(bodyData[attr]))) continue;
+        bodyData[attr] = Number(bodyData[attr]);
+      }
+    }
+  }
+  return bodyData;
+}
 
 // src/restura/middleware/schemaValidation.ts
 async function schemaValidation(req, res, next) {
@@ -1120,55 +1241,52 @@ function convertTable(table) {
   return modelString;
 }
 
-// src/restura/middleware/authenticateUser.ts
-function authenticateUser(applicationAuthenticateHandler) {
-  return (req, res, next) => {
-    applicationAuthenticateHandler(
-      req,
-      (userDetails) => {
-        req.requesterDetails = __spreadValues(__spreadValues({}, req.requesterDetails), userDetails);
-        next();
-      },
-      (errorMessage) => {
-        res.sendError("UNAUTHORIZED", errorMessage);
-      }
-    );
-  };
-}
+// src/restura/sql/PsqlEngine.ts
+var import_core_utils5 = require("@redskytech/core-utils");
 
-// src/restura/customTypeValidationGenerator.ts
-var import_fs = __toESM(require("fs"));
-var TJS = __toESM(require("typescript-json-schema"));
-var import_path = __toESM(require("path"));
-var import_tmp = __toESM(require("tmp"));
-var process2 = __toESM(require("process"));
-function customTypeValidationGenerator(currentSchema) {
-  const schemaObject = {};
-  const customInterfaceNames = currentSchema.customTypes.match(new RegExp("(?<=interface\\s)(\\w+)|(?<=type\\s)(\\w+)", "g"));
-  if (!customInterfaceNames) return {};
-  const temporaryFile = import_tmp.default.fileSync({ mode: 420, prefix: "prefix-", postfix: ".ts" });
-  import_fs.default.writeFileSync(temporaryFile.name, currentSchema.customTypes);
-  const compilerOptions = {
-    strictNullChecks: true,
-    skipLibCheck: true
-  };
-  const program = TJS.getProgramFromFiles(
-    [
-      (0, import_path.resolve)(temporaryFile.name),
-      // find a way to remove
-      import_path.default.join(process2.cwd(), "src/@types/models.d.ts"),
-      import_path.default.join(process2.cwd(), "src/@types/api.d.ts")
-    ],
-    compilerOptions
-  );
-  customInterfaceNames.forEach((item) => {
-    const ddlSchema = TJS.generateSchema(program, item, {
-      required: true
-    });
-    schemaObject[item] = ddlSchema || {};
+// src/restura/sql/PsqlUtils.ts
+var import_pg_format = __toESM(require("pg-format"));
+function escapeColumnName(columnName) {
+  if (columnName === void 0) return "";
+  return `"${columnName.replace(/"/g, "")}"`.replace(".", '"."');
+}
+function questionMarksToOrderedParams(query) {
+  let count = 1;
+  return query.replace(/'\?'|\?/g, () => `$${count++}`);
+}
+function insertObjectQuery(table, obj) {
+  const keys = Object.keys(obj);
+  const params = Object.values(obj);
+  const columns = keys.map((column) => escapeColumnName(column)).join(", ");
+  const values = params.map((value) => SQL`${value}`).join(", ");
+  const query = `INSERT INTO "${table}" (${columns})
+                 VALUES (${values})
+                 RETURNING *`;
+  return query;
+}
+function updateObjectQuery(table, obj, whereStatement) {
+  const setArray = [];
+  for (const i in obj) {
+    setArray.push(`${escapeColumnName(i)} = ` + SQL`${obj[i]}`);
+  }
+  return `UPDATE ${escapeColumnName(table)}
+                 SET ${setArray.join(", ")} ${whereStatement}
+                 RETURNING *`;
+}
+function isValueNumber2(value) {
+  return !isNaN(Number(value));
+}
+function SQL(strings, ...values) {
+  let query = strings[0];
+  values.forEach((value, index) => {
+    if (isValueNumber2(value)) {
+      query += value;
+    } else {
+      query += import_pg_format.default.literal(value);
+    }
+    query += strings[index + 1];
   });
-  temporaryFile.removeCallback();
-  return schemaObject;
+  return query;
 }
 
 // src/restura/sql/SqlEngine.ts
@@ -1260,7 +1378,10 @@ var SqlEngine = class {
         param = param.replace("#", "");
         const globalParamValue = req.requesterDetails[param];
         if (!globalParamValue)
-          throw new RsError("SCHEMA_ERROR", `Invalid global keyword clause in route ${routeData.name}`);
+          throw new RsError(
+            "SCHEMA_ERROR",
+            `Invalid global keyword clause in route (${routeData.path}) when looking for (#${param})`
+          );
         sqlParams.push(globalParamValue);
       });
       return value.replace(new RegExp(/#[a-zA-Z][a-zA-Z0-9_]+/g), "?");
@@ -1269,7 +1390,7 @@ var SqlEngine = class {
   }
 };
 
-// src/restura/sql/filterSqlParser.ts
+// src/restura/sql/filterPsqlParser.ts
 var import_pegjs = __toESM(require("pegjs"));
 var filterSqlGrammar = `
 start = expressionList
@@ -1281,7 +1402,7 @@ expressionList =
 
 expression = 
     negate:negate?"(" "column:" column:column ","? value:value? ","? type:type? ")" 
-    {return \`\${negate? "!" : ""}(\${type?  type(column, value) : \`\${column} = \${mysql.escape(value)}\`})\`;}
+    {return \`\${negate? "!" : ""}(\${type?  type(column, value) : \`\${column} = \${format.literal(value)}\`})\`;}
     /
     negate:negate?"("expression:expressionList")" { return \`\${negate? "!" : ""}(\${expression})\`; }
 
@@ -1289,80 +1410,33 @@ negate = "!"
     
 operator = "and"i / "or"i
 
-column = left:text "." right:text { return  \`\${mysql.escapeId(left)}.\${mysql.escapeId(right)}\`; }
-	   /
-	   text:text { return mysql.escapeId(text); }
-
+	   
+column = left:text "." right:text { return  \`\${format.ident(left)}.\${format.ident(right)}\`; } 
+    / 
+    text:text { return format.ident(text); } 
+    
 
-text = text:[ a-z0-9-_:.@]i+ { return text.join("");}
+text = text:[a-z0-9-_:@]i+ { return text.join("");}
 
 type = "type:" type:typeString { return type; }
-typeString = text:"startsWith" { return function(column, value) { return \`\${column} LIKE '\${mysql.escape(value).slice(1,-1)}%'\`; } } /
-    text:"endsWith"  { return function(column, value) { return \`\${column} LIKE '%\${mysql.escape(value).slice(1,-1)}'\`; } } /
-    text:"contains" { return function(column, value) { return \`\${column} LIKE '%\${mysql.escape(value).slice(1,-1)}%'\`; } } /
-    text:"exact" { return function(column, value)    { return \`\${column} = '\${mysql.escape(value).slice(1,-1)}'\`; } } /
-    text:"greaterThanEqual" { return function(column, value) { return \`\${column} >= '\${mysql.escape(value).slice(1,-1)}'\`; } } /
-    text:"greaterThan" { return function(column, value) { return \`\${column} > '\${mysql.escape(value).slice(1,-1)}'\`; } } /
-    text:"lessThanEqual" { return function(column, value) { return \`\${column} <= '\${mysql.escape(value).slice(1,-1)}'\`; } } /
-    text:"lessThan" { return function(column, value) { return \`\${column} < '\${mysql.escape(value).slice(1,-1)}'\`; } } / 
+typeString = text:"startsWith" { return function(column, value) { return \`\${column} ILIKE '\${format.literal(value).slice(1,-1)}%'\`; } } /
+    text:"endsWith"  { return function(column, value) { return \`\${column} ILIKE '%\${format.literal(value).slice(1,-1)}'\`; } } /
+    text:"contains" { return function(column, value) { return \`\${column} ILIKE '%\${format.literal(value).slice(1,-1)}%'\`; } } /
+    text:"exact" { return function(column, value)    { return \`\${column} = '\${format.literal(value).slice(1,-1)}'\`; } } /
+    text:"greaterThanEqual" { return function(column, value) { return \`\${column} >= '\${format.literal(value).slice(1,-1)}'\`; } } /
+    text:"greaterThan" { return function(column, value) { return \`\${column} > '\${format.literal(value).slice(1,-1)}'\`; } } /
+    text:"lessThanEqual" { return function(column, value) { return \`\${column} <= '\${format.literal(value).slice(1,-1)}'\`; } } /
+    text:"lessThan" { return function(column, value) { return \`\${column} < '\${format.literal(value).slice(1,-1)}'\`; } } / 
     text:"isNull"   { return function(column, value) { return \`isNull(\${column})\`; } } 
     
 value = "value:" value:text { return value; } 
 
 `;
-var filterSqlParser = import_pegjs.default.generate(filterSqlGrammar, {
-  format: "commonjs"
-  // dependencies: { mysql: 'mysql' } // todo: figure out a better way to escape values depending on the database type
+var filterPsqlParser = import_pegjs.default.generate(filterSqlGrammar, {
+  format: "commonjs",
+  dependencies: { format: "pg-format" }
 });
-var filterSqlParser_default = filterSqlParser;
-
-// src/restura/sql/PsqlEngine.ts
-var import_core_utils5 = require("@redskytech/core-utils");
-
-// src/restura/sql/PsqlUtils.ts
-var import_pg_format = __toESM(require("pg-format"));
-function escapeColumnName(columnName) {
-  if (columnName === void 0) return "";
-  return `"${columnName.replace(/"/g, "")}"`.replace(".", '"."');
-}
-function questionMarksToOrderedParams(query) {
-  let count = 1;
-  return query.replace(/'\?'/g, () => `$${count++}`);
-}
-function insertObjectQuery(table, obj) {
-  const keys = Object.keys(obj);
-  const params = Object.values(obj);
-  const columns = keys.map((column) => escapeColumnName(column)).join(", ");
-  const values = params.map((value) => SQL`${value}`).join(", ");
-  const query = `INSERT INTO "${table}" (${columns})
-                 VALUES (${values})
-                 RETURNING *`;
-  return query;
-}
-function updateObjectQuery(table, obj, whereStatement) {
-  const setArray = [];
-  for (const i in obj) {
-    setArray.push(`${escapeColumnName(i)} = ` + SQL`${obj[i]}`);
-  }
-  return `UPDATE ${escapeColumnName(table)}
-                 SET ${setArray.join(", ")} ${whereStatement}
-                 RETURNING *`;
-}
-function isValueNumber2(value) {
-  return !isNaN(Number(value));
-}
-function SQL(strings, ...values) {
-  let query = strings[0];
-  values.forEach((value, index) => {
-    if (isValueNumber2(value)) {
-      query += value;
-    } else {
-      query += import_pg_format.default.literal(value);
-    }
-    query += strings[index + 1];
-  });
-  return query;
-}
+var filterPsqlParser_default = filterPsqlParser;
 
 // src/restura/sql/PsqlEngine.ts
 var PsqlEngine = class extends SqlEngine {
@@ -1379,8 +1453,45 @@ var PsqlEngine = class extends SqlEngine {
     return "";
   }
   createNestedSelect(req, schema, item, routeData, userRole, sqlParams) {
-    console.log(req, schema, item, routeData, userRole, sqlParams);
-    return "";
+    if (!item.subquery) return "";
+    if (!import_core_utils5.ObjectUtils.isArrayWithData(
+      item.subquery.properties.filter((nestedItem) => {
+        return this.doesRoleHavePermissionToColumn(req.requesterDetails.role, schema, nestedItem, [
+          ...routeData.joins,
+          ...item.subquery.joins
+        ]);
+      })
+    )) {
+      return "'[]'";
+    }
+    return `COALESCE((
+				SELECT JSON_AGG(JSON_BUILD_OBJECT(
+			${item.subquery.properties.map((nestedItem) => {
+      if (!this.doesRoleHavePermissionToColumn(req.requesterDetails.role, schema, nestedItem, [
+        ...routeData.joins,
+        ...item.subquery.joins
+      ])) {
+        return;
+      }
+      if (nestedItem.subquery) {
+        return `"${nestedItem.name}", ${this.createNestedSelect(
+          // recursion
+          req,
+          schema,
+          nestedItem,
+          routeData,
+          userRole,
+          sqlParams
+        )}`;
+      }
+      return `'${nestedItem.name}', ${escapeColumnName(nestedItem.selector)}`;
+    }).filter(Boolean).join(",")}
+						)) 
+						FROM
+							"${item.subquery.table}"
+							${this.generateJoinStatements(req, item.subquery.joins, item.subquery.table, routeData, schema, userRole, sqlParams)}
+							${this.generateWhereClause(req, item.subquery.where, routeData, sqlParams)}
+					), '[]')`;
   }
   async executeCreateRequest(req, routeData, schema) {
     const sqlParams = [];
@@ -1389,7 +1500,7 @@ var PsqlEngine = class extends SqlEngine {
       parameterObj[assignment.name] = this.replaceParamKeywords(assignment.value, routeData, req, sqlParams);
     });
     const query = insertObjectQuery(routeData.table, __spreadValues(__spreadValues({}, req.data), parameterObj));
-    const createdItem = await this.psqlConnectionPool.queryOne(query, sqlParams);
+    const createdItem = await this.psqlConnectionPool.queryOne(query, sqlParams, req.requesterDetails);
     const insertId = createdItem == null ? void 0 : createdItem.id;
     const whereData = [
       {
@@ -1439,12 +1550,14 @@ var PsqlEngine = class extends SqlEngine {
     if (routeData.type === "ONE") {
       return this.psqlConnectionPool.queryOne(
         `${selectStatement}${sqlStatement}${groupByOrderByStatement};`,
-        sqlParams
+        sqlParams,
+        req.requesterDetails
       );
     } else if (routeData.type === "ARRAY") {
       return this.psqlConnectionPool.runQuery(
         `${selectStatement}${sqlStatement}${groupByOrderByStatement};`,
-        sqlParams
+        sqlParams,
+        req.requesterDetails
       );
     } else if (routeData.type === "PAGED") {
       const data = req.data;
@@ -1456,7 +1569,8 @@ ${sqlStatement};`,
           data.perPage || DEFAULT_PAGED_PER_PAGE_NUMBER,
           (data.page - 1) * data.perPage || DEFAULT_PAGED_PAGE_NUMBER,
           ...sqlParams
-        ]
+        ],
+        req.requesterDetails
       );
       let total = 0;
       if (import_core_utils5.ObjectUtils.isArrayWithData(pageResults)) {
@@ -1487,7 +1601,7 @@ ${sqlStatement};`,
     }
     const whereClause = this.generateWhereClause(req, routeData.where, routeData, sqlParams);
     const query = updateObjectQuery(routeData.table, bodyNoId, whereClause);
-    await this.psqlConnectionPool.queryOne(query, [...sqlParams]);
+    await this.psqlConnectionPool.queryOne(query, [...sqlParams], req.requesterDetails);
     return this.executeGetRequest(req, routeData, schema);
   }
   async executeDeleteRequest(req, routeData, schema) {
@@ -1505,16 +1619,26 @@ ${sqlStatement};`,
                            FROM "${routeData.table}" ${joinStatement}`;
     deleteStatement += this.generateWhereClause(req, routeData.where, routeData, sqlParams);
     deleteStatement += ";";
-    await this.psqlConnectionPool.runQuery(deleteStatement, sqlParams);
+    await this.psqlConnectionPool.runQuery(deleteStatement, sqlParams, req.requesterDetails);
     return true;
   }
   generateJoinStatements(req, joins, baseTable, routeData, schema, userRole, sqlParams) {
-    console.log(req, joins, baseTable, routeData, schema, userRole, sqlParams);
-    return "";
-  }
-  getTableSchema(schema, tableName) {
-    console.log(schema, tableName);
-    return {};
+    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");
+      if (item.custom) {
+        const customReplaced = this.replaceParamKeywords(item.custom, routeData, req, sqlParams);
+        joinStatements += `	${item.type} JOIN ${escapeColumnName(item.table)} 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(
+          item.foreignColumnName
+        )}
+`;
+      }
+    });
+    return joinStatements;
   }
   generateGroupBy(routeData) {
     let groupBy = "";
@@ -1573,22 +1697,24 @@ ${sqlStatement};`,
     const data = req.data;
     if (routeData.type === "PAGED" && !!(data == null ? void 0 : data.filter)) {
       let statement = data.filter.replace(/\$[a-zA-Z][a-zA-Z0-9_]+/g, (value) => {
+        var _a;
         const requestParam = routeData.request.find((item) => {
           return item.name === value.replace("$", "");
         });
         if (!requestParam)
           throw new RsError("SCHEMA_ERROR", `Invalid route keyword in route ${routeData.name}`);
-        return data[requestParam.name];
+        return ((_a = data[requestParam.name]) == null ? void 0 : _a.toString()) || "";
       });
       statement = statement.replace(/#[a-zA-Z][a-zA-Z0-9_]+/g, (value) => {
+        var _a;
         const requestParam = routeData.request.find((item) => {
           return item.name === value.replace("#", "");
         });
         if (!requestParam)
           throw new RsError("SCHEMA_ERROR", `Invalid route keyword in route ${routeData.name}`);
-        return data[requestParam.name];
+        return ((_a = data[requestParam.name]) == null ? void 0 : _a.toString()) || "";
       });
-      statement = filterSqlParser_default.parse(statement);
+      statement = filterPsqlParser_default.parse(statement);
       if (whereClause.startsWith("WHERE")) {
         whereClause += ` AND (${statement})
 `;
@@ -1601,24 +1727,33 @@ ${sqlStatement};`,
   }
 };
 
-// src/restura/restura.ts
-var import_pg2 = require("pg");
-
 // src/restura/sql/PsqlPool.ts
-var import_pg = require("pg");
+var import_pg = __toESM(require("pg"));
+var import_pg_format2 = __toESM(require("pg-format"));
+var { Pool } = import_pg.default;
 var PsqlPool = class {
   constructor(poolConfig) {
     this.poolConfig = poolConfig;
-    this.pool = new import_pg.Pool(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);
+    });
   }
   // eslint-disable-next-line  @typescript-eslint/no-explicit-any
-  async queryOne(query, options) {
+  async queryOne(query, options, requesterDetails) {
     const formattedQuery = questionMarksToOrderedParams(query);
+    this.logSqlStatement(formattedQuery, options, requesterDetails);
     try {
       const response = await this.pool.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];
     } catch (error) {
       console.error(error, query, options);
+      if (RsError.isRsError(error)) throw error;
       if ((error == null ? void 0 : error.routine) === "_bt_check_unique") {
         throw new RsError("DUPLICATE", error.message);
       }
@@ -1626,8 +1761,9 @@ var PsqlPool = class {
     }
   }
   // eslint-disable-next-line  @typescript-eslint/no-explicit-any
-  async runQuery(query, options) {
+  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 {
@@ -1641,9 +1777,30 @@ var PsqlPool = class {
       throw new RsError("DATABASE_ERROR", `${error.message}`);
     }
   }
+  logSqlStatement(query, options, requesterDetails, prefix = "") {
+    if (logger.level !== "silly") return;
+    let sqlStatement = "";
+    if (options.length === 0) {
+      sqlStatement = query;
+    } else {
+      let stringIndex = 0;
+      sqlStatement = query.replace(/\$\d+/g, () => {
+        const value = options[stringIndex++];
+        if (typeof value === "number") return value.toString();
+        return import_pg_format2.default.literal(value);
+      });
+    }
+    let initiator = "Anonymous";
+    if ("userId" in requesterDetails && requesterDetails.userId)
+      initiator = `User Id (${requesterDetails.userId.toString()})`;
+    if ("isSystemUser" in requesterDetails && requesterDetails.isSystemUser) initiator = "SYSTEM";
+    logger.silly(`${prefix}query by ${initiator}, Query ->
+ ${sqlStatement}`);
+  }
 };
 
 // src/restura/restura.ts
+var { types } = import_pg2.default;
 var ResturaEngine = class {
   constructor() {
     this.publicEndpoints = {
@@ -1661,10 +1818,11 @@ var ResturaEngine = class {
    * @returns A promise that resolves when the initialization is complete.
    */
   async init(app, authenticationHandler, psqlConnectionPool) {
+    this.resturaConfig = import_internal2.config.validate("restura", resturaConfigSchema);
     this.psqlConnectionPool = psqlConnectionPool;
     this.psqlEngine = new PsqlEngine(this.psqlConnectionPool);
     setupPgReturnTypes();
-    this.resturaConfig = import_internal2.config.validate("restura", resturaConfigSchema);
+    await customApiFactory_default.loadApiFiles(this.resturaConfig.customApiFolderPath);
     this.authenticationHandler = authenticationHandler;
     app.use((0, import_compression.default)());
     app.use(import_body_parser.default.json({ limit: "32mb" }));
@@ -1727,7 +1885,7 @@ var ResturaEngine = class {
    * @returns A promise that resolves when the API has been successfully generated and written to the output file.
    */
   async generateApiFromSchema(outputFile, providedSchema) {
-    import_fs2.default.writeFileSync(
+    import_fs3.default.writeFileSync(
       outputFile,
       await apiGenerator(providedSchema, await this.generateHashForSchema(providedSchema))
     );
@@ -1740,7 +1898,7 @@ var ResturaEngine = class {
    * @returns A promise that resolves when the model has been successfully written to the output file.
    */
   async generateModelFromSchema(outputFile, providedSchema) {
-    import_fs2.default.writeFileSync(
+    import_fs3.default.writeFileSync(
       outputFile,
       await modelGenerator(providedSchema, await this.generateHashForSchema(providedSchema))
     );
@@ -1752,11 +1910,11 @@ var ResturaEngine = class {
    * @throws {Error} If the schema file is missing or the schema is not valid.
    */
   async getLatestFileSystemSchema() {
-    if (!import_fs2.default.existsSync(this.resturaConfig.schemaFilePath)) {
+    if (!import_fs3.default.existsSync(this.resturaConfig.schemaFilePath)) {
       logger.error(`Missing restura schema file, expected path: ${this.resturaConfig.schemaFilePath}`);
       throw new Error("Missing restura schema file");
     }
-    const schemaFileData = import_fs2.default.readFileSync(this.resturaConfig.schemaFilePath, { encoding: "utf8" });
+    const schemaFileData = import_fs3.default.readFileSync(this.resturaConfig.schemaFilePath, { encoding: "utf8" });
     const schema = import_core_utils6.ObjectUtils.safeParse(schemaFileData);
     const isValid = await isSchemaValid(schema);
     if (!isValid) {
@@ -1777,9 +1935,9 @@ var ResturaEngine = class {
   async getHashes(providedSchema) {
     var _a, _b, _c, _d;
     const schemaHash = await this.generateHashForSchema(providedSchema);
-    const apiFile = import_fs2.default.readFileSync(import_path2.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"));
+    const apiFile = import_fs3.default.readFileSync(import_path3.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"));
     const apiCreatedSchemaHash = (_b = (_a = apiFile.toString().match(/\((.*)\)/)) == null ? void 0 : _a[1]) != null ? _b : "";
-    const modelFile = import_fs2.default.readFileSync(import_path2.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"));
+    const modelFile = import_fs3.default.readFileSync(import_path3.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"));
     const modelCreatedSchemaHash = (_d = (_c = modelFile.toString().match(/\((.*)\)/)) == null ? void 0 : _c[1]) != null ? _d : "";
     return {
       schemaHash,
@@ -1815,27 +1973,27 @@ var ResturaEngine = class {
     logger.info(`Restura loaded (${routeCount}) endpoint${routeCount > 1 ? "s" : ""}`);
   }
   async validateGeneratedTypesFolder() {
-    if (!import_fs2.default.existsSync(this.resturaConfig.generatedTypesPath)) {
-      import_fs2.default.mkdirSync(this.resturaConfig.generatedTypesPath, { recursive: true });
+    if (!import_fs3.default.existsSync(this.resturaConfig.generatedTypesPath)) {
+      import_fs3.default.mkdirSync(this.resturaConfig.generatedTypesPath, { recursive: true });
     }
-    const hasApiFile = import_fs2.default.existsSync(import_path2.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"));
-    const hasModelsFile = import_fs2.default.existsSync(import_path2.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"));
+    const hasApiFile = import_fs3.default.existsSync(import_path3.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"));
+    const hasModelsFile = import_fs3.default.existsSync(import_path3.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"));
     if (!hasApiFile) {
-      await this.generateApiFromSchema(import_path2.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
+      await this.generateApiFromSchema(import_path3.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
     }
     if (!hasModelsFile) {
       await this.generateModelFromSchema(
-        import_path2.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
+        import_path3.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
         this.schema
       );
     }
     const hashes = await this.getHashes(this.schema);
     if (hashes.schemaHash !== hashes.apiCreatedSchemaHash) {
-      await this.generateApiFromSchema(import_path2.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
+      await this.generateApiFromSchema(import_path3.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
     }
     if (hashes.schemaHash !== hashes.modelCreatedSchemaHash) {
       await this.generateModelFromSchema(
-        import_path2.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
+        import_path3.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
         this.schema
       );
     }
@@ -1865,9 +2023,9 @@ var ResturaEngine = class {
     }
   }
   async updateTypes() {
-    await this.generateApiFromSchema(import_path2.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
+    await this.generateApiFromSchema(import_path3.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
     await this.generateModelFromSchema(
-      import_path2.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
+      import_path3.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
       this.schema
     );
   }
@@ -1890,11 +2048,16 @@ var ResturaEngine = class {
       const routeData = this.getRouteData(req.method, req.baseUrl, req.path);
       this.validateAuthorization(req, routeData);
       validateRequestParams(req, routeData, this.customTypeValidation);
+      if (this.isCustomRoute(routeData)) {
+        await this.runCustomRouteLogic(req, res, routeData);
+        return;
+      }
       const data = await this.psqlEngine.runQueryForRoute(
         req,
         routeData,
         this.schema
       );
+      this.responseValidator.validateResponseParams(data, req.baseUrl, routeData);
       if (routeData.type === "PAGED") res.sendNoWrap(data);
       else res.sendData(data);
     } catch (e) {
@@ -1904,34 +2067,25 @@ var ResturaEngine = class {
   isCustomRoute(route) {
     return route.type === "CUSTOM_ONE" || route.type === "CUSTOM_ARRAY" || route.type === "CUSTOM_PAGED";
   }
-  // @boundMethod
-  // private async runCustomRouteLogic<T>(req: RsRequest<T>, res: RsResponse<T>, routeData: RouteData) {
-  // 	const version = req.baseUrl.split('/')[2];
-  // 	let domain = routeData.path.split('/')[1];
-  // 	domain = domain.split('-').reduce((acc, value, index) => {
-  // 		if (index === 0) acc = value;
-  // 		else acc += StringUtils.capitalizeFirst(value);
-  // 		return acc;
-  // 	}, '');
-  // 	const customApiName = `${StringUtils.capitalizeFirst(domain)}Api${StringUtils.capitalizeFirst(version)}`;
-  // 	const customApi = apiFactory.getCustomApi(customApiName);
-  // 	if (!customApi) throw new RsError('NOT_FOUND', `API domain ${domain}-${version} not found`);
-  // 	const functionName = `${routeData.method.toLowerCase()}${routeData.path
-  // 		.replace(new RegExp('-', 'g'), '/')
-  // 		.split('/')
-  // 		.reduce((acc, cur) => {
-  // 			if (cur === '') return acc;
-  // 			return acc + StringUtils.capitalizeFirst(cur);
-  // 		}, '')}`;
-  // 	// @ts-expect-error - Here we are dynamically calling the function from a custom class, not sure how to typescript this
-  // 	const customFunction = customApi[functionName] as (
-  // 		req: RsRequest<T>,
-  // 		res: RsResponse<T>,
-  // 		routeData: RouteData
-  // 	) => Promise<void>;
-  // 	if (!customFunction) throw new RsError('NOT_FOUND', `API path ${routeData.path} not implemented`);
-  // 	await customFunction(req, res, routeData);
-  // }
+  async runCustomRouteLogic(req, res, routeData) {
+    const version = req.baseUrl.split("/")[2];
+    let domain = routeData.path.split("/")[1];
+    domain = domain.split("-").reduce((acc, value, index) => {
+      if (index === 0) acc = value;
+      else acc += import_core_utils6.StringUtils.capitalizeFirst(value);
+      return acc;
+    }, "");
+    const customApiName = `${import_core_utils6.StringUtils.capitalizeFirst(domain)}Api${import_core_utils6.StringUtils.capitalizeFirst(version)}`;
+    const customApi = customApiFactory_default.getCustomApi(customApiName);
+    if (!customApi) throw new RsError("NOT_FOUND", `API domain ${domain}-${version} not found`);
+    const functionName = `${routeData.method.toLowerCase()}${routeData.path.replace(new RegExp("-", "g"), "/").split("/").reduce((acc, cur) => {
+      if (cur === "") return acc;
+      return acc + import_core_utils6.StringUtils.capitalizeFirst(cur);
+    }, "")}`;
+    const customFunction = customApi[functionName];
+    if (!customFunction) throw new RsError("NOT_FOUND", `API path ${routeData.path} not implemented`);
+    await customFunction(req, res, routeData);
+  }
   async generateHashForSchema(providedSchema) {
     const schemaPrettyStr = await prettier3.format(JSON.stringify(providedSchema), __spreadValues({
       parser: "json"
@@ -1956,7 +2110,7 @@ var ResturaEngine = class {
       printWidth: 120,
       singleQuote: true
     }));
-    import_fs2.default.writeFileSync(this.resturaConfig.schemaFilePath, schemaPrettyStr);
+    import_fs3.default.writeFileSync(this.resturaConfig.schemaFilePath, schemaPrettyStr);
   }
   resetPublicEndpoints() {
     this.publicEndpoints = {
@@ -1973,13 +2127,13 @@ var ResturaEngine = class {
     if (!routeData.roles.includes(role))
       throw new RsError("UNAUTHORIZED", "Not authorized to access this endpoint");
   }
-  getRouteData(method, baseUrl, path3) {
+  getRouteData(method, baseUrl, path4) {
     const endpoint = this.schema.endpoints.find((item) => {
       return item.baseUrl === baseUrl;
     });
     if (!endpoint) throw new RsError("NOT_FOUND", "Route not found");
     const route = endpoint.routes.find((item) => {
-      return item.method === method && item.path === path3;
+      return item.method === method && item.path === path4;
     });
     if (!route) throw new RsError("NOT_FOUND", "Route not found");
     return route;
@@ -2006,13 +2160,16 @@ __decorateClass([
 __decorateClass([
   boundMethod
 ], ResturaEngine.prototype, "isCustomRoute", 1);
+__decorateClass([
+  boundMethod
+], ResturaEngine.prototype, "runCustomRouteLogic", 1);
 var setupPgReturnTypes = () => {
   const TIMESTAMPTZ_OID = 1184;
-  import_pg2.types.setTypeParser(TIMESTAMPTZ_OID, (val) => {
+  types.setTypeParser(TIMESTAMPTZ_OID, (val) => {
     return val === null ? null : new Date(val).toISOString();
   });
   const BIGINT_OID = 20;
-  import_pg2.types.setTypeParser(BIGINT_OID, (val) => {
+  types.setTypeParser(BIGINT_OID, (val) => {
     return val === null ? null : Number(val);
   });
 };
@@ -2020,8 +2177,16 @@ setupPgReturnTypes();
 var restura = new ResturaEngine();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  HtmlStatusCodes,
   PsqlPool,
+  RsError,
+  SQL,
+  escapeColumnName,
+  insertObjectQuery,
+  isValueNumber,
   logger,
-  restura
+  questionMarksToOrderedParams,
+  restura,
+  updateObjectQuery
 });
 //# sourceMappingURL=index.js.map