fix: Issue with generated utils. (#291)

Co-authored-by: jan.silhan <[email protected]>

Author: rajzik

plugins/typescript/src/generators/generateReactQueryComponents.test.ts

@@ -84,8 +84,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -250,8 +250,8 @@ describe("generateReactQueryComponents", () => {
       { ...config }
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -441,8 +441,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -647,8 +647,8 @@ describe("generateReactQueryComponents", () => {
       { ...config }
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -839,8 +839,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -1032,8 +1032,8 @@ describe("generateReactQueryComponents", () => {
       { ...config }
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -1239,8 +1239,8 @@ describe("generateReactQueryComponents", () => {
       { ...config, injectedHeaders: ["breed"] }
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -1438,8 +1438,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -1645,8 +1645,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -1800,8 +1800,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -2003,8 +2003,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -2164,8 +2164,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -2298,8 +2298,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -2436,8 +2436,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -2574,8 +2574,8 @@ describe("generateReactQueryComponents", () => {
       config
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("petstoreComponents.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("petstoreComponents.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -2712,8 +2712,8 @@ describe("generateReactQueryComponents", () => {
       { ...config, filenamePrefix: "" }
     );
 
-    expect(writeFile.mock.calls[1][0]).toBe("components.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
+    expect(writeFile.mock.calls[0][0]).toBe("components.ts");
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
       "/**
        * Generated by @openapi-codegen
        *
@@ -2824,136 +2824,39 @@ describe("generateReactQueryComponents", () => {
       {
         openAPIDocument,
         writeFile,
-        existsFile: () => true,
+        existsFile: (file) => !file.includes("Utils"),
         readFile: async () => "",
       },
       config
     );
 
     expect(writeFile.mock.calls[0][0]).toBe("petstoreUtils.ts");
-    expect(writeFile.mock.calls[1][1]).toMatchInlineSnapshot(`
-      "/**
-       * Generated by @openapi-codegen
-       *
-       * @version 1.0.0
-       */
-      import * as reactQuery from "@tanstack/react-query";
-      import {
-        usePetstoreContext,
-        PetstoreContext,
-        queryKeyFn,
-      } from "./petstoreContext";
-      import { deepMerge } from "./petstoreUtils";
-      import type * as Fetcher from "./petstoreFetcher";
-      import { petstoreFetch } from "./petstoreFetcher";
-      import type * as Schemas from "./petstoreSchemas";
-      import type { ServerErrorStatus } from "./petstoreUtils";
-
-      type QueryFnOptions = {
-        signal?: AbortController["signal"];
-      };
-
-      export type ListPetsError = Fetcher.ErrorWrapper<{
-        status: ServerErrorStatus;
-        payload: string;
-      }>;
-
-      export type ListPetsResponse = Schemas.Pet[];
-
-      export type ListPetsVariables = PetstoreContext["fetcherOptions"];
-
-      /**
-       * Get all the pets
-       */
-      export const fetchListPets = (
-        variables: ListPetsVariables,
-        signal?: AbortSignal,
-      ) =>
-        petstoreFetch<ListPetsResponse, ListPetsError, undefined, {}, {}, {}>({
-          url: "/pets",
-          method: "get",
-          ...variables,
-          signal,
-        });
-
-      /**
-       * Get all the pets
-       */
-      export function listPetsQuery(variables: ListPetsVariables): {
-        queryKey: reactQuery.QueryKey;
-        queryFn: (options: QueryFnOptions) => Promise<ListPetsResponse>;
-      };
-
-      export function listPetsQuery(
-        variables: ListPetsVariables | reactQuery.SkipToken,
-      ): {
-        queryKey: reactQuery.QueryKey;
-        queryFn:
-          | ((options: QueryFnOptions) => Promise<ListPetsResponse>)
-          | reactQuery.SkipToken;
-      };
-
-      export function listPetsQuery(
-        variables: ListPetsVariables | reactQuery.SkipToken,
-      ) {
-        return {
-          queryKey: queryKeyFn({
-            path: "/pets",
-            operationId: "listPets",
-            variables,
-          }),
-          queryFn:
-            variables === reactQuery.skipToken
-              ? reactQuery.skipToken
-              : ({ signal }: QueryFnOptions) => fetchListPets(variables, signal),
-        };
+    expect(writeFile.mock.calls[0][1]).toMatchInlineSnapshot(`
+      "type ComputeRange<
+        N extends number,
+        Result extends Array<unknown> = [],
+      > = Result["length"] extends N
+        ? Result
+        : ComputeRange<N, [...Result, Result["length"]]>;
+
+      export type ClientErrorStatus = Exclude<
+        ComputeRange<500>[number],
+        ComputeRange<400>[number]
+      >;
+      export type ServerErrorStatus = Exclude<
+        ComputeRange<600>[number],
+        ComputeRange<500>[number]
+      >;
+
+      export function deepMerge<T, U extends T>(target: T, source: U): U {
+        const returnType = (target || {}) as U;
+        for (const key in source) {
+          if (source[key] instanceof Object)
+            Object.assign(source[key], deepMerge(returnType[key], source[key]));
+        }
+        Object.assign(returnType || {}, source);
+        return returnType;
       }
-
-      /**
-       * Get all the pets
-       */
-      export const useSuspenseListPets = <TData = ListPetsResponse,>(
-        variables: ListPetsVariables,
-        options?: Omit<
-          reactQuery.UseQueryOptions<ListPetsResponse, ListPetsError, TData>,
-          "queryKey" | "queryFn" | "initialData"
-        >,
-      ) => {
-        const { queryOptions, fetcherOptions } = usePetstoreContext(options);
-        return reactQuery.useSuspenseQuery<ListPetsResponse, ListPetsError, TData>({
-          ...listPetsQuery(deepMerge(fetcherOptions, variables)),
-          ...options,
-          ...queryOptions,
-        });
-      };
-
-      /**
-       * Get all the pets
-       */
-      export const useListPets = <TData = ListPetsResponse,>(
-        variables: ListPetsVariables | reactQuery.SkipToken,
-        options?: Omit<
-          reactQuery.UseQueryOptions<ListPetsResponse, ListPetsError, TData>,
-          "queryKey" | "queryFn" | "initialData"
-        >,
-      ) => {
-        const { queryOptions, fetcherOptions } = usePetstoreContext(options);
-        return reactQuery.useQuery<ListPetsResponse, ListPetsError, TData>({
-          ...listPetsQuery(
-            variables === reactQuery.skipToken
-              ? variables
-              : deepMerge(fetcherOptions, variables),
-          ),
-          ...options,
-          ...queryOptions,
-        });
-      };
-
-      export type QueryOperation = {
-        path: "/pets";
-        operationId: "listPets";
-        variables: ListPetsVariables | reactQuery.SkipToken;
-      };
       "
     `);
   });

plugins/typescript/src/generators/generateReactQueryComponents.ts

@@ -331,7 +331,9 @@ export const generateReactQueryComponents = async (
     utils: utilsFilename,
   });
 
-  await context.writeFile(`${utilsFilename}.ts`, getUtils());
+  if (!context.existsFile(`${utilsFilename}.ts`)) {
+    await context.writeFile(`${utilsFilename}.ts`, getUtils());
+  }
 
   await context.writeFile(
     filename + ".ts",