@gearbox-protocol/cli-utils 5.69.0 → 5.69.1

package/dist/Zommand.js

@@ -73,10 +73,10 @@ export class Zommand extends Command {
             }
             let fromInlineConfig = {};
             if (inlineConfig) {
-                fromInlineConfig = decompressObject(inlineConfig);
+                fromInlineConfig = await decompressObject(inlineConfig, this.#templatedData);
             }
             else if (process.env.INLINE_CONFIG) {
-                fromInlineConfig = decompressObject(process.env.INLINE_CONFIG);
+                fromInlineConfig = await decompressObject(process.env.INLINE_CONFIG, this.#templatedData);
             }
             const schemaFromEnv = {};
             for (const [env, key] of Object.entries(this.#envToObjectKeys)) {

package/dist/compressedConfig.d.ts

@@ -5,5 +5,6 @@
 export declare function compressObject(obj: unknown): string;
 /**
  * Decompress a base64url string back into a JS object
+ * Allows to pass template data to resolve promises/env
  */
-export declare function decompressObject<T = unknown>(value: string): T;
+export declare function decompressObject<T = unknown>(value: string, templateData?: Record<string, unknown>): Promise<T>;

package/dist/compressedConfig.js

@@ -1,4 +1,5 @@
 import { deflateSync, inflateSync } from "node:zlib";
+import { resolveFromObject } from "./resolveYamlFiles.js";
 /**
  * Compress a plain JS object into a base64url string
  * suitable for env vars.
@@ -10,9 +11,12 @@ export function compressObject(obj) {
 }
 /**
  * Decompress a base64url string back into a JS object
+ * Allows to pass template data to resolve promises/env
  */
-export function decompressObject(value) {
+export async function decompressObject(value, templateData) {
     const compressed = Buffer.from(value, "base64url");
-    const json = inflateSync(compressed).toString("utf8");
-    return JSON.parse(json);
+    const str = inflateSync(compressed).toString("utf8");
+    const json = JSON.parse(str);
+    const result = await resolveFromObject(json, templateData);
+    return result;
 }

package/dist/resolveYamlFiles.d.ts

@@ -23,6 +23,14 @@ export declare function resolveYamlFiles(file: string, templateData?: TemplateDa
  * @returns
  */
 export declare function resolveYamlDoc(file: string, templateData?: TemplateData): Promise<YAML.Document>;
+/**
+ * Helper function that gets object with templated values
+ * Just because async ast already exists in yaml, but not in json reviver
+ * @param json
+ * @param templateData
+ * @returns
+ */
+export declare function resolveFromObject(json: object, templateData?: TemplateData): Promise<object>;
 /**
  * Given file and a relative file path, returns full path of the relative file
  * Supports s3 links for base file

package/dist/resolveYamlFiles.js

@@ -80,6 +80,34 @@ export async function resolveYamlDoc(file, templateData) {
     });
     return cfgRaw;
 }
+/**
+ * Helper function that gets object with templated values
+ * Just because async ast already exists in yaml, but not in json reviver
+ * @param json
+ * @param templateData
+ * @returns
+ */
+export async function resolveFromObject(json, templateData) {
+    const content = YAML.stringify(json);
+    const cfgRaw = YAML.parseDocument(content, { merge: true });
+    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;
+            }
+        },
+    });
+    return cfgRaw.toJSON();
+}
 function getNodesPath(nodes) {
     return nodes
         .map(n => {

package/package.json

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