@pact-foundation/pact-core 13.12.0 → 13.12.2

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.12.2](https://github.com/pact-foundation/pact-js-core/compare/v13.12.1...v13.12.2) (2022-11-28)
+
+
+### Fixes and Improvements
+
+* upgrade to ffi 0.3.15 ([0da476d](https://github.com/pact-foundation/pact-js-core/commit/0da476dbd342f64234515572408fd43b28b5085b))
+
+### [13.12.1](https://github.com/pact-foundation/pact-js-core/compare/v13.12.0...v13.12.1) (2022-11-24)
+
+
+### Fixes and Improvements
+
+* upgrade to latest pino. Fixes 417 ([2de141c](https://github.com/pact-foundation/pact-js-core/commit/2de141c9f93d9423d18c4a574ca6775eaaba5775))
+
 ## [13.12.0](https://github.com/pact-foundation/pact-js-core/compare/v13.11.3...v13.12.0) (2022-11-08)
 
 

package/build/Makefile

@@ -58,7 +58,7 @@ CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
 CXX.host ?= g++
 CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
 LINK.host ?= $(CXX.host)
-LDFLAGS.host ?=
+LDFLAGS.host ?= $(LDFLAGS_host)
 AR.host ?= ar
 
 # Define a dir function that can handle spaces.
@@ -121,17 +121,17 @@ endef
 # - quiet_cmd_foo is the brief-output summary of the command.
 
 quiet_cmd_cc = CC($(TOOLSET)) $@
-cmd_cc = $(CC.$(TOOLSET)) $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c -o $@ $<
+cmd_cc = $(CC.$(TOOLSET)) -o $@ $< $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c
 
 quiet_cmd_cxx = CXX($(TOOLSET)) $@
-cmd_cxx = $(CXX.$(TOOLSET)) $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
+cmd_cxx = $(CXX.$(TOOLSET)) -o $@ $< $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c
 
 quiet_cmd_touch = TOUCH $@
 cmd_touch = touch $@
 
 quiet_cmd_copy = COPY $@
 # send stderr to /dev/null to ignore messages when linking directories.
-cmd_copy = rm -rf "$@" && cp -af "$<" "$@"
+cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@")
 
 quiet_cmd_alink = AR($(TOOLSET)) $@
 cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^)
@@ -143,7 +143,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
 # special "figure out circular dependencies" flags around the entire
 # input list during linking.
 quiet_cmd_link = LINK($(TOOLSET)) $@
-cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
+cmd_link = $(LINK.$(TOOLSET)) -o $@ $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
 
 # We support two kinds of shared objects (.so):
 # 1) shared_library, which is just bundling together many dependent libraries
@@ -162,10 +162,10 @@ cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--s
 # - Set SONAME to the library filename so our binaries don't reference
 # the local, absolute paths used on the link command-line.
 quiet_cmd_solink = SOLINK($(TOOLSET)) $@
-cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS)
+cmd_solink = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS)
 
 quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@
-cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS)
+cmd_solink_module = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS)
 
 
 # Define an escape_quotes function to escape single quotes.
@@ -318,8 +318,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
 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)/build/config.gypi $(srcdir)/../../../.cache/node-gyp/12.22.12/include/node/common.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../../opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
+cmd_regen_makefile = cd $(srcdir); /opt/hostedtoolcache/node/16.18.1/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/16.18.1" "-Dnode_gyp_dir=/opt/hostedtoolcache/node/16.18.1/x64/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/home/runner/.cache/node-gyp/16.18.1/<(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/16.18.1/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/home/runner/.cache/node-gyp/16.18.1/include/node/common.gypi "--toplevel-dir=." binding.gyp
+Makefile: $(srcdir)/build/config.gypi $(srcdir)/../../../.cache/node-gyp/16.18.1/include/node/common.gypi $(srcdir)/../../../../../opt/hostedtoolcache/node/16.18.1/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/binding.gyp
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included

package/build/pact.target.mk

@@ -9,6 +9,7 @@ DEFS_Debug := \
 	'-DV8_DEPRECATION_WARNINGS=1' \
 	'-DV8_DEPRECATION_WARNINGS' \
 	'-DV8_IMMINENT_DEPRECATION_WARNINGS' \
+	'-D_GLIBCXX_USE_CXX11_ABI=1' \
 	'-D_LARGEFILE_SOURCE' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-D__STDC_FORMAT_MACROS' \
@@ -37,17 +38,17 @@ CFLAGS_C_Debug :=
 # Flags passed to only C++ files.
 CFLAGS_CC_Debug := \
 	-fno-rtti \
-	-std=gnu++1y \
+	-std=gnu++14 \
 	-Werror
 
 INCS_Debug := \
-	-I/home/runner/.cache/node-gyp/12.22.12/include/node \
-	-I/home/runner/.cache/node-gyp/12.22.12/src \
-	-I/home/runner/.cache/node-gyp/12.22.12/deps/openssl/config \
-	-I/home/runner/.cache/node-gyp/12.22.12/deps/openssl/openssl/include \
-	-I/home/runner/.cache/node-gyp/12.22.12/deps/uv/include \
-	-I/home/runner/.cache/node-gyp/12.22.12/deps/zlib \
-	-I/home/runner/.cache/node-gyp/12.22.12/deps/v8/include \
+	-I/home/runner/.cache/node-gyp/16.18.1/include/node \
+	-I/home/runner/.cache/node-gyp/16.18.1/src \
+	-I/home/runner/.cache/node-gyp/16.18.1/deps/openssl/config \
+	-I/home/runner/.cache/node-gyp/16.18.1/deps/openssl/openssl/include \
+	-I/home/runner/.cache/node-gyp/16.18.1/deps/uv/include \
+	-I/home/runner/.cache/node-gyp/16.18.1/deps/zlib \
+	-I/home/runner/.cache/node-gyp/16.18.1/deps/v8/include \
 	-I$(srcdir)/node_modules/node-addon-api \
 	-I/home/runner/work/pact-js-core/pact-js-core/native \
 	-I/home/runner/work/pact-js-core/pact-js-core/ffi
@@ -59,6 +60,7 @@ DEFS_Release := \
 	'-DV8_DEPRECATION_WARNINGS=1' \
 	'-DV8_DEPRECATION_WARNINGS' \
 	'-DV8_IMMINENT_DEPRECATION_WARNINGS' \
+	'-D_GLIBCXX_USE_CXX11_ABI=1' \
 	'-D_LARGEFILE_SOURCE' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-D__STDC_FORMAT_MACROS' \
@@ -84,17 +86,17 @@ CFLAGS_C_Release :=
 # Flags passed to only C++ files.
 CFLAGS_CC_Release := \
 	-fno-rtti \
-	-std=gnu++1y \
+	-std=gnu++14 \
 	-Werror
 
 INCS_Release := \
-	-I/home/runner/.cache/node-gyp/12.22.12/include/node \
-	-I/home/runner/.cache/node-gyp/12.22.12/src \
-	-I/home/runner/.cache/node-gyp/12.22.12/deps/openssl/config \
-	-I/home/runner/.cache/node-gyp/12.22.12/deps/openssl/openssl/include \
-	-I/home/runner/.cache/node-gyp/12.22.12/deps/uv/include \
-	-I/home/runner/.cache/node-gyp/12.22.12/deps/zlib \
-	-I/home/runner/.cache/node-gyp/12.22.12/deps/v8/include \
+	-I/home/runner/.cache/node-gyp/16.18.1/include/node \
+	-I/home/runner/.cache/node-gyp/16.18.1/src \
+	-I/home/runner/.cache/node-gyp/16.18.1/deps/openssl/config \
+	-I/home/runner/.cache/node-gyp/16.18.1/deps/openssl/openssl/include \
+	-I/home/runner/.cache/node-gyp/16.18.1/deps/uv/include \
+	-I/home/runner/.cache/node-gyp/16.18.1/deps/zlib \
+	-I/home/runner/.cache/node-gyp/16.18.1/deps/v8/include \
 	-I$(srcdir)/node_modules/node-addon-api \
 	-I/home/runner/work/pact-js-core/pact-js-core/native \
 	-I/home/runner/work/pact-js-core/pact-js-core/ffi

package/ffi/pact-cpp.h

@@ -17,6 +17,36 @@
 #include <ostream>
 #include <new>
 
+/**
+ * The type of value detected after parsing the expression
+ */
+enum class ExpressionValueType {
+  /**
+   * If the type is unknown
+   */
+  ExpressionValueType_Unknown,
+  /**
+   * String type
+   */
+  ExpressionValueType_String,
+  /**
+   * Numeric type
+   */
+  ExpressionValueType_Number,
+  /**
+   * Integer numeric type (no significant figures after the decimal point)
+   */
+  ExpressionValueType_Integer,
+  /**
+   * Decimal numeric type (at least one significant figure after the decimal point)
+   */
+  ExpressionValueType_Decimal,
+  /**
+   * Boolean type
+   */
+  ExpressionValueType_Boolean,
+};
+
 /**
  * Request or Response enum
  */
@@ -81,6 +111,26 @@ enum class PactSpecification {
  */
 struct Consumer;
 
+/**
+ * Trait to represent a generator
+ */
+struct Generator;
+
+/**
+ * Set of all matching rules
+ */
+struct MatchingRule;
+
+/**
+ * Result of parsing a matching rule definition
+ */
+struct MatchingRuleDefinitionResult;
+
+/**
+ * An iterator over the matching rules from a matching definition expression.
+ */
+struct MatchingRuleIterator;
+
 /**
  * Struct that defines a message.
  */
@@ -129,6 +179,11 @@ struct Mismatches;
  */
 struct MismatchesIterator;
 
+/**
+ * Opaque type for use as a pointer to a Pact model
+ */
+struct Pact;
+
 /**
  * An iterator over messages in a pact.
  */
@@ -228,6 +283,65 @@ struct ProviderStateParamPair {
   const char *value;
 };
 
+/**
+ * The matching rule or reference from parsing the matching definition expression.
+ *
+ * For matching rules, the ID corresponds to the following rules:
+ * | Rule | ID |
+ * | ---- | -- |
+ * | Equality | 1 |
+ * | Regex | 2 |
+ * | Type | 3 |
+ * | MinType | 4 |
+ * | MaxType | 5 |
+ * | MinMaxType | 6 |
+ * | Timestamp | 7 |
+ * | Time | 8 |
+ * | Date | 9 |
+ * | Include | 10 |
+ * | Number | 11 |
+ * | Integer | 12 |
+ * | Decimal | 13 |
+ * | Null | 14 |
+ * | ContentType | 15 |
+ * | ArrayContains | 16 |
+ * | Values | 17 |
+ * | Boolean | 18 |
+ * | StatusCode | 19 |
+ * | NotEmpty | 20 |
+ * | Semver | 21 |
+ * | EachKey | 22 |
+ * | EachValue | 23 |
+ */
+struct MatchingRuleResult {
+  enum class Tag {
+    /**
+     * The matching rule from the expression.
+     */
+    MatchingRuleResult_MatchingRule,
+    /**
+     * A reference to a named item.
+     */
+    MatchingRuleResult_MatchingReference,
+  };
+
+  struct MatchingRuleResult_MatchingRule_Body {
+    uint16_t _0;
+    const char *_1;
+    const MatchingRule *_2;
+  };
+
+  struct MatchingRuleResult_MatchingReference_Body {
+    const char *_0;
+  };
+
+  Tag tag;
+  union {
+    MatchingRuleResult_MatchingRule_Body matching_rule;
+    MatchingRuleResult_MatchingReference_Body matching_reference;
+  };
+};
+
 /**
  * Wraps a Pact model struct
  */
@@ -529,6 +643,21 @@ int pactffi_logger_apply();
  */
 const char *pactffi_fetch_log_buffer(const char *log_id);
 
+/**
+ * Parses the provided JSON into a Pact model. The returned Pact model must be freed with the
+ * `pactffi_pact_model_delete` function when no longer needed.
+ *
+ * # Error Handling
+ *
+ * This function will return a NULL pointer if passed a NULL pointer or if an error occurs.
+ */
+Pact *pactffi_parse_pact_json(const char *json);
+
+/**
+ * Frees the memory used by the Pact model
+ */
+void pactffi_pact_model_delete(Pact *pact);
+
 /**
  * Get a copy of this consumer's name.
  *
@@ -1766,6 +1895,144 @@ const ProviderState *pactffi_sync_http_get_provider_state(const SynchronousHttp
  */
 ProviderStateIterator *pactffi_sync_http_get_provider_state_iter(SynchronousHttp *interaction);
 
+/**
+ * Parse a matcher definition string into a MatchingRuleDefinition containing the example value,
+ * and matching rules and any generator.
+ *
+ * The following are examples of matching rule definitions:
+ * * `matching(type,'Name')` - type matcher with string value 'Name'
+ * * `matching(number,100)` - number matcher
+ * * `matching(datetime, 'yyyy-MM-dd','2000-01-01')` - datetime matcher with format string
+ *
+ * See [Matching Rule definition expressions](https://docs.rs/pact_models/latest/pact_models/matchingrules/expressions/index.html).
+ *
+ * The returned value needs to be freed up with the `pactffi_matcher_definition_delete` function.
+ *
+ * # Errors
+ * If the expression is invalid, the MatchingRuleDefinition error will be set. You can check for
+ * this value with the `pactffi_matcher_definition_error` function.
+ *
+ * # Safety
+ *
+ * This function is safe if the expression is a valid NULL terminated string pointer.
+ */
+const MatchingRuleDefinitionResult *pactffi_parse_matcher_definition(const char *expression);
+
+/**
+ * Returns any error message from parsing a matching definition expression. If there is no error,
+ * it will return a NULL pointer, otherwise returns the error message as a NULL-terminated string.
+ * The returned string must be freed using the `pactffi_string_delete` function once done with it.
+ */
+const char *pactffi_matcher_definition_error(const MatchingRuleDefinitionResult *definition);
+
+/**
+ * Returns the value from parsing a matching definition expression. If there was an error,
+ * it will return a NULL pointer, otherwise returns the value as a NULL-terminated string.
+ * The returned string must be freed using the `pactffi_string_delete` function once done with it.
+ *
+ * Note that different expressions values can have types other than a string. Use
+ * `pactffi_matcher_definition_value_type` to get the actual type of the value. This function
+ * will always return the string representation of the value.
+ */
+const char *pactffi_matcher_definition_value(const MatchingRuleDefinitionResult *definition);
+
+/**
+ * Frees the memory used by the result of parsing the matching definition expression
+ */
+void pactffi_matcher_definition_delete(const MatchingRuleDefinitionResult *definition);
+
+/**
+ * Returns the generator from parsing a matching definition expression. If there was an error or
+ * there is no associated generator, it will return a NULL pointer, otherwise returns the generator
+ * as a pointer.
+ *
+ * The generator pointer will be a valid pointer as long as `pactffi_matcher_definition_delete`
+ * has not been called on the definition. Using the generator pointer after the definition
+ * has been deleted will result in undefined behaviour.
+ */
+const Generator *pactffi_matcher_definition_generator(const MatchingRuleDefinitionResult *definition);
+
+/**
+ * Returns the type of the value from parsing a matching definition expression. If there was an
+ * error parsing the expression, it will return Unknown.
+ */
+ExpressionValueType pactffi_matcher_definition_value_type(const MatchingRuleDefinitionResult *definition);
+
+/**
+ * Free the iterator when you're done using it.
+ */
+void pactffi_matching_rule_iter_delete(MatchingRuleIterator *iter);
+
+/**
+ * Returns an iterator over the matching rules from the parsed definition. The iterator needs to
+ * be deleted with the `pactffi_matching_rule_iter_delete` function once done with it.
+ *
+ * If there was an error parsing the expression, this function will return a NULL pointer.
+ */
+MatchingRuleIterator *pactffi_matcher_definition_iter(const MatchingRuleDefinitionResult *definition);
+
+/**
+ * Get the next matching rule or reference from the iterator. As the values returned are owned
+ * by the iterator, they do not need to be deleted but will be cleaned up when the iterator is
+ * deleted.
+ *
+ * Will return a NULL pointer when the iterator has advanced past the end of the list.
+ *
+ * # Safety
+ *
+ * This function is safe.
+ *
+ * # Error Handling
+ *
+ * This function will return a NULL pointer if passed a NULL pointer or if an error occurs.
+ */
+const MatchingRuleResult *pactffi_matching_rule_iter_next(MatchingRuleIterator *iter);
+
+/**
+ * Get the JSON form of the matching rule.
+ *
+ * The returned string must be deleted with `pactffi_string_delete`.
+ *
+ * # Safety
+ *
+ * This function will fail if it is passed a NULL pointer, or the iterator that owns the
+ * value of the matching rule has been deleted.
+ */
+const char *pactffi_matching_rule_to_json(const MatchingRule *rule);
+
+/**
+ * Get the JSON form of the generator.
+ *
+ * The returned string must be deleted with `pactffi_string_delete`.
+ *
+ * # Safety
+ *
+ * This function will fail if it is passed a NULL pointer, or the owner of the generator has
+ * been deleted.
+ */
+const char *pactffi_generator_to_json(const Generator *generator);
+
+/**
+ * Generate a string value using the provided generator and an optional JSON payload containing
+ * any generator context. The context value is used for generators like `MockServerURL` (which
+ * should contain details about the running mock server) and `ProviderStateGenerator` (which
+ * should be the values returned from the Provider State callback function).
+ *
+ * If anything goes wrong, it will return a NULL pointer.
+ */
+const char *pactffi_generator_generate_string(const Generator *generator, const char *context_json);
+
+/**
+ * Generate an integer value using the provided generator and an optional JSON payload containing
+ * any generator context. The context value is used for generators like `ProviderStateGenerator`
+ * (which should be the values returned from the Provider State callback function).
+ *
+ * If anything goes wrong or the generator is not a type that can generate an integer value, it
+ * will return a zero value.
+ */
+unsigned short pactffi_generator_generate_integer(const Generator *generator,
+                                                  const char *context_json);
+
 /**
  * Delete a string previously returned by this FFI.
  *

package/ffi/pact.h

@@ -16,6 +16,36 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+/**
+ * The type of value detected after parsing the expression
+ */
+typedef enum ExpressionValueType {
+  /**
+   * If the type is unknown
+   */
+  ExpressionValueType_Unknown,
+  /**
+   * String type
+   */
+  ExpressionValueType_String,
+  /**
+   * Numeric type
+   */
+  ExpressionValueType_Number,
+  /**
+   * Integer numeric type (no significant figures after the decimal point)
+   */
+  ExpressionValueType_Integer,
+  /**
+   * Decimal numeric type (at least one significant figure after the decimal point)
+   */
+  ExpressionValueType_Decimal,
+  /**
+   * Boolean type
+   */
+  ExpressionValueType_Boolean,
+} ExpressionValueType;
+
 /**
  * Request or Response enum
  */
@@ -80,6 +110,26 @@ typedef enum PactSpecification {
  */
 typedef struct Consumer Consumer;
 
+/**
+ * Trait to represent a generator
+ */
+typedef struct Generator Generator;
+
+/**
+ * Set of all matching rules
+ */
+typedef struct MatchingRule MatchingRule;
+
+/**
+ * Result of parsing a matching rule definition
+ */
+typedef struct MatchingRuleDefinitionResult MatchingRuleDefinitionResult;
+
+/**
+ * An iterator over the matching rules from a matching definition expression.
+ */
+typedef struct MatchingRuleIterator MatchingRuleIterator;
+
 /**
  * Struct that defines a message.
  */
@@ -128,6 +178,11 @@ typedef struct Mismatches Mismatches;
  */
 typedef struct MismatchesIterator MismatchesIterator;
 
+/**
+ * Opaque type for use as a pointer to a Pact model
+ */
+typedef struct Pact Pact;
+
 /**
  * An iterator over messages in a pact.
  */
@@ -227,6 +282,63 @@ typedef struct ProviderStateParamPair {
   const char *value;
 } ProviderStateParamPair;
 
+/**
+ * The matching rule or reference from parsing the matching definition expression.
+ *
+ * For matching rules, the ID corresponds to the following rules:
+ * | Rule | ID |
+ * | ---- | -- |
+ * | Equality | 1 |
+ * | Regex | 2 |
+ * | Type | 3 |
+ * | MinType | 4 |
+ * | MaxType | 5 |
+ * | MinMaxType | 6 |
+ * | Timestamp | 7 |
+ * | Time | 8 |
+ * | Date | 9 |
+ * | Include | 10 |
+ * | Number | 11 |
+ * | Integer | 12 |
+ * | Decimal | 13 |
+ * | Null | 14 |
+ * | ContentType | 15 |
+ * | ArrayContains | 16 |
+ * | Values | 17 |
+ * | Boolean | 18 |
+ * | StatusCode | 19 |
+ * | NotEmpty | 20 |
+ * | Semver | 21 |
+ * | EachKey | 22 |
+ * | EachValue | 23 |
+ */
+typedef enum MatchingRuleResult_Tag {
+  /**
+   * The matching rule from the expression.
+   */
+  MatchingRuleResult_MatchingRule,
+  /**
+   * A reference to a named item.
+   */
+  MatchingRuleResult_MatchingReference,
+} MatchingRuleResult_Tag;
+
+typedef struct MatchingRuleResult_MatchingRule_Body {
+  uint16_t _0;
+  const char *_1;
+  const struct MatchingRule *_2;
+} MatchingRuleResult_MatchingRule_Body;
+
+typedef struct MatchingRuleResult {
+  MatchingRuleResult_Tag tag;
+  union {
+    MatchingRuleResult_MatchingRule_Body matching_rule;
+    struct {
+      const char *matching_reference;
+    };
+  };
+} MatchingRuleResult;
+
 /**
  * Wraps a Pact model struct
  */
@@ -523,6 +635,21 @@ int pactffi_logger_apply(void);
  */
 const char *pactffi_fetch_log_buffer(const char *log_id);
 
+/**
+ * Parses the provided JSON into a Pact model. The returned Pact model must be freed with the
+ * `pactffi_pact_model_delete` function when no longer needed.
+ *
+ * # Error Handling
+ *
+ * This function will return a NULL pointer if passed a NULL pointer or if an error occurs.
+ */
+struct Pact *pactffi_parse_pact_json(const char *json);
+
+/**
+ * Frees the memory used by the Pact model
+ */
+void pactffi_pact_model_delete(struct Pact *pact);
+
 /**
  * Get a copy of this consumer's name.
  *
@@ -1764,6 +1891,145 @@ const struct ProviderState *pactffi_sync_http_get_provider_state(const struct Sy
  */
 struct ProviderStateIterator *pactffi_sync_http_get_provider_state_iter(struct SynchronousHttp *interaction);
 
+/**
+ * Parse a matcher definition string into a MatchingRuleDefinition containing the example value,
+ * and matching rules and any generator.
+ *
+ * The following are examples of matching rule definitions:
+ * * `matching(type,'Name')` - type matcher with string value 'Name'
+ * * `matching(number,100)` - number matcher
+ * * `matching(datetime, 'yyyy-MM-dd','2000-01-01')` - datetime matcher with format string
+ *
+ * See [Matching Rule definition expressions](https://docs.rs/pact_models/latest/pact_models/matchingrules/expressions/index.html).
+ *
+ * The returned value needs to be freed up with the `pactffi_matcher_definition_delete` function.
+ *
+ * # Errors
+ * If the expression is invalid, the MatchingRuleDefinition error will be set. You can check for
+ * this value with the `pactffi_matcher_definition_error` function.
+ *
+ * # Safety
+ *
+ * This function is safe if the expression is a valid NULL terminated string pointer.
+ */
+const struct MatchingRuleDefinitionResult *pactffi_parse_matcher_definition(const char *expression);
+
+/**
+ * Returns any error message from parsing a matching definition expression. If there is no error,
+ * it will return a NULL pointer, otherwise returns the error message as a NULL-terminated string.
+ * The returned string must be freed using the `pactffi_string_delete` function once done with it.
+ */
+const char *pactffi_matcher_definition_error(const struct MatchingRuleDefinitionResult *definition);
+
+/**
+ * Returns the value from parsing a matching definition expression. If there was an error,
+ * it will return a NULL pointer, otherwise returns the value as a NULL-terminated string.
+ * The returned string must be freed using the `pactffi_string_delete` function once done with it.
+ *
+ * Note that different expressions values can have types other than a string. Use
+ * `pactffi_matcher_definition_value_type` to get the actual type of the value. This function
+ * will always return the string representation of the value.
+ */
+const char *pactffi_matcher_definition_value(const struct MatchingRuleDefinitionResult *definition);
+
+/**
+ * Frees the memory used by the result of parsing the matching definition expression
+ */
+void pactffi_matcher_definition_delete(const struct MatchingRuleDefinitionResult *definition);
+
+/**
+ * Returns the generator from parsing a matching definition expression. If there was an error or
+ * there is no associated generator, it will return a NULL pointer, otherwise returns the generator
+ * as a pointer.
+ *
+ * The generator pointer will be a valid pointer as long as `pactffi_matcher_definition_delete`
+ * has not been called on the definition. Using the generator pointer after the definition
+ * has been deleted will result in undefined behaviour.
+ */
+const struct Generator *pactffi_matcher_definition_generator(const struct MatchingRuleDefinitionResult *definition);
+
+/**
+ * Returns the type of the value from parsing a matching definition expression. If there was an
+ * error parsing the expression, it will return Unknown.
+ */
+enum ExpressionValueType pactffi_matcher_definition_value_type(const struct MatchingRuleDefinitionResult *definition);
+
+/**
+ * Free the iterator when you're done using it.
+ */
+void pactffi_matching_rule_iter_delete(struct MatchingRuleIterator *iter);
+
+/**
+ * Returns an iterator over the matching rules from the parsed definition. The iterator needs to
+ * be deleted with the `pactffi_matching_rule_iter_delete` function once done with it.
+ *
+ * If there was an error parsing the expression, this function will return a NULL pointer.
+ */
+struct MatchingRuleIterator *pactffi_matcher_definition_iter(const struct MatchingRuleDefinitionResult *definition);
+
+/**
+ * Get the next matching rule or reference from the iterator. As the values returned are owned
+ * by the iterator, they do not need to be deleted but will be cleaned up when the iterator is
+ * deleted.
+ *
+ * Will return a NULL pointer when the iterator has advanced past the end of the list.
+ *
+ * # Safety
+ *
+ * This function is safe.
+ *
+ * # Error Handling
+ *
+ * This function will return a NULL pointer if passed a NULL pointer or if an error occurs.
+ */
+const struct MatchingRuleResult *pactffi_matching_rule_iter_next(struct MatchingRuleIterator *iter);
+
+/**
+ * Get the JSON form of the matching rule.
+ *
+ * The returned string must be deleted with `pactffi_string_delete`.
+ *
+ * # Safety
+ *
+ * This function will fail if it is passed a NULL pointer, or the iterator that owns the
+ * value of the matching rule has been deleted.
+ */
+const char *pactffi_matching_rule_to_json(const struct MatchingRule *rule);
+
+/**
+ * Get the JSON form of the generator.
+ *
+ * The returned string must be deleted with `pactffi_string_delete`.
+ *
+ * # Safety
+ *
+ * This function will fail if it is passed a NULL pointer, or the owner of the generator has
+ * been deleted.
+ */
+const char *pactffi_generator_to_json(const struct Generator *generator);
+
+/**
+ * Generate a string value using the provided generator and an optional JSON payload containing
+ * any generator context. The context value is used for generators like `MockServerURL` (which
+ * should contain details about the running mock server) and `ProviderStateGenerator` (which
+ * should be the values returned from the Provider State callback function).
+ *
+ * If anything goes wrong, it will return a NULL pointer.
+ */
+const char *pactffi_generator_generate_string(const struct Generator *generator,
+                                              const char *context_json);
+
+/**
+ * Generate an integer value using the provided generator and an optional JSON payload containing
+ * any generator context. The context value is used for generators like `ProviderStateGenerator`
+ * (which should be the values returned from the Provider State callback function).
+ *
+ * If anything goes wrong or the generator is not a type that can generate an integer value, it
+ * will return a zero value.
+ */
+unsigned short pactffi_generator_generate_integer(const struct Generator *generator,
+                                                  const char *context_json);
+
 /**
  * Delete a string previously returned by this FFI.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pact-foundation/pact-core",
-  "version": "13.12.0",
+  "version": "13.12.2",
   "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",
@@ -53,7 +53,6 @@
   },
   "dependencies": {
     "@types/needle": "2.5.2",
-    "@types/pino": "6.3.11",
     "bindings": "^1.5.0",
     "chalk": "4.1.2",
     "check-types": "7.3.0",
@@ -61,8 +60,8 @@
     "mkdirp": "1.0.0",
     "needle": "2.8.0",
     "node-addon-api": "^4.2.0",
-    "pino": "6.13.1",
-    "pino-pretty": "^6.0.0",
+    "pino": "^8.7.0",
+    "pino-pretty": "^9.1.1",
     "promise-timeout": "1.3.0",
     "rimraf": "2.6.2",
     "underscore": "1.12.1",

package/src/ffi/index.d.ts

@@ -1,7 +1,7 @@
 import { LogLevel } from '../logger/types';
 import { Ffi } from './types';
 declare const ffiLib: Ffi;
-export declare const PACT_FFI_VERSION = "0.3.14";
+export declare const PACT_FFI_VERSION = "0.3.15";
 declare let ffi: typeof ffiLib;
 export declare const getFfiLib: (logLevel?: LogLevel) => typeof ffi;
 export {};

package/src/ffi/index.js

@@ -23,7 +23,7 @@ exports.getFfiLib = exports.PACT_FFI_VERSION = void 0;
 const logger_1 = __importStar(require("../logger"));
 const bindings = require("bindings");
 const ffiLib = bindings('pact.node');
-exports.PACT_FFI_VERSION = '0.3.14';
+exports.PACT_FFI_VERSION = '0.3.15';
 let ffi;
 let ffiLogLevel;
 const initialiseFfi = (logLevel) => {

package/src/logger/pino.d.ts

@@ -1,3 +1,3 @@
-import pino = require('pino');
+import { pino } from 'pino';
 import { LogLevel } from './types';
 export declare const createLogger: (level: LogLevel) => pino.Logger;

package/src/logger/pino.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLogger = void 0;
-const pino = require("pino");
-const createLogger = (level) => pino({
+const pino_1 = require("pino");
+const createLogger = (level) => pino_1.pino({
     level: level.toLowerCase(),
-    prettyPrint: {
-        translateTime: true,
+    transport: {
+        target: 'pino-pretty',
     },
 });
 exports.createLogger = createLogger;

package/src/logger/pino.js.map

@@ -1 +1 @@
-{"version":3,"file":"pino.js","sourceRoot":"","sources":["pino.ts"],"names":[],"mappings":";;;AAAA,6BAA8B;AAGvB,MAAM,YAAY,GAAG,CAAC,KAAe,EAAe,EAAE,CAC3D,IAAI,CAAC;IACH,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE;IAC1B,WAAW,EAAE;QACX,aAAa,EAAE,IAAI;KACpB;CACF,CAAC,CAAC;AANQ,QAAA,YAAY,gBAMpB"}
+{"version":3,"file":"pino.js","sourceRoot":"","sources":["pino.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAGrB,MAAM,YAAY,GAAG,CAAC,KAAe,EAAe,EAAE,CAC3D,WAAI,CAAC;IACH,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE;IAC1B,SAAS,EAAE;QACT,MAAM,EAAE,aAAa;KACtB;CACF,CAAC,CAAC;AANQ,QAAA,YAAY,gBAMpB"}