Compare commits

...

9 Commits

Author SHA1 Message Date
github-actions[bot]
2042559b4d chore(main): release 4.1.0 (#374)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-01-06 17:02:24 -06:00
Jacob Nguyen
220a60ecf8 feat: moduleinfo-in-eventplugins (#373) 2025-01-06 17:00:02 -06:00
Glitch
55715d5659 fix: update github username (#371)
Some checks failed
NPM / Publish / test-and-publish (push) Has been cancelled
2024-11-18 16:34:27 -06:00
github-actions[bot]
d0c3b7469e chore(main): release 4.0.3 (#370)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-10-06 11:53:30 -05:00
Jacob Nguyen
eabfb81819 fix: async presence (#369)
* fix: async presence

* fixes to typings
2024-10-06 11:51:07 -05:00
Duro
1789ccb2f2 fix: fix eventModule typing for Discord events (#368) 2024-08-19 11:18:13 -05:00
github-actions[bot]
25c5891ade chore(main): release 4.0.2 (#367)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-08-12 21:30:44 -05:00
jacob
2106cdc1d0 fix: type issue 2024-08-12 21:28:22 -05:00
Jacob Nguyen
61e82fdc7b refactor: remove ts-results-es (#366)
* remove tsresultses

* remove test since it uses external api

* opt in for simpler

* add more debug information

Signed-off-by: Jacob Nguyen <76754747+jacoobes@users.noreply.github.com>

* add more debug information

Signed-off-by: Jacob Nguyen <76754747+jacoobes@users.noreply.github.com>

* clean up if else

---------

Signed-off-by: Jacob Nguyen <76754747+jacoobes@users.noreply.github.com>
2024-08-11 11:07:44 -05:00
16 changed files with 371 additions and 138 deletions

View File

@@ -1,5 +1,32 @@
# Changelog
## [4.1.0](https://github.com/sern-handler/handler/compare/v4.0.3...v4.1.0) (2025-01-06)
### Features
* moduleinfo-in-eventplugins ([#373](https://github.com/sern-handler/handler/issues/373)) ([220a60e](https://github.com/sern-handler/handler/commit/220a60ecf853df8d288de2533c669562a430c3f9))
### Bug Fixes
* update github username ([#371](https://github.com/sern-handler/handler/issues/371)) ([55715d5](https://github.com/sern-handler/handler/commit/55715d565990fe686159f3c1eda3754d1262c72c))
## [4.0.3](https://github.com/sern-handler/handler/compare/v4.0.2...v4.0.3) (2024-10-06)
### Bug Fixes
* async presence ([#369](https://github.com/sern-handler/handler/issues/369)) ([eabfb81](https://github.com/sern-handler/handler/commit/eabfb81819b53a4656d8eac6e21cfb488b724a42))
* fix eventModule typing for Discord events ([#368](https://github.com/sern-handler/handler/issues/368)) ([1789ccb](https://github.com/sern-handler/handler/commit/1789ccb2f22f502f87538fecdb07106ff7110434))
## [4.0.2](https://github.com/sern-handler/handler/compare/v4.0.1...v4.0.2) (2024-08-13)
### Bug Fixes
* type issue ([2106cdc](https://github.com/sern-handler/handler/commit/2106cdc1d033f88b6ee4ccca6754fe7a595a9328))
## [4.0.1](https://github.com/sern-handler/handler/compare/v4.0.0...v4.0.1) (2024-07-19)

View File

@@ -49,7 +49,7 @@ export default commandModule({
- [Vinci](https://github.com/SrIzan10/vinci), the bot for Mara Turing.
- [Bask](https://github.com/baskbotml/bask), Listen your favorite artists on Discord.
- [Murayama](https://github.com/murayamabot/murayama), :pepega:
- [Protector (WIP)](https://github.com/needhamgary/Protector), Just a simple bot to help enhance a private minecraft server.
- [Protector](https://github.com/GlitchApotamus/Protector), Just a simple bot to help enhance a private minecraft server.
- [SmokinWeed 💨](https://github.com/Peter-MJ-Parker/sern-bud), A fun bot for a small - but growing - server.
- [Man Nomic](https://github.com/jacoobes/man-nomic), A simple information bot to provide information to the nomic-ai discord community.
- [Linear-Discord](https://github.com/sern-handler/linear-discord) Display and manage a linear dashboard.

View File

@@ -1,7 +1,7 @@
{
"name": "@sern/handler",
"packageManager": "yarn@3.5.0",
"version": "4.0.1",
"version": "4.1.0",
"description": "A complete, customizable, typesafe, & reactive framework for discord bots.",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -39,8 +39,7 @@
"callsites": "^3.1.0",
"cron": "^3.1.7",
"deepmerge": "^4.3.1",
"rxjs": "^7.8.0",
"ts-results-es": "^4.1.0"
"rxjs": "^7.8.0"
},
"devDependencies": {
"@faker-js/faker": "^8.0.1",

View File

@@ -10,8 +10,39 @@ import { partitionPlugins } from './functions'
import type { Awaitable } from '../types/utility';
/**
* @since 1.0.0 The wrapper function to define command modules for sern
* @param mod
* Creates a command module with standardized structure and plugin support.
*
* @since 1.0.0
* @param {InputCommand} mod - Command module configuration
* @returns {Module} Processed command module ready for registration
*
* @example
* // Basic slash command
* export default commandModule({
* type: CommandType.Slash,
* description: "Ping command",
* execute: async (ctx) => {
* await ctx.reply("Pong! 🏓");
* }
* });
*
* @example
* // Command with component interaction
* export default commandModule({
* type: CommandType.Slash,
* description: "Interactive command",
* execute: async (ctx) => {
* const button = new ButtonBuilder({
* customId: "btn/someData",
* label: "Click me",
* style: ButtonStyle.Primary
* });
* await ctx.reply({
* content: "Interactive message",
* components: [new ActionRowBuilder().addComponents(button)]
* });
* }
* });
*/
export function commandModule(mod: InputCommand): Module {
const [onEvent, plugins] = partitionPlugins(mod.plugins);
@@ -21,12 +52,35 @@ export function commandModule(mod: InputCommand): Module {
locals: {} } as Module;
}
/**
* Creates an event module for handling Discord.js or custom events.
*
* @since 1.0.0
* The wrapper function to define event modules for sern
* @param mod
* @template T - Event name from ClientEvents
* @param {InputEvent<T>} mod - Event module configuration
* @returns {Module} Processed event module ready for registration
* @throws {Error} If ControlPlugins are used in event modules
*
* @example
* // Discord event listener
* export default eventModule({
* type: EventType.Discord,
* execute: async (message) => {
* console.log(`${message.author.tag}: ${message.content}`);
* }
* });
*
* @example
* // Custom sern event
* export default eventModule({
* type: EventType.Sern,
* execute: async (eventData) => {
* // Handle sern-specific event
* }
* });
*/
export function eventModule(mod: InputEvent): Module {
export function eventModule<T extends keyof ClientEvents = keyof ClientEvents>(mod: InputEvent<T>): Module {
const [onEvent, plugins] = partitionPlugins(mod.plugins);
if(onEvent.length !== 0) throw Error("Event modules cannot have ControlPlugins");
return { ...mod,
@@ -35,8 +89,9 @@ export function eventModule(mod: InputEvent): Module {
}
/** Create event modules from discord.js client events,
* This is an {@link eventModule} for discord events,
* where typings can be very bad.
* This was an {@link eventModule} for discord events,
* where typings were bad.
* @deprecated Use {@link eventModule} instead
* @param mod
*/
export function discordEvent<T extends keyof ClientEvents>(mod: {

View File

@@ -1,6 +1,7 @@
import { CommandType, PluginType } from './structures/enums';
import type { Plugin, PluginResult, CommandArgs, InitArgs } from '../types/core-plugin';
import { Err, Ok } from 'ts-results-es';
import { Err, Ok } from './structures/result';
import type { Dictionary } from '../types/utility';
export function makePlugin<V extends unknown[]>(
type: PluginType,
@@ -37,7 +38,7 @@ export function CommandControlPlugin<I extends CommandType>(
* The object passed into every plugin to control a command's behavior
*/
export const controller = {
next: (val?: Record<string,unknown>) => Ok(val),
next: (val?: Dictionary) => Ok(val),
stop: (val?: string) => Err(val),
};

View File

@@ -1,11 +1,10 @@
import type { ActivitiesOptions } from "discord.js";
import type { IntoDependencies } from "./ioc";
import type { Emitter } from "./interfaces";
import { Awaitable } from "../types/utility";
type Status = 'online' | 'idle' | 'invisible' | 'dnd'
type PresenceReduce = (previous: Presence.Result) => Presence.Result;
type PresenceReduce = (previous: Presence.Result) => Awaitable<Presence.Result>;
export const Presence = {
/**
@@ -50,7 +49,7 @@ export const Presence = {
export declare namespace Presence {
export type Config<T extends (keyof Dependencies)[]> = {
inject?: [...T]
execute: (...v: IntoDependencies<T>) => Presence.Result;
execute: (...v: IntoDependencies<T>) => Awaitable<Presence.Result>;
}
@@ -60,7 +59,7 @@ export declare namespace Presence {
activities?: ActivitiesOptions[];
shardId?: number[];
repeat?: number | [Emitter, string];
onRepeat?: (previous: Result) => Result;
onRepeat?: PresenceReduce
}
}

View File

@@ -8,8 +8,7 @@ import type {
Snowflake,
User,
} from 'discord.js';
import { CoreContext } from '../structures/core-context';
import { Result, Ok, Err } from 'ts-results-es';
import { Result, Ok, Err, val } from './result';
import * as assert from 'assert';
import type { ReplyOptions } from '../../types/utility';
import { fmt } from '../functions'
@@ -21,39 +20,32 @@ import { SernError } from './enums';
* Provides values shared between
* Message and ChatInputCommandInteraction
*/
export class Context extends CoreContext<Message, ChatInputCommandInteraction> {
export class Context {
get options() {
if(this.isMessage()) {
const [, ...rest] = fmt(this.message.content, this.prefix);
return rest;
} else {
return this.interaction.options;
}
}
return this.interaction.options;
}
protected constructor(protected ctx: Result<Message, ChatInputCommandInteraction>,
private __prefix?: string) {
super(ctx);
}
private __prefix?: string) { }
public get prefix() {
return this.__prefix;
}
public get id(): Snowflake {
return safeUnwrap(this.ctx
.map(m => m.id)
.mapErr(i => i.id));
return val(this.ctx).id
}
public get channel() {
return safeUnwrap(this.ctx.map(m => m.channel).mapErr(i => i.channel));
return val(this.ctx).channel;
}
public get channelId(): Snowflake {
return safeUnwrap(this.ctx
.map(m => m.channelId)
.mapErr(i => i.channelId));
return val(this.ctx).channelId;
}
/**
@@ -61,9 +53,11 @@ export class Context extends CoreContext<Message, ChatInputCommandInteraction> {
* else, interaction.user
*/
public get user(): User {
return safeUnwrap(this.ctx
.map(m => m.author)
.mapErr(i => i.user));
if(this.ctx.ok) {
return this.ctx.value.author;
}
return this.ctx.error.user;
}
public get userId(): Snowflake {
@@ -71,59 +65,60 @@ export class Context extends CoreContext<Message, ChatInputCommandInteraction> {
}
public get createdTimestamp(): number {
return safeUnwrap(this.ctx
.map(m => m.createdTimestamp)
.mapErr(i => i.createdTimestamp));
return val(this.ctx).createdTimestamp;
}
public get guild() {
return safeUnwrap(this.ctx
.map(m => m.guild)
.mapErr(i => i.guild));
return val(this.ctx).guild;
}
public get guildId() {
return safeUnwrap(this.ctx
.map(m => m.guildId)
.mapErr(i => i.guildId));
return val(this.ctx).guildId;
}
/*
* interactions can return APIGuildMember if the guild it is emitted from is not cached
*/
public get member() {
return safeUnwrap(this.ctx
.map(m => m.member)
.mapErr(i => i.member));
return val(this.ctx).member;
}
get message(): Message {
return this.ctx.expect(SernError.MismatchEvent);
if(this.ctx.ok) {
return this.ctx.value;
}
throw Error(SernError.MismatchEvent);
}
public isMessage(): this is Context & { ctx: Result<Message, never> } {
return this.ctx.ok;
}
public isSlash(): this is Context & { ctx: Result<never, ChatInputCommandInteraction> } {
return !this.isMessage();
}
get interaction(): ChatInputCommandInteraction {
return this.ctx.expectErr(SernError.MismatchEvent);
if(!this.ctx.ok) {
return this.ctx.error;
}
throw Error(SernError.MismatchEvent);
}
public get client(): Client {
return safeUnwrap(this.ctx
.map(m => m.client)
.mapErr(i => i.client));
return val(this.ctx).client;
}
public get inGuild(): boolean {
return safeUnwrap(this.ctx
.map(m => m.inGuild())
.mapErr(i => i.inGuild()));
return val(this.ctx).inGuild()
}
public async reply(content: ReplyOptions) {
return safeUnwrap(
this.ctx
.map(m => m.reply(content as MessageReplyOptions))
.mapErr(i =>
i.reply(content as InteractionReplyOptions).then(() => i.fetchReply())),
);
if(this.ctx.ok) {
return this.ctx.value.reply(content as MessageReplyOptions)
}
interface FetchReply { fetchReply: true };
return this.ctx.error.reply(content as InteractionReplyOptions & FetchReply)
}
static wrap(wrappable: BaseInteraction | Message, prefix?: string): Context {
@@ -134,10 +129,3 @@ export class Context extends CoreContext<Message, ChatInputCommandInteraction> {
return new Context(Err(wrappable), prefix);
}
}
function safeUnwrap<T>(res: Result<T, T>) {
if(res.isOk()) {
return res.expect("Tried unwrapping message field: " + res)
}
return res.expectErr("Tried unwrapping interaction field" + res)
}

View File

@@ -1,18 +0,0 @@
import { Result as Either } from 'ts-results-es';
import * as assert from 'node:assert';
/**
* @since 3.0.0
*/
export abstract class CoreContext<M, I> {
protected constructor(protected ctx: Either<M, I>) {
assert.ok(typeof ctx === 'object' && ctx != null, "Context was nonobject or null");
}
public isMessage(): this is CoreContext<M, never> {
return this.ctx.isOk();
}
public isSlash(): this is CoreContext<never, I> {
return !this.isMessage();
}
}

View File

@@ -0,0 +1,20 @@
export type Result<Ok, Err> =
| { ok: true; value: Ok }
| { ok: false; error: Err };
export const Ok = <Ok>(value: Ok) => ({ ok: true, value } as const);
export const Err = <Err>(error: Err) => ({ ok: false, error } as const);
export const val = <O, E>(r: Result<O, E>) => r.ok ? r.value : r.error;
export const EMPTY_ERR = Err(undefined);
/**
* Wrap an async operation that may throw an Error (`try-catch` style) into checked exception style
* @param op The operation function
*/
export async function wrapAsync<T, E = unknown>(op: () => Promise<T>): Promise<Result<T, E>> {
try { return op()
.then(Ok)
.catch(Err); }
catch (e) { return Promise.resolve(Err(e as E)); }
}

View File

@@ -8,7 +8,7 @@ import {
import * as Id from '../core/id'
import type { Emitter, ErrorHandling, Logging } from '../core/interfaces';
import { SernError } from '../core/structures/enums'
import { Err, Ok, Result } from 'ts-results-es';
import { EMPTY_ERR, Err, Ok, Result, wrapAsync } from '../core/structures/result';
import type { UnpackedDependencies } from '../types/utility';
import type { CommandModule, Module, Processed } from '../types/core-modules';
import * as assert from 'node:assert';
@@ -17,6 +17,7 @@ import { CommandType } from '../core/structures/enums'
import { inspect } from 'node:util'
import { disposeAll } from '../core/ioc';
import { resultPayload, isAutocomplete, treeSearch, fmt } from '../core/functions'
import merge from 'deepmerge'
function handleError<C>(crashHandler: ErrorHandling, emitter: Emitter, logging?: Logging) {
@@ -43,7 +44,7 @@ interface ExecutePayload {
export const filterTap = <K, R>(onErr: (e: R) => void): OperatorFunction<Result<K, R>, K> =>
concatMap(result => {
if(result.isOk()) {
if(result.ok){
return of(result.value)
}
onErr(result.error);
@@ -142,7 +143,7 @@ export function createInteractionHandler<T extends Interaction>(
.map(({ id, params }) => ({ module: mg.get(id), params }))
.filter(({ module }) => module !== undefined);
if(modules.length == 0) {
return Err.EMPTY;
return EMPTY_ERR;
}
const [{module, params}] = modules;
return Ok(createDispatcher({
@@ -179,9 +180,9 @@ export function createMessageHandler(
* @param task the deferred execution which will be called
*/
export function executeModule(emitter: Emitter, { module, args }: ExecutePayload) {
return from(Result.wrapAsync(async () => module.execute(...args)))
return from(wrapAsync(async () => module.execute(...args)))
.pipe(concatMap(result => {
if (result.isOk()) {
if (result.ok){
emitter.emit('module.activate', resultPayload('success', module));
return EMPTY;
}
@@ -206,10 +207,10 @@ export function createResultResolver<Output>(config: {
return async (payload: ExecutePayload) => {
const task = await callPlugins(payload);
if (!task) throw Error("Plugin did not return anything.");
if(task.isOk()) {
return onNext(payload, task.value) as Output;
} else {
if(!task.ok) {
onStop?.(payload.module, String(task.error));
} else {
return onNext(payload, task.value) as Output;
}
};
};
@@ -225,12 +226,13 @@ export async function callInitPlugins(_module: Module, deps: Dependencies, emit?
for(const plugin of module.plugins ?? []) {
const result = await plugin.execute({ module, absPath: module.meta.absPath, deps });
if (!result) throw Error("Plugin did not return anything. " + inspect(plugin, false, Infinity, true));
if(result.isErr()) {
if(!result.ok) {
if(emit) {
emitter?.emit('module.register',
resultPayload('failure', module, result.error ?? SernError.PluginFailure));
}
throw Error(result.error ?? SernError.PluginFailure);
throw Error((result.error ?? SernError.PluginFailure) +
'on module ' + module.name + " " + module.meta.absPath);
}
}
return module
@@ -239,8 +241,18 @@ export async function callInitPlugins(_module: Module, deps: Dependencies, emit?
export async function callPlugins({ args, module, deps, params }: ExecutePayload) {
let state = {};
for(const plugin of module.onEvent??[]) {
const result = await plugin.execute(...args, { state, deps, params, type: module.type });
if(result.isErr()) {
const executionContext = {
state,
deps,
params,
type: module.type,
module: { name: module.name,
description: module.description,
locals: module.locals,
meta: module.meta }
};
const result = await plugin.execute(...args, executionContext);
if(!result.ok) {
return result;
}
if(isObject(result.value)) {
@@ -251,14 +263,26 @@ export async function callPlugins({ args, module, deps, params }: ExecutePayload
}
/**
* Creates an executable task ( execute the command ) if all control plugins are successful
* this needs to go
* @param onStop emits a failure response to the SernEmitter
*/
export function intoTask(onStop: (m: Module) => unknown) {
const onNext = ({ args, module, deps, params }: ExecutePayload, state: Record<string, unknown>) => ({
module,
args: [...args, { state, deps, params, type: module.type }],
deps
});
const onNext = ({ args, module, deps, params }: ExecutePayload, state: Record<string, unknown>) => {
return {
module,
args: [...args, { state,
deps,
params,
type: module.type,
module: { name: module.name,
description: module.description,
locals: module.locals,
meta: module.meta } }],
deps
}
};
return createResultResolver({ onStop, onNext });
}

View File

@@ -1,4 +1,4 @@
import { concatMap, from, interval, of, map, scan, startWith, fromEvent, take } from "rxjs"
import { concatMap, from, interval, of, map, startWith, fromEvent, take, mergeScan } from "rxjs"
import { Presence } from "../core/presences";
import { Services } from "../core/ioc";
import assert from "node:assert";
@@ -14,7 +14,7 @@ const parseConfig = async (conf: Promise<Presence.Result>) => {
const src$ = typeof repeat === 'number'
? interval(repeat)
: fromEvent(...repeat);
return src$.pipe(scan(onRepeat, s),
return src$.pipe(mergeScan(async (args) => onRepeat(args), s),
startWith(s));
}
return of(s).pipe(take(1));

View File

@@ -19,14 +19,97 @@ import type {
import type { CommandType, EventType } from '../core/structures/enums';
import { Context } from '../core/structures/context'
import { ControlPlugin, InitPlugin, Plugin } from './core-plugin';
import { Awaitable, SernEventsMapping, UnpackedDependencies } from './utility';
import { Awaitable, SernEventsMapping, UnpackedDependencies, Dictionary } from './utility';
//state, deps, type (very original)
/**
* SDT (State, Dependencies, Type) interface represents the core data structure
* passed through the plugin pipeline to command modules.
*
* @interface SDT
* @template TState - Type parameter for the state object's structure
* @template TDeps - Type parameter for dependencies interface
*
* @property {Record<string, unknown>} state - Accumulated state data passed between plugins
* @property {TDeps} deps - Instance of application dependencies
* @property {CommandType} type - Command type identifier
* @property {string} [params] - Optional parameters passed to the command
*
* @example
* // Example of a plugin using SDT
* const loggingPlugin = CommandControlPlugin((ctx, sdt: SDT) => {
* console.log(`User ${ctx.user.id} executed command`);
* return controller.next({ 'logging/timestamp': Date.now() });
* });
*
* @example
* // Example of state accumulation through multiple plugins
* const plugin1 = CommandControlPlugin((ctx, sdt: SDT) => {
* return controller.next({ 'plugin1/data': 'value1' });
* });
*
* const plugin2 = CommandControlPlugin((ctx, sdt: SDT) => {
* // Access previous state
* const prevData = sdt.state['plugin1/data'];
* return controller.next({ 'plugin2/data': 'value2' });
* });
*
* @remarks
* - State is immutable and accumulated through the plugin chain
* - Keys in state should be namespaced to avoid collisions
* - Dependencies are injected and available throughout the pipeline
* - Type information helps plugins make type-safe decisions
*
* @see {@link CommandControlPlugin} for plugin implementation
* @see {@link CommandType} for available command types
* @see {@link Dependencies} for dependency injection interface
*/
export type SDT = {
state: Record<string,unknown>;
/**
* Accumulated state passed between plugins in the pipeline.
* Each plugin can add to or modify this state using controller.next().
*
* @type {Record<string, unknown>}
* @example
* // Good: Namespaced state key
* { 'myPlugin/userData': { id: '123', name: 'User' } }
*
* // Avoid: Non-namespaced keys that might collide
* { userData: { id: '123' } }
*/
state: Record<string, unknown>;
/**
* Application dependencies available to plugins and command modules.
* Typically includes services, configurations, and utilities.
*
* @type {Dependencies}
*/
deps: Dependencies;
type: CommandType,
params?: string
/**
* Identifies the type of command being processed.
* Used by plugins to apply type-specific logic.
*
* @type {CommandType}
*/
type: CommandType;
/**
* Optional parameters passed to the command.
* May contain additional configuration or runtime data.
*
* @type {string}
* @optional
*/
params?: string;
/**
* A copy of the current module that the plugin is running in.
*/
module: { name: string;
description: string;
meta: Dictionary;
locals: Dictionary; }
};
export type Processed<T> = T & { name: string; description: string };
@@ -41,7 +124,75 @@ export interface Module {
id: string;
absPath: string;
}
locals: Record<string,unknown>
/**
* Custom data storage object for module-specific information.
* Plugins and module code can use this to store and retrieve metadata,
* configuration, or any other module-specific information.
*
* @type {Dictionary}
* @description A key-value store that allows plugins and module code to persist
* data at the module level. This is especially useful for InitPlugins that need
* to attach metadata or configuration to modules.
*
* @example
* // In a plugin
* module.locals.registrationDate = Date.now();
* module.locals.version = "1.0.0";
* module.locals.permissions = ["ADMIN", "MODERATE"];
*
* @example
* // In module execution
* console.log(`Command registered on: ${new Date(module.locals.registrationDate)}`);
*
* @example
* // Storing localization data
* module.locals.translations = {
* en: "Hello",
* es: "Hola",
* fr: "Bonjour"
* };
*
* @example
* // Storing command metadata
* module.locals.metadata = {
* category: "admin",
* cooldown: 5000,
* requiresPermissions: true
* };
*
* @remarks
* - The locals object is initialized as an empty object ({}) by default
* - Keys should be namespaced to avoid collisions between plugins
* - Values can be of any type
* - Data persists for the lifetime of the module
* - Commonly used by InitPlugins during module initialization
*
* @best-practices
* 1. Namespace your keys to avoid conflicts:
* ```typescript
* module.locals['myPlugin:data'] = value;
* ```
*
* 2. Document the data structure you're storing:
* ```typescript
* interface MyPluginData {
* version: string;
* timestamp: number;
* }
* module.locals['myPlugin:data'] = {
* version: '1.0.0',
* timestamp: Date.now()
* } as MyPluginData;
* ```
*
* 3. Use type-safe accessors when possible:
* ```typescript
* const getPluginData = (module: Module): MyPluginData =>
* module.locals['myPlugin:data'];
* ```
*/
locals: Dictionary;
execute(...args: any[]): Awaitable<any>;
}
@@ -167,9 +318,9 @@ export interface CommandModuleDefs {
[CommandType.Modal]: ModalSubmitCommand;
}
export interface EventModuleDefs {
export interface EventModuleDefs<T extends keyof ClientEvents = keyof ClientEvents> {
[EventType.Sern]: SernEventCommand;
[EventType.Discord]: DiscordEventCommand;
[EventType.Discord]: DiscordEventCommand<T>;
[EventType.External]: ExternalEventCommand;
}
@@ -186,12 +337,12 @@ export interface SernAutocompleteData
type CommandModuleNoPlugins = {
[T in CommandType]: Omit<CommandModuleDefs[T], 'plugins' | 'onEvent' | 'meta' | 'locals'>;
};
type EventModulesNoPlugins = {
[T in EventType]: Omit<EventModuleDefs[T], 'plugins' | 'onEvent' | 'meta' | 'locals'> ;
type EventModulesNoPlugins<K extends keyof ClientEvents = keyof ClientEvents> = {
[T in EventType]: Omit<EventModuleDefs<K>[T], 'plugins' | 'onEvent' | 'meta' | 'locals'> ;
};
export type InputEvent = {
[T in EventType]: EventModulesNoPlugins[T] & {
export type InputEvent<K extends keyof ClientEvents = keyof ClientEvents> = {
[T in EventType]: EventModulesNoPlugins<K>[T] & {
once?: boolean;
plugins?: InitPlugin[]
};

View File

@@ -11,7 +11,6 @@
* Plugins are reminiscent of middleware in express.
*/
import type { Result } from 'ts-results-es';
import type {
Module,
Processed,
@@ -23,6 +22,7 @@ import type { Context } from '../core/structures/context'
import type {
ButtonInteraction,
ChannelSelectMenuInteraction,
ChatInputCommandInteraction,
MentionableSelectMenuInteraction,
MessageContextMenuCommandInteraction,
ModalSubmitInteraction,
@@ -31,6 +31,7 @@ import type {
UserContextMenuCommandInteraction,
UserSelectMenuInteraction,
} from 'discord.js';
import { Result } from '../core/structures/result';
export type PluginResult = Awaitable<Result<Record<string,unknown>|undefined, string|undefined>>;
export interface InitArgs<T extends Processed<Module> = Processed<Module>> {
@@ -56,8 +57,8 @@ export type AnyPlugin = ControlPlugin | InitPlugin<[InitArgs<Processed<Module>>]
export type CommandArgs<I extends CommandType = CommandType> = CommandArgsMatrix[I]
interface CommandArgsMatrix {
[CommandType.Text]: [Context, SDT];
[CommandType.Slash]: [Context, SDT];
[CommandType.Text]: [Context & { get options(): string[]}, SDT];
[CommandType.Slash]: [Context & { get options(): ChatInputCommandInteraction['options']}, SDT];
[CommandType.Both]: [Context, SDT];
[CommandType.CtxMsg]: [MessageContextMenuCommandInteraction, SDT];
[CommandType.CtxUser]: [UserContextMenuCommandInteraction, SDT];

View File

@@ -1,8 +1,9 @@
import type { InteractionReplyOptions, MessageReplyOptions } from 'discord.js';
import type { Module } from './core-modules';
import type { Result } from 'ts-results-es';
import type { Result } from '../core/structures/result';
export type Awaitable<T> = PromiseLike<T> | T;
export type Dictionary = Record<string, unknown>
export type VoidResult = Result<void, void>;
export type AnyFunction = (...args: any[]) => unknown;

View File

@@ -120,13 +120,6 @@ test('init plugins replace array', async () => {
expect(['a']).deep.equal(s.opts)
})
test('call control plugin ', async () => {
const plugin = CommandControlPlugin<CommandType.Slash>((ctx,sdt) => {
return controller.next();
});
const res = await plugin.execute(new ChatInputCommandInteraction(), {})
expect(res.isOk()).toBe(true)
})
test('form sdt', async () => {

View File

@@ -557,7 +557,6 @@ __metadata:
discord.js: ^14.15.3
eslint: 8.39.0
rxjs: ^7.8.0
ts-results-es: ^4.1.0
typescript: 5.0.2
vitest: ^1.6.0
languageName: unknown
@@ -2959,13 +2958,6 @@ __metadata:
languageName: node
linkType: hard
"ts-results-es@npm:^4.1.0":
version: 4.2.0
resolution: "ts-results-es@npm:4.2.0"
checksum: ff475c2f6d44377e0204211e6eafdbcabddf3ad09d40540ad5dee3d817eefbd48c07a21f5ad86864ef82cd8a5542a266af9dd8dd4d58d4766fdd6e79370519bb
languageName: node
linkType: hard
"tslib@npm:2.6.2":
version: 2.6.2
resolution: "tslib@npm:2.6.2"