@pact-foundation/pact-core 13.7.2 → 13.7.3

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [13.7.3](https://github.com/pact-foundation/pact-js-core/compare/v13.7.2...v13.7.3) (2022-08-12)
+
+
+### Fixes and Improvements
+
+* update the argument validation and function mapping for ffi verification ([#391](https://github.com/pact-foundation/pact-js-core/issues/391)) ([fee85e1](https://github.com/pact-foundation/pact-js-core/commit/fee85e1d1fcd63b81c3d2d0f86ab9691975873e6))
+
 ### [13.7.2](https://github.com/pact-foundation/pact-js-core/compare/v13.7.1...v13.7.2) (2022-08-11)
 
 

package/build/Makefile

@@ -319,7 +319,7 @@ endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
 cmd_regen_makefile = cd $(srcdir); /opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/runner/.cache/node-gyp/12.22.12" "-Dnode_gyp_dir=/opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/home/runner/.cache/node-gyp/12.22.12/<(target_arch)/node.lib" "-Dmodule_root_dir=/home/runner/work/pact-js-core/pact-js-core" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/home/runner/work/pact-js-core/pact-js-core/build/config.gypi -I/opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/home/runner/.cache/node-gyp/12.22.12/include/node/common.gypi "--toplevel-dir=." binding.gyp
-Makefile: $(srcdir)/../../../.cache/node-gyp/12.22.12/include/node/common.gypi $(srcdir)/binding.gyp $(srcdir)/build/config.gypi $(srcdir)/../../../../../opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
+Makefile: $(srcdir)/binding.gyp $(srcdir)/build/config.gypi $(srcdir)/../../../../../opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/../../../.cache/node-gyp/12.22.12/include/node/common.gypi
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pact-foundation/pact-core",
-  "version": "13.7.2",
+  "version": "13.7.3",
   "description": "Core of @pact-foundation/pact. You almost certainly don't want to depend on this directly.",
   "main": "src/index.js",
   "homepage": "https://github.com/pact-foundation/pact-js-core#readme",
@@ -155,7 +155,7 @@
       },
       {
         "type": "refactor",
-        "hidden": true
+        "section": "Fixes and Improvements"
       },
       {
         "type": "perf",

package/src/ffi/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+export declare type FfiHandle = number;
 export declare type FfiPactHandle = number;
 export declare type FfiInteractionHandle = number;
 export declare type FfiVerifierHandle = number;
@@ -47,6 +48,8 @@ export declare enum FfiLogLevelFilter {
 export declare type Ffi = {
     pactffiInit(logLevel: string): string;
     pactffiVersion(): string;
+} & FfiConsumerFunctions & FfiVerificationFunctions;
+export declare type FfiConsumerFunctions = {
     pactffiCreateMockServerForPact(handle: FfiPactHandle, address: string, tls: boolean): number;
     pactffiNewPact(consumer: string, provider: string): FfiPactHandle;
     pactffiWithSpecification(handle: FfiPactHandle, specification: FfiSpecificationVersion): boolean;
@@ -84,6 +87,8 @@ export declare type Ffi = {
     pactffiMessageWithBinaryContents(handle: FfiMessageHandle, contentType: string, data: Buffer, size: number): void;
     pactffiMessageWithMetadata(handle: FfiMessageHandle, key: string, value: string): void;
     pactffiMessageReify(handle: FfiMessageHandle): string;
+};
+export declare type FfiVerificationFunctions = {
     pactffiVerifierNewForApplication(libraryName: string, version: string): FfiVerifierHandle;
     pactffiVerifierExecute(handle: FfiVerifierHandle, callback: (e: Error, res: number) => void): number;
     pactffiVerifierShutdown(handle: FfiVerifierHandle): void;

package/src/ffi/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":";;;AAQa,QAAA,uBAAuB,GAClC;IACE,6BAA6B,EAAE,CAAC;IAChC,wBAAwB,EAAE,CAAC;IAC3B,0BAA0B,EAAE,CAAC;IAC7B,wBAAwB,EAAE,CAAC;IAC3B,wBAAwB,EAAE,CAAC;IAC3B,wBAAwB,EAAE,CAAC;CAC5B,CAAC;AAIS,QAAA,oBAAoB,GAAyC;IACxE,OAAO,EAAE,CAAC;IACV,aAAa,EAAE,CAAC;IAChB,yBAAyB,EAAE,CAAC;IAC5B,qBAAqB,EAAE,CAAC;CACzB,CAAC;AAIW,QAAA,2BAA2B,GAGpC;IACF,OAAO,EAAE,CAAC;IACV,yBAAyB,EAAE,CAAC;IAC5B,sBAAsB,EAAE,CAAC;CAC1B,CAAC;AAIW,QAAA,0BAA0B,GAGnC;IACF,OAAO,EAAE,CAAC;IACV,aAAa,EAAE,CAAC;IAChB,qBAAqB,EAAE,CAAC;IACxB,mBAAmB,EAAE,CAAC;CACvB,CAAC;AAIW,QAAA,4BAA4B,GAGrC;IACF,OAAO,EAAE,CAAC;IACV,0BAA0B,EAAE,CAAC;IAC7B,oCAAoC,EAAE,CAAC;IACvC,6BAA6B,EAAE,CAAC;IAChC,yBAAyB,EAAE,CAAC;IAC5B,+BAA+B,EAAE,CAAC;IAClC,wBAAwB,EAAE,CAAC;CAC5B,CAAC;AAIW,QAAA,wBAAwB,GAAuB,CAAC,CAAC;AACjD,QAAA,yBAAyB,GAAuB,CAAC,CAAC;AAElD,QAAA,yBAAyB,GAAG;IACvC,YAAY,EAAE,CAAC,CAAC;IAChB,gBAAgB,EAAE,CAAC,CAAC;IACpB,sBAAsB,EAAE,CAAC,CAAC;IAC1B,UAAU,EAAE,CAAC,CAAC;IACd,iBAAiB,EAAE,CAAC,CAAC;IACrB,UAAU,EAAE,CAAC,CAAC;CACf,CAAC;AAUF,IAAY,wBAMX;AAND,WAAY,wBAAwB;IAClC,6GAA2B,CAAA;IAC3B,qGAAmB,CAAA;IACnB,yGAAqB,CAAA;IACrB,6FAAe,CAAA;IACf,iGAAiB,CAAA;AACnB,CAAC,EANW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAMnC;AAUD,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,mEAAa,CAAA;IACb,2EAAa,CAAA;AACf,CAAC,EAHW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B;AAED,IAAY,iBAOX;AAPD,WAAY,iBAAiB;IAC3B,2EAAiB,CAAA;IACjB,+EAAe,CAAA;IACf,6EAAc,CAAA;IACd,6EAAc,CAAA;IACd,+EAAe,CAAA;IACf,+EAAe,CAAA;AACjB,CAAC,EAPW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAO5B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":";;;AASa,QAAA,uBAAuB,GAClC;IACE,6BAA6B,EAAE,CAAC;IAChC,wBAAwB,EAAE,CAAC;IAC3B,0BAA0B,EAAE,CAAC;IAC7B,wBAAwB,EAAE,CAAC;IAC3B,wBAAwB,EAAE,CAAC;IAC3B,wBAAwB,EAAE,CAAC;CAC5B,CAAC;AAIS,QAAA,oBAAoB,GAAyC;IACxE,OAAO,EAAE,CAAC;IACV,aAAa,EAAE,CAAC;IAChB,yBAAyB,EAAE,CAAC;IAC5B,qBAAqB,EAAE,CAAC;CACzB,CAAC;AAIW,QAAA,2BAA2B,GAGpC;IACF,OAAO,EAAE,CAAC;IACV,yBAAyB,EAAE,CAAC;IAC5B,sBAAsB,EAAE,CAAC;CAC1B,CAAC;AAIW,QAAA,0BAA0B,GAGnC;IACF,OAAO,EAAE,CAAC;IACV,aAAa,EAAE,CAAC;IAChB,qBAAqB,EAAE,CAAC;IACxB,mBAAmB,EAAE,CAAC;CACvB,CAAC;AAIW,QAAA,4BAA4B,GAGrC;IACF,OAAO,EAAE,CAAC;IACV,0BAA0B,EAAE,CAAC;IAC7B,oCAAoC,EAAE,CAAC;IACvC,6BAA6B,EAAE,CAAC;IAChC,yBAAyB,EAAE,CAAC;IAC5B,+BAA+B,EAAE,CAAC;IAClC,wBAAwB,EAAE,CAAC;CAC5B,CAAC;AAIW,QAAA,wBAAwB,GAAuB,CAAC,CAAC;AACjD,QAAA,yBAAyB,GAAuB,CAAC,CAAC;AAElD,QAAA,yBAAyB,GAAG;IACvC,YAAY,EAAE,CAAC,CAAC;IAChB,gBAAgB,EAAE,CAAC,CAAC;IACpB,sBAAsB,EAAE,CAAC,CAAC;IAC1B,UAAU,EAAE,CAAC,CAAC;IACd,iBAAiB,EAAE,CAAC,CAAC;IACrB,UAAU,EAAE,CAAC,CAAC;CACf,CAAC;AAUF,IAAY,wBAMX;AAND,WAAY,wBAAwB;IAClC,6GAA2B,CAAA;IAC3B,qGAAmB,CAAA;IACnB,yGAAqB,CAAA;IACrB,6FAAe,CAAA;IACf,iGAAiB,CAAA;AACnB,CAAC,EANW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAMnC;AAUD,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,mEAAa,CAAA;IACb,2EAAa,CAAA;AACf,CAAC,EAHW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B;AAED,IAAY,iBAOX;AAPD,WAAY,iBAAiB;IAC3B,2EAAiB,CAAA;IACjB,+EAAe,CAAA;IACf,6EAAc,CAAA;IACd,6EAAc,CAAA;IACd,+EAAe,CAAA;IACf,+EAAe,CAAA;AACjB,CAAC,EAPW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAO5B"}

package/src/verifier/argumentMapper/arguments.d.ts

@@ -1,5 +1,14 @@
-import { ArgMapping, IgnoreOptionCombinations } from './types';
-import { InternalPactVerifierOptions, VerifierOptions } from '../types';
-export declare const ignoredArguments: Array<string>;
-export declare const ignoreOptionCombinations: IgnoreOptionCombinations<VerifierOptions>;
-export declare const argMapping: ArgMapping<InternalPactVerifierOptions>;
+import { FnMapping } from './types';
+import { InternalPactVerifierOptions } from '../types';
+import { FfiVerificationFunctions } from '../../ffi/types';
+export declare type IgnoredFfiFunctions = {
+    pactffiVerifierNewForApplication: 1;
+    pactffiVerifierExecute: 1;
+    pactffiVerifierShutdown: 1;
+};
+export declare type MergedFfiSourceFunctions = {
+    pactffiVerifierAddFileSource: 1;
+    pactffiVerifierUrlSource: 1;
+};
+export declare type RequiredFfiVerificationFunctions = Omit<FfiVerificationFunctions, keyof (IgnoredFfiFunctions & MergedFfiSourceFunctions)>;
+export declare const ffiFnMapping: FnMapping<RequiredFfiVerificationFunctions, InternalPactVerifierOptions>;

package/src/verifier/argumentMapper/arguments.js

@@ -1,94 +1,142 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.argMapping = exports.ignoreOptionCombinations = exports.ignoredArguments = void 0;
-const url = require("url");
-const filesystem_1 = require("../filesystem");
-exports.ignoredArguments = [
-    'requestFilter',
-    'stateHandlers',
-    'messageProviders',
-    'changeOrigin',
-    'beforeEach',
-    'afterEach',
-    'validateSSL',
-];
-exports.ignoreOptionCombinations = {
-    enablePending: { ifNotSet: 'pactBrokerUrl' },
-    consumerVersionSelectors: { ifNotSet: 'pactBrokerUrl' },
-    consumerVersionTags: { ifNotSet: 'pactBrokerUrl' },
-    publishVerificationResult: { ifNotSet: 'pactBrokerUrl' },
+exports.ffiFnMapping = void 0;
+const logger_1 = __importDefault(require("../../logger"));
+const fs = require("fs");
+const types_1 = require("./types");
+const url_1 = require("url");
+const DEFAULT_TIMEOUT = 30000;
+const objArrayToStringArray = (obj) => {
+    return obj.map((o) => JSON.stringify(o));
 };
-exports.argMapping = {
-    buildUrl: { arg: '--build-url', mapper: 'string' },
-    providerBranch: { arg: '--provider-branch', mapper: 'string' },
-    providerBaseUrl: (providerBaseUrl) => {
-        const u = url.parse(providerBaseUrl);
-        return u && u.port && u.hostname
-            ? ['--port', u.port, '--hostname', u.hostname]
-            : [];
+exports.ffiFnMapping = {
+    pactffiVerifierAddCustomHeader: {
+        validateAndExecute(ffi, handle, options) {
+            if (options.customProviderHeaders) {
+                if (options.customProviderHeaders) {
+                    Object.entries(options.customProviderHeaders).forEach(([key, value]) => {
+                        ffi.pactffiVerifierAddCustomHeader(handle, key, value);
+                    });
+                }
+                return { status: types_1.FnValidationStatus.SUCCESS };
+            }
+            return { status: types_1.FnValidationStatus.IGNORE };
+        },
     },
-    providerStatesSetupBody: {
-        warningMessage: 'providerStatesSetupBody is not valid for the CLI',
+    pactffiVerifierAddDirectorySource: {
+        validateAndExecute(ffi, handle, options) {
+            const messages = [];
+            if (options.pactUrls) {
+                options.pactUrls.forEach((file) => {
+                    logger_1.default.debug(`checking source type of given pactUrl: ${file}`);
+                    try {
+                        const u = new url_1.URL(file);
+                        if (u.hostname) {
+                            logger_1.default.debug(`adding ${file} as a Url source`);
+                            ffi.pactffiVerifierUrlSource(handle, file, options.pactBrokerUsername ||
+                                process.env.PACT_BROKER_USERNAME ||
+                                '', options.pactBrokerPassword ||
+                                process.env.PACT_BROKER_PASSWORD ||
+                                '', options.pactBrokerToken || process.env.PACT_BROKER_TOKEN || '');
+                        }
+                    }
+                    catch {
+                        messages.push(`${file} is not a valid URL`);
+                    }
+                    try {
+                        const f = fs.lstatSync(file);
+                        if (f.isDirectory()) {
+                            logger_1.default.debug(`adding ${file} as Directory source`);
+                            ffi.pactffiVerifierAddDirectorySource(handle, file);
+                        }
+                        else if (f.isFile() || f.isSymbolicLink()) {
+                            logger_1.default.debug(`adding ${file} as File source`);
+                            ffi.pactffiVerifierAddFileSource(handle, file);
+                        }
+                    }
+                    catch {
+                        messages.push(`'${file}' does not exist, or is not a file or directory`);
+                    }
+                });
+                return { status: types_1.FnValidationStatus.SUCCESS };
+            }
+            if (messages.length > 0) {
+                return { status: types_1.FnValidationStatus.FAIL, messages };
+            }
+            return { status: types_1.FnValidationStatus.IGNORE };
+        },
     },
-    providerStatesSetupTeardown: {
-        warningMessage: 'providerStatesSetupTeardown is not valid for the CLI',
+    pactffiVerifierBrokerSourceWithSelectors: {
+        validateAndExecute(ffi, handle, opts) {
+            const brokerUrl = opts.pactBrokerUrl || process.env.PACT_BROKER_BASE_URL;
+            if (brokerUrl && opts.provider) {
+                ffi.pactffiVerifierBrokerSourceWithSelectors(handle, brokerUrl, opts.pactBrokerUsername || process.env.PACT_BROKER_USERNAME || '', opts.pactBrokerPassword || process.env.PACT_BROKER_PASSWORD || '', opts.pactBrokerToken || process.env.PACT_BROKER_TOKEN || '', opts.enablePending || false, opts.includeWipPactsSince || '', opts.providerVersionTags || [], opts.providerBranch || '', opts.consumerVersionSelectors
+                    ? objArrayToStringArray(opts.consumerVersionSelectors)
+                    : [], opts.consumerVersionTags || []);
+                return { status: types_1.FnValidationStatus.SUCCESS };
+            }
+            return { status: types_1.FnValidationStatus.IGNORE };
+        },
     },
-    logLevel: (logLevel) => ['--loglevel', logLevel],
-    provider: { arg: '--provider-name', mapper: 'string' },
-    pactUrls: (pactUrls) => pactUrls.reduce((acc, uri) => {
-        switch (filesystem_1.getUriType(uri)) {
-            case 'URL':
-                return [...acc, '--url', uri];
-            case 'DIRECTORY':
-                return [...acc, '--dir', uri];
-            case 'FILE':
-                return [...acc, '--file', uri];
-            default:
-                return acc;
-        }
-    }, []),
-    pactBrokerUrl: { arg: '--broker-url', mapper: 'string' },
-    pactBrokerUsername: { arg: '--user', mapper: 'string' },
-    pactBrokerPassword: { arg: '--password', mapper: 'string' },
-    pactBrokerToken: { arg: '--token', mapper: 'string' },
-    consumerVersionTags: (tags) => [
-        '--consumer-version-tags',
-        Array.isArray(tags) ? tags.join(',') : tags,
-    ],
-    providerVersionTags: (tags) => [
-        '--provider-tags',
-        Array.isArray(tags) ? tags.join(',') : tags,
-    ],
-    providerStatesSetupUrl: { arg: '--state-change-url', mapper: 'string' },
-    providerVersion: { arg: '--provider-version', mapper: 'string' },
-    includeWipPactsSince: { arg: '--include-wip-pacts-since', mapper: 'string' },
-    consumerVersionSelectors: (selectors) => selectors
-        .map((s) => [
-        '--consumer-version-selectors',
-        JSON.stringify(s),
-    ])
-        .reduce((acc, current) => [...acc, ...current], []),
-    publishVerificationResult: { arg: '--publish', mapper: 'flag' },
-    enablePending: { arg: '--enable-pending', mapper: 'flag' },
-    timeout: { arg: '--request-timeout', mapper: 'string' },
-    disableSslVerification: { arg: '--disable-ssl-verification', mapper: 'flag' },
-    format: {
-        warningMessage: "All output is now on standard out, setting 'format' has no effect",
+    pactffiVerifierSetConsumerFilters: {
+        validateAndExecute(ffi, handle, options) {
+            if (options.consumerFilters && options.consumerFilters.length > 0) {
+                ffi.pactffiVerifierSetConsumerFilters(handle, options.consumerFilters);
+                return { status: types_1.FnValidationStatus.SUCCESS };
+            }
+            return { status: types_1.FnValidationStatus.IGNORE };
+        },
     },
-    out: {
-        warningMessage: "All output is now on standard out, setting 'out' has no effect",
+    pactffiVerifierSetFilterInfo: {
+        validateAndExecute(ffi, handle, options) {
+            if (process.env.PACT_DESCRIPTION ||
+                process.env.PACT_PROVIDER_STATE ||
+                process.env.PACT_PROVIDER_NO_STATE) {
+                const filterDescription = process.env.PACT_DESCRIPTION || '';
+                const filterState = process.env.PACT_PROVIDER_STATE || '';
+                const filterNoState = process.env.PACT_PROVIDER_NO_STATE ? true : false;
+                ffi.pactffiVerifierSetFilterInfo(handle, filterDescription, filterState, filterNoState);
+                return { status: types_1.FnValidationStatus.SUCCESS };
+            }
+            return { status: types_1.FnValidationStatus.IGNORE };
+        },
     },
-    logDir: {
-        warningMessage: 'Setting logDir is deprecated as all logs are now on standard out',
+    pactffiVerifierSetProviderInfo: {
+        validateAndExecute(ffi, handle, options) {
+            const uri = new url_1.URL(options.providerBaseUrl);
+            ffi.pactffiVerifierSetProviderInfo(handle, options.provider || '', uri.protocol.split(':')[0], uri.hostname, parseInt(uri.port, 10), uri.pathname);
+            return { status: types_1.FnValidationStatus.SUCCESS };
+        },
     },
-    verbose: {
-        warningMessage: "Verbose mode is deprecated and has no effect, please use logLevel: 'DEBUG' instead",
+    pactffiVerifierSetProviderState: {
+        validateAndExecute(ffi, handle, options) {
+            if (options.providerStatesSetupUrl) {
+                ffi.pactffiVerifierSetProviderState(handle, options.providerStatesSetupUrl, true, true);
+                return { status: types_1.FnValidationStatus.SUCCESS };
+            }
+            return { status: types_1.FnValidationStatus.IGNORE };
+        },
     },
-    monkeypatch: {
-        warningMessage: 'The undocumented feature monkeypatch is no more, please file an issue if you were using it and need this functionality',
+    pactffiVerifierSetPublishOptions: {
+        validateAndExecute(ffi, handle, options) {
+            if (options.publishVerificationResult && options.providerVersion) {
+                ffi.pactffiVerifierSetPublishOptions(handle, options.providerVersion, options.buildUrl || '', options.providerVersionTags || [], options.providerBranch || '');
+                return { status: types_1.FnValidationStatus.SUCCESS };
+            }
+            return { status: types_1.FnValidationStatus.IGNORE };
+        },
     },
-    customProviderHeaders: {
-        warningMessage: 'customProviderHeaders have been removed. This functionality is provided by request filters in a much more flexible way',
+    pactffiVerifierSetVerificationOptions: {
+        validateAndExecute(ffi, handle, opts) {
+            if (opts.disableSslVerification || opts.timeout) {
+                ffi.pactffiVerifierSetVerificationOptions(handle, opts.disableSslVerification || false, opts.timeout || DEFAULT_TIMEOUT);
+                return { status: types_1.FnValidationStatus.SUCCESS };
+            }
+            return { status: types_1.FnValidationStatus.IGNORE };
+        },
     },
 };
 //# sourceMappingURL=arguments.js.map

package/src/verifier/argumentMapper/arguments.js.map

@@ -1 +1 @@
-{"version":3,"file":"arguments.js","sourceRoot":"","sources":["arguments.ts"],"names":[],"mappings":";;;AAAA,2BAA4B;AAS5B,8CAA2C;AAQ9B,QAAA,gBAAgB,GAAkB;IAC7C,eAAe;IACf,eAAe;IACf,kBAAkB;IAClB,cAAc;IACd,YAAY;IACZ,WAAW;IACX,aAAa;CACd,CAAC;AAEW,QAAA,wBAAwB,GACnC;IACE,aAAa,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;IAC5C,wBAAwB,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;IACvD,mBAAmB,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;IAClD,yBAAyB,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;CACzD,CAAC;AAES,QAAA,UAAU,GAA4C;IACjE,QAAQ,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE;IAClD,cAAc,EAAE,EAAE,GAAG,EAAE,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE;IAC9D,eAAe,EAAE,CAAC,eAAuB,EAAE,EAAE;QAC3C,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,QAAQ;YAC9B,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC9C,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IACD,uBAAuB,EAAE;QACvB,cAAc,EAAE,kDAAkD;KACnE;IACD,2BAA2B,EAAE;QAC3B,cAAc,EAAE,sDAAsD;KACvE;IACD,QAAQ,EAAE,CAAC,QAAkB,EAAE,EAAE,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC;IAC1D,QAAQ,EAAE,EAAE,GAAG,EAAE,iBAAiB,EAAE,MAAM,EAAE,QAAQ,EAAE;IACtD,QAAQ,EAAE,CAAC,QAAkB,EAAE,EAAE,CAC/B,QAAQ,CAAC,MAAM,CAAgB,CAAC,GAAkB,EAAE,GAAW,EAAE,EAAE;QACjE,QAAQ,uBAAU,CAAC,GAAG,CAAC,EAAE;YACvB,KAAK,KAAK;gBACR,OAAO,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;YAChC,KAAK,WAAW;gBACd,OAAO,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;YAChC,KAAK,MAAM;gBACT,OAAO,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YACjC;gBACE,OAAO,GAAG,CAAC;SACd;IACH,CAAC,EAAE,EAAE,CAAC;IACR,aAAa,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE;IACxD,kBAAkB,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE;IACvD,kBAAkB,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE;IAC3D,eAAe,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE;IACrD,mBAAmB,EAAE,CAAC,IAAuB,EAAE,EAAE,CAAC;QAChD,yBAAyB;QACzB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;KAC5C;IACD,mBAAmB,EAAE,CAAC,IAAuB,EAAE,EAAE,CAAC;QAChD,iBAAiB;QACjB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;KAC5C;IACD,sBAAsB,EAAE,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,EAAE,QAAQ,EAAE;IAEvE,eAAe,EAAE,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,EAAE,QAAQ,EAAE;IAEhE,oBAAoB,EAAE,EAAE,GAAG,EAAE,2BAA2B,EAAE,MAAM,EAAE,QAAQ,EAAE;IAC5E,wBAAwB,EAAE,CAAC,SAAoC,EAAE,EAAE,CACjE,SAAS;SACN,GAAG,CAAC,CAAC,CAA0B,EAAE,EAAE,CAAC;QACnC,8BAA8B;QAC9B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;KAClB,CAAC;SACD,MAAM,CAAC,CAAC,GAAa,EAAE,OAAiB,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAC3E,yBAAyB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE;IAC/D,aAAa,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,EAAE;IAC1D,OAAO,EAAE,EAAE,GAAG,EAAE,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE;IACvD,sBAAsB,EAAE,EAAE,GAAG,EAAE,4BAA4B,EAAE,MAAM,EAAE,MAAM,EAAE;IAE7E,MAAM,EAAE;QACN,cAAc,EACZ,mEAAmE;KACtE;IACD,GAAG,EAAE;QACH,cAAc,EACZ,gEAAgE;KACnE;IAED,MAAM,EAAE;QACN,cAAc,EACZ,kEAAkE;KACrE;IACD,OAAO,EAAE;QACP,cAAc,EACZ,oFAAoF;KACvF;IACD,WAAW,EAAE;QACX,cAAc,EACZ,wHAAwH;KAC3H;IACD,qBAAqB,EAAE;QACrB,cAAc,EACZ,wHAAwH;KAC3H;CACF,CAAC"}
+{"version":3,"file":"arguments.js","sourceRoot":"","sources":["arguments.ts"],"names":[],"mappings":"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"}

package/src/verifier/argumentMapper/index.d.ts

@@ -1 +1,3 @@
-export {};
+import { InternalPactVerifierOptions } from '../types';
+import { Ffi, FfiVerifierHandle } from '../../ffi/types';
+export declare const setupVerification: (ffi: Ffi, handle: FfiVerifierHandle, options: InternalPactVerifierOptions) => void;

package/src/verifier/argumentMapper/index.js

@@ -1,59 +1,44 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.argumentMapper = void 0;
-const logger_1 = __importDefault(require("../../logger"));
+exports.setupVerification = void 0;
+const types_1 = require("./types");
+const logger_1 = __importStar(require("../../logger"));
 const arguments_1 = require("./arguments");
-const argumentMapper = (options) => Object.keys(options)
-    .filter((k) => {
-    const ignoreCondition = arguments_1.ignoreOptionCombinations[k];
-    if (ignoreCondition !== undefined) {
-        logger_1.default.trace(`The argument mapper has an ignored combination for '${k}'`);
-        if (ignoreCondition.ifNotSet &&
-            options[ignoreCondition.ifNotSet] === undefined) {
-            logger_1.default.warn(`Ignoring option '${k}' because it is invalid without '${ignoreCondition.ifNotSet}' also being set. This may indicate an error in your configuration`);
-            return false;
-        }
-        logger_1.default.trace(`But it was not ignored: '${k}'`);
-    }
-    return true;
-})
-    .map((key) => {
-    const thisMapping = arguments_1.argMapping[key];
-    const thisValue = options[key];
-    if (!thisMapping) {
-        if (!arguments_1.ignoredArguments.includes(key)) {
-            logger_1.default.error(`Pact-core is ignoring unknown option '${key}'`);
-        }
-        return [];
-    }
-    if (thisValue === undefined) {
-        logger_1.default.warn(`The Verifier option '${key}' was was explicitly set to undefined and will be ignored. This may indicate an error in your config. Remove the option entirely to prevent this warning`);
-        return [];
-    }
-    if ('warningMessage' in thisMapping) {
-        logger_1.default.warn(thisMapping.warningMessage);
-        return [];
-    }
-    if ('arg' in thisMapping) {
-        switch (thisMapping.mapper) {
-            case 'string':
-                return [thisMapping.arg, `${thisValue}`];
-            case 'flag':
-                return thisValue ? [thisMapping.arg] : [];
+const setupVerification = (ffi, handle, options) => {
+    Object.keys(arguments_1.ffiFnMapping).map((k) => {
+        const validation = arguments_1.ffiFnMapping[k].validateAndExecute(ffi, handle, options);
+        switch (validation.status) {
+            case types_1.FnValidationStatus.FAIL:
+                logger_1.logErrorAndThrow(`the required ffi function '${k}' failed validation with errors: ${validation.messages || [].join(',')}`);
+                break;
+            case types_1.FnValidationStatus.IGNORE:
+                logger_1.default.debug(`the optional ffi function '${k}' was not executed as it had non-fatal validation errors: ${validation.messages || [].join(',')}`);
+                break;
+            case types_1.FnValidationStatus.SUCCESS:
+                break;
             default:
-                logger_1.default.pactCrash(`Option mapper for '${key}' maps to '${thisMapping.arg}' with unknown mapper type '${thisMapping.mapper}'`);
-                return [];
+                logger_1.logCrashAndThrow(`the ffi function '${k}' returned the following unrecognised validation signal: '${validation.status}'`);
         }
-    }
-    if (typeof thisMapping === 'function') {
-        return thisMapping(thisValue);
-    }
-    logger_1.default.pactCrash(`The option mapper completely failed to find a mapping for '${key}'.`);
-    return [];
-})
-    .reduce((acc, current) => [...acc, ...current], []);
-exports.argumentMapper = argumentMapper;
+    });
+};
+exports.setupVerification = setupVerification;
 //# sourceMappingURL=index.js.map

package/src/verifier/argumentMapper/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AACA,0DAAkC;AAElC,2CAIqB;AAUd,MAAM,cAAc,GAAG,CAC5B,OAAoC,EAC1B,EAAE,CACX,MAAM,CAAC,IAAI,CAAC,OAAO,CAA8C;KAC/D,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;IACZ,MAAM,eAAe,GAAG,oCAAwB,CAAC,CAAC,CAAC,CAAC;IACpD,IAAI,eAAe,KAAK,SAAS,EAAE;QACjC,gBAAM,CAAC,KAAK,CACV,uDAAuD,CAAC,GAAG,CAC5D,CAAC;QAEF,IACE,eAAe,CAAC,QAAQ;YACxB,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,SAAS,EAC/C;YACA,gBAAM,CAAC,IAAI,CACT,oBAAoB,CAAC,oCAAoC,eAAe,CAAC,QAAQ,oEAAoE,CACtJ,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QACD,gBAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;KAChD;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;KACD,GAAG,CAAC,CAAC,GAAsC,EAAE,EAAE;IAK9C,MAAM,WAAW,GAAG,sBAAU,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAE/B,IAAI,CAAC,WAAW,EAAE;QAChB,IAAI,CAAC,4BAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACnC,gBAAM,CAAC,KAAK,CAAC,yCAAyC,GAAG,GAAG,CAAC,CAAC;SAC/D;QACD,OAAO,EAAE,CAAC;KACX;IACD,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,gBAAM,CAAC,IAAI,CACT,wBAAwB,GAAG,0JAA0J,CACtL,CAAC;QACF,OAAO,EAAE,CAAC;KACX;IACD,IAAI,gBAAgB,IAAI,WAAW,EAAE;QACnC,gBAAM,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QACxC,OAAO,EAAE,CAAC;KACX;IACD,IAAI,KAAK,IAAI,WAAW,EAAE;QACxB,QAAQ,WAAW,CAAC,MAAM,EAAE;YAC1B,KAAK,QAAQ;gBACX,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;YAC3C,KAAK,MAAM;gBACT,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5C;gBACE,gBAAM,CAAC,SAAS,CACd,sBAAsB,GAAG,cAAc,WAAW,CAAC,GAAG,+BAA+B,WAAW,CAAC,MAAM,GAAG,CAC3G,CAAC;gBACF,OAAO,EAAE,CAAC;SACb;KACF;IACD,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE;QACrC,OAAQ,WAAwC,CAAC,SAAS,CAAC,CAAC;KAC7D;IACD,gBAAM,CAAC,SAAS,CACd,8DAA8D,GAAG,IAAI,CACtE,CAAC;IACF,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;KAED,MAAM,CAAC,CAAC,GAAa,EAAE,OAAiB,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;AAtE/D,QAAA,cAAc,kBAsEiD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA6C;AAC7C,uDAA0E;AAE1E,2CAA6E;AAGtE,MAAM,iBAAiB,GAAG,CAC/B,GAAQ,EACR,MAAyB,EACzB,OAAoC,EAC9B,EAAE;IAEN,MAAM,CAAC,IAAI,CAAC,wBAAY,CACzB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACV,MAAM,UAAU,GAAG,wBAAY,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAE5E,QAAQ,UAAU,CAAC,MAAM,EAAE;YACzB,KAAK,0BAAkB,CAAC,IAAI;gBAC1B,yBAAgB,CACd,8BAA8B,CAAC,oCAC7B,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CACpC,EAAE,CACH,CAAC;gBACF,MAAM;YACR,KAAK,0BAAkB,CAAC,MAAM;gBAC5B,gBAAM,CAAC,KAAK,CACV,8BAA8B,CAAC,6DAC7B,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CACpC,EAAE,CACH,CAAC;gBACF,MAAM;YACR,KAAK,0BAAkB,CAAC,OAAO;gBAC7B,MAAM;YACR;gBACE,yBAAgB,CACd,qBAAqB,CAAC,6DAA6D,UAAU,CAAC,MAAM,GAAG,CACxG,CAAC;SACL;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAjCW,QAAA,iBAAiB,qBAiC5B"}

package/src/verifier/argumentMapper/types.d.ts

@@ -1 +1,20 @@
-export {};
+export declare const deprecatedFunction: (_: any, property: string) => boolean;
+import { Ffi, FfiHandle } from '../../ffi/types';
+export declare type FnObject = {
+    [key: string]: (...args: any) => any;
+};
+export declare type FnMapping<T extends FnObject, O> = {
+    [Key in keyof T]: FnArgumentMapping<Key, T, O>;
+};
+export declare enum FnValidationStatus {
+    SUCCESS = 0,
+    IGNORE = 1,
+    FAIL = 2
+}
+export declare type FnValidationResult = {
+    status: FnValidationStatus;
+    messages?: string[];
+};
+export declare type FnArgumentMapping<K extends keyof T, T extends FnObject, O> = {
+    validateAndExecute: (ffi: Ffi, handle: FfiHandle, options: O) => FnValidationResult;
+};

package/src/verifier/argumentMapper/types.js

@@ -1,3 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FnValidationStatus = exports.deprecatedFunction = void 0;
+const logger_1 = __importDefault(require("../../logger"));
+const deprecatedFunction = (_, property) => {
+    logger_1.default.warn(`${property} is deprecated and no longer has any effect`);
+    return true;
+};
+exports.deprecatedFunction = deprecatedFunction;
+var FnValidationStatus;
+(function (FnValidationStatus) {
+    FnValidationStatus[FnValidationStatus["SUCCESS"] = 0] = "SUCCESS";
+    FnValidationStatus[FnValidationStatus["IGNORE"] = 1] = "IGNORE";
+    FnValidationStatus[FnValidationStatus["FAIL"] = 2] = "FAIL";
+})(FnValidationStatus = exports.FnValidationStatus || (exports.FnValidationStatus = {}));
 //# sourceMappingURL=types.js.map

package/src/verifier/argumentMapper/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAE3B,MAAM,kBAAkB,GAAG,CAAC,CAAM,EAAE,QAAgB,EAAW,EAAE;IACtE,gBAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,6CAA6C,CAAC,CAAC;IAEtE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B;AAWF,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC5B,iEAAW,CAAA;IACX,+DAAU,CAAA;IACV,2DAAQ,CAAA;AACV,CAAC,EAJW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAI7B"}

package/src/verifier/nativeVerifier.js

@@ -23,78 +23,15 @@ exports.verify = void 0;
 const logger_1 = __importStar(require("../logger"));
 const ffi_1 = require("../ffi");
 const types_1 = require("../ffi/types");
-const url_1 = require("url");
 const pkg = require('../../package.json');
-const fs = require("fs");
-const objArrayToStringArray = (obj) => {
-    return obj.map((o) => JSON.stringify(o));
-};
+const argumentMapper_1 = require("./argumentMapper");
 const verify = (opts) => {
     const ffi = ffi_1.getFfiLib(opts.logLevel);
     if (opts.logLevel) {
         logger_1.setLogLevel(opts.logLevel);
     }
     const handle = ffi.pactffiVerifierNewForApplication(pkg.name.split('/')[1], pkg.version);
-    const uri = new url_1.URL(opts.providerBaseUrl);
-    ffi.pactffiVerifierSetProviderInfo(handle, opts.provider || '', uri.protocol.split(':')[0], uri.hostname, parseInt(uri.port, 10), uri.pathname);
-    if (opts.providerStatesSetupUrl) {
-        ffi.pactffiVerifierSetProviderState(handle, opts.providerStatesSetupUrl, opts.providerStatesSetupTeardown || true, opts.providerStatesSetupBody || true);
-    }
-    if (opts.customProviderHeaders) {
-        Object.entries(opts.customProviderHeaders).forEach(([key, value]) => {
-            ffi.pactffiVerifierAddCustomHeader(handle, key, value);
-        });
-    }
-    const filterDescription = process.env.PACT_DESCRIPTION || '';
-    const filterState = process.env.PACT_PROVIDER_STATE || '';
-    const filterNoState = process.env.PACT_PROVIDER_NO_STATE ? true : false;
-    ffi.pactffiVerifierSetFilterInfo(handle, filterDescription, filterState, filterNoState);
-    if (opts.pactUrls) {
-        opts.pactUrls.forEach((file) => {
-            logger_1.default.debug(`checking source type of given pactUrl: ${file}`);
-            try {
-                const u = new url_1.URL(file);
-                if (u.hostname) {
-                    logger_1.default.debug(`adding ${file} as a Url source`);
-                    ffi.pactffiVerifierUrlSource(handle, file, opts.pactBrokerUsername || '', opts.pactBrokerPassword || '', opts.pactBrokerToken || '');
-                }
-            }
-            catch {
-                logger_1.default.debug(`${file} is not a URI`);
-            }
-            try {
-                const f = fs.lstatSync(file);
-                if (f.isDirectory()) {
-                    logger_1.default.debug(`adding ${file} as Directory source`);
-                    ffi.pactffiVerifierAddDirectorySource(handle, file);
-                }
-                else if (f.isFile() || f.isSymbolicLink()) {
-                    logger_1.default.debug(`adding ${file} as File source`);
-                    ffi.pactffiVerifierAddFileSource(handle, file);
-                }
-            }
-            catch {
-                logger_1.default.debug(`${file} is not a file`);
-            }
-        });
-    }
-    if (opts.disableSslVerification || opts.timeout) {
-        ffi.pactffiVerifierSetVerificationOptions(handle, opts.disableSslVerification || false, opts.timeout || 30000);
-    }
-    if (opts.publishVerificationResult ||
-        opts.providerVersion ||
-        opts.buildUrl ||
-        opts.disableSslVerification ||
-        opts.timeout ||
-        opts.providerVersionTags) {
-        ffi.pactffiVerifierSetPublishOptions(handle, opts.providerVersion || '', opts.buildUrl || '', opts.providerVersionTags || [], opts.providerBranch || '');
-    }
-    const brokerUrl = opts.pactBrokerUrl || process.env.PACT_BROKER_BASE_URL;
-    if (brokerUrl && opts.provider) {
-        ffi.pactffiVerifierBrokerSourceWithSelectors(handle, brokerUrl, opts.pactBrokerUsername || process.env.PACT_BROKER_USERNAME || '', opts.pactBrokerPassword || process.env.PACT_BROKER_PASSWORD || '', opts.pactBrokerToken || process.env.PACT_BROKER_TOKEN || '', opts.enablePending || false, opts.includeWipPactsSince || '', opts.providerVersionTags || [], opts.providerBranch || '', opts.consumerVersionSelectors
-            ? objArrayToStringArray(opts.consumerVersionSelectors)
-            : [], opts.consumerVersionTags || []);
-    }
+    argumentMapper_1.setupVerification(ffi, handle, opts);
     return new Promise((resolve, reject) => {
         ffi.pactffiVerifierExecute(handle, (err, res) => {
             logger_1.default.debug(`shutting down verifier with handle ${handle}`);

package/src/verifier/nativeVerifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"nativeVerifier.js","sourceRoot":"","sources":["nativeVerifier.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nativeVerifier.js","sourceRoot":"","sources":["nativeVerifier.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,oDAAgD;AAChD,gCAAmC;AACnC,wCAAwD;AAGxD,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE1C,qDAAqD;AAE9C,MAAM,MAAM,GAAG,CAAC,IAAqB,EAAmB,EAAE;IAC/D,MAAM,GAAG,GAAG,eAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,oBAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KAC5B;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,gCAAgC,CACjD,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACtB,GAAG,CAAC,OAAO,CACZ,CAAC;IAEF,kCAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAErC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,GAAG,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,GAAU,EAAE,GAAW,EAAE,EAAE;YAC7D,gBAAM,CAAC,KAAK,CAAC,sCAAsC,MAAM,EAAE,CAAC,CAAC;YAE7D,GAAG,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAEpC,gBAAM,CAAC,KAAK,CAAC,2BAA2B,GAAG,KAAK,GAAG,EAAE,CAAC,CAAC;YACvD,IAAI,GAAG,EAAE;gBACP,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;oBAE3B,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACnB;qBAAM,IAAI,GAAG,CAAC,OAAO,EAAE;oBACtB,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;iBAC3B;gBACD,gBAAM,CAAC,SAAS,CACd,sEAAsE,CACvE,CAAC;gBACF,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,QAAQ,GAAG,EAAE;oBACX,KAAK,gCAAwB,CAAC,uBAAuB;wBACnD,gBAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;wBACvC,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC;wBAC5B,MAAM;oBACR,KAAK,gCAAwB,CAAC,mBAAmB;wBAC/C,gBAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;wBAC1C,MAAM,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;wBACxC,MAAM;oBACR,KAAK,gCAAwB,CAAC,iBAAiB;wBAC7C,gBAAM,CAAC,SAAS,CACd,mDAAmD,CACpD,CAAC;wBACF,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;wBACpD,MAAM;oBACR;wBACE,gBAAM,CAAC,SAAS,CACd,wDAAwD,CACzD,CAAC;wBACF,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;wBACvC,MAAM;iBACT;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAzDW,QAAA,MAAM,UAyDjB"}

package/src/verifier/types.d.ts

@@ -39,4 +39,5 @@ export interface VerifierOptions {
     disableSslVerification?: boolean;
     buildUrl?: string;
     customProviderHeaders?: CustomHeaders;
+    consumerFilters?: string[];
 }

package/src/verifier/validateOptions.d.ts

@@ -1,2 +1,12 @@
-import { VerifierOptions } from './types';
-export declare const validateOptions: (o: VerifierOptions) => VerifierOptions;
+import { InternalPactVerifierOptions, VerifierOptions } from './types';
+export declare const deprecatedFunction: (_: InternalPactVerifierOptions) => (_: any, property: string) => boolean;
+export declare const incompatibleWith: (keys: (keyof InternalPactVerifierOptions)[]) => (options: InternalPactVerifierOptions) => (_: any, property: string) => boolean;
+export declare const requires: (keys: (keyof InternalPactVerifierOptions)[]) => (options: InternalPactVerifierOptions) => (_: any, property: string) => boolean;
+export declare const requiresOneOf: (keys: (keyof InternalPactVerifierOptions)[]) => (options: InternalPactVerifierOptions) => (_: any, property: string) => boolean;
+export declare type AssertFunction = (a: any, ...args: any) => boolean;
+export declare const wrapCheckType: (fn: AssertFunction) => (_: InternalPactVerifierOptions) => AssertFunction;
+export declare type ArgumentValidationRules<T> = {
+    [Key in keyof T]-?: ((options: T) => AssertFunction)[];
+};
+export declare const validationRules: ArgumentValidationRules<InternalPactVerifierOptions>;
+export declare const validateOptions: (options: VerifierOptions) => VerifierOptions;

package/src/verifier/validateOptions.js

@@ -1,44 +1,73 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateOptions = void 0;
+exports.validateOptions = exports.validationRules = exports.wrapCheckType = exports.requiresOneOf = exports.requires = exports.incompatibleWith = exports.deprecatedFunction = void 0;
 const checkTypes = require("check-types");
-const logger_1 = __importDefault(require("../logger"));
+const logger_1 = __importStar(require("../logger"));
+const underscore_1 = require("underscore");
+const deprecatedFunction = (_) => (_, property) => {
+    logger_1.default.warn(`${property} is deprecated and no longer has any effect`);
+    return true;
+};
+exports.deprecatedFunction = deprecatedFunction;
+const incompatibleWith = (keys) => (options) => (_, property) => {
+    const incompatibilities = underscore_1.pick(options, keys);
+    if (Object.keys(incompatibilities).length > 0) {
+        logger_1.logErrorAndThrow(`${property} is incompatible with the following properties: ${keys.join(',')}`);
+        return false;
+    }
+    return true;
+};
+exports.incompatibleWith = incompatibleWith;
+const requires = (keys) => (options) => (_, property) => {
+    const required = underscore_1.pick(options, keys);
+    if (keys.length !== Object.keys(required).length) {
+        logger_1.logErrorAndThrow(`${property} requires the following properties: ${keys.join(',')}`);
+        return false;
+    }
+    return true;
+};
+exports.requires = requires;
+const requiresOneOf = (keys) => (options) => (_, property) => {
+    const required = underscore_1.pick(options, keys);
+    if (Object.keys(required).length === 0) {
+        logger_1.logErrorAndThrow(`${property} requires one of the following properties: ${keys.join(',')}`);
+        return false;
+    }
+    return true;
+};
+exports.requiresOneOf = requiresOneOf;
+const wrapCheckType = (fn) => (_) => fn;
+exports.wrapCheckType = wrapCheckType;
 const LogLevels = ['debug', 'error', 'info', 'trace', 'warn'];
-const validateOptions = (o) => {
-    const options = { ...o };
-    if (options.logLevel) {
-        if (LogLevels.includes(options.logLevel.toLowerCase())) {
-            options.logLevel = options.logLevel.toLowerCase();
-        }
-        else {
-            throw new Error(`The logLevel '${options.logLevel}' is not a valid logLevel. The valid options are: ${LogLevels.join(', ')}`);
-        }
+const logLevelValidator = (_) => (l) => {
+    if (LogLevels.includes(l.toLowerCase())) {
+        l = l.toLowerCase();
     }
-    if (options.providerVersionTags) {
-        if (!checkTypes.string(options.providerVersionTags) &&
-            !checkTypes.array.of.string(options.providerVersionTags)) {
-            throw new Error('providerVersionTags should be a string or an array of strings');
-        }
-        if (options.providerVersionTags.includes('latest')) {
-            logger_1.default.warn("Using the tag 'latest' is not recommended and probably does not do what you intended.");
-            logger_1.default.warn('    See https://docs.pact.io/pact_broker/tags/#latest-pacts');
-        }
-    }
-    if (options.consumerVersionTags) {
-        if (!checkTypes.string(options.consumerVersionTags) &&
-            !checkTypes.array.of.string(options.consumerVersionTags)) {
-            throw new Error('consumerVersionTags should be a string or an array of strings');
-        }
-        if (options.consumerVersionTags.includes('latest')) {
-            logger_1.default.warn("Using the tag 'latest' is not recommended and probably does not do what you intended.");
-            logger_1.default.warn('    See https://docs.pact.io/pact_broker/tags/#latest-pacts');
-            logger_1.default.warn('    If you need to specify latest, try:');
-            logger_1.default.warn('       consumerVersionSelectors: [{ lastest: true }]');
-        }
+    else {
+        throw new Error(`The logLevel '${l}' is not a valid logLevel. The valid options are: ${LogLevels.join(', ')}`);
     }
+    return true;
+};
+const consumerVersionSelectorValidator = (options) => (l) => {
     if (options.consumerVersionSelectors &&
         Array.isArray(options.consumerVersionSelectors)) {
         const PROPS = [
@@ -63,61 +92,97 @@ const validateOptions = (o) => {
             }
             Object.keys(selector).forEach((key) => {
                 if (!PROPS.includes(key)) {
-                    throw new Error(`The property '${key}' is not a valid property of ConsumerVersionSelector. Allowed properties are ${PROPS.join(', ')})`);
+                    logger_1.default.warn(`The consumer version selector '${key}' is unknown but will be sent through to the validation. Allowed properties are ${PROPS.join(', ')})`);
                 }
             });
         });
     }
-    if (options.includeWipPactsSince !== undefined) {
-        checkTypes.assert.nonEmptyString(options.includeWipPactsSince, 'includeWipPactsSince should be a non-empty string');
-    }
-    checkTypes.assert.nonEmptyString(options.providerBaseUrl, 'providerBaseUrl must be a non-empty string');
-    if ((!options.pactUrls ||
-        checkTypes.emptyArray(options.pactUrls)) &&
-        !options.pactBrokerUrl) {
-        throw new Error('Must provide the pactUrls argument if no pactBrokerUrl provided');
-    }
-    if ((!options.pactBrokerUrl || !options.provider) &&
-        (!options.pactUrls || checkTypes.emptyArray(options.pactUrls))) {
-        throw new Error('Must provide both provider and pactBrokerUrl if pactUrls not provided.');
-    }
-    if (options.providerStatesSetupUrl) {
-        checkTypes.assert.string(options.providerStatesSetupUrl, 'providerStatesSetupUrl must be a non-empty string');
-    }
-    if (options.pactBrokerUsername) {
-        checkTypes.assert.string(options.pactBrokerUsername, 'pactBrokerUsername must be a non-empty string');
-    }
-    if (options.pactBrokerPassword) {
-        checkTypes.assert.string(options.pactBrokerPassword, 'pactBrokerPassword must be a string');
-    }
-    if (options.pactBrokerToken &&
-        (options.pactBrokerUsername || options.pactBrokerPassword)) {
-        throw new Error('Must provide pactBrokerToken or pactBrokerUsername/pactBrokerPassword but not both.');
-    }
-    if (options.pactBrokerUrl) {
-        checkTypes.assert.string(options.pactBrokerUrl, 'pactBrokerUrl must be a string');
-    }
-    if (options.pactUrls) {
-        checkTypes.assert.array.of.string(options.pactUrls, 'pactUrls must be an array of strings');
-    }
-    if (options.providerBaseUrl) {
-        checkTypes.assert.string(options.providerBaseUrl, 'providerBaseUrl must be a string');
-    }
-    if (options.publishVerificationResult) {
-        checkTypes.assert.boolean(options.publishVerificationResult, 'publishVerificationResult must be a boolean');
-    }
-    if (options.publishVerificationResult && !options.providerVersion) {
-        throw new Error('Must provide both or none of publishVerificationResult and providerVersion.');
-    }
-    if (options.providerVersion) {
-        checkTypes.assert.string(options.providerVersion, 'providerVersion must be a string');
-    }
-    if (options.enablePending !== undefined) {
-        checkTypes.assert.boolean(options.enablePending, 'enablePending must be a boolean');
-    }
-    if (options.timeout) {
-        checkTypes.assert.positive(options.timeout, 'timeout must be a positive number');
+    return true;
+};
+const consumerVersionTagsValidator = (options) => (l) => {
+    if (options.consumerVersionTags) {
+        if (!checkTypes.string(options.consumerVersionTags) &&
+            !checkTypes.array.of.string(options.consumerVersionTags)) {
+            throw new Error('consumerVersionTags should be a string or an array of strings');
+        }
+        if (options.consumerVersionTags.includes('latest')) {
+            logger_1.default.warn("Using the tag 'latest' is not recommended and probably does not do what you intended.");
+            logger_1.default.warn('    See https://docs.pact.io/pact_broker/tags/#latest-pacts');
+            logger_1.default.warn('    If you need to specify latest, try:');
+            logger_1.default.warn('       consumerVersionSelectors: [{ lastest: true }]');
+        }
     }
+    return true;
+};
+exports.validationRules = {
+    providerBaseUrl: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+    buildUrl: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+    consumerVersionSelectors: [consumerVersionSelectorValidator],
+    consumerVersionTags: [consumerVersionTagsValidator],
+    customProviderHeaders: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+    disableSslVerification: [exports.wrapCheckType(checkTypes.assert.boolean)],
+    enablePending: [exports.wrapCheckType(checkTypes.assert.boolean)],
+    format: [exports.deprecatedFunction],
+    includeWipPactsSince: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+    provider: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+    pactUrls: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+    pactBrokerUrl: [
+        exports.wrapCheckType(checkTypes.assert.nonEmptyString),
+        exports.requires(['provider']),
+        exports.requiresOneOf([
+            'pactUrls',
+            'consumerVersionSelectors',
+            'consumerVersionTags',
+        ]),
+    ],
+    pactBrokerUsername: [
+        exports.wrapCheckType(checkTypes.assert.nonEmptyString),
+        exports.incompatibleWith(['pactBrokerToken']),
+        exports.requires(['pactBrokerPassword']),
+    ],
+    pactBrokerPassword: [
+        exports.wrapCheckType(checkTypes.assert.nonEmptyString),
+        exports.incompatibleWith(['pactBrokerToken']),
+        exports.requires(['pactBrokerUsername']),
+    ],
+    pactBrokerToken: [
+        exports.wrapCheckType(checkTypes.assert.nonEmptyString),
+        exports.incompatibleWith(['pactBrokerUsername', 'pactBrokerPassword']),
+    ],
+    providerVersionTags: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+    providerBranch: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+    providerStatesSetupUrl: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+    providerStatesSetupTeardown: [exports.wrapCheckType(checkTypes.assert.boolean)],
+    providerStatesSetupBody: [exports.wrapCheckType(checkTypes.assert.boolean)],
+    publishVerificationResult: [
+        exports.wrapCheckType(checkTypes.assert.boolean),
+        exports.requires(['providerVersion']),
+    ],
+    providerVersion: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+    timeout: [exports.wrapCheckType(checkTypes.assert.positive)],
+    logLevel: [logLevelValidator],
+    out: [exports.deprecatedFunction],
+    verbose: [exports.deprecatedFunction],
+    monkeypatch: [exports.deprecatedFunction],
+    logDir: [exports.deprecatedFunction],
+    consumerFilters: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
+};
+const validateOptions = (options) => {
+    Object.keys(options).concat('providerBaseUrl').map((k) => {
+        const rules = exports.validationRules[k];
+        if (Array.isArray(options[k])) {
+            options[k].map((item) => {
+                rules.map((rule) => {
+                    rule(options)(item, k);
+                });
+            });
+        }
+        else {
+            rules.map((rule) => {
+                rule(options)(options[k], k);
+            });
+        }
+    });
     return options;
 };
 exports.validateOptions = validateOptions;

package/src/verifier/validateOptions.js.map

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

package/src/verifier/filesystem/index.d.ts

@@ -1,2 +0,0 @@
-import { UriType } from './types';
-export declare const getUriType: (uri: string) => UriType;

package/src/verifier/filesystem/index.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUriType = void 0;
-const path = require("path");
-const url = require("url");
-const fs = require("fs");
-const getUriType = (uri) => {
-    if (/https?:/.test(url.parse(uri).protocol || '')) {
-        return 'URL';
-    }
-    try {
-        if (fs.statSync(path.normalize(uri)).isDirectory()) {
-            return 'DIRECTORY';
-        }
-        else {
-            return 'FILE';
-        }
-    }
-    catch (e) {
-        throw new Error(`Pact file or directory '${uri}' doesn't exist`);
-    }
-};
-exports.getUriType = getUriType;
-//# sourceMappingURL=index.js.map

package/src/verifier/filesystem/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,6BAA8B;AAC9B,2BAA4B;AAC5B,yBAA0B;AAInB,MAAM,UAAU,GAAG,CAAC,GAAW,EAAW,EAAE;IACjD,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE;QACjD,OAAO,KAAK,CAAC;KACd;IACD,IAAI;QACF,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;YAClD,OAAO,WAAW,CAAC;SACpB;aAAM;YACL,OAAO,MAAM,CAAC;SACf;KACF;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,iBAAiB,CAAC,CAAC;KAClE;AACH,CAAC,CAAC;AAbW,QAAA,UAAU,cAarB"}

package/src/verifier/filesystem/types.d.ts

@@ -1 +0,0 @@
-export declare type UriType = 'URL' | 'DIRECTORY' | 'FILE';

package/src/verifier/filesystem/types.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.js.map

package/src/verifier/filesystem/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":""}