@restura/core 1.9.0 → 1.9.2

package/dist/index.d.ts

@@ -1130,6 +1130,10 @@ declare class PsqlEngine extends SqlEngine {
     private readonly INITIAL_RECONNECT_DELAY;
     constructor(psqlConnectionPool: PsqlPool, shouldListenForDbTriggers?: boolean, scratchDatabaseSuffix?: string);
     close(): Promise<void>;
+    /**
+     * Setup the return types for the PostgreSQL connection.
+     * For example return DATE as a string instead of a Date object and BIGINT as a number instead of a string.
+     */
     private setupPgReturnTypes;
     private reconnectTriggerClient;
     private listenForDbTriggers;

package/dist/index.js

@@ -1743,6 +1743,32 @@ function deepResolveSchemaRefs(schema, definitions, seen = /* @__PURE__ */ new S
 function resolveSchemaRef(schema, definitions) {
   return deepResolveSchemaRefs(schema, definitions);
 }
+function summarizeSubSchema(sub) {
+  if (!sub || typeof sub !== "object") return "unknown";
+  if (sub.type === "object" && sub.properties && typeof sub.properties === "object") {
+    const props = sub.properties;
+    const parts = [];
+    if (props.type && props.type.enum) {
+      const enumVal = props.type.enum[0];
+      parts.push(`type: '${String(enumVal)}'`);
+    }
+    for (const key of Object.keys(props)) {
+      if (key === "type") continue;
+      parts.push(key);
+    }
+    return parts.length ? `{ ${parts.join(", ")} }` : "object";
+  }
+  return "object";
+}
+function formatValidationErrorMessage(message, errSchema) {
+  const schema = errSchema;
+  const options = schema?.oneOf ?? schema?.anyOf;
+  if (options && Array.isArray(options) && (message.includes("subschema") || message.includes("any of") || message.includes("exactly one from"))) {
+    const summaries = options.map((sub, i) => `(${i + 1}) ${summarizeSubSchema(sub)}`);
+    return `must be one of: ${summaries.join(" or ")}`;
+  }
+  return message;
+}
 function requestValidator(req, routeData, customValidationSchema, standardValidationSchema) {
   const routeKey = `${routeData.method}:${routeData.path}`;
   const isCustom = routeData.type === "CUSTOM_ONE" || routeData.type === "CUSTOM_ARRAY" || routeData.type === "CUSTOM_PAGED";
@@ -1780,18 +1806,14 @@ function requestValidator(req, routeData, customValidationSchema, standardValida
   if (!executeValidation.valid) {
     const errorMessages = executeValidation.errors.map((err) => {
       const property = err.property.replace("instance.", "");
-      return `${property}: ${err.message}`;
+      const message = formatValidationErrorMessage(err.message, err.schema);
+      return `${property}: ${message}`;
     }).join(", ");
     throw new RsError("BAD_REQUEST", `Request validation failed: ${errorMessages}`);
   }
 }
 function getRequestData(req, schema) {
-  let body = "";
-  if (req.method === "GET" || req.method === "DELETE") {
-    body = "query";
-  } else {
-    body = "body";
-  }
+  const body = req.method === "GET" || req.method === "DELETE" ? "query" : "body";
   const bodyData = req[body];
   if (bodyData && body === "query" && schema) {
     return coerceBySchema(bodyData, schema);
@@ -1830,6 +1852,16 @@ function coerceValue(value, propertySchema) {
   if (value === "") {
     return targetType === "string" ? "" : void 0;
   }
+  const isRefOrUnion = propertySchema.$ref != null || Array.isArray(propertySchema.oneOf) || Array.isArray(propertySchema.anyOf);
+  if (isRefOrUnion && typeof value === "string") {
+    const trimmed = value.trim();
+    if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+      try {
+        return JSON.parse(value);
+      } catch {
+      }
+    }
+  }
   switch (targetType) {
     case "number":
     case "integer":
@@ -2576,15 +2608,25 @@ var PsqlEngine = class extends SqlEngine {
       await this.triggerClient.end();
     }
   }
+  /**
+   * Setup the return types for the PostgreSQL connection.
+   * For example return DATE as a string instead of a Date object and BIGINT as a number instead of a string.
+   */
   setupPgReturnTypes() {
-    const TIMESTAMPTZ_OID = 1184;
-    types.setTypeParser(TIMESTAMPTZ_OID, (val) => {
-      return val === null ? null : new Date(val).toISOString();
-    });
-    const BIGINT_OID = 20;
-    types.setTypeParser(BIGINT_OID, (val) => {
-      return val === null ? null : Number(val);
-    });
+    const PG_TYPE_OID = {
+      BIGINT: 20,
+      DATE: 1082,
+      TIME: 1083,
+      TIMESTAMP: 1114,
+      TIMESTAMPTZ: 1184,
+      TIMETZ: 1266
+    };
+    types.setTypeParser(PG_TYPE_OID.BIGINT, (val) => val === null ? null : Number(val));
+    types.setTypeParser(PG_TYPE_OID.DATE, (val) => val);
+    types.setTypeParser(PG_TYPE_OID.TIME, (val) => val);
+    types.setTypeParser(PG_TYPE_OID.TIMETZ, (val) => val);
+    types.setTypeParser(PG_TYPE_OID.TIMESTAMP, (val) => val === null ? null : new Date(val).toISOString());
+    types.setTypeParser(PG_TYPE_OID.TIMESTAMPTZ, (val) => val === null ? null : new Date(val).toISOString());
   }
   async reconnectTriggerClient() {
     if (this.reconnectAttempts >= this.MAX_RECONNECT_ATTEMPTS) {