@rpcbase/cli 0.88.0 → 0.90.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.88.0",
+  "version": "0.90.0",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -28,7 +28,8 @@
   },
   "dependencies": {
     "axios": "1.9.0",
-    "dotenv": "16.5.0",
+    "dotenv": "17.0.0",
+    "dotenv-expand": "12.0.2",
     "validator": "13.15.0",
     "yargs": "17.7.2"
   }

package/src/index.js

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 
 import yargs from "yargs/yargs"
-import { hideBin } from 'yargs/helpers'
-import dotenv from 'dotenv'
-import fs from 'fs'
-import {deploy} from "./cmd-deploy.js"
-import {ssh} from "./cmd-ssh.js"
-import {waitFor} from "./cmd-wait-for/index.js"
+import { hideBin } from "yargs/helpers"
+import dotenv from "dotenv"
+import { expand } from "dotenv-expand"
+import fs from "fs"
+import { deploy } from "./cmd-deploy.js"
+import { ssh } from "./cmd-ssh.js"
+import { waitFor } from "./cmd-wait-for/index.js"
 
 yargs(hideBin(process.argv))
   .option("env", {
@@ -16,37 +17,36 @@ yargs(hideBin(process.argv))
     global: true,
     default: ["process.env"],
     coerce: (envFiles) => {
-      if (!envFiles || envFiles.length === 0) return {};
+      if (!envFiles || envFiles.length === 0) return {}
 
-      const envVars = {};
+      const envVars = {}
 
-      envFiles.forEach(filePath => {
+      envFiles.forEach((filePath) => {
         if (fs.existsSync(filePath)) {
-          const parsed = dotenv.parse(fs.readFileSync(filePath));
-          Object.assign(envVars, parsed);
+          const parsedFile = dotenv.parse(fs.readFileSync(filePath))
+          const expanded = expand({ parsed: parsedFile }).parsed
+          Object.assign(envVars, expanded)
         } else if (filePath !== "process.env") {
-          console.warn(`Warning: Environment file ${filePath} not found.`);
+          console.warn(`Warning: Environment file ${filePath} not found.`)
         }
-      });
+      })
 
-      // Then apply process.env variables to override file-based variables
-      Object.assign(envVars, process.env);
+      Object.assign(envVars, process.env)
 
-      return envVars;
-    }
+      return envVars
+    },
   })
   .command(
     "test",
     "test command",
     (yargs) => {
-      return yargs
-        .option("verbose", {
-          alias: "v",
-          describe: "Run with verbose logging",
-          type: "boolean",
-        });
+      return yargs.option("verbose", {
+        alias: "v",
+        describe: "Run with verbose logging",
+        type: "boolean",
+      })
     },
-    async(argv) => {
+    async (argv) => {
       console.log("IT WORKS!")
     },
   )
@@ -65,9 +65,9 @@ yargs(hideBin(process.argv))
           describe: "Exclude additional files from the rsync command",
           type: "array",
           default: [],
-        });
+        })
     },
-    async(argv) => {
+    async (argv) => {
       await deploy(argv)
     },
   )
@@ -86,14 +86,19 @@ yargs(hideBin(process.argv))
           type: "boolean",
         })
     },
-    async(argv) => {
+    async (argv) => {
       await ssh(argv)
     },
   )
-  .command("wait-for", "Waits for the specified service to become available", () => {}, (argv) => {
-    waitFor()
-  })
+  .command(
+    "wait-for",
+    "Waits for the specified service to become available",
+    () => {},
+    (argv) => {
+      waitFor()
+    },
+  )
   .demandCommand(1, "You need to specify a command")
   // .strict()
   .help()
-  .parse();
+  .parse()