diff options
| author | Leyla Jähnig <[email protected]> | 2022-07-30 12:57:05 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-07-30 12:57:05 +0200 |
| commit | fc4815520b4c6aaf35a89fe41ff4a94b3346379c (patch) | |
| tree | 44e170fa4c26eb6f81bcaa215640339435d9c5f5 | |
| parent | 09df73aa1ab97dfec4ed3a4dfdd8280f7b094a87 (diff) | |
| download | faker-fc4815520b4c6aaf35a89fe41ff4a94b3346379c.tar.xz faker-fc4815520b4c6aaf35a89fe41ff4a94b3346379c.zip | |
refactor(fake): move to `helpers` (#1161)
Co-authored-by: Eric Cheng <[email protected]>
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | src/modules/address/index.ts | 6 | ||||
| -rw-r--r-- | src/modules/company/index.ts | 14 | ||||
| -rw-r--r-- | src/modules/fake/index.ts | 100 | ||||
| -rw-r--r-- | src/modules/helpers/index.ts | 131 | ||||
| -rw-r--r-- | test/__snapshots__/helpers.spec.ts.snap | 12 | ||||
| -rw-r--r-- | test/all_functional.spec.ts | 4 | ||||
| -rw-r--r-- | test/helpers.spec.ts | 133 |
8 files changed, 304 insertions, 102 deletions
@@ -98,11 +98,13 @@ The API covers the following modules: ### Templates -Faker contains a generator method `faker.fake` for combining faker API methods using a mustache string format. +Faker contains a generator method `faker.helpers.fake` for combining faker API methods using a mustache string format. ```ts console.log( - faker.fake('Hello {{name.prefix}} {{name.lastName}}, how are you today?') + faker.helpers.fake( + 'Hello {{name.prefix}} {{name.lastName}}, how are you today?' + ) ); ``` diff --git a/src/modules/address/index.ts b/src/modules/address/index.ts index 7c55bb51..4c2469e1 100644 --- a/src/modules/address/index.ts +++ b/src/modules/address/index.ts @@ -86,7 +86,7 @@ export class Address { format = this.faker.datatype.number(formats.length - 1); } - return this.faker.fake(formats[format]); + return this.faker.helpers.fake(formats[format]); } /** @@ -171,7 +171,7 @@ export class Address { const format = this.faker.helpers.arrayElement( this.faker.definitions.address.street ); - return this.faker.fake(format); + return this.faker.helpers.fake(format); } /** @@ -212,7 +212,7 @@ export class Address { const formats = this.faker.definitions.address.street_address; const format = formats[useFullAddress ? 'full' : 'normal']; - return this.faker.fake(format); + return this.faker.helpers.fake(format); } /** diff --git a/src/modules/company/index.ts b/src/modules/company/index.ts index 968afbbf..1dce91fd 100644 --- a/src/modules/company/index.ts +++ b/src/modules/company/index.ts @@ -45,7 +45,7 @@ export class Company { format = this.faker.datatype.number(formats.length - 1); } - return this.faker.fake(formats[format]); + return this.faker.helpers.fake(formats[format]); } /** @@ -88,9 +88,11 @@ export class Company { * faker.company.catchPhrase() // 'Upgradable systematic flexibility' */ catchPhrase(): string { - return this.faker.fake( - '{{company.catchPhraseAdjective}} {{company.catchPhraseDescriptor}} {{company.catchPhraseNoun}}' - ); + return [ + this.catchPhraseAdjective(), + this.catchPhraseDescriptor(), + this.catchPhraseNoun(), + ].join(' '); } /** @@ -100,9 +102,7 @@ export class Company { * faker.company.bs() // 'cultivate synergistic e-markets' */ bs(): string { - return this.faker.fake( - '{{company.bsBuzz}} {{company.bsAdjective}} {{company.bsNoun}}' - ); + return [this.bsBuzz(), this.bsAdjective(), this.bsNoun()].join(' '); } /** diff --git a/src/modules/fake/index.ts b/src/modules/fake/index.ts index 9dff1c8e..a60acd5b 100644 --- a/src/modules/fake/index.ts +++ b/src/modules/fake/index.ts @@ -1,8 +1,10 @@ import type { Faker } from '../..'; -import { FakerError } from '../../errors/faker-error'; +import { deprecated } from '../../internal/deprecated'; /** * Generator method for combining faker methods based on string input. + * + * @deprecated */ export class Fake { constructor(private readonly faker: Faker) { @@ -47,6 +49,7 @@ export class Fake { * @param str The template string that will get interpolated. Must not be empty. * * @see faker.helpers.mustache() to use custom functions for resolution. + * @see faker.helpers.fake() * * @example * faker.fake('{{name.lastName}}') // 'Barrows' @@ -55,93 +58,16 @@ export class Fake { * faker.fake('Good Morning {{name.firstName}}!') // 'Good Morning Estelle!' * faker.fake('You can call me at {{phone.number(!## ### #####!)}}.') // 'You can call me at 202 555 973722.' * faker.fake('I flipped the coin an got: {{helpers.arrayElement(["heads", "tails"])}}') // 'I flipped the coin an got: tails' + * + * @deprecated Use faker.helpers.fake() instead. */ fake(str: string): string { - // if incoming str parameter is not provided, return error message - if (typeof str !== 'string' || str.length === 0) { - throw new FakerError('string parameter is required!'); - } - - // find first matching {{ and }} - const start = str.search(/{{[a-z]/); - const end = str.indexOf('}}', start); - - // if no {{ and }} is found, we are done - if (start === -1 || end === -1) { - return str; - } - - // extract method name from between the {{ }} that we found - // for example: {{name.firstName}} - const token = str.substring(start + 2, end + 2); - let method = token.replace('}}', '').replace('{{', ''); - - // extract method parameters - const regExp = /\(([^)]+)\)/; - const matches = regExp.exec(method); - let parameters = ''; - if (matches) { - method = method.replace(regExp, ''); - parameters = matches[1]; - } - - // split the method into module and function - const parts = method.split('.'); - - let currentModuleOrMethod: unknown = this.faker; - let currentDefinitions: unknown = this.faker.definitions; - - // Search for the requested method or definition - for (const part of parts) { - currentModuleOrMethod = currentModuleOrMethod?.[part]; - currentDefinitions = currentDefinitions?.[part]; - } - - // Make method executable - let fn: (args?: unknown) => unknown; - if (typeof currentModuleOrMethod === 'function') { - fn = currentModuleOrMethod as (args?: unknown) => unknown; - } else if (Array.isArray(currentDefinitions)) { - fn = () => - this.faker.helpers.arrayElement(currentDefinitions as unknown[]); - } else { - throw new FakerError(`Invalid module method or definition: ${method} -- faker.${method} is not a function -- faker.definitions.${method} is not an array`); - } - - // assign the function from the module.function namespace - fn = fn.bind(this); - - // If parameters are populated here, they are always going to be of string type - // since we might actually be dealing with an object or array, - // we always attempt to the parse the incoming parameters into JSON - let params: unknown; - // Note: we experience a small performance hit here due to JSON.parse try / catch - // If anyone actually needs to optimize this specific code path, please open a support issue on github - try { - params = JSON.parse(parameters); - } catch (err) { - // since JSON.parse threw an error, assume parameters was actually a string - params = parameters; - } - - let result: string; - if (typeof params === 'string' && params.length === 0) { - result = String(fn()); - } else { - result = String(fn(params)); - } - - // Replace the found tag with the returned fake value - // We cannot use string.replace here because the result might contain evaluated characters - const res = str.substring(0, start) + result + str.substring(end + 2); - - if (res === '') { - return ''; - } - - // return the response recursively until we are done finding all tags - return this.fake(res); + deprecated({ + deprecated: 'faker.fake()', + proposed: 'faker.helpers.fake()', + since: '7.4', + until: '8.0', + }); + return this.faker.helpers.fake(str); } } diff --git a/src/modules/helpers/index.ts b/src/modules/helpers/index.ts index a68b66ae..b4d73b2e 100644 --- a/src/modules/helpers/index.ts +++ b/src/modules/helpers/index.ts @@ -1,4 +1,5 @@ import type { Faker } from '../..'; +import { FakerError } from '../../errors/faker-error'; import { luhnCheckValue } from './luhn-check'; /** @@ -454,4 +455,134 @@ export class Helpers { return arrayCopy.slice(min); } + + /** + * Generator for combining faker methods based on a static string input. + * + * Note: We recommend using string template literals instead of `fake()`, + * which are faster and strongly typed (if you are using TypeScript), + * e.g. ``const address = `${faker.address.zipCode()} ${faker.address.city()}`;`` + * + * This method is useful if you have to build a random string from a static, non-executable source + * (e.g. string coming from a user, stored in a database or a file). + * + * It checks the given string for placeholders and replaces them by calling faker methods: + * + * ```js + * const hello = faker.helpers.fake('Hi, my name is {{name.firstName}} {{name.lastName}}!') + * ``` + * + * This would use the `faker.name.firstName()` and `faker.name.lastName()` method to resolve the placeholders respectively. + * + * It is also possible to provide parameters. At first, they will be parsed as json, + * and if that isn't possible, we will fall back to string: + * + * ```js + * const message = faker.helpers.fake(`You can call me at {{phone.number(+!# !## #### #####!)}}.') + * ``` + * + * Currently it is not possible to set more than a single parameter. + * + * It is also NOT possible to use any non-faker methods or plain javascript in such templates. + * + * @param str The template string that will get interpolated. Must not be empty. + * + * @see faker.helpers.mustache() to use custom functions for resolution. + * + * @example + * faker.helpers.fake('{{name.lastName}}') // 'Barrows' + * faker.helpers.fake('{{name.lastName}}, {{name.firstName}} {{name.suffix}}') // 'Durgan, Noe MD' + * faker.helpers.fake('This is static test.') // 'This is static test.' + * faker.helpers.fake('Good Morning {{name.firstName}}!') // 'Good Morning Estelle!' + * faker.helpers.fake('You can call me at {{phone.number(!## ### #####!)}}.') // 'You can call me at 202 555 973722.' + * faker.helpers.fake('I flipped the coin an got: {{helpers.arrayElement(["heads", "tails"])}}') // 'I flipped the coin an got: tails' + */ + fake(str: string): string { + // if incoming str parameter is not provided, return error message + if (typeof str !== 'string' || str.length === 0) { + throw new FakerError('string parameter is required!'); + } + + // find first matching {{ and }} + const start = str.search(/{{[a-z]/); + const end = str.indexOf('}}', start); + + // if no {{ and }} is found, we are done + if (start === -1 || end === -1) { + return str; + } + + // extract method name from between the {{ }} that we found + // for example: {{name.firstName}} + const token = str.substring(start + 2, end + 2); + let method = token.replace('}}', '').replace('{{', ''); + + // extract method parameters + const regExp = /\(([^)]+)\)/; + const matches = regExp.exec(method); + let parameters = ''; + if (matches) { + method = method.replace(regExp, ''); + parameters = matches[1]; + } + + // split the method into module and function + const parts = method.split('.'); + + let currentModuleOrMethod: unknown = this.faker; + let currentDefinitions: unknown = this.faker.definitions; + + // Search for the requested method or definition + for (const part of parts) { + currentModuleOrMethod = currentModuleOrMethod?.[part]; + currentDefinitions = currentDefinitions?.[part]; + } + + // Make method executable + let fn: (args?: unknown) => unknown; + if (typeof currentModuleOrMethod === 'function') { + fn = currentModuleOrMethod as (args?: unknown) => unknown; + } else if (Array.isArray(currentDefinitions)) { + fn = () => + this.faker.helpers.arrayElement(currentDefinitions as unknown[]); + } else { + throw new FakerError(`Invalid module method or definition: ${method} +- faker.${method} is not a function +- faker.definitions.${method} is not an array`); + } + + // assign the function from the module.function namespace + fn = fn.bind(this); + + // If parameters are populated here, they are always going to be of string type + // since we might actually be dealing with an object or array, + // we always attempt to the parse the incoming parameters into JSON + let params: unknown; + // Note: we experience a small performance hit here due to JSON.parse try / catch + // If anyone actually needs to optimize this specific code path, please open a support issue on github + try { + params = JSON.parse(parameters); + } catch (err) { + // since JSON.parse threw an error, assume parameters was actually a string + params = parameters; + } + + let result: string; + if (typeof params === 'string' && params.length === 0) { + result = String(fn()); + } else { + result = String(fn(params)); + } + + // Replace the found tag with the returned fake value + // We cannot use string.replace here because the result might contain evaluated characters + const res = str.substring(0, start) + result + str.substring(end + 2); + + if (res === '') { + return ''; + } + + // return the response recursively until we are done finding all tags + return this.fake(res); + } } diff --git a/test/__snapshots__/helpers.spec.ts.snap b/test/__snapshots__/helpers.spec.ts.snap index d959cafe..c79f19c8 100644 --- a/test/__snapshots__/helpers.spec.ts.snap +++ b/test/__snapshots__/helpers.spec.ts.snap @@ -29,6 +29,10 @@ exports[`helpers > 42 > arrayElements > with array 2`] = ` ] `; +exports[`helpers > 42 > fake > with args 1`] = `"my string: Cky2eiXX/J"`; + +exports[`helpers > 42 > fake > with plain string 1`] = `"my test string"`; + exports[`helpers > 42 > maybe > with only value 1`] = `"Hello World!"`; exports[`helpers > 42 > maybe > with value and probability 1`] = `undefined`; @@ -139,6 +143,10 @@ exports[`helpers > 1211 > arrayElements > with array 2`] = ` ] `; +exports[`helpers > 1211 > fake > with args 1`] = `"my string: wKti5-}$_/"`; + +exports[`helpers > 1211 > fake > with plain string 1`] = `"my test string"`; + exports[`helpers > 1211 > maybe > with only value 1`] = `undefined`; exports[`helpers > 1211 > maybe > with value and probability 1`] = `undefined`; @@ -239,6 +247,10 @@ exports[`helpers > 1337 > arrayElements > with array 2`] = ` ] `; +exports[`helpers > 1337 > fake > with args 1`] = `"my string: 9U/4:SK$>6"`; + +exports[`helpers > 1337 > fake > with plain string 1`] = `"my test string"`; + exports[`helpers > 1337 > maybe > with only value 1`] = `"Hello World!"`; exports[`helpers > 1337 > maybe > with value and probability 1`] = `undefined`; diff --git a/test/all_functional.spec.ts b/test/all_functional.spec.ts index b391b61e..f857b84c 100644 --- a/test/all_functional.spec.ts +++ b/test/all_functional.spec.ts @@ -99,7 +99,7 @@ describe('functional tests', () => { } }); -describe('faker.fake functional tests', () => { +describe('faker.helpers.fake functional tests', () => { for (const locale in faker.locales) { describe(locale, () => { Object.keys(modules).forEach((module) => { @@ -109,7 +109,7 @@ describe('faker.fake functional tests', () => { faker.locale = locale; // TODO ST-DDT 2022-03-28: Use random seed once there are no more failures faker.seed(1); - const result = faker.fake(`{{${module}.${meth}}}`); + const result = faker.helpers.fake(`{{${module}.${meth}}}`); expect(result).toBeTypeOf('string'); }); diff --git a/test/helpers.spec.ts b/test/helpers.spec.ts index 6a89667f..61d742a7 100644 --- a/test/helpers.spec.ts +++ b/test/helpers.spec.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it } from 'vitest'; -import { faker } from '../src'; +import { faker, FakerError } from '../src'; import { luhnCheck } from '../src/modules/helpers/luhn-check'; import { seededTests } from './support/seededRuns'; @@ -86,6 +86,13 @@ describe('helpers', () => { t.describe('objectValue', (t) => { t.it('simple', { a: 1, b: 2, c: 3 }); }); + + t.describe('fake', (t) => { + t.it('with plain string', 'my test string').it( + 'with args', + 'my string: {{datatype.string}}' + ); + }); }); describe(`random seeded tests for seed ${faker.seed()}`, () => { @@ -477,6 +484,130 @@ describe('helpers', () => { expect(actual).toBeUndefined(); }); }); + + describe('fake()', () => { + it('replaces a token with a random value for a method with no parameters', () => { + const name = faker.helpers.fake('{{phone.number}}'); + expect(name).toMatch(/\d/); + }); + + it('replaces multiple tokens with random values for methods with no parameters', () => { + const name = faker.helpers.fake( + '{{helpers.arrayElement}}{{helpers.arrayElement}}{{helpers.arrayElement}}' + ); + expect(name).toMatch(/[abc]{3}/); + }); + + it('replaces a token with a random value for a methods with a simple parameter', () => { + const random = faker.helpers.fake( + '{{helpers.slugify("Will This Work")}}' + ); + expect(random).toBe('Will-This-Work'); + }); + + it('replaces a token with a random value for a method with an array parameter', () => { + const arr = ['one', 'two', 'three']; + const random = faker.helpers.fake( + '{{helpers.arrayElement(["one", "two", "three"])}}' + ); + expect(arr).toContain(random); + }); + + it('does not allow undefined parameters', () => { + expect(() => + // @ts-expect-error: The parameter is required + faker.helpers.fake() + ).toThrowError(new FakerError('string parameter is required!')); + }); + + it('does not allow invalid module name', () => { + expect(() => faker.helpers.fake('{{foo.bar}}')).toThrowError( + new FakerError(`Invalid module method or definition: foo.bar +- faker.foo.bar is not a function +- faker.definitions.foo.bar is not an array`) + ); + }); + + it('does not allow missing method name', () => { + expect(() => faker.helpers.fake('{{address}}')).toThrowError( + new FakerError(`Invalid module method or definition: address +- faker.address is not a function +- faker.definitions.address is not an array`) + ); + }); + + it('does not allow invalid method name', () => { + expect(() => faker.helpers.fake('{{address.foo}}')).toThrowError( + new FakerError(`Invalid module method or definition: address.foo +- faker.address.foo is not a function +- faker.definitions.address.foo is not an array`) + ); + }); + + it('does not allow invalid definitions data', () => { + expect(() => + faker.helpers.fake('{{finance.credit_card}}') + ).toThrowError( + new FakerError(`Invalid module method or definition: finance.credit_card +- faker.finance.credit_card is not a function +- faker.definitions.finance.credit_card is not an array`) + ); + }); + + it('should be able to return empty strings', () => { + expect(faker.helpers.fake('{{helpers.repeatString}}')).toBe(''); + }); + + it('should be able to return locale definition strings', () => { + expect(faker.definitions.cell_phone.formats).toContain( + faker.helpers.fake('{{cell_phone.formats}}') + ); + }); + + it('should be able to return locale definition strings that starts with the name of an existing module', () => { + expect(faker.definitions.address.city_name).toContain( + faker.helpers.fake('{{address.city_name}}') + ); + }); + + it('should be able to handle only {{ brackets', () => { + expect(faker.helpers.fake('{{hello')).toBe('{{hello'); + expect(faker.helpers.fake('hello{{')).toBe('hello{{'); + }); + + it('should be able to handle only }} brackets', () => { + expect(faker.helpers.fake('hello}}')).toBe('hello}}'); + expect(faker.helpers.fake('}}hello')).toBe('}}hello'); + }); + + it('should be able to handle inverted brackets', () => { + expect(faker.helpers.fake('}}hello{{')).toBe('}}hello{{'); + }); + + it('should be able to handle random }} brackets', () => { + expect(faker.helpers.fake('}}hello{{random.alpha}}')).toMatch( + /^}}hello[a-z]$/ + ); + }); + + it('should be able to handle connected brackets', () => { + expect(faker.helpers.fake('{{{random.alpha}}}')).toMatch(/^{[a-z]}$/); + }); + + it('should be able to handle empty brackets', () => { + expect(faker.helpers.fake('{{}}')).toBe('{{}}'); + }); + + it('should be able to handle special replacement patterns', () => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (faker.random as any).special = () => '$&'; + + expect(faker.helpers.fake('{{random.special}}')).toBe('$&'); + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + delete (faker.random as any).special; + }); + }); } }); }); |
