test: improve branch coverage to 91.62% (above 90% threshold)

Add tests for uncovered branches in generate.mts (axios client, enums,
noOperationId, noSchemas, schemaType options), service.mts edge cases
(non-exported vars, non-arrow functions, JSDoc, deprecated detection),
createImports.mts (axios client), and format.mts (prettier/eslint).
Replace @ts-ignore with proper type assertions in createImports tests.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: TakehiroTada

tests/__snapshots__/generate.test.ts.snap

@@ -612,3 +612,100 @@ export const useFindPaginatedPetsSuspense = <
   });
 "
 `;
+
+exports[`generate - axios client with enums, noOperationId, schemaType > queries.ts 1`] = `
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+
+import { useMutation, UseMutationOptions, useQuery, UseQueryOptions } from "@tanstack/react-query";
+import { AxiosError } from "axios";
+import { type Options } from "../requests/client";
+import { deletePetsById, getNotDefined, getPaginatedPets, getPets, getPetsById, postNotDefined, postPets } from "../requests/sdk.gen";
+import { DeletePetsByIdData, DeletePetsByIdError, GetNotDefinedData, GetPaginatedPetsData, GetPetsByIdData, GetPetsByIdError, GetPetsData, GetPetsError, PostNotDefinedData, PostPetsData, PostPetsError } from "../requests/types.gen";
+import * as Common from "./common";
+/**
+* Returns all pets from the system that the user has access to
+* Nam sed condimentum est. Maecenas tempor sagittis sapien, nec rhoncus sem sagittis sit amet. Aenean at gravida augue, ac iaculis sem. Curabitur odio lorem, ornare eget elementum nec, cursus id lectus. Duis mi turpis, pulvinar ac eros ac, tincidunt varius justo. In hac habitasse platea dictumst. Integer at adipiscing ante, a sagittis ligula. Aenean pharetra tempor ante molestie imperdiet. Vivamus id aliquam diam. Cras quis velit non tortor eleifend sagittis. Praesent at enim pharetra urna volutpat venenatis eget eget mauris. In eleifend fermentum facilisis. Praesent enim enim, gravida ac sodales sed, placerat id erat. Suspendisse lacus dolor, consectetur non augue vel, vehicula interdum libero. Morbi euismod sagittis libero sed lacinia.
+*
+* Sed tempus felis lobortis leo pulvinar rutrum. Nam mattis velit nisl, eu condimentum ligula luctus nec. Phasellus semper velit eget aliquet faucibus. In a mattis elit. Phasellus vel urna viverra, condimentum lorem id, rhoncus nibh. Ut pellentesque posuere elementum. Sed a varius odio. Morbi rhoncus ligula libero, vel eleifend nunc tristique vitae. Fusce et sem dui. Aenean nec scelerisque tortor. Fusce malesuada accumsan magna vel tempus. Quisque mollis felis eu dolor tristique, sit amet auctor felis gravida. Sed libero lorem, molestie sed nisl in, accumsan tempor nisi. Fusce sollicitudin massa ut lacinia mattis. Sed vel eleifend lorem. Pellentesque vitae felis pretium, pulvinar elit eu, euismod sapien.
+*
+*/
+export const useGetPets = <TData = Common.GetPetsDefaultResponse, TError = AxiosError<GetPetsError>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<GetPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseGetPetsKeyFn(clientOptions, queryKey), queryFn: () => getPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+/**
+* This path is not fully defined.
+*
+* @deprecated
+*/
+export const useGetNotDefined = <TData = Common.GetNotDefinedDefaultResponse, TError = AxiosError<unknown>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<GetNotDefinedData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+/**
+* Returns a user based on a single ID, if the user does not have access to the pet
+*/
+export const useGetPetsById = <TData = Common.GetPetsByIdDefaultResponse, TError = AxiosError<GetPetsByIdError>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<GetPetsByIdData, true>, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseGetPetsByIdKeyFn(clientOptions, queryKey), queryFn: () => getPetsById({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+/**
+* Returns paginated pets from the system that the user has access to
+*
+*/
+export const useGetPaginatedPets = <TData = Common.GetPaginatedPetsDefaultResponse, TError = AxiosError<unknown>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<GetPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseGetPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: () => getPaginatedPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+/**
+* Creates a new pet in the store. Duplicates are allowed
+*/
+export const usePostPets = <TData = Common.PostPetsMutationResult, TError = AxiosError<PostPetsError>, TQueryKey extends Array<unknown> = unknown[], TContext = unknown>(mutationKey?: TQueryKey, options?: Omit<UseMutationOptions<TData, TError, Options<PostPetsData, true>, TContext>, "mutationKey" | "mutationFn">) => useMutation<TData, TError, Options<PostPetsData, true>, TContext>({ mutationKey: Common.UsePostPetsKeyFn(mutationKey), mutationFn: clientOptions => postPets(clientOptions) as unknown as Promise<TData>, ...options });
+/**
+* This path is not defined at all.
+*
+* @deprecated
+*/
+export const usePostNotDefined = <TData = Common.PostNotDefinedMutationResult, TError = AxiosError<unknown>, TQueryKey extends Array<unknown> = unknown[], TContext = unknown>(mutationKey?: TQueryKey, options?: Omit<UseMutationOptions<TData, TError, Options<PostNotDefinedData, true>, TContext>, "mutationKey" | "mutationFn">) => useMutation<TData, TError, Options<PostNotDefinedData, true>, TContext>({ mutationKey: Common.UsePostNotDefinedKeyFn(mutationKey), mutationFn: clientOptions => postNotDefined(clientOptions) as unknown as Promise<TData>, ...options });
+/**
+* deletes a single pet based on the ID supplied
+*/
+export const useDeletePetsById = <TData = Common.DeletePetsByIdMutationResult, TError = AxiosError<DeletePetsByIdError>, TQueryKey extends Array<unknown> = unknown[], TContext = unknown>(mutationKey?: TQueryKey, options?: Omit<UseMutationOptions<TData, TError, Options<DeletePetsByIdData, true>, TContext>, "mutationKey" | "mutationFn">) => useMutation<TData, TError, Options<DeletePetsByIdData, true>, TContext>({ mutationKey: Common.UseDeletePetsByIdKeyFn(mutationKey), mutationFn: clientOptions => deletePetsById(clientOptions) as unknown as Promise<TData>, ...options });
+"
+`;
+
+exports[`generate - noSchemas option > queries.ts 1`] = `
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+
+import { useMutation, UseMutationOptions, useQuery, UseQueryOptions } from "@tanstack/react-query";
+import { type Options } from "../requests/client";
+import { addPet, deletePet, findPaginatedPets, findPetById, findPets, getNotDefined, postNotDefined } from "../requests/sdk.gen";
+import { AddPetData, AddPetError, DeletePetData, DeletePetError, FindPaginatedPetsData, FindPetByIdData, FindPetByIdError, FindPetsData, FindPetsError, GetNotDefinedData, PostNotDefinedData } from "../requests/types.gen";
+import * as Common from "./common";
+/**
+* Returns all pets from the system that the user has access to
+* Nam sed condimentum est. Maecenas tempor sagittis sapien, nec rhoncus sem sagittis sit amet. Aenean at gravida augue, ac iaculis sem. Curabitur odio lorem, ornare eget elementum nec, cursus id lectus. Duis mi turpis, pulvinar ac eros ac, tincidunt varius justo. In hac habitasse platea dictumst. Integer at adipiscing ante, a sagittis ligula. Aenean pharetra tempor ante molestie imperdiet. Vivamus id aliquam diam. Cras quis velit non tortor eleifend sagittis. Praesent at enim pharetra urna volutpat venenatis eget eget mauris. In eleifend fermentum facilisis. Praesent enim enim, gravida ac sodales sed, placerat id erat. Suspendisse lacus dolor, consectetur non augue vel, vehicula interdum libero. Morbi euismod sagittis libero sed lacinia.
+*
+* Sed tempus felis lobortis leo pulvinar rutrum. Nam mattis velit nisl, eu condimentum ligula luctus nec. Phasellus semper velit eget aliquet faucibus. In a mattis elit. Phasellus vel urna viverra, condimentum lorem id, rhoncus nibh. Ut pellentesque posuere elementum. Sed a varius odio. Morbi rhoncus ligula libero, vel eleifend nunc tristique vitae. Fusce et sem dui. Aenean nec scelerisque tortor. Fusce malesuada accumsan magna vel tempus. Quisque mollis felis eu dolor tristique, sit amet auctor felis gravida. Sed libero lorem, molestie sed nisl in, accumsan tempor nisi. Fusce sollicitudin massa ut lacinia mattis. Sed vel eleifend lorem. Pellentesque vitae felis pretium, pulvinar elit eu, euismod sapien.
+*
+*/
+export const useFindPets = <TData = Common.FindPetsDefaultResponse, TError = FindPetsError, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey), queryFn: () => findPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+/**
+* This path is not fully defined.
+*
+* @deprecated
+*/
+export const useGetNotDefined = <TData = Common.GetNotDefinedDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<GetNotDefinedData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+/**
+* Returns a user based on a single ID, if the user does not have access to the pet
+*/
+export const useFindPetById = <TData = Common.FindPetByIdDefaultResponse, TError = FindPetByIdError, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetByIdData, true>, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+/**
+* Returns paginated pets from the system that the user has access to
+*
+*/
+export const useFindPaginatedPets = <TData = Common.FindPaginatedPetsDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+/**
+* Creates a new pet in the store. Duplicates are allowed
+*/
+export const useAddPet = <TData = Common.AddPetMutationResult, TError = AddPetError, TQueryKey extends Array<unknown> = unknown[], TContext = unknown>(mutationKey?: TQueryKey, options?: Omit<UseMutationOptions<TData, TError, Options<AddPetData, true>, TContext>, "mutationKey" | "mutationFn">) => useMutation<TData, TError, Options<AddPetData, true>, TContext>({ mutationKey: Common.UseAddPetKeyFn(mutationKey), mutationFn: clientOptions => addPet(clientOptions) as unknown as Promise<TData>, ...options });
+/**
+* This path is not defined at all.
+*
+* @deprecated
+*/
+export const usePostNotDefined = <TData = Common.PostNotDefinedMutationResult, TError = unknown, TQueryKey extends Array<unknown> = unknown[], TContext = unknown>(mutationKey?: TQueryKey, options?: Omit<UseMutationOptions<TData, TError, Options<PostNotDefinedData, true>, TContext>, "mutationKey" | "mutationFn">) => useMutation<TData, TError, Options<PostNotDefinedData, true>, TContext>({ mutationKey: Common.UsePostNotDefinedKeyFn(mutationKey), mutationFn: clientOptions => postNotDefined(clientOptions) as unknown as Promise<TData>, ...options });
+/**
+* deletes a single pet based on the ID supplied
+*/
+export const useDeletePet = <TData = Common.DeletePetMutationResult, TError = DeletePetError, TQueryKey extends Array<unknown> = unknown[], TContext = unknown>(mutationKey?: TQueryKey, options?: Omit<UseMutationOptions<TData, TError, Options<DeletePetData, true>, TContext>, "mutationKey" | "mutationFn">) => useMutation<TData, TError, Options<DeletePetData, true>, TContext>({ mutationKey: Common.UseDeletePetKeyFn(mutationKey), mutationFn: clientOptions => deletePet(clientOptions) as unknown as Promise<TData>, ...options });
+"
+`;

tests/createImports.test.ts

@@ -1,14 +1,17 @@
 import path from "node:path";
 import { Project } from "ts-morph";
-import { describe, expect, test } from "vitest";
+import type ts from "typescript";
+import { afterAll, beforeAll, describe, expect, test } from "vitest";
 import { createImports } from "../src/createImports.mts";
 import { cleanOutputs, generateTSClients, outputPath } from "./utils";
 
 const fileName = "createImports";
 
 describe(fileName, () => {
+  beforeAll(async () => await generateTSClients(fileName));
+  afterAll(async () => await cleanOutputs(fileName));
+
   test("createImports", async () => {
-    await generateTSClients(fileName);
     const project = new Project({
       skipAddingFilesFromTsConfig: true,
     });
@@ -17,15 +20,31 @@ describe(fileName, () => {
       project,
     });
 
-    // @ts-ignore
-    const moduleNames = imports.map((i) => i.moduleSpecifier.text);
+    const moduleNames = imports.map(
+      (i) => (i.moduleSpecifier as ts.StringLiteral).text,
+    );
     expect(moduleNames).toStrictEqual([
       "../requests/client",
       "@tanstack/react-query",
       "../requests/sdk.gen",
       "../requests/types.gen",
     ]);
-    await cleanOutputs(fileName);
+  });
+
+  test("createImports with axios client", async () => {
+    const project = new Project({
+      skipAddingFilesFromTsConfig: true,
+    });
+    project.addSourceFilesAtPaths(path.join(outputPath(fileName), "**", "*"));
+    const imports = createImports({
+      project,
+      client: "@hey-api/client-axios",
+    });
+
+    const moduleNames = imports.map(
+      (i) => (i.moduleSpecifier as ts.StringLiteral).text,
+    );
+    expect(moduleNames).toContain("axios");
   });
 
   // Skip: no-models.yaml causes upstream @hey-api/openapi-ts error
@@ -40,8 +59,9 @@ describe(fileName, () => {
       project,
     });
 
-    // @ts-ignore
-    const moduleNames = imports.map((i) => i.moduleSpecifier.text);
+    const moduleNames = imports.map(
+      (i) => (i.moduleSpecifier as ts.StringLiteral).text,
+    );
     expect(moduleNames).toStrictEqual([
       "../requests/client",
       "@tanstack/react-query",

tests/format.test.ts

@@ -0,0 +1,56 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { processOutput } from "../src/format.mjs";
+
+vi.mock("cross-spawn", () => ({
+  sync: vi.fn(),
+}));
+
+describe("processOutput", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("runs prettier formatter", async () => {
+    const { sync } = await import("cross-spawn");
+    await processOutput({ output: "/tmp/test", format: "prettier" });
+    expect(sync).toHaveBeenCalledWith("prettier", [
+      "--ignore-unknown",
+      "/tmp/test",
+      "--write",
+      "--ignore-path",
+      "./.prettierignore",
+    ]);
+  });
+
+  test("runs eslint linter", async () => {
+    const { sync } = await import("cross-spawn");
+    await processOutput({ output: "/tmp/test", lint: "eslint" });
+    expect(sync).toHaveBeenCalledWith("eslint", ["/tmp/test", "--fix"]);
+  });
+
+  test("runs biome formatter", async () => {
+    const { sync } = await import("cross-spawn");
+    await processOutput({ output: "/tmp/test", format: "biome" });
+    expect(sync).toHaveBeenCalledWith("biome", [
+      "format",
+      "--write",
+      "/tmp/test",
+    ]);
+  });
+
+  test("runs biome linter", async () => {
+    const { sync } = await import("cross-spawn");
+    await processOutput({ output: "/tmp/test", lint: "biome" });
+    expect(sync).toHaveBeenCalledWith("biome", [
+      "lint",
+      "--write",
+      "/tmp/test",
+    ]);
+  });
+
+  test("does nothing without format or lint", async () => {
+    const { sync } = await import("cross-spawn");
+    await processOutput({ output: "/tmp/test" });
+    expect(sync).not.toHaveBeenCalled();
+  });
+});

tests/generate.test.ts

@@ -64,3 +64,71 @@ describe("generate", () => {
     expect(readOutput("ensureQueryData.ts")).toMatchSnapshot();
   });
 });
+
+describe("generate - axios client with enums, noOperationId, schemaType", () => {
+  const outputDir = "outputs-generate-axios";
+  const readAxiosOutput = (fileName: string) => {
+    return readFileSync(
+      path.join(__dirname, outputDir, "queries", fileName),
+      "utf-8",
+    );
+  };
+
+  beforeAll(async () => {
+    const options: LimitedUserConfig = {
+      input: path.join(__dirname, "inputs", "petstore.yaml"),
+      output: path.join("tests", outputDir),
+      client: "@hey-api/client-axios",
+      enums: "javascript",
+      noOperationId: true,
+      schemaType: "json",
+      pageParam: "page",
+      nextPageParam: "meta.next",
+      initialPageParam: "initial",
+    };
+    await generate(options, "1.0.0");
+  });
+
+  afterAll(async () => {
+    if (existsSync(path.join(__dirname, outputDir))) {
+      await rm(path.join(__dirname, outputDir), { recursive: true });
+    }
+  });
+
+  test("queries.ts", () => {
+    expect(readAxiosOutput("queries.ts")).toMatchSnapshot();
+  });
+});
+
+describe("generate - noSchemas option", () => {
+  const outputDir = "outputs-generate-noschemas";
+  const readNoSchemasOutput = (fileName: string) => {
+    return readFileSync(
+      path.join(__dirname, outputDir, "queries", fileName),
+      "utf-8",
+    );
+  };
+
+  beforeAll(async () => {
+    const options: LimitedUserConfig = {
+      input: path.join(__dirname, "inputs", "petstore.yaml"),
+      output: path.join("tests", outputDir),
+      client: "@hey-api/client-fetch",
+      noSchemas: true,
+      pageParam: "page",
+      nextPageParam: "meta.next",
+      initialPageParam: "initial",
+    };
+    await generate(options, "1.0.0");
+  });
+
+  afterAll(async () => {
+    if (existsSync(path.join(__dirname, outputDir))) {
+      await rm(path.join(__dirname, outputDir), { recursive: true });
+    }
+  });
+
+  test("queries.ts", () => {
+    expect(readNoSchemasOutput("queries.ts")).toMatchSnapshot();
+  });
+});