@saasak/tool-env 1.2.0 → 1.2.2

package/bin/index.js

@@ -21,7 +21,7 @@ const __root = process.cwd();
 
 const command = args._[0] || "write";
 
-const secret = resolveSecret(args.secret);
+const secret = resolveSecret(args.secret ? `file://${args.secret}` : '');
 
 const envPath = args.env || ".env.json";
 const envFile = path.resolve(__root, envPath);
@@ -290,7 +290,7 @@ async function runCommand() {
 	let envVars = {};
 	try {
 		envVars = load({
-			secret: resolveSecret(args.secret),
+			secret: secret,
 			targetEnv: args.target,
 			envPath: args.env,
 			applyToProcess: false,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saasak/tool-env",
   "license": "MIT",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "author": "dev@saasak.studio",
   "description": "A small util to manage environment variables for your monorepo",
   "keywords": [

package/src/core.js

@@ -136,32 +136,30 @@ export function resolveTargetAliases(allowedEnvs) {
  * @returns {string} - Resolved secret or empty string if not provided
  */
 export function resolveSecret(secretParam) {
-	if (secretParam) {
-		if (secretParam === "stdin") {
-			try {
-				const value = fs.readFileSync(0, "utf8").trim();
-				if (value) return value;
-			} catch (_) {
-				// fall through to env vars
-			}
-		} else if (secretParam.startsWith("file://")) {
-			try {
-				const value = fs.readFileSync(secretParam.slice(7), "utf8").trim();
-				if (value) return value;
-			} catch (_) {
-				// fall through to env vars
-			}
-		} else {
-			try {
-				return fs.readFileSync(secretParam, "utf8").trim();
-			} catch (_) {
-				// Not a readable file path — treat as literal secret string
-				return secretParam;
-			}
+	const getDefault = (v = '') => v || process.env.WRENV_SECRET || process.env.TARGET_SECRET || "";
+	const getFromStream = (stream) => {
+		try {
+			const value = fs.readFileSync(stream, "utf8").trim();
+			return getDefault(value);
+		} catch (_) {
+			return getDefault();
 		}
 	}
+	const isFile = (f) => {
+		try {
+			return fs.statSync(f).isFile();
+		} catch (_) {
+			return false
+		}
+	}
+
+	if (secretParam === "stdin")
+		return getFromStream(0);
 
-	return process.env.WRENV_SECRET || process.env.TARGET_SECRET || "";
+	if ((secretParam || '').startsWith("file://"))
+		return getFromStream(secretParam.slice(7));
+
+	return getDefault(secretParam)
 }
 
 /**
@@ -286,8 +284,8 @@ function findMonorepoRoot(cwd, envPath) {
  */
 export function loadEnvJson(options = {}) {
 	const {
-		secret: secretParam,
 		targetEnv: targetParam,
+		secret: secretParam,
 		envPath = ".env.json",
 		cwd = process.cwd(),
 	} = options;