@orval/core 7.1.1 → 7.2.0

package/dist/index.js

@@ -47253,21 +47253,39 @@ var resolveSchemaPropertiesToFormData = ({
           );
           if (itemSchema.type === "object" || itemSchema.type === "array") {
             valueStr = "JSON.stringify(value)";
-          } else if (itemSchema.type === "number" || itemSchema.type === "integer" || itemSchema.type === "boolean") {
+          } else if (itemSchema.type === "number" || itemSchema.type?.includes("number") || itemSchema.type === "integer" || itemSchema.type?.includes("integer") || itemSchema.type === "boolean" || itemSchema.type?.includes("boolean")) {
             valueStr = "value.toString()";
           }
         }
         formDataValue = `${valueKey}.forEach(value => ${variableName}.append('${key}', ${valueStr}));
 `;
-      } else if (property.type === "number" || property.type === "integer" || property.type === "boolean") {
+      } else if (property.type === "number" || property.type?.includes("number") || property.type === "integer" || property.type?.includes("integer") || property.type === "boolean" || property.type?.includes("boolean")) {
         formDataValue = `${variableName}.append('${key}', ${nonOptionalValueKey}.toString())
 `;
       } else {
         formDataValue = `${variableName}.append('${key}', ${nonOptionalValueKey})
 `;
       }
+      let existSubSchemaNullable = false;
+      if (property.allOf || property.anyOf || property.oneOf) {
+        const combine = property.allOf || property.anyOf || property.oneOf;
+        const subSchemas = combine?.map(
+          (c2) => resolveObject({ schema: c2, combined: true, context })
+        );
+        if (subSchemas?.some((subSchema) => {
+          return ["number", "integer", "boolean"].includes(subSchema.type);
+        })) {
+          formDataValue = `${variableName}.append('${key}', ${nonOptionalValueKey}.toString())
+`;
+        }
+        if (subSchemas?.some((subSchema) => {
+          return subSchema.type === "null";
+        })) {
+          existSubSchemaNullable = true;
+        }
+      }
       const isRequired = schema.required?.includes(key) && !isRequestBodyOptional;
-      if (property.nullable) {
+      if (property.nullable || property.type?.includes("null") || existSubSchemaNullable) {
         if (isRequired) {
           return acc + `if(${valueKey} !== null) {
  ${formDataValue} }
@@ -47556,7 +47574,7 @@ var getScalar = ({
         isEnum = true;
       }
       const itemWithConst2 = item;
-      if (itemWithConst2.const) {
+      if (itemWithConst2.const !== void 0) {
         value2 = itemWithConst2.const;
       }
       return {
@@ -47574,7 +47592,7 @@ var getScalar = ({
     case "boolean":
       let value = "boolean";
       const itemWithConst = item;
-      if (itemWithConst.const) {
+      if (itemWithConst.const !== void 0) {
         value = itemWithConst.const;
       }
       return {
@@ -47725,6 +47743,16 @@ var combineSchemas = ({
       if (propName && acc.schemas.length) {
         propName = propName + pascal(getNumberWord(acc.schemas.length + 1));
       }
+      if (separator2 === "allOf" && schema.required) {
+        if (isSchema(subSchema) && subSchema.required) {
+          subSchema = {
+            ...subSchema,
+            required: [...schema.required, ...subSchema.required]
+          };
+        } else {
+          subSchema = { ...subSchema, required: schema.required };
+        }
+      }
       const resolvedValue2 = resolveObject({
         schema: subSchema,
         propName,