From 744d600b6550419734f0aef0b287171fe502ba23 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Fri, 12 Apr 2024 16:20:26 -0700
Subject: [PATCH 01/21] [WIP] analytics

---
 lib/commands/analytics/index.js | 121 ++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 lib/commands/analytics/index.js

diff --git a/lib/commands/analytics/index.js b/lib/commands/analytics/index.js
new file mode 100644
index 00000000..47d2ec5a
--- /dev/null
+++ b/lib/commands/analytics/index.js
@@ -0,0 +1,121 @@
+/* eslint-disable no-console */
+
+import meow from 'meow'
+import ora from 'ora'
+
+import { outputFlags, validationFlags } from '../../flags/index.js'
+// import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api-helpers.js'
+import { InputError } from '../../utils/errors.js'
+import { printFlagList } from '../../utils/formatting.js'
+import { FREE_API_KEY, getDefaultKey, setupSdk } from '../../utils/sdk.js'
+
+/** @type {import('../../utils/meow-with-subcommands').CliSubcommand} */
+export const analytics = {
+  description: 'Look up analytics data',
+  async run (argv, importMeta, { parentName }) {
+    const name = parentName + ' analytics'
+
+    const input = setupCommand(name, analytics.description, argv, importMeta)
+    if (input) {
+      const spinner = ora("Fetching analytics data").start()
+      console.log(input)
+      if(input.scope === 'org'){
+        await fetchOrgAnalyticsData(input.time, spinner)
+      } else {
+        // await fetchRepoAnalyticsData(input.time, spinner)
+      }
+    }
+  }
+}
+
+// Internal functions
+
+/**
+ * @typedef CommandContext
+ * @property {string} scope 
+ * @property {string} time 
+ */
+
+/**
+ * @param {string} name
+ * @param {string} description
+ * @param {readonly string[]} argv
+ * @param {ImportMeta} importMeta
+ * @returns {void|CommandContext}
+ */
+function setupCommand (name, description, argv, importMeta) {
+  const flags = {
+    ...outputFlags,
+    ...validationFlags,
+  }
+
+  const cli = meow(`
+    Usage
+      $ ${name} <scope> <time>
+
+    Options
+      ${printFlagList(flags, 6)}
+
+    Examples
+      $ ${name} org 7
+      $ ${name} org 30
+  `, {
+    argv,
+    description,
+    importMeta,
+    flags
+  })
+
+  const scope = cli.input[0]
+
+  if(!scope){
+    throw new InputError("Please provide a scope to get analytics data")
+  }
+
+  if(!cli.input.length){
+    throw new InputError("Please provide a scope and a time to get analytics data")
+  }
+
+  if(scope && !['org', 'repo'].includes(scope)){
+    throw new InputError("The scope must either be 'scope' or 'repo'")
+  }
+  const time = cli.input[1]
+
+  if(!time){
+    throw new InputError("Please provide a time to get analytics data")
+  }
+
+  if (time && !['7','30','60'].includes(time)) {
+    throw new InputError('The time filter must either be 7, 30 or 60')
+  }
+
+    return {
+        scope, time
+    }
+}
+
+// /**
+//  * @typedef AnalyticsData
+//  * @property {import('@socketsecurity/sdk').SocketSdkReturnType<'getOrgAnalytics'>["data"]} data
+//  */
+
+/**
+ * @param {string} time
+ * @param {import('ora').Ora} spinner
+ * @returns {Promise<void>}
+ */
+// * @returns {Promise<void|AnalyticsData>}
+async function fetchOrgAnalyticsData (time, spinner) {
+  const socketSdk = await setupSdk(getDefaultKey() || FREE_API_KEY)
+  console.table(time)
+
+//   const result = await handleApiCall(socketSdk.getOrgAnalytics(time), 'fetching analytics data')
+  
+//   if (result.success === false) {
+    // return handleUnsuccessfulApiResponse('getOrgAnalytics', result, spinner)
+//   }
+
+//   return {
+  
+//   }
+}

From 1c6bd4fcb7664df85a075a37eb794f65d8f8fda7 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Mon, 15 Apr 2024 14:31:34 -0700
Subject: [PATCH 02/21] start implementing an analytics command

---
 lib/commands/analytics/index.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/commands/analytics/index.js b/lib/commands/analytics/index.js
index 47d2ec5a..23955423 100644
--- a/lib/commands/analytics/index.js
+++ b/lib/commands/analytics/index.js
@@ -7,7 +7,7 @@ import { outputFlags, validationFlags } from '../../flags/index.js'
 // import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api-helpers.js'
 import { InputError } from '../../utils/errors.js'
 import { printFlagList } from '../../utils/formatting.js'
-import { FREE_API_KEY, getDefaultKey, setupSdk } from '../../utils/sdk.js'
+// import { FREE_API_KEY, getDefaultKey, setupSdk } from '../../utils/sdk.js'
 
 /** @type {import('../../utils/meow-with-subcommands').CliSubcommand} */
 export const analytics = {
@@ -17,9 +17,9 @@ export const analytics = {
 
     const input = setupCommand(name, analytics.description, argv, importMeta)
     if (input) {
-      const spinner = ora("Fetching analytics data").start()
+      const spinner = ora('Fetching analytics data').start()
       console.log(input)
-      if(input.scope === 'org'){
+      if (input.scope === 'org') {
         await fetchOrgAnalyticsData(input.time, spinner)
       } else {
         // await fetchRepoAnalyticsData(input.time, spinner)
@@ -32,8 +32,8 @@ export const analytics = {
 
 /**
  * @typedef CommandContext
- * @property {string} scope 
- * @property {string} time 
+ * @property {string} scope
+ * @property {string} time
  */
 
 /**
@@ -68,24 +68,24 @@ function setupCommand (name, description, argv, importMeta) {
 
   const scope = cli.input[0]
 
-  if(!scope){
-    throw new InputError("Please provide a scope to get analytics data")
+  if (!scope) {
+    throw new InputError('Please provide a scope to get analytics data')
   }
 
-  if(!cli.input.length){
-    throw new InputError("Please provide a scope and a time to get analytics data")
+  if (!cli.input.length) {
+    throw new InputError('Please provide a scope and a time to get analytics data')
   }
 
-  if(scope && !['org', 'repo'].includes(scope)){
+  if (scope && !['org', 'repo'].includes(scope)) {
     throw new InputError("The scope must either be 'scope' or 'repo'")
   }
   const time = cli.input[1]
 
-  if(!time){
-    throw new InputError("Please provide a time to get analytics data")
+  if (!time) {
+    throw new InputError('Please provide a time to get analytics data')
   }
 
-  if (time && !['7','30','60'].includes(time)) {
+  if (time && !['7', '30', '60'].includes(time)) {
     throw new InputError('The time filter must either be 7, 30 or 60')
   }
 
@@ -106,16 +106,17 @@ function setupCommand (name, description, argv, importMeta) {
  */
 // * @returns {Promise<void|AnalyticsData>}
 async function fetchOrgAnalyticsData (time, spinner) {
-  const socketSdk = await setupSdk(getDefaultKey() || FREE_API_KEY)
+//   const socketSdk = await setupSdk(getDefaultKey() || FREE_API_KEY)
   console.table(time)
+  console.log(spinner)
 
 //   const result = await handleApiCall(socketSdk.getOrgAnalytics(time), 'fetching analytics data')
-  
+
 //   if (result.success === false) {
     // return handleUnsuccessfulApiResponse('getOrgAnalytics', result, spinner)
 //   }
 
 //   return {
-  
+
 //   }
 }

From 42ba0c5cb88a1069b83b361fd408de54c2a11c45 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Tue, 7 May 2024 13:59:43 -0700
Subject: [PATCH 03/21] fetch data and display it in a table

---
 lib/commands/analytics/index.js | 38 +++++++++++++++++----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/lib/commands/analytics/index.js b/lib/commands/analytics/index.js
index 23955423..8e059f4d 100644
--- a/lib/commands/analytics/index.js
+++ b/lib/commands/analytics/index.js
@@ -4,10 +4,10 @@ import meow from 'meow'
 import ora from 'ora'
 
 import { outputFlags, validationFlags } from '../../flags/index.js'
-// import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api-helpers.js'
+import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api-helpers.js'
 import { InputError } from '../../utils/errors.js'
 import { printFlagList } from '../../utils/formatting.js'
-// import { FREE_API_KEY, getDefaultKey, setupSdk } from '../../utils/sdk.js'
+import { getDefaultKey, setupSdk } from '../../utils/sdk.js'
 
 /** @type {import('../../utils/meow-with-subcommands').CliSubcommand} */
 export const analytics = {
@@ -18,7 +18,6 @@ export const analytics = {
     const input = setupCommand(name, analytics.description, argv, importMeta)
     if (input) {
       const spinner = ora('Fetching analytics data').start()
-      console.log(input)
       if (input.scope === 'org') {
         await fetchOrgAnalyticsData(input.time, spinner)
       } else {
@@ -94,29 +93,32 @@ function setupCommand (name, description, argv, importMeta) {
     }
 }
 
-// /**
-//  * @typedef AnalyticsData
-//  * @property {import('@socketsecurity/sdk').SocketSdkReturnType<'getOrgAnalytics'>["data"]} data
-//  */
+/**
+ * @typedef AnalyticsData
+ * @property {import('@socketsecurity/sdk').SocketSdkReturnType<'getOrgAnalytics'>["data"]} data
+ */
 
 /**
  * @param {string} time
  * @param {import('ora').Ora} spinner
  * @returns {Promise<void>}
  */
-// * @returns {Promise<void|AnalyticsData>}
 async function fetchOrgAnalyticsData (time, spinner) {
-//   const socketSdk = await setupSdk(getDefaultKey() || FREE_API_KEY)
-  console.table(time)
-  console.log(spinner)
+  const socketSdk = await setupSdk(getDefaultKey())
+  const result = await handleApiCall(socketSdk.getOrgAnalytics(time), 'fetching analytics data')
 
-//   const result = await handleApiCall(socketSdk.getOrgAnalytics(time), 'fetching analytics data')
-
-//   if (result.success === false) {
-    // return handleUnsuccessfulApiResponse('getOrgAnalytics', result, spinner)
-//   }
+  if (result.success === false) {
+    return handleUnsuccessfulApiResponse('getOrgAnalytics', result, spinner)
+  }
 
-//   return {
+  const formattedData = result.data.map(d => {
+    const formattedDate = new Date(d.created_at).toLocaleDateString()
+    return {
+      ...d,
+      created_at: formattedDate,
+    }
+  })
+  const data = {...formattedData.flat(1)}
 
-//   }
+  console.table(data, ['created_at', 'repository_name', 'total_critical_alerts', 'total_high_alerts', 'total_critical_added', 'total_high_added', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented', 'top_five_alert_types'])
 }

From 7f9d779f244ec8965d23ec6563cb1189a07a5e59 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Tue, 7 May 2024 14:37:52 -0700
Subject: [PATCH 04/21] fix lint

---
 lib/commands/analytics/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/commands/analytics/index.js b/lib/commands/analytics/index.js
index 8e059f4d..0fc6842a 100644
--- a/lib/commands/analytics/index.js
+++ b/lib/commands/analytics/index.js
@@ -118,7 +118,7 @@ async function fetchOrgAnalyticsData (time, spinner) {
       created_at: formattedDate,
     }
   })
-  const data = {...formattedData.flat(1)}
+  const data = { ...formattedData.flat(1) }
 
   console.table(data, ['created_at', 'repository_name', 'total_critical_alerts', 'total_high_alerts', 'total_critical_added', 'total_high_added', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented', 'top_five_alert_types'])
 }

From 8ce85e55380e8091448979f5642599f0202e9c43 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Wed, 8 May 2024 11:22:45 -0700
Subject: [PATCH 05/21] add command for repo level analytics

---
 lib/commands/analytics/index.js | 71 +++++++++++++++++++++++++++++----
 1 file changed, 64 insertions(+), 7 deletions(-)

diff --git a/lib/commands/analytics/index.js b/lib/commands/analytics/index.js
index 0fc6842a..20e61a8a 100644
--- a/lib/commands/analytics/index.js
+++ b/lib/commands/analytics/index.js
@@ -1,5 +1,6 @@
 /* eslint-disable no-console */
 
+import chalk from 'chalk'
 import meow from 'meow'
 import ora from 'ora'
 
@@ -21,7 +22,9 @@ export const analytics = {
       if (input.scope === 'org') {
         await fetchOrgAnalyticsData(input.time, spinner)
       } else {
-        // await fetchRepoAnalyticsData(input.time, spinner)
+        if (input.repo) {
+          await fetchRepoAnalyticsData(input.repo, input.time, spinner)
+        }
       }
     }
   }
@@ -33,6 +36,7 @@ export const analytics = {
  * @typedef CommandContext
  * @property {string} scope
  * @property {string} time
+ * @property {string|undefined} repo
  */
 
 /**
@@ -78,7 +82,10 @@ function setupCommand (name, description, argv, importMeta) {
   if (scope && !['org', 'repo'].includes(scope)) {
     throw new InputError("The scope must either be 'scope' or 'repo'")
   }
-  const time = cli.input[1]
+
+  const repo = scope === 'repo' ? cli.input[1] : undefined
+
+  const time = scope === 'repo' ? cli.input[2] : cli.input[1]
 
   if (!time) {
     throw new InputError('Please provide a time to get analytics data')
@@ -88,13 +95,13 @@ function setupCommand (name, description, argv, importMeta) {
     throw new InputError('The time filter must either be 7, 30 or 60')
   }
 
-    return {
-        scope, time
-    }
+  return {
+      scope, time, repo
+  }
 }
 
 /**
- * @typedef AnalyticsData
+ * @typedef OrgAnalyticsData
  * @property {import('@socketsecurity/sdk').SocketSdkReturnType<'getOrgAnalytics'>["data"]} data
  */
 
@@ -111,6 +118,53 @@ async function fetchOrgAnalyticsData (time, spinner) {
     return handleUnsuccessfulApiResponse('getOrgAnalytics', result, spinner)
   }
 
+  // const formattedData = result.data.map(d => {
+  //   const formattedDate = new Date(d.created_at).toLocaleDateString()
+  //   return {
+  //     ...d,
+  //     created_at: formattedDate,
+  //   }
+  // })
+  // const data = { ...formattedData.flat(1) }
+
+  // const test = result.data.reduce((acc, current) => {
+  //   if (acc[current.created_at]) {
+  //     acc[current.created_at].total_critical_alerts += acc[current.created_at].total_critical_alerts
+  //   } else {
+  //     acc[current.created_at] = current
+  //   }
+
+  //   return acc
+  // }, {})
+
+  // console.log(test)
+
+  // console.log('\n')
+  // console.table(data, ['created_at', 'repository_name', 'total_critical_alerts', 'total_high_alerts', 'top_five_alert_types'])
+  // console.table(data, ['created_at', 'repository_name', 'total_critical_added', 'total_high_added'])
+  // console.table(data, ['created_at', 'repository_name', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented'])
+}
+
+/**
+ * @typedef RepoAnalyticsData
+ * @property {import('@socketsecurity/sdk').SocketSdkReturnType<'getRepoAnalytics'>["data"]} data
+ */
+
+/**
+ * @param {string} repo
+ * @param {string} time
+ * @param {import('ora').Ora} spinner
+ * @returns {Promise<void>}
+ */
+async function fetchRepoAnalyticsData (repo, time, spinner) {
+  const socketSdk = await setupSdk(getDefaultKey())
+  const result = await handleApiCall(socketSdk.getRepoAnalytics(repo, time), 'fetching analytics data')
+
+  if (result.success === false) {
+    return handleUnsuccessfulApiResponse('getRepoAnalytics', result, spinner)
+  }
+  spinner.stop()
+
   const formattedData = result.data.map(d => {
     const formattedDate = new Date(d.created_at).toLocaleDateString()
     return {
@@ -120,5 +174,8 @@ async function fetchOrgAnalyticsData (time, spinner) {
   })
   const data = { ...formattedData.flat(1) }
 
-  console.table(data, ['created_at', 'repository_name', 'total_critical_alerts', 'total_high_alerts', 'total_critical_added', 'total_high_added', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented', 'top_five_alert_types'])
+  console.log(chalk.bgMagenta.white.bold(`\n Analytics data for ${repo} over the last ${time} days: \n`))
+  console.table(data, ['created_at', 'total_critical_alerts', 'total_high_alerts', 'top_five_alert_types'])
+  console.table(data, ['created_at', 'total_critical_added', 'total_high_added'])
+  console.table(data, ['created_at', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented'])
 }

From 00583c84cfae668266ace8e5f1de178d201d5b31 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Wed, 8 May 2024 11:51:50 -0700
Subject: [PATCH 06/21] add org level table

---
 lib/commands/analytics/index.js | 52 +++++++++++++++++----------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/lib/commands/analytics/index.js b/lib/commands/analytics/index.js
index 20e61a8a..b3317704 100644
--- a/lib/commands/analytics/index.js
+++ b/lib/commands/analytics/index.js
@@ -118,31 +118,33 @@ async function fetchOrgAnalyticsData (time, spinner) {
     return handleUnsuccessfulApiResponse('getOrgAnalytics', result, spinner)
   }
 
-  // const formattedData = result.data.map(d => {
-  //   const formattedDate = new Date(d.created_at).toLocaleDateString()
-  //   return {
-  //     ...d,
-  //     created_at: formattedDate,
-  //   }
-  // })
-  // const data = { ...formattedData.flat(1) }
-
-  // const test = result.data.reduce((acc, current) => {
-  //   if (acc[current.created_at]) {
-  //     acc[current.created_at].total_critical_alerts += acc[current.created_at].total_critical_alerts
-  //   } else {
-  //     acc[current.created_at] = current
-  //   }
-
-  //   return acc
-  // }, {})
-
-  // console.log(test)
-
-  // console.log('\n')
-  // console.table(data, ['created_at', 'repository_name', 'total_critical_alerts', 'total_high_alerts', 'top_five_alert_types'])
-  // console.table(data, ['created_at', 'repository_name', 'total_critical_added', 'total_high_added'])
-  // console.table(data, ['created_at', 'repository_name', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented'])
+  spinner.stop()
+
+  const data = result.data.reduce((/** @type {{ [key: string]: any }} */ acc, current) => {
+    const formattedDate = new Date(current.created_at).toLocaleDateString()
+
+    if (acc[formattedDate]) {
+      acc[formattedDate].total_critical_alerts += current.total_critical_alerts
+      acc[formattedDate].total_high_alerts += current.total_high_alerts
+      acc[formattedDate].total_critical_added += current.total_critical_added
+      acc[formattedDate].total_high_added += current.total_high_added
+      acc[formattedDate].total_critical_prevented += current.total_critical_prevented
+      acc[formattedDate].total_high_prevented += current.total_high_prevented
+      acc[formattedDate].total_medium_prevented += current.total_medium_prevented
+      acc[formattedDate].total_low_prevented += current.total_low_prevented
+      // acc[formattedDate].top_five_alert_types += current.top_five_alert_types
+    } else {
+      acc[formattedDate] = current
+      acc[formattedDate].created_at = formattedDate
+    }
+
+    return acc
+  }, {})
+
+  console.log(chalk.bgMagenta.white.bold(`\n Analytics data for the organization over the last ${time} days: \n`))
+  console.table(data, ['repository_name', 'total_critical_alerts', 'total_high_alerts', 'top_five_alert_types'])
+  console.table(data, ['repository_name', 'total_critical_added', 'total_high_added'])
+  console.table(data, ['repository_name', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented'])
 }
 
 /**

From ff1c5757338aebb75b5ace6e936c43739b0b02e2 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Mon, 19 Aug 2024 12:49:31 -0700
Subject: [PATCH 07/21] rebase

---
 lib/commands/analytics/index.js => src/commands/analytics.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/commands/analytics/index.js => src/commands/analytics.ts (100%)

diff --git a/lib/commands/analytics/index.js b/src/commands/analytics.ts
similarity index 100%
rename from lib/commands/analytics/index.js
rename to src/commands/analytics.ts

From 106abaac6061ec3f1425526d4ceb9e7d421b4b02 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Wed, 21 Aug 2024 14:17:14 -0700
Subject: [PATCH 08/21] update command to typescript

---
 src/commands/analytics.ts | 69 ++++++++++++---------------------------
 1 file changed, 20 insertions(+), 49 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index b3317704..5821f2bb 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -1,17 +1,17 @@
-/* eslint-disable no-console */
-
 import chalk from 'chalk'
 import meow from 'meow'
 import ora from 'ora'
 
-import { outputFlags, validationFlags } from '../../flags/index.js'
-import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api-helpers.js'
-import { InputError } from '../../utils/errors.js'
-import { printFlagList } from '../../utils/formatting.js'
-import { getDefaultKey, setupSdk } from '../../utils/sdk.js'
+import { outputFlags, validationFlags } from '../flags'
+import { handleApiCall, handleUnsuccessfulApiResponse } from '../utils/api-helpers'
+import { InputError } from '../utils/errors'
+import { printFlagList } from '../utils/formatting'
+import { getDefaultKey, setupSdk } from '../utils/sdk'
+
+import type { CliSubcommand } from '../utils/meow-with-subcommands'
+import type { Ora } from "ora"
 
-/** @type {import('../../utils/meow-with-subcommands').CliSubcommand} */
-export const analytics = {
+export const analytics: CliSubcommand = {
   description: 'Look up analytics data',
   async run (argv, importMeta, { parentName }) {
     const name = parentName + ' analytics'
@@ -32,22 +32,14 @@ export const analytics = {
 
 // Internal functions
 
-/**
- * @typedef CommandContext
- * @property {string} scope
- * @property {string} time
- * @property {string|undefined} repo
- */
-
-/**
- * @param {string} name
- * @param {string} description
- * @param {readonly string[]} argv
- * @param {ImportMeta} importMeta
- * @returns {void|CommandContext}
- */
-function setupCommand (name, description, argv, importMeta) {
-  const flags = {
+type CommandContext = {
+  scope: string
+  time: string
+  repo: string | undefined
+}
+
+function setupCommand (name: string, description: string, argv: readonly string[], importMeta: ImportMeta): void|CommandContext {
+  const flags: { [key: string]: any } = {
     ...outputFlags,
     ...validationFlags,
   }
@@ -100,17 +92,7 @@ function setupCommand (name, description, argv, importMeta) {
   }
 }
 
-/**
- * @typedef OrgAnalyticsData
- * @property {import('@socketsecurity/sdk').SocketSdkReturnType<'getOrgAnalytics'>["data"]} data
- */
-
-/**
- * @param {string} time
- * @param {import('ora').Ora} spinner
- * @returns {Promise<void>}
- */
-async function fetchOrgAnalyticsData (time, spinner) {
+async function fetchOrgAnalyticsData (time: string, spinner: Ora): Promise<void> {
   const socketSdk = await setupSdk(getDefaultKey())
   const result = await handleApiCall(socketSdk.getOrgAnalytics(time), 'fetching analytics data')
 
@@ -120,7 +102,7 @@ async function fetchOrgAnalyticsData (time, spinner) {
 
   spinner.stop()
 
-  const data = result.data.reduce((/** @type {{ [key: string]: any }} */ acc, current) => {
+  const data = result.data.reduce((acc: { [key: string]: any }, current) => {
     const formattedDate = new Date(current.created_at).toLocaleDateString()
 
     if (acc[formattedDate]) {
@@ -147,18 +129,7 @@ async function fetchOrgAnalyticsData (time, spinner) {
   console.table(data, ['repository_name', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented'])
 }
 
-/**
- * @typedef RepoAnalyticsData
- * @property {import('@socketsecurity/sdk').SocketSdkReturnType<'getRepoAnalytics'>["data"]} data
- */
-
-/**
- * @param {string} repo
- * @param {string} time
- * @param {import('ora').Ora} spinner
- * @returns {Promise<void>}
- */
-async function fetchRepoAnalyticsData (repo, time, spinner) {
+async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora): Promise<void> {
   const socketSdk = await setupSdk(getDefaultKey())
   const result = await handleApiCall(socketSdk.getRepoAnalytics(repo, time), 'fetching analytics data')
 

From a2bcbd0bf0fbcc905c87b041dc272ce5b7851dca Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Thu, 22 Aug 2024 12:08:57 -0700
Subject: [PATCH 09/21] wip

---
 src/commands/analytics.ts | 57 +++++++++++++++++++++++++++++----------
 src/commands/index.ts     |  1 +
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index 5821f2bb..84ecba43 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -1,10 +1,12 @@
 import chalk from 'chalk'
 import meow from 'meow'
 import ora from 'ora'
+// @ts-ignore
+import chalkTable from 'chalk-table'
 
 import { outputFlags, validationFlags } from '../flags'
 import { handleApiCall, handleUnsuccessfulApiResponse } from '../utils/api-helpers'
-import { InputError } from '../utils/errors'
+import { AuthError, InputError } from '../utils/errors'
 import { printFlagList } from '../utils/formatting'
 import { getDefaultKey, setupSdk } from '../utils/sdk'
 
@@ -18,12 +20,16 @@ export const analytics: CliSubcommand = {
 
     const input = setupCommand(name, analytics.description, argv, importMeta)
     if (input) {
+      const apiKey = getDefaultKey()
+      if(!apiKey){
+        throw new AuthError("User must be authenticated to run this command. To log in, run the command `socket login` and enter your API key.")
+      }
       const spinner = ora('Fetching analytics data').start()
       if (input.scope === 'org') {
-        await fetchOrgAnalyticsData(input.time, spinner)
+        await fetchOrgAnalyticsData(input.time, spinner, apiKey)
       } else {
         if (input.repo) {
-          await fetchRepoAnalyticsData(input.repo, input.time, spinner)
+          await fetchRepoAnalyticsData(input.repo, input.time, spinner, apiKey)
         }
       }
     }
@@ -92,8 +98,8 @@ function setupCommand (name: string, description: string, argv: readonly string[
   }
 }
 
-async function fetchOrgAnalyticsData (time: string, spinner: Ora): Promise<void> {
-  const socketSdk = await setupSdk(getDefaultKey())
+async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string): Promise<void> {
+  const socketSdk = await setupSdk(apiKey)
   const result = await handleApiCall(socketSdk.getOrgAnalytics(time), 'fetching analytics data')
 
   if (result.success === false) {
@@ -123,14 +129,26 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora): Promise<void>
     return acc
   }, {})
 
-  console.log(chalk.bgMagenta.white.bold(`\n Analytics data for the organization over the last ${time} days: \n`))
-  console.table(data, ['repository_name', 'total_critical_alerts', 'total_high_alerts', 'top_five_alert_types'])
-  console.table(data, ['repository_name', 'total_critical_added', 'total_high_added'])
-  console.table(data, ['repository_name', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented'])
+
+  const options = {
+    columns: [
+      { field: 'created_at', name: chalk.cyan('Date') },
+      { field: 'total_critical_alerts', name: chalk.cyan('Critical alerts') },
+      { field: 'total_high_alerts', name: chalk.cyan('High alerts') },
+      { field: 'total_critical_added', name: chalk.cyan('Critical alerts added') },
+      { field: 'total_high_added', name: chalk.cyan('High alerts added') },
+      { field: 'total_critical_prevented', name: chalk.cyan('Critical alerts prevented') },
+      { field: 'total_medium_prevented', name: chalk.cyan('Medium alerts prevented') },
+      { field: 'total_low_prevented', name: chalk.cyan('Low alerts prevented') },
+    ]
+  }
+
+  console.log(chalk.bgMagenta.white.bold(`\n Analytics data at the organization level over the last ${time} days (indicated in total amount): \n`))
+  console.log(`${chalkTable(options, Object.values(data))}\n`)
 }
 
-async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora): Promise<void> {
-  const socketSdk = await setupSdk(getDefaultKey())
+async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora, apiKey: string): Promise<void> {
+  const socketSdk = await setupSdk(apiKey)
   const result = await handleApiCall(socketSdk.getRepoAnalytics(repo, time), 'fetching analytics data')
 
   if (result.success === false) {
@@ -147,8 +165,19 @@ async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora)
   })
   const data = { ...formattedData.flat(1) }
 
+  const options = {
+    columns: [
+      { field: 'created_at', name: chalk.cyan('Date') },
+      { field: 'total_critical_alerts', name: chalk.cyan('Critical alerts') },
+      { field: 'total_high_alerts', name: chalk.cyan('High alerts') },
+      { field: 'total_critical_added', name: chalk.cyan('Critical alerts added') },
+      { field: 'total_high_added', name: chalk.cyan('High alerts added') },
+      { field: 'total_critical_prevented', name: chalk.cyan('Critical alerts prevented') },
+      { field: 'total_medium_prevented', name: chalk.cyan('Medium alerts prevented') },
+      { field: 'total_low_prevented', name: chalk.cyan('Low alerts prevented') },
+    ]
+  }
+
   console.log(chalk.bgMagenta.white.bold(`\n Analytics data for ${repo} over the last ${time} days: \n`))
-  console.table(data, ['created_at', 'total_critical_alerts', 'total_high_alerts', 'top_five_alert_types'])
-  console.table(data, ['created_at', 'total_critical_added', 'total_high_added'])
-  console.table(data, ['created_at', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented'])
+  console.log(`${chalkTable(options, Object.values(data))}\n`)
 }
diff --git a/src/commands/index.ts b/src/commands/index.ts
index e8c75477..cacb9ce1 100644
--- a/src/commands/index.ts
+++ b/src/commands/index.ts
@@ -13,3 +13,4 @@ export * from './scan'
 export * from './audit-log'
 export * from './repos'
 export * from './dependencies'
+export * from './analytics'

From 5abc0da5e2ddf67c76c48e740a8314d85dbe235f Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Thu, 22 Aug 2024 14:42:10 -0700
Subject: [PATCH 10/21] wip

---
 package.json              |   2 +
 src/commands/analytics.ts | 104 +++++++++++++++++++++++++-------------
 2 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 9bc3a0c6..2f19aa9b 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,8 @@
     "@socketsecurity/config": "^2.1.3",
     "@socketsecurity/sdk": "^1.2.0",
     "ansi-align": "^3.0.1",
+    "blessed": "^0.1.81",
+    "blessed-contrib": "^4.11.0",
     "chalk-table": "^1.0.2",
     "cli-boxes": "^3.0.0",
     "cli-spinners": "^2.9.2",
diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index 84ecba43..3c5450db 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -1,8 +1,12 @@
+// @ts-nocheck
+// @ts-ignore
+import blessed from 'blessed'
+import contrib from 'blessed-contrib'
 import chalk from 'chalk'
-import meow from 'meow'
-import ora from 'ora'
 // @ts-ignore
 import chalkTable from 'chalk-table'
+import meow from 'meow'
+import ora from 'ora'
 
 import { outputFlags, validationFlags } from '../flags'
 import { handleApiCall, handleUnsuccessfulApiResponse } from '../utils/api-helpers'
@@ -108,43 +112,71 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string
 
   spinner.stop()
 
-  const data = result.data.reduce((acc: { [key: string]: any }, current) => {
-    const formattedDate = new Date(current.created_at).toLocaleDateString()
-
-    if (acc[formattedDate]) {
-      acc[formattedDate].total_critical_alerts += current.total_critical_alerts
-      acc[formattedDate].total_high_alerts += current.total_high_alerts
-      acc[formattedDate].total_critical_added += current.total_critical_added
-      acc[formattedDate].total_high_added += current.total_high_added
-      acc[formattedDate].total_critical_prevented += current.total_critical_prevented
-      acc[formattedDate].total_high_prevented += current.total_high_prevented
-      acc[formattedDate].total_medium_prevented += current.total_medium_prevented
-      acc[formattedDate].total_low_prevented += current.total_low_prevented
-      // acc[formattedDate].top_five_alert_types += current.top_five_alert_types
-    } else {
-      acc[formattedDate] = current
-      acc[formattedDate].created_at = formattedDate
-    }
+  // const data = result.data.reduce((acc: { [key: string]: any }, current) => {
+  //   const formattedDate = new Date(current.created_at).toLocaleDateString()
+
+  //   if (acc[formattedDate]) {
+  //     acc[formattedDate].total_critical_alerts += current.total_critical_alerts
+  //     acc[formattedDate].total_high_alerts += current.total_high_alerts
+  //     acc[formattedDate].total_critical_added += current.total_critical_added
+  //     acc[formattedDate].total_high_added += current.total_high_added
+  //     acc[formattedDate].total_critical_prevented += current.total_critical_prevented
+  //     acc[formattedDate].total_high_prevented += current.total_high_prevented
+  //     acc[formattedDate].total_medium_prevented += current.total_medium_prevented
+  //     acc[formattedDate].total_low_prevented += current.total_low_prevented
+  //     // acc[formattedDate].top_five_alert_types += current.top_five_alert_types
+  //   } else {
+  //     acc[formattedDate] = current
+  //     acc[formattedDate].created_at = formattedDate
+  //   }
+
+  //   return acc
+  // }, {})
+
+
+  // const options = {
+  //   columns: [
+  //     { field: 'created_at', name: chalk.cyan('Date') },
+  //     { field: 'total_critical_alerts', name: chalk.cyan('Critical alerts') },
+  //     { field: 'total_high_alerts', name: chalk.cyan('High alerts') },
+  //     { field: 'total_critical_added', name: chalk.cyan('Critical alerts added') },
+  //     { field: 'total_high_added', name: chalk.cyan('High alerts added') },
+  //     { field: 'total_critical_prevented', name: chalk.cyan('Critical alerts prevented') },
+  //     { field: 'total_medium_prevented', name: chalk.cyan('Medium alerts prevented') },
+  //     { field: 'total_low_prevented', name: chalk.cyan('Low alerts prevented') },
+  //   ]
+  // }
+
+  // console.log(chalk.bgMagenta.white.bold(`\n Analytics data at the organization level over the last ${time} days (indicated in total amount): \n`))
+  // console.log(`${chalkTable(options, Object.values(data))}\n`)
+
+  const screen = blessed.screen()
+  // eslint-disable-next-line
+  const grid = new contrib.grid({rows: 1, cols: 2, screen})
+
+  const line = grid.set(0, 0, 1, 1, contrib.line,
+    { style:
+      { line: "yellow"
+      , text: "green"
+      , baseline: "black"}
+    , xLabelPadding: 3
+    , xPadding: 5
+    , label: 'Stocks'})
+
+  // const map = grid.set(0, 1, 1, 1, contrib.map, {label: 'Servers Location'})
+
+  const lineData = {
+    x: ['t1', 't2', 't3', 't4'],
+    y: [5, 1, 7, 5]
+  }
 
-    return acc
-  }, {})
+  line.setData([lineData])
 
+  screen.key(['escape', 'q', 'C-c'], function(ch, key) {
+    return process.exit(0);
+  });
 
-  const options = {
-    columns: [
-      { field: 'created_at', name: chalk.cyan('Date') },
-      { field: 'total_critical_alerts', name: chalk.cyan('Critical alerts') },
-      { field: 'total_high_alerts', name: chalk.cyan('High alerts') },
-      { field: 'total_critical_added', name: chalk.cyan('Critical alerts added') },
-      { field: 'total_high_added', name: chalk.cyan('High alerts added') },
-      { field: 'total_critical_prevented', name: chalk.cyan('Critical alerts prevented') },
-      { field: 'total_medium_prevented', name: chalk.cyan('Medium alerts prevented') },
-      { field: 'total_low_prevented', name: chalk.cyan('Low alerts prevented') },
-    ]
-  }
-
-  console.log(chalk.bgMagenta.white.bold(`\n Analytics data at the organization level over the last ${time} days (indicated in total amount): \n`))
-  console.log(`${chalkTable(options, Object.values(data))}\n`)
+  screen.render()
 }
 
 async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora, apiKey: string): Promise<void> {

From 146d094fe12c01e3d7750e8ee35ae50ec2154012 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Fri, 23 Aug 2024 14:14:58 -0700
Subject: [PATCH 11/21] wip

---
 .dep-stats.json           |   4 +
 package-lock.json         | 487 +++++++++++++++++++++++++++++++++++++-
 src/commands/analytics.ts | 103 +++++---
 3 files changed, 553 insertions(+), 41 deletions(-)

diff --git a/.dep-stats.json b/.dep-stats.json
index d9502afc..19f395af 100644
--- a/.dep-stats.json
+++ b/.dep-stats.json
@@ -5,6 +5,8 @@
     "@inquirer/prompts": "^5.3.2",
     "@socketsecurity/config": "^2.1.3",
     "@socketsecurity/sdk": "^1.2.0",
+    "blessed": "^0.1.81",
+    "blessed-contrib": "^4.11.0",
     "chalk-table": "^1.0.2",
     "hpagent": "^1.2.0",
     "ignore": "^5.3.1",
@@ -89,6 +91,8 @@
     "@socketsecurity/config": "^2.1.3",
     "@socketsecurity/sdk": "^1.2.0",
     "ansi-align": "^3.0.1",
+    "blessed": "^0.1.81",
+    "blessed-contrib": "^4.11.0",
     "chalk-table": "^1.0.2",
     "cli-boxes": "^3.0.0",
     "cli-spinners": "^2.9.2",
diff --git a/package-lock.json b/package-lock.json
index 4df135a0..e7914042 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,8 @@
         "@socketsecurity/config": "^2.1.3",
         "@socketsecurity/sdk": "^1.2.0",
         "ansi-align": "^3.0.1",
+        "blessed": "^0.1.81",
+        "blessed-contrib": "^4.11.0",
         "chalk-table": "^1.0.2",
         "cli-boxes": "^3.0.0",
         "cli-spinners": "^2.9.2",
@@ -2236,6 +2238,16 @@
       "license": "(Apache-2.0 AND BSD-3-Clause)",
       "optional": true
     },
+    "node_modules/@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
@@ -6283,6 +6295,21 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/ansi-term": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/ansi-term/-/ansi-term-0.0.2.tgz",
+      "integrity": "sha512-jLnGE+n8uAjksTJxiWZf/kcUmXq+cRWSl550B9NmQ8YiqaTM+lILcSe5dHdp8QkJPhaOghDjnMKwyYSMjosgAA==",
+      "license": "ISC",
+      "dependencies": {
+        "x256": ">=0.0.1"
+      }
+    },
+    "node_modules/ansicolors": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz",
+      "integrity": "sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==",
+      "license": "MIT"
+    },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -6746,6 +6773,104 @@
         "readable-stream": "^3.4.0"
       }
     },
+    "node_modules/blessed": {
+      "version": "0.1.81",
+      "resolved": "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz",
+      "integrity": "sha512-LoF5gae+hlmfORcG1M5+5XZi4LBmvlXTzwJWzUlPryN/SJdSflZvROM2TwkT0GMpq7oqT48NRd4GS7BiVBc5OQ==",
+      "license": "MIT",
+      "bin": {
+        "blessed": "bin/tput.js"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/blessed-contrib": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.11.0.tgz",
+      "integrity": "sha512-P00Xji3xPp53+FdU9f74WpvnOAn/SS0CKLy4vLAf5Ps7FGDOTY711ruJPZb3/7dpFuP+4i7f4a/ZTZdLlKG9WA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-term": ">=0.0.2",
+        "chalk": "^1.1.0",
+        "drawille-canvas-blessed-contrib": ">=0.1.3",
+        "lodash": "~>=4.17.21",
+        "map-canvas": ">=0.1.5",
+        "marked": "^4.0.12",
+        "marked-terminal": "^5.1.1",
+        "memory-streams": "^0.1.0",
+        "memorystream": "^0.3.1",
+        "picture-tuber": "^1.0.1",
+        "sparkline": "^0.1.1",
+        "strip-ansi": "^3.0.0",
+        "term-canvas": "0.0.5",
+        "x256": ">=0.0.1"
+      }
+    },
+    "node_modules/blessed-contrib/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/blessed-contrib/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/blessed-contrib/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/blessed-contrib/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/blessed-contrib/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/blessed-contrib/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/body-parser": {
       "version": "1.20.2",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
@@ -6942,6 +7067,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/bresenham": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/bresenham/-/bresenham-0.0.3.tgz",
+      "integrity": "sha512-wbMxoJJM1p3+6G7xEFXYNCJ30h2qkwmVxebkbwIl4OcnWtno5R3UT9VuYLfStlVNAQCmRjkGwjPFdfaPd4iNXw==",
+      "license": "MIT"
+    },
     "node_modules/browserslist": {
       "version": "4.23.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
@@ -7035,6 +7166,14 @@
       "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
       "license": "BSD-3-Clause"
     },
+    "node_modules/buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
+      "engines": {
+        "node": ">=0.2.0"
+      }
+    },
     "node_modules/builtin-modules": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
@@ -7357,11 +7496,23 @@
       ],
       "license": "CC-BY-4.0"
     },
+    "node_modules/cardinal": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz",
+      "integrity": "sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==",
+      "license": "MIT",
+      "dependencies": {
+        "ansicolors": "~0.3.2",
+        "redeyed": "~2.1.0"
+      },
+      "bin": {
+        "cdl": "bin/cdl.js"
+      }
+    },
     "node_modules/chalk": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
       "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
@@ -7463,6 +7614,12 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "license": "MIT"
     },
+    "node_modules/charm": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/charm/-/charm-0.1.2.tgz",
+      "integrity": "sha512-syedaZ9cPe7r3hoQA9twWYKu5AIyCswN5+szkmPBe9ccdLrj4bYaCnLVPTLd2kgVRc7+zoX4tyPgRnFKCj5YjQ==",
+      "license": "MIT/X11"
+    },
     "node_modules/cheerio": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz",
@@ -7640,6 +7797,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/cli-table3": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
+      "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
+      "license": "MIT",
+      "dependencies": {
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": "10.* || >= 12.*"
+      },
+      "optionalDependencies": {
+        "@colors/colors": "1.5.0"
+      }
+    },
     "node_modules/cli-truncate": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
@@ -8135,6 +8307,12 @@
         "url": "https://opencollective.com/core-js"
       }
     },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "license": "MIT"
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -8562,6 +8740,25 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/drawille-blessed-contrib": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/drawille-blessed-contrib/-/drawille-blessed-contrib-1.0.0.tgz",
+      "integrity": "sha512-WnHMgf5en/hVOsFhxLI8ZX0qTJmerOsVjIMQmn4cR1eI8nLGu+L7w5ENbul+lZ6w827A3JakCuernES5xbHLzQ==",
+      "license": "MIT"
+    },
+    "node_modules/drawille-canvas-blessed-contrib": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/drawille-canvas-blessed-contrib/-/drawille-canvas-blessed-contrib-0.1.3.tgz",
+      "integrity": "sha512-bdDvVJOxlrEoPLifGDPaxIzFh3cD7QH05ePoQ4fwnqfi08ZSxzEhOUpI5Z0/SQMlWgcCQOEtuw0zrwezacXglw==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-term": ">=0.0.2",
+        "bresenham": "0.0.3",
+        "drawille-blessed-contrib": ">=0.0.1",
+        "gl-matrix": "^2.1.0",
+        "x256": ">=0.0.1"
+      }
+    },
     "node_modules/each-parallel-async": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/each-parallel-async/-/each-parallel-async-1.0.0.tgz",
@@ -9786,6 +9983,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/esquery": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
@@ -9839,6 +10049,29 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/event-stream": {
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-0.9.8.tgz",
+      "integrity": "sha512-o5h0Mp1bkoR6B0i7pTCAzRy+VzdsRWH997KQD4Psb0EOPoKEIiaRx/EsOdUl7p1Ktjw7aIWvweI/OY1R9XrlUg==",
+      "dependencies": {
+        "optimist": "0.2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/event-stream/node_modules/optimist": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz",
+      "integrity": "sha512-Wy7E3cQDpqsTIFyW7m22hSevyTLxw850ahYv7FWsw4G6MIKVTZ8NSA95KBrQ95a4SMsMr1UGUUnwEFKhVaSzIg==",
+      "license": "MIT/X11",
+      "dependencies": {
+        "wordwrap": ">=0.0.1 <0.1.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/events-to-array": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/events-to-array/-/events-to-array-2.0.3.tgz",
@@ -10370,6 +10603,12 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/gl-matrix": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-2.8.1.tgz",
+      "integrity": "sha512-0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw==",
+      "license": "MIT"
+    },
     "node_modules/glob": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz",
@@ -10570,6 +10809,27 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-ansi/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -10607,6 +10867,12 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/here": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/here/-/here-0.0.2.tgz",
+      "integrity": "sha512-U7VYImCTcPoY27TSmzoiFsmWLEqQFaYNdpsPb9K0dXJhE6kufUqycaz51oR09CW85dDU9iWyy7At8M+p7hb3NQ==",
+      "license": "MIT"
+    },
     "node_modules/hosted-git-info": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
@@ -10913,7 +11179,6 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/ini": {
@@ -11465,6 +11730,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "license": "MIT"
+    },
     "node_modules/isbot": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/isbot/-/isbot-3.8.0.tgz",
@@ -12044,6 +12315,60 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/map-canvas": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/map-canvas/-/map-canvas-0.1.5.tgz",
+      "integrity": "sha512-f7M3sOuL9+up0NCOZbb1rQpWDLZwR/ftCiNbyscjl9LUUEwrRaoumH4sz6swgs58lF21DQ0hsYOCw5C6Zz7hbg==",
+      "license": "ISC",
+      "dependencies": {
+        "drawille-canvas-blessed-contrib": ">=0.0.1",
+        "xml2js": "^0.4.5"
+      }
+    },
+    "node_modules/marked": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/marked-terminal": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-5.2.0.tgz",
+      "integrity": "sha512-Piv6yNwAQXGFjZSaiNljyNFw7jKDdGrw70FSbtxEyldLsyeuV5ZHm/1wW++kWbrOF1VPnUgYOhB2oLL0ZpnekA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^6.2.0",
+        "cardinal": "^2.1.1",
+        "chalk": "^5.2.0",
+        "cli-table3": "^0.6.3",
+        "node-emoji": "^1.11.0",
+        "supports-hyperlinks": "^2.3.0"
+      },
+      "engines": {
+        "node": ">=14.13.1 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "marked": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/marked-terminal/node_modules/ansi-escapes": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz",
+      "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/matcher": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
@@ -12066,11 +12391,37 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/memory-streams": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/memory-streams/-/memory-streams-0.1.3.tgz",
+      "integrity": "sha512-qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA==",
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "~1.0.2"
+      }
+    },
+    "node_modules/memory-streams/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/memory-streams/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "license": "MIT"
+    },
     "node_modules/memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
       "integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==",
-      "dev": true,
       "engines": {
         "node": ">= 0.10.0"
       }
@@ -12538,6 +12889,15 @@
         "node": ">=10.5.0"
       }
     },
+    "node_modules/node-emoji": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
+      "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      }
+    },
     "node_modules/node-gyp": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz",
@@ -13045,6 +13405,15 @@
         "opener": "bin/opener-bin.js"
       }
     },
+    "node_modules/optimist": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+      "integrity": "sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==",
+      "license": "MIT/X11",
+      "dependencies": {
+        "wordwrap": "~0.0.2"
+      }
+    },
     "node_modules/optionator": {
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -13518,6 +13887,26 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/picture-tuber": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/picture-tuber/-/picture-tuber-1.0.2.tgz",
+      "integrity": "sha512-49/xq+wzbwDeI32aPvwQJldM8pr7dKDRuR76IjztrkmiCkAQDaWFJzkmfVqCHmt/iFoPFhHmI9L0oKhthrTOQw==",
+      "license": "MIT",
+      "dependencies": {
+        "buffers": "~0.1.1",
+        "charm": "~0.1.0",
+        "event-stream": "~0.9.8",
+        "optimist": "~0.3.4",
+        "png-js": "~0.1.0",
+        "x256": "~0.0.1"
+      },
+      "bin": {
+        "picture-tube": "bin/tube.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/pidtree": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
@@ -13563,6 +13952,11 @@
         "node": ">=4"
       }
     },
+    "node_modules/png-js": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/png-js/-/png-js-0.1.1.tgz",
+      "integrity": "sha512-NTtk2SyfjBm+xYl2/VZJBhFnTQ4kU5qWC7VC4/iGbrgiU4FuB4xC+74erxADYJIqZICOR1HCvRA7EBHkpjTg9g=="
+    },
     "node_modules/polite-json": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/polite-json/-/polite-json-5.0.0.tgz",
@@ -14330,6 +14724,15 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/redeyed": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz",
+      "integrity": "sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==",
+      "license": "MIT",
+      "dependencies": {
+        "esprima": "~4.0.0"
+      }
+    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -15268,6 +15671,39 @@
       "integrity": "sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==",
       "license": "MIT"
     },
+    "node_modules/sparkline": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/sparkline/-/sparkline-0.1.2.tgz",
+      "integrity": "sha512-t//aVOiWt9fi/e22ea1vXVWBDX+gp18y+Ch9sKqmHl828bRfvP2VtfTJVEcgWFBQHd0yDPNQRiHdqzCvbcYSDA==",
+      "dependencies": {
+        "here": "0.0.2",
+        "nopt": "~2.1.2"
+      },
+      "bin": {
+        "sparkline": "bin/sparkline"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/sparkline/node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "license": "ISC"
+    },
+    "node_modules/sparkline/node_modules/nopt": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
+      "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
+      "license": "MIT",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -16334,6 +16770,11 @@
         "node": "20 || >=22"
       }
     },
+    "node_modules/term-canvas": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/term-canvas/-/term-canvas-0.0.5.tgz",
+      "integrity": "sha512-eZ3rIWi5yLnKiUcsW8P79fKyooaLmyLWAGqBhFspqMxRNUiB4GmHHk5AzQ4LxvFbJILaXqQZLwbbATLOhCFwkw=="
+    },
     "node_modules/terminal-link": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-3.0.0.tgz",
@@ -17558,6 +17999,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -17698,6 +18148,15 @@
         }
       }
     },
+    "node_modules/x256": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/x256/-/x256-0.0.2.tgz",
+      "integrity": "sha512-ZsIH+sheoF8YG9YG+QKEEIdtqpHRA9FYuD7MqhfyB1kayXU43RUNBFSxBEnF8ywSUxdg+8no4+bPr5qLbyxKgA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/xdg-basedir": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
@@ -17723,6 +18182,28 @@
         "xml-js": "bin/cli.js"
       }
     },
+    "node_modules/xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "license": "MIT",
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index 3c5450db..ba9b4119 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -112,27 +112,28 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string
 
   spinner.stop()
 
-  // const data = result.data.reduce((acc: { [key: string]: any }, current) => {
-  //   const formattedDate = new Date(current.created_at).toLocaleDateString()
-
-  //   if (acc[formattedDate]) {
-  //     acc[formattedDate].total_critical_alerts += current.total_critical_alerts
-  //     acc[formattedDate].total_high_alerts += current.total_high_alerts
-  //     acc[formattedDate].total_critical_added += current.total_critical_added
-  //     acc[formattedDate].total_high_added += current.total_high_added
-  //     acc[formattedDate].total_critical_prevented += current.total_critical_prevented
-  //     acc[formattedDate].total_high_prevented += current.total_high_prevented
-  //     acc[formattedDate].total_medium_prevented += current.total_medium_prevented
-  //     acc[formattedDate].total_low_prevented += current.total_low_prevented
-  //     // acc[formattedDate].top_five_alert_types += current.top_five_alert_types
-  //   } else {
-  //     acc[formattedDate] = current
-  //     acc[formattedDate].created_at = formattedDate
-  //   }
-
-  //   return acc
-  // }, {})
+  const data = result.data.reduce((acc: { [key: string]: any }, current) => {
+    const formattedDate = new Date(current.created_at).toLocaleDateString()
+
+    if (acc[formattedDate]) {
+      acc[formattedDate].total_critical_alerts += current.total_critical_alerts
+      acc[formattedDate].total_high_alerts += current.total_high_alerts
+      acc[formattedDate].total_critical_added += current.total_critical_added
+      acc[formattedDate].total_high_added += current.total_high_added
+      acc[formattedDate].total_critical_prevented += current.total_critical_prevented
+      acc[formattedDate].total_high_prevented += current.total_high_prevented
+      acc[formattedDate].total_medium_prevented += current.total_medium_prevented
+      acc[formattedDate].total_low_prevented += current.total_low_prevented
+      // acc[formattedDate].top_five_alert_types += current.top_five_alert_types
+    } else {
+      acc[formattedDate] = current
+      acc[formattedDate].created_at = formattedDate
+    }
+
+    return acc
+  }, {})
 
+  // console.log(data)
 
   // const options = {
   //   columns: [
@@ -152,31 +153,33 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string
 
   const screen = blessed.screen()
   // eslint-disable-next-line
-  const grid = new contrib.grid({rows: 1, cols: 2, screen})
+  const grid = new contrib.grid({rows: 4, cols: 4, screen})
 
-  const line = grid.set(0, 0, 1, 1, contrib.line,
-    { style:
-      { line: "yellow"
-      , text: "green"
-      , baseline: "black"}
-    , xLabelPadding: 3
-    , xPadding: 5
-    , label: 'Stocks'})
+  renderLineCharts(grid, screen, 'Critical alerts', [0,0,1,1.5])
+  renderLineCharts(grid, screen, 'High alerts', [0,1.5,1,1.5])
+  renderLineCharts(grid, screen, 'Critical alerts added to main', [1,0,1,2])
+  renderLineCharts(grid, screen, 'High alerts added to main', [1,2,1,2])
+  renderLineCharts(grid, screen, 'Critical alerts prevented from main', [2,0,1,2])
+  renderLineCharts(grid, screen, 'High alerts prevented to main', [2,2,1,2])
 
-  // const map = grid.set(0, 1, 1, 1, contrib.map, {label: 'Servers Location'})
+  const bar = grid.set(3, 0, 1, 1, contrib.bar,
+      { label: 'Top 5 alert types'
+      , barWidth: 4
+      , barSpacing: 6
+      , xOffset: 0
+      , maxHeight: 9})
 
-  const lineData = {
-    x: ['t1', 't2', 't3', 't4'],
-    y: [5, 1, 7, 5]
-  }
+   screen.append(bar) //must append before setting data
 
-  line.setData([lineData])
+   bar.setData(
+      { titles: ['Env vars', 'stuff']
+      , data: [5, 10]})
 
+  screen.render()
+    
   screen.key(['escape', 'q', 'C-c'], function(ch, key) {
     return process.exit(0);
-  });
-
-  screen.render()
+  })
 }
 
 async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora, apiKey: string): Promise<void> {
@@ -213,3 +216,27 @@ async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora,
   console.log(chalk.bgMagenta.white.bold(`\n Analytics data for ${repo} over the last ${time} days: \n`))
   console.log(`${chalkTable(options, Object.values(data))}\n`)
 }
+
+
+const renderLineCharts = (grid, screen, title, coords) => {
+  const line = grid.set(...coords, contrib.line,
+    { style:
+      { line: "cyan"
+      , text: "cyan"
+      , baseline: "black"}
+    , xLabelPadding: 0
+    , xPadding: 0,
+    xOffset: 0,
+    legend: {width: 1}
+    , label: title})
+
+  screen.append(line)
+
+  const lineData = {
+    // x: Object.keys(data),
+    x: ['8/22', '8/21', '8/20', '8/19', '8/18', '8/17', '8/16'].reverse(),
+    y: [0, 0, 0, 0, 0, 12, 50]
+  }
+
+  line.setData([lineData])
+}
\ No newline at end of file

From 21b84d0205aa6a7772b24b5226dd04f278540dc7 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Fri, 23 Aug 2024 14:16:01 -0700
Subject: [PATCH 12/21] wip

---
 src/commands/analytics.ts | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index ba9b4119..eaa01af3 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -112,26 +112,26 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string
 
   spinner.stop()
 
-  const data = result.data.reduce((acc: { [key: string]: any }, current) => {
-    const formattedDate = new Date(current.created_at).toLocaleDateString()
-
-    if (acc[formattedDate]) {
-      acc[formattedDate].total_critical_alerts += current.total_critical_alerts
-      acc[formattedDate].total_high_alerts += current.total_high_alerts
-      acc[formattedDate].total_critical_added += current.total_critical_added
-      acc[formattedDate].total_high_added += current.total_high_added
-      acc[formattedDate].total_critical_prevented += current.total_critical_prevented
-      acc[formattedDate].total_high_prevented += current.total_high_prevented
-      acc[formattedDate].total_medium_prevented += current.total_medium_prevented
-      acc[formattedDate].total_low_prevented += current.total_low_prevented
-      // acc[formattedDate].top_five_alert_types += current.top_five_alert_types
-    } else {
-      acc[formattedDate] = current
-      acc[formattedDate].created_at = formattedDate
-    }
-
-    return acc
-  }, {})
+  // const data = result.data.reduce((acc: { [key: string]: any }, current) => {
+  //   const formattedDate = new Date(current.created_at).toLocaleDateString()
+
+  //   if (acc[formattedDate]) {
+  //     acc[formattedDate].total_critical_alerts += current.total_critical_alerts
+  //     acc[formattedDate].total_high_alerts += current.total_high_alerts
+  //     acc[formattedDate].total_critical_added += current.total_critical_added
+  //     acc[formattedDate].total_high_added += current.total_high_added
+  //     acc[formattedDate].total_critical_prevented += current.total_critical_prevented
+  //     acc[formattedDate].total_high_prevented += current.total_high_prevented
+  //     acc[formattedDate].total_medium_prevented += current.total_medium_prevented
+  //     acc[formattedDate].total_low_prevented += current.total_low_prevented
+  //     // acc[formattedDate].top_five_alert_types += current.top_five_alert_types
+  //   } else {
+  //     acc[formattedDate] = current
+  //     acc[formattedDate].created_at = formattedDate
+  //   }
+
+  //   return acc
+  // }, {})
 
   // console.log(data)
 

From f70d4137573815f1f7c387fae4adcb968ffd2c7a Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Mon, 26 Aug 2024 09:50:16 -0700
Subject: [PATCH 13/21] wip

---
 src/commands/analytics.ts | 80 ++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index eaa01af3..87502e42 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -1,4 +1,3 @@
-// @ts-nocheck
 // @ts-ignore
 import blessed from 'blessed'
 import contrib from 'blessed-contrib'
@@ -112,26 +111,26 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string
 
   spinner.stop()
 
-  // const data = result.data.reduce((acc: { [key: string]: any }, current) => {
-  //   const formattedDate = new Date(current.created_at).toLocaleDateString()
-
-  //   if (acc[formattedDate]) {
-  //     acc[formattedDate].total_critical_alerts += current.total_critical_alerts
-  //     acc[formattedDate].total_high_alerts += current.total_high_alerts
-  //     acc[formattedDate].total_critical_added += current.total_critical_added
-  //     acc[formattedDate].total_high_added += current.total_high_added
-  //     acc[formattedDate].total_critical_prevented += current.total_critical_prevented
-  //     acc[formattedDate].total_high_prevented += current.total_high_prevented
-  //     acc[formattedDate].total_medium_prevented += current.total_medium_prevented
-  //     acc[formattedDate].total_low_prevented += current.total_low_prevented
-  //     // acc[formattedDate].top_five_alert_types += current.top_five_alert_types
-  //   } else {
-  //     acc[formattedDate] = current
-  //     acc[formattedDate].created_at = formattedDate
-  //   }
-
-  //   return acc
-  // }, {})
+  const data = result.data.reduce((acc: { [key: string]: any }, current) => {
+    const formattedDate = new Date(current.created_at).toLocaleDateString()
+
+    if (acc[formattedDate]) {
+      acc[formattedDate].total_critical_alerts += current.total_critical_alerts
+      acc[formattedDate].total_high_alerts += current.total_high_alerts
+      acc[formattedDate].total_critical_added += current.total_critical_added
+      acc[formattedDate].total_high_added += current.total_high_added
+      acc[formattedDate].total_critical_prevented += current.total_critical_prevented
+      acc[formattedDate].total_high_prevented += current.total_high_prevented
+      acc[formattedDate].total_medium_prevented += current.total_medium_prevented
+      acc[formattedDate].total_low_prevented += current.total_low_prevented
+      // acc[formattedDate].top_five_alert_types += current.top_five_alert_types
+    } else {
+      acc[formattedDate] = current
+      acc[formattedDate].created_at = formattedDate
+    }
+
+    return acc
+  }, {})
 
   // console.log(data)
 
@@ -155,29 +154,31 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string
   // eslint-disable-next-line
   const grid = new contrib.grid({rows: 4, cols: 4, screen})
 
-  renderLineCharts(grid, screen, 'Critical alerts', [0,0,1,1.5])
-  renderLineCharts(grid, screen, 'High alerts', [0,1.5,1,1.5])
-  renderLineCharts(grid, screen, 'Critical alerts added to main', [1,0,1,2])
-  renderLineCharts(grid, screen, 'High alerts added to main', [1,2,1,2])
-  renderLineCharts(grid, screen, 'Critical alerts prevented from main', [2,0,1,2])
-  renderLineCharts(grid, screen, 'High alerts prevented to main', [2,2,1,2])
+  renderLineCharts(grid, screen, 'Critical alerts', [0,0,1,1.5], data, 'total_critical_alerts')
+  renderLineCharts(grid, screen, 'High alerts', [0,1.5,1,1.5], data, 'total_high_alerts')
+  renderLineCharts(grid, screen, 'Critical alerts added to main', [1,0,1,2], data, 'total_critical_added')
+  renderLineCharts(grid, screen, 'High alerts added to main', [1,2,1,2], data, 'total_high_added')
+  renderLineCharts(grid, screen, 'Critical alerts prevented from main', [2,0,1,2], data, 'total_critical_prevented')
+  renderLineCharts(grid, screen, 'High alerts prevented to main', [2,2,1,2], data, 'total_high_prevented')
 
-  const bar = grid.set(3, 0, 1, 1, contrib.bar,
+  const bar = grid.set(3, 0, 1, 2, contrib.bar,
       { label: 'Top 5 alert types'
-      , barWidth: 4
-      , barSpacing: 6
+      , barWidth: 10
+      , barSpacing: 20
       , xOffset: 0
-      , maxHeight: 9})
+      , maxHeight: 9, barBgColor: 'magenta' })
 
    screen.append(bar) //must append before setting data
 
+   const top5AlertTypes = Object.values(data)[0].top_five_alert_types
+   
    bar.setData(
-      { titles: ['Env vars', 'stuff']
-      , data: [5, 10]})
+      { titles: Object.keys(top5AlertTypes)
+      , data: Object.values(top5AlertTypes)})
 
   screen.render()
     
-  screen.key(['escape', 'q', 'C-c'], function(ch, key) {
+  screen.key(['escape', 'q', 'C-c'], function() {
     return process.exit(0);
   })
 }
@@ -218,7 +219,11 @@ async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora,
 }
 
 
-const renderLineCharts = (grid, screen, title, coords) => {
+const renderLineCharts = (grid: any, screen: any, title: string, coords: number[], data: {[key: string]: {[key: string]: number | {}}}, label: string) => {
+  const formattedDates = Object.keys(data).map(d => `${new Date(d).getMonth()+1}/${new Date(d).getDate()}`)
+
+  const alertsCounts = Object.values(data).map(d => d[label])
+  
   const line = grid.set(...coords, contrib.line,
     { style:
       { line: "cyan"
@@ -233,9 +238,8 @@ const renderLineCharts = (grid, screen, title, coords) => {
   screen.append(line)
 
   const lineData = {
-    // x: Object.keys(data),
-    x: ['8/22', '8/21', '8/20', '8/19', '8/18', '8/17', '8/16'].reverse(),
-    y: [0, 0, 0, 0, 0, 12, 50]
+    x: formattedDates.reverse(),
+    y: alertsCounts
   }
 
   line.setData([lineData])

From 737fb9bf4390068954e9ac805d5c8d154d1c5c08 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Mon, 26 Aug 2024 10:13:16 -0700
Subject: [PATCH 14/21] improve repo view

---
 src/commands/analytics.ts | 132 ++++++++++++++++++++------------------
 1 file changed, 71 insertions(+), 61 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index 87502e42..19d30ece 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -1,9 +1,6 @@
 // @ts-ignore
 import blessed from 'blessed'
 import contrib from 'blessed-contrib'
-import chalk from 'chalk'
-// @ts-ignore
-import chalkTable from 'chalk-table'
 import meow from 'meow'
 import ora from 'ora'
 
@@ -123,7 +120,6 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string
       acc[formattedDate].total_high_prevented += current.total_high_prevented
       acc[formattedDate].total_medium_prevented += current.total_medium_prevented
       acc[formattedDate].total_low_prevented += current.total_low_prevented
-      // acc[formattedDate].top_five_alert_types += current.top_five_alert_types
     } else {
       acc[formattedDate] = current
       acc[formattedDate].created_at = formattedDate
@@ -132,39 +128,21 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string
     return acc
   }, {})
 
-  // console.log(data)
-
-  // const options = {
-  //   columns: [
-  //     { field: 'created_at', name: chalk.cyan('Date') },
-  //     { field: 'total_critical_alerts', name: chalk.cyan('Critical alerts') },
-  //     { field: 'total_high_alerts', name: chalk.cyan('High alerts') },
-  //     { field: 'total_critical_added', name: chalk.cyan('Critical alerts added') },
-  //     { field: 'total_high_added', name: chalk.cyan('High alerts added') },
-  //     { field: 'total_critical_prevented', name: chalk.cyan('Critical alerts prevented') },
-  //     { field: 'total_medium_prevented', name: chalk.cyan('Medium alerts prevented') },
-  //     { field: 'total_low_prevented', name: chalk.cyan('Low alerts prevented') },
-  //   ]
-  // }
-
-  // console.log(chalk.bgMagenta.white.bold(`\n Analytics data at the organization level over the last ${time} days (indicated in total amount): \n`))
-  // console.log(`${chalkTable(options, Object.values(data))}\n`)
-
   const screen = blessed.screen()
   // eslint-disable-next-line
   const grid = new contrib.grid({rows: 4, cols: 4, screen})
 
-  renderLineCharts(grid, screen, 'Critical alerts', [0,0,1,1.5], data, 'total_critical_alerts')
-  renderLineCharts(grid, screen, 'High alerts', [0,1.5,1,1.5], data, 'total_high_alerts')
-  renderLineCharts(grid, screen, 'Critical alerts added to main', [1,0,1,2], data, 'total_critical_added')
-  renderLineCharts(grid, screen, 'High alerts added to main', [1,2,1,2], data, 'total_high_added')
-  renderLineCharts(grid, screen, 'Critical alerts prevented from main', [2,0,1,2], data, 'total_critical_prevented')
-  renderLineCharts(grid, screen, 'High alerts prevented to main', [2,2,1,2], data, 'total_high_prevented')
+  renderLineCharts(grid, screen, 'Total critical alerts', [0,0,1,2], data, 'total_critical_alerts')
+  renderLineCharts(grid, screen, 'Total high alerts', [0,2,1,2], data, 'total_high_alerts')
+  renderLineCharts(grid, screen, 'Total critical alerts added to main', [1,0,1,2], data, 'total_critical_added')
+  renderLineCharts(grid, screen, 'Total high alerts added to main', [1,2,1,2], data, 'total_high_added')
+  renderLineCharts(grid, screen, 'Total critical alerts prevented from main', [2,0,1,2], data, 'total_critical_prevented')
+  renderLineCharts(grid, screen, 'Total high alerts prevented from main', [2,2,1,2], data, 'total_high_prevented')
 
   const bar = grid.set(3, 0, 1, 2, contrib.bar,
       { label: 'Top 5 alert types'
       , barWidth: 10
-      , barSpacing: 20
+      , barSpacing: 17
       , xOffset: 0
       , maxHeight: 9, barBgColor: 'magenta' })
 
@@ -192,48 +170,80 @@ async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora,
   }
   spinner.stop()
 
-  const formattedData = result.data.map(d => {
-    const formattedDate = new Date(d.created_at).toLocaleDateString()
-    return {
-      ...d,
-      created_at: formattedDate,
+  const data = result.data.reduce((acc: { [key: string]: any }, current) => {
+    const formattedDate = new Date(current.created_at).toLocaleDateString()
+
+    if (acc[formattedDate]) {
+      acc[formattedDate].total_critical_alerts += current.total_critical_alerts
+      acc[formattedDate].total_high_alerts += current.total_high_alerts
+      acc[formattedDate].total_critical_added += current.total_critical_added
+      acc[formattedDate].total_high_added += current.total_high_added
+      acc[formattedDate].total_critical_prevented += current.total_critical_prevented
+      acc[formattedDate].total_high_prevented += current.total_high_prevented
+      acc[formattedDate].total_medium_prevented += current.total_medium_prevented
+      acc[formattedDate].total_low_prevented += current.total_low_prevented
+    } else {
+      acc[formattedDate] = current
+      acc[formattedDate].created_at = formattedDate
     }
-  })
-  const data = { ...formattedData.flat(1) }
-
-  const options = {
-    columns: [
-      { field: 'created_at', name: chalk.cyan('Date') },
-      { field: 'total_critical_alerts', name: chalk.cyan('Critical alerts') },
-      { field: 'total_high_alerts', name: chalk.cyan('High alerts') },
-      { field: 'total_critical_added', name: chalk.cyan('Critical alerts added') },
-      { field: 'total_high_added', name: chalk.cyan('High alerts added') },
-      { field: 'total_critical_prevented', name: chalk.cyan('Critical alerts prevented') },
-      { field: 'total_medium_prevented', name: chalk.cyan('Medium alerts prevented') },
-      { field: 'total_low_prevented', name: chalk.cyan('Low alerts prevented') },
-    ]
-  }
 
-  console.log(chalk.bgMagenta.white.bold(`\n Analytics data for ${repo} over the last ${time} days: \n`))
-  console.log(`${chalkTable(options, Object.values(data))}\n`)
-}
+    return acc
+  }, {})
+
+  const screen = blessed.screen()
+  // eslint-disable-next-line
+  const grid = new contrib.grid({rows: 4, cols: 4, screen})
 
+  renderLineCharts(grid, screen, 'Total critical alerts', [0,0,1,2], data, 'total_critical_alerts')
+  renderLineCharts(grid, screen, 'Total high alerts', [0,2,1,2], data, 'total_high_alerts')
+  renderLineCharts(grid, screen, 'Total critical alerts added to main', [1,0,1,2], data, 'total_critical_added')
+  renderLineCharts(grid, screen, 'Total high alerts added to main', [1,2,1,2], data, 'total_high_added')
+  renderLineCharts(grid, screen, 'Total critical alerts prevented from main', [2,0,1,2], data, 'total_critical_prevented')
+  renderLineCharts(grid, screen, 'Total high alerts prevented from main', [2,2,1,2], data, 'total_high_prevented')
 
-const renderLineCharts = (grid: any, screen: any, title: string, coords: number[], data: {[key: string]: {[key: string]: number | {}}}, label: string) => {
+  const bar = grid.set(3, 0, 1, 2, contrib.bar,
+      { label: 'Top 5 alert types'
+      , barWidth: 10
+      , barSpacing: 17
+      , xOffset: 0
+      , maxHeight: 9, barBgColor: 'magenta' })
+
+   screen.append(bar) //must append before setting data
+
+   const top5AlertTypes = Object.values(data)[0].top_five_alert_types
+   
+   bar.setData(
+      { titles: Object.keys(top5AlertTypes)
+      , data: Object.values(top5AlertTypes)})
+
+  screen.render()
+    
+  screen.key(['escape', 'q', 'C-c'], function() {
+    return process.exit(0);
+  })
+}
+
+const renderLineCharts = (grid: any, screen: any, title: string, coords: number[], data: {[key: string]: {[key: string]: number}}, label: string) => {
   const formattedDates = Object.keys(data).map(d => `${new Date(d).getMonth()+1}/${new Date(d).getDate()}`)
 
   const alertsCounts = Object.values(data).map(d => d[label])
   
   const line = grid.set(...coords, contrib.line,
     { style:
-      { line: "cyan"
-      , text: "cyan"
-      , baseline: "black"}
-    , xLabelPadding: 0
-    , xPadding: 0,
-    xOffset: 0,
-    legend: {width: 1}
-    , label: title})
+      { line: "cyan", 
+        text: "cyan", 
+        baseline: "black"
+      }, 
+      xLabelPadding: 0, 
+      xPadding: 0,
+      xOffset: 0,
+      wholeNumbersOnly: true,
+      legend: {
+        width: 1
+      }, 
+      label: title
+    }
+  )
 
   screen.append(line)
 

From 0897ec7be7a1fc19b6c2078b75f38cc092d8010e Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Mon, 26 Aug 2024 10:25:43 -0700
Subject: [PATCH 15/21] add json ouput flag

---
 src/commands/analytics.ts | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index 19d30ece..a74c20bf 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -26,10 +26,10 @@ export const analytics: CliSubcommand = {
       }
       const spinner = ora('Fetching analytics data').start()
       if (input.scope === 'org') {
-        await fetchOrgAnalyticsData(input.time, spinner, apiKey)
+        await fetchOrgAnalyticsData(input.time, spinner, apiKey, input.outputJson)
       } else {
         if (input.repo) {
-          await fetchRepoAnalyticsData(input.repo, input.time, spinner, apiKey)
+          await fetchRepoAnalyticsData(input.repo, input.time, spinner, apiKey, input.outputJson)
         }
       }
     }
@@ -42,6 +42,7 @@ type CommandContext = {
   scope: string
   time: string
   repo: string | undefined
+  outputJson: boolean
 }
 
 function setupCommand (name: string, description: string, argv: readonly string[], importMeta: ImportMeta): void|CommandContext {
@@ -67,6 +68,10 @@ function setupCommand (name: string, description: string, argv: readonly string[
     flags
   })
 
+  const {
+    json: outputJson
+  } = cli.flags
+
   const scope = cli.input[0]
 
   if (!scope) {
@@ -93,12 +98,12 @@ function setupCommand (name: string, description: string, argv: readonly string[
     throw new InputError('The time filter must either be 7, 30 or 60')
   }
 
-  return {
-      scope, time, repo
+  return <CommandContext>{
+      scope, time, repo, outputJson
   }
 }
 
-async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string): Promise<void> {
+async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
   const socketSdk = await setupSdk(apiKey)
   const result = await handleApiCall(socketSdk.getOrgAnalytics(time), 'fetching analytics data')
 
@@ -128,6 +133,10 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string
     return acc
   }, {})
 
+  if(outputJson){
+    return console.log(data)
+  }
+
   const screen = blessed.screen()
   // eslint-disable-next-line
   const grid = new contrib.grid({rows: 4, cols: 4, screen})
@@ -161,7 +170,7 @@ async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string
   })
 }
 
-async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora, apiKey: string): Promise<void> {
+async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
   const socketSdk = await setupSdk(apiKey)
   const result = await handleApiCall(socketSdk.getRepoAnalytics(repo, time), 'fetching analytics data')
 
@@ -190,6 +199,10 @@ async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora,
     return acc
   }, {})
 
+  if(outputJson){
+    return console.log(data)
+  }
+
   const screen = blessed.screen()
   // eslint-disable-next-line
   const grid = new contrib.grid({rows: 4, cols: 4, screen})

From 3e87983d9774c00d829d9722c7e258c83158935d Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Mon, 26 Aug 2024 12:35:43 -0700
Subject: [PATCH 16/21] wip

---
 src/commands/analytics.ts | 276 +++++++++++++++++++++-----------------
 1 file changed, 156 insertions(+), 120 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index a74c20bf..6d2d427e 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -4,7 +4,7 @@ import contrib from 'blessed-contrib'
 import meow from 'meow'
 import ora from 'ora'
 
-import { outputFlags, validationFlags } from '../flags'
+import { outputFlags } from '../flags'
 import { handleApiCall, handleUnsuccessfulApiResponse } from '../utils/api-helpers'
 import { AuthError, InputError } from '../utils/errors'
 import { printFlagList } from '../utils/formatting'
@@ -12,9 +12,11 @@ import { getDefaultKey, setupSdk } from '../utils/sdk'
 
 import type { CliSubcommand } from '../utils/meow-with-subcommands'
 import type { Ora } from "ora"
+import chalk from 'chalk'
 
 export const analytics: CliSubcommand = {
-  description: 'Look up analytics data',
+  description: `Look up analytics data \n
+  Default parameters are set to show the organization-level analytics over the last 7 days.`,
   async run (argv, importMeta, { parentName }) {
     const name = parentName + ' analytics'
 
@@ -36,31 +38,53 @@ export const analytics: CliSubcommand = {
   }
 }
 
+const analyticsFlags: { [key: string]: any } = {
+  scope: {
+    type: 'string',
+    shortFlag: 's',
+    default: 'org',
+    description: "Scope of the analytics data - either 'org' or 'repo'"
+  },
+  time: {
+    type: 'number',
+    shortFlag: 't',
+    default: 7,
+    description: 'Time filter - either 7, 30 or 90'
+  },
+  repo: {
+    type: 'string',
+    shortFlag: 'r',
+    default: '',
+    description: "Name of the repository"
+  },
+}
+
 // Internal functions
 
 type CommandContext = {
   scope: string
-  time: string
-  repo: string | undefined
+  time: number
+  repo: string
   outputJson: boolean
 }
 
 function setupCommand (name: string, description: string, argv: readonly string[], importMeta: ImportMeta): void|CommandContext {
   const flags: { [key: string]: any } = {
     ...outputFlags,
-    ...validationFlags,
+    ...analyticsFlags
   }
 
   const cli = meow(`
     Usage
-      $ ${name} <scope> <time>
+      $ ${name} --scope=<scope> --time=<time filter>
 
     Options
       ${printFlagList(flags, 6)}
 
     Examples
-      $ ${name} org 7
-      $ ${name} org 30
+      $ ${name} --scope=org --time=7
+      $ ${name} --scope=org --time=30
+      $ ${name} --scope=repo --repo=test-repo --time=30
   `, {
     argv,
     description,
@@ -69,117 +93,140 @@ function setupCommand (name: string, description: string, argv: readonly string[
   })
 
   const {
-    json: outputJson
+    json: outputJson,
+    scope, 
+    time,
+    repo
   } = cli.flags
 
-  const scope = cli.input[0]
-
-  if (!scope) {
-    throw new InputError('Please provide a scope to get analytics data')
+  if (scope !== 'org' && scope !== 'repo') {
+    throw new InputError("The scope must either be 'org' or 'repo'")
   }
 
-  if (!cli.input.length) {
-    throw new InputError('Please provide a scope and a time to get analytics data')
+  if (time !== 7 && time !== 30 && time !== 90) {
+    throw new InputError('The time filter must either be 7, 30 or 90')
   }
 
-  if (scope && !['org', 'repo'].includes(scope)) {
-    throw new InputError("The scope must either be 'scope' or 'repo'")
+  if(scope === 'repo' && !repo){
+    console.error(
+      `${chalk.bgRed.white('Input error')}: Please provide a repository name when using the repository scope. \n`
+    )
+    cli.showHelp()
+    return
   }
 
-  const repo = scope === 'repo' ? cli.input[1] : undefined
+  return <CommandContext>{
+    scope, time, repo, outputJson
+  }
+}
 
-  const time = scope === 'repo' ? cli.input[2] : cli.input[1]
+async function fetchOrgAnalyticsData (time: number, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
+  const socketSdk = await setupSdk(apiKey)
+  const result = await handleApiCall(socketSdk.getOrgAnalytics(time.toString()), 'fetching analytics data')
 
-  if (!time) {
-    throw new InputError('Please provide a time to get analytics data')
+  if (result.success === false) {
+    return handleUnsuccessfulApiResponse('getOrgAnalytics', result, spinner)
   }
 
-  if (time && !['7', '30', '60'].includes(time)) {
-    throw new InputError('The time filter must either be 7, 30 or 60')
+  spinner.stop()
+
+  if(!result.data.length){
+    return console.log('No analytics data is available for this organization yet.')
   }
 
-  return <CommandContext>{
-      scope, time, repo, outputJson
+  const data = formatData(result.data)
+
+  if(outputJson){
+    return console.log(data)
   }
+
+  return displayAnalyticsScreen(data)
 }
 
-async function fetchOrgAnalyticsData (time: string, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
+async function fetchRepoAnalyticsData (repo: string, time: number, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
   const socketSdk = await setupSdk(apiKey)
-  const result = await handleApiCall(socketSdk.getOrgAnalytics(time), 'fetching analytics data')
+  const result = await handleApiCall(socketSdk.getRepoAnalytics(repo, time.toString()), 'fetching analytics data')
 
   if (result.success === false) {
-    return handleUnsuccessfulApiResponse('getOrgAnalytics', result, spinner)
+    return handleUnsuccessfulApiResponse('getRepoAnalytics', result, spinner)
   }
-
   spinner.stop()
 
-  const data = result.data.reduce((acc: { [key: string]: any }, current) => {
-    const formattedDate = new Date(current.created_at).toLocaleDateString()
-
-    if (acc[formattedDate]) {
-      acc[formattedDate].total_critical_alerts += current.total_critical_alerts
-      acc[formattedDate].total_high_alerts += current.total_high_alerts
-      acc[formattedDate].total_critical_added += current.total_critical_added
-      acc[formattedDate].total_high_added += current.total_high_added
-      acc[formattedDate].total_critical_prevented += current.total_critical_prevented
-      acc[formattedDate].total_high_prevented += current.total_high_prevented
-      acc[formattedDate].total_medium_prevented += current.total_medium_prevented
-      acc[formattedDate].total_low_prevented += current.total_low_prevented
-    } else {
-      acc[formattedDate] = current
-      acc[formattedDate].created_at = formattedDate
-    }
+  if(!result.data.length){
+    return console.log('No analytics data is available for this organization yet.')
+  }
 
-    return acc
-  }, {})
+  const data = formatData(result.data)
 
   if(outputJson){
     return console.log(data)
   }
 
-  const screen = blessed.screen()
-  // eslint-disable-next-line
-  const grid = new contrib.grid({rows: 4, cols: 4, screen})
+  return displayAnalyticsScreen(data)
+}
 
-  renderLineCharts(grid, screen, 'Total critical alerts', [0,0,1,2], data, 'total_critical_alerts')
-  renderLineCharts(grid, screen, 'Total high alerts', [0,2,1,2], data, 'total_high_alerts')
-  renderLineCharts(grid, screen, 'Total critical alerts added to main', [1,0,1,2], data, 'total_critical_added')
-  renderLineCharts(grid, screen, 'Total high alerts added to main', [1,2,1,2], data, 'total_high_added')
-  renderLineCharts(grid, screen, 'Total critical alerts prevented from main', [2,0,1,2], data, 'total_critical_prevented')
-  renderLineCharts(grid, screen, 'Total high alerts prevented from main', [2,2,1,2], data, 'total_high_prevented')
+const renderLineCharts = (grid: any, screen: any, title: string, coords: number[], data: FormattedAnalyticsData, label: string) => {
+  const formattedDates = Object.keys(data).map(d => `${new Date(d).getMonth()+1}/${new Date(d).getDate()}`)
 
-  const bar = grid.set(3, 0, 1, 2, contrib.bar,
-      { label: 'Top 5 alert types'
-      , barWidth: 10
-      , barSpacing: 17
-      , xOffset: 0
-      , maxHeight: 9, barBgColor: 'magenta' })
+  // @ts-ignore
+  const alertsCounts = Object.values(data).map(d => d[label])
+  
+  const line = grid.set(...coords, contrib.line,
+    { style:
+      { line: "cyan", 
+        text: "cyan", 
+        baseline: "black"
+      }, 
+      xLabelPadding: 0, 
+      xPadding: 0,
+      xOffset: 0,
+      wholeNumbersOnly: true,
+      legend: {
+        width: 1
+      }, 
+      label: title
+    }
+  )
 
-   screen.append(bar) //must append before setting data
+  screen.append(line)
 
-   const top5AlertTypes = Object.values(data)[0].top_five_alert_types
-   
-   bar.setData(
-      { titles: Object.keys(top5AlertTypes)
-      , data: Object.values(top5AlertTypes)})
+  const lineData = {
+    x: formattedDates.reverse(),
+    y: alertsCounts
+  }
 
-  screen.render()
-    
-  screen.key(['escape', 'q', 'C-c'], function() {
-    return process.exit(0);
-  })
+  line.setData([lineData])
 }
 
-async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
-  const socketSdk = await setupSdk(apiKey)
-  const result = await handleApiCall(socketSdk.getRepoAnalytics(repo, time), 'fetching analytics data')
-
-  if (result.success === false) {
-    return handleUnsuccessfulApiResponse('getRepoAnalytics', result, spinner)
+type AnalyticsData = {
+  id: number,
+  created_at: string
+  repository_id: string
+  organization_id: number
+  repository_name: string
+  total_critical_alerts: number
+  total_high_alerts: number
+  total_medium_alerts: number
+  total_low_alerts: number
+  total_critical_added: number
+  total_high_added: number
+  total_medium_added: number
+  total_low_added: number
+  total_critical_prevented: number
+  total_high_prevented: number
+  total_medium_prevented: number
+  total_low_prevented: number
+  top_five_alert_types: {
+    [key: string]: number
   }
-  spinner.stop()
+}
+
+type FormattedAnalyticsData = {
+  [key: string]: AnalyticsData
+}
 
-  const data = result.data.reduce((acc: { [key: string]: any }, current) => {
+const formatData = (data: AnalyticsData[]) => {
+  return data.reduce((acc: { [key: string]: any }, current) => {
     const formattedDate = new Date(current.created_at).toLocaleDateString()
 
     if (acc[formattedDate]) {
@@ -198,11 +245,9 @@ async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora,
 
     return acc
   }, {})
+}
 
-  if(outputJson){
-    return console.log(data)
-  }
-
+const displayAnalyticsScreen = (data: FormattedAnalyticsData) => {
   const screen = blessed.screen()
   // eslint-disable-next-line
   const grid = new contrib.grid({rows: 4, cols: 4, screen})
@@ -222,48 +267,39 @@ async function fetchRepoAnalyticsData (repo: string, time: string, spinner: Ora,
       , maxHeight: 9, barBgColor: 'magenta' })
 
    screen.append(bar) //must append before setting data
-
-   const top5AlertTypes = Object.values(data)[0].top_five_alert_types
+ 
+   const top5 = extractTop5Alerts(data)
    
    bar.setData(
-      { titles: Object.keys(top5AlertTypes)
-      , data: Object.values(top5AlertTypes)})
+      { titles: Object.keys(top5)
+      , data: Object.values(top5)})
 
   screen.render()
     
-  screen.key(['escape', 'q', 'C-c'], function() {
-    return process.exit(0);
-  })
+  screen.key(['escape', 'q', 'C-c'], () => process.exit(0))
 }
 
-const renderLineCharts = (grid: any, screen: any, title: string, coords: number[], data: {[key: string]: {[key: string]: number}}, label: string) => {
-  const formattedDates = Object.keys(data).map(d => `${new Date(d).getMonth()+1}/${new Date(d).getDate()}`)
-
-  const alertsCounts = Object.values(data).map(d => d[label])
+const extractTop5Alerts = (data: FormattedAnalyticsData) => {
+  const allTop5Alerts = Object.values(data).map(d => d.top_five_alert_types)
   
-  const line = grid.set(...coords, contrib.line,
-    { style:
-      { line: "cyan", 
-        text: "cyan", 
-        baseline: "black"
-      }, 
-      xLabelPadding: 0, 
-      xPadding: 0,
-      xOffset: 0,
-      wholeNumbersOnly: true,
-      legend: {
-        width: 1
-      }, 
-      label: title
-    }
-  )
-
-  screen.append(line)
-
-  const lineData = {
-    x: formattedDates.reverse(),
-    y: alertsCounts
-  }
+  const aggTop5Alerts = allTop5Alerts.reduce((acc, current) => {
+   const alertTypes = Object.keys(current)
+
+   alertTypes.forEach(type => {
+     if(!acc[type]){
+      // @ts-ignore
+       acc[type] = current[type]
+     } else {
+      // @ts-ignore
+       if(acc[type] < current[type]){
+        // @ts-ignore
+         acc[type] = current[type]
+       }
+     }
+   })
+   
+   return acc
+  }, {})
 
-  line.setData([lineData])
+  return Object.fromEntries(Object.entries(aggTop5Alerts).sort((a: [string, number], b: [string, number]) => b[1] - a[1]).slice(0,5))
 }
\ No newline at end of file

From 76f180553da9e6a28ec1bcda91c876aadf7fab68 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Mon, 26 Aug 2024 13:00:41 -0700
Subject: [PATCH 17/21] add graphs

---
 src/commands/analytics.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index 6d2d427e..90af46e0 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -191,7 +191,7 @@ const renderLineCharts = (grid: any, screen: any, title: string, coords: number[
   screen.append(line)
 
   const lineData = {
-    x: formattedDates.reverse(),
+    x: formattedDates,
     y: alertsCounts
   }
 
@@ -250,16 +250,18 @@ const formatData = (data: AnalyticsData[]) => {
 const displayAnalyticsScreen = (data: FormattedAnalyticsData) => {
   const screen = blessed.screen()
   // eslint-disable-next-line
-  const grid = new contrib.grid({rows: 4, cols: 4, screen})
+  const grid = new contrib.grid({rows: 5, cols: 4, screen})
 
   renderLineCharts(grid, screen, 'Total critical alerts', [0,0,1,2], data, 'total_critical_alerts')
   renderLineCharts(grid, screen, 'Total high alerts', [0,2,1,2], data, 'total_high_alerts')
-  renderLineCharts(grid, screen, 'Total critical alerts added to main', [1,0,1,2], data, 'total_critical_added')
-  renderLineCharts(grid, screen, 'Total high alerts added to main', [1,2,1,2], data, 'total_high_added')
-  renderLineCharts(grid, screen, 'Total critical alerts prevented from main', [2,0,1,2], data, 'total_critical_prevented')
-  renderLineCharts(grid, screen, 'Total high alerts prevented from main', [2,2,1,2], data, 'total_high_prevented')
-
-  const bar = grid.set(3, 0, 1, 2, contrib.bar,
+  renderLineCharts(grid, screen, 'Total critical alerts added to the main branch', [1,0,1,2], data, 'total_critical_added')
+  renderLineCharts(grid, screen, 'Total high alerts added to the main branch', [1,2,1,2], data, 'total_high_added')
+  renderLineCharts(grid, screen, 'Total critical alerts prevented from the main branch', [2,0,1,2], data, 'total_critical_prevented')
+  renderLineCharts(grid, screen, 'Total high alerts prevented from the main branch', [2,2,1,2], data, 'total_high_prevented')
+  renderLineCharts(grid, screen, 'Total medium alerts prevented from the main branch', [3,0,1,2], data, 'total_medium_prevented')
+  renderLineCharts(grid, screen, 'Total low alerts prevented from the main branch', [3,2,1,2], data, 'total_low_prevented')
+
+  const bar = grid.set(4, 0, 1, 2, contrib.bar,
       { label: 'Top 5 alert types'
       , barWidth: 10
       , barSpacing: 17

From da85d1eb5572f415ce0dff07bbcf9bebb9660120 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Wed, 28 Aug 2024 11:02:00 -0700
Subject: [PATCH 18/21] improvements

---
 src/commands/analytics.ts | 304 +++++++++++++++++++++++---------------
 1 file changed, 185 insertions(+), 119 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index 90af46e0..c4d94bb1 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -1,3 +1,4 @@
+// @ts-nocheck
 // @ts-ignore
 import blessed from 'blessed'
 import contrib from 'blessed-contrib'
@@ -120,6 +121,52 @@ function setupCommand (name: string, description: string, argv: readonly string[
   }
 }
 
+const METRICS = [
+  'total_critical_alerts',
+  'total_high_alerts',
+  'total_medium_alerts',
+  'total_low_alerts',
+  'total_critical_added',
+  'total_medium_added',
+  'total_low_added',
+  'total_high_added',
+  'total_critical_prevented',
+  'total_high_prevented',
+  'total_medium_prevented',
+  'total_low_prevented'
+]
+
+type AnalyticsData = {
+  id: number,
+  created_at: string
+  repository_id: string
+  organization_id: number
+  repository_name: string
+  total_critical_alerts: number
+  total_high_alerts: number
+  total_medium_alerts: number
+  total_low_alerts: number
+  total_critical_added: number
+  total_high_added: number
+  total_medium_added: number
+  total_low_added: number
+  total_critical_prevented: number
+  total_high_prevented: number
+  total_medium_prevented: number
+  total_low_prevented: number
+  top_five_alert_types: {
+    [key: string]: number
+  }
+}
+
+type FormattedAnalyticsData = {
+  [key: string]: {
+    [key: string]: number | {
+      [key: string]: number
+    }
+  }
+}
+
 async function fetchOrgAnalyticsData (time: number, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
   const socketSdk = await setupSdk(apiKey)
   const result = await handleApiCall(socketSdk.getOrgAnalytics(time.toString()), 'fetching analytics data')
@@ -134,15 +181,115 @@ async function fetchOrgAnalyticsData (time: number, spinner: Ora, apiKey: string
     return console.log('No analytics data is available for this organization yet.')
   }
 
-  const data = formatData(result.data)
+  const data = formatData(result.data, 'org')
+
+  console.log(data)
 
   if(outputJson){
-    return console.log(data)
+    return console.log(result.data)
   }
 
   return displayAnalyticsScreen(data)
 }
 
+const months = [
+  'Jan',
+  'Feb',
+  'Mar',
+  'Apr',
+  'May',
+  'Jun',
+  'Jul',
+  'Aug',
+  'Sep',
+  'Oct',
+  'Nov',
+  'Dec'
+]
+
+const formatDate = (date: string) => {
+  return `${months[new Date(date).getMonth()]} ${new Date(date).getDate()}`
+}
+
+const formatData = (data: AnalyticsData[], scope: string) => {
+  let formattedData, sortedTopFivealerts
+
+  if(scope === 'org'){
+    const topFiveAlerts = data.map(d => d.top_five_alert_types || {})
+
+    const totalTopAlerts = topFiveAlerts.reduce((acc, current: {[key: string]: number}) => {
+      const alertTypes = Object.keys(current)
+      alertTypes.map((type: string) => {
+        if (!acc[type]) {
+          acc[type] = current[type]
+        } else {
+          acc[type] += current[type]
+        }
+        return acc
+      })
+      return acc
+    }, {} as { [k: string]: any })
+
+  
+    sortedTopFivealerts = Object.entries(totalTopAlerts)
+      .sort(([, a], [, b]) => b - a)
+      .slice(0, 5)
+      .reduce((r, [k, v]) => ({ ...r, [k]: v }), {})
+  
+    const formatData = (label: string) => {
+      return data.reduce((acc, current) => {
+        const date: string = formatDate(current.created_at)
+        if (!acc[date]) {
+          acc[date] = current[label]
+        } else {
+          acc[date] += current[label]
+        }
+        return acc
+      }, {} as { [k: string]: number })
+    }
+  
+    formattedData = METRICS.reduce((acc, current: string) => {
+      acc[current] = formatData(current)
+      return acc
+    }, {} as { [k: string]: any })
+
+  } else if (scope === 'repo'){
+
+    const topAlerts = data.reduce((acc, current) => {
+      const alertTypes = Object.keys(current.top_five_alert_types)
+      alertTypes.map(type => {
+        if (!acc[type]) {
+          acc[type] = current.top_five_alert_types[type]
+        } else {
+          if (current.top_five_alert_types[type] > acc[type]) {
+            acc[type] = current.top_five_alert_types[type]
+          }
+        }
+        return acc
+      })
+      return acc
+    }, {} as {[key: string]: number})
+
+    sortedTopFivealerts = Object.entries(topAlerts)
+    .sort(([, a]: [string, number], [, b]: [string, number]) => b - a)
+    .slice(0, 5)
+    .reduce((r, [k, v]) => ({ ...r, [k]: v }), {})
+
+  formattedData = data.reduce((acc, current) => {
+    METRICS.forEach((m: string) => {
+      if (!acc[m]) {
+        acc[m] = {}
+      }
+      acc[m][formatDate(current.created_at)] = current[m]
+      return acc
+    })
+    return acc
+  }, {} as { [k: string]: any })
+  }
+
+  return {...formattedData, top_five_alert_types: sortedTopFivealerts}
+}
+
 async function fetchRepoAnalyticsData (repo: string, time: number, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
   const socketSdk = await setupSdk(apiKey)
   const result = await handleApiCall(socketSdk.getRepoAnalytics(repo, time.toString()), 'fetching analytics data')
@@ -156,21 +303,48 @@ async function fetchRepoAnalyticsData (repo: string, time: number, spinner: Ora,
     return console.log('No analytics data is available for this organization yet.')
   }
 
-  const data = formatData(result.data)
+  const data = formatData(result.data, 'repo')
 
   if(outputJson){
-    return console.log(data)
+    return console.log(result.data)
   }
 
   return displayAnalyticsScreen(data)
 }
 
-const renderLineCharts = (grid: any, screen: any, title: string, coords: number[], data: FormattedAnalyticsData, label: string) => {
-  const formattedDates = Object.keys(data).map(d => `${new Date(d).getMonth()+1}/${new Date(d).getDate()}`)
+const displayAnalyticsScreen = (data: FormattedAnalyticsData) => {
+  const screen = blessed.screen()
+  // eslint-disable-next-line
+  const grid = new contrib.grid({rows: 5, cols: 4, screen})
 
-  // @ts-ignore
-  const alertsCounts = Object.values(data).map(d => d[label])
-  
+  renderLineCharts(grid, screen, 'Total critical alerts', [0,0,1,2], data['total_critical_alerts'])
+  renderLineCharts(grid, screen, 'Total high alerts', [0,2,1,2], data['total_high_alerts'])
+  renderLineCharts(grid, screen, 'Total critical alerts added to the main branch', [1,0,1,2], data['total_critical_added'])
+  renderLineCharts(grid, screen, 'Total high alerts added to the main branch', [1,2,1,2], data['total_high_added'])
+  renderLineCharts(grid, screen, 'Total critical alerts prevented from the main branch', [2,0,1,2], data['total_critical_prevented'])
+  renderLineCharts(grid, screen, 'Total high alerts prevented from the main branch', [2,2,1,2], data['total_high_prevented'])
+  renderLineCharts(grid, screen, 'Total medium alerts prevented from the main branch', [3,0,1,2], data['total_medium_prevented'])
+  renderLineCharts(grid, screen, 'Total low alerts prevented from the main branch', [3,2,1,2], data['total_low_prevented'])
+
+  const bar = grid.set(4, 0, 1, 2, contrib.bar,
+      { label: 'Top 5 alert types'
+      , barWidth: 10
+      , barSpacing: 17
+      , xOffset: 0
+      , maxHeight: 9, barBgColor: 'magenta' })
+
+   screen.append(bar) //must append before setting data
+   
+   bar.setData(
+      { titles: Object.keys(data.top_five_alert_types)
+      , data: Object.values(data.top_five_alert_types)})
+
+  screen.render()
+    
+  screen.key(['escape', 'q', 'C-c'], () => process.exit(0))
+}
+
+const renderLineCharts = (grid: any, screen: any, title: string, coords: number[], data: {[key: string]: number}) => {  
   const line = grid.set(...coords, contrib.line,
     { style:
       { line: "cyan", 
@@ -191,117 +365,9 @@ const renderLineCharts = (grid: any, screen: any, title: string, coords: number[
   screen.append(line)
 
   const lineData = {
-    x: formattedDates,
-    y: alertsCounts
+    x: Object.keys(data),
+    y: Object.values(data)
   }
 
   line.setData([lineData])
-}
-
-type AnalyticsData = {
-  id: number,
-  created_at: string
-  repository_id: string
-  organization_id: number
-  repository_name: string
-  total_critical_alerts: number
-  total_high_alerts: number
-  total_medium_alerts: number
-  total_low_alerts: number
-  total_critical_added: number
-  total_high_added: number
-  total_medium_added: number
-  total_low_added: number
-  total_critical_prevented: number
-  total_high_prevented: number
-  total_medium_prevented: number
-  total_low_prevented: number
-  top_five_alert_types: {
-    [key: string]: number
-  }
-}
-
-type FormattedAnalyticsData = {
-  [key: string]: AnalyticsData
-}
-
-const formatData = (data: AnalyticsData[]) => {
-  return data.reduce((acc: { [key: string]: any }, current) => {
-    const formattedDate = new Date(current.created_at).toLocaleDateString()
-
-    if (acc[formattedDate]) {
-      acc[formattedDate].total_critical_alerts += current.total_critical_alerts
-      acc[formattedDate].total_high_alerts += current.total_high_alerts
-      acc[formattedDate].total_critical_added += current.total_critical_added
-      acc[formattedDate].total_high_added += current.total_high_added
-      acc[formattedDate].total_critical_prevented += current.total_critical_prevented
-      acc[formattedDate].total_high_prevented += current.total_high_prevented
-      acc[formattedDate].total_medium_prevented += current.total_medium_prevented
-      acc[formattedDate].total_low_prevented += current.total_low_prevented
-    } else {
-      acc[formattedDate] = current
-      acc[formattedDate].created_at = formattedDate
-    }
-
-    return acc
-  }, {})
-}
-
-const displayAnalyticsScreen = (data: FormattedAnalyticsData) => {
-  const screen = blessed.screen()
-  // eslint-disable-next-line
-  const grid = new contrib.grid({rows: 5, cols: 4, screen})
-
-  renderLineCharts(grid, screen, 'Total critical alerts', [0,0,1,2], data, 'total_critical_alerts')
-  renderLineCharts(grid, screen, 'Total high alerts', [0,2,1,2], data, 'total_high_alerts')
-  renderLineCharts(grid, screen, 'Total critical alerts added to the main branch', [1,0,1,2], data, 'total_critical_added')
-  renderLineCharts(grid, screen, 'Total high alerts added to the main branch', [1,2,1,2], data, 'total_high_added')
-  renderLineCharts(grid, screen, 'Total critical alerts prevented from the main branch', [2,0,1,2], data, 'total_critical_prevented')
-  renderLineCharts(grid, screen, 'Total high alerts prevented from the main branch', [2,2,1,2], data, 'total_high_prevented')
-  renderLineCharts(grid, screen, 'Total medium alerts prevented from the main branch', [3,0,1,2], data, 'total_medium_prevented')
-  renderLineCharts(grid, screen, 'Total low alerts prevented from the main branch', [3,2,1,2], data, 'total_low_prevented')
-
-  const bar = grid.set(4, 0, 1, 2, contrib.bar,
-      { label: 'Top 5 alert types'
-      , barWidth: 10
-      , barSpacing: 17
-      , xOffset: 0
-      , maxHeight: 9, barBgColor: 'magenta' })
-
-   screen.append(bar) //must append before setting data
- 
-   const top5 = extractTop5Alerts(data)
-   
-   bar.setData(
-      { titles: Object.keys(top5)
-      , data: Object.values(top5)})
-
-  screen.render()
-    
-  screen.key(['escape', 'q', 'C-c'], () => process.exit(0))
-}
-
-const extractTop5Alerts = (data: FormattedAnalyticsData) => {
-  const allTop5Alerts = Object.values(data).map(d => d.top_five_alert_types)
-  
-  const aggTop5Alerts = allTop5Alerts.reduce((acc, current) => {
-   const alertTypes = Object.keys(current)
-
-   alertTypes.forEach(type => {
-     if(!acc[type]){
-      // @ts-ignore
-       acc[type] = current[type]
-     } else {
-      // @ts-ignore
-       if(acc[type] < current[type]){
-        // @ts-ignore
-         acc[type] = current[type]
-       }
-     }
-   })
-   
-   return acc
-  }, {})
-
-  return Object.fromEntries(Object.entries(aggTop5Alerts).sort((a: [string, number], b: [string, number]) => b[1] - a[1]).slice(0,5))
 }
\ No newline at end of file

From 274ed90a914bc7b5e96d7517056f8db74fc3d053 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Wed, 28 Aug 2024 11:41:17 -0700
Subject: [PATCH 19/21] update types

---
 src/commands/analytics.ts | 65 ++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index c4d94bb1..cbdb155f 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -1,4 +1,3 @@
-// @ts-nocheck
 // @ts-ignore
 import blessed from 'blessed'
 import contrib from 'blessed-contrib'
@@ -39,7 +38,7 @@ export const analytics: CliSubcommand = {
   }
 }
 
-const analyticsFlags: { [key: string]: any } = {
+const analyticsFlags = {
   scope: {
     type: 'string',
     shortFlag: 's',
@@ -161,9 +160,7 @@ type AnalyticsData = {
 
 type FormattedAnalyticsData = {
   [key: string]: {
-    [key: string]: number | {
-      [key: string]: number
-    }
+    [key: string]: number
   }
 }
 
@@ -183,8 +180,6 @@ async function fetchOrgAnalyticsData (time: number, spinner: Ora, apiKey: string
 
   const data = formatData(result.data, 'org')
 
-  console.log(data)
-
   if(outputJson){
     return console.log(result.data)
   }
@@ -211,24 +206,24 @@ const formatDate = (date: string) => {
   return `${months[new Date(date).getMonth()]} ${new Date(date).getDate()}`
 }
 
-const formatData = (data: AnalyticsData[], scope: string) => {
+const formatData = (data: any, scope: string) => {
   let formattedData, sortedTopFivealerts
 
   if(scope === 'org'){
-    const topFiveAlerts = data.map(d => d.top_five_alert_types || {})
+    const topFiveAlerts = data.map((d: { [k: string]: any }) => d['top_five_alert_types'])
 
-    const totalTopAlerts = topFiveAlerts.reduce((acc, current: {[key: string]: number}) => {
+    const totalTopAlerts: {[key: string]: number} = topFiveAlerts.reduce((acc: { [k: string]: number }, current: {[key: string]: number}) => {
       const alertTypes = Object.keys(current)
       alertTypes.map((type: string) => {
         if (!acc[type]) {
-          acc[type] = current[type]
+          acc[type] = current[type]!
         } else {
-          acc[type] += current[type]
+          acc[type] += current[type]!
         }
         return acc
       })
       return acc
-    }, {} as { [k: string]: any })
+    }, {} as { [k: string]: number })
 
   
     sortedTopFivealerts = Object.entries(totalTopAlerts)
@@ -237,32 +232,32 @@ const formatData = (data: AnalyticsData[], scope: string) => {
       .reduce((r, [k, v]) => ({ ...r, [k]: v }), {})
   
     const formatData = (label: string) => {
-      return data.reduce((acc, current) => {
-        const date: string = formatDate(current.created_at)
+      return data.reduce((acc: { [k: string]: number }, current: {[key: string]: any}) => {
+        const date: string = formatDate(current['created_at'])
         if (!acc[date]) {
-          acc[date] = current[label]
+          acc[date] = current[label]!
         } else {
-          acc[date] += current[label]
+          acc[date] += current[label]!
         }
         return acc
-      }, {} as { [k: string]: number })
+      }, {})
     }
   
     formattedData = METRICS.reduce((acc, current: string) => {
       acc[current] = formatData(current)
       return acc
-    }, {} as { [k: string]: any })
+    }, {} as { [k: string]: number })
 
   } else if (scope === 'repo'){
 
-    const topAlerts = data.reduce((acc, current) => {
-      const alertTypes = Object.keys(current.top_five_alert_types)
+    const topAlerts: {[key: string]: number} = data.reduce((acc:  {[key: string]: number}, current: {[key: string]: any}) => {
+      const alertTypes = Object.keys(current['top_five_alert_types'])
       alertTypes.map(type => {
         if (!acc[type]) {
-          acc[type] = current.top_five_alert_types[type]
+          acc[type] = current['top_five_alert_types'][type]
         } else {
-          if (current.top_five_alert_types[type] > acc[type]) {
-            acc[type] = current.top_five_alert_types[type]
+          if (current['top_five_alert_types'][type] > (acc[type] || 0)) {
+            acc[type] = current['top_five_alert_types'][type]
           }
         }
         return acc
@@ -271,20 +266,20 @@ const formatData = (data: AnalyticsData[], scope: string) => {
     }, {} as {[key: string]: number})
 
     sortedTopFivealerts = Object.entries(topAlerts)
-    .sort(([, a]: [string, number], [, b]: [string, number]) => b - a)
+    .sort(([, a], [, b]) => b - a)
     .slice(0, 5)
     .reduce((r, [k, v]) => ({ ...r, [k]: v }), {})
 
-  formattedData = data.reduce((acc, current) => {
-    METRICS.forEach((m: string) => {
-      if (!acc[m]) {
-        acc[m] = {}
-      }
-      acc[m][formatDate(current.created_at)] = current[m]
+    formattedData = data.reduce((acc: any, current: {[key: string]: any}) => {
+      METRICS.forEach((m: string) => {
+        if (!acc[m]) {
+          acc[m] = {}
+        }
+        acc[m][formatDate(current['created_at'])] = current[m]
+        return acc
+      })
       return acc
-    })
-    return acc
-  }, {} as { [k: string]: any })
+    }, {} as { [k: string]: number })
   }
 
   return {...formattedData, top_five_alert_types: sortedTopFivealerts}
@@ -312,7 +307,7 @@ async function fetchRepoAnalyticsData (repo: string, time: number, spinner: Ora,
   return displayAnalyticsScreen(data)
 }
 
-const displayAnalyticsScreen = (data: FormattedAnalyticsData) => {
+const displayAnalyticsScreen = (data: any) => {
   const screen = blessed.screen()
   // eslint-disable-next-line
   const grid = new contrib.grid({rows: 5, cols: 4, screen})

From d94bae8e359f0128526e489d3fed0829c1d7f368 Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Wed, 28 Aug 2024 11:41:51 -0700
Subject: [PATCH 20/21] update types

---
 src/commands/analytics.ts | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index cbdb155f..b9de04e5 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -135,35 +135,6 @@ const METRICS = [
   'total_low_prevented'
 ]
 
-type AnalyticsData = {
-  id: number,
-  created_at: string
-  repository_id: string
-  organization_id: number
-  repository_name: string
-  total_critical_alerts: number
-  total_high_alerts: number
-  total_medium_alerts: number
-  total_low_alerts: number
-  total_critical_added: number
-  total_high_added: number
-  total_medium_added: number
-  total_low_added: number
-  total_critical_prevented: number
-  total_high_prevented: number
-  total_medium_prevented: number
-  total_low_prevented: number
-  top_five_alert_types: {
-    [key: string]: number
-  }
-}
-
-type FormattedAnalyticsData = {
-  [key: string]: {
-    [key: string]: number
-  }
-}
-
 async function fetchOrgAnalyticsData (time: number, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
   const socketSdk = await setupSdk(apiKey)
   const result = await handleApiCall(socketSdk.getOrgAnalytics(time.toString()), 'fetching analytics data')

From fc57faf4ad25ec420498db5c1b431434d51ec3bf Mon Sep 17 00:00:00 2001
From: Charlie Gerard <charlie.a.gerard@gmail.com>
Date: Wed, 28 Aug 2024 11:51:20 -0700
Subject: [PATCH 21/21] add feature to save data to local file

---
 src/commands/analytics.ts | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/commands/analytics.ts b/src/commands/analytics.ts
index b9de04e5..b1a17929 100644
--- a/src/commands/analytics.ts
+++ b/src/commands/analytics.ts
@@ -1,6 +1,7 @@
 // @ts-ignore
 import blessed from 'blessed'
 import contrib from 'blessed-contrib'
+import fs from 'fs'
 import meow from 'meow'
 import ora from 'ora'
 
@@ -28,10 +29,10 @@ export const analytics: CliSubcommand = {
       }
       const spinner = ora('Fetching analytics data').start()
       if (input.scope === 'org') {
-        await fetchOrgAnalyticsData(input.time, spinner, apiKey, input.outputJson)
+        await fetchOrgAnalyticsData(input.time, spinner, apiKey, input.outputJson, input.file)
       } else {
         if (input.repo) {
-          await fetchRepoAnalyticsData(input.repo, input.time, spinner, apiKey, input.outputJson)
+          await fetchRepoAnalyticsData(input.repo, input.time, spinner, apiKey, input.outputJson, input.file)
         }
       }
     }
@@ -57,6 +58,12 @@ const analyticsFlags = {
     default: '',
     description: "Name of the repository"
   },
+  file: {
+    type: 'string',
+    shortFlag: 'f',
+    default: '',
+    description: "Path to a local file to save the output"
+  }
 }
 
 // Internal functions
@@ -66,6 +73,7 @@ type CommandContext = {
   time: number
   repo: string
   outputJson: boolean
+  file: string
 }
 
 function setupCommand (name: string, description: string, argv: readonly string[], importMeta: ImportMeta): void|CommandContext {
@@ -96,7 +104,8 @@ function setupCommand (name: string, description: string, argv: readonly string[
     json: outputJson,
     scope, 
     time,
-    repo
+    repo, 
+    file
   } = cli.flags
 
   if (scope !== 'org' && scope !== 'repo') {
@@ -116,7 +125,7 @@ function setupCommand (name: string, description: string, argv: readonly string[
   }
 
   return <CommandContext>{
-    scope, time, repo, outputJson
+    scope, time, repo, outputJson, file
   }
 }
 
@@ -135,7 +144,7 @@ const METRICS = [
   'total_low_prevented'
 ]
 
-async function fetchOrgAnalyticsData (time: number, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
+async function fetchOrgAnalyticsData (time: number, spinner: Ora, apiKey: string, outputJson: boolean, filePath: string): Promise<void> {
   const socketSdk = await setupSdk(apiKey)
   const result = await handleApiCall(socketSdk.getOrgAnalytics(time.toString()), 'fetching analytics data')
 
@@ -151,10 +160,17 @@ async function fetchOrgAnalyticsData (time: number, spinner: Ora, apiKey: string
 
   const data = formatData(result.data, 'org')
 
-  if(outputJson){
+  if(outputJson && !filePath){
     return console.log(result.data)
   }
 
+  if(filePath){
+    fs.writeFile(filePath, JSON.stringify(result.data), err => {
+      err ? console.error(err) : console.log(`Data successfully written to ${filePath}`)
+    })
+    return
+  }
+
   return displayAnalyticsScreen(data)
 }
 
@@ -256,7 +272,7 @@ const formatData = (data: any, scope: string) => {
   return {...formattedData, top_five_alert_types: sortedTopFivealerts}
 }
 
-async function fetchRepoAnalyticsData (repo: string, time: number, spinner: Ora, apiKey: string, outputJson: boolean): Promise<void> {
+async function fetchRepoAnalyticsData (repo: string, time: number, spinner: Ora, apiKey: string, outputJson: boolean, filePath: string): Promise<void> {
   const socketSdk = await setupSdk(apiKey)
   const result = await handleApiCall(socketSdk.getRepoAnalytics(repo, time.toString()), 'fetching analytics data')
 
@@ -271,10 +287,17 @@ async function fetchRepoAnalyticsData (repo: string, time: number, spinner: Ora,
 
   const data = formatData(result.data, 'repo')
 
-  if(outputJson){
+  if(outputJson && !filePath){
     return console.log(result.data)
   }
 
+  if(filePath){
+    fs.writeFile(filePath, JSON.stringify(result.data), err => {
+      err ? console.error(err) : console.log(`Data successfully written to ${filePath}`)
+    })
+    return
+  }
+
   return displayAnalyticsScreen(data)
 }