fix(code-gen): strip undefined query parameters in the fetch api clients

compasjs · May 12, 2023 · d3b51ec · d3b51ec
1 parent dc300a5
commit d3b51ec
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 0 deletions.
diff --git a/packages/code-gen/src/api-client/js-fetch.js b/packages/code-gen/src/api-client/js-fetch.js
@@ -7,6 +7,7 @@ import {
   fileContextSetIndent,
 } from "../file/context.js";
 import { fileWrite } from "../file/write.js";
+import { referenceUtilsGetProperty } from "../processors/reference-utils.js";
 import { structureResolveReference } from "../processors/structure.js";
 import { JavascriptImportCollector } from "../target/javascript.js";
 import { upperCaseFirst } from "../utils.js";
@@ -271,6 +272,33 @@ export function jsFetchGenerateFunction(
     fileBlockEnd(file);
   }
 
+  if (route.query) {
+    /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+    // @ts-expect-error
+    const type = structureResolveReference(
+      generateContext.structure,
+      route.query,
+    );
+
+    if (type.type === "object") {
+      for (const key of Object.keys(type.keys)) {
+        const isOptional = referenceUtilsGetProperty(
+          generateContext,
+          type.keys[key],
+          ["isOptional"],
+          false,
+        );
+
+        if (isOptional) {
+          fileWrite(
+            file,
+            `if (query["${key}"] === null || query["${key}"] === undefined) { delete query["${key}"]; }`,
+          );
+        }
+      }
+    }
+  }
+
   fileWrite(file, `const response = await fetchFn(`);
   fileContextSetIndent(file, 1);
 

diff --git a/packages/code-gen/src/api-client/ts-fetch.js b/packages/code-gen/src/api-client/ts-fetch.js
@@ -7,6 +7,7 @@ import {
   fileContextSetIndent,
 } from "../file/context.js";
 import { fileWrite } from "../file/write.js";
+import { referenceUtilsGetProperty } from "../processors/reference-utils.js";
 import { structureResolveReference } from "../processors/structure.js";
 import { JavascriptImportCollector } from "../target/javascript.js";
 import { upperCaseFirst } from "../utils.js";
@@ -268,6 +269,33 @@ export function tsFetchGenerateFunction(
     fileBlockEnd(file);
   }
 
+  if (route.query) {
+    /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+    // @ts-expect-error
+    const type = structureResolveReference(
+      generateContext.structure,
+      route.query,
+    );
+
+    if (type.type === "object") {
+      for (const key of Object.keys(type.keys)) {
+        const isOptional = referenceUtilsGetProperty(
+          generateContext,
+          type.keys[key],
+          ["isOptional"],
+          false,
+        );
+
+        if (isOptional) {
+          fileWrite(
+            file,
+            `if (query["${key}"] === null || query["${key}"] === undefined) { delete query["${key}"]; }`,
+          );
+        }
+      }
+    }
+  }
+
   fileWrite(file, `const response = await fetchFn(`);
   fileContextSetIndent(file, 1);