reciple 7.3.2 → 7.4.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/classes/Config.d.ts
CHANGED
|
@@ -29,6 +29,7 @@ export declare class Config {
|
|
|
29
29
|
getConfig(): IConfig;
|
|
30
30
|
askToken(): Promise<string>;
|
|
31
31
|
parseToken(): string | null;
|
|
32
|
+
static resolveEnvValues<T extends Record<any, any> | string | Array<any>>(object: T, envFile?: string): T;
|
|
32
33
|
static defaultConfig(): IConfig;
|
|
33
34
|
static defaultConfigYaml(): string;
|
|
34
35
|
}
|
package/bin/classes/Config.js
CHANGED
|
@@ -10,6 +10,7 @@ const fs_1 = require("fs");
|
|
|
10
10
|
const parseEnvString_1 = require("../utils/parseEnvString");
|
|
11
11
|
const fallout_utility_1 = require("fallout-utility");
|
|
12
12
|
const cli_1 = require("../utils/cli");
|
|
13
|
+
const dotenv_1 = __importDefault(require("dotenv"));
|
|
13
14
|
const path_1 = __importDefault(require("path"));
|
|
14
15
|
const yaml_1 = __importDefault(require("yaml"));
|
|
15
16
|
class Config {
|
|
@@ -41,7 +42,7 @@ class Config {
|
|
|
41
42
|
if (!this.config)
|
|
42
43
|
throw new Error(`Config is not parsed`);
|
|
43
44
|
this.config.token = this.parseToken() || 'TOKEN';
|
|
44
|
-
return this.config;
|
|
45
|
+
return Config.resolveEnvValues(this.config);
|
|
45
46
|
}
|
|
46
47
|
async askToken() {
|
|
47
48
|
return (await (await import('prompts')).default({
|
|
@@ -58,6 +59,28 @@ class Config {
|
|
|
58
59
|
return token;
|
|
59
60
|
return (0, parseEnvString_1.parseEnvString)(token, cli_1.cli.options.env ? path_1.default.resolve(cli_1.cli.options.env) : path_1.default.join(cli_1.cli.cwd, '.env')) || null;
|
|
60
61
|
}
|
|
62
|
+
static resolveEnvValues(object, envFile) {
|
|
63
|
+
if (envFile)
|
|
64
|
+
dotenv_1.default.config({ path: envFile, override: true });
|
|
65
|
+
if (typeof object !== 'object')
|
|
66
|
+
return (typeof object === 'string' ? (0, parseEnvString_1.parseEnvString)(object) : object);
|
|
67
|
+
if (Array.isArray(object))
|
|
68
|
+
return object.map(v => (0, parseEnvString_1.parseEnvString)(v));
|
|
69
|
+
const keys = object ? Object.keys(object) : [];
|
|
70
|
+
const values = Object.values(object);
|
|
71
|
+
let newObject = {};
|
|
72
|
+
let i = 0;
|
|
73
|
+
for (const value of values) {
|
|
74
|
+
newObject = {
|
|
75
|
+
...newObject,
|
|
76
|
+
[keys[i]]: typeof value === 'string' || typeof value === 'object'
|
|
77
|
+
? this.resolveEnvValues(value)
|
|
78
|
+
: value
|
|
79
|
+
};
|
|
80
|
+
i++;
|
|
81
|
+
}
|
|
82
|
+
return newObject;
|
|
83
|
+
}
|
|
61
84
|
static defaultConfig() {
|
|
62
85
|
return yaml_1.default.parse(this.defaultConfigYaml());
|
|
63
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/classes/Config.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAmE;AACnE,4CAAgE;AAChE,2BAA6D;AAC7D,4DAAyD;AACzD,qDAA6C;AAE7C,sCAAmC;AACnC,gDAAwB;AACxB,gDAAuB;AAuBvB,MAAa,MAAM;IACR,MAAM,CAAC,iBAAiB,GAAW,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;IACnF,MAAM,GAAiB,IAAI,CAAC;IAC1B,UAAU,CAAS;IAE5B,YAAY,UAAkB;QAC1B,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC/D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,WAAW;QACpB,IAAI,CAAC,IAAA,eAAU,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YAC9B,IAAI,UAAU,GAAG,IAAA,4BAAU,EAAC,MAAM,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,gBAAO,CAAC,CAAC;YAC5E,MAAM,UAAU,GAAG,cAAG,CAAC,KAAK,CAAC,UAAU,CAAY,CAAC;YAEpD,IAAI,UAAU,CAAC,KAAK,KAAK,OAAO,EAAE;gBAC9B,UAAU,CAAC,KAAK,GAAG,SAAG,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,OAAO,CAAC;gBAC3E,UAAU,GAAG,IAAA,4BAAU,EAAC,UAAU,EAAE,cAAc,EAAE,UAAU,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;aACrF;YAED,IAAA,kBAAa,EAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;YACpD,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;SAC5B;aAAM;YACH,IAAI,CAAC,MAAM,GAAG,IAAA,yCAAmB,EAAC,cAAG,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;SACzG;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,SAAS;QACZ,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,OAAO,CAAC;QAEjD,OAAO,IAAI,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/classes/Config.ts"],"names":[],"mappings":"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"}
|
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.4.0",
|
|
7
7
|
"main": "./bin/index.js",
|
|
8
8
|
"module": "./bin/esm.mjs",
|
|
9
9
|
"types": "./bin/index.d.ts",
|
|
@@ -37,16 +37,16 @@
|
|
|
37
37
|
"README.md"
|
|
38
38
|
],
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@reciple/client": "^7.
|
|
40
|
+
"@reciple/client": "^7.4.0",
|
|
41
41
|
"commander": "^10.0.1",
|
|
42
42
|
"dotenv": "^16.0.3",
|
|
43
|
-
"fallout-utility": "^2.4.
|
|
43
|
+
"fallout-utility": "^2.4.3",
|
|
44
44
|
"globby": "^13.1.4",
|
|
45
45
|
"kleur": "^4.1.5",
|
|
46
46
|
"lodash.merge": "^4.6.2",
|
|
47
47
|
"micromatch": "^4.0.5",
|
|
48
48
|
"prompts": "^2.4.2",
|
|
49
|
-
"semver": "^7.
|
|
49
|
+
"semver": "^7.5.0",
|
|
50
50
|
"yaml": "^2.2.1"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"peerDependencies": {
|
|
60
60
|
"discord.js": "^14.7.1"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "71dbca421a78115bfdcd7af60bc932d2fe08fb9a"
|
|
63
63
|
}
|