From 1ae2f6f489bcf7b317202877af3419ecc01bc1d0 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Thu, 2 Feb 2023 19:56:31 +0700 Subject: fix(person): change fullName to use name patterns (#1637) --- src/definitions/person.ts | 4 ++-- src/locales/ar/person/name.ts | 9 ++++++--- src/locales/az/person/name.ts | 9 +++------ src/locales/cz/person/name.ts | 15 +++++++++------ src/locales/de/person/name.ts | 10 +++++----- src/locales/de_AT/person/name.ts | 8 +++++--- src/locales/de_CH/person/name.ts | 4 +++- src/locales/dv/person/name.ts | 4 +--- src/locales/el/person/name.ts | 12 +++++++++--- src/locales/en/person/name.ts | 19 ++++++++++++++----- src/locales/en_GH/person/name.ts | 9 +++++---- src/locales/en_NG/person/name.ts | 4 ++-- src/locales/en_ZA/person/name.ts | 4 ++-- src/locales/es/person/name.ts | 11 +++++++++-- src/locales/es_MX/person/name.ts | 22 ++++++++++++++++++---- src/locales/fa/person/name.ts | 9 +++++---- src/locales/fi/person/name.ts | 4 +--- src/locales/fr/person/name.ts | 8 +++++--- src/locales/fr_BE/person/name.ts | 14 +++++++++----- src/locales/fr_CH/person/name.ts | 8 +++++--- src/locales/ge/person/name.ts | 7 +++++-- src/locales/he/person/name.ts | 9 +++++---- src/locales/hr/person/name.ts | 14 +++++++++----- src/locales/hu/person/name.ts | 7 +++++-- src/locales/hy/person/name.ts | 14 +++++++++----- src/locales/id_ID/person/name.ts | 13 ++++++------- src/locales/it/person/name.ts | 9 +++++---- src/locales/ja/person/name.ts | 4 +++- src/locales/ko/person/name.ts | 4 +++- src/locales/lv/person/name.ts | 29 ++++++++++++++++++----------- src/locales/mk/person/name.ts | 9 +++++---- src/locales/nb_NO/person/name.ts | 23 +++++++++++++++++------ src/locales/nl/person/name.ts | 13 +++++++++---- src/locales/nl_BE/person/name.ts | 12 +++++++++--- src/locales/pl/person/name.ts | 7 +++++-- src/locales/pt_BR/person/name.ts | 14 +++++++++----- src/locales/pt_PT/person/name.ts | 10 +++++----- src/locales/ro/person/name.ts | 14 ++++++-------- src/locales/ru/person/name.ts | 18 ++++++++++-------- src/locales/sk/person/name.ts | 15 +++++++++------ src/locales/sv/person/name.ts | 19 +++++++++++++------ src/locales/tr/person/name.ts | 9 +++++---- src/locales/uk/person/name.ts | 18 ++++++++++-------- src/locales/ur/person/name.ts | 16 +++++++++------- src/locales/vi/person/name.ts | 4 +--- src/locales/zh_CN/person/name.ts | 4 +++- src/locales/zh_TW/person/name.ts | 4 +++- src/modules/person/index.ts | 29 ++++++++++------------------- 48 files changed, 324 insertions(+), 211 deletions(-) (limited to 'src') diff --git a/src/definitions/person.ts b/src/definitions/person.ts index 773d4fb8..b6096e81 100644 --- a/src/definitions/person.ts +++ b/src/definitions/person.ts @@ -26,9 +26,9 @@ export type PersonDefinitions = LocaleEntry<{ suffix: string[]; /** - * A list of patterns used to generate names. + * A weighted list of patterns used to generate names. */ - name: string[]; + name: Array<{ value: string; weight: number }>; bio_patterns?: string[]; diff --git a/src/locales/ar/person/name.ts b/src/locales/ar/person/name.ts index 81f3b1e4..bd69e768 100644 --- a/src/locales/ar/person/name.ts +++ b/src/locales/ar/person/name.ts @@ -1,5 +1,8 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 5 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 5 }, ]; diff --git a/src/locales/az/person/name.ts b/src/locales/az/person/name.ts index afecc403..1018fe75 100644 --- a/src/locales/az/person/name.ts +++ b/src/locales/az/person/name.ts @@ -1,8 +1,5 @@ export default [ - '{{person.male_first_name}}', - '{{person.male_last_name}} {{person.male_first_name}}', - '{{person.male_first_name}} {{person.male_last_name}}', - '{{person.female_first_name}}', - '{{person.female_first_name}} {{person.female_last_name}}', - '{{person.female_last_name}} {{person.female_first_name}}', + { value: '{{person.firstName}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, ]; diff --git a/src/locales/cz/person/name.ts b/src/locales/cz/person/name.ts index e06caa3a..eb76dabb 100644 --- a/src/locales/cz/person/name.ts +++ b/src/locales/cz/person/name.ts @@ -1,8 +1,11 @@ export default [ - '{{person.prefix}} {{person.male_first_name}} {{person.male_last_name}}', - '{{person.prefix}} {{person.female_first_name}} {{person.female_last_name}}', - '{{person.male_first_name}} {{person.male_last_name}} {{person.suffix}}', - '{{person.female_first_name}} {{person.female_last_name}} {{person.suffix}}', - '{{person.male_first_name}} {{person.male_last_name}}', - '{{person.female_first_name}} {{person.female_last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/de/person/name.ts b/src/locales/de/person/name.ts index fd40e987..3e779a47 100644 --- a/src/locales/de/person/name.ts +++ b/src/locales/de/person/name.ts @@ -1,7 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.nobility_title_prefix}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/de_AT/person/name.ts b/src/locales/de_AT/person/name.ts index 011fae52..2b844dc7 100644 --- a/src/locales/de_AT/person/name.ts +++ b/src/locales/de_AT/person/name.ts @@ -1,5 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.nobility_title_prefix}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 5 }, ]; diff --git a/src/locales/de_CH/person/name.ts b/src/locales/de_CH/person/name.ts index 6d951dfc..3ed8a80c 100644 --- a/src/locales/de_CH/person/name.ts +++ b/src/locales/de_CH/person/name.ts @@ -1 +1,3 @@ -export default ['{{person.first_name}} {{person.last_name}}']; +export default [ + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, +]; diff --git a/src/locales/dv/person/name.ts b/src/locales/dv/person/name.ts index 66884dd8..3ed8a80c 100644 --- a/src/locales/dv/person/name.ts +++ b/src/locales/dv/person/name.ts @@ -1,5 +1,3 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.male_last_name}}', - '{{person.female_first_name}} {{person.female_last_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, ]; diff --git a/src/locales/el/person/name.ts b/src/locales/el/person/name.ts index 8cee34fa..eb76dabb 100644 --- a/src/locales/el/person/name.ts +++ b/src/locales/el/person/name.ts @@ -1,5 +1,11 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/en/person/name.ts b/src/locales/en/person/name.ts index 28a268c4..772af2a9 100644 --- a/src/locales/en/person/name.ts +++ b/src/locales/en/person/name.ts @@ -1,7 +1,16 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 49 }, + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 7, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 7, + }, + { + value: + '{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, ]; diff --git a/src/locales/en_GH/person/name.ts b/src/locales/en_GH/person/name.ts index 40cb9edc..b0892e31 100644 --- a/src/locales/en_GH/person/name.ts +++ b/src/locales/en_GH/person/name.ts @@ -1,6 +1,7 @@ export default [ - '{{person.female_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}-{{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}-{{person.last_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, + { + value: '{{person.firstName}} {{person.lastName}}-{{person.lastName}}', + weight: 1, + }, ]; diff --git a/src/locales/en_NG/person/name.ts b/src/locales/en_NG/person/name.ts index ed508514..d7408557 100644 --- a/src/locales/en_NG/person/name.ts +++ b/src/locales/en_NG/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, ]; diff --git a/src/locales/en_ZA/person/name.ts b/src/locales/en_ZA/person/name.ts index ed508514..d7408557 100644 --- a/src/locales/en_ZA/person/name.ts +++ b/src/locales/en_ZA/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, ]; diff --git a/src/locales/es/person/name.ts b/src/locales/es/person/name.ts index 45752dd6..68a1d1f7 100644 --- a/src/locales/es/person/name.ts +++ b/src/locales/es/person/name.ts @@ -1,4 +1,11 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.last_name}}', + { + value: + '{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}', + weight: 9, + }, ]; diff --git a/src/locales/es_MX/person/name.ts b/src/locales/es_MX/person/name.ts index e6032d2d..7253fc0f 100644 --- a/src/locales/es_MX/person/name.ts +++ b/src/locales/es_MX/person/name.ts @@ -1,6 +1,20 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} de {{person.last_name}}', - '{{person.suffix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.last_name}}', + { + value: + '{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} de {{person.lastName}}', + weight: 3, + }, + { + value: + '{{person.suffix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}', + weight: 5, + }, ]; diff --git a/src/locales/fa/person/name.ts b/src/locales/fa/person/name.ts index 482cbd41..3e779a47 100644 --- a/src/locales/fa/person/name.ts +++ b/src/locales/fa/person/name.ts @@ -1,6 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/fi/person/name.ts b/src/locales/fi/person/name.ts index 34f0370d..3ed8a80c 100644 --- a/src/locales/fi/person/name.ts +++ b/src/locales/fi/person/name.ts @@ -1,5 +1,3 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, ]; diff --git a/src/locales/fr/person/name.ts b/src/locales/fr/person/name.ts index 81f3b1e4..95becffa 100644 --- a/src/locales/fr/person/name.ts +++ b/src/locales/fr/person/name.ts @@ -1,5 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 2, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/fr_BE/person/name.ts b/src/locales/fr_BE/person/name.ts index 28a268c4..eb76dabb 100644 --- a/src/locales/fr_BE/person/name.ts +++ b/src/locales/fr_BE/person/name.ts @@ -1,7 +1,11 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/fr_CH/person/name.ts b/src/locales/fr_CH/person/name.ts index 81f3b1e4..95becffa 100644 --- a/src/locales/fr_CH/person/name.ts +++ b/src/locales/fr_CH/person/name.ts @@ -1,5 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 2, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/ge/person/name.ts b/src/locales/ge/person/name.ts index 2e536501..3e779a47 100644 --- a/src/locales/ge/person/name.ts +++ b/src/locales/ge/person/name.ts @@ -1,4 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/he/person/name.ts b/src/locales/he/person/name.ts index 482cbd41..3e779a47 100644 --- a/src/locales/he/person/name.ts +++ b/src/locales/he/person/name.ts @@ -1,6 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/hr/person/name.ts b/src/locales/hr/person/name.ts index 740b0642..02a6fdf5 100644 --- a/src/locales/hr/person/name.ts +++ b/src/locales/hr/person/name.ts @@ -1,7 +1,11 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}, {{person.suffix}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}}, {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/hu/person/name.ts b/src/locales/hu/person/name.ts index 0a6c8d52..019fb596 100644 --- a/src/locales/hu/person/name.ts +++ b/src/locales/hu/person/name.ts @@ -1,4 +1,7 @@ export default [ - '{{person.prefix}} {{person.last_name}} {{person.first_name}}', - '{{person.last_name}} {{person.first_name}}', + { + value: '{{person.prefix}} {{person.lastName}} {{person.firstName}}', + weight: 1, + }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 9 }, ]; diff --git a/src/locales/hy/person/name.ts b/src/locales/hy/person/name.ts index 28a268c4..eb76dabb 100644 --- a/src/locales/hy/person/name.ts +++ b/src/locales/hy/person/name.ts @@ -1,7 +1,11 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/id_ID/person/name.ts b/src/locales/id_ID/person/name.ts index fefc263e..94ea3a29 100644 --- a/src/locales/id_ID/person/name.ts +++ b/src/locales/id_ID/person/name.ts @@ -1,9 +1,8 @@ export default [ - '{{person.male_first_name}} {{person.male_last_name}}', - '{{person.male_last_name}} {{person.male_first_name}}', - '{{person.male_first_name}} {{person.male_first_name}} {{person.male_last_name}}', - '{{person.female_first_name}} {{person.female_last_name}}', - '{{person.female_first_name}} {{person.male_last_name}}', - '{{person.female_last_name}} {{person.female_first_name}}', - '{{person.female_first_name}} {{person.female_first_name}} {{person.female_last_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, + { + value: '{{person.firstName}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, ]; diff --git a/src/locales/it/person/name.ts b/src/locales/it/person/name.ts index 482cbd41..3e779a47 100644 --- a/src/locales/it/person/name.ts +++ b/src/locales/it/person/name.ts @@ -1,6 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/ja/person/name.ts b/src/locales/ja/person/name.ts index 3558edaf..75688dbd 100644 --- a/src/locales/ja/person/name.ts +++ b/src/locales/ja/person/name.ts @@ -1 +1,3 @@ -export default ['{{person.last_name}} {{person.first_name}}']; +export default [ + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, +]; diff --git a/src/locales/ko/person/name.ts b/src/locales/ko/person/name.ts index 3558edaf..75688dbd 100644 --- a/src/locales/ko/person/name.ts +++ b/src/locales/ko/person/name.ts @@ -1 +1,3 @@ -export default ['{{person.last_name}} {{person.first_name}}']; +export default [ + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, +]; diff --git a/src/locales/lv/person/name.ts b/src/locales/lv/person/name.ts index 55bf8bff..492a7e6f 100644 --- a/src/locales/lv/person/name.ts +++ b/src/locales/lv/person/name.ts @@ -1,13 +1,20 @@ export default [ - '{{person.prefix}} {{person.male_first_name}} {{person.male_last_name}}', - '{{person.male_first_name}} {{person.male_last_name}}', - '{{person.male_last_name}} {{person.male_first_name}}', - '{{person.male_first_name}} {{person.male_first_name}} {{person.male_last_name}}', - '{{person.male_first_name}} {{person.male_last_name}}-{{person.male_last_name}}', - '{{person.prefix}} {{person.female_first_name}} {{person.female_last_name}}', - '{{person.female_first_name}} {{person.female_last_name}} {{person.suffix}}', - '{{person.female_first_name}} {{person.female_last_name}}', - '{{person.female_last_name}} {{person.female_first_name}}', - '{{person.female_first_name}} {{person.female_first_name}} {{person.female_last_name}}', - '{{person.female_first_name}} {{person.female_last_name}}-{{person.female_last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 7 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 2 }, + { + value: '{{person.firstName}} {{person.firstName}} {{person.lastName}}', + weight: 2, + }, + { + value: '{{person.firstName}} {{person.lastName}}-{{person.lastName}}', + weight: 2, + }, ]; diff --git a/src/locales/mk/person/name.ts b/src/locales/mk/person/name.ts index 9a2cbe85..b5a91acc 100644 --- a/src/locales/mk/person/name.ts +++ b/src/locales/mk/person/name.ts @@ -1,6 +1,7 @@ export default [ - '{{person.female_prefix}} {{person.female_first_name}} {{person.female_last_name}}', - '{{person.male_prefix}} {{person.male_first_name}} {{person.male_last_name}}', - '{{person.female_first_name}} {{person.female_last_name}}', - '{{person.male_first_name}} {{person.male_last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/nb_NO/person/name.ts b/src/locales/nb_NO/person/name.ts index a0c4cc5e..3cfec1ea 100644 --- a/src/locales/nb_NO/person/name.ts +++ b/src/locales/nb_NO/person/name.ts @@ -1,8 +1,19 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.female_first_name}} {{person.female_first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.male_first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/nl/person/name.ts b/src/locales/nl/person/name.ts index ab5165b6..eb76dabb 100644 --- a/src/locales/nl/person/name.ts +++ b/src/locales/nl/person/name.ts @@ -1,6 +1,11 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.tussenvoegsel}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/nl_BE/person/name.ts b/src/locales/nl_BE/person/name.ts index 8cee34fa..eb76dabb 100644 --- a/src/locales/nl_BE/person/name.ts +++ b/src/locales/nl_BE/person/name.ts @@ -1,5 +1,11 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/pl/person/name.ts b/src/locales/pl/person/name.ts index 2e536501..3e779a47 100644 --- a/src/locales/pl/person/name.ts +++ b/src/locales/pl/person/name.ts @@ -1,4 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/pt_BR/person/name.ts b/src/locales/pt_BR/person/name.ts index 28a268c4..eb76dabb 100644 --- a/src/locales/pt_BR/person/name.ts +++ b/src/locales/pt_BR/person/name.ts @@ -1,7 +1,11 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/pt_PT/person/name.ts b/src/locales/pt_PT/person/name.ts index 98c6b8db..45b05d92 100644 --- a/src/locales/pt_PT/person/name.ts +++ b/src/locales/pt_PT/person/name.ts @@ -1,7 +1,7 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', - '{{person.male_prefix}} {{person.male_first_name}} {{person.last_name}}', - '{{person.female_prefix}} {{person.female_first_name}} {{person.last_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, ]; diff --git a/src/locales/ro/person/name.ts b/src/locales/ro/person/name.ts index 761a6ec6..3a8f55ef 100644 --- a/src/locales/ro/person/name.ts +++ b/src/locales/ro/person/name.ts @@ -1,10 +1,8 @@ export default [ - '{{person.male_first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.male_first_name}}', - '{{person.prefix}} {{person.male_first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}, {{person.suffix}}', - '{{person.prefix}} {{person.male_first_name}} {{person.last_name}}, {{person.suffix}}', - '{{person.female_first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.female_first_name}}', - '{{person.prefix}} {{person.female_first_name}} {{person.last_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, ]; diff --git a/src/locales/ru/person/name.ts b/src/locales/ru/person/name.ts index c5189e48..51793f93 100644 --- a/src/locales/ru/person/name.ts +++ b/src/locales/ru/person/name.ts @@ -1,10 +1,12 @@ export default [ - '{{person.male_first_name}} {{person.male_last_name}}', - '{{person.male_last_name}} {{person.male_first_name}}', - '{{person.male_first_name}} {{person.male_middle_name}} {{person.male_last_name}}', - '{{person.male_last_name}} {{person.male_first_name}} {{person.male_middle_name}}', - '{{person.female_first_name}} {{person.female_last_name}}', - '{{person.female_last_name}} {{person.female_first_name}}', - '{{person.female_first_name}} {{person.female_middle_name}} {{person.female_last_name}}', - '{{person.female_last_name}} {{person.female_first_name}} {{person.female_middle_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, + { + value: '{{person.firstName}} {{person.middleName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.lastName}} {{person.firstName}} {{person.middleName}}', + weight: 1, + }, ]; diff --git a/src/locales/sk/person/name.ts b/src/locales/sk/person/name.ts index e06caa3a..eb76dabb 100644 --- a/src/locales/sk/person/name.ts +++ b/src/locales/sk/person/name.ts @@ -1,8 +1,11 @@ export default [ - '{{person.prefix}} {{person.male_first_name}} {{person.male_last_name}}', - '{{person.prefix}} {{person.female_first_name}} {{person.female_last_name}}', - '{{person.male_first_name}} {{person.male_last_name}} {{person.suffix}}', - '{{person.female_first_name}} {{person.female_last_name}} {{person.suffix}}', - '{{person.male_first_name}} {{person.male_last_name}}', - '{{person.female_first_name}} {{person.female_last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/sv/person/name.ts b/src/locales/sv/person/name.ts index b8314da3..37334af6 100644 --- a/src/locales/sv/person/name.ts +++ b/src/locales/sv/person/name.ts @@ -1,8 +1,15 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}', + weight: 1, + }, ]; diff --git a/src/locales/tr/person/name.ts b/src/locales/tr/person/name.ts index 482cbd41..b5a91acc 100644 --- a/src/locales/tr/person/name.ts +++ b/src/locales/tr/person/name.ts @@ -1,6 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/uk/person/name.ts b/src/locales/uk/person/name.ts index c5189e48..51793f93 100644 --- a/src/locales/uk/person/name.ts +++ b/src/locales/uk/person/name.ts @@ -1,10 +1,12 @@ export default [ - '{{person.male_first_name}} {{person.male_last_name}}', - '{{person.male_last_name}} {{person.male_first_name}}', - '{{person.male_first_name}} {{person.male_middle_name}} {{person.male_last_name}}', - '{{person.male_last_name}} {{person.male_first_name}} {{person.male_middle_name}}', - '{{person.female_first_name}} {{person.female_last_name}}', - '{{person.female_last_name}} {{person.female_first_name}}', - '{{person.female_first_name}} {{person.female_middle_name}} {{person.female_last_name}}', - '{{person.female_last_name}} {{person.female_first_name}} {{person.female_middle_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, + { + value: '{{person.firstName}} {{person.middleName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.lastName}} {{person.firstName}} {{person.middleName}}', + weight: 1, + }, ]; diff --git a/src/locales/ur/person/name.ts b/src/locales/ur/person/name.ts index a946985a..eb76dabb 100644 --- a/src/locales/ur/person/name.ts +++ b/src/locales/ur/person/name.ts @@ -1,9 +1,11 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', - '{{person.male_first_name}} بن {{person.male_first_name}}', - '{{person.female_first_name}} بنت {{person.male_first_name}}', + { + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', + weight: 1, + }, + { + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/vi/person/name.ts b/src/locales/vi/person/name.ts index ac2a668e..3ed8a80c 100644 --- a/src/locales/vi/person/name.ts +++ b/src/locales/vi/person/name.ts @@ -1,5 +1,3 @@ export default [ - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, ]; diff --git a/src/locales/zh_CN/person/name.ts b/src/locales/zh_CN/person/name.ts index 4052e58f..d661e1c8 100644 --- a/src/locales/zh_CN/person/name.ts +++ b/src/locales/zh_CN/person/name.ts @@ -1 +1,3 @@ -export default ['{{person.first_name}}{{person.last_name}}']; +export default [ + { value: '{{person.lastName}}{{person.firstName}}', weight: 1 }, +]; diff --git a/src/locales/zh_TW/person/name.ts b/src/locales/zh_TW/person/name.ts index 4052e58f..d661e1c8 100644 --- a/src/locales/zh_TW/person/name.ts +++ b/src/locales/zh_TW/person/name.ts @@ -1 +1,3 @@ -export default ['{{person.first_name}}{{person.last_name}}']; +export default [ + { value: '{{person.lastName}}{{person.firstName}}', weight: 1 }, +]; diff --git a/src/modules/person/index.ts b/src/modules/person/index.ts index 03609cbc..da30fee7 100644 --- a/src/modules/person/index.ts +++ b/src/modules/person/index.ts @@ -187,27 +187,18 @@ export class PersonModule { lastName = this.lastName(sex), } = options; - const nameParts: string[] = []; - const prefix = this.faker.helpers.maybe(() => this.prefix(sex), { - probability: 0.125, - }); - - if (prefix) { - nameParts.push(prefix); - } - - nameParts.push(firstName); - nameParts.push(lastName); + const fullNamePattern: string = this.faker.helpers.weightedArrayElement( + this.faker.definitions.person.name + ); - const suffix = this.faker.helpers.maybe(() => this.suffix(), { - probability: 0.125, + const fullName = this.faker.helpers.mustache(fullNamePattern, { + 'person.prefix': () => this.prefix(sex), + 'person.firstName': () => firstName, + 'person.middleName': () => this.middleName(sex), + 'person.lastName': () => lastName, + 'person.suffix': () => this.suffix(), }); - - if (suffix) { - nameParts.push(suffix); - } - - return nameParts.join(' '); + return fullName; } /** -- cgit v1.2.3