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

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
@@ -19,6 +21,19 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -52,6 +67,7 @@ var __decorateClass = (decorators, target, key, kind) => {
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  PsqlPool: () => PsqlPool,
   logger: () => logger,
   restura: () => restura
 });
@@ -110,7 +126,7 @@ var logger = import_winston.default.createLogger({
 });
 
 // src/restura/restura.ts
-var import_core_utils4 = require("@redskytech/core-utils");
+var import_core_utils6 = require("@redskytech/core-utils");
 var import_internal2 = require("@restura/internal");
 
 // ../../node_modules/.pnpm/autobind-decorator@2.4.0/node_modules/autobind-decorator/lib/esm/index.js
@@ -165,8 +181,8 @@ 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_fs = __toESM(require("fs"));
-var import_path = __toESM(require("path"));
+var import_fs2 = __toESM(require("fs"));
+var import_path2 = __toESM(require("path"));
 var prettier3 = __toESM(require("prettier"));
 
 // src/restura/errors.ts
@@ -218,7 +234,7 @@ var htmlStatusMap = {
   SCHEMA_ERROR: 500 /* SERVER_ERROR */
 };
 
-// src/restura/SqlUtils.ts
+// src/restura/sql/SqlUtils.ts
 var SqlUtils = class _SqlUtils {
   static convertDatabaseTypeToTypescript(type, value) {
     type = type.toLocaleLowerCase();
@@ -309,9 +325,9 @@ var ResponseValidator = class _ResponseValidator {
     return { validator: "any" };
   }
   getTypeFromTable(selector, name) {
-    const path2 = selector.split(".");
-    if (path2.length === 0 || path2.length > 2 || path2[0] === "") return { validator: "any", isOptional: false };
-    const tableName = path2.length == 2 ? path2[0] : name, columnName = path2.length == 2 ? path2[1] : path2[0];
+    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 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 };
@@ -527,10 +543,10 @@ var ApiTree = class _ApiTree {
     return `${p.name}${optional ? "?" : ""}:${responseType}${array ? "[]" : ""}`;
   }
   getTypeFromTable(selector, name) {
-    const path2 = selector.split(".");
-    if (path2.length === 0 || path2.length > 2 || path2[0] === "") return { responseType: "any", optional: false };
-    let tableName = path2.length == 2 ? path2[0] : name;
-    const columnName = path2.length == 2 ? path2[1] : path2[0];
+    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];
     let table = this.database.find((t) => t.name == tableName);
     if (!table && tableName.includes("_")) {
       const tableAliasSplit = tableName.split("_");
@@ -545,8 +561,8 @@ var ApiTree = class _ApiTree {
     };
   }
 };
-function pathToNamespaces(path2) {
-  return path2.split("/").map((e) => import_core_utils.StringUtils.toPascalCasing(e)).filter((e) => e);
+function pathToNamespaces(path3) {
+  return path3.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 **/`;
@@ -610,6 +626,163 @@ function addApiResponseFunctions(req, res, next) {
 // src/restura/validateRequestParams.ts
 var import_core_utils2 = require("@redskytech/core-utils");
 var import_jsonschema = __toESM(require("jsonschema"));
+var import_zod3 = require("zod");
+
+// src/restura/types/validation.types.ts
+var import_zod2 = require("zod");
+var validatorDataSchemeValue = import_zod2.z.union([import_zod2.z.string(), import_zod2.z.array(import_zod2.z.string()), import_zod2.z.number(), import_zod2.z.array(import_zod2.z.number())]);
+var validatorDataSchema = import_zod2.z.object({
+  type: import_zod2.z.enum(["TYPE_CHECK", "MIN", "MAX", "ONE_OF"]),
+  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") {
@@ -644,84 +817,83 @@ function getRequestData(req) {
 }
 
 // src/restura/restura.schema.ts
-var import_zod2 = require("zod");
-var orderBySchema = import_zod2.z.object({
-  columnName: import_zod2.z.string(),
-  order: import_zod2.z.enum(["ASC", "DESC"]),
-  tableName: import_zod2.z.string()
-}).strict();
-var groupBySchema = import_zod2.z.object({
-  columnName: import_zod2.z.string(),
-  tableName: import_zod2.z.string()
+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()
 }).strict();
-var whereDataSchema = import_zod2.z.object({
-  tableName: import_zod2.z.string().optional(),
-  columnName: import_zod2.z.string().optional(),
-  operator: import_zod2.z.enum(["=", "<", ">", "<=", ">=", "!=", "LIKE", "IN", "NOT IN", "STARTS WITH", "ENDS WITH"]).optional(),
-  value: import_zod2.z.string().optional(),
-  custom: import_zod2.z.string().optional(),
-  conjunction: import_zod2.z.enum(["AND", "OR"]).optional()
+var groupBySchema = import_zod4.z.object({
+  columnName: import_zod4.z.string(),
+  tableName: import_zod4.z.string()
 }).strict();
-var assignmentDataSchema = import_zod2.z.object({
-  name: import_zod2.z.string(),
-  value: import_zod2.z.string()
+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()
 }).strict();
-var joinDataSchema = import_zod2.z.object({
-  table: import_zod2.z.string(),
-  localColumnName: import_zod2.z.string().optional(),
-  foreignColumnName: import_zod2.z.string().optional(),
-  custom: import_zod2.z.string().optional(),
-  type: import_zod2.z.enum(["LEFT", "INNER"]),
-  alias: import_zod2.z.string().optional()
+var assignmentDataSchema = import_zod4.z.object({
+  name: import_zod4.z.string(),
+  value: import_zod4.z.string()
 }).strict();
-var validatorDataSchema = import_zod2.z.object({
-  type: import_zod2.z.enum(["TYPE_CHECK", "MIN", "MAX", "ONE_OF"]),
-  value: import_zod2.z.union([import_zod2.z.string(), import_zod2.z.array(import_zod2.z.string()), import_zod2.z.number(), import_zod2.z.array(import_zod2.z.number())])
+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()
 }).strict();
-var requestDataSchema = import_zod2.z.object({
-  name: import_zod2.z.string(),
-  required: import_zod2.z.boolean(),
-  validator: import_zod2.z.array(validatorDataSchema)
+var requestDataSchema = import_zod4.z.object({
+  name: import_zod4.z.string(),
+  required: import_zod4.z.boolean(),
+  validator: import_zod4.z.array(validatorDataSchema)
 }).strict();
-var responseDataSchema = import_zod2.z.object({
-  name: import_zod2.z.string(),
-  selector: import_zod2.z.string().optional(),
-  subquery: import_zod2.z.object({
-    table: import_zod2.z.string(),
-    joins: import_zod2.z.array(joinDataSchema),
-    where: import_zod2.z.array(whereDataSchema),
-    properties: import_zod2.z.array(import_zod2.z.lazy(() => responseDataSchema)),
+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)),
     // Explicit type for the lazy schema
     groupBy: groupBySchema.optional(),
     orderBy: orderBySchema.optional()
   }).optional()
 }).strict();
-var routeDataBaseSchema = import_zod2.z.object({
-  method: import_zod2.z.enum(["GET", "POST", "PUT", "PATCH", "DELETE"]),
-  name: import_zod2.z.string(),
-  description: import_zod2.z.string(),
-  path: import_zod2.z.string(),
-  roles: import_zod2.z.array(import_zod2.z.string())
+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())
 }).strict();
 var standardRouteSchema = routeDataBaseSchema.extend({
-  type: import_zod2.z.enum(["ONE", "ARRAY", "PAGED"]),
-  table: import_zod2.z.string(),
-  joins: import_zod2.z.array(joinDataSchema),
-  assignments: import_zod2.z.array(assignmentDataSchema),
-  where: import_zod2.z.array(whereDataSchema),
-  request: import_zod2.z.array(requestDataSchema),
-  response: import_zod2.z.array(responseDataSchema),
+  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),
   groupBy: groupBySchema.optional(),
   orderBy: orderBySchema.optional()
 }).strict();
 var customRouteSchema = routeDataBaseSchema.extend({
-  type: import_zod2.z.enum(["CUSTOM_ONE", "CUSTOM_ARRAY", "CUSTOM_PAGED"]),
-  responseType: import_zod2.z.union([import_zod2.z.string(), import_zod2.z.enum(["string", "number", "boolean"])]),
-  requestType: import_zod2.z.string().optional(),
-  request: import_zod2.z.array(requestDataSchema).optional(),
-  fileUploadType: import_zod2.z.enum(["SINGLE", "MULTIPLE"]).optional()
+  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()
 }).strict();
-var postgresColumnNumericTypesSchema = import_zod2.z.enum([
+var postgresColumnNumericTypesSchema = import_zod4.z.enum([
   "SMALLINT",
   // 2 bytes, -32,768 to 32,767
   "INTEGER",
@@ -741,7 +913,7 @@ var postgresColumnNumericTypesSchema = import_zod2.z.enum([
   "BIGSERIAL"
   // auto-incrementing big integer
 ]);
-var postgresColumnStringTypesSchema = import_zod2.z.enum([
+var postgresColumnStringTypesSchema = import_zod4.z.enum([
   "CHAR",
   // fixed-length, blank-padded
   "VARCHAR",
@@ -751,7 +923,7 @@ var postgresColumnStringTypesSchema = import_zod2.z.enum([
   "BYTEA"
   // binary data
 ]);
-var postgresColumnDateTypesSchema = import_zod2.z.enum([
+var postgresColumnDateTypesSchema = import_zod4.z.enum([
   "DATE",
   // calendar date (year, month, day)
   "TIMESTAMP",
@@ -763,7 +935,7 @@ var postgresColumnDateTypesSchema = import_zod2.z.enum([
   "INTERVAL"
   // time span
 ]);
-var mariaDbColumnNumericTypesSchema = import_zod2.z.enum([
+var mariaDbColumnNumericTypesSchema = import_zod4.z.enum([
   "BOOLEAN",
   // 1-byte A synonym for "TINYINT(1)". Supported from version 1.2.0 onwards.
   "TINYINT",
@@ -783,7 +955,7 @@ var mariaDbColumnNumericTypesSchema = import_zod2.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_zod2.z.enum([
+var mariaDbColumnStringTypesSchema = import_zod4.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",
@@ -809,7 +981,7 @@ var mariaDbColumnStringTypesSchema = import_zod2.z.enum([
   "ENUM"
   // Enum type
 ]);
-var mariaDbColumnDateTypesSchema = import_zod2.z.enum([
+var mariaDbColumnDateTypesSchema = import_zod4.z.enum([
   "DATE",
   // 4-bytes Date has year, month, and day.
   "DATETIME",
@@ -819,9 +991,9 @@ var mariaDbColumnDateTypesSchema = import_zod2.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_zod2.z.object({
-  name: import_zod2.z.string(),
-  type: import_zod2.z.union([
+var columnDataSchema = import_zod4.z.object({
+  name: import_zod4.z.string(),
+  type: import_zod4.z.union([
     postgresColumnNumericTypesSchema,
     postgresColumnStringTypesSchema,
     postgresColumnDateTypesSchema,
@@ -829,24 +1001,24 @@ var columnDataSchema = import_zod2.z.object({
     mariaDbColumnStringTypesSchema,
     mariaDbColumnDateTypesSchema
   ]),
-  isNullable: import_zod2.z.boolean(),
-  roles: import_zod2.z.array(import_zod2.z.string()),
-  comment: import_zod2.z.string().optional(),
-  default: import_zod2.z.string().optional(),
-  value: import_zod2.z.string().optional(),
-  isPrimary: import_zod2.z.boolean().optional(),
-  isUnique: import_zod2.z.boolean().optional(),
-  hasAutoIncrement: import_zod2.z.boolean().optional(),
-  length: import_zod2.z.number().optional()
+  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()
 }).strict();
-var indexDataSchema = import_zod2.z.object({
-  name: import_zod2.z.string(),
-  columns: import_zod2.z.array(import_zod2.z.string()),
-  isUnique: import_zod2.z.boolean(),
-  isPrimaryKey: import_zod2.z.boolean(),
-  order: import_zod2.z.enum(["ASC", "DESC"])
+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"])
 }).strict();
-var foreignKeyActionsSchema = import_zod2.z.enum([
+var foreignKeyActionsSchema = import_zod4.z.enum([
   "CASCADE",
   // CASCADE action for foreign keys
   "SET NULL",
@@ -858,38 +1030,38 @@ var foreignKeyActionsSchema = import_zod2.z.enum([
   "SET DEFAULT"
   // SET DEFAULT action for foreign keys
 ]);
-var foreignKeyDataSchema = import_zod2.z.object({
-  name: import_zod2.z.string(),
-  column: import_zod2.z.string(),
-  refTable: import_zod2.z.string(),
-  refColumn: import_zod2.z.string(),
+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(),
   onDelete: foreignKeyActionsSchema,
   onUpdate: foreignKeyActionsSchema
 }).strict();
-var checkConstraintDataSchema = import_zod2.z.object({
-  name: import_zod2.z.string(),
-  check: import_zod2.z.string()
+var checkConstraintDataSchema = import_zod4.z.object({
+  name: import_zod4.z.string(),
+  check: import_zod4.z.string()
 }).strict();
-var tableDataSchema = import_zod2.z.object({
-  name: import_zod2.z.string(),
-  columns: import_zod2.z.array(columnDataSchema),
-  indexes: import_zod2.z.array(indexDataSchema),
-  foreignKeys: import_zod2.z.array(foreignKeyDataSchema),
-  checkConstraints: import_zod2.z.array(checkConstraintDataSchema),
-  roles: import_zod2.z.array(import_zod2.z.string())
+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())
 }).strict();
-var endpointDataSchema = import_zod2.z.object({
-  name: import_zod2.z.string(),
-  description: import_zod2.z.string(),
-  baseUrl: import_zod2.z.string(),
-  routes: import_zod2.z.array(import_zod2.z.union([standardRouteSchema, customRouteSchema]))
+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]))
 }).strict();
-var resturaZodSchema = import_zod2.z.object({
-  database: import_zod2.z.array(tableDataSchema),
-  endpoints: import_zod2.z.array(endpointDataSchema),
-  globalParams: import_zod2.z.array(import_zod2.z.string()),
-  roles: import_zod2.z.array(import_zod2.z.string()),
-  customTypes: import_zod2.z.string()
+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()
 }).strict();
 async function isSchemaValid(schemaToCheck) {
   try {
@@ -949,7 +1121,7 @@ function convertTable(table) {
 }
 
 // src/restura/middleware/authenticateUser.ts
-async function authenticateUser(applicationAuthenticateHandler) {
+function authenticateUser(applicationAuthenticateHandler) {
   return (req, res, next) => {
     applicationAuthenticateHandler(
       req,
@@ -964,6 +1136,513 @@ async function authenticateUser(applicationAuthenticateHandler) {
   };
 }
 
+// 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 || {};
+  });
+  temporaryFile.removeCallback();
+  return schemaObject;
+}
+
+// src/restura/sql/SqlEngine.ts
+var import_core_utils4 = require("@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");
+    switch (routeData.method) {
+      case "POST":
+        return this.executeCreateRequest(req, routeData, schema);
+      case "GET":
+        return this.executeGetRequest(req, routeData, schema);
+      case "PUT":
+      case "PATCH":
+        return this.executeUpdateRequest(req, routeData, schema);
+      case "DELETE":
+        return this.executeDeleteRequest(req, routeData, schema);
+    }
+  }
+  getTableSchema(schema, tableName) {
+    const tableSchema = schema.database.find((item) => item.name === tableName);
+    if (!tableSchema) throw new RsError("SCHEMA_ERROR", `Table ${tableName} not found in schema`);
+    return tableSchema;
+  }
+  doesRoleHavePermissionToColumn(role, schema, item, joins) {
+    if (item.selector) {
+      let tableName = item.selector.split(".")[0];
+      const columnName = item.selector.split(".")[1];
+      let tableSchema = schema.database.find((item2) => item2.name === tableName);
+      if (!tableSchema) {
+        const join = joins.find((join2) => join2.alias === tableName);
+        if (!join) throw new RsError("SCHEMA_ERROR", `Table ${tableName} not found in schema`);
+        tableName = join.table;
+        tableSchema = schema.database.find((item2) => item2.name === tableName);
+      }
+      if (!tableSchema) throw new RsError("SCHEMA_ERROR", `Table ${tableName} not found in schema`);
+      const columnSchema = tableSchema.columns.find((item2) => item2.name === columnName);
+      if (!columnSchema)
+        throw new RsError("SCHEMA_ERROR", `Column ${columnName} not found in table ${tableName}`);
+      const doesColumnHaveRoles = import_core_utils4.ObjectUtils.isArrayWithData(columnSchema.roles);
+      if (!doesColumnHaveRoles) return true;
+      if (!role) return false;
+      return columnSchema.roles.includes(role);
+    }
+    if (item.subquery) {
+      return import_core_utils4.ObjectUtils.isArrayWithData(
+        item.subquery.properties.filter((nestedItem) => {
+          return this.doesRoleHavePermissionToColumn(role, schema, nestedItem, joins);
+        })
+      );
+    }
+    return false;
+  }
+  doesRoleHavePermissionToTable(userRole, schema, tableName) {
+    const tableSchema = this.getTableSchema(schema, tableName);
+    const doesTableHaveRoles = import_core_utils4.ObjectUtils.isArrayWithData(tableSchema.roles);
+    if (!doesTableHaveRoles) return true;
+    if (!userRole) return false;
+    return tableSchema.roles.includes(userRole);
+  }
+  replaceParamKeywords(value, routeData, req, sqlParams) {
+    let returnValue = value;
+    returnValue = this.replaceLocalParamKeywords(returnValue, routeData, req, sqlParams);
+    returnValue = this.replaceGlobalParamKeywords(returnValue, routeData, req, sqlParams);
+    return returnValue;
+  }
+  replaceLocalParamKeywords(value, routeData, req, sqlParams) {
+    var _a;
+    if (!routeData.request) return value;
+    const data = req.data;
+    if (typeof value === "string") {
+      (_a = value.match(/\$[a-zA-Z][a-zA-Z0-9_]+/g)) == null ? void 0 : _a.forEach((param) => {
+        const requestParam = routeData.request.find((item) => {
+          return item.name === param.replace("$", "");
+        });
+        if (!requestParam)
+          throw new RsError("SCHEMA_ERROR", `Invalid route keyword in route ${routeData.name}`);
+        sqlParams.push(data[requestParam.name]);
+      });
+      return value.replace(new RegExp(/\$[a-zA-Z][a-zA-Z0-9_]+/g), "?");
+    }
+    return value;
+  }
+  replaceGlobalParamKeywords(value, routeData, req, sqlParams) {
+    var _a;
+    if (typeof value === "string") {
+      (_a = value.match(/#[a-zA-Z][a-zA-Z0-9_]+/g)) == null ? void 0 : _a.forEach((param) => {
+        param = param.replace("#", "");
+        const globalParamValue = req.requesterDetails[param];
+        if (!globalParamValue)
+          throw new RsError("SCHEMA_ERROR", `Invalid global keyword clause in route ${routeData.name}`);
+        sqlParams.push(globalParamValue);
+      });
+      return value.replace(new RegExp(/#[a-zA-Z][a-zA-Z0-9_]+/g), "?");
+    }
+    return value;
+  }
+};
+
+// src/restura/sql/filterSqlParser.ts
+var import_pegjs = __toESM(require("pegjs"));
+var filterSqlGrammar = `
+start = expressionList
+
+expressionList =
+        leftExpression:expression operator:operator rightExpression:expressionList 
+    { return \`\${leftExpression} \${operator} \${rightExpression}\`;}
+    / expression
+
+expression = 
+    negate:negate?"(" "column:" column:column ","? value:value? ","? type:type? ")" 
+    {return \`\${negate? "!" : ""}(\${type?  type(column, value) : \`\${column} = \${mysql.escape(value)}\`})\`;}
+    /
+    negate:negate?"("expression:expressionList")" { return \`\${negate? "!" : ""}(\${expression})\`; }
+
+negate = "!"
+    
+operator = "and"i / "or"i
+
+column = left:text "." right:text { return  \`\${mysql.escapeId(left)}.\${mysql.escapeId(right)}\`; }
+	   /
+	   text:text { return mysql.escapeId(text); }
+
+
+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)}'\`; } } / 
+    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 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;
+}
+
+// src/restura/sql/PsqlEngine.ts
+var PsqlEngine = class extends SqlEngine {
+  constructor(psqlConnectionPool) {
+    super();
+    this.psqlConnectionPool = psqlConnectionPool;
+  }
+  async diffDatabaseToSchema(schema) {
+    console.log(schema);
+    return Promise.resolve("");
+  }
+  generateDatabaseSchemaFromSchema(schema) {
+    console.log(schema);
+    return "";
+  }
+  createNestedSelect(req, schema, item, routeData, userRole, sqlParams) {
+    console.log(req, schema, item, routeData, userRole, sqlParams);
+    return "";
+  }
+  async executeCreateRequest(req, routeData, schema) {
+    const sqlParams = [];
+    const parameterObj = {};
+    (routeData.assignments || []).forEach((assignment) => {
+      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 insertId = createdItem == null ? void 0 : createdItem.id;
+    const whereData = [
+      {
+        tableName: routeData.table,
+        value: insertId,
+        columnName: "id",
+        operator: "="
+      }
+    ];
+    req.data = { id: insertId };
+    return this.executeGetRequest(req, __spreadProps(__spreadValues({}, routeData), { where: whereData }), schema);
+  }
+  async executeGetRequest(req, routeData, schema) {
+    const DEFAULT_PAGED_PAGE_NUMBER = 0;
+    const DEFAULT_PAGED_PER_PAGE_NUMBER = 25;
+    const sqlParams = [];
+    const userRole = req.requesterDetails.role;
+    let sqlStatement = "";
+    const selectColumns = [];
+    routeData.response.forEach((item) => {
+      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.`);
+    let selectStatement = "SELECT \n";
+    selectStatement += `	${selectColumns.map((item) => {
+      if (item.subquery) {
+        return `${this.createNestedSelect(req, schema, item, routeData, userRole, sqlParams)} AS ${item.name}`;
+      }
+      return `${escapeColumnName(item.selector)} AS ${escapeColumnName(item.name)}`;
+    }).join(",\n	")}
+`;
+    sqlStatement += `FROM "${routeData.table}"
+`;
+    sqlStatement += this.generateJoinStatements(
+      req,
+      routeData.joins,
+      routeData.table,
+      routeData,
+      schema,
+      userRole,
+      sqlParams
+    );
+    sqlStatement += this.generateWhereClause(req, routeData.where, routeData, sqlParams);
+    let groupByOrderByStatement = this.generateGroupBy(routeData);
+    groupByOrderByStatement += this.generateOrderBy(req, routeData);
+    if (routeData.type === "ONE") {
+      return this.psqlConnectionPool.queryOne(
+        `${selectStatement}${sqlStatement}${groupByOrderByStatement};`,
+        sqlParams
+      );
+    } else if (routeData.type === "ARRAY") {
+      return this.psqlConnectionPool.runQuery(
+        `${selectStatement}${sqlStatement}${groupByOrderByStatement};`,
+        sqlParams
+      );
+    } 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
+        ]
+      );
+      let total = 0;
+      if (import_core_utils5.ObjectUtils.isArrayWithData(pageResults)) {
+        total = pageResults[1][0].total;
+      }
+      return { data: pageResults[0], total };
+    } else {
+      throw new RsError("UNKNOWN_ERROR", "Unknown route type.");
+    }
+  }
+  async executeUpdateRequest(req, routeData, schema) {
+    const sqlParams = [];
+    const _a = req.body, { id } = _a, bodyNoId = __objRest(_a, ["id"]);
+    const table = schema.database.find((item) => {
+      return item.name === routeData.table;
+    });
+    if (!table) throw new RsError("UNKNOWN_ERROR", "Unknown table.");
+    if (table.columns.find((column) => column.name === "modifiedOn")) {
+      bodyNoId.modifiedOn = (/* @__PURE__ */ new Date()).toISOString();
+    }
+    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}`);
+      if (SqlUtils.convertDatabaseTypeToTypescript(column.type) === "number")
+        bodyNoId[assignmentWithPrefix] = Number(assignment.value);
+      else bodyNoId[assignmentWithPrefix] = assignment.value;
+    }
+    const whereClause = this.generateWhereClause(req, routeData.where, routeData, sqlParams);
+    const query = updateObjectQuery(routeData.table, bodyNoId, whereClause);
+    await this.psqlConnectionPool.queryOne(query, [...sqlParams]);
+    return this.executeGetRequest(req, routeData, schema);
+  }
+  async executeDeleteRequest(req, routeData, schema) {
+    const sqlParams = [];
+    const joinStatement = this.generateJoinStatements(
+      req,
+      routeData.joins,
+      routeData.table,
+      routeData,
+      schema,
+      req.requesterDetails.role,
+      sqlParams
+    );
+    let deleteStatement = `DELETE
+                           FROM "${routeData.table}" ${joinStatement}`;
+    deleteStatement += this.generateWhereClause(req, routeData.where, routeData, sqlParams);
+    deleteStatement += ";";
+    await this.psqlConnectionPool.runQuery(deleteStatement, sqlParams);
+    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 {};
+  }
+  generateGroupBy(routeData) {
+    let groupBy = "";
+    if (routeData.groupBy) {
+      groupBy = `GROUP BY ${escapeColumnName(routeData.groupBy.tableName)}.${escapeColumnName(routeData.groupBy.columnName)}
+`;
+    }
+    return groupBy;
+  }
+  generateOrderBy(req, routeData) {
+    let orderBy = "";
+    const orderOptions = {
+      ASC: "ASC",
+      DESC: "DESC"
+    };
+    const data = req.data;
+    if (routeData.type === "PAGED" && "sortBy" in data) {
+      const sortOrder = orderOptions[data.sortOrder] || "ASC";
+      orderBy = `ORDER BY ${escapeColumnName(data.sortBy)} ${sortOrder}
+`;
+    } else if (routeData.orderBy) {
+      const sortOrder = orderOptions[routeData.orderBy.order] || "ASC";
+      orderBy = `ORDER BY ${escapeColumnName(routeData.orderBy.tableName)}.${escapeColumnName(routeData.orderBy.columnName)} ${sortOrder}
+`;
+    }
+    return orderBy;
+  }
+  generateWhereClause(req, where, routeData, sqlParams) {
+    let whereClause = "";
+    where.forEach((item, index) => {
+      if (index === 0) whereClause = "WHERE ";
+      if (item.custom) {
+        whereClause += this.replaceParamKeywords(item.custom, routeData, req, sqlParams);
+        return;
+      }
+      if (item.operator === void 0 || item.value === void 0 || item.columnName === void 0 || item.tableName === void 0)
+        throw new RsError(
+          "SCHEMA_ERROR",
+          `Invalid where clause in route ${routeData.name}, missing required fields if not custom`
+        );
+      let operator = item.operator;
+      if (operator === "LIKE") {
+        sqlParams[sqlParams.length - 1] = `%${sqlParams[sqlParams.length - 1]}%`;
+      } else if (operator === "STARTS WITH") {
+        operator = "LIKE";
+        sqlParams[sqlParams.length - 1] = `${sqlParams[sqlParams.length - 1]}%`;
+      } else if (operator === "ENDS WITH") {
+        operator = "LIKE";
+        sqlParams[sqlParams.length - 1] = `%${sqlParams[sqlParams.length - 1]}`;
+      }
+      const replacedValue = this.replaceParamKeywords(item.value, routeData, req, sqlParams);
+      const escapedValue = SQL`${replacedValue}`;
+      whereClause += `	${item.conjunction || ""} "${item.tableName}"."${item.columnName}" ${operator} ${["IN", "NOT IN"].includes(operator) ? `(${escapedValue})` : escapedValue}
+`;
+    });
+    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) => {
+        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];
+      });
+      statement = statement.replace(/#[a-zA-Z][a-zA-Z0-9_]+/g, (value) => {
+        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];
+      });
+      statement = filterSqlParser_default.parse(statement);
+      if (whereClause.startsWith("WHERE")) {
+        whereClause += ` AND (${statement})
+`;
+      } else {
+        whereClause += `WHERE ${statement}
+`;
+      }
+    }
+    return whereClause;
+  }
+};
+
+// src/restura/restura.ts
+var import_pg2 = require("pg");
+
+// src/restura/sql/PsqlPool.ts
+var import_pg = require("pg");
+var PsqlPool = class {
+  constructor(poolConfig) {
+    this.poolConfig = poolConfig;
+    this.pool = new import_pg.Pool(poolConfig);
+  }
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  async queryOne(query, options) {
+    const formattedQuery = questionMarksToOrderedParams(query);
+    try {
+      const response = await this.pool.query(formattedQuery, options);
+      return response.rows[0];
+    } catch (error) {
+      console.error(error, query, options);
+      if ((error == null ? void 0 : error.routine) === "_bt_check_unique") {
+        throw new RsError("DUPLICATE", error.message);
+      }
+      throw new RsError("DATABASE_ERROR", `${error.message}`);
+    }
+  }
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  async runQuery(query, options) {
+    const formattedQuery = questionMarksToOrderedParams(query);
+    const queryUpdated = query.replace(/[\t\n]/g, " ");
+    console.log(queryUpdated, options);
+    try {
+      const response = await this.pool.query(formattedQuery, options);
+      return response.rows;
+    } catch (error) {
+      console.error(error, query, options);
+      if ((error == null ? void 0 : error.routine) === "_bt_check_unique") {
+        throw new RsError("DUPLICATE", error.message);
+      }
+      throw new RsError("DATABASE_ERROR", `${error.message}`);
+    }
+  }
+};
+
 // src/restura/restura.ts
 var ResturaEngine = class {
   constructor() {
@@ -975,14 +1654,16 @@ var ResturaEngine = class {
       DELETE: []
     };
   }
-  // private customTypeValidation!: ValidationDictionary;
   /**
    * Initializes the Restura engine with the provided Express application.
    *
    * @param app - The Express application instance to initialize with Restura.
    * @returns A promise that resolves when the initialization is complete.
    */
-  async init(app, authenticationHandler) {
+  async init(app, authenticationHandler, psqlConnectionPool) {
+    this.psqlConnectionPool = psqlConnectionPool;
+    this.psqlEngine = new PsqlEngine(this.psqlConnectionPool);
+    setupPgReturnTypes();
     this.resturaConfig = import_internal2.config.validate("restura", resturaConfigSchema);
     this.authenticationHandler = authenticationHandler;
     app.use((0, import_compression.default)());
@@ -991,7 +1672,7 @@ var ResturaEngine = class {
     app.use((0, import_cookie_parser.default)());
     app.disable("x-powered-by");
     app.use("/", addApiResponseFunctions);
-    app.use("/api/", authenticateUser);
+    app.use("/api/", authenticateUser(this.authenticationHandler));
     app.use("/restura", this.resturaAuthentication);
     app.put(
       "/restura/v1/schema",
@@ -1007,7 +1688,7 @@ var ResturaEngine = class {
     app.get("/restura/v1/schema/types", this.getSchemaAndTypes);
     this.expressApp = app;
     await this.reloadEndpoints();
-    this.validateGeneratedTypesFolder();
+    await this.validateGeneratedTypesFolder();
     logger.info("Restura Engine Initialized");
   }
   /**
@@ -1046,7 +1727,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_fs.default.writeFileSync(
+    import_fs2.default.writeFileSync(
       outputFile,
       await apiGenerator(providedSchema, await this.generateHashForSchema(providedSchema))
     );
@@ -1059,7 +1740,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_fs.default.writeFileSync(
+    import_fs2.default.writeFileSync(
       outputFile,
       await modelGenerator(providedSchema, await this.generateHashForSchema(providedSchema))
     );
@@ -1071,12 +1752,12 @@ var ResturaEngine = class {
    * @throws {Error} If the schema file is missing or the schema is not valid.
    */
   async getLatestFileSystemSchema() {
-    if (!import_fs.default.existsSync(this.resturaConfig.schemaFilePath)) {
+    if (!import_fs2.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_fs.default.readFileSync(this.resturaConfig.schemaFilePath, { encoding: "utf8" });
-    const schema = import_core_utils4.ObjectUtils.safeParse(schemaFileData);
+    const schemaFileData = import_fs2.default.readFileSync(this.resturaConfig.schemaFilePath, { encoding: "utf8" });
+    const schema = import_core_utils6.ObjectUtils.safeParse(schemaFileData);
     const isValid = await isSchemaValid(schema);
     if (!isValid) {
       logger.error("Schema is not valid");
@@ -1096,9 +1777,9 @@ var ResturaEngine = class {
   async getHashes(providedSchema) {
     var _a, _b, _c, _d;
     const schemaHash = await this.generateHashForSchema(providedSchema);
-    const apiFile = import_fs.default.readFileSync(import_path.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"));
+    const apiFile = import_fs2.default.readFileSync(import_path2.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_fs.default.readFileSync(import_path.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"));
+    const modelFile = import_fs2.default.readFileSync(import_path2.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"));
     const modelCreatedSchemaHash = (_d = (_c = modelFile.toString().match(/\((.*)\)/)) == null ? void 0 : _c[1]) != null ? _d : "";
     return {
       schemaHash,
@@ -1108,6 +1789,7 @@ var ResturaEngine = class {
   }
   async reloadEndpoints() {
     this.schema = await this.getLatestFileSystemSchema();
+    this.customTypeValidation = customTypeValidationGenerator(this.schema);
     this.resturaRouter = express.Router();
     this.resetPublicEndpoints();
     let routeCount = 0;
@@ -1133,27 +1815,27 @@ var ResturaEngine = class {
     logger.info(`Restura loaded (${routeCount}) endpoint${routeCount > 1 ? "s" : ""}`);
   }
   async validateGeneratedTypesFolder() {
-    if (!import_fs.default.existsSync(this.resturaConfig.generatedTypesPath)) {
-      import_fs.default.mkdirSync(this.resturaConfig.generatedTypesPath, { recursive: true });
+    if (!import_fs2.default.existsSync(this.resturaConfig.generatedTypesPath)) {
+      import_fs2.default.mkdirSync(this.resturaConfig.generatedTypesPath, { recursive: true });
     }
-    const hasApiFile = import_fs.default.existsSync(import_path.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"));
-    const hasModelsFile = import_fs.default.existsSync(import_path.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"));
+    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"));
     if (!hasApiFile) {
-      await this.generateApiFromSchema(import_path.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
+      await this.generateApiFromSchema(import_path2.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
     }
     if (!hasModelsFile) {
       await this.generateModelFromSchema(
-        import_path.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
+        import_path2.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_path.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
+      await this.generateApiFromSchema(import_path2.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
     }
     if (hashes.schemaHash !== hashes.modelCreatedSchemaHash) {
       await this.generateModelFromSchema(
-        import_path.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
+        import_path2.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
         this.schema
       );
     }
@@ -1183,9 +1865,9 @@ var ResturaEngine = class {
     }
   }
   async updateTypes() {
-    await this.generateApiFromSchema(import_path.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
+    await this.generateApiFromSchema(import_path2.default.join(this.resturaConfig.generatedTypesPath, "api.d.ts"), this.schema);
     await this.generateModelFromSchema(
-      import_path.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
+      import_path2.default.join(this.resturaConfig.generatedTypesPath, "models.d.ts"),
       this.schema
     );
   }
@@ -1207,6 +1889,14 @@ var ResturaEngine = class {
     try {
       const routeData = this.getRouteData(req.method, req.baseUrl, req.path);
       this.validateAuthorization(req, routeData);
+      validateRequestParams(req, routeData, this.customTypeValidation);
+      const data = await this.psqlEngine.runQueryForRoute(
+        req,
+        routeData,
+        this.schema
+      );
+      if (routeData.type === "PAGED") res.sendNoWrap(data);
+      else res.sendData(data);
     } catch (e) {
       next(e);
     }
@@ -1266,7 +1956,7 @@ var ResturaEngine = class {
       printWidth: 120,
       singleQuote: true
     }));
-    import_fs.default.writeFileSync(this.resturaConfig.schemaFilePath, schemaPrettyStr);
+    import_fs2.default.writeFileSync(this.resturaConfig.schemaFilePath, schemaPrettyStr);
   }
   resetPublicEndpoints() {
     this.publicEndpoints = {
@@ -1283,13 +1973,13 @@ var ResturaEngine = class {
     if (!routeData.roles.includes(role))
       throw new RsError("UNAUTHORIZED", "Not authorized to access this endpoint");
   }
-  getRouteData(method, baseUrl, path2) {
+  getRouteData(method, baseUrl, path3) {
     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 === path2;
+      return item.method === method && item.path === path3;
     });
     if (!route) throw new RsError("NOT_FOUND", "Route not found");
     return route;
@@ -1316,9 +2006,21 @@ __decorateClass([
 __decorateClass([
   boundMethod
 ], ResturaEngine.prototype, "isCustomRoute", 1);
+var setupPgReturnTypes = () => {
+  const TIMESTAMPTZ_OID = 1184;
+  import_pg2.types.setTypeParser(TIMESTAMPTZ_OID, (val) => {
+    return val === null ? null : new Date(val).toISOString();
+  });
+  const BIGINT_OID = 20;
+  import_pg2.types.setTypeParser(BIGINT_OID, (val) => {
+    return val === null ? null : Number(val);
+  });
+};
+setupPgReturnTypes();
 var restura = new ResturaEngine();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PsqlPool,
   logger,
   restura
 });