@optique/core 0.9.5 → 0.9.7

package/dist/facade.cjs

@@ -284,9 +284,26 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 		completion: require_primitives.constant(false),
 		result: originalParser
 	}));
+	const mainParserIndex = parsers.length - 1;
 	if (parsers.length === 1) return parsers[0];
-	else if (parsers.length === 2) return require_constructs.longestMatch(parsers[0], parsers[1]);
-	else return require_constructs.longestMatch(...parsers);
+	let combined;
+	if (parsers.length === 2) combined = require_constructs.longestMatch(parsers[0], parsers[1]);
+	else combined = require_constructs.longestMatch(...parsers);
+	const topUsage = combined.usage[0];
+	if (topUsage?.type === "exclusive" && mainParserIndex > 0) {
+		const terms = [...topUsage.terms];
+		const [mainTerm] = terms.splice(mainParserIndex, 1);
+		const lenientCount = (helpParsers.helpOption ? 1 : 0) + (versionParsers.versionOption ? 1 : 0);
+		terms.splice(lenientCount, 0, mainTerm);
+		combined = {
+			...combined,
+			usage: [{
+				...topUsage,
+				terms
+			}]
+		};
+	}
+	return combined;
 }
 /**
 * Classifies the parsing result into a discriminated union for cleaner handling.

package/dist/facade.js

@@ -284,9 +284,26 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 		completion: constant(false),
 		result: originalParser
 	}));
+	const mainParserIndex = parsers.length - 1;
 	if (parsers.length === 1) return parsers[0];
-	else if (parsers.length === 2) return longestMatch(parsers[0], parsers[1]);
-	else return longestMatch(...parsers);
+	let combined;
+	if (parsers.length === 2) combined = longestMatch(parsers[0], parsers[1]);
+	else combined = longestMatch(...parsers);
+	const topUsage = combined.usage[0];
+	if (topUsage?.type === "exclusive" && mainParserIndex > 0) {
+		const terms = [...topUsage.terms];
+		const [mainTerm] = terms.splice(mainParserIndex, 1);
+		const lenientCount = (helpParsers.helpOption ? 1 : 0) + (versionParsers.versionOption ? 1 : 0);
+		terms.splice(lenientCount, 0, mainTerm);
+		combined = {
+			...combined,
+			usage: [{
+				...topUsage,
+				terms
+			}]
+		};
+	}
+	return combined;
 }
 /**
 * Classifies the parsing result into a discriminated union for cleaner handling.

package/dist/usage.cjs

@@ -194,8 +194,10 @@ function normalizeUsageTerm(term) {
 		const terms = [];
 		for (const usage of term.terms) {
 			const normalized = normalizeUsage(usage);
-			if (normalized.length === 1 && normalized[0].type === "exclusive") for (const subUsage of normalized[0].terms) terms.push(subUsage);
-			else terms.push(normalized);
+			if (normalized.length >= 1 && normalized[0].type === "exclusive") {
+				const rest = normalized.slice(1);
+				for (const subUsage of normalized[0].terms) terms.push([...subUsage, ...rest]);
+			} else terms.push(normalized);
 		}
 		return {
 			type: "exclusive",

package/dist/usage.js

@@ -193,8 +193,10 @@ function normalizeUsageTerm(term) {
 		const terms = [];
 		for (const usage of term.terms) {
 			const normalized = normalizeUsage(usage);
-			if (normalized.length === 1 && normalized[0].type === "exclusive") for (const subUsage of normalized[0].terms) terms.push(subUsage);
-			else terms.push(normalized);
+			if (normalized.length >= 1 && normalized[0].type === "exclusive") {
+				const rest = normalized.slice(1);
+				for (const subUsage of normalized[0].terms) terms.push([...subUsage, ...rest]);
+			} else terms.push(normalized);
 		}
 		return {
 			type: "exclusive",

package/package.json

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