@power-bots/powerbotlibrary 0.5.1 → 0.5.2

package/dist/commands/other/config.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const discord_js_1 = require("discord.js");
 const main_1 = require("../../main");
-const config_1 = require("../../config");
+const config_1 = require("../../lib/config");
 module.exports = {
     data: new discord_js_1.SlashCommandBuilder()
         .setName('config')

package/dist/{bot.d.ts → lib/bot.d.ts}

@@ -10,6 +10,11 @@ export declare class Bot {
     info: any;
     setup(dirname: any): Promise<void>;
     run(): Promise<void>;
+    scanFolder(folder: string): Promise<string[]>;
+    importFolder(folder: string, func: Function, requiredData?: string[]): Promise<void>;
+    _importFolder(folder: string, func: Function, requiredData?: string[]): Promise<void>;
+    commandImporter(command: any): Promise<void>;
+    eventImporter(data: any): Promise<void>;
     resolveGuild(guild: Guild | Snowflake): Promise<Guild | null>;
     getGuild(id: Snowflake): Promise<Guild | null>;
     getRole(id: Snowflake, guild: Guild | Snowflake): Promise<Role | null>;

package/dist/{bot.js → lib/bot.js}

@@ -26,35 +26,6 @@ Object.defineProperty(exports, "knex", { enumerable: true, get: function () { re
 var config_1 = require("./config");
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return config_1.Config; } });
 Object.defineProperty(exports, "ConfigTypes", { enumerable: true, get: function () { return config_1.ConfigTypes; } });
-function addCommandsFromPath(bot, foldersPath) {
-    if (node_fs_1.default.existsSync(foldersPath)) {
-        const commandFolders = node_fs_1.default.readdirSync(foldersPath);
-        for (const folder of commandFolders) {
-            const commandsPath = node_path_1.default.join(foldersPath, folder);
-            let commandFiles;
-            if (node_fs_1.default.statSync(commandsPath).isDirectory()) {
-                commandFiles = node_fs_1.default.readdirSync(commandsPath).filter((file) => file.endsWith('.js'));
-            }
-            else {
-                commandFiles = [""];
-            }
-            for (const file of commandFiles) {
-                const filePath = node_path_1.default.join(commandsPath, file);
-                const command = require(filePath);
-                if ('data' in command && 'execute' in command) {
-                    bot.commands.set(command.data.name, command);
-                    bot.commandsArray.push(command.data.toJSON());
-                }
-                else {
-                    bot.log.warn(`The command at ${filePath} is missing a required "data" or "execute" property.`);
-                }
-                ;
-            }
-            ;
-        }
-        ;
-    }
-}
 class Bot {
     constructor() {
         this.info = {};
@@ -103,8 +74,8 @@ class Bot {
             // IMPORT COMMANDS
             this.commands = new discord_js_1.Collection();
             this.commandsArray = [];
-            addCommandsFromPath(this, node_path_1.default.join(this.dirname, 'commands'));
-            addCommandsFromPath(this, node_path_1.default.join(__dirname, 'commands'));
+            yield this.importFolder('commands', (data) => this.commandImporter(data));
+            yield this.importFolder('events', (data) => this.eventImporter(data));
             // LOGIN CLIENT
             this.client.once(discord_js_1.Events.ClientReady, (readyClient) => {
                 this.log.info(`Logged in as ${readyClient.user.tag}`);
@@ -157,6 +128,52 @@ class Bot {
             }));
         });
     }
+    scanFolder(folder) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let results = [];
+            if (node_fs_1.default.existsSync(folder)) {
+                const folderContents = node_fs_1.default.readdirSync(folder);
+                for (const file of folderContents) {
+                    const fullPath = node_path_1.default.join(folder, file);
+                    const stats = node_fs_1.default.lstatSync(fullPath);
+                    if (stats.isDirectory())
+                        results.push(...yield this.scanFolder(fullPath));
+                    if (stats.isFile())
+                        results.push(fullPath);
+                }
+            }
+            return results;
+        });
+    }
+    importFolder(folder_1, func_1) {
+        return __awaiter(this, arguments, void 0, function* (folder, func, requiredData = []) {
+            yield this._importFolder(node_path_1.default.join(this.dirname, folder), func, requiredData);
+            yield this._importFolder(node_path_1.default.join(__dirname, "..", folder), func, requiredData);
+        });
+    }
+    _importFolder(folder_1, func_1) {
+        return __awaiter(this, arguments, void 0, function* (folder, func, requiredData = []) {
+            for (const file of yield this.scanFolder(folder)) {
+                const data = require(file);
+                for (const required of requiredData)
+                    if (!data[required])
+                        continue;
+                if (file.endsWith(".js"))
+                    yield func(data);
+            }
+        });
+    }
+    commandImporter(command) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.commands.set(command.data.name, command);
+            this.commandsArray.push(command.data.toJSON());
+        });
+    }
+    eventImporter(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.client.on(data.event, data.execute);
+        });
+    }
     resolveGuild(guild) {
         return __awaiter(this, void 0, void 0, function* () {
             let _guild;

package/dist/{config.js → lib/config.js}

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = exports.ConfigTypes = void 0;
-const main_1 = require("./main");
+const main_1 = require("../main");
 var ConfigTypes;
 (function (ConfigTypes) {
     ConfigTypes["Guild"] = "guild";

package/dist/{db.js → lib/db.js}

@@ -17,7 +17,7 @@ exports.setupDatabase = setupDatabase;
 exports.updateDatabase = updateDatabase;
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = __importDefault(require("node:fs"));
-const main_1 = require("./main");
+const main_1 = require("../main");
 let rawDb;
 function setupDatabase() {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/{lang.js → lib/lang.js}

@@ -16,7 +16,7 @@ exports.Lang = void 0;
 exports.reply = reply;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const main_1 = require("./main");
+const main_1 = require("../main");
 const discord_js_1 = require("discord.js");
 function localize(obj, lang, args) {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/main.d.ts

@@ -1,5 +1,5 @@
-import { Bot } from "./bot";
-export { knex } from "./db";
-export { Config, ConfigTypes } from "./config";
-export { Lang, reply } from "./lang";
+import { Bot } from "./lib/bot";
+export { knex } from "./lib/db";
+export { Config, ConfigTypes } from "./lib/config";
+export { Lang, reply } from "./lib/lang";
 export declare const bot: Bot;

package/dist/main.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bot = exports.reply = exports.Lang = exports.ConfigTypes = exports.Config = exports.knex = void 0;
-const bot_1 = require("./bot");
-var db_1 = require("./db");
+const bot_1 = require("./lib/bot");
+var db_1 = require("./lib/db");
 Object.defineProperty(exports, "knex", { enumerable: true, get: function () { return db_1.knex; } });
-var config_1 = require("./config");
+var config_1 = require("./lib/config");
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return config_1.Config; } });
 Object.defineProperty(exports, "ConfigTypes", { enumerable: true, get: function () { return config_1.ConfigTypes; } });
-var lang_1 = require("./lang");
+var lang_1 = require("./lib/lang");
 Object.defineProperty(exports, "Lang", { enumerable: true, get: function () { return lang_1.Lang; } });
 Object.defineProperty(exports, "reply", { enumerable: true, get: function () { return lang_1.reply; } });
 exports.bot = new bot_1.Bot();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@power-bots/powerbotlibrary",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
   "dependencies": {