@optique/core 0.7.16-dev.389 → 0.7.17-dev.396

package/dist/constructs.cjs

@@ -882,6 +882,9 @@ function merge(...args) {
 			});
 		},
 		getDocFragments(state, _defaultValue) {
+			let brief;
+			let description;
+			let footer;
 			const fragments = parsers.flatMap((p, i) => {
 				let parserState;
 				if (p.initialState === void 0) {
@@ -895,7 +898,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 = [];
@@ -910,18 +917,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
+				}]
+			};
 		}
 	};
 }
@@ -1116,9 +1133,14 @@ function group(label, parser) {
 				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 initialCommandNames = /* @__PURE__ */ new Set();
+			for (const f of initialFragments.fragments) if (f.type === "entry" && f.term.type === "command") initialCommandNames.add(f.term.name);
+			else if (f.type === "section") {
+				for (const e of f.entries) if (e.term.type === "command") initialCommandNames.add(e.term.name);
+			}
+			const initialHasCommands = initialCommandNames.size > 0;
+			const currentCommandsAreGroupOwn = allEntries.some((e) => e.term.type === "command" && initialCommandNames.has(e.term.name));
+			const applyLabel = !initialHasCommands || currentCommandsAreGroupOwn;
 			const labeledSection = applyLabel ? {
 				title: label,
 				entries: allEntries

package/dist/constructs.js

@@ -882,6 +882,9 @@ function merge(...args) {
 			});
 		},
 		getDocFragments(state, _defaultValue) {
+			let brief;
+			let description;
+			let footer;
 			const fragments = parsers.flatMap((p, i) => {
 				let parserState;
 				if (p.initialState === void 0) {
@@ -895,7 +898,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 = [];
@@ -910,18 +917,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
+				}]
+			};
 		}
 	};
 }
@@ -1116,9 +1133,14 @@ function group(label, parser) {
 				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 initialCommandNames = /* @__PURE__ */ new Set();
+			for (const f of initialFragments.fragments) if (f.type === "entry" && f.term.type === "command") initialCommandNames.add(f.term.name);
+			else if (f.type === "section") {
+				for (const e of f.entries) if (e.term.type === "command") initialCommandNames.add(e.term.name);
+			}
+			const initialHasCommands = initialCommandNames.size > 0;
+			const currentCommandsAreGroupOwn = allEntries.some((e) => e.term.type === "command" && initialCommandNames.has(e.term.name));
+			const applyLabel = !initialHasCommands || currentCommandsAreGroupOwn;
 			const labeledSection = applyLabel ? {
 				title: label,
 				entries: allEntries

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.7.16-dev.389+19027a10",
+  "version": "0.7.17-dev.396+609a7342",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",