@gearbox-protocol/cli-utils 5.36.21 → 5.36.22

package/dist/resolveYamlFiles.js

@@ -8,7 +8,7 @@ import getPromisePath from "./getPromisePath.js";
  * e.g. ${KEY} or ${KEY.SUBKEY}
  *
  */
-const templateKeyRegex = /^\$\{(?:[\w-]+(?:\.[\w-]+)*)\}$/;
+const templateKeyRegex = /\$\{(?:[\w-]+(?:\.[\w-]+)*)\}/g;
 /**
  * Merges yaml files, respecting .extends references.
  * Performs env variable substitution on the config.
@@ -62,12 +62,17 @@ export async function resolveYamlDoc(file, templateData) {
     }
     await YAML.visitAsync(cfgRaw, {
         Scalar: async (_, node) => {
-            if (typeof node.value === "string" && templateKeyRegex.test(node.value)) {
-                const templateKey = node.value.slice(2, -1);
-                const templateValue = getPromisePath(templateData, templateKey);
-                if (templateValue) {
-                    node.value = await Promise.resolve(templateValue);
+            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;
             }
         },
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/cli-utils",
   "description": "Utils for creating cli apps",
-  "version": "5.36.21",
+  "version": "5.36.22",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"