@optique/core 0.6.9-dev.197 → 0.6.10

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright 2025 Hong Minhee
+Copyright 2025–2026 Hong Minhee
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/dist/constructs.cjs

@@ -269,14 +269,17 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		parsers = labelOrParsers;
 		options = maybeParsersOrOptions ?? {};
 	}
-	const parserPairs = Object.entries(parsers);
+	const parserKeys = Reflect.ownKeys(parsers);
+	const parserPairs = parserKeys.map((k) => [k, parsers[k]]);
 	parserPairs.sort(([_, parserA], [__, parserB]) => parserB.priority - parserA.priority);
+	const initialState = {};
+	for (const key of parserKeys) initialState[key] = parsers[key].initialState;
 	return {
 		$valueType: [],
 		$stateType: [],
-		priority: Math.max(...Object.values(parsers).map((p) => p.priority)),
+		priority: Math.max(...parserKeys.map((k) => parsers[k].priority)),
 		usage: parserPairs.flatMap(([_, p]) => p.usage),
-		initialState: Object.fromEntries(Object.entries(parsers).map(([key, parser]) => [key, parser.initialState])),
+		initialState,
 		parse(context) {
 			let error = {
 				consumed: 0,
@@ -342,8 +345,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		},
 		complete(state) {
 			const result = {};
-			for (const field in state) {
-				if (!(field in parsers)) continue;
+			for (const field of parserKeys) {
 				const valueResult = parsers[field].complete(state[field]);
 				if (valueResult.success) result[field] = valueResult.value;
 				else return {

package/dist/constructs.js

@@ -269,14 +269,17 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		parsers = labelOrParsers;
 		options = maybeParsersOrOptions ?? {};
 	}
-	const parserPairs = Object.entries(parsers);
+	const parserKeys = Reflect.ownKeys(parsers);
+	const parserPairs = parserKeys.map((k) => [k, parsers[k]]);
 	parserPairs.sort(([_, parserA], [__, parserB]) => parserB.priority - parserA.priority);
+	const initialState = {};
+	for (const key of parserKeys) initialState[key] = parsers[key].initialState;
 	return {
 		$valueType: [],
 		$stateType: [],
-		priority: Math.max(...Object.values(parsers).map((p) => p.priority)),
+		priority: Math.max(...parserKeys.map((k) => parsers[k].priority)),
 		usage: parserPairs.flatMap(([_, p]) => p.usage),
-		initialState: Object.fromEntries(Object.entries(parsers).map(([key, parser]) => [key, parser.initialState])),
+		initialState,
 		parse(context) {
 			let error = {
 				consumed: 0,
@@ -342,8 +345,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		},
 		complete(state) {
 			const result = {};
-			for (const field in state) {
-				if (!(field in parsers)) continue;
+			for (const field of parserKeys) {
 				const valueResult = parsers[field].complete(state[field]);
 				if (valueResult.success) result[field] = valueResult.value;
 				else return {

package/dist/parser.cjs

@@ -93,6 +93,26 @@ function suggest(parser, args) {
 	return Array.from(parser.suggest(context, prefix));
 }
 /**
+* Recursively searches for a command within nested exclusive usage terms.
+* When the command is found, returns the expanded usage terms for that command.
+*
+* @param term The usage term to search in
+* @param commandName The command name to find
+* @returns The expanded usage terms if found, null otherwise
+*/
+function findCommandInExclusive(term, commandName) {
+	if (term.type !== "exclusive") return null;
+	for (const termGroup of term.terms) {
+		const firstTerm = termGroup[0];
+		if (firstTerm?.type === "command" && firstTerm.name === commandName) return termGroup;
+		if (firstTerm?.type === "exclusive") {
+			const found = findCommandInExclusive(firstTerm, commandName);
+			if (found) return [...found, ...termGroup.slice(1)];
+		}
+	}
+	return null;
+}
+/**
 * Generates a documentation page for a parser based on its current state after
 * attempting to parse the provided arguments. This function is useful for
 * creating help documentation that reflects the current parsing context.
@@ -149,15 +169,14 @@ function getDocPage(parser, args = []) {
 	}
 	if (entries.length > 0) sections.push({ entries });
 	const usage = [...require_usage.normalizeUsage(parser.usage)];
-	for (const arg of args) for (let i = 0; i < usage.length; i++) {
+	let i = 0;
+	for (const arg of args) {
 		const term = usage[i];
-		if (term.type !== "exclusive") continue;
-		for (const termGroup of term.terms) {
-			const firstTerm = termGroup[0];
-			if (firstTerm?.type !== "command" || firstTerm.name !== arg) continue;
-			usage.splice(i, 1, ...termGroup);
-			break;
+		if (usage.length > i && term.type === "exclusive") {
+			const found = findCommandInExclusive(term, arg);
+			if (found) usage.splice(i, 1, ...found);
 		}
+		i++;
 	}
 	return {
 		usage,

package/dist/parser.js

@@ -93,6 +93,26 @@ function suggest(parser, args) {
 	return Array.from(parser.suggest(context, prefix));
 }
 /**
+* Recursively searches for a command within nested exclusive usage terms.
+* When the command is found, returns the expanded usage terms for that command.
+*
+* @param term The usage term to search in
+* @param commandName The command name to find
+* @returns The expanded usage terms if found, null otherwise
+*/
+function findCommandInExclusive(term, commandName) {
+	if (term.type !== "exclusive") return null;
+	for (const termGroup of term.terms) {
+		const firstTerm = termGroup[0];
+		if (firstTerm?.type === "command" && firstTerm.name === commandName) return termGroup;
+		if (firstTerm?.type === "exclusive") {
+			const found = findCommandInExclusive(firstTerm, commandName);
+			if (found) return [...found, ...termGroup.slice(1)];
+		}
+	}
+	return null;
+}
+/**
 * Generates a documentation page for a parser based on its current state after
 * attempting to parse the provided arguments. This function is useful for
 * creating help documentation that reflects the current parsing context.
@@ -149,15 +169,14 @@ function getDocPage(parser, args = []) {
 	}
 	if (entries.length > 0) sections.push({ entries });
 	const usage = [...normalizeUsage(parser.usage)];
-	for (const arg of args) for (let i = 0; i < usage.length; i++) {
+	let i = 0;
+	for (const arg of args) {
 		const term = usage[i];
-		if (term.type !== "exclusive") continue;
-		for (const termGroup of term.terms) {
-			const firstTerm = termGroup[0];
-			if (firstTerm?.type !== "command" || firstTerm.name !== arg) continue;
-			usage.splice(i, 1, ...termGroup);
-			break;
+		if (usage.length > i && term.type === "exclusive") {
+			const found = findCommandInExclusive(term, arg);
+			if (found) usage.splice(i, 1, ...found);
 		}
+		i++;
 	}
 	return {
 		usage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.6.9-dev.197+945d8f0c",
+  "version": "0.6.10",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",