@optique/core 1.0.0-dev.479 → 1.0.0-dev.487

package/dist/facade.cjs

@@ -615,6 +615,35 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 					stderr(`Error: ${errorMessage}`);
 					return onError(1);
 				};
+				const displayHelp = (doc) => {
+					if (doc != null) {
+						const isMetaCommandHelp = requestedCommand != null && completionCommandNames.includes(requestedCommand) || requestedCommand != null && helpCommandNames.includes(requestedCommand) || requestedCommand != null && versionCommandNames.includes(requestedCommand);
+						const isSubcommandHelp = classified.commands.length > 0;
+						const isTopLevel = !isSubcommandHelp;
+						const shouldOverride = !isMetaCommandHelp && !isSubcommandHelp;
+						const augmentedDoc = {
+							...doc,
+							brief: shouldOverride ? brief ?? doc.brief : doc.brief,
+							description: shouldOverride ? description ?? doc.description : doc.description,
+							examples: isTopLevel && !isMetaCommandHelp ? examples ?? doc.examples : void 0,
+							author: isTopLevel && !isMetaCommandHelp ? author ?? doc.author : void 0,
+							bugs: isTopLevel && !isMetaCommandHelp ? bugs ?? doc.bugs : void 0,
+							footer: shouldOverride ? footer ?? doc.footer : doc.footer ?? footer
+						};
+						stdout(require_doc.formatDocPage(programName, augmentedDoc, {
+							colors,
+							maxWidth,
+							showDefault,
+							showChoices,
+							sectionOrder
+						}));
+					}
+					try {
+						return onHelp(0);
+					} catch {
+						return onHelp();
+					}
+				};
 				if (classified.commands.length > 0) {
 					let validationContext = {
 						buffer: [...classified.commands],
@@ -655,35 +684,6 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 					}
 					if (validationResult != null) return reportInvalidHelpCommand(validationResult);
 				}
-				const displayHelp = (doc) => {
-					if (doc != null) {
-						const isMetaCommandHelp = requestedCommand != null && completionCommandNames.includes(requestedCommand) || requestedCommand != null && helpCommandNames.includes(requestedCommand) || requestedCommand != null && versionCommandNames.includes(requestedCommand);
-						const isSubcommandHelp = classified.commands.length > 0;
-						const isTopLevel = !isSubcommandHelp;
-						const shouldOverride = !isMetaCommandHelp && !isSubcommandHelp;
-						const augmentedDoc = {
-							...doc,
-							brief: shouldOverride ? brief ?? doc.brief : doc.brief,
-							description: shouldOverride ? description ?? doc.description : doc.description,
-							examples: isTopLevel && !isMetaCommandHelp ? examples ?? doc.examples : void 0,
-							author: isTopLevel && !isMetaCommandHelp ? author ?? doc.author : void 0,
-							bugs: isTopLevel && !isMetaCommandHelp ? bugs ?? doc.bugs : void 0,
-							footer: shouldOverride ? footer ?? doc.footer : doc.footer ?? footer
-						};
-						stdout(require_doc.formatDocPage(programName, augmentedDoc, {
-							colors,
-							maxWidth,
-							showDefault,
-							showChoices,
-							sectionOrder
-						}));
-					}
-					try {
-						return onHelp(0);
-					} catch {
-						return onHelp();
-					}
-				};
 				const docOrPromise = require_parser.getDocPage(helpGeneratorParser, classified.commands);
 				if (docOrPromise instanceof Promise) return docOrPromise.then(displayHelp);
 				return displayHelp(docOrPromise);

package/dist/facade.js

@@ -615,6 +615,35 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 					stderr(`Error: ${errorMessage}`);
 					return onError(1);
 				};
+				const displayHelp = (doc) => {
+					if (doc != null) {
+						const isMetaCommandHelp = requestedCommand != null && completionCommandNames.includes(requestedCommand) || requestedCommand != null && helpCommandNames.includes(requestedCommand) || requestedCommand != null && versionCommandNames.includes(requestedCommand);
+						const isSubcommandHelp = classified.commands.length > 0;
+						const isTopLevel = !isSubcommandHelp;
+						const shouldOverride = !isMetaCommandHelp && !isSubcommandHelp;
+						const augmentedDoc = {
+							...doc,
+							brief: shouldOverride ? brief ?? doc.brief : doc.brief,
+							description: shouldOverride ? description ?? doc.description : doc.description,
+							examples: isTopLevel && !isMetaCommandHelp ? examples ?? doc.examples : void 0,
+							author: isTopLevel && !isMetaCommandHelp ? author ?? doc.author : void 0,
+							bugs: isTopLevel && !isMetaCommandHelp ? bugs ?? doc.bugs : void 0,
+							footer: shouldOverride ? footer ?? doc.footer : doc.footer ?? footer
+						};
+						stdout(formatDocPage(programName, augmentedDoc, {
+							colors,
+							maxWidth,
+							showDefault,
+							showChoices,
+							sectionOrder
+						}));
+					}
+					try {
+						return onHelp(0);
+					} catch {
+						return onHelp();
+					}
+				};
 				if (classified.commands.length > 0) {
 					let validationContext = {
 						buffer: [...classified.commands],
@@ -655,35 +684,6 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 					}
 					if (validationResult != null) return reportInvalidHelpCommand(validationResult);
 				}
-				const displayHelp = (doc) => {
-					if (doc != null) {
-						const isMetaCommandHelp = requestedCommand != null && completionCommandNames.includes(requestedCommand) || requestedCommand != null && helpCommandNames.includes(requestedCommand) || requestedCommand != null && versionCommandNames.includes(requestedCommand);
-						const isSubcommandHelp = classified.commands.length > 0;
-						const isTopLevel = !isSubcommandHelp;
-						const shouldOverride = !isMetaCommandHelp && !isSubcommandHelp;
-						const augmentedDoc = {
-							...doc,
-							brief: shouldOverride ? brief ?? doc.brief : doc.brief,
-							description: shouldOverride ? description ?? doc.description : doc.description,
-							examples: isTopLevel && !isMetaCommandHelp ? examples ?? doc.examples : void 0,
-							author: isTopLevel && !isMetaCommandHelp ? author ?? doc.author : void 0,
-							bugs: isTopLevel && !isMetaCommandHelp ? bugs ?? doc.bugs : void 0,
-							footer: shouldOverride ? footer ?? doc.footer : doc.footer ?? footer
-						};
-						stdout(formatDocPage(programName, augmentedDoc, {
-							colors,
-							maxWidth,
-							showDefault,
-							showChoices,
-							sectionOrder
-						}));
-					}
-					try {
-						return onHelp(0);
-					} catch {
-						return onHelp();
-					}
-				};
 				const docOrPromise = getDocPage(helpGeneratorParser, classified.commands);
 				if (docOrPromise instanceof Promise) return docOrPromise.then(displayHelp);
 				return displayHelp(docOrPromise);

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/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');
@@ -163,7 +164,8 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, context, prefix)
 			}
 		}
 	} else {
-		if (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/")) {
+		const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
+		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) {
 			for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
 				if (prefix === "-" && optionName$1.length !== 2) continue;
 				yield {
@@ -244,7 +246,8 @@ async function* suggestOptionAsync(optionNames$1, valueParser, hidden, context,
 			}
 		}
 	} else {
-		if (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/")) {
+		const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
+		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) {
 			for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
 				if (prefix === "-" && optionName$1.length !== 2) continue;
 				yield {
@@ -833,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";
@@ -163,7 +164,8 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, context, prefix)
 			}
 		}
 	} else {
-		if (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/")) {
+		const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
+		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) {
 			for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
 				if (prefix === "-" && optionName$1.length !== 2) continue;
 				yield {
@@ -244,7 +246,8 @@ async function* suggestOptionAsync(optionNames$1, valueParser, hidden, context,
 			}
 		}
 	} else {
-		if (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/")) {
+		const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
+		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) {
 			for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
 				if (prefix === "-" && optionName$1.length !== 2) continue;
 				yield {
@@ -833,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.479+a619f71b",
+  "version": "1.0.0-dev.487+3c38bb65",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",