@alcyone-labs/arg-parser 2.4.2 → 2.5.0

package/dist/index.mjs

@@ -1070,6 +1070,11 @@ const zodFlagSchema = z.object({
       "Must be a custom parser function"
     ),
     // Custom parser function (value: string) => any | Promise<any>
+    z.custom(
+      (val) => val && typeof val === "object" && val._def,
+      "Must be a Zod schema"
+    ),
+    // Zod schema for structured JSON validation
     z.string().refine(
       // String literal types
       (value) => ["boolean", "string", "number", "array", "object"].includes(
@@ -1080,7 +1085,7 @@ const zodFlagSchema = z.object({
       }
     )
   ]).default("string").describe(
-    "Expected data type (constructor or string literal) or a custom parser function. Defaults to 'string'."
+    "Expected data type (constructor, string literal, custom parser function, or Zod schema). Defaults to 'string'."
   ),
   mandatory: z.union([
     z.boolean(),
@@ -1112,6 +1117,9 @@ const zodFlagSchema = z.object({
   return newObj;
 });
 function getJsonSchemaTypeFromFlag(flagType) {
+  if (flagType && typeof flagType === "object" && flagType._def) {
+    return "object";
+  }
   if (typeof flagType === "function") {
     if (flagType === String) return "string";
     if (flagType === Number) return "number";
@@ -3338,7 +3346,21 @@ const _ArgParserBase = class _ArgParserBase {
       const result = flag["type"](value);
       value = result && typeof result.then === "function" ? await result : result;
     } else if (typeof flag["type"] === "object") {
-      value = new flag["type"](value);
+      if (flag["type"] && flag["type"]._def) {
+        try {
+          const parsedJson = typeof value === "string" ? JSON.parse(value) : value;
+          value = flag["type"].parse(parsedJson);
+        } catch (error) {
+          if (error instanceof SyntaxError) {
+            throw new Error(`Invalid JSON for flag '${flag["name"]}': ${error.message}`);
+          } else {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            throw new Error(`Validation failed for flag '${flag["name"]}': ${errorMessage}`);
+          }
+        }
+      } else {
+        value = new flag["type"](value);
+      }
     }
     if (flag["enum"] && flag["enum"].length > 0) {
       const allowedValues = flag["enum"].map((v) => typeof v === "string" ? `'${v}'` : v).join(", ");
@@ -3710,7 +3732,28 @@ ${cyan("Flags:")}
         const descriptionLines = Array.isArray(flag["description"]) ? flag["description"] : [flag["description"]];
         const metaLines = [];
         let typeName = "unknown";
-        if (typeof flag["type"] === "function") {
+        let typeDetails = [];
+        if (flag["type"] && typeof flag["type"] === "object" && flag["type"]._def) {
+          typeName = "JSON object";
+          try {
+            const zodSchema = flag["type"];
+            const def = zodSchema._def;
+            if (def.shape) {
+              const shape = typeof def.shape === "function" ? def.shape() : def.shape;
+              const properties2 = Object.keys(shape);
+              if (properties2.length > 0) {
+                if (properties2.length <= 4) {
+                  typeDetails.push(`Properties: ${properties2.join(", ")}`);
+                } else {
+                  typeDetails.push(`Properties: ${properties2.slice(0, 4).join(", ")}, ... (${properties2.length} total)`);
+                }
+              }
+            }
+            typeDetails.push("Expected: JSON string");
+          } catch (error) {
+            typeDetails.push("Expected: JSON string");
+          }
+        } else if (typeof flag["type"] === "function") {
           typeName = flag["type"].name || "custom function";
           if (typeName === "Boolean") typeName = "boolean";
           if (typeName === "String") typeName = "string";
@@ -3721,6 +3764,9 @@ ${cyan("Flags:")}
           typeName = flag["type"];
         }
         metaLines.push(`Type: ${typeName}`);
+        if (typeDetails.length > 0) {
+          metaLines.push(...typeDetails);
+        }
         if (flag["flagOnly"]) {
           metaLines.push("Flag only (no value expected)");
         }
@@ -4473,7 +4519,9 @@ _buildRecursiveString_fn = function(parser, level, visited = /* @__PURE__ */ new
         `${flagIndent}  Description: ${Array.isArray(flag["description"]) ? flag["description"].join(" | ") : flag["description"]}`
       );
       let typeName = "unknown";
-      if (typeof flag["type"] === "function") {
+      if (flag["type"] && typeof flag["type"] === "object" && flag["type"]._def) {
+        typeName = "Zod schema";
+      } else if (typeof flag["type"] === "function") {
         typeName = flag["type"].name || "custom function";
       } else if (typeof flag["type"] === "string") {
         typeName = flag["type"];
@@ -4540,7 +4588,9 @@ _buildRecursiveJson_fn = function(parser, visited = /* @__PURE__ */ new Set()) {
   config.flags = flags.map((flag) => {
     var _a;
     let typeName = "unknown";
-    if (typeof flag["type"] === "function") {
+    if (flag["type"] && typeof flag["type"] === "object" && flag["type"]._def) {
+      typeName = "Zod schema";
+    } else if (typeof flag["type"] === "function") {
       typeName = flag["type"].name || "custom function";
     } else if (typeof flag["type"] === "string") {
       typeName = flag["type"];
@@ -4963,6 +5013,25 @@ function createMcpErrorResponse(error) {
   };
 }
 function convertFlagToJsonSchemaProperty(flag) {
+  if (flag.type && typeof flag.type === "object" && flag.type._def) {
+    const zodSchema = flag.type;
+    try {
+      const property2 = z.toJSONSchema(zodSchema);
+      if (flag.description) {
+        property2.description = flag.description;
+      }
+      const isRequired2 = !!(flag.mandatory || flag.required);
+      return { property: property2, isRequired: isRequired2 };
+    } catch (error) {
+      console.warn(`Failed to convert Zod schema to JSON Schema for flag '${flag.name}':`, error);
+      const property2 = {
+        type: "object",
+        description: flag.description || `${flag.name} parameter (Zod schema)`
+      };
+      const isRequired2 = !!(flag.mandatory || flag.required);
+      return { property: property2, isRequired: isRequired2 };
+    }
+  }
   const property = {
     type: getJsonSchemaTypeFromFlag(flag.type),
     description: flag.description || `${flag.name} parameter`
@@ -5069,8 +5138,11 @@ function extractSimplifiedResponse(mcpResponse) {
   };
 }
 function mapArgParserFlagToZodSchema(flag) {
-  let zodSchema = z.string();
   const flagTypeOpt = flag["type"];
+  if (flagTypeOpt && typeof flagTypeOpt === "object" && flagTypeOpt._def) {
+    return flagTypeOpt;
+  }
+  let zodSchema = z.string();
   let typeName;
   if (typeof flagTypeOpt === "function") {
     typeName = flagTypeOpt.name.toLowerCase().replace("constructor", "");