Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: move some random methods to helpers #892

Merged
merged 15 commits into from
May 1, 2022
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions src/address.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class Address {
if (typeof localeFormat === 'string') {
format = localeFormat;
} else {
format = this.faker.random.arrayElement(localeFormat);
format = this.faker.helpers.arrayElement(localeFormat);
}
}
return this.faker.helpers.replaceSymbols(format);
Expand Down Expand Up @@ -108,7 +108,7 @@ export class Address {
* faker.address.cityPrefix() // 'East'
*/
cityPrefix(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.city_prefix
);
}
Expand All @@ -120,7 +120,7 @@ export class Address {
* faker.address.citySuffix() // 'mouth'
*/
citySuffix(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.city_suffix
);
}
Expand All @@ -132,7 +132,7 @@ export class Address {
* faker.address.cityName() // 'San Rafael'
*/
cityName(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.city_name
);
}
Expand All @@ -144,7 +144,7 @@ export class Address {
* faker.address.buildingNumber() // '379'
*/
buildingNumber(): string {
const format = this.faker.random.arrayElement(
const format = this.faker.helpers.arrayElement(
this.faker.definitions.address.building_number
);

Expand Down Expand Up @@ -200,7 +200,7 @@ export class Address {
* faker.address.streetSuffix() // 'Streets'
*/
streetSuffix(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.street_suffix
);
}
Expand All @@ -212,7 +212,7 @@ export class Address {
* fakerGH.address.streetPrefix() // 'Boame'
*/
streetPrefix(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.street_prefix
);
}
Expand All @@ -226,7 +226,7 @@ export class Address {
*/
secondaryAddress(): string {
return this.faker.helpers.replaceSymbolWithNumber(
this.faker.random.arrayElement(
this.faker.helpers.arrayElement(
this.faker.definitions.address.secondary_address
)
);
Expand All @@ -239,7 +239,7 @@ export class Address {
* faker.address.county() // 'Cambridgeshire'
*/
county(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.county
);
}
Expand All @@ -251,7 +251,7 @@ export class Address {
* faker.address.country() // 'Greece'
*/
country(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.country
);
}
Expand All @@ -271,7 +271,7 @@ export class Address {
const key: keyof typeof this.faker.definitions.address =
alphaCode === 'alpha-3' ? 'country_code_alpha_3' : 'country_code';

return this.faker.random.arrayElement(this.faker.definitions.address[key]);
return this.faker.helpers.arrayElement(this.faker.definitions.address[key]);
}

/**
Expand All @@ -281,7 +281,9 @@ export class Address {
* faker.address.state() // 'Georgia'
*/
state(): string {
return this.faker.random.arrayElement(this.faker.definitions.address.state);
return this.faker.helpers.arrayElement(
this.faker.definitions.address.state
);
}

/**
Expand All @@ -291,7 +293,7 @@ export class Address {
* faker.address.stateAbbr() // 'ND'
*/
stateAbbr(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.state_abbr
);
}
Expand Down Expand Up @@ -355,11 +357,11 @@ export class Address {
*/
direction(useAbbr: boolean = false): string {
if (!useAbbr) {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.direction
);
}
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.direction_abbr
);
}
Expand All @@ -377,11 +379,11 @@ export class Address {
*/
cardinalDirection(useAbbr: boolean = false): string {
if (!useAbbr) {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.direction.slice(0, 4)
);
}
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.direction_abbr.slice(0, 4)
);
}
Expand All @@ -399,11 +401,11 @@ export class Address {
*/
ordinalDirection(useAbbr: boolean = false): string {
if (!useAbbr) {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.direction.slice(4, 8)
);
}
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.direction_abbr.slice(4, 8)
);
}
Expand Down Expand Up @@ -479,7 +481,7 @@ export class Address {
* faker.address.timeZone() // 'Pacific/Guam'
*/
timeZone(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.address.time_zone
);
}
Expand Down
32 changes: 18 additions & 14 deletions src/animal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class Animal {
* faker.animal.dog() // 'Irish Water Spaniel'
*/
dog(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.dog);
return this.faker.helpers.arrayElement(this.faker.definitions.animal.dog);
}

/**
Expand All @@ -31,7 +31,7 @@ export class Animal {
* faker.animal.cat() // 'Singapura'
*/
cat(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.cat);
return this.faker.helpers.arrayElement(this.faker.definitions.animal.cat);
}

/**
Expand All @@ -41,7 +41,7 @@ export class Animal {
* faker.animal.snake() // 'Eyelash viper'
*/
snake(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.snake);
return this.faker.helpers.arrayElement(this.faker.definitions.animal.snake);
}

/**
Expand All @@ -51,7 +51,7 @@ export class Animal {
* faker.animal.bear() // 'Asian black bear'
*/
bear(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.bear);
return this.faker.helpers.arrayElement(this.faker.definitions.animal.bear);
}

/**
Expand All @@ -61,7 +61,7 @@ export class Animal {
* faker.animal.lion() // 'Northeast Congo Lion'
*/
lion(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.lion);
return this.faker.helpers.arrayElement(this.faker.definitions.animal.lion);
}

/**
Expand All @@ -71,7 +71,7 @@ export class Animal {
* faker.animal.cetacean() // 'Spinner Dolphin'
*/
cetacean(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.animal.cetacean
);
}
Expand All @@ -83,7 +83,7 @@ export class Animal {
* faker.animal.horse() // 'Swedish Warmblood'
*/
horse(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.horse);
return this.faker.helpers.arrayElement(this.faker.definitions.animal.horse);
}

/**
Expand All @@ -93,7 +93,7 @@ export class Animal {
* faker.animal.bird() // 'Buller's Shearwater'
*/
bird(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.bird);
return this.faker.helpers.arrayElement(this.faker.definitions.animal.bird);
}

/**
Expand All @@ -103,7 +103,7 @@ export class Animal {
* faker.animal.cow() // 'Brava'
*/
cow(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.cow);
return this.faker.helpers.arrayElement(this.faker.definitions.animal.cow);
}

/**
Expand All @@ -113,7 +113,7 @@ export class Animal {
* faker.animal.fish() // 'Mandarin fish'
*/
fish(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.fish);
return this.faker.helpers.arrayElement(this.faker.definitions.animal.fish);
}

/**
Expand All @@ -123,7 +123,7 @@ export class Animal {
* faker.animal.crocodilia() // 'Philippine Crocodile'
*/
crocodilia(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.animal.crocodilia
);
}
Expand All @@ -135,7 +135,9 @@ export class Animal {
* faker.animal.insect() // 'Pyramid ant'
*/
insect(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.insect);
return this.faker.helpers.arrayElement(
this.faker.definitions.animal.insect
);
}

/**
Expand All @@ -145,7 +147,9 @@ export class Animal {
* faker.animal.rabbit() // 'Florida White'
*/
rabbit(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.rabbit);
return this.faker.helpers.arrayElement(
this.faker.definitions.animal.rabbit
);
}

/**
Expand All @@ -155,6 +159,6 @@ export class Animal {
* faker.animal.type() // 'crocodilia'
*/
type(): string {
return this.faker.random.arrayElement(this.faker.definitions.animal.type);
return this.faker.helpers.arrayElement(this.faker.definitions.animal.type);
}
}
12 changes: 6 additions & 6 deletions src/commerce.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class Commerce {
* faker.commerce.color() // 'red'
*/
color(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.commerce.color
);
}
Expand All @@ -33,7 +33,7 @@ export class Commerce {
* faker.commerce.department() // 'Garden'
*/
department(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.commerce.department
);
}
Expand Down Expand Up @@ -90,7 +90,7 @@ export class Commerce {
* faker.commerce.productAdjective() // 'Handcrafted'
*/
productAdjective(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.commerce.product_name.adjective
);
}
Expand All @@ -102,7 +102,7 @@ export class Commerce {
* faker.commerce.productMaterial() // 'Rubber'
*/
productMaterial(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.commerce.product_name.material
);
}
Expand All @@ -114,7 +114,7 @@ export class Commerce {
* faker.commerce.product() // 'Computer'
*/
product(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.commerce.product_name.product
);
}
Expand All @@ -126,7 +126,7 @@ export class Commerce {
* faker.commerce.productDescription() // 'Andy shoes are designed to keeping...'
*/
productDescription(): string {
return this.faker.random.arrayElement(
return this.faker.helpers.arrayElement(
this.faker.definitions.commerce.product_description
);
}
Expand Down
Loading