Fix schema

Author: owjs3901

examples/vite/openapi.json

@@ -54,6 +54,55 @@
       }
     },
     "/users/{user_id}/posts": {
+      "delete": {
+        "summary": "Get user posts by ID",
+        "operationId": "getUserPostsById",
+        "parameters": [
+          {
+            "name": "user_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "default": 1
+            },
+            "description": "User ID"
+          },
+          {
+            "name": "post_id",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            },
+            "description": "Post ID"
+          },
+          {
+            "name": "required",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            },
+            "description": "Post ID"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "User details",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Post"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
       "get": {
         "summary": "Get user posts by ID",
         "operationId": "getUserPostsById",

examples/vite/src/App.tsx

@@ -16,6 +16,7 @@ function App() {
     api
       .get('/users/{userId}/posts', {
         params: { userId: 1 },
+        // query: { postId: 1 },
       })
       .then((res) => {
         console.log(res)

packages/generator/src/generate-interface.ts

@@ -3,7 +3,6 @@ import { toPascal } from '@devup-api/utils'
 import type { OpenAPIV3_1 } from 'openapi-types'
 import { convertCase } from './convert-case'
 import {
-  areAllPropertiesOptional,
   extractParameters,
   extractRequestBody,
   formatTypeValue,
@@ -299,14 +298,9 @@ export function generateInterface(
         const interfaceEntries = entries
           .map(([key, endpointValue]) => {
             const formattedValue = formatTypeValue(endpointValue, 2)
-            // Check if all properties in endpointValue are optional
-            const allOptional =
-              typeof endpointValue === 'object' &&
-              endpointValue !== null &&
-              !Array.isArray(endpointValue) &&
-              areAllPropertiesOptional(endpointValue as Record<string, unknown>)
-            const optionalMarker = allOptional ? '?' : ''
-            return `    ${wrapInterfaceKeyGuard(key)}${optionalMarker}: ${formattedValue}`
+            // Top-level keys in ApiStruct should never be optional
+            // Only params, query, body etc. can be optional if all their properties are optional
+            return `    ${wrapInterfaceKeyGuard(key)}: ${formattedValue}`
           })
           .join(';\n')
 

packages/generator/src/generate-schema.ts

@@ -281,9 +281,16 @@ export function formatType(
         return `${nextIndentStr}${key}: ${formattedValue}`
       }
 
+      // Check if value is an object (like params, query) with all optional properties
+      const valueAllOptional =
+        typeof value === 'object' &&
+        value !== null &&
+        !Array.isArray(value) &&
+        areAllPropertiesOptional(value as Record<string, unknown>)
+      const optionalMarker = valueAllOptional ? '?' : ''
+
       const formattedValue = formatTypeValue(value, nextIndent)
-      // Key already has '?' if it's optional (from getTypeFromSchema), keep it as is
-      return `${nextIndentStr}${key}: ${formattedValue}`
+      return `${nextIndentStr}${key}${optionalMarker}: ${formattedValue}`
     })
     .join(';\n')