@catladder/cli 0.0.0-refactor-resolve-references-next-de1019aa → 0.0.0-refactor-resolve-references-next-c8f614f7

package/dist/bundles/catenv/index.js

@@ -113,9 +113,8 @@ const getCurrentComponentAndEnvFromChoice = async (config, choice) => {
 };
 exports.getCurrentComponentAndEnvFromChoice = getCurrentComponentAndEnvFromChoice;
 const makeKeyValueString = (variables, keyPrefix = "") => Object.entries(variables)
-    .map(
-// double quotes seems not to work
-([key, value]) => `${keyPrefix}${key}='${(0, pipeline_1.bashEscape)(value, "single")}'`)
+    // quotes are important, otherwise line breaks don't work properly
+    .map(([key, value]) => `${keyPrefix}${key}=${(0, pipeline_1.escapeForDotEnv)(value)}`)
     .join("\n");
 exports.makeKeyValueString = makeKeyValueString;
 const sanitizeEnvVarName = (name) => name.replace(/[\s\-.]+/g, "_");
@@ -152,7 +151,6 @@ const writeDotEnvFiles = async (config, choice) => {
         delete variables["_ALL_ENV_VAR_KEYS"];
         const componentDir = (0, utils_1.getComponentFullPath)(gitRoot, config, componentName);
         const filePath = (0, path_1.join)(componentDir, ".env");
-        // many .dotenv don't like multiline values, so we sanitize them here
         await (0, pipeline_1.writeGeneratedFile)(filePath, (0, utils_1.makeKeyValueString)(variables), {
             commentChar: "#",
         });
@@ -827,35 +825,132 @@ exports.joinBashExpressions = joinBashExpressions;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.escapeSingleQuotes = exports.escapeDoubleQuotes = exports.escapeString = exports.bashEscape = void 0;
+exports.escapeForDotEnv = exports.escapeSingleQuotes = exports.escapeDoubleQuotes = exports.escapeBashExpression = exports.escapeString = exports.bashEscape = void 0;
+const globalScriptFunctions_1 = __nccwpck_require__(2912);
 const VariableValueContainingReferences_1 = __nccwpck_require__(1592);
 const BashExpression_1 = __nccwpck_require__(2376);
 /**
  * escapes a string or bash expression for bash
  * it either can escape single or double quotes (double is default)
  */
-const bashEscape = (value, mode = "double") => {
+const bashEscape = (value, options = {
+    quotes: "double",
+}) => {
     if (value instanceof BashExpression_1.BashExpression) {
-        return value.toString(); // no need to escape bash expressions, as we want them to evaluate
+        // no need to escape
+        return (0, exports.escapeBashExpression)(value, options);
     }
     if (value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences) {
-        return value.toString({
-            escape: mode,
-        });
+        return value.toString(options);
     }
-    return (0, exports.escapeString)(value, mode);
+    return (0, exports.escapeString)(value, options);
 };
 exports.bashEscape = bashEscape;
-const escapeString = (value, mode = "double") => {
-    return mode === "double"
-        ? (0, exports.escapeDoubleQuotes)(value)
-        : (0, exports.escapeSingleQuotes)(value);
+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
 
 /***/ }),
@@ -917,7 +1012,8 @@ const variableContainingReferences = {
         const stringified = value.parts
             .map((part) => part instanceof BashExpression_1.BashExpression
             ? indentNewlinesInBashExpression(part, ctx.indent)
-            : part.toString().replace(/\n/g, `\n${ctx.indent}`))
+            : // indent every new line
+                part.toString().replace(/\n/g, `\n${ctx.indent}`))
             .join("");
         return "|-\n" + ctx.indent + stringified;
     },
@@ -969,7 +1065,11 @@ const getInjectVarsScript = (vars) => {
     // filter out null and undefined values
     return Object.entries(vars)
         .filter(([, value]) => !(0, lodash_1.isNil)(value))
-        .map(([key, value]) => `export ${key}="${value ? (0, bashEscape_1.bashEscape)(value) : ""}"`);
+        .map(([key, value]) => `export ${key}="${value
+        ? (0, bashEscape_1.bashEscape)(value, {
+            quotes: "double",
+        })
+        : ""}"`);
 };
 exports.getInjectVarsScript = getInjectVarsScript;
 //# sourceMappingURL=getInjectVarsScript.js.map
@@ -1292,9 +1392,9 @@ exports.writeBuildInfo = writeBuildInfo;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.componentContextNeedsBuildTimeDotEnv = exports.writeDotEnv = void 0;
 const lodash_1 = __nccwpck_require__(3255);
-const gitlab_1 = __nccwpck_require__(8490);
-const getBuildInfoVariables_1 = __nccwpck_require__(7827);
 const bashEscape_1 = __nccwpck_require__(2463);
+const getBuildInfoVariables_1 = __nccwpck_require__(7827);
+const gitlab_1 = __nccwpck_require__(8490);
 /**
  * writes a .env file in the components folder
  * @param context
@@ -1309,10 +1409,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))
-        // double quotes seems not to work in some cases
-        .map(([key, value]) => `${key}='${(0, bashEscape_1.bashEscape)(value, "single")}'`)
+        .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`,
@@ -5194,6 +5293,45 @@ exports.contextIsStoppable = contextIsStoppable;
 
 /***/ }),
 
+/***/ 2912:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.registerGlobalScriptFunction = exports.globalScriptFunctions = void 0;
+class GlobalScriptFunction {
+    constructor(name, script) {
+        this.name = name;
+        this.script = script;
+    }
+    toBashFunction() {
+        return `function ${this.name} () {
+${this.script.trim()}
+}`.trim();
+    }
+    invoke(...args) {
+        return `${this.name} ${args.join(" ")}`;
+    }
+}
+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
+
+/***/ }),
+
 /***/ 603:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -5822,7 +5960,8 @@ function getGitlabNeedsForWorkspaceJob(context, { needsStages, needs }, allJobs)
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createGitlabPipelineWithDefaults = void 0;
 const runner_1 = __nccwpck_require__(4058);
-const createGitlabPipelineWithDefaults = ({ image, variables, ...config }) => {
+const globalScriptFunctions_1 = __nccwpck_require__(2912);
+const createGitlabPipelineWithDefaults = ({ image, variables, before_script, ...config }) => {
     return {
         image: image !== null && image !== void 0 ? image : (0, runner_1.getRunnerImage)("jobs-default"), // default image
         variables: {
@@ -5833,6 +5972,10 @@ const createGitlabPipelineWithDefaults = ({ image, variables, ...config }) => {
             GIT_DEPTH: "1", // no need the full depth
             ...(variables !== null && variables !== void 0 ? variables : {}),
         },
+        before_script: [
+            ...[...globalScriptFunctions_1.globalScriptFunctions.values()].map((script) => script.toBashFunction()),
+            ...(before_script !== null && before_script !== void 0 ? before_script : []),
+        ],
         ...config,
     };
 };
@@ -6365,12 +6508,13 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 /***/ }),
 
 /***/ 8490:
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.collapseableSection = exports.repeatOnFailure = exports.sanitizeForBashVariable = exports.allowFailureInScripts = void 0;
+const globalScriptFunctions_1 = __nccwpck_require__(2912);
 const allowFailureInScripts = (script) => [
     "set +e", // disable fail job on error
     ...script,
@@ -6389,11 +6533,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 [
-        `echo -e "\\e[0Ksection_start:$(date +%s):${name}[collapsed=true]\\r\\e[0K${header}"`,
+        start.invoke(`"${name}"`, `"${header}"`),
         ...commands,
-        `echo -e "\\e[0Ksection_end:$(date +%s):${name}\\r\\e[0K"`,
+        end.invoke(`"${name}"`),
     ];
 };
 exports.collapseableSection = collapseableSection;
@@ -6525,6 +6676,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createVariableValueContainingReferencesFromString = exports.VariableValueContainingReferences = exports.VariableReference = exports.UnresolvableReference = void 0;
+const BashExpression_1 = __nccwpck_require__(2376);
 const bashEscape_1 = __nccwpck_require__(2463);
 class UnresolvableReference {
     constructor(reference) {
@@ -6553,11 +6705,16 @@ class VariableValueContainingReferences {
                 ? []
                 : [part]);
     }
-    toString(options = { escape: false }) {
+    toString(options = {
+        quotes: false,
+    }) {
         return this.parts
             .map((part) => {
             if (typeof part === "string") {
-                return options.escape ? (0, bashEscape_1.escapeString)(part, options.escape) : part;
+                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();

package/dist/bundles/cli/index.js

@@ -3998,35 +3998,132 @@ exports.joinBashExpressions = joinBashExpressions;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.escapeSingleQuotes = exports.escapeDoubleQuotes = exports.escapeString = exports.bashEscape = void 0;
+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 either can escape single or double quotes (double is default)
  */
-const bashEscape = (value, mode = "double") => {
+const bashEscape = (value, options = {
+    quotes: "double",
+}) => {
     if (value instanceof BashExpression_1.BashExpression) {
-        return value.toString(); // no need to escape bash expressions, as we want them to evaluate
+        // no need to escape
+        return (0, exports.escapeBashExpression)(value, options);
     }
     if (value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences) {
-        return value.toString({
-            escape: mode,
-        });
+        return value.toString(options);
     }
-    return (0, exports.escapeString)(value, mode);
+    return (0, exports.escapeString)(value, options);
 };
 exports.bashEscape = bashEscape;
-const escapeString = (value, mode = "double") => {
-    return mode === "double"
-        ? (0, exports.escapeDoubleQuotes)(value)
-        : (0, exports.escapeSingleQuotes)(value);
+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
 
 /***/ }),
@@ -4088,7 +4185,8 @@ const variableContainingReferences = {
         const stringified = value.parts
             .map((part) => part instanceof BashExpression_1.BashExpression
             ? indentNewlinesInBashExpression(part, ctx.indent)
-            : part.toString().replace(/\n/g, `\n${ctx.indent}`))
+            : // indent every new line
+                part.toString().replace(/\n/g, `\n${ctx.indent}`))
             .join("");
         return "|-\n" + ctx.indent + stringified;
     },
@@ -4140,7 +4238,11 @@ const getInjectVarsScript = (vars) => {
     // filter out null and undefined values
     return Object.entries(vars)
         .filter(([, value]) => !(0, lodash_1.isNil)(value))
-        .map(([key, value]) => `export ${key}="${value ? (0, bashEscape_1.bashEscape)(value) : ""}"`);
+        .map(([key, value]) => `export ${key}="${value
+        ? (0, bashEscape_1.bashEscape)(value, {
+            quotes: "double",
+        })
+        : ""}"`);
 };
 exports.getInjectVarsScript = getInjectVarsScript;
 //# sourceMappingURL=getInjectVarsScript.js.map
@@ -4463,9 +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 getBuildInfoVariables_1 = __nccwpck_require__(17827);
 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
@@ -4480,10 +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))
-        // double quotes seems not to work in some cases
-        .map(([key, value]) => `${key}='${(0, bashEscape_1.bashEscape)(value, "single")}'`)
+        .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`,
@@ -8365,6 +8466,45 @@ exports.contextIsStoppable = contextIsStoppable;
 
 /***/ }),
 
+/***/ 12912:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.registerGlobalScriptFunction = exports.globalScriptFunctions = void 0;
+class GlobalScriptFunction {
+    constructor(name, script) {
+        this.name = name;
+        this.script = script;
+    }
+    toBashFunction() {
+        return `function ${this.name} () {
+${this.script.trim()}
+}`.trim();
+    }
+    invoke(...args) {
+        return `${this.name} ${args.join(" ")}`;
+    }
+}
+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
+
+/***/ }),
+
 /***/ 10603:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -8993,7 +9133,8 @@ function getGitlabNeedsForWorkspaceJob(context, { needsStages, needs }, allJobs)
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createGitlabPipelineWithDefaults = void 0;
 const runner_1 = __nccwpck_require__(4058);
-const createGitlabPipelineWithDefaults = ({ image, variables, ...config }) => {
+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
         variables: {
@@ -9004,6 +9145,10 @@ const createGitlabPipelineWithDefaults = ({ image, variables, ...config }) => {
             GIT_DEPTH: "1", // no need the full depth
             ...(variables !== null && variables !== void 0 ? variables : {}),
         },
+        before_script: [
+            ...[...globalScriptFunctions_1.globalScriptFunctions.values()].map((script) => script.toBashFunction()),
+            ...(before_script !== null && before_script !== void 0 ? before_script : []),
+        ],
         ...config,
     };
 };
@@ -9536,12 +9681,13 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 /***/ }),
 
 /***/ 38490:
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.collapseableSection = exports.repeatOnFailure = exports.sanitizeForBashVariable = exports.allowFailureInScripts = void 0;
+const globalScriptFunctions_1 = __nccwpck_require__(12912);
 const allowFailureInScripts = (script) => [
     "set +e", // disable fail job on error
     ...script,
@@ -9560,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 [
-        `echo -e "\\e[0Ksection_start:$(date +%s):${name}[collapsed=true]\\r\\e[0K${header}"`,
+        start.invoke(`"${name}"`, `"${header}"`),
         ...commands,
-        `echo -e "\\e[0Ksection_end:$(date +%s):${name}\\r\\e[0K"`,
+        end.invoke(`"${name}"`),
     ];
 };
 exports.collapseableSection = collapseableSection;
@@ -9696,6 +9849,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 
 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) {
@@ -9724,11 +9878,16 @@ class VariableValueContainingReferences {
                 ? []
                 : [part]);
     }
-    toString(options = { escape: false }) {
+    toString(options = {
+        quotes: false,
+    }) {
         return this.parts
             .map((part) => {
             if (typeof part === "string") {
-                return options.escape ? (0, bashEscape_1.escapeString)(part, options.escape) : part;
+                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();

package/dist/cli/src/apps/catenv/printVariables.js.map

@@ -1 +1 @@
-{"version":3,"file":"printVariables.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/printVariables.ts"],"names":[],"mappings":";;;AACA,oEAAmE;AAEnE,mCAIiB;AAEjB,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;;IACvE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,CAAC;IAEF,IAAI,gBAAgB,EAAE,CAAC;QACrB,wCAAwC;QACxC,IAAI,MAAA,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,MAAM,mCAAI,IAAI,EAAE,CAAC;YACvD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAC/D,CAAC;SAAM,CAAC;QACN,6DAA6D;QAC7D,0EAA0E;QAC1E,mCAAmC;QACnC,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAChD,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE;;YAC3B,wCAAwC;YACxC,IAAI,MAAA,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,mCAAI,IAAI,EAAE,CAAC;gBACpD,OAAO,MAAM,GAAG,CAAC;YACnB,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;YACtE,OAAO,UAAU,CAAC,mBAAmB,CAAC,CAAC;YACvC,OAAO;gBACL,GAAG,CAAC,MAAM,GAAG,CAAC;gBACd,GAAG,UAAU;gBACb,qCAAqC;gBACrC,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;oBAC/C,GAAG,IAAA,0BAAkB,EAAC,aAAa,CAAC,WAAW,EAAE,CAAC,IAAI,GAAG,EAAE;oBAC3D,KAAK;iBACN,CAAC,CACH;aACF,CAAC;QACJ,CAAC,EACD,OAAO,CAAC,OAAO,CAAC,EAA4B,CAAC,CAC9C,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;IACtE,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE/D,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF,MAAM,wBAAwB,GAAG,CAAC,SAAoB,EAAE,EAAE,CACxD,IAAA,0BAAkB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC"}
+{"version":3,"file":"printVariables.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/printVariables.ts"],"names":[],"mappings":";;;AACA,oEAAmE;AAEnE,mCAIiB;AAEjB,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;;IACvE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,CAAC;IAEF,IAAI,gBAAgB,EAAE,CAAC;QACrB,wCAAwC;QACxC,IAAI,MAAA,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,MAAM,mCAAI,IAAI,EAAE,CAAC;YACvD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAC/D,CAAC;SAAM,CAAC;QACN,6DAA6D;QAC7D,0EAA0E;QAC1E,mCAAmC;QACnC,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAChD,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE;;YAC3B,wCAAwC;YACxC,IAAI,MAAA,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,mCAAI,IAAI,EAAE,CAAC;gBACpD,OAAO,MAAM,GAAG,CAAC;YACnB,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;YACtE,OAAO,UAAU,CAAC,mBAAmB,CAAC,CAAC;YACvC,OAAO;gBACL,GAAG,CAAC,MAAM,GAAG,CAAC;gBACd,GAAG,UAAU;gBACb,qCAAqC;gBACrC,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;oBAC/C,GAAG,IAAA,0BAAkB,EAAC,aAAa,CAAC,WAAW,EAAE,CAAC,IAAI,GAAG,EAAE;oBAC3D,KAAK;iBACN,CAAC,CACH;aACF,CAAC;QACJ,CAAC,EACD,OAAO,CAAC,OAAO,CAAC,EAA4B,CAAC,CAC9C,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;IACtE,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE/D,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF,MAAM,wBAAwB,GAAG,CAAC,SAAiC,EAAE,EAAE,CACrE,IAAA,0BAAkB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC"}

package/dist/cli/src/apps/catenv/types.d.ts

@@ -1,6 +1,4 @@
-import type { VariableValue } from "../../../../pipeline/src/index.js";
 export type Choice = {
     env?: string;
     componentName?: string;
 };
-export type Variables = Record<string, VariableValue>;