@restura/core 1.9.1 → 1.10.0

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":
@@ -2498,7 +2530,15 @@ NullOperator
     / "null"i { return function(col) { return formatColumn(col) + ' IS NULL'; }; }
 
 OperatorWithValue
-    = "in"i _ "," _ val:CastedValueWithPipes { return function(col) { return buildInClauseWithCast(formatColumn(col), val.value, val.cast); }; }
+    = "in"i _ "," _ vals:InValueList cast:TypeCast? { return function(col) { 
+        var formattedCol = formatColumn(col);
+        var literals = vals.map(function(v) {
+            var unescaped = unescapeValue(v);
+            var formatted = formatValue(unescaped);
+            return cast ? formatted + '::' + cast : formatted;
+        });
+        return formattedCol + ' IN (' + literals.join(', ') + ')';
+    }; }
     / "ne"i _ "," _ val:CastedValue { return function(col) { return formatColumn(col) + ' <> ' + formatValueWithCast(val.value, val.cast); }; }
     / "gte"i _ "," _ val:CastedValue { return function(col) { return formatColumn(col) + ' >= ' + formatValueWithCast(val.value, val.cast); }; }
     / "gt"i _ "," _ val:CastedValue { return function(col) { return formatColumn(col) + ' > ' + formatValueWithCast(val.value, val.cast); }; }
@@ -2508,6 +2548,26 @@ OperatorWithValue
     / "sw"i _ "," _ val:CastedValue { return function(col) { var formatted = format.literal(unescapeValue(val.value) + '%'); return formatColumn(col) + ' ILIKE ' + (val.cast ? formatted + '::' + val.cast : formatted); }; }
     / "ew"i _ "," _ val:CastedValue { return function(col) { var formatted = format.literal('%' + unescapeValue(val.value)); return formatColumn(col) + ' ILIKE ' + (val.cast ? formatted + '::' + val.cast : formatted); }; }
 
+InValueList
+    = first:InValue rest:("|" InValue)* {
+        var values = [first];
+        for (var i = 0; i < rest.length; i++) {
+            values.push(rest[i][1]);
+        }
+        return values;
+    }
+
+InValue
+    = QuotedString
+    / chars:InValueChar+ { return chars.join(''); }
+
+InValueChar
+    = "\\\\\\\\" { return '\\\\\\\\'; }
+    / "\\\\," { return '\\\\,'; }
+    / "\\\\|" { return '\\\\|'; }
+    / [a-zA-Z0-9_\\-!#/@$%^&*+=<>?~.;'" ]
+    / c:":" !":"  { return c; }
+
 CastedValue
     = val:Value cast:TypeCast? { return { value: val, cast: cast }; }
 
@@ -2518,24 +2578,40 @@ TypeCast
     = "::" type:("timestamptz"i / "timestamp"i / "boolean"i / "numeric"i / "bigint"i / "text"i / "date"i / "int"i)
         { return type.toLowerCase(); }
 
+QuotedString
+    = '"' chars:DoubleQuotedChar* '"' { return chars.join(''); }
+    / "'" chars:SingleQuotedChar* "'" { return chars.join(''); }
+
+DoubleQuotedChar
+    = '\\\\"' { return '"'; }
+    / '\\\\\\\\' { return '\\\\'; }
+    / [^"\\\\]
+
+SingleQuotedChar
+    = "\\\\'" { return "'"; }
+    / '\\\\\\\\' { return '\\\\'; }
+    / [^'\\\\]
+
 Value
-    = chars:ValueChar+ { return chars.join(''); }
+    = QuotedString
+    / chars:ValueChar+ { return chars.join(''); }
 
 ValueChar
     = "\\\\\\\\" { return '\\\\\\\\'; }
     / "\\\\," { return '\\\\,'; }
     / "\\\\|" { return '\\\\|'; }
-    / [^,()\\\\|:]
+    / [a-zA-Z0-9_\\-!#/@$%^&*+=<>?~.;'" ]
     / c:":" !":"  { return c; }
 
 ValueWithPipes
-    = chars:ValueWithPipesChar+ { return chars.join(''); }
+    = QuotedString
+    / chars:ValueWithPipesChar+ { return chars.join(''); }
 
 ValueWithPipesChar
     = "\\\\\\\\" { return '\\\\\\\\'; }
     / "\\\\," { return '\\\\,'; }
     / "\\\\|" { return '\\\\|'; }
-    / [^,()\\\\:]
+    / [a-zA-Z0-9_\\-!#/@$%^&*+=<>?~.;'" |]
     / c:":" !":"  { return c; }
 `;
 var fullGrammar = entryGrammar + oldGrammar + newGrammar;