Merge branch 'main' into cr-remove-couroutine

# Conflicts:
#	CHANGELOG.md

Author: charlierudolph

CHANGELOG.md

@@ -29,6 +29,8 @@ See the [migration guide](./docs/migration.md) for details of how to migrate fro
 
 * Prevent duplicate scenario execution where the same feature is targeted in multiple line expressions ([#1706](https://github.com/cucumber/cucumber-js/issues/1706))
 * Fixed reports banner to point to [new docs](https://cucumber.io/docs/cucumber/environment-variables/) about environment variables
+* Re-add color functions for use with custom formatters [1582](https://github.com/cucumber/cucumber-js/issues/1582)
+* IParameterTypeDefinition regexp fix [1702](https://github.com/cucumber/cucumber-js/issues/1702)
 
 ## [7.3.0] (2021-06-17)
 

CONTRIBUTING.md

@@ -5,7 +5,8 @@ Before anything else, thank you. Thank you for taking some of your precious time
 ## Setup
 
 * install [Node.Js](https://nodejs.org/en/) and [Yarn](https://yarnpkg.com/)
-* `yarn install`
+* `yarn install` - Install dependencies
+* `yarn test` - Compile typescript and run the tests
 
 ## Tests
 

src/formatter/get_color_fns.ts

@@ -9,6 +9,10 @@ export interface IColorFns {
   forStatus: (status: TestStepResultStatus) => IColorFn
   location: IColorFn
   tag: IColorFn
+  diffAdded: IColorFn
+  diffRemoved: IColorFn
+  errorMessage: IColorFn
+  errorStack: IColorFn
 }
 
 export default function getColorFns(enabled: boolean): IColorFns {
@@ -27,6 +31,10 @@ export default function getColorFns(enabled: boolean): IColorFns {
       },
       location: colors.gray.bind(colors),
       tag: colors.cyan.bind(colors),
+      diffAdded: colors.green.bind(colors),
+      diffRemoved: colors.red.bind(colors),
+      errorMessage: colors.red.bind(colors),
+      errorStack: colors.grey.bind(colors),
     }
   } else {
     return {
@@ -35,6 +43,10 @@ export default function getColorFns(enabled: boolean): IColorFns {
       },
       location: (x) => x,
       tag: (x) => x,
+      diffAdded: (x) => x,
+      diffRemoved: (x) => x,
+      errorMessage: (x) => x,
+      errorStack: (x) => x,
     }
   }
 }

src/support_code_library_builder/types.ts

@@ -58,7 +58,7 @@ export interface IDefineTestRunHookOptions {
 
 export interface IParameterTypeDefinition<T> {
   name: string
-  regexp: RegExp
+  regexp: readonly RegExp[] | readonly string[] | RegExp | string
   transformer: (...match: string[]) => T
   useForSnippets?: boolean
   preferForRegexpMatch?: boolean