diff --git a/.eslintrc.cjs b/.eslintrc.cjs index a5cb75ff9d8..cf0f611caf8 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -80,6 +80,12 @@ module.exports = defineConfig({ trailingUnderscore: 'forbid', }, ], + '@typescript-eslint/no-confusing-void-expression': [ + 'error', + { + ignoreArrowShorthand: true, + }, + ], '@typescript-eslint/no-inferrable-types': [ 'error', { ignoreParameters: true }, @@ -114,10 +120,6 @@ module.exports = defineConfig({ '@typescript-eslint/unbound-method': 'off', '@typescript-eslint/unified-signatures': 'off', // incompatible with our api docs generation - // TODO @ST-DDT 2023-10-10: The following rules currently conflict with our code. - // Each rule should be checked whether it should be enabled/configured and the problems fixed, or stay disabled permanently. - '@typescript-eslint/no-confusing-void-expression': 'off', - 'jsdoc/require-jsdoc': 'off', // Enabled only for src/**/*.ts 'jsdoc/require-returns': 'off', 'jsdoc/sort-tags': [ @@ -164,12 +166,6 @@ module.exports = defineConfig({ 'error', { case: 'snakeCase', - // TODO @ST-DDT 2023-10-21: rename the definitions in v9 - ignore: [ - /chemicalElement\.ts$/, - /directoryPaths\.ts$/, - /mimeTypes\.ts$/, - ], }, ], 'unicorn/text-encoding-identifier-case': 'off', diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe0ad5cea5a..627992e4dde 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - node_version: [18, 20] + node_version: [18, 20, 22] fail-fast: false timeout-minutes: 10 @@ -122,7 +122,7 @@ jobs: lint: runs-on: ubuntu-latest timeout-minutes: 10 - name: 'Lint: node-20, ubuntu-latest' + name: 'Lint: node-22, ubuntu-latest' steps: - name: Checkout uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 @@ -132,10 +132,10 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0 - - name: Set node version to 20 + - name: Set node version to 22 uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: - node-version: 20 + node-version: 22 cache: 'pnpm' - name: Install deps @@ -152,7 +152,7 @@ jobs: ts-check: runs-on: ubuntu-latest timeout-minutes: 10 - name: 'TS-Check: node-20, ubuntu-latest' + name: 'TS-Check: node-22, ubuntu-latest' steps: - name: Checkout uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 @@ -162,10 +162,10 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0 - - name: Set node version to 20 + - name: Set node version to 22 uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: - node-version: 20 + node-version: 22 cache: 'pnpm' - name: Install deps @@ -182,7 +182,7 @@ jobs: codecov: runs-on: ubuntu-latest timeout-minutes: 10 - name: 'Codecov: node-20, ubuntu-latest' + name: 'Codecov: node-22, ubuntu-latest' steps: - name: Checkout uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 @@ -192,10 +192,10 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0 - - name: Set node version to 20 + - name: Set node version to 22 uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: - node-version: 20 + node-version: 22 cache: 'pnpm' - name: Install deps diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 1b36e8e7502..7c631d13c5b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ jobs: check-code-generation: runs-on: ubuntu-latest timeout-minutes: 10 - name: 'Check Code Generation: node-20, ubuntu-latest' + name: 'Check Code Generation: node-22, ubuntu-latest' permissions: pull-requests: write steps: @@ -22,10 +22,10 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0 - - name: Set node version to 20 + - name: Set node version to 22 uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: - node-version: 20 + node-version: 22 cache: 'pnpm' - name: Install deps diff --git a/docs/guide/upgrading.md b/docs/guide/upgrading.md index 1981c501276..653570b6eba 100644 --- a/docs/guide/upgrading.md +++ b/docs/guide/upgrading.md @@ -480,6 +480,28 @@ Renamed deprecated locale aliases `cz`, `en_IND`, `ge` and removed `global`. | `import { faker } from '@faker-js/faker/locale/ge'` | `import { faker } from '@faker-js/faker/locale/ka_GE'` | | `import { faker } from '@faker-js/faker/locale/global'` | `import { faker } from '@faker-js/faker/locale/base'` | +### Renamed Locale Definitions + +The following locale definitions have been renamed + +| old | replacement | +| ------------------------------------------- | -------------------------------------------- | +| `faker.definitions.science.chemicalElement` | `faker.definitions.science.chemical_element` | +| `faker.definitions.system.directoryPaths` | `faker.definitions.system.directory_paths` | +| `faker.definitions.system.mimeTypes` | `faker.definitions.system.mime_types` | + +With that now all our locale data use the following naming scheme: + +```txt +faker.definitions.category_name.entry_name +``` + +Please keep in mind that property keys of complex objects remain in camel-case. + +```txt +faker.definitions.science.chemical_element.atomicNumber +``` + ### Type Aliases Removed deprecated type aliases diff --git a/scripts/generate-locales.ts b/scripts/generate-locales.ts index 41b2e108e1f..933215a1ed3 100644 --- a/scripts/generate-locales.ts +++ b/scripts/generate-locales.ts @@ -312,7 +312,6 @@ async function normalizeLocaleFile(filePath: string, definitionKey: string) { const legacyDefinitions = ['app', 'cell_phone', 'team']; const definitionsToSkip = [ - 'finance', 'internet', 'location', 'lorem', diff --git a/src/definitions/science.ts b/src/definitions/science.ts index a2fa995b73c..01f791f8a9d 100644 --- a/src/definitions/science.ts +++ b/src/definitions/science.ts @@ -13,5 +13,5 @@ export type ScienceDefinition = LocaleEntry<{ /** * Some periodic table element information. */ - chemicalElement: ReadonlyArray; + chemical_element: ReadonlyArray; }>; diff --git a/src/definitions/system.ts b/src/definitions/system.ts index 86868c632ad..72f5c98a7d1 100644 --- a/src/definitions/system.ts +++ b/src/definitions/system.ts @@ -7,12 +7,12 @@ export type SystemDefinition = LocaleEntry<{ /** * Returns some common file paths. */ - directoryPaths: string[]; + directory_paths: string[]; /** * The mime type definitions with some additional information. */ - mimeTypes: { [mimeType: string]: SystemMimeTypeEntryDefinition }; + mime_types: { [mimeType: string]: SystemMimeTypeEntryDefinition }; }>; /** diff --git a/src/locales/base/system/directoryPaths.ts b/src/locales/base/system/directory_paths.ts similarity index 100% rename from src/locales/base/system/directoryPaths.ts rename to src/locales/base/system/directory_paths.ts diff --git a/src/locales/base/system/index.ts b/src/locales/base/system/index.ts index 122bee499c7..5d6a50968a2 100644 --- a/src/locales/base/system/index.ts +++ b/src/locales/base/system/index.ts @@ -3,12 +3,12 @@ * Run 'pnpm run generate:locales' to update. */ import type { SystemDefinition } from '../../..'; -import directoryPaths from './directoryPaths'; -import mimeTypes from './mimeTypes'; +import directory_paths from './directory_paths'; +import mime_types from './mime_types'; const system: SystemDefinition = { - directoryPaths, - mimeTypes, + directory_paths, + mime_types, }; export default system; diff --git a/src/locales/base/system/mimeTypes.ts b/src/locales/base/system/mime_types.ts similarity index 100% rename from src/locales/base/system/mimeTypes.ts rename to src/locales/base/system/mime_types.ts diff --git a/src/locales/el/finance/account_type.ts b/src/locales/el/finance/account_type.ts index 5b84d30c81d..7617d6dfd5c 100644 --- a/src/locales/el/finance/account_type.ts +++ b/src/locales/el/finance/account_type.ts @@ -1 +1 @@ -export default ['Καταθετικός', 'Μισθοδοσίας', 'Δανειακός']; +export default ['Δανειακός', 'Καταθετικός', 'Μισθοδοσίας']; diff --git a/src/locales/el/finance/credit_card/discover.ts b/src/locales/el/finance/credit_card/discover.ts index f9a710c8503..7a719ee01df 100644 --- a/src/locales/el/finance/credit_card/discover.ts +++ b/src/locales/el/finance/credit_card/discover.ts @@ -1,8 +1,8 @@ export default [ '/6011-####-####-###L/', - '/65##-####-####-###L/', - '/64[4-9]#-####-####-###L/', '/6011-62##-####-####-###L/', - '/65##-62##-####-####-###L/', + '/64[4-9]#-####-####-###L/', '/64[4-9]#-62##-####-####-###L/', + '/65##-####-####-###L/', + '/65##-62##-####-####-###L/', ]; diff --git a/src/locales/el/finance/credit_card/mastercard.ts b/src/locales/el/finance/credit_card/mastercard.ts index 857493ac18c..16770c32aa4 100644 --- a/src/locales/el/finance/credit_card/mastercard.ts +++ b/src/locales/el/finance/credit_card/mastercard.ts @@ -1 +1 @@ -export default ['5[1-5]##-####-####-###L', '2[221-720]-####-####-###L']; +export default ['2[221-720]-####-####-###L', '5[1-5]##-####-####-###L']; diff --git a/src/locales/el/finance/transaction_type.ts b/src/locales/el/finance/transaction_type.ts index 51f65625093..ffd333a1e50 100644 --- a/src/locales/el/finance/transaction_type.ts +++ b/src/locales/el/finance/transaction_type.ts @@ -1 +1 @@ -export default ['κατάθεση', 'ανάληψη', 'πληρωμή', 'τιμολόγιο']; +export default ['ανάληψη', 'κατάθεση', 'πληρωμή', 'τιμολόγιο']; diff --git a/src/locales/en/finance/account_type.ts b/src/locales/en/finance/account_type.ts index 5e656c2d8ac..625151259ba 100644 --- a/src/locales/en/finance/account_type.ts +++ b/src/locales/en/finance/account_type.ts @@ -1,10 +1,10 @@ export default [ + 'Auto Loan', 'Checking', - 'Savings', - 'Money Market', - 'Investment', - 'Home Loan', 'Credit Card', - 'Auto Loan', + 'Home Loan', + 'Investment', + 'Money Market', 'Personal Loan', + 'Savings', ]; diff --git a/src/locales/en/finance/credit_card/discover.ts b/src/locales/en/finance/credit_card/discover.ts index 23a8f6d5f11..462c3f43bcc 100644 --- a/src/locales/en/finance/credit_card/discover.ts +++ b/src/locales/en/finance/credit_card/discover.ts @@ -1,8 +1,8 @@ export default [ '6011-####-####-###L', - '65##-####-####-###L', - '64[4-9]#-####-####-###L', '6011-62##-####-####-###L', - '65##-62##-####-####-###L', + '64[4-9]#-####-####-###L', '64[4-9]#-62##-####-####-###L', + '65##-####-####-###L', + '65##-62##-####-####-###L', ]; diff --git a/src/locales/en/finance/credit_card/mastercard.ts b/src/locales/en/finance/credit_card/mastercard.ts index 857493ac18c..16770c32aa4 100644 --- a/src/locales/en/finance/credit_card/mastercard.ts +++ b/src/locales/en/finance/credit_card/mastercard.ts @@ -1 +1 @@ -export default ['5[1-5]##-####-####-###L', '2[221-720]-####-####-###L']; +export default ['2[221-720]-####-####-###L', '5[1-5]##-####-####-###L']; diff --git a/src/locales/en/finance/transaction_type.ts b/src/locales/en/finance/transaction_type.ts index 56de3081036..12d109f54cc 100644 --- a/src/locales/en/finance/transaction_type.ts +++ b/src/locales/en/finance/transaction_type.ts @@ -1 +1 @@ -export default ['deposit', 'withdrawal', 'payment', 'invoice']; +export default ['deposit', 'invoice', 'payment', 'withdrawal']; diff --git a/src/locales/en/science/chemicalElement.ts b/src/locales/en/science/chemical_element.ts similarity index 100% rename from src/locales/en/science/chemicalElement.ts rename to src/locales/en/science/chemical_element.ts diff --git a/src/locales/en/science/index.ts b/src/locales/en/science/index.ts index 86f8dd2f47e..91968423bbf 100644 --- a/src/locales/en/science/index.ts +++ b/src/locales/en/science/index.ts @@ -3,11 +3,11 @@ * Run 'pnpm run generate:locales' to update. */ import type { ScienceDefinition } from '../../..'; -import chemicalElement from './chemicalElement'; +import chemical_element from './chemical_element'; import unit from './unit'; const science: ScienceDefinition = { - chemicalElement, + chemical_element, unit, }; diff --git a/src/locales/eo/science/chemicalElement.ts b/src/locales/eo/science/chemical_element.ts similarity index 100% rename from src/locales/eo/science/chemicalElement.ts rename to src/locales/eo/science/chemical_element.ts diff --git a/src/locales/eo/science/index.ts b/src/locales/eo/science/index.ts index 86f8dd2f47e..91968423bbf 100644 --- a/src/locales/eo/science/index.ts +++ b/src/locales/eo/science/index.ts @@ -3,11 +3,11 @@ * Run 'pnpm run generate:locales' to update. */ import type { ScienceDefinition } from '../../..'; -import chemicalElement from './chemicalElement'; +import chemical_element from './chemical_element'; import unit from './unit'; const science: ScienceDefinition = { - chemicalElement, + chemical_element, unit, }; diff --git a/src/locales/fa/finance/account_type.ts b/src/locales/fa/finance/account_type.ts index f550ee432f8..fb7728298eb 100644 --- a/src/locales/fa/finance/account_type.ts +++ b/src/locales/fa/finance/account_type.ts @@ -1,8 +1,8 @@ export default [ - 'پس انداز', 'سرمایه گذاری', - 'وام مسکن', - 'کارت اعتباری', 'وام خودرو', 'وام شخصی', + 'وام مسکن', + 'پس انداز', + 'کارت اعتباری', ]; diff --git a/src/locales/fa/finance/credit_card/mastercard.ts b/src/locales/fa/finance/credit_card/mastercard.ts index 857493ac18c..16770c32aa4 100644 --- a/src/locales/fa/finance/credit_card/mastercard.ts +++ b/src/locales/fa/finance/credit_card/mastercard.ts @@ -1 +1 @@ -export default ['5[1-5]##-####-####-###L', '2[221-720]-####-####-###L']; +export default ['2[221-720]-####-####-###L', '5[1-5]##-####-####-###L']; diff --git a/src/locales/fa/finance/transaction_type.ts b/src/locales/fa/finance/transaction_type.ts index 35dc53d7bb7..2db21fdea47 100644 --- a/src/locales/fa/finance/transaction_type.ts +++ b/src/locales/fa/finance/transaction_type.ts @@ -1 +1 @@ -export default ['سپرده', 'برداشت از حساب', 'پرداخت', 'صورتحساب']; +export default ['برداشت از حساب', 'سپرده', 'صورتحساب', 'پرداخت']; diff --git a/src/locales/fr/finance/account_type.ts b/src/locales/fr/finance/account_type.ts index 28b2a89e02c..a9772647059 100644 --- a/src/locales/fr/finance/account_type.ts +++ b/src/locales/fr/finance/account_type.ts @@ -1,9 +1,9 @@ export default [ + 'Carte de crédit', 'Chèque', 'Epargne', - 'Marché monétaire', 'Investissement', + 'Marché monétaire', 'Prêt immobilier', - 'Carte de crédit', 'Prêt personnel', ]; diff --git a/src/locales/fr/finance/transaction_type.ts b/src/locales/fr/finance/transaction_type.ts index bdbb578a0da..df088c36887 100644 --- a/src/locales/fr/finance/transaction_type.ts +++ b/src/locales/fr/finance/transaction_type.ts @@ -1 +1 @@ -export default ['dépôt', 'retrait', 'paiement', 'facture']; +export default ['dépôt', 'facture', 'paiement', 'retrait']; diff --git a/src/locales/hu/finance/account_type.ts b/src/locales/hu/finance/account_type.ts index 08a69d243b5..ecbc3c52400 100644 --- a/src/locales/hu/finance/account_type.ts +++ b/src/locales/hu/finance/account_type.ts @@ -1,10 +1,10 @@ export default [ + 'Befektetés', 'Fizetési', + 'Gépjármű kölcsön', + 'Hitelkártya', + 'Lakáshitel', 'Megtakaritás', 'Money Market', - 'Befektetés', - 'Lakáshitel', - 'Hitelkártya', - 'Gépjármű kölcsön', 'Személyi kölcsön', ]; diff --git a/src/locales/hu/finance/transaction_type.ts b/src/locales/hu/finance/transaction_type.ts index 49d309188b1..95e7e545df7 100644 --- a/src/locales/hu/finance/transaction_type.ts +++ b/src/locales/hu/finance/transaction_type.ts @@ -1 +1 @@ -export default ['pénzbefizetés', 'pénzfelvétel', 'fizetés', 'számlázás']; +export default ['fizetés', 'pénzbefizetés', 'pénzfelvétel', 'számlázás']; diff --git a/src/locales/nb_NO/science/chemicalElement.ts b/src/locales/nb_NO/science/chemical_element.ts similarity index 100% rename from src/locales/nb_NO/science/chemicalElement.ts rename to src/locales/nb_NO/science/chemical_element.ts diff --git a/src/locales/nb_NO/science/index.ts b/src/locales/nb_NO/science/index.ts index 86f8dd2f47e..91968423bbf 100644 --- a/src/locales/nb_NO/science/index.ts +++ b/src/locales/nb_NO/science/index.ts @@ -3,11 +3,11 @@ * Run 'pnpm run generate:locales' to update. */ import type { ScienceDefinition } from '../../..'; -import chemicalElement from './chemicalElement'; +import chemical_element from './chemical_element'; import unit from './unit'; const science: ScienceDefinition = { - chemicalElement, + chemical_element, unit, }; diff --git a/src/locales/pl/science/chemicalElement.ts b/src/locales/pl/science/chemical_element.ts similarity index 100% rename from src/locales/pl/science/chemicalElement.ts rename to src/locales/pl/science/chemical_element.ts diff --git a/src/locales/pl/science/index.ts b/src/locales/pl/science/index.ts index 86f8dd2f47e..91968423bbf 100644 --- a/src/locales/pl/science/index.ts +++ b/src/locales/pl/science/index.ts @@ -3,11 +3,11 @@ * Run 'pnpm run generate:locales' to update. */ import type { ScienceDefinition } from '../../..'; -import chemicalElement from './chemicalElement'; +import chemical_element from './chemical_element'; import unit from './unit'; const science: ScienceDefinition = { - chemicalElement, + chemical_element, unit, }; diff --git a/src/locales/ur/finance/account_type.ts b/src/locales/ur/finance/account_type.ts index 01cb226c786..02be7f8a89a 100644 --- a/src/locales/ur/finance/account_type.ts +++ b/src/locales/ur/finance/account_type.ts @@ -1 +1 @@ -export default ['Savings', 'Current']; +export default ['Current', 'Savings']; diff --git a/src/locales/ur/finance/transaction_type.ts b/src/locales/ur/finance/transaction_type.ts index 56de3081036..12d109f54cc 100644 --- a/src/locales/ur/finance/transaction_type.ts +++ b/src/locales/ur/finance/transaction_type.ts @@ -1 +1 @@ -export default ['deposit', 'withdrawal', 'payment', 'invoice']; +export default ['deposit', 'invoice', 'payment', 'withdrawal']; diff --git a/src/locales/zh_CN/finance/account_type.ts b/src/locales/zh_CN/finance/account_type.ts index 57834bea665..5da77a5bfe2 100644 --- a/src/locales/zh_CN/finance/account_type.ts +++ b/src/locales/zh_CN/finance/account_type.ts @@ -1,10 +1,10 @@ export default [ - '支票', + '个人贷款', + '信用卡', '储蓄', - '货币市场', - '投资', '房屋贷款', - '信用卡', + '投资', + '支票', '汽车贷款', - '个人贷款', + '货币市场', ]; diff --git a/src/locales/zh_CN/finance/credit_card/mastercard.ts b/src/locales/zh_CN/finance/credit_card/mastercard.ts index 857493ac18c..16770c32aa4 100644 --- a/src/locales/zh_CN/finance/credit_card/mastercard.ts +++ b/src/locales/zh_CN/finance/credit_card/mastercard.ts @@ -1 +1 @@ -export default ['5[1-5]##-####-####-###L', '2[221-720]-####-####-###L']; +export default ['2[221-720]-####-####-###L', '5[1-5]##-####-####-###L']; diff --git a/src/locales/zh_CN/finance/credit_card/unionpay.ts b/src/locales/zh_CN/finance/credit_card/unionpay.ts index b6bc8e70978..aa66fabf7a6 100644 --- a/src/locales/zh_CN/finance/credit_card/unionpay.ts +++ b/src/locales/zh_CN/finance/credit_card/unionpay.ts @@ -1,8 +1,8 @@ export default [ '62#############L', '67#############L', - '81#############L', - '81##############L', - '81###############L', '81################L', + '81###############L', + '81##############L', + '81#############L', ]; diff --git a/src/locales/zh_CN/finance/transaction_type.ts b/src/locales/zh_CN/finance/transaction_type.ts index d6e774430a9..2e0597be1c7 100644 --- a/src/locales/zh_CN/finance/transaction_type.ts +++ b/src/locales/zh_CN/finance/transaction_type.ts @@ -1 +1 @@ -export default ['存款', '取款', '支付', '开票']; +export default ['取款', '存款', '开票', '支付']; diff --git a/src/locales/zh_CN/science/chemicalElement.ts b/src/locales/zh_CN/science/chemical_element.ts similarity index 100% rename from src/locales/zh_CN/science/chemicalElement.ts rename to src/locales/zh_CN/science/chemical_element.ts diff --git a/src/locales/zh_CN/science/index.ts b/src/locales/zh_CN/science/index.ts index 86f8dd2f47e..91968423bbf 100644 --- a/src/locales/zh_CN/science/index.ts +++ b/src/locales/zh_CN/science/index.ts @@ -3,11 +3,11 @@ * Run 'pnpm run generate:locales' to update. */ import type { ScienceDefinition } from '../../..'; -import chemicalElement from './chemicalElement'; +import chemical_element from './chemical_element'; import unit from './unit'; const science: ScienceDefinition = { - chemicalElement, + chemical_element, unit, }; diff --git a/src/modules/science/index.ts b/src/modules/science/index.ts index 26c78014786..525ff8bf0cc 100644 --- a/src/modules/science/index.ts +++ b/src/modules/science/index.ts @@ -49,7 +49,7 @@ export class ScienceModule extends ModuleBase { */ chemicalElement(): ChemicalElement { return this.faker.helpers.arrayElement( - this.faker.definitions.science.chemicalElement + this.faker.definitions.science.chemical_element ); } diff --git a/src/modules/system/index.ts b/src/modules/system/index.ts index 3468bbb0a79..1fcc9be3271 100644 --- a/src/modules/system/index.ts +++ b/src/modules/system/index.ts @@ -114,7 +114,7 @@ export class SystemModule extends ModuleBase { * @since 3.1.0 */ mimeType(): string { - const mimeTypeKeys = Object.keys(this.faker.definitions.system.mimeTypes); + const mimeTypeKeys = Object.keys(this.faker.definitions.system.mime_types); return this.faker.helpers.arrayElement(mimeTypeKeys); } @@ -152,7 +152,7 @@ export class SystemModule extends ModuleBase { * @since 3.1.0 */ fileType(): string { - const mimeTypes = this.faker.definitions.system.mimeTypes; + const mimeTypes = this.faker.definitions.system.mime_types; const typeSet = new Set( Object.keys(mimeTypes).map((key) => key.split('/')[0]) @@ -172,7 +172,7 @@ export class SystemModule extends ModuleBase { * @since 3.1.0 */ fileExt(mimeType?: string): string { - const mimeTypes = this.faker.definitions.system.mimeTypes; + const mimeTypes = this.faker.definitions.system.mime_types; if (typeof mimeType === 'string') { return this.faker.helpers.arrayElement(mimeTypes[mimeType].extensions); @@ -193,7 +193,7 @@ export class SystemModule extends ModuleBase { * @since 3.1.0 */ directoryPath(): string { - const paths = this.faker.definitions.system.directoryPaths; + const paths = this.faker.definitions.system.directory_paths; return this.faker.helpers.arrayElement(paths); } diff --git a/test/modules/__snapshots__/finance.spec.ts.snap b/test/modules/__snapshots__/finance.spec.ts.snap index bf62bcd747e..2f394c08bab 100644 --- a/test/modules/__snapshots__/finance.spec.ts.snap +++ b/test/modules/__snapshots__/finance.spec.ts.snap @@ -1,6 +1,6 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`finance > 42 > accountName 1`] = `"Money Market Account"`; +exports[`finance > 42 > accountName 1`] = `"Credit Card Account"`; exports[`finance > 42 > accountNumber > noArgs 1`] = `"39751108"`; @@ -30,11 +30,11 @@ exports[`finance > 42 > creditCardCVV 1`] = `"397"`; exports[`finance > 42 > creditCardIssuer 1`] = `"discover"`; -exports[`finance > 42 > creditCardNumber > noArgs 1`] = `"6485-6211-0867-0982-1138"`; +exports[`finance > 42 > creditCardNumber > noArgs 1`] = `"6575-6211-0867-0982-1139"`; exports[`finance > 42 > creditCardNumber > with issuer 1`] = `"4975110867099"`; -exports[`finance > 42 > creditCardNumber > with issuer option mastercard 1`] = `"5575-1108-6709-8213"`; +exports[`finance > 42 > creditCardNumber > with issuer option mastercard 1`] = `"2696-7511-0867-0988"`; exports[`finance > 42 > creditCardNumber > with issuer option visa 1`] = `"4975110867099"`; @@ -82,9 +82,9 @@ exports[`finance > 42 > routingNumber 1`] = `"397511082"`; exports[`finance > 42 > transactionDescription 1`] = `"deposit transaction at Reynolds, Miller and Crist using card ending with ***(...1135) for KES 374.54 in account ***08670982"`; -exports[`finance > 42 > transactionType 1`] = `"withdrawal"`; +exports[`finance > 42 > transactionType 1`] = `"invoice"`; -exports[`finance > 1211 > accountName 1`] = `"Personal Loan Account"`; +exports[`finance > 1211 > accountName 1`] = `"Savings Account"`; exports[`finance > 1211 > accountNumber > noArgs 1`] = `"98296673"`; @@ -118,7 +118,7 @@ exports[`finance > 1211 > creditCardNumber > noArgs 1`] = `"4296-6736-8768-4885" exports[`finance > 1211 > creditCardNumber > with issuer 1`] = `"4829-6673-6876-8484"`; -exports[`finance > 1211 > creditCardNumber > with issuer option mastercard 1`] = `"2667-2966-7368-7681"`; +exports[`finance > 1211 > creditCardNumber > with issuer option mastercard 1`] = `"5529-6673-6876-8484"`; exports[`finance > 1211 > creditCardNumber > with issuer option visa 1`] = `"4829-6673-6876-8484"`; @@ -166,9 +166,9 @@ exports[`finance > 1211 > routingNumber 1`] = `"982966738"`; exports[`finance > 1211 > transactionDescription 1`] = `"payment transaction at Fahey, Zieme and Osinski using card ending with ***(...8825) for CRC 928.52 in account ***73687684"`; -exports[`finance > 1211 > transactionType 1`] = `"invoice"`; +exports[`finance > 1211 > transactionType 1`] = `"withdrawal"`; -exports[`finance > 1337 > accountName 1`] = `"Money Market Account"`; +exports[`finance > 1337 > accountName 1`] = `"Credit Card Account"`; exports[`finance > 1337 > accountNumber > noArgs 1`] = `"21243529"`; @@ -202,7 +202,7 @@ exports[`finance > 1337 > creditCardNumber > noArgs 1`] = `"3014-352971-3614"`; exports[`finance > 1337 > creditCardNumber > with issuer 1`] = `"4124352971364"`; -exports[`finance > 1337 > creditCardNumber > with issuer option mastercard 1`] = `"5124-3529-7136-1949"`; +exports[`finance > 1337 > creditCardNumber > with issuer option mastercard 1`] = `"2300-2435-2971-3611"`; exports[`finance > 1337 > creditCardNumber > with issuer option visa 1`] = `"4124352971364"`; @@ -248,6 +248,6 @@ exports[`finance > 1337 > pin > with length option 1`] = `"2124352971"`; exports[`finance > 1337 > routingNumber 1`] = `"212435298"`; -exports[`finance > 1337 > transactionDescription 1`] = `"withdrawal transaction at Gottlieb - Koelpin using card ending with ***(...9477) for HUF 262.02 in account ***52971361"`; +exports[`finance > 1337 > transactionDescription 1`] = `"invoice transaction at Gottlieb - Koelpin using card ending with ***(...9477) for HUF 262.02 in account ***52971361"`; -exports[`finance > 1337 > transactionType 1`] = `"withdrawal"`; +exports[`finance > 1337 > transactionType 1`] = `"invoice"`; diff --git a/test/modules/helpers.spec.ts b/test/modules/helpers.spec.ts index b9b59f22b95..09f264679d3 100644 --- a/test/modules/helpers.spec.ts +++ b/test/modules/helpers.spec.ts @@ -799,7 +799,8 @@ describe('helpers', () => { }); it('should never return the callback result when probability is 0', () => { - const actual = faker.helpers.maybe(() => expect.fail(), { + const method: () => unknown = expect.fail; + const actual = faker.helpers.maybe(method, { probability: 0, }); diff --git a/test/modules/science.spec.ts b/test/modules/science.spec.ts index 80002c1968f..051fecbb3cf 100644 --- a/test/modules/science.spec.ts +++ b/test/modules/science.spec.ts @@ -28,7 +28,7 @@ describe('science', () => { expect(name).toBeTypeOf('string'); expect(() => { - faker.definitions.science.chemicalElement.find( + faker.definitions.science.chemical_element.find( (element) => element.name === name ); }).toBeTruthy(); @@ -39,7 +39,7 @@ describe('science', () => { expect(symbol).toBeTypeOf('string'); expect(() => { - faker.definitions.science.chemicalElement.find( + faker.definitions.science.chemical_element.find( (element) => element.symbol === symbol ); }).toBeTruthy(); @@ -50,7 +50,7 @@ describe('science', () => { expect(atomicNumber).toBeTypeOf('number'); expect(() => { - faker.definitions.science.chemicalElement.find( + faker.definitions.science.chemical_element.find( (element) => element.atomicNumber === atomicNumber ); }).toBeTruthy();