reciple 7.0.13 → 7.1.1

package/bin/utils/modules.js

@@ -5,24 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireTypescriptFile = exports.getModules = void 0;
 const fs_1 = require("fs");
-const fallout_utility_1 = require("fallout-utility");
 const micromatch_1 = __importDefault(require("micromatch"));
 const cli_1 = require("./cli");
+const path_1 = __importDefault(require("path"));
 async function getModules(config, filter) {
     const modules = [];
     const { globby, isDynamicPattern } = await import('globby');
-    if (cli_1.flags?.ts || config.resolveTypescriptModules) {
-        require('ts-interpreter.js');
-    }
     for (const folder of config.modulesFolders) {
-        const dir = fallout_utility_1.path.isAbsolute(folder) ? folder : fallout_utility_1.path.join(cli_1.cwd, folder);
-        if (isDynamicPattern(dir)) {
-            let modulesFolders = await globby(dir, {
+        const dir = path_1.default.isAbsolute(folder) ? folder : path_1.default.join(cli_1.cwd, folder);
+        if (isDynamicPattern(folder, { cwd: cli_1.cwd })) {
+            let modulesFolders = await globby(folder, {
                 cwd: cli_1.cwd,
                 onlyDirectories: true,
                 absolute: true
             });
-            modulesFolders = modulesFolders.filter(f => !micromatch_1.default.isMatch(fallout_utility_1.path.basename(f), config.exclude));
+            modulesFolders = modulesFolders.filter(f => !micromatch_1.default.isMatch(path_1.default.basename(f), config.exclude));
             modules.push(...await getModules({
                 ...config,
                 modulesFolders
@@ -33,14 +30,17 @@ async function getModules(config, filter) {
             (0, fs_1.mkdirSync)(dir, { recursive: true });
         if (!(0, fs_1.lstatSync)(dir).isDirectory())
             continue;
-        const files = (0, fs_1.readdirSync)(dir).map(file => fallout_utility_1.path.join(dir, file)).filter(f => !micromatch_1.default.isMatch(fallout_utility_1.path.basename(f), config.exclude));
+        const files = (0, fs_1.readdirSync)(dir).map(file => path_1.default.join(dir, file)).filter(f => !micromatch_1.default.isMatch(path_1.default.basename(f), config.exclude));
         modules.push(...files.filter(file => (filter ? filter(file) : file.endsWith('.js'))));
     }
     return modules;
 }
 exports.getModules = getModules;
-async function requireTypescriptFile(file) {
-    return require(file);
+async function requireTypescriptFile(file, compilerOptions) {
+    const tsLoader = await import('@weichwarenprojekt/ts-importer').catch(() => null);
+    if (!tsLoader)
+        return null;
+    return tsLoader.loadModule(file, { compilerOptions });
 }
 exports.requireTypescriptFile = requireTypescriptFile;
 //# sourceMappingURL=modules.js.map

package/bin/utils/modules.js.map

@@ -1 +1 @@
-{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/utils/modules.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAmE;AACnE,qDAAkD;AAElD,4DAAoC;AACpC,+BAAmC;AAE5B,KAAK,UAAU,UAAU,CAAC,MAA0B,EAAE,MAAiD;IAC1G,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,IAAI,WAAK,EAAE,EAAE,IAAI,MAAM,CAAC,wBAAwB,EAAE;QAC9C,OAAO,CAAC,mBAAmB,CAAC,CAAC;KAChC;IAED,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,cAAc,EAAE;QACxC,MAAM,GAAG,GAAG,sBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,sBAAI,CAAC,IAAI,CAAC,SAAG,EAAE,MAAM,CAAC,CAAC;QAEtE,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE;YACvB,IAAI,cAAc,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE;gBAC/B,GAAG,EAAH,SAAG;gBACH,eAAe,EAAE,IAAI;gBACrB,QAAQ,EAAE,IAAI;aACjB,CAAC,CAAC;YAEH,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,oBAAU,CAAC,OAAO,CAAC,sBAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAEvG,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,UAAU,CAAC;gBAC7B,GAAG,MAAM;gBACT,cAAc;aACjB,CAAC,CAAC,CAAC;YAEJ,SAAS;SACZ;QAED,IAAI,CAAC,IAAA,eAAU,EAAC,GAAG,CAAC;YAAE,IAAA,cAAS,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAA,cAAS,EAAC,GAAG,CAAC,CAAC,WAAW,EAAE;YAAE,SAAS;QAE5C,MAAM,KAAK,GAAG,IAAA,gBAAW,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,sBAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,oBAAU,CAAC,OAAO,CAAC,sBAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QACpI,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACzF;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AApCD,gCAoCC;AAEM,KAAK,UAAU,qBAAqB,CAAC,IAAY;IACpD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAFD,sDAEC"}
+{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/utils/modules.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAmE;AAGnE,4DAAoC;AACpC,+BAA4B;AAE5B,gDAAwB;AAEjB,KAAK,UAAU,UAAU,CAAC,MAA0B,EAAE,MAAiD;IAC1G,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,cAAc,EAAE;QACxC,MAAM,GAAG,GAAG,cAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,SAAG,EAAE,MAAM,CAAC,CAAC;QAEtE,IAAI,gBAAgB,CAAC,MAAM,EAAE,EAAE,GAAG,EAAH,SAAG,EAAE,CAAC,EAAE;YACnC,IAAI,cAAc,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE;gBAClC,GAAG,EAAH,SAAG;gBACH,eAAe,EAAE,IAAI;gBACrB,QAAQ,EAAE,IAAI;aACjB,CAAC,CAAC;YAEH,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,oBAAU,CAAC,OAAO,CAAC,cAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAEvG,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,UAAU,CAAC;gBAC7B,GAAG,MAAM;gBACT,cAAc;aACjB,CAAC,CAAC,CAAC;YAEJ,SAAS;SACZ;QAED,IAAI,CAAC,IAAA,eAAU,EAAC,GAAG,CAAC;YAAE,IAAA,cAAS,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAA,cAAS,EAAC,GAAG,CAAC,CAAC,WAAW,EAAE;YAAE,SAAS;QAE5C,MAAM,KAAK,GAAG,IAAA,gBAAW,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,oBAAU,CAAC,OAAO,CAAC,cAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QACpI,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACzF;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAhCD,gCAgCC;AAEM,KAAK,UAAU,qBAAqB,CAAC,IAAY,EAAE,eAA8D;IACpH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,gCAAgC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAClF,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE3B,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;AAC1D,CAAC;AALD,sDAKC"}

package/package.json

@@ -3,7 +3,7 @@
   "description": "Reciple is a Discord.js handler",
   "homepage": "https://reciple.js.org/docs/reciple",
   "license": "GPL-3.0",
-  "version": "7.0.13",
+  "version": "7.1.1",
   "main": "./bin/index.js",
   "module": "./bin/esm.mjs",
   "types": "./bin/index.d.ts",
@@ -37,7 +37,8 @@
     "README.md"
   ],
   "dependencies": {
-    "@reciple/client": "^7.0.8",
+    "@reciple/client": "^7.0.9",
+    "@weichwarenprojekt/ts-importer": "^0.1.5",
     "chalk": "4.1.2",
     "commander": "^10.0.0",
     "dotenv": "^16.0.3",
@@ -52,14 +53,13 @@
     "@types/micromatch": "^4.0.2",
     "@types/prompts": "^2.4.2",
     "@types/semver": "^7.3.13",
-    "discord.js": "^14.7.1",
-    "ts-interpreter.js": "^1.4.3"
+    "discord.js": "^14.7.1"
   },
   "peerDependencies": {
     "discord.js": "^14.7.1"
   },
   "optionalDependencies": {
-    "ts-interpreter.js": "^1.4.3"
+    "@weichwarenprojekt/ts-importer": "^0.1.5"
   },
-  "gitHead": "8e2673509655ceb1fa463acc0b4c13a24bc2de83"
+  "gitHead": "e6e3b11c7a87cf95d4e11148760dd8777c7050f9"
 }

package/static/config.yml

@@ -1,100 +1,104 @@
-# The bot token
-#   You can directly set the bot token as value or use token from env
-#   To use token from env set the value like this:
-#     token: env:TOKEN
-token: TOKEN
-
-# Commands Config
-commands:
-  contextMenuCommand:
-    # If false, the client will ignore this type of command when executed
-    enabled: true
-    # Enable user command cooldowns if available
-    enableCooldown: true
-    # Command register config
-    registerCommands:
-      # Allow commands to be registered globally
-      registerGlobally: true
-      # Allow commands to be registered a given guilds/servers
-      registerToGuilds: []
-    # If enabled, the client will accept replied interactions of this type
-    acceptRepliedInteractions: false
-  slashCommand:
-    # If false, the client will ignore this type of command when executed
-    enabled: true
-    # Enable user command cooldowns if available
-    enableCooldown: true
-    # Command register config
-    registerCommands:
-      # Allow commands to be registered globally
-      registerGlobally: true
-      # Allow commands to be registered a given guilds/servers
-      registerToGuilds: []
-    # If enabled, the client will accept replied interactions of this type
-    acceptRepliedInteractions: false
-  messageCommand:
-    # If false, the client will ignore this type of command when executed
-    enabled: true
-    # Enable user command cooldowns if available
-    enableCooldown: true
-    # String separator for command options
-    commandArgumentSeparator: ' '
-    # Command prefix
-    prefix: '!'
-  additionalApplicationCommands:
-    # Command register config
-    registerCommands:
-      # Allow commands to be registered globally
-      registerGlobally: true
-      # Allow commands to be registered a given guilds/servers
-      registerToGuilds: []
-
-# Application commands register config
-applicationCommandRegister:
-  # Wether allow all application commands to be registered globally
-  #   This ignores their specific configs
-  allowRegisterGlobally: true
-  # Wether allow all application commands to be registered to guilds
-  #   This ignores their specific configs
-  allowRegisterOnGuilds: true
-  # Register empty command list
-  registerEmptyCommands: true
-
-# Logger config
-logger:
-  # Enables client logger
-  enabled: true
-  # Enables logger debug mode
-  debugmode: false
-  # Enables colored console logs
-  coloredMessages: true
-  # File file config
-  logToFile:
-    # Enables log file
-    enabled: true
-    # Sets the log file folder
-    logsFolder: './logs'
-
-# Modules config
-modules:
-  # Reciple modules folders
-  #   You can add multiple folders by adding the folder path or using glob patterns
-  modulesFolders: ['./modules']
-  # Excluded files or folders
-  #   You can add the file/folder name or use glob patterns
-  exclude: []
-  # If false, the client will still load unsupported modules
-  disableModuleVersionCheck: false
-  # Resolve files in modules folder with ".ts" file extension
-  #   This feature is experimental
-  resolveTypescriptModules: false
-
-# Discord.js client options
-client:
-  intents:
-    - 'Guilds'
-    - 'GuildMessages'
-    - 'MessageContent'
-
-# Don't change this value
-version: ^VERSION
+# The bot token
+#   You can directly set the bot token as value or use token from env
+#   To use token from env set the value like this:
+#     token: env:TOKEN
+token: TOKEN
+
+# Commands Config
+commands:
+  contextMenuCommand:
+    # If false, the client will ignore this type of command when executed
+    enabled: true
+    # Enable user command cooldowns if available
+    enableCooldown: true
+    # Command register config
+    registerCommands:
+      # Allow commands to be registered globally
+      registerGlobally: true
+      # Allow commands to be registered a given guilds/servers
+      registerToGuilds: []
+    # If enabled, the client will accept replied interactions of this type
+    acceptRepliedInteractions: false
+  slashCommand:
+    # If false, the client will ignore this type of command when executed
+    enabled: true
+    # Enable user command cooldowns if available
+    enableCooldown: true
+    # Command register config
+    registerCommands:
+      # Allow commands to be registered globally
+      registerGlobally: true
+      # Allow commands to be registered a given guilds/servers
+      registerToGuilds: []
+    # If enabled, the client will accept replied interactions of this type
+    acceptRepliedInteractions: false
+  messageCommand:
+    # If false, the client will ignore this type of command when executed
+    enabled: true
+    # Enable user command cooldowns if available
+    enableCooldown: true
+    # String separator for command options
+    commandArgumentSeparator: ' '
+    # Command prefix
+    prefix: '!'
+  additionalApplicationCommands:
+    # Command register config
+    registerCommands:
+      # Allow commands to be registered globally
+      registerGlobally: true
+      # Allow commands to be registered a given guilds/servers
+      registerToGuilds: []
+
+# Application commands register config
+applicationCommandRegister:
+  # Wether allow all application commands to be registered globally
+  #   This ignores their specific configs
+  allowRegisterGlobally: true
+  # Wether allow all application commands to be registered to guilds
+  #   This ignores their specific configs
+  allowRegisterOnGuilds: true
+  # Register empty command list
+  registerEmptyCommands: true
+
+# Logger config
+logger:
+  # Enables client logger
+  enabled: true
+  # Enables logger debug mode
+  debugmode: false
+  # Enables colored console logs
+  coloredMessages: true
+  # File file config
+  logToFile:
+    # Enables log file
+    enabled: true
+    # Sets the log file folder
+    logsFolder: './logs'
+
+# Modules config
+modules:
+  # Reciple modules folders
+  #   You can add multiple folders by adding the folder path or using glob patterns
+  modulesFolders: ['./modules']
+  # Excluded files or folders
+  #   You can add the file/folder name or use glob patterns
+  exclude: []
+  # If false, the client will still load unsupported modules
+  disableModuleVersionCheck: false
+  # Resolve files in modules folder with ".ts" file extension
+  #   This feature is experimental
+  typescriptModules:
+    enabled: false
+    compilerOptions:
+      target: ESNext
+      module: NodeNext
+
+# Discord.js client options
+client:
+  intents:
+    - 'Guilds'
+    - 'GuildMessages'
+    - 'MessageContent'
+
+# Don't change this value
+version: ^VERSION