Merge pull request #30000 from ergoithz/master

[@types/amqplib] fix wrong Message/MessageFields

types/amqplib/index.d.ts

@@ -8,7 +8,7 @@
 
 import * as Promise from 'bluebird';
 import * as events from 'events';
-import { Replies, Options, Message } from './properties';
+import { Replies, Options, Message, GetMessage, ConsumeMessage } from './properties';
 export * from './properties';
 
 export interface Connection extends events.EventEmitter {
@@ -40,10 +40,10 @@ export interface Channel extends events.EventEmitter {
     publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish): boolean;
     sendToQueue(queue: string, content: Buffer, options?: Options.Publish): boolean;
 
-    consume(queue: string, onMessage: (msg: Message | null) => any, options?: Options.Consume): Promise<Replies.Consume>;
+    consume(queue: string, onMessage: (msg: ConsumeMessage | null) => any, options?: Options.Consume): Promise<Replies.Consume>;
 
     cancel(consumerTag: string): Promise<Replies.Empty>;
-    get(queue: string, options?: Options.Get): Promise<Message | false>;
+    get(queue: string, options?: Options.Get): Promise<GetMessage | false>;
 
     ack(message: Message, allUpTo?: boolean): void;
     ackAll(): void;

types/amqplib/properties.d.ts

@@ -145,12 +145,32 @@ export interface Message {
     properties: MessageProperties;
 }
 
-export interface MessageFields {
+export interface GetMessage extends Message {
+    fields: GetMessageFields;
+}
+
+export interface ConsumeMessage extends Message {
+    fields: ConsumeMessageFields;
+}
+
+export interface CommonMessageFields {
     deliveryTag: number;
     redelivered: boolean;
     exchange: string;
     routingKey: string;
-    messageCount: string;
+}
+
+export interface MessageFields extends CommonMessageFields {
+    messageCount?: number;
+    consumerTag?: string;
+}
+
+export interface GetMessageFields extends CommonMessageFields {
+    messageCount: number;
+}
+
+export interface ConsumeMessageFields extends CommonMessageFields {
+    deliveryTag: number;
 }
 
 export interface MessageProperties {