Conditionally encode query parameters

Author: bayasdev

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

@@ -444,14 +444,21 @@ export async function generateApi(
 
       const properties = parameters.map((param) => {
         const value = isFlatArg ? rootObject : accessProperty(rootObject, param.name);
-        return createPropertyAssignment(
-          param.originalName,
+
+        const encodedValue =
           encodeQueryParams && param.param?.in === 'query'
-            ? factory.createCallExpression(factory.createIdentifier('encodeURIComponent'), undefined, [
-                factory.createCallExpression(factory.createIdentifier('String'), undefined, [value]),
-              ])
-            : value
-        );
+            ? factory.createConditionalExpression(
+                value,
+                undefined,
+                factory.createCallExpression(factory.createIdentifier('encodeURIComponent'), undefined, [
+                  factory.createCallExpression(factory.createIdentifier('String'), undefined, [value]),
+                ]),
+                undefined,
+                factory.createIdentifier('undefined')
+              )
+            : value;
+
+        return createPropertyAssignment(param.originalName, encodedValue);
       });
 
       return factory.createPropertyAssignment(

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

@@ -235,12 +235,15 @@ describe('option encodeQueryParams', () => {
     encodeQueryParams: true,
   };
 
-  it('should encode query parameters', async () => {
+  it('should conditionally encode query parameters', async () => {
     const api = await generateEndpoints({
       ...config,
       filterEndpoints: ['findPetsByStatus'],
     });
-    expect(api).toContain('status: encodeURIComponent(String(queryArg.status))');
+
+    expect(api).toMatch(
+      /params:\s*{\s*\n\s*status:\s*queryArg\.status\s*\?\s*encodeURIComponent\(\s*String\(queryArg\.status\)\s*\)\s*:\s*undefined\s*,?\s*\n\s*}/s
+    );
   });
 
   it('should not encode path parameters', async () => {