@saasak/tool-env 1.2.1 → 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.1",
+  "version": "1.2.2",
   "author": "dev@saasak.studio",
   "description": "A small util to manage environment variables for your monorepo",
   "keywords": [

package/src/core.js

@@ -153,18 +153,13 @@ export function resolveSecret(secretParam) {
 		}
 	}
 
-	if (!secretParam)
-		return getDefault();
-
 	if (secretParam === "stdin")
 		return getFromStream(0);
 
-	if (secretParam.startsWith("file://"))
+	if ((secretParam || '').startsWith("file://"))
 		return getFromStream(secretParam.slice(7));
 
-	return isFile(secretParam)
-		? getFromStream(secretParam)
-		: getDefault(secretParam); // Treat as literal if not a file
+	return getDefault(secretParam)
 }
 
 /**
@@ -289,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;