argsbarg 1.4.0 → 1.4.2

package/src/validate.ts

@@ -12,6 +12,7 @@ import {
   CliOptionKind,
   CliSchemaValidationError,
 } from "./types.ts";
+import { MCP_SCHEMA_URI_DEFAULT } from "./mcp/tools.ts";
 
 const reservedCommandNames = ["completion", "mcp"];
 
@@ -34,22 +35,6 @@ export function cliValidateRoot(root: CliCommand): void {
 
 /** Recursively validates a command node: handlers vs children, options, and positionals. */
 function walkCommand(cmd: CliCommand, isRoot: boolean = false): void {
-  // Fallback only on root
-  if (!isRoot && cmd.fallbackCommand !== undefined) {
-    throw new CliSchemaValidationError(
-      "Fallback is only supported on the program root (not on " + cmd.key + ")",
-    );
-  }
-  if (
-    !isRoot &&
-    cmd.fallbackMode !== undefined &&
-    cmd.fallbackMode !== CliFallbackMode.MissingOnly
-  ) {
-    throw new CliSchemaValidationError(
-      "fallbackMode may only be set on the program root (not on " + cmd.key + ")",
-    );
-  }
-
   if (!isRoot && cmd.mcpServer !== undefined) {
     throw new CliSchemaValidationError(
       "mcpServer is only supported on the program root (not on " + cmd.key + ")",
@@ -66,6 +51,19 @@ function walkCommand(cmd: CliCommand, isRoot: boolean = false): void {
     throw new CliSchemaValidationError("mcpTool is only supported on leaf commands");
   }
 
+  if (isRoot && cmd.mcpServer?.resources) {
+    const schemaUri = cmd.mcpServer.schemaResourceUri ?? MCP_SCHEMA_URI_DEFAULT;
+    const uris = cmd.mcpServer.resources.map((r) => r.uri);
+    if (uris.includes(schemaUri)) {
+      throw new CliSchemaValidationError(
+        `mcpServer.resources URI '${schemaUri}' conflicts with the built-in schema resource`,
+      );
+    }
+    if (new Set(uris).size !== uris.length) {
+      throw new CliSchemaValidationError("mcpServer.resources URIs must be unique");
+    }
+  }
+
   // Check for duplicate child names
   const seenNames = new Set<string>();
   for (const child of cmd.commands ?? []) {
@@ -75,6 +73,22 @@ function walkCommand(cmd: CliCommand, isRoot: boolean = false): void {
     seenNames.add(child.key);
   }
 
+  if (cmd.fallbackMode !== undefined && cmd.fallbackCommand === undefined) {
+    throw new CliSchemaValidationError(
+      `fallbackMode requires fallbackCommand on '${cmd.key}'`,
+    );
+  }
+
+  if (cmd.fallbackCommand !== undefined) {
+    const children = cmd.commands ?? [];
+    const valid = children.find((c) => c.key === cmd.fallbackCommand);
+    if (!valid) {
+      throw new CliSchemaValidationError(
+        `fallbackCommand '${cmd.fallbackCommand}' is not a child of '${cmd.key}'`,
+      );
+    }
+  }
+
   // Validate options (short name uniqueness, reserved -h, required presence)
   const seenShorts = new Set<string>();
   for (const opt of cmd.options ?? []) {
@@ -103,6 +117,30 @@ function walkCommand(cmd: CliCommand, isRoot: boolean = false): void {
       }
       seenShorts.add(opt.shortName);
     }
+
+    if (opt.kind === CliOptionKind.Enum) {
+      if (!opt.choices || opt.choices.length === 0) {
+        throw new CliSchemaValidationError(
+          `Option '${opt.name}' on '${cmd.key}': Enum kind requires non-empty choices`,
+        );
+      }
+      if (new Set(opt.choices).size !== opt.choices.length) {
+        throw new CliSchemaValidationError(
+          `Option '${opt.name}' on '${cmd.key}': Enum choices must be distinct`,
+        );
+      }
+      for (const choice of opt.choices) {
+        if (choice.length === 0) {
+          throw new CliSchemaValidationError(
+            `Option '${opt.name}' on '${cmd.key}': Enum choices must be non-empty strings`,
+          );
+        }
+      }
+    } else if (opt.choices !== undefined) {
+      throw new CliSchemaValidationError(
+        `Option '${opt.name}' on '${cmd.key}': choices is only valid for Enum kind`,
+      );
+    }
   }
 
   // Validate positionals