@optique/core 0.8.5 → 0.8.7

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright 2025 Hong Minhee
+Copyright 2025–2026 Hong Minhee
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/dist/constructs.cjs

@@ -73,7 +73,8 @@ function analyzeNoMatchContext(parsers) {
 */
 var DuplicateOptionError = class extends Error {
 	constructor(optionName$1, sources) {
-		super(`Duplicate option name "${optionName$1}" found in fields: ${sources.join(", ")}. Each option name must be unique within a parser combinator.`);
+		const sourceNames = sources.map((s) => typeof s === "symbol" ? s.description ?? s.toString() : s);
+		super(`Duplicate option name "${optionName$1}" found in fields: ${sourceNames.join(", ")}. Each option name must be unique within a parser combinator.`);
 		this.optionName = optionName$1;
 		this.sources = sources;
 		this.name = "DuplicateOptionError";
@@ -367,17 +368,35 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		parsers = labelOrParsers;
 		options = maybeParsersOrOptions ?? {};
 	}
-	const parserPairs = Object.entries(parsers);
+	const parserKeys = Reflect.ownKeys(parsers);
+	const parserPairs = parserKeys.map((k) => [k, parsers[k]]);
 	parserPairs.sort(([_, parserA], [__, parserB]) => parserB.priority - parserA.priority);
+	const initialState = {};
+	for (const key of parserKeys) initialState[key] = parsers[key].initialState;
 	if (!options.allowDuplicates) checkDuplicateOptionNames(parserPairs.map(([field, parser]) => [field, parser.usage]));
-	const noMatchContext = analyzeNoMatchContext(Object.values(parsers));
+	const noMatchContext = analyzeNoMatchContext(parserKeys.map((k) => parsers[k]));
 	return {
 		$valueType: [],
 		$stateType: [],
-		priority: Math.max(...Object.values(parsers).map((p) => p.priority)),
+		priority: Math.max(...parserKeys.map((k) => parsers[k].priority)),
 		usage: parserPairs.flatMap(([_, p]) => p.usage),
-		initialState: Object.fromEntries(Object.entries(parsers).map(([key, parser]) => [key, parser.initialState])),
+		initialState,
 		parse(context) {
+			if (!options.allowDuplicates) {
+				const optionNameSources = /* @__PURE__ */ new Map();
+				for (const [field, parser] of parserPairs) {
+					const names = require_usage.extractOptionNames(parser.usage);
+					for (const name of names) {
+						if (!optionNameSources.has(name)) optionNameSources.set(name, []);
+						optionNameSources.get(name).push(field);
+					}
+				}
+				for (const [name, sources] of optionNameSources) if (sources.length > 1) return {
+					success: false,
+					consumed: 0,
+					error: require_message.message`Duplicate option name ${require_message.optionName(name)} found in fields: ${require_message.values(sources.map((s) => typeof s === "symbol" ? s.description ?? s.toString() : s))}. Each option name must be unique within a parser combinator.`
+				};
+			}
 			let error = {
 				consumed: 0,
 				error: context.buffer.length > 0 ? (() => {
@@ -447,8 +466,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		},
 		complete(state) {
 			const result = {};
-			for (const field in state) {
-				if (!(field in parsers)) continue;
+			for (const field of parserKeys) {
 				const valueResult = parsers[field].complete(state[field]);
 				if (valueResult.success) result[field] = valueResult.value;
 				else return {

package/dist/constructs.d.cts

@@ -83,8 +83,8 @@ interface OrErrorOptions {
  */
 declare class DuplicateOptionError extends Error {
   readonly optionName: string;
-  readonly sources: string[];
-  constructor(optionName: string, sources: string[]);
+  readonly sources: readonly (string | symbol)[];
+  constructor(optionName: string, sources: readonly (string | symbol)[]);
 }
 /**
  * Creates a parser that combines two mutually exclusive parsers into one.

package/dist/constructs.d.ts

@@ -83,8 +83,8 @@ interface OrErrorOptions {
  */
 declare class DuplicateOptionError extends Error {
   readonly optionName: string;
-  readonly sources: string[];
-  constructor(optionName: string, sources: string[]);
+  readonly sources: readonly (string | symbol)[];
+  constructor(optionName: string, sources: readonly (string | symbol)[]);
 }
 /**
  * Creates a parser that combines two mutually exclusive parsers into one.

package/dist/constructs.js

@@ -73,7 +73,8 @@ function analyzeNoMatchContext(parsers) {
 */
 var DuplicateOptionError = class extends Error {
 	constructor(optionName$1, sources) {
-		super(`Duplicate option name "${optionName$1}" found in fields: ${sources.join(", ")}. Each option name must be unique within a parser combinator.`);
+		const sourceNames = sources.map((s) => typeof s === "symbol" ? s.description ?? s.toString() : s);
+		super(`Duplicate option name "${optionName$1}" found in fields: ${sourceNames.join(", ")}. Each option name must be unique within a parser combinator.`);
 		this.optionName = optionName$1;
 		this.sources = sources;
 		this.name = "DuplicateOptionError";
@@ -367,17 +368,35 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		parsers = labelOrParsers;
 		options = maybeParsersOrOptions ?? {};
 	}
-	const parserPairs = Object.entries(parsers);
+	const parserKeys = Reflect.ownKeys(parsers);
+	const parserPairs = parserKeys.map((k) => [k, parsers[k]]);
 	parserPairs.sort(([_, parserA], [__, parserB]) => parserB.priority - parserA.priority);
+	const initialState = {};
+	for (const key of parserKeys) initialState[key] = parsers[key].initialState;
 	if (!options.allowDuplicates) checkDuplicateOptionNames(parserPairs.map(([field, parser]) => [field, parser.usage]));
-	const noMatchContext = analyzeNoMatchContext(Object.values(parsers));
+	const noMatchContext = analyzeNoMatchContext(parserKeys.map((k) => parsers[k]));
 	return {
 		$valueType: [],
 		$stateType: [],
-		priority: Math.max(...Object.values(parsers).map((p) => p.priority)),
+		priority: Math.max(...parserKeys.map((k) => parsers[k].priority)),
 		usage: parserPairs.flatMap(([_, p]) => p.usage),
-		initialState: Object.fromEntries(Object.entries(parsers).map(([key, parser]) => [key, parser.initialState])),
+		initialState,
 		parse(context) {
+			if (!options.allowDuplicates) {
+				const optionNameSources = /* @__PURE__ */ new Map();
+				for (const [field, parser] of parserPairs) {
+					const names = extractOptionNames(parser.usage);
+					for (const name of names) {
+						if (!optionNameSources.has(name)) optionNameSources.set(name, []);
+						optionNameSources.get(name).push(field);
+					}
+				}
+				for (const [name, sources] of optionNameSources) if (sources.length > 1) return {
+					success: false,
+					consumed: 0,
+					error: message`Duplicate option name ${optionName(name)} found in fields: ${values(sources.map((s) => typeof s === "symbol" ? s.description ?? s.toString() : s))}. Each option name must be unique within a parser combinator.`
+				};
+			}
 			let error = {
 				consumed: 0,
 				error: context.buffer.length > 0 ? (() => {
@@ -447,8 +466,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		},
 		complete(state) {
 			const result = {};
-			for (const field in state) {
-				if (!(field in parsers)) continue;
+			for (const field of parserKeys) {
 				const valueResult = parsers[field].complete(state[field]);
 				if (valueResult.success) result[field] = valueResult.value;
 				else return {

package/dist/modifiers.cjs

@@ -316,10 +316,23 @@ function multiple(parser, options = {}) {
 		},
 		suggest(context, prefix) {
 			const innerState = context.state.length > 0 ? context.state.at(-1) : parser.initialState;
-			return parser.suggest({
+			const suggestions = parser.suggest({
 				...context,
 				state: innerState
 			}, prefix);
+			const selectedValues = /* @__PURE__ */ new Set();
+			for (const s of context.state) {
+				const completed = parser.complete(s);
+				if (completed.success) {
+					const valueStr = String(completed.value);
+					selectedValues.add(valueStr);
+				}
+			}
+			if (selectedValues.size > 0) return Array.from(suggestions).filter((suggestion) => {
+				if (suggestion.kind === "literal") return !selectedValues.has(suggestion.text);
+				return true;
+			});
+			return suggestions;
 		},
 		getDocFragments(state, defaultValue) {
 			const innerState = state.kind === "unavailable" ? { kind: "unavailable" } : state.state.length > 0 ? {

package/dist/modifiers.js

@@ -316,10 +316,23 @@ function multiple(parser, options = {}) {
 		},
 		suggest(context, prefix) {
 			const innerState = context.state.length > 0 ? context.state.at(-1) : parser.initialState;
-			return parser.suggest({
+			const suggestions = parser.suggest({
 				...context,
 				state: innerState
 			}, prefix);
+			const selectedValues = /* @__PURE__ */ new Set();
+			for (const s of context.state) {
+				const completed = parser.complete(s);
+				if (completed.success) {
+					const valueStr = String(completed.value);
+					selectedValues.add(valueStr);
+				}
+			}
+			if (selectedValues.size > 0) return Array.from(suggestions).filter((suggestion) => {
+				if (suggestion.kind === "literal") return !selectedValues.has(suggestion.text);
+				return true;
+			});
+			return suggestions;
 		},
 		getDocFragments(state, defaultValue) {
 			const innerState = state.kind === "unavailable" ? { kind: "unavailable" } : state.state.length > 0 ? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",