@restura/core 1.0.5 → 1.0.7

package/dist/index.d.ts

@@ -480,9 +480,6 @@ declare const customRouteSchema: z.ZodObject<{
             value: z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodNumber, z.ZodArray<z.ZodNumber>]>;
         }, z.core.$strict>>;
     }, z.core.$strict>>>;
-    table: z.ZodUndefined;
-    joins: z.ZodUndefined;
-    assignments: z.ZodUndefined;
     fileUploadType: z.ZodOptional<z.ZodEnum<{
         SINGLE: "SINGLE";
         MULTIPLE: "MULTIPLE";
@@ -896,9 +893,6 @@ declare const resturaSchema: z.ZodObject<{
                     value: z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodNumber, z.ZodArray<z.ZodNumber>]>;
                 }, z.core.$strict>>;
             }, z.core.$strict>>>;
-            table: z.ZodUndefined;
-            joins: z.ZodUndefined;
-            assignments: z.ZodUndefined;
             fileUploadType: z.ZodOptional<z.ZodEnum<{
                 SINGLE: "SINGLE";
                 MULTIPLE: "MULTIPLE";

package/dist/index.js

@@ -1163,9 +1163,6 @@ var customRouteSchema = routeDataBaseSchema.extend({
   responseType: z3.union([z3.string(), z3.enum(["string", "number", "boolean"])]),
   requestType: z3.string().optional(),
   request: z3.array(requestDataSchema).optional(),
-  table: z3.undefined(),
-  joins: z3.undefined(),
-  assignments: z3.undefined(),
   fileUploadType: z3.enum(["SINGLE", "MULTIPLE"]).optional()
 }).strict();
 var postgresColumnNumericTypesSchema = z3.enum([
@@ -1403,7 +1400,11 @@ function requestValidator(req, routeData, validationSchema) {
     if (!routeData.requestType) throw new RsError("BAD_REQUEST", `No request type defined for custom request.`);
     const currentInterface = validationSchema[routeData.requestType];
     const validator = new jsonschema.Validator();
-    const executeValidation = validator.validate(req.data, currentInterface);
+    const strictSchema = {
+      ...currentInterface,
+      additionalProperties: false
+    };
+    const executeValidation = validator.validate(req.data, strictSchema);
     if (!executeValidation.valid) {
       throw new RsError(
         "BAD_REQUEST",
@@ -2419,7 +2420,17 @@ var PsqlEngine = class extends SqlEngine {
           item.name
         )}`;
       }
-      return `${item.type ? item.selector : escapeColumnName(item.selector)} AS ${escapeColumnName(item.name)}`;
+      if (item.type) {
+        const selectorWithReplacedKeywords = this.replaceParamKeywords(
+          item.selector,
+          routeData,
+          req,
+          sqlParams
+        );
+        return `${selectorWithReplacedKeywords} AS ${escapeColumnName(item.name)}`;
+      } else {
+        return `${escapeColumnName(item.selector)} AS ${escapeColumnName(item.name)}`;
+      }
     }).join(",\n	")}
 `;
     sqlStatement += `FROM "${routeData.table}"