reciple 7.7.3 → 7.8.0-dev.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/bin.mjs +11 -12
- package/bin/bin.mjs.map +1 -1
- package/bin/classes/Config.d.ts +2 -1
- package/bin/classes/Config.js +12 -5
- package/bin/classes/Config.js.map +1 -1
- package/bin/utils/cli.d.ts +15 -3
- package/bin/utils/cli.js +1 -1
- package/bin/utils/cli.js.map +1 -1
- package/bin/utils/getConfigExtensions.d.ts +1 -0
- package/bin/utils/getConfigExtensions.js +10 -4
- package/bin/utils/getConfigExtensions.js.map +1 -1
- package/bin/utils/modules.js +5 -4
- package/bin/utils/modules.js.map +1 -1
- package/package.json +7 -7
package/bin/bin.mjs
CHANGED
|
@@ -3,26 +3,25 @@ import { ContextMenuCommandBuilder, MessageCommandBuilder, SlashCommandBuilder,
|
|
|
3
3
|
import { getJsConfig, getModules } from './utils/modules.js';
|
|
4
4
|
import { createLogger, eventLogger } from './utils/logger.js';
|
|
5
5
|
import { checkLatestUpdate } from '@reciple/update-checker';
|
|
6
|
-
import { existsSync, mkdirSync, readdirSync } from 'fs';
|
|
7
6
|
import { command, cli, cliVersion } from './utils/cli.js';
|
|
7
|
+
import { mkdir, readdir } from 'fs/promises';
|
|
8
8
|
import { setTimeout } from 'timers/promises';
|
|
9
9
|
import { Config } from './classes/Config.js';
|
|
10
10
|
import { RecipleClient } from './index.js';
|
|
11
11
|
import micromatch from 'micromatch';
|
|
12
|
+
import { existsSync } from 'fs';
|
|
12
13
|
import prompts from 'prompts';
|
|
13
14
|
import semver from 'semver';
|
|
14
15
|
import kleur from 'kleur';
|
|
15
16
|
import path from 'path';
|
|
16
17
|
command.parse();
|
|
17
18
|
const allowedFiles = ['node_modules', 'reciple.yml', 'package.json', '.*'];
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
: path.join(cli.cwd, cli.options.config)
|
|
22
|
-
: path.join(cli.cwd, 'reciple.yml');
|
|
19
|
+
let configPaths = cli.options?.config?.map(c => path.isAbsolute(c) ? path.resolve(c) : path.join(cli.cwd, c));
|
|
20
|
+
configPaths = !configPaths?.length ? [path.join(cli.cwd, 'reciple.yml')] : configPaths;
|
|
21
|
+
const mainConfigPath = configPaths.shift();
|
|
23
22
|
if (!existsSync(cli.cwd))
|
|
24
|
-
|
|
25
|
-
if (
|
|
23
|
+
await mkdir(cli.cwd, { recursive: true });
|
|
24
|
+
if ((await readdir(cli.cwd)).filter(f => !micromatch.isMatch(f, allowedFiles)).length && !existsSync(mainConfigPath) && !cli.options.yes) {
|
|
26
25
|
const confirm = await prompts({
|
|
27
26
|
initial: false,
|
|
28
27
|
message: `Would you like to initialize your Reciple app ${cli.cwd !== process.cwd() ? 'in your chosen directory' : 'here'}?`,
|
|
@@ -32,7 +31,7 @@ if (readdirSync(cli.cwd).filter(f => !micromatch.isMatch(f, allowedFiles)).lengt
|
|
|
32
31
|
if (!confirm.confirm)
|
|
33
32
|
process.exit(0);
|
|
34
33
|
}
|
|
35
|
-
const configParser = await (new Config(
|
|
34
|
+
const configParser = await (new Config(mainConfigPath, configPaths)).parseConfig();
|
|
36
35
|
const config = configParser.getConfig();
|
|
37
36
|
const logger = config.logger?.enabled ? await createLogger(config.logger) : undefined;
|
|
38
37
|
if (cli.options.setup)
|
|
@@ -75,10 +74,10 @@ client.once('ready', async () => {
|
|
|
75
74
|
process.removeListener('uncaughtException', processErrorHandler);
|
|
76
75
|
process.removeListener('unhandledRejection', processErrorHandler);
|
|
77
76
|
const loadedModules = await client.modules.loadModules({
|
|
78
|
-
modules: client.modules.
|
|
77
|
+
modules: client.modules.cache.toJSON(),
|
|
79
78
|
resolveCommands: true
|
|
80
79
|
});
|
|
81
|
-
const unloaded = client.modules.
|
|
80
|
+
const unloaded = client.modules.cache.sweep(m => !loadedModules.some(s => s.id == m.id));
|
|
82
81
|
client.logger?.debug(`Failed to load (${unloaded}) modules.`);
|
|
83
82
|
let stopping = false;
|
|
84
83
|
const unloadModulesAndStopProcess = async (signal) => {
|
|
@@ -87,7 +86,7 @@ client.once('ready', async () => {
|
|
|
87
86
|
stopping = true;
|
|
88
87
|
await client.modules.unloadModules({
|
|
89
88
|
reason: 'ProcessExit',
|
|
90
|
-
modules: client.modules.
|
|
89
|
+
modules: client.modules.cache.toJSON(),
|
|
91
90
|
removeCommandsFromClient: false,
|
|
92
91
|
removeFromModulesCollection: true
|
|
93
92
|
});
|
package/bin/bin.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.mjs","sourceRoot":"","sources":["../src/bin.mts"],"names":[],"mappings":";AAEA,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC9H,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"bin.mjs","sourceRoot":"","sources":["../src/bin.mts"],"names":[],"mappings":"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"}
|
package/bin/classes/Config.d.ts
CHANGED
|
@@ -26,7 +26,8 @@ export declare class Config {
|
|
|
26
26
|
static defaultConfigPath: string;
|
|
27
27
|
config: IConfig | null;
|
|
28
28
|
readonly configPath: string;
|
|
29
|
-
|
|
29
|
+
readonly extensionPaths: string[];
|
|
30
|
+
constructor(configPath: string, extensionPaths?: string[]);
|
|
30
31
|
parseConfig(): Promise<this>;
|
|
31
32
|
getConfig(): IConfig;
|
|
32
33
|
askToken(): Promise<string>;
|
package/bin/classes/Config.js
CHANGED
|
@@ -9,18 +9,22 @@ const client_1 = require("@reciple/client");
|
|
|
9
9
|
const fs_1 = require("fs");
|
|
10
10
|
const parseEnvString_1 = require("../utils/parseEnvString");
|
|
11
11
|
const fallout_utility_1 = require("fallout-utility");
|
|
12
|
+
const discord_js_1 = require("discord.js");
|
|
12
13
|
const cli_1 = require("../utils/cli");
|
|
13
14
|
const dotenv_1 = __importDefault(require("dotenv"));
|
|
14
15
|
const path_1 = __importDefault(require("path"));
|
|
15
16
|
const yaml_1 = __importDefault(require("yaml"));
|
|
17
|
+
const kleur_1 = __importDefault(require("kleur"));
|
|
16
18
|
class Config {
|
|
17
19
|
static defaultConfigPath = path_1.default.join(__dirname, '../../static/config.yml');
|
|
18
20
|
config = null;
|
|
19
21
|
configPath;
|
|
20
|
-
|
|
22
|
+
extensionPaths = [];
|
|
23
|
+
constructor(configPath, extensionPaths) {
|
|
21
24
|
if (!configPath)
|
|
22
|
-
throw new
|
|
25
|
+
throw new client_1.RecipleError({ message: 'Config path is not defined', name: 'InvalidConfigPath' });
|
|
23
26
|
this.configPath = configPath;
|
|
27
|
+
this.extensionPaths = extensionPaths ?? [];
|
|
24
28
|
}
|
|
25
29
|
async parseConfig() {
|
|
26
30
|
if (!(0, fs_1.existsSync)(this.configPath)) {
|
|
@@ -34,13 +38,16 @@ class Config {
|
|
|
34
38
|
this.config = configData;
|
|
35
39
|
}
|
|
36
40
|
else {
|
|
37
|
-
this.config =
|
|
41
|
+
this.config = yaml_1.default.parse((0, fs_1.readFileSync)(this.configPath, 'utf-8'));
|
|
38
42
|
}
|
|
43
|
+
this.config.extends = (0, discord_js_1.normalizeArray)([this.config?.extends ?? []]);
|
|
44
|
+
this.config.extends.push(...this.extensionPaths);
|
|
45
|
+
this.config = (0, getConfigExtensions_1.getConfigExtensions)(this.config, this.configPath);
|
|
39
46
|
return this;
|
|
40
47
|
}
|
|
41
48
|
getConfig() {
|
|
42
49
|
if (!this.config)
|
|
43
|
-
throw new
|
|
50
|
+
throw new client_1.RecipleError({ message: 'Config is not parsed', name: 'InvalidParsedConfigData' });
|
|
44
51
|
this.config.token = this.parseToken() || 'TOKEN';
|
|
45
52
|
return Config.resolveEnvValues(this.config);
|
|
46
53
|
}
|
|
@@ -86,7 +93,7 @@ class Config {
|
|
|
86
93
|
}
|
|
87
94
|
static defaultConfigYaml() {
|
|
88
95
|
if (!(0, fs_1.existsSync)(this.defaultConfigPath))
|
|
89
|
-
throw new
|
|
96
|
+
throw new client_1.RecipleError(`Default config file does not exists '${kleur_1.default.yellow(this.defaultConfigPath)}'`);
|
|
90
97
|
return (0, fs_1.readFileSync)(this.defaultConfigPath, 'utf-8');
|
|
91
98
|
}
|
|
92
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/classes/Config.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/classes/Config.ts"],"names":[],"mappings":"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"}
|
package/bin/utils/cli.d.ts
CHANGED
|
@@ -1,19 +1,31 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
export declare let command: Command;
|
|
3
|
+
export interface CLIOptions {
|
|
4
|
+
version?: string;
|
|
5
|
+
token?: string;
|
|
6
|
+
config?: string[];
|
|
7
|
+
debugmode?: boolean;
|
|
8
|
+
yes?: boolean;
|
|
9
|
+
env?: string;
|
|
10
|
+
shardmode?: boolean;
|
|
11
|
+
setup?: boolean;
|
|
12
|
+
cacheConfig?: string;
|
|
13
|
+
sweeperConfig?: string;
|
|
14
|
+
}
|
|
3
15
|
export declare const cli: {
|
|
4
16
|
readonly args: string[];
|
|
5
|
-
readonly options:
|
|
17
|
+
readonly options: CLIOptions;
|
|
6
18
|
readonly cwd: string;
|
|
7
19
|
};
|
|
8
20
|
export declare const cliVersion: string;
|
|
9
21
|
/**
|
|
10
22
|
* @deprecated Use `cli` object instead
|
|
11
23
|
*/
|
|
12
|
-
export declare const flags:
|
|
24
|
+
export declare const flags: CLIOptions;
|
|
13
25
|
/**
|
|
14
26
|
* @deprecated Use `cli` object instead
|
|
15
27
|
*/
|
|
16
|
-
export declare const argvOptions: () =>
|
|
28
|
+
export declare const argvOptions: () => CLIOptions;
|
|
17
29
|
/**
|
|
18
30
|
* @deprecated Use `cli` object instead
|
|
19
31
|
*/
|
package/bin/utils/cli.js
CHANGED
|
@@ -17,7 +17,7 @@ exports.command = new commander_1.Command()
|
|
|
17
17
|
.version(`Reciple CLI: ${version}\nReciple Client: ${client_1.realVersion}`, '-v, --version')
|
|
18
18
|
.argument('[cwd]', 'Change the current working directory')
|
|
19
19
|
.option('-t, --token <token>', 'Replace used bot token')
|
|
20
|
-
.option('-c, --config <dir>', '
|
|
20
|
+
.option('-c, --config <dir>', 'Set path to a config file', (v, p) => p.concat([v]), [])
|
|
21
21
|
.option('-D, --debugmode', 'Enable debug mode')
|
|
22
22
|
.option('-y, --yes', 'Agree to all Reciple confirmation prompts')
|
|
23
23
|
.option('--env <file>', '.env file location')
|
package/bin/utils/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/utils/cli.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA8C;AAC9C,yCAAoC;AACpC,2BAAkC;AAClC,gDAAwB;AACxB,mCAAgC;AAChC,+BAAiC;AAEjC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAEpG,QAAA,OAAO,GAAG,IAAI,mBAAO,EAAE;KAC7B,IAAI,CAAC,SAAS,CAAC;KACf,WAAW,CAAC,WAAW,CAAC;KACxB,OAAO,CAAC,gBAAgB,OAAO,qBAAqB,oBAAW,EAAE,EAAE,eAAe,CAAC;KACnF,QAAQ,CAAC,OAAO,EAAE,sCAAsC,CAAC;KACzD,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC;KACvD,MAAM,CAAC,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/utils/cli.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA8C;AAC9C,yCAAoC;AACpC,2BAAkC;AAClC,gDAAwB;AACxB,mCAAgC;AAChC,+BAAiC;AAEjC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAEpG,QAAA,OAAO,GAAG,IAAI,mBAAO,EAAE;KAC7B,IAAI,CAAC,SAAS,CAAC;KACf,WAAW,CAAC,WAAW,CAAC;KACxB,OAAO,CAAC,gBAAgB,OAAO,qBAAqB,oBAAW,EAAE,EAAE,eAAe,CAAC;KACnF,QAAQ,CAAC,OAAO,EAAE,sCAAsC,CAAC;KACzD,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC;KACvD,MAAM,CAAC,oBAAoB,EAAE,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;KAChG,MAAM,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;KAC9C,MAAM,CAAC,WAAW,EAAE,2CAA2C,CAAC;KAChE,MAAM,CAAC,cAAc,EAAE,oBAAoB,CAAC;KAC5C,MAAM,CAAC,aAAa,EAAE,mDAAmD,CAAC;KAC1E,MAAM,CAAC,SAAS,EAAE,iDAAiD,CAAC;KACpE,MAAM,CAAC,uBAAuB,EAAE,2BAA2B,CAAC;KAC5D,MAAM,CAAC,yBAAyB,EAAE,2BAA2B,CAAC;KAC9D,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAejB,QAAA,GAAG,GAAG;IACf,IAAI,IAAI,KAAK,OAAO,eAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACnC,IAAI,OAAO,KAAK,OAAO,eAAO,CAAC,IAAI,EAAc,CAAC,CAAC,CAAC;IACpD,IAAI,GAAG,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;CAClF,CAAC;AAEW,QAAA,UAAU,GAAG,GAAG,IAAA,eAAM,EAAC,OAAO,CAAC,EAAE,CAAC;AAE/C,0BAA0B;AAE1B;;GAEG;AACU,QAAA,KAAK,GAAG,WAAG,CAAC,OAAO,CAAC;AAEjC;;GAEG;AACU,QAAA,WAAW,GAAG,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,WAAG,CAAC,OAAO,EAAE,wDAAwD,CAAC,CAAC;AAElH;;GAEG;AACU,QAAA,GAAG,GAAG,WAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,WAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC"}
|
|
@@ -3,11 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getConfigExtensions = void 0;
|
|
6
|
+
exports.getConfigExtensions = exports.configMergeCustomizer = void 0;
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
|
-
const
|
|
8
|
+
const client_1 = require("@reciple/client");
|
|
9
|
+
const lodash_mergewith_1 = __importDefault(require("lodash.mergewith"));
|
|
9
10
|
const path_1 = __importDefault(require("path"));
|
|
10
11
|
const yaml_1 = __importDefault(require("yaml"));
|
|
12
|
+
function configMergeCustomizer(objValue, srcValue, key) {
|
|
13
|
+
if (Array.isArray(objValue))
|
|
14
|
+
return srcValue;
|
|
15
|
+
}
|
|
16
|
+
exports.configMergeCustomizer = configMergeCustomizer;
|
|
11
17
|
function getConfigExtensions(config, configPath) {
|
|
12
18
|
if (!config.extends || Array.isArray(config.extends) && !config.extends.length)
|
|
13
19
|
return config;
|
|
@@ -19,9 +25,9 @@ function getConfigExtensions(config, configPath) {
|
|
|
19
25
|
: e);
|
|
20
26
|
for (const extension of extensions) {
|
|
21
27
|
if (!(0, fs_1.existsSync)(extension))
|
|
22
|
-
throw new
|
|
28
|
+
throw new client_1.RecipleError({ message: `Config extension file doesn't exists: ${extension}`, name: 'InvalidConfigExtensionPath' });
|
|
23
29
|
const configExtension = getConfigExtensions(yaml_1.default.parse((0, fs_1.readFileSync)(extension, 'utf-8')), extension);
|
|
24
|
-
config = (0,
|
|
30
|
+
config = (0, lodash_mergewith_1.default)(configExtension, config, configMergeCustomizer);
|
|
25
31
|
}
|
|
26
32
|
config.extends = extensions;
|
|
27
33
|
return config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConfigExtensions.js","sourceRoot":"","sources":["../../src/utils/getConfigExtensions.ts"],"names":[],"mappings":";;;;;;AAAA,2BAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"getConfigExtensions.js","sourceRoot":"","sources":["../../src/utils/getConfigExtensions.ts"],"names":[],"mappings":";;;;;;AAAA,2BAA8C;AAC9C,4CAA+C;AAC/C,wEAAqC;AACrC,gDAAwB;AACxB,gDAAuB;AAEvB,SAAgB,qBAAqB,CAAC,QAAa,EAAE,QAAa,EAAE,GAAW;IAC3E,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;AACjD,CAAC;AAFD,sDAEC;AAED,SAAgB,mBAAmB,CAA2C,MAAS,EAAE,UAAmB;IACxG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAE9F,IAAI,UAAU,GAAG,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;IACpF,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU;QACvC,CAAC,CAAC,cAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC,CAAC,CAAC;IAEb,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAChC,IAAI,CAAC,IAAA,eAAU,EAAC,SAAS,CAAC;YAAE,MAAM,IAAI,qBAAY,CAAC,EAAE,OAAO,EAAE,yCAAyC,SAAS,EAAE,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,CAAC;QAE1J,MAAM,eAAe,GAAG,mBAAmB,CAAC,cAAG,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAEpG,MAAM,GAAG,IAAA,0BAAK,EAAC,eAAe,EAAE,MAAM,EAAE,qBAAqB,CAAC,CAAC;KAClE;IAED,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC;IAE5B,OAAO,MAAM,CAAC;AAClB,CAAC;AArBD,kDAqBC"}
|
package/bin/utils/modules.js
CHANGED
|
@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getJsConfig = exports.getModules = void 0;
|
|
7
|
-
const fs_1 = require("fs");
|
|
8
7
|
const client_1 = require("@reciple/client");
|
|
8
|
+
const promises_1 = require("fs/promises");
|
|
9
9
|
const micromatch_1 = __importDefault(require("micromatch"));
|
|
10
|
+
const fs_1 = require("fs");
|
|
10
11
|
const cli_1 = require("./cli");
|
|
11
12
|
const path_1 = __importDefault(require("path"));
|
|
12
13
|
async function getModules(config, filter) {
|
|
@@ -28,10 +29,10 @@ async function getModules(config, filter) {
|
|
|
28
29
|
continue;
|
|
29
30
|
}
|
|
30
31
|
if (!(0, fs_1.existsSync)(dir))
|
|
31
|
-
(0,
|
|
32
|
-
if (!(0,
|
|
32
|
+
await (0, promises_1.mkdir)(dir, { recursive: true });
|
|
33
|
+
if (!(await (0, promises_1.lstat)(dir)).isDirectory())
|
|
33
34
|
continue;
|
|
34
|
-
const files = (0,
|
|
35
|
+
const files = (await (0, promises_1.readdir)(dir)).map(file => path_1.default.join(dir, file)).filter(f => !micromatch_1.default.isMatch(path_1.default.basename(f), config.exclude));
|
|
35
36
|
modules.push(...files.filter(file => (filter ? filter(file) : file.endsWith('.js'))));
|
|
36
37
|
}
|
|
37
38
|
return modules;
|
package/bin/utils/modules.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/utils/modules.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/utils/modules.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoD;AACpD,0CAAoD;AAGpD,4DAAoC;AACpC,2BAAgC;AAChC,+BAA4B;AAC5B,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,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAE1E,IAAI,gBAAgB,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,SAAG,CAAC,GAAG,EAAE,CAAC,EAAE;YAC5C,IAAI,cAAc,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE;gBAClC,GAAG,EAAE,SAAG,CAAC,GAAG;gBACZ,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,MAAM,IAAA,gBAAK,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,CAAC,MAAM,IAAA,gBAAK,EAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE;YAAE,SAAS;QAEhD,MAAM,KAAK,GAAG,CAAC,MAAM,IAAA,kBAAO,EAAC,GAAG,CAAC,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;QACxI,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,WAAW,CAAI,IAAY;IAC7C,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,SAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7E,OAAO,IAAA,0BAAiB,EAAI,MAAM,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC;AAJD,kCAIC"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"description": "Reciple is a Discord.js bot framework",
|
|
4
4
|
"homepage": "https://reciple.js.org/docs/reciple",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
|
-
"version": "7.
|
|
6
|
+
"version": "7.8.0-dev.0",
|
|
7
7
|
"main": "./bin/index.js",
|
|
8
8
|
"module": "./bin/esm.mjs",
|
|
9
9
|
"types": "./bin/index.d.ts",
|
|
@@ -37,21 +37,21 @@
|
|
|
37
37
|
"README.md"
|
|
38
38
|
],
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@reciple/client": "^7.
|
|
40
|
+
"@reciple/client": "^7.7.0-dev.0",
|
|
41
41
|
"@reciple/update-checker": "^7.0.2",
|
|
42
42
|
"commander": "^10.0.1",
|
|
43
|
-
"dotenv": "^16.
|
|
43
|
+
"dotenv": "^16.1.1",
|
|
44
44
|
"fallout-utility": "^2.5.1",
|
|
45
45
|
"globby": "^13.1.4",
|
|
46
46
|
"kleur": "^4.1.5",
|
|
47
|
-
"lodash.
|
|
47
|
+
"lodash.mergewith": "^4.6.2",
|
|
48
48
|
"micromatch": "^4.0.5",
|
|
49
49
|
"prompts": "^2.4.2",
|
|
50
50
|
"semver": "^7.5.1",
|
|
51
|
-
"yaml": "^2.
|
|
51
|
+
"yaml": "^2.3.1"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@types/lodash.
|
|
54
|
+
"@types/lodash.mergewith": "^4.6.7",
|
|
55
55
|
"@types/micromatch": "^4.0.2",
|
|
56
56
|
"@types/prompts": "^2.4.4",
|
|
57
57
|
"@types/semver": "^7.5.0",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"peerDependencies": {
|
|
61
61
|
"discord.js": "^14.7.1"
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "3e6e67522d3746969be52d3eda54b93f36f271cd"
|
|
64
64
|
}
|