fix(json): disable pretty printing in json mode

flxbl-io · Aug 7, 2023 · 2fa6cf6 · 2fa6cf6
1 parent 1b65439
commit 2fa6cf6
Show file tree

Hide file tree

Showing 4 changed files with 12,431 additions and 16,919 deletions.
diff --git a/packages/sfpowerscripts-cli/package.json b/packages/sfpowerscripts-cli/package.json
@@ -23,6 +23,7 @@
         "ajv": "8.11.0",
         "async-retry": "^1.3.1",
         "bottleneck": "^2.19.5",
+        "chalk": "^4.1.2",
         "cli-table": "0.3.11",
         "dotenv": "16.3.1",
         "fs-extra": "^11.1.1",

diff --git a/packages/sfpowerscripts-cli/src/SfpowerscriptsCommand.ts b/packages/sfpowerscripts-cli/src/SfpowerscriptsCommand.ts
@@ -4,7 +4,7 @@ import ProjectValidation from './ProjectValidation';
 import * as fs from 'fs-extra';
 import SFPLogger, { COLOR_HEADER, ConsoleLogger, LoggerLevel } from '@dxatscale/sfp-logger';
 import GroupConsoleLogs from './ui/GroupConsoleLogs';
-import { Command, Flags } from '@oclif/core';
+import { Command, Flags, ux } from '@oclif/core';
 import { FlagOutput } from '@oclif/core/lib/interfaces/parser';
 import { Org } from '@salesforce/core';
 
@@ -117,6 +117,12 @@ export default abstract class SfpowerscriptsCommand extends Command {
                 )
             );
         }
+        else
+        {
+            //Disable pretty printing in json mode
+            const chalk = require('chalk')
+            chalk.level = 0;
+        }
 
         if (this.statics.requiresProject) {
             let projectValidation = new ProjectValidation();

diff --git a/packages/sfpowerscripts-cli/src/commands/pool/list.ts b/packages/sfpowerscripts-cli/src/commands/pool/list.ts
@@ -49,7 +49,7 @@ export default class List extends SfpowerscriptsCommand {
         loglevel
     };
 
-    public async execute(): Promise<AnyJson> {
+    public async execute(): Promise<any> {
         await this.hubOrg.refreshAuth();
         const hubConn = this.hubOrg.getConnection();
 
@@ -98,7 +98,7 @@ export default class List extends SfpowerscriptsCommand {
             }
         }
 
-        let output: any = {
+        let output = {
             total: scratchOrgInuse.length + scratchOrgNotInuse.length + scratchOrgInProvision.length,
             inuse: scratchOrgInuse.length,
             unused: scratchOrgNotInuse.length,