@extrahorizon/exh-cli 1.12.0-dev-152-fc8569c → 1.12.0-dev-154-7343f7f

package/build/config-json-schemas/Template.json

@@ -44,6 +44,10 @@
                 "outputs": {
                     "type": "object",
                     "additionalProperties": { "type": "string" }
+                },
+                "variables": {
+                    "type": "object",
+                    "additionalProperties": { "type": "string" }
                 }
             }
         },

package/build/services/templates/util/buildTemplates.js

@@ -17,10 +17,14 @@ async function buildTemplate(name, templateFilesByName, callChain = []) {
     if (callChain.includes(name)) {
         throw new Error(`Circular extension detected. ${renderCallChain(newCallChain)}`);
     }
-    const templateFile = templateFilesByName[name];
-    if (!templateFile) {
+    if (!templateFilesByName[name]) {
         throw new Error(`Template file dependency ${name} not found!`);
     }
+    const { variables, ...templateFile } = templateFilesByName[name];
+    if (variables && templateFile.outputs) {
+        templateFile.outputs = replaceVariables(templateFile.outputs, variables);
+        templateFilesByName[name] = templateFile;
+    }
     let templateConfig;
     if (templateFile.extends_template) {
         templateConfig = await extendV1Template(name, templateFilesByName, newCallChain);
@@ -31,8 +35,8 @@ async function buildTemplate(name, templateFilesByName, callChain = []) {
     else {
         templateConfig = { ...templateFile, name };
     }
-    if (!(0, utils_1.isV1Template)(templateConfig) && Object.keys(templateConfig.outputs || {}).length < 1) {
-        throw new Error(`Template '${name}' must have at least one output defined!`);
+    if (!(0, utils_1.isV1Template)(templateConfig)) {
+        validateV2Template(templateConfig);
     }
     return templateConfig;
 }
@@ -94,8 +98,55 @@ async function extendV2Template(name, templateFilesByName, callChain) {
         outputs: newOutputs,
     };
 }
+function replaceVariables(outputs, variables) {
+    const replaced = {};
+    const resolvedVariables = {};
+    for (const [varName, varValue] of Object.entries(variables)) {
+        resolvedVariables[varName] = resolveVariableValue(varValue);
+    }
+    for (const [key, value] of Object.entries(outputs)) {
+        let replacedValue = value;
+        for (const [varName, varValue] of Object.entries(resolvedVariables)) {
+            replacedValue = replacedValue
+                .replaceAll(`\${${varName}}`, varValue)
+                .replaceAll(`$${varName}`, varValue);
+        }
+        replaced[key] = replacedValue;
+    }
+    return replaced;
+}
+function resolveVariableValue(value) {
+    if (!value.startsWith('$')) {
+        return value;
+    }
+    const envVar = value.startsWith('${') && value.endsWith('}') ?
+        value.slice(2, -1) :
+        value.slice(1);
+    const validEnvPattern = /^[A-Z][A-Z0-9_]*$/;
+    if (!validEnvPattern.test(envVar)) {
+        throw new Error(`Invalid environment variable name ${envVar}. Environment variable names must contain only uppercase letters, numbers, and underscores and must start with a letter.`);
+    }
+    const resolved = process.env[envVar];
+    if (resolved === undefined) {
+        throw new Error(`Variable ${envVar} not found in environment`);
+    }
+    return resolved;
+}
+function validateV2Template(template) {
+    if (!/^[A-Za-z][A-Za-z0-9_-]{0,49}$/.test(template.name)) {
+        throw new Error(`Template name '${template.name}' is invalid. Template names must start with a letter and can only contain letters, numbers, underscores and hyphens, and be at most 50 characters long.`);
+    }
+    if (Object.keys(template.outputs || {}).length < 1) {
+        throw new Error(`Template '${template.name}' must have at least one output defined.`);
+    }
+    for (const outputName of Object.keys(template.outputs)) {
+        if (!/^[A-Za-z][A-Za-z0-9_-]{0,49}$/.test(outputName)) {
+            throw new Error(`Output name '${outputName}' is invalid. Output names must start with a letter and can only contain letters, numbers, underscores and hyphens, and be at most 50 characters long.`);
+        }
+    }
+}
 function v1ExtendingV2Error(extendsTemplate, callChain) {
-    return new Error(`You cannot extend a v2 template ('${extendsTemplate}') in a v1 template!` +
+    return new Error(`You cannot extend a v2 template ('${extendsTemplate}') in a v1 template.` +
         `In ${renderCallChain(callChain)}`);
 }
 function v1VariableNotFoundError(variableName, extendsTemplate, callChain) {
@@ -104,7 +155,7 @@ function v1VariableNotFoundError(variableName, extendsTemplate, callChain) {
         `in ${renderCallChain(callChain)}`);
 }
 function v2ExtendingV1Error(extendsTemplate, callChain) {
-    return new Error(`You cannot extend a v1 template ('${extendsTemplate}') in a v2 template!` +
+    return new Error(`You cannot extend a v1 template ('${extendsTemplate}') in a v2 template.` +
         `In ${renderCallChain(callChain)}`);
 }
 function v2VariableNotFoundError(variableName, extendsTemplate, callChain) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.12.0-dev-152-fc8569c",
+  "version": "1.12.0-dev-154-7343f7f",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",