Merge pull request #4084 from julien-tricent/bugfix/4058

Author: markerikson

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

@@ -278,10 +278,14 @@ export async function generateApi(
       ).name
     );
 
-    const parameters = supportDeepObjects([
-      ...apiGen.resolveArray(pathItem.parameters),
-      ...apiGen.resolveArray(operation.parameters),
-    ]).filter(argumentMatches(overrides?.parameterFilter));
+    const operationParameters = apiGen.resolveArray(operation.parameters);
+    const pathItemParameters = apiGen
+      .resolveArray(pathItem.parameters)
+      .filter((pp) => !operationParameters.some((op) => op.name === pp.name && op.in === pp.in));
+
+    const parameters = supportDeepObjects([...pathItemParameters, ...operationParameters]).filter(
+      argumentMatches(overrides?.parameterFilter)
+    );
 
     const allNames = parameters.map((p) => p.name);
     const queryArg: QueryArgDefinitions = {};

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

@@ -2524,6 +2524,24 @@ export type ExampleSchemaWrite = {
 "
 `;
 
+exports[`query parameters > parameters overridden in swagger should also be overridden in the code 1`] = `
+"import { api } from "./fixtures/emptyApi";
+const injectedRtkApi = api.injectEndpoints({
+  endpoints: (build) => ({
+    getUsersById: build.query<GetUsersByIdApiResponse, GetUsersByIdApiArg>({
+      query: (queryArg) => ({ url: \`/users/\${queryArg.id}\` }),
+    }),
+  }),
+  overrideExisting: false,
+});
+export { injectedRtkApi as enhancedApi };
+export type GetUsersByIdApiResponse = unknown;
+export type GetUsersByIdApiArg = {
+  id: number;
+};
+"
+`;
+
 exports[`should use brackets in a querystring urls arg, when the arg contains full stops 1`] = `
 "import { api } from "./fixtures/emptyApi";
 const injectedRtkApi = api.injectEndpoints({

packages/rtk-query-codegen-openapi/test/fixtures/parameterOverride.yaml

@@ -0,0 +1,23 @@
+openapi: 3.0.2
+info:
+  title: parameterOverride
+  version: 1.0.0
+paths:
+  /users/{id}:
+    parameters:
+      - in: path
+        name: id
+        schema:
+          type: string
+        required: true
+    get:
+      summary: Gets one or more users by ID.
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: OK

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

@@ -563,3 +563,13 @@ describe('openapi spec', () => {
     expect(api).toMatchSnapshot();
   });
 });
+
+describe('query parameters', () => {
+  it('parameters overridden in swagger should also be overridden in the code', async () => {
+    const api = await generateEndpoints({
+      schemaFile: './test/fixtures/parameterOverride.yaml',
+      apiFile: './fixtures/emptyApi.ts',
+    });
+    expect(api).toMatchSnapshot();
+  });
+});