From 8d5e2b40769e004bd77e1d2aca1ea5f64e65694d Mon Sep 17 00:00:00 2001
From: Mikko <40822203+mikko-o@users.noreply.github.com>
Date: Mon, 27 Sep 2021 12:02:26 +0300
Subject: [PATCH] Extend supported json formats

Accept either a token metadata array (Token[]) or {token: Token[]}
---
 src/analysis.ts        | 4 ++--
 src/scripts/analyse.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/analysis.ts b/src/analysis.ts
index 795dc6a..735f213 100644
--- a/src/analysis.ts
+++ b/src/analysis.ts
@@ -47,9 +47,9 @@ type Counts = {
  * @returns Collection with rarity data
  */
 export const analyse = (
-  t: Array<Record<string, string | number | Attribute[]>>
+  c: Array<Record<string, string | number | Attribute[]>> | { tokens: Array<Record<string, string | number | Attribute[]>> }
 ): Collection => {
-  const tokens: Token[] = preprocess(t)
+  const tokens: Token[] = preprocess('tokens' in c ? c.tokens : c)
   const n = tokens.length
   let traitTypes = getTraitTypeSet(tokens)
 
diff --git a/src/scripts/analyse.ts b/src/scripts/analyse.ts
index 337b69d..84bd79b 100644
--- a/src/scripts/analyse.ts
+++ b/src/scripts/analyse.ts
@@ -25,7 +25,7 @@ const argv = yargs(process.argv.slice(2)).options({
 if ('json' in argv) {
   console.log('Analysing data...')
   const rawData = readFileSync(argv.json, { encoding: 'utf-8' })
-  const tokens: Token[] = JSON.parse(rawData)
+  const tokens: Token[] | { tokens: Token[] } = JSON.parse(rawData)
   const collection = analyse(tokens)
 
   if (argv.saveJson) {