@optique/core 1.1.0 → 1.2.0-dev.2169

package/dist/internal/parser.cjs

@@ -784,13 +784,70 @@ function buildDocPage(parser, context, args, matchedCommandArgIndices) {
 		}
 	}
 	return {
-		usage,
+		usage: revealMatchedCommandUsage(usage, effectiveArgs, commandArgIndices ?? null),
 		sections,
 		...brief != null && { brief: require_message.cloneMessage(brief) },
 		...description != null && { description: require_message.cloneMessage(description) },
 		...footer != null && { footer: require_message.cloneMessage(footer) }
 	};
 }
+function revealMatchedCommandUsage(usage, args, matchedCommandArgIndices) {
+	if (args.length < 1) return usage;
+	const [revealed] = revealMatchedCommandUsageTerms(usage, args, matchedCommandArgIndices, 0);
+	return revealed;
+}
+function revealMatchedCommandUsageTerms(usage, args, matchedCommandArgIndices, argIndex) {
+	const terms = [];
+	let nextArgIndex = argIndex;
+	for (const term of usage) {
+		const [revealed, afterTermArgIndex] = revealMatchedCommandUsageTerm(term, args, matchedCommandArgIndices, nextArgIndex);
+		terms.push(revealed);
+		nextArgIndex = afterTermArgIndex;
+	}
+	return [terms, nextArgIndex];
+}
+function revealMatchedCommandUsageTerm(term, args, matchedCommandArgIndices, argIndex) {
+	if (term.type === "command") {
+		const nextArgIndex = findNextMatchedCommandArgIndex(args, matchedCommandArgIndices, argIndex);
+		if (nextArgIndex < args.length && commandTermMatches(term, args[nextArgIndex])) {
+			const { hidden: _hidden,...revealed } = term;
+			return [revealed, nextArgIndex + 1];
+		}
+		return [term, argIndex];
+	}
+	if (term.type === "sequence") {
+		const [terms, nextArgIndex] = revealMatchedCommandUsageTerms(term.terms, args, matchedCommandArgIndices, argIndex);
+		return [{
+			...term,
+			terms
+		}, nextArgIndex];
+	}
+	if (term.type === "optional" || term.type === "multiple") {
+		const [terms, nextArgIndex] = revealMatchedCommandUsageTerms(term.terms, args, matchedCommandArgIndices, argIndex);
+		return [{
+			...term,
+			terms
+		}, nextArgIndex];
+	}
+	if (term.type === "exclusive") {
+		let maxArgIndex = argIndex;
+		const terms = term.terms.map((branch) => {
+			const [revealed, nextArgIndex] = revealMatchedCommandUsageTerms(branch, args, matchedCommandArgIndices, argIndex);
+			if (nextArgIndex > maxArgIndex) maxArgIndex = nextArgIndex;
+			return revealed;
+		});
+		return [{
+			...term,
+			terms
+		}, maxArgIndex];
+	}
+	return [term, argIndex];
+}
+function findNextMatchedCommandArgIndex(args, matchedCommandArgIndices, start) {
+	if (matchedCommandArgIndices == null) return start;
+	for (let index = start; index < args.length; index++) if (matchedCommandArgIndices.has(index)) return index;
+	return args.length;
+}
 
 //#endregion
 exports.annotationWrapperRequiresSourceBindingKey = annotationWrapperRequiresSourceBindingKey;

package/dist/internal/parser.js

@@ -784,13 +784,70 @@ function buildDocPage(parser, context, args, matchedCommandArgIndices) {
 		}
 	}
 	return {
-		usage,
+		usage: revealMatchedCommandUsage(usage, effectiveArgs, commandArgIndices ?? null),
 		sections,
 		...brief != null && { brief: cloneMessage(brief) },
 		...description != null && { description: cloneMessage(description) },
 		...footer != null && { footer: cloneMessage(footer) }
 	};
 }
+function revealMatchedCommandUsage(usage, args, matchedCommandArgIndices) {
+	if (args.length < 1) return usage;
+	const [revealed] = revealMatchedCommandUsageTerms(usage, args, matchedCommandArgIndices, 0);
+	return revealed;
+}
+function revealMatchedCommandUsageTerms(usage, args, matchedCommandArgIndices, argIndex) {
+	const terms = [];
+	let nextArgIndex = argIndex;
+	for (const term of usage) {
+		const [revealed, afterTermArgIndex] = revealMatchedCommandUsageTerm(term, args, matchedCommandArgIndices, nextArgIndex);
+		terms.push(revealed);
+		nextArgIndex = afterTermArgIndex;
+	}
+	return [terms, nextArgIndex];
+}
+function revealMatchedCommandUsageTerm(term, args, matchedCommandArgIndices, argIndex) {
+	if (term.type === "command") {
+		const nextArgIndex = findNextMatchedCommandArgIndex(args, matchedCommandArgIndices, argIndex);
+		if (nextArgIndex < args.length && commandTermMatches(term, args[nextArgIndex])) {
+			const { hidden: _hidden,...revealed } = term;
+			return [revealed, nextArgIndex + 1];
+		}
+		return [term, argIndex];
+	}
+	if (term.type === "sequence") {
+		const [terms, nextArgIndex] = revealMatchedCommandUsageTerms(term.terms, args, matchedCommandArgIndices, argIndex);
+		return [{
+			...term,
+			terms
+		}, nextArgIndex];
+	}
+	if (term.type === "optional" || term.type === "multiple") {
+		const [terms, nextArgIndex] = revealMatchedCommandUsageTerms(term.terms, args, matchedCommandArgIndices, argIndex);
+		return [{
+			...term,
+			terms
+		}, nextArgIndex];
+	}
+	if (term.type === "exclusive") {
+		let maxArgIndex = argIndex;
+		const terms = term.terms.map((branch) => {
+			const [revealed, nextArgIndex] = revealMatchedCommandUsageTerms(branch, args, matchedCommandArgIndices, argIndex);
+			if (nextArgIndex > maxArgIndex) maxArgIndex = nextArgIndex;
+			return revealed;
+		});
+		return [{
+			...term,
+			terms
+		}, maxArgIndex];
+	}
+	return [term, argIndex];
+}
+function findNextMatchedCommandArgIndex(args, matchedCommandArgIndices, start) {
+	if (matchedCommandArgIndices == null) return start;
+	for (let index = start; index < args.length; index++) if (matchedCommandArgIndices.has(index)) return index;
+	return args.length;
+}
 
 //#endregion
 export { annotationWrapperRequiresSourceBindingKey, composeWrappedSourceMetadata, createParserContext, defineInheritedAnnotationParser, defineSourceBindingOnlyAnnotationCompletionParser, getDelegatingSuggestRuntimeNodes, getDocPage, getDocPageAsync, getDocPageSync, getParserSuggestRuntimeNodes, inheritParentAnnotationsKey, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync, unmatchedNonCliDependencySourceStateMarker };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.1.0",
+  "version": "1.2.0-dev.2169",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -200,7 +200,7 @@
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
-    "@optique/env": "1.1.0"
+    "@optique/env": "1.2.0-dev.2169+209bc0fc"
   },
   "scripts": {
     "build": "tsdown",