diff --git a/scripts/commands/db/update.ts b/scripts/commands/db/update.ts index 401da305..707d9cfe 100644 --- a/scripts/commands/db/update.ts +++ b/scripts/commands/db/update.ts @@ -1,4 +1,4 @@ -import { CSV, IssueLoader, CSVParser, Issue, IssueData } from '../../core' +import { CSV, IssueLoader, Issue, IssueData } from '../../core' import { createChannelId, createFeedId } from '../../utils' import { Channel, Feed, BlocklistRecord } from '../../models' import { Storage, Collection, Logger } from '@freearhey/core' @@ -11,7 +11,6 @@ const dataStorage = new Storage(DATA_DIR) const logger = new Logger({ level: -999 }) async function main() { - const parser = new CSVParser() const issueLoader = new IssueLoader() const dataLoader = new DataLoader({ storage: dataStorage }) @@ -101,7 +100,7 @@ async function editFeeds(issues: Collection, data: DataLoaderData) { ) if (!found) return - let channelId: string | undefined = found.channelId + const channelId: string | undefined = found.channelId let feedId: string | undefined = found.id if (issueData.has('feed_name')) { const name = issueData.getString('feed_name') || found.name diff --git a/scripts/commands/db/validate.ts b/scripts/commands/db/validate.ts index 1a65e2d4..0206eb93 100644 --- a/scripts/commands/db/validate.ts +++ b/scripts/commands/db/validate.ts @@ -238,7 +238,7 @@ function findDuplicatesBy(items: Collection, keys: string[]) { const duplicates = new Collection() const buffer = new Dictionary() - items.forEach((item, i = 0) => { + items.forEach((item: { [key: string]: string | number }) => { const normId = keys.map(key => item[key].toString().toLowerCase()).join() if (buffer.has(normId)) { duplicates.add(item) diff --git a/scripts/core/dataLoader.ts b/scripts/core/dataLoader.ts index 47aee225..c0088981 100644 --- a/scripts/core/dataLoader.ts +++ b/scripts/core/dataLoader.ts @@ -27,7 +27,7 @@ export class DataLoader { async load(): Promise { const files = await this.storage.list('*.csv') - let data: DataLoaderData = { + const data: DataLoaderData = { channels: new Collection(), feeds: new Collection(), categories: new Collection(), @@ -55,7 +55,7 @@ export class DataLoader { const csv = await this.storage.load(file.basename()) const rows = csv.split(/\r\n/) const headers = rows[0].split(',') - let errors = new Collection() + const errors = new Collection() for (const [i, line] of rows.entries()) { if (!line.trim()) continue if (line.indexOf('\n') > -1) { diff --git a/scripts/types/csvParser.d.ts b/scripts/types/csvParser.d.ts index d9946573..e97ef835 100644 --- a/scripts/types/csvParser.d.ts +++ b/scripts/types/csvParser.d.ts @@ -1,4 +1,4 @@ export type CSVParserRow = { line: number - data: any + data: { [key: string]: string } } diff --git a/scripts/validators/blocklistRecordValidator.ts b/scripts/validators/blocklistRecordValidator.ts index ae1e6de5..8d1c7678 100644 --- a/scripts/validators/blocklistRecordValidator.ts +++ b/scripts/validators/blocklistRecordValidator.ts @@ -12,7 +12,7 @@ export class BlocklistRecordValidator extends Validator { validate(blocklistRecord: BlocklistRecord): Collection { const { channelsKeyById }: DataLoaderData = this.data - let errors = new Collection() + const errors = new Collection() const joiResults = blocklistRecord .getSchema() diff --git a/scripts/validators/categoryValidator.ts b/scripts/validators/categoryValidator.ts index 644086fe..e91edb8d 100644 --- a/scripts/validators/categoryValidator.ts +++ b/scripts/validators/categoryValidator.ts @@ -9,7 +9,7 @@ export class CategoryValidator extends Validator { } validate(category: Category): Collection { - let errors = new Collection() + const errors = new Collection() const joiResults = category.getSchema().validate(category.data(), { abortEarly: false }) if (joiResults.error) { diff --git a/scripts/validators/channelValidator.ts b/scripts/validators/channelValidator.ts index fa26f77f..636f3117 100644 --- a/scripts/validators/channelValidator.ts +++ b/scripts/validators/channelValidator.ts @@ -18,7 +18,7 @@ export class ChannelValidator extends Validator { categoriesKeyById }: DataLoaderData = this.data - let errors = new Collection() + const errors = new Collection() const joiResults = channel.getSchema().validate(channel.data(), { abortEarly: false }) if (joiResults.error) { diff --git a/scripts/validators/countryValidator.ts b/scripts/validators/countryValidator.ts index c1e7292e..d2b0ee37 100644 --- a/scripts/validators/countryValidator.ts +++ b/scripts/validators/countryValidator.ts @@ -12,7 +12,7 @@ export class CountryValidator extends Validator { validate(country: Country): Collection { const { languagesKeyByCode }: DataLoaderData = this.data - let errors = new Collection() + const errors = new Collection() const joiResults = country.getSchema().validate(country.data(), { abortEarly: false }) if (joiResults.error) { diff --git a/scripts/validators/feedValidator.ts b/scripts/validators/feedValidator.ts index 57085405..538a52ca 100644 --- a/scripts/validators/feedValidator.ts +++ b/scripts/validators/feedValidator.ts @@ -18,7 +18,7 @@ export class FeedValidator extends Validator { timezonesKeyById }: DataLoaderData = this.data - let errors = new Collection() + const errors = new Collection() const joiResults = feed.getSchema().validate(feed.data(), { abortEarly: false }) if (joiResults.error) { diff --git a/scripts/validators/languageValidator.ts b/scripts/validators/languageValidator.ts index ec14c763..c8b3a32c 100644 --- a/scripts/validators/languageValidator.ts +++ b/scripts/validators/languageValidator.ts @@ -9,7 +9,7 @@ export class LanguageValidator extends Validator { } validate(language: Language): Collection { - let errors = new Collection() + const errors = new Collection() const joiResults = language.getSchema().validate(language.data(), { abortEarly: false }) if (joiResults.error) { diff --git a/scripts/validators/regionValidator.ts b/scripts/validators/regionValidator.ts index 61d2129b..0c7c24b4 100644 --- a/scripts/validators/regionValidator.ts +++ b/scripts/validators/regionValidator.ts @@ -12,7 +12,7 @@ export class RegionValidator extends Validator { validate(region: Region): Collection { const { countriesKeyByCode }: DataLoaderData = this.data - let errors = new Collection() + const errors = new Collection() const joiResults = region.getSchema().validate(region.data(), { abortEarly: false }) if (joiResults.error) { diff --git a/scripts/validators/subdivisionValidator.ts b/scripts/validators/subdivisionValidator.ts index 357031ae..2cf43f1e 100644 --- a/scripts/validators/subdivisionValidator.ts +++ b/scripts/validators/subdivisionValidator.ts @@ -12,7 +12,7 @@ export class SubdivisionValidator extends Validator { validate(subdivision: Subdivision): Collection { const { countriesKeyByCode }: DataLoaderData = this.data - let errors = new Collection() + const errors = new Collection() const joiResults = subdivision.getSchema().validate(subdivision.data(), { abortEarly: false }) if (joiResults.error) { diff --git a/scripts/validators/timezoneValidator.ts b/scripts/validators/timezoneValidator.ts index d5e10d7a..ed3bb734 100644 --- a/scripts/validators/timezoneValidator.ts +++ b/scripts/validators/timezoneValidator.ts @@ -12,7 +12,7 @@ export class TimezoneValidator extends Validator { validate(timezone: Timezone): Collection { const { countriesKeyByCode }: DataLoaderData = this.data - let errors = new Collection() + const errors = new Collection() const joiResults = timezone.getSchema().validate(timezone.data(), { abortEarly: false }) if (joiResults.error) {