@catladder/cli 0.0.0-next-5f70052e → 0.0.0-next-32b3a548

package/dist/bundles/cli/index.js

@@ -862,7 +862,7 @@ const copyDb_1 = __nccwpck_require__(78651);
 exports["default"] = async (vorpal) => vorpal
     .command("project-cloud-sql-restore-db", "restores a project db from one source to another target")
     .action(async function restoreDb() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const envs = await (0, autocompletions_1.envAndComponents)();
     const { sourceEnvAndComponent } = await this.prompt({
         type: "list",
@@ -892,7 +892,7 @@ exports["default"] = async (vorpal) => vorpal
             scheme: "postgres",
             hosts: [],
         });
-        const parsersResult = parser.parse(sourceEnvVars.DATABASE_URL);
+        const parsersResult = parser.parse(sourceEnvVars.DATABASE_URL.toString());
         sourcePort = (_b = (_a = parsersResult.hosts) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.port;
         sourceUsername = parsersResult.username;
         sourcePassword = parsersResult.password;
@@ -901,12 +901,12 @@ exports["default"] = async (vorpal) => vorpal
     else {
         sourcePort = 54399;
         sourceProxy = await (0, startProxy_1.startCloudSqlProxyInBackground)({
-            instanceName: sourceEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME,
+            instanceName: sourceEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME.toString(),
             localPort: sourcePort,
         });
-        sourceUsername = sourceEnvVars.DB_USER;
-        sourcePassword = sourceEnvVars.DB_PASSWORD;
-        sourceDbName = sourceEnvVars.DB_NAME;
+        sourceUsername = sourceEnvVars.DB_USER.toString();
+        sourcePassword = sourceEnvVars.DB_PASSWORD.toString();
+        sourceDbName = (_c = sourceEnvVars.DB_NAME) === null || _c === void 0 ? void 0 : _c.toString();
     }
     const { targetEnvAndComponent } = await this.prompt({
         type: "list",
@@ -922,8 +922,8 @@ exports["default"] = async (vorpal) => vorpal
             scheme: "postgres",
             hosts: [],
         });
-        const parsersResult = parser.parse(targetEnvVars.DATABASE_URL);
-        targetPort = (_d = (_c = parsersResult.hosts) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.port;
+        const parsersResult = parser.parse(targetEnvVars.DATABASE_URL.toString());
+        targetPort = (_e = (_d = parsersResult.hosts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.port;
         targetUsername = parsersResult.username;
         targetPassword = parsersResult.password;
         targetDbName = parsersResult.endpoint;
@@ -931,12 +931,12 @@ exports["default"] = async (vorpal) => vorpal
     else {
         targetPort = 54499;
         targetProxy = await (0, startProxy_1.startCloudSqlProxyInBackground)({
-            instanceName: targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME,
+            instanceName: targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME.toString(),
             localPort: targetPort,
         });
-        targetUsername = targetEnvVars.DB_USER;
-        targetPassword = targetEnvVars.DB_PASSWORD;
-        targetDbName = targetEnvVars.DB_NAME;
+        targetUsername = targetEnvVars.DB_USER.toString();
+        targetPassword = targetEnvVars.DB_PASSWORD.toString();
+        targetDbName = targetEnvVars.DB_NAME.toString();
     }
     const { shouldContinue } = await this.prompt({
         type: "confirm",
@@ -1038,14 +1038,14 @@ exports["default"] = async (vorpal) => vorpal
     });
 });
 const getProxyInfoForKubernetes = async (vorpal, context) => {
-    var _a;
+    var _a, _b;
     if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
         throw new Error("unsupported");
     }
     const envVars = await (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name);
     // bit hacky, would be nicer if we would also declare this through env vars
     const cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
-    const DB_PASSWORD = (envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD);
+    const DB_PASSWORD = (_b = ((envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD))) === null || _b === void 0 ? void 0 : _b.toString();
     const DB_NAME = cloudSqlValues.cloudsql.fullDbName.toString();
     const instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
     return {
@@ -1056,17 +1056,17 @@ const getProxyInfoForKubernetes = async (vorpal, context) => {
     };
 };
 const getProxyInfoForCloudRun = async (vorpal, context) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun") ||
         !((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.cloudSql)) {
         throw new Error("unsupported");
     }
     const envVars = await (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name);
-    const DB_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD;
-    const DB_USER = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER;
+    const DB_PASSWORD = (_c = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) === null || _c === void 0 ? void 0 : _c.toString();
+    const DB_USER = (_d = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER) === null || _d === void 0 ? void 0 : _d.toString();
     const DB_NAME = context.environment.envVars.DB_NAME.toString();
     return {
-        instanceName: (_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config.cloudSql.instanceConnectionName,
+        instanceName: (_e = context.deploy) === null || _e === void 0 ? void 0 : _e.config.cloudSql.instanceConnectionName,
         DB_PASSWORD,
         DB_NAME,
         DB_USER,
@@ -3924,7 +3924,7 @@ exports.getShell = getShell;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.bashEscape = exports.joinBashExpressions = exports.getBashVariable = exports.BashExpression = void 0;
+exports.joinBashExpressions = exports.getBashVariable = exports.BashExpression = void 0;
 /**
  * this class represents a string that can be evaluated in bash scripts.
  *
@@ -3988,21 +3988,143 @@ const joinBashExpressions = (parts, joiner = "") => {
     }
 };
 exports.joinBashExpressions = joinBashExpressions;
+//# sourceMappingURL=BashExpression.js.map
+
+/***/ }),
+
+/***/ 12463:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.escapeForDotEnv = exports.escapeSingleQuotes = exports.escapeDoubleQuotes = exports.escapeBashExpression = exports.escapeString = exports.bashEscape = void 0;
+const globalScriptFunctions_1 = __nccwpck_require__(12912);
+const VariableValueContainingReferences_1 = __nccwpck_require__(84474);
+const BashExpression_1 = __nccwpck_require__(42376);
 /**
  * escapes a string or bash expression for bash
- * it mainly escapes double quotes
+ * it either can escape single or double quotes (double is default)
  */
-const bashEscape = (value) => {
-    if (value instanceof BashExpression) {
-        return value.toString(); // no need to escape bash expressions, as we want them to evaluate
+const bashEscape = (value, options = {
+    quotes: "double",
+}) => {
+    if (value instanceof BashExpression_1.BashExpression) {
+        // no need to escape
+        return (0, exports.escapeBashExpression)(value, options);
     }
-    // we wrap it in double quotes, so we need to escape them
-    if (typeof value === "string")
-        return value.replace(/"/g, '\\"');
-    return value;
+    if (value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences) {
+        return value.toString(options);
+    }
+    return (0, exports.escapeString)(value, options);
 };
 exports.bashEscape = bashEscape;
-//# sourceMappingURL=BashExpression.js.map
+const escapeString = (value, { quotes } = {
+    quotes: "double",
+}) => {
+    const quoteEscaped = quotes
+        ? quotes === "single"
+            ? (0, exports.escapeSingleQuotes)(value)
+            : (0, exports.escapeDoubleQuotes)(value)
+        : value;
+    return quoteEscaped;
+};
+exports.escapeString = escapeString;
+const escapeBashExpression = (value, options) => {
+    // no need to escape, we just return the string
+    return value;
+};
+exports.escapeBashExpression = escapeBashExpression;
+const escapeDoubleQuotes = (value) => value === null || value === void 0 ? void 0 : value.toString().replace(/"/g, '\\"');
+exports.escapeDoubleQuotes = escapeDoubleQuotes;
+const escapeSingleQuotes = (value) => value === null || value === void 0 ? void 0 : value.toString().replace(/'/g, "\\'");
+exports.escapeSingleQuotes = escapeSingleQuotes;
+/**
+ *
+ * what an absolute nightmare.
+ * unfortunatly, dotenv has many limitations. You can't escape quotes properly.
+ *
+ * In order to be very forgiving, we need to do some magic here:
+ *
+ * - when the value contains no newlines, we are fine
+ * - if the value contains newlines, we need to wrap it in quotes. And thats where the problem begins:
+ * - you can't escape quotes. this is a shitty limitation of dotenv and node
+ * - you can have inner quotes, but they break in node.js (not in dotenv though), see https://github.com/nodejs/node/issues/54134
+ * - so we need to quote cleverly
+ * - to make things worse, we need to check whether we have a simple stirng or a bash expression, that needs to be evalulated first...
+ */
+const escapeForDotEnv = (value) => {
+    if (value === undefined || value === null) {
+        return "";
+    }
+    if (typeof value === "string") {
+        // if string contains newlines, we need to wrap it in quotes
+        // we additionaly escape newlines, that give best compatibility
+        if (value.includes("\n")) {
+            const newlinesReplaces = value.replace(/\n/g, "\\n");
+            // default to ", but if this is not possible, we try to use ' or `
+            const quote = value.includes(`"`)
+                ? value.includes(`'`)
+                    ? value.includes("`")
+                        ? // If all quote types are present, default to no
+                            ""
+                        : "`"
+                    : "'"
+                : '"';
+            // if we found a quote, we can wrap the string in it
+            return `${quote}${newlinesReplaces}${quote}`;
+        }
+        else {
+            // otherwise we can return as is
+            return value;
+        }
+    }
+    else if (value instanceof BashExpression_1.BashExpression) {
+        return escapeBashExpressionForDotEnv(value);
+    }
+    else if (value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences) {
+        // instead of doing it part-wise, we just do it all at once
+        const containsAnyBashExpression = value.parts.some((part) => part instanceof BashExpression_1.BashExpression);
+        if (!containsAnyBashExpression) {
+            return (0, exports.escapeForDotEnv)(value.toString({
+                quotes: "double",
+            }));
+        }
+        else {
+            const result = escapeBashExpressionForDotEnv(new BashExpression_1.BashExpression(value.toString({
+                quotes: "double",
+            })));
+            return result;
+        }
+    }
+    else {
+        return value;
+    }
+};
+exports.escapeForDotEnv = escapeForDotEnv;
+// basically the same thing as above for bash
+// thx chatgpt for this
+const escapeForDotEnvScript = (0, globalScriptFunctions_1.registerGlobalScriptFunction)("escapeForDotEnv", `
+ input="\${1:-$(cat)}"
+ input="\${input//$'\\n'/\\\\n}"
+  if [[ "$input" == *\\\\n* ]]; then
+    if [[ "$input" == *\\"* && "$input" == *\\'* && "$input" == *\\\`* ]]; then
+      printf "%s\\n" "$input"
+    elif [[ "$input" == *\\"* && "$input" == *\\'* ]]; then
+      printf "\`%s\`\\n" "$input"
+    elif [[ "$input" == *\\"* ]]; then
+      printf "'%s'\\n" "$input"
+    else
+      printf "\\"%s\\"\\n" "$input"
+    fi
+  else
+    printf "%s\\n" "$input"
+  fi
+  `);
+const escapeBashExpressionForDotEnv = (value) => {
+    return value.transformWithCommand(escapeForDotEnvScript.name).toString();
+};
+//# sourceMappingURL=bashEscape.js.map
 
 /***/ }),
 
@@ -4032,6 +4154,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.writeBashYamlToFileScript = exports.yamlBashString = void 0;
 const yaml_1 = __nccwpck_require__(68033);
 const BashExpression_1 = __nccwpck_require__(42376);
+const VariableValueContainingReferences_1 = __nccwpck_require__(84474);
 const bashExpressionType = {
     tag: "",
     resolve: (str) => {
@@ -4042,10 +4165,33 @@ const bashExpressionType = {
         // we create a BLOCK_LITERAL
         // but because bash will interpret the value, it may resolve to a multiline string
         // so we need to indent every line using sed
-        return "|-\n" + node.value.transformWithCommand(`sed 's/^/${ctx.indent}/'`);
+        return ("|-\n" +
+            ctx.indent +
+            indentNewlinesInBashExpression(node.value, ctx.indent));
     },
     identify: (v) => v instanceof BashExpression_1.BashExpression,
 };
+const indentNewlinesInBashExpression = (expression, indent) => {
+    return expression.transformWithCommand(`sed '1!s/^/${indent}/'`);
+};
+const variableContainingReferences = {
+    tag: "",
+    resolve: (str) => {
+        // not really needed,but let's make typescript happy
+        return new VariableValueContainingReferences_1.VariableValueContainingReferences(str);
+    },
+    stringify(node, ctx) {
+        const value = node.value;
+        const stringified = value.parts
+            .map((part) => part instanceof BashExpression_1.BashExpression
+            ? indentNewlinesInBashExpression(part, ctx.indent)
+            : // indent every new line
+                part.toString().replace(/\n/g, `\n${ctx.indent}`))
+            .join("");
+        return "|-\n" + ctx.indent + stringified;
+    },
+    identify: (v) => v instanceof VariableValueContainingReferences_1.VariableValueContainingReferences,
+};
 /***
  * creates a yaml string that can be used in bash scripts
  * it handles BashExpressions correctly so that they can be evaluated in bash
@@ -4054,7 +4200,7 @@ const yamlBashString = (value) => {
     return (0, yaml_1.stringify)(value, {
         defaultStringType: "BLOCK_LITERAL",
         defaultKeyType: "PLAIN",
-        customTags: [bashExpressionType],
+        customTags: [bashExpressionType, variableContainingReferences],
         aliasDuplicateObjects: false,
         lineWidth: 0,
     });
@@ -4085,61 +4231,47 @@ exports.writeBashYamlToFileScript = writeBashYamlToFileScript;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getInjectVarsScript = void 0;
 const lodash_1 = __nccwpck_require__(23255);
-const BashExpression_1 = __nccwpck_require__(42376);
+const bashEscape_1 = __nccwpck_require__(12463);
 const getInjectVarsScript = (vars) => {
     if (!vars)
         return [];
     // filter out null and undefined values
     return Object.entries(vars)
         .filter(([, value]) => !(0, lodash_1.isNil)(value))
-        .map(([key, value]) => `export ${key}="${value ? (0, BashExpression_1.bashEscape)(value) : ""}"`);
+        .map(([key, value]) => `export ${key}="${value
+        ? (0, bashEscape_1.bashEscape)(value, {
+            quotes: "double",
+        })
+        : ""}"`);
 };
 exports.getInjectVarsScript = getInjectVarsScript;
 //# sourceMappingURL=getInjectVarsScript.js.map
 
 /***/ }),
 
-/***/ 72233:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+/***/ 22990:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
 
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-const BashExpression_1 = __nccwpck_require__(42376);
-// from https://github.com/dsblv/string-replace-async/blob/main/index.js
-// and adjusted a bit
-async function replaceAsync(string, searchValue, replacer) {
-    const wasBashExpression = string instanceof BashExpression_1.BashExpression;
-    try {
-        // 1. Run fake pass of `replace`, collect values from `replacer` calls
-        // 2. Resolve them with `Promise.all`
-        // 3. Run `replace` with resolved values
-        const values = [];
-        String.prototype.replace.call(string instanceof BashExpression_1.BashExpression ? string : (0, BashExpression_1.bashEscape)(string), searchValue, function (...args) {
-            // eslint-disable-next-line prefer-spread
-            const result = replacer.apply(undefined, args);
-            values.push(result);
-            return "";
-        });
-        const resolvedValues = await Promise.all(values);
-        const containsBashExpression = resolvedValues.some((value) => value instanceof BashExpression_1.BashExpression);
-        const result = (string instanceof BashExpression_1.BashExpression ? string : (0, BashExpression_1.bashEscape)(string)).replace(searchValue, function () {
-            var _a, _b;
-            return (_b = (_a = resolvedValues.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
-        });
-        if (wasBashExpression || containsBashExpression) {
-            return new BashExpression_1.BashExpression(result);
-        }
-        else {
-            return result;
-        }
-    }
-    catch (error) {
-        return Promise.reject(error);
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-}
-exports["default"] = replaceAsync;
-//# sourceMappingURL=replaceAsync.js.map
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__nccwpck_require__(12463), exports);
+__exportStar(__nccwpck_require__(42376), exports);
+//# sourceMappingURL=index.js.map
 
 /***/ }),
 
@@ -4433,8 +4565,9 @@ exports.writeBuildInfo = writeBuildInfo;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.componentContextNeedsBuildTimeDotEnv = exports.writeDotEnv = void 0;
 const lodash_1 = __nccwpck_require__(23255);
-const gitlab_1 = __nccwpck_require__(38490);
+const bashEscape_1 = __nccwpck_require__(12463);
 const getBuildInfoVariables_1 = __nccwpck_require__(17827);
+const gitlab_1 = __nccwpck_require__(38490);
 /**
  * writes a .env file in the components folder
  * @param context
@@ -4449,9 +4582,9 @@ const writeDotEnv = (context) => {
         // filter out build variables, since they may interfer with caching like turbo
         // build variables are rarely used anyway and we may treat them differently in the future
         .filter(([key]) => !getBuildInfoVariables_1.ALL_BUILD_VARIABLES.includes(key))
-        .map(([key, value]) => `${key}=${value === null || value === void 0 ? void 0 : value.toString().replaceAll("\n", "\\n")}`)
+        .map(([key, value]) => `${key}=${(0, bashEscape_1.escapeForDotEnv)(value)}`)
         .join("\n");
-    return (0, gitlab_1.collapseableSection)("write-dotenv-" + context.name, "write dot env")([
+    return (0, gitlab_1.collapseableSection)("write-dotenv-" + context.name, "write dot env for " + context.name)([
         `cat <<EOF > ${context.build.dir}/.env
 ${keyValueString}
 EOF`,
@@ -6078,9 +6211,10 @@ exports.getSecretVarNameForContext = exports.getSecretVarName = exports.getEnvir
 const deploy_1 = __nccwpck_require__(68483);
 const BashExpression_1 = __nccwpck_require__(42376);
 const types_1 = __nccwpck_require__(84466);
+const VariableValueContainingReferences_1 = __nccwpck_require__(84474);
+const resolveAllReferences_1 = __nccwpck_require__(16305);
 const getBuildInfoVariables_1 = __nccwpck_require__(17827);
 const getEnvironmentContext_1 = __nccwpck_require__(13663);
-const resolveReferences_1 = __nccwpck_require__(43115);
 const transformJobOnlyVars_1 = __nccwpck_require__(1552);
 const envVars_1 = __nccwpck_require__(16296);
 const getBasePredefinedVariables = (ctx) => {
@@ -6091,8 +6225,8 @@ const getBasePredefinedVariables = (ctx) => {
         ...(ctx.envType !== "local" ? (0, getBuildInfoVariables_1.getBuildInfoVariables)(ctx) : {}),
     };
 };
-const getEnvironmentVariables = async (ctx, alreadyVisited = {}) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+const getEnvironmentVariables = async (ctx, options = {}) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const environmentContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
     const { config, env, componentName } = ctx;
     const { envConfigRaw, deployConfigRaw, buildConfigRaw, envType } = environmentContext;
@@ -6145,18 +6279,28 @@ const getEnvironmentVariables = async (ctx, alreadyVisited = {}) => {
     ];
     const secretEnvVars = (0, envVars_1.makeSecretEnvVarMapping)(env, componentName, secretEnvVarKeys);
     const publicEnvVarsRawSanitized = (0, envVars_1.stringifyValues)(publicEnvVarsRaw);
-    const envVarsRaw = addIndexVar({
+    const publicEnvVarsUnresolved = Object.fromEntries(Object.entries(publicEnvVarsRawSanitized).map(([key, value]) => [
+        key,
+        (0, VariableValueContainingReferences_1.createVariableValueContainingReferencesFromString)(value, {
+            componentName: ctx.componentName,
+        }),
+    ]));
+    const publicEnvVars = ((_h = options.shouldResolveReferences) !== null && _h !== void 0 ? _h : true)
+        ? await (0, resolveAllReferences_1.resolveAllReferences)(publicEnvVarsUnresolved, async (otherComponentName) => {
+            const { envVars: otherEnvVars } = await (0, exports.getEnvironmentVariables)({
+                ...ctx,
+                componentName: otherComponentName,
+            }, {
+                shouldResolveReferences: false, // we already do this here with replaceAllReferences recursivly until re replaced all
+            });
+            return otherEnvVars;
+        })
+        : publicEnvVarsUnresolved;
+    const envVars = addIndexVar({
         ...predefinedVariables,
         ...secretEnvVars,
-        ...publicEnvVarsRawSanitized,
+        ...publicEnvVars,
     });
-    const envVars = (await (0, resolveReferences_1.resolveReferences)(envVarsRaw, async (otherComponentName, alreadyVisited) => {
-        const { envVars: otherEnvVars } = await (0, exports.getEnvironmentVariables)({
-            ...ctx,
-            componentName: otherComponentName,
-        }, alreadyVisited);
-        return otherEnvVars;
-    }, alreadyVisited));
     return {
         envVars,
         secretEnvVarKeys,
@@ -6274,69 +6418,6 @@ __exportStar(__nccwpck_require__(45133), exports);
 
 /***/ }),
 
-/***/ 43115:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.resolveReferences = void 0;
-const lodash_1 = __nccwpck_require__(23255);
-const replaceAsync_1 = __importDefault(__nccwpck_require__(72233));
-// regex to resolve references in catladder variables
-// those expressions have the pattern ${componentName:variableName}
-const REGEX = /\$\{(([^:}]+):)?([^}]+)}/gm;
-const resolveReferences = async (vars, getOtherVariables, alreadyVisitedBase = {}) => {
-    /**
-     *
-     * replace referenced variables with their values in a value string
-     */
-    const replaceSingleValue = async (value, alreadyVisited = alreadyVisitedBase) => {
-        if (REGEX.test(value.toString())) {
-            // we consider variables that got references in it  BashExpressions, because the replacement may be one
-            return await (0, replaceAsync_1.default)(value, REGEX, async (match, _, componentName, variableName) => {
-                var _a, _b;
-                if ((_a = alreadyVisited[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]) {
-                    return match; // prevent endless loop
-                }
-                const newAlreadyVisited = (0, lodash_1.merge)({}, alreadyVisited, {
-                    [componentName]: {
-                        [variableName]: true,
-                    },
-                });
-                const result = componentName
-                    ? (_b = (await (getOtherVariables === null || getOtherVariables === void 0 ? void 0 : getOtherVariables(componentName, newAlreadyVisited).then((r) => r === null || r === void 0 ? void 0 : r[variableName])))) !== null && _b !== void 0 ? _b : null
-                    : vars[variableName]; // is self reference
-                const replaced = result !== null && result !== undefined
-                    ? await replaceSingleValue(result, newAlreadyVisited)
-                    : match;
-                return replaced;
-            });
-        }
-        else {
-            return value;
-        }
-    };
-    return Object.fromEntries(await Promise.all(Object.entries(vars).map(async ([key, value]) => {
-        if (value === null || value === undefined) {
-            return [key, null];
-        }
-        return [
-            key,
-            value !== null && value !== undefined
-                ? await replaceSingleValue(value)
-                : null,
-        ];
-    })));
-};
-exports.resolveReferences = resolveReferences;
-//# sourceMappingURL=resolveReferences.js.map
-
-/***/ }),
-
 /***/ 1552:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -7173,15 +7254,15 @@ exports.getCloudRunDeployScripts = void 0;
 const lodash_1 = __nccwpck_require__(23255);
 const gitlab_1 = __nccwpck_require__(38490);
 const sbom_1 = __nccwpck_require__(44986);
+const __1 = __nccwpck_require__(2674);
+const bashYaml_1 = __nccwpck_require__(54660);
 const cleanup_1 = __nccwpck_require__(67888);
 const database_1 = __nccwpck_require__(28206);
 const gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(46320);
 const cloudRunJobs_1 = __nccwpck_require__(61224);
 const cloudRunServices_1 = __nccwpck_require__(17334);
 const common_1 = __nccwpck_require__(73325);
-const __1 = __nccwpck_require__(2674);
 const constants_1 = __nccwpck_require__(38865);
-const bashYaml_1 = __nccwpck_require__(54660);
 function getCloudRunDeployScripts(context) {
     var _a;
     const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
@@ -8391,7 +8472,7 @@ exports.contextIsStoppable = contextIsStoppable;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.COLLAPSEABLE_SECTION_END = exports.COLLAPSEABLE_SECTION_START = void 0;
+exports.registerGlobalScriptFunction = exports.globalScriptFunctions = void 0;
 class GlobalScriptFunction {
     constructor(name, script) {
         this.name = name;
@@ -8399,20 +8480,27 @@ class GlobalScriptFunction {
     }
     toBashFunction() {
         return `function ${this.name} () {
-            ${this.script}
-        }`;
+${this.script.trim()}
+}`.trim();
     }
     invoke(...args) {
         return `${this.name} ${args.join(" ")}`;
     }
 }
-exports.COLLAPSEABLE_SECTION_START = new GlobalScriptFunction("collapseable_section_start", `local section_title="\${1}"
-  local section_description="\${2:-$section_title}"
-  echo -e "section_start:\`date +%s\`:\${section_title}[collapsed=true]\\r\\e[0K$\{section_description}"
-`);
-exports.COLLAPSEABLE_SECTION_END = new GlobalScriptFunction("collapseable_section_end", `local section_title="\${1}"
-  echo -e "section_end:\`date +%s\`:\${section_title}\\r\\e[0K"
-`);
+exports.globalScriptFunctions = new Map();
+/**
+ * registers a global script function
+ * only use that in top-level scopes as it will attach the function to the global scope
+ */
+const registerGlobalScriptFunction = (name, script) => {
+    if (exports.globalScriptFunctions.has(name)) {
+        throw new Error(`Global script function ${name} already exists`);
+    }
+    const scriptFunction = new GlobalScriptFunction(name, script);
+    exports.globalScriptFunctions.set(name, scriptFunction);
+    return scriptFunction;
+};
+exports.registerGlobalScriptFunction = registerGlobalScriptFunction;
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -8446,6 +8534,8 @@ __exportStar(__nccwpck_require__(5875), exports);
 __exportStar(__nccwpck_require__(67862), exports);
 __exportStar(__nccwpck_require__(68483), exports);
 __exportStar(__nccwpck_require__(92228), exports);
+__exportStar(__nccwpck_require__(51619), exports);
+__exportStar(__nccwpck_require__(22990), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -9036,37 +9126,14 @@ function getGitlabNeedsForWorkspaceJob(context, { needsStages, needs }, allJobs)
 /***/ }),
 
 /***/ 66551:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createGitlabPipelineWithDefaults = void 0;
 const runner_1 = __nccwpck_require__(4058);
-const GLOBAL_SCRIPTS = __importStar(__nccwpck_require__(12912));
+const globalScriptFunctions_1 = __nccwpck_require__(12912);
 const createGitlabPipelineWithDefaults = ({ image, variables, before_script, ...config }) => {
     return {
         image: image !== null && image !== void 0 ? image : (0, runner_1.getRunnerImage)("jobs-default"), // default image
@@ -9079,7 +9146,7 @@ const createGitlabPipelineWithDefaults = ({ image, variables, before_script, ...
             ...(variables !== null && variables !== void 0 ? variables : {}),
         },
         before_script: [
-            ...Object.values(GLOBAL_SCRIPTS).map((script) => script.toBashFunction()),
+            ...[...globalScriptFunctions_1.globalScriptFunctions.values()].map((script) => script.toBashFunction()),
             ...(before_script !== null && before_script !== void 0 ? before_script : []),
         ],
         ...config,
@@ -9639,11 +9706,18 @@ const repeatOnFailure = (command, options) => {
   `;
 };
 exports.repeatOnFailure = repeatOnFailure;
+const start = (0, globalScriptFunctions_1.registerGlobalScriptFunction)("collapseable_section_start", `local section_title="\${1}"
+  local section_description="\${2:-$section_title}"
+  echo -e "section_start:\`date +%s\`:\${section_title}[collapsed=true]\\r\\e[0K$\{section_description}"
+`);
+const end = (0, globalScriptFunctions_1.registerGlobalScriptFunction)("collapseable_section_end", `local section_title="\${1}"
+  echo -e "section_end:\`date +%s\`:\${section_title}\\r\\e[0K"
+`);
 const collapseableSection = (name, header) => (commands) => {
     return [
-        globalScriptFunctions_1.COLLAPSEABLE_SECTION_START.invoke(`"${name}"`, `"${header}"`),
+        start.invoke(`"${name}"`, `"${header}"`),
         ...commands,
-        globalScriptFunctions_1.COLLAPSEABLE_SECTION_END.invoke(`"${name}"`),
+        end.invoke(`"${name}"`),
     ];
 };
 exports.collapseableSection = collapseableSection;
@@ -9758,6 +9832,182 @@ exports.writeYamlfile = writeYamlfile;
 
 /***/ }),
 
+/***/ 51619:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=VariableValue.js.map
+
+/***/ }),
+
+/***/ 84474:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.createVariableValueContainingReferencesFromString = exports.VariableValueContainingReferences = exports.VariableReference = exports.UnresolvableReference = void 0;
+const BashExpression_1 = __nccwpck_require__(42376);
+const bashEscape_1 = __nccwpck_require__(12463);
+class UnresolvableReference {
+    constructor(reference) {
+        this.reference = reference;
+    }
+    toString() {
+        return `Unresolvable reference: ${this.reference.toString()}`;
+    }
+}
+exports.UnresolvableReference = UnresolvableReference;
+class VariableReference {
+    constructor(componentName, variableName) {
+        this.componentName = componentName;
+        this.variableName = variableName;
+    }
+    toString() {
+        return `\${${this.componentName}:${this.variableName}}`;
+    }
+}
+exports.VariableReference = VariableReference;
+class VariableValueContainingReferences {
+    constructor(parts) {
+        this.parts = (Array.isArray(parts) ? parts : [parts]).flatMap((part) => part instanceof VariableValueContainingReferences
+            ? part.parts
+            : part === ""
+                ? []
+                : [part]);
+    }
+    toString(options = {
+        quotes: false,
+    }) {
+        return this.parts
+            .map((part) => {
+            if (typeof part === "string") {
+                return (0, bashEscape_1.escapeString)(part, options);
+            }
+            else if (part instanceof BashExpression_1.BashExpression) {
+                return (0, bashEscape_1.escapeBashExpression)(part, options);
+            }
+            else {
+                return part.toString();
+            }
+        })
+            .join("");
+    }
+}
+exports.VariableValueContainingReferences = VariableValueContainingReferences;
+// regex to resolve references in catladder variables
+// those expressions have the pattern ${componentName:variableName}
+const REGEX = /\$\{(([^:}]+):)?([^}]+)}/gm;
+const createVariableValueContainingReferencesFromString = (value, options) => {
+    const parts = [];
+    let match;
+    let lastIndex = 0;
+    while ((match = REGEX.exec(value)) !== null) {
+        const [fullMatch, _, otherComponentName, variableName] = match;
+        parts.push(value.slice(lastIndex, match.index));
+        parts.push(new VariableReference(otherComponentName || options.componentName, variableName));
+        lastIndex = REGEX.lastIndex;
+    }
+    parts.push(value.slice(lastIndex));
+    return new VariableValueContainingReferences(parts);
+};
+exports.createVariableValueContainingReferencesFromString = createVariableValueContainingReferencesFromString;
+//# sourceMappingURL=VariableValueContainingReferences.js.map
+
+/***/ }),
+
+/***/ 16305:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.resolveAllReferences = void 0;
+const VariableValueContainingReferences_1 = __nccwpck_require__(84474);
+const resolveAllReferencesOnce_1 = __nccwpck_require__(89554);
+const resolveAllReferences = async (values, getEnvVars) => {
+    // replace until there aren't any references left
+    let result = values;
+    let i = 0;
+    while (Object.values(result).some((value) => value.parts.some((part) => part instanceof VariableValueContainingReferences_1.VariableReference))) {
+        const replaced = await (0, resolveAllReferencesOnce_1.resolveAllReferencesOnce)(result, getEnvVars);
+        result = replaced;
+        i++;
+        if (i > 1000) {
+            const unresolved = Object.entries(result).filter(([key, value]) => value.parts.some((part) => part instanceof VariableValueContainingReferences_1.VariableReference));
+            throw new Error("Infinite loop detected in these variables: " +
+                unresolved
+                    .map(([key, value]) => `${key} (last reference: ${value.parts.find((part) => part instanceof VariableValueContainingReferences_1.VariableReference)})`)
+                    .join(", "));
+        }
+    }
+    return result;
+};
+exports.resolveAllReferences = resolveAllReferences;
+//# sourceMappingURL=resolveAllReferences.js.map
+
+/***/ }),
+
+/***/ 89554:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.resolveAllReferencesOnce = void 0;
+const VariableValueContainingReferences_1 = __nccwpck_require__(84474);
+const resolveReferencesOnce_1 = __nccwpck_require__(78749);
+const resolveAllReferencesOnce = async (values, getEnvVars) => {
+    const allReferences = Object.values(values).flatMap((value) => value === null || value === void 0 ? void 0 : value.parts.filter((part) => part instanceof VariableValueContainingReferences_1.VariableReference));
+    const allComponentsUnique = Array.from(new Set(allReferences.map((reference) => reference.componentName)));
+    const allEnvVarsInComponents = Object.fromEntries(await Promise.all(allComponentsUnique.map(async (componentName) => [
+        componentName,
+        await getEnvVars(componentName),
+    ])));
+    return Object.fromEntries(Object.entries(values).map(([key, value]) => [
+        key,
+        value !== null && value !== undefined
+            ? (0, resolveReferencesOnce_1.resolveReferencesOnce)(value, ({ componentName, variableName }) => {
+                return allEnvVarsInComponents[componentName][variableName];
+            })
+            : value,
+    ]));
+};
+exports.resolveAllReferencesOnce = resolveAllReferencesOnce;
+//# sourceMappingURL=resolveAllReferencesOnce.js.map
+
+/***/ }),
+
+/***/ 78749:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.resolveReferencesOnce = void 0;
+const VariableValueContainingReferences_1 = __nccwpck_require__(84474);
+const resolveReferencesOnce = (value, resolver) => {
+    const replacedParts = value.parts.map((part) => {
+        if (part instanceof VariableValueContainingReferences_1.VariableReference) {
+            const result = resolver({
+                componentName: part.componentName,
+                variableName: part.variableName,
+            });
+            return result !== null && result !== void 0 ? result : new VariableValueContainingReferences_1.UnresolvableReference(part);
+        }
+        else {
+            return part;
+        }
+    });
+    return new VariableValueContainingReferences_1.VariableValueContainingReferences(replacedParts);
+};
+exports.resolveReferencesOnce = resolveReferencesOnce;
+//# sourceMappingURL=resolveReferencesOnce.js.map
+
+/***/ }),
+
 /***/ 93090:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {