politty 0.4.13 → 0.4.14

package/dist/{runner-CnG-Ncz0.js → runner-DSZw1AsW.js}

@@ -1,5 +1,5 @@
-import { a as getExtractedFields, c as toKebabCase, i as extractFields, r as resolveSubCommandMeta, s as toCamelCase } from "./lazy-xrzxwnru.js";
-import { a as emptyLogs, i as createLogCollector, n as resolveLazyCommand, o as mergeLogs, r as resolveSubcommand, t as listSubCommands } from "./subcommand-router-BhYVuS83.js";
+import { a as getAllAliases, c as toCamelCase, i as extractFields, l as toKebabCase, o as getExtractedFields, r as resolveSubCommandMeta } from "./lazy-DiMJSDMB.js";
+import { a as emptyLogs, i as createLogCollector, n as resolveLazyCommand, o as mergeLogs, r as resolveSubcommand, t as listSubCommands } from "./subcommand-router--EUt6ftA.js";
 import { styleText } from "node:util";
 import stringWidth from "string-width";
 
@@ -630,8 +630,8 @@ function renderOptions(command, descriptions = {}, context) {
 		version: descriptions.version ?? defaultBuiltinDescriptions.version
 	};
 	const extracted = getExtractedFields(command);
-	const hasUserDefinedh = extracted?.fields.some((f) => f.alias === "h" && f.overrideBuiltinAlias === true) ?? false;
-	const hasUserDefinedH = extracted?.fields.some((f) => f.alias === "H" && f.overrideBuiltinAlias === true) ?? false;
+	const hasUserDefinedh = extracted?.fields.some((f) => f.overrideBuiltinAlias === true && getAllAliases(f).includes("h")) ?? false;
+	const hasUserDefinedH = extracted?.fields.some((f) => f.overrideBuiltinAlias === true && getAllAliases(f).includes("H")) ?? false;
 	if (hasUserDefinedh) lines.push(formatOption(styles.option("--help"), desc.help));
 	else lines.push(formatOption(`${styles.option("-h")}, ${styles.option("--help")}`, desc.help));
 	if (hasUserDefinedH) lines.push(formatOption(styles.option("--help-all"), desc.helpAll));
@@ -754,13 +754,25 @@ function renderUnionOptions(extracted, _command, lines) {
 */
 function formatFlags(opt) {
 	const parts = [];
-	if (opt.alias) parts.push(styles.option(`-${opt.alias}`));
+	if (opt.alias) {
+		for (const alias of opt.alias) if (alias.length === 1) parts.push(styles.option(`-${alias}`));
+	}
 	let longFlag = styles.option(`--${opt.cliName}`);
 	if (opt.type !== "boolean") {
 		const placeholder = opt.placeholder ?? opt.cliName.toUpperCase();
 		longFlag += ` ${styles.placeholder(`<${placeholder}>`)}`;
 	}
 	parts.push(longFlag);
+	if (opt.alias) {
+		for (const alias of opt.alias) if (alias.length > 1) {
+			let longAlias = styles.option(`--${alias}`);
+			if (opt.type !== "boolean") {
+				const placeholder = opt.placeholder ?? opt.cliName.toUpperCase();
+				longAlias += ` ${styles.placeholder(`<${placeholder}>`)}`;
+			}
+			parts.push(longAlias);
+		}
+	}
 	return parts.join(", ");
 }
 /**
@@ -1016,22 +1028,36 @@ function checkDuplicateAliases(extracted, commandPath) {
 	const errors = [];
 	const seenAliases = /* @__PURE__ */ new Map();
 	const fieldNames = new Set(extracted.fields.map((f) => f.name));
-	for (const field of extracted.fields) {
-		if (!field.alias) continue;
-		if (fieldNames.has(field.alias)) errors.push({
-			commandPath,
-			type: "duplicate_alias",
-			message: `Alias "${field.alias}" for field "${field.name}" conflicts with existing field name "${field.alias}".`,
-			field: field.name
-		});
-		const existingField = seenAliases.get(field.alias);
-		if (existingField) errors.push({
+	const cliNames = new Set(extracted.fields.map((f) => f.cliName));
+	const registerAlias = (alias, fieldName, isDerived) => {
+		if (fieldNames.has(alias) || cliNames.has(alias)) errors.push({
 			commandPath,
 			type: "duplicate_alias",
-			message: `Duplicate alias "${field.alias}" detected. Both "${existingField}" and "${field.name}" use the same alias.`,
-			field: field.name
+			message: `Alias "${alias}" for field "${fieldName}" conflicts with existing field name or CLI name "${alias}".`,
+			field: fieldName
 		});
-		seenAliases.set(field.alias, field.name);
+		const existingField = seenAliases.get(alias);
+		if (existingField && existingField !== fieldName) {
+			const qualifier = isDerived ? " (derived camelCase variant)" : "";
+			errors.push({
+				commandPath,
+				type: "duplicate_alias",
+				message: `Duplicate alias "${alias}"${qualifier} detected. Both "${existingField}" and "${fieldName}" use the same alias.`,
+				field: fieldName
+			});
+		}
+		seenAliases.set(alias, fieldName);
+	};
+	for (const field of extracted.fields) {
+		const allAliases = getAllAliases(field);
+		if (allAliases.length === 0) continue;
+		for (const alias of allAliases) {
+			registerAlias(alias, field.name, false);
+			if (alias.length > 1 && alias.includes("-")) {
+				const camelVariant = toCamelCase(alias);
+				if (camelVariant !== alias && !fieldNames.has(camelVariant)) registerAlias(camelVariant, field.name, true);
+			}
+		}
 	}
 	return errors;
 }
@@ -1072,12 +1098,15 @@ function checkPositionalConfig(extracted, commandPath) {
 */
 function checkReservedAliases(extracted, commandPath) {
 	const errors = [];
-	for (const field of extracted.fields) if ((field.alias === "h" || field.alias === "H") && field.overrideBuiltinAlias !== true) errors.push({
-		commandPath,
-		type: "reserved_alias",
-		message: `Alias "${field.alias}" is reserved for --${field.alias === "h" ? "help" : "help-all"}.`,
-		field: field.name
-	});
+	for (const field of extracted.fields) {
+		if (field.overrideBuiltinAlias === true) continue;
+		for (const alias of getAllAliases(field)) if (alias === "h" || alias === "H") errors.push({
+			commandPath,
+			type: "reserved_alias",
+			message: `Alias "${alias}" is reserved for --${alias === "h" ? "help" : "help-all"}.`,
+			field: field.name
+		});
+	}
 	return errors;
 }
 /**
@@ -1141,8 +1170,9 @@ function validateReservedAliases(extracted, _hasSubCommands) {
 	const errors = checkReservedAliases(extracted, []);
 	if (errors.length > 0) {
 		const field = errors[0].field ?? "unknown";
-		const alias = extracted.fields.find((f) => f.name === field)?.alias ?? "h";
-		throw new ReservedAliasError(`Alias "${alias}" is reserved for --${alias === "h" ? "help" : "help-all"}. To override this, set { alias: "${alias}", overrideBuiltinAlias: true } for "${field}".`);
+		const found = extracted.fields.find((f) => f.name === field);
+		const alias = (found ? getAllAliases(found) : []).find((a) => a === "h" || a === "H") ?? "h";
+		throw new ReservedAliasError(`Alias "${alias}" is reserved for --${alias === "h" ? "help" : "help-all"}. To override this, set { overrideBuiltinAlias: true } for "${field}" and keep the alias where it is currently defined (in alias or hiddenAlias).`);
 	}
 }
 /**
@@ -1387,7 +1417,13 @@ function buildParserOptions(extracted) {
 	for (const field of extracted.fields) definedNames.add(field.name);
 	for (const field of extracted.fields) {
 		if (field.cliName !== field.name) aliasMap.set(field.cliName, field.name);
-		if (field.alias) aliasMap.set(field.alias, field.name);
+		for (const alias of getAllAliases(field)) {
+			aliasMap.set(alias, field.name);
+			if (alias.length > 1 && alias.includes("-")) {
+				const camelAlias = toCamelCase(alias);
+				if (camelAlias !== alias && !definedNames.has(camelAlias) && !aliasMap.has(camelAlias)) aliasMap.set(camelAlias, field.name);
+			}
+		}
 		const camelVariant = toCamelCase(field.name);
 		if (camelVariant !== field.name && !definedNames.has(camelVariant) && !aliasMap.has(camelVariant)) aliasMap.set(camelVariant, field.name);
 		if (field.type === "boolean") booleanFlags.add(field.name);
@@ -1429,12 +1465,14 @@ function mergeWithPositionals(parsed, extracted) {
 */
 function buildGlobalFlagLookup(globalExtracted) {
 	const { aliasMap = /* @__PURE__ */ new Map(), booleanFlags = /* @__PURE__ */ new Set() } = buildParserOptions(globalExtracted);
+	const shortAliases = /* @__PURE__ */ new Set();
+	for (const field of globalExtracted.fields) for (const alias of getAllAliases(field)) if (alias.length === 1) shortAliases.add(alias);
 	return {
 		aliasMap,
 		booleanFlags,
 		flagNames: new Set(globalExtracted.fields.map((f) => f.name)),
 		cliNames: new Set(globalExtracted.fields.map((f) => f.cliName)),
-		aliases: new Set(globalExtracted.fields.filter((f) => f.alias).map((f) => f.alias))
+		aliases: shortAliases
 	};
 }
 /**
@@ -1620,8 +1658,8 @@ function parseArgs(argv, command, options = {}) {
 			if (options.globalExtracted) validateCrossSchemaCollisions(options.globalExtracted, extracted);
 		}
 	}
-	const hasUserDefinedH = extracted?.fields.some((f) => f.alias === "H" && f.overrideBuiltinAlias === true) ?? false;
-	const hasUserDefinedh = extracted?.fields.some((f) => f.alias === "h" && f.overrideBuiltinAlias === true) ?? false;
+	const hasUserDefinedH = extracted?.fields.some((f) => f.overrideBuiltinAlias === true && getAllAliases(f).includes("H")) ?? false;
+	const hasUserDefinedh = extracted?.fields.some((f) => f.overrideBuiltinAlias === true && getAllAliases(f).includes("h")) ?? false;
 	const helpAllRequested = argv.includes("--help-all") || !hasUserDefinedH && argv.includes("-H");
 	const helpRequested = !helpAllRequested && (argv.includes("--help") || !hasUserDefinedh && argv.includes("-h"));
 	const versionRequested = argv.includes("--version");
@@ -1668,11 +1706,12 @@ function parseArgs(argv, command, options = {}) {
 	}
 	const knownFlags = new Set(extracted.fields.map((f) => f.name));
 	const knownCliNames = new Set(extracted.fields.map((f) => f.cliName));
-	const knownAliases = new Set(extracted.fields.filter((f) => f.alias).map((f) => f.alias));
+	const knownAliases = /* @__PURE__ */ new Set();
+	for (const f of extracted.fields) for (const alias of getAllAliases(f)) knownAliases.add(alias);
 	if (options.globalExtracted) for (const f of options.globalExtracted.fields) {
 		knownFlags.add(f.name);
 		knownCliNames.add(f.cliName);
-		if (f.alias) knownAliases.add(f.alias);
+		for (const alias of getAllAliases(f)) knownAliases.add(alias);
 	}
 	const unknownFlags = [];
 	for (const key of Object.keys(parsed.options)) if (!knownFlags.has(key) && !knownCliNames.has(key) && !knownAliases.has(key)) unknownFlags.push(key);
@@ -1710,8 +1749,9 @@ function parseGlobalArgs(tokens, globalExtracted) {
 */
 function separateGlobalArgs(argv, globalExtracted, localExtracted) {
 	const lookup = buildGlobalFlagLookup(globalExtracted);
+	const localFieldNames = new Set(localExtracted?.fields.map((f) => f.name) ?? []);
 	const localCliNames = new Set(localExtracted?.fields.map((f) => f.cliName) ?? []);
-	const localAliases = new Set(localExtracted?.fields.filter((f) => f.alias).map((f) => f.alias) ?? []);
+	const localAliasMapKeys = localExtracted ? new Set(buildParserOptions(localExtracted).aliasMap?.keys() ?? []) : /* @__PURE__ */ new Set();
 	const globalTokens = [];
 	const commandTokens = [];
 	for (let i = 0; i < argv.length; i++) {
@@ -1723,7 +1763,7 @@ function separateGlobalArgs(argv, globalExtracted, localExtracted) {
 		if (arg.startsWith("--")) {
 			const { resolvedName, withoutDashes, isNegated, isGlobal } = resolveGlobalLongOption(arg, lookup);
 			const flagName = isNegated ? withoutDashes.slice(3) : withoutDashes;
-			const isLocalCollision = localCliNames.has(withoutDashes) || localCliNames.has(flagName);
+			const isLocalCollision = localFieldNames.has(withoutDashes) || localFieldNames.has(flagName) || localCliNames.has(withoutDashes) || localCliNames.has(flagName) || localAliasMapKeys.has(withoutDashes) || localAliasMapKeys.has(flagName);
 			if (isGlobal && !isLocalCollision) {
 				i += collectGlobalFlag(argv, i, resolvedName, isNegated, lookup.booleanFlags, globalTokens) - 1;
 				continue;
@@ -1732,7 +1772,7 @@ function separateGlobalArgs(argv, globalExtracted, localExtracted) {
 			const withoutDash = arg.includes("=") ? arg.slice(1, arg.indexOf("=")) : arg.slice(1);
 			if (withoutDash.length === 1) {
 				const resolvedName = lookup.aliasMap.get(withoutDash) ?? withoutDash;
-				if ((lookup.aliases.has(withoutDash) || lookup.flagNames.has(resolvedName)) && !localAliases.has(withoutDash)) {
+				if ((lookup.aliases.has(withoutDash) || lookup.flagNames.has(resolvedName)) && !localAliasMapKeys.has(withoutDash)) {
 					i += collectGlobalFlag(argv, i, resolvedName, false, lookup.booleanFlags, globalTokens) - 1;
 					continue;
 				}
@@ -2235,4 +2275,4 @@ function extractAndValidateGlobal(options) {
 
 //#endregion
 export { logger as C, createDualCaseProxy as D, symbols as E, isColorEnabled as S, styles as T, PositionalConfigError as _, parseArgv as a, renderInline as b, validateCommand as c, validateDuplicateFields as d, validatePositionalConfig as f, DuplicateFieldError as g, DuplicateAliasError as h, formatValidationErrors as i, validateCrossSchemaCollisions as l, CaseVariantCollisionError as m, runMain as n, formatCommandValidationErrors as o, validateReservedAliases as p, runner_exports as r, validateCaseVariantCollisions as s, runCommand as t, validateDuplicateAliases as u, ReservedAliasError as v, setColorEnabled as w, renderMarkdown as x, generateHelp as y };
-//# sourceMappingURL=runner-CnG-Ncz0.js.map
+//# sourceMappingURL=runner-DSZw1AsW.js.map