@rpcbase/cli 0.7.0 → 0.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.7.0",
+  "version": "0.11.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"
@@ -10,12 +10,12 @@
   },
   "dependencies": {
     "bluebird": "3.7.2",
-    "chalk": "4.1.2",
-    "concurrently": "7.0.0",
+    "concurrently": "7.2.1",
     "debug": "4.3.4",
-    "dotenv": "16.0.0",
-    "semver": "7.3.5",
+    "dotenv": "16.0.1",
+    "picocolors": "1.0.0",
+    "semver": "7.3.7",
     "validator": "13.7.0",
-    "yargs": "17.4.0"
+    "yargs": "17.5.1"
   }
 }

package/src/default_command.js

@@ -2,19 +2,22 @@
 const debug = require("debug")("rb-cli")
 const path = require("path")
 const fs = require("fs")
-const chalk = require("chalk")
+const colors = require("picocolors")
 const concurrently = require("concurrently")
 
+const docker_runtime_check = require("./helpers/docker_runtime_check")
 const exit_with_message = require("./helpers/exit_with_message")
 const get_run_configs = require("./helpers/get_run_configs")
-const docker_runtime_check = require("./helpers/docker_runtime_check")
 const verify_project = require("./verify_project")
 
-
+// TODO: nuke this
+// server native + docker + docker-native is way too complex
+// either everything is native, or everything is in docker
 const default_command = async(args) => {
   const run_configs = get_run_configs()
 
-  const run_commands = run_configs.map((cfg) => {
+  const run_commands = []
+  run_configs.forEach((cfg) => {
     let name
     let command
     let prefixColor
@@ -41,15 +44,16 @@ const default_command = async(args) => {
       command = `${command} --coverage`
     }
 
-    // command, name, prefixColor, env, cwd
-    return {
+    // add command
+    run_commands.push({
       name,
       command,
       prefixColor,
       cwd: cfg.working_dir
-    }
+    })
   })
 
+  // check if docker is running
   if (run_configs.filter((c) => c.type === "server").length > 0) {
     docker_runtime_check()
   }
@@ -68,7 +72,7 @@ const default_command = async(args) => {
     })
     .catch((err) => {
       if (project_errors?.length >  0) {
-        console.log(`\n${chalk.bold("exited due to configuration errors:")}`)
+        console.log(`\n${colors.bold("exited due to configuration errors:")}`)
         project_errors.forEach((err) => {
           console.log(err)
         })

package/src/errors.js

@@ -1,8 +1,8 @@
 /* @flow */
-const chalk = require("chalk")
+const colors = require("picocolors")
 
 const ERRORS = {
-  INVALID_CWD: `expected to run in ${chalk.cyan("client/")} or ${chalk.cyan("server/server/")} or project root directory`
+  INVALID_CWD: `expected to run in ${colors.cyan("client/")} or ${colors.cyan("server/server/")} or project root directory`
 }
 
 module.exports = ERRORS

package/src/helpers/docker_runtime_check.js

@@ -1,12 +1,21 @@
 /* @flow */
 const {execSync} = require("child_process")
-const chalk = require("chalk")
+const os = require("os")
+const colors = require("picocolors")
+
+const {FORCE_DOCKER} = process.env
 
 const docker_runtime_check = () => {
+  // skip check on osx except when forcing docker
+  if (os.platform() === "darwin" && !FORCE_DOCKER) {
+    return
+  }
+
+
   try {
     execSync("docker version -f json")
   } catch (err) {
-    console.log(chalk.cyan.bold("docker"), "exited with error")
+    console.log(colors.cyan("docker"), "exited with error")
     process.exit(1)
   }
 }

package/src/helpers/exit_with_message.js

@@ -1,8 +1,8 @@
 /* @flow */
-const chalk = require("chalk")
+const colors = require("picocolors")
 
 const exit_with_message = (message = "", code = 1) => {
-  console.log(chalk.red("error:"), message)
+  console.log(colors.red("error:"), message)
 
   // TODO: sentry(?) report error
 

package/src/helpers/get_run_configs.js

@@ -5,11 +5,11 @@ const fs = require("fs")
 const ERRORS = require("../errors")
 const exit_with_message = require("./exit_with_message")
 
-
 // run type is client | server | both
 const get_run_configs = () => {
   const cwd = process.cwd()
 
+
   // check if running parent of rb project
   const dir_contents = fs.readdirSync(cwd)
   const is_parent_dir = dir_contents.includes("client") && dir_contents.includes("server")
@@ -57,6 +57,8 @@ const get_run_configs = () => {
           working_dir: path.join(cwd, "../infrastructure")
         },
       ]
+    } else {
+      console.log("TODO: server get_run_configs:handle edge case here")
     }
   }
 

package/src/verify_project/index.js

@@ -1,7 +1,7 @@
 /* @flow */
 const path = require("path")
 const _ = require("lodash")
-const chalk = require("chalk")
+const colors = require("picocolors")
 const Promise = require("bluebird")
 
 const verify_packages_installed = require("./verify_packages_installed")
@@ -34,18 +34,18 @@ const verify_project = async(run_configs) => {
   )
 
   if (deps_errors.length > 0) {
-    let error_str = `${chalk.bold.red("error:")} the following packages are missing from your ${chalk.bold("node_modules")}\n`
+    let error_str = `${colors.red("error:")} the following packages are missing from your ${colors.bold("node_modules")}\n`
     deps_errors.forEach((err) => {
       error_str += `  ${err}\n`
     })
-    error_str += `\n  run ${chalk.bold("yarn install")} to ensure dependencies are installed\n`
+    error_str += `\n  run ${colors.bold("yarn install")} to ensure dependencies are installed\n`
     result_errors.push(error_str)
   }
 
   // get env file from server and validate required services and ports
   const env_errors = await verify_env(project_root_dir)
   if (env_errors.length > 0) {
-    let error_str = `${chalk.bold.red("error:")} ${chalk.bold(".env")} misconfigurations\n`
+    let error_str = `${colors.red("error:")} ${colors.bold(".env")} misconfigurations\n`
     env_errors.forEach((err) => {
       error_str += `  ${err}\n`
     })

package/src/verify_project/thresholds.schema.json

@@ -0,0 +1,28 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://schemas.rpcbase.com/schemas/thresholds.schema.json",
+  "title": "thresholds",
+  "type": "object",
+  "properties": {
+    "statements": {
+      "type": "number",
+      "minimum": 0,
+      "maximum": 100,
+    },
+    "branches": {
+      "type": "number",
+      "minimum": 0,
+      "maximum": 100,
+    },
+    "functions": {
+      "type": "number",
+      "minimum": 0,
+      "maximum": 100,
+    },
+    "lines": {
+      "type": "number",
+      "minimum": 0,
+      "maximum": 100,
+    }
+  }
+}

package/src/verify_project/verify_env.js

@@ -1,14 +1,15 @@
 /* @flow */
 const fs = require("fs")
 const path = require("path")
-const chalk = require("chalk")
+
+const colors = require("picocolors")
 const dotenv = require("dotenv")
 const validator = require("validator")
 
 
 const validate_port = (val) => {
   if (!validator.isPort(val)) {
-    return `expected ${chalk.bold(val)} to be a valid port number`
+    return `expected ${colors.bold(val)} to be a valid port number`
   }
 }
 
@@ -31,7 +32,7 @@ const SERVICES = [
       "DATABASE_PORT": validate_port,
       "DATABASE_NAME": (val) => {
         if (!/^[$A-Z_][0-9A-Z_$-]*$/i.test(val)) {
-          return `expected ${chalk.bold(`'${val}'`)} to be a valid database name`
+          return `expected ${colors.bold(`'${val}'`)} to be a valid database name`
         }
       }
     },
@@ -65,13 +66,13 @@ const verify_env = async(root_dir) => {
       const env_val = parsed_env[k]
 
       if (!env_val) {
-        result_errors.push(`${chalk.yellow.bold(k)} is missing`)
+        result_errors.push(`${colors.yellow(k)} is missing`)
         return
       }
 
       const err = val_fn(env_val)
       if (err) {
-        result_errors.push(`${chalk.yellow.bold(k)} ${err}`)
+        result_errors.push(`${colors.yellow(k)} ${err}`)
       }
     })
   })

package/src/verify_project/verify_packages_installed.js

@@ -2,7 +2,7 @@
 const path = require("path")
 const fs = require("fs")
 const util = require("util")
-const chalk = require("chalk")
+const colors = require("picocolors")
 const semverSatisfies = require("semver/functions/satisfies")
 
 const exec = util.promisify(require("child_process").exec)
@@ -37,7 +37,7 @@ const verify_packages_installed = (root_dir) => async(wd) => {
 
   Object.keys(deps).forEach((k) => {
     if (!installed[k]) {
-      result_errors.push(`${chalk.yellow.bold(k)} is missing in ${chalk.bold(rel_dir + "/")}`)
+      result_errors.push(`${colors.yellow(k)} is missing in ${colors.bold(rel_dir + "/")}`)
     }
   })