From e569e94f86146e546d504d2953dccb53a276bef0 Mon Sep 17 00:00:00 2001 From: prisis Date: Tue, 25 Jan 2022 23:44:59 +0100 Subject: [PATCH 1/2] fix: removed dead code and added missing types --- src/system.ts | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/src/system.ts b/src/system.ts index 063941f0159..53a42fdf8be 100644 --- a/src/system.ts +++ b/src/system.ts @@ -76,24 +76,6 @@ export class System { * faker.system.mimeType() // 'video/vnd.vivo' */ mimeType(): string { - const typeSet = new Set(); - 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); @@ -145,8 +127,6 @@ export class System { }); const types = setToArray(typeSet); - const extensions = setToArray(extensionSet); - const mimeTypeKeys = Object.keys(this.faker.definitions.system.mimeTypes); return this.faker.random.arrayElement(types); } @@ -160,25 +140,8 @@ export class System { * faker.system.fileExt('application/json') // 'json' */ fileExt(mimeType?: string): string { - const typeSet = new Set(); 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); if (mimeType) { const mimes = this.faker.definitions.system.mimeTypes; From f231afac2d7556fbf839344ded180165730c33a8 Mon Sep 17 00:00:00 2001 From: prisis Date: Mon, 31 Jan 2022 23:30:03 +0100 Subject: [PATCH 2/2] fix: adjusted fileExt to return correct code again --- src/system.ts | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/system.ts b/src/system.ts index 53a42fdf8be..33413a23bc6 100644 --- a/src/system.ts +++ b/src/system.ts @@ -111,19 +111,12 @@ export class System { */ fileType(): string { const typeSet = new Set(); - 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); @@ -140,14 +133,24 @@ export class System { * faker.system.fileExt('application/json') // 'json' */ fileExt(mimeType?: string): string { - const extensionSet = new Set(); - const extensions = setToArray(extensionSet); - - if (mimeType) { + 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(); + + Object.keys(mimeTypes).forEach((m) => { + if (mimeTypes[m].extensions instanceof Array) { + mimeTypes[m].extensions.forEach((ext) => { + extensionSet.add(ext); + }); + } + }); + + const extensions = setToArray(extensionSet); + return this.faker.random.arrayElement(extensions); }