Change ParameterType.regexps type (#133)

* Change ParameterType.expression type

* fix typo

* Export the new types

Author: aslakhellesoy

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+- [JavaScript] The `ParameterType` constructor's `regexps` parameter has a new type: `type Regexps = StringOrRegExp | readonly StringOrRegExp[]; type StringOrRegExp = string | RegExp`.
+
 ## [15.2.0] - 2022-05-24
 ### Added
 - [JavaScript] Add `ParameterInfo` ([#124](https://github.com/cucumber/cucumber-expressions/pull/124))

javascript/src/ParameterType.ts

@@ -10,6 +10,9 @@ interface Constructor<T> extends Function {
 
 type Factory<T> = (...args: unknown[]) => T
 
+export type Regexps = StringOrRegExp | readonly StringOrRegExp[]
+export type StringOrRegExp = string | RegExp
+
 export default class ParameterType<T> {
   private transformFn: (...match: readonly string[]) => T | PromiseLike<T>
 
@@ -40,16 +43,16 @@ export default class ParameterType<T> {
 
   /**
    * @param name {String} the name of the type
-   * @param regexps {Array.<RegExp>,RegExp,Array.<String>,String} that matches the type
+   * @param regexps {Array.<RegExp | String>,RegExp,String} that matche the type
    * @param type {Function} the prototype (constructor) of the type. May be null.
    * @param transform {Function} function transforming string to another type. May be null.
    * @param useForSnippets {boolean} true if this should be used for snippets. Defaults to true.
    * @param preferForRegexpMatch {boolean} true if this is a preferential type. Defaults to false.
    */
   constructor(
     public readonly name: string | undefined,
-    regexps: readonly RegExp[] | readonly string[] | RegExp | string,
-    public readonly type: Constructor<T> | Factory<T> | string | null,
+    regexps: Regexps,
+    public readonly type: Constructor<T> | Factory<T> | null,
     transform: (...match: string[]) => T | PromiseLike<T>,
     public readonly useForSnippets: boolean,
     public readonly preferForRegexpMatch: boolean
@@ -77,11 +80,8 @@ export default class ParameterType<T> {
   }
 }
 
-type StringOrRegexp = string | RegExp
-
-function stringArray(regexps: readonly StringOrRegexp[] | StringOrRegexp): string[] {
-  // @ts-ignore
-  const array: StringOrRegexp[] = Array.isArray(regexps) ? regexps : [regexps]
+function stringArray(regexps: Regexps): string[] {
+  const array: StringOrRegExp[] = Array.isArray(regexps) ? regexps : [regexps]
   return array.map((r) => (r instanceof RegExp ? regexpSource(r) : r))
 }