@optique/zod 1.0.0-dev.1290 → 1.0.0-dev.1300

package/dist/index.cjs

@@ -22,6 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 const __optique_core_message = __toESM(require("@optique/core/message"));
+const __optique_core_nonempty = __toESM(require("@optique/core/nonempty"));
 
 //#region src/index.ts
 /**
@@ -47,7 +48,7 @@ const __optique_core_message = __toESM(require("@optique/core/message"));
 function inferMetavar(schema) {
 	const def = schema._def;
 	if (!def) return "VALUE";
-	const typeName = def.typeName || def.type;
+	const typeName = def.typeName ?? def.type;
 	if (typeName === "ZodString" || typeName === "string") {
 		if (Array.isArray(def.checks)) for (const check of def.checks) {
 			const kind = check.kind || check.format;
@@ -76,8 +77,15 @@ function inferMetavar(schema) {
 	}
 	if (typeName === "ZodBoolean" || typeName === "boolean") return "BOOLEAN";
 	if (typeName === "ZodDate" || typeName === "date") return "DATE";
-	if (typeName === "ZodEnum" || typeName === "enum" || typeName === "ZodNativeEnum" || typeName === "nativeEnum") return "CHOICE";
-	if (typeName === "ZodUnion" || typeName === "union" || typeName === "ZodLiteral" || typeName === "literal") return "VALUE";
+	if (typeName === "ZodEnum" || typeName === "enum" || typeName === "ZodNativeEnum" || typeName === "nativeEnum") return inferChoices(schema) != null ? "CHOICE" : "VALUE";
+	if (typeName === "ZodLiteral" || typeName === "literal") {
+		if (inferChoices(schema) != null) return "CHOICE";
+		return "VALUE";
+	}
+	if (typeName === "ZodUnion" || typeName === "union") {
+		if (inferChoices(schema) != null) return "CHOICE";
+		return "VALUE";
+	}
 	if (typeName === "ZodOptional" || typeName === "optional" || typeName === "ZodNullable" || typeName === "nullable") {
 		const innerType = def.innerType;
 		if (innerType != null) return inferMetavar(innerType);
@@ -91,6 +99,70 @@ function inferMetavar(schema) {
 	return "VALUE";
 }
 /**
+* Extracts valid choices from a Zod schema that represents a fixed set of
+* values (enum, literal, or union of literals).
+*
+* @param schema A Zod schema to analyze.
+* @returns An array of string representations of valid choices, or `undefined`
+*          if the schema does not represent a fixed set of values.
+*/
+function inferChoices(schema) {
+	const def = schema._def;
+	if (!def) return void 0;
+	const typeName = def.typeName ?? def.type;
+	if (typeName === "ZodEnum" || typeName === "enum") {
+		const values = def.values;
+		if (Array.isArray(values)) return values.map(String);
+		const entries = def.entries;
+		if (entries != null && typeof entries === "object") {
+			const result = /* @__PURE__ */ new Set();
+			for (const val of Object.values(entries)) if (typeof val === "string") result.add(val);
+			else return void 0;
+			return result.size > 0 ? [...result] : void 0;
+		}
+		return void 0;
+	}
+	if (typeName === "ZodNativeEnum" || typeName === "nativeEnum") {
+		const values = def.values;
+		if (values != null && typeof values === "object" && !Array.isArray(values)) {
+			const result = /* @__PURE__ */ new Set();
+			for (const val of Object.values(values)) if (typeof val === "string") result.add(val);
+			else return void 0;
+			return result.size > 0 ? [...result] : void 0;
+		}
+		return void 0;
+	}
+	if (typeName === "ZodLiteral" || typeName === "literal") {
+		const value = def.value;
+		if (typeof value === "string") return [value];
+		const values = def.values;
+		if (Array.isArray(values)) {
+			const result = [];
+			for (const v of values) if (typeof v === "string") result.push(v);
+			else return void 0;
+			return result.length > 0 ? result : void 0;
+		}
+		return void 0;
+	}
+	if (typeName === "ZodUnion" || typeName === "union") {
+		const options = def.options;
+		if (!Array.isArray(options)) return void 0;
+		const allChoices = /* @__PURE__ */ new Set();
+		for (const opt of options) {
+			const sub = inferChoices(opt);
+			if (sub == null) return void 0;
+			for (const choice of sub) allChoices.add(choice);
+		}
+		return allChoices.size > 0 ? [...allChoices] : void 0;
+	}
+	if (typeName === "ZodOptional" || typeName === "optional" || typeName === "ZodNullable" || typeName === "nullable" || typeName === "ZodDefault" || typeName === "default") {
+		const innerType = def.innerType;
+		if (innerType != null) return inferChoices(innerType);
+		return void 0;
+	}
+	return void 0;
+}
+/**
 * Creates a value parser from a Zod schema.
 *
 * This parser validates CLI argument strings using Zod schemas, enabling
@@ -158,12 +230,25 @@ function inferMetavar(schema) {
 * }));
 * ```
 *
+* @throws {TypeError} If the resolved `metavar` is an empty string.
 * @since 0.7.0
 */
 function zod(schema, options = {}) {
-	return {
+	const choices = inferChoices(schema);
+	const metavar = options.metavar ?? inferMetavar(schema);
+	(0, __optique_core_nonempty.ensureNonEmptyString)(metavar);
+	const parser = {
 		$mode: "sync",
-		metavar: options.metavar ?? inferMetavar(schema),
+		metavar,
+		...choices != null && choices.length > 0 ? {
+			choices: Object.freeze(choices),
+			*suggest(prefix) {
+				for (const c of choices) if (c.startsWith(prefix)) yield {
+					kind: "literal",
+					text: c
+				};
+			}
+		} : {},
 		parse(input) {
 			const result = schema.safeParse(input);
 			if (result.success) return {
@@ -192,6 +277,7 @@ function zod(schema, options = {}) {
 			return String(value);
 		}
 	};
+	return parser;
 }
 
 //#endregion

package/dist/index.d.cts

@@ -97,6 +97,7 @@ interface ZodParserOptions {
  * }));
  * ```
  *
+ * @throws {TypeError} If the resolved `metavar` is an empty string.
  * @since 0.7.0
  */
 declare function zod<T>(schema: z.Schema<T>, options?: ZodParserOptions): ValueParser<"sync", T>;

package/dist/index.d.ts

@@ -97,6 +97,7 @@ interface ZodParserOptions {
  * }));
  * ```
  *
+ * @throws {TypeError} If the resolved `metavar` is an empty string.
  * @since 0.7.0
  */
 declare function zod<T>(schema: z.Schema<T>, options?: ZodParserOptions): ValueParser<"sync", T>;

package/dist/index.js

@@ -1,4 +1,5 @@
 import { message } from "@optique/core/message";
+import { ensureNonEmptyString } from "@optique/core/nonempty";
 
 //#region src/index.ts
 /**
@@ -24,7 +25,7 @@ import { message } from "@optique/core/message";
 function inferMetavar(schema) {
 	const def = schema._def;
 	if (!def) return "VALUE";
-	const typeName = def.typeName || def.type;
+	const typeName = def.typeName ?? def.type;
 	if (typeName === "ZodString" || typeName === "string") {
 		if (Array.isArray(def.checks)) for (const check of def.checks) {
 			const kind = check.kind || check.format;
@@ -53,8 +54,15 @@ function inferMetavar(schema) {
 	}
 	if (typeName === "ZodBoolean" || typeName === "boolean") return "BOOLEAN";
 	if (typeName === "ZodDate" || typeName === "date") return "DATE";
-	if (typeName === "ZodEnum" || typeName === "enum" || typeName === "ZodNativeEnum" || typeName === "nativeEnum") return "CHOICE";
-	if (typeName === "ZodUnion" || typeName === "union" || typeName === "ZodLiteral" || typeName === "literal") return "VALUE";
+	if (typeName === "ZodEnum" || typeName === "enum" || typeName === "ZodNativeEnum" || typeName === "nativeEnum") return inferChoices(schema) != null ? "CHOICE" : "VALUE";
+	if (typeName === "ZodLiteral" || typeName === "literal") {
+		if (inferChoices(schema) != null) return "CHOICE";
+		return "VALUE";
+	}
+	if (typeName === "ZodUnion" || typeName === "union") {
+		if (inferChoices(schema) != null) return "CHOICE";
+		return "VALUE";
+	}
 	if (typeName === "ZodOptional" || typeName === "optional" || typeName === "ZodNullable" || typeName === "nullable") {
 		const innerType = def.innerType;
 		if (innerType != null) return inferMetavar(innerType);
@@ -68,6 +76,70 @@ function inferMetavar(schema) {
 	return "VALUE";
 }
 /**
+* Extracts valid choices from a Zod schema that represents a fixed set of
+* values (enum, literal, or union of literals).
+*
+* @param schema A Zod schema to analyze.
+* @returns An array of string representations of valid choices, or `undefined`
+*          if the schema does not represent a fixed set of values.
+*/
+function inferChoices(schema) {
+	const def = schema._def;
+	if (!def) return void 0;
+	const typeName = def.typeName ?? def.type;
+	if (typeName === "ZodEnum" || typeName === "enum") {
+		const values = def.values;
+		if (Array.isArray(values)) return values.map(String);
+		const entries = def.entries;
+		if (entries != null && typeof entries === "object") {
+			const result = /* @__PURE__ */ new Set();
+			for (const val of Object.values(entries)) if (typeof val === "string") result.add(val);
+			else return void 0;
+			return result.size > 0 ? [...result] : void 0;
+		}
+		return void 0;
+	}
+	if (typeName === "ZodNativeEnum" || typeName === "nativeEnum") {
+		const values = def.values;
+		if (values != null && typeof values === "object" && !Array.isArray(values)) {
+			const result = /* @__PURE__ */ new Set();
+			for (const val of Object.values(values)) if (typeof val === "string") result.add(val);
+			else return void 0;
+			return result.size > 0 ? [...result] : void 0;
+		}
+		return void 0;
+	}
+	if (typeName === "ZodLiteral" || typeName === "literal") {
+		const value = def.value;
+		if (typeof value === "string") return [value];
+		const values = def.values;
+		if (Array.isArray(values)) {
+			const result = [];
+			for (const v of values) if (typeof v === "string") result.push(v);
+			else return void 0;
+			return result.length > 0 ? result : void 0;
+		}
+		return void 0;
+	}
+	if (typeName === "ZodUnion" || typeName === "union") {
+		const options = def.options;
+		if (!Array.isArray(options)) return void 0;
+		const allChoices = /* @__PURE__ */ new Set();
+		for (const opt of options) {
+			const sub = inferChoices(opt);
+			if (sub == null) return void 0;
+			for (const choice of sub) allChoices.add(choice);
+		}
+		return allChoices.size > 0 ? [...allChoices] : void 0;
+	}
+	if (typeName === "ZodOptional" || typeName === "optional" || typeName === "ZodNullable" || typeName === "nullable" || typeName === "ZodDefault" || typeName === "default") {
+		const innerType = def.innerType;
+		if (innerType != null) return inferChoices(innerType);
+		return void 0;
+	}
+	return void 0;
+}
+/**
 * Creates a value parser from a Zod schema.
 *
 * This parser validates CLI argument strings using Zod schemas, enabling
@@ -135,12 +207,25 @@ function inferMetavar(schema) {
 * }));
 * ```
 *
+* @throws {TypeError} If the resolved `metavar` is an empty string.
 * @since 0.7.0
 */
 function zod(schema, options = {}) {
-	return {
+	const choices = inferChoices(schema);
+	const metavar = options.metavar ?? inferMetavar(schema);
+	ensureNonEmptyString(metavar);
+	const parser = {
 		$mode: "sync",
-		metavar: options.metavar ?? inferMetavar(schema),
+		metavar,
+		...choices != null && choices.length > 0 ? {
+			choices: Object.freeze(choices),
+			*suggest(prefix) {
+				for (const c of choices) if (c.startsWith(prefix)) yield {
+					kind: "literal",
+					text: c
+				};
+			}
+		} : {},
 		parse(input) {
 			const result = schema.safeParse(input);
 			if (result.success) return {
@@ -169,6 +254,7 @@ function zod(schema, options = {}) {
 			return String(value);
 		}
 	};
+	return parser;
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/zod",
-  "version": "1.0.0-dev.1290+a999711d",
+  "version": "1.0.0-dev.1300+12293782",
   "description": "Zod value parsers for Optique",
   "keywords": [
     "CLI",
@@ -57,7 +57,7 @@
     "zod": "^3.25.0 || ^4.0.0"
   },
   "dependencies": {
-    "@optique/core": "1.0.0-dev.1290+a999711d"
+    "@optique/core": "1.0.0-dev.1300+12293782"
   },
   "devDependencies": {
     "@types/node": "^20.19.9",