@optique/core 1.0.0-dev.465 → 1.0.0-dev.467

package/dist/facade.cjs

@@ -1,6 +1,7 @@
 const require_annotations = require('./annotations.cjs');
 const require_message = require('./message.cjs');
 const require_completion = require('./completion.cjs');
+const require_mode_dispatch = require('./mode-dispatch.cjs');
 const require_usage = require('./usage.cjs');
 const require_constructs = require('./constructs.cjs');
 const require_doc = require('./doc.cjs');
@@ -404,8 +405,7 @@ function handleCompletion(completionArgs, programName, parser, completionParser,
 				sectionOrder
 			}));
 		}
-		if (parser.$mode === "async") return Promise.resolve(callOnError(1));
-		return callOnError(1);
+		return require_mode_dispatch.dispatchByMode(parser.$mode, () => callOnError(1), () => Promise.resolve(callOnError(1)));
 	}
 	const shell = availableShells[shellName];
 	if (!shell) {
@@ -418,25 +418,24 @@ function handleCompletion(completionArgs, programName, parser, completionParser,
 			colors,
 			quotes: !colors
 		}));
-		if (parser.$mode === "async") return Promise.resolve(callOnError(1));
-		return callOnError(1);
+		return require_mode_dispatch.dispatchByMode(parser.$mode, () => callOnError(1), () => Promise.resolve(callOnError(1)));
 	}
 	if (args.length === 0) {
 		const completionArg = isOptionMode ? completionOptionDisplayName ?? "--completion" : completionCommandDisplayName ?? "completion";
 		const script = shell.generateScript(programName, [completionArg, shellName]);
 		stdout(script);
-		if (parser.$mode === "async") return Promise.resolve(callOnCompletion(0));
-		return callOnCompletion(0);
+		return require_mode_dispatch.dispatchByMode(parser.$mode, () => callOnCompletion(0), () => Promise.resolve(callOnCompletion(0)));
 	}
-	if (parser.$mode === "async") return (async () => {
-		const suggestions$1 = await require_parser.suggestAsync(parser, args);
-		for (const chunk of shell.encodeSuggestions(suggestions$1)) stdout(chunk);
+	return require_mode_dispatch.dispatchByMode(parser.$mode, () => {
+		const syncParser = parser;
+		const suggestions = require_parser.suggest(syncParser, args);
+		for (const chunk of shell.encodeSuggestions(suggestions)) stdout(chunk);
+		return callOnCompletion(0);
+	}, async () => {
+		const suggestions = await require_parser.suggestAsync(parser, args);
+		for (const chunk of shell.encodeSuggestions(suggestions)) stdout(chunk);
 		return callOnCompletion(0);
-	})();
-	const syncParser = parser;
-	const suggestions = require_parser.suggest(syncParser, args);
-	for (const chunk of shell.encodeSuggestions(suggestions)) stdout(chunk);
-	return callOnCompletion(0);
+	});
 }
 function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsParam) {
 	const isProgram = typeof programNameOrArgs !== "string";
@@ -479,6 +478,20 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 	const completionCommandConfig = norm(options.completion?.command);
 	const completionOptionConfig = norm(options.completion?.option);
 	const onCompletion = options.completion?.onShow ?? (() => ({}));
+	const onCompletionResult = (code) => {
+		try {
+			return onCompletion(code);
+		} catch {
+			return onCompletion();
+		}
+	};
+	const onErrorResult = (code) => {
+		try {
+			return onError(code);
+		} catch {
+			return onError();
+		}
+	};
 	const helpOptionNames = helpOptionConfig?.names ?? ["--help"];
 	const helpCommandNames = helpCommandConfig?.names ?? ["help"];
 	const versionOptionNames = versionOptionConfig?.names ?? ["--version"];
@@ -510,20 +523,20 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 	};
 	if (options.completion) {
 		const hasHelpOption = helpOptionConfig ? helpOptionNames.some((n) => args.includes(n)) : false;
-		if (completionCommandConfig && args.length >= 1 && completionCommandNames.includes(args[0]) && !hasHelpOption) return handleCompletion(args.slice(1), programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], false, sectionOrder);
+		if (completionCommandConfig && args.length >= 1 && completionCommandNames.includes(args[0]) && !hasHelpOption) return handleCompletion(args.slice(1), programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletionResult, onErrorResult, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], false, sectionOrder);
 		if (completionOptionConfig) for (let i = 0; i < args.length; i++) {
 			const arg = args[i];
 			const equalsMatch = completionOptionNames.find((n) => arg.startsWith(n + "="));
 			if (equalsMatch) {
 				const shell = arg.slice(equalsMatch.length + 1);
 				const completionArgs = args.slice(i + 1);
-				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], true, sectionOrder);
+				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletionResult, onErrorResult, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], true, sectionOrder);
 			}
 			const exactMatch = completionOptionNames.includes(arg);
 			if (exactMatch) {
 				const shell = i + 1 < args.length ? args[i + 1] : "";
 				const completionArgs = i + 1 < args.length ? args.slice(i + 2) : [];
-				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], true, sectionOrder);
+				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletionResult, onErrorResult, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], true, sectionOrder);
 			}
 		}
 	}
@@ -719,11 +732,17 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 			default: throw new RunParserError("Unexpected parse result type");
 		}
 	};
-	if (parser.$mode === "async") return require_parser.parseAsync(augmentedParser, args).then(handleResult);
-	else {
+	const parserMode = parser.$mode;
+	return require_mode_dispatch.dispatchByMode(parserMode, () => {
 		const result = require_parser.parseSync(augmentedParser, args);
-		return handleResult(result);
-	}
+		const handled = handleResult(result);
+		if (handled instanceof Promise) throw new RunParserError("Synchronous parser returned async result.");
+		return handled;
+	}, async () => {
+		const result = await require_parser.parseAsync(augmentedParser, args);
+		const handled = handleResult(result);
+		return handled instanceof Promise ? await handled : handled;
+	});
 }
 /**
 * Runs a synchronous command-line parser with the given options.

package/dist/facade.js

@@ -1,6 +1,7 @@
 import { annotationKey } from "./annotations.js";
 import { commandLine, formatMessage, lineBreak, message, optionName, text, value } from "./message.js";
 import { bash, fish, nu, pwsh, zsh } from "./completion.js";
+import { dispatchByMode } from "./mode-dispatch.js";
 import { formatUsage } from "./usage.js";
 import { group, longestMatch, object } from "./constructs.js";
 import { formatDocPage } from "./doc.js";
@@ -404,8 +405,7 @@ function handleCompletion(completionArgs, programName, parser, completionParser,
 				sectionOrder
 			}));
 		}
-		if (parser.$mode === "async") return Promise.resolve(callOnError(1));
-		return callOnError(1);
+		return dispatchByMode(parser.$mode, () => callOnError(1), () => Promise.resolve(callOnError(1)));
 	}
 	const shell = availableShells[shellName];
 	if (!shell) {
@@ -418,25 +418,24 @@ function handleCompletion(completionArgs, programName, parser, completionParser,
 			colors,
 			quotes: !colors
 		}));
-		if (parser.$mode === "async") return Promise.resolve(callOnError(1));
-		return callOnError(1);
+		return dispatchByMode(parser.$mode, () => callOnError(1), () => Promise.resolve(callOnError(1)));
 	}
 	if (args.length === 0) {
 		const completionArg = isOptionMode ? completionOptionDisplayName ?? "--completion" : completionCommandDisplayName ?? "completion";
 		const script = shell.generateScript(programName, [completionArg, shellName]);
 		stdout(script);
-		if (parser.$mode === "async") return Promise.resolve(callOnCompletion(0));
-		return callOnCompletion(0);
+		return dispatchByMode(parser.$mode, () => callOnCompletion(0), () => Promise.resolve(callOnCompletion(0)));
 	}
-	if (parser.$mode === "async") return (async () => {
-		const suggestions$1 = await suggestAsync(parser, args);
-		for (const chunk of shell.encodeSuggestions(suggestions$1)) stdout(chunk);
+	return dispatchByMode(parser.$mode, () => {
+		const syncParser = parser;
+		const suggestions = suggest(syncParser, args);
+		for (const chunk of shell.encodeSuggestions(suggestions)) stdout(chunk);
+		return callOnCompletion(0);
+	}, async () => {
+		const suggestions = await suggestAsync(parser, args);
+		for (const chunk of shell.encodeSuggestions(suggestions)) stdout(chunk);
 		return callOnCompletion(0);
-	})();
-	const syncParser = parser;
-	const suggestions = suggest(syncParser, args);
-	for (const chunk of shell.encodeSuggestions(suggestions)) stdout(chunk);
-	return callOnCompletion(0);
+	});
 }
 function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsParam) {
 	const isProgram = typeof programNameOrArgs !== "string";
@@ -479,6 +478,20 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 	const completionCommandConfig = norm(options.completion?.command);
 	const completionOptionConfig = norm(options.completion?.option);
 	const onCompletion = options.completion?.onShow ?? (() => ({}));
+	const onCompletionResult = (code) => {
+		try {
+			return onCompletion(code);
+		} catch {
+			return onCompletion();
+		}
+	};
+	const onErrorResult = (code) => {
+		try {
+			return onError(code);
+		} catch {
+			return onError();
+		}
+	};
 	const helpOptionNames = helpOptionConfig?.names ?? ["--help"];
 	const helpCommandNames = helpCommandConfig?.names ?? ["help"];
 	const versionOptionNames = versionOptionConfig?.names ?? ["--version"];
@@ -510,20 +523,20 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 	};
 	if (options.completion) {
 		const hasHelpOption = helpOptionConfig ? helpOptionNames.some((n) => args.includes(n)) : false;
-		if (completionCommandConfig && args.length >= 1 && completionCommandNames.includes(args[0]) && !hasHelpOption) return handleCompletion(args.slice(1), programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], false, sectionOrder);
+		if (completionCommandConfig && args.length >= 1 && completionCommandNames.includes(args[0]) && !hasHelpOption) return handleCompletion(args.slice(1), programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletionResult, onErrorResult, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], false, sectionOrder);
 		if (completionOptionConfig) for (let i = 0; i < args.length; i++) {
 			const arg = args[i];
 			const equalsMatch = completionOptionNames.find((n) => arg.startsWith(n + "="));
 			if (equalsMatch) {
 				const shell = arg.slice(equalsMatch.length + 1);
 				const completionArgs = args.slice(i + 1);
-				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], true, sectionOrder);
+				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletionResult, onErrorResult, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], true, sectionOrder);
 			}
 			const exactMatch = completionOptionNames.includes(arg);
 			if (exactMatch) {
 				const shell = i + 1 < args.length ? args[i + 1] : "";
 				const completionArgs = i + 1 < args.length ? args.slice(i + 2) : [];
-				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], true, sectionOrder);
+				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletionResult, onErrorResult, availableShells, colors, maxWidth, completionCommandNames[0], completionOptionNames[0], true, sectionOrder);
 			}
 		}
 	}
@@ -719,11 +732,17 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 			default: throw new RunParserError("Unexpected parse result type");
 		}
 	};
-	if (parser.$mode === "async") return parseAsync(augmentedParser, args).then(handleResult);
-	else {
+	const parserMode = parser.$mode;
+	return dispatchByMode(parserMode, () => {
 		const result = parseSync(augmentedParser, args);
-		return handleResult(result);
-	}
+		const handled = handleResult(result);
+		if (handled instanceof Promise) throw new RunParserError("Synchronous parser returned async result.");
+		return handled;
+	}, async () => {
+		const result = await parseAsync(augmentedParser, args);
+		const handled = handleResult(result);
+		return handled instanceof Promise ? await handled : handled;
+	});
 }
 /**
 * Runs a synchronous command-line parser with the given options.

package/dist/mode-dispatch.cjs

@@ -19,6 +19,20 @@ function dispatchByMode(mode, syncFn, asyncFn) {
 	return syncFn();
 }
 /**
+* Maps a mode-wrapped value while preserving its execution mode.
+*
+* @param mode The execution mode.
+* @param value The mode-wrapped value to transform.
+* @param mapFn Mapping function applied to the unwrapped value.
+* @returns The mapped value with correct mode wrapping.
+* @internal
+* @since 1.0.0
+*/
+function mapModeValue(mode, value, mapFn) {
+	if (mode === "async") return Promise.resolve(value).then(mapFn);
+	return mapFn(value);
+}
+/**
 * Dispatches iterable to sync or async implementation based on mode.
 *
 * @param mode The execution mode.
@@ -35,4 +49,5 @@ function dispatchIterableByMode(mode, syncFn, asyncFn) {
 
 //#endregion
 exports.dispatchByMode = dispatchByMode;
-exports.dispatchIterableByMode = dispatchIterableByMode;
+exports.dispatchIterableByMode = dispatchIterableByMode;
+exports.mapModeValue = mapModeValue;

package/dist/mode-dispatch.js

@@ -18,6 +18,20 @@ function dispatchByMode(mode, syncFn, asyncFn) {
 	return syncFn();
 }
 /**
+* Maps a mode-wrapped value while preserving its execution mode.
+*
+* @param mode The execution mode.
+* @param value The mode-wrapped value to transform.
+* @param mapFn Mapping function applied to the unwrapped value.
+* @returns The mapped value with correct mode wrapping.
+* @internal
+* @since 1.0.0
+*/
+function mapModeValue(mode, value, mapFn) {
+	if (mode === "async") return Promise.resolve(value).then(mapFn);
+	return mapFn(value);
+}
+/**
 * Dispatches iterable to sync or async implementation based on mode.
 *
 * @param mode The execution mode.
@@ -33,4 +47,4 @@ function dispatchIterableByMode(mode, syncFn, asyncFn) {
 }
 
 //#endregion
-export { dispatchByMode, dispatchIterableByMode };
+export { dispatchByMode, dispatchIterableByMode, mapModeValue };

package/dist/modifiers.cjs

@@ -235,8 +235,7 @@ function withDefault(parser, defaultValue, options) {
 							};
 						}
 					};
-					if (innerResult instanceof Promise) return innerResult.then(handleInnerResult);
-					return handleInnerResult(innerResult);
+					return require_mode_dispatch.mapModeValue(parser.$mode, innerResult, handleInnerResult);
 				}
 				if (require_dependency.isWrappedDependencySource(parser)) try {
 					const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
@@ -293,8 +292,7 @@ function withDefault(parser, defaultValue, options) {
 							};
 						}
 					};
-					if (innerResult instanceof Promise) return innerResult.then(handleInnerResult);
-					return handleInnerResult(innerResult);
+					return require_mode_dispatch.mapModeValue(parser.$mode, innerResult, handleInnerResult);
 				}
 				try {
 					const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
@@ -374,19 +372,10 @@ function withDefault(parser, defaultValue, options) {
 */
 function map(parser, transform) {
 	const complete = (state) => {
-		const res = parser.complete(state);
-		if (res instanceof Promise) return res.then((r) => {
-			if (r.success) return {
-				success: true,
-				value: transform(r.value)
-			};
-			return r;
-		});
-		if (res.success) return {
+		return require_mode_dispatch.mapModeValue(parser.$mode, parser.complete(state), (result) => result.success ? {
 			success: true,
-			value: transform(res.value)
-		};
-		return res;
+			value: transform(result.value)
+		} : result);
 	};
 	const dependencyMarkers = require_dependency.isWrappedDependencySource(parser) ? {
 		[require_dependency.wrappedDependencySourceMarker]: parser[require_dependency.wrappedDependencySourceMarker],

package/dist/modifiers.js

@@ -1,6 +1,6 @@
 import { formatMessage, message, text } from "./message.js";
 import { createDependencySourceState, dependencyId, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue, transformsDependencyValueMarker, wrappedDependencySourceMarker } from "./dependency.js";
-import { dispatchByMode, dispatchIterableByMode } from "./mode-dispatch.js";
+import { dispatchByMode, dispatchIterableByMode, mapModeValue } from "./mode-dispatch.js";
 
 //#region src/modifiers.ts
 /**
@@ -235,8 +235,7 @@ function withDefault(parser, defaultValue, options) {
 							};
 						}
 					};
-					if (innerResult instanceof Promise) return innerResult.then(handleInnerResult);
-					return handleInnerResult(innerResult);
+					return mapModeValue(parser.$mode, innerResult, handleInnerResult);
 				}
 				if (isWrappedDependencySource(parser)) try {
 					const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
@@ -293,8 +292,7 @@ function withDefault(parser, defaultValue, options) {
 							};
 						}
 					};
-					if (innerResult instanceof Promise) return innerResult.then(handleInnerResult);
-					return handleInnerResult(innerResult);
+					return mapModeValue(parser.$mode, innerResult, handleInnerResult);
 				}
 				try {
 					const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
@@ -374,19 +372,10 @@ function withDefault(parser, defaultValue, options) {
 */
 function map(parser, transform) {
 	const complete = (state) => {
-		const res = parser.complete(state);
-		if (res instanceof Promise) return res.then((r) => {
-			if (r.success) return {
-				success: true,
-				value: transform(r.value)
-			};
-			return r;
-		});
-		if (res.success) return {
+		return mapModeValue(parser.$mode, parser.complete(state), (result) => result.success ? {
 			success: true,
-			value: transform(res.value)
-		};
-		return res;
+			value: transform(result.value)
+		} : result);
 	};
 	const dependencyMarkers = isWrappedDependencySource(parser) ? {
 		[wrappedDependencySourceMarker]: parser[wrappedDependencySourceMarker],

package/dist/parser.cjs

@@ -1,5 +1,6 @@
 const require_annotations = require('./annotations.cjs');
 const require_message = require('./message.cjs');
+const require_mode_dispatch = require('./mode-dispatch.cjs');
 const require_usage = require('./usage.cjs');
 const require_constructs = require('./constructs.cjs');
 const require_modifiers = require('./modifiers.cjs');
@@ -138,8 +139,7 @@ async function parseAsync(parser, args, options) {
 * @since 0.10.0 Added optional `options` parameter for annotations support.
 */
 function parse(parser, args, options) {
-	if (parser.$mode === "async") return parseAsync(parser, args, options);
-	return parseSync(parser, args, options);
+	return require_mode_dispatch.dispatchByMode(parser.$mode, () => parseSync(parser, args, options), () => parseAsync(parser, args, options));
 }
 /**
 * Generates command-line suggestions based on current parsing state.
@@ -273,8 +273,7 @@ async function suggestAsync(parser, args, options) {
 * @since 0.10.0 Added optional `options` parameter for annotations support.
 */
 function suggest(parser, args, options) {
-	if (parser.$mode === "async") return suggestAsync(parser, args, options);
-	return suggestSync(parser, args, options);
+	return require_mode_dispatch.dispatchByMode(parser.$mode, () => suggestSync(parser, args, options), () => suggestAsync(parser, args, options));
 }
 /**
 * Recursively searches for a command within nested exclusive usage terms.

package/dist/parser.js

@@ -1,5 +1,6 @@
 import { annotationKey } from "./annotations.js";
 import { message } from "./message.js";
+import { dispatchByMode } from "./mode-dispatch.js";
 import { normalizeUsage } from "./usage.js";
 import { DuplicateOptionError, concat, conditional, group, longestMatch, merge, object, or, tuple } from "./constructs.js";
 import { WithDefaultError, map, multiple, nonEmpty, optional, withDefault } from "./modifiers.js";
@@ -138,8 +139,7 @@ async function parseAsync(parser, args, options) {
 * @since 0.10.0 Added optional `options` parameter for annotations support.
 */
 function parse(parser, args, options) {
-	if (parser.$mode === "async") return parseAsync(parser, args, options);
-	return parseSync(parser, args, options);
+	return dispatchByMode(parser.$mode, () => parseSync(parser, args, options), () => parseAsync(parser, args, options));
 }
 /**
 * Generates command-line suggestions based on current parsing state.
@@ -273,8 +273,7 @@ async function suggestAsync(parser, args, options) {
 * @since 0.10.0 Added optional `options` parameter for annotations support.
 */
 function suggest(parser, args, options) {
-	if (parser.$mode === "async") return suggestAsync(parser, args, options);
-	return suggestSync(parser, args, options);
+	return dispatchByMode(parser.$mode, () => suggestSync(parser, args, options), () => suggestAsync(parser, args, options));
 }
 /**
 * Recursively searches for a command within nested exclusive usage terms.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.465+097d1ac4",
+  "version": "1.0.0-dev.467+6cd2594b",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",