Address CLI PR review feedback

Author: ChiragAgg5k

templates/cli/cli.ts.twig

@@ -83,8 +83,8 @@ if (process.argv.includes('-v') || process.argv.includes('--version')) {
         .helpOption('-h, --help', 'Display help for command')
         .version(version, '-v, --version', 'Output the version number')
         .option('-V, --verbose', 'Show complete error log')
-        .option('-j, --json', 'Output in JSON format')
-        .option('-R, --raw', 'Output raw JSON (secrets still redacted unless --show-secrets is set)')
+        .option('-j, --json', 'Output filtered JSON without empty values')
+        .option('-R, --raw', 'Output full JSON response (secrets still redacted unless --show-secrets is set)')
         .option('--show-secrets', 'Display sensitive values like secrets and tokens in output')
         .hook('preAction', migrate)
         .option('-f,--force', 'Flag to confirm all warnings')

templates/cli/lib/parser.ts

@@ -100,6 +100,16 @@ const endRender = (): void => {
   }
 };
 
+const withRender = <T>(callback: () => T): T => {
+  beginRender();
+
+  try {
+    return callback();
+  } finally {
+    endRender();
+  }
+};
+
 const isSensitiveKey = (key: string): boolean => {
   const normalizedKey = key.toLowerCase().replace(/[^a-z0-9]/g, "");
 
@@ -222,9 +232,7 @@ const filterData = (data: JsonObject): JsonObject => {
 };
 
 export const parse = (data: JsonObject): void => {
-  beginRender();
-
-  try {
+  withRender(() => {
     const sanitizedData = maskSensitiveData(data) as JsonObject;
 
     if (cliConfig.raw) {
@@ -285,9 +293,7 @@ export const parse = (data: JsonObject): void => {
         printedScalar = true;
       }
     }
-  } finally {
-    endRender();
-  }
+  });
 };
 
 const MAX_COL_WIDTH = 40;
@@ -312,9 +318,7 @@ const formatCellValue = (value: unknown): string => {
 };
 
 export const drawTable = (data: Array<JsonObject | null | undefined>): void => {
-  beginRender();
-
-  try {
+  withRender(() => {
     if (data.length == 0) {
       console.log("[]");
       return;
@@ -395,21 +399,21 @@ export const drawTable = (data: Array<JsonObject | null | undefined>): void => {
       colWidths: columns.map(() => null) as (number | null)[],
       wordWrap: false,
       chars: {
-        top: " ",
+        "top": " ",
         "top-mid": " ",
         "top-left": " ",
         "top-right": " ",
-        bottom: " ",
+        "bottom": " ",
         "bottom-mid": " ",
         "bottom-left": " ",
         "bottom-right": " ",
-        left: " ",
+        "left": " ",
         "left-mid": " ",
-        mid: chalk.cyan("─"),
+        "mid": chalk.cyan("─"),
         "mid-mid": chalk.cyan("┼"),
-        right: " ",
+        "right": " ",
         "right-mid": " ",
-        middle: chalk.cyan("│"),
+        "middle": chalk.cyan("│"),
       },
     });
 
@@ -421,9 +425,7 @@ export const drawTable = (data: Array<JsonObject | null | undefined>): void => {
       table.push(rowValues);
     });
     console.log(table.toString());
-  } finally {
-    endRender();
-  }
+  });
 };
 
 export const drawJSON = (data: unknown): void => {