@optique/core 1.3.0-dev.2540 → 1.3.0-dev.2554

package/dist/usage.cjs

@@ -196,8 +196,8 @@ function formatUsage(programName, usage, options = {}) {
 		if (usage.length > 0 && usage.slice(0, -1).every((t) => t.type === "command") && lastTerm.type === "exclusive" && lastTerm.terms.every((t) => t.length > 0 && (t[0].type === "command" || t[0].type === "option" || t[0].type === "argument" || t[0].type === "optional" && t[0].terms.length === 1 && (t[0].terms[0].type === "command" || t[0].terms[0].type === "option" || t[0].terms[0].type === "argument")))) {
 			const lines = [];
 			for (let command of lastTerm.terms) {
-				const firstTerm = command[0];
-				if (firstTerm?.type === "command" && isUsageHidden(firstTerm.hidden)) continue;
+				const firstTerm$1 = command[0];
+				if (firstTerm$1?.type === "command" && isUsageHidden(firstTerm$1.hidden)) continue;
 				if (usage.length > 1) command = [...usage.slice(0, -1), ...command];
 				lines.push(formatUsage(programName, command, options));
 			}
@@ -208,10 +208,13 @@ function formatUsage(programName, usage, options = {}) {
 		type: "programName",
 		programName
 	}, options.theme)), options);
-	const terms = [...formatUsageTerms(usage, options)];
+	const terms = [...normalizeUsageSeparators(formatUsageTerms(usage, options))];
 	if (terms.length === 0) return require_terminal_internal.serializeTokens(programTokens, options.colors);
 	const width = programTokens.reduce((n, token) => token.width === -1 ? 0 : n + token.width, 0);
-	const separator = options.maxWidth != null && width + 1 + terms[0].width > options.maxWidth ? {
+	const firstTerm = terms.find((token) => token.text !== "");
+	const lastProgram = programTokens.findLast((token) => token.text !== "");
+	if (lastProgram == null || firstTerm == null || lastProgram.width === -1 || firstTerm.width === -1) return require_terminal_internal.serializeTokens(programTokens, options.colors) + wrapUsageTokens(terms, options, width);
+	const separator = options.maxWidth != null && width + 1 + firstTerm.width > options.maxWidth ? {
 		text: "\n",
 		width: -1,
 		scopes: []
@@ -456,7 +459,8 @@ function* formatUsageTerms(terms, options) {
 		if (i > 0) yield {
 			text: " ",
 			width: 1,
-			scopes: []
+			scopes: [],
+			separator: true
 		};
 		yield* formatUsageTermInternal(t, options);
 		i++;
@@ -486,11 +490,37 @@ function formatUsageTerm(term, options = {}) {
 function wrapUsageTokens(input, options, initialWidth = 0) {
 	return require_terminal_internal.serializeTokens(layoutUsageTokens(input, options, initialWidth), options.colors);
 }
+/** Keeps one layout-owned space between nonempty outputs on the same line. */
+function* normalizeUsageSeparators(input) {
+	let previous;
+	let pending = [];
+	for (const token of input) {
+		if (token.separator || token.text === "") {
+			pending.push(token);
+			continue;
+		}
+		let separated = false;
+		for (const item of pending) if (!item.separator) yield item;
+		else if (!separated && previous != null && previous.width !== -1 && token.width !== -1) {
+			yield item;
+			separated = true;
+		}
+		pending = [];
+		yield token;
+		previous = token;
+	}
+	for (const item of pending) if (!item.separator) yield item;
+}
 function layoutUsageTokens(input, options, initialWidth = 0) {
 	let lineWidth = initialWidth;
 	const output = [];
-	for (const token of input) {
-		if (options.maxWidth != null && lineWidth > 0 && lineWidth + token.width > options.maxWidth) {
+	for (const token of normalizeUsageSeparators(input)) {
+		if (token.width === -1) {
+			output.push(token);
+			lineWidth = 0;
+			continue;
+		}
+		if (options.maxWidth != null && lineWidth > 0 && token.width > 0 && lineWidth + token.width > options.maxWidth) {
 			const last = output.at(-1);
 			if (last?.text.endsWith(" ") && (!options.colors || last.scopes.length === 0)) output[output.length - 1] = {
 				...last,
@@ -524,7 +554,8 @@ function* formatUsageTermInternal(term, options) {
 	const space = {
 		text: " ",
 		width: 1,
-		scopes: []
+		scopes: [],
+		separator: true
 	};
 	if (term.type === "argument") yield* leaf({
 		type: "metavar",

package/dist/usage.js

@@ -196,8 +196,8 @@ function formatUsage(programName, usage, options = {}) {
 		if (usage.length > 0 && usage.slice(0, -1).every((t) => t.type === "command") && lastTerm.type === "exclusive" && lastTerm.terms.every((t) => t.length > 0 && (t[0].type === "command" || t[0].type === "option" || t[0].type === "argument" || t[0].type === "optional" && t[0].terms.length === 1 && (t[0].terms[0].type === "command" || t[0].terms[0].type === "option" || t[0].terms[0].type === "argument")))) {
 			const lines = [];
 			for (let command of lastTerm.terms) {
-				const firstTerm = command[0];
-				if (firstTerm?.type === "command" && isUsageHidden(firstTerm.hidden)) continue;
+				const firstTerm$1 = command[0];
+				if (firstTerm$1?.type === "command" && isUsageHidden(firstTerm$1.hidden)) continue;
 				if (usage.length > 1) command = [...usage.slice(0, -1), ...command];
 				lines.push(formatUsage(programName, command, options));
 			}
@@ -208,10 +208,13 @@ function formatUsage(programName, usage, options = {}) {
 		type: "programName",
 		programName
 	}, options.theme)), options);
-	const terms = [...formatUsageTerms(usage, options)];
+	const terms = [...normalizeUsageSeparators(formatUsageTerms(usage, options))];
 	if (terms.length === 0) return serializeTokens(programTokens, options.colors);
 	const width = programTokens.reduce((n, token) => token.width === -1 ? 0 : n + token.width, 0);
-	const separator = options.maxWidth != null && width + 1 + terms[0].width > options.maxWidth ? {
+	const firstTerm = terms.find((token) => token.text !== "");
+	const lastProgram = programTokens.findLast((token) => token.text !== "");
+	if (lastProgram == null || firstTerm == null || lastProgram.width === -1 || firstTerm.width === -1) return serializeTokens(programTokens, options.colors) + wrapUsageTokens(terms, options, width);
+	const separator = options.maxWidth != null && width + 1 + firstTerm.width > options.maxWidth ? {
 		text: "\n",
 		width: -1,
 		scopes: []
@@ -456,7 +459,8 @@ function* formatUsageTerms(terms, options) {
 		if (i > 0) yield {
 			text: " ",
 			width: 1,
-			scopes: []
+			scopes: [],
+			separator: true
 		};
 		yield* formatUsageTermInternal(t, options);
 		i++;
@@ -486,11 +490,37 @@ function formatUsageTerm(term, options = {}) {
 function wrapUsageTokens(input, options, initialWidth = 0) {
 	return serializeTokens(layoutUsageTokens(input, options, initialWidth), options.colors);
 }
+/** Keeps one layout-owned space between nonempty outputs on the same line. */
+function* normalizeUsageSeparators(input) {
+	let previous;
+	let pending = [];
+	for (const token of input) {
+		if (token.separator || token.text === "") {
+			pending.push(token);
+			continue;
+		}
+		let separated = false;
+		for (const item of pending) if (!item.separator) yield item;
+		else if (!separated && previous != null && previous.width !== -1 && token.width !== -1) {
+			yield item;
+			separated = true;
+		}
+		pending = [];
+		yield token;
+		previous = token;
+	}
+	for (const item of pending) if (!item.separator) yield item;
+}
 function layoutUsageTokens(input, options, initialWidth = 0) {
 	let lineWidth = initialWidth;
 	const output = [];
-	for (const token of input) {
-		if (options.maxWidth != null && lineWidth > 0 && lineWidth + token.width > options.maxWidth) {
+	for (const token of normalizeUsageSeparators(input)) {
+		if (token.width === -1) {
+			output.push(token);
+			lineWidth = 0;
+			continue;
+		}
+		if (options.maxWidth != null && lineWidth > 0 && token.width > 0 && lineWidth + token.width > options.maxWidth) {
 			const last = output.at(-1);
 			if (last?.text.endsWith(" ") && (!options.colors || last.scopes.length === 0)) output[output.length - 1] = {
 				...last,
@@ -524,7 +554,8 @@ function* formatUsageTermInternal(term, options) {
 	const space = {
 		text: " ",
 		width: 1,
-		scopes: []
+		scopes: [],
+		separator: true
 	};
 	if (term.type === "argument") yield* leaf({
 		type: "metavar",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.3.0-dev.2540",
+  "version": "1.3.0-dev.2554",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -237,7 +237,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.3.0-dev.2540+a24fec00",
+    "@optique/env": "1.3.0-dev.2554+5fdcbbad",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",