djs-builder 0.5.1 → 0.5.2

package/lib/discord/functions/logger.ts

@@ -9,7 +9,6 @@ const cyan = '\x1b[36m';
 const reset = '\x1b[0m';
 const yellow = '\x1b[33m';
 
-
 function getTimestamp(): string {
     const now = new Date();
     const year = now.getFullYear();
@@ -21,6 +20,19 @@ function getTimestamp(): string {
     return `[${year}-${month}-${day} ${hours}:${minutes}:${seconds}]`;
 }
 
+function extractErrorLocation(stack: string): string {
+    const lines = stack.split('\n');
+    const locationLine = lines[1] || lines[0];
+    
+    const match = locationLine.match(/\((.*):(\d+):(\d+)\)/);
+    if (match) {
+        const file = match[1];
+        const line = match[2];
+        return `File: ${file}, Line: ${line}`;
+    }
+    return 'Unknown location';
+}
+
 export function logSuccess(message: string) {
     console.log(`${getTimestamp()} ${green}${successEmoji}${reset} ${green}${message}${reset}`);
 }
@@ -30,18 +42,17 @@ export function logError(message: string, error?: Error) {
     const baseMessage = `${timestamp} ${red}${errorEmoji}${reset} ${red}${message}${reset}`;
 
     if (error && error.stack) {
-        console.error(`${baseMessage}\n${error.stack}`);
+        const location = extractErrorLocation(error.stack);
+        console.error(`${baseMessage}\n${location}\n${error.stack}`);
     } else {
         console.error(baseMessage);
     }
 }
 
-
 export function logInfo(message: string) {
     console.log(`${getTimestamp()} ${cyan}${infoEmoji}${reset} ${cyan}${message}${reset}`);
 }
 
-
 export function logWarning(message: string) {
     console.warn(`${getTimestamp()} ${yellow}${warningEmoji}${reset} ${yellow}${message}${reset}`);
 }

package/lib/discord/functions/similarity.ts

@@ -1,19 +1,32 @@
-import { Collection } from 'discord.js'
+import { Collection } from 'discord.js';
 import { Command } from '../types/starter';
+
 export function getSimilarCommands(commandName: string, commands: Collection<string, Command>): string[] {
-    const similarityThreshold = 0.6; 
+    const similarityThreshold = 0.6;
+    const partialMatches: string[] = [];
     const similarCommands: { name: string; similarity: number }[] = [];
 
     commands.forEach((_, cmdName) => {
+        if (cmdName.includes(commandName) || commandName.includes(cmdName)) {
+            partialMatches.push(cmdName);
+        }
+
         const similarity = calculateSimilarity(commandName, cmdName);
         if (similarity >= similarityThreshold) {
             similarCommands.push({ name: cmdName, similarity });
         }
     });
 
+    const combinedCommands = new Set([...partialMatches, ...similarCommands.map(cmd => cmd.name)]);
+    const uniqueCommands = Array.from(combinedCommands);
+
     similarCommands.sort((a, b) => b.similarity - a.similarity);
 
-    return similarCommands.map(cmd => cmd.name);
+    return uniqueCommands.sort((a, b) => {
+        const aIndex = similarCommands.findIndex(cmd => cmd.name === a);
+        const bIndex = similarCommands.findIndex(cmd => cmd.name === b);
+        return bIndex - aIndex;
+    });
 }
 
 function calculateSimilarity(str1: string, str2: string): number {
@@ -21,7 +34,6 @@ function calculateSimilarity(str1: string, str2: string): number {
     const len2 = str2.length;
     const matrix = [];
 
-    // Initialize the matrix
     for (let i = 0; i <= len1; i++) {
         matrix[i] = [i];
     }
@@ -35,7 +47,7 @@ function calculateSimilarity(str1: string, str2: string): number {
             matrix[i][j] = Math.min(
                 matrix[i - 1][j] + 1,
                 matrix[i][j - 1] + 1,
-                matrix[i - 1][j - 1] + cost 
+                matrix[i - 1][j - 1] + cost
             );
         }
     }

package/lib/discord/functions/terminal.ts

@@ -1,17 +1,25 @@
-import { blue, cyan, blueBright, magentaBright, red, yellow, cyanBright, gray, redBright, greenBright, yellowBright } from 'colorette';
-import { BotOptions } from '../types/starter';
+import { blue, cyanBright, greenBright, red, yellowBright, redBright, green, magentaBright, cyan, yellow, blueBright, gray } from 'colorette';
 import Table from 'cli-table';
 import fs from 'fs';
 import path from 'path';
+import figlet from 'figlet';
 
-interface Client {
-    user: { username: string };
-    prefixSize?: number;
-    slashSize?: number;
-    eventSize?: number;
+
+
+async function showLoadingBar(duration: number) {
+    const steps = [15, 30, 70, 85, 95, 100];
+    const interval = duration / steps.length;
+
+    for (const step of steps) {
+        process.stdout.write(`\r${cyanBright('Loading... ')}${'█'.repeat(step / 10)}${'░'.repeat(10 - step / 10)} ${step}%`);
+        await new Promise(resolve => setTimeout(resolve, interval));
+    }
+
+    process.stdout.write('\r'.padEnd(50) + '\r');
 }
 
-export async function terminalLogs(client: any, bot: BotOptions): Promise<void> {
+// Main function to show terminal logs
+export async function terminalLogs(client: any, bot: any): Promise<void> {
     const { user, prefixSize = 0, slashSize = 0, eventSize = 0 } = client;
 
     const totalCommands = slashSize + prefixSize;
@@ -45,9 +53,12 @@ export async function terminalLogs(client: any, bot: BotOptions): Promise<void>
     const projectPath = findProjectRoot();
     const projectSize = getProjectSize(projectPath);
 
+    await showLoadingBar(3000);
+
     const botStatesTable = new Table({
         head: [blue('# Bot States')],
-        colWidths: [30, 20]
+        colWidths: [30, 40],
+        style: { 'padding-left': 1, 'padding-right': 1 }
     });
     botStatesTable.push(
         [yellowBright('Bot Name'), user.username],
@@ -59,10 +70,11 @@ export async function terminalLogs(client: any, bot: BotOptions): Promise<void>
 
     const botInfoTable = new Table({
         head: [blue('# Bot Info')],
-        colWidths: [30, 25]
+        colWidths: [30, 50],
+        style: { 'padding-left': 1, 'padding-right': 1 }
     });
-    if (client.presence?.Status) {
-        botInfoTable.push([yellow('Status'), client.presence.Status]);
+    if (client.presence?.status) {
+        botInfoTable.push([yellowBright('Status'), client.presence.status]);
     }
     if (bot.Status?.activities && bot.Status.activities.length > 0) {
         botInfoTable.push([cyanBright('Activity'), bot.Status.activities[0]]);
@@ -90,6 +102,7 @@ export async function terminalLogs(client: any, bot: BotOptions): Promise<void>
         const loggedInAt = new Date(client.readyTimestamp).toLocaleString();
         botInfoTable.push([yellowBright('Logged In At'), loggedInAt]);
     }
-    console.log(botStatesTable.toString());
-    console.log(botInfoTable.toString());
+
+    console.log(`\n${blueBright('Bot States')}\n${botStatesTable.toString()}\n`);
+    console.log(`${blueBright('Bot Info')}\n${botInfoTable.toString()}\n`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "djs-builder",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Discord.js bot builder. Supports Ts and Js.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,10 +30,12 @@
     "mongodb"
   ],
   "dependencies": {
+    "@types/figlet": "^1.5.8",
     "cli-table": "^0.3.11",
     "colorette": "^2.0.20",
     "discord.js": "^14.15.3",
     "djs-builder": "^0.4.10",
+    "figlet": "^1.7.0",
     "mongodb": "^6.5.0",
     "verse.db": "^2.0.4"
   },