@xyo-network/xl1-cli-lib 1.10.2 → 1.12.0

package/dist/node/index.mjs

@@ -1436,7 +1436,7 @@ var initServices = async (context) => {
 // src/runCLI.ts
 import { deepMerge } from "@xylabs/object";
 import { isDefined as isDefined13 } from "@xylabs/typeof";
-import { ConfigSchema } from "@xyo-network/xl1-protocol-sdk";
+import { ConfigZod } from "@xyo-network/xl1-protocol-sdk";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { ZodError } from "zod";
@@ -1512,50 +1512,19 @@ var initLogger = (config3) => {
   return logger;
 };
 
-// src/optionsFromZodSchema.ts
-import {
-  ZodBoolean,
-  ZodDefault,
-  ZodEnum,
-  ZodNumber,
-  ZodObject,
-  ZodOptional
-} from "zod";
-var collectOptions = (zodType, path = [], out = {}) => {
-  if (zodType instanceof ZodObject) {
-    const shape = zodType.shape;
-    for (const [k, v] of Object.entries(shape)) {
-      collectOptions(v, [...path, k], out);
-    }
-    return out;
-  }
-  const def = zodType._def;
-  if (def?.innerType instanceof ZodObject) {
-    const shape = def.innerType.shape;
-    for (const [k, v] of Object.entries(shape)) {
-      collectOptions(v, [...path, k], out);
-    }
-    return out;
-  }
-  const options = {};
-  options.describe = def.description;
-  options.default = typeof def.defaultValue === "function" ? def.defaultValue() : def.defaultValue;
-  let type = "string";
-  const typeName = def.typeName === ZodDefault.name || def.typeName === ZodOptional.name ? def.innerType._def.typeName : def.typeName;
-  if (typeName === ZodBoolean.name) type = "boolean";
-  if (typeName === ZodNumber.name || def.coerce) type = "number";
-  if (typeName === ZodEnum.name) {
-    options.choices = Object.values(def.innerType.enum);
-  }
-  options.type = type;
-  const key = path.join(".");
-  out[key] = options;
-  return out;
-};
-var optionsFromZodSchema = (schema) => {
+// src/optionsFromGlobalZodRegistry.ts
+import { isUsageMeta } from "@xyo-network/xl1-protocol-sdk";
+import { globalRegistry } from "zod";
+var usageMetaToOptions = (meta) => {
+  return meta;
+};
+var optionsFromGlobalZodRegistry = () => {
   const opts = {};
-  for (const [rootKey, zodType] of Object.entries(schema)) {
-    collectOptions(zodType, [rootKey], opts);
+  for (const schema of globalRegistry._map.values()) {
+    if (isUsageMeta(schema)) {
+      if (schema.hidden) continue;
+      opts[schema.title] = usageMetaToOptions(schema);
+    }
   }
   return opts;
 };
@@ -1613,7 +1582,7 @@ var waitForHostPort = (host, port) => {
 
 // src/runCLI.ts
 var config;
-var version = isDefined13("1.10.1") ? "1.10.1" : "unknown";
+var version = isDefined13("1.11.0") ? "1.11.0" : "unknown";
 var getContextFromConfig = (config3) => {
   const logger = initLogger(config3);
   const orchestrator = new Orchestrator(logger);
@@ -1645,21 +1614,19 @@ $0 <command> [options]`).parserConfiguration({
     // foo.bar → { foo: { bar } }
     "populate--": true
     // Populate -- with all options so we can detected user-supplied vs defaults
-  }).env("XL1").scriptName("xl1").version(version).middleware((argv2) => {
+  }).env("XL1").scriptName("xl1").middleware((argv2) => {
     try {
       const parsedConfigFile = tryParseConfig();
       const parsedConfigArgs = argv2;
       const mergedConfig = deepMerge(parsedConfigArgs, parsedConfigFile);
-      config = ConfigSchema.parse(mergedConfig);
+      config = ConfigZod.parse(mergedConfig);
     } catch (err) {
       if (err instanceof ZodError) {
-        for (const issue of err.errors) {
-          console.error(`${issue.path.join(".")} \u2192 ${issue.message}`);
-        }
+        console.error(`${err.message}`);
       }
       throw new Error("Invalid configuration");
     }
-  }).options(optionsFromZodSchema(ConfigSchema.shape)).wrap(y.terminalWidth()).command("api", "Run a XL1 API Node", (yargs2) => {
+  }).options(optionsFromGlobalZodRegistry()).wrap(y.terminalWidth()).command("api", "Run a XL1 API Node", (yargs2) => {
     return yargs2.command("$0", "Run a XL1 API Node", () => {
     }, () => {
       const context = getContextFromConfig(config);
@@ -1677,7 +1644,7 @@ $0 <command> [options]`).parserConfiguration({
     runApi({ ...context, config });
     await waitForHostPort("localhost", config.api.port);
     await runProducer({ ...context, config });
-  }).help().alias("help", "h").argv;
+  }).help().alias("help", "h").version(version).argv;
   await argv;
 }