From 77e0bd4941db24beafd0fecc5db452d6fdba63fb Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Tue, 6 Dec 2022 21:38:02 +0700 Subject: [PATCH 01/18] fix(person): change fullName to use name patterns --- src/locales/az/person/name.ts | 9 ++---- src/locales/cz/person/name.ts | 9 ++---- src/locales/de/person/name.ts | 3 -- src/locales/dv/person/name.ts | 6 +--- src/locales/en/person/name.ts | 9 +++--- src/locales/en_GH/person/name.ts | 6 ++-- src/locales/fa/person/name.ts | 2 -- src/locales/fi/person/name.ts | 6 +--- src/locales/fr_BE/person/name.ts | 2 -- src/locales/he/person/name.ts | 2 -- src/locales/hr/person/name.ts | 2 -- src/locales/hy/person/name.ts | 2 -- src/locales/id_ID/person/name.ts | 10 ++----- src/locales/it/person/name.ts | 2 -- src/locales/lv/person/name.ts | 17 ++++------- src/locales/mk/person/name.ts | 6 ++-- src/locales/nb_NO/person/name.ts | 3 +- src/locales/pt_BR/person/name.ts | 2 -- src/locales/pt_PT/person/name.ts | 5 +--- src/locales/ro/person/name.ts | 11 ++----- src/locales/ru/person/name.ts | 12 +++----- src/locales/sk/person/name.ts | 9 ++---- src/locales/sv/person/name.ts | 2 -- src/locales/tr/person/name.ts | 2 -- src/locales/uk/person/name.ts | 12 +++----- src/locales/ur/person/name.ts | 4 --- src/locales/vi/person/name.ts | 6 +--- src/locales/zh_CN/person/name.ts | 2 +- src/locales/zh_TW/person/name.ts | 2 +- src/modules/person/index.ts | 37 +++++++++--------------- test/__snapshots__/git.spec.ts.snap | 36 +++++++++++------------ test/__snapshots__/internet.spec.ts.snap | 12 -------- test/__snapshots__/person.spec.ts.snap | 26 ++++++++--------- 33 files changed, 88 insertions(+), 188 deletions(-) diff --git a/src/locales/az/person/name.ts b/src/locales/az/person/name.ts index afecc403f09..8867b29104a 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}}', + '{{person.first_name}}', + '{{person.last_name}} {{person.first_name}}', + '{{person.first_name}} {{person.last_name}}', ]; diff --git a/src/locales/cz/person/name.ts b/src/locales/cz/person/name.ts index e06caa3ac67..8cee34fa23d 100644 --- a/src/locales/cz/person/name.ts +++ b/src/locales/cz/person/name.ts @@ -1,8 +1,5 @@ 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}}', + '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + '{{person.first_name}} {{person.last_name}}', ]; diff --git a/src/locales/de/person/name.ts b/src/locales/de/person/name.ts index fd40e987457..2e536501d0a 100644 --- a/src/locales/de/person/name.ts +++ b/src/locales/de/person/name.ts @@ -1,7 +1,4 @@ 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}}', ]; diff --git a/src/locales/dv/person/name.ts b/src/locales/dv/person/name.ts index 66884dd81fd..6d951dfc8fc 100644 --- a/src/locales/dv/person/name.ts +++ b/src/locales/dv/person/name.ts @@ -1,5 +1 @@ -export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.male_last_name}}', - '{{person.female_first_name}} {{person.female_last_name}}', -]; +export default ['{{person.first_name}} {{person.last_name}}']; diff --git a/src/locales/en/person/name.ts b/src/locales/en/person/name.ts index 28a268c490f..cc67668b85f 100644 --- a/src/locales/en/person/name.ts +++ b/src/locales/en/person/name.ts @@ -1,7 +1,6 @@ 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}}', + ...Array(7).fill('{{person.first_name}} {{person.last_name}}'), //70% of the time we want a first and last name + '{{person.prefix}} {{person.first_name}} {{person.last_name}}', //10% of the time add a prefix + '{{person.first_name}} {{person.last_name}} {{person.suffix}}', //10% of the time add a suffix + '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.suffix}}', //10% of the time add both ]; diff --git a/src/locales/en_GH/person/name.ts b/src/locales/en_GH/person/name.ts index 40cb9edc363..79e50e83a2b 100644 --- a/src/locales/en_GH/person/name.ts +++ b/src/locales/en_GH/person/name.ts @@ -1,6 +1,4 @@ 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}}', + '{{person.first_name}} {{person.last_name}}', + '{{person.first_name}} {{person.last_name}}-{{person.last_name}}', ]; diff --git a/src/locales/fa/person/name.ts b/src/locales/fa/person/name.ts index 482cbd41af9..2e536501d0a 100644 --- a/src/locales/fa/person/name.ts +++ b/src/locales/fa/person/name.ts @@ -1,6 +1,4 @@ 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}}', ]; diff --git a/src/locales/fi/person/name.ts b/src/locales/fi/person/name.ts index 34f0370d18d..6d951dfc8fc 100644 --- a/src/locales/fi/person/name.ts +++ b/src/locales/fi/person/name.ts @@ -1,5 +1 @@ -export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', -]; +export default ['{{person.first_name}} {{person.last_name}}']; diff --git a/src/locales/fr_BE/person/name.ts b/src/locales/fr_BE/person/name.ts index 28a268c490f..8cee34fa23d 100644 --- a/src/locales/fr_BE/person/name.ts +++ b/src/locales/fr_BE/person/name.ts @@ -2,6 +2,4 @@ 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}}', ]; diff --git a/src/locales/he/person/name.ts b/src/locales/he/person/name.ts index 482cbd41af9..2e536501d0a 100644 --- a/src/locales/he/person/name.ts +++ b/src/locales/he/person/name.ts @@ -1,6 +1,4 @@ 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}}', ]; diff --git a/src/locales/hr/person/name.ts b/src/locales/hr/person/name.ts index 740b0642c74..d816b0f9972 100644 --- a/src/locales/hr/person/name.ts +++ b/src/locales/hr/person/name.ts @@ -2,6 +2,4 @@ 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}}', ]; diff --git a/src/locales/hy/person/name.ts b/src/locales/hy/person/name.ts index 28a268c490f..8cee34fa23d 100644 --- a/src/locales/hy/person/name.ts +++ b/src/locales/hy/person/name.ts @@ -2,6 +2,4 @@ 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}}', ]; diff --git a/src/locales/id_ID/person/name.ts b/src/locales/id_ID/person/name.ts index fefc263e8d8..2181b8b0d45 100644 --- a/src/locales/id_ID/person/name.ts +++ b/src/locales/id_ID/person/name.ts @@ -1,9 +1,5 @@ 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}}', + '{{person.first_name}} {{person.last_name}}', + '{{person.last_name}} {{person.first_name}}', + '{{person.first_name}} {{person.first_name}} {{person.last_name}}', ]; diff --git a/src/locales/it/person/name.ts b/src/locales/it/person/name.ts index 482cbd41af9..2e536501d0a 100644 --- a/src/locales/it/person/name.ts +++ b/src/locales/it/person/name.ts @@ -1,6 +1,4 @@ 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}}', ]; diff --git a/src/locales/lv/person/name.ts b/src/locales/lv/person/name.ts index 55bf8bffe08..f66d471cd5a 100644 --- a/src/locales/lv/person/name.ts +++ b/src/locales/lv/person/name.ts @@ -1,13 +1,8 @@ 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}}', + '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + '{{person.first_name}} {{person.last_name}}', + '{{person.last_name}} {{person.first_name}}', + '{{person.first_name}} {{person.first_name}} {{person.last_name}}', + '{{person.first_name}} {{person.last_name}}-{{person.last_name}}', ]; diff --git a/src/locales/mk/person/name.ts b/src/locales/mk/person/name.ts index 9a2cbe859f1..2e536501d0a 100644 --- a/src/locales/mk/person/name.ts +++ b/src/locales/mk/person/name.ts @@ -1,6 +1,4 @@ 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}}', + '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + '{{person.first_name}} {{person.last_name}}', ]; diff --git a/src/locales/nb_NO/person/name.ts b/src/locales/nb_NO/person/name.ts index a0c4cc5e86b..0ad3ef53407 100644 --- a/src/locales/nb_NO/person/name.ts +++ b/src/locales/nb_NO/person/name.ts @@ -1,8 +1,7 @@ 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.first_name}} {{person.last_name}}', '{{person.first_name}} {{person.last_name}} {{person.last_name}}', '{{person.first_name}} {{person.last_name}}', ]; diff --git a/src/locales/pt_BR/person/name.ts b/src/locales/pt_BR/person/name.ts index 28a268c490f..8cee34fa23d 100644 --- a/src/locales/pt_BR/person/name.ts +++ b/src/locales/pt_BR/person/name.ts @@ -2,6 +2,4 @@ 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}}', ]; diff --git a/src/locales/pt_PT/person/name.ts b/src/locales/pt_PT/person/name.ts index 98c6b8dbf1c..917c292988e 100644 --- a/src/locales/pt_PT/person/name.ts +++ b/src/locales/pt_PT/person/name.ts @@ -1,7 +1,4 @@ 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}}', + '{{person.prefix}} {{person.first_name}} {{person.last_name}}', ]; diff --git a/src/locales/ro/person/name.ts b/src/locales/ro/person/name.ts index 761a6ec6243..18c690b2df6 100644 --- a/src/locales/ro/person/name.ts +++ b/src/locales/ro/person/name.ts @@ -1,10 +1,5 @@ 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}}', + '{{person.first_name}} {{person.last_name}}', + '{{person.last_name}} {{person.first_name}}', + '{{person.prefix}} {{person.first_name}} {{person.last_name}}', ]; diff --git a/src/locales/ru/person/name.ts b/src/locales/ru/person/name.ts index c5189e48054..1bbda737c53 100644 --- a/src/locales/ru/person/name.ts +++ b/src/locales/ru/person/name.ts @@ -1,10 +1,6 @@ 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}}', + '{{person.first_name}} {{person.last_name}}', + '{{person.last_name}} {{person.first_name}}', + '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', + '{{person.last_name}} {{person.first_name}} {{person.middle_name}}', ]; diff --git a/src/locales/sk/person/name.ts b/src/locales/sk/person/name.ts index e06caa3ac67..8cee34fa23d 100644 --- a/src/locales/sk/person/name.ts +++ b/src/locales/sk/person/name.ts @@ -1,8 +1,5 @@ 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}}', + '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + '{{person.first_name}} {{person.last_name}}', ]; diff --git a/src/locales/sv/person/name.ts b/src/locales/sv/person/name.ts index b8314da3020..0a1e0d7fd34 100644 --- a/src/locales/sv/person/name.ts +++ b/src/locales/sv/person/name.ts @@ -3,6 +3,4 @@ export default [ '{{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}}', ]; diff --git a/src/locales/tr/person/name.ts b/src/locales/tr/person/name.ts index 482cbd41af9..2e536501d0a 100644 --- a/src/locales/tr/person/name.ts +++ b/src/locales/tr/person/name.ts @@ -1,6 +1,4 @@ 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}}', ]; diff --git a/src/locales/uk/person/name.ts b/src/locales/uk/person/name.ts index c5189e48054..1bbda737c53 100644 --- a/src/locales/uk/person/name.ts +++ b/src/locales/uk/person/name.ts @@ -1,10 +1,6 @@ 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}}', + '{{person.first_name}} {{person.last_name}}', + '{{person.last_name}} {{person.first_name}}', + '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', + '{{person.last_name}} {{person.first_name}} {{person.middle_name}}', ]; diff --git a/src/locales/ur/person/name.ts b/src/locales/ur/person/name.ts index a946985a015..8cee34fa23d 100644 --- a/src/locales/ur/person/name.ts +++ b/src/locales/ur/person/name.ts @@ -2,8 +2,4 @@ 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}}', ]; diff --git a/src/locales/vi/person/name.ts b/src/locales/vi/person/name.ts index ac2a668eaef..6d951dfc8fc 100644 --- a/src/locales/vi/person/name.ts +++ b/src/locales/vi/person/name.ts @@ -1,5 +1 @@ -export default [ - '{{person.male_first_name}} {{person.last_name}}', - '{{person.female_first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', -]; +export default ['{{person.first_name}} {{person.last_name}}']; diff --git a/src/locales/zh_CN/person/name.ts b/src/locales/zh_CN/person/name.ts index 4052e58f31a..93522368361 100644 --- a/src/locales/zh_CN/person/name.ts +++ b/src/locales/zh_CN/person/name.ts @@ -1 +1 @@ -export default ['{{person.first_name}}{{person.last_name}}']; +export default ['{{person.last_name}}{{person.first_name}}']; diff --git a/src/locales/zh_TW/person/name.ts b/src/locales/zh_TW/person/name.ts index 4052e58f31a..93522368361 100644 --- a/src/locales/zh_TW/person/name.ts +++ b/src/locales/zh_TW/person/name.ts @@ -1 +1 @@ -export default ['{{person.first_name}}{{person.last_name}}']; +export default ['{{person.last_name}}{{person.first_name}}']; diff --git a/src/modules/person/index.ts b/src/modules/person/index.ts index af954d546f9..0efbffc595d 100644 --- a/src/modules/person/index.ts +++ b/src/modules/person/index.ts @@ -165,33 +165,22 @@ export class PersonModule { sex?: SexType; } = {} ): string { - const { - sex = this.faker.helpers.arrayElement([Sex.Female, Sex.Male]), - firstName = this.firstName(sex), - lastName = this.lastName(sex), - } = options; + const sex = + options.sex || this.faker.helpers.arrayElement([Sex.Female, Sex.Male]); - 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.arrayElement( + this.faker.definitions.person.name + ); - const suffix = this.faker.helpers.maybe(() => this.suffix(), { - probability: 0.125, + const fullName = this.faker.helpers.mustache(fullNamePattern, { + 'person.gender': () => this.gender(), + 'person.prefix': () => this.prefix(sex), + 'person.first_name': () => options.firstName || this.firstName(sex), + 'person.middle_name': () => this.middleName(sex), + 'person.last_name': () => options.lastName || this.lastName(sex), + 'person.suffix': () => this.suffix(), }); - - if (suffix) { - nameParts.push(suffix); - } - - return nameParts.join(' '); + return fullName; } /** diff --git a/test/__snapshots__/git.spec.ts.snap b/test/__snapshots__/git.spec.ts.snap index 51a0c632fae..bdad5290c8a 100644 --- a/test/__snapshots__/git.spec.ts.snap +++ b/test/__snapshots__/git.spec.ts.snap @@ -51,28 +51,28 @@ exports[`git > 1211 > commitDate > with only string refDate 1`] = `"Tue Dec 31 0 exports[`git > 1211 > commitEntry > with only Date refDate 1`] = ` "commit adb42f0e3f4a973fab0aeefce96dfcf49cd438df -Author: Imani Runolfsson -Date: Tue Dec 31 10:07:32 2019 -0400 +Author: Imani Runolfsson +Date: Tue Dec 31 20:11:06 2019 -0600 -    override wireless interface +    quantify virtual microchip " `; exports[`git > 1211 > commitEntry > with only number refDate 1`] = ` "commit adb42f0e3f4a973fab0aeefce96dfcf49cd438df -Author: Imani Runolfsson -Date: Tue Dec 31 10:07:32 2019 -0400 +Author: Imani Runolfsson +Date: Tue Dec 31 20:11:06 2019 -0600 -    override wireless interface +    quantify virtual microchip " `; exports[`git > 1211 > commitEntry > with only string refDate 1`] = ` "commit adb42f0e3f4a973fab0aeefce96dfcf49cd438df -Author: Imani Runolfsson -Date: Tue Dec 31 10:07:32 2019 -0400 +Author: Imani Runolfsson +Date: Tue Dec 31 20:11:06 2019 -0600 -    override wireless interface +    quantify virtual microchip " `; @@ -92,28 +92,28 @@ exports[`git > 1337 > commitDate > with only string refDate 1`] = `"Tue Dec 31 1 exports[`git > 1337 > commitEntry > with only Date refDate 1`] = ` "commit c346ba075bd57f5a62b82d72af39cbbb07a98cba -Author: Friedrich Dibbert -Date: Tue Dec 31 04:18:56 2019 -0700 +Author: Friedrich Dibbert +Date: Tue Dec 31 14:05:04 2019 +0800 -    reboot haptic capacitor +    override solid state firewall " `; exports[`git > 1337 > commitEntry > with only number refDate 1`] = ` "commit c346ba075bd57f5a62b82d72af39cbbb07a98cba -Author: Friedrich Dibbert -Date: Tue Dec 31 04:18:56 2019 -0700 +Author: Friedrich Dibbert +Date: Tue Dec 31 14:05:04 2019 +0800 -    reboot haptic capacitor +    override solid state firewall " `; exports[`git > 1337 > commitEntry > with only string refDate 1`] = ` "commit c346ba075bd57f5a62b82d72af39cbbb07a98cba -Author: Friedrich Dibbert -Date: Tue Dec 31 04:18:56 2019 -0700 +Author: Friedrich Dibbert +Date: Tue Dec 31 14:05:04 2019 +0800 -    reboot haptic capacitor +    override solid state firewall " `; diff --git a/test/__snapshots__/internet.spec.ts.snap b/test/__snapshots__/internet.spec.ts.snap index 5b33c9e23be..16ea39d4241 100644 --- a/test/__snapshots__/internet.spec.ts.snap +++ b/test/__snapshots__/internet.spec.ts.snap @@ -22,8 +22,6 @@ exports[`internet > 42 > displayName > with Latin names 1`] = `"Jane_Doe"`; exports[`internet > 42 > displayName > with accented names 1`] = `"Hélene_Müller"`; -exports[`internet > 42 > displayName > with names 1`] = `"Jane_Doe"`; - exports[`internet > 42 > domainName 1`] = `"hasty-shin.org"`; exports[`internet > 42 > domainSuffix 1`] = `"info"`; @@ -94,8 +92,6 @@ exports[`internet > 42 > userName > with Latin names 1`] = `"Jane_Doe"`; exports[`internet > 42 > userName > with accented names 1`] = `"Helene_Muller"`; -exports[`internet > 42 > userName > with names 1`] = `"Jane_Doe"`; - exports[`internet > 1211 > avatar 1`] = `"https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/1160.jpg"`; exports[`internet > 1211 > color > noArgs 1`] = `"#773a72"`; @@ -118,8 +114,6 @@ exports[`internet > 1211 > displayName > with Latin names 1`] = `"Jane.Doe89"`; exports[`internet > 1211 > displayName > with accented names 1`] = `"Hélene.Müller89"`; -exports[`internet > 1211 > displayName > with names 1`] = `"Jane.Doe89"`; - exports[`internet > 1211 > domainName 1`] = `"vibrant-infix.org"`; exports[`internet > 1211 > domainSuffix 1`] = `"org"`; @@ -190,8 +184,6 @@ exports[`internet > 1211 > userName > with Latin names 1`] = `"Jane.Doe89"`; exports[`internet > 1211 > userName > with accented names 1`] = `"Helene.Muller89"`; -exports[`internet > 1211 > userName > with names 1`] = `"Jane.Doe89"`; - exports[`internet > 1337 > avatar 1`] = `"https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/327.jpg"`; exports[`internet > 1337 > color > noArgs 1`] = `"#214814"`; @@ -214,8 +206,6 @@ exports[`internet > 1337 > displayName > with Latin names 1`] = `"Jane56"`; exports[`internet > 1337 > displayName > with accented names 1`] = `"Hélene56"`; -exports[`internet > 1337 > displayName > with names 1`] = `"Jane56"`; - exports[`internet > 1337 > domainName 1`] = `"fair-migration.com"`; exports[`internet > 1337 > domainSuffix 1`] = `"biz"`; @@ -285,5 +275,3 @@ exports[`internet > 1337 > userName > with Cyrillic names 1`] = `"Fedor56"`; exports[`internet > 1337 > userName > with Latin names 1`] = `"Jane56"`; exports[`internet > 1337 > userName > with accented names 1`] = `"Helene56"`; - -exports[`internet > 1337 > userName > with names 1`] = `"Jane56"`; diff --git a/test/__snapshots__/person.spec.ts.snap b/test/__snapshots__/person.spec.ts.snap index a74ca00a33b..c1f8ea8c8e4 100644 --- a/test/__snapshots__/person.spec.ts.snap +++ b/test/__snapshots__/person.spec.ts.snap @@ -4,15 +4,15 @@ exports[`person > 42 > firstName > noArgs 1`] = `"Garnet"`; exports[`person > 42 > firstName > with sex 1`] = `"Glen"`; -exports[`person > 42 > fullName > noArgs 1`] = `"Sadie Wiegand"`; +exports[`person > 42 > fullName > noArgs 1`] = `"Dr. Tina Reynolds"`; exports[`person > 42 > fullName > with all (sex) 1`] = `"John Doe"`; -exports[`person > 42 > fullName > with firstName 1`] = `"John Schinner"`; +exports[`person > 42 > fullName > with firstName 1`] = `"Dr. John Deckow"`; -exports[`person > 42 > fullName > with lastName 1`] = `"Sadie Doe"`; +exports[`person > 42 > fullName > with lastName 1`] = `"Dr. Tina Doe"`; -exports[`person > 42 > fullName > with sex 1`] = `"Melanie Schinner"`; +exports[`person > 42 > fullName > with sex 1`] = `"Sadie Wiegand"`; exports[`person > 42 > gender 1`] = `"Gender nonconforming"`; @@ -52,15 +52,15 @@ exports[`person > 1211 > firstName > noArgs 1`] = `"Tito"`; exports[`person > 1211 > firstName > with sex 1`] = `"Percy"`; -exports[`person > 1211 > fullName > noArgs 1`] = `"Claude Trantow"`; +exports[`person > 1211 > fullName > noArgs 1`] = `"Darrel Satterfield"`; -exports[`person > 1211 > fullName > with all (sex) 1`] = `"John Doe"`; +exports[`person > 1211 > fullName > with all (sex) 1`] = `"Ms. John Doe PhD"`; -exports[`person > 1211 > fullName > with firstName 1`] = `"John Koelpin"`; +exports[`person > 1211 > fullName > with firstName 1`] = `"John Trantow"`; -exports[`person > 1211 > fullName > with lastName 1`] = `"Claude Doe"`; +exports[`person > 1211 > fullName > with lastName 1`] = `"Darrel Doe"`; -exports[`person > 1211 > fullName > with sex 1`] = `"Patti Koelpin"`; +exports[`person > 1211 > fullName > with sex 1`] = `"Ms. Henrietta Satterfield I"`; exports[`person > 1211 > gender 1`] = `"Trigender"`; @@ -100,15 +100,15 @@ exports[`person > 1337 > firstName > noArgs 1`] = `"Devyn"`; exports[`person > 1337 > firstName > with sex 1`] = `"Ray"`; -exports[`person > 1337 > fullName > noArgs 1`] = `"Leona Cronin"`; +exports[`person > 1337 > fullName > noArgs 1`] = `"Marilyn Effertz"`; exports[`person > 1337 > fullName > with all (sex) 1`] = `"John Doe"`; -exports[`person > 1337 > fullName > with firstName 1`] = `"John MacGyver"`; +exports[`person > 1337 > fullName > with firstName 1`] = `"John Cronin"`; -exports[`person > 1337 > fullName > with lastName 1`] = `"Leona Doe"`; +exports[`person > 1337 > fullName > with lastName 1`] = `"Marilyn Doe"`; -exports[`person > 1337 > fullName > with sex 1`] = `"Esther MacGyver"`; +exports[`person > 1337 > fullName > with sex 1`] = `"Leona Cronin"`; exports[`person > 1337 > gender 1`] = `"Demigender"`; From 394617870429d47a2f6f00c472c4313fc537fa13 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Tue, 6 Dec 2022 22:31:34 +0700 Subject: [PATCH 02/18] fix(person): temp disable tests, add gendered prefixes in en --- src/locales/en/person/female_prefix.ts | 1 + src/locales/en/person/index.ts | 4 ++++ src/locales/en/person/male_prefix.ts | 1 + test/locales.spec.ts | 7 ++++--- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 src/locales/en/person/female_prefix.ts create mode 100644 src/locales/en/person/male_prefix.ts diff --git a/src/locales/en/person/female_prefix.ts b/src/locales/en/person/female_prefix.ts new file mode 100644 index 00000000000..43fce37a544 --- /dev/null +++ b/src/locales/en/person/female_prefix.ts @@ -0,0 +1 @@ +export default ['Mrs.', 'Ms.', 'Miss', 'Dr.']; diff --git a/src/locales/en/person/index.ts b/src/locales/en/person/index.ts index 68824ff3869..f91a5081e4e 100644 --- a/src/locales/en/person/index.ts +++ b/src/locales/en/person/index.ts @@ -5,11 +5,13 @@ import type { PersonDefinitions } from '../../..'; import female_first_name from './female_first_name'; import female_middle_name from './female_middle_name'; +import female_prefix from './female_prefix'; import first_name from './first_name'; import gender from './gender'; import last_name from './last_name'; import male_first_name from './male_first_name'; import male_middle_name from './male_middle_name'; +import male_prefix from './male_prefix'; import middle_name from './middle_name'; import name_ from './name'; import prefix from './prefix'; @@ -21,11 +23,13 @@ import western_zodiac_sign from './western_zodiac_sign'; const person: PersonDefinitions = { female_first_name, female_middle_name, + female_prefix, first_name, gender, last_name, male_first_name, male_middle_name, + male_prefix, middle_name, name: name_, prefix, diff --git a/src/locales/en/person/male_prefix.ts b/src/locales/en/person/male_prefix.ts new file mode 100644 index 00000000000..795e64fdd11 --- /dev/null +++ b/src/locales/en/person/male_prefix.ts @@ -0,0 +1 @@ +export default ['Mr.', 'Dr.']; diff --git a/test/locales.spec.ts b/test/locales.spec.ts index 4249f94ded1..68a093db7ad 100644 --- a/test/locales.spec.ts +++ b/test/locales.spec.ts @@ -17,9 +17,10 @@ describe('locale', () => { function checkLocaleData(data: unknown) { if (Array.isArray(data)) { - it('should not have duplicate entries', () => { - expect(data).not.toContainDuplicates(); - }); + // FIXME: temporarily disable this test + // it('should not have duplicate entries', () => { + // expect(data).not.toContainDuplicates(); + // }); } else if (typeof data === 'object' && data != null) { for (const [nestedKey, nestedData] of Object.entries(data)) { describe(nestedKey, () => { From 5c548964786e21f9cb93014df9c09e659150b201 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Wed, 7 Dec 2022 14:31:46 +0700 Subject: [PATCH 03/18] fix(person): fix snapshot tests --- test/__snapshots__/person.spec.ts.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/__snapshots__/person.spec.ts.snap b/test/__snapshots__/person.spec.ts.snap index c1f8ea8c8e4..d6c637b9c81 100644 --- a/test/__snapshots__/person.spec.ts.snap +++ b/test/__snapshots__/person.spec.ts.snap @@ -34,7 +34,7 @@ exports[`person > 42 > middleName > with sex 1`] = `"Houston"`; exports[`person > 42 > prefix > noArgs 1`] = `"Mrs."`; -exports[`person > 42 > prefix > with sex 1`] = `"Mrs."`; +exports[`person > 42 > prefix > with sex 1`] = `"Mr."`; exports[`person > 42 > sex > noArgs 1`] = `"female"`; @@ -130,7 +130,7 @@ exports[`person > 1337 > middleName > with sex 1`] = `"Ethan"`; exports[`person > 1337 > prefix > noArgs 1`] = `"Mrs."`; -exports[`person > 1337 > prefix > with sex 1`] = `"Mrs."`; +exports[`person > 1337 > prefix > with sex 1`] = `"Mr."`; exports[`person > 1337 > sex > noArgs 1`] = `"female"`; From 6283b588293200453caa9238acda7d7c94ca50a4 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Wed, 7 Dec 2022 14:31:46 +0700 Subject: [PATCH 04/18] fix(person): bring back test --- test/locales.spec.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/locales.spec.ts b/test/locales.spec.ts index 68a093db7ad..4249f94ded1 100644 --- a/test/locales.spec.ts +++ b/test/locales.spec.ts @@ -17,10 +17,9 @@ describe('locale', () => { function checkLocaleData(data: unknown) { if (Array.isArray(data)) { - // FIXME: temporarily disable this test - // it('should not have duplicate entries', () => { - // expect(data).not.toContainDuplicates(); - // }); + it('should not have duplicate entries', () => { + expect(data).not.toContainDuplicates(); + }); } else if (typeof data === 'object' && data != null) { for (const [nestedKey, nestedData] of Object.entries(data)) { describe(nestedKey, () => { From c285157df52aec3d032d1f923cfc11a0fd0c115d Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Wed, 7 Dec 2022 18:22:52 +0700 Subject: [PATCH 05/18] fix(person): add weightedArrayElement helper --- src/definitions/person.ts | 4 +-- src/locales/ar/person/name.ts | 8 ++--- src/locales/az/person/name.ts | 8 ++--- src/locales/cz/person/name.ts | 8 ++--- src/locales/de/person/name.ts | 6 ++-- src/locales/de_AT/person/index.ts | 4 +-- src/locales/de_AT/person/middle_name.ts | 2 ++ src/locales/de_AT/person/name.ts | 8 ++--- .../de_AT/person/nobility_title_prefix.ts | 1 - src/locales/de_CH/person/name.ts | 5 ++- src/locales/dv/person/name.ts | 5 ++- src/locales/el/person/name.ts | 8 ++--- src/locales/en/person/name.ts | 13 +++++--- src/locales/en_GH/person/name.ts | 6 ++-- src/locales/en_NG/person/name.ts | 6 ++-- src/locales/en_ZA/person/name.ts | 6 ++-- src/locales/es/person/name.ts | 9 +++-- src/locales/es_MX/person/name.ts | 16 ++++++--- src/locales/fa/person/name.ts | 6 ++-- src/locales/fi/person/name.ts | 5 ++- src/locales/fr/person/name.ts | 7 ++-- src/locales/fr_BE/person/name.ts | 8 ++--- src/locales/fr_CH/person/name.ts | 7 ++-- src/locales/ge/person/name.ts | 6 ++-- src/locales/he/person/name.ts | 6 ++-- src/locales/hr/person/name.ts | 8 ++--- src/locales/hu/person/name.ts | 6 ++-- src/locales/hy/person/name.ts | 8 ++--- src/locales/id_ID/person/name.ts | 8 ++--- src/locales/it/person/name.ts | 6 ++-- src/locales/ja/person/name.ts | 5 ++- src/locales/ko/person/name.ts | 5 ++- src/locales/lv/person/name.ts | 14 ++++---- src/locales/mk/person/name.ts | 6 ++-- src/locales/nb_NO/person/name.ts | 12 +++---- .../{tussenvoegsel.ts => middle_name.ts} | 1 + src/locales/nl/person/name.ts | 10 +++--- src/locales/nl_BE/person/name.ts | 8 ++--- src/locales/pl/person/name.ts | 6 ++-- src/locales/pt_BR/person/name.ts | 8 ++--- src/locales/pt_PT/person/name.ts | 6 ++-- src/locales/ro/person/name.ts | 8 ++--- src/locales/ru/person/name.ts | 10 +++--- src/locales/sk/person/name.ts | 8 ++--- src/locales/sv/person/name.ts | 10 +++--- src/locales/tr/person/name.ts | 6 ++-- src/locales/uk/person/name.ts | 10 +++--- src/locales/ur/person/name.ts | 8 ++--- src/locales/vi/person/name.ts | 5 ++- src/locales/zh_CN/person/name.ts | 4 ++- src/locales/zh_TW/person/name.ts | 5 ++- src/modules/helpers/index.ts | 33 +++++++++++++++++++ src/modules/person/index.ts | 2 +- test/__snapshots__/helpers.spec.ts.snap | 6 ++++ test/helpers.spec.ts | 33 +++++++++++++++++++ 55 files changed, 270 insertions(+), 163 deletions(-) create mode 100644 src/locales/de_AT/person/middle_name.ts delete mode 100644 src/locales/de_AT/person/nobility_title_prefix.ts rename src/locales/nl/person/{tussenvoegsel.ts => middle_name.ts} (57%) diff --git a/src/definitions/person.ts b/src/definitions/person.ts index 488ff4fe433..1e1c73f378f 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: [string, number][]; title: PersonTitleDefinitions; diff --git a/src/locales/ar/person/name.ts b/src/locales/ar/person/name.ts index 81f3b1e489a..74231e6a225 100644 --- a/src/locales/ar/person/name.ts +++ b/src/locales/ar/person/name.ts @@ -1,5 +1,5 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 5], + ['{{person.last_name}} {{person.first_name}}', 5], +] as [string, number][]; diff --git a/src/locales/az/person/name.ts b/src/locales/az/person/name.ts index 8867b29104a..7c2d5650c0d 100644 --- a/src/locales/az/person/name.ts +++ b/src/locales/az/person/name.ts @@ -1,5 +1,5 @@ export default [ - '{{person.first_name}}', - '{{person.last_name}} {{person.first_name}}', - '{{person.first_name}} {{person.last_name}}', -]; + ['{{person.first_name}}', 1], + ['{{person.last_name}} {{person.first_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 1], +] as [string, number][]; diff --git a/src/locales/cz/person/name.ts b/src/locales/cz/person/name.ts index 8cee34fa23d..3db743b6439 100644 --- a/src/locales/cz/person/name.ts +++ b/src/locales/cz/person/name.ts @@ -1,5 +1,5 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/de/person/name.ts b/src/locales/de/person/name.ts index 2e536501d0a..b095a5b342e 100644 --- a/src/locales/de/person/name.ts +++ b/src/locales/de/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 9], +] as [string, number][]; diff --git a/src/locales/de_AT/person/index.ts b/src/locales/de_AT/person/index.ts index 559f8e7755c..eeb24e415c7 100644 --- a/src/locales/de_AT/person/index.ts +++ b/src/locales/de_AT/person/index.ts @@ -5,15 +5,15 @@ import type { PersonDefinitions } from '../../..'; import first_name from './first_name'; import last_name from './last_name'; +import middle_name from './middle_name'; import name_ from './name'; -import nobility_title_prefix from './nobility_title_prefix'; import prefix from './prefix'; const person: PersonDefinitions = { first_name, last_name, + middle_name, name: name_, - nobility_title_prefix, prefix, }; diff --git a/src/locales/de_AT/person/middle_name.ts b/src/locales/de_AT/person/middle_name.ts new file mode 100644 index 00000000000..ac226a8cf32 --- /dev/null +++ b/src/locales/de_AT/person/middle_name.ts @@ -0,0 +1,2 @@ +// This is a nobility title prefix, but for simplicity it acts like a middle name +export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/de_AT/person/name.ts b/src/locales/de_AT/person/name.ts index 011fae52816..e35531aa2a0 100644 --- a/src/locales/de_AT/person/name.ts +++ b/src/locales/de_AT/person/name.ts @@ -1,5 +1,5 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.middle_name}} {{person.last_name}}', 2], + ['{{person.first_name}} {{person.last_name}}', 5], +] as [string, number][]; diff --git a/src/locales/de_AT/person/nobility_title_prefix.ts b/src/locales/de_AT/person/nobility_title_prefix.ts deleted file mode 100644 index ba3a30d7d97..00000000000 --- a/src/locales/de_AT/person/nobility_title_prefix.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/de_CH/person/name.ts b/src/locales/de_CH/person/name.ts index 6d951dfc8fc..0267ccd9abc 100644 --- a/src/locales/de_CH/person/name.ts +++ b/src/locales/de_CH/person/name.ts @@ -1 +1,4 @@ -export default ['{{person.first_name}} {{person.last_name}}']; +export default [['{{person.first_name}} {{person.last_name}}', 1]] as [ + string, + number +][]; diff --git a/src/locales/dv/person/name.ts b/src/locales/dv/person/name.ts index 6d951dfc8fc..0267ccd9abc 100644 --- a/src/locales/dv/person/name.ts +++ b/src/locales/dv/person/name.ts @@ -1 +1,4 @@ -export default ['{{person.first_name}} {{person.last_name}}']; +export default [['{{person.first_name}} {{person.last_name}}', 1]] as [ + string, + number +][]; diff --git a/src/locales/el/person/name.ts b/src/locales/el/person/name.ts index 8cee34fa23d..3db743b6439 100644 --- a/src/locales/el/person/name.ts +++ b/src/locales/el/person/name.ts @@ -1,5 +1,5 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/en/person/name.ts b/src/locales/en/person/name.ts index cc67668b85f..03e348a2b71 100644 --- a/src/locales/en/person/name.ts +++ b/src/locales/en/person/name.ts @@ -1,6 +1,9 @@ export default [ - ...Array(7).fill('{{person.first_name}} {{person.last_name}}'), //70% of the time we want a first and last name - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', //10% of the time add a prefix - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', //10% of the time add a suffix - '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.suffix}}', //10% of the time add both -]; + ['{{person.first_name}} {{person.last_name}}', 7], + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + [ + '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.suffix}}', + 1, + ], +] as [string, number][]; diff --git a/src/locales/en_GH/person/name.ts b/src/locales/en_GH/person/name.ts index 79e50e83a2b..d76441c4a14 100644 --- a/src/locales/en_GH/person/name.ts +++ b/src/locales/en_GH/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}-{{person.last_name}}', -]; + ['{{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}-{{person.last_name}}', 1], +] as [string, number][]; diff --git a/src/locales/en_NG/person/name.ts b/src/locales/en_NG/person/name.ts index ed50851497d..c5ad44b7c03 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}}', -]; + ['{{person.first_name}} {{person.last_name}}', 1], + ['{{person.last_name}} {{person.first_name}}', 1], +] as [string, number][]; diff --git a/src/locales/en_ZA/person/name.ts b/src/locales/en_ZA/person/name.ts index ed50851497d..c5ad44b7c03 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}}', -]; + ['{{person.first_name}} {{person.last_name}}', 1], + ['{{person.last_name}} {{person.first_name}}', 1], +] as [string, number][]; diff --git a/src/locales/es/person/name.ts b/src/locales/es/person/name.ts index 45752dd65aa..509cbf87452 100644 --- a/src/locales/es/person/name.ts +++ b/src/locales/es/person/name.ts @@ -1,4 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.last_name}}', -]; + [ + '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + 1, + ], + ['{{person.first_name}} {{person.last_name}} {{person.last_name}}', 9], +] as [string, number][]; diff --git a/src/locales/es_MX/person/name.ts b/src/locales/es_MX/person/name.ts index e6032d2d8f1..b3e2f45db99 100644 --- a/src/locales/es_MX/person/name.ts +++ b/src/locales/es_MX/person/name.ts @@ -1,6 +1,12 @@ 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}}', -]; + [ + '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + 1, + ], + ['{{person.first_name}} {{person.last_name}} de {{person.last_name}}', 3], + [ + '{{person.suffix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + 1, + ], + ['{{person.first_name}} {{person.last_name}} {{person.last_name}}', 5], +] as [string, number][]; diff --git a/src/locales/fa/person/name.ts b/src/locales/fa/person/name.ts index 2e536501d0a..b095a5b342e 100644 --- a/src/locales/fa/person/name.ts +++ b/src/locales/fa/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 9], +] as [string, number][]; diff --git a/src/locales/fi/person/name.ts b/src/locales/fi/person/name.ts index 6d951dfc8fc..0267ccd9abc 100644 --- a/src/locales/fi/person/name.ts +++ b/src/locales/fi/person/name.ts @@ -1 +1,4 @@ -export default ['{{person.first_name}} {{person.last_name}}']; +export default [['{{person.first_name}} {{person.last_name}}', 1]] as [ + string, + number +][]; diff --git a/src/locales/fr/person/name.ts b/src/locales/fr/person/name.ts index 81f3b1e489a..59c85e861d0 100644 --- a/src/locales/fr/person/name.ts +++ b/src/locales/fr/person/name.ts @@ -1,5 +1,4 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 2], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/fr_BE/person/name.ts b/src/locales/fr_BE/person/name.ts index 8cee34fa23d..3db743b6439 100644 --- a/src/locales/fr_BE/person/name.ts +++ b/src/locales/fr_BE/person/name.ts @@ -1,5 +1,5 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/fr_CH/person/name.ts b/src/locales/fr_CH/person/name.ts index 81f3b1e489a..59c85e861d0 100644 --- a/src/locales/fr_CH/person/name.ts +++ b/src/locales/fr_CH/person/name.ts @@ -1,5 +1,4 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 2], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/ge/person/name.ts b/src/locales/ge/person/name.ts index 2e536501d0a..b095a5b342e 100644 --- a/src/locales/ge/person/name.ts +++ b/src/locales/ge/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 9], +] as [string, number][]; diff --git a/src/locales/he/person/name.ts b/src/locales/he/person/name.ts index 2e536501d0a..b095a5b342e 100644 --- a/src/locales/he/person/name.ts +++ b/src/locales/he/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 9], +] as [string, number][]; diff --git a/src/locales/hr/person/name.ts b/src/locales/hr/person/name.ts index d816b0f9972..ff5bfe04f51 100644 --- a/src/locales/hr/person/name.ts +++ b/src/locales/hr/person/name.ts @@ -1,5 +1,5 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}, {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/hu/person/name.ts b/src/locales/hu/person/name.ts index 0a6c8d5255d..d1fb55b4025 100644 --- a/src/locales/hu/person/name.ts +++ b/src/locales/hu/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.prefix}} {{person.last_name}} {{person.first_name}}', - '{{person.last_name}} {{person.first_name}}', -]; + ['{{person.prefix}} {{person.last_name}} {{person.first_name}}', 1], + ['{{person.last_name}} {{person.first_name}}', 9], +] as [string, number][]; diff --git a/src/locales/hy/person/name.ts b/src/locales/hy/person/name.ts index 8cee34fa23d..3db743b6439 100644 --- a/src/locales/hy/person/name.ts +++ b/src/locales/hy/person/name.ts @@ -1,5 +1,5 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/id_ID/person/name.ts b/src/locales/id_ID/person/name.ts index 2181b8b0d45..5fb2d93f0c3 100644 --- a/src/locales/id_ID/person/name.ts +++ b/src/locales/id_ID/person/name.ts @@ -1,5 +1,5 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', - '{{person.first_name}} {{person.first_name}} {{person.last_name}}', -]; + ['{{person.first_name}} {{person.last_name}}', 1], + ['{{person.last_name}} {{person.first_name}}', 1], + ['{{person.first_name}} {{person.first_name}} {{person.last_name}}', 1], +] as [string, number][]; diff --git a/src/locales/it/person/name.ts b/src/locales/it/person/name.ts index 2e536501d0a..b095a5b342e 100644 --- a/src/locales/it/person/name.ts +++ b/src/locales/it/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 9], +] as [string, number][]; diff --git a/src/locales/ja/person/name.ts b/src/locales/ja/person/name.ts index 3558edaf2c6..104ede1315e 100644 --- a/src/locales/ja/person/name.ts +++ b/src/locales/ja/person/name.ts @@ -1 +1,4 @@ -export default ['{{person.last_name}} {{person.first_name}}']; +export default [['{{person.last_name}} {{person.first_name}}', 1]] as [ + string, + number +][]; diff --git a/src/locales/ko/person/name.ts b/src/locales/ko/person/name.ts index 3558edaf2c6..104ede1315e 100644 --- a/src/locales/ko/person/name.ts +++ b/src/locales/ko/person/name.ts @@ -1 +1,4 @@ -export default ['{{person.last_name}} {{person.first_name}}']; +export default [['{{person.last_name}} {{person.first_name}}', 1]] as [ + string, + number +][]; diff --git a/src/locales/lv/person/name.ts b/src/locales/lv/person/name.ts index f66d471cd5a..c8d0ab0d030 100644 --- a/src/locales/lv/person/name.ts +++ b/src/locales/lv/person/name.ts @@ -1,8 +1,8 @@ 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.last_name}} {{person.first_name}}', - '{{person.first_name}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}-{{person.last_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 7], + ['{{person.last_name}} {{person.first_name}}', 2], + ['{{person.first_name}} {{person.first_name}} {{person.last_name}}', 2], + ['{{person.first_name}} {{person.last_name}}-{{person.last_name}}', 2], +] as [string, number][]; diff --git a/src/locales/mk/person/name.ts b/src/locales/mk/person/name.ts index 2e536501d0a..3ab117452a3 100644 --- a/src/locales/mk/person/name.ts +++ b/src/locales/mk/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/nb_NO/person/name.ts b/src/locales/nb_NO/person/name.ts index 0ad3ef53407..639d1467886 100644 --- a/src/locales/nb_NO/person/name.ts +++ b/src/locales/nb_NO/person/name.ts @@ -1,7 +1,7 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.suffix}}', - '{{person.first_name}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/nl/person/tussenvoegsel.ts b/src/locales/nl/person/middle_name.ts similarity index 57% rename from src/locales/nl/person/tussenvoegsel.ts rename to src/locales/nl/person/middle_name.ts index cd7f275bf51..4a985e28e87 100644 --- a/src/locales/nl/person/tussenvoegsel.ts +++ b/src/locales/nl/person/middle_name.ts @@ -1 +1,2 @@ +// This is a tussenvoegsel, but it acts like a middle name export default ['van', 'van de', 'van den', "van 't", 'van het', 'de', 'den']; diff --git a/src/locales/nl/person/name.ts b/src/locales/nl/person/name.ts index ab5165b6041..e67cfa1e7d5 100644 --- a/src/locales/nl/person/name.ts +++ b/src/locales/nl/person/name.ts @@ -1,6 +1,6 @@ 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}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], + ['{{person.first_name}} {{person.middle_name}} {{person.last_name}}', 1], +] as [string, number][]; diff --git a/src/locales/nl_BE/person/name.ts b/src/locales/nl_BE/person/name.ts index 8cee34fa23d..3db743b6439 100644 --- a/src/locales/nl_BE/person/name.ts +++ b/src/locales/nl_BE/person/name.ts @@ -1,5 +1,5 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/pl/person/name.ts b/src/locales/pl/person/name.ts index 2e536501d0a..b095a5b342e 100644 --- a/src/locales/pl/person/name.ts +++ b/src/locales/pl/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 9], +] as [string, number][]; diff --git a/src/locales/pt_BR/person/name.ts b/src/locales/pt_BR/person/name.ts index 8cee34fa23d..3db743b6439 100644 --- a/src/locales/pt_BR/person/name.ts +++ b/src/locales/pt_BR/person/name.ts @@ -1,5 +1,5 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/pt_PT/person/name.ts b/src/locales/pt_PT/person/name.ts index 917c292988e..aa8459e3332 100644 --- a/src/locales/pt_PT/person/name.ts +++ b/src/locales/pt_PT/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', -]; + ['{{person.first_name}} {{person.last_name}}', 9], + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], +] as [string, number][]; diff --git a/src/locales/ro/person/name.ts b/src/locales/ro/person/name.ts index 18c690b2df6..e6005f6211b 100644 --- a/src/locales/ro/person/name.ts +++ b/src/locales/ro/person/name.ts @@ -1,5 +1,5 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', -]; + ['{{person.first_name}} {{person.last_name}}', 8], + ['{{person.last_name}} {{person.first_name}}', 1], + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], +] as [string, number][]; diff --git a/src/locales/ru/person/name.ts b/src/locales/ru/person/name.ts index 1bbda737c53..86a75382f4b 100644 --- a/src/locales/ru/person/name.ts +++ b/src/locales/ru/person/name.ts @@ -1,6 +1,6 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', - '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}} {{person.middle_name}}', -]; + ['{{person.first_name}} {{person.last_name}}', 1], + ['{{person.last_name}} {{person.first_name}}', 1], + ['{{person.first_name}} {{person.middle_name}} {{person.last_name}}', 1], + ['{{person.last_name}} {{person.first_name}} {{person.middle_name}}', 1], +] as [string, number][]; diff --git a/src/locales/sk/person/name.ts b/src/locales/sk/person/name.ts index 8cee34fa23d..3db743b6439 100644 --- a/src/locales/sk/person/name.ts +++ b/src/locales/sk/person/name.ts @@ -1,5 +1,5 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/sv/person/name.ts b/src/locales/sv/person/name.ts index 0a1e0d7fd34..0c8f606283d 100644 --- a/src/locales/sv/person/name.ts +++ b/src/locales/sv/person/name.ts @@ -1,6 +1,6 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], + ['{{person.first_name}} {{person.last_name}} {{person.last_name}}', 1], +] as [string, number][]; diff --git a/src/locales/tr/person/name.ts b/src/locales/tr/person/name.ts index 2e536501d0a..3ab117452a3 100644 --- a/src/locales/tr/person/name.ts +++ b/src/locales/tr/person/name.ts @@ -1,4 +1,4 @@ export default [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}}', - '{{person.first_name}} {{person.last_name}}', -]; + ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/uk/person/name.ts b/src/locales/uk/person/name.ts index 1bbda737c53..86a75382f4b 100644 --- a/src/locales/uk/person/name.ts +++ b/src/locales/uk/person/name.ts @@ -1,6 +1,6 @@ export default [ - '{{person.first_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}}', - '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', - '{{person.last_name}} {{person.first_name}} {{person.middle_name}}', -]; + ['{{person.first_name}} {{person.last_name}}', 1], + ['{{person.last_name}} {{person.first_name}}', 1], + ['{{person.first_name}} {{person.middle_name}} {{person.last_name}}', 1], + ['{{person.last_name}} {{person.first_name}} {{person.middle_name}}', 1], +] as [string, number][]; diff --git a/src/locales/ur/person/name.ts b/src/locales/ur/person/name.ts index 8cee34fa23d..3db743b6439 100644 --- a/src/locales/ur/person/name.ts +++ b/src/locales/ur/person/name.ts @@ -1,5 +1,5 @@ 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.prefix}} {{person.first_name}} {{person.last_name}}', 1], + ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], + ['{{person.first_name}} {{person.last_name}}', 8], +] as [string, number][]; diff --git a/src/locales/vi/person/name.ts b/src/locales/vi/person/name.ts index 6d951dfc8fc..0267ccd9abc 100644 --- a/src/locales/vi/person/name.ts +++ b/src/locales/vi/person/name.ts @@ -1 +1,4 @@ -export default ['{{person.first_name}} {{person.last_name}}']; +export default [['{{person.first_name}} {{person.last_name}}', 1]] as [ + string, + number +][]; diff --git a/src/locales/zh_CN/person/name.ts b/src/locales/zh_CN/person/name.ts index 93522368361..f6337cb8d36 100644 --- a/src/locales/zh_CN/person/name.ts +++ b/src/locales/zh_CN/person/name.ts @@ -1 +1,3 @@ -export default ['{{person.last_name}}{{person.first_name}}']; +export default [['{{person.last_name}}{{person.first_name}}', 1]] as Array< + [string, number] +> as [string, number][]; diff --git a/src/locales/zh_TW/person/name.ts b/src/locales/zh_TW/person/name.ts index 93522368361..9210b231236 100644 --- a/src/locales/zh_TW/person/name.ts +++ b/src/locales/zh_TW/person/name.ts @@ -1 +1,4 @@ -export default ['{{person.last_name}}{{person.first_name}}']; +export default [['{{person.last_name}}{{person.first_name}}', 1]] as [ + string, + number +][]; diff --git a/src/modules/helpers/index.ts b/src/modules/helpers/index.ts index 7f2c5898c6f..32056b9952b 100644 --- a/src/modules/helpers/index.ts +++ b/src/modules/helpers/index.ts @@ -445,6 +445,39 @@ export class HelpersModule { return array[index]; } + /** + * Returns a weighted random element from the given array. Each element of the array should be an array with two elements: the first is the value, the second is an integer weight. + * For example, if there are two elements A and B, with weights 1 and 2 respectively, then the probability of picking A is 1/3 and the probability of picking B is 2/3. + * + * @template T The type of the entries to pick from. + * @param array Array to pick the value from. + * + * @example + * faker.helpers.weightedArrayElement([['sunny', 5], ['rainy', 4],['snowy', 1]]) // 'sunny', 50% of the time, 'rainy' 40% of the time, 'snowy' 10% of the time + * + * @since 8.0.0 + */ + weightedArrayElement( + array: ReadonlyArray<[T, number]> = [] as unknown as ReadonlyArray< + [T, number] + > + ): T { + if (array.length === 0) { + throw new Error( + 'weightedArrayElement expects an array with at least one element' + ); + } + const total = array.reduce((acc, [_, weight]) => acc + weight, 0); + const random = this.faker.number.int({ min: 0, max: total - 1 }); + let current = 0; + for (const [value, weight] of array) { + current += weight; + if (random < current) { + return value; + } + } + } + /** * Returns a subset with random elements of the given array in random order. * diff --git a/src/modules/person/index.ts b/src/modules/person/index.ts index 0efbffc595d..46328d71c6b 100644 --- a/src/modules/person/index.ts +++ b/src/modules/person/index.ts @@ -168,7 +168,7 @@ export class PersonModule { const sex = options.sex || this.faker.helpers.arrayElement([Sex.Female, Sex.Male]); - const fullNamePattern: string = this.faker.helpers.arrayElement( + const fullNamePattern: string = this.faker.helpers.weightedArrayElement( this.faker.definitions.person.name ); diff --git a/test/__snapshots__/helpers.spec.ts.snap b/test/__snapshots__/helpers.spec.ts.snap index 3dc76f896a9..8134af4e24b 100644 --- a/test/__snapshots__/helpers.spec.ts.snap +++ b/test/__snapshots__/helpers.spec.ts.snap @@ -144,6 +144,8 @@ exports[`helpers > 42 > uniqueArray > with array 1`] = ` ] `; +exports[`helpers > 42 > weightedArrayElement > with array 1`] = `"sunny"`; + exports[`helpers > 1211 > arrayElement > noArgs 1`] = `"c"`; exports[`helpers > 1211 > arrayElement > with array 1`] = `"!"`; @@ -296,6 +298,8 @@ exports[`helpers > 1211 > uniqueArray > with array 1`] = ` ] `; +exports[`helpers > 1211 > weightedArrayElement > with array 1`] = `"snowy"`; + exports[`helpers > 1337 > arrayElement > noArgs 1`] = `"a"`; exports[`helpers > 1337 > arrayElement > with array 1`] = `"l"`; @@ -437,3 +441,5 @@ exports[`helpers > 1337 > uniqueArray > with array 1`] = ` "d", ] `; + +exports[`helpers > 1337 > weightedArrayElement > with array 1`] = `"sunny"`; diff --git a/test/helpers.spec.ts b/test/helpers.spec.ts index 530c3b49a00..727e46b4051 100644 --- a/test/helpers.spec.ts +++ b/test/helpers.spec.ts @@ -59,6 +59,14 @@ describe('helpers', () => { t.it('noArgs').it('with array', 'Hello World!'.split('')); }); + t.describe('weightedArrayElement', (t) => { + t.it('with array', [ + ['sunny', 5], + ['rainy', 4], + ['snowy', 1], + ]); + }); + t.describe('arrayElements', (t) => { t.it('noArgs') .it('with array', 'Hello World!'.split('')) @@ -132,6 +140,31 @@ describe('helpers', () => { }); }); + describe('weightedArrayElement', () => { + it('should return a weighted random element in the array', () => { + const testArray: [string, number][] = [ + ['hello', 10], + ['to', 5], + ['you', 3], + ['my', 2], + ['friend', 1], + ]; + const actual = faker.helpers.weightedArrayElement(testArray); + + expect(testArray.map((a) => a[0])).toContain(actual); + }); + + it('should return the only element in the array when there is only 1', () => { + const testArray: [string, number][] = [['hello', 10]]; + const actual = faker.helpers.weightedArrayElement(testArray); + + expect(actual).toBe('hello'); + }); + it('should throw if the array is empty', () => { + expect(() => faker.helpers.weightedArrayElement([])).to.throw(); + }); + }); + describe('arrayElements', () => { it('should return a subset with random elements in the array', () => { const testArray = ['hello', 'to', 'you', 'my', 'friend']; From 753fedca312fcf1b7ea5b09db717963c37458a68 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Wed, 7 Dec 2022 18:28:35 +0700 Subject: [PATCH 06/18] fix(person): fix nl --- src/locales/nl/person/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/nl/person/index.ts b/src/locales/nl/person/index.ts index 562b58c9ec7..dfe16a0569d 100644 --- a/src/locales/nl/person/index.ts +++ b/src/locales/nl/person/index.ts @@ -7,20 +7,20 @@ import female_first_name from './female_first_name'; import first_name from './first_name'; import last_name from './last_name'; import male_first_name from './male_first_name'; +import middle_name from './middle_name'; import name_ from './name'; import prefix from './prefix'; import suffix from './suffix'; -import tussenvoegsel from './tussenvoegsel'; const person: PersonDefinitions = { female_first_name, first_name, last_name, male_first_name, + middle_name, name: name_, prefix, suffix, - tussenvoegsel, }; export default person; From ff786c9f4c90b5b16e6f73e9c8310bc2140906e6 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Wed, 7 Dec 2022 18:38:04 +0700 Subject: [PATCH 07/18] fix(person): fix nl and de_AT --- .../de_AT/person/{middle_name.ts => female_middle_name.ts} | 0 src/locales/de_AT/person/index.ts | 6 ++++-- src/locales/de_AT/person/male_middle_name.ts | 2 ++ .../nl/person/{middle_name.ts => female_middle_name.ts} | 0 src/locales/nl/person/index.ts | 6 ++++-- src/locales/nl/person/male_middle_name.ts | 2 ++ 6 files changed, 12 insertions(+), 4 deletions(-) rename src/locales/de_AT/person/{middle_name.ts => female_middle_name.ts} (100%) create mode 100644 src/locales/de_AT/person/male_middle_name.ts rename src/locales/nl/person/{middle_name.ts => female_middle_name.ts} (100%) create mode 100644 src/locales/nl/person/male_middle_name.ts diff --git a/src/locales/de_AT/person/middle_name.ts b/src/locales/de_AT/person/female_middle_name.ts similarity index 100% rename from src/locales/de_AT/person/middle_name.ts rename to src/locales/de_AT/person/female_middle_name.ts diff --git a/src/locales/de_AT/person/index.ts b/src/locales/de_AT/person/index.ts index eeb24e415c7..4c053afd651 100644 --- a/src/locales/de_AT/person/index.ts +++ b/src/locales/de_AT/person/index.ts @@ -3,16 +3,18 @@ * Run 'pnpm run generate:locales' to update. */ import type { PersonDefinitions } from '../../..'; +import female_middle_name from './female_middle_name'; import first_name from './first_name'; import last_name from './last_name'; -import middle_name from './middle_name'; +import male_middle_name from './male_middle_name'; import name_ from './name'; import prefix from './prefix'; const person: PersonDefinitions = { + female_middle_name, first_name, last_name, - middle_name, + male_middle_name, name: name_, prefix, }; diff --git a/src/locales/de_AT/person/male_middle_name.ts b/src/locales/de_AT/person/male_middle_name.ts new file mode 100644 index 00000000000..ac226a8cf32 --- /dev/null +++ b/src/locales/de_AT/person/male_middle_name.ts @@ -0,0 +1,2 @@ +// This is a nobility title prefix, but for simplicity it acts like a middle name +export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/nl/person/middle_name.ts b/src/locales/nl/person/female_middle_name.ts similarity index 100% rename from src/locales/nl/person/middle_name.ts rename to src/locales/nl/person/female_middle_name.ts diff --git a/src/locales/nl/person/index.ts b/src/locales/nl/person/index.ts index dfe16a0569d..67ac95fd7f8 100644 --- a/src/locales/nl/person/index.ts +++ b/src/locales/nl/person/index.ts @@ -4,20 +4,22 @@ */ import type { PersonDefinitions } from '../../..'; import female_first_name from './female_first_name'; +import female_middle_name from './female_middle_name'; import first_name from './first_name'; import last_name from './last_name'; import male_first_name from './male_first_name'; -import middle_name from './middle_name'; +import male_middle_name from './male_middle_name'; import name_ from './name'; import prefix from './prefix'; import suffix from './suffix'; const person: PersonDefinitions = { female_first_name, + female_middle_name, first_name, last_name, male_first_name, - middle_name, + male_middle_name, name: name_, prefix, suffix, diff --git a/src/locales/nl/person/male_middle_name.ts b/src/locales/nl/person/male_middle_name.ts new file mode 100644 index 00000000000..4a985e28e87 --- /dev/null +++ b/src/locales/nl/person/male_middle_name.ts @@ -0,0 +1,2 @@ +// This is a tussenvoegsel, but it acts like a middle name +export default ['van', 'van de', 'van den', "van 't", 'van het', 'de', 'den']; From f462314f319b377ef08d47bb739653e060d0a6cc Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Wed, 7 Dec 2022 18:45:21 +0700 Subject: [PATCH 08/18] fix(person): warnings --- src/locales/zh_CN/person/name.ts | 7 ++++--- src/modules/helpers/index.ts | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/locales/zh_CN/person/name.ts b/src/locales/zh_CN/person/name.ts index f6337cb8d36..9210b231236 100644 --- a/src/locales/zh_CN/person/name.ts +++ b/src/locales/zh_CN/person/name.ts @@ -1,3 +1,4 @@ -export default [['{{person.last_name}}{{person.first_name}}', 1]] as Array< - [string, number] -> as [string, number][]; +export default [['{{person.last_name}}{{person.first_name}}', 1]] as [ + string, + number +][]; diff --git a/src/modules/helpers/index.ts b/src/modules/helpers/index.ts index 32056b9952b..d43257b011c 100644 --- a/src/modules/helpers/index.ts +++ b/src/modules/helpers/index.ts @@ -467,7 +467,7 @@ export class HelpersModule { 'weightedArrayElement expects an array with at least one element' ); } - const total = array.reduce((acc, [_, weight]) => acc + weight, 0); + const total = array.reduce((acc, [, weight]) => acc + weight, 0); const random = this.faker.number.int({ min: 0, max: total - 1 }); let current = 0; for (const [value, weight] of array) { From 284ad8c998d0aba10e2ec5bc33e5fc5e655d05f9 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Mon, 2 Jan 2023 22:13:21 +0700 Subject: [PATCH 09/18] migrate to new weightedArray method --- src/definitions/person.ts | 2 +- src/locales/ar/person/name.ts | 11 +++++++---- src/locales/az/person/name.ts | 8 ++++---- src/locales/cz/person/name.ts | 14 ++++++++++---- src/locales/de/person/name.ts | 9 ++++++--- src/locales/de_AT/person/index.ts | 4 ++++ src/locales/de_AT/person/name.ts | 14 ++++++++++---- src/locales/de_CH/person/name.ts | 7 +++---- src/locales/dv/person/name.ts | 7 +++---- src/locales/el/person/name.ts | 14 ++++++++++---- src/locales/en/person/name.ts | 23 +++++++++++++++-------- src/locales/en_GH/person/name.ts | 9 ++++++--- src/locales/en_NG/person/name.ts | 6 +++--- src/locales/en_ZA/person/name.ts | 6 +++--- src/locales/es/person/name.ts | 16 ++++++++++------ src/locales/es_MX/person/name.ts | 28 +++++++++++++++++----------- src/locales/fa/person/name.ts | 9 ++++++--- src/locales/fi/person/name.ts | 7 +++---- src/locales/fr/person/name.ts | 9 ++++++--- src/locales/fr_BE/person/name.ts | 14 ++++++++++---- src/locales/fr_CH/person/name.ts | 9 ++++++--- src/locales/ge/person/name.ts | 9 ++++++--- src/locales/he/person/name.ts | 9 ++++++--- src/locales/hr/person/name.ts | 14 ++++++++++---- src/locales/hu/person/name.ts | 9 ++++++--- src/locales/hy/person/name.ts | 14 ++++++++++---- src/locales/id_ID/person/name.ts | 11 +++++++---- src/locales/it/person/name.ts | 9 ++++++--- src/locales/ja/person/name.ts | 7 +++---- src/locales/ko/person/name.ts | 7 +++---- src/locales/lv/person/name.ts | 26 +++++++++++++++++++------- src/locales/mk/person/name.ts | 9 ++++++--- src/locales/nb_NO/person/name.ts | 24 ++++++++++++++++++------ src/locales/nl/person/name.ts | 19 ++++++++++++++----- src/locales/nl_BE/person/name.ts | 14 ++++++++++---- src/locales/pl/person/name.ts | 9 ++++++--- src/locales/pt_BR/person/name.ts | 14 ++++++++++---- src/locales/pt_PT/person/name.ts | 9 ++++++--- src/locales/ro/person/name.ts | 11 +++++++---- src/locales/ru/person/name.ts | 16 +++++++++++----- src/locales/sk/person/name.ts | 14 ++++++++++---- src/locales/sv/person/name.ts | 19 ++++++++++++++----- src/locales/tr/person/name.ts | 9 ++++++--- src/locales/uk/person/name.ts | 16 +++++++++++----- src/locales/ur/person/name.ts | 14 ++++++++++---- src/locales/vi/person/name.ts | 7 +++---- src/locales/zh_CN/person/name.ts | 7 +++---- src/locales/zh_TW/person/name.ts | 7 +++---- 48 files changed, 367 insertions(+), 192 deletions(-) diff --git a/src/definitions/person.ts b/src/definitions/person.ts index 43529a45e74..0f2889c4dfa 100644 --- a/src/definitions/person.ts +++ b/src/definitions/person.ts @@ -28,7 +28,7 @@ export type PersonDefinitions = LocaleEntry<{ /** * A weighted list of patterns used to generate names. */ - name: [string, number][]; + name: { value: string; weight: number }[]; bio_patterns?: string[]; diff --git a/src/locales/ar/person/name.ts b/src/locales/ar/person/name.ts index 74231e6a225..ccecb00c362 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}}', 1], - ['{{person.first_name}} {{person.last_name}}', 5], - ['{{person.last_name}} {{person.first_name}}', 5], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 5 }, + { value: '{{person.last_name}} {{person.first_name}}', weight: 5 }, +]; diff --git a/src/locales/az/person/name.ts b/src/locales/az/person/name.ts index 7c2d5650c0d..9a84f08f968 100644 --- a/src/locales/az/person/name.ts +++ b/src/locales/az/person/name.ts @@ -1,5 +1,5 @@ export default [ - ['{{person.first_name}}', 1], - ['{{person.last_name}} {{person.first_name}}', 1], - ['{{person.first_name}} {{person.last_name}}', 1], -] as [string, number][]; + { value: '{{person.first_name}}', weight: 1 }, + { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, +]; diff --git a/src/locales/cz/person/name.ts b/src/locales/cz/person/name.ts index 3db743b6439..eebac188dae 100644 --- a/src/locales/cz/person/name.ts +++ b/src/locales/cz/person/name.ts @@ -1,5 +1,11 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/de/person/name.ts b/src/locales/de/person/name.ts index b095a5b342e..4d264419f40 100644 --- a/src/locales/de/person/name.ts +++ b/src/locales/de/person/name.ts @@ -1,4 +1,7 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}}', 9], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, +]; diff --git a/src/locales/de_AT/person/index.ts b/src/locales/de_AT/person/index.ts index 4c053afd651..d229e8376b6 100644 --- a/src/locales/de_AT/person/index.ts +++ b/src/locales/de_AT/person/index.ts @@ -3,17 +3,21 @@ * Run 'pnpm run generate:locales' to update. */ import type { PersonDefinitions } from '../../..'; +import female_first_name from './female_first_name'; import female_middle_name from './female_middle_name'; import first_name from './first_name'; import last_name from './last_name'; +import male_first_name from './male_first_name'; import male_middle_name from './male_middle_name'; import name_ from './name'; import prefix from './prefix'; const person: PersonDefinitions = { + female_first_name, female_middle_name, first_name, last_name, + male_first_name, male_middle_name, name: name_, prefix, diff --git a/src/locales/de_AT/person/name.ts b/src/locales/de_AT/person/name.ts index e35531aa2a0..2165b00b6da 100644 --- a/src/locales/de_AT/person/name.ts +++ b/src/locales/de_AT/person/name.ts @@ -1,5 +1,11 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.middle_name}} {{person.last_name}}', 2], - ['{{person.first_name}} {{person.last_name}}', 5], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', + weight: 2, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 5 }, +]; diff --git a/src/locales/de_CH/person/name.ts b/src/locales/de_CH/person/name.ts index 0267ccd9abc..251494666a3 100644 --- a/src/locales/de_CH/person/name.ts +++ b/src/locales/de_CH/person/name.ts @@ -1,4 +1,3 @@ -export default [['{{person.first_name}} {{person.last_name}}', 1]] as [ - string, - number -][]; +export default [ + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, +]; diff --git a/src/locales/dv/person/name.ts b/src/locales/dv/person/name.ts index 0267ccd9abc..251494666a3 100644 --- a/src/locales/dv/person/name.ts +++ b/src/locales/dv/person/name.ts @@ -1,4 +1,3 @@ -export default [['{{person.first_name}} {{person.last_name}}', 1]] as [ - string, - number -][]; +export default [ + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, +]; diff --git a/src/locales/el/person/name.ts b/src/locales/el/person/name.ts index 3db743b6439..eebac188dae 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}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/en/person/name.ts b/src/locales/en/person/name.ts index 03e348a2b71..dac6382e3d9 100644 --- a/src/locales/en/person/name.ts +++ b/src/locales/en/person/name.ts @@ -1,9 +1,16 @@ export default [ - ['{{person.first_name}} {{person.last_name}}', 7], - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.suffix}}', - 1, - ], -] as [string, number][]; + { value: '{{person.first_name}} {{person.last_name}}', weight: 49 }, + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 7, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 7, + }, + { + value: + '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, +]; diff --git a/src/locales/en_GH/person/name.ts b/src/locales/en_GH/person/name.ts index d76441c4a14..aeb8e2a95e5 100644 --- a/src/locales/en_GH/person/name.ts +++ b/src/locales/en_GH/person/name.ts @@ -1,4 +1,7 @@ export default [ - ['{{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}}-{{person.last_name}}', 1], -] as [string, number][]; + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { + value: '{{person.first_name}} {{person.last_name}}-{{person.last_name}}', + weight: 1, + }, +]; diff --git a/src/locales/en_NG/person/name.ts b/src/locales/en_NG/person/name.ts index c5ad44b7c03..8762b175741 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}}', 1], - ['{{person.last_name}} {{person.first_name}}', 1], -] as [string, number][]; + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, +]; diff --git a/src/locales/en_ZA/person/name.ts b/src/locales/en_ZA/person/name.ts index c5ad44b7c03..8762b175741 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}}', 1], - ['{{person.last_name}} {{person.first_name}}', 1], -] as [string, number][]; + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, +]; diff --git a/src/locales/es/person/name.ts b/src/locales/es/person/name.ts index 509cbf87452..51715483f08 100644 --- a/src/locales/es/person/name.ts +++ b/src/locales/es/person/name.ts @@ -1,7 +1,11 @@ export default [ - [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', - 1, - ], - ['{{person.first_name}} {{person.last_name}} {{person.last_name}}', 9], -] as [string, number][]; + { + value: + '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.last_name}}', + weight: 9, + }, +]; diff --git a/src/locales/es_MX/person/name.ts b/src/locales/es_MX/person/name.ts index b3e2f45db99..7393af04cfd 100644 --- a/src/locales/es_MX/person/name.ts +++ b/src/locales/es_MX/person/name.ts @@ -1,12 +1,18 @@ export default [ - [ - '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', - 1, - ], - ['{{person.first_name}} {{person.last_name}} de {{person.last_name}}', 3], - [ - '{{person.suffix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', - 1, - ], - ['{{person.first_name}} {{person.last_name}} {{person.last_name}}', 5], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} de {{person.last_name}}', + weight: 3, + }, + { + value: '{{person.suffix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.last_name}}', + weight: 5, + }, +]; diff --git a/src/locales/fa/person/name.ts b/src/locales/fa/person/name.ts index b095a5b342e..4d264419f40 100644 --- a/src/locales/fa/person/name.ts +++ b/src/locales/fa/person/name.ts @@ -1,4 +1,7 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}}', 9], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, +]; diff --git a/src/locales/fi/person/name.ts b/src/locales/fi/person/name.ts index 0267ccd9abc..251494666a3 100644 --- a/src/locales/fi/person/name.ts +++ b/src/locales/fi/person/name.ts @@ -1,4 +1,3 @@ -export default [['{{person.first_name}} {{person.last_name}}', 1]] as [ - string, - number -][]; +export default [ + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, +]; diff --git a/src/locales/fr/person/name.ts b/src/locales/fr/person/name.ts index 59c85e861d0..e886199449a 100644 --- a/src/locales/fr/person/name.ts +++ b/src/locales/fr/person/name.ts @@ -1,4 +1,7 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 2], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 2, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/fr_BE/person/name.ts b/src/locales/fr_BE/person/name.ts index 3db743b6439..eebac188dae 100644 --- a/src/locales/fr_BE/person/name.ts +++ b/src/locales/fr_BE/person/name.ts @@ -1,5 +1,11 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/fr_CH/person/name.ts b/src/locales/fr_CH/person/name.ts index 59c85e861d0..e886199449a 100644 --- a/src/locales/fr_CH/person/name.ts +++ b/src/locales/fr_CH/person/name.ts @@ -1,4 +1,7 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 2], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 2, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/ge/person/name.ts b/src/locales/ge/person/name.ts index b095a5b342e..4d264419f40 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}}', 1], - ['{{person.first_name}} {{person.last_name}}', 9], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, +]; diff --git a/src/locales/he/person/name.ts b/src/locales/he/person/name.ts index b095a5b342e..4d264419f40 100644 --- a/src/locales/he/person/name.ts +++ b/src/locales/he/person/name.ts @@ -1,4 +1,7 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}}', 9], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, +]; diff --git a/src/locales/hr/person/name.ts b/src/locales/hr/person/name.ts index ff5bfe04f51..c98d588850d 100644 --- a/src/locales/hr/person/name.ts +++ b/src/locales/hr/person/name.ts @@ -1,5 +1,11 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}}, {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}}, {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/hu/person/name.ts b/src/locales/hu/person/name.ts index d1fb55b4025..d868910c425 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}}', 1], - ['{{person.last_name}} {{person.first_name}}', 9], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.last_name}} {{person.first_name}}', + weight: 1, + }, + { value: '{{person.last_name}} {{person.first_name}}', weight: 9 }, +]; diff --git a/src/locales/hy/person/name.ts b/src/locales/hy/person/name.ts index 3db743b6439..eebac188dae 100644 --- a/src/locales/hy/person/name.ts +++ b/src/locales/hy/person/name.ts @@ -1,5 +1,11 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/id_ID/person/name.ts b/src/locales/id_ID/person/name.ts index 5fb2d93f0c3..6e615d07c52 100644 --- a/src/locales/id_ID/person/name.ts +++ b/src/locales/id_ID/person/name.ts @@ -1,5 +1,8 @@ export default [ - ['{{person.first_name}} {{person.last_name}}', 1], - ['{{person.last_name}} {{person.first_name}}', 1], - ['{{person.first_name}} {{person.first_name}} {{person.last_name}}', 1], -] as [string, number][]; + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { + value: '{{person.first_name}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, +]; diff --git a/src/locales/it/person/name.ts b/src/locales/it/person/name.ts index b095a5b342e..4d264419f40 100644 --- a/src/locales/it/person/name.ts +++ b/src/locales/it/person/name.ts @@ -1,4 +1,7 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}}', 9], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, +]; diff --git a/src/locales/ja/person/name.ts b/src/locales/ja/person/name.ts index 104ede1315e..9b5eadaefd9 100644 --- a/src/locales/ja/person/name.ts +++ b/src/locales/ja/person/name.ts @@ -1,4 +1,3 @@ -export default [['{{person.last_name}} {{person.first_name}}', 1]] as [ - string, - number -][]; +export default [ + { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, +]; diff --git a/src/locales/ko/person/name.ts b/src/locales/ko/person/name.ts index 104ede1315e..9b5eadaefd9 100644 --- a/src/locales/ko/person/name.ts +++ b/src/locales/ko/person/name.ts @@ -1,4 +1,3 @@ -export default [['{{person.last_name}} {{person.first_name}}', 1]] as [ - string, - number -][]; +export default [ + { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, +]; diff --git a/src/locales/lv/person/name.ts b/src/locales/lv/person/name.ts index c8d0ab0d030..a4965259aee 100644 --- a/src/locales/lv/person/name.ts +++ b/src/locales/lv/person/name.ts @@ -1,8 +1,20 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 7], - ['{{person.last_name}} {{person.first_name}}', 2], - ['{{person.first_name}} {{person.first_name}} {{person.last_name}}', 2], - ['{{person.first_name}} {{person.last_name}}-{{person.last_name}}', 2], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 7 }, + { value: '{{person.last_name}} {{person.first_name}}', weight: 2 }, + { + value: '{{person.first_name}} {{person.first_name}} {{person.last_name}}', + weight: 2, + }, + { + value: '{{person.first_name}} {{person.last_name}}-{{person.last_name}}', + weight: 2, + }, +]; diff --git a/src/locales/mk/person/name.ts b/src/locales/mk/person/name.ts index 3ab117452a3..97ffbb4972b 100644 --- a/src/locales/mk/person/name.ts +++ b/src/locales/mk/person/name.ts @@ -1,4 +1,7 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/nb_NO/person/name.ts b/src/locales/nb_NO/person/name.ts index 639d1467886..457b116583a 100644 --- a/src/locales/nb_NO/person/name.ts +++ b/src/locales/nb_NO/person/name.ts @@ -1,7 +1,19 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.last_name}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/nl/person/name.ts b/src/locales/nl/person/name.ts index e67cfa1e7d5..d892081d1ed 100644 --- a/src/locales/nl/person/name.ts +++ b/src/locales/nl/person/name.ts @@ -1,6 +1,15 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], - ['{{person.first_name}} {{person.middle_name}} {{person.last_name}}', 1], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { + value: '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', + weight: 1, + }, +]; diff --git a/src/locales/nl_BE/person/name.ts b/src/locales/nl_BE/person/name.ts index 3db743b6439..eebac188dae 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}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/pl/person/name.ts b/src/locales/pl/person/name.ts index b095a5b342e..4d264419f40 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}}', 1], - ['{{person.first_name}} {{person.last_name}}', 9], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, +]; diff --git a/src/locales/pt_BR/person/name.ts b/src/locales/pt_BR/person/name.ts index 3db743b6439..eebac188dae 100644 --- a/src/locales/pt_BR/person/name.ts +++ b/src/locales/pt_BR/person/name.ts @@ -1,5 +1,11 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/pt_PT/person/name.ts b/src/locales/pt_PT/person/name.ts index aa8459e3332..ee869e99714 100644 --- a/src/locales/pt_PT/person/name.ts +++ b/src/locales/pt_PT/person/name.ts @@ -1,4 +1,7 @@ export default [ - ['{{person.first_name}} {{person.last_name}}', 9], - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], -] as [string, number][]; + { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, +]; diff --git a/src/locales/ro/person/name.ts b/src/locales/ro/person/name.ts index e6005f6211b..c780fb37de8 100644 --- a/src/locales/ro/person/name.ts +++ b/src/locales/ro/person/name.ts @@ -1,5 +1,8 @@ export default [ - ['{{person.first_name}} {{person.last_name}}', 8], - ['{{person.last_name}} {{person.first_name}}', 1], - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], -] as [string, number][]; + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, +]; diff --git a/src/locales/ru/person/name.ts b/src/locales/ru/person/name.ts index 86a75382f4b..6bfddd81473 100644 --- a/src/locales/ru/person/name.ts +++ b/src/locales/ru/person/name.ts @@ -1,6 +1,12 @@ export default [ - ['{{person.first_name}} {{person.last_name}}', 1], - ['{{person.last_name}} {{person.first_name}}', 1], - ['{{person.first_name}} {{person.middle_name}} {{person.last_name}}', 1], - ['{{person.last_name}} {{person.first_name}} {{person.middle_name}}', 1], -] as [string, number][]; + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { + value: '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.last_name}} {{person.first_name}} {{person.middle_name}}', + weight: 1, + }, +]; diff --git a/src/locales/sk/person/name.ts b/src/locales/sk/person/name.ts index 3db743b6439..eebac188dae 100644 --- a/src/locales/sk/person/name.ts +++ b/src/locales/sk/person/name.ts @@ -1,5 +1,11 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/sv/person/name.ts b/src/locales/sv/person/name.ts index 0c8f606283d..7b752d05a92 100644 --- a/src/locales/sv/person/name.ts +++ b/src/locales/sv/person/name.ts @@ -1,6 +1,15 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], - ['{{person.first_name}} {{person.last_name}} {{person.last_name}}', 1], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.last_name}}', + weight: 1, + }, +]; diff --git a/src/locales/tr/person/name.ts b/src/locales/tr/person/name.ts index 3ab117452a3..97ffbb4972b 100644 --- a/src/locales/tr/person/name.ts +++ b/src/locales/tr/person/name.ts @@ -1,4 +1,7 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/uk/person/name.ts b/src/locales/uk/person/name.ts index 86a75382f4b..6bfddd81473 100644 --- a/src/locales/uk/person/name.ts +++ b/src/locales/uk/person/name.ts @@ -1,6 +1,12 @@ export default [ - ['{{person.first_name}} {{person.last_name}}', 1], - ['{{person.last_name}} {{person.first_name}}', 1], - ['{{person.first_name}} {{person.middle_name}} {{person.last_name}}', 1], - ['{{person.last_name}} {{person.first_name}} {{person.middle_name}}', 1], -] as [string, number][]; + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { + value: '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.last_name}} {{person.first_name}} {{person.middle_name}}', + weight: 1, + }, +]; diff --git a/src/locales/ur/person/name.ts b/src/locales/ur/person/name.ts index 3db743b6439..eebac188dae 100644 --- a/src/locales/ur/person/name.ts +++ b/src/locales/ur/person/name.ts @@ -1,5 +1,11 @@ export default [ - ['{{person.prefix}} {{person.first_name}} {{person.last_name}}', 1], - ['{{person.first_name}} {{person.last_name}} {{person.suffix}}', 1], - ['{{person.first_name}} {{person.last_name}}', 8], -] as [string, number][]; + { + value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + weight: 1, + }, + { + value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + weight: 1, + }, + { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, +]; diff --git a/src/locales/vi/person/name.ts b/src/locales/vi/person/name.ts index 0267ccd9abc..251494666a3 100644 --- a/src/locales/vi/person/name.ts +++ b/src/locales/vi/person/name.ts @@ -1,4 +1,3 @@ -export default [['{{person.first_name}} {{person.last_name}}', 1]] as [ - string, - number -][]; +export default [ + { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, +]; diff --git a/src/locales/zh_CN/person/name.ts b/src/locales/zh_CN/person/name.ts index 9210b231236..b8508f10f8e 100644 --- a/src/locales/zh_CN/person/name.ts +++ b/src/locales/zh_CN/person/name.ts @@ -1,4 +1,3 @@ -export default [['{{person.last_name}}{{person.first_name}}', 1]] as [ - string, - number -][]; +export default [ + { value: '{{person.last_name}}{{person.first_name}}', weight: 1 }, +]; diff --git a/src/locales/zh_TW/person/name.ts b/src/locales/zh_TW/person/name.ts index 9210b231236..b8508f10f8e 100644 --- a/src/locales/zh_TW/person/name.ts +++ b/src/locales/zh_TW/person/name.ts @@ -1,4 +1,3 @@ -export default [['{{person.last_name}}{{person.first_name}}', 1]] as [ - string, - number -][]; +export default [ + { value: '{{person.last_name}}{{person.first_name}}', weight: 1 }, +]; From a802269e8bbda5cfa75ebbb1caf581b67b561af7 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Mon, 2 Jan 2023 22:17:08 +0700 Subject: [PATCH 10/18] rv prefix changes --- src/locales/en/person/female_prefix.ts | 1 - src/locales/en/person/index.ts | 4 ---- src/locales/en/person/male_prefix.ts | 1 - 3 files changed, 6 deletions(-) delete mode 100644 src/locales/en/person/female_prefix.ts delete mode 100644 src/locales/en/person/male_prefix.ts diff --git a/src/locales/en/person/female_prefix.ts b/src/locales/en/person/female_prefix.ts deleted file mode 100644 index 43fce37a544..00000000000 --- a/src/locales/en/person/female_prefix.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['Mrs.', 'Ms.', 'Miss', 'Dr.']; diff --git a/src/locales/en/person/index.ts b/src/locales/en/person/index.ts index 774f852e189..0f1b5889890 100644 --- a/src/locales/en/person/index.ts +++ b/src/locales/en/person/index.ts @@ -8,13 +8,11 @@ import bio_patterns from './bio_patterns'; import bio_supporter from './bio_supporter'; import female_first_name from './female_first_name'; import female_middle_name from './female_middle_name'; -import female_prefix from './female_prefix'; import first_name from './first_name'; import gender from './gender'; import last_name from './last_name'; import male_first_name from './male_first_name'; import male_middle_name from './male_middle_name'; -import male_prefix from './male_prefix'; import middle_name from './middle_name'; import name_ from './name'; import prefix from './prefix'; @@ -29,13 +27,11 @@ const person: PersonDefinitions = { bio_supporter, female_first_name, female_middle_name, - female_prefix, first_name, gender, last_name, male_first_name, male_middle_name, - male_prefix, middle_name, name: name_, prefix, diff --git a/src/locales/en/person/male_prefix.ts b/src/locales/en/person/male_prefix.ts deleted file mode 100644 index 795e64fdd11..00000000000 --- a/src/locales/en/person/male_prefix.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['Mr.', 'Dr.']; From 91583789d206551f8c0ff688f928721889e37a60 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Mon, 2 Jan 2023 23:51:39 +0700 Subject: [PATCH 11/18] update snapshots --- test/__snapshots__/person.spec.ts.snap | 8 ++++---- vite.config.ts | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/__snapshots__/person.spec.ts.snap b/test/__snapshots__/person.spec.ts.snap index 6ed0ea65d09..633b5a9fe40 100644 --- a/test/__snapshots__/person.spec.ts.snap +++ b/test/__snapshots__/person.spec.ts.snap @@ -36,7 +36,7 @@ exports[`person > 42 > middleName > with sex 1`] = `"Houston"`; exports[`person > 42 > prefix > noArgs 1`] = `"Mrs."`; -exports[`person > 42 > prefix > with sex 1`] = `"Mr."`; +exports[`person > 42 > prefix > with sex 1`] = `"Mrs."`; exports[`person > 42 > sex > noArgs 1`] = `"female"`; @@ -58,13 +58,13 @@ exports[`person > 1211 > firstName > with sex 1`] = `"Percy"`; exports[`person > 1211 > fullName > noArgs 1`] = `"Darrel Satterfield"`; -exports[`person > 1211 > fullName > with all (sex) 1`] = `"Ms. John Doe PhD"`; +exports[`person > 1211 > fullName > with all (sex) 1`] = `"John Doe IV"`; exports[`person > 1211 > fullName > with firstName 1`] = `"John Trantow"`; exports[`person > 1211 > fullName > with lastName 1`] = `"Darrel Doe"`; -exports[`person > 1211 > fullName > with sex 1`] = `"Ms. Henrietta Satterfield I"`; +exports[`person > 1211 > fullName > with sex 1`] = `"Joy Trantow DDS"`; exports[`person > 1211 > gender 1`] = `"Trigender"`; @@ -136,7 +136,7 @@ exports[`person > 1337 > middleName > with sex 1`] = `"Ethan"`; exports[`person > 1337 > prefix > noArgs 1`] = `"Mrs."`; -exports[`person > 1337 > prefix > with sex 1`] = `"Mr."`; +exports[`person > 1337 > prefix > with sex 1`] = `"Mrs."`; exports[`person > 1337 > sex > noArgs 1`] = `"female"`; diff --git a/vite.config.ts b/vite.config.ts index 36e24b8d0c0..5230717ab22 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -9,5 +9,8 @@ export default defineConfig({ reporter: ['clover', 'cobertura', 'lcov', 'text'], include: ['src'], }, + onConsoleLog(log) { + if (log.includes('deprecated')) return false; + }, }, }); From 0a18c4c7dac557080575dbefba9583d87a4cd11d Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Mon, 2 Jan 2023 23:52:18 +0700 Subject: [PATCH 12/18] fix lint --- src/locales/es_MX/person/name.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/locales/es_MX/person/name.ts b/src/locales/es_MX/person/name.ts index 7393af04cfd..51521fe6d0a 100644 --- a/src/locales/es_MX/person/name.ts +++ b/src/locales/es_MX/person/name.ts @@ -1,6 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + value: + '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', weight: 1, }, { @@ -8,7 +9,8 @@ export default [ weight: 3, }, { - value: '{{person.suffix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + value: + '{{person.suffix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', weight: 1, }, { From dd81694496ce9074a0a089fd3b0940a19978bbad Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Fri, 6 Jan 2023 20:23:22 +0700 Subject: [PATCH 13/18] change name patterns to use camelCase --- src/locales/ar/person/name.ts | 6 +++--- src/locales/az/person/name.ts | 6 +++--- src/locales/cz/person/name.ts | 6 +++--- src/locales/de/person/name.ts | 4 ++-- src/locales/de_AT/person/name.ts | 6 +++--- src/locales/de_CH/person/name.ts | 2 +- src/locales/dv/person/name.ts | 2 +- src/locales/el/person/name.ts | 6 +++--- src/locales/en/person/name.ts | 8 ++++---- src/locales/en_GH/person/name.ts | 4 ++-- src/locales/en_NG/person/name.ts | 4 ++-- src/locales/en_ZA/person/name.ts | 4 ++-- src/locales/es/person/name.ts | 4 ++-- src/locales/es_MX/person/name.ts | 8 ++++---- src/locales/fa/person/name.ts | 4 ++-- src/locales/fi/person/name.ts | 2 +- src/locales/fr/person/name.ts | 4 ++-- src/locales/fr_BE/person/name.ts | 6 +++--- src/locales/fr_CH/person/name.ts | 4 ++-- src/locales/ge/person/name.ts | 4 ++-- src/locales/he/person/name.ts | 4 ++-- src/locales/hr/person/name.ts | 6 +++--- src/locales/hu/person/name.ts | 4 ++-- src/locales/hy/person/name.ts | 6 +++--- src/locales/id_ID/person/name.ts | 6 +++--- src/locales/it/person/name.ts | 4 ++-- src/locales/ja/person/name.ts | 2 +- src/locales/ko/person/name.ts | 2 +- src/locales/lv/person/name.ts | 12 ++++++------ src/locales/mk/person/name.ts | 4 ++-- src/locales/nb_NO/person/name.ts | 10 +++++----- src/locales/nl/person/name.ts | 8 ++++---- src/locales/nl_BE/person/name.ts | 6 +++--- src/locales/pl/person/name.ts | 4 ++-- src/locales/pt_BR/person/name.ts | 6 +++--- src/locales/pt_PT/person/name.ts | 4 ++-- src/locales/ro/person/name.ts | 6 +++--- src/locales/ru/person/name.ts | 8 ++++---- src/locales/sk/person/name.ts | 6 +++--- src/locales/sv/person/name.ts | 8 ++++---- src/locales/tr/person/name.ts | 4 ++-- src/locales/uk/person/name.ts | 8 ++++---- src/locales/ur/person/name.ts | 6 +++--- src/locales/vi/person/name.ts | 2 +- src/locales/zh_CN/person/name.ts | 2 +- src/locales/zh_TW/person/name.ts | 2 +- src/modules/person/index.ts | 6 +++--- 47 files changed, 120 insertions(+), 120 deletions(-) diff --git a/src/locales/ar/person/name.ts b/src/locales/ar/person/name.ts index ccecb00c362..bd69e768928 100644 --- a/src/locales/ar/person/name.ts +++ b/src/locales/ar/person/name.ts @@ -1,8 +1,8 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 5 }, - { value: '{{person.last_name}} {{person.first_name}}', weight: 5 }, + { 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 9a84f08f968..1018fe75cee 100644 --- a/src/locales/az/person/name.ts +++ b/src/locales/az/person/name.ts @@ -1,5 +1,5 @@ export default [ - { value: '{{person.first_name}}', weight: 1 }, - { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { 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 eebac188dae..eb76dabb32d 100644 --- a/src/locales/cz/person/name.ts +++ b/src/locales/cz/person/name.ts @@ -1,11 +1,11 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/de/person/name.ts b/src/locales/de/person/name.ts index 4d264419f40..3e779a47416 100644 --- a/src/locales/de/person/name.ts +++ b/src/locales/de/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, + { 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 2165b00b6da..4c89d923f91 100644 --- a/src/locales/de_AT/person/name.ts +++ b/src/locales/de_AT/person/name.ts @@ -1,11 +1,11 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', + value: '{{person.firstName}} {{person.middleName}} {{person.lastName}}', weight: 2, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 5 }, + { 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 251494666a3..3ed8a80c86e 100644 --- a/src/locales/de_CH/person/name.ts +++ b/src/locales/de_CH/person/name.ts @@ -1,3 +1,3 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, ]; diff --git a/src/locales/dv/person/name.ts b/src/locales/dv/person/name.ts index 251494666a3..3ed8a80c86e 100644 --- a/src/locales/dv/person/name.ts +++ b/src/locales/dv/person/name.ts @@ -1,3 +1,3 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, ]; diff --git a/src/locales/el/person/name.ts b/src/locales/el/person/name.ts index eebac188dae..eb76dabb32d 100644 --- a/src/locales/el/person/name.ts +++ b/src/locales/el/person/name.ts @@ -1,11 +1,11 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/en/person/name.ts b/src/locales/en/person/name.ts index dac6382e3d9..772af2a946d 100644 --- a/src/locales/en/person/name.ts +++ b/src/locales/en/person/name.ts @@ -1,16 +1,16 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 49 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 49 }, { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 7, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 7, }, { value: - '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.suffix}}', + '{{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 aeb8e2a95e5..b0892e31545 100644 --- a/src/locales/en_GH/person/name.ts +++ b/src/locales/en_GH/person/name.ts @@ -1,7 +1,7 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, { - value: '{{person.first_name}} {{person.last_name}}-{{person.last_name}}', + 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 8762b175741..d74085574db 100644 --- a/src/locales/en_NG/person/name.ts +++ b/src/locales/en_NG/person/name.ts @@ -1,4 +1,4 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, - { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { 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 8762b175741..d74085574db 100644 --- a/src/locales/en_ZA/person/name.ts +++ b/src/locales/en_ZA/person/name.ts @@ -1,4 +1,4 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, - { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { 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 51715483f08..68a1d1f787b 100644 --- a/src/locales/es/person/name.ts +++ b/src/locales/es/person/name.ts @@ -1,11 +1,11 @@ export default [ { value: - '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + '{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.last_name}}', + 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 51521fe6d0a..7253fc0f04e 100644 --- a/src/locales/es_MX/person/name.ts +++ b/src/locales/es_MX/person/name.ts @@ -1,20 +1,20 @@ export default [ { value: - '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + '{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} de {{person.last_name}}', + value: '{{person.firstName}} {{person.lastName}} de {{person.lastName}}', weight: 3, }, { value: - '{{person.suffix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}', + '{{person.suffix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.last_name}}', + 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 4d264419f40..3e779a47416 100644 --- a/src/locales/fa/person/name.ts +++ b/src/locales/fa/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/fi/person/name.ts b/src/locales/fi/person/name.ts index 251494666a3..3ed8a80c86e 100644 --- a/src/locales/fi/person/name.ts +++ b/src/locales/fi/person/name.ts @@ -1,3 +1,3 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, ]; diff --git a/src/locales/fr/person/name.ts b/src/locales/fr/person/name.ts index e886199449a..95becffad7e 100644 --- a/src/locales/fr/person/name.ts +++ b/src/locales/fr/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 2, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { 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 eebac188dae..eb76dabb32d 100644 --- a/src/locales/fr_BE/person/name.ts +++ b/src/locales/fr_BE/person/name.ts @@ -1,11 +1,11 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { 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 e886199449a..95becffad7e 100644 --- a/src/locales/fr_CH/person/name.ts +++ b/src/locales/fr_CH/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 2, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/ge/person/name.ts b/src/locales/ge/person/name.ts index 4d264419f40..3e779a47416 100644 --- a/src/locales/ge/person/name.ts +++ b/src/locales/ge/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/he/person/name.ts b/src/locales/he/person/name.ts index 4d264419f40..3e779a47416 100644 --- a/src/locales/he/person/name.ts +++ b/src/locales/he/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/hr/person/name.ts b/src/locales/hr/person/name.ts index c98d588850d..02a6fdf5273 100644 --- a/src/locales/hr/person/name.ts +++ b/src/locales/hr/person/name.ts @@ -1,11 +1,11 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}}, {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}}, {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/hu/person/name.ts b/src/locales/hu/person/name.ts index d868910c425..019fb596118 100644 --- a/src/locales/hu/person/name.ts +++ b/src/locales/hu/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.last_name}} {{person.first_name}}', + value: '{{person.prefix}} {{person.lastName}} {{person.firstName}}', weight: 1, }, - { value: '{{person.last_name}} {{person.first_name}}', weight: 9 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 9 }, ]; diff --git a/src/locales/hy/person/name.ts b/src/locales/hy/person/name.ts index eebac188dae..eb76dabb32d 100644 --- a/src/locales/hy/person/name.ts +++ b/src/locales/hy/person/name.ts @@ -1,11 +1,11 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { 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 6e615d07c52..94ea3a29037 100644 --- a/src/locales/id_ID/person/name.ts +++ b/src/locales/id_ID/person/name.ts @@ -1,8 +1,8 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, - { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, { - value: '{{person.first_name}} {{person.first_name}} {{person.last_name}}', + 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 4d264419f40..3e779a47416 100644 --- a/src/locales/it/person/name.ts +++ b/src/locales/it/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/ja/person/name.ts b/src/locales/ja/person/name.ts index 9b5eadaefd9..75688dbd037 100644 --- a/src/locales/ja/person/name.ts +++ b/src/locales/ja/person/name.ts @@ -1,3 +1,3 @@ export default [ - { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, ]; diff --git a/src/locales/ko/person/name.ts b/src/locales/ko/person/name.ts index 9b5eadaefd9..75688dbd037 100644 --- a/src/locales/ko/person/name.ts +++ b/src/locales/ko/person/name.ts @@ -1,3 +1,3 @@ export default [ - { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, ]; diff --git a/src/locales/lv/person/name.ts b/src/locales/lv/person/name.ts index a4965259aee..492a7e6fd3c 100644 --- a/src/locales/lv/person/name.ts +++ b/src/locales/lv/person/name.ts @@ -1,20 +1,20 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 7 }, - { value: '{{person.last_name}} {{person.first_name}}', weight: 2 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 7 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 2 }, { - value: '{{person.first_name}} {{person.first_name}} {{person.last_name}}', + value: '{{person.firstName}} {{person.firstName}} {{person.lastName}}', weight: 2, }, { - value: '{{person.first_name}} {{person.last_name}}-{{person.last_name}}', + 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 97ffbb4972b..b5a91accfae 100644 --- a/src/locales/mk/person/name.ts +++ b/src/locales/mk/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { 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 457b116583a..3cfec1ea604 100644 --- a/src/locales/nb_NO/person/name.ts +++ b/src/locales/nb_NO/person/name.ts @@ -1,19 +1,19 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, { - value: '{{person.first_name}} {{person.first_name}} {{person.last_name}}', + value: '{{person.firstName}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.last_name}}', + value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/nl/person/name.ts b/src/locales/nl/person/name.ts index d892081d1ed..09b0296c0f5 100644 --- a/src/locales/nl/person/name.ts +++ b/src/locales/nl/person/name.ts @@ -1,15 +1,15 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, { - value: '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', + value: '{{person.firstName}} {{person.middleName}} {{person.lastName}}', weight: 1, }, ]; diff --git a/src/locales/nl_BE/person/name.ts b/src/locales/nl_BE/person/name.ts index eebac188dae..eb76dabb32d 100644 --- a/src/locales/nl_BE/person/name.ts +++ b/src/locales/nl_BE/person/name.ts @@ -1,11 +1,11 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/pl/person/name.ts b/src/locales/pl/person/name.ts index 4d264419f40..3e779a47416 100644 --- a/src/locales/pl/person/name.ts +++ b/src/locales/pl/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, + { 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 eebac188dae..eb76dabb32d 100644 --- a/src/locales/pt_BR/person/name.ts +++ b/src/locales/pt_BR/person/name.ts @@ -1,11 +1,11 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { 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 ee869e99714..45b05d925a9 100644 --- a/src/locales/pt_PT/person/name.ts +++ b/src/locales/pt_PT/person/name.ts @@ -1,7 +1,7 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 9 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + 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 c780fb37de8..3a8f55ef5c0 100644 --- a/src/locales/ro/person/name.ts +++ b/src/locales/ro/person/name.ts @@ -1,8 +1,8 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, - { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + 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 6bfddd81473..51793f935db 100644 --- a/src/locales/ru/person/name.ts +++ b/src/locales/ru/person/name.ts @@ -1,12 +1,12 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, - { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, { - value: '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', + value: '{{person.firstName}} {{person.middleName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.last_name}} {{person.first_name}} {{person.middle_name}}', + 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 eebac188dae..eb76dabb32d 100644 --- a/src/locales/sk/person/name.ts +++ b/src/locales/sk/person/name.ts @@ -1,11 +1,11 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/sv/person/name.ts b/src/locales/sv/person/name.ts index 7b752d05a92..37334af61f1 100644 --- a/src/locales/sv/person/name.ts +++ b/src/locales/sv/person/name.ts @@ -1,15 +1,15 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, { - value: '{{person.first_name}} {{person.last_name}} {{person.last_name}}', + 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 97ffbb4972b..b5a91accfae 100644 --- a/src/locales/tr/person/name.ts +++ b/src/locales/tr/person/name.ts @@ -1,7 +1,7 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/uk/person/name.ts b/src/locales/uk/person/name.ts index 6bfddd81473..51793f935db 100644 --- a/src/locales/uk/person/name.ts +++ b/src/locales/uk/person/name.ts @@ -1,12 +1,12 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, - { value: '{{person.last_name}} {{person.first_name}}', weight: 1 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 1 }, + { value: '{{person.lastName}} {{person.firstName}}', weight: 1 }, { - value: '{{person.first_name}} {{person.middle_name}} {{person.last_name}}', + value: '{{person.firstName}} {{person.middleName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.last_name}} {{person.first_name}} {{person.middle_name}}', + 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 eebac188dae..eb76dabb32d 100644 --- a/src/locales/ur/person/name.ts +++ b/src/locales/ur/person/name.ts @@ -1,11 +1,11 @@ export default [ { - value: '{{person.prefix}} {{person.first_name}} {{person.last_name}}', + value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, { - value: '{{person.first_name}} {{person.last_name}} {{person.suffix}}', + value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}', weight: 1, }, - { value: '{{person.first_name}} {{person.last_name}}', weight: 8 }, + { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, ]; diff --git a/src/locales/vi/person/name.ts b/src/locales/vi/person/name.ts index 251494666a3..3ed8a80c86e 100644 --- a/src/locales/vi/person/name.ts +++ b/src/locales/vi/person/name.ts @@ -1,3 +1,3 @@ export default [ - { value: '{{person.first_name}} {{person.last_name}}', weight: 1 }, + { 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 b8508f10f8e..d661e1c84c2 100644 --- a/src/locales/zh_CN/person/name.ts +++ b/src/locales/zh_CN/person/name.ts @@ -1,3 +1,3 @@ export default [ - { value: '{{person.last_name}}{{person.first_name}}', weight: 1 }, + { 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 b8508f10f8e..d661e1c84c2 100644 --- a/src/locales/zh_TW/person/name.ts +++ b/src/locales/zh_TW/person/name.ts @@ -1,3 +1,3 @@ export default [ - { value: '{{person.last_name}}{{person.first_name}}', weight: 1 }, + { value: '{{person.lastName}}{{person.firstName}}', weight: 1 }, ]; diff --git a/src/modules/person/index.ts b/src/modules/person/index.ts index 9733a6ab154..d2cf74eaa9a 100644 --- a/src/modules/person/index.ts +++ b/src/modules/person/index.ts @@ -176,9 +176,9 @@ export class PersonModule { const fullName = this.faker.helpers.mustache(fullNamePattern, { 'person.gender': () => this.gender(), 'person.prefix': () => this.prefix(sex), - 'person.first_name': () => options.firstName || this.firstName(sex), - 'person.middle_name': () => this.middleName(sex), - 'person.last_name': () => options.lastName || this.lastName(sex), + 'person.firstName': () => options.firstName || this.firstName(sex), + 'person.middleName': () => this.middleName(sex), + 'person.lastName': () => options.lastName || this.lastName(sex), 'person.suffix': () => this.suffix(), }); return fullName; From 165224fad578be6b07d2b05335737c7e5d9ac4ba Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Sat, 7 Jan 2023 08:36:51 +0700 Subject: [PATCH 14/18] remove nobility title prefix for de --- src/locales/de/person/female_middle_name.ts | 2 ++ src/locales/de/person/index.ts | 6 ++++-- src/locales/de/person/male_middle_name.ts | 2 ++ src/locales/de/person/name.ts | 4 ++++ src/locales/de/person/nobility_title_prefix.ts | 1 - 5 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 src/locales/de/person/female_middle_name.ts create mode 100644 src/locales/de/person/male_middle_name.ts delete mode 100644 src/locales/de/person/nobility_title_prefix.ts diff --git a/src/locales/de/person/female_middle_name.ts b/src/locales/de/person/female_middle_name.ts new file mode 100644 index 00000000000..ac226a8cf32 --- /dev/null +++ b/src/locales/de/person/female_middle_name.ts @@ -0,0 +1,2 @@ +// This is a nobility title prefix, but for simplicity it acts like a middle name +export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/de/person/index.ts b/src/locales/de/person/index.ts index 00cd7c190b1..1c56472213e 100644 --- a/src/locales/de/person/index.ts +++ b/src/locales/de/person/index.ts @@ -4,21 +4,23 @@ */ import type { PersonDefinitions } from '../../..'; import female_first_name from './female_first_name'; +import female_middle_name from './female_middle_name'; import first_name from './first_name'; import last_name from './last_name'; import male_first_name from './male_first_name'; +import male_middle_name from './male_middle_name'; import name_ from './name'; -import nobility_title_prefix from './nobility_title_prefix'; import prefix from './prefix'; import sex from './sex'; const person: PersonDefinitions = { female_first_name, + female_middle_name, first_name, last_name, male_first_name, + male_middle_name, name: name_, - nobility_title_prefix, prefix, sex, }; diff --git a/src/locales/de/person/male_middle_name.ts b/src/locales/de/person/male_middle_name.ts new file mode 100644 index 00000000000..ac226a8cf32 --- /dev/null +++ b/src/locales/de/person/male_middle_name.ts @@ -0,0 +1,2 @@ +// This is a nobility title prefix, but for simplicity it acts like a middle name +export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/de/person/name.ts b/src/locales/de/person/name.ts index 3e779a47416..1783bbd2855 100644 --- a/src/locales/de/person/name.ts +++ b/src/locales/de/person/name.ts @@ -3,5 +3,9 @@ export default [ value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, + { + value: '{{person.firstName}} {{person.middleName}} {{person.lastName}}', + weight: 2, + }, { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/de/person/nobility_title_prefix.ts b/src/locales/de/person/nobility_title_prefix.ts deleted file mode 100644 index ba3a30d7d97..00000000000 --- a/src/locales/de/person/nobility_title_prefix.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['zu', 'von', 'vom', 'von der']; From 6ea472d38b6f23a2ec89048f6badbe0787adb86b Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Sat, 28 Jan 2023 11:58:30 +0700 Subject: [PATCH 15/18] revert changes to middle_name in de, de_AT, nl --- src/locales/de/person/female_middle_name.ts | 2 -- src/locales/de/person/index.ts | 6 ++---- src/locales/de/person/male_middle_name.ts | 2 -- src/locales/de/person/name.ts | 4 ---- src/locales/de/person/nobility_title_prefix.ts | 1 + src/locales/de_AT/person/female_middle_name.ts | 2 -- src/locales/de_AT/person/index.ts | 6 ++---- src/locales/de_AT/person/male_middle_name.ts | 2 -- src/locales/de_AT/person/name.ts | 4 ---- src/locales/de_AT/person/nobility_title_prefix.ts | 1 + src/locales/nl/person/female_middle_name.ts | 2 -- src/locales/nl/person/index.ts | 4 ---- src/locales/nl/person/male_middle_name.ts | 2 -- src/locales/nl/person/name.ts | 4 ---- 14 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 src/locales/de/person/female_middle_name.ts delete mode 100644 src/locales/de/person/male_middle_name.ts create mode 100644 src/locales/de/person/nobility_title_prefix.ts delete mode 100644 src/locales/de_AT/person/female_middle_name.ts delete mode 100644 src/locales/de_AT/person/male_middle_name.ts create mode 100644 src/locales/de_AT/person/nobility_title_prefix.ts delete mode 100644 src/locales/nl/person/female_middle_name.ts delete mode 100644 src/locales/nl/person/male_middle_name.ts diff --git a/src/locales/de/person/female_middle_name.ts b/src/locales/de/person/female_middle_name.ts deleted file mode 100644 index ac226a8cf32..00000000000 --- a/src/locales/de/person/female_middle_name.ts +++ /dev/null @@ -1,2 +0,0 @@ -// This is a nobility title prefix, but for simplicity it acts like a middle name -export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/de/person/index.ts b/src/locales/de/person/index.ts index 687e51d5984..da73119bfca 100644 --- a/src/locales/de/person/index.ts +++ b/src/locales/de/person/index.ts @@ -4,27 +4,25 @@ */ import type { PersonDefinitions } from '../../..'; import female_first_name from './female_first_name'; -import female_middle_name from './female_middle_name'; import female_prefix from './female_prefix'; import first_name from './first_name'; import last_name from './last_name'; import male_first_name from './male_first_name'; -import male_middle_name from './male_middle_name'; import male_prefix from './male_prefix'; import name_ from './name'; +import nobility_title_prefix from './nobility_title_prefix'; import prefix from './prefix'; import sex from './sex'; const person: PersonDefinitions = { female_first_name, - female_middle_name, female_prefix, first_name, last_name, male_first_name, - male_middle_name, male_prefix, name: name_, + nobility_title_prefix, prefix, sex, }; diff --git a/src/locales/de/person/male_middle_name.ts b/src/locales/de/person/male_middle_name.ts deleted file mode 100644 index ac226a8cf32..00000000000 --- a/src/locales/de/person/male_middle_name.ts +++ /dev/null @@ -1,2 +0,0 @@ -// This is a nobility title prefix, but for simplicity it acts like a middle name -export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/de/person/name.ts b/src/locales/de/person/name.ts index 1783bbd2855..3e779a47416 100644 --- a/src/locales/de/person/name.ts +++ b/src/locales/de/person/name.ts @@ -3,9 +3,5 @@ export default [ value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { - value: '{{person.firstName}} {{person.middleName}} {{person.lastName}}', - weight: 2, - }, { value: '{{person.firstName}} {{person.lastName}}', weight: 9 }, ]; diff --git a/src/locales/de/person/nobility_title_prefix.ts b/src/locales/de/person/nobility_title_prefix.ts new file mode 100644 index 00000000000..ba3a30d7d97 --- /dev/null +++ b/src/locales/de/person/nobility_title_prefix.ts @@ -0,0 +1 @@ +export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/de_AT/person/female_middle_name.ts b/src/locales/de_AT/person/female_middle_name.ts deleted file mode 100644 index ac226a8cf32..00000000000 --- a/src/locales/de_AT/person/female_middle_name.ts +++ /dev/null @@ -1,2 +0,0 @@ -// This is a nobility title prefix, but for simplicity it acts like a middle name -export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/de_AT/person/index.ts b/src/locales/de_AT/person/index.ts index d719b98f648..3e0d9ba6d5f 100644 --- a/src/locales/de_AT/person/index.ts +++ b/src/locales/de_AT/person/index.ts @@ -4,26 +4,24 @@ */ import type { PersonDefinitions } from '../../..'; import female_first_name from './female_first_name'; -import female_middle_name from './female_middle_name'; import female_prefix from './female_prefix'; import first_name from './first_name'; import last_name from './last_name'; import male_first_name from './male_first_name'; -import male_middle_name from './male_middle_name'; import male_prefix from './male_prefix'; import name_ from './name'; +import nobility_title_prefix from './nobility_title_prefix'; import prefix from './prefix'; const person: PersonDefinitions = { female_first_name, - female_middle_name, female_prefix, first_name, last_name, male_first_name, - male_middle_name, male_prefix, name: name_, + nobility_title_prefix, prefix, }; diff --git a/src/locales/de_AT/person/male_middle_name.ts b/src/locales/de_AT/person/male_middle_name.ts deleted file mode 100644 index ac226a8cf32..00000000000 --- a/src/locales/de_AT/person/male_middle_name.ts +++ /dev/null @@ -1,2 +0,0 @@ -// This is a nobility title prefix, but for simplicity it acts like a middle name -export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/de_AT/person/name.ts b/src/locales/de_AT/person/name.ts index 4c89d923f91..2b844dc786a 100644 --- a/src/locales/de_AT/person/name.ts +++ b/src/locales/de_AT/person/name.ts @@ -3,9 +3,5 @@ export default [ value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}', weight: 1, }, - { - value: '{{person.firstName}} {{person.middleName}} {{person.lastName}}', - weight: 2, - }, { value: '{{person.firstName}} {{person.lastName}}', weight: 5 }, ]; diff --git a/src/locales/de_AT/person/nobility_title_prefix.ts b/src/locales/de_AT/person/nobility_title_prefix.ts new file mode 100644 index 00000000000..ba3a30d7d97 --- /dev/null +++ b/src/locales/de_AT/person/nobility_title_prefix.ts @@ -0,0 +1 @@ +export default ['zu', 'von', 'vom', 'von der']; diff --git a/src/locales/nl/person/female_middle_name.ts b/src/locales/nl/person/female_middle_name.ts deleted file mode 100644 index 4a985e28e87..00000000000 --- a/src/locales/nl/person/female_middle_name.ts +++ /dev/null @@ -1,2 +0,0 @@ -// This is a tussenvoegsel, but it acts like a middle name -export default ['van', 'van de', 'van den', "van 't", 'van het', 'de', 'den']; diff --git a/src/locales/nl/person/index.ts b/src/locales/nl/person/index.ts index 0a6b37dc26c..eb000343bc3 100644 --- a/src/locales/nl/person/index.ts +++ b/src/locales/nl/person/index.ts @@ -4,12 +4,10 @@ */ import type { PersonDefinitions } from '../../..'; import female_first_name from './female_first_name'; -import female_middle_name from './female_middle_name'; import female_prefix from './female_prefix'; import first_name from './first_name'; import last_name from './last_name'; import male_first_name from './male_first_name'; -import male_middle_name from './male_middle_name'; import male_prefix from './male_prefix'; import name_ from './name'; import prefix from './prefix'; @@ -17,12 +15,10 @@ import suffix from './suffix'; const person: PersonDefinitions = { female_first_name, - female_middle_name, female_prefix, first_name, last_name, male_first_name, - male_middle_name, male_prefix, name: name_, prefix, diff --git a/src/locales/nl/person/male_middle_name.ts b/src/locales/nl/person/male_middle_name.ts deleted file mode 100644 index 4a985e28e87..00000000000 --- a/src/locales/nl/person/male_middle_name.ts +++ /dev/null @@ -1,2 +0,0 @@ -// This is a tussenvoegsel, but it acts like a middle name -export default ['van', 'van de', 'van den', "van 't", 'van het', 'de', 'den']; diff --git a/src/locales/nl/person/name.ts b/src/locales/nl/person/name.ts index 09b0296c0f5..eb76dabb32d 100644 --- a/src/locales/nl/person/name.ts +++ b/src/locales/nl/person/name.ts @@ -8,8 +8,4 @@ export default [ weight: 1, }, { value: '{{person.firstName}} {{person.lastName}}', weight: 8 }, - { - value: '{{person.firstName}} {{person.middleName}} {{person.lastName}}', - weight: 1, - }, ]; From b0319d7a99e7d3749b181227445f4ec45b48799e Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Sat, 28 Jan 2023 13:48:06 +0700 Subject: [PATCH 16/18] rv tussenvoegsel in nl --- src/locales/nl/person/index.ts | 2 ++ src/locales/nl/person/tussenvoegsel.ts | 1 + 2 files changed, 3 insertions(+) create mode 100644 src/locales/nl/person/tussenvoegsel.ts diff --git a/src/locales/nl/person/index.ts b/src/locales/nl/person/index.ts index eb000343bc3..c93db9e8cc9 100644 --- a/src/locales/nl/person/index.ts +++ b/src/locales/nl/person/index.ts @@ -12,6 +12,7 @@ import male_prefix from './male_prefix'; import name_ from './name'; import prefix from './prefix'; import suffix from './suffix'; +import tussenvoegsel from './tussenvoegsel'; const person: PersonDefinitions = { female_first_name, @@ -23,6 +24,7 @@ const person: PersonDefinitions = { name: name_, prefix, suffix, + tussenvoegsel, }; export default person; diff --git a/src/locales/nl/person/tussenvoegsel.ts b/src/locales/nl/person/tussenvoegsel.ts new file mode 100644 index 00000000000..cd7f275bf51 --- /dev/null +++ b/src/locales/nl/person/tussenvoegsel.ts @@ -0,0 +1 @@ +export default ['van', 'van de', 'van den', "van 't", 'van het', 'de', 'den']; From d6b63563820ff8f503c8f91df678f845994e9975 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Sun, 29 Jan 2023 00:11:30 +0700 Subject: [PATCH 17/18] parse options first, remove unused gender substitution, update tests --- src/modules/person/index.ts | 12 +++++++----- test/__snapshots__/person.spec.ts.snap | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/modules/person/index.ts b/src/modules/person/index.ts index 6557d6d3af2..da30fee7c4e 100644 --- a/src/modules/person/index.ts +++ b/src/modules/person/index.ts @@ -181,19 +181,21 @@ export class PersonModule { sex?: SexType; } = {} ): string { - const sex = - options.sex || this.faker.helpers.arrayElement([Sex.Female, Sex.Male]); + const { + sex = this.faker.helpers.arrayElement([Sex.Female, Sex.Male]), + firstName = this.firstName(sex), + lastName = this.lastName(sex), + } = options; const fullNamePattern: string = this.faker.helpers.weightedArrayElement( this.faker.definitions.person.name ); const fullName = this.faker.helpers.mustache(fullNamePattern, { - 'person.gender': () => this.gender(), 'person.prefix': () => this.prefix(sex), - 'person.firstName': () => options.firstName || this.firstName(sex), + 'person.firstName': () => firstName, 'person.middleName': () => this.middleName(sex), - 'person.lastName': () => options.lastName || this.lastName(sex), + 'person.lastName': () => lastName, 'person.suffix': () => this.suffix(), }); return fullName; diff --git a/test/__snapshots__/person.spec.ts.snap b/test/__snapshots__/person.spec.ts.snap index 1ad7e3ea0f4..5a1ae8ca7d4 100644 --- a/test/__snapshots__/person.spec.ts.snap +++ b/test/__snapshots__/person.spec.ts.snap @@ -6,15 +6,15 @@ exports[`person > 42 > firstName > noArgs 1`] = `"Garnet"`; exports[`person > 42 > firstName > with sex 1`] = `"Glen"`; -exports[`person > 42 > fullName > noArgs 1`] = `"Dr. Tina Reynolds"`; +exports[`person > 42 > fullName > noArgs 1`] = `"Sadie Wiegand"`; exports[`person > 42 > fullName > with all (sex) 1`] = `"John Doe"`; -exports[`person > 42 > fullName > with firstName 1`] = `"Dr. John Deckow"`; +exports[`person > 42 > fullName > with firstName 1`] = `"John Schinner I"`; -exports[`person > 42 > fullName > with lastName 1`] = `"Dr. Tina Doe"`; +exports[`person > 42 > fullName > with lastName 1`] = `"Sadie Doe I"`; -exports[`person > 42 > fullName > with sex 1`] = `"Sadie Wiegand"`; +exports[`person > 42 > fullName > with sex 1`] = `"Melanie Schinner I"`; exports[`person > 42 > gender 1`] = `"Gender nonconforming"`; @@ -56,15 +56,15 @@ exports[`person > 1211 > firstName > noArgs 1`] = `"Tito"`; exports[`person > 1211 > firstName > with sex 1`] = `"Percy"`; -exports[`person > 1211 > fullName > noArgs 1`] = `"Darrel Satterfield"`; +exports[`person > 1211 > fullName > noArgs 1`] = `"Mr. Claude Trantow"`; exports[`person > 1211 > fullName > with all (sex) 1`] = `"John Doe IV"`; -exports[`person > 1211 > fullName > with firstName 1`] = `"John Trantow"`; +exports[`person > 1211 > fullName > with firstName 1`] = `"John Koelpin DDS"`; -exports[`person > 1211 > fullName > with lastName 1`] = `"Darrel Doe"`; +exports[`person > 1211 > fullName > with lastName 1`] = `"Claude Doe DDS"`; -exports[`person > 1211 > fullName > with sex 1`] = `"Joy Trantow DDS"`; +exports[`person > 1211 > fullName > with sex 1`] = `"Patti Koelpin DDS"`; exports[`person > 1211 > gender 1`] = `"Trigender"`; @@ -106,15 +106,15 @@ exports[`person > 1337 > firstName > noArgs 1`] = `"Devyn"`; exports[`person > 1337 > firstName > with sex 1`] = `"Ray"`; -exports[`person > 1337 > fullName > noArgs 1`] = `"Marilyn Effertz"`; +exports[`person > 1337 > fullName > noArgs 1`] = `"Leona Cronin"`; exports[`person > 1337 > fullName > with all (sex) 1`] = `"John Doe"`; -exports[`person > 1337 > fullName > with firstName 1`] = `"John Cronin"`; +exports[`person > 1337 > fullName > with firstName 1`] = `"John MacGyver"`; -exports[`person > 1337 > fullName > with lastName 1`] = `"Marilyn Doe"`; +exports[`person > 1337 > fullName > with lastName 1`] = `"Leona Doe"`; -exports[`person > 1337 > fullName > with sex 1`] = `"Leona Cronin"`; +exports[`person > 1337 > fullName > with sex 1`] = `"Esther MacGyver"`; exports[`person > 1337 > gender 1`] = `"Demigender"`; From c3ccd262a7e9c47494f6ba871c607e921ac9498b Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Thu, 2 Feb 2023 09:07:18 +0700 Subject: [PATCH 18/18] fix new lint error --- src/definitions/person.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/definitions/person.ts b/src/definitions/person.ts index 0f2889c4dfa..b6096e81e2f 100644 --- a/src/definitions/person.ts +++ b/src/definitions/person.ts @@ -28,7 +28,7 @@ export type PersonDefinitions = LocaleEntry<{ /** * A weighted list of patterns used to generate names. */ - name: { value: string; weight: number }[]; + name: Array<{ value: string; weight: number }>; bio_patterns?: string[];