@rpcbase/cli 0.36.0 → 0.38.0

package/bin.js

@@ -11,6 +11,8 @@ const {hideBin} = require("yargs/helpers")
 const start_command = require("./src/start_command")
 const print_versions = require("./src/print_versions")
 const update = require("./src/update")
+const sync_dotenv = require("./src/sync-dotenv")
+
 
 yargs(hideBin(process.argv))
   .command(["start", "*"], "Starts client, server, and infrastructure", (yargs) => {
@@ -32,6 +34,7 @@ yargs(hideBin(process.argv))
         description: "Run with debug logging"
       })
   }, (argv) => {
+    console.log("IS start")
     if (argv.version) return print_versions()
     start_command(argv)
   })
@@ -47,6 +50,26 @@ yargs(hideBin(process.argv))
     if (argv.version) return print_versions()
     await update()
   })
+  // sync-dotenv
+  .command("sync-dotenv [source_env] [dest_env]", "Compare and sync dotenv files", (yargs) => {
+    yargs
+      .option("write", {
+        type: "boolean",
+        default: false,
+        description: "Write the ouput to dest env file"
+      })
+      .positional("source_env", {
+        describe: "source .env file",
+        type: "string"
+      })
+      .positional("dest_env", {
+        describe: "destination env file",
+        type: "string"
+      })
+  }, async(argv) => {
+    if (argv.version) return print_versions()
+    await sync_dotenv(argv.source_env, argv.dest_env)
+  })
   // Ping
   .command("ping", "Ping", () => {}, (argv) => {
     if (argv.version) return print_versions()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.36.0",
+  "version": "0.38.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"
@@ -13,9 +13,13 @@
     "concurrently": "8.2.1",
     "debug": "4.3.4",
     "dotenv": "16.3.1",
+    "parse-dotenv": "2.1.0",
     "picocolors": "1.0.0",
     "semver": "7.5.4",
     "validator": "13.11.0",
     "yargs": "17.7.2"
+  },
+  "devDependencies": {
+    "jest": "29.7.0"
   }
 }

package/src/helpers/get_run_configs.js

@@ -7,11 +7,11 @@ const exit_with_message = require("./exit_with_message")
 
 const {CONTAINER_MODE} = process.env
 
-if (!["docker", "native"].includes(CONTAINER_MODE.trim()))
-  throw new Error("expected CONTAINER_MODE to be native|docker")
-
 // run type is client | server | both
 const get_run_configs = () => {
+  if (!["docker", "native"].includes(CONTAINER_MODE.trim()))
+    throw new Error("expected CONTAINER_MODE to be native|docker")
+
   const cwd = process.cwd()
 
   // check if running parent of rb project

package/src/helpers/tailscale_tunnel.js

@@ -14,7 +14,6 @@ const has_tailscale = process.platform === "darwin" && fs.existsSync(TAILSCALE_P
 const get_port = (run_configs) => {
   const project_root_dir = get_root_dir(run_configs)
 
-  // TODO: should join w/ .env.base
   const server_env_path = path.join(project_root_dir, "./server/server/.env")
 
   const server_env_buf = fs.readFileSync(server_env_path)

package/src/sync-dotenv/.env.sample

@@ -0,0 +1,3 @@
+DOMAIN=localhost3
+GHEllo=
+# yo

package/src/sync-dotenv/index.js

@@ -0,0 +1,126 @@
+/* @flow */
+const path = require("path")
+const fs = require("fs")
+const os = require('os')
+const parse_env = require("parse-dotenv")
+
+
+const DEFAULT_ENV_PATH = path.resolve(process.cwd(), ".env")
+const SAMPLE_ENV_SUFFIX = ".sample"
+const COMMENT_PREFIX = "__COMMENT_"
+
+const env_to_string = (parsed) =>
+  Object.keys(parsed)
+    .map(key => `${key}=${parsed[key] || ""}`)
+    .join(os.EOL)
+    .replace(/(__\w+_\d+__=)/g, "")
+
+
+const write_to_dest_env = (path, parsed_env) => {
+  try {
+    fs.writeFileSync(path, env_to_string(parsed_env))
+  } catch (e) {
+    throw new Error(`Sync failed. ${e.message}`)
+  }
+}
+
+
+const get_empty_obj_props = (obj) => {
+
+  const obj_copy = { ...obj }
+
+  Object.keys(obj_copy).forEach(key => {
+    if (obj_copy[key].includes("#")) {
+      if (obj_copy[key].match(/(".*"|'.*')/g)) {
+        const objArr = obj_copy[key].split(/(".*"|'.*')/)
+        obj_copy[key] = objArr.slice(-1)[0].trim()
+      } else {
+        const objArr = obj_copy[key].split("#")
+        obj_copy[key] = `#${objArr.slice(-1)[0]}`
+      }
+
+      return
+    }
+
+    if (!key.startsWith(COMMENT_PREFIX)) {
+      obj_copy[key] = ""
+    }
+  })
+
+  return obj_copy
+}
+
+const get_unique_vars_from_envs = (
+  env,
+  env_example,
+  config = {}
+) => {
+  const unique_keys = new Set(Object.keys(env))
+  const unique_keys_list = Array.from(unique_keys)
+
+  const unique_from_source = unique_keys_list.map((key) => {
+    if (key.startsWith(COMMENT_PREFIX)) return { [key]: env[key] }
+    return { [key]: env_example[key] || "" }
+  })
+
+  const preseved_vars = Object.keys(env_example)
+    .map(key => ({ [key]: env_example[key] }))
+    // .filter(env => {
+    //   console.log("ICICIC", env)
+    //   return ignoreKeys.length && ignoreKeys.includes(Object.keys(env)[0])
+    // })
+
+  return [...unique_from_source, ...preseved_vars]
+}
+
+
+const sync_with_dest_env = (
+  env_path,
+  env_example_path
+) => {
+  const config = { emptyLines: true, comments: true }
+
+  const source_env = get_empty_obj_props(
+    parse_env(env_path, config)
+  )
+
+  const target_env = parse_env(env_example_path)
+
+  const unique_vars = get_unique_vars_from_envs(source_env, target_env, config)
+  const env_copy = {}
+
+  unique_vars.forEach(env => {
+    const [key] = Object.keys(env)
+    env_copy[key] = env[key]
+  })
+
+  write_to_dest_env(env_example_path, env_copy)
+}
+
+
+const sync_dotenv = (
+  env_path,
+  _dest_env,
+) => {
+  if (env_path && !fs.existsSync(env_path)) {
+    throw new Error(`env_path: ${env_path} doesn't exist`)
+  }
+
+  const source_path = env_path || DEFAULT_ENV_PATH
+
+  if (!fs.existsSync(source_path)) {
+    throw new Error(`${env_path || ".env"} file not found`)
+  }
+
+  const dest_env_path = _dest_env || `${source_path}${SAMPLE_ENV_SUFFIX}`
+
+  // creates the sample env file if it doesn't exist
+  if (!fs.existsSync(dest_env_path)) {
+    fs.writeFileSync(dest_env_path, "")
+  }
+
+  sync_with_dest_env(source_path, dest_env_path)
+}
+
+
+module.exports = sync_dotenv

package/src/sync-dotenv/test.js

@@ -0,0 +1,8 @@
+/* @flow */
+
+const {syncEnv} = require("./index")
+
+
+const res = syncEnv(".env", ".env.sample")
+
+// console.log("FNDE", res)