reciple 6.0.0-dev.10 → 6.0.0-dev.12

package/dist/lib/bin.mjs

@@ -0,0 +1,53 @@
+#!/usr/bin/env node
+import { RecipleClient } from './reciple/classes/RecipleClient.js';
+import { RecipleConfig } from './reciple/classes/RecipleConfig.js';
+import { rawVersion } from './reciple/version.js';
+import { existsSync, readdirSync } from 'fs';
+import { cwd, flags } from './reciple/flags.js';
+import { input } from 'fallout-utility';
+import chalk from 'chalk';
+import 'dotenv/config';
+import path from 'path';
+import { inspect } from 'util';
+const allowedFiles = ['node_modules', 'reciple.yml', 'package.json'];
+const configPath = path.join(cwd, './reciple.yml');
+if (readdirSync(cwd).filter(f => !f.startsWith('.') && allowedFiles.indexOf(f)).length > 0 && !existsSync(flags.config ?? configPath)) {
+    const ask = (flags.yes ? 'y' : null) ?? input('This directory does not contain reciple.yml. Would you like to init axis here? [y/n] ') ?? '';
+    if (ask.toString().toLowerCase() !== 'y')
+        process.exit(0);
+}
+let configParser;
+try {
+    configParser = new RecipleConfig(flags.config ?? configPath).parseConfig();
+}
+catch (err) {
+    console.error(`${chalk.bold.red('Config Error')}: ${inspect(err)}`);
+    process.exit(1);
+}
+const config = configParser.getConfig();
+const client = new RecipleClient({ config: config, ...config.client });
+/**
+ * Start
+ */
+if (!client.isClientLogsSilent)
+    client.logger.info('Starting Reciple client v' + rawVersion);
+client.addCommandListeners();
+await client.modules.startModules(await client.modules.getModulesFromFiles({
+    files: await client.modules.getModulePaths({
+        filter: file => file.endsWith('.js') || file.endsWith('.cjs') || file.endsWith('.mjs'),
+    }),
+}));
+client.on('ready', async () => {
+    await client.modules.loadModules(client.modules.modules.toJSON(), true);
+    if (!client.isClientLogsSilent)
+        client.logger.log(`Loaded ${client.commands.slashCommands.size} slash commands`, `Loaded ${client.commands.messageCommands.size} message commands`);
+    if (client.config.commands.slashCommand.registerCommands)
+        await client.commands.registerApplicationCommands();
+    if (!client.isClientLogsSilent)
+        client.logger.warn(`Logged in as ${client.user?.tag || 'Unknown'}!`);
+    client.on('cacheSweep', () => client.cooldowns.clean());
+});
+client.login(config.token).catch(err => {
+    if (!client.isClientLogsSilent)
+        client.logger.error(err);
+});

package/dist/lib/esm.mjs

@@ -0,0 +1 @@
+export * from './index.js';

package/dist/{cjs → lib}/index.js

@@ -14,21 +14,21 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./reciple/classes/builders/MessageCommandBuilder"), exports);
-__exportStar(require("./reciple/classes/builders/MessageCommandOptionBuilder"), exports);
-__exportStar(require("./reciple/classes/builders/SlashCommandBuilder"), exports);
-__exportStar(require("./reciple/classes/managers/ApplicationCommandManager"), exports);
-__exportStar(require("./reciple/classes/managers/ClientCommandManager"), exports);
-__exportStar(require("./reciple/classes/managers/ClientModuleManager"), exports);
-__exportStar(require("./reciple/classes/managers/CommandCooldownManager"), exports);
-__exportStar(require("./reciple/classes/managers/MessageCommandOptionManager"), exports);
-__exportStar(require("./reciple/classes/RecipleClient"), exports);
-__exportStar(require("./reciple/classes/RecipleConfig"), exports);
-__exportStar(require("./reciple/classes/RecipleModule"), exports);
-__exportStar(require("./reciple/types/builders"), exports);
-__exportStar(require("./reciple/types/commands"), exports);
-__exportStar(require("./reciple/types/paramOptions"), exports);
-__exportStar(require("./reciple/flags"), exports);
-__exportStar(require("./reciple/permissions"), exports);
-__exportStar(require("./reciple/util"), exports);
-__exportStar(require("./reciple/version"), exports);
+__exportStar(require("./reciple/classes/builders/MessageCommandBuilder.js"), exports);
+__exportStar(require("./reciple/classes/builders/MessageCommandOptionBuilder.js"), exports);
+__exportStar(require("./reciple/classes/builders/SlashCommandBuilder.js"), exports);
+__exportStar(require("./reciple/classes/managers/ApplicationCommandManager.js"), exports);
+__exportStar(require("./reciple/classes/managers/ClientCommandManager.js"), exports);
+__exportStar(require("./reciple/classes/managers/ClientModuleManager.js"), exports);
+__exportStar(require("./reciple/classes/managers/CommandCooldownManager.js"), exports);
+__exportStar(require("./reciple/classes/managers/MessageCommandOptionManager.js"), exports);
+__exportStar(require("./reciple/classes/RecipleClient.js"), exports);
+__exportStar(require("./reciple/classes/RecipleConfig.js"), exports);
+__exportStar(require("./reciple/classes/RecipleModule.js"), exports);
+__exportStar(require("./reciple/types/builders.js"), exports);
+__exportStar(require("./reciple/types/commands.js"), exports);
+__exportStar(require("./reciple/types/builders.js"), exports);
+__exportStar(require("./reciple/types/builders.js"), exports);
+__exportStar(require("./reciple/permissions.js"), exports);
+__exportStar(require("./reciple/util.js"), exports);
+__exportStar(require("./reciple/version.js"), exports);

package/dist/{cjs → lib}/reciple/classes/RecipleClient.js

@@ -18,7 +18,7 @@ const builders_1 = require("../types/builders");
 const RecipleConfig_1 = require("./RecipleConfig");
 const fallout_utility_1 = require("fallout-utility");
 const util_1 = require("../util");
-const version_1 = require("../version");
+const version_js_1 = require("../version.js");
 const flags_1 = require("../flags");
 const path_1 = __importDefault(require("path"));
 class RecipleClient extends discord_js_1.Client {
@@ -35,7 +35,7 @@ class RecipleClient extends discord_js_1.Client {
         this.modules = new ClientModuleManager_1.ClientModuleManager({
             client: this,
         });
-        this.version = version_1.version;
+        this.version = version_js_1.version;
         this.logger = (0, util_1.createLogger)(!!options.config?.fileLogging.stringifyLoggedJSON, options.config?.fileLogging.debugmode);
         this.config = { ...this.config, ...(options.config ?? {}) };
         if (this.config.fileLogging.enabled)

package/dist/{cjs → lib}/reciple/classes/RecipleConfig.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecipleConfig = void 0;
 const fs_1 = require("fs");
-const version_1 = require("../version");
+const version_js_1 = require("../version.js");
 const fallout_utility_1 = require("fallout-utility");
 const flags_1 = require("../flags");
 const path_1 = __importDefault(require("path"));
@@ -32,7 +32,7 @@ class RecipleConfig {
             const defaultConfigPath = RecipleConfig.defaultConfigPath;
             if (!(0, fs_1.existsSync)(defaultConfigPath))
                 throw new Error('Default Config file not found. Please reinstall Reciple.');
-            const defaultConfig = (0, fallout_utility_1.replaceAll)((0, fs_1.readFileSync)(defaultConfigPath, 'utf-8'), 'VERSION', version_1.version);
+            const defaultConfig = (0, fallout_utility_1.replaceAll)((0, fs_1.readFileSync)(defaultConfigPath, 'utf-8'), 'VERSION', version_js_1.version);
             (0, fs_1.writeFileSync)(this.configPath, defaultConfig, 'utf-8');
             if (!(0, fs_1.existsSync)(this.configPath))
                 throw new Error('Failed to create config file.');
@@ -48,7 +48,7 @@ class RecipleConfig {
         const config = (0, fs_1.readFileSync)(this.configPath, 'utf-8');
         this.config = yaml_1.default.parse(config);
         if (!this._isSupportedConfig())
-            throw new Error('Unsupported config version. Your config version: ' + (this.config?.version || 'No version specified.') + ', Reciple version: ' + version_1.version);
+            throw new Error('Unsupported config version. Your config version: ' + (this.config?.version || 'No version specified.') + ', Reciple version: ' + version_js_1.version);
         return this;
     }
     /**
@@ -78,7 +78,7 @@ class RecipleConfig {
      * Check if the config version is supported
      */
     _isSupportedConfig() {
-        return (0, version_1.isSupportedVersion)(this.config?.version || '0.0.0', version_1.version);
+        return (0, version_js_1.isSupportedVersion)(this.config?.version || '0.0.0', version_js_1.version);
     }
     /**
      * Ask for a token

package/dist/{cjs → lib}/reciple/classes/managers/ClientModuleManager.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -113,7 +90,7 @@ class ClientModuleManager {
         const modules = [];
         for (const file of options.files) {
             try {
-                const resolveFile = await Promise.resolve().then(() => __importStar(require(file)));
+                const resolveFile = await import(file);
                 let script = resolveFile?.default ?? resolveFile;
                 if (script instanceof RecipleModule_1.RecipleModule) {
                     modules.push(script);
@@ -150,18 +127,18 @@ class ClientModuleManager {
             return false;
         return true;
     }
-    async getModuleFiles(...folders) {
+    async getModulePaths(options) {
         const modules = [];
-        for (const dir of (0, discord_js_1.normalizeArray)(folders).length ? (0, discord_js_1.normalizeArray)(folders) : (0, discord_js_1.normalizeArray)([this.client.config.modulesFolder])) {
+        for (const dir of options?.folders ?? (0, discord_js_1.normalizeArray)([this.client.config.modulesFolder])) {
             if (!(0, fs_1.existsSync)(dir))
                 (0, fs_1.mkdirSync)(dir, { recursive: true });
             if (!(0, fs_1.lstatSync)(dir).isDirectory())
                 continue;
             modules.push(...(0, fs_1.readdirSync)(dir)
                 .map(file => path_1.default.join(flags_1.cwd, dir, file))
-                .filter(file => file.endsWith('.js') || file.endsWith('.cjs')));
+                .filter(file => (options?.filter ? options.filter(file) : file.endsWith('.js'))));
         }
-        return modules.filter(file => !this.client.config.ignoredFiles.some(ignored => (0, wildcard_match_1.default)(ignored)(path_1.default.basename(file))));
+        return modules.filter(file => !(options?.ignoredFiles ?? this.client.config.ignoredFiles).some(ignored => (0, wildcard_match_1.default)(ignored)(path_1.default.basename(file))));
     }
 }
 exports.ClientModuleManager = ClientModuleManager;

package/dist/{cjs → lib}/reciple/flags.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cwd = exports.token = exports.flags = exports.commander = void 0;
-const version_1 = require("./version");
+const version_js_1 = require("./version.js");
 const commander_1 = require("commander");
 /**
  * Commander
@@ -9,7 +9,7 @@ const commander_1 = require("commander");
 exports.commander = new commander_1.Command()
     .name('reciple')
     .description('Reciple.js - Discord.js handler cli')
-    .version(`v${version_1.rawVersion}`, '-v, --version')
+    .version(`v${version_js_1.rawVersion}`, '-v, --version')
     .argument('[current-working-directory]', 'Change the current working directory')
     .option('-t, --token <token>', 'Replace used bot token')
     .option('-c, --config <config>', 'Change path to config file')

package/dist/{cjs → lib}/reciple/version.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSupportedVersion = exports.parseVersion = exports.isValidVersion = exports.rawVersion = exports.version = void 0;
 const semver_1 = __importDefault(require("semver"));
-// TODO: ESM support
 /**
  * Current reciple version
  */

package/dist/types/esm.d.mts

@@ -0,0 +1 @@
+export * from './index.js';

package/dist/types/index.d.ts

@@ -1,18 +1,18 @@
-export * from './reciple/classes/builders/MessageCommandBuilder';
-export * from './reciple/classes/builders/MessageCommandOptionBuilder';
-export * from './reciple/classes/builders/SlashCommandBuilder';
-export * from './reciple/classes/managers/ApplicationCommandManager';
-export * from './reciple/classes/managers/ClientCommandManager';
-export * from './reciple/classes/managers/ClientModuleManager';
-export * from './reciple/classes/managers/CommandCooldownManager';
-export * from './reciple/classes/managers/MessageCommandOptionManager';
-export * from './reciple/classes/RecipleClient';
-export * from './reciple/classes/RecipleConfig';
-export * from './reciple/classes/RecipleModule';
-export * from './reciple/types/builders';
-export * from './reciple/types/commands';
-export * from './reciple/types/paramOptions';
-export * from './reciple/flags';
-export * from './reciple/permissions';
-export * from './reciple/util';
-export * from './reciple/version';
+export * from './reciple/classes/builders/MessageCommandBuilder.js';
+export * from './reciple/classes/builders/MessageCommandOptionBuilder.js';
+export * from './reciple/classes/builders/SlashCommandBuilder.js';
+export * from './reciple/classes/managers/ApplicationCommandManager.js';
+export * from './reciple/classes/managers/ClientCommandManager.js';
+export * from './reciple/classes/managers/ClientModuleManager.js';
+export * from './reciple/classes/managers/CommandCooldownManager.js';
+export * from './reciple/classes/managers/MessageCommandOptionManager.js';
+export * from './reciple/classes/RecipleClient.js';
+export * from './reciple/classes/RecipleConfig.js';
+export * from './reciple/classes/RecipleModule.js';
+export * from './reciple/types/builders.js';
+export * from './reciple/types/commands.js';
+export * from './reciple/types/builders.js';
+export * from './reciple/types/builders.js';
+export * from './reciple/permissions.js';
+export * from './reciple/util.js';
+export * from './reciple/version.js';

package/dist/types/reciple/classes/managers/ClientModuleManager.d.ts

@@ -1,5 +1,5 @@
-import { Collection, RestOrArray } from 'discord.js';
-import { ClientModuleManagerGetModulesFromFilesOptions } from '../../types/paramOptions';
+import { Collection } from 'discord.js';
+import { ClientModuleManagerGetModulePathsOptions, ClientModuleManagerGetModulesFromFilesOptions } from '../../types/paramOptions';
 import { RecipleClient } from '../RecipleClient';
 import { RecipleModule, RecipleScript } from '../RecipleModule';
 export interface ClientModuleManagerOptions {
@@ -15,5 +15,5 @@ export declare class ClientModuleManager {
     unLoadModules(modules: RecipleModule[], removeUnloadedModules?: boolean, ignoreErrors?: boolean): Promise<RecipleModule[]>;
     getModulesFromFiles(options: ClientModuleManagerGetModulesFromFilesOptions): Promise<RecipleModule[]>;
     static validateScript(script: unknown): script is RecipleScript;
-    getModuleFiles(...folders: RestOrArray<string>): Promise<string[]>;
+    getModulePaths(options?: ClientModuleManagerGetModulePathsOptions): Promise<string[]>;
 }

package/dist/types/reciple/types/paramOptions.d.ts

@@ -1,5 +1,5 @@
 import { ConfigCommandPermissions } from '../classes/RecipleConfig';
-import { PermissionsBitField } from 'discord.js';
+import { Awaitable, PermissionsBitField } from 'discord.js';
 import { AnyCommandBuilder } from './builders';
 export interface UserHasCommandPermissionsOptions {
     /**
@@ -23,3 +23,8 @@ export interface ClientModuleManagerGetModulesFromFilesOptions {
     disabeVersionCheck?: boolean;
     dontSkipError?: boolean;
 }
+export interface ClientModuleManagerGetModulePathsOptions {
+    folders?: string[];
+    ignoredFiles?: string[];
+    filter?: (file: string) => Awaitable<boolean>;
+}

package/package.json

@@ -1,18 +1,26 @@
 {
   "name": "reciple",
-  "version": "6.0.0-dev.10",
-  "bin": "./dist/cjs/bin.js",
+  "version": "6.0.0-dev.12",
+  "bin": "./dist/lib/bin.mjs",
   "license": "GPL-3.0",
-  "main": "./dist/cjs/index.js",
+  "type": "commonjs",
+  "main": "./dist/lib/index.js",
   "types": "./dist/types/index.d.ts",
-  "module": "./dist/mjs/index.js",
+  "module": "./esm.mjs",
   "author": "FalloutStudios",
   "description": "Handler for Discord.js",
   "homepage": "https://reciple.js.org",
   "exports": {
-    "require": "./dist/cjs/index.js",
-    "import": "./dist/mjs/index.js",
-    "types": "./dist/types/index.d.ts"
+    ".": {
+      "import": {
+        "types": "./dist/types/index.d.ts",
+        "default": "./dist/lib/esm.mjs"
+      },
+      "require": {
+        "types": "./dist/types/index.d.ts",
+        "default": "./dist/lib/index.js"
+      }
+    }
   },
   "keywords": [
     "Discord",
@@ -29,12 +37,11 @@
     "format": "npx prettier --write src",
     "clean": "npx rimraf dist",
     "build": "npm run clean && npx tsc",
-    "build:publish": "npm run format && npm run build && npx docs && npm publish",
+    "build:publish": "npm run format && npm run build && npm run docs && npm publish",
     "build:publish-dev": "npm run format && npm run build && npm publish --tag dev",
-    "test": "npm run build && npm run start -w test",
+    "test": "npm run build && npm install && npm run start -w test",
     "docs": "npx docgen --typescript true -c ./docs/index.json -o ./docs/docs.json -i src/index.ts",
-    "watch": "npx tsc --watch --noEmit",
-    "husky:install": "npx husky install"
+    "watch": "npx tsc --watch --noEmit"
   },
   "repository": {
     "type": "git",
@@ -54,7 +61,7 @@
     "chalk": "4.1.2",
     "commander": "^9.4.1",
     "dotenv": "^16.0.3",
-    "fallout-utility": "^1.5.4",
+    "fallout-utility": "^1.5.13",
     "semver": "^7.3.7",
     "wildcard-match": "^5.1.2",
     "yaml": "^2.1.1"
@@ -64,7 +71,6 @@
     "@types/node": "^18.11.0",
     "@types/semver": "^7.3.12",
     "discord.js": "^14.6.0",
-    "husky": "^8.0.1",
     "prettier": "2.7.1",
     "rimraf": "^3.0.2",
     "typescript": "^4.8.4"

package/dist/cjs/bin.js

@@ -1,54 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const RecipleClient_1 = require("./reciple/classes/RecipleClient");
-const RecipleConfig_1 = require("./reciple/classes/RecipleConfig");
-const version_1 = require("./reciple/version");
-const fs_1 = require("fs");
-const flags_1 = require("./reciple/flags");
-const fallout_utility_1 = require("fallout-utility");
-const chalk_1 = __importDefault(require("chalk"));
-require("dotenv/config");
-const path_1 = __importDefault(require("path"));
-const allowedFiles = ['node_modules', 'reciple.yml', 'package.json'];
-const configPath = path_1.default.join(flags_1.cwd, './reciple.yml');
-if ((0, fs_1.readdirSync)(flags_1.cwd).filter(f => !f.startsWith('.') && allowedFiles.indexOf(f)).length > 0 && !(0, fs_1.existsSync)(flags_1.flags.config ?? configPath)) {
-    const ask = (flags_1.flags.yes ? 'y' : null) ?? (0, fallout_utility_1.input)('This directory does not contain reciple.yml. Would you like to init axis here? [y/n] ') ?? '';
-    if (ask.toString().toLowerCase() !== 'y')
-        process.exit(0);
-}
-let configParser;
-try {
-    configParser = new RecipleConfig_1.RecipleConfig(flags_1.flags.config ?? configPath).parseConfig();
-}
-catch (err) {
-    console.error(`${chalk_1.default.bold.red('Config Error')}: ${chalk_1.default.white(err.message)}`);
-    process.exit(1);
-}
-const config = configParser.getConfig();
-const client = new RecipleClient_1.RecipleClient({ config: config, ...config.client });
-if (!client.isClientLogsSilent)
-    client.logger.info('Starting Reciple client v' + version_1.rawVersion);
-(async () => {
-    client.addCommandListeners();
-    await client.modules.startModules(await client.modules.getModulesFromFiles({
-        files: await client.modules.getModuleFiles(),
-    }));
-    client.on('ready', async () => {
-        await client.modules.loadModules(client.modules.modules.toJSON(), true);
-        if (!client.isClientLogsSilent)
-            client.logger.log(`Loaded ${client.commands.slashCommands.size} slash commands`, `Loaded ${client.commands.messageCommands.size} message commands`);
-        if (client.config.commands.slashCommand.registerCommands)
-            await client.commands.registerApplicationCommands();
-        if (!client.isClientLogsSilent)
-            client.logger.warn(`Logged in as ${client.user?.tag || 'Unknown'}!`);
-        client.on('cacheSweep', () => client.cooldowns.clean());
-    });
-    client.login(config.token).catch(err => {
-        if (!client.isClientLogsSilent)
-            client.logger.error(err);
-    });
-})();