diff --git a/.eslintrc.js b/.eslintrc.js index 4a9b406b..7c73657a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,5 +28,13 @@ module.exports = { 'plugin:@typescript-eslint/recommended', 'plugin:@typescript-eslint/recommended-requiring-type-checking', ], - ignorePatterns: ['.eslintrc.js', 'tailwind.config.js'], + ignorePatterns: [ + '.eslintrc.js', + 'tailwind.config.js', + 'node_modules', + 'dist_electron', + '*.spec.ts', + 'vite.config.ts', + 'postcss.config.js', + ], }; diff --git a/babel.config.js b/babel.config.js deleted file mode 100644 index 916db641..00000000 --- a/babel.config.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - presets: ['@vue/cli-plugin-babel/preset'] -}; diff --git a/backend/database/bespoke.ts b/backend/database/bespoke.ts index 67d56329..42fb7135 100644 --- a/backend/database/bespoke.ts +++ b/backend/database/bespoke.ts @@ -1,3 +1,10 @@ +import { + Cashflow, + IncomeExpense, + TopExpenses, + TotalCreditAndDebit, + TotalOutstanding, +} from 'utils/db/types'; import { ModelNameEnum } from '../../models/types'; import DatabaseCore from './core'; import { BespokeFunction } from './types'; @@ -43,7 +50,7 @@ export class BespokeQueries { .groupBy('account') .orderBy('total', 'desc') .limit(5); - return topExpenses; + return topExpenses as TopExpenses; } static async getTotalOutstanding( @@ -52,13 +59,13 @@ export class BespokeQueries { fromDate: string, toDate: string ) { - return await db.knex!(schemaName) + return (await db.knex!(schemaName) .sum({ total: 'baseGrandTotal' }) .sum({ outstanding: 'outstandingAmount' }) .where('submitted', true) .where('cancelled', false) .whereBetween('date', [fromDate, toDate]) - .first(); + .first()) as TotalOutstanding; } static async getCashflow(db: DatabaseCore, fromDate: string, toDate: string) { @@ -67,7 +74,7 @@ export class BespokeQueries { .where('accountType', 'in', ['Cash', 'Bank']) .andWhere('isGroup', false); const dateAsMonthYear = db.knex!.raw(`strftime('%Y-%m', ??)`, 'date'); - return await db.knex!('AccountingLedgerEntry') + return (await db.knex!('AccountingLedgerEntry') .where('reverted', false) .sum({ inflow: 'debit', @@ -78,7 +85,7 @@ export class BespokeQueries { }) .where('account', 'in', cashAndBankAccounts) .whereBetween('date', [fromDate, toDate]) - .groupBy(dateAsMonthYear); + .groupBy(dateAsMonthYear)) as Cashflow; } static async getIncomeAndExpenses( @@ -86,7 +93,7 @@ export class BespokeQueries { fromDate: string, toDate: string ) { - const income = await db.knex!.raw( + const income = (await db.knex!.raw( ` select sum(cast(credit as real) - cast(debit as real)) as balance, strftime('%Y-%m', date) as yearmonth from AccountingLedgerEntry @@ -100,9 +107,9 @@ export class BespokeQueries { ) group by yearmonth`, [fromDate, toDate] - ); + )) as IncomeExpense['income']; - const expense = await db.knex!.raw( + const expense = (await db.knex!.raw( ` select sum(cast(debit as real) - cast(credit as real)) as balance, strftime('%Y-%m', date) as yearmonth from AccountingLedgerEntry @@ -116,20 +123,20 @@ export class BespokeQueries { ) group by yearmonth`, [fromDate, toDate] - ); + )) as IncomeExpense['expense']; return { income, expense }; } static async getTotalCreditAndDebit(db: DatabaseCore) { - return await db.knex!.raw(` + return (await db.knex!.raw(` select account, sum(cast(credit as real)) as totalCredit, sum(cast(debit as real)) as totalDebit from AccountingLedgerEntry group by account - `); + `)) as unknown as TotalCreditAndDebit; } static async getStockQuantity( @@ -141,6 +148,7 @@ export class BespokeQueries { batch?: string, serialNumbers?: string[] ): Promise { + /* eslint-disable @typescript-eslint/no-floating-promises */ const query = db.knex!(ModelNameEnum.StockLedgerEntry) .sum('quantity') .where('item', item); diff --git a/backend/database/core.ts b/backend/database/core.ts index 5d1dd6c1..d14a1a70 100644 --- a/backend/database/core.ts +++ b/backend/database/core.ts @@ -1,9 +1,4 @@ -import { - CannotCommitError, - getDbError, - NotFoundError, - ValueError, -} from 'fyo/utils/errors'; +import { getDbError, NotFoundError, ValueError } from 'fyo/utils/errors'; import { knex, Knex } from 'knex'; import { Field, @@ -73,16 +68,16 @@ export default class DatabaseCore extends DatabaseBase { let query: { value: string }[] = []; try { - query = await db.knex!('SingleValue').where({ + query = (await db.knex!('SingleValue').where({ fieldname: 'countryCode', parent: 'SystemSettings', - }); + })) as { value: string }[]; } catch { // Database not inialized and no countryCode passed } if (query.length > 0) { - countryCode = query[0].value as string; + countryCode = query[0].value; } await db.close(); @@ -95,8 +90,8 @@ export default class DatabaseCore extends DatabaseBase { async connect() { this.knex = knex(this.connectionParams); - this.knex.on('query-error', (error) => { - error.type = getDbError(error); + this.knex.on('query-error', (error: Error) => { + error.cause = getDbError(error); }); await this.knex.raw('PRAGMA foreign_keys=ON'); } @@ -105,22 +100,6 @@ export default class DatabaseCore extends DatabaseBase { await this.knex!.destroy(); } - async commit() { - /** - * this auto commits, commit is not required - * will later wrap the outermost functions in - * transactions. - */ - try { - // await this.knex!.raw('commit'); - } catch (err) { - const type = getDbError(err as Error); - if (type !== CannotCommitError) { - throw err; - } - } - } - async migrate() { for (const schemaName in this.schemaMap) { const schema = this.schemaMap[schemaName] as Schema; @@ -135,7 +114,6 @@ export default class DatabaseCore extends DatabaseBase { } } - await this.commit(); await this.#initializeSingles(); } @@ -149,6 +127,7 @@ export default class DatabaseCore extends DatabaseBase { try { const qb = this.knex!(schemaName); if (name !== undefined) { + // eslint-disable-next-line @typescript-eslint/no-floating-promises qb.where({ name }); } row = await qb.limit(1); @@ -178,7 +157,7 @@ export default class DatabaseCore extends DatabaseBase { async get( schemaName: string, - name: string = '', + name = '', fields?: string | string[] ): Promise { const schema = this.schemaMap[schemaName] as Schema; @@ -316,7 +295,6 @@ export default class DatabaseCore extends DatabaseBase { await this.knex!(schemaName) .update({ name: newName }) .where('name', oldName); - await this.commit(); } async update(schemaName: string, fieldValueMap: FieldValueMap) { @@ -422,6 +400,7 @@ export default class DatabaseCore extends DatabaseBase { filters: QueryFilter, options: GetQueryBuilderOptions ): Knex.QueryBuilder { + /* eslint-disable @typescript-eslint/no-floating-promises */ const builder = this.knex!.select(fields).from(schemaName); this.#applyFiltersToBuilder(builder, filters); @@ -464,12 +443,12 @@ export default class DatabaseCore extends DatabaseBase { // => `date >= 2017-09-09 and date <= 2017-11-01` const filtersArray = this.#getFiltersArray(filters); - for (const i in filtersArray) { + for (let i = 0; i < filtersArray.length; i++) { const filter = filtersArray[i]; const field = filter[0] as string; const operator = filter[1]; const comparisonValue = filter[2]; - const type = i === '0' ? 'where' : 'andWhere'; + const type = i === 0 ? 'where' : 'andWhere'; if (operator === '=') { builder[type](field, comparisonValue); @@ -505,7 +484,8 @@ export default class DatabaseCore extends DatabaseBase { if ( operator === 'like' && - !(comparisonValue as (string | number)[]).includes('%') + typeof comparisonValue === 'string' && + !comparisonValue.includes('%') ) { comparisonValue = `%${comparisonValue}%`; } @@ -595,11 +575,8 @@ export default class DatabaseCore extends DatabaseBase { } // link - if ( - field.fieldtype === FieldTypeEnum.Link && - (field as TargetField).target - ) { - const targetSchemaName = (field as TargetField).target as string; + if (field.fieldtype === FieldTypeEnum.Link && field.target) { + const targetSchemaName = field.target; const schema = this.schemaMap[targetSchemaName] as Schema; table .foreign(field.fieldname) @@ -630,7 +607,7 @@ export default class DatabaseCore extends DatabaseBase { } if (newForeignKeys.length) { - await this.#addForeignKeys(schemaName, newForeignKeys); + await this.#addForeignKeys(schemaName); } } @@ -652,15 +629,15 @@ export default class DatabaseCore extends DatabaseBase { async #getNonExtantSingleValues(singleSchemaName: string) { const existingFields = ( - await this.knex!('SingleValue') + (await this.knex!('SingleValue') .where({ parent: singleSchemaName }) - .select('fieldname') + .select('fieldname')) as { fieldname: string }[] ).map(({ fieldname }) => fieldname); return this.schemaMap[singleSchemaName]!.fields.map( ({ fieldname, default: value }) => ({ fieldname, - value: value as RawValue | undefined, + value: value, }) ).filter( ({ fieldname, value }) => @@ -710,7 +687,7 @@ export default class DatabaseCore extends DatabaseBase { child.idx ??= idx; } - async #addForeignKeys(schemaName: string, newForeignKeys: Field[]) { + async #addForeignKeys(schemaName: string) { const tableRows = await this.knex!.select().from(schemaName); await this.prestigeTheTable(schemaName, tableRows); } @@ -731,10 +708,10 @@ export default class DatabaseCore extends DatabaseBase { } async #getOne(schemaName: string, name: string, fields: string[]) { - const fieldValueMap: FieldValueMap = await this.knex!.select(fields) + const fieldValueMap = (await this.knex!.select(fields) .from(schemaName) .where('name', name) - .first(); + .first()) as FieldValueMap; return fieldValueMap; } @@ -794,9 +771,9 @@ export default class DatabaseCore extends DatabaseBase { fieldname, }; - const names: { name: string }[] = await this.knex!('SingleValue') + const names = (await this.knex!('SingleValue') .select('name') - .where(updateKey); + .where(updateKey)) as { name: string }[]; if (!names?.length) { this.#insertSingleValue(singleSchemaName, fieldname, value); @@ -899,7 +876,7 @@ export default class DatabaseCore extends DatabaseBase { continue; } - for (const child of tableFieldValue!) { + for (const child of tableFieldValue) { this.#prepareChild(schemaName, parentName, child, field, added.length); if ( diff --git a/backend/database/tests/helpers.ts b/backend/database/tests/helpers.ts index 9bfa8de3..ead1db65 100644 --- a/backend/database/tests/helpers.ts +++ b/backend/database/tests/helpers.ts @@ -204,7 +204,7 @@ export async function assertDoesNotThrow( throw new assert.AssertionError({ message: `Got unwanted exception${ message ? `: ${message}` : '' - }\nError: ${(err as Error).message}\n${(err as Error).stack}`, + }\nError: ${(err as Error).message}\n${(err as Error).stack ?? ''}`, }); } } diff --git a/backend/helpers.ts b/backend/helpers.ts index 95389164..f9c72c30 100644 --- a/backend/helpers.ts +++ b/backend/helpers.ts @@ -55,7 +55,13 @@ export function emitMainProcessError( error: unknown, more?: Record ) { - (process.emit as Function)(CUSTOM_EVENTS.MAIN_PROCESS_ERROR, error, more); + ( + process.emit as ( + event: string, + error: unknown, + more?: Record + ) => void + )(CUSTOM_EVENTS.MAIN_PROCESS_ERROR, error, more); } export async function checkFileAccess(filePath: string, mode?: number) { diff --git a/backend/patches/testPatch.ts b/backend/patches/testPatch.ts index a18f9635..6bd74432 100644 --- a/backend/patches/testPatch.ts +++ b/backend/patches/testPatch.ts @@ -1,5 +1,6 @@ import { DatabaseManager } from '../database/manager'; +// eslint-disable-next-line @typescript-eslint/no-unused-vars async function execute(dm: DatabaseManager) { /** * Execute function will receive the DatabaseManager which is to be used diff --git a/backend/patches/updateSchemas.ts b/backend/patches/updateSchemas.ts index 12b0e463..e883de26 100644 --- a/backend/patches/updateSchemas.ts +++ b/backend/patches/updateSchemas.ts @@ -30,9 +30,9 @@ async function execute(dm: DatabaseManager) { const sourceKnex = dm.db!.knex!; const version = ( - await sourceKnex('SingleValue') + (await sourceKnex('SingleValue') .select('value') - .where({ fieldname: 'version' }) + .where({ fieldname: 'version' })) as { value: string }[] )?.[0]?.value; /** @@ -58,7 +58,7 @@ async function execute(dm: DatabaseManager) { await copyData(sourceKnex, destDm); } catch (err) { const destPath = destDm.db!.dbPath; - destDm.db!.close(); + await destDm.db!.close(); await fs.unlink(destPath); throw err; } @@ -94,7 +94,7 @@ async function replaceDatabaseCore( async function copyData(sourceKnex: Knex, destDm: DatabaseManager) { const destKnex = destDm.db!.knex!; const schemaMap = destDm.getSchemaMap(); - await destKnex!.raw('PRAGMA foreign_keys=OFF'); + await destKnex.raw('PRAGMA foreign_keys=OFF'); await copySingleValues(sourceKnex, destKnex, schemaMap); await copyParty(sourceKnex, destKnex, schemaMap[ModelNameEnum.Party]!); await copyItem(sourceKnex, destKnex, schemaMap[ModelNameEnum.Item]!); @@ -111,7 +111,7 @@ async function copyData(sourceKnex: Knex, destDm: DatabaseManager) { destKnex, schemaMap[ModelNameEnum.NumberSeries]! ); - await destKnex!.raw('PRAGMA foreign_keys=ON'); + await destKnex.raw('PRAGMA foreign_keys=ON'); } async function copyNumberSeries( @@ -137,14 +137,14 @@ async function copyNumberSeries( continue; } - const indices = await sourceKnex.raw( + const indices = (await sourceKnex.raw( ` select cast(substr(name, ??) as int) as idx from ?? order by idx desc limit 1`, [name.length + 1, referenceType] - ); + )) as { idx: number }[]; value.start = 1001; value.current = indices[0]?.idx ?? value.current ?? value.start; @@ -358,7 +358,9 @@ async function getCountryCode(knex: Knex) { * Need to account for schema changes, in 0.4.3-beta.0 */ const country = ( - await knex('SingleValue').select('value').where({ fieldname: 'country' }) + (await knex('SingleValue') + .select('value') + .where({ fieldname: 'country' })) as { value: string }[] )?.[0]?.value; if (!country) { diff --git a/dummy/index.ts b/dummy/index.ts index 1c27ae9c..e7827bb5 100644 --- a/dummy/index.ts +++ b/dummy/index.ts @@ -25,8 +25,8 @@ type Notifier = (stage: string, percent: number) => void; export async function setupDummyInstance( dbPath: string, fyo: Fyo, - years: number = 1, - baseCount: number = 1000, + years = 1, + baseCount = 1000, notifier?: Notifier ) { await fyo.purgeCache(); @@ -251,7 +251,7 @@ async function getSalesInvoices( * For each date create a Sales Invoice. */ - for (const d in dates) { + for (let d = 0; d < dates.length; d++) { const date = dates[d]; notifier?.( @@ -424,7 +424,7 @@ async function getSalesPurchaseInvoices( for (const item of supplierGrouped[supplier]) { await doc.append('items', {}); const quantity = purchaseQty[item]; - doc.items!.at(-1)!.set({ item, quantity }); + await doc.items!.at(-1)!.set({ item, quantity }); } invoices.push(doc); @@ -527,7 +527,7 @@ async function syncAndSubmit(docs: Doc[], notifier?: Notifier) { }; const total = docs.length; - for (const i in docs) { + for (let i = 0; i < docs.length; i++) { const doc = docs[i]; notifier?.( `Syncing ${nameMap[doc.schemaName]}, ${i} out of ${total}`, diff --git a/fyo/core/authHandler.ts b/fyo/core/authHandler.ts index 22325cb1..ccd914c8 100644 --- a/fyo/core/authHandler.ts +++ b/fyo/core/authHandler.ts @@ -62,58 +62,6 @@ export class AuthHandler { return null; } - async login(email: string, password: string) { - if (email === 'Administrator') { - this.#session.user = 'Administrator'; - return; - } - - const response = await fetch(this.#getServerURL() + '/api/login', { - method: 'POST', - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ email, password }), - }); - - if (response.status === 200) { - const res = await response.json(); - - this.#session.user = email; - this.#session.token = res.token; - - return res; - } - - return response; - } - - async signup(email: string, fullName: string, password: string) { - const response = await fetch(this.#getServerURL() + '/api/signup', { - method: 'POST', - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ email, fullName, password }), - }); - - if (response.status === 200) { - return await response.json(); - } - - return response; - } - - async logout() { - // TODO: Implement this with auth flow - } - - #getServerURL() { - return this.#config.serverURL || ''; - } - async getCreds(): Promise { if (!this.#creds) { this.#creds = await this.#demux.getCreds(); diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts index c9220163..fd07c913 100644 --- a/fyo/core/converter.ts +++ b/fyo/core/converter.ts @@ -144,7 +144,7 @@ export class Converter { return this.#toRawValueMap(parentSchemaName, value.getValidDict()); } - return this.#toRawValueMap(parentSchemaName, value as DocValueMap); + return this.#toRawValueMap(parentSchemaName, value); }); } else { rawValueMap[fieldname] = Converter.toRawValue( @@ -176,7 +176,7 @@ function toDocString(value: RawValue, field: Field) { } function toDocDate(value: RawValue, field: Field) { - if ((value as any) instanceof Date) { + if ((value as unknown) instanceof Date) { return value; } @@ -286,7 +286,7 @@ function toDocAttachment(value: RawValue, field: Field): null | Attachment { } try { - return JSON.parse(value) || null; + return (JSON.parse(value) as Attachment) || null; } catch { throwError(value, field, 'doc'); } @@ -322,7 +322,7 @@ function toRawInt(value: DocValue, field: Field): number { } if (typeof value === 'number') { - return Math.floor(value as number); + return Math.floor(value); } throwError(value, field, 'raw'); @@ -363,7 +363,7 @@ function toRawDateTime(value: DocValue, field: Field): string | null { } if (value instanceof Date) { - return (value as Date).toISOString(); + return value.toISOString(); } if (value instanceof DateTime) { @@ -431,8 +431,8 @@ function toRawAttachment(value: DocValue, field: Field): null | string { function throwError(value: T, field: Field, type: 'raw' | 'doc'): never { throw new ValueError( - `invalid ${type} conversion '${value}' of type ${typeof value} found, field: ${JSON.stringify( - field - )}` + `invalid ${type} conversion '${String( + value + )}' of type ${typeof value} found, field: ${JSON.stringify(field)}` ); } diff --git a/fyo/core/dbHandler.ts b/fyo/core/dbHandler.ts index 69d17acf..7610024b 100644 --- a/fyo/core/dbHandler.ts +++ b/fyo/core/dbHandler.ts @@ -7,10 +7,15 @@ import { translateSchema } from 'fyo/utils/translation'; import { Field, RawValue, SchemaMap } from 'schemas/types'; import { getMapFromList } from 'utils'; import { + Cashflow, DatabaseBase, DatabaseDemuxBase, GetAllOptions, + IncomeExpense, QueryFilter, + TopExpenses, + TotalCreditAndDebit, + TotalOutstanding, } from 'utils/db/types'; import { schemaTranslateables } from 'utils/translationHelpers'; import { LanguageMap } from 'utils/types'; @@ -22,20 +27,10 @@ import { RawValueMap, } from './types'; -// Return types of Bespoke Queries -type TopExpenses = { account: string; total: number }[]; -type TotalOutstanding = { total: number; outstanding: number }; -type Cashflow = { inflow: number; outflow: number; yearmonth: string }[]; -type Balance = { balance: number; yearmonth: string }[]; -type IncomeExpense = { income: Balance; expense: Balance }; -type TotalCreditAndDebit = { - account: string; - totalCredit: number; - totalDebit: number; -}; type FieldMap = Record>; export class DatabaseHandler extends DatabaseBase { + /* eslint-disable @typescript-eslint/no-floating-promises */ #fyo: Fyo; converter: Converter; #demux: DatabaseDemuxBase; @@ -83,7 +78,7 @@ export class DatabaseHandler extends DatabaseBase { } async init() { - this.#schemaMap = (await this.#demux.getSchemaMap()) as SchemaMap; + this.#schemaMap = await this.#demux.getSchemaMap(); this.#setFieldMap(); this.observer = new Observable(); } @@ -92,7 +87,7 @@ export class DatabaseHandler extends DatabaseBase { if (languageMap) { translateSchema(this.#schemaMap, languageMap, schemaTranslateables); } else { - this.#schemaMap = (await this.#demux.getSchemaMap()) as SchemaMap; + this.#schemaMap = await this.#demux.getSchemaMap(); this.#setFieldMap(); } } @@ -142,6 +137,7 @@ export class DatabaseHandler extends DatabaseBase { options: GetAllOptions = {} ): Promise { const rawValueMap = await this.#getAll(schemaName, options); + this.observer.trigger(`getAll:${schemaName}`, options); return this.converter.toDocValueMap( schemaName, @@ -154,6 +150,7 @@ export class DatabaseHandler extends DatabaseBase { options: GetAllOptions = {} ): Promise { const all = await this.#getAll(schemaName, options); + this.observer.trigger(`getAllRaw:${schemaName}`, options); return all; } @@ -188,6 +185,7 @@ export class DatabaseHandler extends DatabaseBase { ): Promise { const rawValueMap = await this.#getAll(schemaName, options); const count = rawValueMap.length; + this.observer.trigger(`count:${schemaName}`, options); return count; } @@ -199,18 +197,21 @@ export class DatabaseHandler extends DatabaseBase { newName: string ): Promise { await this.#demux.call('rename', schemaName, oldName, newName); + this.observer.trigger(`rename:${schemaName}`, { oldName, newName }); } async update(schemaName: string, docValueMap: DocValueMap): Promise { const rawValueMap = this.converter.toRawValueMap(schemaName, docValueMap); await this.#demux.call('update', schemaName, rawValueMap); + this.observer.trigger(`update:${schemaName}`, docValueMap); } // Delete async delete(schemaName: string, name: string): Promise { await this.#demux.call('delete', schemaName, name); + this.observer.trigger(`delete:${schemaName}`, name); } @@ -220,6 +221,7 @@ export class DatabaseHandler extends DatabaseBase { schemaName, filters )) as number; + this.observer.trigger(`deleteAll:${schemaName}`, filters); return count; } @@ -231,6 +233,7 @@ export class DatabaseHandler extends DatabaseBase { schemaName, name )) as boolean; + this.observer.trigger(`exists:${schemaName}`, name); return doesExist; } diff --git a/fyo/core/docHandler.ts b/fyo/core/docHandler.ts index 2cb9b310..d331a8e0 100644 --- a/fyo/core/docHandler.ts +++ b/fyo/core/docHandler.ts @@ -153,6 +153,7 @@ export class DocHandler { // propagate change to `docs` doc.on('change', (params: unknown) => { + // eslint-disable-next-line @typescript-eslint/no-floating-promises this.docs.trigger('change', params); }); @@ -167,22 +168,24 @@ export class DocHandler { } #setCacheUpdationListeners(schemaName: string) { - this.fyo.db.observer.on(`delete:${schemaName}`, (name: string) => { + this.fyo.db.observer.on(`delete:${schemaName}`, (name) => { + if (typeof name !== 'string') { + return; + } + this.removeFromCache(schemaName, name); }); - this.fyo.db.observer.on( - `rename:${schemaName}`, - (names: { oldName: string; newName: string }) => { - const doc = this.#getFromCache(schemaName, names.oldName); - if (doc === undefined) { - return; - } - - this.removeFromCache(schemaName, names.oldName); - this.#addToCache(doc); + this.fyo.db.observer.on(`rename:${schemaName}`, (names) => { + const { oldName } = names as { oldName: string }; + const doc = this.#getFromCache(schemaName, oldName); + if (doc === undefined) { + return; } - ); + + this.removeFromCache(schemaName, oldName); + this.#addToCache(doc); + }); } removeFromCache(schemaName: string, name: string) { diff --git a/fyo/demux/auth.ts b/fyo/demux/auth.ts index 486b1d2b..9a9df527 100644 --- a/fyo/demux/auth.ts +++ b/fyo/demux/auth.ts @@ -4,7 +4,7 @@ import { Creds } from 'utils/types'; const { ipcRenderer } = require('electron'); export class AuthDemux extends AuthDemuxBase { - #isElectron: boolean = false; + #isElectron = false; constructor(isElectron: boolean) { super(); this.#isElectron = isElectron; diff --git a/fyo/demux/db.ts b/fyo/demux/db.ts index a1b4381b..959903b0 100644 --- a/fyo/demux/db.ts +++ b/fyo/demux/db.ts @@ -6,7 +6,7 @@ import { BackendResponse } from 'utils/ipc/types'; import { IPC_ACTIONS } from 'utils/messages'; export class DatabaseDemux extends DatabaseDemuxBase { - #isElectron: boolean = false; + #isElectron = false; constructor(isElectron: boolean) { super(); this.#isElectron = isElectron; @@ -27,70 +27,76 @@ export class DatabaseDemux extends DatabaseDemuxBase { } async getSchemaMap(): Promise { - if (this.#isElectron) { - return (await this.#handleDBCall(async function dbFunc() { - return await ipcRenderer.invoke(IPC_ACTIONS.DB_SCHEMA); - })) as SchemaMap; + if (!this.#isElectron) { + throw new NotImplemented(); } - throw new NotImplemented(); + return (await this.#handleDBCall(async () => { + return (await ipcRenderer.invoke( + IPC_ACTIONS.DB_SCHEMA + )) as BackendResponse; + })) as SchemaMap; } async createNewDatabase( dbPath: string, countryCode?: string ): Promise { - if (this.#isElectron) { - return (await this.#handleDBCall(async function dbFunc() { - return await ipcRenderer.invoke( - IPC_ACTIONS.DB_CREATE, - dbPath, - countryCode - ); - })) as string; + if (!this.#isElectron) { + throw new NotImplemented(); } - throw new NotImplemented(); + return (await this.#handleDBCall(async () => { + return (await ipcRenderer.invoke( + IPC_ACTIONS.DB_CREATE, + dbPath, + countryCode + )) as BackendResponse; + })) as string; } async connectToDatabase( dbPath: string, countryCode?: string ): Promise { - if (this.#isElectron) { - return (await this.#handleDBCall(async function dbFunc() { - return await ipcRenderer.invoke( - IPC_ACTIONS.DB_CONNECT, - dbPath, - countryCode - ); - })) as string; + if (!this.#isElectron) { + throw new NotImplemented(); } - throw new NotImplemented(); + return (await this.#handleDBCall(async () => { + return (await ipcRenderer.invoke( + IPC_ACTIONS.DB_CONNECT, + dbPath, + countryCode + )) as BackendResponse; + })) as string; } async call(method: DatabaseMethod, ...args: unknown[]): Promise { - if (this.#isElectron) { - return (await this.#handleDBCall(async function dbFunc() { - return await ipcRenderer.invoke(IPC_ACTIONS.DB_CALL, method, ...args); - })) as unknown; + if (!this.#isElectron) { + throw new NotImplemented(); } - throw new NotImplemented(); + return await this.#handleDBCall(async () => { + return (await ipcRenderer.invoke( + IPC_ACTIONS.DB_CALL, + method, + ...args + )) as BackendResponse; + }); } async callBespoke(method: string, ...args: unknown[]): Promise { - if (this.#isElectron) { - return (await this.#handleDBCall(async function dbFunc() { - return await ipcRenderer.invoke( - IPC_ACTIONS.DB_BESPOKE, - method, - ...args - ); - })) as unknown; + if (!this.#isElectron) { + throw new NotImplemented(); } - throw new NotImplemented(); + return await this.#handleDBCall(async () => { + return (await ipcRenderer.invoke( + IPC_ACTIONS.DB_BESPOKE, + method, + ...args + )) as BackendResponse; + }); } } diff --git a/fyo/index.ts b/fyo/index.ts index d9de79bc..1b41b672 100644 --- a/fyo/index.ts +++ b/fyo/index.ts @@ -164,7 +164,6 @@ export class Fyo { async close() { await this.db.close(); - await this.auth.logout(); } getField(schemaName: string, fieldname: string) { diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts index c3abdc1c..9c3783f0 100644 --- a/fyo/model/doc.ts +++ b/fyo/model/doc.ts @@ -9,7 +9,6 @@ import { DynamicLinkField, Field, FieldTypeEnum, - OptionField, RawValue, Schema, TargetField, @@ -37,8 +36,8 @@ import { FormulaMap, FormulaReturn, HiddenMap, - ListsMap, ListViewSettings, + ListsMap, ReadOnlyMap, RequiredMap, TreeViewSettings, @@ -47,6 +46,7 @@ import { import { validateOptions, validateRequired } from './validationFunction'; export class Doc extends Observable { + /* eslint-disable @typescript-eslint/no-floating-promises */ name?: string; schema: Readonly; fyo: Fyo; @@ -62,15 +62,15 @@ export class Doc extends Observable { parentSchemaName?: string; links?: Record; - _dirty: boolean = true; - _notInserted: boolean = true; + _dirty = true; + _notInserted = true; _syncing = false; constructor( schema: Schema, data: DocValueMap, fyo: Fyo, - convertToDocValue: boolean = true + convertToDocValue = true ) { super(); this.fyo = markRaw(fyo); @@ -289,10 +289,10 @@ export class Doc extends Observable { async set( fieldname: string | DocValueMap, value?: DocValue | Doc[] | DocValueMap[], - retriggerChildDocApplyChange: boolean = false + retriggerChildDocApplyChange = false ): Promise { if (typeof fieldname === 'object') { - return await this.setMultiple(fieldname as DocValueMap); + return await this.setMultiple(fieldname); } if (!this._canSet(fieldname, value)) { @@ -391,7 +391,7 @@ export class Doc extends Observable { } if (field.fieldtype === FieldTypeEnum.Currency && !isPesa(defaultValue)) { - defaultValue = this.fyo.pesa!(defaultValue as string | number); + defaultValue = this.fyo.pesa(defaultValue as string | number); } this[field.fieldname] = defaultValue; @@ -418,7 +418,7 @@ export class Doc extends Observable { push( fieldname: string, docValueMap: Doc | DocValueMap | RawValueMap = {}, - convertToDocValue: boolean = false + convertToDocValue = false ) { const childDocs = [ (this[fieldname] ?? []) as Doc[], @@ -449,7 +449,7 @@ export class Doc extends Observable { _getChildDoc( docValueMap: Doc | DocValueMap | RawValueMap, fieldname: string, - convertToDocValue: boolean = false + convertToDocValue = false ): Doc { if (!this.name && this.schema.naming !== 'manual') { this.name = this.fyo.doc.getTemporaryName(this.schema); @@ -528,7 +528,7 @@ export class Doc extends Observable { field.fieldtype === FieldTypeEnum.Select || field.fieldtype === FieldTypeEnum.AutoComplete ) { - validateOptions(field as OptionField, value as string, this); + validateOptions(field, value as string, this); } validateRequired(field, value, this); @@ -544,10 +544,7 @@ export class Doc extends Observable { await validator(value); } - getValidDict( - filterMeta: boolean = false, - filterComputed: boolean = false - ): DocValueMap { + getValidDict(filterMeta = false, filterComputed = false): DocValueMap { let fields = this.schema.fields; if (filterMeta) { fields = this.schema.fields.filter((f) => !f.meta); @@ -639,11 +636,11 @@ export class Doc extends Observable { async _loadLink(field: Field) { if (field.fieldtype === FieldTypeEnum.Link) { - return await this._loadLinkField(field as TargetField); + return await this._loadLinkField(field); } if (field.fieldtype === FieldTypeEnum.DynamicLink) { - return await this._loadDynamicLinkField(field as DynamicLinkField); + return await this._loadDynamicLinkField(field); } } @@ -767,14 +764,13 @@ export class Doc extends Observable { changedFieldname?: string, retriggerChildDocApplyChange?: boolean ): Promise { - const doc = this; let changed = await this._callAllTableFieldsApplyFormula(changedFieldname); changed = - (await this._applyFormulaForFields(doc, changedFieldname)) || changed; + (await this._applyFormulaForFields(this, changedFieldname)) || changed; if (changed && retriggerChildDocApplyChange) { await this._callAllTableFieldsApplyFormula(changedFieldname); - await this._applyFormulaForFields(doc, changedFieldname); + await this._applyFormulaForFields(this, changedFieldname); } return changed; @@ -803,7 +799,7 @@ export class Doc extends Observable { childDocs: Doc[], fieldname?: string ): Promise { - let changed: boolean = false; + let changed = false; for (const childDoc of childDocs) { if (!childDoc._applyFormula) { continue; @@ -978,7 +974,7 @@ export class Doc extends Observable { async trigger(event: string, params?: unknown) { if (this[event]) { - await (this[event] as Function)(params); + await (this[event] as (args: unknown) => Promise)(params); } await super.trigger(event, params); @@ -993,9 +989,9 @@ export class Doc extends Observable { try { return this.fyo.pesa(value as string | number); } catch (err) { - ( - err as Error - ).message += ` value: '${value}' of type: ${typeof value}, fieldname: '${tablefield}', childfield: '${childfield}'`; + (err as Error).message += ` value: '${String( + value + )}' of type: ${typeof value}, fieldname: '${tablefield}', childfield: '${childfield}'`; throw err; } } @@ -1032,7 +1028,7 @@ export class Doc extends Observable { if (this.numberSeries) { delete updateMap.name; } else { - updateMap.name = updateMap.name + ' CPY'; + updateMap.name = String(updateMap.name) + ' CPY'; } const rawUpdateMap = this.fyo.db.converter.toRawValueMap( @@ -1054,6 +1050,8 @@ export class Doc extends Observable { * * This may cause the lifecycle function to execute incorrectly. */ + + /* eslint-disable @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */ async change(ch: ChangeArg) {} async validate() {} async beforeSync() {} @@ -1084,7 +1082,9 @@ export class Doc extends Observable { return {}; } - static getTreeSettings(fyo: Fyo): TreeViewSettings | void {} + static getTreeSettings(fyo: Fyo): TreeViewSettings | void { + return; + } static getActions(fyo: Fyo): Action[] { return []; diff --git a/fyo/model/errorHelpers.ts b/fyo/model/errorHelpers.ts index 9c148512..5dc7568f 100644 --- a/fyo/model/errorHelpers.ts +++ b/fyo/model/errorHelpers.ts @@ -99,23 +99,18 @@ async function getNotFoundDetailsIfDoesNotExists( ): Promise { const value = doc.get(field.fieldname); if (field.fieldtype === FieldTypeEnum.Link && value) { - return getNotFoundLinkDetails(field as TargetField, value as string, fyo); + return getNotFoundLinkDetails(field, value as string, fyo); } if (field.fieldtype === FieldTypeEnum.DynamicLink && value) { - return getNotFoundDynamicLinkDetails( - field as DynamicLinkField, - value as string, - fyo, - doc - ); + return getNotFoundDynamicLinkDetails(field, value as string, fyo, doc); } if ( field.fieldtype === FieldTypeEnum.Table && (value as Doc[] | undefined)?.length ) { - return getNotFoundTableDetails(value as Doc[], fyo); + return await getNotFoundTableDetails(value as Doc[], fyo); } return null; @@ -127,7 +122,7 @@ async function getNotFoundLinkDetails( fyo: Fyo ): Promise { const { target } = field; - const exists = await fyo.db.exists(target as string, value); + const exists = await fyo.db.exists(target, value); if (!exists) { return { label: field.label, value }; } @@ -160,7 +155,7 @@ async function getNotFoundTableDetails( fyo: Fyo ): Promise { for (const childDoc of value) { - const details = getNotFoundDetails(childDoc, fyo); + const details = await getNotFoundDetails(childDoc, fyo); if (details) { return details; } diff --git a/fyo/model/helpers.ts b/fyo/model/helpers.ts index 711c9fcb..98f8c5c2 100644 --- a/fyo/model/helpers.ts +++ b/fyo/model/helpers.ts @@ -34,7 +34,7 @@ export function getPreDefaultValues( case FieldTypeEnum.Table: return [] as Doc[]; case FieldTypeEnum.Currency: - return fyo.pesa!(0.0); + return fyo.pesa(0.0); case FieldTypeEnum.Int: case FieldTypeEnum.Float: return 0; @@ -145,9 +145,9 @@ export function isDocValueTruthy(docValue: DocValue | Doc[]) { } export function setChildDocIdx(childDocs: Doc[]) { - for (const idx in childDocs) { - childDocs[idx].idx = +idx; - } + childDocs.forEach((cd, idx) => { + cd.idx = idx; + }); } export function getFormulaSequence(formulas: FormulaMap) { diff --git a/fyo/model/validationFunction.ts b/fyo/model/validationFunction.ts index 858198f5..0e03d0cd 100644 --- a/fyo/model/validationFunction.ts +++ b/fyo/model/validationFunction.ts @@ -7,14 +7,26 @@ import { getIsNullOrUndef } from 'utils'; import { Doc } from './doc'; export function validateEmail(value: DocValue) { - const isValid = /(.+)@(.+){2,}\.(.+){2,}/.test(value as string); + if (typeof value !== 'string') { + throw new TypeError( + `Invalid email ${String(value)} of type ${typeof value}` + ); + } + + const isValid = /(.+)@(.+){2,}\.(.+){2,}/.test(value); if (!isValid) { throw new ValidationError(`Invalid email: ${value}`); } } export function validatePhoneNumber(value: DocValue) { - const isValid = /[+]{0,1}[\d ]+/.test(value as string); + if (typeof value !== 'string') { + throw new TypeError( + `Invalid phone ${String(value)} of type ${typeof value}` + ); + } + + const isValid = /[+]{0,1}[\d ]+/.test(value); if (!isValid) { throw new ValidationError(`Invalid phone: ${value}`); } diff --git a/fyo/models/SystemSettings.ts b/fyo/models/SystemSettings.ts index 6d6f1d74..59432187 100644 --- a/fyo/models/SystemSettings.ts +++ b/fyo/models/SystemSettings.ts @@ -18,7 +18,7 @@ export default class SystemSettings extends Doc { instanceId?: string; validations: ValidationMap = { - async displayPrecision(value: DocValue) { + displayPrecision(value: DocValue) { if ((value as number) >= 0 && (value as number) <= 9) { return; } @@ -38,7 +38,7 @@ export default class SystemSettings extends Doc { (c) => ({ value: countryInfo[c]?.locale, - label: `${c} (${countryInfo[c]?.locale})`, + label: `${c} (${countryInfo[c]?.locale ?? t`Not Found`})`, } as SelectOption) ); }, diff --git a/fyo/telemetry/telemetry.ts b/fyo/telemetry/telemetry.ts index 7c5b77af..4ddf6371 100644 --- a/fyo/telemetry/telemetry.ts +++ b/fyo/telemetry/telemetry.ts @@ -66,6 +66,7 @@ export class TelemetryManager { log(verb: Verb, noun: Noun, more?: Record) { if (!this.#started && this.fyo.db.isConnected) { + // eslint-disable-next-line @typescript-eslint/no-floating-promises this.start().then(() => this.#sendBeacon(verb, noun, more)); return; } diff --git a/fyo/tests/helpers.ts b/fyo/tests/helpers.ts index 9754d8c4..e48731f0 100644 --- a/fyo/tests/helpers.ts +++ b/fyo/tests/helpers.ts @@ -2,6 +2,7 @@ import { AuthDemuxBase } from 'utils/auth/types'; import { Creds } from 'utils/types'; export class DummyAuthDemux extends AuthDemuxBase { + // eslint-disable-next-line @typescript-eslint/require-await async getCreds(): Promise { return { errorLogUrl: '', tokenString: '', telemetryUrl: '' }; } diff --git a/fyo/utils/errors.ts b/fyo/utils/errors.ts index 54d20617..ad3489b3 100644 --- a/fyo/utils/errors.ts +++ b/fyo/utils/errors.ts @@ -4,11 +4,7 @@ export class BaseError extends Error { statusCode: number; shouldStore: boolean; - constructor( - statusCode: number, - message: string, - shouldStore: boolean = true - ) { + constructor(statusCode: number, message: string, shouldStore = true) { super(message); this.name = 'BaseError'; this.statusCode = statusCode; @@ -18,63 +14,63 @@ export class BaseError extends Error { } export class ValidationError extends BaseError { - constructor(message: string, shouldStore: boolean = false) { + constructor(message: string, shouldStore = false) { super(417, message, shouldStore); this.name = 'ValidationError'; } } export class NotFoundError extends BaseError { - constructor(message: string, shouldStore: boolean = true) { + constructor(message: string, shouldStore = true) { super(404, message, shouldStore); this.name = 'NotFoundError'; } } export class ForbiddenError extends BaseError { - constructor(message: string, shouldStore: boolean = true) { + constructor(message: string, shouldStore = true) { super(403, message, shouldStore); this.name = 'ForbiddenError'; } } export class DuplicateEntryError extends ValidationError { - constructor(message: string, shouldStore: boolean = false) { + constructor(message: string, shouldStore = false) { super(message, shouldStore); this.name = 'DuplicateEntryError'; } } export class LinkValidationError extends ValidationError { - constructor(message: string, shouldStore: boolean = false) { + constructor(message: string, shouldStore = false) { super(message, shouldStore); this.name = 'LinkValidationError'; } } export class MandatoryError extends ValidationError { - constructor(message: string, shouldStore: boolean = false) { + constructor(message: string, shouldStore = false) { super(message, shouldStore); this.name = 'MandatoryError'; } } export class DatabaseError extends BaseError { - constructor(message: string, shouldStore: boolean = true) { + constructor(message: string, shouldStore = true) { super(500, message, shouldStore); this.name = 'DatabaseError'; } } export class CannotCommitError extends DatabaseError { - constructor(message: string, shouldStore: boolean = true) { + constructor(message: string, shouldStore = true) { super(message, shouldStore); this.name = 'CannotCommitError'; } } export class NotImplemented extends BaseError { - constructor(message: string = '', shouldStore: boolean = false) { + constructor(message = '', shouldStore = false) { super(501, message, shouldStore); this.name = 'NotImplemented'; } diff --git a/fyo/utils/format.ts b/fyo/utils/format.ts index dfc5d142..24e7b99c 100644 --- a/fyo/utils/format.ts +++ b/fyo/utils/format.ts @@ -60,7 +60,7 @@ function toDatetime(value: unknown): DateTime | null { } else if (value instanceof Date) { return DateTime.fromJSDate(value); } else if (typeof value === 'number') { - return DateTime.fromSeconds(value as number); + return DateTime.fromSeconds(value); } return null; @@ -120,7 +120,9 @@ function formatCurrency( try { valueString = formatNumber(value, fyo); } catch (err) { - (err as Error).message += ` value: '${value}', type: ${typeof value}`; + (err as Error).message += ` value: '${String( + value + )}', type: ${typeof value}`; throw err; } @@ -148,7 +150,9 @@ function formatNumber(value: unknown, fyo: Fyo): string { if (formattedNumber === 'NaN') { throw Error( - `invalid value passed to formatNumber: '${value}' of type ${typeof value}` + `invalid value passed to formatNumber: '${String( + value + )}' of type ${typeof value}` ); } diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts index 35fef677..2bbf4ec0 100644 --- a/fyo/utils/index.ts +++ b/fyo/utils/index.ts @@ -8,7 +8,7 @@ import { getIsNullOrUndef, safeParseInt } from 'utils'; export function slug(str: string) { return str - .replace(/(?:^\w|[A-Z]|\b\w)/g, function (letter, index) { + .replace(/(?:^\w|[A-Z]|\b\w)/g, (letter, index) => { return index == 0 ? letter.toLowerCase() : letter.toUpperCase(); }) .replace(/\s+/g, ''); @@ -24,7 +24,7 @@ export function unique(list: T[], key = (it: T) => String(it)) { export function getDuplicates(array: unknown[]) { const duplicates: unknown[] = []; - for (const i in array) { + for (let i = 0; i < array.length; i++) { const previous = array[safeParseInt(i) - 1]; const current = array[i]; @@ -118,7 +118,7 @@ function getRawOptionList(field: Field, doc: Doc | undefined | null) { return []; } - const Model = doc!.fyo.models[doc!.schemaName]; + const Model = doc.fyo.models[doc.schemaName]; if (Model === undefined) { return []; } @@ -128,7 +128,7 @@ function getRawOptionList(field: Field, doc: Doc | undefined | null) { return []; } - return getList(doc!); + return getList(doc); } export function getEmptyValuesByFieldTypes( diff --git a/fyo/utils/observable.ts b/fyo/utils/observable.ts index 5847c888..68db75bb 100644 --- a/fyo/utils/observable.ts +++ b/fyo/utils/observable.ts @@ -3,13 +3,15 @@ enum EventType { OnceListeners = '_onceListeners', } +type Listener = (...args: unknown[]) => unknown | Promise; + export default class Observable { [key: string]: unknown | T; _isHot: Map; _eventQueue: Map; _map: Map; - _listeners: Map; - _onceListeners: Map; + _listeners: Map; + _onceListeners: Map; constructor() { this._map = new Map(); @@ -37,6 +39,7 @@ export default class Observable { */ set(key: string, value: T) { this[key] = value; + // eslint-disable-next-line @typescript-eslint/no-floating-promises this.trigger('change', { doc: this, changed: key, @@ -50,7 +53,7 @@ export default class Observable { * @param event : name of the event for which the listener is checked * @param listener : specific listener that is checked for */ - hasListener(event: string, listener?: Function) { + hasListener(event: string, listener?: Listener) { const listeners = this[EventType.Listeners].get(event) ?? []; const onceListeners = this[EventType.OnceListeners].get(event) ?? []; @@ -69,7 +72,7 @@ export default class Observable { * @param event : name of the event for which the listener is set * @param listener : listener that is executed when the event is triggered */ - on(event: string, listener: Function) { + on(event: string, listener: Listener) { this._addListener(EventType.Listeners, event, listener); } @@ -80,7 +83,7 @@ export default class Observable { * @param event : name of the event for which the listener is set * @param listener : listener that is executed when the event is triggered */ - once(event: string, listener: Function) { + once(event: string, listener: Listener) { this._addListener(EventType.OnceListeners, event, listener); } @@ -90,7 +93,7 @@ export default class Observable { * @param event : name of the event from which to remove the listener * @param listener : listener that was set for the event */ - off(event: string, listener: Function) { + off(event: string, listener: Listener) { this._removeListener(EventType.Listeners, event, listener); this._removeListener(EventType.OnceListeners, event, listener); } @@ -111,7 +114,7 @@ export default class Observable { * @param throttle : wait time before triggering the event. */ - async trigger(event: string, params?: unknown, throttle: number = 0) { + async trigger(event: string, params?: unknown, throttle = 0) { let isHot = false; if (throttle > 0) { isHot = this._throttled(event, params, throttle); @@ -125,7 +128,7 @@ export default class Observable { await this._executeTriggers(event, params); } - _removeListener(type: EventType, event: string, listener: Function) { + _removeListener(type: EventType, event: string, listener: Listener) { const listeners = (this[type].get(event) ?? []).filter( (l) => l !== listener ); @@ -160,6 +163,7 @@ export default class Observable { const params = this._eventQueue.get(event); if (params !== undefined) { + // eslint-disable-next-line @typescript-eslint/no-floating-promises this._executeTriggers(event, params); this._eventQueue.delete(event); } @@ -168,7 +172,7 @@ export default class Observable { return false; } - _addListener(type: EventType, event: string, listener: Function) { + _addListener(type: EventType, event: string, listener: Listener) { this._initLiseners(type, event); const list = this[type].get(event)!; if (list.includes(listener)) { diff --git a/fyo/utils/translation.ts b/fyo/utils/translation.ts index 4c80b0e4..598ba41c 100644 --- a/fyo/utils/translation.ts +++ b/fyo/utils/translation.ts @@ -31,7 +31,7 @@ class TranslationString { } #formatArg(arg: string | number | boolean) { - return arg ?? ''; + return String(arg ?? ''); } #translate() { @@ -48,22 +48,23 @@ class TranslationString { } #stitch() { - if (!((this.args[0] as any) instanceof Array)) { + if (!((this.args[0] as unknown) instanceof Array)) { throw new ValueError( - `invalid args passed to TranslationString ${ + `invalid args passed to TranslationString ${String( this.args - } of type ${typeof this.args[0]}` + )} of type ${typeof this.args[0]}` ); } - this.strList = this.args[0] as any as string[]; + this.strList = this.args[0] as unknown as string[]; this.argList = this.args.slice(1) as TranslationArgs[]; if (this.languageMap) { this.#translate(); } - return this.strList!.map((s, i) => s + this.#formatArg(this.argList![i])) + return this.strList + .map((s, i) => s + this.#formatArg(this.argList![i])) .join('') .replace(/\s+/g, ' ') .trim(); diff --git a/models/Transactional/LedgerPosting.ts b/models/Transactional/LedgerPosting.ts index a448a279..1af62596 100644 --- a/models/Transactional/LedgerPosting.ts +++ b/models/Transactional/LedgerPosting.ts @@ -71,9 +71,9 @@ export class LedgerPosting { const roundOffAccount = await this._getRoundOffAccount(); if (difference.gt(0)) { - this.credit(roundOffAccount, absoluteValue); + await this.credit(roundOffAccount, absoluteValue); } else { - this.debit(roundOffAccount, absoluteValue); + await this.debit(roundOffAccount, absoluteValue); } } diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts index 1d222d1b..289f5655 100644 --- a/models/baseModels/Account/Account.ts +++ b/models/baseModels/Account/Account.ts @@ -59,10 +59,7 @@ export class Account extends Doc { return; } - const account = await this.fyo.db.get( - 'Account', - this.parentAccount as string - ); + const account = await this.fyo.db.get('Account', this.parentAccount); this.accountType = account.accountType as AccountType; } diff --git a/models/baseModels/Address/Address.ts b/models/baseModels/Address/Address.ts index c021e0f9..ab6fcbcd 100644 --- a/models/baseModels/Address/Address.ts +++ b/models/baseModels/Address/Address.ts @@ -1,10 +1,10 @@ -import { Fyo, t } from 'fyo'; +import { t } from 'fyo'; import { Doc } from 'fyo/model/doc'; import { EmptyMessageMap, FormulaMap, - ListsMap, ListViewSettings, + ListsMap, } from 'fyo/model/types'; import { codeStateMap } from 'regional/in'; import { getCountryInfo } from 'utils/misc'; @@ -12,7 +12,7 @@ import { getCountryInfo } from 'utils/misc'; export class Address extends Doc { formulas: FormulaMap = { addressDisplay: { - formula: async () => { + formula: () => { return [ this.addressLine1, this.addressLine2, diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts index c3a2756a..917a1e4d 100644 --- a/models/baseModels/Invoice/Invoice.ts +++ b/models/baseModels/Invoice/Invoice.ts @@ -143,7 +143,7 @@ export abstract class Invoice extends Transactional { outstandingAmount: this.baseGrandTotal!, }); - const party = (await this.fyo.doc.getDoc('Party', this.party!)) as Party; + const party = (await this.fyo.doc.getDoc('Party', this.party)) as Party; await party.updateOutstandingAmount(); if (this.makeAutoPayment && this.autoPaymentAccount) { @@ -181,7 +181,7 @@ export abstract class Invoice extends Transactional { async _updatePartyOutStanding() { const partyDoc = (await this.fyo.doc.getDoc( ModelNameEnum.Party, - this.party! + this.party )) as Party; await partyDoc.updateOutstandingAmount(); @@ -223,7 +223,7 @@ export abstract class Invoice extends Transactional { return 1.0; } const exchangeRate = await getExchangeRate({ - fromCurrency: this.currency!, + fromCurrency: this.currency, toCurrency: currency as string, }); @@ -247,7 +247,7 @@ export abstract class Invoice extends Transactional { continue; } - const tax = await this.getTax(item.tax!); + const tax = await this.getTax(item.tax); for (const { account, rate } of (tax.details ?? []) as TaxDetail[]) { taxes[account] ??= { account, @@ -256,7 +256,11 @@ export abstract class Invoice extends Transactional { }; let amount = item.amount!; - if (this.enableDiscounting && !this.discountAfterTax && !item.itemDiscountedTotal?.isZero()) { + if ( + this.enableDiscounting && + !this.discountAfterTax && + !item.itemDiscountedTotal?.isZero() + ) { amount = item.itemDiscountedTotal!; } @@ -285,7 +289,7 @@ export abstract class Invoice extends Transactional { } async getTax(tax: string) { - if (!this._taxes![tax]) { + if (!this._taxes[tax]) { this._taxes[tax] = await this.fyo.doc.getDoc('Tax', tax); } @@ -302,7 +306,7 @@ export abstract class Invoice extends Transactional { return itemDiscountAmount.add(invoiceDiscountAmount); } - async getGrandTotal() { + getGrandTotal() { const totalDiscount = this.getTotalDiscount(); return ((this.taxes ?? []) as Doc[]) .map((doc) => doc.amount as Money) @@ -407,16 +411,15 @@ export abstract class Invoice extends Transactional { }, dependsOn: ['party', 'currency'], }, - netTotal: { formula: async () => this.getSum('items', 'amount', false) }, + netTotal: { formula: () => this.getSum('items', 'amount', false) }, taxes: { formula: async () => await this.getTaxSummary() }, - grandTotal: { formula: async () => await this.getGrandTotal() }, + grandTotal: { formula: () => this.getGrandTotal() }, baseGrandTotal: { - formula: async () => - (this.grandTotal as Money).mul(this.exchangeRate! ?? 1), + formula: () => (this.grandTotal as Money).mul(this.exchangeRate! ?? 1), dependsOn: ['grandTotal', 'exchangeRate'], }, outstandingAmount: { - formula: async () => { + formula: () => { if (this.submitted) { return; } @@ -425,7 +428,7 @@ export abstract class Invoice extends Transactional { }, }, stockNotTransferred: { - formula: async () => { + formula: () => { if (this.submitted) { return; } @@ -526,7 +529,7 @@ export abstract class Invoice extends Transactional { !!doc.autoStockTransferLocation, numberSeries: (doc) => getNumberSeries(doc.schemaName, doc.fyo), terms: (doc) => { - const defaults = doc.fyo.singles.Defaults as Defaults | undefined; + const defaults = doc.fyo.singles.Defaults; if (doc.schemaName === ModelNameEnum.SalesInvoice) { return defaults?.salesInvoiceTerms ?? ''; } @@ -616,9 +619,7 @@ export abstract class Invoice extends Transactional { return this.fyo.doc.getNewDoc(ModelNameEnum.Payment, data) as Payment; } - async getStockTransfer( - isAuto: boolean = false - ): Promise { + async getStockTransfer(isAuto = false): Promise { if (!this.isSubmitted) { return null; } diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts index 03760fec..a01c5dd0 100644 --- a/models/baseModels/InvoiceItem/InvoiceItem.ts +++ b/models/baseModels/InvoiceItem/InvoiceItem.ts @@ -188,7 +188,7 @@ export abstract class InvoiceItem extends Doc { dependsOn: ['item', 'unit'], }, transferQuantity: { - formula: async (fieldname) => { + formula: (fieldname) => { if (fieldname === 'quantity' || this.unit === this.transferUnit) { return this.quantity; } @@ -205,7 +205,7 @@ export abstract class InvoiceItem extends Doc { const itemDoc = await this.fyo.doc.getDoc( ModelNameEnum.Item, - this.item as string + this.item ); const unitDoc = itemDoc.getLink('uom'); @@ -321,7 +321,7 @@ export abstract class InvoiceItem extends Doc { ], }, itemTaxedTotal: { - formula: async (fieldname) => { + formula: async () => { const totalTaxRate = await this.getTotalTaxRate(); const rate = this.rate ?? this.fyo.pesa(0); const quantity = this.quantity ?? 1; @@ -389,7 +389,7 @@ export abstract class InvoiceItem extends Doc { }; validations: ValidationMap = { - rate: async (value: DocValue) => { + rate: (value: DocValue) => { if ((value as Money).gte(0)) { return; } @@ -401,7 +401,7 @@ export abstract class InvoiceItem extends Doc { )}) cannot be less zero.` ); }, - itemDiscountAmount: async (value: DocValue) => { + itemDiscountAmount: (value: DocValue) => { if ((value as Money).lte(this.amount!)) { return; } @@ -416,7 +416,7 @@ export abstract class InvoiceItem extends Doc { )}).` ); }, - itemDiscountPercent: async (value: DocValue) => { + itemDiscountPercent: (value: DocValue) => { if ((value as number) < 100) { return; } @@ -434,13 +434,14 @@ export abstract class InvoiceItem extends Doc { const item = await this.fyo.db.getAll(ModelNameEnum.UOMConversionItem, { fields: ['parent'], - filters: { uom: value as string, parent: this.item! }, + filters: { uom: value as string, parent: this.item }, }); if (item.length < 1) throw new ValidationError( - t`Transfer Unit ${value as string} is not applicable for Item ${this - .item!}` + t`Transfer Unit ${value as string} is not applicable for Item ${ + this.item + }` ); }, }; diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts index c1453d05..351bf5b5 100644 --- a/models/baseModels/Item/Item.ts +++ b/models/baseModels/Item/Item.ts @@ -71,7 +71,7 @@ export class Item extends Doc { }; validations: ValidationMap = { - rate: async (value: DocValue) => { + rate: (value: DocValue) => { if ((value as Money).isNegative()) { throw new ValidationError(this.fyo.t`Rate can't be negative.`); } @@ -85,13 +85,13 @@ export class Item extends Doc { label: fyo.t`Sales Invoice`, condition: (doc) => !doc.notInserted && doc.for !== 'Purchases', action: async (doc, router) => { - const invoice = await fyo.doc.getNewDoc('SalesInvoice'); + const invoice = fyo.doc.getNewDoc('SalesInvoice'); await invoice.append('items', { item: doc.name as string, rate: doc.rate as Money, tax: doc.tax as string, }); - router.push(`/edit/SalesInvoice/${invoice.name}`); + await router.push(`/edit/SalesInvoice/${invoice.name!}`); }, }, { @@ -99,13 +99,13 @@ export class Item extends Doc { label: fyo.t`Purchase Invoice`, condition: (doc) => !doc.notInserted && doc.for !== 'Sales', action: async (doc, router) => { - const invoice = await fyo.doc.getNewDoc('PurchaseInvoice'); + const invoice = fyo.doc.getNewDoc('PurchaseInvoice'); await invoice.append('items', { item: doc.name as string, rate: doc.rate as Money, tax: doc.tax as string, }); - router.push(`/edit/PurchaseInvoice/${invoice.name}`); + await router.push(`/edit/PurchaseInvoice/${invoice.name!}`); }, }, ]; @@ -126,7 +126,9 @@ export class Item extends Doc { hasBatch: () => !(this.fyo.singles.InventorySettings?.enableBatches && this.trackItem), hasSerialNumber: () => - !(this.fyo.singles.InventorySettings?.enableSerialNumber && this.trackItem), + !( + this.fyo.singles.InventorySettings?.enableSerialNumber && this.trackItem + ), uomConversions: () => !this.fyo.singles.InventorySettings?.enableUomConversions, }; diff --git a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts index 55945e21..ee71fd64 100644 --- a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts +++ b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts @@ -29,10 +29,10 @@ export class JournalEntryAccount extends Doc { formulas: FormulaMap = { debit: { - formula: async () => this.getAutoDebitCredit('debit'), + formula: () => this.getAutoDebitCredit('debit'), }, credit: { - formula: async () => this.getAutoDebitCredit('credit'), + formula: () => this.getAutoDebitCredit('credit'), }, }; diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts index 16520efb..c2a29634 100644 --- a/models/baseModels/Party/Party.ts +++ b/models/baseModels/Party/Party.ts @@ -89,7 +89,7 @@ export class Party extends Doc { dependsOn: ['role'], }, currency: { - formula: async () => { + formula: () => { if (!this.currency) { return this.fyo.singles.SystemSettings!.currency as string; } @@ -132,12 +132,13 @@ export class Party extends Doc { condition: (doc: Doc) => !doc.notInserted && (doc.role as PartyRole) !== 'Customer', action: async (partyDoc, router) => { - const doc = await fyo.doc.getNewDoc('PurchaseInvoice', { + const doc = fyo.doc.getNewDoc('PurchaseInvoice', { party: partyDoc.name, account: partyDoc.defaultAccount as string, }); - router.push({ - path: `/edit/PurchaseInvoice/${doc.name}`, + + await router.push({ + path: `/edit/PurchaseInvoice/${doc.name!}`, query: { schemaName: 'PurchaseInvoice', values: { @@ -170,7 +171,7 @@ export class Party extends Doc { }); await router.push({ - path: `/edit/SalesInvoice/${doc.name}`, + path: `/edit/SalesInvoice/${doc.name!}`, query: { schemaName: 'SalesInvoice', values: { @@ -186,7 +187,7 @@ export class Party extends Doc { condition: (doc: Doc) => !doc.notInserted && (doc.role as PartyRole) !== 'Supplier', action: async (partyDoc, router) => { - router.push({ + await router.push({ path: '/list/SalesInvoice', query: { filters: JSON.stringify({ party: partyDoc.name }) }, }); diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts index 0f928138..073ca608 100644 --- a/models/baseModels/Payment/Payment.ts +++ b/models/baseModels/Payment/Payment.ts @@ -84,9 +84,7 @@ export class Payment extends Transactional { updateAmountOnReferenceUpdate() { this.amount = this.fyo.pesa(0); for (const paymentReference of (this.for ?? []) as Doc[]) { - this.amount = (this.amount as Money).add( - paymentReference.amount as Money - ); + this.amount = this.amount.add(paymentReference.amount as Money); } } @@ -123,8 +121,9 @@ export class Payment extends Transactional { if (referenceName && referenceType && !refDoc) { throw new ValidationError( - t`${referenceType} of type ${this.fyo.schemaMap?.[referenceType] - ?.label!} does not exist` + t`${referenceType} of type ${ + this.fyo.schemaMap?.[referenceType]?.label ?? referenceType + } does not exist` ); } @@ -241,8 +240,8 @@ export class Payment extends Transactional { const account = this.account as string; const amount = this.amount as Money; - await posting.debit(paymentAccount as string, amount); - await posting.credit(account as string, amount); + await posting.debit(paymentAccount, amount); + await posting.credit(account, amount); await this.applyWriteOffPosting(posting); return posting; @@ -269,7 +268,7 @@ export class Payment extends Transactional { } async validateReferences() { - const forReferences = (this.for ?? []) as PaymentFor[]; + const forReferences = this.for ?? []; if (forReferences.length === 0) { return; } @@ -334,10 +333,10 @@ export class Payment extends Transactional { } async updateReferenceDocOutstanding() { - for (const row of (this.for ?? []) as PaymentFor[]) { + for (const row of this.for ?? []) { const referenceDoc = await this.fyo.doc.getDoc( row.referenceType!, - row.referenceName! + row.referenceName ); const previousOutstandingAmount = referenceDoc.outstandingAmount as Money; @@ -348,7 +347,7 @@ export class Payment extends Transactional { async afterCancel() { await super.afterCancel(); - this.revertOutstandingAmount(); + await this.revertOutstandingAmount(); } async revertOutstandingAmount() { @@ -357,10 +356,10 @@ export class Payment extends Transactional { } async _revertReferenceOutstanding() { - for (const ref of (this.for ?? []) as PaymentFor[]) { + for (const ref of this.for ?? []) { const refDoc = await this.fyo.doc.getDoc( ref.referenceType!, - ref.referenceName! + ref.referenceName ); const outstandingAmount = (refDoc.outstandingAmount as Money).add( @@ -374,7 +373,7 @@ export class Payment extends Transactional { async updatePartyOutstanding() { const partyDoc = (await this.fyo.doc.getDoc( ModelNameEnum.Party, - this.party! + this.party )) as Party; await partyDoc.updateOutstandingAmount(); } @@ -439,7 +438,7 @@ export class Payment extends Transactional { 'referenceName' )) as Invoice | null; - return (refDoc?.account ?? null) as string | null; + return refDoc?.account ?? null; } formulas: FormulaMap = { @@ -514,17 +513,17 @@ export class Payment extends Transactional { }, }, amount: { - formula: async () => this.getSum('for', 'amount', false), + formula: () => this.getSum('for', 'amount', false), dependsOn: ['for'], }, amountPaid: { - formula: async () => this.amount!.sub(this.writeoff!), + formula: () => this.amount!.sub(this.writeoff!), dependsOn: ['amount', 'writeoff', 'for'], }, }; validations: ValidationMap = { - amount: async (value: DocValue) => { + amount: (value: DocValue) => { if ((value as Money).isNegative()) { throw new ValidationError( this.fyo.t`Payment amount cannot be less than zero.` @@ -615,7 +614,7 @@ export class Payment extends Transactional { return [getLedgerLinkAction(fyo)]; } - static getListViewSettings(fyo: Fyo): ListViewSettings { + static getListViewSettings(): ListViewSettings { return { columns: ['name', getDocStatusListColumn(), 'party', 'date', 'amount'], }; diff --git a/models/baseModels/PaymentFor/PaymentFor.ts b/models/baseModels/PaymentFor/PaymentFor.ts index 5cf55eda..9c289a6f 100644 --- a/models/baseModels/PaymentFor/PaymentFor.ts +++ b/models/baseModels/PaymentFor/PaymentFor.ts @@ -60,7 +60,7 @@ export class PaymentFor extends Doc { const outstandingAmount = (await this.fyo.getValue( this.referenceType as string, - this.referenceName as string, + this.referenceName, 'outstandingAmount' )) as Money; @@ -105,10 +105,11 @@ export class PaymentFor extends Doc { return; } + const referenceType = this.referenceType ?? ModelNameEnum.SalesInvoice; + const label = this.fyo.schemaMap[referenceType]?.label ?? referenceType; + throw new NotFoundError( - t`${this.fyo.schemaMap[this.referenceType!]?.label!} ${ - value as string - } does not exist`, + t`${label} ${value as string} does not exist`, false ); }, diff --git a/models/baseModels/PrintTemplate.ts b/models/baseModels/PrintTemplate.ts index 8bd2bd66..58750643 100644 --- a/models/baseModels/PrintTemplate.ts +++ b/models/baseModels/PrintTemplate.ts @@ -46,7 +46,7 @@ export class PrintTemplate extends Doc { static lists: ListsMap = { type(doc?: Doc) { - let enableInventory: boolean = false; + let enableInventory = false; let schemaMap: SchemaMap = {}; if (doc) { enableInventory = !!doc.fyo.singles.AccountingSettings?.enableInventory; diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts index 5c37616d..8da038bf 100644 --- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts +++ b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts @@ -24,7 +24,7 @@ export class PurchaseInvoice extends Invoice { } } - const discountAmount = await this.getTotalDiscount(); + const discountAmount = this.getTotalDiscount(); const discountAccount = this.fyo.singles.AccountingSettings ?.discountAccount as string | undefined; if (discountAccount && discountAmount.isPositive()) { diff --git a/models/baseModels/SalesInvoice/SalesInvoice.ts b/models/baseModels/SalesInvoice/SalesInvoice.ts index 8514542d..791c7554 100644 --- a/models/baseModels/SalesInvoice/SalesInvoice.ts +++ b/models/baseModels/SalesInvoice/SalesInvoice.ts @@ -19,12 +19,12 @@ export class SalesInvoice extends Invoice { } if (this.taxes) { - for (const tax of this.taxes!) { + for (const tax of this.taxes) { await posting.credit(tax.account!, tax.amount!.mul(exchangeRate)); } } - const discountAmount = await this.getTotalDiscount(); + const discountAmount = this.getTotalDiscount(); const discountAccount = this.fyo.singles.AccountingSettings ?.discountAccount as string | undefined; if (discountAccount && discountAmount.isPositive()) { diff --git a/models/baseModels/SetupWizard/SetupWizard.ts b/models/baseModels/SetupWizard/SetupWizard.ts index 6086ae23..4415042f 100644 --- a/models/baseModels/SetupWizard/SetupWizard.ts +++ b/models/baseModels/SetupWizard/SetupWizard.ts @@ -61,7 +61,7 @@ export class SetupWizard extends Doc { formulas: FormulaMap = { fiscalYearStart: { - formula: async (fieldname?: string) => { + formula: (fieldname?: string) => { if ( fieldname === 'fiscalYearEnd' && this.fiscalYearEnd && @@ -85,7 +85,7 @@ export class SetupWizard extends Doc { dependsOn: ['country', 'fiscalYearEnd'], }, fiscalYearEnd: { - formula: async (fieldname?: string) => { + formula: (fieldname?: string) => { if ( fieldname === 'fiscalYearStart' && this.fiscalYearStart && @@ -109,7 +109,7 @@ export class SetupWizard extends Doc { dependsOn: ['country', 'fiscalYearStart'], }, currency: { - formula: async () => { + formula: () => { const country = this.get('country'); if (typeof country !== 'string') { return; @@ -135,7 +135,7 @@ export class SetupWizard extends Doc { dependsOn: ['country'], }, chartOfAccounts: { - formula: async () => { + formula: () => { const country = this.get('country') as string | undefined; if (country === undefined) { return; diff --git a/models/helpers.ts b/models/helpers.ts index 4c508d0d..3fbfad45 100644 --- a/models/helpers.ts +++ b/models/helpers.ts @@ -9,10 +9,7 @@ import { AccountRootType, AccountRootTypeEnum, } from './baseModels/Account/types'; -import { - Defaults, - numberSeriesDefaultsMap, -} from './baseModels/Defaults/Defaults'; +import { numberSeriesDefaultsMap } from './baseModels/Defaults/Defaults'; import { Invoice } from './baseModels/Invoice/Invoice'; import { StockMovement } from './inventory/StockMovement'; import { StockTransfer } from './inventory/StockTransfer'; @@ -55,7 +52,7 @@ export function getMakeStockTransferAction( condition: (doc: Doc) => doc.isSubmitted && !!doc.stockNotTransferred, action: async (doc: Doc) => { const transfer = await (doc as Invoice).getStockTransfer(); - if (!transfer) { + if (!transfer || !transfer.name) { return; } @@ -81,7 +78,7 @@ export function getMakeInvoiceAction( condition: (doc: Doc) => doc.isSubmitted && !doc.backReference, action: async (doc: Doc) => { const invoice = await (doc as StockTransfer).getInvoice(); - if (!invoice) { + if (!invoice || !invoice.name) { return; } @@ -128,10 +125,7 @@ export function getMakePaymentAction(fyo: Fyo): Action { }; } -export function getLedgerLinkAction( - fyo: Fyo, - isStock: boolean = false -): Action { +export function getLedgerLinkAction(fyo: Fyo, isStock = false): Action { let label = fyo.t`Accounting Entries`; let reportClassName: 'GeneralLedger' | 'StockLedger' = 'GeneralLedger'; @@ -146,7 +140,7 @@ export function getLedgerLinkAction( condition: (doc: Doc) => doc.isSubmitted, action: async (doc: Doc, router: Router) => { const route = getLedgerLink(doc, reportClassName); - router.push(route); + await router.push(route); }, }; } @@ -174,7 +168,7 @@ export function getTransactionStatusColumn(): ColumnConfig { fieldtype: 'Select', render(doc) { const status = getDocStatus(doc) as InvoiceStatus; - const color = statusColor[status]; + const color = statusColor[status] ?? 'gray'; const label = getStatusText(status); return { @@ -389,9 +383,7 @@ export async function getExchangeRate({ let exchangeRate = 0; if (localStorage) { - exchangeRate = safeParseFloat( - localStorage.getItem(cacheKey as string) as string - ); + exchangeRate = safeParseFloat(localStorage.getItem(cacheKey) as string); } if (exchangeRate && exchangeRate !== 1) { @@ -402,9 +394,14 @@ export async function getExchangeRate({ const res = await fetch( `https://api.vatcomply.com/rates?date=${date}&base=${fromCurrency}&symbols=${toCurrency}` ); - const data = await res.json(); + const data = (await res.json()) as { + base: string; + data: string; + rates: Record; + }; exchangeRate = data.rates[toCurrency]; } catch (error) { + // eslint-disable-next-line no-console console.error(error); exchangeRate ??= 1; } @@ -439,7 +436,7 @@ export function getNumberSeries(schemaName: string, fyo: Fyo) { return undefined; } - const defaults = fyo.singles.Defaults as Defaults | undefined; + const defaults = fyo.singles.Defaults; const field = fyo.getField(schemaName, 'numberSeries'); const value = defaults?.[numberSeriesKey] as string | undefined; return value ?? (field?.default as string | undefined); diff --git a/models/inventory/StockManager.ts b/models/inventory/StockManager.ts index c34666db..16302bc6 100644 --- a/models/inventory/StockManager.ts +++ b/models/inventory/StockManager.ts @@ -40,7 +40,7 @@ export class StockManager { } for (const details of detailsList) { - await this.#createTransfer(details); + this.#createTransfer(details); } await this.#sync(); @@ -73,7 +73,7 @@ export class StockManager { } } - async #createTransfer(details: SMIDetails) { + #createTransfer(details: SMIDetails) { const item = new StockManagerItem(details, this.fyo); item.transferStock(); this.items.push(item); diff --git a/models/inventory/StockMovement.ts b/models/inventory/StockMovement.ts index dea5a682..cd24b54b 100644 --- a/models/inventory/StockMovement.ts +++ b/models/inventory/StockMovement.ts @@ -23,7 +23,7 @@ import { getSerialNumberFromDoc, updateSerialNumbers, validateBatch, - validateSerialNumber + validateSerialNumber, } from './helpers'; import { MovementType, MovementTypeEnum } from './types'; @@ -39,6 +39,7 @@ export class StockMovement extends Transfer { return false; } + // eslint-disable-next-line @typescript-eslint/require-await override async getPosting(): Promise { return null; } diff --git a/models/inventory/StockMovementItem.ts b/models/inventory/StockMovementItem.ts index 41f61c68..613ce79f 100644 --- a/models/inventory/StockMovementItem.ts +++ b/models/inventory/StockMovementItem.ts @@ -1,6 +1,5 @@ import { t } from 'fyo'; import { DocValue } from 'fyo/core/types'; -import { Doc } from 'fyo/model/doc'; import { FiltersMap, FormulaMap, @@ -14,8 +13,8 @@ import { ModelNameEnum } from 'models/types'; import { Money } from 'pesa'; import { safeParseFloat } from 'utils/index'; import { StockMovement } from './StockMovement'; -import { MovementTypeEnum } from './types'; import { TransferItem } from './TransferItem'; +import { MovementTypeEnum } from './types'; export class StockMovementItem extends TransferItem { name?: string; @@ -78,8 +77,8 @@ export class StockMovementItem extends TransferItem { return null; } - const defaultLocation = this.fyo.singles.InventorySettings - ?.defaultLocation as string | undefined; + const defaultLocation = + this.fyo.singles.InventorySettings?.defaultLocation; if (defaultLocation && !this.fromLocation && this.isIssue) { return defaultLocation; } @@ -94,8 +93,8 @@ export class StockMovementItem extends TransferItem { return null; } - const defaultLocation = this.fyo.singles.InventorySettings - ?.defaultLocation as string | undefined; + const defaultLocation = + this.fyo.singles.InventorySettings?.defaultLocation; if (defaultLocation && !this.toLocation && this.isReceipt) { return defaultLocation; } @@ -128,7 +127,7 @@ export class StockMovementItem extends TransferItem { dependsOn: ['item', 'unit'], }, transferQuantity: { - formula: async (fieldname) => { + formula: (fieldname) => { if (fieldname === 'quantity' || this.unit === this.transferUnit) { return this.quantity; } @@ -145,7 +144,7 @@ export class StockMovementItem extends TransferItem { const itemDoc = await this.fyo.doc.getDoc( ModelNameEnum.Item, - this.item as string + this.item ); const unitDoc = itemDoc.getLink('uom'); @@ -217,13 +216,14 @@ export class StockMovementItem extends TransferItem { const item = await this.fyo.db.getAll(ModelNameEnum.UOMConversionItem, { fields: ['parent'], - filters: { uom: value as string, parent: this.item! }, + filters: { uom: value as string, parent: this.item }, }); if (item.length < 1) throw new ValidationError( - t`Transfer Unit ${value as string} is not applicable for Item ${this - .item!}` + t`Transfer Unit ${value as string} is not applicable for Item ${ + this.item + }` ); }, }; diff --git a/models/inventory/StockTransfer.ts b/models/inventory/StockTransfer.ts index ec55f334..6cee6b0e 100644 --- a/models/inventory/StockTransfer.ts +++ b/models/inventory/StockTransfer.ts @@ -26,7 +26,6 @@ import { validateBatch, validateSerialNumber, } from './helpers'; -import { Item } from 'models/baseModels/Item/Item'; export abstract class StockTransfer extends Transfer { name?: string; @@ -67,7 +66,7 @@ export abstract class StockTransfer extends Transfer { static defaults: DefaultMap = { numberSeries: (doc) => getNumberSeries(doc.schemaName, doc.fyo), terms: (doc) => { - const defaults = doc.fyo.singles.Defaults as Defaults | undefined; + const defaults = doc.fyo.singles.Defaults; if (doc.schemaName === ModelNameEnum.Shipment) { return defaults?.shipmentTerms ?? ''; } diff --git a/models/inventory/StockTransferItem.ts b/models/inventory/StockTransferItem.ts index c02c60cb..2a60f906 100644 --- a/models/inventory/StockTransferItem.ts +++ b/models/inventory/StockTransferItem.ts @@ -1,4 +1,3 @@ -import { t } from 'fyo'; import { DocValue } from 'fyo/core/types'; import { Doc } from 'fyo/model/doc'; import { @@ -73,7 +72,7 @@ export class StockTransferItem extends TransferItem { dependsOn: ['item', 'unit'], }, transferQuantity: { - formula: async (fieldname) => { + formula: (fieldname) => { if (fieldname === 'quantity' || this.unit === this.transferUnit) { return this.quantity; } @@ -90,7 +89,7 @@ export class StockTransferItem extends TransferItem { const itemDoc = await this.fyo.doc.getDoc( ModelNameEnum.Item, - this.item as string + this.item ); const unitDoc = itemDoc.getLink('uom'); @@ -146,7 +145,7 @@ export class StockTransferItem extends TransferItem { dependsOn: ['rate', 'quantity'], }, rate: { - formula: async (fieldname) => { + formula: async () => { const rate = (await this.fyo.getValue( 'Item', this.item as string, @@ -177,8 +176,8 @@ export class StockTransferItem extends TransferItem { return; } - const defaultLocation = this.fyo.singles.InventorySettings - ?.defaultLocation as string | undefined; + const defaultLocation = + this.fyo.singles.InventorySettings?.defaultLocation; if (defaultLocation && !this.location) { return defaultLocation; @@ -195,13 +194,14 @@ export class StockTransferItem extends TransferItem { const item = await this.fyo.db.getAll(ModelNameEnum.UOMConversionItem, { fields: ['parent'], - filters: { uom: value as string, parent: this.item! }, + filters: { uom: value as string, parent: this.item }, }); if (item.length < 1) throw new ValidationError( - t`Transfer Unit ${value as string} is not applicable for Item ${this - .item!}` + this.fyo.t`Transfer Unit ${ + value as string + } is not applicable for Item ${this.item}` ); }, }; diff --git a/models/inventory/stockQueue.ts b/models/inventory/stockQueue.ts index 975dcbe4..2d9ba3ba 100644 --- a/models/inventory/stockQueue.ts +++ b/models/inventory/stockQueue.ts @@ -55,7 +55,7 @@ export class StockQueue { return null; } - let incomingRate: number = 0; + let incomingRate = 0; this.quantity -= quantity; let remaining = quantity; diff --git a/models/inventory/tests/helpers.ts b/models/inventory/tests/helpers.ts index b9697de8..b473370a 100644 --- a/models/inventory/tests/helpers.ts +++ b/models/inventory/tests/helpers.ts @@ -37,17 +37,22 @@ interface TransferTwo extends Omit { location: string; } -export function getItem(name: string, rate: number, hasBatch: boolean = false, hasSerialNumber: boolean = false) { +export function getItem( + name: string, + rate: number, + hasBatch = false, + hasSerialNumber = false +) { return { name, rate, trackItem: true, hasBatch, hasSerialNumber }; } -export async function getBatch( +export function getBatch( schemaName: ModelNameEnum.Batch, batch: string, expiryDate: Date, manufactureDate: Date, fyo: Fyo -): Promise { +): Batch { const doc = fyo.doc.getNewDoc(schemaName, { batch, expiryDate, diff --git a/models/regionalModels/in/Address.ts b/models/regionalModels/in/Address.ts index 1c9e94e8..0cf5b92f 100644 --- a/models/regionalModels/in/Address.ts +++ b/models/regionalModels/in/Address.ts @@ -5,7 +5,7 @@ import { codeStateMap } from 'regional/in'; export class Address extends BaseAddress { formulas: FormulaMap = { addressDisplay: { - formula: async () => { + formula: () => { return [ this.addressLine1, this.addressLine2, @@ -28,7 +28,7 @@ export class Address extends BaseAddress { }, pos: { - formula: async () => { + formula: () => { const stateList = Object.values(codeStateMap).sort(); const state = this.state as string; if (stateList.includes(state)) { diff --git a/models/regionalModels/in/Party.ts b/models/regionalModels/in/Party.ts index 9571c933..523cd2a2 100644 --- a/models/regionalModels/in/Party.ts +++ b/models/regionalModels/in/Party.ts @@ -6,6 +6,7 @@ export class Party extends BaseParty { gstin?: string; gstType?: GSTType; + // eslint-disable-next-line @typescript-eslint/require-await async beforeSync() { const gstin = this.get('gstin') as string | undefined; const gstType = this.get('gstType') as GSTType; diff --git a/reports/AccountReport.ts b/reports/AccountReport.ts index 0ead699d..2f0bba60 100644 --- a/reports/AccountReport.ts +++ b/reports/AccountReport.ts @@ -34,11 +34,11 @@ export const ACC_BAL_WIDTH = 1.25; export abstract class AccountReport extends LedgerReport { toDate?: string; - count: number = 3; + count = 3; fromYear?: number; toYear?: number; - consolidateColumns: boolean = false; - hideGroupAmounts: boolean = false; + consolidateColumns = false; + hideGroupAmounts = false; periodicity: Periodicity = 'Monthly'; basedOn: BasedOn = 'Until Date'; @@ -88,10 +88,7 @@ export abstract class AccountReport extends LedgerReport { }; } - async getTotalNode( - rootNode: AccountTreeNode, - name: string - ): Promise { + getTotalNode(rootNode: AccountTreeNode, name: string): AccountListNode { const accountTree = { [rootNode.name]: rootNode }; const leafNodes = getListOfLeafNodes(accountTree) as AccountTreeNode[]; @@ -153,7 +150,7 @@ export abstract class AccountReport extends LedgerReport { ): Promise { const accountValueMap: AccountNameValueMapMap = new Map(); if (!this.accountMap) { - await this._getAccountMap(); + await this._setAndReturnAccountMap(); } for (const account of map.keys()) { @@ -169,17 +166,17 @@ export abstract class AccountReport extends LedgerReport { } if (!this.accountMap?.[entry.account]) { - this._getAccountMap(true); + await this._setAndReturnAccountMap(true); } - const totalBalance = valueMap.get(key!)?.balance ?? 0; + const totalBalance = valueMap.get(key)?.balance ?? 0; const balance = (entry.debit ?? 0) - (entry.credit ?? 0); const rootType = this.accountMap![entry.account]?.rootType; if (isCredit(rootType)) { - valueMap.set(key!, { balance: totalBalance - balance }); + valueMap.set(key, { balance: totalBalance - balance }); } else { - valueMap.set(key!, { balance: totalBalance + balance }); + valueMap.set(key, { balance: totalBalance + balance }); } } accountValueMap.set(account, valueMap); @@ -189,7 +186,9 @@ export abstract class AccountReport extends LedgerReport { } async _getAccountTree(rangeGroupedMap: AccountNameValueMapMap) { - const accountTree = cloneDeep(await this._getAccountMap()) as AccountTree; + const accountTree = cloneDeep( + await this._setAndReturnAccountMap() + ) as AccountTree; setPruneFlagOnAccountTreeNodes(accountTree); setValueMapOnAccountTreeNodes(accountTree, rangeGroupedMap); @@ -200,7 +199,7 @@ export abstract class AccountReport extends LedgerReport { return accountTree; } - async _getAccountMap(force: boolean = false) { + async _setAndReturnAccountMap(force = false) { if (this.accountMap && !force) { return this.accountMap; } @@ -510,14 +509,14 @@ function updateParentAccountWithChildValues( parentAccount.valueMap ??= new Map(); for (const key of valueMap.keys()) { - const value = parentAccount.valueMap!.get(key); + const value = parentAccount.valueMap.get(key); const childValue = valueMap.get(key); const map: Record = {}; for (const key of Object.keys(childValue!)) { map[key] = (value?.[key] ?? 0) + (childValue?.[key] ?? 0); } - parentAccount.valueMap!.set(key, map); + parentAccount.valueMap.set(key, map); } return parentAccount.parentAccount!; @@ -533,7 +532,7 @@ function setChildrenOnAccountTreeNodes(accountTree: AccountTree) { } accountTree[ac.parentAccount].children ??= []; - accountTree[ac.parentAccount].children!.push(ac!); + accountTree[ac.parentAccount].children!.push(ac); parentNodes.add(ac.parentAccount); } diff --git a/reports/BalanceSheet/BalanceSheet.ts b/reports/BalanceSheet/BalanceSheet.ts index b730e3d7..b4650b0c 100644 --- a/reports/BalanceSheet/BalanceSheet.ts +++ b/reports/BalanceSheet/BalanceSheet.ts @@ -13,7 +13,7 @@ import { getMapFromList } from 'utils'; export class BalanceSheet extends AccountReport { static title = t`Balance Sheet`; static reportName = 'balance-sheet'; - loading: boolean = false; + loading = false; get rootTypes(): AccountRootType[] { return [ @@ -54,15 +54,15 @@ export class BalanceSheet extends AccountReport { }) .filter((row) => !!row.rootNode); - this.reportData = await this.getReportDataFromRows( + this.reportData = this.getReportDataFromRows( getMapFromList(rootTypeRows, 'rootType') ); this.loading = false; } - async getReportDataFromRows( + getReportDataFromRows( rootTypeRows: Record - ): Promise { + ): ReportData { const typeNameList = [ { rootType: AccountRootTypeEnum.Asset, @@ -89,7 +89,7 @@ export class BalanceSheet extends AccountReport { reportData.push(...row.rows); if (row.rootNode) { - const totalNode = await this.getTotalNode(row.rootNode, totalName); + const totalNode = this.getTotalNode(row.rootNode, totalName); const totalRow = this.getRowFromAccountListNode(totalNode); reportData.push(totalRow); } diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts index 6c3c8c7c..1752c993 100644 --- a/reports/GeneralLedger/GeneralLedger.ts +++ b/reports/GeneralLedger/GeneralLedger.ts @@ -24,11 +24,11 @@ type ReferenceType = export class GeneralLedger extends LedgerReport { static title = t`General Ledger`; static reportName = 'general-ledger'; - usePagination: boolean = true; - loading: boolean = false; + usePagination = true; + loading = false; - ascending: boolean = false; - reverted: boolean = false; + ascending = false; + reverted = false; referenceType: ReferenceType = 'All'; groupBy: 'none' | 'party' | 'account' | 'referenceName' = 'none'; _rawData: LedgerEntry[] = []; @@ -37,7 +37,7 @@ export class GeneralLedger extends LedgerReport { super(fyo); } - async setDefaultFilters() { + setDefaultFilters() { if (!this.toDate) { this.toDate = DateTime.now().plus({ days: 1 }).toISODate(); this.fromDate = DateTime.now().minus({ years: 1 }).toISODate(); @@ -239,7 +239,7 @@ export class GeneralLedger extends LedgerReport { return { totalDebit, totalCredit }; } - async _getQueryFilters(): Promise { + _getQueryFilters(): QueryFilter { const filters: QueryFilter = {}; const stringFilters = ['account', 'party', 'referenceName']; diff --git a/reports/GoodsAndServiceTax/BaseGSTR.ts b/reports/GoodsAndServiceTax/BaseGSTR.ts index 245bec08..beebaaac 100644 --- a/reports/GoodsAndServiceTax/BaseGSTR.ts +++ b/reports/GoodsAndServiceTax/BaseGSTR.ts @@ -17,9 +17,9 @@ export abstract class BaseGSTR extends Report { toDate?: string; fromDate?: string; transferType?: TransferType; - usePagination: boolean = true; + usePagination = true; gstrRows?: GSTRRow[]; - loading: boolean = false; + loading = false; abstract gstrType: GSTRType; @@ -111,7 +111,7 @@ export abstract class BaseGSTR extends Report { return (row) => row.rate === 0; // this takes care of both nil rated, exempted goods } - return (_) => true; + return () => true; } async getEntries() { @@ -133,7 +133,7 @@ export abstract class BaseGSTR extends Report { const entries = await this.getEntries(); const gstrRows: GSTRRow[] = []; for (const entry of entries) { - const gstrRow = await this.getGstrRow(entry.name as string); + const gstrRow = await this.getGstrRow(entry.name); gstrRows.push(gstrRow); } return gstrRows; @@ -149,7 +149,7 @@ export abstract class BaseGSTR extends Report { 'gstin' )) as string | null; - const party = (await this.fyo.doc.getDoc('Party', entry.party!)) as Party; + const party = (await this.fyo.doc.getDoc('Party', entry.party)) as Party; let place = ''; if (party.address) { @@ -216,7 +216,7 @@ export abstract class BaseGSTR extends Report { } } - async setDefaultFilters() { + setDefaultFilters() { if (!this.toDate) { this.toDate = DateTime.local().toISODate(); } diff --git a/reports/GoodsAndServiceTax/gstExporter.ts b/reports/GoodsAndServiceTax/gstExporter.ts index 62fdec32..972fc5dd 100644 --- a/reports/GoodsAndServiceTax/gstExporter.ts +++ b/reports/GoodsAndServiceTax/gstExporter.ts @@ -175,7 +175,7 @@ async function getCanExport(report: BaseGSTR) { return true; } - showDialog({ + await showDialog({ title: report.fyo.t`Cannot Export`, detail: report.fyo.t`Please set GSTIN in General Settings.`, type: 'error', @@ -204,7 +204,7 @@ export async function getGstrJsonData(report: BaseGSTR): Promise { } else if (transferType === TransferTypeEnum.B2CL) { gstData.b2cl = await generateB2clData(report); } else if (transferType === TransferTypeEnum.B2CS) { - gstData.b2cs = await generateB2csData(report); + gstData.b2cs = generateB2csData(report); } return JSON.stringify(gstData); diff --git a/reports/LedgerReport.ts b/reports/LedgerReport.ts index 8a7d6231..4b1c280a 100644 --- a/reports/LedgerReport.ts +++ b/reports/LedgerReport.ts @@ -14,7 +14,7 @@ export abstract class LedgerReport extends Report { static reportName = 'general-ledger'; _rawData: LedgerEntry[] = []; - shouldRefresh: boolean = false; + shouldRefresh = false; constructor(fyo: Fyo) { super(fyo); @@ -117,7 +117,7 @@ export abstract class LedgerReport extends Report { }); } - abstract _getQueryFilters(): Promise; + abstract _getQueryFilters(): QueryFilter | Promise; getActions(): Action[] { return getCommonExportActions(this); diff --git a/reports/ProfitAndLoss/ProfitAndLoss.ts b/reports/ProfitAndLoss/ProfitAndLoss.ts index 1df9c5c3..859a3e42 100644 --- a/reports/ProfitAndLoss/ProfitAndLoss.ts +++ b/reports/ProfitAndLoss/ProfitAndLoss.ts @@ -17,7 +17,7 @@ import { export class ProfitAndLoss extends AccountReport { static title = t`Profit And Loss`; static reportName = 'profit-and-loss'; - loading: boolean = false; + loading = false; get rootTypes(): AccountRootType[] { return [AccountRootTypeEnum.Income, AccountRootTypeEnum.Expense]; @@ -62,7 +62,7 @@ export class ProfitAndLoss extends AccountReport { const expenseList = convertAccountRootNodeToAccountList(expenseRoot); const expenseRows = this.getReportRowsFromAccountList(expenseList); - this.reportData = await this.getReportDataFromRows( + this.reportData = this.getReportDataFromRows( incomeRows, expenseRows, incomeRoot, @@ -71,14 +71,14 @@ export class ProfitAndLoss extends AccountReport { this.loading = false; } - async getReportDataFromRows( + getReportDataFromRows( incomeRows: ReportData, expenseRows: ReportData, incomeRoot: AccountTreeNode | undefined, expenseRoot: AccountTreeNode | undefined - ): Promise { + ): ReportData { if (incomeRoot && !expenseRoot) { - return await this.getIncomeOrExpenseRows( + return this.getIncomeOrExpenseRows( incomeRoot, incomeRows, t`Total Income (Credit)` @@ -86,7 +86,7 @@ export class ProfitAndLoss extends AccountReport { } if (expenseRoot && !incomeRoot) { - return await this.getIncomeOrExpenseRows( + return this.getIncomeOrExpenseRows( expenseRoot, expenseRows, t`Total Income (Credit)` @@ -97,7 +97,7 @@ export class ProfitAndLoss extends AccountReport { return []; } - return await this.getIncomeAndExpenseRows( + return this.getIncomeAndExpenseRows( incomeRows, expenseRows, incomeRoot, @@ -105,30 +105,27 @@ export class ProfitAndLoss extends AccountReport { ); } - async getIncomeOrExpenseRows( + getIncomeOrExpenseRows( root: AccountTreeNode, rows: ReportData, totalRowName: string - ): Promise { - const total = await this.getTotalNode(root, totalRowName); + ): ReportData { + const total = this.getTotalNode(root, totalRowName); const totalRow = this.getRowFromAccountListNode(total); return [rows, totalRow].flat(); } - async getIncomeAndExpenseRows( + getIncomeAndExpenseRows( incomeRows: ReportData, expenseRows: ReportData, incomeRoot: AccountTreeNode, expenseRoot: AccountTreeNode ) { - const totalIncome = await this.getTotalNode( - incomeRoot, - t`Total Income (Credit)` - ); + const totalIncome = this.getTotalNode(incomeRoot, t`Total Income (Credit)`); const totalIncomeRow = this.getRowFromAccountListNode(totalIncome); - const totalExpense = await this.getTotalNode( + const totalExpense = this.getTotalNode( expenseRoot, t`Total Expense (Debit)` ); diff --git a/reports/Report.ts b/reports/Report.ts index 744ac770..53d25bce 100644 --- a/reports/Report.ts +++ b/reports/Report.ts @@ -10,14 +10,14 @@ import { ColumnField, ReportData } from './types'; export abstract class Report extends Observable { static title: string; static reportName: string; - static isInventory: boolean = false; + static isInventory = false; fyo: Fyo; columns: ColumnField[] = []; filters: Field[] = []; reportData: ReportData; - usePagination: boolean = false; - shouldRefresh: boolean = false; + usePagination = false; + shouldRefresh = false; abstract loading: boolean; constructor(fyo: Fyo) { @@ -26,14 +26,12 @@ export abstract class Report extends Observable { this.reportData = []; } - get title() { - // @ts-ignore - return this.constructor.title; + get title(): string { + return (this.constructor as typeof Report).title; } - get reportName() { - // @ts-ignore - return this.constructor.reportName; + get reportName(): string { + return (this.constructor as typeof Report).reportName; } async initialize() { @@ -61,7 +59,7 @@ export abstract class Report extends Observable { return filterMap; } - async set(key: string, value: DocValue, callPostSet: boolean = true) { + async set(key: string, value: DocValue, callPostSet = true) { const field = this.filters.find((f) => f.fieldname === key); if (field === undefined) { return; @@ -95,7 +93,7 @@ export abstract class Report extends Observable { * Should first check if filter value is set * and update only if it is not set. */ - async setDefaultFilters() {} + abstract setDefaultFilters(): void | Promise; abstract getActions(): Action[]; abstract getFilters(): Field[] | Promise; abstract getColumns(): ColumnField[] | Promise; diff --git a/reports/TrialBalance/TrialBalance.ts b/reports/TrialBalance/TrialBalance.ts index 82b2f494..edc3047c 100644 --- a/reports/TrialBalance/TrialBalance.ts +++ b/reports/TrialBalance/TrialBalance.ts @@ -35,8 +35,8 @@ export class TrialBalance extends AccountReport { fromDate?: string; toDate?: string; - hideGroupAmounts: boolean = false; - loading: boolean = false; + hideGroupAmounts = false; + loading = false; _rawData: LedgerEntry[] = []; _dateRanges?: DateRange[]; @@ -79,6 +79,7 @@ export class TrialBalance extends AccountReport { this.loading = false; } + // eslint-disable-next-line @typescript-eslint/require-await async getReportDataFromRows( rootTypeRows: RootTypeRow[] ): Promise { @@ -93,6 +94,7 @@ export class TrialBalance extends AccountReport { return reportData; } + // eslint-disable-next-line @typescript-eslint/require-await async _getGroupedByDateRanges( map: GroupedMap ): Promise { @@ -108,11 +110,11 @@ export class TrialBalance extends AccountReport { const key = this._getRangeMapKey(entry); if (key === null) { throw new ValueError( - `invalid entry in trial balance ${entry.date?.toISOString()}` + `invalid entry in trial balance ${entry.date?.toISOString() ?? ''}` ); } - const map = valueMap.get(key!); + const map = valueMap.get(key); const totalCredit = map?.credit ?? 0; const totalDebit = map?.debit ?? 0; @@ -188,6 +190,7 @@ export class TrialBalance extends AccountReport { } as ReportRow; } + // eslint-disable-next-line @typescript-eslint/require-await async _getQueryFilters(): Promise { const filters: QueryFilter = {}; filters.reverted = false; diff --git a/reports/commonExporter.ts b/reports/commonExporter.ts index d4cdcdc5..ea55aa5d 100644 --- a/reports/commonExporter.ts +++ b/reports/commonExporter.ts @@ -1,4 +1,4 @@ -import { Fyo, t } from 'fyo'; +import { t } from 'fyo'; import { Action } from 'fyo/model/types'; import { Verb } from 'fyo/telemetry/types'; import { getSavePath, saveData, showExportInFolder } from 'src/utils/ipcCalls'; @@ -88,7 +88,7 @@ function getJsonData(report: Report): string { } const rowObj: Record = {}; - for (const c in row.cells) { + for (let c = 0; c < row.cells.length; c++) { const { label } = columns[c]; const cell = getValueFromCell(row.cells[c], displayPrecision); rowObj[label] = cell; @@ -129,7 +129,7 @@ function convertReportToCSVMatrix(report: Report): unknown[][] { const displayPrecision = (report.fyo.singles.SystemSettings?.displayPrecision as number) ?? 2; const reportData = report.reportData; - const columns = report.columns!; + const columns = report.columns; const csvdata: unknown[][] = []; csvdata.push(columns.map((c) => c.label)); @@ -140,7 +140,7 @@ function convertReportToCSVMatrix(report: Report): unknown[][] { } const csvrow: unknown[] = []; - for (const c in row.cells) { + for (let c = 0; c < row.cells.length; c++) { const cell = getValueFromCell(row.cells[c], displayPrecision); csvrow.push(cell); } diff --git a/reports/inventory/StockBalance.ts b/reports/inventory/StockBalance.ts index cf6795e8..49096868 100644 --- a/reports/inventory/StockBalance.ts +++ b/reports/inventory/StockBalance.ts @@ -13,9 +13,9 @@ export class StockBalance extends StockLedger { static reportName = 'stock-balance'; static isInventory = true; - override ascending: boolean = true; + override ascending = true; override referenceType: ReferenceType = 'All'; - override referenceName: string = ''; + override referenceName = ''; override async _getReportData(force?: boolean): Promise { if (this.shouldRefresh || force || !this._rawData?.length) { diff --git a/reports/inventory/StockLedger.ts b/reports/inventory/StockLedger.ts index 675a8085..7d80e3ce 100644 --- a/reports/inventory/StockLedger.ts +++ b/reports/inventory/StockLedger.ts @@ -19,11 +19,11 @@ export class StockLedger extends Report { static reportName = 'stock-ledger'; static isInventory = true; - usePagination: boolean = true; + usePagination = true; _rawData?: ComputedStockLedgerEntry[]; - loading: boolean = false; - shouldRefresh: boolean = false; + loading = false; + shouldRefresh = false; item?: string; location?: string; @@ -52,7 +52,7 @@ export class StockLedger extends Report { this._setObservers(); } - async setDefaultFilters() { + setDefaultFilters() { if (!this.toDate) { this.toDate = DateTime.now().plus({ days: 1 }).toISODate(); this.fromDate = DateTime.now().minus({ years: 1 }).toISODate(); @@ -91,9 +91,8 @@ export class StockLedger extends Report { async _setRawData() { const valuationMethod = - (this.fyo.singles.InventorySettings?.valuationMethod as - | ValuationMethod - | undefined) ?? ValuationMethod.FIFO; + this.fyo.singles.InventorySettings?.valuationMethod ?? + ValuationMethod.FIFO; const rawSLEs = await getRawStockLedgerEntries(this.fyo); this._rawData = getStockLedgerEntries(rawSLEs, valuationMethod); @@ -113,7 +112,7 @@ export class StockLedger extends Report { } let i = 0; - for (const idx in rawData) { + for (let idx = 0; idx < rawData.length; idx++) { const row = rawData[idx]; if (this.item && row.item !== this.item) { continue; diff --git a/schemas/index.ts b/schemas/index.ts index eccd6b39..37ab4f72 100644 --- a/schemas/index.ts +++ b/schemas/index.ts @@ -12,7 +12,7 @@ const NAME_FIELD = { readOnly: true, }; -export function getSchemas(countryCode: string = '-'): Readonly { +export function getSchemas(countryCode = '-'): Readonly { const builtCoreSchemas = getCoreSchemas(); const builtAppSchemas = getAppSchemas(countryCode); @@ -209,14 +209,14 @@ export function getAbstractCombinedSchemas(schemas: SchemaStubMap): SchemaMap { for (const name of extendingSchemaNames) { const extendingSchema = schemas[name] as Schema; - const abstractSchema = schemas[extendingSchema.extends!] as SchemaStub; + const abstractSchema = schemas[extendingSchema.extends!]; schemaMap[name] = getCombined(extendingSchema, abstractSchema) as Schema; } - for (const name in abstractSchemaNames) { + abstractSchemaNames.forEach((name) => { delete schemaMap[name]; - } + }); return schemaMap; } diff --git a/scripts/generateTranslations.ts b/scripts/generateTranslations.ts index 6460141c..a0b743e8 100644 --- a/scripts/generateTranslations.ts +++ b/scripts/generateTranslations.ts @@ -8,6 +8,8 @@ import { schemaTranslateables, } from '../utils/translationHelpers'; +/* eslint-disable no-console, @typescript-eslint/no-floating-promises */ + const translationsFolder = path.resolve(__dirname, '..', 'translations'); const PATTERN = /(? { const contents: string[] = await fs.readdir(root); const files: string[] = []; @@ -86,7 +88,7 @@ function getTStrings(content: string): Promise { } function tStringFinder(content: string): string[] { - return [...content.matchAll(PATTERN)].map(([_, t]) => { + return [...content.matchAll(PATTERN)].map(([, t]) => { t = getIndexFormat(t); return getWhitespaceSanitized(t); }); diff --git a/scripts/profile.ts b/scripts/profile.ts index 34c4557e..6120a2ef 100644 --- a/scripts/profile.ts +++ b/scripts/profile.ts @@ -19,4 +19,5 @@ async function run() { await unlink(dbPath); } +// eslint-disable-next-line @typescript-eslint/no-floating-promises run(); diff --git a/tests/helpers.ts b/tests/helpers.ts index 244e08b8..aa64d3ab 100644 --- a/tests/helpers.ts +++ b/tests/helpers.ts @@ -54,6 +54,8 @@ export function getTestFyo(): Fyo { const ext = '.spec.ts'; +/* eslint-disable @typescript-eslint/no-misused-promises */ + export function setupTestFyo(fyo: Fyo, filename: string) { const testName = path.basename(filename, ext); diff --git a/utils/csvParser.ts b/utils/csvParser.ts index 9cd5bc2c..589ae1b3 100644 --- a/utils/csvParser.ts +++ b/utils/csvParser.ts @@ -13,7 +13,7 @@ export function generateCSV(matrix: unknown[][]): string { return formattedRows.join('\r\n'); } -function splitCsvBlock(text: string, splitter: string = '\r\n'): string[] { +function splitCsvBlock(text: string, splitter = '\r\n'): string[] { if (!text.endsWith(splitter)) { text += splitter; } diff --git a/utils/db/types.ts b/utils/db/types.ts index 2be03bce..aeabeeec 100644 --- a/utils/db/types.ts +++ b/utils/db/types.ts @@ -93,3 +93,15 @@ export abstract class DatabaseDemuxBase { abstract callBespoke(method: string, ...args: unknown[]): Promise; } + +// Return types of Bespoke Queries +export type TopExpenses = { account: string; total: number }[]; +export type TotalOutstanding = { total: number; outstanding: number }; +export type Cashflow = { inflow: number; outflow: number; yearmonth: string }[]; +export type Balance = { balance: number; yearmonth: string }[]; +export type IncomeExpense = { income: Balance; expense: Balance }; +export type TotalCreditAndDebit = { + account: string; + totalCredit: number; + totalDebit: number; +}; \ No newline at end of file diff --git a/utils/index.ts b/utils/index.ts index 2de5c6ff..7f5899fe 100644 --- a/utils/index.ts +++ b/utils/index.ts @@ -115,6 +115,7 @@ export function invertMap(map: Record): Record { } export function time(func: (...args: K[]) => T, ...args: K[]): T { + /* eslint-disable no-console */ const name = func.name; console.time(name); const stuff = func(...args); @@ -126,6 +127,7 @@ export async function timeAsync( func: (...args: K[]) => Promise, ...args: K[] ): Promise { + /* eslint-disable no-console */ const name = func.name; console.time(name); const stuff = await func(...args); @@ -255,20 +257,20 @@ export function removeAtIndex(array: T[], index: number): T[] { export function objectForEach( obj: T, - func: Function + func: (arg: unknown) => unknown ) { if (typeof obj !== 'object' || obj === null) { return func(obj); } + const newObj: Record = {}; for (const key in obj) { - obj[key] = objectForEach(obj[key], func); + newObj[key] = objectForEach(obj[key], func); } - return func(obj); + return func(newObj); } - /** * Asserts that `value` is of type T. Use with care. */ diff --git a/utils/translationHelpers.ts b/utils/translationHelpers.ts index 36fbaf03..40336883 100644 --- a/utils/translationHelpers.ts +++ b/utils/translationHelpers.ts @@ -10,7 +10,7 @@ export const schemaTranslateables = [ 'tab', ]; -export function getIndexFormat(inp: string | string[]) { +export function getIndexFormat(inp: string | string[] | unknown) { /** * converts: * ['This is an ', ,' interpolated ',' string.'] and @@ -26,7 +26,7 @@ export function getIndexFormat(inp: string | string[]) { } else if (inp instanceof Array) { snippets = inp; } else { - throw new Error(`invalid input ${inp} of type ${typeof inp}`); + throw new Error(`invalid input ${String(inp)} of type ${typeof inp}`); } if (snippets === undefined) { @@ -43,7 +43,7 @@ export function getIndexFormat(inp: string | string[]) { str += s; return; } - str += s + '${' + i + '}'; + str += s + '${' + String(i) + '}'; }); return str; @@ -70,5 +70,5 @@ export function getWhitespaceSanitized(str: string) { } export function getIndexList(str: string) { - return [...str.matchAll(/\${([^}]+)}/g)].map(([_, i]) => parseInt(i)); + return [...str.matchAll(/\${([^}]+)}/g)].map(([, i]) => parseInt(i)); } diff --git a/utils/types.ts b/utils/types.ts index 29d22a29..ad0aa83b 100644 --- a/utils/types.ts +++ b/utils/types.ts @@ -51,6 +51,7 @@ export interface SelectFileReturn { canceled: boolean; } +// eslint-disable-next-line @typescript-eslint/no-explicit-any export type PropertyEnum> = { [key in keyof Required]: key; };