fix(clients): revert usage of URLSearchParams #839

Gabb-c · Jun 12, 2023 · c92e365 · c92e365
1 parent cf5bd81
commit c92e365
Show file tree

Hide file tree

Showing 13 changed files with 134 additions and 119 deletions.
diff --git a/src/clients/berry.client.ts b/src/clients/berry.client.ts
@@ -1,8 +1,8 @@
 import { Endpoints } from "../constants";
 import { Berry, BerryFirmness, BerryFlavor, NamedAPIResourceList } from "../models";
 import { BaseClient } from "../structures/base";
+import { getListURL } from "../utils/request-params";
 import { AxiosError, AxiosResponse } from "axios";
-import { getListRequestParams } from "src/utils/request-params";
 
 /**
  * ### Berry Client
@@ -109,9 +109,9 @@ export class BerryClient extends BaseClient {
    */
   public listBerries(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
-      const params = getListRequestParams(offset, limit);
+      const url = getListURL(Endpoints.BERRY, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.BERRY, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -125,9 +125,9 @@ export class BerryClient extends BaseClient {
    */
   public listBerryFirmnesses(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
-      const params = getListRequestParams(offset, limit);
+      const url = getListURL(Endpoints.BERRY_FIRMNESS, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.BERRY_FIRMNESS, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -141,9 +141,9 @@ export class BerryClient extends BaseClient {
    */
   public listBerryFlavors(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
-      const params = getListRequestParams(offset, limit);
+      const url = getListURL(Endpoints.BERRY_FLAVOR, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.BERRY_FLAVOR, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });

diff --git a/src/clients/contest.client.ts b/src/clients/contest.client.ts
@@ -1,8 +1,8 @@
 import { Endpoints } from "../constants";
 import { ContestEffect, ContestType, NamedAPIResourceList, SuperContestEffect } from "../models";
 import { BaseClient } from "../structures/base";
+import { getListURL } from "../utils/request-params";
 import { AxiosError, AxiosResponse } from "axios";
-import { getListRequestParams } from "src/utils/request-params";
 
 /**
  * ### Contest Client
@@ -79,9 +79,9 @@ export class ContestClient extends BaseClient {
    */
   public async listContestTypes(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
-      const params = getListRequestParams(offset, limit);
+      const url = getListURL(Endpoints.CONTEST_TYPE, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.CONTEST_TYPE, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -95,9 +95,9 @@ export class ContestClient extends BaseClient {
    */
   public async listContestEffects(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
-      const params = getListRequestParams(offset, limit);
+      const url = getListURL(Endpoints.CONTEST_EFFECT, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.CONTEST_EFFECT, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -114,9 +114,9 @@ export class ContestClient extends BaseClient {
     limit?: number,
   ): Promise<NamedAPIResourceList> {
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
-      const params = getListRequestParams(offset, limit);
+      const url = getListURL(Endpoints.SUPER_CONTEST_EFFECT, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.SUPER_CONTEST_EFFECT, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });

diff --git a/src/clients/encounter.client.ts b/src/clients/encounter.client.ts
@@ -6,8 +6,8 @@ import {
   NamedAPIResourceList,
 } from "../models";
 import { BaseClient } from "../structures/base";
+import { getListURL } from "../utils/request-params";
 import { AxiosError, AxiosResponse } from "axios";
-import { getListRequestParams } from "src/utils/request-params";
 
 /**
  * ### Encounter Client
@@ -115,9 +115,9 @@ export class EncounterClient extends BaseClient {
     limit?: number,
   ): Promise<NamedAPIResourceList> {
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
-      const params = getListRequestParams(offset, limit);
+      const url = getListURL(Endpoints.ENCOUNTER_METHOD, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.ENCOUNTER_METHOD, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -134,9 +134,9 @@ export class EncounterClient extends BaseClient {
     limit?: number,
   ): Promise<NamedAPIResourceList> {
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
-      const params = getListRequestParams(offset, limit);
+      const url = getListURL(Endpoints.ENCOUNTER_CONDITION, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.ENCOUNTER_CONDITION, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -153,9 +153,9 @@ export class EncounterClient extends BaseClient {
     limit?: number,
   ): Promise<NamedAPIResourceList> {
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
-      const params = getListRequestParams(offset, limit);
+      const url = getListURL(Endpoints.ENCOUNTER_CONDITION_VALUE, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.ENCOUNTER_CONDITION_VALUE, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });

diff --git a/src/clients/evolution.client.ts b/src/clients/evolution.client.ts
@@ -1,8 +1,8 @@
 import { Endpoints } from "../constants";
 import { EvolutionChain, EvolutionTrigger, NamedAPIResourceList } from "../models";
 import { BaseClient } from "../structures/base";
+import { getListURL } from "../utils/request-params";
 import { AxiosError, AxiosResponse } from "axios";
-import { getListRequestParams } from "src/utils/request-params";
 
 /**
  * ### Evolution Client
@@ -63,10 +63,10 @@ export class EvolutionClient extends BaseClient {
    * @returns A list of Evolution Chains
    */
   public async listEvolutionChains(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.EVOLUTION_CHAIN, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.EVOLUTION_CHAIN, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -82,10 +82,10 @@ export class EvolutionClient extends BaseClient {
     offset?: number,
     limit?: number,
   ): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.EVOLUTION_TRIGGER, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.EVOLUTION_TRIGGER, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });

diff --git a/src/clients/game.client.ts b/src/clients/game.client.ts
@@ -1,8 +1,8 @@
 import { Endpoints } from "../constants";
 import { Generation, NamedAPIResourceList, Pokedex, Version, VersionGroup } from "../models";
 import { BaseClient } from "../structures/base";
+import { getListURL } from "../utils/request-params";
 import { AxiosError, AxiosResponse } from "axios";
-import { getListRequestParams } from "src/utils/request-params";
 
 /**
  * ### Game Client
@@ -135,10 +135,10 @@ export class GameClient extends BaseClient {
    * @returns A list of Generations
    */
   public async listGenerations(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.GENERATION, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.GENERATION, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -151,10 +151,10 @@ export class GameClient extends BaseClient {
    * @returns A list of Pokedexes
    */
   public async listPokedexes(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.POKEDEX, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.POKEDEX, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -167,10 +167,10 @@ export class GameClient extends BaseClient {
    * @returns A list of Versions
    */
   public async listVersions(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.VERSION, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.VERSION, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -183,10 +183,10 @@ export class GameClient extends BaseClient {
    * @returns A list of Version Groups
    */
   public async listVersionGroups(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.VERSION_GROUP, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.VERSION_GROUP, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });

diff --git a/src/clients/item.client.ts b/src/clients/item.client.ts
@@ -8,8 +8,8 @@ import {
   NamedAPIResourceList,
 } from "../models";
 import { BaseClient } from "../structures/base";
+import { getListURL } from "../utils/request-params";
 import { AxiosError, AxiosResponse } from "axios";
-import { getListRequestParams } from "src/utils/request-params";
 
 /**
  * ### Item Client
@@ -171,10 +171,10 @@ export class ItemClient extends BaseClient {
    * @returns A list of Items
    */
   public async listItems(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.ITEM, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.ITEM, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -187,10 +187,10 @@ export class ItemClient extends BaseClient {
    * @returns A list of Item Attributes
    */
   public async listItemAttributes(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.ITEM_ATTRIBUTE, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.ITEM_ATTRIBUTE, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -203,10 +203,10 @@ export class ItemClient extends BaseClient {
    * @returns A list of Item Categories
    */
   public async listItemCategories(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.ITEM_CATEGORY, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.ITEM_CATEGORY, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -222,10 +222,10 @@ export class ItemClient extends BaseClient {
     offset?: number,
     limit?: number,
   ): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.ITEM_FLING_EFFECT, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.ITEM_FLING_EFFECT, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -238,10 +238,10 @@ export class ItemClient extends BaseClient {
    * @returns A list of Item Pockets
    */
   public async listItemPockets(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.ITEM_POCKET, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.ITEM_POCKET, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });

diff --git a/src/clients/location.client.ts b/src/clients/location.client.ts
@@ -1,8 +1,8 @@
 import { Endpoints } from "../constants";
 import { Location, LocationArea, NamedAPIResourceList, PalParkArea, Region } from "../models";
 import { BaseClient } from "../structures/base";
+import { getListURL } from "../utils/request-params";
 import { AxiosError, AxiosResponse } from "axios";
-import { getListRequestParams } from "src/utils/request-params";
 
 /**
  * ### Location Client
@@ -135,10 +135,10 @@ export class LocationClient extends BaseClient {
    * @returns A list of Locations
    */
   public async listLocations(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.LOCATION, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.LOCATION, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -151,10 +151,10 @@ export class LocationClient extends BaseClient {
    * @returns A list of Location Areas
    */
   public async listLocationAreas(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.LOCATION_AREA, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.LOCATION_AREA, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -167,10 +167,10 @@ export class LocationClient extends BaseClient {
    * @returns A list of Pal Park Areas
    */
   public async listPalParkAreas(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.PALPARK_AREA, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.PALPARK_AREA, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });
@@ -183,10 +183,10 @@ export class LocationClient extends BaseClient {
    * @returns A list of Regions
    */
   public async listRegions(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.REGION, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.REGION, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });

diff --git a/src/clients/machine.client.ts b/src/clients/machine.client.ts
@@ -1,8 +1,8 @@
 import { Endpoints } from "../constants";
 import { Machine, NamedAPIResourceList } from "../models";
 import { BaseClient } from "../structures/base";
+import { getListURL } from "../utils/request-params";
 import { AxiosError, AxiosResponse } from "axios";
-import { getListRequestParams } from "src/utils/request-params";
 
 /**
  * ### Machine Client
@@ -34,10 +34,10 @@ export class MachineClient extends BaseClient {
    * @returns A list of Machines
    */
   public async listMachines(offset?: number, limit?: number): Promise<NamedAPIResourceList> {
-    const params = getListRequestParams(offset, limit);
     return new Promise<NamedAPIResourceList>((resolve, reject) => {
+      const url = getListURL(Endpoints.MACHINE, offset, limit);
       this.api
-        .get<NamedAPIResourceList>(Endpoints.MACHINE, { params })
+        .get<NamedAPIResourceList>(url)
         .then((response: AxiosResponse<NamedAPIResourceList>) => resolve(response.data))
         .catch((error: AxiosError<string>) => reject(error));
     });