fix(hono): validator return parsed value (#1339)

* fix(hono): validator return parsed value * fix(format): check * fix(format): check
orval-labs · Apr 30, 2024 · 6d41605 · 6d41605
1 parent 3d965f4
commit 6d41605
Show file tree

Hide file tree

Showing 13 changed files with 252 additions and 278 deletions.
diff --git a/packages/hono/src/index.ts b/packages/hono/src/index.ts
@@ -843,6 +843,8 @@ export const zValidator =
             'Content-Type': 'application/json',
           },
         });
+      } else {
+        c.res = new Response(JSON.stringify(result.data), c.res);
       }
     }
   };

diff --git a/packages/orval/src/utils/options.ts b/packages/orval/src/utils/options.ts
@@ -215,11 +215,11 @@ export const normalizeOptions = async (
           useMutation: outputOptions.override?.query?.useMutation ?? true,
           signal: outputOptions.override?.query?.signal ?? true,
           shouldExportMutatorHooks:
-              outputOptions.override?.query?.shouldExportMutatorHooks ?? true,
+            outputOptions.override?.query?.shouldExportMutatorHooks ?? true,
           shouldExportHttpClient:
-              outputOptions.override?.query?.shouldExportHttpClient ?? true,
+            outputOptions.override?.query?.shouldExportHttpClient ?? true,
           shouldExportQueryKey:
-              outputOptions.override?.query?.shouldExportQueryKey ?? true,
+            outputOptions.override?.query?.shouldExportQueryKey ?? true,
           ...normalizeQueryOptions(outputOptions.override?.query, workspace),
         },
         zod: {

diff --git a/packages/zod/src/index.ts b/packages/zod/src/index.ts
@@ -161,8 +161,8 @@ export const generateZodValidationSchemaDefinition = (
         const separator = schema.allOf
           ? 'allOf'
           : schema.oneOf
-          ? 'oneOf'
-          : 'anyOf';
+            ? 'oneOf'
+            : 'anyOf';
 
         const schemas = (schema.allOf ?? schema.oneOf ?? schema.anyOf) as (
           | SchemaObject

diff --git a/samples/basic/api/endpoints/petstoreFromFileSpec.ts b/samples/basic/api/endpoints/petstoreFromFileSpec.ts
@@ -4,21 +4,18 @@
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
  */
-import axios from 'axios'
-import type {
-  AxiosRequestConfig,
-  AxiosResponse
-} from 'axios'
+import axios from 'axios';
+import type { AxiosRequestConfig, AxiosResponse } from 'axios';
 export type CreatePetsBody = {
   name: string;
   tag: string;
 };
 
 export type ListPetsParams = {
-/**
- * How many items to return at one time (max 100)
- */
-limit?: string;
+  /**
+   * How many items to return at one time (max 100)
+   */
+  limit?: string;
 };
 
 export interface Error {
@@ -54,46 +51,39 @@ export interface Pet {
  */
 export type Pets = Pet[];
 
-
-
-
-
-  /**
+/**
  * @summary List all pets
  */
 export const listPets = <TData = AxiosResponse<Pets>>(
-    params?: ListPetsParams, options?: AxiosRequestConfig
- ): Promise<TData> => {
-    return axios.get(
-      `/pets`,{
+  params?: ListPetsParams,
+  options?: AxiosRequestConfig,
+): Promise<TData> => {
+  return axios.get(`/pets`, {
     ...options,
-        params: {...params, ...options?.params},}
-    );
-  }
+    params: { ...params, ...options?.params },
+  });
+};
 
 /**
  * @summary Create a pet
  */
 export const createPets = <TData = AxiosResponse<void>>(
-    createPetsBody: CreatePetsBody, options?: AxiosRequestConfig
- ): Promise<TData> => {
-    return axios.post(
-      `/pets`,
-      createPetsBody,options
-    );
-  }
+  createPetsBody: CreatePetsBody,
+  options?: AxiosRequestConfig,
+): Promise<TData> => {
+  return axios.post(`/pets`, createPetsBody, options);
+};
 
 /**
  * @summary Info for a specific pet
  */
 export const showPetById = <TData = AxiosResponse<Pet>>(
-    petId: string, options?: AxiosRequestConfig
- ): Promise<TData> => {
-    return axios.get(
-      `/pets/${petId}`,options
-    );
-  }
+  petId: string,
+  options?: AxiosRequestConfig,
+): Promise<TData> => {
+  return axios.get(`/pets/${petId}`, options);
+};
 
-export type ListPetsResult = AxiosResponse<Pets>
-export type CreatePetsResult = AxiosResponse<void>
-export type ShowPetByIdResult = AxiosResponse<Pet>
+export type ListPetsResult = AxiosResponse<Pets>;
+export type CreatePetsResult = AxiosResponse<void>;
+export type ShowPetByIdResult = AxiosResponse<Pet>;
diff --git a/samples/basic/api/endpoints/petstoreFromFileSpecWithConfig.ts b/samples/basic/api/endpoints/petstoreFromFileSpecWithConfig.ts
@@ -4,21 +4,18 @@
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
  */
-import axios from 'axios'
-import type {
-  AxiosRequestConfig,
-  AxiosResponse
-} from 'axios'
+import axios from 'axios';
+import type { AxiosRequestConfig, AxiosResponse } from 'axios';
 export type CreatePetsBody = {
   name: string;
   tag: string;
 };
 
 export type ListPetsParams = {
-/**
- * How many items to return at one time (max 100)
- */
-limit?: string;
+  /**
+   * How many items to return at one time (max 100)
+   */
+  limit?: string;
 };
 
 export interface Error {
@@ -54,46 +51,39 @@ export interface Pet {
  */
 export type Pets = Pet[];
 
-
-
-
-
-  /**
+/**
  * @summary List all pets
  */
 export const listPets = <TData = AxiosResponse<Pets>>(
-    params?: ListPetsParams, options?: AxiosRequestConfig
- ): Promise<TData> => {
-    return axios.get(
-      `/pets`,{
+  params?: ListPetsParams,
+  options?: AxiosRequestConfig,
+): Promise<TData> => {
+  return axios.get(`/pets`, {
     ...options,
-        params: {...params, ...options?.params},}
-    );
-  }
+    params: { ...params, ...options?.params },
+  });
+};
 
 /**
  * @summary Create a pet
  */
 export const createPets = <TData = AxiosResponse<void>>(
-    createPetsBody: CreatePetsBody, options?: AxiosRequestConfig
- ): Promise<TData> => {
-    return axios.post(
-      `/pets`,
-      createPetsBody,options
-    );
-  }
+  createPetsBody: CreatePetsBody,
+  options?: AxiosRequestConfig,
+): Promise<TData> => {
+  return axios.post(`/pets`, createPetsBody, options);
+};
 
 /**
  * @summary Info for a specific pet
  */
 export const showPetById = <TData = AxiosResponse<Pet>>(
-    petId: string, options?: AxiosRequestConfig
- ): Promise<TData> => {
-    return axios.get(
-      `/pets/${petId}`,options
-    );
-  }
+  petId: string,
+  options?: AxiosRequestConfig,
+): Promise<TData> => {
+  return axios.get(`/pets/${petId}`, options);
+};
 
-export type ListPetsResult = AxiosResponse<Pets>
-export type CreatePetsResult = AxiosResponse<void>
-export type ShowPetByIdResult = AxiosResponse<Pet>
+export type ListPetsResult = AxiosResponse<Pets>;
+export type CreatePetsResult = AxiosResponse<void>;
+export type ShowPetByIdResult = AxiosResponse<Pet>;