Skip to content

fix: removed dead code and adjusted fileExt #304

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 4 commits into from
Feb 1, 2022
Merged

fix: removed dead code and adjusted fileExt #304

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e569e94
fix: removed dead code and added missing types
prisis Jan 25, 2022
f231afa
fix: adjusted fileExt to return correct code again
prisis Jan 31, 2022
6e597fa
Merge branch 'main' into feature/fix-type-and-dead-code
prisis Feb 1, 2022
c30e5e6
Merge branch 'main' into feature/fix-type-and-dead-code
prisis Feb 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
46 changes: 6 additions & 40 deletions src/system.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,24 +76,6 @@ export class System {
* faker.system.mimeType() // 'video/vnd.vivo'
*/
mimeType(): string {
const typeSet = new Set<string>();
const extensionSet = new Set();
const mimeTypes = this.faker.definitions.system.mimeTypes;

Object.keys(mimeTypes).forEach((m) => {
const type = m.split('/')[0];

typeSet.add(type);

if (mimeTypes[m].extensions instanceof Array) {
mimeTypes[m].extensions.forEach((ext) => {
extensionSet.add(ext);
});
}
});

const types = setToArray(typeSet);
const extensions = setToArray(extensionSet);
const mimeTypeKeys = Object.keys(this.faker.definitions.system.mimeTypes);

return this.faker.random.arrayElement(mimeTypeKeys);
Expand Down Expand Up @@ -129,24 +111,15 @@ export class System {
*/
fileType(): string {
const typeSet = new Set<string>();
const extensionSet = new Set();
const mimeTypes = this.faker.definitions.system.mimeTypes;

Object.keys(mimeTypes).forEach((m) => {
const type = m.split('/')[0];

typeSet.add(type);

if (mimeTypes[m].extensions instanceof Array) {
mimeTypes[m].extensions.forEach((ext) => {
extensionSet.add(ext);
});
}
});

const types = setToArray(typeSet);
const extensions = setToArray(extensionSet);
const mimeTypeKeys = Object.keys(this.faker.definitions.system.mimeTypes);
return this.faker.random.arrayElement(types);
}

Expand All @@ -160,30 +133,23 @@ export class System {
* faker.system.fileExt('application/json') // 'json'
*/
fileExt(mimeType?: string): string {
const typeSet = new Set<string>();
const extensionSet = new Set<string>();
if (typeof mimeType === 'string') {
const mimes = this.faker.definitions.system.mimeTypes;
return this.faker.random.arrayElement(mimes[mimeType].extensions);
}

const mimeTypes = this.faker.definitions.system.mimeTypes;
const extensionSet = new Set<string>();

Object.keys(mimeTypes).forEach((m) => {
const type = m.split('/')[0];

typeSet.add(type);

if (mimeTypes[m].extensions instanceof Array) {
mimeTypes[m].extensions.forEach((ext) => {
extensionSet.add(ext);
});
}
});

const types = setToArray(typeSet);
const extensions = setToArray(extensionSet);
const mimeTypeKeys = Object.keys(this.faker.definitions.system.mimeTypes);

if (mimeType) {
const mimes = this.faker.definitions.system.mimeTypes;
return this.faker.random.arrayElement(mimes[mimeType].extensions);
}

return this.faker.random.arrayElement(extensions);
}
Expand Down