From 9d8cb8928490f0710b01809987e2d8af1b9903a7 Mon Sep 17 00:00:00 2001 From: abreits Date: Thu, 22 Oct 2015 13:06:26 +0200 Subject: [PATCH 1/5] amqplib: exposed Option and Reply properties again (bugfix) --- amqplib/amqplib-tests.ts | 12 ++++++++++++ amqplib/amqplib.d.ts | 12 ++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/amqplib/amqplib-tests.ts b/amqplib/amqplib-tests.ts index f99a3bde1a..134306e51e 100644 --- a/amqplib/amqplib-tests.ts +++ b/amqplib/amqplib-tests.ts @@ -5,6 +5,7 @@ import amqp = require("amqplib"); var msg = "Hello World"; +// test promise api amqp.connect("amqp://localhost") .then(connection => { return connection.createChannel() @@ -21,6 +22,12 @@ amqp.connect("amqp://localhost") .ensure(() => connection.close()); }); +// test promise api properties +var amqpMessage: amqp.Message; +var amqpAssertExchangeOptions: amqp.Options.AssertExchange; +var anqpAssertExchangeReplies: amqp.Replies.AssertExchange; + + // callback api tests import amqpcb = require("amqplib/callback_api"); @@ -51,3 +58,8 @@ amqpcb.connect("amqp://localhost", (err, connection) => { }); } }); + +// test callback api properties +var amqpcbMessage: amqp.Message; +var amqpcbAssertExchangeOptions: amqp.Options.AssertExchange; +var anqpcbAssertExchangeReplies: amqp.Replies.AssertExchange; \ No newline at end of file diff --git a/amqplib/amqplib.d.ts b/amqplib/amqplib.d.ts index f125aaa070..0c76495efc 100644 --- a/amqplib/amqplib.d.ts +++ b/amqplib/amqplib.d.ts @@ -100,9 +100,9 @@ declare module "amqplib" { import events = require("events"); import when = require("when"); import shared = require("amqplib/properties") - import Replies = shared.Replies; - import Options = shared.Options; - import Message = shared.Message; + export import Replies = shared.Replies; + export import Options = shared.Options; + export import Message = shared.Message; interface Connection extends events.EventEmitter { close(): when.Promise; @@ -156,9 +156,9 @@ declare module "amqplib/callback_api" { import events = require("events"); import shared = require("amqplib/properties") - import Replies = shared.Replies; - import Options = shared.Options; - import Message = shared.Message; + export import Replies = shared.Replies; + export import Options = shared.Options; + export import Message = shared.Message; interface Connection extends events.EventEmitter { close(callback?: (err: any) => void): void; From 16f5ce29bdc2cafe31078501632e4262305f6b41 Mon Sep 17 00:00:00 2001 From: abreits Date: Thu, 22 Oct 2015 13:35:11 +0200 Subject: [PATCH 2/5] amqplib: properties of type Object changed to any --- amqplib/amqplib-tests.ts | 2 ++ amqplib/amqplib.d.ts | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/amqplib/amqplib-tests.ts b/amqplib/amqplib-tests.ts index 134306e51e..9a15e250f4 100644 --- a/amqplib/amqplib-tests.ts +++ b/amqplib/amqplib-tests.ts @@ -24,6 +24,7 @@ amqp.connect("amqp://localhost") // test promise api properties var amqpMessage: amqp.Message; +amqpMessage.properties.contentType === "application/json"; var amqpAssertExchangeOptions: amqp.Options.AssertExchange; var anqpAssertExchangeReplies: amqp.Replies.AssertExchange; @@ -61,5 +62,6 @@ amqpcb.connect("amqp://localhost", (err, connection) => { // test callback api properties var amqpcbMessage: amqp.Message; +amqpMessage.properties.contentType === "application/json"; var amqpcbAssertExchangeOptions: amqp.Options.AssertExchange; var anqpcbAssertExchangeReplies: amqp.Replies.AssertExchange; \ No newline at end of file diff --git a/amqplib/amqplib.d.ts b/amqplib/amqplib.d.ts index 0c76495efc..d03c46ed79 100644 --- a/amqplib/amqplib.d.ts +++ b/amqplib/amqplib.d.ts @@ -66,7 +66,7 @@ declare module "amqplib/properties" { contentType?: string; contentEncoding?: string; - headers?: Object; + headers?: any; priority?: number; correlationId?: string; replyTo?: string; @@ -81,7 +81,7 @@ declare module "amqplib/properties" { noAck?: boolean; exclusive?: boolean; priority?: number; - arguments?: Object; + arguments?: any; } interface Get { noAck?: boolean; @@ -90,8 +90,8 @@ declare module "amqplib/properties" { interface Message { content: Buffer; - fields: Object; - properties: Object; + fields: any; + properties: any; } } From 9d4382e67b717d52a3173ecb76b38c403fc2454a Mon Sep 17 00:00:00 2001 From: abreits Date: Thu, 22 Oct 2015 13:51:13 +0200 Subject: [PATCH 3/5] amqplib: small cleanup of the test code --- amqplib/amqplib-tests.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amqplib/amqplib-tests.ts b/amqplib/amqplib-tests.ts index 9a15e250f4..1116279de0 100644 --- a/amqplib/amqplib-tests.ts +++ b/amqplib/amqplib-tests.ts @@ -24,7 +24,7 @@ amqp.connect("amqp://localhost") // test promise api properties var amqpMessage: amqp.Message; -amqpMessage.properties.contentType === "application/json"; +amqpMessage.properties.contentType = "application/json"; var amqpAssertExchangeOptions: amqp.Options.AssertExchange; var anqpAssertExchangeReplies: amqp.Replies.AssertExchange; @@ -62,6 +62,6 @@ amqpcb.connect("amqp://localhost", (err, connection) => { // test callback api properties var amqpcbMessage: amqp.Message; -amqpMessage.properties.contentType === "application/json"; +amqpcbMessage.properties.contentType = "application/json"; var amqpcbAssertExchangeOptions: amqp.Options.AssertExchange; var anqpcbAssertExchangeReplies: amqp.Replies.AssertExchange; \ No newline at end of file From efb976cda153bce3e5fb77f4e834ca1594581a1d Mon Sep 17 00:00:00 2001 From: abreits Date: Tue, 27 Oct 2015 08:58:06 +0100 Subject: [PATCH 4/5] amqplib: corrected amqpcb test --- amqplib/amqplib-tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amqplib/amqplib-tests.ts b/amqplib/amqplib-tests.ts index 1116279de0..346988588b 100644 --- a/amqplib/amqplib-tests.ts +++ b/amqplib/amqplib-tests.ts @@ -61,7 +61,7 @@ amqpcb.connect("amqp://localhost", (err, connection) => { }); // test callback api properties -var amqpcbMessage: amqp.Message; +var amqpcbMessage: amqpcb.Message; amqpcbMessage.properties.contentType = "application/json"; var amqpcbAssertExchangeOptions: amqp.Options.AssertExchange; var anqpcbAssertExchangeReplies: amqp.Replies.AssertExchange; \ No newline at end of file From 0630a01ea6ecee52c3e0612b0450f55a4689e0ba Mon Sep 17 00:00:00 2001 From: abreits Date: Tue, 27 Oct 2015 09:20:08 +0100 Subject: [PATCH 5/5] amqplib: amqpcb test fix --- amqplib/amqplib-tests.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amqplib/amqplib-tests.ts b/amqplib/amqplib-tests.ts index 346988588b..85763c9ee1 100644 --- a/amqplib/amqplib-tests.ts +++ b/amqplib/amqplib-tests.ts @@ -63,5 +63,5 @@ amqpcb.connect("amqp://localhost", (err, connection) => { // test callback api properties var amqpcbMessage: amqpcb.Message; amqpcbMessage.properties.contentType = "application/json"; -var amqpcbAssertExchangeOptions: amqp.Options.AssertExchange; -var anqpcbAssertExchangeReplies: amqp.Replies.AssertExchange; \ No newline at end of file +var amqpcbAssertExchangeOptions: amqpcb.Options.AssertExchange; +var anqpcbAssertExchangeReplies: amqpcb.Replies.AssertExchange; \ No newline at end of file