@optique/core 0.8.12 → 0.8.14

package/dist/constructs.cjs

@@ -838,6 +838,9 @@ function merge(...args) {
 			return require_suggestion.deduplicateSuggestions(suggestions);
 		},
 		getDocFragments(state, _defaultValue) {
+			let brief;
+			let description;
+			let footer;
 			const fragments = parsers.flatMap((p, i) => {
 				let parserState;
 				if (p.initialState === void 0) {
@@ -851,7 +854,11 @@ function merge(...args) {
 					kind: "available",
 					state: state.state
 				};
-				return p.getDocFragments(parserState, void 0).fragments;
+				const docFragments = p.getDocFragments(parserState, void 0);
+				brief ??= docFragments.brief;
+				description ??= docFragments.description;
+				footer ??= docFragments.footer;
+				return docFragments.fragments;
 			});
 			const entries = fragments.filter((f) => f.type === "entry");
 			const sections = [];
@@ -866,18 +873,28 @@ function merge(...args) {
 					entries
 				};
 				sections.push(labeledSection);
-				return { fragments: sections.map((s) => ({
+				return {
+					brief,
+					description,
+					footer,
+					fragments: sections.map((s) => ({
+						...s,
+						type: "section"
+					}))
+				};
+			}
+			return {
+				brief,
+				description,
+				footer,
+				fragments: [...sections.map((s) => ({
 					...s,
 					type: "section"
-				})) };
-			}
-			return { fragments: [...sections.map((s) => ({
-				...s,
-				type: "section"
-			})), {
-				type: "section",
-				entries
-			}] };
+				})), {
+					type: "section",
+					entries
+				}]
+			};
 		}
 	};
 }
@@ -1062,10 +1079,17 @@ function group(label, parser) {
 			for (const fragment of fragments) if (fragment.type === "entry") allEntries.push(fragment);
 			else if (fragment.type === "section") if (fragment.title) titledSections.push(fragment);
 			else allEntries.push(...fragment.entries);
-			const labeledSection = {
+			const initialFragments = parser.getDocFragments({
+				kind: "available",
+				state: parser.initialState
+			}, void 0);
+			const initialHasCommands = initialFragments.fragments.some((f) => f.type === "entry" && f.term.type === "command" || f.type === "section" && f.entries.some((e) => e.term.type === "command"));
+			const currentHasCommands = allEntries.some((e) => e.term.type === "command");
+			const applyLabel = !initialHasCommands || currentHasCommands;
+			const labeledSection = applyLabel ? {
 				title: label,
 				entries: allEntries
-			};
+			} : { entries: allEntries };
 			return {
 				description,
 				fragments: [...titledSections.map((s) => ({

package/dist/constructs.js

@@ -838,6 +838,9 @@ function merge(...args) {
 			return deduplicateSuggestions(suggestions);
 		},
 		getDocFragments(state, _defaultValue) {
+			let brief;
+			let description;
+			let footer;
 			const fragments = parsers.flatMap((p, i) => {
 				let parserState;
 				if (p.initialState === void 0) {
@@ -851,7 +854,11 @@ function merge(...args) {
 					kind: "available",
 					state: state.state
 				};
-				return p.getDocFragments(parserState, void 0).fragments;
+				const docFragments = p.getDocFragments(parserState, void 0);
+				brief ??= docFragments.brief;
+				description ??= docFragments.description;
+				footer ??= docFragments.footer;
+				return docFragments.fragments;
 			});
 			const entries = fragments.filter((f) => f.type === "entry");
 			const sections = [];
@@ -866,18 +873,28 @@ function merge(...args) {
 					entries
 				};
 				sections.push(labeledSection);
-				return { fragments: sections.map((s) => ({
+				return {
+					brief,
+					description,
+					footer,
+					fragments: sections.map((s) => ({
+						...s,
+						type: "section"
+					}))
+				};
+			}
+			return {
+				brief,
+				description,
+				footer,
+				fragments: [...sections.map((s) => ({
 					...s,
 					type: "section"
-				})) };
-			}
-			return { fragments: [...sections.map((s) => ({
-				...s,
-				type: "section"
-			})), {
-				type: "section",
-				entries
-			}] };
+				})), {
+					type: "section",
+					entries
+				}]
+			};
 		}
 	};
 }
@@ -1062,10 +1079,17 @@ function group(label, parser) {
 			for (const fragment of fragments) if (fragment.type === "entry") allEntries.push(fragment);
 			else if (fragment.type === "section") if (fragment.title) titledSections.push(fragment);
 			else allEntries.push(...fragment.entries);
-			const labeledSection = {
+			const initialFragments = parser.getDocFragments({
+				kind: "available",
+				state: parser.initialState
+			}, void 0);
+			const initialHasCommands = initialFragments.fragments.some((f) => f.type === "entry" && f.term.type === "command" || f.type === "section" && f.entries.some((e) => e.term.type === "command"));
+			const currentHasCommands = allEntries.some((e) => e.term.type === "command");
+			const applyLabel = !initialHasCommands || currentHasCommands;
+			const labeledSection = applyLabel ? {
 				title: label,
 				entries: allEntries
-			};
+			} : { entries: allEntries };
 			return {
 				description,
 				fragments: [...titledSections.map((s) => ({

package/dist/usage.cjs

@@ -186,8 +186,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

@@ -185,8 +185,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.8.12",
+  "version": "0.8.14",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",