Merge branch 'next' into coding-style/helpers

src/definitions/internet.ts

@@ -31,4 +31,9 @@ export type InternetDefinition = LocaleEntry<{
   http_status_code: Record<HTTPStatusCodeType, number[]>;
 
   jwt_algorithm: string[];
+
+  /**
+   * List of user agent patterns.
+   */
+  user_agent_pattern: string[];
 }>;

src/definitions/location.ts

@@ -1,3 +1,4 @@
+import type { Language } from '../modules/location';
 import type { LocaleEntry } from './definitions';
 
 /**
@@ -147,4 +148,11 @@ export type LocationDefinition = LocaleEntry<{
    * @see [IANA Time Zone Database](https://www.iana.org/time-zones)
    */
   time_zone: string[];
+
+  /**
+   * A list of spoken languages.
+   *
+   * @see [ISO 639-2 Language Code List](https://www.loc.gov/standards/iso639-2/php/code_list.php)
+   */
+  language: Language[];
 }>;

src/locales/base/internet/index.ts

@@ -6,11 +6,13 @@ import type { InternetDefinition } from '../../..';
 import emoji from './emoji';
 import http_status_code from './http_status_code';
 import jwt_algorithm from './jwt_algorithm';
+import user_agent_pattern from './user_agent_pattern';
 
 const internet: InternetDefinition = {
   emoji,
   http_status_code,
   jwt_algorithm,
+  user_agent_pattern,
 };
 
 export default internet;

src/locales/base/internet/user_agent_pattern.ts

@@ -0,0 +1,22 @@
+export default [
+  //typical IE user agent on Windows
+  'Mozilla/5.0 (compatible; MSIE {{number.int({"min":6,"max":10})}}.0; Windows NT {{helpers.arrayElement(["5.1","5.2","6.0","6.1","6.2","6.3","10.0"])}}; Trident/{{number.int({"min":4,"max":7})}}.0)',
+  //typical Edge user agent on Windows
+  'Mozilla/5.0 (Windows NT {{helpers.arrayElement(["5.1","5.2","6.0","6.1","6.2","6.3","10.0"])}}; Win64; x64) AppleWebKit/{{number.int({"min":536,"max":605})}}.{{number.int({"min":0,"max":99})}} (KHTML, like Gecko) Chrome/{{number.int({"min":55,"max":131})}}.{{system.semver}} Safari/{{number.int({"min":536,"max":605})}}.{{number.int({"min":0,"max":99})}} Edg/{{number.int({"min":110,"max":131})}}.{{system.semver}}',
+  //typical Safari user agent on MacOS
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/{{number.int({"min":536,"max":605})}}.{{number.int({"min":0,"max":99})}}.{{number.int({"min":0,"max":99})}} (KHTML, like Gecko) Version/16.1 Safari/{{number.int({"min":536,"max":605})}}.{{number.int({"min":0,"max":99})}}.{{number.int({"min":0,"max":99})}}',
+  //typical Firefox user agent on MacOS
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:{{number.int({"min":75, "max":133})}}.0) Gecko/20100101 Firefox/{{number.int({"min":75, "max":133})}}.0',
+  //typical Chrome user agent on MacOS
+  'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_15_7) AppleWebKit/{{number.int({"min":536,"max":605})}}.{{number.int({"min":0,"max":99})}}.{{number.int({"min":0,"max":99})}} (KHTML, like Gecko) Chrome/{{number.int({"min":55,"max":131})}}.{{system.semver}} Safari/{{number.int({"min":536,"max":605})}}.{{number.int({"min":0,"max":99})}}.{{number.int({"min":0,"max":99})}}',
+  //typical Firefox user agent on Linux
+  'Mozilla/5.0 (X11; Linux x86_64; rv:{{number.int({"min":75,"max":133})}}.0) Gecko/20100101 Firefox/{{number.int({"min":75,"max":133})}}.0',
+  //typical user agent for a bot
+  'FakerBot/{{system.semver}}',
+  //typical Googlebot user agent
+  'Googlebot/2.1 (+http://www.google.com/bot.html)',
+  //typical Safari user agent on iOS
+  'Mozilla/5.0 (iPhone; CPU iPhone OS {{number.int({"min":10,"max":18})}}_{{number.int({"min":0,"max":4})}} like Mac OS X) AppleWebKit/{{number.int({"min":536,"max":605})}}.{{number.int({"min":0,"max":99})}}.{{number.int({"min":0,"max":99})}} (KHTML, like Gecko) Version/{{number.int({"min":10,"max":18})}}_{{number.int({"min":0,"max":4})}} Mobile/15E148 Safari/{{number.int({"min":536,"max":605})}}.{{number.int({"min":0,"max":99})}}',
+  //typical Chrome user agent on Android
+  'Mozilla/5.0 (Linux; Android {{number.int({"min":5,"max":13})}}; {{helpers.arrayElement(["SM-G998U","SM-G998B","SM-G998N","SM-G998P","SM-T800"])}}) AppleWebKit/{{number.int({"min":536,"max":605})}}.{{number.int({"min":0,"max":99})}} (KHTML, like Gecko) Chrome/{{number.int({"min":55,"max":131})}}.{{system.semver}} Mobile Safari/{{number.int({"min":536,"max":605})}}.{{number.int({"min":0,"max":99})}}',
+];

src/locales/de/animal/index.ts

@@ -0,0 +1,12 @@
+/*
+ * This file is automatically generated.
+ * Run 'pnpm run generate:locales' to update.
+ */
+import type { AnimalDefinition } from '../../..';
+import type_ from './type';
+
+const animal: AnimalDefinition = {
+  type: type_,
+};
+
+export default animal;

src/locales/de/animal/type.ts

@@ -0,0 +1,46 @@
+export default [
+  'Adler',
+  'Affe',
+  'Biene',
+  'Bär',
+  'Delfin',
+  'Eichhörnchen',
+  'Eisbär',
+  'Elefant',
+  'Fisch',
+  'Flamingo',
+  'Fledermaus',
+  'Frosch',
+  'Fuchs',
+  'Gecko',
+  'Giraffe',
+  'Gorilla',
+  'Hai',
+  'Hamster',
+  'Hund',
+  'Kaninchen',
+  'Katze',
+  'Koala',
+  'Krokodil',
+  'Kuh',
+  'Känguru',
+  'Löwe',
+  'Nashorn',
+  'Nilpferd',
+  'Panda',
+  'Papagei',
+  'Pfau',
+  'Pferd',
+  'Pinguin',
+  'Reh',
+  'Schildkröte',
+  'Schlange',
+  'Schmetterling',
+  'Seelöwe',
+  'Strauß',
+  'Tiger',
+  'Vogel',
+  'Wal',
+  'Wolf',
+  'Zebra',
+];

src/locales/de/index.ts

@@ -3,6 +3,7 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
+import animal from './animal';
 import cell_phone from './cell_phone';
 import color from './color';
 import company from './company';
@@ -23,6 +24,7 @@ import word from './word';
  * - Endonym: Deutsch
  */
 const de: LocaleDefinition = {
+  animal,
   cell_phone,
   color,
   company,

src/locales/en/location/index.ts

@@ -12,6 +12,7 @@ import continent from './continent';
 import country from './country';
 import county from './county';
 import direction from './direction';
+import language from './language';
 import postcode from './postcode';
 import secondary_address from './secondary_address';
 import state from './state';
@@ -31,6 +32,7 @@ const location: LocationDefinition = {
   country,
   county,
   direction,
+  language,
   postcode,
   secondary_address,
   state,

src/locales/en/location/language.ts

@@ -0,0 +1,73 @@
+export default [
+  { name: 'Afrikaans', alpha2: 'af', alpha3: 'afr' },
+  { name: 'Azerbaijani', alpha2: 'az', alpha3: 'aze' },
+  { name: 'Maldivian', alpha2: 'dv', alpha3: 'div' },
+  { name: 'Farsi/Persian', alpha2: 'fa', alpha3: 'fas' },
+  { name: 'Latvian', alpha2: 'lv', alpha3: 'lav' },
+  { name: 'Indonesian', alpha2: 'id', alpha3: 'ind' },
+  { name: 'Nepali', alpha2: 'ne', alpha3: 'nep' },
+  { name: 'Thai', alpha2: 'th', alpha3: 'tha' },
+  { name: 'Uzbek', alpha2: 'uz', alpha3: 'uzb' },
+  { name: 'Yoruba', alpha2: 'yo', alpha3: 'yor' },
+  { name: 'Pashto', alpha2: 'ps', alpha3: 'pus' },
+  { name: 'English', alpha2: 'en', alpha3: 'eng' },
+  { name: 'Urdu', alpha2: 'ur', alpha3: 'urd' },
+  { name: 'German', alpha2: 'de', alpha3: 'deu' },
+  { name: 'French', alpha2: 'fr', alpha3: 'fra' },
+  { name: 'Spanish', alpha2: 'es', alpha3: 'spa' },
+  { name: 'Italian', alpha2: 'it', alpha3: 'ita' },
+  { name: 'Dutch', alpha2: 'nl', alpha3: 'nld' },
+  { name: 'Russian', alpha2: 'ru', alpha3: 'rus' },
+  { name: 'Portuguese', alpha2: 'pt', alpha3: 'por' },
+  { name: 'Polish', alpha2: 'pl', alpha3: 'pol' },
+  { name: 'Arabic', alpha2: 'ar', alpha3: 'ara' },
+  { name: 'Japanese', alpha2: 'ja', alpha3: 'jpn' },
+  { name: 'Chinese', alpha2: 'zh', alpha3: 'zho' },
+  { name: 'Hindi', alpha2: 'hi', alpha3: 'hin' },
+  { name: 'Bengali', alpha2: 'bn', alpha3: 'ben' },
+  { name: 'Gujarati', alpha2: 'gu', alpha3: 'guj' },
+  { name: 'Tamil', alpha2: 'ta', alpha3: 'tam' },
+  { name: 'Telugu', alpha2: 'te', alpha3: 'tel' },
+  { name: 'Punjabi', alpha2: 'pa', alpha3: 'pan' },
+  { name: 'Vietnamese', alpha2: 'vi', alpha3: 'vie' },
+  { name: 'Korean', alpha2: 'ko', alpha3: 'kor' },
+  { name: 'Turkish', alpha2: 'tr', alpha3: 'tur' },
+  { name: 'Swedish', alpha2: 'sv', alpha3: 'swe' },
+  { name: 'Greek', alpha2: 'el', alpha3: 'ell' },
+  { name: 'Czech', alpha2: 'cs', alpha3: 'ces' },
+  { name: 'Hungarian', alpha2: 'hu', alpha3: 'hun' },
+  { name: 'Romanian', alpha2: 'ro', alpha3: 'ron' },
+  { name: 'Ukrainian', alpha2: 'uk', alpha3: 'ukr' },
+  { name: 'Norwegian', alpha2: 'no', alpha3: 'nor' },
+  { name: 'Serbian', alpha2: 'sr', alpha3: 'srp' },
+  { name: 'Croatian', alpha2: 'hr', alpha3: 'hrv' },
+  { name: 'Slovak', alpha2: 'sk', alpha3: 'slk' },
+  { name: 'Slovenian', alpha2: 'sl', alpha3: 'slv' },
+  { name: 'Icelandic', alpha2: 'is', alpha3: 'isl' },
+  { name: 'Finnish', alpha2: 'fi', alpha3: 'fin' },
+  { name: 'Danish', alpha2: 'da', alpha3: 'dan' },
+  { name: 'Swahili', alpha2: 'sw', alpha3: 'swa' },
+  { name: 'Bashkir', alpha2: 'ba', alpha3: 'bak' },
+  { name: 'Basque', alpha2: 'eu', alpha3: 'eus' },
+  { name: 'Catalan', alpha2: 'ca', alpha3: 'cat' },
+  { name: 'Galician', alpha2: 'gl', alpha3: 'glg' },
+  { name: 'Esperanto', alpha2: 'eo', alpha3: 'epo' },
+  { name: 'Fijian', alpha2: 'fj', alpha3: 'fij' },
+  { name: 'Malagasy', alpha2: 'mg', alpha3: 'mlg' },
+  { name: 'Maltese', alpha2: 'mt', alpha3: 'mlt' },
+  { name: 'Albanian', alpha2: 'sq', alpha3: 'sqi' },
+  { name: 'Armenian', alpha2: 'hy', alpha3: 'hye' },
+  { name: 'Georgian', alpha2: 'ka', alpha3: 'kat' },
+  { name: 'Macedonian', alpha2: 'mk', alpha3: 'mkd' },
+  { name: 'Kazakh', alpha2: 'kk', alpha3: 'kaz' },
+  { name: 'Haitian Creole', alpha2: 'ht', alpha3: 'hat' },
+  { name: 'Mongolian', alpha2: 'mn', alpha3: 'mon' },
+  { name: 'Kyrgyz', alpha2: 'ky', alpha3: 'kir' },
+  { name: 'Finnish', alpha2: 'fi', alpha3: 'fin' },
+  { name: 'Tagalog', alpha2: 'tl', alpha3: 'tgl' },
+  { name: 'Malay', alpha2: 'ms', alpha3: 'msa' },
+  { name: 'Tajik', alpha2: 'tg', alpha3: 'tgk' },
+  { name: 'Swati', alpha2: 'ss', alpha3: 'ssw' },
+  { name: 'Tatar', alpha2: 'tt', alpha3: 'tat' },
+  { name: 'Zulu', alpha2: 'zu', alpha3: 'zul' },
+];

src/locales/ur/location/index.ts

@@ -10,6 +10,7 @@ import city_prefix from './city_prefix';
 import city_suffix from './city_suffix';
 import country from './country';
 import direction from './direction';
+import language from './language';
 import postcode from './postcode';
 import secondary_address from './secondary_address';
 import state from './state';
@@ -26,6 +27,7 @@ const location: LocationDefinition = {
   city_suffix,
   country,
   direction,
+  language,
   postcode,
   secondary_address,
   state,

src/locales/ur/location/language.ts

@@ -0,0 +1,33 @@
+export default [
+  { name: 'پشتو', alpha2: 'ps', alpha3: 'pus' },
+  { name: 'اردو', alpha2: 'ur', alpha3: 'urd' },
+  { name: 'انگریزی', alpha2: 'en', alpha3: 'eng' },
+  { name: 'جرمن', alpha2: 'de', alpha3: 'deu' },
+  { name: 'فرانسیسی', alpha2: 'fr', alpha3: 'fra' },
+  { name: 'اسپینش', alpha2: 'es', alpha3: 'spa' },
+  { name: 'دچ', alpha2: 'nl', alpha3: 'nld' },
+  { name: 'روسی', alpha2: 'ru', alpha3: 'rus' },
+  { name: 'پرتگالی', alpha2: 'pt', alpha3: 'por' },
+  { name: 'پولش', alpha2: 'pl', alpha3: 'pol' },
+  { name: 'عربی', alpha2: 'ar', alpha3: 'ara' },
+  { name: 'جاپانی', alpha2: 'ja', alpha3: 'jpn' },
+  { name: 'چینی', alpha2: 'zh', alpha3: 'zho' },
+  { name: 'ہندی', alpha2: 'hi', alpha3: 'hin' },
+  { name: 'بنگالی', alpha2: 'bn', alpha3: 'ben' },
+  { name: 'تمل', alpha2: 'ta', alpha3: 'tam' },
+  { name: 'تلگو', alpha2: 'te', alpha3: 'tel' },
+  { name: 'پنجابی', alpha2: 'pa', alpha3: 'pan' },
+  { name: 'ترکی', alpha2: 'tr', alpha3: 'tur' },
+  { name: 'سویڈش', alpha2: 'sv', alpha3: 'swe' },
+  { name: 'یونانی', alpha2: 'el', alpha3: 'ell' },
+  { name: 'چیک', alpha2: 'cs', alpha3: 'ces' },
+  { name: 'ہنگرین', alpha2: 'hu', alpha3: 'hun' },
+  { name: 'نارویجن', alpha2: 'no', alpha3: 'nor' },
+  { name: 'کروشیائی', alpha2: 'hr', alpha3: 'hrv' },
+  { name: 'سلوواک', alpha2: 'sk', alpha3: 'slk' },
+  { name: 'سلووینیائی', alpha2: 'sl', alpha3: 'slv' },
+  { name: 'فنش', alpha2: 'fi', alpha3: 'fin' },
+  { name: 'دنش', alpha2: 'da', alpha3: 'dan' },
+  { name: 'مالٹی', alpha2: 'mt', alpha3: 'mlt' },
+  { name: 'تاجک', alpha2: 'tg', alpha3: 'tgk' },
+];

src/modules/internet/index.ts

@@ -4,7 +4,6 @@ import { toBase64Url } from '../../internal/base64';
 import { deprecated } from '../../internal/deprecated';
 import { ModuleBase } from '../../internal/module-base';
 import { charMapping } from './char-mappings';
-import * as random_ua from './user-agent';
 
 export type EmojiType =
   | 'smiley'
@@ -798,12 +797,14 @@ export class InternetModule extends ModuleBase {
    *
    * @example
    * faker.internet.userAgent()
-   * // 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_8_8)  AppleWebKit/536.0.2 (KHTML, like Gecko) Chrome/27.0.849.0 Safari/536.0.2'
+   * // 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_1 like Mac OS X) AppleWebKit/537.19.86 (KHTML, like Gecko) Version/18_3 Mobile/15E148 Safari/598.43'
    *
    * @since 2.0.1
    */
   userAgent(): string {
-    return random_ua.generate(this.faker);
+    return this.faker.helpers.fake(
+      this.faker.definitions.internet.user_agent_pattern
+    );
   }
 
   /**