Merge pull request #35 from perpetual-protocol/feature/upgrade-yargs

refactor: add Logger export and upgrade yargs to 17

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@perp/cli",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "description": "CLI for Perpetual Protocol",
     "main": "build/src/index.js",
     "module": "build/src/index.js",
@@ -29,7 +29,7 @@
         "@types/node": "14.14.41",
         "@types/node-fetch": "2.5.10",
         "@types/shelljs": "0.8.8",
-        "@types/yargs": "16.0.1",
+        "@types/yargs": "17.0.0",
         "chai": "4.3.4",
         "mocha": "8.3.2",
         "nyc": "15.1.0",
@@ -47,6 +47,6 @@
         "luxon": "1.26.0",
         "node-fetch": "2.6.1",
         "shelljs": "0.8.4",
-        "yargs": "16.2.0"
+        "yargs": "17.0.1"
     }
 }

src/cli/index.ts

@@ -2,7 +2,14 @@
 
 import { runner } from "./runner"
 import { hideBin } from "yargs/helpers"
+import { Arguments } from "yargs"
 
-runner()
-    .onFinishCommand(() => process.exit(0))
-    .parse(hideBin(process.argv))
+runner().parseAsync(
+    hideBin(process.argv),
+    (err: Error | undefined, argv: Arguments | Promise<Arguments>, output: string) => {
+        if (err || output) {
+            console.log(output)
+        }
+        process.exit(0)
+    },
+)

src/cli/middeware.ts

@@ -63,11 +63,11 @@ export class BaseLogger {
     }
 }
 
-class BotLogger extends BaseLogger {
+export class BotLogger extends BaseLogger {
     // NOTE: add any customization for BotLogger here
     private bufferedStr: string = ''
 
-    log = (str: string) => {
+    log = (str: string = '') => {
         // NOTE: use empty string as the termination character to send message
         if (str !== '') {
             this.bufferedStr += `${str}\n`
@@ -78,6 +78,10 @@ class BotLogger extends BaseLogger {
             this.bufferedStr = ''
         }
     }
+
+    logLine = (str: string = '') => {
+        this._logFn(str)
+    }
 }
 
 class CommandlineLogger extends BaseLogger {

src/cli/runner.ts

@@ -1,12 +1,10 @@
-import yargs, { CommandModule } from "yargs"
+import yargs from "yargs"
 import positionHistory from "../command/position"
 import ammStatus from "../command/amm"
 import portfolio from "../command/portfolio"
 import verifyCommand from "../command/verify"
 import sendTx from "../command/exec"
-import { getStageName } from "../util/stage"
-import { fetchConfiguration } from "../util/metadata"
-import { BaseLogger, LoggerMiddleware } from "./middeware"
+import { LoggerMiddleware } from "./middeware"
 
 const SCRIPT_NAME = "perp"
 

src/command/amm.ts

@@ -121,7 +121,9 @@ const ammCommand: CommandModule = {
                 break
             }
         }
-        log("")
+        if (flagShortList) {
+            log("")
+        }
     },
 }
 

src/index.ts

@@ -1 +1,2 @@
 export * from './cli/runner'
+export { BaseLogger, BotLogger } from './cli/middeware'