Merge branch 'next' into fix/finance/maskedNumber-defaults

faker-js · Oct 29, 2023 · 28e419a · 28e419a
2 parents ac10f9a + a83db8b
commit 28e419a
Show file tree

Hide file tree

Showing 45 changed files with 72 additions and 59 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -41,12 +41,13 @@ module.exports = defineConfig({
     'unicorn/prefer-at': 'off',
     // TODO @Shinigami92 2023-09-23: prefer-string-replace-all should be turned on when we drop support for Node 14.
     'unicorn/prefer-string-replace-all': 'off',
+    // TODO @ST-DDT 2023-10-28: The following rule should be turned on when we switch to esm.
+    'unicorn/prefer-top-level-await': 'off',
 
     // TODO @Shinigami92 2023-09-23: 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.
     'unicorn/better-regex': 'off',
     'unicorn/consistent-function-scoping': 'off',
-    'unicorn/filename-case': 'off',
     'unicorn/import-style': 'off',
     'unicorn/no-array-callback-reference': 'off',
     'unicorn/no-array-reduce': 'off',
@@ -60,7 +61,6 @@ module.exports = defineConfig({
     'unicorn/prefer-module': 'off',
     'unicorn/prefer-negative-index': 'off',
     'unicorn/prefer-string-slice': 'off',
-    'unicorn/prefer-top-level-await': 'off',
     'unicorn/prevent-abbreviations': 'off',
     'unicorn/require-array-join-separator': 'off',
     'unicorn/switch-case-braces': 'off',
@@ -139,8 +139,26 @@ module.exports = defineConfig({
       },
     },
     {
-      files: ['src/locales/**/*.ts'],
+      files: ['src/locale/**/*.ts'],
+      rules: {
+        'unicorn/filename-case': 'off', // our locale files have a custom naming scheme
+      },
+    },
+    {
+      files: ['src/definitions/**/*.ts', 'src/locales/**/*.ts'],
       rules: {
+        'unicorn/filename-case': [
+          '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/package.json b/package.json
@@ -63,7 +63,7 @@
     "build": "run-s build:clean build:code build:types",
     "generate": "run-s generate:locales generate:api-docs",
     "generate:api-docs": "tsx ./scripts/apidoc.ts",
-    "generate:locales": "tsx ./scripts/generateLocales.ts",
+    "generate:locales": "tsx ./scripts/generate-locales.ts",
     "docs:build": "run-s docs:prepare docs:build:run",
     "docs:build:run": "vitepress build docs",
     "docs:build:ci": "run-s build docs:build",

diff --git a/scripts/apidoc/fakerClass.ts → scripts/apidoc/faker-class.ts b/scripts/apidoc/fakerClass.ts → scripts/apidoc/faker-class.ts
@@ -1,11 +1,11 @@
 import type { DeclarationReflection, ProjectReflection } from 'typedoc';
 import { ReflectionKind } from 'typedoc';
 import type { Method } from '../../docs/.vitepress/components/api-docs/method';
-import { writeApiDocsModule } from './apiDocsWriter';
-import { analyzeModule, processModuleMethods } from './moduleMethods';
+import { analyzeModule, processModuleMethods } from './module-methods';
 import { analyzeSignature } from './signature';
 import { extractModuleFieldName, selectApiSignature } from './typedoc';
 import type { ModuleSummary } from './utils';
+import { writeApiDocsModule } from './writer';
 
 export async function processFakerClasses(
   project: ProjectReflection

diff --git a/scripts/apidoc/fakerUtilities.ts → scripts/apidoc/faker-utilities.ts b/scripts/apidoc/fakerUtilities.ts → scripts/apidoc/faker-utilities.ts
@@ -1,10 +1,10 @@
 import type { DeclarationReflection, ProjectReflection } from 'typedoc';
 import { ReflectionKind } from 'typedoc';
 import type { Method } from '../../docs/.vitepress/components/api-docs/method';
-import { writeApiDocsModule } from './apiDocsWriter';
-import { processMethods } from './moduleMethods';
+import { processMethods } from './module-methods';
 import { selectApiSignature } from './typedoc';
 import type { ModuleSummary } from './utils';
+import { writeApiDocsModule } from './writer';
 
 export async function processFakerUtilities(
   project: ProjectReflection

diff --git a/scripts/apidoc/generate.ts b/scripts/apidoc/generate.ts
@@ -1,15 +1,15 @@
 import { resolve } from 'node:path';
+import { processFakerClasses, processFakerRandomizer } from './faker-class';
+import { processFakerUtilities } from './faker-utilities';
+import { processModules } from './module-methods';
+import { loadProject } from './typedoc';
+import { pathOutputDir } from './utils';
 import {
   writeApiDiffIndex,
   writeApiPagesIndex,
   writeApiSearchIndex,
   writeSourceBaseUrl,
-} from './apiDocsWriter';
-import { processFakerClasses, processFakerRandomizer } from './fakerClass';
-import { processFakerUtilities } from './fakerUtilities';
-import { processModules } from './moduleMethods';
-import { loadProject } from './typedoc';
-import { pathOutputDir } from './utils';
+} from './writer';
 
 const pathOutputJson = resolve(pathOutputDir, 'typedoc.json');
 

diff --git a/scripts/apidoc/moduleMethods.ts → scripts/apidoc/module-methods.ts b/scripts/apidoc/moduleMethods.ts → scripts/apidoc/module-methods.ts
@@ -4,7 +4,6 @@ import type {
   SignatureReflection,
 } from 'typedoc';
 import type { Method } from '../../docs/.vitepress/components/api-docs/method';
-import { writeApiDocsModule } from './apiDocsWriter';
 import { codeToHtml } from './markdown';
 import { analyzeSignature } from './signature';
 import {
@@ -18,6 +17,7 @@ import {
 } from './typedoc';
 import type { ModuleSummary } from './utils';
 import { adjustUrls } from './utils';
+import { writeApiDocsModule } from './writer';
 
 /**
  * Analyzes and writes the documentation for modules and their methods such as `faker.animal.cat()`.

diff --git a/scripts/apidoc/parameterDefaults.ts → scripts/apidoc/parameter-defaults.ts b/scripts/apidoc/parameterDefaults.ts → scripts/apidoc/parameter-defaults.ts
diff --git a/scripts/apidoc/typedoc.ts b/scripts/apidoc/typedoc.ts
@@ -19,7 +19,7 @@ import {
   DefaultParameterAwareSerializer,
   parameterDefaultReader,
   patchProjectParameterDefaults,
-} from './parameterDefaults';
+} from './parameter-defaults';
 import { mapByName } from './utils';
 
 type CommentHolder = Pick<Reflection, 'comment'>;

diff --git a/scripts/apidoc/apiDocsWriter.ts → scripts/apidoc/writer.ts b/scripts/apidoc/apiDocsWriter.ts → scripts/apidoc/writer.ts
diff --git a/scripts/generateLocales.ts → scripts/generate-locales.ts b/scripts/generateLocales.ts → scripts/generate-locales.ts
diff --git a/src/modules/finance/index.ts b/src/modules/finance/index.ts
@@ -353,20 +353,15 @@ export class FinanceModule {
     // set defaults
     const { ellipsis = true, length = 4, parens = true } = options;
 
-    // create a template for length
-    let template = '';
+    let template = this.faker.string.numeric({ length });
 
-    for (let i = 0; i < length; i++) {
-      template = `${template}#`;
+    if (ellipsis) {
+      template = `...${template}`;
     }
 
-    //prefix with ellipsis
-    template = ellipsis ? ['...', template].join('') : template;
-
-    template = parens ? ['(', template, ')'].join('') : template;
-
-    //generate random numbers
-    template = this.faker.helpers.replaceSymbolWithNumber(template);
+    if (parens) {
+      template = `(${template})`;
+    }
 
     return template;
   }

diff --git a/src/modules/lorem/index.ts b/src/modules/lorem/index.ts
@@ -1,6 +1,6 @@
 import type { Faker } from '../..';
 import { bindThisToMemberFunctions } from '../../internal/bind-this-to-member-functions';
-import { filterWordListByLength } from '../word/filterWordListByLength';
+import { filterWordListByLength } from '../word/filter-word-list-by-length';
 
 /**
  * Module to generate random texts and words.

diff --git a/src/modules/word/filterWordListByLength.ts → ...odules/word/filter-word-list-by-length.ts b/src/modules/word/filterWordListByLength.ts → ...odules/word/filter-word-list-by-length.ts
diff --git a/src/modules/word/index.ts b/src/modules/word/index.ts
@@ -1,7 +1,7 @@
 import type { Faker } from '../..';
 import { FakerError } from '../../errors/faker-error';
 import { bindThisToMemberFunctions } from '../../internal/bind-this-to-member-functions';
-import { filterWordListByLength } from './filterWordListByLength';
+import { filterWordListByLength } from './filter-word-list-by-length';
 
 /**
  * Module to return various types of words.

diff --git a/test/all_functional.spec.ts → test/all-functional.spec.ts b/test/all_functional.spec.ts → test/all-functional.spec.ts
diff --git a/test/mersenne.spec.ts b/test/mersenne.spec.ts
@@ -1,7 +1,7 @@
 import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
 import { generateMersenne32Randomizer } from '../src/internal/mersenne';
 import type { Randomizer } from '../src/randomizer';
-import { seededRuns } from './support/seededRuns';
+import { seededRuns } from './support/seeded-runs';
 import { times } from './support/times';
 
 const NON_SEEDED_BASED_RUN = 25;

diff --git a/test/modules/airline.spec.ts b/test/modules/airline.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { Aircraft, faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/animal.spec.ts b/test/modules/animal.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/color.spec.ts b/test/modules/color.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { CssFunction, CssSpace, faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/commerce.spec.ts b/test/modules/commerce.spec.ts
@@ -1,7 +1,7 @@
 import validator from 'validator';
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/company.spec.ts b/test/modules/company.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/database.spec.ts b/test/modules/database.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/datatype.spec.ts b/test/modules/datatype.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { faker, FakerError } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 25;

diff --git a/test/modules/date.spec.ts b/test/modules/date.spec.ts
@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, it } from 'vitest';
 import { faker, fakerAZ, FakerError } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const converterMap = [

diff --git a/test/modules/finance_iban.spec.ts → test/modules/finance-iban.spec.ts b/test/modules/finance_iban.spec.ts → test/modules/finance-iban.spec.ts
@@ -2,7 +2,7 @@ import validator from 'validator';
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
 import ibanLib from '../../src/modules/finance/iban';
-import { times } from './../support/times';
+import { times } from '../support/times';
 
 const NON_SEEDED_BASED_RUN = 25;
 

diff --git a/test/modules/finance.spec.ts b/test/modules/finance.spec.ts
@@ -5,7 +5,7 @@ import { faker, fakerZH_CN } from '../../src';
 import { FakerError } from '../../src/errors/faker-error';
 import ibanLib from '../../src/modules/finance/iban';
 import { luhnCheck } from '../../src/modules/helpers/luhn-check';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/git.spec.ts b/test/modules/git.spec.ts
@@ -1,7 +1,7 @@
 import validator from 'validator';
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/hacker.spec.ts b/test/modules/hacker.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/helpers.spec.ts b/test/modules/helpers.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import { faker, FakerError } from '../../src';
 import { luhnCheck } from '../../src/modules/helpers/luhn-check';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 import './../vitest-extensions';
 

diff --git a/test/modules/image.spec.ts b/test/modules/image.spec.ts
@@ -1,7 +1,7 @@
 import isDataURI from 'validator/lib/isDataURI';
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 
 describe('image', () => {
   seededTests(faker, 'image', (t) => {

diff --git a/test/modules/internet.spec.ts b/test/modules/internet.spec.ts
@@ -1,7 +1,7 @@
 import validator from 'validator';
 import { describe, expect, it } from 'vitest';
 import { allFakers, faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/location.spec.ts b/test/modules/location.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { faker, fakerEN_CA, fakerEN_US, FakerError } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 function degreesToRadians(degrees: number) {

diff --git a/test/modules/lorem.spec.ts b/test/modules/lorem.spec.ts
@@ -1,7 +1,7 @@
 import validator from 'validator';
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/music.spec.ts b/test/modules/music.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/number.spec.ts b/test/modules/number.spec.ts
@@ -1,7 +1,7 @@
 import validator from 'validator';
 import { describe, expect, it } from 'vitest';
 import { faker, FakerError } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 
 describe('number', () => {
   seededTests(faker, 'number', (t) => {

diff --git a/test/modules/person.spec.ts b/test/modules/person.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { faker, fakerAZ, fakerMK, fakerUK, Sex } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/phone.spec.ts b/test/modules/phone.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
 import { luhnCheck } from '../../src/modules/helpers/luhn-check';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 25;

diff --git a/test/modules/random.spec.ts b/test/modules/random.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { Faker, faker, FakerError, fakerZH_CN } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/science.spec.ts b/test/modules/science.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/string.spec.ts b/test/modules/string.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { faker, FakerError } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;

diff --git a/test/modules/system.spec.ts b/test/modules/system.spec.ts
@@ -1,7 +1,7 @@
 import validator from 'validator';
 import { describe, expect, it } from 'vitest';
 import { faker, fakerSK } from '../../src';
-import { seededTests } from './../support/seededRuns';
+import { seededTests } from '../support/seeded-runs';
 import { times } from './../support/times';
 
 const NON_SEEDED_BASED_RUN = 5;