@gearbox-protocol/cli-utils 5.38.5 → 5.39.1

package/dist/Zommand.d.ts

@@ -6,7 +6,7 @@ export declare const zommandRegistry: z4.$ZodRegistry<{
     env?: string;
     description?: string;
 }, z4.$ZodType<unknown, unknown, z4.$ZodTypeInternals<unknown, unknown>>>;
-export interface ZommandOptions<T extends z4.$ZodObject> {
+export interface ZommandOptions<T extends z4.$ZodTypes> {
     schema: T;
     templateData?: TemplateData;
     /**
@@ -14,7 +14,7 @@ export interface ZommandOptions<T extends z4.$ZodObject> {
      */
     configFile?: boolean | string;
 }
-export declare class Zommand<T extends z4.$ZodObject, Args extends any[] = []> extends Command<Args, z4.output<T>> {
+export declare class Zommand<T extends z4.$ZodTypes, Args extends any[] = []> extends Command<Args, z4.output<T>> {
     #private;
     constructor(name: string, opts: ZommandOptions<T>);
     action(fn: (this: this, ...args: [...Args, z4.output<T>, this]) => void | Promise<void>): this;

package/dist/Zommand.js

@@ -5,21 +5,26 @@ export const zommandRegistry = z4.registry();
 export class Zommand extends Command {
     #schema;
     #templatedData;
+    #envToObjectKeys = {};
     constructor(name, opts) {
         super(name);
         const { schema, templateData, configFile = true } = opts;
         this.#schema = schema;
         this.#templatedData = templateData;
         const def = this.#schema._zod.def;
-        if (def.type !== "object") {
-            throw new Error(`expected object schema, got ${this.#schema._zod.def.type}`);
+        if (def.type === "object") {
+            this.#addOptionsFromObject(def);
         }
-        for (const optionSchema of Object.values(def.shape)) {
-            const meta = zommandRegistry.get(optionSchema);
-            if (!meta) {
-                continue;
+        else if (def.type === "union") {
+            for (const o of def.options) {
+                const opt = o;
+                if (opt._zod.def.type === "object") {
+                    this.#addOptionsFromObject(opt._zod.def);
+                }
             }
-            this.addOption(new Option(meta.flags, meta.description));
+        }
+        else {
+            throw new Error(`expected object schema, got ${this.#schema._zod.def.type}`);
         }
         if (configFile) {
             let opt = new Option("--config [file]", "config file");
@@ -29,6 +34,23 @@ export class Zommand extends Command {
             this.addOption(opt);
         }
     }
+    #addOptionsFromObject(def) {
+        const shape = def.shape;
+        for (const [key, optionSchema] of Object.entries(shape)) {
+            const meta = zommandRegistry.get(optionSchema);
+            if (!meta) {
+                continue;
+            }
+            // this avoids duplicate options in case of discriminated unions
+            const existing = this.options.find(o => o.flags === meta.flags);
+            if (!existing) {
+                this.addOption(new Option(meta.flags, meta.description));
+                if (meta.env) {
+                    this.#envToObjectKeys[meta.env] = key;
+                }
+            }
+        }
+    }
     action(fn) {
         return super.action(async (...args) => {
             const argz = args;
@@ -41,12 +63,10 @@ export class Zommand extends Command {
                     ...this.#templatedData,
                 });
             }
-            const def = this.#schema._zod.def;
             const schemaFromEnv = {};
-            for (const [key, optionSchema] of Object.entries(def.shape)) {
-                const meta = zommandRegistry.get(optionSchema);
-                if (meta?.env && process.env[meta.env]) {
-                    schemaFromEnv[key] = process.env[meta.env];
+            for (const [env, key] of Object.entries(this.#envToObjectKeys)) {
+                if (process.env[env]) {
+                    schemaFromEnv[key] = process.env[env];
                 }
             }
             // deep merge is not required: env and cli flags are for top-level only

package/package.json

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