fix: add nullable condition to multipart formdata for openapi3.1 (#1646)

* fix: add nullable condition to multipart formdata for openapi3.1

* fix: add multipart form-data nullable test case

* fix: multipart formdata type must be string

* fix: test case and sub schema bugfix

* chore: prettier format

* chore: pluralize variable name

packages/core/src/getters/res-req-types.ts

@@ -417,27 +417,60 @@ const resolveSchemaPropertiesToFormData = ({
             valueStr = 'JSON.stringify(value)';
           } else if (
             itemSchema.type === 'number' ||
+            itemSchema.type?.includes('number') ||
             itemSchema.type === 'integer' ||
-            itemSchema.type === 'boolean'
+            itemSchema.type?.includes('integer') ||
+            itemSchema.type === 'boolean' ||
+            itemSchema.type?.includes('boolean')
           ) {
             valueStr = 'value.toString()';
           }
         }
         formDataValue = `${valueKey}.forEach(value => ${variableName}.append('${key}', ${valueStr}));\n`;
       } else if (
         property.type === 'number' ||
+        property.type?.includes('number') ||
         property.type === 'integer' ||
-        property.type === 'boolean'
+        property.type?.includes('integer') ||
+        property.type === 'boolean' ||
+        property.type?.includes('boolean')
       ) {
         formDataValue = `${variableName}.append('${key}', ${nonOptionalValueKey}.toString())\n`;
       } else {
         formDataValue = `${variableName}.append('${key}', ${nonOptionalValueKey})\n`;
       }
 
+      let existSubSchemaNullable = false;
+      if (property.allOf || property.anyOf || property.oneOf) {
+        const combine = property.allOf || property.anyOf || property.oneOf;
+        const subSchemas = combine?.map((c) =>
+          resolveObject({ schema: c, combined: true, context: context }),
+        );
+        if (
+          subSchemas?.some((subSchema) => {
+            return ['number', 'integer', 'boolean'].includes(subSchema.type);
+          })
+        ) {
+          formDataValue = `${variableName}.append('${key}', ${nonOptionalValueKey}.toString())\n`;
+        }
+
+        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) {\n ${formDataValue} }\n`;
         }

tests/specifications/null-type.yaml

@@ -37,6 +37,24 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/NullableObject'
+  /nullable-with-multipart-form-data:
+    post:
+      tags:
+        - nullables
+      summary: Nullable with multipart/form-data request
+      operationId: NullableWithMultipartFormRequest
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/NullableObject'
+      responses:
+        200:
+          description: Successful Operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/NullableObject'
 components:
   schemas:
     NullableObject:
@@ -54,6 +72,10 @@ components:
           oneOf:
             - type: 'string'
             - type: 'null'
+        is_active:
+          type:
+            - 'boolean'
+            - 'null'
     NullEnum:
       nullable: true
       enum: