@optique/valibot 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"));
 const valibot = __toESM(require("valibot"));
 
 //#region src/index.ts
@@ -83,8 +84,15 @@ function inferMetavar(schema) {
 	if (schemaType === "boolean") return "BOOLEAN";
 	if (schemaType === "date") return "DATE";
 	if (schemaType === "picklist") return "CHOICE";
-	if (schemaType === "literal") return "VALUE";
-	if (schemaType === "union" || schemaType === "variant") return "VALUE";
+	if (schemaType === "literal") {
+		if (inferChoices(schema) != null) return "CHOICE";
+		return "VALUE";
+	}
+	if (schemaType === "union") {
+		if (inferChoices(schema) != null) return "CHOICE";
+		return "VALUE";
+	}
+	if (schemaType === "variant") return "VALUE";
 	if (schemaType === "optional" || schemaType === "nullable" || schemaType === "nullish") {
 		const wrapped = internalSchema.wrapped;
 		if (wrapped) return inferMetavar(wrapped);
@@ -92,6 +100,50 @@ function inferMetavar(schema) {
 	return "VALUE";
 }
 /**
+* Extracts valid choices from a Valibot schema that represents a fixed set of
+* values (picklist, literal, or union of literals).
+*
+* @param schema A Valibot 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 internalSchema = schema;
+	const schemaType = internalSchema.type;
+	if (!schemaType) return void 0;
+	if (schemaType === "picklist") {
+		const options = internalSchema.options;
+		if (Array.isArray(options)) {
+			const result = [];
+			for (const opt of options) if (typeof opt === "string") result.push(opt);
+			else return void 0;
+			return result.length > 0 ? result : void 0;
+		}
+		return void 0;
+	}
+	if (schemaType === "literal") {
+		const value = internalSchema.literal;
+		if (typeof value === "string") return [value];
+		return void 0;
+	}
+	if (schemaType === "union") {
+		const options = internalSchema.options;
+		if (!Array.isArray(options)) return void 0;
+		const allChoices = /* @__PURE__ */ new Set();
+		for (const opt of options) if (typeof opt === "object" && opt != null && "type" in opt) {
+			const sub = inferChoices(opt);
+			if (sub == null) return void 0;
+			for (const choice of sub) allChoices.add(choice);
+		} else return void 0;
+		return allChoices.size > 0 ? [...allChoices] : void 0;
+	}
+	if (schemaType === "optional" || schemaType === "nullable" || schemaType === "nullish") {
+		const wrapped = internalSchema.wrapped;
+		if (wrapped) return inferChoices(wrapped);
+	}
+	return void 0;
+}
+/**
 * Creates a value parser from a Valibot schema.
 *
 * This parser validates CLI argument strings using Valibot schemas, enabling
@@ -168,12 +220,25 @@ function inferMetavar(schema) {
 * );
 * ```
 *
+* @throws {TypeError} If the resolved `metavar` is an empty string.
 * @since 0.7.0
 */
 function valibot$1(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 = (0, valibot.safeParse)(schema, input);
 			if (result.success) return {
@@ -194,6 +259,7 @@ function valibot$1(schema, options = {}) {
 			return String(value);
 		}
 	};
+	return parser;
 }
 
 //#endregion

package/dist/index.d.cts

@@ -106,6 +106,7 @@ interface ValibotParserOptions {
  * );
  * ```
  *
+ * @throws {TypeError} If the resolved `metavar` is an empty string.
  * @since 0.7.0
  */
 declare function valibot<T>(schema: v.BaseSchema<unknown, T, v.BaseIssue<unknown>>, options?: ValibotParserOptions): ValueParser<"sync", T>;

package/dist/index.d.ts

@@ -106,6 +106,7 @@ interface ValibotParserOptions {
  * );
  * ```
  *
+ * @throws {TypeError} If the resolved `metavar` is an empty string.
  * @since 0.7.0
  */
 declare function valibot<T>(schema: v.BaseSchema<unknown, T, v.BaseIssue<unknown>>, options?: ValibotParserOptions): ValueParser<"sync", T>;

package/dist/index.js

@@ -1,4 +1,5 @@
 import { message } from "@optique/core/message";
+import { ensureNonEmptyString } from "@optique/core/nonempty";
 import { safeParse } from "valibot";
 
 //#region src/index.ts
@@ -60,8 +61,15 @@ function inferMetavar(schema) {
 	if (schemaType === "boolean") return "BOOLEAN";
 	if (schemaType === "date") return "DATE";
 	if (schemaType === "picklist") return "CHOICE";
-	if (schemaType === "literal") return "VALUE";
-	if (schemaType === "union" || schemaType === "variant") return "VALUE";
+	if (schemaType === "literal") {
+		if (inferChoices(schema) != null) return "CHOICE";
+		return "VALUE";
+	}
+	if (schemaType === "union") {
+		if (inferChoices(schema) != null) return "CHOICE";
+		return "VALUE";
+	}
+	if (schemaType === "variant") return "VALUE";
 	if (schemaType === "optional" || schemaType === "nullable" || schemaType === "nullish") {
 		const wrapped = internalSchema.wrapped;
 		if (wrapped) return inferMetavar(wrapped);
@@ -69,6 +77,50 @@ function inferMetavar(schema) {
 	return "VALUE";
 }
 /**
+* Extracts valid choices from a Valibot schema that represents a fixed set of
+* values (picklist, literal, or union of literals).
+*
+* @param schema A Valibot 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 internalSchema = schema;
+	const schemaType = internalSchema.type;
+	if (!schemaType) return void 0;
+	if (schemaType === "picklist") {
+		const options = internalSchema.options;
+		if (Array.isArray(options)) {
+			const result = [];
+			for (const opt of options) if (typeof opt === "string") result.push(opt);
+			else return void 0;
+			return result.length > 0 ? result : void 0;
+		}
+		return void 0;
+	}
+	if (schemaType === "literal") {
+		const value = internalSchema.literal;
+		if (typeof value === "string") return [value];
+		return void 0;
+	}
+	if (schemaType === "union") {
+		const options = internalSchema.options;
+		if (!Array.isArray(options)) return void 0;
+		const allChoices = /* @__PURE__ */ new Set();
+		for (const opt of options) if (typeof opt === "object" && opt != null && "type" in opt) {
+			const sub = inferChoices(opt);
+			if (sub == null) return void 0;
+			for (const choice of sub) allChoices.add(choice);
+		} else return void 0;
+		return allChoices.size > 0 ? [...allChoices] : void 0;
+	}
+	if (schemaType === "optional" || schemaType === "nullable" || schemaType === "nullish") {
+		const wrapped = internalSchema.wrapped;
+		if (wrapped) return inferChoices(wrapped);
+	}
+	return void 0;
+}
+/**
 * Creates a value parser from a Valibot schema.
 *
 * This parser validates CLI argument strings using Valibot schemas, enabling
@@ -145,12 +197,25 @@ function inferMetavar(schema) {
 * );
 * ```
 *
+* @throws {TypeError} If the resolved `metavar` is an empty string.
 * @since 0.7.0
 */
 function valibot(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 = safeParse(schema, input);
 			if (result.success) return {
@@ -171,6 +236,7 @@ function valibot(schema, options = {}) {
 			return String(value);
 		}
 	};
+	return parser;
 }
 
 //#endregion

package/package.json

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