necord 5.0.3 → 5.1.0

package/dist/message-components/decorators/component-param.decorator.d.ts

@@ -0,0 +1 @@
+export declare const ComponentParam: (...dataOrPipes: any[]) => ParameterDecorator;

package/dist/message-components/decorators/component-param.decorator.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ComponentParam = void 0;
+const common_1 = require("@nestjs/common");
+const context_1 = require("../../context");
+const v10_1 = require("discord-api-types/v10");
+exports.ComponentParam = (0, common_1.createParamDecorator)((data, ctx) => {
+    const necordContext = context_1.NecordExecutionContext.create(ctx);
+    const [interaction] = necordContext.getContext();
+    const discovery = necordContext.getDiscovery();
+    if (!discovery.isMessageComponent() || interaction.type !== v10_1.InteractionType.MessageComponent)
+        return null;
+    const match = discovery.matcher([interaction.componentType, interaction.customId].join('_'));
+    if (!match)
+        return null;
+    return data ? match.params[data] : match.params;
+});

package/dist/message-components/decorators/index.d.ts

@@ -1,4 +1,5 @@
 export * from './button.decorator';
+export * from './component-param.decorator';
 export * from './message-component.decorator';
 export * from './select-menu.decorator';
 export * from './values.decorator';

package/dist/message-components/decorators/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./button.decorator"), exports);
+__exportStar(require("./component-param.decorator"), exports);
 __exportStar(require("./message-component.decorator"), exports);
 __exportStar(require("./select-menu.decorator"), exports);
 __exportStar(require("./values.decorator"), exports);

package/dist/message-components/message-component.discovery.d.ts

@@ -5,6 +5,7 @@ export interface MessageComponentMeta {
     customId: string;
 }
 export declare class MessageComponentDiscovery extends NecordBaseDiscovery<MessageComponentMeta> {
+    readonly matcher: import("path-to-regexp").MatchFunction<object>;
     getType(): MessageComponentType;
     getCustomId(): string;
     execute(interaction: MessageComponentInteraction): any;

package/dist/message-components/message-component.discovery.js

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageComponentDiscovery = void 0;
+const path_to_regexp_1 = require("path-to-regexp");
 const context_1 = require("../context");
 class MessageComponentDiscovery extends context_1.NecordBaseDiscovery {
+    constructor() {
+        super(...arguments);
+        this.matcher = (0, path_to_regexp_1.match)([this.meta.type.toString(), this.meta.customId].join('_'));
+    }
     getType() {
         return this.meta.type;
     }

package/dist/message-components/message-components.service.d.ts

@@ -5,7 +5,7 @@ import { MessageComponentDiscovery } from './message-component.discovery';
 export declare class MessageComponentsService implements OnModuleInit, OnApplicationBootstrap {
     private readonly client;
     private readonly explorerService;
-    private readonly componentsMap;
+    private readonly components;
     constructor(client: Client, explorerService: ExplorerService<MessageComponentDiscovery>);
     onModuleInit(): void;
     onApplicationBootstrap(): Client<boolean>;

package/dist/message-components/message-components.service.js

@@ -14,25 +14,27 @@ const common_1 = require("@nestjs/common");
 const discord_js_1 = require("discord.js");
 const necord_explorer_service_1 = require("../necord-explorer.service");
 const necord_constants_1 = require("../necord.constants");
-// TODO: Support path-to-regexp https://github.com/necordjs/necord/issues/279
 let MessageComponentsService = class MessageComponentsService {
     constructor(client, explorerService) {
         this.client = client;
         this.explorerService = explorerService;
-        this.componentsMap = new Map();
+        this.components = [];
     }
     onModuleInit() {
         return this.explorerService
             .explore(necord_constants_1.MESSAGE_COMPONENT_METADATA)
-            .forEach(component => this.componentsMap.set([component.getType(), component.getCustomId()].join(':'), component));
+            .forEach(component => this.components.push(component));
     }
     onApplicationBootstrap() {
         return this.client.on('interactionCreate', interaction => {
-            var _a;
             if (interaction.type !== discord_js_1.InteractionType.MessageComponent)
                 return;
-            return (_a = this.componentsMap
-                .get([interaction.componentType, interaction.customId].join(':'))) === null || _a === void 0 ? void 0 : _a.execute(interaction);
+            const name = [interaction.componentType, interaction.customId].join('_');
+            for (const component of this.components) {
+                if (component.matcher(name)) {
+                    return component.execute(interaction);
+                }
+            }
         });
     }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "necord",
 	"description": "A module for creating Discord bots using NestJS, based on Discord.js.",
-	"version": "5.0.3",
+	"version": "5.1.0",
 	"scripts": {
 		"build": "rimraf -rf dist && tsc -p tsconfig.json",
 		"prepublish:npm": "npm run build",
@@ -53,12 +53,12 @@
 		"@favware/npm-deprecate": "1.0.4",
 		"@nestjs/common": "8.4.7",
 		"@nestjs/core": "8.4.7",
-		"@types/node": "18.0.4",
-		"@typescript-eslint/eslint-plugin": "5.30.6",
-		"@typescript-eslint/parser": "5.30.6",
-		"discord-api-types": "0.36.2",
-		"discord.js": "14.0.1",
-		"eslint": "8.19.0",
+		"@types/node": "18.6.2",
+		"@typescript-eslint/eslint-plugin": "5.31.0",
+		"@typescript-eslint/parser": "5.31.0",
+		"discord-api-types": "0.36.3",
+		"discord.js": "14.0.3",
+		"eslint": "8.20.0",
 		"eslint-config-prettier": "8.5.0",
 		"eslint-plugin-prettier": "4.2.1",
 		"husky": "8.0.1",
@@ -66,7 +66,7 @@
 		"lint-staged": "13.0.3",
 		"prettier": "2.7.1",
 		"reflect-metadata": "0.1.13",
-		"release-it": "15.1.1",
+		"release-it": "15.2.0",
 		"rimraf": "3.0.2",
 		"rxjs": "7.5.6",
 		"ts-node": "10.9.1",
@@ -82,5 +82,8 @@
 	"engines": {
 		"node": ">=16.6.0",
 		"npm": ">=7.0.0"
+	},
+	"dependencies": {
+		"path-to-regexp": "^6.2.1"
 	}
 }