fix typo for consumer and create consumer and producer type for core …

…package

.eslintignore

@@ -0,0 +1 @@
+*.d.ts

examples/nestjs/src/consumer/consumer.controller.ts

@@ -2,7 +2,7 @@ import { Controller } from '@nestjs/common';
 import {
   Ctx,
   Payload,
-  Subcribe,
+  Subscribe,
   type RmqContext,
 } from '@rabbitmq-ts/nestjs-consumer';
 
@@ -14,7 +14,7 @@ interface IPayloadProps {
 
 @Controller()
 export class ConsumerController {
-  @Subcribe({
+  @Subscribe({
     routingKey: ROUTE,
     queue: {
       exclusive: true,
@@ -30,7 +30,7 @@ export class ConsumerController {
       noAck: true,
     },
   })
-  public async handleSubcribe(
+  public async handleSubscribe(
     @Payload() data: IPayloadProps,
     @Ctx() context: RmqContext,
   ): Promise<string> {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabbitmq-ts/core",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "license": "MIT",
   "directories": {
     "lib": "lib"

packages/core/src/Connection.ts

@@ -49,7 +49,7 @@ export class Connection {
       return url;
     }
 
-    const { host, port, username, password, virtualHost } = url;
+    const { host, port = '', username, password, virtualHost } = url;
 
     return combine(
       { joinWith: '/' },

packages/core/src/index.ts

@@ -1,18 +1,12 @@
-import type { Options, Replies } from 'amqplib';
+import type { Replies } from 'amqplib';
 import type { Options as ManagerOptions } from 'amqp-connection-manager';
 
-export type TAssertExchange = Options.AssertExchange;
-
 export type TRepliesAssertExchange = Replies.AssertExchange;
 
-export type TAssertQueue = Options.AssertQueue;
-
 export type TRepliesEmpty = Replies.Empty;
 
 export type TPublish = ManagerOptions.Publish;
 
-export type TConsumeOptions = ManagerOptions.Consume;
-
 export type { Channel, ConsumeMessage } from 'amqplib';
 
 export type {
@@ -22,4 +16,12 @@ export type {
 
 export * from './Connection';
 
-export type { IConnectionProps } from './interface';
+export type {
+  TAssertQueue,
+  TExchangeType,
+  IProducerProps,
+  TAssertExchange,
+  TConsumeOptions,
+  ISubscribeParams,
+  IConnectionProps,
+} from './interface';

packages/core/src/interface.ts

@@ -1,4 +1,8 @@
-import type { AmqpConnectionManagerOptions } from 'amqp-connection-manager';
+import type { Options } from 'amqplib';
+import type {
+  Options as ManagerOptions,
+  AmqpConnectionManagerOptions,
+} from 'amqp-connection-manager';
 
 export interface IConnectionAtomProps {
   host: string;
@@ -11,3 +15,41 @@ export interface IConnectionAtomProps {
 export interface IConnectionProps extends AmqpConnectionManagerOptions {
   urls: string | IConnectionAtomProps | (string | IConnectionAtomProps)[];
 }
+
+export type TAssertExchange = Options.AssertExchange;
+
+export type TAssertQueue = Options.AssertQueue;
+
+export type TConsumeOptions = ManagerOptions.Consume;
+
+type TExchangeBaseType = 'direct' | 'topic' | 'headers' | 'fanout' | 'match';
+
+export type TExchangeType = TExchangeBaseType | Omit<string, TExchangeBaseType>;
+
+interface IExchangeProps extends Partial<TAssertExchange> {
+  name: string;
+  type?: TExchangeType;
+}
+
+interface IQueueProps extends Partial<TAssertQueue> {
+  name: string;
+}
+
+export interface ISubscribeParams {
+  queue: IQueueProps;
+  routingKey?: string;
+  exchange?: IExchangeProps;
+  consumerOptions?: TConsumeOptions;
+}
+
+export interface IProducerProps {
+  urls: IConnectionProps['urls'];
+  connectionOptions?: AmqpConnectionManagerOptions;
+  configurations?: {
+    exchanges?: {
+      exchange: string;
+      type: TExchangeType;
+      options?: TAssertExchange;
+    }[];
+  };
+}

packages/nestjs/consumer/README.md

@@ -104,13 +104,13 @@ bootstrap();
 ```ts
 // rabbit.controller.ts
 import { Controller } from '@nestjs/common';
-import { Ctx, Payload, Subcribe } from '@rabbitmq-ts/nestjs-consumer';
+import { Ctx, Payload, Subscribe } from '@rabbitmq-ts/nestjs-consumer';
 
 import type { RmqContext } from '@rabbitmq-ts/nestjs-consumer';
 
 @Controller()
 export class TestController {
-  @Subcribe({
+  @Subscribe({
     routingKey: 'routing_key',
     queue: {
       name: 'queue_name',

packages/nestjs/consumer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabbitmq-ts/nestjs-consumer",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "MIT",
   "directories": {
     "lib": "lib"

packages/nestjs/consumer/src/RabbitMQConsumer.ts

@@ -10,14 +10,13 @@ import {
   type ChannelWrapper,
   type ConsumeMessage,
   type IConnectionProps,
+  type ISubscribeParams,
   type TRepliesAssertExchange,
 } from '@rabbitmq-ts/core';
 
 import { omit } from './utils';
 import { RmqContext } from './Context';
 
-import type { ISubcribeParams } from './decorators';
-
 type TCallback = () => void;
 
 interface ICreateServiceReturnProps {
@@ -29,7 +28,7 @@ export class RabbitMQConsumer
   implements CustomTransportStrategy
 {
   #connection: Connection;
-  #patterns: ISubcribeParams[] = [];
+  #patterns: ISubscribeParams[] = [];
   #channel: ChannelWrapper | undefined;
 
   constructor(props: IConnectionProps) {
@@ -47,13 +46,13 @@ export class RabbitMQConsumer
   }
 
   public addHandler(
-    pattern: ISubcribeParams & { isRabbitMQ: boolean },
+    pattern: ISubscribeParams & { isRabbitMQ: boolean },
     callback: MessageHandler,
     isEventHandler = false,
     extras: Record<string, any> = {},
   ) {
     if (typeof pattern === 'object' && pattern.isRabbitMQ) {
-      pattern = omit(pattern, ['isRabbitMQ']) as ISubcribeParams & {
+      pattern = omit(pattern, ['isRabbitMQ']) as ISubscribeParams & {
         isRabbitMQ: boolean;
       };
 
@@ -131,7 +130,7 @@ export class RabbitMQConsumer
   async #handleMessage(
     message: ConsumeMessage,
     channel: Channel,
-    pattern: ISubcribeParams,
+    pattern: ISubscribeParams,
   ): Promise<void> {
     const { content } = message;
     let rawMessage = content.toString();

packages/nestjs/consumer/src/decorators.ts

@@ -1,38 +1,14 @@
-import type {
-  TAssertQueue,
-  TAssertExchange,
-  TConsumeOptions,
-} from '@rabbitmq-ts/core';
+import type { ISubscribeParams } from '@rabbitmq-ts/core';
 
 const PATTERN_METADATA = 'microservices:pattern';
 const PATTERN_HANDLER_METADATA = 'microservices:handler_type';
 
-type TExchangeBaseType = 'direct' | 'topic' | 'headers' | 'fanout' | 'match';
-
-type TExchangeType = TExchangeBaseType | Omit<string, TExchangeBaseType>;
-
-interface IExchangeProps extends Partial<TAssertExchange> {
-  name: string;
-  type?: TExchangeType;
-}
-
-interface IQueueProps extends Partial<TAssertQueue> {
-  name: string;
-}
-
-export interface ISubcribeParams {
-  queue: IQueueProps;
-  routingKey?: string;
-  exchange?: IExchangeProps;
-  consumerOptions?: TConsumeOptions;
-}
-
-export function Subcribe({
+export function Subscribe({
   queue,
   exchange,
   routingKey,
   consumerOptions = {},
-}: ISubcribeParams): MethodDecorator {
+}: ISubscribeParams): MethodDecorator {
   return (
     _target: object,
     _key: string | symbol,

packages/nestjs/consumer/src/index.ts

@@ -1,6 +1,6 @@
 export { Ctx, Payload } from '@nestjs/microservices';
 
-export { Subcribe } from './decorators';
+export { Subscribe } from './decorators';
 
 export * from './Context';
 export * from './RabbitMQConsumer';

packages/nestjs/producer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabbitmq-ts/nestjs-producer",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "MIT",
   "directories": {
     "lib": "lib"

packages/nestjs/producer/src/RabbitMQProducer.ts

@@ -8,39 +8,21 @@ import {
   Connection,
   type Channel,
   type ChannelWrapper,
-  type TAssertExchange,
-  type IConnectionProps,
-  type AmqpConnectionManagerOptions,
+  type IProducerProps,
 } from '@rabbitmq-ts/core';
 
 import { CHANNEL_WRAPPER } from './constants';
 import { RabbitMQModel } from './RabbitMQModel';
 
 import type { IChannelProps } from './RabbitMQModel';
 
-type TExchangeBaseType = 'direct' | 'topic' | 'headers' | 'fanout' | 'match';
-
-type TExchangeType = TExchangeBaseType | Omit<string, TExchangeBaseType>;
-
-interface IRegisterParams {
-  urls: IConnectionProps['urls'];
-  connectionOptions?: AmqpConnectionManagerOptions;
-  configurations?: {
-    exchanges?: {
-      exchange: string;
-      type: TExchangeType;
-      options?: TAssertExchange;
-    }[];
-  };
-}
-
 @Module({})
 export class RabbitMQProducer implements OnApplicationShutdown {
   public static register({
     urls,
     configurations = {},
     connectionOptions = {},
-  }: IRegisterParams): DynamicModule {
+  }: IProducerProps): DynamicModule {
     const { exchanges = [] } = configurations;
 
     return {