bug fixes PR 1680 (#1693)

Co-authored-by: grumpytofu <>

Author: grumpyTofu

packages/rtk-query-codegen-openapi/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@rtk-query/codgen-openapi",
+  "name": "@rtk-query/codegen-openapi",
   "version": "1.0.0-alpha.1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

packages/rtk-query-codegen-openapi/src/generate.ts

@@ -22,6 +22,8 @@ import { generateCreateApiCall, generateEndpointDefinition, generateImportNode }
 
 const { factory } = ts;
 
+const generatedApiName = 'injectedRtkApi';
+
 function defaultIsDataResponse(code: string) {
   const parsedCode = Number(code);
   return !Number.isNaN(parsedCode) && parsedCode >= 200 && parsedCode < 300;
@@ -119,13 +121,18 @@ export async function generateApi(
           undefined,
           false,
           factory.createNamedExports([
-            factory.createExportSpecifier(factory.createIdentifier('injectedRtkApi'), factory.createIdentifier('api')),
+            factory.createExportSpecifier(
+              factory.createIdentifier(generatedApiName),
+              factory.createIdentifier(exportName)
+            ),
           ]),
           undefined
         ),
         ...Object.values(interfaces),
         ...apiGen['aliases'],
-        ...(hooks ? [generateReactHooks({ exportName, operationDefinitions, endpointOverrides })] : []),
+        ...(hooks
+          ? [generateReactHooks({ exportName: generatedApiName, operationDefinitions, endpointOverrides })]
+          : []),
       ],
       factory.createToken(ts.SyntaxKind.EndOfFileToken),
       ts.NodeFlags.None

packages/rtk-query-codegen-openapi/test/__snapshots__/cli.test.ts.snap

@@ -76,7 +76,7 @@ const injectedRtkApi = api.injectEndpoints({
   }),
   overrideExisting: false,
 });
-export { injectedRtkApi as api };
+export { injectedRtkApi as enhancedApi };
 export type UpdatePetApiResponse = /** status 200 Successful operation */ Pet;
 export type UpdatePetApiArg = {
   /** Update an existent pet in the store */

packages/rtk-query-codegen-openapi/test/__snapshots__/generateEndpoints.test.ts.snap

@@ -115,7 +115,7 @@ const injectedRtkApi = api.injectEndpoints({
   }),
   overrideExisting: false,
 });
-export { injectedRtkApi as api };
+export { injectedRtkApi as enhancedApi };
 export type GetHealthcheckApiResponse = /** status 200 OK */ {
   message: string;
 };
@@ -292,7 +292,7 @@ const injectedRtkApi = api.injectEndpoints({
   }),
   overrideExisting: false,
 });
-export { injectedRtkApi as api };
+export { injectedRtkApi as enhancedApi };
 export type PlaceOrderApiResponse = /** status 200 successful operation */ Order;
 export type PlaceOrderApiArg = {
   order: Order;
@@ -339,7 +339,7 @@ const injectedRtkApi = api.injectEndpoints({
   }),
   overrideExisting: false,
 });
-export { injectedRtkApi as api };
+export { injectedRtkApi as enhancedApi };
 export type LoginUserApiResponse = /** status 200 successful operation */ string;
 export type LoginUserApiArg = {
   /** The user name for login */
@@ -364,15 +364,15 @@ const injectedRtkApi = api.injectEndpoints({
   }),
   overrideExisting: false,
 });
-export { injectedRtkApi as api };
+export { injectedRtkApi as enhancedApi };
 export type LoginUserApiResponse = /** status 200 successful operation */ string;
 export type LoginUserApiArg = {
   /** The user name for login */
   username?: string;
   /** The password for login in clear text */
   password?: string;
 };
-export const { useLoginUserMutation } = enhancedApi;
+export const { useLoginUserMutation } = injectedRtkApi;
 
 `;
 
@@ -393,7 +393,7 @@ const injectedRtkApi = api.injectEndpoints({
   }),
   overrideExisting: false,
 });
-export { injectedRtkApi as api };
+export { injectedRtkApi as enhancedApi };
 export type AddPetApiResponse = /** status 200 Successful operation */ Pet;
 export type AddPetApiArg = {
   /** Create a new pet in the store */
@@ -420,7 +420,7 @@ export type Pet = {
   tags?: Tag[];
   status?: 'available' | 'pending' | 'sold';
 };
-export const { useAddPetMutation, useGetPetByIdQuery } = enhancedApi;
+export const { useAddPetMutation, useGetPetByIdQuery } = injectedRtkApi;
 
 `;
 
@@ -437,7 +437,7 @@ const injectedRtkApi = api.injectEndpoints({
   }),
   overrideExisting: false,
 });
-export { injectedRtkApi as api };
+export { injectedRtkApi as enhancedApi };
 export type PatchApiV1ListByItemIdApiResponse = /** status 200 A successful response. */ string;
 export type PatchApiV1ListByItemIdApiArg = {
   'item.id': string;
@@ -557,7 +557,7 @@ const injectedRtkApi = api.injectEndpoints({
   }),
   overrideExisting: false,
 });
-export { injectedRtkApi as api };
+export { injectedRtkApi as enhancedApi };
 export type UpdatePetApiResponse = /** status 200 Successful operation */ Pet;
 export type UpdatePetApiArg = {
   /** Update an existent pet in the store */
@@ -718,7 +718,7 @@ export const {
   useGetUserByNameQuery,
   useUpdateUserMutation,
   useDeleteUserMutation,
-} = enhancedApi;
+} = injectedRtkApi;
 
 `;
 
@@ -744,7 +744,7 @@ const injectedRtkApi = api.injectEndpoints({
   }),
   overrideExisting: false,
 });
-export { injectedRtkApi as api };
+export { injectedRtkApi as enhancedApi };
 export type GetStructureDefinitionApiResponse = unknown;
 export type GetStructureDefinitionApiArg = {
   /** Some description */
@@ -764,7 +764,7 @@ export type GetStructureDefinitionApiArg = {
   /** Some description */
   naming_conflict?: any;
 };
-export const { useGetStructureDefinitionQuery } = enhancedApi;
+export const { useGetStructureDefinitionQuery } = injectedRtkApi;
 
 `;
 

yarn.lock

@@ -6156,9 +6156,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rtk-query/codgen-openapi@workspace:packages/rtk-query-codegen-openapi":
+"@rtk-query/codegen-openapi@workspace:packages/rtk-query-codegen-openapi":
   version: 0.0.0-use.local
-  resolution: "@rtk-query/codgen-openapi@workspace:packages/rtk-query-codegen-openapi"
+  resolution: "@rtk-query/codegen-openapi@workspace:packages/rtk-query-codegen-openapi"
   dependencies:
     "@apidevtools/swagger-parser": ^10.0.2
     "@babel/core": ^7.12.10