v2.0.0-beta.6

Signed-off-by: Avior <florian.bouillon@delta-wings.net>

.npmignore

@@ -4,3 +4,5 @@
 tsconfig.json
 *.ts
 yarn.lock
+test.js
+test.d.ts

interfaces.d.ts

@@ -33,8 +33,14 @@ interface SetResume {
 	logo?: string
 	symbol?: string
 	cardCount: {
-		total: number
-		official: number
+		/**
+		 * total of number of cards
+		 */
+		 total: number
+		 /**
+		  * number of cards officialy (on the bottom of each cards)
+		  */
+		 official: number
 	}
 }
 
@@ -50,6 +56,33 @@ export interface Set extends SetResume {
 		expanded: boolean
 	}
 
+	cardCount: {
+		/**
+		 * total of number of cards
+		 */
+		total: number
+		/**
+		 * number of cards officialy (on the bottom of each cards)
+		 */
+		official: number
+		/**
+		 * number of cards having a normal version
+		 */
+		normal: number
+		/**
+		 * number of cards having an reverse version
+		 */
+		reverse: number
+		/**
+		 * number of cards having an holo version
+		 */
+		holo: number
+		/**
+		 * Number of possible cards
+		 */
+		firstEd?: number
+	}
+
 	cards: CardList
 }
 

package.json

@@ -1,12 +1,13 @@
 {
 	"name": "@tcgdex/sdk",
-	"version": "2.0.0-beta.2",
+	"version": "2.0.0-beta.6",
 	"main": "./tcgdex.js",
 	"types": "./main.d.ts",
 	"repository": "https://github.com/tcgdex/javascript-sdk.git",
 	"license": "MIT",
 	"devDependencies": {
 		"@types/node-fetch": "2.5.7",
+		"ts-node": "^9.1.1",
 		"typescript": "^4.1.3"
 	},
 	"dependencies": {

tcgdex.ts

@@ -10,32 +10,24 @@ export default class TCGdex {
 		return this.lang || TCGdex.defaultLang
 	}
 
-
 	private getBaseUrl() {
 		return `https://api.tcgdex.net/v2/${this.getLang()}`
 	}
 
-	private gbu() {
-		return this.getBaseUrl()
+	public async fetchCard(id: string | number, set?: string): Promise<Card | undefined> {
+		const path = set ? ['sets', set] : ['cards']
+		return this.rwgr<Card>(...path, id).get()
 	}
 
-	public async getCard(id: string|number, full: true, set?: string): Promise<Card<Set> | undefined>
-	// @ts-expect-error Temporary while building it in the compiler
-	public async getCard(id: string|number, full?: boolean, set?: string): Promise<Card | undefined> {
-		const txt = set ? `sets/${set}` : "cards"
-		const req = this.rwgr<Card>(`${this.gbu()}/${txt}/${id}/`)
-		return req.get()
-	}
-
-	public async getCards(set?: string): Promise<Array<CardResume> | undefined> {
+	public async fetchCards(set?: string): Promise<Array<CardResume> | undefined> {
 		if (set) {
-			const setSingle = await this.getSet(set)
+			const setSingle = await this.fetchSet(set)
 			if (!setSingle) {
 				return undefined
 			}
 			return setSingle.cards
 		}
-		const req = this.rwgr<Array<CardResume>>(`/cards/`)
+		const req = this.rwgr<Array<CardResume>>('cards')
 		const resp = await req.get()
 		if (!resp) {
 			return undefined
@@ -43,8 +35,8 @@ export default class TCGdex {
 		return resp
 	}
 
-	public async getSet(set: string): Promise<Set | undefined> {
-		const req = this.rwgr<Set>(`/sets/${set}/`)
+	public async fetchSet(set: string): Promise<Set | undefined> {
+		const req = this.rwgr<Set>('sets', set)
 		const resp = await req.get()
 		if (!resp) {
 			return undefined
@@ -52,25 +44,25 @@ export default class TCGdex {
 		return resp
 	}
 
-	public async getSerie(expansion: string): Promise<Serie | undefined> {
-		const req = this.rwgr<Serie>(`/series/${expansion}/`)
+	public async fetchSerie(expansion: string): Promise<Serie | undefined> {
+		const req = this.rwgr<Serie>('series', expansion)
 		return req.get()
 	}
 
-	public async getSeries(): Promise<SerieList | undefined> {
-		const req = this.rwgr<SerieList>(`/series/`)
+	public async fetchSeries(): Promise<SerieList | undefined> {
+		const req = this.rwgr<SerieList>('series')
 		return req.get()
 	}
 
-	public async getSets(expansion?: string): Promise<SetList | undefined> {
+	public async fetchSets(expansion?: string): Promise<SetList | undefined> {
 		if (expansion) {
-			const expansionSingle = await this.getSerie(expansion)
+			const expansionSingle = await this.fetchSerie(expansion)
 			if (!expansionSingle) {
 				return undefined
 			}
 			return expansionSingle.sets
 		}
-		const req = this.rwgr<SetList>(`/sets/`)
+		const req = this.rwgr<SetList>('sets')
 		const list = await req.get()
 		if (!list) {
 			return undefined
@@ -78,7 +70,10 @@ export default class TCGdex {
 		return list
 	}
 
-	private rwgr<T = any>(url: string) {
-		return RequestWrapper.getRequest<T>(`${this.gbu()}${url}`)
+	private rwgr<T = any>(...url: Array<string | number>) {
+		return RequestWrapper.getRequest<T>(`${this.getBaseUrl()}/${url.map((v) => encodeURI(
+			// Normalize URL
+			v.toString().replace('?', '%3F').normalize('NFC').replace(/["'\u0300-\u036f]/g, "")
+			)).join('/')}`)
 	}
 }

yarn.lock

@@ -11,15 +11,25 @@
     form-data "^3.0.0"
 
 "@types/node@*":
-  version "13.9.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.0.tgz#5b6ee7a77faacddd7de719017d0bc12f52f81589"
-  integrity sha512-0ARSQootUG1RljH2HncpsY2TJBfGQIKOOi7kxzUY6z54ePu/ZD+wJA8zI2Q6v8rol2qpG/rvqsReco8zNMPvhQ==
+  version "14.14.41"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.41.tgz#d0b939d94c1d7bd53d04824af45f1139b8c45615"
+  integrity sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==
+
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -27,15 +37,25 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
 form-data@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
-  integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
@@ -49,29 +69,64 @@ isomorphic-unfetch@^3.1.0:
     node-fetch "^2.6.1"
     unfetch "^4.2.0"
 
-mime-db@1.43.0:
-  version "1.43.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
-  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
+mime-db@1.47.0:
+  version "1.47.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
+  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
 
 mime-types@^2.1.12:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+  version "2.1.30"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
+  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
   dependencies:
-    mime-db "1.44.0"
+    mime-db "1.47.0"
 
 node-fetch@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
+source-map-support@^0.5.17:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@^0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+ts-node@^9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d"
+  integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==
+  dependencies:
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    source-map-support "^0.5.17"
+    yn "3.1.1"
+
 typescript@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
-  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
+  integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
 
 unfetch@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
   integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
+
+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==