fix: relax schema for void responses

mnahkies · Dec 22, 2024 · 780ab21 · 780ab21
1 parent 4189b62
commit 780ab21
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/e2e/src/generated/client/axios/client.ts b/e2e/src/generated/client/axios/client.ts
diff --git a/e2e/src/generated/client/fetch/client.ts b/e2e/src/generated/client/fetch/client.ts
diff --git a/e2e/src/index.axios.spec.ts b/e2e/src/index.axios.spec.ts
@@ -201,8 +201,10 @@ describe("e2e - typescript-axios client", () => {
 
   describe("GET /responses/empty", () => {
     it("returns undefined", async () => {
-      const {data} = await client.getResponsesEmpty()
-      expect(data).toBeUndefined()
+      const {status, data} = await client.getResponsesEmpty()
+
+      expect(status).toBe(204)
+      expect(data).toEqual("")
     })
   })
 })
diff --git a/e2e/src/index.fetch.spec.ts b/e2e/src/index.fetch.spec.ts
@@ -229,8 +229,8 @@ describe("e2e - typescript-fetch client", () => {
     it("returns undefined", async () => {
       const res = await client.getResponsesEmpty()
 
-      const body = await res.json()
-      expect(body).toBeUndefined()
+      expect(res.status).toBe(204)
+      await expect(res.json()).rejects.toThrow("Unexpected end of JSON input")
     })
   })
 })
diff --git a/packages/openapi-code-generator/src/typescript/common/client-operation-builder.ts b/packages/openapi-code-generator/src/typescript/common/client-operation-builder.ts
@@ -128,7 +128,7 @@ export class ClientOperationBuilder {
           acc.defaultResponse = {
             schema: content
               ? schemaBuilder.fromModel(content.schema, true, true)
-              : schemaBuilder.void(),
+              : schemaBuilder.any(),
             type: content ? models.schemaObjectToType(content.schema) : "void",
           }
         } else {
@@ -138,7 +138,7 @@ export class ClientOperationBuilder {
             type: content ? models.schemaObjectToType(content.schema) : "void",
             schema: content
               ? schemaBuilder.fromModel(content.schema, true, true)
-              : schemaBuilder.void(),
+              : schemaBuilder.any(),
           })
         }
 

diff --git a/...s/openapi-code-generator/src/typescript/common/schema-builders/abstract-schema-builder.ts b/...s/openapi-code-generator/src/typescript/common/schema-builders/abstract-schema-builder.ts
@@ -404,7 +404,7 @@ export abstract class AbstractSchemaBuilder<
 
   protected abstract boolean(): string
 
-  protected abstract any(): string
+  public abstract any(): string
 
   protected abstract unknown(): string
 

diff --git a/packages/openapi-code-generator/src/typescript/common/schema-builders/joi-schema-builder.ts b/packages/openapi-code-generator/src/typescript/common/schema-builders/joi-schema-builder.ts
@@ -259,7 +259,7 @@ export class JoiBuilder extends AbstractSchemaBuilder<
       .join(".")
   }
 
-  protected any(): string {
+  public any(): string {
     return [joi, "any()"].filter(isDefined).join(".")
   }
 

diff --git a/packages/openapi-code-generator/src/typescript/common/schema-builders/zod-schema-builder.ts b/packages/openapi-code-generator/src/typescript/common/schema-builders/zod-schema-builder.ts
@@ -269,7 +269,7 @@ export class ZodBuilder extends AbstractSchemaBuilder<
     return this.addStaticSchema("PermissiveBoolean")
   }
 
-  protected any(): string {
+  public any(): string {
     return [zod, "any()"].filter(isDefined).join(".")
   }