fix: fix incorrect merge causing issues

package.json

@@ -58,7 +58,8 @@
     "src/",
     "!dist/**/*.map",
     "!dist/tsconfig.tsbuildinfo",
-    "!src/**/*.deno.ts{,x}"
+    "!src/**/*.deno.ts{,x}",
+    "!docs/"
   ],
   "release": {
     "branches": [

src/Client.ts

@@ -1,33 +1,16 @@
 import { EventEmitter } from "events";
 import { URL } from "url";
-// @deno-types="./errors/GenericHTTPError.ts"
 import { GenericHTTPError } from "./errors/GenericHTTPError";
-// @deno-types="./errors/InvalidKeyError.ts"
 import { InvalidKeyError } from "./errors/InvalidKeyError";
 import { FindGuild } from "./methods/findGuild";
-// @deno-types="./methods/friends.ts"
 import { Friends } from "./methods/friends";
-// @deno-types="./methods/guild.ts"
 import { Guild } from "./methods/guild";
-// @deno-types="./methods/player.ts"
 import { Player } from "./methods/player";
-// @deno-types="./methods/recentGames.ts"
 import { RecentGames } from "./methods/recentGames";
-// @deno-types="./methods/resources/index.ts"
-import { Resources } from "./methods/resources/index";
-// @deno-types="./methods/skyblock/index.ts"
-import { SkyBlock } from "./methods/skyblock/index";
-// @deno-types="./methods/status.ts"
+import { Resources } from "./methods/resources";
+import { SkyBlock } from "./methods/skyblock";
 import { Status } from "./methods/status";
-// @deno-types="./types/api.ts"
-import { Components, Paths } from "./types/api";
-// @deno-types="./types/DefaultMeta.ts"
-import { DefaultMeta } from "./types/DefaultMeta";
-// @deno-types="./types/RateLimitData.ts"
-import { RateLimitData } from "./types/RateLimitData";
-// @deno-types="./util/BaseClient.ts"
-import { BaseClient } from "./util/BaseClient";
-// @deno-types="./util/Queue.ts"
+import type { Components, Paths } from "./types/api";
 import { Queue } from "./util/Queue";
 import { request } from "./util/Request";
 import { getResultObject, ResultObject } from "./util/ResultObject";
@@ -143,7 +126,7 @@ interface ClientEvents {
   reset: () => void;
 }
 
-export declare interface Client extends BaseClient {
+export declare interface Client {
   /**
    * Listen to the "limited" event which emits when the client starts limiting your calls due to hitting the rate limit.
    * @category Events
@@ -456,7 +439,7 @@ export class Client {
    */
   public async call<T extends Components.Schemas.ApiSuccess>(
     path: string,
-    parameters: Record<string, string> = {}
+    parameters: Parameters = {}
   ): Promise<T & { cached?: boolean }> {
     if (!this.cache) {
       return this.executeActionableCall(
@@ -530,7 +513,7 @@ export class Client {
   private createActionableCall<T extends Components.Schemas.ApiSuccess>(
     path: string,
     /* istanbul ignore next */
-    parameters: Record<string, string> = {}
+    parameters: Parameters = {}
   ): ActionableCall<T> {
     let noRateLimit = false;
     let includeApiKey = true;
@@ -567,7 +550,7 @@ export class Client {
     } & { cloudflareCache?: DefaultMeta["cloudflareCache"] }
   >(
     path: string,
-    parameters: Record<string, string>,
+    parameters: Parameters,
     noRateLimit: boolean,
     includeApiKey: boolean
   ): Promise<T> {

src/helpers/BedwarsLevelInfo.ts

@@ -7,9 +7,7 @@
  * For the original full copyright and license information, please view the LICENSE-HYPIXEL-PHP.md that was distributed with this source code.
  */
 
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
-// @deno-types="./MinecraftFormatting.ts"
 import {
   MinecraftColorAsHex,
   MinecraftFormatting,

src/helpers/GuildLevel.ts

@@ -7,7 +7,6 @@
  * For the original full copyright and license information, please view the LICENSE-HYPIXEL-PHP.md that was distributed with this source code.
  */
 
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
 
 /**

src/helpers/NetworkLevel.ts

@@ -7,7 +7,6 @@
  * For the original full copyright and license information, please view the LICENSE-HYPIXEL-PHP.md that was distributed with this source code.
  */
 
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
 
 /**

src/helpers/PlayerRank.ts

@@ -1,6 +1,4 @@
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
-// @deno-types="./MinecraftFormatting.ts"
 import {
   MinecraftColorAsHex,
   MinecraftFormatting,

src/helpers/SkyBlockCollections.ts

@@ -1,4 +1,3 @@
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
 
 /**

src/helpers/SkyBlockSkills.ts

@@ -1,4 +1,3 @@
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
 
 export interface SkyBlockSkillsInfo {

src/helpers/SkyWarsLevelInfo.ts

@@ -7,9 +7,7 @@
  * For the original full copyright and license information, please view the LICENSE-HYPIXEL-PHP.md that was distributed with this source code.
  */
 
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
-// @deno-types="./SkyWarsPrestige.ts"
 import {
   getSkyWarsPrestigeForLevel,
   SkyWarsPrestiges,

src/helpers/SkyWarsPrestige.ts

@@ -7,7 +7,6 @@
  * For the original full copyright and license information, please view the LICENSE-HYPIXEL-PHP.md that was distributed with this source code.
  */
 
-// @deno-types="./MinecraftFormatting.ts"
 import {
   MinecraftColorAsHex,
   MinecraftFormatting,

src/helpers/TransformSkyBlockItemData.ts

@@ -1,6 +1,4 @@
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
-// @deno-types="./TransformItemData.ts"
 import { NBTInventory, transformItemData } from "./TransformItemData";
 
 /**

src/index.ts

@@ -1,60 +1,30 @@
-// @deno-types="./Client.ts"
 export * from "./Client";
-// @deno-types="./errors/GenericHTTPError.ts"
 export * from "./errors/GenericHTTPError";
-// @deno-types="./errors/InvalidKeyError.ts"
 export * from "./errors/InvalidKeyError";
-// @deno-types="./errors/RateLimitError.ts"
 export * from "./errors/RateLimitError";
-// @deno-types="./helpers/BedwarsLevelInfo.ts"
 export * from "./helpers/BedwarsLevelInfo";
-// @deno-types="./helpers/GuildLevel.ts"
 export * from "./helpers/GuildLevel";
-// @deno-types="./helpers/MinecraftFormatting.ts"
 export * from "./helpers/MinecraftFormatting";
-// @deno-types="./helpers/NetworkLevel.ts"
 export * from "./helpers/NetworkLevel";
-// @deno-types="./helpers/PlayerRank.ts"
 export * from "./helpers/PlayerRank";
-// @deno-types="./helpers/Romanize.ts"
 export * from "./helpers/Romanize";
-// @deno-types="./helpers/SkyBlockCollections.ts"
 export * from "./helpers/SkyBlockCollections";
-// @deno-types="./helpers/SkyBlockSkills.ts"
 export * from "./helpers/SkyBlockSkills";
-// @deno-types="./helpers/SkyWarsLevelInfo.ts"
 export * from "./helpers/SkyWarsLevelInfo";
-// @deno-types="./helpers/SkyWarsPrestige.ts"
 export * from "./helpers/SkyWarsPrestige";
-// @deno-types="./helpers/TransformItemData.ts"
 export * from "./helpers/TransformItemData";
-// @deno-types="./helpers/TransformSkyBlockItemData.ts"
 export * from "./helpers/TransformSkyBlockItemData";
-// @deno-types="./methods/findGuild.ts"
 export * from "./methods/findGuild";
-// @deno-types="./methods/friends.ts"
 export * from "./methods/friends";
-// @deno-types="./methods/guild.ts"
 export * from "./methods/guild";
-// @deno-types="./methods/player.ts"
 export * from "./methods/player";
-// @deno-types="./methods/recentGames.ts"
 export * from "./methods/recentGames";
-// @deno-types="./methods/resources/index.ts"
 export * from "./methods/resources/index";
-// @deno-types="./methods/resources/guilds.ts"
 export * from "./methods/resources/guilds";
-// @deno-types="./methods/resources/skyblock.ts"
 export * from "./methods/resources/skyblock";
-// @deno-types="./methods/skyblock/index.ts"
 export * from "./methods/skyblock/index";
-// @deno-types="./methods/skyblock/auction.ts"
 export * from "./methods/skyblock/auction";
-// @deno-types="./methods/skyblock/auctions.ts"
 export * from "./methods/skyblock/auctions";
-// @deno-types="./methods/skyblock/profiles.ts"
 export * from "./methods/skyblock/profiles";
-// @deno-types="./methods/status.ts"
 export * from "./methods/status";
-// @deno-types="./types/api.ts"
 export * from "./types/api";

src/methods/findGuild.ts

@@ -1,8 +1,5 @@
-// @deno-types="../types/api.ts"
 import { Components, Paths } from "../types/api";
-// @deno-types="../util/Method.ts"
 import { Method } from "../util/Method";
-// @deno-types="../util/ResultObject.ts"
 import { getResultObject, ResultObject } from "../util/ResultObject";
 
 export class FindGuild extends Method {

src/methods/friends.ts

@@ -1,8 +1,5 @@
-// @deno-types="../types/api.ts"
 import { Components, Paths } from "../types/api";
-// @deno-types="../util/Method.ts"
 import { Method } from "../util/Method";
-// @deno-types="../util/ResultArray.ts"
 import { getResultArray, ResultArray } from "../util/ResultArray";
 
 export class Friends extends Method {

src/methods/guild.ts

@@ -1,8 +1,5 @@
-// @deno-types="../types/api.ts"
 import { Paths } from "../types/api";
-// @deno-types="../util/Method.ts"
 import { Method } from "../util/Method";
-// @deno-types="../util/ResultObject.ts"
 import { getResultObject, ResultObject } from "../util/ResultObject";
 
 export class Guild extends Method {

src/methods/player.ts

@@ -1,8 +1,5 @@
-// @deno-types="../types/api.ts"
 import { Components, Paths } from "../types/api";
-// @deno-types="../util/Method.ts"
 import { Method } from "../util/Method";
-// @deno-types="../util/ResultObject.ts"
 import { ResultObject, getResultObject } from "../util/ResultObject";
 
 export class Player extends Method {

src/methods/recentGames.ts

@@ -1,8 +1,5 @@
-// @deno-types="../types/api.ts"
 import { Components, Paths } from "../types/api";
-// @deno-types="../util/Method.ts"
 import { Method } from "../util/Method";
-// @deno-types="../util/ResultArray.ts"
 import { getResultArray, ResultArray } from "../util/ResultArray";
 
 export class RecentGames extends Method {

src/methods/resources/guilds.ts

@@ -1,10 +1,6 @@
-// @deno-types="../../types/api.ts"
 import { Paths } from "../../types/api";
-// @deno-types="../../util/Method.ts"
 import { Method } from "../../util/Method";
-// @deno-types="../../util/ResultObject.ts"
 import { getResultObject, ResultObject } from "../../util/ResultObject";
-// @deno-types="../../util/ResultArray.ts"
 import { getResultArray, ResultArray } from "../../util/ResultArray";
 
 export class GuildsResources extends Method {

src/methods/resources/index.ts

@@ -1,12 +1,7 @@
-// @deno-types="../../types/api.ts"
 import { Paths } from "../../types/api";
-// @deno-types="../../util/Method.ts"
 import { Method } from "../../util/Method";
-// @deno-types="../../util/ResultObject.ts"
 import { getResultObject, ResultObject } from "../../util/ResultObject";
-// @deno-types="./guilds.ts"
 import { GuildsResources } from "./guilds";
-// @deno-types="./skyblock.ts"
 import { SkyBlockResources } from "./skyblock";
 
 export class Resources extends Method {

src/methods/resources/skyblock.ts

@@ -1,8 +1,5 @@
-// @deno-types="../../types/api.ts"
 import { Paths } from "../../types/api";
-// @deno-types="../../util/Method.ts"
 import { Method } from "../../util/Method";
-// @deno-types="../../util/ResultObject.ts"
 import { getResultObject, ResultObject } from "../../util/ResultObject";
 
 export class SkyBlockResources extends Method {

src/methods/skyblock/auction.ts

@@ -1,8 +1,5 @@
-// @deno-types="../../types/api.ts"
 import { Paths } from "../../types/api";
-// @deno-types="../../util/Method.ts"
 import { Method } from "../../util/Method";
-// @deno-types="../../util/ResultArray.ts"
 import { getResultArray, ResultArray } from "../../util/ResultArray";
 
 export class SkyBlockAuction extends Method {

src/methods/skyblock/auctions.ts

@@ -1,8 +1,5 @@
-// @deno-types="../../types/api.ts"
 import { Paths } from "../../types/api";
-// @deno-types="../../util/Method.ts"
 import { Method } from "../../util/Method";
-// @deno-types="../../util/ResultObject.ts"
 import { getResultObject, ResultObject } from "../../util/ResultObject";
 
 export class SkyBlockAuctions extends Method {

src/methods/skyblock/index.ts

@@ -1,16 +1,9 @@
-// @deno-types="../../types/api.ts"
 import { Paths } from "../../types/api";
-// @deno-types="../../util/Method.ts"
 import { Method } from "../../util/Method";
-// @deno-types="../../util/ResultArray.ts"
 import { getResultArray, ResultArray } from "../../util/ResultArray";
-// @deno-types="../../util/ResultObject.ts"
 import { getResultObject, ResultObject } from "../../util/ResultObject";
-// @deno-types="./auction.ts"
 import { SkyBlockAuction } from "./auction";
-// @deno-types="./auctions.ts"
 import { SkyBlockAuctions } from "./auctions";
-// @deno-types="./profiles.ts"
 import { SkyBlockProfiles } from "./profiles";
 
 export class SkyBlock extends Method {

src/methods/skyblock/profiles.ts

@@ -1,8 +1,5 @@
-// @deno-types="../../types/api.ts"
 import { Components, Paths } from "../../types/api";
-// @deno-types="../../util/Method.ts"
 import { Method } from "../../util/Method";
-// @deno-types="../../util/ResultArray.ts"
 import { getResultArray, ResultArray } from "../../util/ResultArray";
 
 export class SkyBlockProfiles extends Method {

src/methods/status.ts

@@ -1,8 +1,5 @@
-// @deno-types="../types/api.ts"
 import { Components, Paths } from "../types/api";
-// @deno-types="../util/Method.ts"
 import { Method } from "../util/Method";
-// @deno-types="../util/ResultObject.ts"
 import { ResultObject, getResultObject } from "../util/ResultObject";
 
 export class Status extends Method {

src/types/DefaultMeta.ts

@@ -1,4 +1,3 @@
-// @deno-types="./RateLimitData.ts"
 import { RateLimitData } from "./RateLimitData";
 
 /**

src/util/BaseClient.ts

@@ -1,4 +1,3 @@
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
 
 export abstract class BaseClient {

src/util/Method.ts

@@ -1,4 +1,3 @@
-// @deno-types="./BaseClient.ts"
 import { BaseClient } from "./BaseClient";
 
 /** @internal */

src/util/ResultArray.ts

@@ -1,6 +1,4 @@
-// @deno-types="../types/DefaultMeta.ts"
 import { DefaultMeta } from "../types/DefaultMeta";
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
 
 /**

src/util/ResultObject.ts

@@ -1,6 +1,4 @@
-// @deno-types="../types/DefaultMeta.ts"
 import { DefaultMeta } from "../types/DefaultMeta";
-// @deno-types="../types/api.ts"
 import { Components } from "../types/api";
 
 /**