Output empty object response body as {} type instead of void type

aspida.config.js

@@ -64,6 +64,11 @@ module.exports = [
     outputEachDir: true,
     openapi: { inputFile: 'samples/allOf-required.yml' },
   },
+  {
+    input: 'samples/empty-object-response-body',
+    outputEachDir: true,
+    openapi: { inputFile: 'samples/empty-object-response-body.yml' },
+  },
   // {
   //   input: 'samples/path-at-mark',
   //   outputEachDir: true,

samples/empty-object-response-body.yml

@@ -0,0 +1,34 @@
+openapi: 3.0.0
+info:
+  version: 1.0.0
+  title: Sample
+paths:
+  /without-additional-properties:
+    delete:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+  /with-additional-properties-true:
+    delete:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                additionalProperties: true
+  /with-additional-properties-false:
+    delete:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                additionalProperties: false

samples/empty-object-response-body/$api.ts

@@ -0,0 +1,57 @@
+import type { AspidaClient, BasicHeaders } from 'aspida';
+import type { Methods as Methods0 } from './with-additional-properties-false';
+import type { Methods as Methods1 } from './with-additional-properties-true';
+import type { Methods as Methods2 } from './without-additional-properties';
+
+const api = <T>({ baseURL, fetch }: AspidaClient<T>) => {
+  const prefix = (baseURL === undefined ? '' : baseURL).replace(/\/$/, '');
+  const PATH0 = '/with-additional-properties-false';
+  const PATH1 = '/with-additional-properties-true';
+  const PATH2 = '/without-additional-properties';
+  const DELETE = 'DELETE';
+
+  return {
+    with_additional_properties_false: {
+      /**
+       * @returns OK
+       */
+      delete: (option?: { config?: T | undefined } | undefined) =>
+        fetch<Methods0['delete']['resBody'], BasicHeaders, Methods0['delete']['status']>(prefix, PATH0, DELETE, option).json(),
+      /**
+       * @returns OK
+       */
+      $delete: (option?: { config?: T | undefined } | undefined) =>
+        fetch<Methods0['delete']['resBody'], BasicHeaders, Methods0['delete']['status']>(prefix, PATH0, DELETE, option).json().then(r => r.body),
+      $path: () => `${prefix}${PATH0}`,
+    },
+    with_additional_properties_true: {
+      /**
+       * @returns OK
+       */
+      delete: (option?: { config?: T | undefined } | undefined) =>
+        fetch<Methods1['delete']['resBody'], BasicHeaders, Methods1['delete']['status']>(prefix, PATH1, DELETE, option).json(),
+      /**
+       * @returns OK
+       */
+      $delete: (option?: { config?: T | undefined } | undefined) =>
+        fetch<Methods1['delete']['resBody'], BasicHeaders, Methods1['delete']['status']>(prefix, PATH1, DELETE, option).json().then(r => r.body),
+      $path: () => `${prefix}${PATH1}`,
+    },
+    without_additional_properties: {
+      /**
+       * @returns OK
+       */
+      delete: (option?: { config?: T | undefined } | undefined) =>
+        fetch<Methods2['delete']['resBody'], BasicHeaders, Methods2['delete']['status']>(prefix, PATH2, DELETE, option).json(),
+      /**
+       * @returns OK
+       */
+      $delete: (option?: { config?: T | undefined } | undefined) =>
+        fetch<Methods2['delete']['resBody'], BasicHeaders, Methods2['delete']['status']>(prefix, PATH2, DELETE, option).json().then(r => r.body),
+      $path: () => `${prefix}${PATH2}`,
+    },
+  };
+};
+
+export type ApiInstance = ReturnType<typeof api>;
+export default api;

samples/empty-object-response-body/with-additional-properties-false/$api.ts

@@ -0,0 +1,25 @@
+import type { AspidaClient, BasicHeaders } from 'aspida';
+import type { Methods as Methods0 } from '.';
+
+const api = <T>({ baseURL, fetch }: AspidaClient<T>) => {
+  const prefix = (baseURL === undefined ? '' : baseURL).replace(/\/$/, '');
+  const PATH0 = '/with-additional-properties-false';
+  const DELETE = 'DELETE';
+
+  return {
+    /**
+     * @returns OK
+     */
+    delete: (option?: { config?: T | undefined } | undefined) =>
+      fetch<Methods0['delete']['resBody'], BasicHeaders, Methods0['delete']['status']>(prefix, PATH0, DELETE, option).json(),
+    /**
+     * @returns OK
+     */
+    $delete: (option?: { config?: T | undefined } | undefined) =>
+      fetch<Methods0['delete']['resBody'], BasicHeaders, Methods0['delete']['status']>(prefix, PATH0, DELETE, option).json().then(r => r.body),
+    $path: () => `${prefix}${PATH0}`,
+  };
+};
+
+export type ApiInstance = ReturnType<typeof api>;
+export default api;

samples/empty-object-response-body/with-additional-properties-false/index.ts

@@ -0,0 +1,10 @@
+/* eslint-disable */
+export type Methods = {
+  delete: {
+    status: 200
+
+    /** OK */
+    resBody: {
+    }
+  }
+}

samples/empty-object-response-body/with-additional-properties-true/$api.ts

@@ -0,0 +1,25 @@
+import type { AspidaClient, BasicHeaders } from 'aspida';
+import type { Methods as Methods0 } from '.';
+
+const api = <T>({ baseURL, fetch }: AspidaClient<T>) => {
+  const prefix = (baseURL === undefined ? '' : baseURL).replace(/\/$/, '');
+  const PATH0 = '/with-additional-properties-true';
+  const DELETE = 'DELETE';
+
+  return {
+    /**
+     * @returns OK
+     */
+    delete: (option?: { config?: T | undefined } | undefined) =>
+      fetch<Methods0['delete']['resBody'], BasicHeaders, Methods0['delete']['status']>(prefix, PATH0, DELETE, option).json(),
+    /**
+     * @returns OK
+     */
+    $delete: (option?: { config?: T | undefined } | undefined) =>
+      fetch<Methods0['delete']['resBody'], BasicHeaders, Methods0['delete']['status']>(prefix, PATH0, DELETE, option).json().then(r => r.body),
+    $path: () => `${prefix}${PATH0}`,
+  };
+};
+
+export type ApiInstance = ReturnType<typeof api>;
+export default api;

samples/empty-object-response-body/with-additional-properties-true/index.ts

@@ -0,0 +1,11 @@
+/* eslint-disable */
+export type Methods = {
+  delete: {
+    status: 200
+
+    /** OK */
+    resBody: {
+      [key: string]: any
+    }
+  }
+}

samples/empty-object-response-body/without-additional-properties/$api.ts

@@ -0,0 +1,25 @@
+import type { AspidaClient, BasicHeaders } from 'aspida';
+import type { Methods as Methods0 } from '.';
+
+const api = <T>({ baseURL, fetch }: AspidaClient<T>) => {
+  const prefix = (baseURL === undefined ? '' : baseURL).replace(/\/$/, '');
+  const PATH0 = '/without-additional-properties';
+  const DELETE = 'DELETE';
+
+  return {
+    /**
+     * @returns OK
+     */
+    delete: (option?: { config?: T | undefined } | undefined) =>
+      fetch<Methods0['delete']['resBody'], BasicHeaders, Methods0['delete']['status']>(prefix, PATH0, DELETE, option).json(),
+    /**
+     * @returns OK
+     */
+    $delete: (option?: { config?: T | undefined } | undefined) =>
+      fetch<Methods0['delete']['resBody'], BasicHeaders, Methods0['delete']['status']>(prefix, PATH0, DELETE, option).json().then(r => r.body),
+    $path: () => `${prefix}${PATH0}`,
+  };
+};
+
+export type ApiInstance = ReturnType<typeof api>;
+export default api;

samples/empty-object-response-body/without-additional-properties/index.ts

@@ -0,0 +1,10 @@
+/* eslint-disable */
+export type Methods = {
+  delete: {
+    status: 200
+
+    /** OK */
+    resBody: {
+    }
+  }
+}

samples/openapi/api/v3/channels/_channelId@string/chats/_chatId@string/items/index.ts

@@ -16,6 +16,8 @@ export type Methods = {
     resBody: {
       limit: number
       offset: number
+      data: {
+      }[]
     }
   }
 

samples/openapi/api/v3/chats/_chatId@string/items/index.ts

@@ -18,6 +18,8 @@ export type Methods = {
     resBody: {
       limit: number
       offset: number
+      data: {
+      }[]
     }
   }
 

src/builderUtils/converters.ts

@@ -123,11 +123,11 @@ export const schema2value = (
     } else if (isArraySchema(schema)) {
       isArray = true;
       value = schema2value(schema.items);
-    } else if (schema.properties || schema.additionalProperties) {
+    } else if (schema.type === 'object' || schema.properties || 'additionalProperties' in schema) {
       value = object2value(schema);
     } else if (schema.format === 'binary') {
       value = isResponse ? 'Blob' : BINARY_TYPE;
-    } else if (schema.type !== 'object') {
+    } else {
       value = schema.type
         ? {
             integer: 'number',