@sapphire/plugin-subcommands 2.0.0-pr-145.4dbd0994.0 → 2.0.1
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/dist/lib/SubCommandEntry.d.ts +7 -7
- package/dist/lib/SubCommandEntry.d.ts.map +1 -1
- package/dist/lib/SubCommandEntry.js.map +1 -1
- package/dist/lib/SubCommandEntryCommand.d.ts +1 -1
- package/dist/lib/SubCommandEntryCommand.d.ts.map +1 -1
- package/dist/lib/SubCommandEntryCommand.js +2 -2
- package/dist/lib/SubCommandEntryCommand.js.map +1 -1
- package/dist/lib/SubCommandEntryMethod.d.ts +1 -1
- package/dist/lib/SubCommandEntryMethod.d.ts.map +1 -1
- package/dist/lib/SubCommandEntryMethod.js +1 -1
- package/dist/lib/SubCommandEntryMethod.js.map +1 -1
- package/dist/lib/SubCommandManager.d.ts +1 -1
- package/dist/lib/SubCommandManager.d.ts.map +1 -1
- package/dist/lib/SubCommandManager.js +3 -3
- package/dist/lib/SubCommandManager.js.map +1 -1
- package/dist/lib/SubCommandPluginCommand.d.ts +2 -2
- package/dist/lib/SubCommandPluginCommand.d.ts.map +1 -1
- package/dist/lib/SubCommandPluginCommand.js +3 -3
- package/dist/lib/SubCommandPluginCommand.js.map +1 -1
- package/package.json +6 -6
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Args,
|
|
1
|
+
import { Args, Awaitable, Command, CommandContext } from '@sapphire/framework';
|
|
2
2
|
import type { Message } from 'discord.js';
|
|
3
3
|
/**
|
|
4
4
|
* @since 1.0.0
|
|
@@ -7,11 +7,11 @@ import type { Message } from 'discord.js';
|
|
|
7
7
|
* @see {@link SubCommandEntryMethod}
|
|
8
8
|
*/
|
|
9
9
|
export declare abstract class SubCommandEntry<ArgType extends Args = Args, CommandType extends Command<ArgType> = Command<ArgType>> {
|
|
10
|
-
readonly input: string | ((context: SubCommandEntry.
|
|
10
|
+
readonly input: string | ((context: SubCommandEntry.MessageRunContext<ArgType, CommandType>) => Awaitable<string>);
|
|
11
11
|
readonly output: string;
|
|
12
12
|
constructor(options: SubCommandEntry.Options<ArgType, CommandType>);
|
|
13
|
-
match(value: string, context: SubCommandEntry.
|
|
14
|
-
abstract
|
|
13
|
+
match(value: string, context: SubCommandEntry.MessageRunContext<ArgType, CommandType>): Promise<boolean>;
|
|
14
|
+
abstract messageRun(context: SubCommandEntry.MessageRunContext<ArgType, CommandType>): unknown;
|
|
15
15
|
}
|
|
16
16
|
export declare namespace SubCommandEntry {
|
|
17
17
|
/**
|
|
@@ -27,14 +27,14 @@ export declare namespace SubCommandEntry {
|
|
|
27
27
|
* ```
|
|
28
28
|
*/
|
|
29
29
|
interface Options<ArgType extends Args = Args, CommandType extends Command<ArgType> = Command<ArgType>> {
|
|
30
|
-
input: string | ((context:
|
|
30
|
+
input: string | ((context: MessageRunContext<ArgType, CommandType>) => Awaitable<string>);
|
|
31
31
|
output?: string;
|
|
32
32
|
}
|
|
33
33
|
/**
|
|
34
|
-
*
|
|
34
|
+
* MessageRunContext is passed to SubCommandManager.messageRun() and to input (if it is a function)
|
|
35
35
|
* @see {@link SubCommandEntry.Options}
|
|
36
36
|
*/
|
|
37
|
-
interface
|
|
37
|
+
interface MessageRunContext<ArgType extends Args = Args, CommandType extends Command<ArgType> = Command<ArgType>> {
|
|
38
38
|
command: CommandType;
|
|
39
39
|
message: Message;
|
|
40
40
|
args: ArgType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubCommandEntry.d.ts","sourceRoot":"","sources":["../../src/lib/SubCommandEntry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"SubCommandEntry.d.ts","sourceRoot":"","sources":["../../src/lib/SubCommandEntry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAa,MAAM,qBAAqB,CAAC;AAE1F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C;;;;;GAKG;AACH,8BAAsB,eAAe,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IACzH,SAAgB,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1H,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAEZ,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC;IAM5D,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;aAMrG,UAAU,CAAC,OAAO,EAAE,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,OAAO;CACrG;AAGD,yBAAiB,eAAe,CAAC;IAChC;;;;;;;;;;;OAWG;IACH,UAAiB,OAAO,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5G,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1F,MAAM,CAAC,EAAE,MAAM,CAAC;KAChB;IAED;;;OAGG;IACH,UAAiB,iBAAiB,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;QACtH,OAAO,EAAE,WAAW,CAAC;QACrB,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,EAAE,OAAO,CAAC;QACd,OAAO,EAAE,cAAc,CAAC;KACxB;CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubCommandEntry.js","sourceRoot":"","sources":["../../src/lib/SubCommandEntry.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"SubCommandEntry.js","sourceRoot":"","sources":["../../src/lib/SubCommandEntry.ts"],"names":[],"mappings":";;;AAAA,mDAA0F;AAC1F,mDAAiD;AAGjD;;;;;GAKG;AACH,MAAsB,eAAe;IAIpC,YAAmB,OAAsD;QAHzE;;;;;WAA0H;QAC1H;;;;;WAA+B;QAG9B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ;YAAE,MAAM,IAAI,cAAc,CAAC,qBAAqB,CAAC,CAAC;QAC1G,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAK,OAAO,CAAC,KAAgB,CAAC;IAC3D,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,KAAa,EAAE,OAAgE;QACjG,MAAM,KAAK,GAAG,IAAA,sBAAU,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;QAC9E,MAAM,eAAe,GAAG,qBAAS,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC;QACzE,OAAO,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC;IACxF,CAAC;CAGD;AAjBD,0CAiBC"}
|
|
@@ -12,6 +12,6 @@ import { SubCommandEntry } from './SubCommandEntry';
|
|
|
12
12
|
* ```
|
|
13
13
|
*/
|
|
14
14
|
export declare class SubCommandEntryCommand<ArgType extends Args = Args, CommandType extends Command<ArgType> = Command<ArgType>> extends SubCommandEntry<ArgType, CommandType> {
|
|
15
|
-
|
|
15
|
+
messageRun(context: SubCommandEntry.MessageRunContext<ArgType, CommandType>): unknown;
|
|
16
16
|
}
|
|
17
17
|
//# sourceMappingURL=SubCommandEntryCommand.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubCommandEntryCommand.d.ts","sourceRoot":"","sources":["../../src/lib/SubCommandEntryCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAa,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;;;;;;;;GAUG;AACH,qBAAa,sBAAsB,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAE,SAAQ,eAAe,CAChJ,OAAO,EACP,WAAW,CACX;IACO,
|
|
1
|
+
{"version":3,"file":"SubCommandEntryCommand.d.ts","sourceRoot":"","sources":["../../src/lib/SubCommandEntryCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAa,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;;;;;;;;GAUG;AACH,qBAAa,sBAAsB,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAE,SAAQ,eAAe,CAChJ,OAAO,EACP,WAAW,CACX;IACO,UAAU,CAAC,OAAO,EAAE,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,OAAO;CAK5F"}
|
|
@@ -15,10 +15,10 @@ const SubCommandEntry_1 = require("./SubCommandEntry");
|
|
|
15
15
|
* ```
|
|
16
16
|
*/
|
|
17
17
|
class SubCommandEntryCommand extends SubCommandEntry_1.SubCommandEntry {
|
|
18
|
-
|
|
18
|
+
messageRun(context) {
|
|
19
19
|
const command = framework_1.container.stores.get('commands').get(this.output);
|
|
20
20
|
if (command)
|
|
21
|
-
return command.
|
|
21
|
+
return command.messageRun(context.message, context.args, context.context);
|
|
22
22
|
throw new ReferenceError(`The command '${this.input}' does not exist.`);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubCommandEntryCommand.js","sourceRoot":"","sources":["../../src/lib/SubCommandEntryCommand.ts"],"names":[],"mappings":";;;AAAA,mDAA+D;AAC/D,uDAAoD;AAEpD;;;;;;;;;;GAUG;AACH,MAAa,sBAA6G,SAAQ,iCAGjI;IACO,
|
|
1
|
+
{"version":3,"file":"SubCommandEntryCommand.js","sourceRoot":"","sources":["../../src/lib/SubCommandEntryCommand.ts"],"names":[],"mappings":";;;AAAA,mDAA+D;AAC/D,uDAAoD;AAEpD;;;;;;;;;;GAUG;AACH,MAAa,sBAA6G,SAAQ,iCAGjI;IACO,UAAU,CAAC,OAAgE;QACjF,MAAM,OAAO,GAAG,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,OAAO;YAAE,OAAO,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACvF,MAAM,IAAI,cAAc,CAAC,gBAAgB,IAAI,CAAC,KAAK,mBAAmB,CAAC,CAAC;IACzE,CAAC;CACD;AATD,wDASC"}
|
|
@@ -26,6 +26,6 @@ import { SubCommandEntry } from './SubCommandEntry';
|
|
|
26
26
|
* ```
|
|
27
27
|
*/
|
|
28
28
|
export declare class SubCommandEntryMethod<ArgType extends Args = Args, CommandType extends Command<ArgType> = Command<ArgType>> extends SubCommandEntry<ArgType, CommandType> {
|
|
29
|
-
|
|
29
|
+
messageRun(context: SubCommandEntry.MessageRunContext<ArgType, CommandType>): unknown;
|
|
30
30
|
}
|
|
31
31
|
//# sourceMappingURL=SubCommandEntryMethod.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubCommandEntryMethod.d.ts","sourceRoot":"","sources":["../../src/lib/SubCommandEntryMethod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,qBAAa,qBAAqB,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAE,SAAQ,eAAe,CAC/I,OAAO,EACP,WAAW,CACX;IACO,
|
|
1
|
+
{"version":3,"file":"SubCommandEntryMethod.d.ts","sourceRoot":"","sources":["../../src/lib/SubCommandEntryMethod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,qBAAa,qBAAqB,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAE,SAAQ,eAAe,CAC/I,OAAO,EACP,WAAW,CACX;IACO,UAAU,CAAC,OAAO,EAAE,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,OAAO;CAK5F"}
|
|
@@ -28,7 +28,7 @@ const SubCommandEntry_1 = require("./SubCommandEntry");
|
|
|
28
28
|
* ```
|
|
29
29
|
*/
|
|
30
30
|
class SubCommandEntryMethod extends SubCommandEntry_1.SubCommandEntry {
|
|
31
|
-
|
|
31
|
+
messageRun(context) {
|
|
32
32
|
const method = Reflect.get(context.command, this.output);
|
|
33
33
|
if (method)
|
|
34
34
|
return Reflect.apply(method, context.command, [context.message, context.args, context.context]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubCommandEntryMethod.js","sourceRoot":"","sources":["../../src/lib/SubCommandEntryMethod.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAEpD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAa,qBAA4G,SAAQ,iCAGhI;IACO,
|
|
1
|
+
{"version":3,"file":"SubCommandEntryMethod.js","sourceRoot":"","sources":["../../src/lib/SubCommandEntryMethod.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAEpD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAa,qBAA4G,SAAQ,iCAGhI;IACO,UAAU,CAAC,OAAgE;QACjF,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,MAAM;YAAE,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5G,MAAM,IAAI,cAAc,CAAC,eAAe,IAAI,CAAC,KAAK,qCAAqC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC;IAClH,CAAC;CACD;AATD,sDASC"}
|
|
@@ -5,7 +5,7 @@ export declare class SubCommandManager<ArgType extends Args = Args, CommandType
|
|
|
5
5
|
private readonly entries;
|
|
6
6
|
private readonly default;
|
|
7
7
|
constructor(entries: SubCommandManager.RawEntries<ArgType, CommandType>);
|
|
8
|
-
|
|
8
|
+
messageRun(context: SubCommandEntry.MessageRunContext<ArgType, CommandType>): Promise<unknown>;
|
|
9
9
|
protected resolve(value: string | SubCommandManager.Entry<ArgType, CommandType>): SubCommandManager.Entry<ArgType, CommandType>;
|
|
10
10
|
static readonly handlers: Map<string, typeof SubCommandEntryCommand>;
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubCommandManager.d.ts","sourceRoot":"","sources":["../../src/lib/SubCommandManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAA+B,MAAM,qBAAqB,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,qBAAa,iBAAiB,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAClH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+C;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsD;gBAE3D,OAAO,EAAE,iBAAiB,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC;IAgBjE,
|
|
1
|
+
{"version":3,"file":"SubCommandManager.d.ts","sourceRoot":"","sources":["../../src/lib/SubCommandManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAA+B,MAAM,qBAAqB,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,qBAAa,iBAAiB,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAClH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+C;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsD;gBAE3D,OAAO,EAAE,iBAAiB,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC;IAgBjE,UAAU,CAAC,OAAO,EAAE,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC;IAmBxF,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC;IAK/H,gBAAuB,QAAQ,6CAG5B;CACH;AAGD,yBAAiB,iBAAiB,CAAC;IAClC,KAAY,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAC;IACxC,UAAiB,KAAK,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAC1G,SAAQ,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC;QACrD,IAAI,CAAC,EAAE,IAAI,CAAC;QACZ,OAAO,CAAC,EAAE,OAAO,CAAC;KAClB;IAED,KAAY,UAAU,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,SAAS,CACrH,MAAM,GACN,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,CAC7B,EAAE,CAAC;CACJ"}
|
|
@@ -32,20 +32,20 @@ class SubCommandManager {
|
|
|
32
32
|
this.entries.push(entry);
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
|
-
async
|
|
35
|
+
async messageRun(context) {
|
|
36
36
|
// Pick one argument, then try to match a subcommand:
|
|
37
37
|
context.args.save();
|
|
38
38
|
const value = context.args.nextMaybe();
|
|
39
39
|
if (value.exists) {
|
|
40
40
|
for (const entry of this.entries) {
|
|
41
41
|
if (await entry.match(value.value, context))
|
|
42
|
-
return entry.
|
|
42
|
+
return entry.messageRun(context);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
// No subcommand matched, let's restore and try to run default, if any:
|
|
46
46
|
context.args.restore();
|
|
47
47
|
if (this.default)
|
|
48
|
-
return this.default.
|
|
48
|
+
return this.default.messageRun(context);
|
|
49
49
|
// No match and no subcommand, return an err:
|
|
50
50
|
return (0, framework_1.err)(new framework_1.UserError({ identifier: "subCommandNoMatch" /* SubCommandNoMatch */, context }));
|
|
51
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubCommandManager.js","sourceRoot":"","sources":["../../src/lib/SubCommandManager.ts"],"names":[],"mappings":";;;AAAA,mDAAiF;AAEjF,qEAAkE;AAClE,mEAAgE;AAEhE,MAAa,iBAAiB;IAI7B,YAAmB,OAA2D;QAH9E;;;;mBAAoE,EAAE;WAAC;QACvE;;;;mBAAyE,IAAI;WAAC;QAG7E,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;YAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,IAAI,GAAG,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC;YACpE,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,cAAc,CAAC,0CAA0C,KAAK,CAAC,IAAI,oCAAoC,CAAC,CAAC;YAE9H,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,KAAK,CAAC,OAAO,EAAE;gBAClB,IAAI,IAAI,CAAC,OAAO;oBAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,CAAC,OAAO,CAAC,KAAK,kBAAkB,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;gBAC1H,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;aACrB;YAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACzB;IACF,CAAC;IAEM,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"SubCommandManager.js","sourceRoot":"","sources":["../../src/lib/SubCommandManager.ts"],"names":[],"mappings":";;;AAAA,mDAAiF;AAEjF,qEAAkE;AAClE,mEAAgE;AAEhE,MAAa,iBAAiB;IAI7B,YAAmB,OAA2D;QAH9E;;;;mBAAoE,EAAE;WAAC;QACvE;;;;mBAAyE,IAAI;WAAC;QAG7E,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;YAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,IAAI,GAAG,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC;YACpE,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,cAAc,CAAC,0CAA0C,KAAK,CAAC,IAAI,oCAAoC,CAAC,CAAC;YAE9H,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,KAAK,CAAC,OAAO,EAAE;gBAClB,IAAI,IAAI,CAAC,OAAO;oBAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,CAAC,OAAO,CAAC,KAAK,kBAAkB,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;gBAC1H,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;aACrB;YAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACzB;IACF,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,OAAgE;QACvF,qDAAqD;QACrD,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAEvC,IAAI,KAAK,CAAC,MAAM,EAAE;YACjB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;gBACjC,IAAI,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC;oBAAE,OAAO,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;aAC9E;SACD;QAED,uEAAuE;QACvE,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAE1D,6CAA6C;QAC7C,OAAO,IAAA,eAAG,EAAC,IAAI,qBAAS,CAAC,EAAE,UAAU,6CAA+B,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IACnF,CAAC;IAES,OAAO,CAAC,KAA6D;QAC9E,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC5C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACxD,CAAC;;AA1CF,8CAgDC;AAJA;;;;WAAkC,IAAI,GAAG,CAAC;QACzC,CAAC,SAAS,EAAE,+CAAsB,CAAC;QACnC,CAAC,QAAQ,EAAE,6CAAqB,CAAC;KACjC,CAAC;GAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Args,
|
|
1
|
+
import { Args, Awaitable, Command, CommandContext, CommandOptions, PieceContext } from '@sapphire/framework';
|
|
2
2
|
import type { Message } from 'discord.js';
|
|
3
3
|
import { SubCommandManager } from './SubCommandManager';
|
|
4
4
|
export declare class SubCommandPluginCommand<ArgType extends Args = Args, CommandType extends Command<ArgType> = Command<ArgType>> extends Command<ArgType> {
|
|
5
5
|
readonly subCommands: SubCommandManager<ArgType, CommandType> | null;
|
|
6
6
|
constructor(context: PieceContext, options: SubCommandPluginCommandOptions<ArgType>);
|
|
7
|
-
|
|
7
|
+
messageRun(message: Message, args: ArgType, context: CommandContext): Awaitable<unknown>;
|
|
8
8
|
}
|
|
9
9
|
export interface SubCommandPluginCommandOptions<ArgType extends Args = Args, CommandType extends Command<ArgType> = Command<ArgType>> extends CommandOptions {
|
|
10
10
|
subCommands?: SubCommandManager.RawEntries<ArgType, CommandType>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubCommandPluginCommand.d.ts","sourceRoot":"","sources":["../../src/lib/SubCommandPluginCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"SubCommandPluginCommand.d.ts","sourceRoot":"","sources":["../../src/lib/SubCommandPluginCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC7G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,qBAAa,uBAAuB,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAE,SAAQ,OAAO,CAAC,OAAO,CAAC;IAClJ,SAAgB,WAAW,EAAE,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,IAAI,CAAC;gBAEzD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,8BAA8B,CAAC,OAAO,CAAC;IAMnF,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC;CAI/F;AAED,MAAM,WAAW,8BAA8B,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,EAAE,WAAW,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CACnI,SAAQ,cAAc;IACtB,WAAW,CAAC,EAAE,iBAAiB,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;CACjE;AAGD,yBAAiB,uBAAuB,CAAC;IACxC;;OAEG;IACH,KAAY,OAAO,GAAG,8BAA8B,CAAC;CACrD"}
|
|
@@ -14,10 +14,10 @@ class SubCommandPluginCommand extends framework_1.Command {
|
|
|
14
14
|
});
|
|
15
15
|
this.subCommands = options.subCommands ? new SubCommandManager_1.SubCommandManager(options.subCommands) : null;
|
|
16
16
|
}
|
|
17
|
-
|
|
17
|
+
messageRun(message, args, context) {
|
|
18
18
|
if (!this.subCommands)
|
|
19
|
-
throw new Error(`The command ${this.name} does not have a '
|
|
20
|
-
return this.subCommands.
|
|
19
|
+
throw new Error(`The command ${this.name} does not have a 'messageRun' method and does not support sub-commands.`);
|
|
20
|
+
return this.subCommands.messageRun({ message, args, context, command: this });
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
exports.SubCommandPluginCommand = SubCommandPluginCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubCommandPluginCommand.js","sourceRoot":"","sources":["../../src/lib/SubCommandPluginCommand.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"SubCommandPluginCommand.js","sourceRoot":"","sources":["../../src/lib/SubCommandPluginCommand.ts"],"names":[],"mappings":";;;AAAA,mDAA6G;AAE7G,2DAAwD;AAExD,MAAa,uBAA8G,SAAQ,mBAAgB;IAGlJ,YAAmB,OAAqB,EAAE,OAAgD;QACzF,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAHzB;;;;;WAA4E;QAK3E,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,qCAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5F,CAAC;IAEM,UAAU,CAAC,OAAgB,EAAE,IAAa,EAAE,OAAuB;QACzE,IAAI,CAAC,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,IAAI,yEAAyE,CAAC,CAAC;QAC1I,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAA8B,EAAE,CAAC,CAAC;IACzG,CAAC;CACD;AAbD,0DAaC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sapphire/plugin-subcommands",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.1",
|
|
4
4
|
"description": "Plugin for @sapphire/framework that adds support for subcommands.",
|
|
5
5
|
"author": "@sapphire",
|
|
6
6
|
"license": "MIT",
|
|
@@ -18,8 +18,8 @@
|
|
|
18
18
|
"homepage": "https://github.com/sapphiredev/plugins/tree/main/packages/subcommands",
|
|
19
19
|
"scripts": {
|
|
20
20
|
"lint": "eslint src tests --ext ts --fix",
|
|
21
|
-
"build": "tsc -b src",
|
|
22
|
-
"
|
|
21
|
+
"build": "tsc -b src && yarn esm:default",
|
|
22
|
+
"esm:default": "gen-esm-wrapper dist/index.js dist/index.mjs",
|
|
23
23
|
"prepublishOnly": "yarn build"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
"!dist/*.tsbuildinfo"
|
|
36
36
|
],
|
|
37
37
|
"engines": {
|
|
38
|
-
"node": ">=v14.
|
|
39
|
-
"npm": ">=7.
|
|
38
|
+
"node": ">=v14.0.0",
|
|
39
|
+
"npm": ">=7.0.0"
|
|
40
40
|
},
|
|
41
41
|
"keywords": [
|
|
42
42
|
"sapphiredev",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"publishConfig": {
|
|
56
56
|
"access": "public"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "729b424807575f3c8dffe22ec9128619e3a00948"
|
|
59
59
|
}
|