Skip to content

refactor(address): drop local references of faker modules #748

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 1, 2022
Merged

refactor(address): drop local references of faker modules #748

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
913781c
refactor(address): drop local faker.fake reference
xDivisionByZerox Apr 1, 2022
1194739
refactor(address): drop local reference of faker.helpers
xDivisionByZerox Apr 1, 2022
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
21 changes: 6 additions & 15 deletions src/address.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import type { Faker } from '.';
import type { Fake } from './fake';
import type { Helpers } from './helpers';

let f: Fake['fake'];

/**
* Converts degrees to radians.
Expand Down Expand Up @@ -77,12 +73,7 @@ function coordinateWithOffset(
* Module to generate addresses and locations.
*/
export class Address {
readonly Helpers: Helpers;

constructor(private readonly faker: Faker) {
f = this.faker.fake;
this.Helpers = this.faker.helpers;

// Bind `this` so namespaced is working correctly
for (const name of Object.getOwnPropertyNames(Address.prototype)) {
if (name === 'constructor' || typeof this[name] !== 'function') {
Expand Down Expand Up @@ -116,7 +107,7 @@ export class Address {
format = this.faker.random.arrayElement(localeFormat);
}
}
return this.Helpers.replaceSymbols(format);
return this.faker.helpers.replaceSymbols(format);
}

/**
Expand Down Expand Up @@ -177,7 +168,7 @@ export class Address {
format = this.faker.datatype.number(formats.length - 1);
}

return f(formats[format]);
return this.faker.fake(formats[format]);
}

/**
Expand Down Expand Up @@ -256,19 +247,19 @@ export class Address {
switch (this.faker.datatype.number(2)) {
case 0:
address =
this.Helpers.replaceSymbolWithNumber('#####') +
this.faker.helpers.replaceSymbolWithNumber('#####') +
' ' +
this.faker.address.streetName();
break;
case 1:
address =
this.Helpers.replaceSymbolWithNumber('####') +
this.faker.helpers.replaceSymbolWithNumber('####') +
' ' +
this.faker.address.streetName();
break;
case 2:
address =
this.Helpers.replaceSymbolWithNumber('###') +
this.faker.helpers.replaceSymbolWithNumber('###') +
' ' +
this.faker.address.streetName();
break;
Expand Down Expand Up @@ -309,7 +300,7 @@ export class Address {
* faker.address.secondaryAddress() // 'Apt. 861'
*/
secondaryAddress(): string {
return this.Helpers.replaceSymbolWithNumber(
return this.faker.helpers.replaceSymbolWithNumber(
this.faker.random.arrayElement(
this.faker.definitions.address.secondary_address
)
Expand Down