@pikokr/command.ts 3.1.6 β 3.1.8-dev.f259c9e
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/.all-contributorsrc +14 -3
- package/README.md +19 -1
- package/dist/builtinModules/CommandHandler.js +1 -1
- package/dist/builtinModules/CommandHandler.js.map +1 -1
- package/dist/structures/CommandClient.d.ts +2 -2
- package/dist/structures/CommandClient.js +5 -4
- package/dist/structures/CommandClient.js.map +1 -1
- package/package.json +3 -2
- package/src/builtinModules/CommandHandler.ts +1 -1
- package/src/structures/CommandClient.ts +5 -5
package/.all-contributorsrc
CHANGED
|
@@ -5,8 +5,6 @@
|
|
|
5
5
|
"imageSize": 100,
|
|
6
6
|
"contributorsPerLine": 7,
|
|
7
7
|
"contributorsSortAlphabetically": false,
|
|
8
|
-
"badgeTemplate": "[](#contributors)",
|
|
9
|
-
"contributorTemplate": "<a href=\"<%= contributor.profile %>\"><img src=\"<%= contributor.avatar_url %>\" width=\"<%= options.imageSize %>px;\" alt=\"\"/><br /><sub><b><%= contributor.name %></b></sub></a>",
|
|
10
8
|
"types": {
|
|
11
9
|
"custom": {
|
|
12
10
|
"symbol": "π",
|
|
@@ -21,6 +19,18 @@
|
|
|
21
19
|
"name": "νλ§",
|
|
22
20
|
"avatar_url": "https://avatars.githubusercontent.com/u/68010770?v=4",
|
|
23
21
|
"profile": "https://pikokr.dev",
|
|
22
|
+
"contributions": [
|
|
23
|
+
"code",
|
|
24
|
+
"maintenance",
|
|
25
|
+
"ideas",
|
|
26
|
+
"doc"
|
|
27
|
+
]
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
"login": "PyBsh",
|
|
31
|
+
"name": "RootPi",
|
|
32
|
+
"avatar_url": "https://avatars.githubusercontent.com/u/59782214?v=4",
|
|
33
|
+
"profile": "https://github.com/PyBsh",
|
|
24
34
|
"contributions": [
|
|
25
35
|
"code"
|
|
26
36
|
]
|
|
@@ -29,5 +39,6 @@
|
|
|
29
39
|
"projectName": "command.ts",
|
|
30
40
|
"projectOwner": "pikokr",
|
|
31
41
|
"repoType": "github",
|
|
32
|
-
"repoHost": "https://github.com"
|
|
42
|
+
"repoHost": "https://github.com",
|
|
43
|
+
"commitConvention": "none"
|
|
33
44
|
}
|
package/README.md
CHANGED
|
@@ -1,9 +1,27 @@
|
|
|
1
1
|
# Command.TS
|
|
2
2
|
|
|
3
|
-
[](https://github.com/pikokr/command.ts/actions/workflows/publish.yml)
|
|
3
|
+
[](https://github.com/pikokr/command.ts/actions/workflows/publish.yml) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
|
|
4
|
+
[](#contributors-)
|
|
5
|
+
<!-- ALL-CONTRIBUTORS-BADGE:END -->
|
|
4
6
|
|
|
5
7
|
|
|
6
8
|
|
|
7
9
|
Command framework for discord.js
|
|
8
10
|
|
|
9
11
|
[Discord](https://discord.gg/EEhcPzsGHV) / [λ¬Έμ](https://v3.cts.pikokr.dev) / [V2 λ¬Έμ](https://command-ts-docs-ezojnktwv-pikokr.vercel.app/)
|
|
12
|
+
|
|
13
|
+
## Contributors
|
|
14
|
+
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
|
|
15
|
+
<!-- prettier-ignore-start -->
|
|
16
|
+
<!-- markdownlint-disable -->
|
|
17
|
+
<table>
|
|
18
|
+
<tr>
|
|
19
|
+
<td align="center"><a href="https://pikokr.dev"><img src="https://avatars.githubusercontent.com/u/68010770?v=4?s=100" width="100px;" alt=""/><br /><sub><b>νλ§</b></sub></a><br /><a href="https://github.com/pikokr/command.ts/commits?author=pikokr" title="Code">π»</a> <a href="#maintenance-pikokr" title="Maintenance">π§</a> <a href="#ideas-pikokr" title="Ideas, Planning, & Feedback">π€</a> <a href="https://github.com/pikokr/command.ts/commits?author=pikokr" title="Documentation">π</a></td>
|
|
20
|
+
<td align="center"><a href="https://github.com/PyBsh"><img src="https://avatars.githubusercontent.com/u/59782214?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RootPi</b></sub></a><br /><a href="https://github.com/pikokr/command.ts/commits?author=PyBsh" title="Code">π»</a></td>
|
|
21
|
+
</tr>
|
|
22
|
+
</table>
|
|
23
|
+
|
|
24
|
+
<!-- markdownlint-restore -->
|
|
25
|
+
<!-- prettier-ignore-end -->
|
|
26
|
+
|
|
27
|
+
<!-- ALL-CONTRIBUTORS-LIST:END -->
|
|
@@ -113,7 +113,7 @@ class CommandHandler extends BuiltInModule_1.BuiltInModule {
|
|
|
113
113
|
return error(new error_1.ArgumentNotProvided(i, cmd, msg));
|
|
114
114
|
}
|
|
115
115
|
const executed = yield converter.execute(converterModule, msg, arg);
|
|
116
|
-
if (executed === undefined && !argType.optional) {
|
|
116
|
+
if ((executed === undefined || executed === null) && !argType.optional) {
|
|
117
117
|
return error(new error_1.ArgumentNotProvided(i, cmd, msg));
|
|
118
118
|
}
|
|
119
119
|
argList.push(executed);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandHandler.js","sourceRoot":"","sources":["../../src/builtinModules/CommandHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CommandHandler.js","sourceRoot":"","sources":["../../src/builtinModules/CommandHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,6 @@ export interface CommandClientOptions {
|
|
|
15
15
|
command: CommandOptions;
|
|
16
16
|
owners: 'auto' | Snowflake[];
|
|
17
17
|
slashCommands: SlashCommandOptions;
|
|
18
|
-
logger: Logger;
|
|
19
18
|
}
|
|
20
19
|
export interface CommandClientOptionsParam {
|
|
21
20
|
command: Partial<CommandOptions>;
|
|
@@ -33,8 +32,9 @@ export declare class CommandClient {
|
|
|
33
32
|
private _isReady;
|
|
34
33
|
private fetchOwners;
|
|
35
34
|
ready(): Promise<void>;
|
|
36
|
-
constructor({ client, coolDownAdapter, ...options }: Partial<CommandClientOptionsParam> & {
|
|
35
|
+
constructor({ client, coolDownAdapter, logger, ...options }: Partial<CommandClientOptionsParam> & {
|
|
37
36
|
client: Client;
|
|
38
37
|
coolDownAdapter?: CoolDownAdapter;
|
|
38
|
+
logger?: Logger;
|
|
39
39
|
});
|
|
40
40
|
}
|
|
@@ -33,7 +33,7 @@ const rest_1 = require("@discordjs/rest");
|
|
|
33
33
|
const tslog_1 = require("tslog");
|
|
34
34
|
class CommandClient {
|
|
35
35
|
constructor(_a) {
|
|
36
|
-
var { client, coolDownAdapter } = _a, options = __rest(_a, ["client", "coolDownAdapter"]);
|
|
36
|
+
var { client, coolDownAdapter, logger } = _a, options = __rest(_a, ["client", "coolDownAdapter", "logger"]);
|
|
37
37
|
this.owners = [];
|
|
38
38
|
this.registry = new Registry_1.Registry(this);
|
|
39
39
|
this.rest = new rest_1.REST({
|
|
@@ -51,9 +51,8 @@ class CommandClient {
|
|
|
51
51
|
slashCommands: {
|
|
52
52
|
autoSync: true,
|
|
53
53
|
},
|
|
54
|
-
logger: new tslog_1.Logger({ name: 'Command.TS' }),
|
|
55
54
|
}, options);
|
|
56
|
-
this.logger =
|
|
55
|
+
this.logger = logger !== null && logger !== void 0 ? logger : new tslog_1.Logger({ name: 'Command.TS' });
|
|
57
56
|
if (this.options.owners !== 'auto') {
|
|
58
57
|
this.owners = this.options.owners;
|
|
59
58
|
}
|
|
@@ -85,7 +84,9 @@ class CommandClient {
|
|
|
85
84
|
const owners = yield this.fetchOwners();
|
|
86
85
|
this.owners.push(...owners);
|
|
87
86
|
}
|
|
88
|
-
|
|
87
|
+
if (this.options.slashCommands.autoSync) {
|
|
88
|
+
yield this.registry.syncCommands();
|
|
89
|
+
}
|
|
89
90
|
});
|
|
90
91
|
}
|
|
91
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandClient.js","sourceRoot":"","sources":["../../src/structures/CommandClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsB;AACtB,yCAAqC;AACrC,2CAA6D;AAC7D,sDAA2G;AAC3G,wCAAoE;AACpE,0CAAsC;AACtC,iCAA8B;
|
|
1
|
+
{"version":3,"file":"CommandClient.js","sourceRoot":"","sources":["../../src/structures/CommandClient.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pikokr/command.ts",
|
|
3
3
|
"description": "Discord.js command framework for typescript.",
|
|
4
|
-
"version": "3.1.
|
|
4
|
+
"version": "3.1.8-dev.f259c9e",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"license": "MIT",
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
"@discordjs/builders": "^0.6.0",
|
|
10
10
|
"@discordjs/rest": "^0.1.0-canary.0",
|
|
11
11
|
"@types/lodash": "^4.14.172",
|
|
12
|
+
"all-contributors-cli": "^6.20.0",
|
|
12
13
|
"discord.js": "^13.1.0",
|
|
13
14
|
"prettier": "^2.2.1",
|
|
14
15
|
"ts-node": "^10.1.0",
|
|
@@ -32,4 +33,4 @@
|
|
|
32
33
|
"docs:dev": "typedoc",
|
|
33
34
|
"docs:build": "typedoc"
|
|
34
35
|
}
|
|
35
|
-
}
|
|
36
|
+
}
|
|
@@ -110,7 +110,7 @@ export class CommandHandler extends BuiltInModule {
|
|
|
110
110
|
return error(new ArgumentNotProvided(i, cmd, msg))
|
|
111
111
|
}
|
|
112
112
|
const executed = await converter.execute(converterModule, msg, arg)
|
|
113
|
-
if (executed === undefined && !argType.optional) {
|
|
113
|
+
if ((executed === undefined || executed === null) && !argType.optional) {
|
|
114
114
|
return error(new ArgumentNotProvided(i, cmd, msg))
|
|
115
115
|
}
|
|
116
116
|
argList.push(executed)
|
|
@@ -20,7 +20,6 @@ export interface CommandClientOptions {
|
|
|
20
20
|
command: CommandOptions
|
|
21
21
|
owners: 'auto' | Snowflake[]
|
|
22
22
|
slashCommands: SlashCommandOptions
|
|
23
|
-
logger: Logger
|
|
24
23
|
}
|
|
25
24
|
|
|
26
25
|
export interface CommandClientOptionsParam {
|
|
@@ -58,10 +57,12 @@ export class CommandClient {
|
|
|
58
57
|
const owners = await this.fetchOwners()
|
|
59
58
|
this.owners.push(...owners)
|
|
60
59
|
}
|
|
61
|
-
|
|
60
|
+
if (this.options.slashCommands.autoSync) {
|
|
61
|
+
await this.registry.syncCommands()
|
|
62
|
+
}
|
|
62
63
|
}
|
|
63
64
|
|
|
64
|
-
constructor({ client, coolDownAdapter, ...options }: Partial<CommandClientOptionsParam> & { client: Client; coolDownAdapter?: CoolDownAdapter }) {
|
|
65
|
+
constructor({ client, coolDownAdapter, logger, ...options }: Partial<CommandClientOptionsParam> & { client: Client; coolDownAdapter?: CoolDownAdapter; logger?: Logger }) {
|
|
65
66
|
this.client = client
|
|
66
67
|
this.coolDownAdapter = coolDownAdapter || new DefaultCoolDownAdapter()
|
|
67
68
|
this.options = _.merge<CommandClientOptions, Partial<CommandClientOptionsParam>>(
|
|
@@ -74,12 +75,11 @@ export class CommandClient {
|
|
|
74
75
|
slashCommands: {
|
|
75
76
|
autoSync: true,
|
|
76
77
|
},
|
|
77
|
-
logger: new Logger({ name: 'Command.TS' }),
|
|
78
78
|
},
|
|
79
79
|
options,
|
|
80
80
|
)
|
|
81
81
|
|
|
82
|
-
this.logger =
|
|
82
|
+
this.logger = logger ?? new Logger({ name: 'Command.TS' })
|
|
83
83
|
|
|
84
84
|
if (this.options.owners !== 'auto') {
|
|
85
85
|
this.owners = this.options.owners
|