fix: fixed issue where empty queries were being appended to url

dereekb · Nov 8, 2022 · 2c787e8 · 2c787e8
1 parent fbcff78
commit 2c787e8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/util/fetch/src/lib/url.spec.ts b/packages/util/fetch/src/lib/url.spec.ts
@@ -74,6 +74,14 @@ describe('fetchURL()', () => {
       expect(result).toBe(url.href + `?${new URLSearchParams(Array.from(expectedParams.entries())).toString()}`);
     });
 
+    it('should not append an empty query to the url.', () => {
+      const queryParamsObject = {
+        hello: null
+      };
+      const result = fetchURL({ url, queryParams: queryParamsObject });
+      expect(result).toBe(url.href);
+    });
+
     it('should return the url with query params of different types attached as an object', () => {
       const queryParamsObject = {
         1: 'test',

diff --git a/packages/util/fetch/src/lib/url.ts b/packages/util/fetch/src/lib/url.ts
@@ -1,4 +1,4 @@
-import { ArrayOrValue, fixExtraQueryParameters, forEachInIterable, forEachKeyValue, isIterable, mapIterable, Maybe, useIterableOrValue } from '@dereekb/util';
+import { ArrayOrValue, fixExtraQueryParameters, forEachInIterable, forEachKeyValue, isEmptyIterable, isIterable, mapIterable, Maybe, useIterableOrValue } from '@dereekb/util';
 
 export type SimpleFetchURLInput = URL | string;
 
@@ -27,7 +27,12 @@ export function fetchURL(input: FetchURLInput): string {
 
     if (input.queryParams) {
       const searchParams = queryParamsToSearchParams(input.queryParams);
-      url = fixExtraQueryParameters(baseUrl + `?${searchParams.toString()}`);
+
+      if (!isEmptyIterable(searchParams)) {
+        url = fixExtraQueryParameters(baseUrl + `?${searchParams.toString()}`);
+      } else {
+        url = baseUrl;
+      }
     } else {
       url = baseUrl;
     }