2.4.0

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

.eslintignore

@@ -0,0 +1,4 @@
+dist/
+src/tcgdex.browser.ts
+__tests__
+*.js

.eslintrc.js

@@ -0,0 +1,322 @@
+/**
+ * ESLint custom configuration v1.0.0
+ * packages needed:
+ * eslint
+ * for Typescript
+ * @typescript-eslint/parser
+ * @typescript-eslint/eslint-plugin
+ */
+
+ module.exports = {
+	env: {
+		browser: true,
+		es6: true,
+		node: true
+	},
+	extends: [
+		"eslint:all",
+		"plugin:@typescript-eslint/recommended",
+	],
+	globals: {
+		Atomics: "readonly",
+		SharedArrayBuffer: "readonly"
+	},
+	parser: "@typescript-eslint/parser",
+	parserOptions: {
+		project: "tsconfig.json"
+	},
+	plugins: [
+		"@typescript-eslint"
+	],
+	root: true,
+	rules: {
+		// Tab indent and force switch to have one too
+		indent: [
+			"error",
+			"tab",
+			{SwitchCase: 1}
+		],
+
+		// \n linebreak
+		"linebreak-style": [
+			"error",
+			"unix"
+		],
+
+		// Disable eslint default quote because Typescript replace it
+		quotes: "off",
+		"@typescript-eslint/quotes": [
+			"error",
+			"single",
+			{ avoidEscape: true }
+		],
+
+		// Simply diallow using ';' unless mandatory
+		semi: "off",
+		"@typescript-eslint/semi": [
+			"error",
+			"never",
+			{ "beforeStatementContinuationChars": "always"}
+		],
+
+		// Disallow things that do nothing in the end
+		"no-unused-expressions": "off",
+		"@typescript-eslint/no-unused-expressions": [
+			"error",
+			{ "enforceForJSX": true,}
+		],
+
+		// force overloads to be next to one another
+		"@typescript-eslint/adjacent-overload-signatures": "error",
+
+		// Force to use `Array<thing>
+		"@typescript-eslint/array-type": [
+			"error",
+			{ default: 'generic' }
+		],
+
+		// Warn when no return type is specified
+		"@typescript-eslint/explicit-module-boundary-types": "warn",
+
+		// disallow certain types not safe
+		"@typescript-eslint/ban-types": [
+			"error",
+			{
+				"types": {
+					"{}": false
+				}
+			}
+		],
+		"@typescript-eslint/consistent-type-assertions": "error",
+		"@typescript-eslint/consistent-type-definitions": "error",
+		"@typescript-eslint/explicit-member-accessibility": [
+			"error",
+			{
+				accessibility: "explicit"
+			}
+		],
+		"@typescript-eslint/interface-name-prefix": "off",
+		"@typescript-eslint/member-delimiter-style": [
+			"error",
+			{
+				multiline: {
+					delimiter: "none",
+					requireLast: true
+				},
+				singleline: {
+					delimiter: "comma",
+					requireLast: false
+				}
+			}
+		],
+		"@typescript-eslint/member-ordering": "error",
+		"@typescript-eslint/no-empty-function": "error",
+		"@typescript-eslint/no-empty-interface": "error",
+		"@typescript-eslint/no-explicit-any": "off",
+		"@typescript-eslint/no-misused-new": "error",
+		"@typescript-eslint/no-namespace": "error",
+		"@typescript-eslint/no-parameter-properties": "off",
+		"@typescript-eslint/no-use-before-define": "off",
+		"@typescript-eslint/prefer-for-of": "error",
+		"@typescript-eslint/prefer-function-type": "error",
+		"@typescript-eslint/prefer-namespace-keyword": "error",
+
+		"@typescript-eslint/triple-slash-reference": "error",
+		"@typescript-eslint/type-annotation-spacing": "error",
+		"@typescript-eslint/unified-signatures": "error",
+		"arrow-body-style": "error",
+		"arrow-parens": [
+			"error",
+			"always"
+		],
+
+		camelcase: "error",
+		complexity: "off",
+		"constructor-super": "error",
+		curly: "error",
+		"dot-notation": "error",
+		"eol-last": "error",
+		eqeqeq: [
+			"error",
+			"smart"
+		],
+		"guard-for-in": "warn",
+		"id-blacklist": [
+			"error",
+			"any",
+			"Number",
+			"number",
+			"String",
+			"string",
+			"Boolean",
+			"boolean",
+			"Undefined"
+		],
+		"id-match": "error",
+		"max-classes-per-file": [
+			"error",
+			1
+		],
+		"max-len": [
+			"warn",
+			{
+				code: 200
+			}
+		],
+		"@typescript-eslint/no-inferrable-types": "off",
+		"new-parens": "error",
+		"no-bitwise": "error",
+		"no-caller": "error",
+		"no-cond-assign": "error",
+		"no-debugger": "error",
+		"no-empty": "error",
+		"no-eval": "error",
+		"no-fallthrough": "off",
+		"no-invalid-this": "off",
+		"no-multiple-empty-lines": "error",
+		"no-new-wrappers": "error",
+		"no-shadow": [
+			"error",
+			{
+				hoist: "all"
+			}
+		],
+		"no-throw-literal": "error",
+		"no-trailing-spaces": "error",
+		"no-undef-init": "error",
+		"no-underscore-dangle": "error",
+		"no-unsafe-finally": "error",
+		"no-unused-labels": "error",
+		"no-unused-vars": "off",
+		"no-var": "error",
+		"object-shorthand": "error",
+		"one-var": [
+			"error",
+			"never"
+		],
+		"prefer-const": "error",
+		"quote-props": [
+			"error",
+			"consistent-as-needed"
+		],
+		"radix": "error",
+
+		"space-before-function-paren": "off",
+		"@typescript-eslint/space-before-function-paren": ["error", {
+			asyncArrow: "always",
+			anonymous: "never",
+			named: "never"
+		}],
+		"spaced-comment": "error",
+		"use-isnan": "error",
+		"valid-typeof": "off",
+
+		// some tests from eslint:all
+		"no-tabs": "off",
+		"padded-blocks": [
+			"error",
+			{
+				"blocks": "never",
+				"classes": "always",
+				"switches": "never"
+			}
+		],
+		"sort-imports": "off",
+		"no-console": "off",
+		"function-call-argument-newline": [
+			"error",
+			"consistent"
+		],
+		"dot-location": [
+			"error",
+			"property"
+		],
+		"object-curly-spacing": [
+			"error",
+			"always"
+		],
+		"array-element-newline": [
+			"error",
+			"consistent"
+		],
+		"function-paren-newline": [
+			"error",
+			"consistent"
+		],
+		"no-use-before-define": "off",
+		"@typescript-eslint/no-use-before-define": "error",
+		"capitalized-comments": "off",
+		"multiline-comment-style": "off",
+		"no-extra-parens": "off",
+		"@typescript-eslint/no-extra-parens": [
+			"error",
+			"all",
+			{ "ignoreJSX": "multi-line" }
+		],
+		"func-style": [
+			"error",
+			"declaration",
+			{ "allowArrowFunctions": true }
+		],
+		"no-ternary": "off",
+		"multiline-ternary": "off",
+		"no-magic-numbers": "off",
+		"max-lines-per-function": [
+			"warn",
+			{
+				"skipBlankLines": true,
+				"skipComments": true
+			}
+		],
+		"prefer-promise-reject-errors": "warn",
+		"object-property-newline": [
+			"error",
+			{ "allowAllPropertiesOnSameLine": true }
+		],
+		"no-await-in-loop": "warn",
+		"no-undefined": "off",
+		"id-length": "warn",
+		"class-methods-use-this": "off",
+		"array-bracket-newline": [
+			"error",
+			"consistent"
+		],
+		"no-confusing-arrow": "off",
+		"no-nested-ternary": "off",
+		"no-mixed-operators": "off",
+		"max-statements": [
+			"warn",
+			15
+		],
+		"semi-style": [
+			"error",
+			"first"
+		],
+		"no-useless-constructor": "off",
+		"@typescript-eslint/no-useless-constructor": "error",
+		"lines-between-class-members": "off",
+		"@typescript-eslint/lines-between-class-members": "error",
+		"max-lines": [
+			"warn",
+			{
+				"max": 500,
+				"skipBlankLines": true,
+				"skipComments": true
+			}
+		],
+		"no-plusplus": "off",
+		"id-length": [
+			"warn",
+			{ "exceptions": ["_"] }
+		],
+		"default-param-last": "off",
+		// "@typescript-eslint/default-param-last": "error",
+		// Temporary OFF
+		"@typescript-eslint/default-param-last": "off",
+		"no-continue": "off",
+		"require-atomic-updates": "off",
+		"require-await": "off",
+		"prefer-destructuring": "off",
+		"max-params": ["warn", 5]
+	}
+};

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Build & Test
+
+on:
+  push:
+    branches:
+      - master
+  # Run on any pull request
+  pull_request:
+
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 16.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: yarn
+    - run: yarn build
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js 12.x
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+    - run: yarn && yarn build
+    - run: yarn test
+    # You may pin to the exact commit or the version.
+    # uses: codecov/codecov-action@6004246f47ab62d32be025ce173b241cd84ac58e
+    - uses: codecov/codecov-action@v1.0.13
+      with:
+        # Comma-separated list of files to upload
+        files: ./coverage/coverage-final.json

.github/workflows/code-quality.yml

@@ -0,0 +1,27 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Code Quality Checks
+
+on:
+  push:
+    branches:
+      - master
+  # Run on any pull request
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        persist-credentials: false
+
+    - name: Setup NodeJS
+      uses: actions/setup-node@v2
+      with:
+        node-version: '16.x'
+
+    - name: Lint
+      run: yarn && yarn lint

.gitignore

@@ -1,8 +1,8 @@
-node_modules
-
-# Dist files
-*.js
-*.d.ts
-!interfaces.d.ts
-!main.d.ts
-test.ts
+# Dev Files
+node_modules
+test.ts
+coverage
+
+# Dist files
+dist
+src/version.json

.npmignore

@@ -1,8 +1,9 @@
+src
 .editorconfig
 .gitignore
 .npmignore
-tsconfig.json
-*.ts
+webpack.config.js
+tsconfig.*
 yarn.lock
-test.js
-test.d.ts
+CHANGELOG.md
+coverage

CHANGELOG.md

@@ -0,0 +1,224 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## 2.3.1 - 2021-06-22
+
+### Fixed
+
+- Cleaned dist folder
+
+## 2.3.0-2.3.1 - 2021-06-22
+
+### Added
+
+- Browser specialized build
+- [#9](https://github.com/tcgdex/javascript-sdk/pull/9) Build/Unit/ESLint tests and coverage with Codecov using Github Action
+
+### Changed
+
+- [#10](https://github.com/tcgdex/javascript-sdk/pull/10) Simplified Request/Cache manager
+
+## [2.2.0] - 2021-06-19
+
+### Added
+
+- Added new fields
+
+## [2.1.1] - 2021-05-31
+
+### Fixed
+
+- Package building in the wrong version of ECMAScript
+
+## [2.1.0] - 2021-05-31
+
+### Added
+
+- new `fetch` function that manage all the API endpoints
+
+## [2.0.2-2.0.3] - 2021-05-28
+
+### Fixed
+
+- `rotationMark` should have been named `regulationMark`
+
+## [2.0.1] - 2021-05-28
+
+### Changed
+
+- Hardcoded string values are now strings as they depends on the language
+
+## [2.0.0] - 2021-05-28
+
+### Added
+
+- simple string endpoint typing
+- Typing is exported through the main.d.ts file
+- `cardCount` field in the set interface
+- a `rotationMark` to the card interface
+
+### Changed
+
+- Support new incoming datas
+- Point the SDK to the new V2
+- Renamed `getExpansion(s)` to `getSerie(s)`
+- Typing for the new SDK
+- Functions now use `fetch` instead of `get` in their names
+- URL Normalization is now done by the SDK
+
+### Removed
+
+- TranslationUtil as now translation are managed by the API
+- the interfaces folder as every interfaces are now in `interfaces.d.ts`
+- `this.gbu`
+- Translation files as they are now in the Compiler
+
+## [1.7.0] - 2021-01-31
+
+### Added
+
+- new Rarities
+
+## [1.6.1] - 2021-01-31
+
+### Changed
+
+- tags are now optionnal
+
+## [1.6.0] - 2021-01-08
+
+### Changed
+
+- Errors are now handled to return `undefined`
+
+### Removed
+
+- console.warn when using `getCards`
+
+## [1.5.0] - 2021-01-08
+
+### Added
+
+- getSet can now not transform the API Date to a Javascript Date
+
+## [1.4.2] - 2021-01-08
+
+### Added
+
+- new Tags
+
+### Changed
+
+- rarities to have less strange rarities
+-
+
+### Fixed
+
+- CORS blocked
+
+
+## [1.4.1] - 2020-04-24
+
+### Changed
+
+- Changed API url to the new one
+
+## [1.4.0] - 2020-03-25
+
+### Added
+
+- a `defaultLang` static field to customize the default lang
+- a `getLang` function to get the current lang for the SDK
+
+### Fixed
+
+- Warnings for translations
+
+## [1.3.0] - 2020-03-18
+
+### Added
+
+- A cache system
+- some informations about differents tags on a card
+- lvl on the card interface
+
+### Removed
+
+- cardTypes on the card interface
+
+## [1.2.1] - 2020-03-14
+
+### Fixed
+
+- Fix items datas not in the correct interface
+
+## [1.2.0] - 2020-03-14
+
+### Added
+
+- Added The getCards endpoint to fetch the big list of card with an optionnal  filter on the set
+- Added The getExpansions endpoint to fetch the list of expansions
+- Added Some informations about cardTypes
+- Updated DB to add support for items
+
+### Fixed
+
+- Fix translation not getting the correct file
+
+
+## [1.0.8] - 2020-03-11
+
+### Changed
+
+- Changed typing for some interfaces
+
+## [1.0.1-1.0.7] - 2020-03-11
+
+### Changed
+
+- Renamed the class Name from `TCGDex` to `TCGdex`
+- lang argument is now public so it can be changed while the SDK is active
+
+### Added
+
+- some typing for getCard and translationUtil
+
+## [1.0.0] - 2020-03-11
+
+### Added
+
+- the getCard function to use with the fetch a card with it's id
+- the getSet function to use with the fetch a set with it's id
+- the getExpansion function to use with the fetch an expansion with it's id
+- Constructor arg support for multiple langs
+- TranslationUtil to go from the SDK value to a text value
+
+[Unreleased]: https://github.com/tcgdex/javascript-sdk/compare/v2.3.1...HEAD
+
+[2.3.1]: https://github.com/tcgdex/javascript-sdk/releases/tag/v2.3.1
+[2.3.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/v2.3.0
+[2.2.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/v2.2.0
+[2.1.1]: https://github.com/tcgdex/javascript-sdk/releases/tag/v2.1.1
+[2.1.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/v2.1.0
+[2.0.2-2.0.3]: https://github.com/tcgdex/javascript-sdk/releases/tag/v2.0.3
+[2.0.1]: https://github.com/tcgdex/javascript-sdk/releases/tag/v2.0.1
+[2.0.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/v2.0.0
+[1.7.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/v1.7.0
+[1.6.1]: https://github.com/tcgdex/javascript-sdk/releases/tag/v1.6.1
+[1.6.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/1.6.0
+[1.5.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/1.5.0
+[1.4.2]: https://github.com/tcgdex/javascript-sdk/releases/tag/1.4.2
+[1.4.1]: https://github.com/tcgdex/javascript-sdk/releases/tag/1.4.1
+[1.4.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/1.4.0
+[1.3.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/1.3.0
+[1.2.1]: https://github.com/tcgdex/javascript-sdk/releases/tag/1.2.1
+[1.2.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/1.2.0
+[1.0.8]: https://github.com/tcgdex/javascript-sdk/releases/tag/1.0.8
+[1.0.1-1.0.7]: https://github.com/tcgdex/javascript-sdk/releases/tag/1.0.7
+[1.0.0]: https://github.com/tcgdex/javascript-sdk/releases/tag/v1.0.0

README.md

@@ -1,44 +1,70 @@
-# TCGdex Javacript SDK
-
-## Install
-
-### Yarn/npm
-
-```bash
-yarn add @tcgdex/sdk
-```
-or with npm
-```bash
-npm install @tcgdex/sdk
-```
-
-## Usage
-
-_Note: a complete documentation is in progress_
-
-```javascript
-import TCGdex from '@tcgdex/sdk'
-import TranslationUtil from '@tcgdex/sdk/TranslationUtil'
-import Tag from '@tcgdex/sdk/interfaces/Tag'
-
-// init the class
-const tcgdex = new TCGdex("en") // Lang code (Optionnal) (See TranslationUtil.ts line 3)
-
-// change lang
-tcgdex.lang = "fr"
-
-// get Card object wih global id
-await tcgdex.getCard("base1-1")
-
-// get Card object with local id and set
-await tcgdex.getCard(1, "base1")
-
-// get Set informations
-await tcgdex.getSet("base1")
-
-// get Expansion
-await tcgdex.getExpansion("base")
-
-// Translate information from code to the lang
-TranslationUtil.translate("tag", Tag.STAGE2, "en")
-```
+<p align="center">
+	<a href="http://npmjs.com/@tcgdex/sdk">
+		<img src="https://img.shields.io/npm/v/@tcgdex/sdk?style=flat-square" alt="NOM Version">
+	</a>
+	<a href="http://npmjs.com/@tcgdex/sdk">
+		<img src="https://img.shields.io/npm/dw/@tcgdex/sdk?style=flat-square" alt="NPM Downloads">
+	</a>
+	<a href="https://app.codecov.io/gh/tcgdex/javascript-sdk/">
+		<img src="https://img.shields.io/codecov/c/github/tcgdex/javascript-sdk?style=flat-square&token=FR4BI94N4Q" alt="npm version">
+	</a>
+	<a href="https://github.com/tcgdex/javascript-sdk/blob/master/LICENSE.md">
+		<img src="https://img.shields.io/github/license/tcgdex/javascript-sdk?style=flat-square" alt="the TCGdex JAvascript SDK is released under the MIT license." />
+	</a>
+	<a href="https://github.com/tcgdex/javascript-sdk/blob/master/LICENSE.md">
+		<img src="https://img.shields.io/github/workflow/status/tcgdex/javascript-sdk/Build%20&%20Test?style=flat-square" alt="the TCGdex JAvascript SDK is released under the MIT license." />
+	</a>
+
+</p>
+
+# TCGdex JavaScript/TypeScript SDK
+
+Communicate with the Open Source TCGdex API in Javascript/Typescript using the SDK
+
+Full API/SDK documentation in progress at https://www.tcgdex.net/docs
+
+## Getting Started
+
+Install the SDK using:
+```bash
+yarn add @tcgdex/sdk
+# or
+npm install @tcgdex/sdk
+```
+
+## Usage
+
+_Note: a complete documentation is in progress_
+
+```javascript
+import TCGdex from '@tcgdex/sdk'
+
+// initialize the SDK
+const tcgdex = new TCGdex('en') // Lang code (Optionnal) (See interfaces.ts line 1 for supported languages)
+
+// if you need to change the language
+tcgdex.lang = 'fr'
+
+// get a Card using its global ID
+await tcgdex.fetch('cards', 'base1-1')
+
+// fetch a Card using it's local id and set name/ID
+await tcgdex.fetch('sets', 'Base Set', 1)
+
+// fetch a Set's informations using the set's name/ID
+await tcgdex.fetch('sets', 'Sword & Shield')
+
+// Fetch a serie using the serie's name/ID
+await tcgdex.fetch('series', 'Black & White')
+
+// Fetch cards using other endpoints
+/**
+ * categories => the the different cards categories
+ * hp => fetch the different cards possible HPs
+ * illustrators => fetch all the cards illustrators
+ * rarities => fetch the cards rarities
+ * retreats => fetch the cards using the retreat count
+ * types => fetch the cards using the Pokémon type(s)
+ **/
+await tcgdex.fetch('categories')
+```

Request.ts

@@ -1,50 +0,0 @@
-import fetch from 'isomorphic-unfetch'
-
-export default class RequestWrapper {
-	private static cache: Array<Request<any>> = []
-
-	public static getRequest<T>(url: string) {
-		let req = this.cache.find((req) => req.url === url) as Request<T>|undefined
-		if (!req) {
-			req = new Request<T>(url)
-			this.cache.push(req)
-		}
-		return req
-	}
-}
-
-export class Request<T = any> {
-	public static ttl = 1000 * 60 * 60 // 1 hour
-	private response?: T
-	private fetched?: Date
-	public url: string // url is public for quick url test
-
-	public constructor(url: string) {
-		this.url = url
-	}
-
-	public async get(): Promise<T | undefined> {
-		const now = new Date()
-		if (
-			this.fetched &&
-			this.response &&
-			now.getTime() - this.fetched.getTime() < Request.ttl
-		) {
-			return this.response
-		}
-
-		// Fetch Response
-		const resp = await fetch(this.url, {
-			headers: {
-				"Content-Type": "text/plain"
-			}
-		})
-		if (resp.status !== 200) {
-			return undefined
-		}
-		const response = await resp.json()
-		this.response = response
-		this.fetched = now
-		return response
-	}
-}

__tests__/basic.test.js

@@ -0,0 +1,66 @@
+const TCGdex = require("../src/tcgdex").default
+const fetch = require('node-fetch')
+
+const fakeFetch = (response, status = 200) => jest.fn(() =>
+	Promise.resolve({
+		status: status,
+		json: () => Promise.resolve(response),
+	})
+);
+
+
+
+test('Basic test', async () => {
+	const tcgdex = new TCGdex('en')
+	TCGdex.fetch = fakeFetch({ok: true})
+	const res = await tcgdex.fetch('cards', 'basic-test')
+	expect(res).toEqual({ok: true})
+	expect(TCGdex.fetch).toHaveBeenCalledTimes(1)
+})
+
+test('Cache test', async () => {
+	const tcgdex = new TCGdex('en')
+	TCGdex.fetch = fakeFetch({ok: 'a'})
+	const res1 = await tcgdex.fetch('cards', 'cache-test')
+	expect(res1).toEqual({ok: 'a'})
+	TCGdex.fetch = fakeFetch({ok: 'b'})
+	const res2 = await tcgdex.fetch('cards', 'cache-test')
+	expect(res2).toEqual({ok: 'a'})
+})
+
+test('endpoint errors', async () => {
+	const tcgdex = new TCGdex('en')
+	TCGdex.fetch = fakeFetch({ok: 'a'})
+	await expect(tcgdex.fetch('non existing endpoint')).rejects.toThrow()
+	await expect(tcgdex.fetch()).rejects.toThrow()
+})
+
+test('404 test', async () => {
+	const tcgdex = new TCGdex('en')
+	TCGdex.fetch = fakeFetch(undefined, 404)
+	expect(
+		await tcgdex.fetch('cards', '404-test')
+	).not.toBeDefined()
+})
+
+test('test real endpoints', async () => {
+	const tcgdex = new TCGdex('en')
+	TCGdex.fetch = fetch
+	const endpoints = [
+		{endpoint: 'fetchCard', params: ['swsh1-1']},
+		{endpoint: 'fetchCard', params: ['1', 'Sword & Shield']},
+		{endpoint: 'fetchCards', params: ['swsh1']},
+		{endpoint: 'fetchCards', params: []},
+		{endpoint: 'fetchSet', params: ['swsh1']},
+		{endpoint: 'fetchSets', params: ['swsh']},
+		{endpoint: 'fetchSets', params: []},
+		{endpoint: 'fetchSeries', params: []},
+		{endpoint: 'fetchSerie', params: ['swsh']},
+	]
+
+	for await (const item of endpoints) {
+		expect(
+			await tcgdex[item.endpoint](...item.params)
+		).toBeDefined()
+	}
+})

babel.config.js

@@ -0,0 +1,7 @@
+// Babel config for Jest
+module.exports = {
+	presets: [
+		['@babel/preset-env', {targets: {node: 'current'}}],
+		'@babel/preset-typescript'
+	],
+};

main.d.ts

@@ -1,4 +0,0 @@
-import TCGdex from './tcgdex'
-export * from './interfaces'
-
-export default TCGdex

package.json

@@ -1,26 +1,58 @@
-{
-	"name": "@tcgdex/sdk",
-	"version": "2.0.0-beta.5",
-	"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": {
-		"isomorphic-unfetch": "^3.1.0"
-	},
-	"scripts": {
-		"build": "tsc --project tsconfig.json",
-		"prepublishOnly": "yarn build"
-	},
-	"files": [
-		"*.js",
-		"*.d.ts",
-		"**/*.js",
-		"**/*.d.ts"
-	]
-}
+{
+	"name": "@tcgdex/sdk",
+	"version": "2.4.0",
+	"main": "./dist/cjs/tcgdex.node.js",
+	"types": "./dist/types/tcgdex.d.ts",
+	"repository": "https://github.com/tcgdex/javascript-sdk.git",
+	"homepage": "https://github.com/tcgdex/javascript-sdk",
+	"author": "Aviortheking",
+	"keywords": [
+		"tcgdex",
+		"pokemon",
+		"trading",
+		"card",
+		"tcg",
+		"sdk",
+		"api",
+		"typescript",
+		"javascript",
+		"typing"
+	],
+	"license": "MIT",
+	"devDependencies": {
+		"@babel/core": "^7.14.6",
+		"@babel/preset-env": "^7.14.7",
+		"@babel/preset-typescript": "^7.14.5",
+		"@types/node-fetch": "^2.5.10",
+		"@typescript-eslint/eslint-plugin": "^4.28.0",
+		"@typescript-eslint/parser": "^4.28.0",
+		"eslint": "^7.29.0",
+		"jest": "^27.0.5",
+		"ts-loader": "^9.2.3",
+		"ts-node": "^10.0.0",
+		"typescript": "^4.1.3",
+		"webpack": "^5.40.0",
+		"webpack-nano": "^1.1.1"
+	},
+	"engines": {
+		"node": ">=12"
+	},
+	"dependencies": {
+		"isomorphic-unfetch": "^3.1.0",
+		"unfetch": "^4.2.0"
+	},
+	"scripts": {
+		"prebuild": "node scripts/export-version-number.js",
+		"build": "npm run prebuild && npm run build:cjs && npm run build:browser && npm run build:es2015",
+		"build:cjs": "tsc --project tsconfig.json",
+		"build:es2015": "tsc --project tsconfig.es2015.json",
+		"build:browser": "wp --config webpack.config.js",
+		"prepublishOnly": "npm run build",
+		"lint": "eslint",
+		"test": "jest --coverage"
+	},
+	"files": [
+		"dist"
+	],
+	"sideEffects": false
+}

scripts/export-version-number.js

@@ -0,0 +1,4 @@
+const { version } = require('../package.json')
+const fs = require('fs')
+
+fs.writeFileSync('./src/version.json', JSON.stringify({version}))

src/Request.ts

@@ -0,0 +1,31 @@
+import TCGdex from './tcgdex'
+import { version } from './version.json'
+
+export default class Request {
+
+	// 1 hour of TTL by default
+	public static ttl = 1000 * 60 * 60
+
+	private static cache: Record<string, {response: any, time: number}> = {}
+
+	public static async fetch<T>(url: string): Promise<T | undefined> {
+		let request = this.cache[url]
+		const now = new Date().getTime()
+		if (!request || now - request.time > this.ttl) {
+			const unfetch = TCGdex.fetch
+			const resp = await unfetch(url, {
+				headers: {
+					'user-agent': `@tcgdex/javascript-sdk/${version}`
+				}
+			})
+			if (resp.status !== 200) {
+				return undefined
+			}
+
+			this.cache[url] = { response: await resp.json(), time: now }
+			request = this.cache[url]
+		}
+		return request.response
+	}
+
+}

src/interfaces.ts

@@ -1,8 +1,8 @@
-export type SupportedLanguages = 'en' | 'fr'
+export type SupportedLanguages = 'en' | 'fr' | 'es' | 'it' | 'pt' | 'de'
 
 export type Languages<T = string> = Partial<Record<SupportedLanguages, T>>
 
-interface SerieResume {
+export interface SerieResume {
 	id: string
 	name: string
 }
@@ -18,29 +18,26 @@ interface variants {
 	firstEdition?: boolean
 }
 
-export type Types = 'Colorless' | 'Darkness' | 'Dragon' |
-'Fairy' | 'Fightning' | 'Fire' |
-'Grass' | 'Lightning' | 'Metal' |
-'Psychic' | 'Water'
-
 export type SetList = Array<SetResume>
 export type SerieList = Array<SerieResume>
 export type CardList = Array<CardResume>
 
-interface SetResume {
+export interface SetResume {
 	id: string
 	name: string
 	logo?: string
 	symbol?: string
 	cardCount: {
+
 		/**
 		 * total of number of cards
 		 */
-		 total: number
-		 /**
+		total: number
+
+		/**
 		  * number of cards officialy (on the bottom of each cards)
 		  */
-		 official: number
+		official: number
 	}
 }
 
@@ -51,32 +48,52 @@ export interface Set extends SetResume {
 
 	releaseDate: string
 
-	legal?: {
+	/**
+	 * Designate if the set is usable in tournaments
+	 *
+	 * Note: this is specific to the set and if a
+	 * card is banned from the set it will still be true
+	 */
+	legal: {
+
+		/**
+		 * Ability to play in standard tournaments
+		 */
 		standard: boolean
+
+		/**
+		 * Ability to play in expanded tournaments
+		 */
 		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
 		 */
@@ -86,7 +103,7 @@ export interface Set extends SetResume {
 	cards: CardList
 }
 
-interface CardResume {
+export interface CardResume {
 	id: string
 	localId: string
 
@@ -114,7 +131,7 @@ export interface Card<SetType extends SetResume = SetResume> extends CardResume
 	 * - Ultra Rare
 	 * - Secret Rare
 	 */
-	rarity: 'None' | 'Common'| 'Uncommon' | 'Rare' | 'Ultra Rare' | 'Secret Rare'
+	rarity: string
 
 	/**
 	 * Card Category
@@ -123,7 +140,7 @@ export interface Card<SetType extends SetResume = SetResume> extends CardResume
 	 * - Trainer
 	 * - Energy
 	 */
-	category: 'Pokemon' | 'Trainer' | 'Energy'
+	category: string
 
 	/**
 	 * Card Variants (Override Set Variants)
@@ -151,8 +168,9 @@ export interface Card<SetType extends SetResume = SetResume> extends CardResume
 
 	/**
 	 * Pokemon Types
+	 * ex for multiple https://www.tcgdex.net/database/ex/ex13/17
 	 */
-	types?: Array<Types> // ex for multiple https://www.tcgdex.net/database/ex/ex13/17
+	types?: Array<string>
 
 	/**
 	 * Pokemon Sub Evolution
@@ -188,7 +206,7 @@ export interface Card<SetType extends SetResume = SetResume> extends CardResume
 	 * - Stage2 https://www.tcgdex.net/database/xy/xy9/3
 	 * - VMAX https://www.tcgdex.net/database/swsh/swsh1/50
 	 */
-	stage?: 'Basic' | 'BREAK' | 'LEVEL-UP' | 'MEGA' | 'RESTORED' | 'Stage1' | 'Stage2' | 'VMAX'
+	stage?: string
 
 	/**
 	 * Card Suffix
@@ -201,7 +219,7 @@ export interface Card<SetType extends SetResume = SetResume> extends CardResume
 	 * - SP https://www.tcgdex.net/database/pl/pl1/7
 	 * - TAG TEAM-GX https://www.tcgdex.net/database/sm/sm12/226
 	 */
-	suffix?: 'EX' | 'GX' | 'V' | 'Legend' | 'Prime' | 'SP' | 'TAG TEAM-GX'
+	suffix?: string
 
 	/**
 	 * Pokemon Held Item
@@ -219,7 +237,7 @@ export interface Card<SetType extends SetResume = SetResume> extends CardResume
 	 * multi abilities ex https://www.tcgdex.net/database/ex/ex15/10
 	 */
 	abilities?: Array<{
-		type: 'Pokemon Power' | 'Poke-BODY' | 'Poke-POWER' | 'Ability' | 'Ancient Trait'
+		type: string
 		name: string
 		effect: string
 	}>
@@ -228,7 +246,7 @@ export interface Card<SetType extends SetResume = SetResume> extends CardResume
 	 * Pokemon Attacks
 	 */
 	attacks?: Array<{
-		cost?: Array<Types>
+		cost?: Array<string>
 		name: string
 		effect?: string
 		damage?: string | number
@@ -238,33 +256,48 @@ export interface Card<SetType extends SetResume = SetResume> extends CardResume
 	 * Pokemon Weaknesses
 	 */
 	weaknesses?: Array<{
-		type: Types
+		type: string
 		value?: string
 	}>
 
 	resistances?: Array<{
-		type: Types
+		type: string
 		value?: string
 	}>
 
 	retreat?: number
 
-	//Trainer/Energy
+	// Trainer/Energy
 	effect?: string
 
 	// Trainer Only
-	trainerType?: 'Supporter' | // https://www.tcgdex.net/database/ex/ex7/83
-	'Item' | // https://www.tcgdex.net/database/ex/ex7/89
-	'Stadium' | // https://www.tcgdex.net/database/ex/ex7/87
-	'Tool' | // https://www.tcgdex.net/database/neo/neo1/93
-	'Ace Spec' | // https://www.tcgdex.net/database/bw/bw7/139
-	'Technical Machine' | // https://www.tcgdex.net/database/ecard/ecard1/144
-	'Goldenred Game Corner' | // https://www.tcgdex.net/database/neo/neo1/83
-	'Rocket\'s Secret Machine' // https://www.tcgdex.net/database/ex/ex7/84
+	trainerType?: string
 
 	// Energy Only
-	energyType?: 'Normal' | // https://www.tcgdex.net/database/ecard/ecard1/160
-	'Special' // https://www.tcgdex.net/database/ecard/ecard1/158
+	energyType?: string
+
+	/**
+	 * Define the rotation mark on cards >= Sword & Shield
+	 */
+	regulationMark?: string
+
+	/**
+	 * Card ability to be played in official tournaments
+	 *
+	 * Note: all cards are avaialable to play in unlimited tournaments
+	 */
+	legal: {
+
+		/**
+		 * Ability to play in standard tournaments
+		 */
+		standard: boolean
+
+		/**
+		 * Ability to play in expanded tournaments
+		 */
+		expanded: boolean
+	}
 }
 
 export type StringEndpointList = Array<string>

src/tcgdex.browser.ts

@@ -0,0 +1,6 @@
+import TCGdex from './tcgdex'
+import unfetch from 'unfetch'
+
+TCGdex.fetch = window.fetch ?? unfetch as any
+
+module.exports = 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

@@ -0,0 +1,185 @@
+import RequestWrapper from './Request'
+import { Serie, Set, Card, CardResume, SerieList, SetList, SupportedLanguages, StringEndpoint } from './interfaces'
+type Endpoint = 'cards' | 'categories' | 'hp' | 'illustrators' | 'rarities' | 'retreats' | 'series' | 'sets' | 'types'
+
+const ENDPOINTS: Array<Endpoint> = ['cards', 'categories', 'hp', 'illustrators', 'rarities', 'retreats', 'series', 'sets', 'types']
+const BASE_URL = 'https://api.tcgdex.net/v2'
+export default class TCGdex {
+
+	public static fetch: typeof fetch
+
+	/**
+	 * @deprecated to change the lang use `this.lang`
+	 */
+	public static defaultLang: SupportedLanguages = 'en'
+
+	public constructor(public lang?: SupportedLanguages) {}
+
+	public getLang(): SupportedLanguages {
+		return this.lang ?? TCGdex.defaultLang ?? 'en'
+	}
+
+	/**
+	 * Shortcut to easily fetch a card using both it's global id and it's local ID
+	 * @param id the card global/local ID
+	 * @param set the card set name/ID (optionnal)
+	 * @returns the card object
+	 */
+	public async fetchCard(id: string | number, set?: string): Promise<Card | undefined> {
+		const path = set ? ['sets', set] : ['cards']
+		// @ts-expect-error the base endpoint is 'sets' or 'cards'
+		return this.fetch(...path, id)
+	}
+
+	/**
+	 * Shortcut to easily fetch cards using an optionnal set name/ID
+	 * @param set the card set name/ID (optionnal)
+	 * @returns a card list
+	 */
+	public async fetchCards(set?: string): Promise<Array<CardResume> | undefined> {
+		if (set) {
+			const fSet = await this.fetch('sets', set)
+			return fSet ? fSet.cards : undefined
+		}
+		return this.fetch('cards')
+	}
+
+	/**
+	 * @deprecated use `this.fetch('sets', set)`
+	 */
+	public async fetchSet(set: string): Promise<Set | undefined> {
+		return this.fetch('sets', set)
+	}
+
+	/**
+	 * @deprecated use `this.fetch('series', serie)`
+	 */
+	public async fetchSerie(serie: string): Promise<Serie | undefined> {
+		return this.fetch('series', serie)
+	}
+
+	/**
+	 * @deprecated use `this.fetch('series')`
+	 */
+	public async fetchSeries(): Promise<SerieList | undefined> {
+		return this.fetch('series')
+	}
+
+	/**
+	 * Shortcut to easily fetch sets using an optionnal serie name/ID
+	 * @param serie the card set name/ID (optionnal)
+	 * @returns a card list
+	 */
+	public async fetchSets(serie?: string): Promise<SetList | undefined> {
+		if (serie) {
+			const fSerie = await this.fetch('series', serie)
+			return fSerie ? fSerie.sets : undefined
+		}
+		return this.fetch('sets')
+	}
+
+	/**
+	 * Fetch a card using its global id
+	 * @param endpoint_0 'cards'
+	 * @param endpoint_1 {string} the card global ID
+	 */
+	public async fetch(...type: ['cards', string]): Promise<Card | undefined>
+
+	/**
+	 * Fetch every cards in the database
+	 * @param endpoint_0 'cards'
+	 */
+	public async fetch(type: 'cards'): Promise<Array<CardResume> | undefined>
+
+	/**
+	 * Fetch a card using its local id and its set
+	 * @param endpoint_0 'sets'
+	 * @param endpoint_1 {string} the set name or ID
+	 * @param endpoint_2 {string} the card local ID
+	 */
+	public async fetch(...endpoint: ['sets', string, string]): Promise<Card | undefined>
+
+	/**
+	 * Fetch a set
+	 * @param endpoint_0 'sets'
+	 * @param endpoint_1 {string} the set name or ID
+	 */
+	public async fetch(...endpoint: ['sets', string]): Promise<Set | undefined>
+
+	/**
+	 * Fetch every sets
+	 * @param endpoint_0 'sets'
+	 */
+	public async fetch(endpoint: 'sets'): Promise<SetList | undefined>
+
+	/**
+	 * Fetch a serie
+	 * @param endpoint_0 'series'
+	 * @param endpoint_1 {string} the serie name or ID
+	 */
+	public async fetch(...endpoint: ['series', string]): Promise<Serie | undefined>
+
+	/**
+	 * Fetch every series
+	 * @param endpoint_0 'series'
+	 */
+	public async fetch(endpoint: 'series'): Promise<SerieList | undefined>
+
+	/**
+	 * Fetch cards depending on a specific filter
+	 * @param endpoint_0 {'categories' | 'hp' | 'illustrators' | 'rarities' | 'retreats' | 'types'}
+	 * Possible value 'categories' | 'hp' | 'illustrators' | 'rarities' | 'retreats' | 'types'
+	 * @param endpoint_1 {string} the value set while fetching the index
+	 */
+	public async fetch(...endpoint: ['categories' | 'hp' | 'illustrators' | 'rarities' | 'retreats' | 'types', string]): Promise<StringEndpoint | undefined>
+
+	/**
+	 * Fetch cards depending on a specific filter
+	 * @param endpoint_0 {'hp' | 'retreats' | 'categories' | 'illustrators' | 'rarities' | 'types'}
+	 * Possible value 'hp' | 'retreats' | 'categories' | 'illustrators' | 'rarities' | 'types'
+	 * @param endpoint_1 {string} Fetch the possible values to use depending on the endpoint
+	 */
+	public async fetch(endpoint: 'hp' | 'retreats' | 'categories' | 'illustrators' | 'rarities' | 'types'): Promise<Array<string> | undefined>
+
+	/**
+	 * Fetch The differents endpoints depending on the first argument
+	 * @param endpoint_0 {'hp' | 'retreats' | 'categories' | 'illustrators' | 'rarities' | 'types'}
+	 * Possible value 'cards' | 'categories' | 'hp' | 'illustrators' | 'rarities' | 'retreats' | 'series' | 'sets' | 'types'
+	 * @param endpoint_1 {string} (Optionnal) some details to go from the index file to the item file (mostly the ID/name)
+	 * @param endpoint_2 {string} (Optionnal) only for sets the card local ID to fetch the card through the set
+	 */
+	public async fetch(...endpoint: Array<Endpoint | string>): Promise<any | undefined> {
+		if (endpoint.length === 0) {
+			throw new Error('endpoint to fetch is empty!')
+		}
+		// @ts-expect-error with the precedent check, we KNOW that type is not empty
+		const baseEndpoint = endpoint.shift().toLowerCase() as Endpoint
+		if (!ENDPOINTS.includes(baseEndpoint)) {
+			throw new Error(`unknown endpoint to fetch! (${baseEndpoint})`)
+		}
+		return this.makeRequest(baseEndpoint, ...endpoint)
+	}
+
+	/**
+	 * Function to make the request and normalize the whole path
+	 */
+	private makeRequest<T = any>(...url: Array<string | number>) {
+		// Normalize path
+		const path = url.map((subPath) => encodeURI(
+			subPath
+				// Transform numbers to string
+				.toString()
+				// replace this special character with an escaped one
+				.replace('?', '%3F')
+				// normalize the string
+				.normalize('NFC')
+				// remove some special chars by nothing
+				// eslint-disable-next-line no-misleading-character-class
+				.replace(/["'\u0300-\u036f]/gu, '')
+		)).join('/')
+		return RequestWrapper.fetch<T>(`${BASE_URL}/${this.getLang()}/${path}`)
+	}
+
+}
+
+export * from './interfaces'

tcgdex.ts

@@ -1,76 +0,0 @@
-import RequestWrapper from './Request'
-import { Serie, Set, Card, CardResume, SerieList, SetList, SupportedLanguages } from './interfaces'
-
-export default class TCGdex {
-	public static defaultLang: SupportedLanguages = "en"
-
-	public constructor(public lang?: SupportedLanguages) {}
-
-	public getLang() {
-		return this.lang || TCGdex.defaultLang
-	}
-
-	private getBaseUrl() {
-		return `https://api.tcgdex.net/v2/${this.getLang()}`
-	}
-
-	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 fetchCards(set?: string): Promise<Array<CardResume> | undefined> {
-		if (set) {
-			const setSingle = await this.fetchSet(set)
-			if (!setSingle) {
-				return undefined
-			}
-			return setSingle.cards
-		}
-		const req = this.rwgr<Array<CardResume>>('cards')
-		const resp = await req.get()
-		if (!resp) {
-			return undefined
-		}
-		return resp
-	}
-
-	public async fetchSet(set: string): Promise<Set | undefined> {
-		const req = this.rwgr<Set>('sets', set)
-		const resp = await req.get()
-		if (!resp) {
-			return undefined
-		}
-		return resp
-	}
-
-	public async fetchSerie(expansion: string): Promise<Serie | undefined> {
-		const req = this.rwgr<Serie>('series', expansion)
-		return req.get()
-	}
-
-	public async fetchSeries(): Promise<SerieList | undefined> {
-		const req = this.rwgr<SerieList>('series')
-		return req.get()
-	}
-
-	public async fetchSets(expansion?: string): Promise<SetList | undefined> {
-		if (expansion) {
-			const expansionSingle = await this.fetchSerie(expansion)
-			if (!expansionSingle) {
-				return undefined
-			}
-			return expansionSingle.sets
-		}
-		const req = this.rwgr<SetList>('sets')
-		const list = await req.get()
-		if (!list) {
-			return undefined
-		}
-		return list
-	}
-
-	private rwgr<T = any>(...url: Array<string | number>) {
-		return RequestWrapper.getRequest<T>(`${this.getBaseUrl()}/${url.map((v) => encodeURI(v.toString())).join('/')}`)
-	}
-}

translations/abilityType.ts

@@ -1,17 +0,0 @@
-import { translations } from "../TranslationUtil"
-
-const translations: translations = {
-	en: [
-		"Poké-Body",
-		"Poké-Power",
-		"Ability",
-		"Ancient Trait"
-	],
-	fr: [
-		"Poké-Body",
-		"Poké-Power",
-		"Talent",
-		"Trait Ancien"
-	]
-}
-export default translations

translations/category.ts

@@ -1,15 +0,0 @@
-import { translations } from "../TranslationUtil"
-
-const translations: translations = {
-	en: [
-		"Pokémon",
-		"Trainer",
-		"Energy"
-	],
-	fr: [
-		"Pokémon",
-		"Dresseur",
-		"Énergie"
-	]
-}
-export default translations

translations/rarity.ts

@@ -1,21 +0,0 @@
-import { translations } from "../TranslationUtil"
-
-const translations: translations = {
-	en: [
-		"No rarity",
-		"Common",
-		"unCommon",
-		"Rare",
-		"Rare Ultra",
-		"Ultra Rare",
-	],
-	fr: [
-		"Sans rareté",
-		"Commun",
-		"Non Commun",
-		"Rare",
-		"Rare Ultra",
-		"Ultra Rare",
-	]
-}
-export default translations

translations/tag.ts

@@ -1,59 +0,0 @@
-import { translations } from "../TranslationUtil"
-
-const translations: translations = {
-	en: [
-		"Basic Pokémon",
-		"Basic Energy",
-		"BREAK",
-		"EX",
-		"GX",
-		"Item",
-		"LEGEND",
-		"Level-Up",
-		"MEGA",
-		"Restored",
-		"Rocket's Secret Machine",
-		"SP",
-		"Special",
-		"Stadium",
-		"Stage 1",
-		"Stage 2",
-		"Supporter",
-		"Tag Team",
-		"Technical Machine",
-		"Tool",
-		"Pokémon V",
-		"Pokémon VMAX",
-		"Prime",
-		"ACE",
-		"Rainbow",
-	],
-	fr: [
-		"Pokémon de base",
-		"Energie de base",
-		"TURBO",
-		"EX",
-		"GX",
-		"Objet",
-		"LÉGENDE",
-		"Niveau Sup",
-		"Méga",
-		"Restauré",
-		"Machine secrète dees Rocket",
-		"SP",
-		"Spéciale",
-		"Stadium",
-		"Niveau 1",
-		"Niveau 2",
-		"Supporter",
-		"ESCOUADE",
-		"Machine Technique",
-		"Outil",
-		"Pokémon V",
-		"Pokémon VMAX",
-		"Prime",
-		"ACE",
-		"Arc en ciel",
-	]
-}
-export default translations

translations/type.ts

@@ -1,32 +0,0 @@
-import { translations } from "../TranslationUtil";
-
-const trans: translations = {
-	en: [
-		"Colorless",
-		"Darkness",
-		"Dragon",
-		"Fairy",
-		"Fighting",
-		"Fire",
-		"Grass",
-		"Lightning",
-		"Metal",
-		"Psychic",
-		"Water"
-	],
-	fr: [
-		"Incolore",
-		"Obscurité",
-		"Dragon",
-		"Fée",
-		"Combat",
-		"Feu",
-		"Plante",
-		"Électrique",
-		"Métal",
-		"Psy",
-		"Eau"
-	]
-}
-
-export default trans

tsconfig.es2015.json

@@ -0,0 +1,11 @@
+{
+	"extends": "./tsconfig.json",
+	"include": ["./src/tcgdex.node.ts"],
+	"compilerOptions": {
+		"target": "ES2020",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+		"module": "ES2015",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+		"declaration": false,                      /* Generates corresponding '.d.ts' file. */
+		"declarationDir": null,
+		"outDir": "./dist/modules",                   /* Redirect output structure to the directory. */
+		}
+}

tsconfig.json

@@ -1,66 +1,66 @@
 {
-	"include": ["**/*.ts"],
-	"exclude": ["translations"],
+	"include": ["./src/tcgdex.node.ts"],
 	"compilerOptions": {
-	  /* Basic Options */
-	  // "incremental": true,                   /* Enable incremental compilation */
-	  "target": "ESNext",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
-	  "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-	  // "lib": [],                             /* Specify library files to be included in the compilation. */
-	  // "allowJs": true,                       /* Allow javascript files to be compiled. */
-	  // "checkJs": true,                       /* Report errors in .js files. */
-	  // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-	  "declaration": true,                      /* Generates corresponding '.d.ts' file. */
-	//   "declarationDir": "types",                /* Folder where the declarations are*/
-	  // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
-	  // "sourceMap": true,                     /* Generates corresponding '.map' file. */
-	  // "outFile": "./",                       /* Concatenate and emit output to single file. */
-	  // "outDir": "./",                        /* Redirect output structure to the directory. */
-	  // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-	  // "composite": true,                     /* Enable project compilation */
-	  // "tsBuildInfoFile": "",                 /* Specify file to store incremental compilation information */
-	  "removeComments": true,                   /* Do not emit comments to output. */
-	  // "noEmit": true,                        /* Do not emit outputs. */
-	  // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-	  // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-	  // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-	  /* Strict Type-Checking Options */
-	  "strict": true,                           /* Enable all strict type-checking options. */
-	  // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-	  // "strictNullChecks": true,              /* Enable strict null checks. */
-	  // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
-	  // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-	  // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
-	  // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-	  // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+		/* Basic Options */
+		// "incremental": true,                   /* Enable incremental compilation */
+		"target": "ES2020",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+		"module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+		// "lib": [],                             /* Specify library files to be included in the compilation. */
+		// "allowJs": true,                       /* Allow javascript files to be compiled. */
+		// "checkJs": true,                       /* Report errors in .js files. */
+		// "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+		"declaration": true,                      /* Generates corresponding '.d.ts' file. */
+		"declarationDir": "./dist/types",         /* Folder where the declarations are*/
+		// "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+		// "sourceMap": true,                     /* Generates corresponding '.map' file. */
+		// "outFile": "./",                       /* Concatenate and emit output to single file. */
+		"outDir": "./dist/cjs",                   /* Redirect output structure to the directory. */
+		"rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+		// "composite": true,                     /* Enable project compilation */
+		// "tsBuildInfoFile": "",                 /* Specify file to store incremental compilation information */
+		// "removeComments": true,                /* Do not emit comments to output. */
+		// "noEmit": true,                        /* Do not emit outputs. */
+		// "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+		// "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+		// "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+		/* Strict Type-Checking Options */
+		"strict": true,                           /* Enable all strict type-checking options. */
+		"noImplicitAny": true,                    /* Raise error on expressions and declarations with an implied 'any' type. */
+		"strictNullChecks": true,                 /* Enable strict null checks. */
+		"strictFunctionTypes": true,              /* Enable strict checking of function types. */
+		"strictBindCallApply": true,              /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+		"strictPropertyInitialization": true,     /* Enable strict checking of property initialization in classes. */
+		"noImplicitThis": true,                   /* Raise error on 'this' expressions with an implied 'any' type. */
+		"alwaysStrict": true,                     /* Parse in strict mode and emit "use strict" for each source file. */
 
-	  /* Additional Checks */
-	  "noUnusedLocals": true,                /* Report errors on unused locals. */
-	  "noUnusedParameters": true,            /* Report errors on unused parameters. */
-	  "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
-	//   "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
-	  "forceConsistentCasingInFileNames": true,
+		/* Additional Checks */
+		"noUnusedLocals": true,                   /* Report errors on unused locals. */
+		"noUnusedParameters": true,               /* Report errors on unused parameters. */
+		"noImplicitReturns": true,                /* Report error when not all code paths in function return a value. */
+		"noFallthroughCasesInSwitch": true,       /* Report errors for fallthrough cases in switch statement. */
+		"forceConsistentCasingInFileNames": true,
 
-	  /* Module Resolution Options */
-	  // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-	  // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
-	  // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-	  // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-	  // "typeRoots": [],                       /* List of folders to include type definitions from. */
-	  // "types": [],                           /* Type declaration files to be included in compilation. */
-	  // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-	  "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-	  // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
-	  // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+		"resolveJsonModule": true,
+		/* Module Resolution Options */
+		"moduleResolution": "node",               /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+		// "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+		// "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+		// "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+		// "typeRoots": [],                       /* List of folders to include type definitions from. */
+		// "types": [],                           /* Type declaration files to be included in compilation. */
+		// "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+		"esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+		// "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+		// "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
 
-	  /* Source Map Options */
-	  // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-	  // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
-	  // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
-	  // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+		/* Source Map Options */
+		// "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+		// "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+		// "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+		// "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
 
-	  /* Experimental Options */
-	  // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
-	  // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+		/* Experimental Options */
+		"experimentalDecorators": true,           /* Enables experimental support for ES7 decorators. */
+		"emitDecoratorMetadata": true             /* Enables experimental support for emitting type metadata for decorators. */
 	}
-  }
+}

webpack.config.js

@@ -0,0 +1,34 @@
+const path = require('path')
+
+module.exports = {
+	mode: 'production',
+	entry: './src/tcgdex.browser.ts',
+	output: {
+		path: path.resolve(__dirname, 'dist'),
+		filename: 'tcgdex.browser.js',
+		libraryTarget: 'umd',
+		library: 'TCGdex',
+		umdNamedDefine: true
+	},
+	resolve: {
+		extensions: ['.ts']
+	},
+	optimization: {
+		minimize: true
+	},
+	module: {
+		rules: [{
+			test: /\.ts$/,
+			loader: 'ts-loader',
+			exclude: /node_modules/,
+			options: {
+				compilerOptions: {
+					sourceMap: false,
+					declaration: false,
+					declarationDir: null,
+					target: 'ES2016'
+				}
+			}
+		}]
+	}
+}

yarn.lock

@@ -1,132 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node-fetch@2.5.7":
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
-  integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
-"@types/node@*":
-  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"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  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.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"
-    mime-types "^2.1.12"
-
-isomorphic-unfetch@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f"
-  integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==
-  dependencies:
-    node-fetch "^2.6.1"
-    unfetch "^4.2.0"
-
-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.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.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.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==