@optique/core 1.0.0-dev.483 → 1.0.0-dev.488

package/dist/doc.cjs

@@ -27,9 +27,10 @@ function scoreSection(section) {
 /**
 * The default section comparator: command-only sections come first, then
 * mixed sections, then option/argument-only sections.  Untitled sections
-* receive a slight priority boost so the main (untitled) section appears
-* before titled sections of a similar classification.  Sections with the
-* same score preserve their original relative order (stable sort).
+* receive a score bonus of -1 via {@link scoreSection} so that untitled
+* command-only sections naturally sort before titled command-only sections.
+* Sections with the same score preserve their original relative order
+* (stable sort).
 */
 function defaultSectionOrder(a, b) {
 	return scoreSection(a) - scoreSection(b);
@@ -103,8 +104,7 @@ function formatDocPage(programName, page, options = {}) {
 	})).toSorted((a, b) => {
 		const cmp = comparator(a.section, b.section);
 		if (cmp !== 0) return cmp;
-		const titleCmp = (a.section.title == null ? 0 : 1) - (b.section.title == null ? 0 : 1);
-		return titleCmp !== 0 ? titleCmp : a.index - b.index;
+		return a.index - b.index;
 	}).map(({ section }) => section);
 	for (const section of sections) {
 		if (section.entries.length < 1) continue;

package/dist/doc.js

@@ -27,9 +27,10 @@ function scoreSection(section) {
 /**
 * The default section comparator: command-only sections come first, then
 * mixed sections, then option/argument-only sections.  Untitled sections
-* receive a slight priority boost so the main (untitled) section appears
-* before titled sections of a similar classification.  Sections with the
-* same score preserve their original relative order (stable sort).
+* receive a score bonus of -1 via {@link scoreSection} so that untitled
+* command-only sections naturally sort before titled command-only sections.
+* Sections with the same score preserve their original relative order
+* (stable sort).
 */
 function defaultSectionOrder(a, b) {
 	return scoreSection(a) - scoreSection(b);
@@ -103,8 +104,7 @@ function formatDocPage(programName, page, options = {}) {
 	})).toSorted((a, b) => {
 		const cmp = comparator(a.section, b.section);
 		if (cmp !== 0) return cmp;
-		const titleCmp = (a.section.title == null ? 0 : 1) - (b.section.title == null ? 0 : 1);
-		return titleCmp !== 0 ? titleCmp : a.index - b.index;
+		return a.index - b.index;
 	}).map(({ section }) => section);
 	for (const section of sections) {
 		if (section.entries.length < 1) continue;

package/dist/modifiers.cjs

@@ -495,7 +495,6 @@ function multiple(parser, options = {}) {
 			});
 		},
 		suggest(context, prefix) {
-			const innerState = context.state.length > 0 ? context.state.at(-1) : parser.initialState;
 			const selectedValues = /* @__PURE__ */ new Set();
 			for (const s of context.state) {
 				const completed = syncParser.complete(s);
@@ -511,12 +510,12 @@ function multiple(parser, options = {}) {
 			return require_mode_dispatch.dispatchIterableByMode(parser.$mode, function* () {
 				for (const s of syncParser.suggest({
 					...context,
-					state: innerState
+					state: parser.initialState
 				}, prefix)) if (shouldInclude(s)) yield s;
 			}, async function* () {
 				const suggestions = parser.suggest({
 					...context,
-					state: innerState
+					state: parser.initialState
 				}, prefix);
 				for await (const s of suggestions) if (shouldInclude(s)) yield s;
 			});

package/dist/modifiers.js

@@ -495,7 +495,6 @@ function multiple(parser, options = {}) {
 			});
 		},
 		suggest(context, prefix) {
-			const innerState = context.state.length > 0 ? context.state.at(-1) : parser.initialState;
 			const selectedValues = /* @__PURE__ */ new Set();
 			for (const s of context.state) {
 				const completed = syncParser.complete(s);
@@ -511,12 +510,12 @@ function multiple(parser, options = {}) {
 			return dispatchIterableByMode(parser.$mode, function* () {
 				for (const s of syncParser.suggest({
 					...context,
-					state: innerState
+					state: parser.initialState
 				}, prefix)) if (shouldInclude(s)) yield s;
 			}, async function* () {
 				const suggestions = parser.suggest({
 					...context,
-					state: innerState
+					state: parser.initialState
 				}, prefix);
 				for await (const s of suggestions) if (shouldInclude(s)) yield s;
 			});

package/dist/parser.cjs

@@ -387,14 +387,34 @@ function buildDocPage(parser, context, args) {
 		kind: "available",
 		state: context.state
 	}, void 0);
-	const entries = fragments.filter((f) => f.type === "entry");
-	const sections = [];
-	for (const fragment of fragments) {
-		if (fragment.type !== "section") continue;
-		if (fragment.title == null) entries.push(...fragment.entries);
-		else sections.push(fragment);
+	const buildingSections = [];
+	let untitledSection = null;
+	const titledSectionMap = /* @__PURE__ */ new Map();
+	for (const fragment of fragments) if (fragment.type === "entry") {
+		if (untitledSection == null) {
+			untitledSection = { entries: [] };
+			buildingSections.push(untitledSection);
+		}
+		untitledSection.entries.push(fragment);
+	} else if (fragment.type === "section") if (fragment.title == null) {
+		if (untitledSection == null) {
+			untitledSection = { entries: [] };
+			buildingSections.push(untitledSection);
+		}
+		untitledSection.entries.push(...fragment.entries);
+	} else {
+		let section = titledSectionMap.get(fragment.title);
+		if (section == null) {
+			section = {
+				title: fragment.title,
+				entries: []
+			};
+			titledSectionMap.set(fragment.title, section);
+			buildingSections.push(section);
+		}
+		section.entries.push(...fragment.entries);
 	}
-	if (entries.length > 0) sections.push({ entries });
+	const sections = buildingSections;
 	const usage = [...require_usage.normalizeUsage(parser.usage)];
 	let i = 0;
 	for (const arg of args) {

package/dist/parser.js

@@ -387,14 +387,34 @@ function buildDocPage(parser, context, args) {
 		kind: "available",
 		state: context.state
 	}, void 0);
-	const entries = fragments.filter((f) => f.type === "entry");
-	const sections = [];
-	for (const fragment of fragments) {
-		if (fragment.type !== "section") continue;
-		if (fragment.title == null) entries.push(...fragment.entries);
-		else sections.push(fragment);
+	const buildingSections = [];
+	let untitledSection = null;
+	const titledSectionMap = /* @__PURE__ */ new Map();
+	for (const fragment of fragments) if (fragment.type === "entry") {
+		if (untitledSection == null) {
+			untitledSection = { entries: [] };
+			buildingSections.push(untitledSection);
+		}
+		untitledSection.entries.push(fragment);
+	} else if (fragment.type === "section") if (fragment.title == null) {
+		if (untitledSection == null) {
+			untitledSection = { entries: [] };
+			buildingSections.push(untitledSection);
+		}
+		untitledSection.entries.push(...fragment.entries);
+	} else {
+		let section = titledSectionMap.get(fragment.title);
+		if (section == null) {
+			section = {
+				title: fragment.title,
+				entries: []
+			};
+			titledSectionMap.set(fragment.title, section);
+			buildingSections.push(section);
+		}
+		section.entries.push(...fragment.entries);
 	}
-	if (entries.length > 0) sections.push({ entries });
+	const sections = buildingSections;
 	const usage = [...normalizeUsage(parser.usage)];
 	let i = 0;
 	for (const arg of args) {

package/dist/primitives.cjs

@@ -1,5 +1,6 @@
 const require_message = require('./message.cjs');
 const require_dependency = require('./dependency.cjs');
+const require_mode_dispatch = require('./mode-dispatch.cjs');
 const require_usage = require('./usage.cjs');
 const require_suggestion = require('./suggestion.cjs');
 const require_usage_internals = require('./usage-internals.cjs');
@@ -835,6 +836,7 @@ function argument(valueParser, options = {}) {
 			};
 		},
 		suggest(context, prefix) {
+			if (context.state != null) return require_mode_dispatch.dispatchIterableByMode(valueParser.$mode, function* () {}, async function* () {});
 			if (isAsync) return suggestArgumentAsync(valueParser, require_usage.isSuggestionHidden(options.hidden), prefix, context.dependencyRegistry);
 			return suggestArgumentSync(valueParser, require_usage.isSuggestionHidden(options.hidden), prefix, context.dependencyRegistry);
 		},

package/dist/primitives.js

@@ -1,5 +1,6 @@
 import { message, metavar, optionName, optionNames, text, valueSet } from "./message.js";
 import { createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependencyId, getDefaultValuesFunction, getDependencyIds, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, suggestWithDependency } from "./dependency.js";
+import { dispatchIterableByMode } from "./mode-dispatch.js";
 import { extractOptionNames, isDocHidden, isSuggestionHidden } from "./usage.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, findSimilar } from "./suggestion.js";
 import { extractLeadingCommandNames } from "./usage-internals.js";
@@ -835,6 +836,7 @@ function argument(valueParser, options = {}) {
 			};
 		},
 		suggest(context, prefix) {
+			if (context.state != null) return dispatchIterableByMode(valueParser.$mode, function* () {}, async function* () {});
 			if (isAsync) return suggestArgumentAsync(valueParser, isSuggestionHidden(options.hidden), prefix, context.dependencyRegistry);
 			return suggestArgumentSync(valueParser, isSuggestionHidden(options.hidden), prefix, context.dependencyRegistry);
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.483+8c78671b",
+  "version": "1.0.0-dev.488+690cf201",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",