Add --view flag to report create

Author: Pelle Wessman

lib/commands/report/create.js

@@ -14,20 +14,37 @@ import { printFlagList } from '../../utils/formatting.js'
 import { createDebugLogger } from '../../utils/misc.js'
 import { setupSdk } from '../../utils/sdk.js'
 import { isErrnoException } from '../../utils/type-helpers.js'
+import { fetchReportData, formatReportDataOutput } from './view.js'
 
 /** @type {import('../../utils/meow-with-subcommands').CliSubcommand} */
 export const create = {
   description: 'Create a project report',
   async run (argv, importMeta, { parentName }) {
-    const name = parentName + ' view'
+    const name = parentName + ' create'
 
     const input = await setupCommand(name, create.description, argv, importMeta)
 
     if (input) {
-      const { cwd, debugLog, dryRun, outputJson, outputMarkdown, packagePaths } = input
+      const {
+        cwd,
+        debugLog,
+        dryRun,
+        outputJson,
+        outputMarkdown,
+        packagePaths,
+        view,
+      } = input
+
       const result = input && await createReport(packagePaths, { cwd, debugLog, dryRun })
 
-      if (result) {
+      if (result && view) {
+        const reportId = result.data.id
+        const reportResult = input && await fetchReportData(reportId)
+
+        if (reportResult) {
+          formatReportDataOutput(reportResult.data, { name, outputJson, outputMarkdown, reportId })
+        }
+      } else if (result) {
         formatReportCreationOutput(result.data, { outputJson, outputMarkdown })
       }
     }
@@ -41,7 +58,7 @@ export const create = {
  * @param {string} description
  * @param {readonly string[]} argv
  * @param {ImportMeta} importMeta
- * @returns {Promise<void|{ cwd: string, debugLog: typeof console.error, dryRun: boolean, outputJson: boolean, outputMarkdown: boolean, packagePaths: string[] }>}
+ * @returns {Promise<void|{ cwd: string, debugLog: typeof console.error, dryRun: boolean, outputJson: boolean, outputMarkdown: boolean, packagePaths: string[], view: boolean }>}
  */
 async function setupCommand (name, description, argv, importMeta) {
   const cli = meow(`
@@ -54,6 +71,7 @@ async function setupCommand (name, description, argv, importMeta) {
         '--dry-run': 'Only output what will be done without actually doing it',
         '--json': 'Output result as json',
         '--markdown': 'Output result as markdown',
+        '--view': 'Will wait for and return the created report'
       }, 6)}
 
     Examples
@@ -84,13 +102,19 @@ async function setupCommand (name, description, argv, importMeta) {
         alias: 'm',
         default: false,
       },
+      view: {
+        type: 'boolean',
+        alias: 'v',
+        default: false,
+      },
     }
   })
 
   const {
     dryRun,
     json: outputJson,
     markdown: outputMarkdown,
+    view,
   } = cli.flags
 
   if (!cli.input[0]) {
@@ -109,7 +133,8 @@ async function setupCommand (name, description, argv, importMeta) {
     dryRun,
     outputJson,
     outputMarkdown,
-    packagePaths
+    packagePaths,
+    view,
   }
 }
 

lib/commands/report/view.js

@@ -100,7 +100,7 @@ function setupCommand (name, description, argv, importMeta) {
  * @param {string} reportId
  * @returns {Promise<void|import('@socketsecurity/sdk').SocketSdkReturnType<'getReport'>>}
  */
-async function fetchReportData (reportId) {
+export async function fetchReportData (reportId) {
   // Do the API call
 
   const socketSdk = await setupSdk()
@@ -124,7 +124,7 @@ async function fetchReportData (reportId) {
  * @param {{ name: string, outputJson: boolean, outputMarkdown: boolean, reportId: string }} context
  * @returns {void}
  */
-function formatReportDataOutput (data, { name, outputJson, outputMarkdown, reportId }) {
+export function formatReportDataOutput (data, { name, outputJson, outputMarkdown, reportId }) {
   // If JSON, output and return...
 
   if (outputJson) {