@restura/core 0.1.0-alpha.10 → 0.1.0-alpha.11

package/dist/index.mjs

@@ -494,7 +494,7 @@ var ApiTree = class _ApiTree {
             break;
         }
       }
-      return `'${p.name}'${p.required ? "" : "?"}:${requestType}`;
+      return `'${p.name}'${p.required ? "" : "?"}:${requestType}${p.isNullable ? " | null" : ""}`;
     }).join(";\n")}${ObjectUtils.isArrayWithData(route.request) ? ";" : ""}
 		 `;
     modelString += `}`;
@@ -518,18 +518,18 @@ var ApiTree = class _ApiTree {
     return nested;
   }
   getNameAndType(p) {
-    let responseType = "any", optional = false, array = false;
+    let responseType = "any", isNullable = false, array = false;
     if (p.selector) {
-      ({ responseType, optional } = this.getTypeFromTable(p.selector, p.name));
+      ({ responseType, isNullable } = this.getTypeFromTable(p.selector, p.name));
     } else if (p.subquery) {
       responseType = this.getFields(p.subquery.properties);
       array = true;
     }
-    return `${p.name}${optional ? "?" : ""}:${responseType}${array ? "[]" : ""}`;
+    return `${p.name}:${responseType}${array ? "[]" : ""}${isNullable ? " | null" : ""}`;
   }
   getTypeFromTable(selector, name) {
     const path4 = selector.split(".");
-    if (path4.length === 0 || path4.length > 2 || path4[0] === "") return { responseType: "any", optional: false };
+    if (path4.length === 0 || path4.length > 2 || path4[0] === "") return { responseType: "any", isNullable: 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);
@@ -539,10 +539,10 @@ var ApiTree = class _ApiTree {
       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 { responseType: "any", optional: false };
+    if (!table || !column) return { responseType: "any", isNullable: false };
     return {
       responseType: SqlUtils.convertDatabaseTypeToTypescript(column.type, column.value),
-      optional: column.roles.length > 0 || column.isNullable
+      isNullable: column.roles.length > 0 || column.isNullable
     };
   }
 };
@@ -748,6 +748,7 @@ var joinDataSchema = z3.object({
 var requestDataSchema = z3.object({
   name: z3.string(),
   required: z3.boolean(),
+  isNullable: z3.boolean().optional().default(false),
   validator: z3.array(validatorDataSchema)
 }).strict();
 var responseDataSchema = z3.object({
@@ -1023,6 +1024,7 @@ function validateRequestParams(req, routeData, validationSchema) {
   });
 }
 function validateRequestSingleParam(requestValue, requestParam) {
+  if (requestParam.isNullable && requestValue === null) return;
   requestParam.validator.forEach((validator) => {
     switch (validator.type) {
       case "TYPE_CHECK":