diff --git a/package.json b/package.json index d142d36..d4b2194 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@dzeio/logger": "^2.0.0-alpha.0", "@dzeio/object-util": "^1.0.4", "@dzeio/queue": "^1.2.0", - "@tcgdex/sdk": "^2.0.0-alpha.3", + "@tcgdex/sdk": "^2.0.0-beta.4", "@types/glob": "^7.1.1", "@types/node": "^15.0.1", "@types/node-fetch": "^2.5.7", diff --git a/utils/setUtil.ts b/utils/setUtil.ts index d88ca2a..9606ec5 100644 --- a/utils/setUtil.ts +++ b/utils/setUtil.ts @@ -70,6 +70,7 @@ export async function setToSetSimple(set: Set, lang: SupportedLanguages): Promis } export async function setToSetSingle(set: Set, lang: SupportedLanguages): Promise { + const cards = await getCards(lang, set) const pics = await getSetPictures(set, lang) return { name: set.name[lang] as string, @@ -81,7 +82,11 @@ export async function setToSetSingle(set: Set, lang: SupportedLanguages): Promis tcgOnline: set.tcgOnline, cardCount: { total: set.cardCount.total, - official: set.cardCount.official + official: set.cardCount.official, + normal: cards.reduce((count, card) => count + (card[1].variants?.normal ?? set.variants?.normal ? 1 : 0), 0), + reverse: cards.reduce((count, card) => count + (card[1].variants?.reverse ?? set.variants?.reverse ? 1 : 0), 0), + holo: cards.reduce((count, card) => count + (card[1].variants?.holo ?? set.variants?.holo ? 1 : 0), 0), + firstEd: cards.reduce((count, card) => count + (card[1].variants?.firstEdition ?? set.variants?.firstEdition ? 1 : 0), 0), }, releaseDate: set.releaseDate, legal: set.legal && { @@ -90,6 +95,6 @@ export async function setToSetSingle(set: Set, lang: SupportedLanguages): Promis }, logo: pics[0], symbol: pics[1], - cards: await Promise.all((await getCards(lang, set)).map(([id, card]) => cardToCardSimple(id, card, lang))) + cards: await Promise.all(cards.map(([id, card]) => cardToCardSimple(id, card, lang))) } } diff --git a/yarn.lock b/yarn.lock index ac19a31..5df0ed8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,10 +19,10 @@ resolved "https://registry.yarnpkg.com/@dzeio/queue/-/queue-1.2.0.tgz#cc61133f182f4b15267f974c63a7a9e4591365f5" integrity sha512-YCDgMy41bYH7Rn5nIuH5T3W30Up69LhVqKm5IbK0ybjqyf90Sb9qeRpyqbtG+CV6kQnakhpkcr8ZqtRQWCVtrQ== -"@tcgdex/sdk@^2.0.0-alpha.3": - version "2.0.0-beta.3" - resolved "https://registry.yarnpkg.com/@tcgdex/sdk/-/sdk-2.0.0-beta.3.tgz#07d439830f39478f1b42731ff39794bb0a8767ef" - integrity sha512-KaDmKBovcrTJlKjhtum1KE/+7lTvRuN6QEixhpuy8KS58udHKlLCY+od+Wn3gfYZTRxNzgbShDKIbQ5nMD8Faw== +"@tcgdex/sdk@^2.0.0-beta.4": + version "2.0.0-beta.4" + resolved "https://registry.yarnpkg.com/@tcgdex/sdk/-/sdk-2.0.0-beta.4.tgz#dc3fdab6a20fcbc314955c9fb04c3d8d5963d78b" + integrity sha512-iTtjf0Xb8Nj8i6NNit3jB/L+jrIZyIqm1C63I0YW+sGWlUdpuq4yDdgyyiscCCP6gRdlh8nsNwN6KkkYGXVDYg== dependencies: isomorphic-unfetch "^3.1.0"