Skip to content

Commit 7c4d7a3

Browse files
authored
Merge branch 'next' into add-dutch-province-abbreviations
2 parents 35e90a5 + 5a48282 commit 7c4d7a3

File tree

8 files changed

+33
-33
lines changed

8 files changed

+33
-33
lines changed

docs/guide/frameworks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe('reverse array', () => {
6464

6565
## Cypress
6666

67-
[Cypress](https://www.cypress.io/) integration is fairly straighforward as well:
67+
[Cypress](https://www.cypress.io/) integration is fairly straightforward as well:
6868

6969
```ts
7070
import { faker } from '@faker-js/faker/locale/en';

src/definitions/color.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { LocaleEntry } from './definitions';
55
*/
66
export type ColorDefinition = LocaleEntry<{
77
/**
8-
* Human readable color names.
8+
* Human-readable color names.
99
*/
1010
human: string[];
1111

src/modules/color/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export class ColorModule {
185185
}
186186

187187
/**
188-
* Returns a random human readable color name.
188+
* Returns a random human-readable color name.
189189
*
190190
* @example
191191
* faker.color.human() // 'red'

src/modules/date/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { deprecated } from '../../internal/deprecated';
55

66
/**
77
* Converts date passed as a string, number or Date to a Date object.
8-
* If nothing or a non parsable value is passed, then it will take the value from the given fallback.
8+
* If nothing or a non-parsable value is passed, then it will take the value from the given fallback.
99
*
1010
* @param date The date to convert.
1111
* @param fallback The fallback date to use if the passed date is not valid.

src/modules/finance/index.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ export class FinanceModule {
740740
/**
741741
* Generates a random credit card number.
742742
*
743-
* @param issuer The name of the issuer (case insensitive) or the format used to generate one.
743+
* @param issuer The name of the issuer (case-insensitive) or the format used to generate one.
744744
*
745745
* @example
746746
* faker.finance.creditCardNumber() // '4427163488662'
@@ -754,7 +754,7 @@ export class FinanceModule {
754754
* Generates a random credit card number.
755755
*
756756
* @param options An options object. Defaults to `''`.
757-
* @param options.issuer The name of the issuer (case insensitive) or the format used to generate one.
757+
* @param options.issuer The name of the issuer (case-insensitive) or the format used to generate one.
758758
*
759759
* @example
760760
* faker.finance.creditCardNumber() // '4427163488662'
@@ -765,7 +765,7 @@ export class FinanceModule {
765765
*/
766766
creditCardNumber(options?: {
767767
/**
768-
* The name of the issuer (case insensitive) or the format used to generate one.
768+
* The name of the issuer (case-insensitive) or the format used to generate one.
769769
*
770770
* @default ''
771771
*/
@@ -775,7 +775,7 @@ export class FinanceModule {
775775
* Generates a random credit card number.
776776
*
777777
* @param options An options object, the issuer or a custom format. Defaults to `{}`.
778-
* @param options.issuer The name of the issuer (case insensitive) or the format used to generate one.
778+
* @param options.issuer The name of the issuer (case-insensitive) or the format used to generate one.
779779
*
780780
* @example
781781
* faker.finance.creditCardNumber() // '4427163488662'
@@ -790,7 +790,7 @@ export class FinanceModule {
790790
| string
791791
| {
792792
/**
793-
* The name of the issuer (case insensitive) or the format used to generate one.
793+
* The name of the issuer (case-insensitive) or the format used to generate one.
794794
*
795795
* @default ''
796796
*/
@@ -801,7 +801,7 @@ export class FinanceModule {
801801
* Generates a random credit card number.
802802
*
803803
* @param options An options object, the issuer or a custom format. Defaults to `{}`.
804-
* @param options.issuer The name of the issuer (case insensitive) or the format used to generate one.
804+
* @param options.issuer The name of the issuer (case-insensitive) or the format used to generate one.
805805
*
806806
* @example
807807
* faker.finance.creditCardNumber() // '4427163488662'
@@ -816,7 +816,7 @@ export class FinanceModule {
816816
| string
817817
| {
818818
/**
819-
* The name of the issuer (case insensitive) or the format used to generate one.
819+
* The name of the issuer (case-insensitive) or the format used to generate one.
820820
*
821821
* @default ''
822822
*/

src/modules/helpers/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ export class HelpersModule {
257257
* - `.{min,max}` => Repeat the character `min` to `max` times.
258258
* - `[min-max]` => Generate a number between min and max (inclusive).
259259
*
260-
* @param string The template string to to parse.
260+
* @param string The template string to parse.
261261
*
262262
* @example
263263
* faker.helpers.regexpStyleStringParse() // ''
@@ -355,7 +355,7 @@ export class HelpersModule {
355355
* - `[x-y]+` => Repeat characters between `x` and `y` (inclusive) 1 or more times.
356356
* - `.` => returns a wildcard ASCII character that can be any number, character or symbol. Can be combined with quantifiers as well.
357357
*
358-
* @param pattern The template string/RegExp to to generate a matching string for.
358+
* @param pattern The template string/RegExp to generate a matching string for.
359359
*
360360
* @throws If min value is more than max value in quantifier. e.g. `#{10,5}`
361361
* @throws If invalid quantifier symbol is passed in.

src/modules/internet/index.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ export class InternetModule {
486486

487487
/**
488488
* Generates a username using the given person's name as base.
489-
* The resuling username may use neither, one or both of the names provided.
489+
* The resulting username may use neither, one or both of the names provided.
490490
* This will always return a plain ASCII string.
491491
* Some basic stripping of accents and transliteration of characters will be done.
492492
*
@@ -522,7 +522,7 @@ export class InternetModule {
522522
}): string;
523523
/**
524524
* Generates a username using the given person's name as base.
525-
* The resuling username may use neither, one or both of the names provided.
525+
* The resulting username may use neither, one or both of the names provided.
526526
* This will always return a plain ASCII string.
527527
* Some basic stripping of accents and transliteration of characters will be done.
528528
*
@@ -546,7 +546,7 @@ export class InternetModule {
546546
userName(firstName?: string, lastName?: string): string;
547547
/**
548548
* Generates a username using the given person's name as base.
549-
* The resuling username may use neither, one or both of the names provided.
549+
* The resulting username may use neither, one or both of the names provided.
550550
* This will always return a plain ASCII string.
551551
* Some basic stripping of accents and transliteration of characters will be done.
552552
*
@@ -1309,7 +1309,7 @@ export class InternetModule {
13091309
* @param options An options object. Defaults to `{}`.
13101310
* @param options.length The length of the password to generate. Defaults to `15`.
13111311
* @param options.memorable Whether the generated password should be memorable. Defaults to `false`.
1312-
* @param options.pattern The pattern that all chars should match should match.
1312+
* @param options.pattern The pattern that all chars should match.
13131313
* This option will be ignored, if `memorable` is `true`. Defaults to `/\w/`.
13141314
* @param options.prefix The prefix to use. Defaults to `''`.
13151315
*
@@ -1336,7 +1336,7 @@ export class InternetModule {
13361336
*/
13371337
memorable?: boolean;
13381338
/**
1339-
* The pattern that all chars should match should match.
1339+
* The pattern that all chars should match.
13401340
* This option will be ignored, if `memorable` is `true`.
13411341
*
13421342
* @default /\w/
@@ -1354,7 +1354,7 @@ export class InternetModule {
13541354
*
13551355
* @param len The length of the password to generate. Defaults to `15`.
13561356
* @param memorable Whether the generated password should be memorable. Defaults to `false`.
1357-
* @param pattern The pattern that all chars should match should match.
1357+
* @param pattern The pattern that all chars should match.
13581358
* This option will be ignored, if `memorable` is `true`. Defaults to `/\w/`.
13591359
* @param prefix The prefix to use. Defaults to `''`.
13601360
*
@@ -1381,11 +1381,11 @@ export class InternetModule {
13811381
* @param options The length of the password or an options object. Defaults to `{}`.
13821382
* @param options.length The length of the password to generate. Defaults to `15`.
13831383
* @param options.memorable Whether the generated password should be memorable. Defaults to `false`.
1384-
* @param options.pattern The pattern that all chars should match should match.
1384+
* @param options.pattern The pattern that all chars should match.
13851385
* This option will be ignored, if `memorable` is `true`. Defaults to `/\w/`.
13861386
* @param options.prefix The prefix to use. Defaults to `''`.
13871387
* @param legacyMemorable Whether the generated password should be memorable. Defaults to `false`.
1388-
* @param legacyPattern The pattern that all chars should match should match.
1388+
* @param legacyPattern The pattern that all chars should match.
13891389
* This option will be ignored, if `memorable` is `true`. Defaults to `/\w/`.
13901390
* @param legacyPrefix The prefix to use. Defaults to `''`.
13911391
*
@@ -1415,7 +1415,7 @@ export class InternetModule {
14151415
*/
14161416
memorable?: boolean;
14171417
/**
1418-
* The pattern that all chars should match should match.
1418+
* The pattern that all chars should match.
14191419
* This option will be ignored, if `memorable` is `true`.
14201420
*
14211421
* @default /\w/
@@ -1449,7 +1449,7 @@ export class InternetModule {
14491449
*/
14501450
memorable?: boolean;
14511451
/**
1452-
* The pattern that all chars should match should match.
1452+
* The pattern that all chars should match.
14531453
* This option will be ignored, if `memorable` is `true`.
14541454
*
14551455
* @default /\w/

src/modules/location/index.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ export class LocationModule {
3131
* Generates random zip code from specified format. If format is not specified,
3232
* the locale's zip format is used.
3333
*
34-
* @param options The format used to generate the the zip code or an options object. Defaults to `{}`.
34+
* @param options The format used to generate the zip code or an options object. Defaults to `{}`.
3535
* @param options.state The state to generate the zip code for.
3636
* If the current locale does not have a corresponding `postcode_by_state` definition, an error is thrown.
37-
* @param options.format The optional format used to generate the the zip code.
37+
* @param options.format The optional format used to generate the zip code.
3838
* By default, a random format is used from the locale zip formats.
39-
* This wont be used if the state option is specified.
39+
* This won't be used if the state option is specified.
4040
*
4141
* @see faker.helpers.replaceSymbols()
4242
*
@@ -53,13 +53,13 @@ export class LocationModule {
5353
/**
5454
* The state to generate the zip code for.
5555
*
56-
* If the currrent locale does not have a corresponding `postcode_by_state` definition, an error is thrown.
56+
* If the current locale does not have a corresponding `postcode_by_state` definition, an error is thrown.
5757
*/
5858
state?: string;
5959
/**
60-
* The optional format used to generate the the zip code.
60+
* The optional format used to generate the zip code.
6161
*
62-
* This wont be used if the state option is specified.
62+
* This won't be used if the state option is specified.
6363
*
6464
* @default faker.definitions.location.postcode
6565
*/
@@ -327,8 +327,8 @@ export class LocationModule {
327327
* Returns a random [ISO_3166-1](https://en.wikipedia.org/wiki/ISO_3166-1) country code.
328328
*
329329
* @param options The code to return or an options object. Defaults to `{}`.
330-
* @param options.variant The variant to return. Can be either `'alpha-2'` (two letter code)
331-
* or `'alpha-3'` (three letter code). Defaults to `'alpha-2'`.
330+
* @param options.variant The variant to return. Can be either `'alpha-2'` (two-letter code)
331+
* or `'alpha-3'` (three-letter code). Defaults to `'alpha-2'`.
332332
*
333333
* @example
334334
* faker.location.countryCode() // 'SJ'
@@ -344,8 +344,8 @@ export class LocationModule {
344344
| {
345345
/**
346346
* The code to return.
347-
* Can be either `'alpha-2'` (two letter code)
348-
* or `'alpha-3'` (three letter code).
347+
* Can be either `'alpha-2'` (two-letter code)
348+
* or `'alpha-3'` (three-letter code).
349349
*
350350
* @default 'alpha-2'
351351
*/

0 commit comments

Comments
 (0)