From 94cfed900d3d6c43b0fca1217d9d640421c39fe9 Mon Sep 17 00:00:00 2001 From: CptSpaceToaster Date: Sat, 12 Oct 2019 13:42:55 -0400 Subject: [PATCH] Update package name for easier use --- .gitignore | 3 ++- .npmignore | 4 +++- README.md | 1 - npm-debug.log | 28 ---------------------------- package-lock.json | 2 +- package.json | 4 ++-- src/classes/card.ts | 2 -- src/classes/meta.ts | 2 -- src/classes/set.ts | 2 -- src/client.ts | 4 ++-- src/index.ts | 45 ++------------------------------------------- src/queryBuilder.ts | 1 - src/sdk.ts | 20 ++++++++++++++++---- 13 files changed, 28 insertions(+), 90 deletions(-) delete mode 100644 npm-debug.log diff --git a/.gitignore b/.gitignore index 76add87..69694e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules -dist \ No newline at end of file +dist +*.tgz diff --git a/.npmignore b/.npmignore index 3e00276..aceb1cd 100644 --- a/.npmignore +++ b/.npmignore @@ -1,2 +1,4 @@ +src tsconfig.json -src \ No newline at end of file +dist/coverage +*.tgz diff --git a/README.md b/README.md index eaf4a00..c1520c9 100644 --- a/README.md +++ b/README.md @@ -147,4 +147,3 @@ PokemonTCG.Card.all() ## TODO * Add more testing? -* Update package name for easier use? \ No newline at end of file diff --git a/npm-debug.log b/npm-debug.log deleted file mode 100644 index a8cc2c9..0000000 --- a/npm-debug.log +++ /dev/null @@ -1,28 +0,0 @@ -0 info it worked if it ends with ok -1 verbose cli [ '/usr/bin/node', '/usr/bin/npm', 'version', 'patch' ] -2 info using npm@3.5.2 -3 info using node@v6.11.4 -4 info git [ 'status', '--porcelain' ] -5 verbose stack Error: Git working directory not clean. -5 verbose stack M README.md -5 verbose stack M src/index.ts -5 verbose stack at /usr/share/npm/lib/version.js:172:21 -5 verbose stack at ChildProcess.exithandler (child_process.js:189:7) -5 verbose stack at emitTwo (events.js:106:13) -5 verbose stack at ChildProcess.emit (events.js:191:7) -5 verbose stack at maybeClose (internal/child_process.js:920:16) -5 verbose stack at Socket. (internal/child_process.js:351:11) -5 verbose stack at emitOne (events.js:96:13) -5 verbose stack at Socket.emit (events.js:188:7) -5 verbose stack at Pipe._handle.close [as _onclose] (net.js:497:12) -6 verbose cwd /home/bradyn/Projects/pokemon-tcg-sdk-typescript -7 error Linux 4.13.0-21-generic -8 error argv "/usr/bin/node" "/usr/bin/npm" "version" "patch" -9 error node v6.11.4 -10 error npm v3.5.2 -11 error Git working directory not clean. -11 error M README.md -11 error M src/index.ts -12 error If you need help, you may report this error at: -12 error -13 verbose exit [ 1, true ] diff --git a/package-lock.json b/package-lock.json index 83d83f0..7fb778e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pokemon-tcg-sdk-typescript", - "version": "1.1.0", + "version": "1.2.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 403ab35..161b7bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pokemon-tcg-sdk-typescript", - "version": "1.2.1", + "version": "1.2.2", "description": "Typescript SDK for the PokemonTCG API (https://pokemontcg.io)", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -12,7 +12,7 @@ ], "scripts": { "test": "mocha --reporter spec --require ts-node/register 'src/**/*.test.ts'", - "build" : "tsc" + "build": "tsc" }, "author": "Bradyn Glines", "repository": { diff --git a/src/classes/card.ts b/src/classes/card.ts index 48504ab..a2a2185 100644 --- a/src/classes/card.ts +++ b/src/classes/card.ts @@ -31,8 +31,6 @@ export class Card implements ICard { types: string[]; weaknesses: IWeakness[]; - constructor() {} - resource(): string { return 'cards'; } diff --git a/src/classes/meta.ts b/src/classes/meta.ts index 9aad76f..8e3d3c2 100644 --- a/src/classes/meta.ts +++ b/src/classes/meta.ts @@ -1,8 +1,6 @@ import { Client } from '../client'; export class Meta { - constructor() {} - static allTypes(): Promise { return Client.get('types'); } diff --git a/src/classes/set.ts b/src/classes/set.ts index 6f88c9a..dd5b941 100644 --- a/src/classes/set.ts +++ b/src/classes/set.ts @@ -15,8 +15,6 @@ export class Set implements ISet { totalCards: number; updatedAt: string; - constructor() {} - resource(): string { return 'sets'; } diff --git a/src/client.ts b/src/client.ts index 0ad1445..24524d3 100644 --- a/src/client.ts +++ b/src/client.ts @@ -1,9 +1,9 @@ import * as axios from 'axios'; -import { PokemonTCG } from './sdk'; +import { API_URL, API_VERSION } from './sdk'; import { IQuery } from './interfaces/query'; export class Client { - static apiUrl: string = `${PokemonTCG.API_URL}/v${PokemonTCG.version}`; + static apiUrl: string = `${API_URL}/v${API_VERSION}`; static get(resource: string, params?: IQuery[] | string): Promise { let url: string = `${this.apiUrl}/${resource}`; diff --git a/src/index.ts b/src/index.ts index 561e90c..af5ff41 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,43 +1,2 @@ -import { Card as BaseCard } from './classes/card'; -import { Meta as BaseMeta } from './classes/meta'; -import { Set as BaseSet } from './classes/set'; - -export namespace PokemonTCG { - export const Card = BaseCard; - export type Card = BaseCard; - - export const Meta = BaseMeta; - export type Meta = BaseMeta; - - export const Set = BaseSet; - export type Set = BaseSet; - - export interface IAbility { - name: string; - text: string; - type: string; - } - - export interface IAttack { - convertedEnergyCost: string; - cost: string[]; - damage: string; - name: string; - text: string; - } - - export interface IQuery { - name: string; - value: string | number; - } - - export interface IResistance { - type: string; - value: string; - } - - export interface IWeakness { - type: string; - value: string; - } -} \ No newline at end of file +import * as PokemonTCG from './sdk'; +export { PokemonTCG }; diff --git a/src/queryBuilder.ts b/src/queryBuilder.ts index 09b65d7..53f48cc 100644 --- a/src/queryBuilder.ts +++ b/src/queryBuilder.ts @@ -2,7 +2,6 @@ import { Client } from './client'; import { Card } from "./classes/card"; import { Set } from "./classes/set"; import { IQuery } from './interfaces/query'; -import { AxiosResponse } from 'axios'; export class QueryBuilder { static all(type: (new () => T)): Promise { diff --git a/src/sdk.ts b/src/sdk.ts index 12159d1..24df52b 100644 --- a/src/sdk.ts +++ b/src/sdk.ts @@ -1,4 +1,16 @@ -export namespace PokemonTCG { - export const API_URL: string = 'https://api.pokemontcg.io'; - export const version: string = '1'; -} \ No newline at end of file +// Constants +export const API_URL: string = 'https://api.pokemontcg.io'; +export const API_VERSION: string = '1'; + +// Classes +export * from './classes/card'; +export * from './classes/set'; +export * from './classes/meta'; + +// Interfaces +export * from './interfaces/ability'; +export * from './interfaces/attack'; +export * from './interfaces/card'; +export * from './interfaces/query'; +export * from './interfaces/resistance'; +export * from './interfaces/weakness';