@geekmidas/cli 1.10.16 → 1.10.17

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @geekmidas/cli
 
+## 1.10.17
+
+### Patch Changes
+
+- 🐛 [`94a25c0`](https://github.com/geekmidas/toolbox/commit/94a25c01ee2a0313eb01260055e4988b20c64dc4) Thanks [@geekmidas](https://github.com/geekmidas)! - Fix exec command credentials resolution
+
 ## 1.10.16
 
 ### Patch Changes

package/dist/index.cjs

@@ -35,7 +35,7 @@ const prompts = require_chunk.__toESM(require("prompts"));
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.15";
+var version = "1.10.16";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -808,7 +808,9 @@ async function resolveServicePorts(workspaceRoot) {
 */
 function replacePortInUrl(url, oldPort, newPort) {
 	if (oldPort === newPort) return url;
-	return url.replace(new RegExp(`:${oldPort}(?=/|$)`, "g"), `:${newPort}`);
+	let result = url.replace(new RegExp(`:${oldPort}(?=[/?#]|$)`, "g"), `:${newPort}`);
+	result = result.replace(new RegExp(`%3A${oldPort}(?=[%/?#&]|$)`, "gi"), `%3A${newPort}`);
+	return result;
 }
 /**
 * Rewrite connection URLs and port vars in secrets with resolved ports.
@@ -838,7 +840,7 @@ function rewriteUrlsWithPorts(secrets, resolvedPorts) {
 		for (const { defaultPort, resolvedPort } of portReplacements) if (value === String(defaultPort)) result[key] = String(resolvedPort);
 	}
 	for (const [key, value] of Object.entries(result)) {
-		if (!key.endsWith("_URL") && !key.endsWith("_ENDPOINT") && key !== "DATABASE_URL") continue;
+		if (!key.endsWith("_URL") && !key.endsWith("_ENDPOINT") && !key.endsWith("_CONNECTION_STRING") && key !== "DATABASE_URL") continue;
 		let rewritten = value;
 		for (const name$1 of serviceNames) rewritten = rewritten.replace(new RegExp(`@${name$1}:`, "g"), "@localhost:");
 		for (const { defaultPort, resolvedPort } of portReplacements) rewritten = replacePortInUrl(rewritten, defaultPort, resolvedPort);
@@ -1894,19 +1896,11 @@ async function execCommand(commandArgs, options = {}) {
 	if (appName) logger$11.log(`📦 App: ${appName}`);
 	const secretCount = Object.keys(credentials).filter((k) => k !== "PORT").length;
 	if (secretCount > 0) logger$11.log(`🔐 Loaded ${secretCount} secret(s)`);
-	const composePath = (0, node_path.join)(secretsRoot, "docker-compose.yml");
-	const mappings = parseComposePortMappings(composePath);
-	if (mappings.length > 0) {
-		const ports = await loadPortState(secretsRoot);
-		if (Object.keys(ports).length > 0) {
-			const rewritten = rewriteUrlsWithPorts(credentials, {
-				dockerEnv: {},
-				ports,
-				mappings
-			});
-			Object.assign(credentials, rewritten);
-			logger$11.log(`🔌 Applied ${Object.keys(ports).length} port mapping(s)`);
-		}
+	const resolvedPorts = await resolveServicePorts(secretsRoot);
+	if (resolvedPorts.mappings.length > 0 && Object.keys(resolvedPorts.ports).length > 0) {
+		const rewritten = rewriteUrlsWithPorts(credentials, resolvedPorts);
+		Object.assign(credentials, rewritten);
+		logger$11.log(`🔌 Applied ${Object.keys(resolvedPorts.ports).length} port mapping(s)`);
 	}
 	try {
 		const appInfo = await require_config.loadWorkspaceAppInfo(cwd);
@@ -6758,7 +6752,7 @@ const GEEKMIDAS_VERSIONS = {
 	"@geekmidas/constructs": "~3.0.2",
 	"@geekmidas/db": "~1.0.0",
 	"@geekmidas/emailkit": "~1.0.0",
-	"@geekmidas/envkit": "~1.0.3",
+	"@geekmidas/envkit": "~1.0.4",
 	"@geekmidas/errors": "~1.0.0",
 	"@geekmidas/events": "~1.1.0",
 	"@geekmidas/logger": "~1.0.0",