@pact-foundation/pact 15.0.0 → 16.0.0

package/CHANGELOG.md

@@ -2,6 +2,43 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [16.0.0](https://github.com/pact-foundation/pact-js/compare/v15.0.1...v16.0.0) (2025-10-07)
+
+
+### ⚠ BREAKING CHANGES
+
+* Rename Matchers to MatchersV2 to to avoid type overlap. remove AnyTemplate from V3 types
+* **deps:** min node >=20
+* export PactV4 / MatchersV3 as Pact / Matchers. Pact / Matchers renamaed to PactV2 / MatchersV2
+* **deps:** min node >=20, update express wildcard 5.x splat
+
+### Features
+
+* add GraphQL support to PactV4 ([4fe838c](https://github.com/pact-foundation/pact-js/commit/4fe838cd0a6ef9934d01cc4f2ad8958e1bb00fca))
+* export PactV4 / MatchersV3 as Pact / Matchers. Pact / Matchers renamaed to PactV2 / MatchersV2 ([f1ce98e](https://github.com/pact-foundation/pact-js/commit/f1ce98e68486f85d42d14cbd000b5b1730c251f0))
+* initial scaffolding for async messages ([041fa19](https://github.com/pact-foundation/pact-js/commit/041fa19e3b19f8767f2e5ec59b4b421af1885576))
+* support GraphQL for PactV3 ([6d077f4](https://github.com/pact-foundation/pact-js/commit/6d077f4b5c11489fd940f7181317229c3527d18c)), closes [#1093](https://github.com/pact-foundation/pact-js/issues/1093)
+
+
+### Fixes and Improvements
+
+* **deps:** explictly add router package, removed in express 5.x ([f99e01b](https://github.com/pact-foundation/pact-js/commit/f99e01be965f1a10508e2b453c122517154891ad))
+* **deps:** min node >=20 ([228d197](https://github.com/pact-foundation/pact-js/commit/228d197d7c4d8c943853db145eedcc84eca2b225))
+* **deps:** min node >=20, update express wildcard 5.x splat ([ef6d3d2](https://github.com/pact-foundation/pact-js/commit/ef6d3d24a92aa63782b3bb829cf3648508ab3759))
+* **deps:** update dependency axios to v1.12.0 [security] ([#1561](https://github.com/pact-foundation/pact-js/issues/1561)) ([75fad7c](https://github.com/pact-foundation/pact-js/commit/75fad7c2b1bdb7ad38da11341cf0546999d0b912))
+* **deps:** update dependency body-parser to v2 ([#1433](https://github.com/pact-foundation/pact-js/issues/1433)) ([357095a](https://github.com/pact-foundation/pact-js/commit/357095a06dab9ef3e7391bc5a4e811e649f6a577))
+* **deps:** update dependency ramda to ^0.31.0 ([#1507](https://github.com/pact-foundation/pact-js/issues/1507)) ([61c33c0](https://github.com/pact-foundation/pact-js/commit/61c33c0bd572e4413394393c2b25300c174b2a57))
+* examples/e2e/package.json & examples/e2e/package-lock.json to reduce vulnerabilities ([#1472](https://github.com/pact-foundation/pact-js/issues/1472)) ([1732a0f](https://github.com/pact-foundation/pact-js/commit/1732a0f41a570e9d1eeacff1192eb7341cb8b3b7))
+* mock backend to return the example value provided in date and time v3 matchers ([#1405](https://github.com/pact-foundation/pact-js/issues/1405)) ([5f47e5d](https://github.com/pact-foundation/pact-js/commit/5f47e5da3e6de5b1121896e909bdede6d24afb58))
+* Rename Matchers to MatchersV2 to to avoid type overlap. remove AnyTemplate from V3 types ([c2fe8f5](https://github.com/pact-foundation/pact-js/commit/c2fe8f5c7175db133f1ed19c71b43a35846f5a30))
+
+## [15.0.1](https://github.com/pact-foundation/pact-js/compare/v15.0.0...v15.0.1) (2025-03-24)
+
+
+### Fixes and Improvements
+
+* **deps:** add graphql back to dependency block ([#1425](https://github.com/pact-foundation/pact-js/issues/1425)) ([98fa621](https://github.com/pact-foundation/pact-js/commit/98fa6215eb1e2f2efcadaabcc28b6c8859da0067))
+
 ## [15.0.0](https://github.com/pact-foundation/pact-js/compare/v13.2.0...v15.0.0) (2025-03-24)
 
 

package/README.md

@@ -12,7 +12,6 @@
 [![Coverage Status](https://coveralls.io/repos/github/pact-foundation/pact-js/badge.svg?branch=master)](https://coveralls.io/github/pact-foundation/pact-js?branch=master)
 [![Code Climate](https://codeclimate.com/github/pact-foundation/pact-js/badges/gpa.svg)](https://codeclimate.com/github/pact-foundation/pact-js)
 [![Issue Count](https://codeclimate.com/github/pact-foundation/pact-js/badges/issue_count.svg)](https://codeclimate.com/github/pact-foundation/pact-js)
-[![Known Vulnerabilities](https://snyk.io/test/github/pact-foundation/pact-js/badge.svg?targetFile=package.json)](https://snyk.io/test/github/pact-foundation/pact-js?targetFile=package.json)
 [![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/pact-foundation/pact-js/blob/master/LICENSE)
 [![slack](https://slack.pact.io/badge.svg)](https://slack.pact.io)
 
@@ -91,7 +90,7 @@ Learn the key Pact JS features in 60 minutes: https://github.com/pact-foundation
 ## Installation
 
 ```shell
-npm i -S @pact-foundation/pact@latest
+npm install --save-dev @pact-foundation/pact
 
 # 🚀 now write some tests!
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pact-foundation/pact",
-  "version": "15.0.0",
+  "version": "16.0.0",
   "description": "Pact for all things Javascript",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -10,12 +10,14 @@
     "predist": "npm run clean",
     "dist": "tsc && copyfiles package.json ./dist",
     "install-plugins": "./scripts/install-plugins",
+    "fix": "npm run format:fix && npm run lint:fix",
     "lint": "eslint --config .eslintrc.json \"{src,test}/**/*.ts\"",
     "lint:fix": "npm run lint -- --fix",
     "format:base": "prettier \"{src,test,examples}/**/*.{ts,js}\"",
     "format:fix": "npm run format:base -- --write",
     "format:check": "npm run format:base -- --check",
     "release": "commit-and-tag-version",
+    "check": "npm run format:check && npm run lint && npm run test",
     "test": "mocha",
     "coverage": "nyc npm run test",
     "pretest": "npm run install-plugins",
@@ -31,7 +33,7 @@
     "url": "git+https://github.com/pact-foundation/pact-js.git"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=20"
   },
   "keywords": [
     "pact",
@@ -101,59 +103,61 @@
     ]
   },
   "dependencies": {
-    "@pact-foundation/pact-core": "^16.0.0",
-    "axios": "^1.8.4",
-    "body-parser": "^1.20.3",
+    "@pact-foundation/pact-core": "^17.0.0",
+    "axios": "^1.12.2",
+    "body-parser": "^2.2.0",
     "chalk": "4.1.2",
-    "express": "^4.21.1",
-    "graphql-tag": "^2.9.1",
+    "express": "^5.1.0",
+    "graphql": "^16.11.0",
+    "graphql-tag": "^2.12.6",
     "http-proxy": "^1.18.1",
-    "https-proxy-agent": "^7.0.4",
-    "js-base64": "^3.6.1",
+    "https-proxy-agent": "^7.0.6",
+    "js-base64": "^3.7.8",
     "lodash": "^4.17.21",
-    "ramda": "^0.30.0",
-    "randexp": "^0.5.3"
+    "ramda": "^0.31.3",
+    "randexp": "^0.5.3",
+    "router": "^2.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.26.4",
-    "@babel/core": "7.26.10",
-    "@babel/preset-env": "7.26.9",
+    "@babel/cli": "7.28.3",
+    "@babel/core": "7.28.4",
+    "@babel/preset-env": "7.28.3",
     "@pact-foundation/pact-js-prettier-config": "1.0.0",
-    "@types/chai": "5.2.1",
+    "@types/chai": "5.2.2",
     "@types/chai-as-promised": "8.0.2",
-    "@types/express": "4.17.21",
+    "@types/express": "4.17.23",
     "@types/http-proxy": "1.17.16",
-    "@types/lodash": "4.17.16",
+    "@types/lodash": "4.17.20",
     "@types/mocha": "10.0.10",
     "@types/nock": "11.1.0",
-    "@types/node": "22.13.13",
-    "@types/ramda": "0.30.2",
+    "@types/node": "22.18.8",
+    "@types/ramda": "0.31.1",
     "@types/sinon": "17.0.4",
-    "@types/sinon-chai": "2.7.42",
+    "@types/sinon-chai": "4.0.0",
     "@typescript-eslint/eslint-plugin": "5.62.0",
     "@typescript-eslint/parser": "5.62.0",
-    "chai": "5.2.0",
-    "chai-as-promised": "8.0.1",
-    "commit-and-tag-version": "12.5.0",
+    "chai": "6.2.0",
+    "chai-as-promised": "8.0.2",
+    "commit-and-tag-version": "12.6.0",
     "copyfiles": "2.4.1",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-airbnb-typescript": "17.1.0",
-    "eslint-config-prettier": "10.1.1",
-    "eslint-import-resolver-typescript": "4.2.2",
-    "eslint-plugin-chai-friendly": "1.0.1",
-    "eslint-plugin-import": "2.31.0",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-import-resolver-typescript": "4.4.2",
+    "eslint-plugin-chai-friendly": "1.1.0",
+    "eslint-plugin-import": "2.32.0",
     "eslint-plugin-mocha": "10.5.0",
-    "mocha": "11.1.0",
-    "nock": "14.0.1",
+    "mocha": "11.7.4",
+    "nock": "14.0.10",
     "nyc": "17.1.0",
-    "prettier": "3.5.3",
+    "prettier": "3.6.2",
     "proxyquire": "2.1.3",
     "rimraf": "6.0.1",
-    "sinon": "19.0.4",
-    "sinon-chai": "4.0.0",
+    "sinon": "21.0.0",
+    "sinon-chai": "4.0.1",
     "source-map-support": "0.5.21",
-    "tsx": "4.19.3",
-    "typescript": "5.8.2"
+    "tsx": "4.20.6",
+    "typescript": "5.9.3"
   }
 }

package/scripts/ci/release.sh

@@ -30,9 +30,10 @@ RELEASE_NOTES="${RELEASE_NOTES//$'\r'/'%0D'}"
 echo "::set-output name=notes::$RELEASE_NOTES"
 
 npm ci
-"$SCRIPT_DIR"/build-and-test.sh
 
+# run release first prior to test, so dist folder has the right version
 npm run release
+"$SCRIPT_DIR"/build-and-test.sh
 
 # Emit version to next step
 VERSION="$("$SCRIPT_DIR/lib/get-version.sh")"

package/src/common/graphQL/configurationError.d.ts

@@ -0,0 +1,2 @@
+export declare class ConfigurationError extends Error {
+}

package/src/common/graphQL/configurationError.js

@@ -0,0 +1,27 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigurationError = void 0;
+var ConfigurationError = /** @class */ (function (_super) {
+    __extends(ConfigurationError, _super);
+    function ConfigurationError() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return ConfigurationError;
+}(Error));
+exports.ConfigurationError = ConfigurationError;
+//# sourceMappingURL=configurationError.js.map

package/src/common/graphQL/configurationError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configurationError.js","sourceRoot":"","sources":["../../../../src/common/graphQL/configurationError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA;IAAwC,sCAAK;IAA7C;;IAA+C,CAAC;IAAD,yBAAC;AAAD,CAAC,AAAhD,CAAwC,KAAK,GAAG;AAAnC,gDAAkB"}

package/src/common/graphQL/graphQL.d.ts

@@ -0,0 +1,15 @@
+import { ASTNode } from 'graphql';
+import { OperationType } from './types';
+export interface GraphQLVariables {
+    [name: string]: unknown;
+}
+/**
+ * Accepts a raw or pre-parsed query, validating in the former case, and
+ * returns a normalized raw query.
+ * @param query {string|ASTNode} the query to validate
+ * @param type the operation type
+ */
+export declare function validateQuery(query: string | ASTNode, type: OperationType): string;
+export declare const escapeSpace: (s: string) => string;
+export declare const escapeRegexChars: (s: string) => string;
+export declare const escapeGraphQlQuery: (s: string) => string;

package/src/common/graphQL/graphQL.js

@@ -0,0 +1,50 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.escapeGraphQlQuery = exports.escapeRegexChars = exports.escapeSpace = void 0;
+exports.validateQuery = validateQuery;
+var graphql_1 = require("graphql");
+var graphql_tag_1 = __importDefault(require("graphql-tag"));
+var graphQLQueryError_1 = require("./graphQLQueryError");
+var configurationError_1 = require("./configurationError");
+/**
+ * Accepts a raw or pre-parsed query, validating in the former case, and
+ * returns a normalized raw query.
+ * @param query {string|ASTNode} the query to validate
+ * @param type the operation type
+ */
+function validateQuery(query, type) {
+    if (!query) {
+        throw new configurationError_1.ConfigurationError("You must provide a GraphQL ".concat(type, "."));
+    }
+    if (typeof query !== 'string') {
+        if ((query === null || query === void 0 ? void 0 : query.kind) === 'Document') {
+            // Already parsed, store in string form
+            return (0, graphql_1.print)(query);
+        }
+        throw new configurationError_1.ConfigurationError('You must provide a either a string or parsed GraphQL.');
+    }
+    else {
+        // String, so validate it
+        try {
+            (0, graphql_tag_1.default)(query);
+        }
+        catch (e) {
+            throw new graphQLQueryError_1.GraphQLQueryError("GraphQL ".concat(type, " is invalid: ").concat(e.message));
+        }
+        return query;
+    }
+}
+var escapeSpace = function (s) { return s.replace(/\s+/g, '\\s*'); };
+exports.escapeSpace = escapeSpace;
+var escapeRegexChars = function (s) {
+    return s.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
+};
+exports.escapeRegexChars = escapeRegexChars;
+var escapeGraphQlQuery = function (s) {
+    return (0, exports.escapeSpace)((0, exports.escapeRegexChars)(s));
+};
+exports.escapeGraphQlQuery = escapeGraphQlQuery;
+//# sourceMappingURL=graphQL.js.map

package/src/common/graphQL/graphQL.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphQL.js","sourceRoot":"","sources":["../../../../src/common/graphQL/graphQL.ts"],"names":[],"mappings":";;;;;;AAgBA,sCA0BC;AA1CD,mCAAyC;AACzC,4DAA8B;AAC9B,yDAAwD;AACxD,2DAA0D;AAO1D;;;;;GAKG;AACH,SAAgB,aAAa,CAC3B,KAAuB,EACvB,IAAmB;IAEnB,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,uCAAkB,CAAC,qCAA8B,IAAI,MAAG,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,MAAK,UAAU,EAAE,CAAC;YAC/B,uCAAuC;YACvC,OAAO,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QACD,MAAM,IAAI,uCAAkB,CAC1B,uDAAuD,CACxD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,yBAAyB;QACzB,IAAI,CAAC;YACH,IAAA,qBAAG,EAAC,KAAK,CAAC,CAAC;QACb,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,qCAAiB,CAAC,kBAAW,IAAI,0BAAgB,CAAC,CAAC,OAAO,CAAE,CAAC,CAAC;QAC1E,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAEM,IAAM,WAAW,GAAG,UAAC,CAAS,IAAa,OAAA,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EAAzB,CAAyB,CAAC;AAA/D,QAAA,WAAW,eAAoD;AAErE,IAAM,gBAAgB,GAAG,UAAC,CAAS;IACxC,OAAA,CAAC,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC;AAA1C,CAA0C,CAAC;AADhC,QAAA,gBAAgB,oBACgB;AAEtC,IAAM,kBAAkB,GAAG,UAAC,CAAS;IAC1C,OAAA,IAAA,mBAAW,EAAC,IAAA,wBAAgB,EAAC,CAAC,CAAC,CAAC;AAAhC,CAAgC,CAAC;AADtB,QAAA,kBAAkB,sBACI"}

package/src/common/graphQL/graphQLQueryError.d.ts

@@ -0,0 +1,2 @@
+export declare class GraphQLQueryError extends Error {
+}

package/src/common/graphQL/graphQLQueryError.js

@@ -0,0 +1,27 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphQLQueryError = void 0;
+var GraphQLQueryError = /** @class */ (function (_super) {
+    __extends(GraphQLQueryError, _super);
+    function GraphQLQueryError() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return GraphQLQueryError;
+}(Error));
+exports.GraphQLQueryError = GraphQLQueryError;
+//# sourceMappingURL=graphQLQueryError.js.map

package/src/common/graphQL/graphQLQueryError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphQLQueryError.js","sourceRoot":"","sources":["../../../../src/common/graphQL/graphQLQueryError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA;IAAuC,qCAAK;IAA5C;;IAA8C,CAAC;IAAD,wBAAC;AAAD,CAAC,AAA/C,CAAuC,KAAK,GAAG;AAAlC,8CAAiB"}

package/src/common/graphQL/types.d.ts

@@ -0,0 +1,4 @@
+export declare enum OperationType {
+    Mutation = "Mutation",
+    Query = "Query"
+}

package/src/common/graphQL/types.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OperationType = void 0;
+var OperationType;
+(function (OperationType) {
+    OperationType["Mutation"] = "Mutation";
+    OperationType["Query"] = "Query";
+})(OperationType || (exports.OperationType = OperationType = {}));
+//# sourceMappingURL=types.js.map

package/src/common/graphQL/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/common/graphQL/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,gCAAe,CAAA;AACjB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB"}

package/src/dsl/graphql.d.ts

@@ -1,7 +1,5 @@
 import { Interaction, InteractionStateComplete } from './interaction';
-export interface GraphQLVariables {
-    [name: string]: unknown;
-}
+import { GraphQLVariables } from '../common/graphQL/graphQL';
 /**
  * GraphQL interface
  */

package/src/dsl/graphql.js

@@ -26,16 +26,12 @@ exports.GraphQLInteraction = void 0;
  */
 var lodash_1 = require("lodash");
 var ramda_1 = require("ramda");
-var graphql_tag_1 = __importDefault(require("graphql-tag"));
 var interaction_1 = require("./interaction");
 var matchers_1 = require("./matchers");
 var graphQLQueryError_1 = __importDefault(require("../errors/graphQLQueryError"));
 var configurationError_1 = __importDefault(require("../errors/configurationError"));
-var escapeSpace = function (s) { return s.replace(/\s+/g, '\\s*'); };
-var escapeRegexChars = function (s) {
-    return s.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
-};
-var escapeGraphQlQuery = function (s) { return escapeSpace(escapeRegexChars(s)); };
+var graphQL_1 = require("../common/graphQL/graphQL");
+var types_1 = require("../common/graphQL/types");
 /**
  * GraphQL interface
  */
@@ -115,7 +111,7 @@ var GraphQLInteraction = /** @class */ (function (_super) {
                 operationName: this.operation,
                 query: (0, matchers_1.regex)({
                     generate: this.query,
-                    matcher: escapeGraphQlQuery(this.query),
+                    matcher: (0, graphQL_1.escapeGraphQlQuery)(this.query),
                 }),
                 variables: this.variables,
             }),
@@ -129,7 +125,7 @@ var GraphQLInteraction = /** @class */ (function (_super) {
             throw new configurationError_1.default("You must provide a GraphQL ".concat(type, "."));
         }
         try {
-            (0, graphql_tag_1.default)(query);
+            (0, graphQL_1.validateQuery)(query, type === 'query' ? types_1.OperationType.Query : types_1.OperationType.Mutation);
         }
         catch (e) {
             throw new graphQLQueryError_1.default("GraphQL ".concat(type, " is invalid: ").concat(e.message));

package/src/dsl/graphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../../src/dsl/graphql.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../../src/dsl/graphql.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;GAIG;AACH,iCAAoD;AACpD,+BAA+B;AAC/B,6CAAsE;AACtE,uCAAmC;AACnC,kFAA4D;AAC5D,oFAA8D;AAC9D,qDAImC;AACnC,iDAAwD;AAExD;;GAEG;AACH;IAAwC,sCAAW;IAAnD;;QACY,eAAS,GAAmB,SAAS,CAAC;QAEtC,eAAS,GAAsB,SAAS,CAAC;;IAkHrD,CAAC;IA9GC;;OAEG;IACI,0CAAa,GAApB,UAAqB,SAAwB;QAC3C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACI,0CAAa,GAApB,UAAqB,SAA2B;QAC9C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACI,sCAAS,GAAhB,UAAiB,KAAa;QAC5B,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;;;;;;;;;OAaG;IACI,yCAAY,GAAnB,UAAoB,QAAgB;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACpD,CAAC;IAED;;OAEG;IACI,iCAAI,GAAX;QACE,gBAAK,CAAC,IAAI,WAAE,CAAC;QAEb,IAAI,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,4BAAkB,CAAC,mCAAmC,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,2BAAiB,CACzB,+CAA+C,CAChD,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAA,eAAM,EACzB;YACE,IAAI,EAAE,IAAA,cAAM,EAAC,oBAAW,EAAE;gBACxB,aAAa,EAAE,IAAI,CAAC,SAAS;gBAC7B,KAAK,EAAE,IAAA,gBAAK,EAAC;oBACX,QAAQ,EAAE,IAAI,CAAC,KAAK;oBACpB,OAAO,EAAE,IAAA,4BAAkB,EAAC,IAAI,CAAC,KAAK,CAAC;iBACxC,CAAC;gBACF,SAAS,EAAE,IAAI,CAAC,SAAS;aAC1B,CAAC;YACF,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,MAAM,EAAE,MAAM;SACf,EACD,IAAI,CAAC,KAAK,CAAC,OAAO,CACnB,CAAC;QAEF,OAAO,IAAI,CAAC,KAAiC,CAAC;IAChD,CAAC;IAEO,4CAAe,GAAvB,UAAwB,KAAa,EAAE,IAAY;QACjD,IAAI,IAAA,cAAK,EAAC,KAAK,CAAC,EAAE,CAAC;YACjB,MAAM,IAAI,4BAAkB,CAAC,qCAA8B,IAAI,MAAG,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,CAAC;YACH,IAAA,uBAAa,EACX,KAAK,EACL,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,qBAAa,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAa,CAAC,QAAQ,CAChE,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,2BAAiB,CAAC,kBAAW,IAAI,0BAAgB,CAAC,CAAC,OAAO,CAAE,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,OAAO,IAAI,CAAC;IACd,CAAC;IACH,yBAAC;AAAD,CAAC,AArHD,CAAwC,yBAAW,GAqHlD;AArHY,gDAAkB"}

package/src/dsl/interaction.d.ts

@@ -3,17 +3,17 @@
  * @module Interaction
  */
 import { HTTPMethods, HTTPMethod } from '../common/request';
-import { Matcher, AnyTemplate } from './matchers';
+import { MatcherV2, AnyTemplate } from './matchers';
 interface QueryObject {
-    [name: string]: string | Matcher<string> | string[];
+    [name: string]: string | MatcherV2<string> | string[];
 }
 export type Query = string | QueryObject;
 export type Headers = {
-    [header: string]: string | Matcher<string> | (Matcher<string> | string)[];
+    [header: string]: string | MatcherV2<string> | (MatcherV2<string> | string)[];
 };
 export interface RequestOptions {
     method: HTTPMethods | HTTPMethod;
-    path: string | Matcher<string>;
+    path: string | MatcherV2<string>;
     query?: Query;
     headers?: Headers;
     body?: AnyTemplate;

package/src/dsl/interaction.js.map

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

package/src/dsl/matchers.d.ts

@@ -14,18 +14,18 @@ export declare const UUID_V4_FORMAT = "^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12
 export declare const IPV4_FORMAT = "^(\\d{1,3}\\.)+\\d{1,3}$";
 export declare const IPV6_FORMAT = "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$";
 export declare const HEX_FORMAT = "^[0-9a-fA-F]+$";
-export interface Matcher<T> {
+export interface MatcherV2<T> {
     value?: T;
     'pact:matcher:type': string;
     getValue(): T;
 }
-export interface ArrayMatcher<T> extends Matcher<T> {
+export interface ArrayMatcher<T> extends MatcherV2<T> {
     'pact:matcher:type': string;
     min?: number;
     max?: number;
 }
-export declare function isMatcher(x: unknown): x is Matcher<AnyTemplate>;
-export type AnyTemplate = AnyJson | Matcher<AnyTemplate> | ArrayMatcher<AnyTemplate> | TemplateMap | ArrayTemplate;
+export declare function isMatcher(x: unknown): x is MatcherV2<AnyTemplate>;
+export type AnyTemplate = AnyJson | MatcherV2<AnyTemplate> | ArrayMatcher<AnyTemplate> | TemplateMap | ArrayTemplate;
 export type InterfaceToTemplate<O> = {
     [K in keyof O]: AnyTemplate;
 };
@@ -53,8 +53,8 @@ export declare function eachLike<T>(template: T, opts?: {
  * The somethingLike matcher
  * @param {any} value - the value to be somethingLike
  */
-export declare function somethingLike<T>(value: T): Matcher<T>;
-export interface RegexMatcher<T> extends Matcher<T> {
+export declare function somethingLike<T>(value: T): MatcherV2<T>;
+export interface RegexMatcher<T> extends MatcherV2<T> {
     regex: string;
 }
 /**
@@ -71,72 +71,72 @@ export declare function term(opts: {
  * Email address matcher.
  * @param {string} address - a email address to use as an example
  */
-export declare function email(address?: string): Matcher<string>;
+export declare function email(address?: string): MatcherV2<string>;
 /**
  * UUID v4 matcher.
  * @param {string} id - a UUID to use as an example.
  */
-export declare function uuid(id?: string): Matcher<string>;
+export declare function uuid(id?: string): MatcherV2<string>;
 /**
  * IPv4 matcher.
  * @param {string} ip - an IPv4 address to use as an example. Defaults to `127.0.0.13`
  */
-export declare function ipv4Address(ip?: string): Matcher<string>;
+export declare function ipv4Address(ip?: string): MatcherV2<string>;
 /**
  * IPv6 matcher.
  * @param {string} ip - an IPv6 address to use as an example. Defaults to '::ffff:192.0.2.128'
  */
-export declare function ipv6Address(ip?: string): Matcher<string>;
+export declare function ipv6Address(ip?: string): MatcherV2<string>;
 /**
  * ISO8601 DateTime matcher.
  * @param {string} date - an ISO8601 Date and Time string
  *                        e.g. 2015-08-06T16:53:10+01:00 are valid
  */
-export declare function iso8601DateTime(date?: string): Matcher<string>;
+export declare function iso8601DateTime(date?: string): MatcherV2<string>;
 /**
  * ISO8601 DateTime matcher with required millisecond precision
  * @param {string} date - an ISO8601 Date and Time string, e.g. 2015-08-06T16:53:10.123+01:00
  */
-export declare function iso8601DateTimeWithMillis(date?: string): Matcher<string>;
+export declare function iso8601DateTimeWithMillis(date?: string): MatcherV2<string>;
 /**
  * ISO8601 Date matcher.
  * @param {string} date - a basic yyyy-MM-dd date string e.g. 2000-09-31
  */
-export declare function iso8601Date(date?: string): Matcher<string>;
+export declare function iso8601Date(date?: string): MatcherV2<string>;
 /**
- *  ISO8601 Time Matcher, matches a pattern of the format "'T'HH:mm:ss".
+ *  ISO8601 Time MatcherV2, matches a pattern of the format "'T'HH:mm:ss".
  * @param {string} date - a ISO8601 formatted time string e.g. T22:44:30.652Z
  */
-export declare function iso8601Time(time?: string): Matcher<string>;
+export declare function iso8601Time(time?: string): MatcherV2<string>;
 /**
  * RFC1123 Timestamp matcher "DAY, DD MON YYY hh:mm:ss"
  *
  * @param {string} date - an RFC1123 Date and Time string, e.g. Mon, 31 Oct 2016 15:21:41 -0400
  */
-export declare function rfc1123Timestamp(timestamp?: string): Matcher<string>;
+export declare function rfc1123Timestamp(timestamp?: string): MatcherV2<string>;
 /**
- * Hexadecimal Matcher.
+ * Hexadecimal MatcherV2.
  * @param {string} hex - a hex value.
  */
-export declare function hexadecimal(hex?: string): Matcher<string>;
+export declare function hexadecimal(hex?: string): MatcherV2<string>;
 /**
- * Decimal Matcher.
+ * Decimal MatcherV2.
  * @param {float} float - a decimal value.
  */
-export declare function decimal(float?: number): Matcher<number>;
+export declare function decimal(float?: number): MatcherV2<number>;
 /**
- * Integer Matcher.
+ * Integer MatcherV2.
  * @param {integer} int - an int value.
  */
-export declare function integer(int?: number): Matcher<number>;
+export declare function integer(int?: number): MatcherV2<number>;
 /**
- * Boolean Matcher.
+ * Boolean MatcherV2.
  */
-export declare function boolean(value?: boolean): Matcher<boolean>;
+export declare function boolean(value?: boolean): MatcherV2<boolean>;
 /**
- * String Matcher.
+ * String MatcherV2.
  */
-export declare function string(value?: string): Matcher<string>;
+export declare function string(value?: string): MatcherV2<string>;
 export { somethingLike as like };
 export { term as regex };
 export declare function extractPayload(value: AnyTemplate): AnyJson;