@magic/cli 0.0.44 → 0.0.46

package/README.md

@@ -541,6 +541,17 @@ update dependencies
 - update dependencies
 - add colors to default arg output
 
-##### 0.0.45 - unreleased
+##### 0.0.45
 
-...
+- help.example can be an array
+- update dependencies
+- cli.prompt - msg can be an array
+
+##### 0.0.46
+
+- cli.exec allows stderrToStdout redirect config option
+- update dependencies
+
+##### 0.0.47 - unreleased
+
+- ...

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic/cli",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "homepage": "https://magic.github.io/cli",
   "description": "declarative command line interfaces with aliasing, commands and environment sanitization",
   "scripts": {
@@ -40,13 +40,13 @@
   },
   "devDependencies": {
     "@magic-modules/git-badges": "0.0.12",
-    "@magic-modules/light-switch": "0.0.11",
-    "@magic-modules/no-spy": "0.0.8",
-    "@magic-modules/pre": "0.0.11",
-    "@magic-themes/docs": "0.0.14",
-    "@magic/core": "0.0.149",
-    "@magic/format": "0.0.50",
-    "@magic/test": "0.2.15"
+    "@magic-modules/light-switch": "0.0.12",
+    "@magic-modules/no-spy": "0.0.9",
+    "@magic-modules/pre": "0.0.12",
+    "@magic-themes/docs": "0.0.15",
+    "@magic/core": "0.0.153",
+    "@magic/format": "0.0.51",
+    "@magic/test": "0.2.17"
   },
   "author": "Wizards & Witches",
   "license": "AGPL-3.0",

package/src/exec.mjs

@@ -6,7 +6,9 @@ const libName = '@magic/cli.exec'
 
 export const exec = (cmd, options = {}) =>
   new Promise((resolve, reject) => {
-    child_process.exec(cmd, options, (err, stdout, stderr) => {
+    const { stderrToStdout, ...opts } = options
+
+    child_process.exec(cmd, opts, (err, stdout, stderr) => {
       if (err) {
         const e = error(err, 'E_EXEC_ERR')
         reject(e)
@@ -14,6 +16,11 @@ export const exec = (cmd, options = {}) =>
       }
 
       if (stderr) {
+        if (stderrToStdout) {
+          resolve(stderr)
+          return
+        }
+
         const e = error(new Error(`${libName}: ${cmd} error: ${stderr}`), 'E_EXEC_STDERR')
         reject(e)
         return

package/src/help/index.mjs

@@ -27,6 +27,18 @@ export const maybeHelp = args => {
   const name = help.name || '@magic/cli wrapped cli.'
   const header = is.string(help) ? help : help.text
 
+  const exampleArray = is.string(help.example) ? help.example.split('\n') : help.example
+
+  const exampleText = exampleArray
+    .map(a => {
+      if (a.trim().startsWith('#')) {
+        return log.color('green', a)
+      } else {
+        return a.trim()
+      }
+    })
+    .join('\n')
+
   const helpArray = [
     log.paint('green', name),
     '\n',
@@ -35,7 +47,7 @@ export const maybeHelp = args => {
     options.length && `${log.paint('grey', 'flags')}:\n${optionHelp}\n\n`,
     env.length && `${log.paint('grey', 'environment switches')}:\n${envHelp}\n\n`,
     'examples:\n',
-    help.example,
+    exampleText,
   ]
 
   const errors = parsed.errors

package/src/prompt.mjs

@@ -1,11 +1,13 @@
-import fs from 'fs'
+import is from '@magic/types'
 import readline from 'readline'
 
-import log from '@magic/log'
-
 export const prompt = (msg = '', options = {}) =>
   new Promise((resolve, reject) => {
-    const { yesNo = false, pass = false, std = process, yesDefault = false } = options
+    const { yesNo = false, std = process, yesDefault = false } = options
+
+    if (is.array(msg)) {
+      msg = msg.join(' ')
+    }
 
     if (yesNo) {
       let flag = 'y/N'