chore: stricter checks

Author: vladfrangu

src/entrypoints/_shared.ts

@@ -238,10 +238,23 @@ export async function runCLI(entrypoint: string) {
 						return errorMessageSplit[1];
 					})();
 
+					const closestMatches = useCommandSuggestions(`${parsed._[0]} ${errorMessageSplit[1]}`);
+
+					const messageParts = [
+						chalk.gray(`Nonexistent ${nonexistentType}: ${chalk.whiteBright(nonexistentRepresentation)}`),
+					];
+
+					if (closestMatches.length) {
+						messageParts.push(
+							chalk.gray(
+								`  Did you mean: ${closestMatches.map((cmd) => chalk.whiteBright(cmd)).join(', ')}?`,
+							),
+						);
+					}
+
 					error({
 						message: [
-							`Nonexistent ${nonexistentType}: ${nonexistentRepresentation}`,
-							`  ${chalk.red('>')}  See more help with --help`,
+							...messageParts,
 							'',
 							selectiveRenderHelpForCommand(command, {
 								showUsageString: true,

src/lib/hooks/useCommandSuggestions.ts

@@ -2,6 +2,7 @@ import { jaroWinkler } from '@skyra/jaro-winkler';
 import levenshtein from 'js-levenshtein';
 
 import { commandRegistry } from '../command-framework/apify-command.js';
+import { cliDebugPrint } from '../utils/cliDebugPrint.js';
 
 export function useCommandSuggestions(inputString: string) {
 	const allCommands = [...commandRegistry.entries()];
@@ -11,17 +12,30 @@ export function useCommandSuggestions(inputString: string) {
 	const closestMatches = allCommands
 		.map(([cmdString, cmdClass]) => {
 			const lowercased = cmdString.toLowerCase();
+			const cmdStringParts = cmdString.split(' ');
+			const lastPart = cmdStringParts[cmdStringParts.length - 1].toLowerCase();
 
-			const matches =
-				levenshtein(lowercasedCommandString, lowercased) <= 2 ||
-				jaroWinkler(lowercasedCommandString, lowercased) >= 0.95;
+			const isAlias = cmdClass.aliases?.includes(lastPart) || cmdClass.hiddenAliases?.includes(lastPart) || false;
+
+			const levenshteinDistance = levenshtein(lowercasedCommandString, lowercased);
+			const jaroWinklerDistance = jaroWinkler(lowercasedCommandString, lowercased);
+
+			const matches = levenshteinDistance <= 2 || jaroWinklerDistance >= 0.975;
 
 			if (matches) {
-				if (cmdString === cmdClass.name) {
-					return cmdString;
+				cliDebugPrint('useCommandSuggestions', {
+					inputString: lowercasedCommandString,
+					lowercased,
+					matches,
+					levenshtein: levenshteinDistance,
+					jaroWinkler: jaroWinklerDistance,
+				});
+
+				if (!isAlias) {
+					return `${lowercased}`;
 				}
 
-				return `${cmdString} (alias for ${cmdClass.name})`;
+				return `${lowercased} (alias for ${cmdClass.name})`;
 			}
 
 			return null;