@optique/core 1.2.2 → 1.2.3

package/dist/constructs.cjs

@@ -1529,6 +1529,33 @@ function createLongestMatch(...args) {
 	return require_modifiers.fluent(multiResult);
 }
 /**
+* Creates the initial parse error shared by object-like combinators.
+* @param context The current parser context.
+* @param noMatchContext The kinds of input accepted by the combinator.
+* @param errors Optional custom error formatters.
+* @returns A zero-consumption parse error.
+*/
+function createObjectLikeInitialError(context, noMatchContext, errors) {
+	if (context.buffer.length < 1) {
+		const customEndOfInput = errors?.endOfInput;
+		return {
+			consumed: 0,
+			error: customEndOfInput ? typeof customEndOfInput === "function" ? customEndOfInput(noMatchContext) : customEndOfInput : generateNoMatchError(noMatchContext)
+		};
+	}
+	const token = context.buffer[0];
+	const customMessage = errors?.unexpectedInput;
+	if (customMessage) return {
+		consumed: 0,
+		error: typeof customMessage === "function" ? customMessage(token) : customMessage
+	};
+	const baseError = require_message.message`Unexpected option or argument: ${token}.`;
+	return {
+		consumed: 0,
+		error: require_suggestion.createErrorWithSuggestions(baseError, token, context.usage, "both", errors?.suggestions)
+	};
+}
+/**
 * Internal sync helper for object suggest functionality.
 * @internal
 */
@@ -1921,19 +1948,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	checkDuplicateReachableLeadingCommandNames(parserPairs.map(([field, parser]) => [field, parser]));
 	const noMatchContext = analyzeNoMatchContext(parserKeys.map((k) => parsers[k]));
 	const combinedMode = parserKeys.some((k) => parsers[k].mode === "async") ? "async" : "sync";
-	const getInitialError = (context) => ({
-		consumed: 0,
-		error: context.buffer.length > 0 ? (() => {
-			const token = context.buffer[0];
-			const customMessage = options.errors?.unexpectedInput;
-			if (customMessage) return typeof customMessage === "function" ? customMessage(token) : customMessage;
-			const baseError = require_message.message`Unexpected option or argument: ${token}.`;
-			return require_suggestion.createErrorWithSuggestions(baseError, token, context.usage, "both", options.errors?.suggestions);
-		})() : (() => {
-			const customEndOfInput = options.errors?.endOfInput;
-			return customEndOfInput ? typeof customEndOfInput === "function" ? customEndOfInput(noMatchContext) : customEndOfInput : generateNoMatchError(noMatchContext);
-		})()
-	});
+	const getInitialError = (context) => createObjectLikeInitialError(context, noMatchContext, options.errors);
 	const parseSync = (context) => {
 		let error = getInitialError(context);
 		let currentContext = context;
@@ -3803,6 +3818,7 @@ function merge(...args) {
 	const syncParsers = syncSorted.map(([p]) => p);
 	if (!options.allowDuplicates) checkDuplicateOptionNames(sorted.map(([parser, originalIndex]) => [String(originalIndex), parser.usage]));
 	checkDuplicateReachableLeadingCommandNames(sorted.map(([parser, originalIndex]) => [String(originalIndex), parser]));
+	const noMatchContext = analyzeNoMatchContext(rawParsers);
 	const mergedFieldParsers = collectChildFieldParsers(parsers);
 	const duplicateOutputFieldNames = collectDuplicateFieldNames(mergedFieldParsers);
 	const parserStateKey = (index) => `__parser_${index}`;
@@ -3896,8 +3912,7 @@ function merge(...args) {
 		};
 		return {
 			success: false,
-			consumed: 0,
-			error: require_message.message`No matching option or argument found.`
+			...createObjectLikeInitialError(context, noMatchContext)
 		};
 	};
 	const parseAsync = async (context) => {
@@ -3942,8 +3957,7 @@ function merge(...args) {
 		};
 		return {
 			success: false,
-			consumed: 0,
-			error: require_message.message`No matching option or argument found.`
+			...createObjectLikeInitialError(context, noMatchContext)
 		};
 	};
 	const mergeParser = {

package/dist/constructs.js

@@ -1529,6 +1529,33 @@ function createLongestMatch(...args) {
 	return fluent(multiResult);
 }
 /**
+* Creates the initial parse error shared by object-like combinators.
+* @param context The current parser context.
+* @param noMatchContext The kinds of input accepted by the combinator.
+* @param errors Optional custom error formatters.
+* @returns A zero-consumption parse error.
+*/
+function createObjectLikeInitialError(context, noMatchContext, errors) {
+	if (context.buffer.length < 1) {
+		const customEndOfInput = errors?.endOfInput;
+		return {
+			consumed: 0,
+			error: customEndOfInput ? typeof customEndOfInput === "function" ? customEndOfInput(noMatchContext) : customEndOfInput : generateNoMatchError(noMatchContext)
+		};
+	}
+	const token = context.buffer[0];
+	const customMessage = errors?.unexpectedInput;
+	if (customMessage) return {
+		consumed: 0,
+		error: typeof customMessage === "function" ? customMessage(token) : customMessage
+	};
+	const baseError = message`Unexpected option or argument: ${token}.`;
+	return {
+		consumed: 0,
+		error: createErrorWithSuggestions(baseError, token, context.usage, "both", errors?.suggestions)
+	};
+}
+/**
 * Internal sync helper for object suggest functionality.
 * @internal
 */
@@ -1921,19 +1948,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	checkDuplicateReachableLeadingCommandNames(parserPairs.map(([field, parser]) => [field, parser]));
 	const noMatchContext = analyzeNoMatchContext(parserKeys.map((k) => parsers[k]));
 	const combinedMode = parserKeys.some((k) => parsers[k].mode === "async") ? "async" : "sync";
-	const getInitialError = (context) => ({
-		consumed: 0,
-		error: context.buffer.length > 0 ? (() => {
-			const token = context.buffer[0];
-			const customMessage = options.errors?.unexpectedInput;
-			if (customMessage) return typeof customMessage === "function" ? customMessage(token) : customMessage;
-			const baseError = message`Unexpected option or argument: ${token}.`;
-			return createErrorWithSuggestions(baseError, token, context.usage, "both", options.errors?.suggestions);
-		})() : (() => {
-			const customEndOfInput = options.errors?.endOfInput;
-			return customEndOfInput ? typeof customEndOfInput === "function" ? customEndOfInput(noMatchContext) : customEndOfInput : generateNoMatchError(noMatchContext);
-		})()
-	});
+	const getInitialError = (context) => createObjectLikeInitialError(context, noMatchContext, options.errors);
 	const parseSync = (context) => {
 		let error = getInitialError(context);
 		let currentContext = context;
@@ -3803,6 +3818,7 @@ function merge(...args) {
 	const syncParsers = syncSorted.map(([p]) => p);
 	if (!options.allowDuplicates) checkDuplicateOptionNames(sorted.map(([parser, originalIndex]) => [String(originalIndex), parser.usage]));
 	checkDuplicateReachableLeadingCommandNames(sorted.map(([parser, originalIndex]) => [String(originalIndex), parser]));
+	const noMatchContext = analyzeNoMatchContext(rawParsers);
 	const mergedFieldParsers = collectChildFieldParsers(parsers);
 	const duplicateOutputFieldNames = collectDuplicateFieldNames(mergedFieldParsers);
 	const parserStateKey = (index) => `__parser_${index}`;
@@ -3896,8 +3912,7 @@ function merge(...args) {
 		};
 		return {
 			success: false,
-			consumed: 0,
-			error: message`No matching option or argument found.`
+			...createObjectLikeInitialError(context, noMatchContext)
 		};
 	};
 	const parseAsync = async (context) => {
@@ -3942,8 +3957,7 @@ function merge(...args) {
 		};
 		return {
 			success: false,
-			consumed: 0,
-			error: message`No matching option or argument found.`
+			...createObjectLikeInitialError(context, noMatchContext)
 		};
 	};
 	const mergeParser = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -225,7 +225,7 @@
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
-    "@optique/env": "1.2.2"
+    "@optique/env": "1.2.3"
   },
   "scripts": {
     "build": "tsdown",