@pact-foundation/pact-core 13.7.4 → 13.7.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/ffi/pact_ffi.dll CHANGED
Binary file
Binary file
@@ -413,14 +413,14 @@ Napi::Value PactffiVerifierSetPublishOptions(const Napi::CallbackInfo& info) {
413
413
  std::string providerVersion = info[1].As<Napi::String>().Utf8Value();
414
414
  std::string buildUrl = info[2].As<Napi::String>().Utf8Value();
415
415
  Napi::Array providerTagsRaw = info[3].As<Napi::Array>();
416
- std::string providerBranch = info[4].As<Napi::String>().Utf8Value();
416
+ std::string providerVersionBranch = info[4].As<Napi::String>().Utf8Value();
417
417
 
418
418
  pactffi_verifier_set_publish_options(handles[handleId],
419
419
  providerVersion.c_str(),
420
420
  buildUrl.c_str(),
421
421
  &NapiArrayToCStringVector(providerTagsRaw)[0],
422
422
  providerTagsRaw.Length(),
423
- providerBranch.c_str());
423
+ providerVersionBranch.c_str());
424
424
 
425
425
  return info.Env().Undefined();
426
426
  }
@@ -788,7 +788,7 @@ Napi::Value PactffiVerifierBrokerSourceWithSelectors(const Napi::CallbackInfo& i
788
788
  bool enablePending = info[5].As<Napi::Boolean>().Value();
789
789
  std::string includeWipPactsSince = info[6].As<Napi::String>().Utf8Value();
790
790
  Napi::Array providerTags = info[7].As<Napi::Array>();
791
- std::string providerBranch = info[8].As<Napi::String>().Utf8Value();
791
+ std::string providerVersionBranch = info[8].As<Napi::String>().Utf8Value();
792
792
  Napi::Array consumerVersionSelectors = info[9].As<Napi::Array>();
793
793
  Napi::Array consumerVersionTags = info[10].As<Napi::Array>();
794
794
 
@@ -805,7 +805,7 @@ Napi::Value PactffiVerifierBrokerSourceWithSelectors(const Napi::CallbackInfo& i
805
805
  includeWipPactsSince.c_str(),
806
806
  &cProviderTags[0],
807
807
  providerTags.Length(),
808
- providerBranch.c_str(),
808
+ providerVersionBranch.c_str(),
809
809
  &cConsumerVersionSelectors[0],
810
810
  consumerVersionSelectors.Length(),
811
811
  &cConsumerVersionTags[0],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pact-foundation/pact-core",
3
- "version": "13.7.4",
3
+ "version": "13.7.7",
4
4
  "description": "Core of @pact-foundation/pact. You almost certainly don't want to depend on this directly.",
5
5
  "main": "src/index.js",
6
6
  "homepage": "https://github.com/pact-foundation/pact-js-core#readme",
@@ -1,7 +1,7 @@
1
1
  import { LogLevel } from '../logger/types';
2
2
  import { Ffi } from './types';
3
3
  declare const ffiLib: Ffi;
4
- export declare const PACT_FFI_VERSION = "0.2.4";
4
+ export declare const PACT_FFI_VERSION = "0.3.5";
5
5
  declare let ffi: typeof ffiLib;
6
6
  export declare const getFfiLib: (logLevel?: LogLevel) => typeof ffi;
7
7
  export {};
package/src/ffi/index.js CHANGED
@@ -23,7 +23,7 @@ exports.getFfiLib = exports.PACT_FFI_VERSION = void 0;
23
23
  const logger_1 = __importStar(require("../logger"));
24
24
  const bindings = require("bindings");
25
25
  const ffiLib = bindings('pact.node');
26
- exports.PACT_FFI_VERSION = '0.2.4';
26
+ exports.PACT_FFI_VERSION = '0.3.5';
27
27
  let ffi;
28
28
  let ffiLogLevel;
29
29
  const initialiseFfi = (logLevel) => {
@@ -90,17 +90,17 @@ export declare type FfiConsumerFunctions = {
90
90
  };
91
91
  export declare type FfiVerificationFunctions = {
92
92
  pactffiVerifierNewForApplication(libraryName: string, version: string): FfiVerifierHandle;
93
- pactffiVerifierExecute(handle: FfiVerifierHandle, callback: (e: Error, res: number) => void): number;
94
- pactffiVerifierShutdown(handle: FfiVerifierHandle): void;
95
93
  pactffiVerifierSetProviderInfo(handle: FfiVerifierHandle, providerName: string, scheme: string, host: string, port: number, path: string): void;
96
94
  pactffiVerifierSetFilterInfo(handle: FfiVerifierHandle, description: string, state: string, noState: boolean): void;
97
95
  pactffiVerifierSetProviderState(handle: FfiVerifierHandle, url: string, teardown: boolean, body: boolean): void;
98
96
  pactffiVerifierSetVerificationOptions(handle: FfiVerifierHandle, disableSslVerification: boolean, requestTimeout: number): void;
99
- pactffiVerifierSetPublishOptions(handle: FfiVerifierHandle, providerVersion: string, buildUrl: string, providerTags: string[], providerBranch: string): void;
97
+ pactffiVerifierSetPublishOptions(handle: FfiVerifierHandle, providerVersion: string, buildUrl: string, providerTags: string[], providerVersionBranch: string): void;
100
98
  pactffiVerifierSetConsumerFilters(handle: FfiVerifierHandle, consumers: string[]): void;
101
99
  pactffiVerifierAddCustomHeader(handle: FfiVerifierHandle, header: string, value: string): void;
102
100
  pactffiVerifierAddFileSource(handle: FfiVerifierHandle, file: string): void;
103
101
  pactffiVerifierAddDirectorySource(handle: FfiVerifierHandle, dir: string): void;
104
102
  pactffiVerifierUrlSource(handle: FfiVerifierHandle, url: string, username: string, password: string, token: string): void;
105
- pactffiVerifierBrokerSourceWithSelectors(handle: FfiVerifierHandle, url: string, username: string, password: string, token: string, enablePending: boolean, includeWipPactsSince: string, providerTags: string[], providerBranch: string, consumerVersionSelectors: string[], consumerVersionTags: string[]): void;
103
+ pactffiVerifierBrokerSourceWithSelectors(handle: FfiVerifierHandle, url: string, username: string, password: string, token: string, enablePending: boolean, includeWipPactsSince: string, providerTags: string[], providerVersionBranch: string, consumerVersionSelectors: string[], consumerVersionTags: string[]): void;
104
+ pactffiVerifierExecute(handle: FfiVerifierHandle, callback: (e: Error, res: number) => void): number;
105
+ pactffiVerifierShutdown(handle: FfiVerifierHandle): void;
106
106
  };
@@ -6,6 +6,10 @@ export declare type IgnoredFfiFunctions = {
6
6
  pactffiVerifierExecute: 1;
7
7
  pactffiVerifierShutdown: 1;
8
8
  };
9
+ export declare type OrderedExecution = {
10
+ [Key in keyof RequiredFfiVerificationFunctions]: number;
11
+ };
12
+ export declare const orderOfExecution: OrderedExecution;
9
13
  export declare type MergedFfiSourceFunctions = {
10
14
  pactffiVerifierAddFileSource: 1;
11
15
  pactffiVerifierUrlSource: 1;
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.ffiFnMapping = void 0;
6
+ exports.ffiFnMapping = exports.orderOfExecution = void 0;
7
7
  const logger_1 = __importDefault(require("../../logger"));
8
8
  const fs = require("fs");
9
9
  const types_1 = require("./types");
@@ -12,15 +12,43 @@ const DEFAULT_TIMEOUT = 30000;
12
12
  const objArrayToStringArray = (obj) => {
13
13
  return obj.map((o) => JSON.stringify(o));
14
14
  };
15
+ exports.orderOfExecution = {
16
+ pactffiVerifierSetProviderInfo: 1,
17
+ pactffiVerifierSetFilterInfo: 2,
18
+ pactffiVerifierSetProviderState: 3,
19
+ pactffiVerifierSetVerificationOptions: 4,
20
+ pactffiVerifierSetPublishOptions: 5,
21
+ pactffiVerifierSetConsumerFilters: 6,
22
+ pactffiVerifierAddCustomHeader: 7,
23
+ pactffiVerifierAddDirectorySource: 8,
24
+ pactffiVerifierBrokerSourceWithSelectors: 9,
25
+ };
15
26
  exports.ffiFnMapping = {
16
27
  pactffiVerifierAddCustomHeader: {
17
28
  validateAndExecute(ffi, handle, options) {
29
+ const messages = [];
18
30
  if (options.customProviderHeaders) {
19
- if (options.customProviderHeaders) {
20
- Object.entries(options.customProviderHeaders).forEach(([key, value]) => {
21
- ffi.pactffiVerifierAddCustomHeader(handle, key, value);
31
+ if (Array.isArray(options.customProviderHeaders)) {
32
+ options.customProviderHeaders.forEach((item) => {
33
+ const parts = item.split(':');
34
+ if (parts.length !== 2) {
35
+ messages.push(`${item} is not a valid custom header. Must be in the format 'Header-Name: Value'`);
36
+ }
37
+ else {
38
+ ffi.pactffiVerifierAddCustomHeader(handle, parts[0], parts[1]);
39
+ }
22
40
  });
23
41
  }
42
+ else {
43
+ if (options.customProviderHeaders) {
44
+ Object.entries(options.customProviderHeaders).forEach(([key, value]) => {
45
+ ffi.pactffiVerifierAddCustomHeader(handle, key, value);
46
+ });
47
+ }
48
+ }
49
+ if (messages.length > 0) {
50
+ return { status: types_1.FnValidationStatus.FAIL };
51
+ }
24
52
  return { status: types_1.FnValidationStatus.SUCCESS };
25
53
  }
26
54
  return { status: types_1.FnValidationStatus.IGNORE };
@@ -73,7 +101,7 @@ exports.ffiFnMapping = {
73
101
  validateAndExecute(ffi, handle, opts) {
74
102
  const brokerUrl = opts.pactBrokerUrl || process.env.PACT_BROKER_BASE_URL;
75
103
  if (brokerUrl && opts.provider) {
76
- 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
104
+ 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.providerVersionBranch || opts.providerBranch || '', opts.consumerVersionSelectors
77
105
  ? objArrayToStringArray(opts.consumerVersionSelectors)
78
106
  : [], opts.consumerVersionTags || []);
79
107
  return { status: types_1.FnValidationStatus.SUCCESS };
@@ -91,7 +119,7 @@ exports.ffiFnMapping = {
91
119
  },
92
120
  },
93
121
  pactffiVerifierSetFilterInfo: {
94
- validateAndExecute(ffi, handle, options) {
122
+ validateAndExecute(ffi, handle) {
95
123
  if (process.env.PACT_DESCRIPTION ||
96
124
  process.env.PACT_PROVIDER_STATE ||
97
125
  process.env.PACT_PROVIDER_NO_STATE) {
@@ -123,7 +151,7 @@ exports.ffiFnMapping = {
123
151
  pactffiVerifierSetPublishOptions: {
124
152
  validateAndExecute(ffi, handle, options) {
125
153
  if (options.publishVerificationResult && options.providerVersion) {
126
- ffi.pactffiVerifierSetPublishOptions(handle, options.providerVersion, options.buildUrl || '', options.providerVersionTags || [], options.providerBranch || '');
154
+ ffi.pactffiVerifierSetPublishOptions(handle, options.providerVersion, options.buildUrl || '', options.providerVersionTags || [], options.providerVersionBranch || options.providerBranch || '');
127
155
  return { status: types_1.FnValidationStatus.SUCCESS };
128
156
  }
129
157
  return { status: types_1.FnValidationStatus.IGNORE };
@@ -1 +1 @@
1
- {"version":3,"file":"arguments.js","sourceRoot":"","sources":["arguments.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"arguments.js","sourceRoot":"","sources":["arguments.ts"],"names":[],"mappings":"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"}
@@ -23,9 +23,12 @@ exports.setupVerification = void 0;
23
23
  const types_1 = require("./types");
24
24
  const logger_1 = __importStar(require("../../logger"));
25
25
  const arguments_1 = require("./arguments");
26
+ const underscore_1 = require("underscore");
26
27
  const setupVerification = (ffi, handle, options) => {
27
- Object.keys(arguments_1.ffiFnMapping).map((k) => {
28
- const validation = arguments_1.ffiFnMapping[k].validateAndExecute(ffi, handle, options);
28
+ const order = underscore_1.values(arguments_1.orderOfExecution).sort((a, b) => a - b);
29
+ const functionsToCall = underscore_1.invert(arguments_1.orderOfExecution);
30
+ order.map((k) => {
31
+ const validation = arguments_1.ffiFnMapping[functionsToCall[k]].validateAndExecute(ffi, handle, options);
29
32
  switch (validation.status) {
30
33
  case types_1.FnValidationStatus.FAIL:
31
34
  logger_1.logErrorAndThrow(`the required ffi function '${k}' failed validation with errors: ${validation.messages || [].join(',')}`);
@@ -1 +1 @@
1
- {"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA6C;AAC7C,uDAA0E;AAE1E,2CAA6D;AAE7D,2CAA4C;AAErC,MAAM,iBAAiB,GAAG,CAC/B,GAAQ,EACR,MAAyB,EACzB,OAAoC,EAC9B,EAAE;IACR,MAAM,KAAK,GAAG,mBAAM,CAAC,4BAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7D,MAAM,eAAe,GAAG,mBAAM,CAAC,4BAAgB,CAAC,CAAC;IAEjD,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACd,MAAM,UAAU,GAAG,wBAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CACpE,GAAG,EACH,MAAM,EACN,OAAO,CACR,CAAC;QAEF,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;AAtCW,QAAA,iBAAiB,qBAsC5B"}
@@ -4,7 +4,7 @@ export declare type FnObject = {
4
4
  [key: string]: (...args: any) => any;
5
5
  };
6
6
  export declare type FnMapping<T extends FnObject, O> = {
7
- [Key in keyof T]: FnArgumentMapping<Key, T, O>;
7
+ [Key in keyof T]: FnArgumentMapping<O>;
8
8
  };
9
9
  export declare enum FnValidationStatus {
10
10
  SUCCESS = 0,
@@ -15,6 +15,6 @@ export declare type FnValidationResult = {
15
15
  status: FnValidationStatus;
16
16
  messages?: string[];
17
17
  };
18
- export declare type FnArgumentMapping<K extends keyof T, T extends FnObject, O> = {
18
+ export declare type FnArgumentMapping<O> = {
19
19
  validateAndExecute: (ffi: Ffi, handle: FfiHandle, options: O) => FnValidationResult;
20
20
  };
@@ -25,7 +25,7 @@ export interface VerifierOptions {
25
25
  pactBrokerToken?: string;
26
26
  consumerVersionTags?: string[];
27
27
  providerVersionTags?: string[];
28
- providerBranch?: string;
28
+ providerVersionBranch?: string;
29
29
  providerStatesSetupUrl?: string;
30
30
  providerStatesSetupTeardown?: boolean;
31
31
  providerStatesSetupBody?: boolean;
@@ -38,6 +38,7 @@ export interface VerifierOptions {
38
38
  logLevel?: LogLevel;
39
39
  disableSslVerification?: boolean;
40
40
  buildUrl?: string;
41
- customProviderHeaders?: CustomHeaders;
41
+ customProviderHeaders?: CustomHeaders | string[];
42
42
  consumerFilters?: string[];
43
+ providerBranch?: string;
43
44
  }
@@ -1,10 +1,11 @@
1
1
  import { InternalPactVerifierOptions, VerifierOptions } from './types';
2
- export declare const deprecatedFunction: (_: InternalPactVerifierOptions) => (_: any, property: string) => boolean;
2
+ export declare const deprecatedFunction: () => (_: any, property: string) => boolean;
3
+ export declare const deprecatedBy: (preferredOption: string) => () => (_: any, property: string) => boolean;
3
4
  export declare const incompatibleWith: (keys: (keyof InternalPactVerifierOptions)[]) => (options: InternalPactVerifierOptions) => (_: any, property: string) => boolean;
4
5
  export declare const requires: (keys: (keyof InternalPactVerifierOptions)[]) => (options: InternalPactVerifierOptions) => (_: any, property: string) => boolean;
5
6
  export declare const requiresOneOf: (keys: (keyof InternalPactVerifierOptions)[]) => (options: InternalPactVerifierOptions) => (_: any, property: string) => boolean;
6
7
  export declare type AssertFunction = (a: any, ...args: any) => boolean;
7
- export declare const wrapCheckType: (fn: AssertFunction) => (_: InternalPactVerifierOptions) => AssertFunction;
8
+ export declare const wrapCheckType: (fn: AssertFunction) => () => AssertFunction;
8
9
  export declare type ArgumentValidationRules<T> = {
9
10
  [Key in keyof T]-?: ((options: T) => AssertFunction)[];
10
11
  };
@@ -19,15 +19,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
19
19
  return result;
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
- exports.validateOptions = exports.validationRules = exports.wrapCheckType = exports.requiresOneOf = exports.requires = exports.incompatibleWith = exports.deprecatedFunction = void 0;
22
+ exports.validateOptions = exports.validationRules = exports.wrapCheckType = exports.requiresOneOf = exports.requires = exports.incompatibleWith = exports.deprecatedBy = exports.deprecatedFunction = void 0;
23
23
  const checkTypes = require("check-types");
24
24
  const logger_1 = __importStar(require("../logger"));
25
25
  const underscore_1 = require("underscore");
26
- const deprecatedFunction = (_) => (_, property) => {
26
+ const deprecatedFunction = () => (_, property) => {
27
27
  logger_1.default.warn(`${property} is deprecated and no longer has any effect`);
28
28
  return true;
29
29
  };
30
30
  exports.deprecatedFunction = deprecatedFunction;
31
+ const deprecatedBy = (preferredOption) => () => (_, property) => {
32
+ logger_1.default.warn(`${property} is deprecated, use ${preferredOption} instead`);
33
+ return true;
34
+ };
35
+ exports.deprecatedBy = deprecatedBy;
31
36
  const incompatibleWith = (keys) => (options) => (_, property) => {
32
37
  const incompatibilities = underscore_1.pick(options, keys);
33
38
  if (Object.keys(incompatibilities).length > 0) {
@@ -55,10 +60,10 @@ const requiresOneOf = (keys) => (options) => (_, property) => {
55
60
  return true;
56
61
  };
57
62
  exports.requiresOneOf = requiresOneOf;
58
- const wrapCheckType = (fn) => (_) => fn;
63
+ const wrapCheckType = (fn) => () => fn;
59
64
  exports.wrapCheckType = wrapCheckType;
60
65
  const LogLevels = ['debug', 'error', 'info', 'trace', 'warn'];
61
- const logLevelValidator = (_) => (l) => {
66
+ const logLevelValidator = () => (l) => {
62
67
  if (LogLevels.includes(l.toLowerCase())) {
63
68
  l = l.toLowerCase();
64
69
  }
@@ -67,7 +72,7 @@ const logLevelValidator = (_) => (l) => {
67
72
  }
68
73
  return true;
69
74
  };
70
- const consumerVersionSelectorValidator = (options) => (l) => {
75
+ const consumerVersionSelectorValidator = (options) => () => {
71
76
  if (options.consumerVersionSelectors &&
72
77
  Array.isArray(options.consumerVersionSelectors)) {
73
78
  const PROPS = [
@@ -99,7 +104,7 @@ const consumerVersionSelectorValidator = (options) => (l) => {
99
104
  }
100
105
  return true;
101
106
  };
102
- const consumerVersionTagsValidator = (options) => (l) => {
107
+ const consumerVersionTagsValidator = (options) => () => {
103
108
  if (options.consumerVersionTags) {
104
109
  if (!checkTypes.string(options.consumerVersionTags) &&
105
110
  !checkTypes.array.of.string(options.consumerVersionTags)) {
@@ -114,12 +119,23 @@ const consumerVersionTagsValidator = (options) => (l) => {
114
119
  }
115
120
  return true;
116
121
  };
122
+ const customProviderHeadersValidator = (options) => () => {
123
+ if (options.customProviderHeaders) {
124
+ if (Array.isArray(options.customProviderHeaders)) {
125
+ checkTypes.assert.array.of.string(options.customProviderHeaders);
126
+ }
127
+ else {
128
+ checkTypes.assert.nonEmptyObject(options.customProviderHeaders);
129
+ }
130
+ }
131
+ return true;
132
+ };
117
133
  exports.validationRules = {
118
134
  providerBaseUrl: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
119
135
  buildUrl: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
120
136
  consumerVersionSelectors: [consumerVersionSelectorValidator],
121
137
  consumerVersionTags: [consumerVersionTagsValidator],
122
- customProviderHeaders: [exports.wrapCheckType(checkTypes.assert.nonEmptyObject)],
138
+ customProviderHeaders: [customProviderHeadersValidator],
123
139
  disableSslVerification: [exports.wrapCheckType(checkTypes.assert.boolean)],
124
140
  enablePending: [exports.wrapCheckType(checkTypes.assert.boolean)],
125
141
  format: [exports.deprecatedFunction],
@@ -150,7 +166,11 @@ exports.validationRules = {
150
166
  exports.incompatibleWith(['pactBrokerUsername', 'pactBrokerPassword']),
151
167
  ],
152
168
  providerVersionTags: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
153
- providerBranch: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
169
+ providerBranch: [
170
+ exports.wrapCheckType(checkTypes.assert.nonEmptyString),
171
+ exports.deprecatedBy('providerVersionBranch'),
172
+ ],
173
+ providerVersionBranch: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
154
174
  providerStatesSetupUrl: [exports.wrapCheckType(checkTypes.assert.nonEmptyString)],
155
175
  providerStatesSetupTeardown: [exports.wrapCheckType(checkTypes.assert.boolean)],
156
176
  providerStatesSetupBody: [exports.wrapCheckType(checkTypes.assert.boolean)],
@@ -178,7 +198,7 @@ const validateOptions = (options) => {
178
198
  });
179
199
  }
180
200
  else {
181
- rules.map((rule) => {
201
+ (rules || []).map((rule) => {
182
202
  rule(options)(options[k], k);
183
203
  });
184
204
  }
@@ -1 +1 @@
1
- {"version":3,"file":"validateOptions.js","sourceRoot":"","sources":["validateOptions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validateOptions.js","sourceRoot":"","sources":["validateOptions.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  export declare const PACT_STANDALONE_VERSION = "1.89.02-rc1";
2
- export declare function createConfig(location?: string): Config;
2
+ export declare function createConfig(): Config;
3
3
  export declare function getBinaryEntry(platform?: string, arch?: string): BinaryEntry;
4
4
  export interface Config {
5
5
  binaries: BinaryEntry[];
@@ -6,7 +6,7 @@ exports.PACT_STANDALONE_VERSION = '1.89.02-rc1';
6
6
  function throwError(msg) {
7
7
  throw new Error(chalk.red(`Error while locating pact binary: ${msg}`));
8
8
  }
9
- function createConfig(location = process.cwd()) {
9
+ function createConfig() {
10
10
  const CHECKSUM_SUFFIX = '.checksum';
11
11
  return {
12
12
  binaries: [
@@ -1 +1 @@
1
- {"version":3,"file":"install.js","sourceRoot":"","sources":["install.ts"],"names":[],"mappings":";;;AAAA,+BAAgC;AAGnB,QAAA,uBAAuB,GAAG,aAAa,CAAC;AAErD,SAAS,UAAU,CAAC,GAAW;IAC7B,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAgB,YAAY,CAAC,WAAmB,OAAO,CAAC,GAAG,EAAE;IAC3D,MAAM,eAAe,GAAG,WAAW,CAAC;IAEpC,OAAO;QACL,QAAQ,EAAE;YACR;gBACE,QAAQ,EAAE,OAAO;gBACjB,MAAM,EAAE,QAAQ,+BAAuB,YAAY;gBACnD,cAAc,EAAE,QAAQ,+BAAuB,aAAa,eAAe,EAAE;gBAC7E,UAAU,EAAE,SAAS,+BAAuB,EAAE;aAC/C;YACD;gBACE,QAAQ,EAAE,QAAQ;gBAClB,MAAM,EAAE,QAAQ,+BAAuB,aAAa;gBACpD,cAAc,EAAE,QAAQ,+BAAuB,cAAc,eAAe,EAAE;gBAC9E,UAAU,EAAE,UAAU,+BAAuB,EAAE;aAChD;YACD;gBACE,QAAQ,EAAE,OAAO;gBACjB,IAAI,EAAE,KAAK;gBACX,MAAM,EAAE,QAAQ,+BAAuB,sBAAsB;gBAC7D,cAAc,EAAE,QAAQ,+BAAuB,uBAAuB,eAAe,EAAE;gBACvF,UAAU,EAAE,aAAa,+BAAuB,EAAE;aACnD;SACF;KACF,CAAC;AACJ,CAAC;AA1BD,oCA0BC;AAED,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;AAE9B,SAAgB,cAAc,CAAC,QAAiB,EAAE,IAAa;IAC7D,QAAQ,GAAG,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IACxC,IAAI,GAAG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAC5B,KAAK,IAAI,KAAK,IAAI,MAAM,CAAC,QAAQ,EAAE;QACjC,IACE,KAAK,CAAC,QAAQ,KAAK,QAAQ;YAC3B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EACzC;YACA,OAAO,KAAK,CAAC;SACd;KACF;IACD,MAAM,UAAU,CACd,oCAAoC,QAAQ,wBAAwB,IAAI,IAAI,CAC7E,CAAC;AACJ,CAAC;AAdD,wCAcC"}
1
+ {"version":3,"file":"install.js","sourceRoot":"","sources":["install.ts"],"names":[],"mappings":";;;AAAA,+BAAgC;AAGnB,QAAA,uBAAuB,GAAG,aAAa,CAAC;AAErD,SAAS,UAAU,CAAC,GAAW;IAC7B,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAgB,YAAY;IAC1B,MAAM,eAAe,GAAG,WAAW,CAAC;IAEpC,OAAO;QACL,QAAQ,EAAE;YACR;gBACE,QAAQ,EAAE,OAAO;gBACjB,MAAM,EAAE,QAAQ,+BAAuB,YAAY;gBACnD,cAAc,EAAE,QAAQ,+BAAuB,aAAa,eAAe,EAAE;gBAC7E,UAAU,EAAE,SAAS,+BAAuB,EAAE;aAC/C;YACD;gBACE,QAAQ,EAAE,QAAQ;gBAClB,MAAM,EAAE,QAAQ,+BAAuB,aAAa;gBACpD,cAAc,EAAE,QAAQ,+BAAuB,cAAc,eAAe,EAAE;gBAC9E,UAAU,EAAE,UAAU,+BAAuB,EAAE;aAChD;YACD;gBACE,QAAQ,EAAE,OAAO;gBACjB,IAAI,EAAE,KAAK;gBACX,MAAM,EAAE,QAAQ,+BAAuB,sBAAsB;gBAC7D,cAAc,EAAE,QAAQ,+BAAuB,uBAAuB,eAAe,EAAE;gBACvF,UAAU,EAAE,aAAa,+BAAuB,EAAE;aACnD;SACF;KACF,CAAC;AACJ,CAAC;AA1BD,oCA0BC;AAED,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;AAE9B,SAAgB,cAAc,CAAC,QAAiB,EAAE,IAAa;IAC7D,QAAQ,GAAG,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IACxC,IAAI,GAAG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAC5B,KAAK,IAAI,KAAK,IAAI,MAAM,CAAC,QAAQ,EAAE;QACjC,IACE,KAAK,CAAC,QAAQ,KAAK,QAAQ;YAC3B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EACzC;YACA,OAAO,KAAK,CAAC;SACd;KACF;IACD,MAAM,UAAU,CACd,oCAAoC,QAAQ,wBAAwB,IAAI,IAAI,CAC7E,CAAC;AACJ,CAAC;AAdD,wCAcC"}