@gearbox-protocol/cli-utils 6.8.3 → 6.9.0

package/dist/resolveYamlFiles.js

@@ -8,8 +8,31 @@ import getPromisePath from "./getPromisePath.js";
  * Consists of alphanumeric+underscore parts separated by dots, all wrappped in env-style brackets
  * e.g. ${KEY} or ${KEY.SUBKEY}
  *
+ * Optionally supports a bash-style default value via `:-`, e.g. `${KEY:-fallback}`.
+ * The default is used when the resolved value is undefined, null, or an empty string.
+ * Capture groups: 1 = key path, 2 = optional default literal (no `}` allowed).
  */
-const templateKeyRegex = /\$\{(?:[\w-]+(?:\.[\w-]+)*)\}/g;
+const templateKeyRegex = /\$\{([\w-]+(?:\.[\w-]+)*)(?::-([^}]*))?\}/g;
+/**
+ * Replaces all `${...}` template tokens in a string using the provided template data.
+ * Supports bash-style `${KEY:-default}` fallback when the resolved value is missing
+ * (undefined, null, or empty string). The default is a literal and is not further
+ * interpolated.
+ */
+async function resolveScalarValue(val, templateData) {
+    const matches = val.matchAll(templateKeyRegex);
+    for (const match of matches) {
+        const [whole, key, defaultValue] = match;
+        const resolved = await getPromisePath(templateData, key);
+        if (resolved !== undefined && resolved !== null && resolved !== "") {
+            val = val.replace(whole, String(resolved));
+        }
+        else if (defaultValue !== undefined) {
+            val = val.replace(whole, defaultValue);
+        }
+    }
+    return val;
+}
 /**
  * Merges yaml files, respecting .extends references.
  * Performs env variable substitution on the config.
@@ -65,16 +88,7 @@ export async function resolveYamlDoc(file, templateData) {
     await YAML.visitAsync(cfgRaw, {
         Scalar: async (_, node) => {
             if (typeof node.value === "string") {
-                let val = node.value;
-                const matches = val.matchAll(templateKeyRegex);
-                for (const match of matches) {
-                    const templateKey = match[0].slice(2, -1);
-                    const templateValue = await getPromisePath(templateData, templateKey);
-                    if (templateValue) {
-                        val = val.replace(match[0], templateValue);
-                    }
-                }
-                node.value = val;
+                node.value = await resolveScalarValue(node.value, templateData);
             }
         },
     });
@@ -93,16 +107,7 @@ export async function resolveFromObject(json, templateData) {
     await YAML.visitAsync(cfgRaw, {
         Scalar: async (_, node) => {
             if (typeof node.value === "string") {
-                let val = node.value;
-                const matches = val.matchAll(templateKeyRegex);
-                for (const match of matches) {
-                    const templateKey = match[0].slice(2, -1);
-                    const templateValue = await getPromisePath(templateData, templateKey);
-                    if (templateValue) {
-                        val = val.replace(match[0], templateValue);
-                    }
-                }
-                node.value = val;
+                node.value = await resolveScalarValue(node.value, templateData);
             }
         },
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/cli-utils",
   "description": "Utils for creating cli apps",
-  "version": "6.8.3",
+  "version": "6.9.0",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"
@@ -27,7 +27,7 @@
     "@aws-sdk/client-s3": "^3.1033.0",
     "@aws-sdk/client-secrets-manager": "^3.1033.0",
     "@aws-sdk/client-ssm": "^3.1033.0",
-    "@gearbox-protocol/sdk": "^14.8.0-next.1",
+    "@gearbox-protocol/sdk": "^14.8.1",
     "@vlad-yakovlev/telegram-md": "^2.1.0",
     "abitype": "^1.2.4",
     "commander": "^14.0.3",