Merge pull request #534 from ethereum/solcjs-pretty-json-and-verbose-options

[solcjs] `--pretty-json` and `--verbose` options

Author: cameel

solcjs

@@ -38,7 +38,9 @@ program
   .option('--abi', 'ABI of the contracts.')
   .option('--standard-json', 'Turn on Standard JSON Input / Output mode.')
   .option('--base-path <path>', 'Automatically resolve all imports inside the given path.')
-  .option('-o, --output-dir <output-directory>', 'Output directory for the contracts.');
+  .option('-o, --output-dir <output-directory>', 'Output directory for the contracts.')
+  .option('-p, --pretty-json', 'Pretty-print all JSON output.', false)
+  .option('-v, --verbose', 'More detailed console output.', false);
 
 program.parse(process.argv);
 const options = program.opts();
@@ -91,18 +93,30 @@ function stripBasePath(sourcePath) {
   return withUnixPathSeparators(relativeSourcePath);
 }
 
+function toFormattedJson(input) {
+  return JSON.stringify(input, null, program.prettyJson ? 4 : 0);
+}
+
+function reformatJsonIfRequested(inputJson) {
+  return (program.prettyJson ? toFormattedJson(JSON.parse(inputJson)) : inputJson);
+}
+
 var callbacks = undefined
 if (options.basePath || !options.standardJson)
   callbacks = {'import': readFileCallback};
 
 if (options.standardJson) {
   var input = fs.readFileSync(process.stdin.fd).toString('utf8');
-  var output = solc.compile(input, callbacks);
+  if (program.verbose)
+    console.log('>>> Compiling:\n' + reformatJsonIfRequested(input) + "\n")
+  var output = reformatJsonIfRequested(solc.compile(input, callbacks));
 
   try {
     var inputJSON = smtchecker.handleSMTQueries(JSON.parse(input), JSON.parse(output), smtsolver.smtSolver);
     if (inputJSON) {
-      output = solc.compile(JSON.stringify(inputJSON), callbacks);
+      if (program.verbose)
+        console.log('>>> Retrying compilation with SMT:\n' + toFormattedJson(inputJSON) + "\n")
+      output = reformatJsonIfRequested(solc.compile(JSON.stringify(inputJSON), callbacks));
     }
   }
   catch (e) {
@@ -118,9 +132,11 @@ if (options.standardJson) {
       outputJSON.errors = []
     }
     outputJSON.errors.push(addError);
-    output = JSON.stringify(outputJSON);
+    output = toFormattedJson(outputJSON);
   }
 
+  if (program.verbose)
+    console.log('>>> Compilation result:')
   console.log(output);
   process.exit(0);
 } else if (files.length === 0) {
@@ -142,7 +158,7 @@ for (var i = 0; i < files.length; i++) {
   }
 }
 
-var output = JSON.parse(solc.compile(JSON.stringify({
+const cliInput = {
   language: 'Solidity',
   settings: {
     optimizer: {
@@ -156,7 +172,10 @@ var output = JSON.parse(solc.compile(JSON.stringify({
     }
   },
   sources: sources
-}), callbacks));
+};
+if (program.verbose)
+  console.log('>>> Compiling:\n' + toFormattedJson(cliInput) + "\n")
+var output = JSON.parse(solc.compile(JSON.stringify(cliInput), callbacks));
 
 let hasError = false;
 
@@ -195,7 +214,7 @@ for (var fileName in output.contracts) {
     }
 
     if (options.abi) {
-      writeFile(contractFileName + '.abi', JSON.stringify(output.contracts[fileName][contractName].abi));
+      writeFile(contractFileName + '.abi', toFormattedJson(output.contracts[fileName][contractName].abi));
     }
   }
 }