@optique/core 1.0.15-dev.2809 → 1.0.15-dev.2813

package/dist/primitives.cjs

@@ -1,4 +1,5 @@
 const require_annotations = require('./internal/annotations.cjs');
+const require_joined_file_suggestion = require('./internal/joined-file-suggestion.cjs');
 const require_message = require('./message.cjs');
 const require_command_doc_metadata = require('./internal/command-doc-metadata.cjs');
 const require_passthrough = require('./internal/passthrough.cjs');
@@ -236,34 +237,34 @@ function* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry,
 	}
 	yield* valueParser.suggest(prefix);
 }
+/** Returns the joined prefix accepted by option parsing. */
+function joinedOptionPrefix(names, input) {
+	return names.filter((name) => name.startsWith("--") || name.startsWith("/") || name.startsWith("-") && name.length > 2).map((name) => name + (name.startsWith("/") ? ":" : "=")).find((prefix) => input.startsWith(prefix));
+}
 /**
 * Internal sync helper for option suggest functionality.
 * @internal
 */
 function* suggestOptionSync(optionNames$1, valueParser, hidden, description, context, prefix) {
 	if (hidden || context.optionsTerminated) return;
-	const equalsIndex = prefix.indexOf("=");
-	if (equalsIndex >= 0) {
-		const optionPart = prefix.slice(0, equalsIndex);
-		const valuePart = prefix.slice(equalsIndex + 1);
+	const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
+	const joinedPrefix = joinedOptionPrefix(optionNames$1, prefix);
+	if (joinedPrefix !== void 0 && !expectingValue) {
+		const optionPart = joinedPrefix.slice(0, -1);
+		const valuePart = prefix.slice(joinedPrefix.length);
 		if (optionNames$1.includes(optionPart)) {
 			if (valueParser && valueParser.suggest) {
 				const valueSuggestions = getSuggestionsWithDependency(valueParser, valuePart, context.dependencyRegistry, context.exec);
 				for (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
 					kind: "literal",
-					text: `${optionPart}=${suggestion.text}`,
-					description: suggestion.description
-				};
-				else yield {
-					kind: "literal",
-					text: `${optionPart}=${suggestion.pattern || ""}`,
+					text: `${joinedPrefix}${suggestion.text}`,
 					description: suggestion.description
 				};
+				else yield require_joined_file_suggestion.joinedFileSuggestion(joinedPrefix, suggestion, valuePart);
 			}
 		}
 	} else {
-		const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
-		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) {
+		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+"))) {
 			for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
 				if (prefix === "-" && optionName$1.length !== 2) continue;
 				yield {
@@ -278,7 +279,7 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, description, con
 			if (context.buffer.length > 0) {
 				const lastToken = context.buffer[context.buffer.length - 1];
 				if (optionNames$1.includes(lastToken)) shouldSuggestValues = true;
-			} else if (require_annotation_state.isAnnotationWrappedInitialState(context.state) && context.buffer.length === 0 && (context.exec?.path?.length ?? 0) === 0 && !(prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) shouldSuggestValues = true;
+			} else if (require_annotation_state.isAnnotationWrappedInitialState(context.state) && context.buffer.length === 0 && (context.exec?.path?.length ?? 0) === 0 && !(prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+"))) shouldSuggestValues = true;
 			if (shouldSuggestValues) yield* getSuggestionsWithDependency(valueParser, prefix, context.dependencyRegistry, context.exec);
 		}
 	}
@@ -327,28 +328,24 @@ async function* getSuggestionsWithDependencyAsync(valueParser, prefix, dependenc
 */
 async function* suggestOptionAsync(optionNames$1, valueParser, hidden, description, context, prefix) {
 	if (hidden || context.optionsTerminated) return;
-	const equalsIndex = prefix.indexOf("=");
-	if (equalsIndex >= 0) {
-		const optionPart = prefix.slice(0, equalsIndex);
-		const valuePart = prefix.slice(equalsIndex + 1);
+	const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
+	const joinedPrefix = joinedOptionPrefix(optionNames$1, prefix);
+	if (joinedPrefix !== void 0 && !expectingValue) {
+		const optionPart = joinedPrefix.slice(0, -1);
+		const valuePart = prefix.slice(joinedPrefix.length);
 		if (optionNames$1.includes(optionPart)) {
 			if (valueParser && valueParser.suggest) {
 				const valueSuggestions = getSuggestionsWithDependencyAsync(valueParser, valuePart, context.dependencyRegistry, context.exec);
 				for await (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
 					kind: "literal",
-					text: `${optionPart}=${suggestion.text}`,
-					description: suggestion.description
-				};
-				else yield {
-					kind: "literal",
-					text: `${optionPart}=${suggestion.pattern || ""}`,
+					text: `${joinedPrefix}${suggestion.text}`,
 					description: suggestion.description
 				};
+				else yield require_joined_file_suggestion.joinedFileSuggestion(joinedPrefix, suggestion, valuePart);
 			}
 		}
 	} else {
-		const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
-		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) {
+		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+"))) {
 			for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
 				if (prefix === "-" && optionName$1.length !== 2) continue;
 				yield {
@@ -363,7 +360,7 @@ async function* suggestOptionAsync(optionNames$1, valueParser, hidden, descripti
 			if (context.buffer.length > 0) {
 				const lastToken = context.buffer[context.buffer.length - 1];
 				if (optionNames$1.includes(lastToken)) shouldSuggestValues = true;
-			} else if (require_annotation_state.isAnnotationWrappedInitialState(context.state) && context.buffer.length === 0 && (context.exec?.path?.length ?? 0) === 0 && !(prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) shouldSuggestValues = true;
+			} else if (require_annotation_state.isAnnotationWrappedInitialState(context.state) && context.buffer.length === 0 && (context.exec?.path?.length ?? 0) === 0 && !(prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+"))) shouldSuggestValues = true;
 			if (shouldSuggestValues) for await (const suggestion of getSuggestionsWithDependencyAsync(valueParser, prefix, context.dependencyRegistry, context.exec)) yield suggestion;
 		}
 	}

package/dist/primitives.js

@@ -1,4 +1,5 @@
 import { annotateFreshArray, getAnnotations } from "./internal/annotations.js";
+import { joinedFileSuggestion } from "./internal/joined-file-suggestion.js";
 import { message, metavar, optionName, optionNames, text, valueSet } from "./message.js";
 import { getCommandDocMetadata, withCommandDocMetadata } from "./internal/command-doc-metadata.js";
 import { defineKnownCompletion, defineOptionMatch, definePassThroughPriority, getOptionMatch, getPassThroughFailure, getPassThroughPriority } from "./internal/passthrough.js";
@@ -236,34 +237,34 @@ function* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry,
 	}
 	yield* valueParser.suggest(prefix);
 }
+/** Returns the joined prefix accepted by option parsing. */
+function joinedOptionPrefix(names, input) {
+	return names.filter((name) => name.startsWith("--") || name.startsWith("/") || name.startsWith("-") && name.length > 2).map((name) => name + (name.startsWith("/") ? ":" : "=")).find((prefix) => input.startsWith(prefix));
+}
 /**
 * Internal sync helper for option suggest functionality.
 * @internal
 */
 function* suggestOptionSync(optionNames$1, valueParser, hidden, description, context, prefix) {
 	if (hidden || context.optionsTerminated) return;
-	const equalsIndex = prefix.indexOf("=");
-	if (equalsIndex >= 0) {
-		const optionPart = prefix.slice(0, equalsIndex);
-		const valuePart = prefix.slice(equalsIndex + 1);
+	const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
+	const joinedPrefix = joinedOptionPrefix(optionNames$1, prefix);
+	if (joinedPrefix !== void 0 && !expectingValue) {
+		const optionPart = joinedPrefix.slice(0, -1);
+		const valuePart = prefix.slice(joinedPrefix.length);
 		if (optionNames$1.includes(optionPart)) {
 			if (valueParser && valueParser.suggest) {
 				const valueSuggestions = getSuggestionsWithDependency(valueParser, valuePart, context.dependencyRegistry, context.exec);
 				for (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
 					kind: "literal",
-					text: `${optionPart}=${suggestion.text}`,
-					description: suggestion.description
-				};
-				else yield {
-					kind: "literal",
-					text: `${optionPart}=${suggestion.pattern || ""}`,
+					text: `${joinedPrefix}${suggestion.text}`,
 					description: suggestion.description
 				};
+				else yield joinedFileSuggestion(joinedPrefix, suggestion, valuePart);
 			}
 		}
 	} else {
-		const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
-		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) {
+		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+"))) {
 			for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
 				if (prefix === "-" && optionName$1.length !== 2) continue;
 				yield {
@@ -278,7 +279,7 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, description, con
 			if (context.buffer.length > 0) {
 				const lastToken = context.buffer[context.buffer.length - 1];
 				if (optionNames$1.includes(lastToken)) shouldSuggestValues = true;
-			} else if (isAnnotationWrappedInitialState(context.state) && context.buffer.length === 0 && (context.exec?.path?.length ?? 0) === 0 && !(prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) shouldSuggestValues = true;
+			} else if (isAnnotationWrappedInitialState(context.state) && context.buffer.length === 0 && (context.exec?.path?.length ?? 0) === 0 && !(prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+"))) shouldSuggestValues = true;
 			if (shouldSuggestValues) yield* getSuggestionsWithDependency(valueParser, prefix, context.dependencyRegistry, context.exec);
 		}
 	}
@@ -327,28 +328,24 @@ async function* getSuggestionsWithDependencyAsync(valueParser, prefix, dependenc
 */
 async function* suggestOptionAsync(optionNames$1, valueParser, hidden, description, context, prefix) {
 	if (hidden || context.optionsTerminated) return;
-	const equalsIndex = prefix.indexOf("=");
-	if (equalsIndex >= 0) {
-		const optionPart = prefix.slice(0, equalsIndex);
-		const valuePart = prefix.slice(equalsIndex + 1);
+	const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
+	const joinedPrefix = joinedOptionPrefix(optionNames$1, prefix);
+	if (joinedPrefix !== void 0 && !expectingValue) {
+		const optionPart = joinedPrefix.slice(0, -1);
+		const valuePart = prefix.slice(joinedPrefix.length);
 		if (optionNames$1.includes(optionPart)) {
 			if (valueParser && valueParser.suggest) {
 				const valueSuggestions = getSuggestionsWithDependencyAsync(valueParser, valuePart, context.dependencyRegistry, context.exec);
 				for await (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
 					kind: "literal",
-					text: `${optionPart}=${suggestion.text}`,
-					description: suggestion.description
-				};
-				else yield {
-					kind: "literal",
-					text: `${optionPart}=${suggestion.pattern || ""}`,
+					text: `${joinedPrefix}${suggestion.text}`,
 					description: suggestion.description
 				};
+				else yield joinedFileSuggestion(joinedPrefix, suggestion, valuePart);
 			}
 		}
 	} else {
-		const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
-		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) {
+		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+"))) {
 			for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
 				if (prefix === "-" && optionName$1.length !== 2) continue;
 				yield {
@@ -363,7 +360,7 @@ async function* suggestOptionAsync(optionNames$1, valueParser, hidden, descripti
 			if (context.buffer.length > 0) {
 				const lastToken = context.buffer[context.buffer.length - 1];
 				if (optionNames$1.includes(lastToken)) shouldSuggestValues = true;
-			} else if (isAnnotationWrappedInitialState(context.state) && context.buffer.length === 0 && (context.exec?.path?.length ?? 0) === 0 && !(prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/"))) shouldSuggestValues = true;
+			} else if (isAnnotationWrappedInitialState(context.state) && context.buffer.length === 0 && (context.exec?.path?.length ?? 0) === 0 && !(prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+"))) shouldSuggestValues = true;
 			if (shouldSuggestValues) for await (const suggestion of getSuggestionsWithDependencyAsync(valueParser, prefix, context.dependencyRegistry, context.exec)) yield suggestion;
 		}
 	}

package/dist/suggestion.cjs

@@ -1,3 +1,4 @@
+const require_joined_file_suggestion = require('./internal/joined-file-suggestion.cjs');
 const require_message = require('./message.cjs');
 const require_usage = require('./usage.cjs');
 
@@ -237,7 +238,8 @@ function deduplicateSuggestions(suggestions) {
 		if (existing == null) {
 			entries.set(key, suggestion);
 			order.push(key);
-		} else if (suggestion.kind === "file" && existing.kind === "file" && suggestion.includeHidden === true && existing.includeHidden !== true) entries.set(key, {
+		} else if (suggestion.kind === "literal" && existing.kind === "literal") require_joined_file_suggestion.mergeJoinedFileSuggestions(existing, suggestion);
+		else if (suggestion.kind === "file" && existing.kind === "file" && suggestion.includeHidden === true && existing.includeHidden !== true) entries.set(key, {
 			...existing,
 			includeHidden: true
 		});

package/dist/suggestion.js

@@ -1,3 +1,4 @@
+import { mergeJoinedFileSuggestions } from "./internal/joined-file-suggestion.js";
 import { message, optionName, text } from "./message.js";
 import { extractCommandNames, extractOptionNames } from "./usage.js";
 
@@ -237,7 +238,8 @@ function deduplicateSuggestions(suggestions) {
 		if (existing == null) {
 			entries.set(key, suggestion);
 			order.push(key);
-		} else if (suggestion.kind === "file" && existing.kind === "file" && suggestion.includeHidden === true && existing.includeHidden !== true) entries.set(key, {
+		} else if (suggestion.kind === "literal" && existing.kind === "literal") mergeJoinedFileSuggestions(existing, suggestion);
+		else if (suggestion.kind === "file" && existing.kind === "file" && suggestion.includeHidden === true && existing.includeHidden !== true) entries.set(key, {
 			...existing,
 			includeHidden: true
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.15-dev.2809",
+  "version": "1.0.15-dev.2813",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",