sugar-djs 0.4.2 → 0.4.4
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/collection.js +2 -2
- package/dist/collection.js.map +1 -1
- package/dist/types.d.ts +2 -2
- package/dist/wrapper.d.ts +15 -21
- package/dist/wrapper.js +18 -33
- package/dist/wrapper.js.map +1 -1
- package/package.json +1 -1
package/dist/collection.js
CHANGED
|
@@ -98,7 +98,7 @@ class WrapperCollection {
|
|
|
98
98
|
}
|
|
99
99
|
else {
|
|
100
100
|
try {
|
|
101
|
-
this.execute({ interaction, args }, component.execute, component.middlewares);
|
|
101
|
+
this.execute({ interaction, args }, component.execute, [...component.middlewares]);
|
|
102
102
|
}
|
|
103
103
|
catch (error) {
|
|
104
104
|
console.log(`Error on component "${interaction.customId}"`);
|
|
@@ -131,7 +131,7 @@ class WrapperCollection {
|
|
|
131
131
|
}
|
|
132
132
|
else {
|
|
133
133
|
try {
|
|
134
|
-
this.execute({ interaction }, command.execute, command.middlewares);
|
|
134
|
+
this.execute({ interaction }, command.execute, [...command.middlewares]);
|
|
135
135
|
}
|
|
136
136
|
catch (error) {
|
|
137
137
|
console.log(`Error on ${commandType} "${interaction.commandName}"`);
|
package/dist/collection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export type MaybePromise<T> = T | Promise<T>;
|
|
|
4
4
|
/**
|
|
5
5
|
* スマートコンポーネントで作れるコマンド
|
|
6
6
|
*/
|
|
7
|
-
type SlashCommandBuilder = SCB | Omit<SCB, 'addSubcommand' | 'addSubcommandGroup'> | SlashCommandOptionsOnlyBuilder | SlashCommandSubcommandsOnlyBuilder;
|
|
7
|
+
export type SlashCommandBuilder = SCB | Omit<SCB, 'addSubcommand' | 'addSubcommandGroup'> | SlashCommandOptionsOnlyBuilder | SlashCommandSubcommandsOnlyBuilder;
|
|
8
8
|
export type AnyCommandBuilder = SlashCommandBuilder | ContextMenuCommandBuilder;
|
|
9
9
|
/**
|
|
10
10
|
* スマートコンポーネントで作れるコンポーネント
|
|
@@ -31,6 +31,7 @@ export type inferInteractionType<T extends AnyCommandBuilder> = T extends SlashC
|
|
|
31
31
|
/**
|
|
32
32
|
* コマンドタイプからコンテキストメニューインタラクションへ変換
|
|
33
33
|
*/
|
|
34
|
+
export type inferCommandType<CommandType extends ApplicationCommandType> = CommandType extends ApplicationCommandType.User ? UserContextMenuCommandInteraction : CommandType extends ApplicationCommandType.Message ? MessageContextMenuCommandInteraction : never;
|
|
34
35
|
export type MiddlewarePayload<T extends AnyInteraction = AnyInteraction<any>, U extends any = {}> = {
|
|
35
36
|
interaction: T;
|
|
36
37
|
} & U;
|
|
@@ -41,4 +42,3 @@ export interface MiddlewarePayloadWithArgs<T extends AnyComponentInteraction = A
|
|
|
41
42
|
args: string[];
|
|
42
43
|
}
|
|
43
44
|
export type Middleware<T extends AnyInteraction = AnyInteraction<any>, U extends any = {}, V extends MiddlewarePayload<T, U> = MiddlewarePayload<T, U>> = (input: MiddlewarePayload<T, U>) => MaybePromise<V | void>;
|
|
44
|
-
export {};
|
package/dist/wrapper.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ApplicationCommandType, AutocompleteInteraction, ContextMenuCommandBuilder, ContextMenuCommandType } from 'discord.js';
|
|
2
2
|
import { z } from 'zod';
|
|
3
|
-
import { AnyBuilder, AnyCommandBuilder, AnyCommandInteraction, AnyComponentBuilder, AnyComponentInteraction, AnyInteraction, MaybePromise, Middleware, MiddlewarePayload, UnwrapOrDefault, inferInteraction, inferInteractionType } from './types';
|
|
3
|
+
import { AnyBuilder, AnyCommandBuilder, AnyCommandInteraction, AnyComponentBuilder, AnyComponentInteraction, AnyInteraction, MaybePromise, Middleware, MiddlewarePayload, SlashCommandBuilder, UnwrapOrDefault, inferCommandType, inferInteraction, inferInteractionType } from './types';
|
|
4
4
|
interface BaseWrapperReturnData<T extends AnyInteraction = AnyInteraction<any>> {
|
|
5
5
|
middlewares: Middleware<T>[];
|
|
6
6
|
execute: (input: MiddlewarePayload<T>) => void;
|
|
@@ -26,13 +26,7 @@ interface CommandBuilderDef<TParms extends CommandBuilderParms> {
|
|
|
26
26
|
middlewares: Middleware<TParms['_interaction']>[];
|
|
27
27
|
type: ApplicationCommandType;
|
|
28
28
|
}
|
|
29
|
-
type CommandBuilder = <T extends
|
|
30
|
-
type CommandBuilderReturnType<T extends AnyCommandBuilder> = T extends ContextMenuCommandBuilder ? CommandTypeRegister<{
|
|
31
|
-
_builder: T;
|
|
32
|
-
_builderType: inferInteractionType<T>;
|
|
33
|
-
_processInputData: MiddlewarePayload<inferInteraction<T>>;
|
|
34
|
-
_interaction: inferInteraction<T>;
|
|
35
|
-
}> : AutocompleteRegister<{
|
|
29
|
+
type CommandBuilder = <T extends SlashCommandBuilder = SlashCommandBuilder>(command: T) => AutocompleteRegister<{
|
|
36
30
|
_builder: T;
|
|
37
31
|
_builderType: inferInteractionType<T>;
|
|
38
32
|
_processInputData: MiddlewarePayload<inferInteraction<T>>;
|
|
@@ -64,15 +58,6 @@ interface AutocompleteRegister<TParms extends CommandBuilderParms> extends Comma
|
|
|
64
58
|
_interaction: TParms['_interaction'];
|
|
65
59
|
}>;
|
|
66
60
|
}
|
|
67
|
-
interface CommandTypeRegister<TParms extends CommandBuilderParms> {
|
|
68
|
-
_def: CommandBuilderDef<TParms>;
|
|
69
|
-
setType<T extends ContextMenuCommandType>(type: T): CommandProcessRegister<{
|
|
70
|
-
_builder: TParms['_builder'];
|
|
71
|
-
_builderType: T;
|
|
72
|
-
_processInputData: MiddlewarePayload<inferInteraction<TParms['_builder'], T>>;
|
|
73
|
-
_interaction: inferInteraction<TParms['_builder'], T>;
|
|
74
|
-
}>;
|
|
75
|
-
}
|
|
76
61
|
/**
|
|
77
62
|
* コマンドレジスターやイベントハンドラー用のデータ
|
|
78
63
|
*/
|
|
@@ -83,6 +68,18 @@ interface CommandData<TParms extends CommandBuilderParms> extends BaseWrapperRet
|
|
|
83
68
|
execute(input: TParms['_processInputData']): void;
|
|
84
69
|
}
|
|
85
70
|
export type AnyCommandData = CommandData<any>;
|
|
71
|
+
type ContextBuilder = <T extends ContextMenuCommandBuilder = ContextMenuCommandBuilder>(command: T) => ContextMenuCommandTypeRegister;
|
|
72
|
+
/**
|
|
73
|
+
* コンテキストメニューコマンドのタイプを登録する関数
|
|
74
|
+
*/
|
|
75
|
+
interface ContextMenuCommandTypeRegister {
|
|
76
|
+
setType<T extends ContextMenuCommandType>(type: T): CommandProcessRegister<{
|
|
77
|
+
_builder: ContextMenuCommandBuilder;
|
|
78
|
+
_builderType: T;
|
|
79
|
+
_processInputData: MiddlewarePayload<inferCommandType<T>>;
|
|
80
|
+
_interaction: inferCommandType<T>;
|
|
81
|
+
}>;
|
|
82
|
+
}
|
|
86
83
|
interface ComponentBuilderParms<Schema = any, Args extends z.ZodArray<z.ZodString> = z.ZodArray<z.ZodString>, Builder extends AnyComponentBuilder = AnyComponentBuilder, ComponentType extends 'function' | 'builder' = 'function' | 'builder', Interaction extends AnyComponentInteraction = AnyComponentInteraction<any>> extends BaseBuilderParms<Builder, Interaction> {
|
|
87
84
|
_schema: Schema;
|
|
88
85
|
_args: Args | undefined;
|
|
@@ -146,10 +143,7 @@ interface ComponentData<TParms extends ComponentBuilderParms> extends BaseWrappe
|
|
|
146
143
|
export type AnyComponentData = ComponentData<any>;
|
|
147
144
|
export declare const wrapper: {
|
|
148
145
|
setCommand: CommandBuilder;
|
|
149
|
-
|
|
150
|
-
* @deprecated Use setCommand with ContextMenuCommandBuilder instead.
|
|
151
|
-
*/
|
|
152
|
-
setCtxCommand: CommandBuilder;
|
|
146
|
+
setCtxCommand: ContextBuilder;
|
|
153
147
|
setComponent: ComponentBuilder;
|
|
154
148
|
};
|
|
155
149
|
export {};
|
package/dist/wrapper.js
CHANGED
|
@@ -5,21 +5,12 @@ const discord_js_1 = require("discord.js");
|
|
|
5
5
|
const zod_1 = require("zod");
|
|
6
6
|
const custom_id_1 = require("./custom-id");
|
|
7
7
|
const createCommandBuilder = function (command) {
|
|
8
|
-
let type = discord_js_1.ApplicationCommandType.ChatInput;
|
|
9
|
-
if (command instanceof discord_js_1.ContextMenuCommandBuilder) {
|
|
10
|
-
type = command.type;
|
|
11
|
-
}
|
|
12
8
|
const _def = {
|
|
13
9
|
middlewares: [],
|
|
14
|
-
type:
|
|
10
|
+
type: discord_js_1.ApplicationCommandType.ChatInput,
|
|
15
11
|
builder: command,
|
|
16
12
|
};
|
|
17
|
-
|
|
18
|
-
return commandTypeRegister(_def);
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
return autocompleteRegister(_def);
|
|
22
|
-
}
|
|
13
|
+
return autocompleteRegister(_def);
|
|
23
14
|
};
|
|
24
15
|
function autocompleteRegister(initDef) {
|
|
25
16
|
const _def = {
|
|
@@ -38,24 +29,6 @@ function autocompleteRegister(initDef) {
|
|
|
38
29
|
},
|
|
39
30
|
};
|
|
40
31
|
}
|
|
41
|
-
function commandTypeRegister(initDef) {
|
|
42
|
-
const _def = {
|
|
43
|
-
...initDef,
|
|
44
|
-
};
|
|
45
|
-
return {
|
|
46
|
-
_def,
|
|
47
|
-
setType: (type) => {
|
|
48
|
-
if (!(_def.builder instanceof discord_js_1.ContextMenuCommandBuilder)) {
|
|
49
|
-
throw new Error('setType can only be used with ContextMenuCommandBuilder.');
|
|
50
|
-
}
|
|
51
|
-
_def.builder.setType(type);
|
|
52
|
-
return createCommandProcessRegister({
|
|
53
|
-
..._def,
|
|
54
|
-
type,
|
|
55
|
-
});
|
|
56
|
-
},
|
|
57
|
-
};
|
|
58
|
-
}
|
|
59
32
|
function createCommandProcessRegister(initDef) {
|
|
60
33
|
const _def = {
|
|
61
34
|
...initDef,
|
|
@@ -81,6 +54,21 @@ function createCommandProcessRegister(initDef) {
|
|
|
81
54
|
},
|
|
82
55
|
};
|
|
83
56
|
}
|
|
57
|
+
const createCtxCommandBuilder = function (command) {
|
|
58
|
+
return createCommandTypeRegister(command);
|
|
59
|
+
};
|
|
60
|
+
function createCommandTypeRegister(builder) {
|
|
61
|
+
return {
|
|
62
|
+
setType: (type) => {
|
|
63
|
+
builder.setType(type);
|
|
64
|
+
return createCommandProcessRegister({
|
|
65
|
+
type,
|
|
66
|
+
middlewares: [],
|
|
67
|
+
builder: builder,
|
|
68
|
+
});
|
|
69
|
+
},
|
|
70
|
+
};
|
|
71
|
+
}
|
|
84
72
|
const extractComponentCustomId = (component) => {
|
|
85
73
|
const json = component.toJSON();
|
|
86
74
|
if ('custom_id' in json) {
|
|
@@ -171,10 +159,7 @@ function createComponentData(initdef, process) {
|
|
|
171
159
|
////////////////////////////////////////////////////////////*/
|
|
172
160
|
exports.wrapper = {
|
|
173
161
|
setCommand: createCommandBuilder,
|
|
174
|
-
|
|
175
|
-
* @deprecated Use setCommand with ContextMenuCommandBuilder instead.
|
|
176
|
-
*/
|
|
177
|
-
setCtxCommand: createCommandBuilder,
|
|
162
|
+
setCtxCommand: createCtxCommandBuilder,
|
|
178
163
|
setComponent: createComponentBuilder,
|
|
179
164
|
};
|
|
180
165
|
//# sourceMappingURL=wrapper.js.map
|
package/dist/wrapper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../src/wrapper.ts"],"names":[],"mappings":";;;AAAA,2CAKoB;AACpB,6BAAwB;
|
|
1
|
+
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../src/wrapper.ts"],"names":[],"mappings":"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"}
|