@optique/core 1.0.0-dev.561 → 1.0.0-dev.563

package/dist/facade.cjs

@@ -67,6 +67,10 @@ function createVersionParser(commandConfig, optionConfig) {
 		versionOption
 	};
 }
+const metaResultBrand = Symbol("@optique/core/facade/meta");
+function isMetaParseResult(value$1) {
+	return typeof value$1 === "object" && value$1 != null && metaResultBrand in value$1;
+}
 /**
 * Creates completion parsers based on the sub-config.
 */
@@ -163,8 +167,10 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 							...context,
 							buffer: [],
 							state: {
+								[metaResultBrand]: true,
 								help: true,
 								version: false,
+								completion: false,
 								commands,
 								helpFlag: true
 							}
@@ -234,8 +240,10 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 						...context,
 						buffer: [],
 						state: {
+							[metaResultBrand]: true,
 							help: false,
 							version: true,
+							completion: false,
 							versionFlag: true
 						}
 					},
@@ -268,6 +276,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 	}
 	if (versionParsers.versionCommand) {
 		const versionParser = require_constructs.object({
+			[metaResultBrand]: require_primitives.constant(true),
 			help: require_primitives.constant(false),
 			version: require_primitives.constant(true),
 			completion: require_primitives.constant(false),
@@ -278,6 +287,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 	}
 	if (completionParsers.completionCommand) {
 		const completionParser = require_constructs.object({
+			[metaResultBrand]: require_primitives.constant(true),
 			help: require_primitives.constant(false),
 			version: require_primitives.constant(false),
 			completion: require_primitives.constant(true),
@@ -288,6 +298,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 	}
 	if (helpParsers.helpCommand) {
 		const helpParser = require_constructs.object({
+			[metaResultBrand]: require_primitives.constant(true),
 			help: require_primitives.constant(true),
 			version: require_primitives.constant(false),
 			completion: require_primitives.constant(false),
@@ -296,6 +307,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 		parsers.push(groups?.helpCommandGroup ? require_constructs.group(groups.helpCommandGroup, helpParser) : helpParser);
 	}
 	parsers.push(require_constructs.object({
+		[metaResultBrand]: require_primitives.constant(true),
 		help: require_primitives.constant(false),
 		version: require_primitives.constant(false),
 		completion: require_primitives.constant(false),
@@ -332,7 +344,7 @@ function classifyResult(result, args, helpOptionNames, helpCommandNames, version
 		error: result.error
 	};
 	const value$1 = result.value;
-	if (typeof value$1 === "object" && value$1 != null && "help" in value$1 && "version" in value$1) {
+	if (isMetaParseResult(value$1)) {
 		const parsedValue = value$1;
 		const hasVersionOption = versionOptionNames.some((n) => args.includes(n));
 		const hasVersionCommand = args.length > 0 && versionCommandNames.includes(args[0]);
@@ -364,7 +376,7 @@ function classifyResult(result, args, helpOptionNames, helpCommandNames, version
 		};
 		return {
 			type: "success",
-			value: parsedValue.result ?? value$1
+			value: "result" in parsedValue ? parsedValue.result : value$1
 		};
 	}
 	return {
@@ -379,20 +391,8 @@ function classifyResult(result, args, helpOptionNames, helpCommandNames, version
 function handleCompletion(completionArgs, programName, parser, completionParser, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionCommandDisplayName, completionOptionDisplayName, isOptionMode, sectionOrder) {
 	const shellName = completionArgs[0] || "";
 	const args = completionArgs.slice(1);
-	const callOnError = (code) => {
-		try {
-			return onError(code);
-		} catch {
-			return onError();
-		}
-	};
-	const callOnCompletion = (code) => {
-		try {
-			return onCompletion(code);
-		} catch {
-			return onCompletion();
-		}
-	};
+	const callOnError = (code) => onError(code);
+	const callOnCompletion = (code) => onCompletion(code);
 	if (!shellName) {
 		stderr("Error: Missing shell name for completion.\n");
 		if (completionParser) {
@@ -477,20 +477,8 @@ 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 onCompletionResult = (code) => onCompletion(code);
+	const onErrorResult = (code) => onError(code);
 	const helpOptionNames = helpOptionConfig?.names ?? ["--help"];
 	const helpCommandNames = helpCommandConfig?.names ?? ["help"];
 	const versionOptionNames = versionOptionConfig?.names ?? ["--version"];
@@ -553,11 +541,7 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 			case "success": return classified.value;
 			case "version":
 				stdout(versionValue);
-				try {
-					return onVersion(0);
-				} catch {
-					return onVersion();
-				}
+				return onVersion(0);
 			case "completion": throw new RunParserError("Completion should be handled by early return");
 			case "help": {
 				let helpGeneratorParser;
@@ -637,11 +621,7 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 							sectionOrder
 						}));
 					}
-					try {
-						return onHelp(0);
-					} catch {
-						return onHelp();
-					}
+					return onHelp(0);
 				};
 				if (classified.commands.length > 0) {
 					let validationContext = {

package/dist/facade.js

@@ -67,6 +67,10 @@ function createVersionParser(commandConfig, optionConfig) {
 		versionOption
 	};
 }
+const metaResultBrand = Symbol("@optique/core/facade/meta");
+function isMetaParseResult(value$1) {
+	return typeof value$1 === "object" && value$1 != null && metaResultBrand in value$1;
+}
 /**
 * Creates completion parsers based on the sub-config.
 */
@@ -163,8 +167,10 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 							...context,
 							buffer: [],
 							state: {
+								[metaResultBrand]: true,
 								help: true,
 								version: false,
+								completion: false,
 								commands,
 								helpFlag: true
 							}
@@ -234,8 +240,10 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 						...context,
 						buffer: [],
 						state: {
+							[metaResultBrand]: true,
 							help: false,
 							version: true,
+							completion: false,
 							versionFlag: true
 						}
 					},
@@ -268,6 +276,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 	}
 	if (versionParsers.versionCommand) {
 		const versionParser = object({
+			[metaResultBrand]: constant(true),
 			help: constant(false),
 			version: constant(true),
 			completion: constant(false),
@@ -278,6 +287,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 	}
 	if (completionParsers.completionCommand) {
 		const completionParser = object({
+			[metaResultBrand]: constant(true),
 			help: constant(false),
 			version: constant(false),
 			completion: constant(true),
@@ -288,6 +298,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 	}
 	if (helpParsers.helpCommand) {
 		const helpParser = object({
+			[metaResultBrand]: constant(true),
 			help: constant(true),
 			version: constant(false),
 			completion: constant(false),
@@ -296,6 +307,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
 		parsers.push(groups?.helpCommandGroup ? group(groups.helpCommandGroup, helpParser) : helpParser);
 	}
 	parsers.push(object({
+		[metaResultBrand]: constant(true),
 		help: constant(false),
 		version: constant(false),
 		completion: constant(false),
@@ -332,7 +344,7 @@ function classifyResult(result, args, helpOptionNames, helpCommandNames, version
 		error: result.error
 	};
 	const value$1 = result.value;
-	if (typeof value$1 === "object" && value$1 != null && "help" in value$1 && "version" in value$1) {
+	if (isMetaParseResult(value$1)) {
 		const parsedValue = value$1;
 		const hasVersionOption = versionOptionNames.some((n) => args.includes(n));
 		const hasVersionCommand = args.length > 0 && versionCommandNames.includes(args[0]);
@@ -364,7 +376,7 @@ function classifyResult(result, args, helpOptionNames, helpCommandNames, version
 		};
 		return {
 			type: "success",
-			value: parsedValue.result ?? value$1
+			value: "result" in parsedValue ? parsedValue.result : value$1
 		};
 	}
 	return {
@@ -379,20 +391,8 @@ function classifyResult(result, args, helpOptionNames, helpCommandNames, version
 function handleCompletion(completionArgs, programName, parser, completionParser, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionCommandDisplayName, completionOptionDisplayName, isOptionMode, sectionOrder) {
 	const shellName = completionArgs[0] || "";
 	const args = completionArgs.slice(1);
-	const callOnError = (code) => {
-		try {
-			return onError(code);
-		} catch {
-			return onError();
-		}
-	};
-	const callOnCompletion = (code) => {
-		try {
-			return onCompletion(code);
-		} catch {
-			return onCompletion();
-		}
-	};
+	const callOnError = (code) => onError(code);
+	const callOnCompletion = (code) => onCompletion(code);
 	if (!shellName) {
 		stderr("Error: Missing shell name for completion.\n");
 		if (completionParser) {
@@ -477,20 +477,8 @@ 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 onCompletionResult = (code) => onCompletion(code);
+	const onErrorResult = (code) => onError(code);
 	const helpOptionNames = helpOptionConfig?.names ?? ["--help"];
 	const helpCommandNames = helpCommandConfig?.names ?? ["help"];
 	const versionOptionNames = versionOptionConfig?.names ?? ["--version"];
@@ -553,11 +541,7 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 			case "success": return classified.value;
 			case "version":
 				stdout(versionValue);
-				try {
-					return onVersion(0);
-				} catch {
-					return onVersion();
-				}
+				return onVersion(0);
 			case "completion": throw new RunParserError("Completion should be handled by early return");
 			case "help": {
 				let helpGeneratorParser;
@@ -637,11 +621,7 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 							sectionOrder
 						}));
 					}
-					try {
-						return onHelp(0);
-					} catch {
-						return onHelp();
-					}
+					return onHelp(0);
 				};
 				if (classified.commands.length > 0) {
 					let validationContext = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.561+e8cfa7d8",
+  "version": "1.0.0-dev.563+68c9b43a",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",