From 3721fc316e2c122059d073c37424db51c1a06c0f Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 14 Aug 2023 17:32:24 +0800 Subject: [PATCH] chore(nocodb): lint --- .../nocodb/src/controllers/data-table.controller.spec.ts | 3 ++- packages/nocodb/src/db/sql-mgr/v2/SqlMgrv2Trans.ts | 2 +- packages/nocodb/src/gateways/socket.gateway.ts | 9 ++++++--- packages/nocodb/src/interface/XcMetaMgr.ts | 1 - .../src/modules/event-emitter/nestjs-event-emitter.ts | 2 +- packages/nocodb/src/modules/jobs/jobs.gateway.ts | 9 ++++++--- packages/nocodb/src/services/data-table.service.spec.ts | 3 ++- .../src/version-upgrader/v1-legacy/BaseApiBuilder.ts | 4 ++-- .../src/version-upgrader/v1-legacy/NcProjectBuilder.ts | 4 ++-- .../src/version-upgrader/v1-legacy/gql/GqlApiBuilder.ts | 8 ++++---- .../version-upgrader/v1-legacy/rest/RestApiBuilder.ts | 8 ++++---- 11 files changed, 30 insertions(+), 23 deletions(-) diff --git a/packages/nocodb/src/controllers/data-table.controller.spec.ts b/packages/nocodb/src/controllers/data-table.controller.spec.ts index cb22816371..791985e416 100644 --- a/packages/nocodb/src/controllers/data-table.controller.spec.ts +++ b/packages/nocodb/src/controllers/data-table.controller.spec.ts @@ -1,5 +1,6 @@ -import { Test, TestingModule } from '@nestjs/testing'; +import { Test } from '@nestjs/testing'; import { DataTableController } from './data-table.controller'; +import type { TestingModule } from '@nestjs/testing'; describe('DataTableController', () => { let controller: DataTableController; diff --git a/packages/nocodb/src/db/sql-mgr/v2/SqlMgrv2Trans.ts b/packages/nocodb/src/db/sql-mgr/v2/SqlMgrv2Trans.ts index 9f810dfa02..1c179e11c7 100644 --- a/packages/nocodb/src/db/sql-mgr/v2/SqlMgrv2Trans.ts +++ b/packages/nocodb/src/db/sql-mgr/v2/SqlMgrv2Trans.ts @@ -1,7 +1,7 @@ import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import KnexMigratorv2Tans from '../../sql-migrator/lib/KnexMigratorv2Tans'; +import Base from '../../../models/Base'; import SqlMgrv2 from './SqlMgrv2'; -import type Base from '../../../models/Base'; import type { Knex } from 'knex'; import type { XKnex } from '../../CustomKnex'; diff --git a/packages/nocodb/src/gateways/socket.gateway.ts b/packages/nocodb/src/gateways/socket.gateway.ts index 14f5071f9a..ea131f4df5 100644 --- a/packages/nocodb/src/gateways/socket.gateway.ts +++ b/packages/nocodb/src/gateways/socket.gateway.ts @@ -14,9 +14,12 @@ function getHash(str) { return crypto.createHash('md5').update(str).digest('hex'); } -const url = new URL(process.env.NC_PUBLIC_URL || `http://localhost:${process.env.PORT || '8080'}/`) -let namespace = url.pathname -namespace += namespace.endsWith("/") ? "" : "/" +const url = new URL( + process.env.NC_PUBLIC_URL || + `http://localhost:${process.env.PORT || '8080'}/`, +); +let namespace = url.pathname; +namespace += namespace.endsWith('/') ? '' : '/'; @WebSocketGateway({ cors: { diff --git a/packages/nocodb/src/interface/XcMetaMgr.ts b/packages/nocodb/src/interface/XcMetaMgr.ts index 94d938a5a8..1a2f847f80 100644 --- a/packages/nocodb/src/interface/XcMetaMgr.ts +++ b/packages/nocodb/src/interface/XcMetaMgr.ts @@ -1,2 +1 @@ -// eslint-disable-next-line @typescript-eslint/no-empty-interface export default interface XcMetaMgr {} 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 dedf7e9fb8..d975fbfbb9 100644 --- a/packages/nocodb/src/modules/event-emitter/nestjs-event-emitter.ts +++ b/packages/nocodb/src/modules/event-emitter/nestjs-event-emitter.ts @@ -1,4 +1,4 @@ -import type { EventEmitter2 } from '@nestjs/event-emitter'; +import { EventEmitter2 } from '@nestjs/event-emitter'; import type { IEventEmitter } from './event-emitter.interface'; export class NestjsEventEmitter implements IEventEmitter { diff --git a/packages/nocodb/src/modules/jobs/jobs.gateway.ts b/packages/nocodb/src/modules/jobs/jobs.gateway.ts index 76ababf3c2..a273fe7d1c 100644 --- a/packages/nocodb/src/modules/jobs/jobs.gateway.ts +++ b/packages/nocodb/src/modules/jobs/jobs.gateway.ts @@ -14,9 +14,12 @@ import { JobEvents } from '../../interface/Jobs'; import type { OnModuleInit } from '@nestjs/common'; import type { JobStatus } from '../../interface/Jobs'; -const url = new URL(process.env.NC_PUBLIC_URL || `http://localhost:${process.env.PORT || '8080'}/`) -let namespace = url.pathname -namespace += namespace.endsWith("/") ? "jobs" : "/jobs" +const url = new URL( + process.env.NC_PUBLIC_URL || + `http://localhost:${process.env.PORT || '8080'}/`, +); +let namespace = url.pathname; +namespace += namespace.endsWith('/') ? 'jobs' : '/jobs'; @WebSocketGateway({ cors: { diff --git a/packages/nocodb/src/services/data-table.service.spec.ts b/packages/nocodb/src/services/data-table.service.spec.ts index cf61df154f..bde29e7e41 100644 --- a/packages/nocodb/src/services/data-table.service.spec.ts +++ b/packages/nocodb/src/services/data-table.service.spec.ts @@ -1,5 +1,6 @@ -import { Test, TestingModule } from '@nestjs/testing'; +import { Test } from '@nestjs/testing'; import { DataTableService } from './data-table.service'; +import type { TestingModule } from '@nestjs/testing'; describe('DataTableService', () => { let service: DataTableService; diff --git a/packages/nocodb/src/version-upgrader/v1-legacy/BaseApiBuilder.ts b/packages/nocodb/src/version-upgrader/v1-legacy/BaseApiBuilder.ts index be99605005..9cab118e02 100644 --- a/packages/nocodb/src/version-upgrader/v1-legacy/BaseApiBuilder.ts +++ b/packages/nocodb/src/version-upgrader/v1-legacy/BaseApiBuilder.ts @@ -3,15 +3,15 @@ import { Router } from 'express'; import inflection from 'inflection'; import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; import NcConnectionMgr from '../../utils/common/NcConnectionMgr'; +import { DbConfig, NcConfig } from '../../interface/config'; import ncModelsOrderUpgrader from './jobs/ncModelsOrderUpgrader'; import ncParentModelTitleUpgrader from './jobs/ncParentModelTitleUpgrader'; import ncRemoveDuplicatedRelationRows from './jobs/ncRemoveDuplicatedRelationRows'; -import type { DbConfig, NcConfig } from '../../interface/config'; +import NcProjectBuilder from './NcProjectBuilder'; import type { XKnex } from '../../db/CustomKnex'; import type { BaseModelSql } from '../../db/BaseModelSql'; import type { MetaService } from '../../meta/meta.service'; import type Noco from '../../Noco'; -import type NcProjectBuilder from './NcProjectBuilder'; import type { MysqlClient, PgClient, SqlClient } from 'nc-help'; const log = debug('nc:api:base'); diff --git a/packages/nocodb/src/version-upgrader/v1-legacy/NcProjectBuilder.ts b/packages/nocodb/src/version-upgrader/v1-legacy/NcProjectBuilder.ts index 7e3c91e834..645ee5d12f 100644 --- a/packages/nocodb/src/version-upgrader/v1-legacy/NcProjectBuilder.ts +++ b/packages/nocodb/src/version-upgrader/v1-legacy/NcProjectBuilder.ts @@ -1,9 +1,9 @@ import { Router } from 'express'; import { SqlClientFactory } from '../../db/sql-client/lib/SqlClientFactory'; +import Noco from '../../Noco'; +import { NcConfig } from '../../interface/config'; import { GqlApiBuilder } from './gql/GqlApiBuilder'; import { RestApiBuilder } from './rest/RestApiBuilder'; -import type Noco from '../../Noco'; -import type { NcConfig } from '../../interface/config'; export default class NcProjectBuilder { public readonly id: string; diff --git a/packages/nocodb/src/version-upgrader/v1-legacy/gql/GqlApiBuilder.ts b/packages/nocodb/src/version-upgrader/v1-legacy/gql/GqlApiBuilder.ts index c32598e8ed..a5adab6819 100644 --- a/packages/nocodb/src/version-upgrader/v1-legacy/gql/GqlApiBuilder.ts +++ b/packages/nocodb/src/version-upgrader/v1-legacy/gql/GqlApiBuilder.ts @@ -1,10 +1,10 @@ import { Router } from 'express'; import GqlXcSchemaFactory from '../../../db/sql-mgr/code/gql-schema/xc-ts/GqlXcSchemaFactory'; import BaseApiBuilder from '../BaseApiBuilder'; -import type { MetaService } from '../../../meta/meta.service'; -import type Noco from '../../../Noco'; -import type NcProjectBuilder from '../NcProjectBuilder'; -import type { DbConfig, NcConfig } from '../../../interface/config'; +import { MetaService } from '../../../meta/meta.service'; +import Noco from '../../../Noco'; +import NcProjectBuilder from '../NcProjectBuilder'; +import { DbConfig, NcConfig } from '../../../interface/config'; import type XcMetaMgr from '../../../interface/XcMetaMgr'; export class GqlApiBuilder extends BaseApiBuilder implements XcMetaMgr { diff --git a/packages/nocodb/src/version-upgrader/v1-legacy/rest/RestApiBuilder.ts b/packages/nocodb/src/version-upgrader/v1-legacy/rest/RestApiBuilder.ts index 918869c37b..8a70263780 100644 --- a/packages/nocodb/src/version-upgrader/v1-legacy/rest/RestApiBuilder.ts +++ b/packages/nocodb/src/version-upgrader/v1-legacy/rest/RestApiBuilder.ts @@ -3,11 +3,11 @@ import SwaggerXc from '../../../db/sql-mgr/code/routers/xc-ts/SwaggerXc'; import ExpressXcTsRoutes from '../../../db/sql-mgr/code/routes/xc-ts/ExpressXcTsRoutes'; import NcHelp from '../../../utils/NcHelp'; import BaseApiBuilder from '../BaseApiBuilder'; -import type { MetaService } from '../../../meta/meta.service'; -import type Noco from '../../../Noco'; +import { MetaService } from '../../../meta/meta.service'; +import Noco from '../../../Noco'; +import { DbConfig, NcConfig } from '../../../interface/config'; +import NcProjectBuilder from '../NcProjectBuilder'; import type { Router } from 'express'; -import type { DbConfig, NcConfig } from '../../../interface/config'; -import type NcProjectBuilder from '../NcProjectBuilder'; export class RestApiBuilder extends BaseApiBuilder { public readonly type = 'rest';