From 75cc1d11c68a1f15aa93304cc3a756f7c4c72149 Mon Sep 17 00:00:00 2001 From: mertmit Date: Thu, 11 May 2023 20:31:29 +0300 Subject: [PATCH] chore: lint Signed-off-by: mertmit --- packages/nocodb/src/Noco.ts | 2 +- packages/nocodb/src/db/BaseModelSqlv2.ts | 21 ++--- .../db/sql-client/lib/sqlite/SqliteClient.ts | 85 ++++++++++--------- .../event-emitter/fallback-event-emitter.ts | 2 +- .../event-emitter/nestjs-event-emitter.ts | 4 +- .../nocodb/src/modules/metas/metas.module.ts | 2 +- .../src/services/hook-handler.service.spec.ts | 3 +- .../src/services/hook-handler.service.ts | 6 +- 8 files changed, 59 insertions(+), 66 deletions(-) diff --git a/packages/nocodb/src/Noco.ts b/packages/nocodb/src/Noco.ts index a764c4e5bc..be7c7acda9 100644 --- a/packages/nocodb/src/Noco.ts +++ b/packages/nocodb/src/Noco.ts @@ -8,9 +8,9 @@ import { AppModule } from './app.module'; import { NC_LICENSE_KEY } from './constants'; import Store from './models/Store'; +import type { IEventEmitter } from './modules/event-emitter/event-emitter.interface'; import type { Express } from 'express'; import type * as http from 'http'; -import { IEventEmitter } from './modules/event-emitter/event-emitter.interface' export default class Noco { private static _this: Noco; diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index 98308d17ba..f7ddc9db94 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -9,7 +9,6 @@ import { isVirtualCol, RelationTypes, UITypes, - ViewTypes, } from 'nocodb-sdk'; import Validator from 'validator'; import { customAlphabet } from 'nanoid'; @@ -18,23 +17,15 @@ import { v4 as uuidv4 } from 'uuid'; import { NcError } from '../helpers/catchError'; import getAst from '../helpers/getAst'; -import { - Audit, - Column, - Filter, - Model, - Project, - Sort, - View, -} from '../models'; +import { Audit, Column, Filter, Model, Project, Sort, View } from '../models'; import { sanitize, unsanitize } from '../helpers/sqlSanitize'; import { COMPARISON_OPS, COMPARISON_SUB_OPS, IS_WITHIN_COMPARISON_SUB_OPS, } from '../models/Filter'; -import Noco from '../Noco' -import { HANDLE_WEBHOOK } from '../services/hook-handler.service' +import Noco from '../Noco'; +import { HANDLE_WEBHOOK } from '../services/hook-handler.service'; import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; import genRollupSelectv2 from './genRollupSelectv2'; import conditionV2 from './conditionV2'; @@ -2523,7 +2514,6 @@ class BaseModelSqlv2 { } private async handleHooks(hookName, prevData, newData, req): Promise { - Noco.eventEmitter.emit(HANDLE_WEBHOOK, { hookName, prevData, @@ -2532,9 +2522,9 @@ class BaseModelSqlv2 { viewId: this.viewId, modelId: this.model.id, tnPath: this.tnPath, - }) -/* + }); + /* const view = await View.get(this.viewId); // handle form view data submission @@ -3317,7 +3307,6 @@ function validateFilterComparison(uidt: UITypes, op: any, sub_op?: any) { function extractCondition(nestedArrayConditions, aliasColObjMap) { return nestedArrayConditions?.map((str) => { - // eslint-disable-next-line prefer-const let [logicOp, alias, op, value] = str.match(/(?:~(and|or|not))?\((.*?),(\w+),(.*)\)/)?.slice(1) || []; diff --git a/packages/nocodb/src/db/sql-client/lib/sqlite/SqliteClient.ts b/packages/nocodb/src/db/sql-client/lib/sqlite/SqliteClient.ts index fb5dec62d9..118423df7b 100644 --- a/packages/nocodb/src/db/sql-client/lib/sqlite/SqliteClient.ts +++ b/packages/nocodb/src/db/sql-client/lib/sqlite/SqliteClient.ts @@ -200,7 +200,7 @@ class SqliteClient extends KnexClient { table.integer('status').nullable(); table.dateTime('created'); table.timestamps(); - } + }, ); log.debug('Table created:', `${args.tn}`, data); } else { @@ -295,7 +295,7 @@ class SqliteClient extends KnexClient { try { const response = await this.sqlClient.raw( - `SELECT name as tn FROM sqlite_master where type = 'table'` + `SELECT name as tn FROM sqlite_master where type = 'table'`, ); result.data.list = []; @@ -359,7 +359,7 @@ class SqliteClient extends KnexClient { try { const response = await this.sqlClient.raw( - `PRAGMA table_info("${args.tn}")` + `PRAGMA table_info("${args.tn}")`, ); const triggerList = (await this.triggerList(args)).data.list; @@ -420,7 +420,8 @@ class SqliteClient extends KnexClient { response[i].dtxs = ''; response[i].au = !!triggerList.find( - ({ trigger }) => trigger === `xc_trigger_${args.tn}_${response[i].cn}` + ({ trigger }) => + trigger === `xc_trigger_${args.tn}_${response[i].cn}`, ); } @@ -466,7 +467,7 @@ class SqliteClient extends KnexClient { // PRAGMA index_xinfo('idx_fk_original_language_id'); const response = await this.sqlClient.raw( - `PRAGMA index_list("${args.tn}")` + `PRAGMA index_list("${args.tn}")`, ); const rows = []; @@ -478,7 +479,7 @@ class SqliteClient extends KnexClient { response[i].unique = response[i].unique === 1 ? 1 : 0; const colsInIndex = await this.sqlClient.raw( - `PRAGMA index_info('${response[i].key_name}')` + `PRAGMA index_info('${response[i].key_name}')`, ); if (colsInIndex.length === 1) { @@ -531,7 +532,7 @@ class SqliteClient extends KnexClient { args.databaseName = this.connectionConfig.connection.database; const response = await this.sqlClient.raw( - `PRAGMA foreign_key_list('${args.tn}')` + `PRAGMA foreign_key_list('${args.tn}')`, ); for (let i = 0; i < response.length; ++i) { @@ -582,7 +583,7 @@ class SqliteClient extends KnexClient { for (let i = 0; i < tables.length; ++i) { const response = await this.sqlClient.raw( - `PRAGMA foreign_key_list('${tables[i].tn}')` + `PRAGMA foreign_key_list('${tables[i].tn}')`, ); for (let j = 0; j < response.length; ++j) { @@ -633,7 +634,7 @@ class SqliteClient extends KnexClient { args.databaseName = this.connectionConfig.connection.database; const response = await this.sqlClient.raw( - `select *, name as trigger_name from sqlite_master where type = 'trigger' and tbl_name='${args.tn}';` + `select *, name as trigger_name from sqlite_master where type = 'trigger' and tbl_name='${args.tn}';`, ); for (let i = 0; i < response.length; ++i) { @@ -676,7 +677,7 @@ class SqliteClient extends KnexClient { args.databaseName = this.connectionConfig.connection.database; const response = await this.sqlClient.raw( - `show function status where db='${args.databaseName}'` + `show function status where db='${args.databaseName}'`, ); if (response.length === 2) { @@ -730,7 +731,7 @@ class SqliteClient extends KnexClient { args.databaseName = this.connectionConfig.connection.database; const response = await this.sqlClient.raw( - `show procedure status where db='${args.databaseName}'` + `show procedure status where db='${args.databaseName}'`, ); if (response.length === 2) { @@ -775,7 +776,7 @@ class SqliteClient extends KnexClient { args.databaseName = this.connectionConfig.connection.database; const response = await this.sqlClient.raw( - `SELECT * FROM sqlite_master WHERE type = 'view'` + `SELECT * FROM sqlite_master WHERE type = 'view'`, ); for (let i = 0; i < response.length; ++i) { @@ -813,7 +814,7 @@ class SqliteClient extends KnexClient { args.databaseName = this.connectionConfig.connection.database; const response = await this.sqlClient.raw( - `SHOW CREATE FUNCTION ${args.function_name};` + `SHOW CREATE FUNCTION ${args.function_name};`, ); if (response.length === 2) { @@ -865,7 +866,7 @@ class SqliteClient extends KnexClient { args.databaseName = this.connectionConfig.connection.database; const response = await this.sqlClient.raw( - `show create procedure ${args.procedure_name};` + `show create procedure ${args.procedure_name};`, ); if (response.length === 2) { @@ -911,7 +912,7 @@ class SqliteClient extends KnexClient { try { const response = await this.sqlClient.raw( - `SELECT * FROM sqlite_master WHERE type = 'view' AND name = '${args.view_name}'` + `SELECT * FROM sqlite_master WHERE type = 'view' AND name = '${args.view_name}'`, ); for (let i = 0; i < response.length; ++i) { @@ -938,7 +939,7 @@ class SqliteClient extends KnexClient { args.databaseName = this.connectionConfig.connection.database; const response = await this.sqlClient.raw( - `SHOW FULL TABLES IN ${args.databaseName} WHERE TABLE_TYPE LIKE 'VIEW';` + `SHOW FULL TABLES IN ${args.databaseName} WHERE TABLE_TYPE LIKE 'VIEW';`, ); if (response.length === 2) { @@ -970,7 +971,7 @@ class SqliteClient extends KnexClient { log.api(`${_func}:args:`, args); const rows = await this.sqlClient.raw( - `create database ${args.database_name}` + `create database ${args.database_name}`, ); return rows; } @@ -981,7 +982,7 @@ class SqliteClient extends KnexClient { log.api(`${_func}:args:`, args); const rows = await this.sqlClient.raw( - `drop database ${args.database_name}` + `drop database ${args.database_name}`, ); return rows; } @@ -1011,7 +1012,7 @@ class SqliteClient extends KnexClient { log.api(`${_func}:args:`, args); const rows = await this.sqlClient.raw( - `DROP FUNCTION IF EXISTS ${args.function_name}` + `DROP FUNCTION IF EXISTS ${args.function_name}`, ); return rows; } @@ -1022,7 +1023,7 @@ class SqliteClient extends KnexClient { log.api(`${_func}:args:`, args); const rows = await this.sqlClient.raw( - `DROP PROCEDURE IF EXISTS ${args.procedure_name}` + `DROP PROCEDURE IF EXISTS ${args.procedure_name}`, ); return rows; } @@ -1042,7 +1043,7 @@ class SqliteClient extends KnexClient { this._version = result.data.object; log.debug( `Version was empty for ${args.func}: population version for database as`, - this._version + this._version, ); } @@ -1073,7 +1074,7 @@ class SqliteClient extends KnexClient { log.api(`${func}:args:`, args); try { const rows = await this.sqlClient.raw( - `CREATE TRIGGER \`${args.function_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}` + `CREATE TRIGGER \`${args.function_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}`, ); result.data.list = rows; } catch (e) { @@ -1101,7 +1102,7 @@ class SqliteClient extends KnexClient { try { await this.sqlClient.raw(`DROP TRIGGER ${args.function_name}`); const rows = await this.sqlClient.raw( - `CREATE TRIGGER \`${args.function_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}` + `CREATE TRIGGER \`${args.function_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}`, ); result.data.list = rows; } catch (e) { @@ -1128,7 +1129,7 @@ class SqliteClient extends KnexClient { log.api(`${func}:args:`, args); try { const rows = await this.sqlClient.raw( - `CREATE TRIGGER \`${args.procedure_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}` + `CREATE TRIGGER \`${args.procedure_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}`, ); result.data.list = rows; } catch (e) { @@ -1156,7 +1157,7 @@ class SqliteClient extends KnexClient { try { await this.sqlClient.raw(`DROP TRIGGER ${args.procedure_name}`); const rows = await this.sqlClient.raw( - `CREATE TRIGGER \`${args.procedure_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}` + `CREATE TRIGGER \`${args.procedure_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}`, ); result.data.list = rows; } catch (e) { @@ -1216,7 +1217,7 @@ class SqliteClient extends KnexClient { try { await this.sqlClient.raw(`DROP TRIGGER ${args.trigger_name}`); await this.sqlClient.raw( - `CREATE TRIGGER \`${args.trigger_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}` + `CREATE TRIGGER \`${args.trigger_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}`, ); const upQuery = `DROP TRIGGER ${args.trigger_name};\nCREATE TRIGGER \`${args.trigger_name}\` \n${args.timing} ${args.event}\nON "${args.tn}" FOR EACH ROW\n${args.statement}`; @@ -1507,13 +1508,13 @@ class SqliteClient extends KnexClient { args.table, args.columns[i], oldColumn, - upQuery + upQuery, ); downQuery += this.alterTableAddColumn( args.table, oldColumn, args.columns[i], - downQuery + downQuery, ); } else if (args.columns[i].altered & 2 || args.columns[i].altered & 8) { // col edit @@ -1521,7 +1522,7 @@ class SqliteClient extends KnexClient { args.table, args.columns[i], oldColumn, - upQuery + upQuery, ); downQuery += ';'; // downQuery += this.alterTableChangeColumn( @@ -1537,7 +1538,7 @@ class SqliteClient extends KnexClient { args.table, args.columns[i], oldColumn, - upQuery + upQuery, ); downQuery += ';'; // downQuery += alterTableRemoveColumn( @@ -1553,7 +1554,7 @@ class SqliteClient extends KnexClient { const pkQuery = this.alterTablePK( args.columns, args.originalColumns, - upQuery + upQuery, ); await this.sqlClient.raw('PRAGMA foreign_keys = OFF;'); @@ -1572,7 +1573,7 @@ class SqliteClient extends KnexClient { if (pkQuery) { await trx.schema.alterTable(args.table, (table) => { for (const pk of pkQuery.oldPks.filter( - (el) => !pkQuery.newPks.includes(el) + (el) => !pkQuery.newPks.includes(el), )) { table.dropPrimary(pk); } @@ -1858,7 +1859,7 @@ class SqliteClient extends KnexClient { /* Filter relations for current table */ if (args.tn) { relations = relations.filter( - (r) => r.tn === args.tn || r.rtn === args.tn + (r) => r.tn === args.tn || r.rtn === args.tn, ); } @@ -1867,7 +1868,7 @@ class SqliteClient extends KnexClient { let columns: any = await this.columnList({ tn: tables[i].tn }); columns = columns.data.list; console.log( - `Sequelize model created: ${tables[i].tn}(${columns.length})\n` + `Sequelize model created: ${tables[i].tn}(${columns.length})\n`, ); // let SqliteSequelizeRender = require('./SqliteSequelizeRender'); @@ -1967,7 +1968,7 @@ class SqliteClient extends KnexClient { query += this.genQuery( `ALTER TABLE ?? DROP COLUMN ??`, [t, n.cn], - shouldSanitize + shouldSanitize, ); return query; } @@ -2007,14 +2008,14 @@ class SqliteClient extends KnexClient { const backupOldColumnQuery = this.genQuery( `ALTER TABLE ?? RENAME COLUMN ?? TO ??;`, [t, o.cn, `${o.cno}_nc_${suffix}`], - shouldSanitize + shouldSanitize, ); let addNewColumnQuery = ''; addNewColumnQuery += this.genQuery( ` ADD ?? ${this.sanitiseDataType(n.dt)}`, [n.cn], - shouldSanitize + shouldSanitize, ); addNewColumnQuery += n.dtxp && n.dt !== 'text' ? `(${n.dtxp})` : ''; addNewColumnQuery += n.cdf @@ -2026,19 +2027,19 @@ class SqliteClient extends KnexClient { addNewColumnQuery = this.genQuery( `ALTER TABLE ?? ${addNewColumnQuery};`, [t], - shouldSanitize + shouldSanitize, ); const updateNewColumnQuery = this.genQuery( `UPDATE ?? SET ?? = ??;`, [t, n.cn, `${o.cno}_nc_${suffix}`], - shouldSanitize + shouldSanitize, ); const dropOldColumnQuery = this.genQuery( `ALTER TABLE ?? DROP COLUMN ??;`, [t, `${o.cno}_nc_${suffix}`], - shouldSanitize + shouldSanitize, ); query = `${backupOldColumnQuery}${addNewColumnQuery}${updateNewColumnQuery}${dropOldColumnQuery}`; @@ -2105,12 +2106,12 @@ class SqliteClient extends KnexClient { try { const tables = await this.sqlClient.raw( - `SELECT name FROM sqlite_master WHERE type='table';` + `SELECT name FROM sqlite_master WHERE type='table';`, ); let count = 0; for (const tb of tables) { const tmp = await this.sqlClient.raw( - `SELECT COUNT(*) as ct FROM '${tb.name}';` + `SELECT COUNT(*) as ct FROM '${tb.name}';`, ); if (tmp && tmp.length) { count += tmp[0].ct; diff --git a/packages/nocodb/src/modules/event-emitter/fallback-event-emitter.ts b/packages/nocodb/src/modules/event-emitter/fallback-event-emitter.ts index 4ee3ac5020..76c8fbc90e 100644 --- a/packages/nocodb/src/modules/event-emitter/fallback-event-emitter.ts +++ b/packages/nocodb/src/modules/event-emitter/fallback-event-emitter.ts @@ -1,5 +1,5 @@ import Emittery from 'emittery'; -import { IEventEmitter } from './event-emitter.interface'; +import type { IEventEmitter } from './event-emitter.interface'; export class FallbackEventEmitter implements IEventEmitter { private readonly emitter: Emittery; diff --git a/packages/nocodb/src/modules/event-emitter/nestjs-event-emitter.ts b/packages/nocodb/src/modules/event-emitter/nestjs-event-emitter.ts index 14e83fe5fa..dedf7e9fb8 100644 --- a/packages/nocodb/src/modules/event-emitter/nestjs-event-emitter.ts +++ b/packages/nocodb/src/modules/event-emitter/nestjs-event-emitter.ts @@ -1,5 +1,5 @@ -import { EventEmitter2 } from '@nestjs/event-emitter'; -import { IEventEmitter } from './event-emitter.interface'; +import type { EventEmitter2 } from '@nestjs/event-emitter'; +import type { IEventEmitter } from './event-emitter.interface'; export class NestjsEventEmitter implements IEventEmitter { constructor(private readonly eventEmitter: EventEmitter2) {} diff --git a/packages/nocodb/src/modules/metas/metas.module.ts b/packages/nocodb/src/modules/metas/metas.module.ts index 63ed0a964e..0aa6a9ae76 100644 --- a/packages/nocodb/src/modules/metas/metas.module.ts +++ b/packages/nocodb/src/modules/metas/metas.module.ts @@ -67,7 +67,7 @@ import { UtilsService } from '../../services/utils.service'; import { ViewColumnsService } from '../../services/view-columns.service'; import { ViewsService } from '../../services/views.service'; import { ApiDocsService } from '../../services/api-docs/api-docs.service'; -import { EventEmitterModule } from '../event-emitter/event-emitter.module' +import { EventEmitterModule } from '../event-emitter/event-emitter.module'; import { GlobalModule } from '../global/global.module'; import { ProjectUsersController } from '../../controllers/project-users.controller'; import { ProjectUsersService } from '../../services/project-users/project-users.service'; diff --git a/packages/nocodb/src/services/hook-handler.service.spec.ts b/packages/nocodb/src/services/hook-handler.service.spec.ts index 9b79fd5af6..977cba23fa 100644 --- a/packages/nocodb/src/services/hook-handler.service.spec.ts +++ b/packages/nocodb/src/services/hook-handler.service.spec.ts @@ -1,5 +1,6 @@ -import { Test, TestingModule } from '@nestjs/testing'; +import { Test } from '@nestjs/testing'; import { HookHandlerService } from './hook-handler.service'; +import type { TestingModule } from '@nestjs/testing'; describe('HookHandlerService', () => { let service: HookHandlerService; diff --git a/packages/nocodb/src/services/hook-handler.service.ts b/packages/nocodb/src/services/hook-handler.service.ts index d7dac48aa4..5067de43dd 100644 --- a/packages/nocodb/src/services/hook-handler.service.ts +++ b/packages/nocodb/src/services/hook-handler.service.ts @@ -1,4 +1,4 @@ -import { Inject, Injectable } from '@nestjs/common' +import { Inject, Injectable } from '@nestjs/common'; import { UITypes, ViewTypes } from 'nocodb-sdk'; import ejs from 'ejs'; import NcPluginMgrv2 from '../helpers/NcPluginMgrv2'; @@ -18,7 +18,9 @@ export const HANDLE_WEBHOOK = '__nc_handleHooks'; export class HookHandlerService implements OnModuleInit, OnModuleDestroy { private unsubscribe: () => void; - constructor(@Inject('IEventEmitter') private readonly eventEmitter: IEventEmitter) {} + constructor( + @Inject('IEventEmitter') private readonly eventEmitter: IEventEmitter, + ) {} private async handleHooks({ hookName,