fix: improve json output

Author: Jeday

index.ts

@@ -56,8 +56,12 @@ program.addHelpText('afterAll', () => {
 
 // Add interrupt handling to the CLI
 const runCLI = withInterruptHandling(async () => {
+  // programm.opts is not init yet
+  const isJson = process.argv.includes('--json');
   const chain = await getChain();
-  if (program.opts().json) {
+  if (isJson) {
+    console.info('[');
+  } else {
     logInfo(`${'-'.repeat(100)}`);
     logInfo(`Using chain: Name: ${chain.name}, Chain ID: ${chain.id}`);
     logInfo(`${'-'.repeat(100)}`);
@@ -72,7 +76,9 @@ runCLI()
     process.exit(1);
   })
   .finally(async () => {
-    if (!program.opts().json) {
+    if (program.opts().json) {
+      console.info(']');
+    } else {
       const chain = await getChain();
       if (chain.id === mainnet.id) {
         showMainnetWarning();

utils/logging/console.ts

@@ -28,43 +28,41 @@ const bigIntStringify = <T>(value: T): string => {
   );
 };
 
+let IS_PREV_JSON_LOG = false;
+
 export const createConsole = (
   headMessage: HeadMessage,
   type: 'info' | 'error' | 'table' | 'bold' = 'info',
 ) => {
   return <T, U>(...args: T[] | U[]) => {
+    // print comma if previous log is JSON to separate logs
+    if (IS_PREV_JSON_LOG) {
+      console.info(',');
+    }
+    // set flag so that next log can check if previous log is JSON and print comma
+    if (program.opts().json) {
+      IS_PREV_JSON_LOG = true;
+    }
+
     switch (type) {
       case 'table':
         if (program.opts().json) {
-          console.info(`\n${getColoredLog(headMessage, headMessage + ':')}`);
-          console.info('<JSON>');
-          console.info(bigIntStringify(args));
-          console.info('</JSON>');
-          return;
+          return console.info(bigIntStringify(args));
         }
         console.info(`\n${getColoredLog(headMessage, headMessage + ':')}`);
-        console.table(...args);
-        break;
+        return console.table(...args);
+
       case 'bold':
         if (program.opts().json) {
-          console.info(`\n${getColoredLog(headMessage, headMessage + ':')}`);
-          console.info('<JSON>');
-          console.info(bigIntStringify({ Result: args }));
-          console.info('</JSON>');
-          return;
+          return console.info(bigIntStringify({ result: args }));
         }
-        console.info(getColoredLog(headMessage, args));
-        break;
+        return console.info(getColoredLog(headMessage, args));
       default:
         if (program.opts().json) {
-          console.info(`\n${getColoredLog(headMessage, headMessage + ':')}`);
-          console.info('<JSON>');
-          console.info(bigIntStringify({ Result: args }));
-          console.info('</JSON>');
-          return;
+          return console.info(bigIntStringify({ result: args }));
         }
         // eslint-disable-next-line no-console
-        console[type](
+        return console[type](
           `\n${getColoredLog(headMessage, headMessage + ':')}`,
           ...args,
         );
@@ -80,10 +78,14 @@ const createTable = (headMessage?: HeadMessage) => (args: CreateTableArgs) => {
   if (!data) return;
 
   if (program.opts().json) {
-    console.info('<JSON>');
-    console.info(bigIntStringify({ Result: data }));
-    console.info('</JSON>');
-    return;
+    // print comma if previous log is JSON to separate logs
+    if (IS_PREV_JSON_LOG) {
+      console.info(',');
+    }
+
+    IS_PREV_JSON_LOG = true;
+
+    return console.info(bigIntStringify({ result: data }));
   } else {
     const table = new Table({ ...TABLE_PARAMS, ...params });
     table.push(...data);