@arkstack/console 0.14.0 → 0.14.2

package/dist/index.js

@@ -85,7 +85,7 @@ var DevCommand = class extends Command {
 * APP_KEY is the unified secret used for signing JWTs and encrypting values
 * across the framework (exposed as `config('app.key')`).
 */
-var KeyGenerateCommand = class extends Command {
+var KeyGenerateCommand = class KeyGenerateCommand extends Command {
 	signature = `key:generate
         {--show : Display the generated key instead of writing it to the .env file.}
         {--force : Overwrite the existing APP_KEY without confirmation.}
@@ -103,19 +103,45 @@ var KeyGenerateCommand = class extends Command {
 			return;
 		}
 		const contents = readFileSync(envPath, "utf-8");
-		const existing = contents.match(/^APP_KEY=(.*)$/m);
-		if (existing?.[1]?.trim() && !this.option("force")) {
+		if (KeyGenerateCommand.hasEnvValue(contents, "APP_KEY") && !this.option("force")) {
 			if (!await this.confirm("An application key already exists. Overwrite it?", false)) {
 				this.info("Application key generation aborted.");
 				return;
 			}
 		}
-		writeFileSync(envPath, existing ? contents.replace(/^APP_KEY=.*$/m, `APP_KEY=${key}`) : `${contents.replace(/\s*$/, "")}\nAPP_KEY=${key}\n`);
+		writeFileSync(envPath, KeyGenerateCommand.upsertEnvKey(contents, "APP_KEY", key));
 		this.success("Application key set successfully.");
 	}
 	generateKey() {
 		return randomBytes(32).toString("base64url");
 	}
+	/**
+	* Whether the env file defines a non-empty value for `name`.
+	*
+	* An empty assignment (`APP_KEY=`), whitespace, or empty quotes (`APP_KEY=""`)
+	* all count as "not set" so a placeholder line is never mistaken for a real key.
+	*
+	* @param contents  The raw `.env` contents.
+	* @param name      The variable name.
+	*/
+	static hasEnvValue = (contents, name) => {
+		const value = contents.match(new RegExp(`^${name}=(.*)$`, "m"))?.[1]?.trim().replace(/^(["'])(.*)\1$/, "$2").trim();
+		return Boolean(value);
+	};
+	/**
+	* Return `contents` with `name` set to `value`, replacing the line in place if
+	* it exists or appending it otherwise.
+	*
+	* @param contents  The raw `.env` contents.
+	* @param name      The variable name.
+	* @param value     The value to set.
+	*/
+	static upsertEnvKey = (contents, name, value) => {
+		const line = `${name}=${value}`;
+		const pattern = new RegExp(`^${name}=.*$`, "m");
+		if (pattern.test(contents)) return contents.replace(pattern, () => line);
+		return `${contents.replace(/\s*$/, "")}\n${line}\n`;
+	};
 };
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/console",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "type": "module",
   "description": "Console module for Arkstack, providing the command-line runtime and console integration layer.",
   "homepage": "https://arkstack.toneflix.net/guide/cli",
@@ -42,17 +42,17 @@
     }
   },
   "peerDependencies": {
-    "arkormx": "^2.9.2",
+    "arkormx": "^2.9.3",
     "clear-router": "^2.8.8"
   },
   "dependencies": {
-    "@h3ravel/musket": "^2.2.0",
+    "@h3ravel/musket": "^2.2.1",
     "@h3ravel/support": "^2.1.4",
     "chalk": "^5.6.2",
     "resora": "^1.3.26",
     "ts-morph": "^28.0.0",
-    "@arkstack/common": "^0.14.0",
-    "@arkstack/contract": "^0.14.0"
+    "@arkstack/common": "^0.14.2",
+    "@arkstack/contract": "^0.14.2"
   },
   "scripts": {
     "build": "tsdown",