Update package.json

Add some cardmarket properties

MIGRATING.md

@@ -0,0 +1,157 @@
+# Migrating from v1 to v2
+
+The functions and typings in V2 the SDK have been re-named to improve developer experience.
+The guide will provide you with the steps to help you migrate your application.
+
+## Type Changes
+Interfaces are no longer prefixed with the letter `I`. **Interfaces in the TypeScript compile are used solely for type-checking purposes.**
+Originally, `ICard` and `ISet` existed to be implemented with the `Card` and `Set` classes respectively. Because each function is now an independently exported function,
+the TypeScript interfaces can be used as intended, which is to simply describe the shape of the data from the API:
+
+`IQuery` was also changed to `Parameter` to complement the [new parameter syntax](https://docs.pokemontcg.io/#api_v2cards_list) in V2 of the API.
+
+* `ICard` -> `Card`
+* `ISet` -> `Set`
+* `IAbility` -> `Ability`
+* `IResistance` -> `Resistance`
+* `IWeakness` -> `Weakness`
+* `IAttack` -> `Attack`
+* `IQuery` -> `Parameter`
+
+## Function Changes
+The API functions are no longer abstracted in classes. Instead, each function is an individual export which still returns
+data of type `Card` or `Set` to reduce redundancy in the SDK. The function names were renamed to reveal intent as clearly as possible. This results
+in code that is self documenting, and enforces a convention where the API functionality is described
+thoroughly for developers.
+
+There is no change in the function return types, nor underlying functionality. Functions will continue to return a generic promised based on the resource (i.e. `Promise<Card>`, `Promise<Set>`).
+
+It is recommended to refactor the function names with the find-and-replace tool in your IDE or text editor in order for your project
+to be compatible with V2 of the SDK.
+
+## Card Functions
+### `PokemonTCG.Card.all()` -> `PokemonTCG.getAllCards()`
+```typescript
+import { PokemonTCG } from 'pokemon-tcg-sdk-typescript';
+
+// V1
+PokemonTCG.Card.all();
+
+// V2
+PokemonTCG.getAllCards();
+```
+
+### `PokemonTCG.Card.find()` -> `PokemonTCG.findCardByID()`
+```typescript
+import { PokemonTCG } from 'pokemon-tcg-sdk-typescript';
+
+// V1
+PokemonTCG.Card.find('xy7-54').then((card: PokemonTCG.Card) => {
+  console.log(card.name) // Gardevoir
+});
+
+// V2
+PokemonTCG.findCardByID('xy7-54').then((card: PokemonTCG.Card) => {
+    console.log(card.name) // Gardevoir
+});
+```
+
+### `PokemonTCG.Card.where()` -> `PokemonTCG.findCardsByQueries()`
+```typescript
+import { PokemonTCG } from 'pokemon-tcg-sdk-typescript';
+
+// V1
+const paramsV1: PokemonTCG.IQuery[] = [{ name: 'name', value: 'Gardevoir' }];
+
+PokemonTCG.Card.where(paramsV1).then((cards: PokemonTCG.Card[]) => {
+  console.log(card[0].name) // Gardevoir
+});
+
+// V2
+const paramsV2: PokemonTCG.Parameter[] = { q: 'id:xy7-54' };
+
+PokemonTCG.findCardsByQueries(paramsV2).then((cards: PokemonTCG.Card[]) => {
+   console.log(card[0].name) // Gardevoir
+});
+```
+## Set Functions
+### `PokemonTCG.Set.all()` -> `PokemonTCG.getAllSets()`
+```typescript
+import { PokemonTCG } from 'pokemon-tcg-sdk-typescript';
+
+// V1
+PokemonTCG.Set.all();
+
+// V2
+PokemonTCG.getAllSets();
+```
+### `PokemonTCG.Set.find()` -> `PokemonTCG.findSetByID()`
+```typescript
+import { PokemonTCG } from 'pokemon-tcg-sdk-typescript';
+
+// V1
+PokemonTCG.Set.find('base1').then((set: PokemonTCG.Set) => {
+  console.log(set.name) // Base
+});
+
+// V2
+PokemonTCG.findSetByID('base1').then((set: PokemonTCG.Set) => {
+    console.log(set.name) // Base
+});
+```
+
+### `PokemonTCG.Set.where()` -> `PokemonTCG.findSetsByQueries()`
+```typescript
+import { PokemonTCG } from 'pokemon-tcg-sdk-typescript';
+
+// V1
+const paramsV1: PokemonTCG.IQuery[] = [{ name: 'name', value:'Base' }];
+
+PokemonTCG.Set.where(paramsV1).then((sets: PokemonTCG.Set[]) => {
+  console.log(sets[0].name) // Base
+});
+
+// V2
+const paramsV2: PokemonTCG.Parameter[] = { q: 'name:Base' };
+
+PokemonTCG.findSetsByQueries(paramsV2).then((sets: PokemonTCG.Set[]) => {
+   console.log(sets[0].name) // Base
+});
+```
+
+## Meta Functions
+
+### `PokemonTCG.Meta.allTypes()` -> `PokemonTCG.getTypes()`
+```typescript
+import { PokemonTCG } from 'pokemon-tcg-sdk-typescript';
+
+// V1
+PokemonTCG.Meta.getAllTypes();
+
+// V2
+PokemonTCG.getTypes();
+```
+
+### `PokemonTCG.Meta.allSupertypes()` -> `PokemonTCG.getSupertypes()`
+```typescript
+import { PokemonTCG } from 'pokemon-tcg-sdk-typescript';
+
+// V1
+PokemonTCG.Meta.allSupertypes();
+
+// V2
+PokemonTCG.getSupertypes();
+```
+
+### `PokemonTCG.Meta.allSubtypes()` -> `PokemonTCG.getSubtypes()`
+```typescript
+import { PokemonTCG } from 'pokemon-tcg-sdk-typescript';
+
+// V1
+PokemonTCG.Meta.allSubtypes();
+
+// V2
+PokemonTCG.getSubtypes();
+```
+
+

README.md

@@ -2,6 +2,9 @@
 
 This is the TypeScript SDK for the [Pokemon TCG API](https://pokemontcg.io).
 
+# V2 Announcement
+Version 1 of this SDK is officially depricated. Version 2 stable release this SDK is scheduled to be released on **Friday, September 17th, 20201**. Version 1 will continue to receive support until then. **See the [migration guide](MIGRATING.md) for steps to update your app to use the latest supported version of the SDK**
+
 ## Installation
 
 **npm**
@@ -12,35 +15,41 @@ This is the TypeScript SDK for the [Pokemon TCG API](https://pokemontcg.io).
 
     yarn add pokemon-tcg-sdk-typescript
 
+It is recommended to use an API key for version 2 of the API. By default, requests are limited to 20,000/day. Requests are rate limited to 1000 requests a day, and a maximum of 30 per minute.
+
+To use the SDK with an API key, create an account at https://dev.pokemontcg.io to grab an API key. Then set your API key to the environment variable POKEMONTCG_API_KEY in a .env file. Make sure to use this exact environment variable, otherwise the SDK will not be able to read the API key.
+
 ## Class Definitions
 
 ### Card
 
 ```typescript
-ability: IAbility;
-ancientTrait?: IAncientTrait;
-artist: string;
-attacks: IAttack[];
-convertedRetreatCost: number;
-evolvesFrom: string;
-hp: string;
-id: string;
-imageUrl: string;
-imageUrlHiRes: string;
-name: string;
-nationalPokedexNumber: number;
-number: string;
-rarity: string;
-resistances: IResistance[];
-retreatCost: string[];
-series: string;
-set: string;
-setCode: string;
-subtype: string;
-supertype: string;
-text: string[];
-types: string[];
-weaknesses: IWeakness[];
+  id: string;
+  name: string;
+  supertype: string;
+  subtypes: string[];
+  hp?: string;
+  types?: string[];
+  evolesFrom?: string;
+  evolvesTo?: string[];
+  rules?: string[];
+  ancientTrait?: IAncientTrait;
+  abilities?: IAbility[];
+  attacks?: IAttack[];
+  weaknesses?: IWeakness[];
+  resistances?: IResistance[];
+  retreatCost?: string[];
+  convertedRetreatCost?: number;
+  set: ISet;
+  number: string;
+  artist?: string;
+  rarity: string;
+  flavorText?: string;
+  nationalPokedexNumbers?: number[];
+  legalities: ILegality;
+  images: ICardImage;
+  tcgplayer?: ITCGPlayer;
+  cardmarket?: ICardmarket;
 ```
 
 ### IAbility
@@ -71,17 +80,16 @@ value: string;
 ### Set
 
 ```typescript
-code: string;
-expandedLegal: boolean;
-logoUrl: string;
-name: string;
-ptcgoCode: string;
-releaseDate: string;
-series: string;
-standardLegal: boolean;
-symbolUrl: string;
-totalCards: number;
-updatedAt: string;
+  id: string;
+  images: ISetImage;
+  legalities: ILegality;
+  name:  string;
+  printedTotal: number;
+  ptcgoCode: string;
+  releaseDate: string;
+  series:  string;
+  total: number;
+  updatedAt: string;
 ```
 
 ### IQuery
@@ -140,17 +148,19 @@ PokemonTCG.Card.all()
 ```
 
 ## Contributing
- * Fork it (click the Fork button at the top of the page)
- * Create your feature branch (git checkout -b my-new-feature)
- * Make some changes and fix some bugs!
- * Run the tests `npm run-script test`
- * Test your changes in a project of yours:
-   * Create a link with [npm](https://docs.npmjs.com/cli/link.html) or [yarn](https://yarnpkg.com/lang/en/docs/cli/link/) (depending on what tool you installed this SDK with)
-   * In your project that **uses** the SDK, install the linked package with `yarn/npm link pokemon-tcg-sdk-typescript`
-   * Verify the SDK behaves as expected, and your changes took effect
- * Commit your changes (git commit -am 'Add some feature')
- * Push to the branch (git push origin my-new-feature)
- * Create a new Pull Request
+* Open an issue
+  * Describe what the SDK is missing and what changes you'd like to see implemented
+  * **Ask clarifying questions**
+* Fork it (click the Fork button at the top of the page)
+* Create your feature branch (git checkout -b my-new-feature)
+* Make some changes and fix some bugs!
+* Run the tests `npm run-script test`
+* Test your changes in a project of yours:
+  * Create a link with [npm](https://docs.npmjs.com/cli/link.html) or [yarn](https://yarnpkg.com/lang/en/docs/cli/link/) (depending on what tool you installed this SDK with)
+  * In your project that **uses** the SDK, install the linked package with `yarn/npm link pokemon-tcg-sdk-typescript`
+  * Verify the SDK behaves as expected, and your changes took effect
+* Commit your changes (git commit -am 'Add some feature')
+* Push to the branch (git push origin my-new-feature)
+* Create a new Pull Request to `master`
+
 
-## TODO
-* Add more testing?

coverage/client.test.ts

@@ -1,6 +1,6 @@
 import * as chai from 'chai';
-import { Client } from '../client';
-import { IQuery } from '../interfaces/query';
+import { Client } from '../src/client';
+import { IQuery } from '../src/interfaces/query';
 
 const expect = chai.expect;
 describe('Client', () => {
@@ -13,7 +13,7 @@ describe('Client', () => {
     Client.get('cards', params)
       .then(response => {
         expect(response).to.be.a('array');
-        expect(response[0].name).to.equal('Gardevoir');
+        expect(response[0].name).to.equal('Ampharos');
       });
   });
 
@@ -21,7 +21,7 @@ describe('Client', () => {
     Client.get('cards')
       .then(response => {
         expect(response).to.be.a('array');
-        expect(response.length).to.equal(100);
+        expect(response.length).to.equal(250);
       });
   });
 
@@ -56,7 +56,7 @@ describe('Client', () => {
       .then(response => {
         expect(response).to.be.a('array');
         expect(response[0]).to.be.a('object');
-        expect(response[0].code).to.equal('base1');
+        expect(response[0].id).to.equal('base1');
       });
   });
 

coverage/queryBuilder.test.ts

@@ -1,7 +1,7 @@
 import * as chai from 'chai';
-import { Card } from '../classes/card';
-import { QueryBuilder } from '../queryBuilder';
-import { IQuery } from '../interfaces/query';
+import { Card } from '../src/classes/card';
+import { QueryBuilder } from '../src/queryBuilder';
+import { IQuery } from '../src/interfaces/query';
 
 const expect = chai.expect;
 describe('QueryBuilder', () => {
@@ -16,13 +16,8 @@ describe('QueryBuilder', () => {
   it('should use where to filter data', () => {
     const params: IQuery[] = [
       {
-        name: 'name',
-        value: 'Charizard'
-  
-      },
-      {
-        name: 'setCode',
-        value: 'base1'
+        name: 'q',
+        value: 'name:Charizard set.id:base1'
       }
     ];
 
@@ -30,14 +25,14 @@ describe('QueryBuilder', () => {
       .then(cards => {
         expect(cards.length).to.equal(1);
         expect(cards[0].id).to.equal('base1-4');
-        expect(cards[0].set).to.equal('Base');
+        expect(cards[0].set.name).to.equal('Base');
       });
   });
 
   it('should use all to get all cards', () => {
     QueryBuilder.all<Card>(Card)
       .then(cards => {
-        expect(cards.length).to.equal(1000);
+        expect(cards.length).to.equal(250);
       });
   });
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pokemon-tcg-sdk-typescript",
-  "version": "1.2.5",
+  "version": "1.3.4",
   "description": "Typescript SDK for the PokemonTCG API (https://pokemontcg.io)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,29 +11,32 @@
     "SDK"
   ],
   "scripts": {
-    "test": "mocha --reporter spec --require ts-node/register 'src/**/*.test.ts'",
+    "prepare": "npm run build",
+    "test": "mocha --reporter spec --require ts-node/register 'coverage/**/*.test.ts'",
     "build": "tsc"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/PokemonTCG/pokemon-tcg-sdk-typescript"
+    "url": "https://gitea.sebar.dev/gitea_admin/pokemon-tcg-sdk-typescript.git"
   },
   "contributors": [
     "Bradyn Glines (https://github.com/glinesbdev)",
     "CptSpaceToaster (https://github.com/CptSpaceToaster)",
     "Monbrey (https://github.com/Monbrey)",
-    "Jonathan Meyer (https://github.com/jonathan-meyer)"
+    "Jonathan Meyer (https://github.com/jonathan-meyer)",
+    "Tee Diang (https://github.com/acupoftee"
   ],
   "license": "MIT",
   "dependencies": {
-    "axios": "^0.19.0",
-    "typescript": "^2.6.2"
+    "axios": "^1.7.9"
   },
   "devDependencies": {
     "@types/chai": "^4.1.1",
     "@types/mocha": "^2.2.46",
+    "@types/node": "^14.14.35",
     "chai": "^4.1.2",
     "mocha": "^8.2.1",
-    "ts-node": "^4.1.0"
+    "ts-node": "^4.1.0",
+    "typescript": "4.1.5"
   }
 }

src/classes/card.ts

@@ -1,63 +1,80 @@
-import { IAbility } from '../interfaces/ability';
-import { IAncientTrait } from '../interfaces/ancientTrait';
-import { IAttack } from '../interfaces/attack';
-import { ICard } from '../interfaces/card';
-import { IQuery } from '../interfaces/query';
-import { IResistance } from '../interfaces/resistance';
-import { IWeakness } from '../interfaces/weakness';
-import { QueryBuilder } from '../queryBuilder';
+import { IAbility } from "../interfaces/ability";
+import { IAncientTrait } from "../interfaces/ancientTrait";
+import { IAttack } from "../interfaces/attack";
+import { ICard } from "../interfaces/card";
+import { ICardImage } from "../interfaces/image";
+import { ICardmarket } from "../interfaces/cardmarket";
+import { ILegality } from "../interfaces/legality";
+import { IQuery } from "../interfaces/query";
+import { IResistance } from "../interfaces/resistance";
+import { ISet } from "../interfaces/set";
+import { ITCGPlayer } from "../interfaces/tcgplayer";
+import { IWeakness } from "../interfaces/weakness";
+import { QueryBuilder } from "../queryBuilder";
 
 export class Card implements ICard {
-  ability: IAbility;
-  artist: string;
-  ancientTrait?: IAncientTrait;
-  attacks: IAttack[];
-  convertedRetreatCost: number;
-  evolvesFrom: string;
-  hp: string;
   id: string;
-  imageUrl: string;
-  imageUrlHiRes: string;
   name: string;
-  nationalPokedexNumber: number;
-  number: string;
-  rarity: string;
-  resistances: IResistance[];
-  retreatCost: string[];
-  series: string;
-  set: string;
-  setCode: string;
-  subtype: string;
   supertype: string;
-  text: string[];
-  types: string[];
-  weaknesses: IWeakness[];
+  subtypes: string[];
+  hp?: string;
+  types?: string[];
+  evolesFrom?: string;
+  evolvesTo?: string[];
+  rules?: string[];
+  ancientTrait?: IAncientTrait;
+  abilities?: IAbility[];
+  attacks?: IAttack[];
+  weaknesses?: IWeakness[];
+  resistances?: IResistance[];
+  retreatCost?: string[];
+  convertedRetreatCost?: number;
+  set: ISet;
+  number: string;
+  artist?: string;
+  rarity: string;
+  flavorText?: string;
+  nationalPokedexNumbers?: number[];
+  legalities: ILegality;
+  regulationMark?: string;
+  images: ICardImage;
+  tcgplayer?: ITCGPlayer;
+  cardmarket?: ICardmarket;
 
   resource(): string {
-    return 'cards';
+    return "cards";
   }
 
+  /**
+   * @deprecated `Card.find` is renamed to `findCardById` in version 2. See the **[migration guide](https://github.com/acupoftee/pokemon-tcg-sdk-typescript/blob/master/MIGRATING.md)** for more info.
+   */
   static async find(id: string): Promise<Card> {
     return QueryBuilder.find(this, id)
-      .then(response => {
+      .then((response) => {
         return response;
       })
-      .catch(error => Promise.reject(error));
+      .catch((error) => Promise.reject(error));
   }
 
+  /**
+   * @deprecated `Card.all` is renamed to `getAllCards` in version 2. See the **[migration guide](https://github.com/acupoftee/pokemon-tcg-sdk-typescript/blob/master/MIGRATING.md)** for more info.
+   */
   static async all(): Promise<Card[]> {
     return QueryBuilder.all(this)
-      .then(response => {
+      .then((response) => {
         return response;
       })
-      .catch(error => Promise.reject(error));
+      .catch((error) => Promise.reject(error));
   }
 
+  /**
+   * @deprecated `Card.where` is renamed to `findCardsByQueries` in version 2. See the **[migration guide](https://github.com/acupoftee/pokemon-tcg-sdk-typescript/blob/master/MIGRATING.md)** for more info.
+   */
   static async where(params: IQuery[]): Promise<Card[]> {
     return QueryBuilder.where(this, params)
-      .then(response => {
+      .then((response) => {
         return response;
       })
-      .catch(error => Promise.reject(error));
+      .catch((error) => Promise.reject(error));
   }
-}
+}

src/classes/meta.ts

@@ -1,15 +1,35 @@
 import { Client } from '../client';
 
 export class Meta {
+  /**
+   * @deprecated `allTypes` is renamed to `getAllTypes` in version 2. See the **[migration guide](https://github.com/acupoftee/pokemon-tcg-sdk-typescript/blob/master/MIGRATING.md)** for more info.
+   */
   static async allTypes(): Promise<string[]> {
-    return Client.get('types');
+    const resposne = await Client.get('types');
+    return resposne;
   }
 
+  /**
+   * @deprecated `allSubtypes` is renamed to `getAllSubtypes` in version 2. See the **[migration guide](https://github.com/acupoftee/pokemon-tcg-sdk-typescript/blob/master/MIGRATING.md)** for more info.
+   */
   static async allSubtypes(): Promise<string[]> {
-    return Client.get('subtypes');
+    const response = await Client.get('subtypes');
+    return response;
   }
 
+  /**
+   * @deprecated `allSupertypes` is renamed to `getAllSupertypes` in version 2. See the **[migration guide](https://github.com/acupoftee/pokemon-tcg-sdk-typescript/blob/master/MIGRATING.md)** for more info.
+   */
   static async allSupertypes(): Promise<string[]> {
-    return Client.get('supertypes');
+    const response = await Client.get('supertypes');
+    return response;
   }
-}
+
+  /**
+   * @deprecated `allRarities` is renamed to `getAllRarities` in version 2. See the **[migration guide](https://github.com/acupoftee/pokemon-tcg-sdk-typescript/blob/master/MIGRATING.md)** for more info.
+   */
+  static async allRarities(): Promise<string[]> {
+    const response = await Client.get('rarities');
+    return response;
+  }
+}

src/classes/set.ts

@@ -1,24 +1,28 @@
 import { ISet } from '../interfaces/set';
 import { IQuery } from '../interfaces/query';
 import { QueryBuilder } from '../queryBuilder';
+import { ILegality } from '../interfaces/legality';
+import { ISetImage } from '../interfaces/image';
 
 export class Set implements ISet {
-  code: string;
-  expandedLegal: boolean;
-  logoUrl: string;
-  name: string;
+  id: string;
+  images: ISetImage;
+  legalities: ILegality;
+  name:  string;
+  printedTotal: number;
   ptcgoCode: string;
   releaseDate: string;
-  series: string;
-  standardLegal: boolean;
-  symbolUrl: string;
-  totalCards: number;
+  series:  string;
+  total: number;
   updatedAt: string;
 
   resource(): string {
     return 'sets';
   }
 
+  /**
+   * @deprecated `Set.find` is renamed to `findSetById` in version 2. See the **[migration guide](https://github.com/acupoftee/pokemon-tcg-sdk-typescript/blob/master/MIGRATING.md)** for more info.
+   */
   static async find(id: string): Promise<Set> {
     return QueryBuilder.find(this, id)
       .then(response => {
@@ -27,6 +31,9 @@ export class Set implements ISet {
       .catch(error => Promise.reject(error));
   }
 
+  /**
+   * @deprecated `Set.all` is renamed to `getAllSets` in version 2. See the **[migration guide](https://github.com/acupoftee/pokemon-tcg-sdk-typescript/blob/master/MIGRATING.md)** for more info.
+   */
   static async all(): Promise<Set[]> {
     return QueryBuilder.all(this)
       .then(response => {
@@ -35,6 +42,9 @@ export class Set implements ISet {
       .catch(error => Promise.reject(error));
   }
 
+  /**
+   * @deprecated `Set.where` is renamed to `findSetsByQueries` in version 2. See the **[migration guide](https://github.com/acupoftee/pokemon-tcg-sdk-typescript/blob/master/MIGRATING.md)** for more info.
+   */
   static async where(params: IQuery[]): Promise<Set[]> {
     return QueryBuilder.where(this, params)
       .then(response => {
@@ -42,4 +52,4 @@ export class Set implements ISet {
       })
       .catch(error => Promise.reject(error));
   }
-}
+}

src/client.ts

@@ -7,12 +7,17 @@ export class Client {
 
   static async get(resource: string, params?: IQuery[] | string): Promise<any> {
     let url: string = `${this.apiUrl}/${resource}`;
+    const POKEMONTCG_API_KEY  = process.env.POKEMONTCG_API_KEY;
     const config: axios.AxiosRequestConfig = {
       headers: {
         'Content-Type': 'application/json'
       }
     };
 
+    if (POKEMONTCG_API_KEY) {
+      config.headers['X-Api-Key'] = POKEMONTCG_API_KEY;
+  }
+
     if(typeof params === 'string') url += `/${params}`;
     else url += `?${this.paramsToQuery(params)}`;
 
@@ -34,4 +39,4 @@ export class Client {
 
     return query;
   }
-}
+}

src/interfaces/attack.ts

@@ -1,5 +1,5 @@
 export interface IAttack {
-  convertedEnergyCost: string;
+  convertedEnergyCost: number;
   cost: string[];
   damage: string;
   name: string;

src/interfaces/card.ts

@@ -1,32 +1,40 @@
-import { IAbility } from '../interfaces/ability';
-import { IAncientTrait } from './ancientTrait';
-import { IAttack } from '../interfaces/attack';
-import { IResistance } from '../interfaces/resistance';
-import { IWeakness } from '../interfaces/weakness';
+import { IAbility } from "../interfaces/ability";
+import { IAncientTrait } from "./ancientTrait";
+import { IAttack } from "../interfaces/attack";
+import { IResistance } from "../interfaces/resistance";
+import { IWeakness } from "../interfaces/weakness";
+import { ICardImage } from "./image";
+import { ICardmarket } from "./cardmarket";
+import { ILegality } from "./legality";
+import { ISet } from "./set";
+import { ITCGPlayer } from "./tcgplayer";
 
 export interface ICard {
-  ability: IAbility;
-  ancientTrait?: IAncientTrait;
-  artist: string;
-  attacks: IAttack[];
-  convertedRetreatCost: number;
-  evolvesFrom: string;
-  hp: string;
   id: string;
-  imageUrl: string;
-  imageUrlHiRes: string;
   name: string;
-  nationalPokedexNumber: number;
-  number: string;
-  rarity: string;
-  resistances: IResistance[];
-  retreatCost: string[];
-  series: string;
-  set: string;
-  setCode: string;
-  subtype: string;
   supertype: string;
-  text: string[];
-  types: string[];
-  weaknesses: IWeakness[];
-}
+  subtypes: string[];
+  hp?: string;
+  types?: string[];
+  evolvesFrom?: string;
+  evolvesTo?: string[];
+  rules?: string[];
+  ancientTrait?: IAncientTrait;
+  abilities?: IAbility[];
+  attacks?: IAttack[];
+  weaknesses?: IWeakness[];
+  resistances?: IResistance[];
+  retreatCost?: string[];
+  convertedRetreatCost?: number;
+  set: ISet;
+  number: string;
+  artist?: string;
+  rarity: string;
+  flavorText?: string;
+  nationalPokedexNumbers?: number[];
+  legalities: ILegality;
+  regulationMark?: string;
+  images: ICardImage;
+  tcgplayer?: ITCGPlayer;
+  cardmarket?: ICardmarket;
+}

src/interfaces/cardmarket.ts

@@ -0,0 +1,21 @@
+export interface ICardmarket {
+  url: string;
+  updatedAt: string;
+  prices: {
+    averageSellPrice: number | null
+    lowPrice: number | null
+    trendPrice: number | null
+    germanProLow: number | null
+    suggestedPrice: number | null
+    reverseHoloSell: number | null
+    reverseHoloLow: number | null
+    reverseHoloTrend: number | null
+    lowPriceExPlus: number | null
+    avg1: number | null
+    avg7: number | null
+    avg30: number | null
+    reverseHoloAvg1: number | null
+    reverseHoloAvg7: number | null
+    reverseHoloAvg30: number | null
+  }
+}

src/interfaces/image.ts

@@ -0,0 +1,9 @@
+export interface ISetImage {
+  symbol: string;
+  logo: string;
+}
+
+export interface ICardImage {
+  small: string;
+  large: string;
+}

src/interfaces/legality.ts

@@ -0,0 +1,10 @@
+export enum Legality {
+  LEGAL = 'Legal',
+  BANNED = 'Banned',
+}
+
+export interface ILegality {
+  expanded: Legality | undefined
+  standard: Legality | undefined
+  unlimited: Legality | undefined
+}

src/interfaces/set.ts

@@ -1,14 +1,15 @@
+import { ISetImage } from "./image";
+import { ILegality } from "./legality";
+
 export interface ISet {
-  code: string;
-  expandedLegal: boolean;
-  logoUrl: string;
-  name: string;
+  id: string;
+  images: ISetImage;
+  legalities: ILegality;
+  name:  string;
+  printedTotal: number;
   ptcgoCode: string;
   releaseDate: string;
-  series: string;
-  standardLegal: boolean;
-  symbolUrl: string;
-  totalCards: number;
+  series:  string;
+  total: number;
   updatedAt: string;
-  updatedSince: string;
 }

src/interfaces/tcgplayer.ts

@@ -0,0 +1,19 @@
+export interface ITCGPlayer {
+  url: string;
+  updatedAt: string;
+  prices: {
+    normal: IPrice | undefined;
+    holofoil: IPrice | undefined;
+    reverseHolofoil: IPrice | undefined;
+    '1stEditionNormal': IPrice | undefined;
+    '1stEditionHolofoil': IPrice | undefined;
+  }
+}
+
+export interface IPrice {
+  low: number | null
+  mid: number | null
+  high: number | null
+  market: number | null
+  directLow: number | null
+}

src/queryBuilder.ts

@@ -8,7 +8,7 @@ export class QueryBuilder {
         const t = new type();
         const params: IQuery[] = [{
             name: 'pageSize',
-            value: 1000
+            value: 250,
         }];
 
         return Client.get(t.resource(), params);

src/sdk.ts

@@ -1,6 +1,6 @@
 // Constants
 export const API_URL: string = 'https://api.pokemontcg.io';
-export const API_VERSION: string = '1';
+export const API_VERSION: string = '2';
 
 // Classes
 export * from './classes/card';
@@ -11,6 +11,7 @@ export * from './classes/meta';
 export * from './interfaces/ability';
 export * from './interfaces/attack';
 export * from './interfaces/card';
+export * from './interfaces/set';
 export * from './interfaces/query';
 export * from './interfaces/resistance';
 export * from './interfaces/weakness';

tsconfig.json

@@ -6,9 +6,13 @@
     "outDir": "./dist",
     "sourceMap": true,
     "experimentalDecorators": true,
-    "lib": ["ES2015"]
+    "lib": ["ES6"]
   },
   "include": [
     "src/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules",
+    "coverage"
   ]
 }