fix: use URL to build the URL

package-lock.json

@@ -1,17 +1,18 @@
 {
 	"name": "@tcgdex/sdk",
-	"version": "2.7.0",
+	"version": "2.6.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@tcgdex/sdk",
-			"version": "2.7.0",
+			"version": "2.6.0",
 			"license": "MIT",
 			"dependencies": {
 				"@cachex/memory": "^1",
 				"@cachex/web-storage": "^1",
-				"@dzeio/object-util": "^1"
+				"@dzeio/object-util": "^1",
+				"isomorphic-unfetch": "^3"
 			},
 			"devDependencies": {
 				"@babel/core": "^7",
@@ -6221,6 +6222,15 @@
 			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
 			"dev": true
 		},
+		"node_modules/isomorphic-unfetch": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz",
+			"integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==",
+			"dependencies": {
+				"node-fetch": "^2.6.1",
+				"unfetch": "^4.2.0"
+			}
+		},
 		"node_modules/istanbul-lib-coverage": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
@@ -8321,6 +8331,25 @@
 			"integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
 			"dev": true
 		},
+		"node_modules/node-fetch": {
+			"version": "2.6.7",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+			"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+			"dependencies": {
+				"whatwg-url": "^5.0.0"
+			},
+			"engines": {
+				"node": "4.x || >=6.0.0"
+			},
+			"peerDependencies": {
+				"encoding": "^0.1.0"
+			},
+			"peerDependenciesMeta": {
+				"encoding": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/node-int64": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -9753,6 +9782,11 @@
 				"node": ">=8.0"
 			}
 		},
+		"node_modules/tr46": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+		},
 		"node_modules/tree-kill": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
@@ -10356,6 +10390,11 @@
 			"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
 			"dev": true
 		},
+		"node_modules/unfetch": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz",
+			"integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA=="
+		},
 		"node_modules/unicode-canonical-property-names-ecmascript": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -10684,6 +10723,20 @@
 				"makeerror": "1.0.12"
 			}
 		},
+		"node_modules/webidl-conversions": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+		},
+		"node_modules/whatwg-url": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+			"dependencies": {
+				"tr46": "~0.0.3",
+				"webidl-conversions": "^3.0.0"
+			}
+		},
 		"node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -15183,6 +15236,15 @@
 			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
 			"dev": true
 		},
+		"isomorphic-unfetch": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz",
+			"integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==",
+			"requires": {
+				"node-fetch": "^2.6.1",
+				"unfetch": "^4.2.0"
+			}
+		},
 		"istanbul-lib-coverage": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
@@ -16745,6 +16807,14 @@
 			"integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
 			"dev": true
 		},
+		"node-fetch": {
+			"version": "2.6.7",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+			"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+			"requires": {
+				"whatwg-url": "^5.0.0"
+			}
+		},
 		"node-int64": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -17815,6 +17885,11 @@
 				"is-number": "^7.0.0"
 			}
 		},
+		"tr46": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+		},
 		"tree-kill": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
@@ -18152,6 +18227,11 @@
 			"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
 			"dev": true
 		},
+		"unfetch": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz",
+			"integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA=="
+		},
 		"unicode-canonical-property-names-ecmascript": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -18334,6 +18414,20 @@
 				"makeerror": "1.0.12"
 			}
 		},
+		"webidl-conversions": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+		},
+		"whatwg-url": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+			"requires": {
+				"tr46": "~0.0.3",
+				"webidl-conversions": "^3.0.0"
+			}
+		},
 		"which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",

package.json

@@ -1,19 +1,19 @@
 {
 	"name": "@tcgdex/sdk",
 	"version": "2.7.0",
-	"main": "./dist/tcgdex.js",
-	"module": "./dist/tcgdex.mjs",
-	"types": "./dist/tcgdex.d.ts",
-	"browser": "./dist/tcgdex.global.js",
+	"main": "./dist/tcgdex.node.js",
+	"module": "./dist/tcgdex.node.mjs",
+	"types": "./dist/tcgdex.node.d.ts",
+	"browser": "./dist/tcgdex.browser.global.js",
 	"exports": {
 		".": {
 			"require": {
-				"types": "./dist/tcgdex.d.ts",
-				"default": "./dist/tcgdex.js"
+				"types": "./dist/tcgdex.node.d.ts",
+				"default": "./dist/tcgdex.node.js"
 			},
 			"import": {
-				"types": "./dist/tcgdex.d.mts",
-				"default": "./dist/tcgdex.mjs"
+				"types": "./dist/tcgdex.node.d.mts",
+				"default": "./dist/tcgdex.node.mjs"
 			}
 		}
 	},
@@ -57,11 +57,12 @@
 	"dependencies": {
 		"@cachex/memory": "^1",
 		"@cachex/web-storage": "^1",
-		"@dzeio/object-util": "^1"
+		"@dzeio/object-util": "^1",
+		"isomorphic-unfetch": "^3"
 	},
 	"scripts": {
 		"prebuild": "node scripts/export-version-number.js",
-		"build": "rm -rf dist && tsup ./src/tcgdex.ts --format cjs,esm,iife --global-name TCGdex --sourcemap --dts --clean",
+		"build": "rm -rf dist && tsup ./src/tcgdex.node.ts --format cjs,esm --dts --clean && tsup ./src/tcgdex.browser.ts --format iife --global-name TCGdex --sourcemap",
 		"prepublishOnly": "npm run build",
 		"lint": "eslint",
 		"test": "vitest run --coverage"

src/interfaces.d.ts

@@ -27,7 +27,7 @@ interface booster {
 	name: string
 	logo?: string
 	artwork_front?: string
-	artwork_back?: string
+	artwork_back?: string	
 }
 
 export type SetList = Array<SetResume>

src/tcgdex.browser.ts

@@ -0,0 +1,5 @@
+import TCGdex from './tcgdex'
+
+TCGdex.fetch = window.fetch
+
+export default TCGdex

src/tcgdex.node.ts

@@ -0,0 +1,7 @@
+import TCGdex from './tcgdex'
+import fetch from 'isomorphic-unfetch'
+
+TCGdex.fetch = fetch as any
+
+export default TCGdex
+export * from './tcgdex'

src/tcgdex.ts

@@ -31,11 +31,7 @@ export default class TCGdex {
 	/**
 	 * How the remote data is going to be fetched
 	 */
-	public static fetch: typeof fetch =
-		detectContext() === 'browser'
-			// fixe: TypeError: 'fetch' called on an object that does not implement interface Window.
-			? (...params: Parameters<typeof fetch>) => window.fetch(...params)
-			: fetch
+	public static fetch: typeof fetch = fetch
 
 	/**
 	 * @deprecated to change the lang use {@link TCGdex.getLang} and {@link TCGdex.setLang}
@@ -46,9 +42,7 @@ export default class TCGdex {
 	 * the previously hidden caching system used by TCGdex to not kill the API
 	 */
 	public cache: CacheInterface =
-		detectContext() === 'browser'
-			? new LocalStorageCache('tcgdex-cache')
-			: new MemoryCache()
+		detectContext() === 'browser' ? new LocalStorageCache('tcgdex-cache') : new MemoryCache()
 
 	/**
 	 * the default cache TTL, only subsequent requests will have their ttl changed
@@ -332,19 +326,22 @@ export default class TCGdex {
 	 * format the final URL
 	 */
 	private getFullURL(
-		url: Array<string | number>,
+		path: Array<string | number>,
 		searchParams?: Array<{ key: string, value: string | number | boolean }>
 	): string {
-		// Normalize path
-		let path = url.map(this.encode).join('/')
+		// build base path
+		const url = new URL(`${this.getEndpoint()}/${this.getLang()}`)
+
+		// set url path
+		url.pathname = `${url.pathname}/${path.join('/')}`
 
 		// handle the Search Params
-		if (searchParams) {
-			path += '?' + searchParams.map((it) => `${this.encode(it.key)}=${this.encode(it.value)}`).join('&')
+		for (const param of searchParams ?? []) {
+			url.searchParams.append(param.key, param.value.toString())
 		}
 
 		// return with the endpoint and all the shit
-		return `${this.getEndpoint()}/${this.getLang()}/${path}`
+		return url.toString()
 	}
 
 	private async actualFetch<T = object>(path: string): Promise<T | undefined> {
@@ -382,26 +379,6 @@ export default class TCGdex {
 		this.cache.set(path, json, this.cacheTTL)
 		return json as T
 	}
-
-	/**
-	 * encode a string to be used in an url
-	 * @param str the string to encode to URL
-	 * @returns the encoded string
-	 */
-	private encode(str: string | number | boolean): string {
-		return encodeURI(
-			str
-				// Transform numbers to string
-				.toString()
-				// replace this special character with an escaped one
-				.replace('?', '%3F')
-				// normalize the string
-				.normalize('NFC')
-				// remove some special chars
-				// eslint-disable-next-line no-misleading-character-class
-				.replace(/["'\u0300-\u036f]/gu, '')
-		)
-	}
 }
 
 // export the old interfaces

src/utils.ts

@@ -1,7 +1,7 @@
 import type { Endpoints } from './interfaces'
 
 /**
- * detect the current running context of the program
+ * detect the current running context ofthe program
  */
 export function detectContext(): 'browser' | 'server' {
 	try {