@saasak/tool-env 1.2.1 → 1.3.0

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);
@@ -280,6 +280,7 @@ async function addCommand() {
 async function runCommand() {
 	const commandParts = args["--"] || [];
 	const [cmd, ...cmdArgs] = commandParts;
+	const expose = !!args.expose
 
 	if (!cmd) {
 		console.error("Usage: wrenv run [options] -- <command> [args...]");
@@ -290,10 +291,11 @@ async function runCommand() {
 	let envVars = {};
 	try {
 		envVars = load({
-			secret: resolveSecret(args.secret),
+			secret: secret,
 			targetEnv: args.target,
 			envPath: args.env,
 			applyToProcess: false,
+			expose
 		});
 	} catch (error) {
 		console.error(`wrenv: ${error.message}`);

package/package.json

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

package/src/core.js

@@ -16,6 +16,7 @@ import { findMonorepoPackages } from "./utils-pkg.js";
  * @property {string} [envPath] - Path to env.json file (default: '.env.json')
  * @property {string} [cwd] - Working directory (default: process.cwd())
  * @property {boolean} [applyToProcess] - Whether to apply to process.env (default: true)
+ * @property {boolean} [expose] - wether to expose the secret or not
  */
 
 /**
@@ -24,6 +25,7 @@ import { findMonorepoPackages } from "./utils-pkg.js";
  * @property {string} [targetEnv] - Target environment
  * @property {string} [envPath] - Path to env.json file (default: '.env.json')
  * @property {string} [cwd] - Working directory (default: process.cwd())
+ * @property {boolean} [expose] - wether to expose the secret or not
  */
 
 /**
@@ -153,18 +155,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,10 +286,11 @@ function findMonorepoRoot(cwd, envPath) {
  */
 export function loadEnvJson(options = {}) {
 	const {
-		secret: secretParam,
 		targetEnv: targetParam,
+		secret: secretParam,
 		envPath = ".env.json",
 		cwd = process.cwd(),
+		expose = false
 	} = options;
 
 	const secret = resolveSecret(secretParam);
@@ -346,7 +344,13 @@ export function loadEnvJson(options = {}) {
 	const currentPackageName = findNearestPackageName(cwd, scope);
 
 	// Return env for current package (with fallback to root)
-	return allEnvs[currentPackageName] || allEnvs.root || {};
+	const finalEnv = allEnvs[currentPackageName] || allEnvs.root || {};
+
+	return expose ? {
+		...finalEnv,
+		WRENV_TARGET: resolvedTarget,
+		WRENV_SECRET: secret
+	} : finalEnv;
 }
 
 /**
@@ -374,6 +378,7 @@ export function load(options = {}) {
 		envPath,
 		cwd = process.cwd(),
 		applyToProcess = true,
+		expose = false
 	} = options;
 
 	// Resolve target first to determine if we're in dev mode
@@ -385,6 +390,7 @@ export function load(options = {}) {
 		targetEnv: resolvedTarget,
 		envPath,
 		cwd,
+		expose
 	});
 
 	// Load .env.local overrides only in dev mode (security: prevent local overrides in production)
@@ -403,10 +409,12 @@ export function load(options = {}) {
 	}
 
 	// - Reserved vars (WRENV_*, TARGET_*) are never injected
-	// - NODE_ENV is only injected if not already set
-	for (const key of RESERVED_ENV_VARS) {
-		delete finalConfig[key];
+	if (!expose) {
+		for (const key of RESERVED_ENV_VARS) {
+			delete finalConfig[key];
+		}
 	}
+	// - NODE_ENV is only injected if not already set
 	if (process.env.NODE_ENV) {
 		delete finalConfig.NODE_ENV;
 	}