Merge pull request #27 from imLymei/next

Merge with next

package.json

@@ -1,6 +1,6 @@
 {
   "name": "foji",
-  "version": "0.4.1",
+  "version": "0.0.0-development",
   "main": "src/index.ts",
   "bin": {
     "foji": "./bin/index.js",
@@ -27,13 +27,15 @@
   "license": "MIT",
   "description": "Forge your code in a new way.",
   "devDependencies": {
+    "@types/fast-levenshtein": "^0.0.4",
     "@types/inquirer": "^9.0.7",
     "@types/node": "^22.5.1",
     "semantic-release": "^24.1.1",
     "typescript": "^5.5.4"
   },
   "dependencies": {
     "@inquirer/prompts": "^5.4.0",
-    "commander": "^12.1.0"
+    "commander": "^12.1.0",
+    "fast-levenshtein": "^3.0.0"
   }
 }

release.config.mjs

@@ -2,5 +2,5 @@
  * @type {import('semantic-release').GlobalConfig}
  */
 export default {
-  branches: ['master', 'next'],
+  branches: ['master', 'next', { name: 'beta', prerelease: true }],
 };

src/commands/index.ts

@@ -6,7 +6,12 @@ import removeCommand from './removeCommand';
 import openConfig from './openConfig';
 import uploadConfig from './uploadConfig';
 import downloadConfig from './downloadConfig';
-import { getConfig, logList, runUserCommand } from '../lib/utils';
+import {
+  getClosestWord,
+  getConfig,
+  logList,
+  runUserCommand,
+} from '../lib/utils';
 import syncConfig from './syncConfig';
 import renameCommand from './renameCommand';
 
@@ -51,7 +56,20 @@ const program = new Command()
     const command = configCommands[commandName];
 
     if (!command) {
-      console.error(`command "${commandName}" not found`);
+      const closestWord = getClosestWord(
+        commandName,
+        Object.keys(configCommands)
+      );
+
+      let suggestion: string;
+
+      if (isFinite(closestWord.distance))
+        suggestion = `Did you mean: "${closestWord.word}"?`;
+
+      console.error(`command "${commandName}" not found.`);
+
+      if (suggestion) console.log(suggestion);
+
       process.exit(1);
     }
 

src/commands/syncConfig.ts

@@ -1,14 +1,10 @@
 import { Command } from 'commander';
 import {
   uploadConfiguration,
-  login,
   updateCloudConfiguration,
-  hasGithubCli,
-  isGithubLogged,
   getConfiguration,
   basicGithubVerifications,
 } from '../lib/github';
-import { confirm } from '@inquirer/prompts';
 import { changeGistUrl, createConfig, getConfig } from '../lib/utils';
 
 const syncConfig = new Command('sync')

src/lib/utils.ts

@@ -1,5 +1,6 @@
 import { confirm } from '@inquirer/prompts';
 import { spawn, exec } from 'node:child_process';
+import levenshtein from 'fast-levenshtein';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
@@ -150,12 +151,6 @@ export function formatCommand(
 
   args = args.map((arg) => (arg === '_' ? undefined : arg));
 
-  if (debug) {
-    console.log('Command:', command);
-    console.log('Command arguments:', commandArguments);
-    console.log('Received arguments:', args);
-  }
-
   for (let index = 0; index < commandArguments.length; index++) {
     const arg = commandArguments[index];
     let argValue = arg.alternativeValue
@@ -167,6 +162,16 @@ export function formatCommand(
     splitCommand[index * 2 + 1] = argValue;
   }
 
+  if (debug) {
+    console.log('Command:', command);
+    console.log('Command arguments:', commandArguments);
+    console.log('Received arguments:', args);
+    console.log(`Formatted command: ${splitCommand.join('')}`);
+    console.log();
+    console.log('Running command...');
+    console.log();
+  }
+
   return splitCommand.join('');
 }
 
@@ -205,3 +210,19 @@ export function openDirectory(path: string) {
 
   exec(`${command} "${path}"`);
 }
+
+export function getClosestWord(
+  searchWord: string,
+  words: string[],
+  defaultWord?: ''
+): { distance: number; word: string } {
+  return words.reduce(
+    (data, word) => {
+      const distance = levenshtein.get(searchWord, word);
+
+      if (distance < data.distance) return { distance, word };
+      return data;
+    },
+    { distance: Infinity, word: defaultWord }
+  );
+}