@pact-foundation/pact 10.2.2 → 10.3.0

package/src/asynchronousMessagePact.js

@@ -0,0 +1,222 @@
+"use strict";
+/**
+ * @module Message
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.asynchronousBodyHandler = exports.synchronousBodyHandler = exports.AsynchronousMessagePact = void 0;
+var lodash_1 = require("lodash");
+var pact_core_1 = __importStar(require("@pact-foundation/pact-core"));
+var ramda_1 = require("ramda");
+var logger_1 = __importStar(require("./common/logger"));
+var configurationError_1 = __importDefault(require("./errors/configurationError"));
+var package_json_1 = require("../package.json");
+var spec_1 = require("./common/spec");
+var v3_1 = require("./v3");
+var DEFAULT_PACT_DIR = './pacts';
+// eslint-disable-next-line no-shadow
+var ContentType;
+(function (ContentType) {
+    ContentType[ContentType["JSON"] = 0] = "JSON";
+    ContentType[ContentType["BINARY"] = 1] = "BINARY";
+    ContentType[ContentType["STRING"] = 2] = "STRING";
+})(ContentType || (ContentType = {}));
+/**
+ * A Message Consumer is analagous to a Provider in the HTTP Interaction model.
+ * It is the receiver of an interaction, and needs to be able to handle whatever
+ * request was provided.
+ */
+var AsynchronousMessagePact = /** @class */ (function () {
+    function AsynchronousMessagePact(config) {
+        this.config = config;
+        this.state = {};
+        this.pact = (0, pact_core_1.makeConsumerMessagePact)(config.consumer, config.provider, (0, spec_1.numberToSpec)(config.spec, v3_1.SpecificationVersion.SPECIFICATION_VERSION_V3), config.logLevel);
+        this.pact.addMetadata('pact-js', 'version', package_json_1.version);
+        this.message = this.pact.newAsynchronousMessage('');
+        if (!(0, lodash_1.isEmpty)(config.logLevel)) {
+            (0, logger_1.setLogLevel)(config.logLevel);
+            pact_core_1.default.logLevel(config.logLevel);
+        }
+    }
+    /**
+     * Gives a state the provider should be in for this Message.
+     *
+     * @param {string} state - The state of the provider.
+     * @returns {Message} MessageConsumer
+     */
+    AsynchronousMessagePact.prototype.given = function (state) {
+        var _this = this;
+        if (typeof state === 'string') {
+            this.message.given(state);
+        }
+        else {
+            (0, ramda_1.forEachObjIndexed)(function (v, k) {
+                _this.message.givenWithParam(state.name, "".concat(k), JSON.stringify(v));
+            }, state.params);
+        }
+        return this;
+    };
+    /**
+     * A free style description of the Message.
+     *
+     * @param {string} description - A description of the Message to be received
+     * @returns {Message} MessageConsumer
+     */
+    AsynchronousMessagePact.prototype.expectsToReceive = function (description) {
+        if ((0, lodash_1.isEmpty)(description)) {
+            throw new configurationError_1.default('You must provide a description for the Message.');
+        }
+        this.message.expectsToReceive(description);
+        return this;
+    };
+    /**
+     * The JSON object to be received by the message consumer.
+     *
+     * May be a JSON object or JSON primitive. The contents must be able to be properly
+     * stringified and parse (i.e. via JSON.stringify and JSON.parse).
+     *
+     * @param {string} content - A description of the Message to be received
+     * @returns {Message} MessageConsumer
+     */
+    AsynchronousMessagePact.prototype.withContent = function (content) {
+        if ((0, lodash_1.isEmpty)(content)) {
+            throw new configurationError_1.default('You must provide a valid JSON document or primitive for the Message.');
+        }
+        this.message.withContents(JSON.stringify(content), 'application/json');
+        this.state.contentType = ContentType.JSON;
+        return this;
+    };
+    /**
+     * The text content to be received by the message consumer.
+     *
+     * May be any text
+     *
+     * @param {string} content - A description of the Message to be received
+     * @returns {Message} MessageConsumer
+     */
+    AsynchronousMessagePact.prototype.withTextContent = function (content, contentType) {
+        this.message.withContents(content, contentType);
+        this.state.contentType = ContentType.STRING;
+        return this;
+    };
+    /**
+     * The binary content to be received by the message consumer.
+     *
+     * Content will be stored in base64 in the resulting pact file.
+     *
+     * @param {Buffer} content - A buffer containing the binary content
+     * @param {String} contenttype - The mime type of the content to expect
+     * @returns {Message} MessageConsumer
+     */
+    AsynchronousMessagePact.prototype.withBinaryContent = function (content, contentType) {
+        this.message.withBinaryContents(content, contentType);
+        this.state.contentType = ContentType.BINARY;
+        return this;
+    };
+    /**
+     * Message metadata.
+     *
+     * @param {string} metadata -
+     * @returns {Message} MessageConsumer
+     */
+    AsynchronousMessagePact.prototype.withMetadata = function (metadata) {
+        var _this = this;
+        if ((0, lodash_1.isEmpty)(metadata)) {
+            throw new configurationError_1.default('You must provide valid metadata for the Message, or none at all');
+        }
+        (0, ramda_1.forEachObjIndexed)(function (v, k) {
+            _this.message.withMetadata("".concat(k), typeof v === 'string' ? v : v.getValue());
+        }, metadata);
+        return this;
+    };
+    /**
+     * Creates a new Pact _message_ interaction to build a testable interaction.
+     *
+     * @param handler A message handler, that must be able to consume the given Message
+     * @returns {Promise}
+     */
+    AsynchronousMessagePact.prototype.verify = function (handler) {
+        var _this = this;
+        logger_1.default.info('Verifying message');
+        return handler(this.reifiedContent())
+            .then(function () {
+            var _a;
+            _this.pact.writePactFile((_a = _this.config.dir) !== null && _a !== void 0 ? _a : DEFAULT_PACT_DIR, _this.config.pactfileWriteMode === 'overwrite');
+        })
+            .finally(function () {
+            _this.message = _this.pact.newAsynchronousMessage('');
+            _this.state = {};
+        });
+    };
+    AsynchronousMessagePact.prototype.reifiedContent = function () {
+        var raw = this.message.reifyMessage();
+        logger_1.default.debug("reified message raw: raw");
+        var reified = JSON.parse(raw);
+        if (this.state.contentType === ContentType.BINARY) {
+            reified.contents = Buffer.from(reified.contents, 'base64');
+        }
+        logger_1.default.debug("rehydrated message body into correct type: ".concat(reified.contents));
+        return reified;
+    };
+    /**
+     * Returns the Message object created.
+     *
+     * @returns {Message}
+     */
+    AsynchronousMessagePact.prototype.json = function () {
+        return this.state;
+    };
+    return AsynchronousMessagePact;
+}());
+exports.AsynchronousMessagePact = AsynchronousMessagePact;
+// TODO: create more basic adapters for API handlers
+// bodyHandler takes a synchronous function and returns
+// a wrapped function that accepts a Message and returns a Promise
+function synchronousBodyHandler(handler) {
+    return function (m) {
+        var body = m.contents;
+        return new Promise(function (resolve, reject) {
+            try {
+                var res = handler(body);
+                resolve(res);
+            }
+            catch (e) {
+                reject(e);
+            }
+        });
+    };
+}
+exports.synchronousBodyHandler = synchronousBodyHandler;
+// bodyHandler takes an asynchronous (promisified) function and returns
+// a wrapped function that accepts a Message and returns a Promise
+// TODO: move this into its own package and re-export?
+function asynchronousBodyHandler(handler) {
+    return function (m) { return handler(m.contents); };
+}
+exports.asynchronousBodyHandler = asynchronousBodyHandler;
+//# sourceMappingURL=asynchronousMessagePact.js.map

package/src/asynchronousMessagePact.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"asynchronousMessagePact.js","sourceRoot":"","sources":["../../src/asynchronousMessagePact.ts"],"names":[],"mappings":"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"}

package/src/asynchronousMessagePact.spec.js

@@ -0,0 +1,117 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/* tslint:disable:no-unused-expression no-empty */
+var chai_1 = __importDefault(require("chai"));
+var chai_as_promised_1 = __importDefault(require("chai-as-promised"));
+var sinon_chai_1 = __importDefault(require("sinon-chai"));
+var asynchronousMessagePact_1 = require("./asynchronousMessagePact");
+chai_1.default.use(sinon_chai_1.default);
+chai_1.default.use(chai_as_promised_1.default);
+var expect = chai_1.default.expect;
+describe('MessageConsumer', function () {
+    var consumer;
+    beforeEach(function () {
+        consumer = new asynchronousMessagePact_1.AsynchronousMessagePact({
+            consumer: 'myconsumer',
+            provider: 'myprovider',
+        });
+    });
+    var testMessage = {
+        contents: {
+            foo: 'bar',
+        },
+    };
+    describe('#constructor', function () {
+        it('creates a Consumer when all mandatory parameters are provided', function () {
+            expect(consumer).to.be.a('object');
+            expect(consumer).to.respondTo('verify');
+        });
+    });
+    describe('#dsl', function () {
+        describe('when an empty description has been given', function () {
+            it('it should throw an error', function () {
+                expect(function () {
+                    consumer.expectsToReceive('');
+                }).to.throw(Error);
+            });
+        });
+        describe('when an empty content object has been given', function () {
+            it('it should throw an error', function () {
+                expect(function () {
+                    consumer.withContent({});
+                }).to.throw(Error);
+            });
+        });
+        describe('when an empty metadata object has been given', function () {
+            it('it should throw an error', function () {
+                expect(function () {
+                    consumer.withMetadata({});
+                }).to.throw(Error);
+            });
+        });
+    });
+    describe('#verify', function () {
+        describe('when given a valid handler and message', function () {
+            it('verifies the consumer message', function () {
+                var stubbedConsumer = new asynchronousMessagePact_1.AsynchronousMessagePact({
+                    consumer: 'myconsumer',
+                    provider: 'myprovider',
+                });
+                var stub = stubbedConsumer;
+                // Stub out service factory
+                stub.getServiceFactory = function () { return ({
+                    createMessage: function () { return Promise.resolve('message created'); },
+                }); };
+                stubbedConsumer
+                    .given('some state')
+                    .expectsToReceive('A message about something')
+                    .withContent({ foo: 'bar' })
+                    .withMetadata({ baz: 'bat' });
+                return expect(stubbedConsumer.verify(function () { return Promise.resolve('yay!'); })).to
+                    .eventually.be.fulfilled;
+            });
+        });
+    });
+    describe('handler transformers', function () {
+        describe('#asynchronousbodyHandler', function () {
+            describe('when given a function that succeeds', function () {
+                it('returns a Handler object that returns a completed promise', function () {
+                    var failFn = function () { return Promise.resolve('yay!'); };
+                    var hFn = (0, asynchronousMessagePact_1.asynchronousBodyHandler)(failFn);
+                    return expect(hFn(testMessage)).to.eventually.be.fulfilled;
+                });
+            });
+            describe('when given a function that throws an Exception', function () {
+                it('returns a Handler object that returns a rejected promise', function () {
+                    var failFn = function () { return Promise.reject(new Error('fail')); };
+                    var hFn = (0, asynchronousMessagePact_1.asynchronousBodyHandler)(failFn);
+                    return expect(hFn(testMessage)).to.eventually.be.rejected;
+                });
+            });
+        });
+        describe('#synchronousbodyHandler', function () {
+            describe('when given a function that succeeds', function () {
+                it('returns a Handler object that returns a completed promise', function () {
+                    var failFn = function () {
+                        /* do nothing! */
+                    };
+                    var hFn = (0, asynchronousMessagePact_1.synchronousBodyHandler)(failFn);
+                    return expect(hFn(testMessage)).to.eventually.be.fulfilled;
+                });
+            });
+            describe('when given a function that throws an Exception', function () {
+                it('returns a Handler object that returns a rejected promise', function () {
+                    var failFn = function () {
+                        throw new Error('fail');
+                    };
+                    var hFn = (0, asynchronousMessagePact_1.synchronousBodyHandler)(failFn);
+                    return expect(hFn(testMessage)).to.eventually.be.rejected;
+                });
+            });
+        });
+    });
+});
+//# sourceMappingURL=asynchronousMessagePact.spec.js.map

package/src/asynchronousMessagePact.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"asynchronousMessagePact.spec.js","sourceRoot":"","sources":["../../src/asynchronousMessagePact.spec.ts"],"names":[],"mappings":"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"}

package/src/common/net.js

@@ -73,8 +73,14 @@ var freePort = function () {
     return new Promise(function (res) {
         var s = net.createServer();
         s.listen(0, function () {
-            var port = s.address().port;
-            s.close(function () { return res(port); });
+            var addr = s.address();
+            if (addr !== null && typeof addr !== 'string') {
+                var port_1 = addr.port;
+                s.close(function () { return res(port_1); });
+            }
+            else {
+                throw Error('unable to find a free port');
+            }
         });
     });
 };

package/src/common/net.js.map

@@ -1 +1 @@
-{"version":3,"file":"net.js","sourceRoot":"","sources":["../../../src/common/net.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAA2B;AAC3B,qCAA+C;AAElC,QAAA,cAAc,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;AAEpE,IAAM,SAAS,GAAG,UAAC,IAAY,EAAE,IAAY;IAClD,OAAA,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QAC1B,IAAM,MAAM,GAAG,GAAG;aACf,YAAY,EAAE;aACd,MAAM,CAAC,EAAE,IAAI,MAAA,EAAE,IAAI,MAAA,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;aACvC,EAAE,CAAC,OAAO,EAAE,UAAC,CAAwB;YACpC,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE;gBAC3B,MAAM,CAAC,IAAI,KAAK,CAAC,eAAQ,IAAI,wCAA8B,IAAI,CAAE,CAAC,CAAC,CAAC;aACrE;iBAAM;gBACL,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC;aACD,EAAE,CAAC,WAAW,EAAE;YACf,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,cAAM,OAAA,OAAO,EAAE,EAAT,CAAS,CAAC,CAAC,KAAK,EAAE,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AAdF,CAcE,CAAC;AAfQ,QAAA,SAAS,aAejB;AAEE,IAAM,eAAe,GAAG,UAAC,IAAY,EAAE,IAAY;IACxD,OAAA,OAAO,CAAC,OAAO,CACb,kBAAQ;SACL,GAAG,CACF,sBAAc;IACd,yEAAyE;IACzE,gEAAgE;IAChE,UAAC,CAAC,IAAK,OAAA,kBAAQ,CAAC,OAAO,CAAC,IAAA,iBAAS,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAA9C,CAA8C;IACrD,wGAAwG;IACxG,EAAE,WAAW,EAAE,CAAC,EAAE,CACnB;SACA,IAAI,CAAC,UAAC,WAAW;QAChB,oEAAoE;QACpE,IAAI,WAAW,CAAC,KAAK,CAAC,UAAC,UAAU,IAAK,OAAA,CAAC,UAAU,CAAC,WAAW,EAAE,EAAzB,CAAyB,CAAC,EAAE;YAChE,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CAAC,2BAAoB,IAAI,gCAA6B,CAAC,CACjE,CAAC;SACH;QAED,8EAA8E;QAC9E,OAAO,IAAA,iBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CACL;AArBD,CAqBC,CAAC;AAtBS,QAAA,eAAe,mBAsBxB;AAEG,IAAM,QAAQ,GAAG;IACtB,OAAO,IAAI,OAAO,CAAC,UAAC,GAAG;QACrB,IAAM,CAAC,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QAC7B,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE;YACV,IAAM,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC;YAC9B,CAAC,CAAC,KAAK,CAAC,cAAM,OAAA,GAAG,CAAC,IAAI,CAAC,EAAT,CAAS,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AARW,QAAA,QAAQ,YAQnB"}
+{"version":3,"file":"net.js","sourceRoot":"","sources":["../../../src/common/net.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAA2B;AAC3B,qCAA+C;AAElC,QAAA,cAAc,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;AAEpE,IAAM,SAAS,GAAG,UAAC,IAAY,EAAE,IAAY;IAClD,OAAA,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QAC1B,IAAM,MAAM,GAAG,GAAG;aACf,YAAY,EAAE;aACd,MAAM,CAAC,EAAE,IAAI,MAAA,EAAE,IAAI,MAAA,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;aACvC,EAAE,CAAC,OAAO,EAAE,UAAC,CAAwB;YACpC,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE;gBAC3B,MAAM,CAAC,IAAI,KAAK,CAAC,eAAQ,IAAI,wCAA8B,IAAI,CAAE,CAAC,CAAC,CAAC;aACrE;iBAAM;gBACL,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC;aACD,EAAE,CAAC,WAAW,EAAE;YACf,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,cAAM,OAAA,OAAO,EAAE,EAAT,CAAS,CAAC,CAAC,KAAK,EAAE,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AAdF,CAcE,CAAC;AAfQ,QAAA,SAAS,aAejB;AAEE,IAAM,eAAe,GAAG,UAAC,IAAY,EAAE,IAAY;IACxD,OAAA,OAAO,CAAC,OAAO,CACb,kBAAQ;SACL,GAAG,CACF,sBAAc;IACd,yEAAyE;IACzE,gEAAgE;IAChE,UAAC,CAAC,IAAK,OAAA,kBAAQ,CAAC,OAAO,CAAC,IAAA,iBAAS,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAA9C,CAA8C;IACrD,wGAAwG;IACxG,EAAE,WAAW,EAAE,CAAC,EAAE,CACnB;SACA,IAAI,CAAC,UAAC,WAAW;QAChB,oEAAoE;QACpE,IAAI,WAAW,CAAC,KAAK,CAAC,UAAC,UAAU,IAAK,OAAA,CAAC,UAAU,CAAC,WAAW,EAAE,EAAzB,CAAyB,CAAC,EAAE;YAChE,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CAAC,2BAAoB,IAAI,gCAA6B,CAAC,CACjE,CAAC;SACH;QAED,8EAA8E;QAC9E,OAAO,IAAA,iBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CACL;AArBD,CAqBC,CAAC;AAtBS,QAAA,eAAe,mBAsBxB;AAEG,IAAM,QAAQ,GAAG;IACtB,OAAO,IAAI,OAAO,CAAC,UAAC,GAAG;QACrB,IAAM,CAAC,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QAC7B,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE;YACV,IAAM,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YACzB,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBAC7C,IAAM,MAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvB,CAAC,CAAC,KAAK,CAAC,cAAM,OAAA,GAAG,CAAC,MAAI,CAAC,EAAT,CAAS,CAAC,CAAC;aAC1B;iBAAM;gBACL,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAbW,QAAA,QAAQ,YAanB"}

package/src/dsl/verifier/proxy/parseBody.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import * as http from 'http';
 interface ReqBodyExtended extends http.IncomingMessage {
     body?: Buffer | Record<string, unknown>;

package/src/dsl/verifier/proxy/tracer.js

@@ -31,6 +31,9 @@ var createResponseTracer = function () { return function (_, res, next) {
         chunks.push(Buffer.from(chunk));
         return oldWrite.apply(res, [chunk]);
     };
+    // I think the type definitions in @types/node is wrong/broken.
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     res.end = function (chunk) {
         if (chunk) {
             chunks.push(Buffer.from(chunk));

package/src/dsl/verifier/proxy/tracer.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracer.js","sourceRoot":"","sources":["../../../../../src/dsl/verifier/proxy/tracer.ts"],"names":[],"mappings":";;;;;;AACA,iCAA8D;AAE9D,kEAA4C;AAE5C,IAAM,6BAA6B,GAAG,UAAC,IAAY,EAAE,GAAqB;IACxE,OAAA,IAAA,eAAM,EACJ;QACE,IAAI,MAAA;QACJ,OAAO,EAAE,IAAA,eAAM,EACb,GAAG,CAAC,UAAU,EAAE,EAChB,UACE,GAAuD,EACvD,GAAG,EACH,KAAK;YAEL,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;YACjB,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAE,CACH;QACD,MAAM,EAAE,GAAG,CAAC,UAAU;KACvB,EACD,iBAAQ,CACT;AAlBD,CAkBC,CAAC;AAEJ,IAAM,4BAA4B,GAAG,UAAC,GAAoB;IACxD,OAAA,IAAA,eAAM,EACJ;QACE,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,IAAI,EAAE,GAAG,CAAC,IAAI;KACf,EACD,iBAAQ,CACT;AARD,CAQC,CAAC;AAEG,IAAM,oBAAoB,GAC/B,cAA8B,OAAA,UAAC,CAAC,EAAE,GAAG,EAAE,IAAI;IACnC,IAAA,KAAqB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,EAAxC,QAAQ,QAAA,EAAE,MAAM,QAAwB,CAAC;IAChD,IAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,GAAG,CAAC,KAAK,GAAG,UAAC,KAAsC;QACjD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAChC,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,GAAG,UAAC,KAAsC;QAC/C,IAAI,KAAK,EAAE;YACT,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SACjC;QACD,IAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,gBAAM,CAAC,KAAK,CACV,6BAAsB,IAAI,CAAC,SAAS,CAClC,6BAA6B,CAAC,IAAI,EAAE,GAAG,CAAC,CACzC,CAAE,CACJ,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC;IACF,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;QAC9B,IAAI,EAAE,CAAC;KACR;AACH,CAAC,EAxB6B,CAwB7B,CAAC;AAzBS,QAAA,oBAAoB,wBAyB7B;AAEG,IAAM,mBAAmB,GAC9B,cAA8B,OAAA,UAAC,GAAG,EAAE,CAAC,EAAE,IAAI;IACzC,gBAAM,CAAC,KAAK,CACV,4BAAqB,IAAI,CAAC,SAAS,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAAE,CACzE,CAAC;IACF,IAAI,EAAE,CAAC;AACT,CAAC,EAL6B,CAK7B,CAAC;AANS,QAAA,mBAAmB,uBAM5B"}
+{"version":3,"file":"tracer.js","sourceRoot":"","sources":["../../../../../src/dsl/verifier/proxy/tracer.ts"],"names":[],"mappings":";;;;;;AACA,iCAA8D;AAE9D,kEAA4C;AAE5C,IAAM,6BAA6B,GAAG,UAAC,IAAY,EAAE,GAAqB;IACxE,OAAA,IAAA,eAAM,EACJ;QACE,IAAI,MAAA;QACJ,OAAO,EAAE,IAAA,eAAM,EACb,GAAG,CAAC,UAAU,EAAE,EAChB,UACE,GAAuD,EACvD,GAAG,EACH,KAAK;YAEL,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;YACjB,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAE,CACH;QACD,MAAM,EAAE,GAAG,CAAC,UAAU;KACvB,EACD,iBAAQ,CACT;AAlBD,CAkBC,CAAC;AAEJ,IAAM,4BAA4B,GAAG,UAAC,GAAoB;IACxD,OAAA,IAAA,eAAM,EACJ;QACE,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,IAAI,EAAE,GAAG,CAAC,IAAI;KACf,EACD,iBAAQ,CACT;AARD,CAQC,CAAC;AAEG,IAAM,oBAAoB,GAC/B,cAA8B,OAAA,UAAC,CAAC,EAAE,GAAG,EAAE,IAAI;IACnC,IAAA,KAAqB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,EAAxC,QAAQ,QAAA,EAAE,MAAM,QAAwB,CAAC;IAChD,IAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,GAAG,CAAC,KAAK,GAAG,UAAC,KAAsC;QACjD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAChC,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC;IAEF,+DAA+D;IAC/D,6DAA6D;IAC7D,aAAa;IACb,GAAG,CAAC,GAAG,GAAG,UAAC,KAAsC;QAC/C,IAAI,KAAK,EAAE;YACT,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SACjC;QACD,IAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,gBAAM,CAAC,KAAK,CACV,6BAAsB,IAAI,CAAC,SAAS,CAClC,6BAA6B,CAAC,IAAI,EAAE,GAAG,CAAC,CACzC,CAAE,CACJ,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC;IACF,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;QAC9B,IAAI,EAAE,CAAC;KACR;AACH,CAAC,EA3B6B,CA2B7B,CAAC;AA5BS,QAAA,oBAAoB,wBA4B7B;AAEG,IAAM,mBAAmB,GAC9B,cAA8B,OAAA,UAAC,GAAG,EAAE,CAAC,EAAE,IAAI;IACzC,gBAAM,CAAC,KAAK,CACV,4BAAqB,IAAI,CAAC,SAAS,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAAE,CACzE,CAAC;IACF,IAAI,EAAE,CAAC;AACT,CAAC,EAL6B,CAK7B,CAAC;AANS,QAAA,mBAAmB,uBAM5B"}

package/src/dsl/verifier/verifier.js

@@ -122,9 +122,10 @@ var Verifier = /** @class */ (function () {
         var _this = this;
         return function (server) {
             var _a;
-            var opts = __assign(__assign({ providerStatesSetupUrl: "".concat(_this.address, ":").concat(server.address().port).concat(_this.stateSetupPath) }, (0, lodash_1.omit)(_this.config, 'handlers')), { providerBaseUrl: "".concat(_this.address, ":").concat(server.address().port), transports: (_a = _this.config.transports) === null || _a === void 0 ? void 0 : _a.concat([
+            var port = server.address().port;
+            var opts = __assign(__assign({ providerStatesSetupUrl: "".concat(_this.address, ":").concat(port).concat(_this.stateSetupPath) }, (0, lodash_1.omit)(_this.config, 'handlers')), { providerBaseUrl: "".concat(_this.address, ":").concat(port), transports: (_a = _this.config.transports) === null || _a === void 0 ? void 0 : _a.concat([
                     {
-                        port: server.address().port,
+                        port: port,
                         path: _this.messageTransportPath,
                         protocol: 'message',
                     },

package/src/dsl/verifier/verifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../../../../src/dsl/verifier/verifier.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../../../../src/dsl/verifier/verifier.ts"],"names":[],"mappings":"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"}

package/src/httpPact/tracing.js

@@ -19,6 +19,9 @@ var http_1 = __importDefault(require("http"));
 var logger_1 = __importDefault(require("../common/logger"));
 var traceHttpInteractions = function () {
     var originalRequest = http_1.default.request;
+    // TODO: Need to look into the types here. They seemed to have changed
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     http_1.default.request = function (options, cb) {
         var requestBodyChunks = [];
         var responseBodyChunks = [];

package/src/httpPact/tracing.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/httpPact/tracing.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8CAA4E;AAE5E,4DAAsC;AAE/B,IAAM,qBAAqB,GAAG;IACnC,IAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC;IACrC,cAAI,CAAC,OAAO,GAAG,UACb,OAAuB,EACvB,EAAkC;QAElC,IAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,IAAM,kBAAkB,GAAa,EAAE,CAAC;QACxC,IAAM,gBAAgB,GAAG,UAAC,GAAoB;YAC5C,gBAAM,CAAC,KAAK,CACV,4BAAqB,IAAI,CAAC,SAAS,uBAC9B,OAAO,KACV,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IACvD,CAAE,CACL,CAAC;YACF,IAAI,EAAE,EAAE;gBACN,EAAE,CAAC,GAAG,CAAC,CAAC;aACT;QACH,CAAC,CAAC;QACF,IAAM,aAAa,GAAkB,eAAe,CAClD,OAAO,EACP,gBAAgB,CACjB,CAAC;QACF,IAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvD,aAAa,CAAC,GAAG,GAAG,UAAC,KAAgD;YACnE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3C,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC,CAAC;QAEF,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,UAAC,QAAyB;YACrD,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE;gBACtB,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE;gBACjB,gBAAM,CAAC,KAAK,CACV,oBAAa,IAAI,CAAC,SAAS,CAAC;oBAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;oBACxD,OAAO,EAAE,QAAQ,CAAC,OAAO;oBACzB,UAAU,EAAE,QAAQ,CAAC,UAAU;iBAChC,CAAC,CAAE,CACL,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC;AACJ,CAAC,CAAC;AA7CW,QAAA,qBAAqB,yBA6ChC"}
+{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/httpPact/tracing.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8CAA4E;AAE5E,4DAAsC;AAE/B,IAAM,qBAAqB,GAAG;IACnC,IAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC;IACrC,sEAAsE;IACtE,6DAA6D;IAC7D,aAAa;IACb,cAAI,CAAC,OAAO,GAAG,UACb,OAAuB,EACvB,EAAkC;QAElC,IAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,IAAM,kBAAkB,GAAa,EAAE,CAAC;QACxC,IAAM,gBAAgB,GAAG,UAAC,GAAoB;YAC5C,gBAAM,CAAC,KAAK,CACV,4BAAqB,IAAI,CAAC,SAAS,uBAC9B,OAAO,KACV,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IACvD,CAAE,CACL,CAAC;YACF,IAAI,EAAE,EAAE;gBACN,EAAE,CAAC,GAAG,CAAC,CAAC;aACT;QACH,CAAC,CAAC;QACF,IAAM,aAAa,GAAkB,eAAe,CAClD,OAAO,EACP,gBAAgB,CACjB,CAAC;QACF,IAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvD,aAAa,CAAC,GAAG,GAAG,UAAC,KAAgD;YACnE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3C,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC,CAAC;QAEF,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,UAAC,QAAyB;YACrD,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE;gBACtB,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE;gBACjB,gBAAM,CAAC,KAAK,CACV,oBAAa,IAAI,CAAC,SAAS,CAAC;oBAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;oBACxD,OAAO,EAAE,QAAQ,CAAC,OAAO;oBACzB,UAAU,EAAE,QAAQ,CAAC,UAAU;iBAChC,CAAC,CAAE,CACL,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC;AACJ,CAAC,CAAC;AAhDW,QAAA,qBAAqB,yBAgDhC"}

package/src/index.d.ts

@@ -67,6 +67,7 @@ export * from './dsl/interaction';
  */
 export * from './dsl/mockService';
 export * from './v3';
+export * from './v4';
 /**
  * Exposes {@link PactOptions}
  * @memberof Pact

package/src/index.js

@@ -98,6 +98,7 @@ __exportStar(require("./dsl/interaction"), exports);
  */
 __exportStar(require("./dsl/mockService"), exports);
 __exportStar(require("./v3"), exports);
+__exportStar(require("./v4"), exports);
 /**
  * Exposes {@link PactOptions}
  * @memberof Pact

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AACH,2DAA+C;AAElC,QAAA,QAAQ,GAAG,YAAY,CAAC;AAIrC,uCAAkC;AAAzB,gGAAA,IAAI,OAAA;AAEb;;;;GAIG;AACH,wDAAsC;AAEtC;;;;GAIG;AACH,6DAG+B;AAF7B,0HAAA,mBAAmB,OAAA;AACnB,2HAAA,oBAAoB,OAAA;AAGtB;;;;GAIG;AACH,gDAA8B;AAE9B;;;;GAIG;AACH,0DAAwC;AAExC;;;;GAIG;AACH,gDAA8B;AAC9B;;;;GAIG;AACH,sDAAoC;AAEpC;;;;GAIG;AACH,oDAAkC;AAElC;;;;GAIG;AACH,oDAAkC;AAElC,uCAAqB;AAErB;;;;GAIG;AACH,gDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AACH,2DAA+C;AAElC,QAAA,QAAQ,GAAG,YAAY,CAAC;AAIrC,uCAAkC;AAAzB,gGAAA,IAAI,OAAA;AAEb;;;;GAIG;AACH,wDAAsC;AAEtC;;;;GAIG;AACH,6DAG+B;AAF7B,0HAAA,mBAAmB,OAAA;AACnB,2HAAA,oBAAoB,OAAA;AAGtB;;;;GAIG;AACH,gDAA8B;AAE9B;;;;GAIG;AACH,0DAAwC;AAExC;;;;GAIG;AACH,gDAA8B;AAC9B;;;;GAIG;AACH,sDAAoC;AAEpC;;;;GAIG;AACH,oDAAkC;AAElC;;;;GAIG;AACH,oDAAkC;AAElC,uCAAqB;AAErB,uCAAqB;AAErB;;;;GAIG;AACH,gDAA8B"}

package/src/messageProviderPact.js

@@ -116,7 +116,9 @@ var MessageProviderPact = /** @class */ (function () {
     MessageProviderPact.prototype.runProviderVerification = function () {
         var _this = this;
         return function (server) {
-            var opts = __assign(__assign({}, (0, lodash_1.omit)(_this.config, 'handlers')), { providerBaseUrl: "http://localhost:".concat(server.address().port) });
+            var opts = __assign(__assign({}, (0, lodash_1.omit)(_this.config, 'handlers')), {
+                providerBaseUrl: "http://localhost:".concat(server.address().port),
+            });
             return pact_core_1.default.verifyPacts(opts);
         };
     };

package/src/messageProviderPact.js.map

@@ -1 +1 @@
-{"version":3,"file":"messageProviderPact.js","sourceRoot":"","sources":["../../src/messageProviderPact.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"messageProviderPact.js","sourceRoot":"","sources":["../../src/messageProviderPact.ts"],"names":[],"mappings":"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"}