diff --git a/packages/nocodb/src/interface/config.ts b/packages/nocodb/src/interface/config.ts index 4789208021..61ae8c67ec 100644 --- a/packages/nocodb/src/interface/config.ts +++ b/packages/nocodb/src/interface/config.ts @@ -1,6 +1,6 @@ -import { Handler } from 'express'; -import * as e from 'express'; -import { Knex } from 'knex'; +import type { Handler } from 'express'; +import type * as e from 'express'; +import type { Knex } from 'knex'; export interface Route { path: string; diff --git a/packages/nocodb/src/lib/Noco.ts b/packages/nocodb/src/lib/Noco.ts index a180a85dcf..ca1c87a9f0 100644 --- a/packages/nocodb/src/lib/Noco.ts +++ b/packages/nocodb/src/lib/Noco.ts @@ -9,14 +9,14 @@ import clear from 'clear'; import cookieParser from 'cookie-parser'; import debug from 'debug'; import * as express from 'express'; -import { Router } from 'express'; +import type { Router } from 'express'; import importFresh from 'import-fresh'; import morgan from 'morgan'; import NcToolGui from 'nc-lib-gui'; import requestIp from 'request-ip'; import { v4 as uuidv4 } from 'uuid'; -import { NcConfig } from '../interface/config'; +import type { NcConfig } from '../interface/config'; import { NC_LICENSE_KEY } from './constants'; import Migrator from './db/sql-migrator/lib/KnexMigrator'; import Store from './models/Store'; @@ -25,24 +25,24 @@ import { T } from 'nc-help'; import NcProjectBuilderCE from './v1-legacy/NcProjectBuilder'; import NcProjectBuilderEE from './v1-legacy/NcProjectBuilderEE'; -import { GqlApiBuilder } from './v1-legacy/gql/GqlApiBuilder'; -import NcMetaIO from './meta/NcMetaIO'; +import type { GqlApiBuilder } from './v1-legacy/gql/GqlApiBuilder'; +import type NcMetaIO from './meta/NcMetaIO'; import NcMetaImplCE from './meta/NcMetaIOImpl'; import NcMetaImplEE from './meta/NcMetaIOImplEE'; -import NcMetaMgrCE from './meta/NcMetaMgr'; -import NcMetaMgrEE from './meta/NcMetaMgrEE'; -import { RestApiBuilder } from './v1-legacy/rest/RestApiBuilder'; +import type NcMetaMgrCE from './meta/NcMetaMgr'; +import type NcMetaMgrEE from './meta/NcMetaMgrEE'; +import type { RestApiBuilder } from './v1-legacy/rest/RestApiBuilder'; import RestAuthCtrlCE from './v1-legacy/rest/RestAuthCtrl'; import RestAuthCtrlEE from './v1-legacy/rest/RestAuthCtrlEE'; import mkdirp from 'mkdirp'; import MetaAPILogger from './meta/MetaAPILogger'; import NcUpgrader from './version-upgrader/NcUpgrader'; -import NcMetaMgrv2 from './meta/NcMetaMgrv2'; +import type NcMetaMgrv2 from './meta/NcMetaMgrv2'; import NocoCache from './cache/NocoCache'; import registerMetaApis from './meta/api'; import NcPluginMgrv2 from './meta/helpers/NcPluginMgrv2'; import User from './models/User'; -import * as http from 'http'; +import type * as http from 'http'; import weAreHiring from './utils/weAreHiring'; import getInstance from './utils/getInstance'; import initAdminFromEnv from './services/user/initAdminFromEnv'; diff --git a/packages/nocodb/src/lib/cache/NocoCache.ts b/packages/nocodb/src/lib/cache/NocoCache.ts index 7896ebca37..0ea0fb1bad 100644 --- a/packages/nocodb/src/lib/cache/NocoCache.ts +++ b/packages/nocodb/src/lib/cache/NocoCache.ts @@ -1,4 +1,4 @@ -import CacheMgr from './CacheMgr'; +import type CacheMgr from './CacheMgr'; import RedisCacheMgr from './RedisCacheMgr'; import RedisMockCacheMgr from './RedisMockCacheMgr'; import { CacheGetType } from '../utils/globals'; diff --git a/packages/nocodb/src/lib/controllers/apiToken.ctl.ts b/packages/nocodb/src/lib/controllers/apiToken.ctl.ts index d472c9a800..d0e6875d52 100644 --- a/packages/nocodb/src/lib/controllers/apiToken.ctl.ts +++ b/packages/nocodb/src/lib/controllers/apiToken.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { apiTokenService } from '../services'; diff --git a/packages/nocodb/src/lib/controllers/attachment.ctl.ts b/packages/nocodb/src/lib/controllers/attachment.ctl.ts index 8b9bd0eff7..62ef843a6e 100644 --- a/packages/nocodb/src/lib/controllers/attachment.ctl.ts +++ b/packages/nocodb/src/lib/controllers/attachment.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import multer from 'multer'; import { OrgUserRoles, ProjectRoles } from 'nocodb-sdk'; import path from 'path'; diff --git a/packages/nocodb/src/lib/controllers/audit.ctl.ts b/packages/nocodb/src/lib/controllers/audit.ctl.ts index 73ab7dafa4..8714f94636 100644 --- a/packages/nocodb/src/lib/controllers/audit.ctl.ts +++ b/packages/nocodb/src/lib/controllers/audit.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import Audit from '../models/Audit'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; diff --git a/packages/nocodb/src/lib/controllers/base.ctl.ts b/packages/nocodb/src/lib/controllers/base.ctl.ts index f35deb5069..ab5ef3a9f1 100644 --- a/packages/nocodb/src/lib/controllers/base.ctl.ts +++ b/packages/nocodb/src/lib/controllers/base.ctl.ts @@ -1,7 +1,7 @@ -import { Request, Response } from 'express'; -import { BaseListType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; +import type { BaseListType } from 'nocodb-sdk'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; -import Base from '../models/Base'; +import type Base from '../models/Base'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; diff --git a/packages/nocodb/src/lib/controllers/column.ctl.ts b/packages/nocodb/src/lib/controllers/column.ctl.ts index a6a230cfe1..614787f7f0 100644 --- a/packages/nocodb/src/lib/controllers/column.ctl.ts +++ b/packages/nocodb/src/lib/controllers/column.ctl.ts @@ -1,5 +1,6 @@ -import { Request, Response, Router } from 'express'; -import { ColumnReqType, TableType, UITypes } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; +import type { ColumnReqType, TableType, UITypes } from 'nocodb-sdk'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { columnService } from '../services'; diff --git a/packages/nocodb/src/lib/controllers/dbData/bulkDataAlias.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/bulkDataAlias.ctl.ts index 7aa016ef2e..93d887237e 100644 --- a/packages/nocodb/src/lib/controllers/dbData/bulkDataAlias.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/bulkDataAlias.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import { bulkDataService } from '../../services'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import apiMetrics from '../../meta/helpers/apiMetrics'; diff --git a/packages/nocodb/src/lib/controllers/dbData/data.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/data.ctl.ts index fb5c35ab17..fc829e2690 100644 --- a/packages/nocodb/src/lib/controllers/dbData/data.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/data.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import { dataService } from '../../services'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import apiMetrics from '../../meta/helpers/apiMetrics'; diff --git a/packages/nocodb/src/lib/controllers/dbData/dataAlias.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/dataAlias.ctl.ts index b5eda23c74..f5a310386d 100644 --- a/packages/nocodb/src/lib/controllers/dbData/dataAlias.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/dataAlias.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import { dataService } from '../../services'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import apiMetrics from '../../meta/helpers/apiMetrics'; diff --git a/packages/nocodb/src/lib/controllers/dbData/dataAliasExport.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/dataAliasExport.ctl.ts index 5126082347..7ba4545c67 100644 --- a/packages/nocodb/src/lib/controllers/dbData/dataAliasExport.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/dataAliasExport.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import * as XLSX from 'xlsx'; import apiMetrics from '../../meta/helpers/apiMetrics'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; diff --git a/packages/nocodb/src/lib/controllers/dbData/dataAliasNested.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/dataAliasNested.ctl.ts index 9fc5169ee3..1df4d3646a 100644 --- a/packages/nocodb/src/lib/controllers/dbData/dataAliasNested.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/dataAliasNested.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import apiMetrics from '../../meta/helpers/apiMetrics'; import { dataAliasNestedService } from '../../services'; diff --git a/packages/nocodb/src/lib/controllers/dbData/helpers.ts b/packages/nocodb/src/lib/controllers/dbData/helpers.ts index 6e49638538..60a691280d 100644 --- a/packages/nocodb/src/lib/controllers/dbData/helpers.ts +++ b/packages/nocodb/src/lib/controllers/dbData/helpers.ts @@ -2,15 +2,15 @@ import { NcError } from '../../meta/helpers/catchError'; import Project from '../../models/Project'; import Model from '../../models/Model'; import View from '../../models/View'; -import { Request } from 'express'; +import type { Request } from 'express'; import Base from '../../models/Base'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; import { isSystemColumn, UITypes } from 'nocodb-sdk'; import * as XLSX from 'xlsx'; import Column from '../../models/Column'; -import LookupColumn from '../../models/LookupColumn'; -import LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; +import type LookupColumn from '../../models/LookupColumn'; +import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; import papaparse from 'papaparse'; import { dataService } from '../../services'; diff --git a/packages/nocodb/src/lib/controllers/dbData/oldData.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/oldData.ctl.ts index 51cdbe51c4..0df513df34 100644 --- a/packages/nocodb/src/lib/controllers/dbData/oldData.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/oldData.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import Model from '../../models/Model'; import { nocoExecute } from 'nc-help'; import Base from '../../models/Base'; diff --git a/packages/nocodb/src/lib/controllers/export.ctl.ts b/packages/nocodb/src/lib/controllers/export.ctl.ts index a6c172edd5..a8108ffcca 100644 --- a/packages/nocodb/src/lib/controllers/export.ctl.ts +++ b/packages/nocodb/src/lib/controllers/export.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import View from '../models/View'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { extractCsvData } from './dbData/helpers'; diff --git a/packages/nocodb/src/lib/controllers/filter.ctl.ts b/packages/nocodb/src/lib/controllers/filter.ctl.ts index bf48e30765..8e8f46c847 100644 --- a/packages/nocodb/src/lib/controllers/filter.ctl.ts +++ b/packages/nocodb/src/lib/controllers/filter.ctl.ts @@ -1,5 +1,6 @@ -import { Request, Response, Router } from 'express'; -import { FilterReqType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; +import type { FilterReqType } from 'nocodb-sdk'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; diff --git a/packages/nocodb/src/lib/controllers/hook.ctl.ts b/packages/nocodb/src/lib/controllers/hook.ctl.ts index c75e2b82d1..4528a59e7b 100644 --- a/packages/nocodb/src/lib/controllers/hook.ctl.ts +++ b/packages/nocodb/src/lib/controllers/hook.ctl.ts @@ -1,6 +1,7 @@ import catchError from '../meta/helpers/catchError'; -import { Request, Response, Router } from 'express'; -import { HookListType, HookType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; +import type { HookListType, HookType } from 'nocodb-sdk'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; diff --git a/packages/nocodb/src/lib/controllers/hookFilter.ctl.ts b/packages/nocodb/src/lib/controllers/hookFilter.ctl.ts index c83a754d05..3a9cba4625 100644 --- a/packages/nocodb/src/lib/controllers/hookFilter.ctl.ts +++ b/packages/nocodb/src/lib/controllers/hookFilter.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import { T } from 'nc-help'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; diff --git a/packages/nocodb/src/lib/controllers/orgToken.ctl.ts b/packages/nocodb/src/lib/controllers/orgToken.ctl.ts index 75e406fc42..20da323594 100644 --- a/packages/nocodb/src/lib/controllers/orgToken.ctl.ts +++ b/packages/nocodb/src/lib/controllers/orgToken.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { getConditionalHandler } from '../meta/helpers/getHandler'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; diff --git a/packages/nocodb/src/lib/controllers/plugin.ctl.ts b/packages/nocodb/src/lib/controllers/plugin.ctl.ts index 8d3e1b6943..f52f88eb90 100644 --- a/packages/nocodb/src/lib/controllers/plugin.ctl.ts +++ b/packages/nocodb/src/lib/controllers/plugin.ctl.ts @@ -1,6 +1,7 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; -import { PluginType } from 'nocodb-sdk'; +import type { PluginType } from 'nocodb-sdk'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { pluginService } from '../services'; diff --git a/packages/nocodb/src/lib/controllers/project.ctl.ts b/packages/nocodb/src/lib/controllers/project.ctl.ts index 18d761efb1..31485b5bc8 100644 --- a/packages/nocodb/src/lib/controllers/project.ctl.ts +++ b/packages/nocodb/src/lib/controllers/project.ctl.ts @@ -1,7 +1,7 @@ -import { Request, Response } from 'express'; -import { ProjectType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; +import type { ProjectType } from 'nocodb-sdk'; import Project from '../models/Project'; -import { ProjectListType } from 'nocodb-sdk'; +import type { ProjectListType } from 'nocodb-sdk'; import { packageVersion } from '../utils/packageVersion'; import { T } from 'nc-help'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; diff --git a/packages/nocodb/src/lib/controllers/publicControllers/publicData.ctl.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicData.ctl.ts index 46a73a0f2a..2bf6749d9c 100644 --- a/packages/nocodb/src/lib/controllers/publicControllers/publicData.ctl.ts +++ b/packages/nocodb/src/lib/controllers/publicControllers/publicData.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import multer from 'multer'; import { NC_ATTACHMENT_FIELD_SIZE } from '../../constants'; import catchError from '../../meta/helpers/catchError'; diff --git a/packages/nocodb/src/lib/controllers/publicControllers/publicDataExport.ctl.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicDataExport.ctl.ts index 6afec3ef35..92a78e0979 100644 --- a/packages/nocodb/src/lib/controllers/publicControllers/publicDataExport.ctl.ts +++ b/packages/nocodb/src/lib/controllers/publicControllers/publicDataExport.ctl.ts @@ -1,18 +1,13 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import * as XLSX from 'xlsx'; import { nocoExecute } from 'nc-help'; import papaparse from 'papaparse'; import { ErrorMessages, isSystemColumn, UITypes, ViewTypes } from 'nocodb-sdk'; import getAst from '../../db/sql-data-mapper/lib/sql/helpers/getAst'; import catchError, { NcError } from '../../meta/helpers/catchError'; -import { - Base, - Column, - LinkToAnotherRecordColumn, - LookupColumn, - Model, - View, -} from '../../models'; +import type { LinkToAnotherRecordColumn, LookupColumn } from '../../models'; +import { Base, Column, Model, View } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; async function exportExcel(req: Request, res: Response) { diff --git a/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts index 238e3223ae..224cb909ef 100644 --- a/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts +++ b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import catchError from '../../meta/helpers/catchError'; import { publicMetaService } from '../../services'; diff --git a/packages/nocodb/src/lib/controllers/sort.ctl.ts b/packages/nocodb/src/lib/controllers/sort.ctl.ts index 332e31e419..37a70d4906 100644 --- a/packages/nocodb/src/lib/controllers/sort.ctl.ts +++ b/packages/nocodb/src/lib/controllers/sort.ctl.ts @@ -1,6 +1,7 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; -import { SortListType, SortReqType } from 'nocodb-sdk'; +import type { SortListType, SortReqType } from 'nocodb-sdk'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; diff --git a/packages/nocodb/src/lib/controllers/sync/import.ctl.ts b/packages/nocodb/src/lib/controllers/sync/import.ctl.ts index da48633196..d27e9865fc 100644 --- a/packages/nocodb/src/lib/controllers/sync/import.ctl.ts +++ b/packages/nocodb/src/lib/controllers/sync/import.ctl.ts @@ -1,13 +1,13 @@ -import { Request, Router } from 'express'; +import type { Request, Router } from 'express'; // import { Queue } from 'bullmq'; // import axios from 'axios'; import catchError, { NcError } from '../../meta/helpers/catchError'; -import { Server } from 'socket.io'; +import type { Server } from 'socket.io'; import NocoJobs from '../../jobs/NocoJobs'; import { SyncSource } from '../../models'; import Noco from '../../Noco'; import { syncService, userService } from '../../services'; -import { AirtableSyncConfig } from '../../services/sync/helpers/job'; +import type { AirtableSyncConfig } from '../../services/sync/helpers/job'; const AIRTABLE_IMPORT_JOB = 'AIRTABLE_IMPORT_JOB'; const AIRTABLE_PROGRESS_JOB = 'AIRTABLE_PROGRESS_JOB'; diff --git a/packages/nocodb/src/lib/controllers/sync/sync.ctl.ts b/packages/nocodb/src/lib/controllers/sync/sync.ctl.ts index 867bf9a73e..5bf6af97d4 100644 --- a/packages/nocodb/src/lib/controllers/sync/sync.ctl.ts +++ b/packages/nocodb/src/lib/controllers/sync/sync.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { syncService } from '../../services'; diff --git a/packages/nocodb/src/lib/controllers/table.ctl.ts b/packages/nocodb/src/lib/controllers/table.ctl.ts index c59c8d4a13..bb7ff101c7 100644 --- a/packages/nocodb/src/lib/controllers/table.ctl.ts +++ b/packages/nocodb/src/lib/controllers/table.ctl.ts @@ -1,5 +1,6 @@ -import { Request, Response, Router } from 'express'; -import { TableListType, TableReqType, TableType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; +import type { TableListType, TableReqType, TableType } from 'nocodb-sdk'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; diff --git a/packages/nocodb/src/lib/controllers/test.ctl.ts b/packages/nocodb/src/lib/controllers/test.ctl.ts index 08ea1e780e..eb919be44c 100644 --- a/packages/nocodb/src/lib/controllers/test.ctl.ts +++ b/packages/nocodb/src/lib/controllers/test.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Router } from 'express'; +import type { Request } from 'express'; +import { Router } from 'express'; import { TestResetService } from '../services/test/TestResetService'; export async function reset(req: Request, res) { diff --git a/packages/nocodb/src/lib/controllers/user/user.ctl.ts b/packages/nocodb/src/lib/controllers/user/user.ctl.ts index 83d93f1b3e..729abec5cb 100644 --- a/packages/nocodb/src/lib/controllers/user/user.ctl.ts +++ b/packages/nocodb/src/lib/controllers/user/user.ctl.ts @@ -1,4 +1,4 @@ -import { Request } from 'express'; +import type { Request } from 'express'; import * as ejs from 'ejs'; import { promisify } from 'util'; diff --git a/packages/nocodb/src/lib/controllers/util.ctl.ts b/packages/nocodb/src/lib/controllers/util.ctl.ts index e5e2b504b6..0d44b46204 100644 --- a/packages/nocodb/src/lib/controllers/util.ctl.ts +++ b/packages/nocodb/src/lib/controllers/util.ctl.ts @@ -1,5 +1,5 @@ // // Project CRUD -import { Request, Response } from 'express'; +import type { Request, Response } from 'express'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import catchError from '../meta/helpers/catchError'; import { utilService } from '../services'; diff --git a/packages/nocodb/src/lib/controllers/view.ctl.ts b/packages/nocodb/src/lib/controllers/view.ctl.ts index edbc2ed736..fa9107f577 100644 --- a/packages/nocodb/src/lib/controllers/view.ctl.ts +++ b/packages/nocodb/src/lib/controllers/view.ctl.ts @@ -1,6 +1,7 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; -import { View } from '../models'; +import type { View } from '../models'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { viewService } from '../services'; diff --git a/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts b/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts index aece1ca06e..e38cfcfbf9 100644 --- a/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts +++ b/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { viewColumnService } from '../services'; diff --git a/packages/nocodb/src/lib/controllers/views/formView.ctl.ts b/packages/nocodb/src/lib/controllers/views/formView.ctl.ts index 50729d4dab..42e21b691a 100644 --- a/packages/nocodb/src/lib/controllers/views/formView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/formView.ctl.ts @@ -1,5 +1,6 @@ -import { Request, Response, Router } from 'express'; -import { FormType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; +import type { FormType } from 'nocodb-sdk'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { formViewService } from '../../services'; diff --git a/packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts b/packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts index 25b4c1969d..7c5b34515b 100644 --- a/packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { formViewColumnService } from '../../services'; diff --git a/packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts b/packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts index 69a4688f02..4556a0b8a6 100644 --- a/packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts @@ -1,5 +1,6 @@ -import { Request, Response, Router } from 'express'; -import { GalleryType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; +import type { GalleryType } from 'nocodb-sdk'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { galleryViewService } from '../../services'; diff --git a/packages/nocodb/src/lib/controllers/views/gridView.ctl.ts b/packages/nocodb/src/lib/controllers/views/gridView.ctl.ts index ca4ca98da2..d86c304adf 100644 --- a/packages/nocodb/src/lib/controllers/views/gridView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/gridView.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Router } from 'express'; +import type { Request } from 'express'; +import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { gridViewService } from '../../services'; diff --git a/packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts b/packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts index e03e7acbcb..3f3f37a044 100644 --- a/packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts @@ -1,4 +1,5 @@ -import { Request, Response, Router } from 'express'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { gridViewColumnService } from '../../services'; diff --git a/packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts b/packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts index f26da8a99d..2b8e4eda35 100644 --- a/packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts @@ -1,5 +1,7 @@ -import { Request, Response, Router } from 'express'; -import { KanbanType, ViewTypes } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; +import type { KanbanType } from 'nocodb-sdk'; +import { ViewTypes } from 'nocodb-sdk'; import View from '../../models/View'; import KanbanView from '../../models/KanbanView'; import { T } from 'nc-help'; diff --git a/packages/nocodb/src/lib/controllers/views/mapView.ctl.ts b/packages/nocodb/src/lib/controllers/views/mapView.ctl.ts index 58ea925ad7..38cf657ae6 100644 --- a/packages/nocodb/src/lib/controllers/views/mapView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/mapView.ctl.ts @@ -1,5 +1,6 @@ -import { Request, Response, Router } from 'express'; -import { MapType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; +import { Router } from 'express'; +import type { MapType } from 'nocodb-sdk'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { mapViewService } from '../../services'; diff --git a/packages/nocodb/src/lib/db/sql-client/lib/KnexClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/KnexClient.ts index 7643c92c9b..b70c1316fa 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/KnexClient.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/KnexClient.ts @@ -1,5 +1,6 @@ /* eslint-disable no-constant-condition */ -import { knex, Knex } from 'knex'; +import type { Knex } from 'knex'; +import { knex } from 'knex'; import { T } from 'nc-help'; import Debug from '../../util/Debug'; import Emit from '../../util/emit'; diff --git a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts index c7f59aafc1..5c46792c6c 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts @@ -1,4 +1,4 @@ -import { ColumnType } from 'nocodb-sdk'; +import type { ColumnType } from 'nocodb-sdk'; import knex from 'knex'; import KnexClient from '../KnexClient'; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/BaseModel.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/BaseModel.ts index 8a542c3d53..1f4989c0cd 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/BaseModel.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/BaseModel.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/ban-types,prefer-const */ -import { Knex } from 'knex'; -import Filter from '../../../models/Filter'; -import Sort from '../../../models/Sort'; +import type { Knex } from 'knex'; +import type Filter from '../../../models/Filter'; +import type Sort from '../../../models/Sort'; const autoBind = require('auto-bind'); const _ = require('lodash'); diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSql.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSql.ts index 74a10ee349..bacc36f34e 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSql.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSql.ts @@ -2,7 +2,8 @@ import autoBind from 'auto-bind'; import _ from 'lodash'; import Validator from 'validator'; -import BaseModel, { XcFilter, XcFilterWithAlias } from '../BaseModel'; +import type { XcFilter, XcFilterWithAlias } from '../BaseModel'; +import BaseModel from '../BaseModel'; import formulaQueryBuilder from './formulaQueryBuilderFromString'; import genRollupSelect from './genRollupSelect'; import Papaparse from 'papaparse'; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts index ac0decba89..726a5e1af3 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts @@ -2,14 +2,14 @@ import autoBind from 'auto-bind'; import _ from 'lodash'; import Model from '../../../../models/Model'; -import SelectOption from '../../../../models/SelectOption'; -import { XKnex } from '../../index'; -import LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; -import RollupColumn from '../../../../models/RollupColumn'; -import LookupColumn from '../../../../models/LookupColumn'; +import type SelectOption from '../../../../models/SelectOption'; +import type { XKnex } from '../../index'; +import type LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; +import type RollupColumn from '../../../../models/RollupColumn'; +import type LookupColumn from '../../../../models/LookupColumn'; import DataLoader from 'dataloader'; import Column from '../../../../models/Column'; -import { XcFilter, XcFilterWithAlias } from '../BaseModel'; +import type { XcFilter, XcFilterWithAlias } from '../BaseModel'; import conditionV2 from './conditionV2'; import Filter, { COMPARISON_OPS, @@ -18,17 +18,17 @@ import Filter, { } from '../../../../models/Filter'; import sortV2 from './sortV2'; import Sort from '../../../../models/Sort'; -import FormulaColumn from '../../../../models/FormulaColumn'; +import type FormulaColumn from '../../../../models/FormulaColumn'; import genRollupSelectv2 from './genRollupSelectv2'; import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import View from '../../../../models/View'; +import type { SortType } from 'nocodb-sdk'; import { AuditOperationSubTypes, AuditOperationTypes, isVirtualCol, RelationTypes, - SortType, UITypes, ViewTypes, } from 'nocodb-sdk'; @@ -48,8 +48,8 @@ import { NcError } from '../../../../meta/helpers/catchError'; import { customAlphabet } from 'nanoid'; import DOMPurify from 'isomorphic-dompurify'; import { sanitize, unsanitize } from './helpers/sanitize'; -import QrCodeColumn from '../../../../models/QrCodeColumn'; -import BarcodeColumn from '../../../../models/BarcodeColumn'; +import type QrCodeColumn from '../../../../models/QrCodeColumn'; +import type BarcodeColumn from '../../../../models/BarcodeColumn'; const GROUP_COL = '__nc_group_id'; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/CustomKnex.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/CustomKnex.ts index e12dd700e6..614419656f 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/CustomKnex.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/CustomKnex.ts @@ -1,12 +1,12 @@ import { Knex, knex } from 'knex'; import { SnowflakeClient } from 'nc-help'; -import { FilterType } from 'nocodb-sdk'; +import type { FilterType } from 'nocodb-sdk'; const types = require('pg').types; // override parsing date column to Date() types.setTypeParser(1082, (val) => val); -import { BaseModelSql } from './BaseModelSql'; +import type { BaseModelSql } from './BaseModelSql'; import Filter from '../../../../models/Filter'; const opMappingGen = { diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts index 27ed28bf85..066de538c4 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts @@ -1,13 +1,13 @@ import jsep from 'jsep'; import mapFunctionName from '../mapFunctionName'; -import Model from '../../../../../models/Model'; -import Column from '../../../../../models/Column'; +import type Model from '../../../../../models/Model'; +import type Column from '../../../../../models/Column'; import genRollupSelectv2 from '../genRollupSelectv2'; -import RollupColumn from '../../../../../models/RollupColumn'; +import type RollupColumn from '../../../../../models/RollupColumn'; import FormulaColumn from '../../../../../models/FormulaColumn'; -import { XKnex } from '../../../index'; -import LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn'; -import LookupColumn from '../../../../../models/LookupColumn'; +import type { XKnex } from '../../../index'; +import type LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn'; +import type LookupColumn from '../../../../../models/LookupColumn'; import { jsepCurlyHook, UITypes } from 'nocodb-sdk'; import { validateDateWithUnknownFormat } from '../helpers/formulaFnHelper'; import { CacheGetType, CacheScope } from '../../../../../utils/globals'; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/commonFns.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/commonFns.ts index d1109ec28b..2b65d2cace 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/commonFns.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/commonFns.ts @@ -1,4 +1,4 @@ -import { MapFnArgs } from '../mapFunctionName'; +import type { MapFnArgs } from '../mapFunctionName'; export default { // todo: handle default case diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts index 58068e6c79..cadf9ed7a3 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts @@ -1,5 +1,5 @@ import dayjs from 'dayjs'; -import { MapFnArgs } from '../mapFunctionName'; +import type { MapFnArgs } from '../mapFunctionName'; import commonFns from './commonFns'; import { convertUnits } from '../helpers/convertUnits'; import { getWeekdayByText } from '../helpers/formulaFnHelper'; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts index 2512437c17..dab07ca6cc 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts @@ -1,5 +1,5 @@ import dayjs from 'dayjs'; -import { MapFnArgs } from '../mapFunctionName'; +import type { MapFnArgs } from '../mapFunctionName'; import commonFns from './commonFns'; import { convertUnits } from '../helpers/convertUnits'; import { getWeekdayByText } from '../helpers/formulaFnHelper'; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts index acf101a4aa..d422d4f81a 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts @@ -1,5 +1,5 @@ import dayjs from 'dayjs'; -import { MapFnArgs } from '../mapFunctionName'; +import type { MapFnArgs } from '../mapFunctionName'; import commonFns from './commonFns'; import { convertUnits } from '../helpers/convertUnits'; import { getWeekdayByText } from '../helpers/formulaFnHelper'; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts index 0c08dd3fa5..2375693b82 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts @@ -1,5 +1,5 @@ import dayjs from 'dayjs'; -import { MapFnArgs } from '../mapFunctionName'; +import type { MapFnArgs } from '../mapFunctionName'; import commonFns from './commonFns'; import { convertUnits } from '../helpers/convertUnits'; import { getWeekdayByText } from '../helpers/formulaFnHelper'; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelect.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelect.ts index fe81fde763..8483cc5ec6 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelect.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelect.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { RelationTypes } from 'nocodb-sdk'; export default function ({ diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelectv2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelectv2.ts index d5631ee3cb..47c9fa8bda 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelectv2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelectv2.ts @@ -1,7 +1,7 @@ -import RollupColumn from '../../../../models/RollupColumn'; -import { XKnex } from '../../index'; -import LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; -import { Knex } from 'knex'; +import type RollupColumn from '../../../../models/RollupColumn'; +import type { XKnex } from '../../index'; +import type LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; +import type { Knex } from 'knex'; import { RelationTypes } from 'nocodb-sdk'; export default async function ({ diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts index 8b8c3def97..9e361e74e4 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts @@ -1,7 +1,7 @@ import View from '../../../../../models/View'; import { isSystemColumn, UITypes } from 'nocodb-sdk'; -import Model from '../../../../../models/Model'; -import LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn'; +import type Model from '../../../../../models/Model'; +import type LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn'; const getAst = async ({ query, diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/mapFunctionName.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/mapFunctionName.ts index 8227e273ec..600457883f 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/mapFunctionName.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/mapFunctionName.ts @@ -1,9 +1,9 @@ -import { XKnex } from '../../index'; +import type { XKnex } from '../../index'; import mssql from './functionMappings/mssql'; import mysql from './functionMappings/mysql'; import pg from './functionMappings/pg'; import sqlite from './functionMappings/sqlite'; -import { Knex } from 'knex'; +import type { Knex } from 'knex'; export interface MapFnArgs { pt: any; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts index 9baac9bfd7..2babee6821 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts @@ -1,12 +1,12 @@ -import { Knex } from 'knex'; -import { XKnex } from '../../index'; +import type { Knex } from 'knex'; +import type { XKnex } from '../../index'; import Sort from '../../../../models/Sort'; -import LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; +import type LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; import genRollupSelectv2 from './genRollupSelectv2'; -import RollupColumn from '../../../../models/RollupColumn'; -import LookupColumn from '../../../../models/LookupColumn'; +import type RollupColumn from '../../../../models/RollupColumn'; +import type LookupColumn from '../../../../models/LookupColumn'; import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; -import FormulaColumn from '../../../../models/FormulaColumn'; +import type FormulaColumn from '../../../../models/FormulaColumn'; import { RelationTypes, UITypes } from 'nocodb-sdk'; import { sanitize } from './helpers/sanitize'; diff --git a/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaFactory.ts b/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaFactory.ts index 996a74beed..8bd08d14a5 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaFactory.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaFactory.ts @@ -1,4 +1,4 @@ -import BaseModelXcMeta from './BaseModelXcMeta'; +import type BaseModelXcMeta from './BaseModelXcMeta'; import ModelXcMetaMssql from './ModelXcMetaMssql'; import ModelXcMetaMysql from './ModelXcMetaMysql'; import ModelXcMetaOracle from './ModelXcMetaOracle'; diff --git a/packages/nocodb/src/lib/db/sql-mgr/code/policies/xc/ExpressXcPolicy.ts b/packages/nocodb/src/lib/db/sql-mgr/code/policies/xc/ExpressXcPolicy.ts index 9dd616cdf0..ed0f1cce7b 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/code/policies/xc/ExpressXcPolicy.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/code/policies/xc/ExpressXcPolicy.ts @@ -1,6 +1,6 @@ import lodash from 'lodash'; -import { Acl } from '../../../../../../interface/config'; +import type { Acl } from '../../../../../../interface/config'; import BaseRender from '../../BaseRender'; class ExpressXcMiddleware extends BaseRender { diff --git a/packages/nocodb/src/lib/db/sql-mgr/v2/ProjectMgrv2.ts b/packages/nocodb/src/lib/db/sql-mgr/v2/ProjectMgrv2.ts index 0662014e37..1574f2f78e 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/v2/ProjectMgrv2.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/v2/ProjectMgrv2.ts @@ -1,7 +1,7 @@ import SqlMgrv2 from './SqlMgrv2'; import SqlMgrv2Trans from './SqlMgrv2Trans'; -import NcMetaIO from '../../../meta/NcMetaIO'; -import Base from '../../../models/Base'; +import type NcMetaIO from '../../../meta/NcMetaIO'; +import type Base from '../../../models/Base'; export default class ProjectMgrv2 { private static sqlMgrMap: { diff --git a/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2.ts b/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2.ts index 8c7d189461..7ab8be7472 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2.ts @@ -4,7 +4,7 @@ import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import SqlClientFactory from '../../sql-client/lib/SqlClientFactory'; import KnexMigratorv2 from '../../sql-migrator/lib/KnexMigratorv2'; -import Base from '../../../models/Base'; +import type Base from '../../../models/Base'; import Debug from '../../util/Debug'; const log = new Debug('SqlMgr'); diff --git a/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2Trans.ts b/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2Trans.ts index bbb9210a48..c515e4d73d 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2Trans.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2Trans.ts @@ -1,9 +1,9 @@ import SqlMgrv2 from './SqlMgrv2'; -import Base from '../../../models/Base'; +import type Base from '../../../models/Base'; import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; -import { Knex } from 'knex'; -import { XKnex } from '../../sql-data-mapper'; -import NcMetaIO from '../../../meta/NcMetaIO'; +import type { Knex } from 'knex'; +import type { XKnex } from '../../sql-data-mapper'; +import type NcMetaIO from '../../../meta/NcMetaIO'; import KnexMigratorv2Tans from '../../sql-migrator/lib/KnexMigratorv2Tans'; export default class SqlMgrv2Trans extends SqlMgrv2 { diff --git a/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2.ts b/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2.ts index 3068907c42..c71ea172e3 100644 --- a/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2.ts +++ b/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import path from 'path'; import { promisify } from 'util'; -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import glob from 'glob'; import SqlClientFactory from '../../sql-client/lib/SqlClientFactory'; @@ -14,9 +14,9 @@ import * as fileHelp from '../../util/file.help'; // import SqlMigrator from './SqlMigrator'; // import NcConfigFactory from '../../../utils/NcConfigFactory'; import Noco from '../../../Noco'; -import { XKnex } from '../../sql-data-mapper'; +import type { XKnex } from '../../sql-data-mapper'; import Project from '../../../models/Project'; -import Base from '../../../models/Base'; +import type Base from '../../../models/Base'; import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import Result from '../../util/Result'; diff --git a/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2Tans.ts b/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2Tans.ts index 87204964a0..e459b56533 100644 --- a/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2Tans.ts +++ b/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2Tans.ts @@ -5,11 +5,11 @@ * @extends {SqlMigrator} */ import KnexMigratorv2 from './KnexMigratorv2'; -import Base from '../../../models/Base'; +import type Base from '../../../models/Base'; import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import Noco from '../../../Noco'; -import { XKnex } from '../../sql-data-mapper'; -import NcMetaIO from '../../../meta/NcMetaIO'; +import type { XKnex } from '../../sql-data-mapper'; +import type NcMetaIO from '../../../meta/NcMetaIO'; import type MssqlClient from '../../sql-client/lib/mssql/MssqlClient'; import type MysqlClient from '../../sql-client/lib/mysql/MysqlClient'; diff --git a/packages/nocodb/src/lib/jobs/NocoJobs.ts b/packages/nocodb/src/lib/jobs/NocoJobs.ts index dd19d5c1f9..f2ea8d1448 100644 --- a/packages/nocodb/src/lib/jobs/NocoJobs.ts +++ b/packages/nocodb/src/lib/jobs/NocoJobs.ts @@ -1,4 +1,4 @@ -import JobsMgr from './JobsMgr'; +import type JobsMgr from './JobsMgr'; import EmitteryJobsMgr from './EmitteryJobsMgr'; import RedisJobsMgr from './RedisJobsMgr'; diff --git a/packages/nocodb/src/lib/meta/MetaAPILogger.ts b/packages/nocodb/src/lib/meta/MetaAPILogger.ts index 88aac02eec..aea64ca26a 100644 --- a/packages/nocodb/src/lib/meta/MetaAPILogger.ts +++ b/packages/nocodb/src/lib/meta/MetaAPILogger.ts @@ -1,5 +1,5 @@ import { XKnex } from '../db/sql-data-mapper'; -import { Request } from 'express'; +import type { Request } from 'express'; export default class MetaAPILogger { static _instance: MetaAPILogger; diff --git a/packages/nocodb/src/lib/meta/NcMetaIO.ts b/packages/nocodb/src/lib/meta/NcMetaIO.ts index 305e2b0132..356b5207c4 100644 --- a/packages/nocodb/src/lib/meta/NcMetaIO.ts +++ b/packages/nocodb/src/lib/meta/NcMetaIO.ts @@ -1,6 +1,6 @@ -import { NcConfig } from '../../interface/config'; -import Noco from '../Noco'; -import { XKnex } from '../db/sql-data-mapper'; +import type { NcConfig } from '../../interface/config'; +import type Noco from '../Noco'; +import type { XKnex } from '../db/sql-data-mapper'; const META_TABLES = { graphql: [ diff --git a/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts b/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts index a22dc63c16..e9b55290f7 100644 --- a/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts +++ b/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts @@ -1,9 +1,10 @@ import CryptoJS from 'crypto-js'; import { customAlphabet } from 'nanoid'; -import { NcConfig } from '../../interface/config'; -import { Knex, XKnex } from '../db/sql-data-mapper'; -import Noco from '../Noco'; +import type { NcConfig } from '../../interface/config'; +import type { Knex } from '../db/sql-data-mapper'; +import { XKnex } from '../db/sql-data-mapper'; +import type Noco from '../Noco'; import XcMigrationSource from '../migrations/XcMigrationSource'; import NcMetaIO, { META_TABLES } from './NcMetaIO'; diff --git a/packages/nocodb/src/lib/meta/NcMetaMgr.ts b/packages/nocodb/src/lib/meta/NcMetaMgr.ts index da98f2c5e9..d936cbecb8 100644 --- a/packages/nocodb/src/lib/meta/NcMetaMgr.ts +++ b/packages/nocodb/src/lib/meta/NcMetaMgr.ts @@ -6,7 +6,9 @@ import path from 'path'; import archiver from 'archiver'; import axios from 'axios'; import bodyParser from 'body-parser'; -import express, { Handler, Router } from 'express'; +import type { Handler } from 'express'; +import type express from 'express'; +import { Router } from 'express'; import extract from 'extract-zip'; import isDocker from 'is-docker'; import multer from 'multer'; @@ -15,9 +17,10 @@ import slash from 'slash'; import { v4 as uuidv4 } from 'uuid'; import { ncp } from 'ncp'; -import IEmailAdapter from '../../interface/IEmailAdapter'; -import IStorageAdapter from '../../interface/IStorageAdapter'; -import { NcConfig, Result } from '../../interface/config'; +import type IEmailAdapter from '../../interface/IEmailAdapter'; +import type IStorageAdapter from '../../interface/IStorageAdapter'; +import type { NcConfig } from '../../interface/config'; +import { Result } from '../../interface/config'; import SqlClientFactory from '../db/sql-client/lib/SqlClientFactory'; import { NcConfigFactory } from '../index'; import ProjectMgr from '../db/sql-mgr/ProjectMgr'; @@ -28,13 +31,14 @@ import NcHelp from '../utils/NcHelp'; import mimetypes, { mimeIcons } from '../utils/mimeTypes'; import { packageVersion } from '../utils/packageVersion'; import projectAcl from '../utils/projectAcl'; -import Noco from '../Noco'; -import { GqlApiBuilder } from '../v1-legacy/gql/GqlApiBuilder'; +import type Noco from '../Noco'; +import type { GqlApiBuilder } from '../v1-legacy/gql/GqlApiBuilder'; import NcPluginMgr from '../v1-legacy/plugins/NcPluginMgr'; import XcCache from '../v1-legacy/plugins/adapters/cache/XcCache'; -import { RestApiBuilder } from '../v1-legacy/rest/RestApiBuilder'; +import type { RestApiBuilder } from '../v1-legacy/rest/RestApiBuilder'; import RestAuthCtrl from '../v1-legacy/rest/RestAuthCtrlEE'; -import NcMetaIO, { META_TABLES } from './NcMetaIO'; +import type NcMetaIO from './NcMetaIO'; +import { META_TABLES } from './NcMetaIO'; import { promisify } from 'util'; import NcTemplateParser from '../v1-legacy/templates/NcTemplateParser'; import { defaultConnectionConfig } from '../utils/NcConfigFactory'; diff --git a/packages/nocodb/src/lib/meta/NcMetaMgrv2.ts b/packages/nocodb/src/lib/meta/NcMetaMgrv2.ts index 596249036f..bd831e8833 100644 --- a/packages/nocodb/src/lib/meta/NcMetaMgrv2.ts +++ b/packages/nocodb/src/lib/meta/NcMetaMgrv2.ts @@ -1,14 +1,15 @@ import bodyParser from 'body-parser'; -import { Handler, Router } from 'express'; +import type { Handler } from 'express'; +import { Router } from 'express'; import multer from 'multer'; -import { NcConfig } from '../../interface/config'; +import type { NcConfig } from '../../interface/config'; import ProjectMgr from '../db/sql-mgr/ProjectMgr'; import { packageVersion } from '../utils/packageVersion'; import projectAcl from '../utils/projectAcl'; -import Noco from '../Noco'; +import type Noco from '../Noco'; import NcPluginMgr from '../v1-legacy/plugins/NcPluginMgr'; -import NcMetaIO from './NcMetaIO'; +import type NcMetaIO from './NcMetaIO'; import { defaultConnectionConfig } from '../utils/NcConfigFactory'; import ncCreateLookup from './handlersv2/ncCreateLookup'; import { NC_ATTACHMENT_FIELD_SIZE } from '../constants'; diff --git a/packages/nocodb/src/lib/meta/api/helpers/apiHelpers.ts b/packages/nocodb/src/lib/meta/api/helpers/apiHelpers.ts index ec3fdfcf9b..b67bcc03f9 100644 --- a/packages/nocodb/src/lib/meta/api/helpers/apiHelpers.ts +++ b/packages/nocodb/src/lib/meta/api/helpers/apiHelpers.ts @@ -1,5 +1,6 @@ -import { NextFunction, Request, Response } from 'express'; -import Ajv, { ErrorObject } from 'ajv'; +import type { NextFunction, Request, Response } from 'express'; +import type { ErrorObject } from 'ajv'; +import Ajv from 'ajv'; import addFormats from 'ajv-formats'; // @ts-ignore import swagger from '../../../../schema/swagger.json'; diff --git a/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts b/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts index 6c73c3dec9..7304920a14 100644 --- a/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts +++ b/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts @@ -1,5 +1,5 @@ import { customAlphabet } from 'nanoid'; -import { +import type { BoolType, ColumnReqType, LinkToAnotherRecordType, @@ -7,12 +7,12 @@ import { RelationTypes, RollupColumnReqType, TableType, - UITypes, } from 'nocodb-sdk'; +import { UITypes } from 'nocodb-sdk'; import Column from '../../../models/Column'; -import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; -import LookupColumn from '../../../models/LookupColumn'; -import Model from '../../../models/Model'; +import type LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; +import type LookupColumn from '../../../models/LookupColumn'; +import type Model from '../../../models/Model'; import { getUniqueColumnAliasName } from '../../helpers/getUniqueName'; import validateParams from '../../helpers/validateParams'; diff --git a/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts b/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts index 41f2e995c6..f601f73546 100644 --- a/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts +++ b/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts @@ -1,14 +1,14 @@ -import Project from '../../../models/Project'; +import type Project from '../../../models/Project'; import Column from '../../../models/Column'; import Model from '../../../models/Model'; import NcHelp from '../../../utils/NcHelp'; -import Base from '../../../models/Base'; +import type Base from '../../../models/Base'; import View from '../../../models/View'; import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import getTableNameAlias, { getColumnNameAlias, } from '../../helpers/getTableName'; -import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; +import type LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; import getColumnUiType from '../../helpers/getColumnUiType'; import mapDefaultDisplayValue from '../../helpers/mapDefaultDisplayValue'; import { extractAndGenerateManyToManyRelations } from '../../../services/metaDiff.svc'; diff --git a/packages/nocodb/src/lib/meta/api/index.ts b/packages/nocodb/src/lib/meta/api/index.ts index 33996709e2..5982aaf0bc 100644 --- a/packages/nocodb/src/lib/meta/api/index.ts +++ b/packages/nocodb/src/lib/meta/api/index.ts @@ -6,7 +6,7 @@ import projectController from '../../controllers/project.ctl'; import baseController from '../../controllers/base.ctl'; import tableController from '../../controllers/table.ctl'; import columnController from '../../controllers/column.ctl'; -import { Router } from 'express'; +import type { Router } from 'express'; import sortController from '../../controllers/sort.ctl'; import filterController from '../../controllers/filter.ctl'; import viewColumnController from '../../controllers/viewColumn.ctl'; @@ -47,7 +47,8 @@ import { publicDataExportController, publicMetaController, } from '../../controllers/publicControllers'; -import { Server, Socket } from 'socket.io'; +import type { Socket } from 'socket.io'; +import { Server } from 'socket.io'; import passport from 'passport'; import crypto from 'crypto'; diff --git a/packages/nocodb/src/lib/meta/handlers/xcMetaDiff.ts b/packages/nocodb/src/lib/meta/handlers/xcMetaDiff.ts index abd443451c..4dd1a65211 100644 --- a/packages/nocodb/src/lib/meta/handlers/xcMetaDiff.ts +++ b/packages/nocodb/src/lib/meta/handlers/xcMetaDiff.ts @@ -1,4 +1,4 @@ -import NcMetaMgr from '../NcMetaMgr'; +import type NcMetaMgr from '../NcMetaMgr'; enum XcMetaDiffType { TABLE_NEW = 'TABLE_NEW', diff --git a/packages/nocodb/src/lib/meta/handlersv2/ncCreateLookup.ts b/packages/nocodb/src/lib/meta/handlersv2/ncCreateLookup.ts index 5bfc7954f8..0b55f8fb92 100644 --- a/packages/nocodb/src/lib/meta/handlersv2/ncCreateLookup.ts +++ b/packages/nocodb/src/lib/meta/handlersv2/ncCreateLookup.ts @@ -1,4 +1,4 @@ -import { NcContextV2 } from '../NcMetaMgrv2'; +import type { NcContextV2 } from '../NcMetaMgrv2'; import Column from '../../models/Column'; import { UITypes } from 'nocodb-sdk'; diff --git a/packages/nocodb/src/lib/meta/handlersv2/ncGetMeta.ts b/packages/nocodb/src/lib/meta/handlersv2/ncGetMeta.ts index 27ec975e2c..7ac1ea4aa7 100644 --- a/packages/nocodb/src/lib/meta/handlersv2/ncGetMeta.ts +++ b/packages/nocodb/src/lib/meta/handlersv2/ncGetMeta.ts @@ -1,4 +1,4 @@ -import { NcContextV2 } from '../NcMetaMgrv2'; +import type { NcContextV2 } from '../NcMetaMgrv2'; import Model from '../../models/Model'; export default async function (this: NcContextV2, { args }: any) { diff --git a/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts b/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts index 8e224899a7..5c9981cf42 100644 --- a/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts +++ b/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts @@ -1,4 +1,4 @@ -import { +import type { IEmailAdapter, IStorageAdapterV2, IWebhookNotificationAdapter, diff --git a/packages/nocodb/src/lib/meta/helpers/PagedResponse.ts b/packages/nocodb/src/lib/meta/helpers/PagedResponse.ts index 777b4b4eb3..e335c10482 100644 --- a/packages/nocodb/src/lib/meta/helpers/PagedResponse.ts +++ b/packages/nocodb/src/lib/meta/helpers/PagedResponse.ts @@ -1,4 +1,4 @@ -import { PaginatedType } from 'nocodb-sdk'; +import type { PaginatedType } from 'nocodb-sdk'; const config: any = { limitDefault: Math.max(+process.env.DB_QUERY_LIMIT_DEFAULT || 25, 1), diff --git a/packages/nocodb/src/lib/meta/helpers/addFormulaErrorIfMissingColumn.ts b/packages/nocodb/src/lib/meta/helpers/addFormulaErrorIfMissingColumn.ts index bb32d6ea01..b3281888ec 100644 --- a/packages/nocodb/src/lib/meta/helpers/addFormulaErrorIfMissingColumn.ts +++ b/packages/nocodb/src/lib/meta/helpers/addFormulaErrorIfMissingColumn.ts @@ -1,4 +1,4 @@ -import FormulaColumn from '../../models/FormulaColumn'; +import type FormulaColumn from '../../models/FormulaColumn'; import jsep from 'jsep'; export default function addFormulaErrorIfMissingColumn({ diff --git a/packages/nocodb/src/lib/meta/helpers/apiMetrics.ts b/packages/nocodb/src/lib/meta/helpers/apiMetrics.ts index e276c99ef9..e1929e48d9 100644 --- a/packages/nocodb/src/lib/meta/helpers/apiMetrics.ts +++ b/packages/nocodb/src/lib/meta/helpers/apiMetrics.ts @@ -1,4 +1,4 @@ -import { Request } from 'express'; +import type { Request } from 'express'; import { T } from 'nc-help'; const countMap = {}; diff --git a/packages/nocodb/src/lib/meta/helpers/catchError.ts b/packages/nocodb/src/lib/meta/helpers/catchError.ts index 4c6da5d46d..b81b80295e 100644 --- a/packages/nocodb/src/lib/meta/helpers/catchError.ts +++ b/packages/nocodb/src/lib/meta/helpers/catchError.ts @@ -1,4 +1,4 @@ -import { ErrorObject } from 'ajv'; +import type { ErrorObject } from 'ajv'; enum DBError { TABLE_EXIST = 'TABLE_EXIST', diff --git a/packages/nocodb/src/lib/meta/helpers/getColumnPropsFromUIDT.ts b/packages/nocodb/src/lib/meta/helpers/getColumnPropsFromUIDT.ts index d1f0f40ce4..f3e19c939f 100644 --- a/packages/nocodb/src/lib/meta/helpers/getColumnPropsFromUIDT.ts +++ b/packages/nocodb/src/lib/meta/helpers/getColumnPropsFromUIDT.ts @@ -1,11 +1,7 @@ -import { - ColumnReqType, - NormalColumnRequestType, - SqlUiFactory, - UITypes, -} from 'nocodb-sdk'; -import Base from '../../models/Base'; -import Column from '../../models/Column'; +import type { ColumnReqType, NormalColumnRequestType } from 'nocodb-sdk'; +import { SqlUiFactory, UITypes } from 'nocodb-sdk'; +import type Base from '../../models/Base'; +import type Column from '../../models/Column'; export default async function getColumnPropsFromUIDT( column: ColumnReqType & { altered?: number }, diff --git a/packages/nocodb/src/lib/meta/helpers/getColumnUiType.ts b/packages/nocodb/src/lib/meta/helpers/getColumnUiType.ts index 444ec3df88..db6f304636 100644 --- a/packages/nocodb/src/lib/meta/helpers/getColumnUiType.ts +++ b/packages/nocodb/src/lib/meta/helpers/getColumnUiType.ts @@ -1,6 +1,6 @@ -import Base from '../../models/Base'; -import Column from '../../models/Column'; -import { ColumnType } from 'nocodb-sdk'; +import type Base from '../../models/Base'; +import type Column from '../../models/Column'; +import type { ColumnType } from 'nocodb-sdk'; import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; export default function getColumnUiType( diff --git a/packages/nocodb/src/lib/meta/helpers/getHandler.ts b/packages/nocodb/src/lib/meta/helpers/getHandler.ts index 07c57a08eb..861d92e01b 100644 --- a/packages/nocodb/src/lib/meta/helpers/getHandler.ts +++ b/packages/nocodb/src/lib/meta/helpers/getHandler.ts @@ -1,4 +1,4 @@ -import express from 'express'; +import type express from 'express'; import Noco from '../../Noco'; export default function getHandler( diff --git a/packages/nocodb/src/lib/meta/helpers/getTableName.ts b/packages/nocodb/src/lib/meta/helpers/getTableName.ts index 4dc49ba652..4aead0e117 100644 --- a/packages/nocodb/src/lib/meta/helpers/getTableName.ts +++ b/packages/nocodb/src/lib/meta/helpers/getTableName.ts @@ -1,5 +1,5 @@ import inflection from 'inflection'; -import Base from '../../models/Base'; +import type Base from '../../models/Base'; export default function getTableNameAlias( tableName: string, diff --git a/packages/nocodb/src/lib/meta/helpers/getUniqueName.ts b/packages/nocodb/src/lib/meta/helpers/getUniqueName.ts index 20b2a1850b..819c726ca7 100644 --- a/packages/nocodb/src/lib/meta/helpers/getUniqueName.ts +++ b/packages/nocodb/src/lib/meta/helpers/getUniqueName.ts @@ -1,4 +1,4 @@ -import Column from '../../models/Column'; +import type Column from '../../models/Column'; export function getUniqueColumnName(columns: Column[], initialName = 'field') { let c = 0; diff --git a/packages/nocodb/src/lib/meta/helpers/mapDefaultDisplayValue.ts b/packages/nocodb/src/lib/meta/helpers/mapDefaultDisplayValue.ts index a661f21818..db5652d97b 100644 --- a/packages/nocodb/src/lib/meta/helpers/mapDefaultDisplayValue.ts +++ b/packages/nocodb/src/lib/meta/helpers/mapDefaultDisplayValue.ts @@ -1,4 +1,4 @@ -import { ColumnType } from 'nocodb-sdk'; +import type { ColumnType } from 'nocodb-sdk'; export default function mapDefaultDisplayValue( columnsArr: Array diff --git a/packages/nocodb/src/lib/meta/helpers/ncMetaAclMw.ts b/packages/nocodb/src/lib/meta/helpers/ncMetaAclMw.ts index 4a9f1f961b..8d26137865 100644 --- a/packages/nocodb/src/lib/meta/helpers/ncMetaAclMw.ts +++ b/packages/nocodb/src/lib/meta/helpers/ncMetaAclMw.ts @@ -1,6 +1,6 @@ import { OrgUserRoles } from 'nocodb-sdk'; import projectAcl from '../../utils/projectAcl'; -import { NextFunction, Request, Response } from 'express'; +import type { NextFunction, Request, Response } from 'express'; import catchError, { NcError } from './catchError'; import extractProjectIdAndAuthenticate from './extractProjectIdAndAuthenticate'; diff --git a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts index bb542bf2d3..ca326d90e7 100644 --- a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts +++ b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts @@ -2,9 +2,9 @@ import View from '../../models/View'; import Column from '../../models/Column'; import { RelationTypes, UITypes } from 'nocodb-sdk'; import Model from '../../models/Model'; -import LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; -import LookupColumn from '../../models/LookupColumn'; -import SelectOption from '../../models/SelectOption'; +import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; +import type LookupColumn from '../../models/LookupColumn'; +import type SelectOption from '../../models/SelectOption'; export default async function populateSamplePayload( viewOrModel: View | Model, diff --git a/packages/nocodb/src/lib/meta/helpers/syncMigration.ts b/packages/nocodb/src/lib/meta/helpers/syncMigration.ts index d5895b72d7..2756db565a 100644 --- a/packages/nocodb/src/lib/meta/helpers/syncMigration.ts +++ b/packages/nocodb/src/lib/meta/helpers/syncMigration.ts @@ -1,6 +1,6 @@ import Migrator from '../../db/sql-migrator/lib/KnexMigratorv2'; -import Project from '../../models/Project'; -import Base from '../../models/Base'; +import type Project from '../../models/Project'; +import type Base from '../../models/Base'; export default async function syncMigration(project: Project): Promise { for (const base of await project.getBases()) { diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts index c4bb18807d..fae4ea50b8 100644 --- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts +++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts @@ -1,12 +1,12 @@ import Handlebars from 'handlebars'; -import Model from '../../models/Model'; +import type Model from '../../models/Model'; import NcPluginMgrv2 from './NcPluginMgrv2'; -import Column from '../../models/Column'; -import Hook from '../../models/Hook'; +import type Column from '../../models/Column'; +import type Hook from '../../models/Hook'; import Filter from '../../models/Filter'; import HookLog from '../../models/HookLog'; -import { HookLogType } from 'nocodb-sdk'; -import FormView from '../../models/FormView'; +import type { HookLogType } from 'nocodb-sdk'; +import type FormView from '../../models/FormView'; export function parseBody(template: string, data: any): string { if (!template) { diff --git a/packages/nocodb/src/lib/migrations/v1/nc_002_add_m2m.ts b/packages/nocodb/src/lib/migrations/v1/nc_002_add_m2m.ts index f000f4fe11..c3544866b4 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_002_add_m2m.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_002_add_m2m.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable('nc_models', (table) => { diff --git a/packages/nocodb/src/lib/migrations/v1/nc_003_add_fkn_column.ts b/packages/nocodb/src/lib/migrations/v1/nc_003_add_fkn_column.ts index 1795fe1928..c8d54a8a6c 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_003_add_fkn_column.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_003_add_fkn_column.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable('nc_relations', (table) => { diff --git a/packages/nocodb/src/lib/migrations/v1/nc_004_add_view_type_column.ts b/packages/nocodb/src/lib/migrations/v1/nc_004_add_view_type_column.ts index 380fb0ae23..2a9e1737cb 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_004_add_view_type_column.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_004_add_view_type_column.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable('nc_shared_views', (table) => { diff --git a/packages/nocodb/src/lib/migrations/v1/nc_005_add_view_name_column.ts b/packages/nocodb/src/lib/migrations/v1/nc_005_add_view_name_column.ts index 5bfe2f87b7..a3234f2f5d 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_005_add_view_name_column.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_005_add_view_name_column.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable('nc_shared_views', (table) => { diff --git a/packages/nocodb/src/lib/migrations/v1/nc_006_alter_nc_shared_views.ts b/packages/nocodb/src/lib/migrations/v1/nc_006_alter_nc_shared_views.ts index 5894fbc66b..51d923bad2 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_006_alter_nc_shared_views.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_006_alter_nc_shared_views.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable('nc_shared_views', (table) => { diff --git a/packages/nocodb/src/lib/migrations/v1/nc_007_alter_nc_shared_views_1.ts b/packages/nocodb/src/lib/migrations/v1/nc_007_alter_nc_shared_views_1.ts index c3d03bb928..94301edf20 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_007_alter_nc_shared_views_1.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_007_alter_nc_shared_views_1.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable('nc_shared_views', (table) => { diff --git a/packages/nocodb/src/lib/migrations/v1/nc_008_add_nc_shared_bases.ts b/packages/nocodb/src/lib/migrations/v1/nc_008_add_nc_shared_bases.ts index b8750fbc2b..fa0a896382 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_008_add_nc_shared_bases.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_008_add_nc_shared_bases.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.createTable('nc_shared_bases', (table) => { diff --git a/packages/nocodb/src/lib/migrations/v1/nc_009_add_model_order.ts b/packages/nocodb/src/lib/migrations/v1/nc_009_add_model_order.ts index ea1160d642..18fe104e8b 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_009_add_model_order.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_009_add_model_order.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable('nc_models', (table) => { diff --git a/packages/nocodb/src/lib/migrations/v1/nc_010_add_parent_title_column.ts b/packages/nocodb/src/lib/migrations/v1/nc_010_add_parent_title_column.ts index 152417d18b..b7e4495a85 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_010_add_parent_title_column.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_010_add_parent_title_column.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable('nc_disabled_models_for_role', (table) => { diff --git a/packages/nocodb/src/lib/migrations/v1/nc_011_remove_old_ses_plugin.ts b/packages/nocodb/src/lib/migrations/v1/nc_011_remove_old_ses_plugin.ts index c78d0374c5..3f7997b4c7 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_011_remove_old_ses_plugin.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_011_remove_old_ses_plugin.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import ses from '../../v1-legacy/plugins/ses'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_012_alter_column_data_types.ts b/packages/nocodb/src/lib/migrations/v2/nc_012_alter_column_data_types.ts index e6b49912b5..cc6a3650b2 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_012_alter_column_data_types.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_012_alter_column_data_types.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_013_sync_source.ts b/packages/nocodb/src/lib/migrations/v2/nc_013_sync_source.ts index 2110fe1ded..5aa7bda017 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_013_sync_source.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_013_sync_source.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_014_alter_column_data_types.ts b/packages/nocodb/src/lib/migrations/v2/nc_014_alter_column_data_types.ts index c8df7ef0d2..42acbb495f 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_014_alter_column_data_types.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_014_alter_column_data_types.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_015_add_meta_col_in_column_table.ts b/packages/nocodb/src/lib/migrations/v2/nc_015_add_meta_col_in_column_table.ts index 3dc79734d9..16a6fbc443 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_015_add_meta_col_in_column_table.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_015_add_meta_col_in_column_table.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_016_alter_hooklog_payload_types.ts b/packages/nocodb/src/lib/migrations/v2/nc_016_alter_hooklog_payload_types.ts index 877b5a985d..65dfab985f 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_016_alter_hooklog_payload_types.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_016_alter_hooklog_payload_types.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_017_add_user_token_version_column.ts b/packages/nocodb/src/lib/migrations/v2/nc_017_add_user_token_version_column.ts index f598acbb93..b687e251dc 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_017_add_user_token_version_column.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_017_add_user_token_version_column.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable('nc_users_v2', (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_018_add_meta_in_view.ts b/packages/nocodb/src/lib/migrations/v2/nc_018_add_meta_in_view.ts index 948d15b086..56bc42cac4 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_018_add_meta_in_view.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_018_add_meta_in_view.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_019_add_meta_in_meta_tables.ts b/packages/nocodb/src/lib/migrations/v2/nc_019_add_meta_in_meta_tables.ts index 554bf27ad5..f8f45d5abf 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_019_add_meta_in_meta_tables.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_019_add_meta_in_meta_tables.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_020_kanban_view.ts b/packages/nocodb/src/lib/migrations/v2/nc_020_kanban_view.ts index 88ed4a86d6..168fc43488 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_020_kanban_view.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_020_kanban_view.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_021_add_fields_in_token.ts b/packages/nocodb/src/lib/migrations/v2/nc_021_add_fields_in_token.ts index 9bb9c31176..81b36fb110 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_021_add_fields_in_token.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_021_add_fields_in_token.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_022_qr_code_column_type.ts b/packages/nocodb/src/lib/migrations/v2/nc_022_qr_code_column_type.ts index e205c29fa5..5d5b73d9d7 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_022_qr_code_column_type.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_022_qr_code_column_type.ts @@ -1,5 +1,5 @@ import { MetaTable } from '../../utils/globals'; -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.createTable(MetaTable.COL_QRCODE, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_023_multiple_source.ts b/packages/nocodb/src/lib/migrations/v2/nc_023_multiple_source.ts index 5ec99603f4..c99d213b70 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_023_multiple_source.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_023_multiple_source.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_024_barcode_column_type.ts b/packages/nocodb/src/lib/migrations/v2/nc_024_barcode_column_type.ts index 7ddbc78c91..3e9c99413b 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_024_barcode_column_type.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_024_barcode_column_type.ts @@ -1,5 +1,5 @@ import { MetaTable } from '../../utils/globals'; -import { Knex } from 'knex'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.createTable(MetaTable.COL_BARCODE, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_025_add_row_height.ts b/packages/nocodb/src/lib/migrations/v2/nc_025_add_row_height.ts index 712904edbf..387a53fa03 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_025_add_row_height.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_025_add_row_height.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_026_map_view.ts b/packages/nocodb/src/lib/migrations/v2/nc_026_map_view.ts index 4f8ccda374..c3c65beb61 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_026_map_view.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_026_map_view.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_027_add_comparison_sub_op.ts b/packages/nocodb/src/lib/migrations/v2/nc_027_add_comparison_sub_op.ts index 4e43488320..823668f15d 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_027_add_comparison_sub_op.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_027_add_comparison_sub_op.ts @@ -1,4 +1,4 @@ -import { Knex } from 'knex'; +import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; const up = async (knex: Knex) => { diff --git a/packages/nocodb/src/lib/models/Audit.ts b/packages/nocodb/src/lib/models/Audit.ts index 8421f27ed7..8f7b336ed1 100644 --- a/packages/nocodb/src/lib/models/Audit.ts +++ b/packages/nocodb/src/lib/models/Audit.ts @@ -1,4 +1,5 @@ -import { AuditOperationTypes, AuditType } from 'nocodb-sdk'; +import type { AuditType } from 'nocodb-sdk'; +import { AuditOperationTypes } from 'nocodb-sdk'; import { MetaTable } from '../utils/globals'; import Noco from '../Noco'; import Model from './Model'; diff --git a/packages/nocodb/src/lib/models/Base.ts b/packages/nocodb/src/lib/models/Base.ts index 3aaf43eb51..7e9a5590a6 100644 --- a/packages/nocodb/src/lib/models/Base.ts +++ b/packages/nocodb/src/lib/models/Base.ts @@ -7,7 +7,8 @@ import { MetaTable, } from '../utils/globals'; import Model from './Model'; -import { BaseType, BoolType, UITypes } from 'nocodb-sdk'; +import type { BaseType, BoolType } from 'nocodb-sdk'; +import { UITypes } from 'nocodb-sdk'; import NocoCache from '../cache/NocoCache'; import CryptoJS from 'crypto-js'; import { extractProps } from '../meta/helpers/extractProps'; diff --git a/packages/nocodb/src/lib/models/Column.ts b/packages/nocodb/src/lib/models/Column.ts index 154e0a4098..a4fc559cab 100644 --- a/packages/nocodb/src/lib/models/Column.ts +++ b/packages/nocodb/src/lib/models/Column.ts @@ -5,12 +5,8 @@ import RollupColumn from './RollupColumn'; import SelectOption from './SelectOption'; import Model from './Model'; import NocoCache from '../cache/NocoCache'; -import { - AllowedColumnTypesForQrAndBarcodes, - ColumnReqType, - ColumnType, - UITypes, -} from 'nocodb-sdk'; +import type { ColumnReqType, ColumnType } from 'nocodb-sdk'; +import { AllowedColumnTypesForQrAndBarcodes, UITypes } from 'nocodb-sdk'; import { CacheDelDirection, CacheGetType, diff --git a/packages/nocodb/src/lib/models/Filter.ts b/packages/nocodb/src/lib/models/Filter.ts index 0c64656c8b..8fd9d73945 100644 --- a/packages/nocodb/src/lib/models/Filter.ts +++ b/packages/nocodb/src/lib/models/Filter.ts @@ -9,7 +9,8 @@ import { MetaTable, } from '../utils/globals'; import View from './View'; -import { BoolType, FilterType, UITypes } from 'nocodb-sdk'; +import type { BoolType, FilterType } from 'nocodb-sdk'; +import { UITypes } from 'nocodb-sdk'; import NocoCache from '../cache/NocoCache'; import { NcError } from '../meta/helpers/catchError'; import { extractProps } from '../meta/helpers/extractProps'; diff --git a/packages/nocodb/src/lib/models/FormView.ts b/packages/nocodb/src/lib/models/FormView.ts index 9dbe572f88..9b82b99149 100644 --- a/packages/nocodb/src/lib/models/FormView.ts +++ b/packages/nocodb/src/lib/models/FormView.ts @@ -1,6 +1,6 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import { BoolType, FormType } from 'nocodb-sdk'; +import type { BoolType, FormType } from 'nocodb-sdk'; import { deserializeJSON, serializeJSON } from '../utils/serialize'; import FormViewColumn from './FormViewColumn'; import View from './View'; diff --git a/packages/nocodb/src/lib/models/FormViewColumn.ts b/packages/nocodb/src/lib/models/FormViewColumn.ts index 26f73f6dbe..b13841cd59 100644 --- a/packages/nocodb/src/lib/models/FormViewColumn.ts +++ b/packages/nocodb/src/lib/models/FormViewColumn.ts @@ -1,6 +1,6 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import { +import type { BoolType, FormColumnType, MetaType, diff --git a/packages/nocodb/src/lib/models/GalleryView.ts b/packages/nocodb/src/lib/models/GalleryView.ts index 8f530d2154..8a0bfc3509 100644 --- a/packages/nocodb/src/lib/models/GalleryView.ts +++ b/packages/nocodb/src/lib/models/GalleryView.ts @@ -1,6 +1,7 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import { BoolType, GalleryColumnType, GalleryType, UITypes } from 'nocodb-sdk'; +import type { BoolType, GalleryColumnType, GalleryType } from 'nocodb-sdk'; +import { UITypes } from 'nocodb-sdk'; import View from './View'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; diff --git a/packages/nocodb/src/lib/models/GalleryViewColumn.ts b/packages/nocodb/src/lib/models/GalleryViewColumn.ts index 4e0ae618bf..1ca49780bd 100644 --- a/packages/nocodb/src/lib/models/GalleryViewColumn.ts +++ b/packages/nocodb/src/lib/models/GalleryViewColumn.ts @@ -3,7 +3,7 @@ import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; import View from './View'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; -import { BoolType } from 'nocodb-sdk'; +import type { BoolType } from 'nocodb-sdk'; export default class GalleryViewColumn { id: string; diff --git a/packages/nocodb/src/lib/models/GridViewColumn.ts b/packages/nocodb/src/lib/models/GridViewColumn.ts index 2575f85355..7eef4a0afa 100644 --- a/packages/nocodb/src/lib/models/GridViewColumn.ts +++ b/packages/nocodb/src/lib/models/GridViewColumn.ts @@ -1,6 +1,6 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import { BoolType, GridColumnType } from 'nocodb-sdk'; +import type { BoolType, GridColumnType } from 'nocodb-sdk'; import { extractProps } from '../meta/helpers/extractProps'; import View from './View'; import NocoCache from '../cache/NocoCache'; diff --git a/packages/nocodb/src/lib/models/Hook.ts b/packages/nocodb/src/lib/models/Hook.ts index 065f3abe4d..b56c10d30f 100644 --- a/packages/nocodb/src/lib/models/Hook.ts +++ b/packages/nocodb/src/lib/models/Hook.ts @@ -1,4 +1,4 @@ -import { BoolType, HookReqType, HookType } from 'nocodb-sdk'; +import type { BoolType, HookReqType, HookType } from 'nocodb-sdk'; import { CacheDelDirection, CacheGetType, diff --git a/packages/nocodb/src/lib/models/HookFilter.ts b/packages/nocodb/src/lib/models/HookFilter.ts index b219ee9fcf..7a6b962104 100644 --- a/packages/nocodb/src/lib/models/HookFilter.ts +++ b/packages/nocodb/src/lib/models/HookFilter.ts @@ -8,7 +8,8 @@ import { MetaTable, } from '../utils/globals'; import View from './View'; -import { FilterType, UITypes } from 'nocodb-sdk'; +import type { FilterType } from 'nocodb-sdk'; +import { UITypes } from 'nocodb-sdk'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; diff --git a/packages/nocodb/src/lib/models/HookLog.ts b/packages/nocodb/src/lib/models/HookLog.ts index cd49df5358..a729878a56 100644 --- a/packages/nocodb/src/lib/models/HookLog.ts +++ b/packages/nocodb/src/lib/models/HookLog.ts @@ -2,7 +2,7 @@ import { MetaTable } from '../utils/globals'; import Noco from '../Noco'; import { extractProps } from '../meta/helpers/extractProps'; import Hook from './Hook'; -import { HookLogType } from 'nocodb-sdk'; +import type { HookLogType } from 'nocodb-sdk'; export default class HookLog implements HookLogType { id?: string; diff --git a/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts b/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts index 3a9056d9a7..59ec7a85e0 100644 --- a/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts +++ b/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts @@ -1,4 +1,4 @@ -import { BoolType } from 'nocodb-sdk'; +import type { BoolType } from 'nocodb-sdk'; import Noco from '../Noco'; import Column from './Column'; import Model from './Model'; diff --git a/packages/nocodb/src/lib/models/MapView.ts b/packages/nocodb/src/lib/models/MapView.ts index fe4d5f2547..283b68e15c 100644 --- a/packages/nocodb/src/lib/models/MapView.ts +++ b/packages/nocodb/src/lib/models/MapView.ts @@ -1,5 +1,5 @@ import Noco from '../Noco'; -import { MapType } from 'nocodb-sdk'; +import type { MapType } from 'nocodb-sdk'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; import View from './View'; import NocoCache from '../cache/NocoCache'; diff --git a/packages/nocodb/src/lib/models/MapViewColumn.ts b/packages/nocodb/src/lib/models/MapViewColumn.ts index bba9ddfaf4..c075107091 100644 --- a/packages/nocodb/src/lib/models/MapViewColumn.ts +++ b/packages/nocodb/src/lib/models/MapViewColumn.ts @@ -2,7 +2,7 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; import View from './View'; import NocoCache from '../cache/NocoCache'; -import { BoolType } from 'nocodb-sdk'; +import type { BoolType } from 'nocodb-sdk'; export default class MapViewColumn { id: string; diff --git a/packages/nocodb/src/lib/models/Model.ts b/packages/nocodb/src/lib/models/Model.ts index b90517b84c..4b09fa0952 100644 --- a/packages/nocodb/src/lib/models/Model.ts +++ b/packages/nocodb/src/lib/models/Model.ts @@ -2,17 +2,10 @@ import Noco from '../Noco'; import { parseMetaProp } from '../utils/modelUtils'; import Column from './Column'; import NocoCache from '../cache/NocoCache'; -import { XKnex } from '../db/sql-data-mapper'; +import type { XKnex } from '../db/sql-data-mapper'; import { BaseModelSqlv2 } from '../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; -import { - BoolType, - isVirtualCol, - ModelTypes, - TableReqType, - TableType, - UITypes, - ViewTypes, -} from 'nocodb-sdk'; +import type { BoolType, TableReqType, TableType } from 'nocodb-sdk'; +import { isVirtualCol, ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk'; import { CacheDelDirection, CacheGetType, diff --git a/packages/nocodb/src/lib/models/ModelRoleVisibility.ts b/packages/nocodb/src/lib/models/ModelRoleVisibility.ts index 74f6515315..c3fe6baaf2 100644 --- a/packages/nocodb/src/lib/models/ModelRoleVisibility.ts +++ b/packages/nocodb/src/lib/models/ModelRoleVisibility.ts @@ -1,4 +1,4 @@ -import { ModelRoleVisibilityType } from 'nocodb-sdk'; +import type { ModelRoleVisibilityType } from 'nocodb-sdk'; import Noco from '../Noco'; import { CacheDelDirection, diff --git a/packages/nocodb/src/lib/models/Plugin.ts b/packages/nocodb/src/lib/models/Plugin.ts index 711feb700e..4467a52aba 100644 --- a/packages/nocodb/src/lib/models/Plugin.ts +++ b/packages/nocodb/src/lib/models/Plugin.ts @@ -1,4 +1,4 @@ -import { PluginType } from 'nocodb-sdk'; +import type { PluginType } from 'nocodb-sdk'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; import Noco from '../Noco'; import NocoCache from '../cache/NocoCache'; diff --git a/packages/nocodb/src/lib/models/Project.ts b/packages/nocodb/src/lib/models/Project.ts index 7e0fb08217..7e746a13eb 100644 --- a/packages/nocodb/src/lib/models/Project.ts +++ b/packages/nocodb/src/lib/models/Project.ts @@ -1,6 +1,7 @@ -import Base, { DB_TYPES } from './/Base'; +import type { DB_TYPES } from './/Base'; +import Base from './/Base'; import Noco from '../Noco'; -import { BoolType, MetaType, ProjectType } from 'nocodb-sdk'; +import type { BoolType, MetaType, ProjectType } from 'nocodb-sdk'; import { CacheDelDirection, CacheGetType, diff --git a/packages/nocodb/src/lib/models/ProjectUser.ts b/packages/nocodb/src/lib/models/ProjectUser.ts index 14e208cb60..b21803f50d 100644 --- a/packages/nocodb/src/lib/models/ProjectUser.ts +++ b/packages/nocodb/src/lib/models/ProjectUser.ts @@ -1,4 +1,4 @@ -import { ProjectType } from 'nocodb-sdk'; +import type { ProjectType } from 'nocodb-sdk'; import { // CacheDelDirection, CacheGetType, diff --git a/packages/nocodb/src/lib/models/Sort.ts b/packages/nocodb/src/lib/models/Sort.ts index 1d90324f52..112b942a8e 100644 --- a/packages/nocodb/src/lib/models/Sort.ts +++ b/packages/nocodb/src/lib/models/Sort.ts @@ -8,7 +8,7 @@ import { MetaTable, } from '../utils/globals'; import NocoCache from '../cache/NocoCache'; -import { SortType } from 'nocodb-sdk'; +import type { SortType } from 'nocodb-sdk'; import { extractProps } from '../meta/helpers/extractProps'; export default class Sort { diff --git a/packages/nocodb/src/lib/models/Store.ts b/packages/nocodb/src/lib/models/Store.ts index 3fffcb122f..aa8d7befbe 100644 --- a/packages/nocodb/src/lib/models/Store.ts +++ b/packages/nocodb/src/lib/models/Store.ts @@ -2,7 +2,7 @@ import { NcError } from '../meta/helpers/catchError'; import { extractProps } from '../meta/helpers/extractProps'; import Noco from '../Noco'; import { MetaTable } from '../utils/globals'; -import { SortType } from 'nocodb-sdk'; +import type { SortType } from 'nocodb-sdk'; // Store is used for storing key value pairs export default class Store { diff --git a/packages/nocodb/src/lib/models/User.ts b/packages/nocodb/src/lib/models/User.ts index 1620b95c9b..86b900f61f 100644 --- a/packages/nocodb/src/lib/models/User.ts +++ b/packages/nocodb/src/lib/models/User.ts @@ -1,4 +1,4 @@ -import { UserType } from 'nocodb-sdk'; +import type { UserType } from 'nocodb-sdk'; import { NcError } from '../meta/helpers/catchError'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; import Noco from '../Noco'; diff --git a/packages/nocodb/src/lib/models/View.ts b/packages/nocodb/src/lib/models/View.ts index 7d3aef636a..fee31c6d21 100644 --- a/packages/nocodb/src/lib/models/View.ts +++ b/packages/nocodb/src/lib/models/View.ts @@ -14,14 +14,8 @@ import GalleryView from './GalleryView'; import GridViewColumn from './GridViewColumn'; import Sort from './Sort'; import Filter from './Filter'; -import { - BoolType, - ColumnReqType, - isSystemColumn, - UITypes, - ViewType, - ViewTypes, -} from 'nocodb-sdk'; +import type { BoolType, ColumnReqType, ViewType } from 'nocodb-sdk'; +import { isSystemColumn, UITypes, ViewTypes } from 'nocodb-sdk'; import GalleryViewColumn from './GalleryViewColumn'; import FormViewColumn from './FormViewColumn'; import KanbanViewColumn from './KanbanViewColumn'; diff --git a/packages/nocodb/src/lib/plugins/backblaze/Backblaze.ts b/packages/nocodb/src/lib/plugins/backblaze/Backblaze.ts index 861652573d..3b35019c96 100644 --- a/packages/nocodb/src/lib/plugins/backblaze/Backblaze.ts +++ b/packages/nocodb/src/lib/plugins/backblaze/Backblaze.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, diff --git a/packages/nocodb/src/lib/plugins/backblaze/BackblazePlugin.ts b/packages/nocodb/src/lib/plugins/backblaze/BackblazePlugin.ts index db114b7a10..021cd47294 100644 --- a/packages/nocodb/src/lib/plugins/backblaze/BackblazePlugin.ts +++ b/packages/nocodb/src/lib/plugins/backblaze/BackblazePlugin.ts @@ -1,4 +1,5 @@ -import { IStorageAdapterV2, XcStoragePlugin } from 'nc-plugin'; +import type { IStorageAdapterV2 } from 'nc-plugin'; +import { XcStoragePlugin } from 'nc-plugin'; import Backblaze from './Backblaze'; diff --git a/packages/nocodb/src/lib/plugins/backblaze/index.ts b/packages/nocodb/src/lib/plugins/backblaze/index.ts index cd952562b6..ea68414513 100644 --- a/packages/nocodb/src/lib/plugins/backblaze/index.ts +++ b/packages/nocodb/src/lib/plugins/backblaze/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import BackblazePlugin from './BackblazePlugin'; diff --git a/packages/nocodb/src/lib/plugins/discord/Discord.ts b/packages/nocodb/src/lib/plugins/discord/Discord.ts index 575b16b766..6bfbedd952 100644 --- a/packages/nocodb/src/lib/plugins/discord/Discord.ts +++ b/packages/nocodb/src/lib/plugins/discord/Discord.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import { IWebhookNotificationAdapter } from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; export default class Discord implements IWebhookNotificationAdapter { public init(): Promise { diff --git a/packages/nocodb/src/lib/plugins/discord/DiscordPlugin.ts b/packages/nocodb/src/lib/plugins/discord/DiscordPlugin.ts index d56bfe5f02..87d7c40c78 100644 --- a/packages/nocodb/src/lib/plugins/discord/DiscordPlugin.ts +++ b/packages/nocodb/src/lib/plugins/discord/DiscordPlugin.ts @@ -1,7 +1,5 @@ -import { - IWebhookNotificationAdapter, - XcWebhookNotificationPlugin, -} from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; +import { XcWebhookNotificationPlugin } from 'nc-plugin'; import Discord from './Discord'; diff --git a/packages/nocodb/src/lib/plugins/discord/index.ts b/packages/nocodb/src/lib/plugins/discord/index.ts index 473f833960..1007afbd0f 100644 --- a/packages/nocodb/src/lib/plugins/discord/index.ts +++ b/packages/nocodb/src/lib/plugins/discord/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import DiscordPlugin from './DiscordPlugin'; diff --git a/packages/nocodb/src/lib/plugins/gcs/Gcs.ts b/packages/nocodb/src/lib/plugins/gcs/Gcs.ts index dc122b58a9..f37d3cbf4a 100644 --- a/packages/nocodb/src/lib/plugins/gcs/Gcs.ts +++ b/packages/nocodb/src/lib/plugins/gcs/Gcs.ts @@ -1,7 +1,8 @@ import fs from 'fs'; import { promisify } from 'util'; -import { Storage, StorageOptions } from '@google-cloud/storage'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { StorageOptions } from '@google-cloud/storage'; +import { Storage } from '@google-cloud/storage'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, diff --git a/packages/nocodb/src/lib/plugins/gcs/GcsPlugin.ts b/packages/nocodb/src/lib/plugins/gcs/GcsPlugin.ts index e88fe45d7e..5a98b2cf69 100644 --- a/packages/nocodb/src/lib/plugins/gcs/GcsPlugin.ts +++ b/packages/nocodb/src/lib/plugins/gcs/GcsPlugin.ts @@ -1,4 +1,5 @@ -import { IStorageAdapterV2, XcStoragePlugin } from 'nc-plugin'; +import type { IStorageAdapterV2 } from 'nc-plugin'; +import { XcStoragePlugin } from 'nc-plugin'; import Gcs from './Gcs'; diff --git a/packages/nocodb/src/lib/plugins/gcs/index.ts b/packages/nocodb/src/lib/plugins/gcs/index.ts index 45285fa9a5..559f45b5b0 100644 --- a/packages/nocodb/src/lib/plugins/gcs/index.ts +++ b/packages/nocodb/src/lib/plugins/gcs/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import GcsPlugin from './GcsPlugin'; diff --git a/packages/nocodb/src/lib/plugins/linode/LinodeObjectStorage.ts b/packages/nocodb/src/lib/plugins/linode/LinodeObjectStorage.ts index 8df6a0f67f..f1cc13eccc 100644 --- a/packages/nocodb/src/lib/plugins/linode/LinodeObjectStorage.ts +++ b/packages/nocodb/src/lib/plugins/linode/LinodeObjectStorage.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, diff --git a/packages/nocodb/src/lib/plugins/linode/LinodeObjectStoragePlugin.ts b/packages/nocodb/src/lib/plugins/linode/LinodeObjectStoragePlugin.ts index fb4b750337..93e83521bf 100644 --- a/packages/nocodb/src/lib/plugins/linode/LinodeObjectStoragePlugin.ts +++ b/packages/nocodb/src/lib/plugins/linode/LinodeObjectStoragePlugin.ts @@ -1,4 +1,5 @@ -import { IStorageAdapterV2, XcStoragePlugin } from 'nc-plugin'; +import type { IStorageAdapterV2 } from 'nc-plugin'; +import { XcStoragePlugin } from 'nc-plugin'; import LinodeObjectStorage from './LinodeObjectStorage'; diff --git a/packages/nocodb/src/lib/plugins/linode/index.ts b/packages/nocodb/src/lib/plugins/linode/index.ts index 9a19adfa0b..c173844715 100644 --- a/packages/nocodb/src/lib/plugins/linode/index.ts +++ b/packages/nocodb/src/lib/plugins/linode/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import LinodeObjectStoragePlugin from './LinodeObjectStoragePlugin'; diff --git a/packages/nocodb/src/lib/plugins/mailerSend/MailerSend.ts b/packages/nocodb/src/lib/plugins/mailerSend/MailerSend.ts index b278e4ed6a..3247ba7c2c 100644 --- a/packages/nocodb/src/lib/plugins/mailerSend/MailerSend.ts +++ b/packages/nocodb/src/lib/plugins/mailerSend/MailerSend.ts @@ -1,7 +1,7 @@ -import { IEmailAdapter } from 'nc-plugin'; +import type { IEmailAdapter } from 'nc-plugin'; import MailerSend, { EmailParams, Recipient } from 'mailersend'; -import { XcEmail } from '../../../interface/IEmailAdapter'; +import type { XcEmail } from '../../../interface/IEmailAdapter'; export default class Mailer implements IEmailAdapter { private mailersend: MailerSend; diff --git a/packages/nocodb/src/lib/plugins/mailerSend/MailerSendPlugin.ts b/packages/nocodb/src/lib/plugins/mailerSend/MailerSendPlugin.ts index d7888d9a25..3513dca12e 100644 --- a/packages/nocodb/src/lib/plugins/mailerSend/MailerSendPlugin.ts +++ b/packages/nocodb/src/lib/plugins/mailerSend/MailerSendPlugin.ts @@ -1,4 +1,5 @@ -import { IEmailAdapter, XcEmailPlugin } from 'nc-plugin'; +import type { IEmailAdapter } from 'nc-plugin'; +import { XcEmailPlugin } from 'nc-plugin'; import MailerSend from './MailerSend'; diff --git a/packages/nocodb/src/lib/plugins/mailerSend/index.ts b/packages/nocodb/src/lib/plugins/mailerSend/index.ts index ffbd19c897..634697cd0b 100644 --- a/packages/nocodb/src/lib/plugins/mailerSend/index.ts +++ b/packages/nocodb/src/lib/plugins/mailerSend/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import MailerSendPlugin from './MailerSendPlugin'; diff --git a/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts b/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts index c27ecfe0e0..7be83b32c8 100644 --- a/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts +++ b/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import { IWebhookNotificationAdapter } from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; export default class Mattermost implements IWebhookNotificationAdapter { public init(): Promise { diff --git a/packages/nocodb/src/lib/plugins/mattermost/MattermostPlugin.ts b/packages/nocodb/src/lib/plugins/mattermost/MattermostPlugin.ts index 753fcadefc..2ca36cda42 100644 --- a/packages/nocodb/src/lib/plugins/mattermost/MattermostPlugin.ts +++ b/packages/nocodb/src/lib/plugins/mattermost/MattermostPlugin.ts @@ -1,7 +1,5 @@ -import { - IWebhookNotificationAdapter, - XcWebhookNotificationPlugin, -} from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; +import { XcWebhookNotificationPlugin } from 'nc-plugin'; import Mattermost from './Mattermost'; diff --git a/packages/nocodb/src/lib/plugins/mattermost/index.ts b/packages/nocodb/src/lib/plugins/mattermost/index.ts index 5a9a1cada8..fde545601d 100644 --- a/packages/nocodb/src/lib/plugins/mattermost/index.ts +++ b/packages/nocodb/src/lib/plugins/mattermost/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import MattermostPlugin from './MattermostPlugin'; diff --git a/packages/nocodb/src/lib/plugins/mino/Minio.ts b/packages/nocodb/src/lib/plugins/mino/Minio.ts index a6c83a5ce0..7a704b6e49 100644 --- a/packages/nocodb/src/lib/plugins/mino/Minio.ts +++ b/packages/nocodb/src/lib/plugins/mino/Minio.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import { promisify } from 'util'; import { Client as MinioClient } from 'minio'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, diff --git a/packages/nocodb/src/lib/plugins/mino/MinioPlugin.ts b/packages/nocodb/src/lib/plugins/mino/MinioPlugin.ts index d987757534..73b0fc9f38 100644 --- a/packages/nocodb/src/lib/plugins/mino/MinioPlugin.ts +++ b/packages/nocodb/src/lib/plugins/mino/MinioPlugin.ts @@ -1,4 +1,5 @@ -import { IStorageAdapterV2, XcStoragePlugin } from 'nc-plugin'; +import type { IStorageAdapterV2 } from 'nc-plugin'; +import { XcStoragePlugin } from 'nc-plugin'; import Minio from './Minio'; diff --git a/packages/nocodb/src/lib/plugins/mino/index.ts b/packages/nocodb/src/lib/plugins/mino/index.ts index 4db4064f4a..71a306a427 100644 --- a/packages/nocodb/src/lib/plugins/mino/index.ts +++ b/packages/nocodb/src/lib/plugins/mino/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import S3Plugin from './MinioPlugin'; diff --git a/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloud.ts b/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloud.ts index a5e72f62d4..f3a923e7d1 100644 --- a/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloud.ts +++ b/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloud.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, diff --git a/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloudPlugin.ts b/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloudPlugin.ts index ae25c2ad65..ce07900c35 100644 --- a/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloudPlugin.ts +++ b/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloudPlugin.ts @@ -1,4 +1,5 @@ -import { IStorageAdapterV2, XcStoragePlugin } from 'nc-plugin'; +import type { IStorageAdapterV2 } from 'nc-plugin'; +import { XcStoragePlugin } from 'nc-plugin'; import OvhCloud from './OvhCloud'; diff --git a/packages/nocodb/src/lib/plugins/ovhCloud/index.ts b/packages/nocodb/src/lib/plugins/ovhCloud/index.ts index f20f40e727..0b0398e5d6 100644 --- a/packages/nocodb/src/lib/plugins/ovhCloud/index.ts +++ b/packages/nocodb/src/lib/plugins/ovhCloud/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import OvhCloud from './OvhCloudPlugin'; diff --git a/packages/nocodb/src/lib/plugins/s3/S3.ts b/packages/nocodb/src/lib/plugins/s3/S3.ts index 35f8d8a432..c1f0acdd68 100644 --- a/packages/nocodb/src/lib/plugins/s3/S3.ts +++ b/packages/nocodb/src/lib/plugins/s3/S3.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, diff --git a/packages/nocodb/src/lib/plugins/s3/S3Plugin.ts b/packages/nocodb/src/lib/plugins/s3/S3Plugin.ts index 4db458139f..00b0e165ca 100644 --- a/packages/nocodb/src/lib/plugins/s3/S3Plugin.ts +++ b/packages/nocodb/src/lib/plugins/s3/S3Plugin.ts @@ -1,4 +1,5 @@ -import { IStorageAdapterV2, XcStoragePlugin } from 'nc-plugin'; +import type { IStorageAdapterV2 } from 'nc-plugin'; +import { XcStoragePlugin } from 'nc-plugin'; import S3 from './S3'; diff --git a/packages/nocodb/src/lib/plugins/s3/index.ts b/packages/nocodb/src/lib/plugins/s3/index.ts index 5ab7b0e356..27d8f9bb2e 100644 --- a/packages/nocodb/src/lib/plugins/s3/index.ts +++ b/packages/nocodb/src/lib/plugins/s3/index.ts @@ -1,5 +1,5 @@ import { PluginCategory, XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import S3Plugin from './S3Plugin'; diff --git a/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStorage.ts b/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStorage.ts index cd2aaa7890..3f61bb6a30 100644 --- a/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStorage.ts +++ b/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStorage.ts @@ -1,6 +1,6 @@ import fs from 'fs'; import { promisify } from 'util'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import AWS from 'aws-sdk'; import request from 'request'; import { diff --git a/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStoragePlugin.ts b/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStoragePlugin.ts index 7118c6a76c..ea16b70846 100644 --- a/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStoragePlugin.ts +++ b/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStoragePlugin.ts @@ -1,4 +1,5 @@ -import { IStorageAdapterV2, XcStoragePlugin } from 'nc-plugin'; +import type { IStorageAdapterV2 } from 'nc-plugin'; +import { XcStoragePlugin } from 'nc-plugin'; import ScalewayObjectStorage from './ScalewayObjectStorage'; diff --git a/packages/nocodb/src/lib/plugins/scaleway/index.ts b/packages/nocodb/src/lib/plugins/scaleway/index.ts index b5ef5e47db..e3f95fda62 100644 --- a/packages/nocodb/src/lib/plugins/scaleway/index.ts +++ b/packages/nocodb/src/lib/plugins/scaleway/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import ScalewayObjectStoragePlugin from './ScalewayObjectStoragePlugin'; const config: XcPluginConfig = { diff --git a/packages/nocodb/src/lib/plugins/ses/SES.ts b/packages/nocodb/src/lib/plugins/ses/SES.ts index 4299002d3f..de0fbc284a 100644 --- a/packages/nocodb/src/lib/plugins/ses/SES.ts +++ b/packages/nocodb/src/lib/plugins/ses/SES.ts @@ -1,8 +1,8 @@ -import { IEmailAdapter } from 'nc-plugin'; +import type { IEmailAdapter } from 'nc-plugin'; import nodemailer from 'nodemailer'; -import Mail from 'nodemailer/lib/mailer'; +import type Mail from 'nodemailer/lib/mailer'; import AWS from 'aws-sdk'; -import { XcEmail } from '../../../interface/IEmailAdapter'; +import type { XcEmail } from '../../../interface/IEmailAdapter'; export default class SES implements IEmailAdapter { private transporter: Mail; diff --git a/packages/nocodb/src/lib/plugins/ses/SESPlugin.ts b/packages/nocodb/src/lib/plugins/ses/SESPlugin.ts index ec7de8aaae..6868ada988 100644 --- a/packages/nocodb/src/lib/plugins/ses/SESPlugin.ts +++ b/packages/nocodb/src/lib/plugins/ses/SESPlugin.ts @@ -1,4 +1,5 @@ -import { IEmailAdapter, XcEmailPlugin } from 'nc-plugin'; +import type { IEmailAdapter } from 'nc-plugin'; +import { XcEmailPlugin } from 'nc-plugin'; import SES from './SES'; diff --git a/packages/nocodb/src/lib/plugins/ses/index.ts b/packages/nocodb/src/lib/plugins/ses/index.ts index 78246ed7d6..d94ecec8de 100644 --- a/packages/nocodb/src/lib/plugins/ses/index.ts +++ b/packages/nocodb/src/lib/plugins/ses/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import SESPlugin from './SESPlugin'; diff --git a/packages/nocodb/src/lib/plugins/slack/Slack.ts b/packages/nocodb/src/lib/plugins/slack/Slack.ts index 8cb0b66a4d..fbdaac6be4 100644 --- a/packages/nocodb/src/lib/plugins/slack/Slack.ts +++ b/packages/nocodb/src/lib/plugins/slack/Slack.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import { IWebhookNotificationAdapter } from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; export default class Slack implements IWebhookNotificationAdapter { public init(): Promise { diff --git a/packages/nocodb/src/lib/plugins/slack/SlackPlugin.ts b/packages/nocodb/src/lib/plugins/slack/SlackPlugin.ts index 7bc5eb6cde..90f087da72 100644 --- a/packages/nocodb/src/lib/plugins/slack/SlackPlugin.ts +++ b/packages/nocodb/src/lib/plugins/slack/SlackPlugin.ts @@ -1,7 +1,5 @@ -import { - IWebhookNotificationAdapter, - XcWebhookNotificationPlugin, -} from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; +import { XcWebhookNotificationPlugin } from 'nc-plugin'; import Slack from './Slack'; diff --git a/packages/nocodb/src/lib/plugins/slack/index.ts b/packages/nocodb/src/lib/plugins/slack/index.ts index bbfe760d74..1751e4efff 100644 --- a/packages/nocodb/src/lib/plugins/slack/index.ts +++ b/packages/nocodb/src/lib/plugins/slack/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import SlackPlugin from './SlackPlugin'; diff --git a/packages/nocodb/src/lib/plugins/smtp/SMTP.ts b/packages/nocodb/src/lib/plugins/smtp/SMTP.ts index 980a6b3222..7279b44f40 100644 --- a/packages/nocodb/src/lib/plugins/smtp/SMTP.ts +++ b/packages/nocodb/src/lib/plugins/smtp/SMTP.ts @@ -1,8 +1,8 @@ -import { IEmailAdapter } from 'nc-plugin'; +import type { IEmailAdapter } from 'nc-plugin'; import nodemailer from 'nodemailer'; -import Mail from 'nodemailer/lib/mailer'; +import type Mail from 'nodemailer/lib/mailer'; -import { XcEmail } from '../../../interface/IEmailAdapter'; +import type { XcEmail } from '../../../interface/IEmailAdapter'; export default class SMTP implements IEmailAdapter { private transporter: Mail; diff --git a/packages/nocodb/src/lib/plugins/smtp/SMTPPlugin.ts b/packages/nocodb/src/lib/plugins/smtp/SMTPPlugin.ts index ba837be9b3..7e729a4598 100644 --- a/packages/nocodb/src/lib/plugins/smtp/SMTPPlugin.ts +++ b/packages/nocodb/src/lib/plugins/smtp/SMTPPlugin.ts @@ -1,4 +1,5 @@ -import { IEmailAdapter, XcEmailPlugin } from 'nc-plugin'; +import type { IEmailAdapter } from 'nc-plugin'; +import { XcEmailPlugin } from 'nc-plugin'; import SMTP from './SMTP'; diff --git a/packages/nocodb/src/lib/plugins/smtp/index.ts b/packages/nocodb/src/lib/plugins/smtp/index.ts index 2f17f0ade6..d1c40ff1aa 100644 --- a/packages/nocodb/src/lib/plugins/smtp/index.ts +++ b/packages/nocodb/src/lib/plugins/smtp/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import SMTPPlugin from './SMTPPlugin'; diff --git a/packages/nocodb/src/lib/plugins/spaces/Spaces.ts b/packages/nocodb/src/lib/plugins/spaces/Spaces.ts index a3fe51cbe4..666cd94897 100644 --- a/packages/nocodb/src/lib/plugins/spaces/Spaces.ts +++ b/packages/nocodb/src/lib/plugins/spaces/Spaces.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, diff --git a/packages/nocodb/src/lib/plugins/spaces/SpacesPlugin.ts b/packages/nocodb/src/lib/plugins/spaces/SpacesPlugin.ts index f0f52e8b98..9f7bbf8ed4 100644 --- a/packages/nocodb/src/lib/plugins/spaces/SpacesPlugin.ts +++ b/packages/nocodb/src/lib/plugins/spaces/SpacesPlugin.ts @@ -1,4 +1,5 @@ -import { IStorageAdapterV2, XcStoragePlugin } from 'nc-plugin'; +import type { IStorageAdapterV2 } from 'nc-plugin'; +import { XcStoragePlugin } from 'nc-plugin'; import Spaces from './Spaces'; diff --git a/packages/nocodb/src/lib/plugins/spaces/index.ts b/packages/nocodb/src/lib/plugins/spaces/index.ts index e60ee264a4..b4dd977d6b 100644 --- a/packages/nocodb/src/lib/plugins/spaces/index.ts +++ b/packages/nocodb/src/lib/plugins/spaces/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import SpacesPlugin from './SpacesPlugin'; diff --git a/packages/nocodb/src/lib/plugins/teams/Teams.ts b/packages/nocodb/src/lib/plugins/teams/Teams.ts index 2d2c5050ff..13ca771d02 100644 --- a/packages/nocodb/src/lib/plugins/teams/Teams.ts +++ b/packages/nocodb/src/lib/plugins/teams/Teams.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import { IWebhookNotificationAdapter } from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; export default class Teams implements IWebhookNotificationAdapter { public init(): Promise { diff --git a/packages/nocodb/src/lib/plugins/teams/TeamsPlugin.ts b/packages/nocodb/src/lib/plugins/teams/TeamsPlugin.ts index 1f3aa06077..13f1f3a29f 100644 --- a/packages/nocodb/src/lib/plugins/teams/TeamsPlugin.ts +++ b/packages/nocodb/src/lib/plugins/teams/TeamsPlugin.ts @@ -1,7 +1,5 @@ -import { - IWebhookNotificationAdapter, - XcWebhookNotificationPlugin, -} from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; +import { XcWebhookNotificationPlugin } from 'nc-plugin'; import Teams from './Teams'; diff --git a/packages/nocodb/src/lib/plugins/teams/index.ts b/packages/nocodb/src/lib/plugins/teams/index.ts index 3788128b6c..14cce713b0 100644 --- a/packages/nocodb/src/lib/plugins/teams/index.ts +++ b/packages/nocodb/src/lib/plugins/teams/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import TeamsPlugin from './TeamsPlugin'; diff --git a/packages/nocodb/src/lib/plugins/twilio/Twilio.ts b/packages/nocodb/src/lib/plugins/twilio/Twilio.ts index 8104006541..e7a1ac4a77 100644 --- a/packages/nocodb/src/lib/plugins/twilio/Twilio.ts +++ b/packages/nocodb/src/lib/plugins/twilio/Twilio.ts @@ -1,4 +1,4 @@ -import { IWebhookNotificationAdapter } from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; import twilio from 'twilio'; export default class Twilio implements IWebhookNotificationAdapter { diff --git a/packages/nocodb/src/lib/plugins/twilio/TwilioPlugin.ts b/packages/nocodb/src/lib/plugins/twilio/TwilioPlugin.ts index 3816af37ea..a9b5a460e8 100644 --- a/packages/nocodb/src/lib/plugins/twilio/TwilioPlugin.ts +++ b/packages/nocodb/src/lib/plugins/twilio/TwilioPlugin.ts @@ -1,7 +1,5 @@ -import { - IWebhookNotificationAdapter, - XcWebhookNotificationPlugin, -} from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; +import { XcWebhookNotificationPlugin } from 'nc-plugin'; import Twilio from './Twilio'; diff --git a/packages/nocodb/src/lib/plugins/twilio/index.ts b/packages/nocodb/src/lib/plugins/twilio/index.ts index b58c528f5f..ebb699a62f 100644 --- a/packages/nocodb/src/lib/plugins/twilio/index.ts +++ b/packages/nocodb/src/lib/plugins/twilio/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import TwilioPlugin from './TwilioPlugin'; diff --git a/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts b/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts index cf662fc0bf..29dbb0d59e 100644 --- a/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts +++ b/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts @@ -1,4 +1,4 @@ -import { IWebhookNotificationAdapter } from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; import twilio from 'twilio'; export default class TwilioWhatsapp implements IWebhookNotificationAdapter { diff --git a/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsappPlugin.ts b/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsappPlugin.ts index 1e64dcc2fc..495b4fe42e 100644 --- a/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsappPlugin.ts +++ b/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsappPlugin.ts @@ -1,7 +1,5 @@ -import { - IWebhookNotificationAdapter, - XcWebhookNotificationPlugin, -} from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; +import { XcWebhookNotificationPlugin } from 'nc-plugin'; import TwilioWhatsapp from './TwilioWhatsapp'; diff --git a/packages/nocodb/src/lib/plugins/twilioWhatsapp/index.ts b/packages/nocodb/src/lib/plugins/twilioWhatsapp/index.ts index 34cf0e7be0..d771de41ce 100644 --- a/packages/nocodb/src/lib/plugins/twilioWhatsapp/index.ts +++ b/packages/nocodb/src/lib/plugins/twilioWhatsapp/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import TwilioWhatsappPlugin from './TwilioWhatsappPlugin'; diff --git a/packages/nocodb/src/lib/plugins/upcloud/UpCloudPlugin.ts b/packages/nocodb/src/lib/plugins/upcloud/UpCloudPlugin.ts index 15d60dd9f9..5ab0fd201b 100644 --- a/packages/nocodb/src/lib/plugins/upcloud/UpCloudPlugin.ts +++ b/packages/nocodb/src/lib/plugins/upcloud/UpCloudPlugin.ts @@ -1,4 +1,5 @@ -import { IStorageAdapterV2, XcStoragePlugin } from 'nc-plugin'; +import type { IStorageAdapterV2 } from 'nc-plugin'; +import { XcStoragePlugin } from 'nc-plugin'; import UpoCloud from './UpoCloud'; diff --git a/packages/nocodb/src/lib/plugins/upcloud/UpoCloud.ts b/packages/nocodb/src/lib/plugins/upcloud/UpoCloud.ts index bda2c8c62e..7f21a5323f 100644 --- a/packages/nocodb/src/lib/plugins/upcloud/UpoCloud.ts +++ b/packages/nocodb/src/lib/plugins/upcloud/UpoCloud.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, diff --git a/packages/nocodb/src/lib/plugins/upcloud/index.ts b/packages/nocodb/src/lib/plugins/upcloud/index.ts index f852c59648..6ba3b9074a 100644 --- a/packages/nocodb/src/lib/plugins/upcloud/index.ts +++ b/packages/nocodb/src/lib/plugins/upcloud/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import UpCloudPlugin from './UpCloudPlugin'; diff --git a/packages/nocodb/src/lib/plugins/vultr/Vultr.ts b/packages/nocodb/src/lib/plugins/vultr/Vultr.ts index bfccac7e89..76ac4f5dfd 100644 --- a/packages/nocodb/src/lib/plugins/vultr/Vultr.ts +++ b/packages/nocodb/src/lib/plugins/vultr/Vultr.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, diff --git a/packages/nocodb/src/lib/plugins/vultr/VultrPlugin.ts b/packages/nocodb/src/lib/plugins/vultr/VultrPlugin.ts index 39ec234074..1ce9512974 100644 --- a/packages/nocodb/src/lib/plugins/vultr/VultrPlugin.ts +++ b/packages/nocodb/src/lib/plugins/vultr/VultrPlugin.ts @@ -1,4 +1,5 @@ -import { IStorageAdapterV2, XcStoragePlugin } from 'nc-plugin'; +import type { IStorageAdapterV2 } from 'nc-plugin'; +import { XcStoragePlugin } from 'nc-plugin'; import Vultr from './Vultr'; diff --git a/packages/nocodb/src/lib/plugins/vultr/index.ts b/packages/nocodb/src/lib/plugins/vultr/index.ts index 1d8f638ab7..18cf26993f 100644 --- a/packages/nocodb/src/lib/plugins/vultr/index.ts +++ b/packages/nocodb/src/lib/plugins/vultr/index.ts @@ -1,5 +1,5 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import { XcPluginConfig } from 'nc-plugin'; +import type { XcPluginConfig } from 'nc-plugin'; import VultrPlugin from './VultrPlugin'; diff --git a/packages/nocodb/src/lib/services/apiDocs/getPaths.ts b/packages/nocodb/src/lib/services/apiDocs/getPaths.ts index 042ef515d6..c13d0ed544 100644 --- a/packages/nocodb/src/lib/services/apiDocs/getPaths.ts +++ b/packages/nocodb/src/lib/services/apiDocs/getPaths.ts @@ -1,9 +1,9 @@ import Noco from '../../Noco'; -import Model from '../../models/Model'; -import Project from '../../models/Project'; +import type Model from '../../models/Model'; +import type Project from '../../models/Project'; import { getModelPaths, getViewPaths } from './templates/paths'; -import { SwaggerColumn } from './getSwaggerColumnMetas'; -import { SwaggerView } from './getSwaggerJSON'; +import type { SwaggerColumn } from './getSwaggerColumnMetas'; +import type { SwaggerView } from './getSwaggerJSON'; export default async function getPaths( { diff --git a/packages/nocodb/src/lib/services/apiDocs/getSchemas.ts b/packages/nocodb/src/lib/services/apiDocs/getSchemas.ts index 5470c19fa9..620a1d91f8 100644 --- a/packages/nocodb/src/lib/services/apiDocs/getSchemas.ts +++ b/packages/nocodb/src/lib/services/apiDocs/getSchemas.ts @@ -1,9 +1,9 @@ import Noco from '../../Noco'; -import Model from '../../models/Model'; -import Project from '../../models/Project'; +import type Model from '../../models/Model'; +import type Project from '../../models/Project'; import { getModelSchemas, getViewSchemas } from './templates/schemas'; -import { SwaggerColumn } from './getSwaggerColumnMetas'; -import { SwaggerView } from './getSwaggerJSON'; +import type { SwaggerColumn } from './getSwaggerColumnMetas'; +import type { SwaggerView } from './getSwaggerJSON'; export default async function getSchemas( { diff --git a/packages/nocodb/src/lib/services/apiDocs/getSwaggerColumnMetas.ts b/packages/nocodb/src/lib/services/apiDocs/getSwaggerColumnMetas.ts index 45b76e4280..ac3e15370e 100644 --- a/packages/nocodb/src/lib/services/apiDocs/getSwaggerColumnMetas.ts +++ b/packages/nocodb/src/lib/services/apiDocs/getSwaggerColumnMetas.ts @@ -1,9 +1,9 @@ import { UITypes } from 'nocodb-sdk'; -import LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; +import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; import SwaggerTypes from '../../db/sql-mgr/code/routers/xc-ts/SwaggerTypes'; -import Column from '../../models/Column'; +import type Column from '../../models/Column'; import Noco from '../../Noco'; -import Project from '../../models/Project'; +import type Project from '../../models/Project'; export default async ( columns: Column[], diff --git a/packages/nocodb/src/lib/services/apiDocs/getSwaggerJSON.ts b/packages/nocodb/src/lib/services/apiDocs/getSwaggerJSON.ts index 8d4e81f478..28dee329b7 100644 --- a/packages/nocodb/src/lib/services/apiDocs/getSwaggerJSON.ts +++ b/packages/nocodb/src/lib/services/apiDocs/getSwaggerJSON.ts @@ -1,13 +1,13 @@ -import { Model, Project, View } from '../../models'; -import FormViewColumn from '../../models/FormViewColumn'; -import GalleryViewColumn from '../../models/GalleryViewColumn'; +import type { Model, Project, View } from '../../models'; +import type FormViewColumn from '../../models/FormViewColumn'; +import type GalleryViewColumn from '../../models/GalleryViewColumn'; import Noco from '../../Noco'; import swaggerBase from './swagger-base.json'; import getPaths from './getPaths'; import getSchemas from './getSchemas'; import getSwaggerColumnMetas from './getSwaggerColumnMetas'; import { ViewTypes } from 'nocodb-sdk'; -import GridViewColumn from '../../models/GridViewColumn'; +import type GridViewColumn from '../../models/GridViewColumn'; export default async function getSwaggerJSON( project: Project, diff --git a/packages/nocodb/src/lib/services/apiDocs/templates/params.ts b/packages/nocodb/src/lib/services/apiDocs/templates/params.ts index 698dbc5eb5..e00ebac63d 100644 --- a/packages/nocodb/src/lib/services/apiDocs/templates/params.ts +++ b/packages/nocodb/src/lib/services/apiDocs/templates/params.ts @@ -1,6 +1,6 @@ -import { SwaggerColumn } from '../getSwaggerColumnMetas'; +import type { SwaggerColumn } from '../getSwaggerColumnMetas'; import { RelationTypes, UITypes } from 'nocodb-sdk'; -import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; +import type LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; export const rowIdParam = { schema: { diff --git a/packages/nocodb/src/lib/services/apiDocs/templates/paths.ts b/packages/nocodb/src/lib/services/apiDocs/templates/paths.ts index fe9b81a89c..588ce337d5 100644 --- a/packages/nocodb/src/lib/services/apiDocs/templates/paths.ts +++ b/packages/nocodb/src/lib/services/apiDocs/templates/paths.ts @@ -16,7 +16,7 @@ import { whereParam, } from './params'; import { csvExportResponseHeader } from './headers'; -import { SwaggerColumn } from '../getSwaggerColumnMetas'; +import type { SwaggerColumn } from '../getSwaggerColumnMetas'; export const getModelPaths = async (ctx: { tableName: string; diff --git a/packages/nocodb/src/lib/services/apiDocs/templates/schemas.ts b/packages/nocodb/src/lib/services/apiDocs/templates/schemas.ts index 10134d9d68..c3bbf4b4bd 100644 --- a/packages/nocodb/src/lib/services/apiDocs/templates/schemas.ts +++ b/packages/nocodb/src/lib/services/apiDocs/templates/schemas.ts @@ -1,4 +1,4 @@ -import { SwaggerColumn } from '../getSwaggerColumnMetas'; +import type { SwaggerColumn } from '../getSwaggerColumnMetas'; export const getModelSchemas = (ctx: { tableName: string; diff --git a/packages/nocodb/src/lib/services/apiToken.svc.ts b/packages/nocodb/src/lib/services/apiToken.svc.ts index 329bcb305c..e2dcf060fe 100644 --- a/packages/nocodb/src/lib/services/apiToken.svc.ts +++ b/packages/nocodb/src/lib/services/apiToken.svc.ts @@ -1,9 +1,10 @@ -import { ApiTokenReqType, OrgUserRoles } from 'nocodb-sdk'; +import type { ApiTokenReqType } from 'nocodb-sdk'; +import { OrgUserRoles } from 'nocodb-sdk'; import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import { NcError } from '../meta/helpers/catchError'; import ApiToken from '../models/ApiToken'; -import User from '../models/User'; +import type User from '../models/User'; export async function apiTokenList(param: { userId: string }) { return ApiToken.list(param.userId); diff --git a/packages/nocodb/src/lib/services/audit.svc.ts b/packages/nocodb/src/lib/services/audit.svc.ts index 886934cc84..daf6cf1d04 100644 --- a/packages/nocodb/src/lib/services/audit.svc.ts +++ b/packages/nocodb/src/lib/services/audit.svc.ts @@ -1,10 +1,7 @@ import { validatePayload } from '../meta/api/helpers'; import Audit from '../models/Audit'; -import { - AuditOperationSubTypes, - AuditOperationTypes, - AuditRowUpdateReqType, -} from 'nocodb-sdk'; +import type { AuditRowUpdateReqType } from 'nocodb-sdk'; +import { AuditOperationSubTypes, AuditOperationTypes } from 'nocodb-sdk'; import Model from '../models/Model'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; diff --git a/packages/nocodb/src/lib/services/base.svc.ts b/packages/nocodb/src/lib/services/base.svc.ts index 0a88a9a030..9b2cb70091 100644 --- a/packages/nocodb/src/lib/services/base.svc.ts +++ b/packages/nocodb/src/lib/services/base.svc.ts @@ -1,5 +1,5 @@ import Project from '../models/Project'; -import { BaseReqType } from 'nocodb-sdk'; +import type { BaseReqType } from 'nocodb-sdk'; import { syncBaseMigration } from '../meta/helpers/syncMigration'; import Base from '../models/Base'; import { T } from 'nc-help'; diff --git a/packages/nocodb/src/lib/services/column.svc.ts b/packages/nocodb/src/lib/services/column.svc.ts index bc12ab4ac4..63142f3ade 100644 --- a/packages/nocodb/src/lib/services/column.svc.ts +++ b/packages/nocodb/src/lib/services/column.svc.ts @@ -1,18 +1,20 @@ -import { - AuditOperationSubTypes, - AuditOperationTypes, +import type { ColumnReqType, - isVirtualCol, LinkToAnotherColumnReqType, LinkToAnotherRecordType, RelationTypes, +} from 'nocodb-sdk'; +import { + AuditOperationSubTypes, + AuditOperationTypes, + isVirtualCol, substituteColumnAliasWithIdInFormula, substituteColumnIdWithAliasInFormula, UITypes, } from 'nocodb-sdk'; import formulaQueryBuilderv2 from '../db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2'; import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2'; -import SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2'; +import type SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2'; import { createHmAndBtColumn, generateFkName, @@ -30,15 +32,15 @@ import { } from '../meta/helpers/getUniqueName'; import mapDefaultDisplayValue from '../meta/helpers/mapDefaultDisplayValue'; import validateParams from '../meta/helpers/validateParams'; -import NcMetaIO from '../meta/NcMetaIO'; +import type NcMetaIO from '../meta/NcMetaIO'; import Audit from '../models/Audit'; import Base from '../models/Base'; import Column from '../models/Column'; import FormulaColumn from '../models/FormulaColumn'; import KanbanView from '../models/KanbanView'; -import LinkToAnotherRecordColumn from '../models/LinkToAnotherRecordColumn'; +import type LinkToAnotherRecordColumn from '../models/LinkToAnotherRecordColumn'; import Model from '../models/Model'; -import Project from '../models/Project'; +import type Project from '../models/Project'; import Noco from '../Noco'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; diff --git a/packages/nocodb/src/lib/services/dbData/bulkData.ts b/packages/nocodb/src/lib/services/dbData/bulkData.ts index 8c4c84c01c..95f597f41a 100644 --- a/packages/nocodb/src/lib/services/dbData/bulkData.ts +++ b/packages/nocodb/src/lib/services/dbData/bulkData.ts @@ -1,7 +1,8 @@ -import { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; +import type { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; import { Base, Model } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import { getViewAndModelByAliasOrId, PathParams } from './helpers'; +import type { PathParams } from './helpers'; +import { getViewAndModelByAliasOrId } from './helpers'; type BulkOperation = | 'bulkInsert' diff --git a/packages/nocodb/src/lib/services/dbData/dataAliasNested.svc.ts b/packages/nocodb/src/lib/services/dbData/dataAliasNested.svc.ts index 0994b1818c..e4375fdd07 100644 --- a/packages/nocodb/src/lib/services/dbData/dataAliasNested.svc.ts +++ b/packages/nocodb/src/lib/services/dbData/dataAliasNested.svc.ts @@ -1,11 +1,8 @@ import { PagedResponseImpl } from '../../meta/helpers/PagedResponse'; import { Base, Model } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import { - getColumnByIdOrName, - getViewAndModelByAliasOrId, - PathParams, -} from './helpers'; +import type { PathParams } from './helpers'; +import { getColumnByIdOrName, getViewAndModelByAliasOrId } from './helpers'; import { NcError } from '../../meta/helpers/catchError'; // todo: handle case where the given column is not ltar diff --git a/packages/nocodb/src/lib/services/dbData/export.ts b/packages/nocodb/src/lib/services/dbData/export.ts index fa222f61ce..8cf15048d0 100644 --- a/packages/nocodb/src/lib/services/dbData/export.ts +++ b/packages/nocodb/src/lib/services/dbData/export.ts @@ -1,4 +1,5 @@ -import { getViewAndModelByAliasOrId, PathParams } from './helpers'; +import type { PathParams } from './helpers'; +import { getViewAndModelByAliasOrId } from './helpers'; import { View } from '../../models'; // Todo: bring logic from controller diff --git a/packages/nocodb/src/lib/services/dbData/helpers.ts b/packages/nocodb/src/lib/services/dbData/helpers.ts index 54b8a3fe03..f1c1c830f8 100644 --- a/packages/nocodb/src/lib/services/dbData/helpers.ts +++ b/packages/nocodb/src/lib/services/dbData/helpers.ts @@ -1,15 +1,15 @@ -import { Request } from 'express'; +import type { Request } from 'express'; import { nocoExecute } from 'nc-help'; import { isSystemColumn, UITypes } from 'nocodb-sdk'; import * as XLSX from 'xlsx'; -import { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; +import type { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; import getAst from '../../db/sql-data-mapper/lib/sql/helpers/getAst'; import { NcError } from '../../meta/helpers/catchError'; import { Model, View } from '../../models'; import Base from '../../models/Base'; import Column from '../../models/Column'; -import LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; -import LookupColumn from '../../models/LookupColumn'; +import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; +import type LookupColumn from '../../models/LookupColumn'; import Project from '../../models/Project'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; import papaparse from 'papaparse'; diff --git a/packages/nocodb/src/lib/services/dbData/index.ts b/packages/nocodb/src/lib/services/dbData/index.ts index e491726f78..92a6025888 100644 --- a/packages/nocodb/src/lib/services/dbData/index.ts +++ b/packages/nocodb/src/lib/services/dbData/index.ts @@ -4,7 +4,8 @@ import { NcError } from '../../meta/helpers/catchError'; import { PagedResponseImpl } from '../../meta/helpers/PagedResponse'; import { Base, Model, View } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import { getViewAndModelByAliasOrId, PathParams } from './helpers'; +import type { PathParams } from './helpers'; +import { getViewAndModelByAliasOrId } from './helpers'; export async function dataList(param: PathParams & { query: any }) { const { model, view } = await getViewAndModelByAliasOrId(param); diff --git a/packages/nocodb/src/lib/services/ee/orgToken.svc.ts b/packages/nocodb/src/lib/services/ee/orgToken.svc.ts index 9dd491144c..b749be2e18 100644 --- a/packages/nocodb/src/lib/services/ee/orgToken.svc.ts +++ b/packages/nocodb/src/lib/services/ee/orgToken.svc.ts @@ -1,4 +1,5 @@ -import { OrgUserRoles, UserType } from 'nocodb-sdk'; +import type { UserType } from 'nocodb-sdk'; +import { OrgUserRoles } from 'nocodb-sdk'; import { PagedResponseImpl } from '../../meta/helpers/PagedResponse'; import { ApiToken } from '../../models'; diff --git a/packages/nocodb/src/lib/services/filter.svc.ts b/packages/nocodb/src/lib/services/filter.svc.ts index 351d312378..9935e0477a 100644 --- a/packages/nocodb/src/lib/services/filter.svc.ts +++ b/packages/nocodb/src/lib/services/filter.svc.ts @@ -1,4 +1,4 @@ -import { FilterReqType } from 'nocodb-sdk'; +import type { FilterReqType } from 'nocodb-sdk'; import { validatePayload } from '../meta/api/helpers'; import Filter from '../models/Filter'; import { T } from 'nc-help'; diff --git a/packages/nocodb/src/lib/services/hook.svc.ts b/packages/nocodb/src/lib/services/hook.svc.ts index 9acf6d4b48..f2e1d58780 100644 --- a/packages/nocodb/src/lib/services/hook.svc.ts +++ b/packages/nocodb/src/lib/services/hook.svc.ts @@ -1,7 +1,7 @@ import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import { Hook, Model } from '../models'; -import { HookReqType, HookTestReqType } from 'nocodb-sdk'; +import type { HookReqType, HookTestReqType } from 'nocodb-sdk'; import { invokeWebhook } from '../meta/helpers/webhookHelpers'; import populateSamplePayload from '../meta/helpers/populateSamplePayload'; diff --git a/packages/nocodb/src/lib/services/hookFilter.svc.ts b/packages/nocodb/src/lib/services/hookFilter.svc.ts index b8b1e04a42..6d064ea1bf 100644 --- a/packages/nocodb/src/lib/services/hookFilter.svc.ts +++ b/packages/nocodb/src/lib/services/hookFilter.svc.ts @@ -1,5 +1,5 @@ import { T } from 'nc-help'; -import { FilterReqType } from 'nocodb-sdk'; +import type { FilterReqType } from 'nocodb-sdk'; import { validatePayload } from '../meta/api/helpers'; import Filter from '../models/Filter'; diff --git a/packages/nocodb/src/lib/services/metaDiff.svc.ts b/packages/nocodb/src/lib/services/metaDiff.svc.ts index 274ba8e705..dcf4d23d46 100644 --- a/packages/nocodb/src/lib/services/metaDiff.svc.ts +++ b/packages/nocodb/src/lib/services/metaDiff.svc.ts @@ -3,13 +3,8 @@ import { T } from 'nc-help'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; import { isVirtualCol, ModelTypes, RelationTypes, UITypes } from 'nocodb-sdk'; -import { - Base, - Column, - LinkToAnotherRecordColumn, - Model, - Project, -} from '../models'; +import type { LinkToAnotherRecordColumn } from '../models'; +import { Base, Column, Model, Project } from '../models'; import ModelXcMetaFactory from '../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; import { getUniqueColumnAliasName } from '../meta/helpers/getUniqueName'; import NcHelp from '../utils/NcHelp'; diff --git a/packages/nocodb/src/lib/services/modelVisibility.svc.ts b/packages/nocodb/src/lib/services/modelVisibility.svc.ts index 719d3de487..31e5aee91f 100644 --- a/packages/nocodb/src/lib/services/modelVisibility.svc.ts +++ b/packages/nocodb/src/lib/services/modelVisibility.svc.ts @@ -1,4 +1,4 @@ -import { VisibilityRuleReqType } from 'nocodb-sdk'; +import type { VisibilityRuleReqType } from 'nocodb-sdk'; import { validatePayload } from '../meta/api/helpers'; import { NcError } from '../meta/helpers/catchError'; import ModelRoleVisibility from '../models/ModelRoleVisibility'; diff --git a/packages/nocodb/src/lib/services/orgToken.svc.ts b/packages/nocodb/src/lib/services/orgToken.svc.ts index fdee8e5fbe..291707b181 100644 --- a/packages/nocodb/src/lib/services/orgToken.svc.ts +++ b/packages/nocodb/src/lib/services/orgToken.svc.ts @@ -1,6 +1,7 @@ -import { ApiTokenReqType, OrgUserRoles } from 'nocodb-sdk'; +import type { ApiTokenReqType } from 'nocodb-sdk'; +import { OrgUserRoles } from 'nocodb-sdk'; import { validatePayload } from '../meta/api/helpers'; -import { User } from '../models'; +import type { User } from '../models'; import ApiToken from '../models/ApiToken'; import { T } from 'nc-help'; import { NcError } from '../meta/helpers/catchError'; diff --git a/packages/nocodb/src/lib/services/orgUser.svc.ts b/packages/nocodb/src/lib/services/orgUser.svc.ts index dbe51d047d..c5266c4186 100644 --- a/packages/nocodb/src/lib/services/orgUser.svc.ts +++ b/packages/nocodb/src/lib/services/orgUser.svc.ts @@ -1,8 +1,8 @@ +import type { UserType } from 'nocodb-sdk'; import { AuditOperationSubTypes, AuditOperationTypes, PluginCategory, - UserType, } from 'nocodb-sdk'; import { v4 as uuidv4 } from 'uuid'; import validator from 'validator'; diff --git a/packages/nocodb/src/lib/services/plugin.svc.ts b/packages/nocodb/src/lib/services/plugin.svc.ts index 67302d8ce7..76178ebb36 100644 --- a/packages/nocodb/src/lib/services/plugin.svc.ts +++ b/packages/nocodb/src/lib/services/plugin.svc.ts @@ -1,7 +1,7 @@ import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import { Plugin } from '../models'; -import { PluginTestReqType, PluginType } from 'nocodb-sdk'; +import type { PluginTestReqType, PluginType } from 'nocodb-sdk'; import NcPluginMgrv2 from '../meta/helpers/NcPluginMgrv2'; export async function pluginList() { diff --git a/packages/nocodb/src/lib/services/project.svc.ts b/packages/nocodb/src/lib/services/project.svc.ts index 08a848f7a5..0b628e6d73 100644 --- a/packages/nocodb/src/lib/services/project.svc.ts +++ b/packages/nocodb/src/lib/services/project.svc.ts @@ -1,5 +1,6 @@ import DOMPurify from 'isomorphic-dompurify'; -import { OrgUserRoles, ProjectReqType } from 'nocodb-sdk'; +import type { ProjectReqType } from 'nocodb-sdk'; +import { OrgUserRoles } from 'nocodb-sdk'; import { promisify } from 'util'; import { populateMeta, validatePayload } from '../meta/api/helpers'; import { extractPropsAndSanitize } from '../meta/helpers/extractProps'; diff --git a/packages/nocodb/src/lib/services/projectUser.svc.ts b/packages/nocodb/src/lib/services/projectUser.svc.ts index 66a8d1a605..d1257452a9 100644 --- a/packages/nocodb/src/lib/services/projectUser.svc.ts +++ b/packages/nocodb/src/lib/services/projectUser.svc.ts @@ -1,4 +1,5 @@ -import { OrgUserRoles, ProjectUserReqType } from 'nocodb-sdk'; +import type { ProjectUserReqType } from 'nocodb-sdk'; +import { OrgUserRoles } from 'nocodb-sdk'; import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; diff --git a/packages/nocodb/src/lib/services/public/publicData.svc.ts b/packages/nocodb/src/lib/services/public/publicData.svc.ts index 41c5b8e61b..1a14ff5519 100644 --- a/packages/nocodb/src/lib/services/public/publicData.svc.ts +++ b/packages/nocodb/src/lib/services/public/publicData.svc.ts @@ -7,13 +7,8 @@ import getAst from '../../db/sql-data-mapper/lib/sql/helpers/getAst'; import { NcError } from '../../meta/helpers/catchError'; import NcPluginMgrv2 from '../../meta/helpers/NcPluginMgrv2'; import { PagedResponseImpl } from '../../meta/helpers/PagedResponse'; -import { - Base, - Column, - LinkToAnotherRecordColumn, - Model, - View, -} from '../../models'; +import type { LinkToAnotherRecordColumn } from '../../models'; +import { Base, Column, Model, View } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; import { mimeIcons } from '../../utils/mimeTypes'; import { sanitizeUrlPath } from '../attachment.svc'; diff --git a/packages/nocodb/src/lib/services/public/publicDataExport.svc.ts b/packages/nocodb/src/lib/services/public/publicDataExport.svc.ts index a35c18ef50..e9f866488a 100644 --- a/packages/nocodb/src/lib/services/public/publicDataExport.svc.ts +++ b/packages/nocodb/src/lib/services/public/publicDataExport.svc.ts @@ -2,14 +2,12 @@ import { nocoExecute } from 'nc-help'; import { isSystemColumn, UITypes } from 'nocodb-sdk'; import getAst from '../../db/sql-data-mapper/lib/sql/helpers/getAst'; import { NcError } from '../../meta/helpers/catchError'; -import { - Base, - Column, +import type { LinkToAnotherRecordColumn, LookupColumn, - Model, View, } from '../../models'; +import { Base, Column, Model } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; export async function getDbRows(param: { diff --git a/packages/nocodb/src/lib/services/public/publicMeta.svc.ts b/packages/nocodb/src/lib/services/public/publicMeta.svc.ts index 940b03e877..74f56b35ec 100644 --- a/packages/nocodb/src/lib/services/public/publicMeta.svc.ts +++ b/packages/nocodb/src/lib/services/public/publicMeta.svc.ts @@ -1,18 +1,8 @@ -import { - ErrorMessages, - LinkToAnotherRecordType, - RelationTypes, - UITypes, -} from 'nocodb-sdk'; +import type { LinkToAnotherRecordType } from 'nocodb-sdk'; +import { ErrorMessages, RelationTypes, UITypes } from 'nocodb-sdk'; import { NcError } from '../../meta/helpers/catchError'; -import { - Base, - Column, - LinkToAnotherRecordColumn, - Model, - Project, - View, -} from '../../models'; +import type { LinkToAnotherRecordColumn } from '../../models'; +import { Base, Column, Model, Project, View } from '../../models'; export async function viewMetaGet(param: { sharedViewUuid: string; diff --git a/packages/nocodb/src/lib/services/sort.svc.ts b/packages/nocodb/src/lib/services/sort.svc.ts index c2d05948c1..967ffea81d 100644 --- a/packages/nocodb/src/lib/services/sort.svc.ts +++ b/packages/nocodb/src/lib/services/sort.svc.ts @@ -1,4 +1,4 @@ -import { SortReqType } from 'nocodb-sdk'; +import type { SortReqType } from 'nocodb-sdk'; import { validatePayload } from '../meta/api/helpers'; import Sort from '../models/Sort'; import { T } from 'nc-help'; diff --git a/packages/nocodb/src/lib/services/sync/helpers/readAndProcessData.ts b/packages/nocodb/src/lib/services/sync/helpers/readAndProcessData.ts index ad004205d1..3713993dc0 100644 --- a/packages/nocodb/src/lib/services/sync/helpers/readAndProcessData.ts +++ b/packages/nocodb/src/lib/services/sync/helpers/readAndProcessData.ts @@ -1,5 +1,6 @@ -import { AirtableBase } from 'airtable/lib/airtable_base'; -import { Api, RelationTypes, TableType, UITypes } from 'nocodb-sdk'; +import type { AirtableBase } from 'airtable/lib/airtable_base'; +import type { Api, TableType } from 'nocodb-sdk'; +import { RelationTypes, UITypes } from 'nocodb-sdk'; import EntityMap from './EntityMap'; const BULK_DATA_BATCH_SIZE = 500; diff --git a/packages/nocodb/src/lib/services/table.svc.ts b/packages/nocodb/src/lib/services/table.svc.ts index 59fe0c9e1d..094b2ea482 100644 --- a/packages/nocodb/src/lib/services/table.svc.ts +++ b/packages/nocodb/src/lib/services/table.svc.ts @@ -1,12 +1,14 @@ import DOMPurify from 'isomorphic-dompurify'; +import type { + ColumnType, + NormalColumnRequestType, + TableReqType, +} from 'nocodb-sdk'; import { AuditOperationSubTypes, AuditOperationTypes, - ColumnType, isVirtualCol, ModelTypes, - NormalColumnRequestType, - TableReqType, UITypes, } from 'nocodb-sdk'; import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2'; @@ -18,16 +20,8 @@ import getTableNameAlias, { getColumnNameAlias, } from '../meta/helpers/getTableName'; import mapDefaultDisplayValue from '../meta/helpers/mapDefaultDisplayValue'; -import { - Audit, - Column, - LinkToAnotherRecordColumn, - Model, - ModelRoleVisibility, - Project, - User, - View, -} from '../models'; +import type { LinkToAnotherRecordColumn, User, View } from '../models'; +import { Audit, Column, Model, ModelRoleVisibility, Project } from '../models'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; import { T } from 'nc-help'; diff --git a/packages/nocodb/src/lib/services/test/TestResetService/resetMysqlSakilaProject.ts b/packages/nocodb/src/lib/services/test/TestResetService/resetMysqlSakilaProject.ts index b010579522..62f425b62e 100644 --- a/packages/nocodb/src/lib/services/test/TestResetService/resetMysqlSakilaProject.ts +++ b/packages/nocodb/src/lib/services/test/TestResetService/resetMysqlSakilaProject.ts @@ -1,9 +1,10 @@ import axios from 'axios'; -import { Knex, knex } from 'knex'; +import type { Knex } from 'knex'; +import { knex } from 'knex'; import { promises as fs } from 'fs'; import Audit from '../../../models/Audit'; -import Project from '../../../models/Project'; +import type Project from '../../../models/Project'; const config = { client: 'mysql2', diff --git a/packages/nocodb/src/lib/services/test/TestResetService/resetPgSakilaProject.ts b/packages/nocodb/src/lib/services/test/TestResetService/resetPgSakilaProject.ts index 9a7b235679..2f035f6053 100644 --- a/packages/nocodb/src/lib/services/test/TestResetService/resetPgSakilaProject.ts +++ b/packages/nocodb/src/lib/services/test/TestResetService/resetPgSakilaProject.ts @@ -6,7 +6,7 @@ import { promises as fs } from 'fs'; // const exec = util.promisify(require('child_process').exec); import Audit from '../../../models/Audit'; -import Project from '../../../models/Project'; +import type Project from '../../../models/Project'; const config = { client: 'pg', diff --git a/packages/nocodb/src/lib/services/user/helpers.ts b/packages/nocodb/src/lib/services/user/helpers.ts index 489f5ffa1a..8784e2abbc 100644 --- a/packages/nocodb/src/lib/services/user/helpers.ts +++ b/packages/nocodb/src/lib/services/user/helpers.ts @@ -1,8 +1,8 @@ import * as jwt from 'jsonwebtoken'; import crypto from 'crypto'; -import User from '../../models/User'; -import { NcConfig } from '../../../interface/config'; -import { Response } from 'express'; +import type User from '../../models/User'; +import type { NcConfig } from '../../../interface/config'; +import type { Response } from 'express'; export function genJwt(user: User, config: NcConfig) { return jwt.sign( diff --git a/packages/nocodb/src/lib/services/user/index.ts b/packages/nocodb/src/lib/services/user/index.ts index 474c1f5c2b..9fe8f47b58 100644 --- a/packages/nocodb/src/lib/services/user/index.ts +++ b/packages/nocodb/src/lib/services/user/index.ts @@ -1,11 +1,11 @@ -import { +import type { PasswordChangeReqType, PasswordForgotReqType, PasswordResetReqType, SignUpReqType, UserType, - validatePassword, } from 'nocodb-sdk'; +import { validatePassword } from 'nocodb-sdk'; import { OrgUserRoles } from 'nocodb-sdk'; import { T } from 'nc-help'; diff --git a/packages/nocodb/src/lib/services/view.svc.ts b/packages/nocodb/src/lib/services/view.svc.ts index 8eb64bf646..086ee0f6a1 100644 --- a/packages/nocodb/src/lib/services/view.svc.ts +++ b/packages/nocodb/src/lib/services/view.svc.ts @@ -1,4 +1,4 @@ -import { SharedViewReqType, ViewReqType } from 'nocodb-sdk'; +import type { SharedViewReqType, ViewReqType } from 'nocodb-sdk'; import { validatePayload } from '../meta/api/helpers'; import { Model, View } from '../models'; import { T } from 'nc-help'; diff --git a/packages/nocodb/src/lib/services/views/formView.svc.ts b/packages/nocodb/src/lib/services/views/formView.svc.ts index f7a8c9047e..5f43319e21 100644 --- a/packages/nocodb/src/lib/services/views/formView.svc.ts +++ b/packages/nocodb/src/lib/services/views/formView.svc.ts @@ -1,5 +1,6 @@ import { T } from 'nc-help'; -import { FormReqType, ViewTypes } from 'nocodb-sdk'; +import type { FormReqType } from 'nocodb-sdk'; +import { ViewTypes } from 'nocodb-sdk'; import { validatePayload } from '../../meta/api/helpers'; import { FormView, View } from '../../models'; diff --git a/packages/nocodb/src/lib/services/views/galleryView.svc.ts b/packages/nocodb/src/lib/services/views/galleryView.svc.ts index 648c8cba76..ea12f44a77 100644 --- a/packages/nocodb/src/lib/services/views/galleryView.svc.ts +++ b/packages/nocodb/src/lib/services/views/galleryView.svc.ts @@ -1,4 +1,5 @@ -import { GalleryReqType, ViewTypes } from 'nocodb-sdk'; +import type { GalleryReqType } from 'nocodb-sdk'; +import { ViewTypes } from 'nocodb-sdk'; import { T } from 'nc-help'; import { validatePayload } from '../../meta/api/helpers'; import { GalleryView, View } from '../../models'; diff --git a/packages/nocodb/src/lib/services/views/gridView.svc.ts b/packages/nocodb/src/lib/services/views/gridView.svc.ts index 8bc07d85ab..19114cd8bd 100644 --- a/packages/nocodb/src/lib/services/views/gridView.svc.ts +++ b/packages/nocodb/src/lib/services/views/gridView.svc.ts @@ -1,5 +1,6 @@ import { T } from 'nc-help'; -import { GridReqType, ViewTypes } from 'nocodb-sdk'; +import type { GridReqType } from 'nocodb-sdk'; +import { ViewTypes } from 'nocodb-sdk'; import { validatePayload } from '../../meta/api/helpers'; import { View } from '../../models'; import { GridView } from '../../models'; diff --git a/packages/nocodb/src/lib/services/views/gridViewColumn.svc.ts b/packages/nocodb/src/lib/services/views/gridViewColumn.svc.ts index fbbf87ea75..21ee7fdce6 100644 --- a/packages/nocodb/src/lib/services/views/gridViewColumn.svc.ts +++ b/packages/nocodb/src/lib/services/views/gridViewColumn.svc.ts @@ -1,4 +1,4 @@ -import { GridColumnReqType } from 'nocodb-sdk'; +import type { GridColumnReqType } from 'nocodb-sdk'; import { validatePayload } from '../../meta/api/helpers'; import GridViewColumn from '../../models/GridViewColumn'; import { T } from 'nc-help'; diff --git a/packages/nocodb/src/lib/services/views/kanbanView.svc.ts b/packages/nocodb/src/lib/services/views/kanbanView.svc.ts index a4a4b88634..ea62177e12 100644 --- a/packages/nocodb/src/lib/services/views/kanbanView.svc.ts +++ b/packages/nocodb/src/lib/services/views/kanbanView.svc.ts @@ -1,4 +1,5 @@ -import { KanbanReqType, ViewTypes } from 'nocodb-sdk'; +import type { KanbanReqType } from 'nocodb-sdk'; +import { ViewTypes } from 'nocodb-sdk'; import { validatePayload } from '../../meta/api/helpers'; import { KanbanView, View } from '../../models'; import { T } from 'nc-help'; diff --git a/packages/nocodb/src/lib/services/views/mapView.svc.ts b/packages/nocodb/src/lib/services/views/mapView.svc.ts index 17e8abcdb1..a4d0063124 100644 --- a/packages/nocodb/src/lib/services/views/mapView.svc.ts +++ b/packages/nocodb/src/lib/services/views/mapView.svc.ts @@ -1,4 +1,5 @@ -import { MapType, ViewTypes } from 'nocodb-sdk'; +import type { MapType } from 'nocodb-sdk'; +import { ViewTypes } from 'nocodb-sdk'; import View from '../../models/View'; import { T } from 'nc-help'; import MapView from '../../models/MapView'; diff --git a/packages/nocodb/src/lib/utils/NcConfigFactory.ts b/packages/nocodb/src/lib/utils/NcConfigFactory.ts index fa6bda148c..9f64b6ecdf 100644 --- a/packages/nocodb/src/lib/utils/NcConfigFactory.ts +++ b/packages/nocodb/src/lib/utils/NcConfigFactory.ts @@ -3,7 +3,7 @@ import parseDbUrl from 'parse-database-url'; import { URL } from 'url'; import { promisify } from 'util'; -import { +import type { AuthConfig, DbConfig, MailerConfig, diff --git a/packages/nocodb/src/lib/utils/common/BaseApiBuilder.ts b/packages/nocodb/src/lib/utils/common/BaseApiBuilder.ts index 5b1f36e8a2..738dccff4b 100644 --- a/packages/nocodb/src/lib/utils/common/BaseApiBuilder.ts +++ b/packages/nocodb/src/lib/utils/common/BaseApiBuilder.ts @@ -4,22 +4,22 @@ import debug from 'debug'; import { Router } from 'express'; import inflection from 'inflection'; // import Knex from "knex"; -import { +import type { MysqlClient, PgClient, SqlClient, // SqlClientFactory, } from 'nc-help'; -import XcDynamicChanges from '../../../interface/XcDynamicChanges'; -import { Acls, DbConfig, NcConfig } from '../../../interface/config'; -import { BaseModelSql, XKnex } from '../../db/sql-data-mapper'; +import type XcDynamicChanges from '../../../interface/XcDynamicChanges'; +import type { Acls, DbConfig, NcConfig } from '../../../interface/config'; +import type { BaseModelSql, XKnex } from '../../db/sql-data-mapper'; import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; import ExpressXcPolicy from '../../db/sql-mgr/code/policies/xc/ExpressXcPolicy'; import NcHelp from '../NcHelp'; -import NcProjectBuilder from '../../v1-legacy/NcProjectBuilder'; -import Noco from '../../Noco'; -import NcMetaIO from '../../meta/NcMetaIO'; +import type NcProjectBuilder from '../../v1-legacy/NcProjectBuilder'; +import type Noco from '../../Noco'; +import type NcMetaIO from '../../meta/NcMetaIO'; import XcCache from '../../v1-legacy/plugins/adapters/cache/XcCache'; import { T } from 'nc-help'; diff --git a/packages/nocodb/src/lib/utils/common/BaseModel.ts b/packages/nocodb/src/lib/utils/common/BaseModel.ts index 96efa65793..e419818224 100644 --- a/packages/nocodb/src/lib/utils/common/BaseModel.ts +++ b/packages/nocodb/src/lib/utils/common/BaseModel.ts @@ -1,11 +1,11 @@ import Handlebars from 'handlebars'; -import { IWebhookNotificationAdapter } from 'nc-plugin'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; import ejs from 'ejs'; -import IEmailAdapter from '../../../interface/IEmailAdapter'; +import type IEmailAdapter from '../../../interface/IEmailAdapter'; import { BaseModelSql } from '../../db/sql-data-mapper'; // import axios from "axios"; -import BaseApiBuilder from './BaseApiBuilder'; +import type BaseApiBuilder from './BaseApiBuilder'; import formSubmissionEmailTemplate from './formSubmissionEmailTemplate'; Handlebars.registerHelper('json', function (context) { diff --git a/packages/nocodb/src/lib/utils/common/BaseProcedure.ts b/packages/nocodb/src/lib/utils/common/BaseProcedure.ts index 3b58e2fcd6..72faad9097 100644 --- a/packages/nocodb/src/lib/utils/common/BaseProcedure.ts +++ b/packages/nocodb/src/lib/utils/common/BaseProcedure.ts @@ -1,7 +1,7 @@ -import { GqlApiBuilder } from '../../v1-legacy/gql/GqlApiBuilder'; -import { RestApiBuilder } from '../../v1-legacy/rest/RestApiBuilder'; +import type { GqlApiBuilder } from '../../v1-legacy/gql/GqlApiBuilder'; +import type { RestApiBuilder } from '../../v1-legacy/rest/RestApiBuilder'; -import XcProcedure from './XcProcedure'; +import type XcProcedure from './XcProcedure'; export default class BaseProcedure { protected builder: GqlApiBuilder | RestApiBuilder; diff --git a/packages/nocodb/src/lib/utils/common/NcConnectionMgr.ts b/packages/nocodb/src/lib/utils/common/NcConnectionMgr.ts index ca7f4fe53d..ae56532e6f 100644 --- a/packages/nocodb/src/lib/utils/common/NcConnectionMgr.ts +++ b/packages/nocodb/src/lib/utils/common/NcConnectionMgr.ts @@ -1,11 +1,11 @@ import SqlClientFactory from '../../db/sql-client/lib/SqlClientFactory'; import { XKnex } from '../../db/sql-data-mapper'; -import { NcConfig } from '../../../interface/config'; +import type { NcConfig } from '../../../interface/config'; import fs from 'fs'; import { promisify } from 'util'; -import { Knex } from 'knex'; +import type { Knex } from 'knex'; -import NcMetaIO from '../../meta/NcMetaIO'; +import type NcMetaIO from '../../meta/NcMetaIO'; import { defaultConnectionConfig } from '../NcConfigFactory'; export default class NcConnectionMgr { diff --git a/packages/nocodb/src/lib/utils/common/NcConnectionMgrv2.ts b/packages/nocodb/src/lib/utils/common/NcConnectionMgrv2.ts index 6e8d042327..b8b09aa6ed 100644 --- a/packages/nocodb/src/lib/utils/common/NcConnectionMgrv2.ts +++ b/packages/nocodb/src/lib/utils/common/NcConnectionMgrv2.ts @@ -4,7 +4,7 @@ import { defaultConnectionConfig, defaultConnectionOptions, } from '../NcConfigFactory'; -import Base from '../../models/Base'; +import type Base from '../../models/Base'; import Noco from '../../Noco'; export default class NcConnectionMgrv2 { diff --git a/packages/nocodb/src/lib/utils/common/XcAudit.ts b/packages/nocodb/src/lib/utils/common/XcAudit.ts index afdeb624f9..1c5573f704 100644 --- a/packages/nocodb/src/lib/utils/common/XcAudit.ts +++ b/packages/nocodb/src/lib/utils/common/XcAudit.ts @@ -1,4 +1,4 @@ -import Noco from '../../Noco'; +import type Noco from '../../Noco'; export default class XcAudit { public static init(app: Noco) { diff --git a/packages/nocodb/src/lib/utils/common/XcCron.ts b/packages/nocodb/src/lib/utils/common/XcCron.ts index abbccc679b..cb42a29ac9 100644 --- a/packages/nocodb/src/lib/utils/common/XcCron.ts +++ b/packages/nocodb/src/lib/utils/common/XcCron.ts @@ -1,9 +1,9 @@ import { CronJob } from 'cron'; -import { NcConfig } from '../../../interface/config'; -import Noco from '../../Noco'; +import type { NcConfig } from '../../../interface/config'; +import type Noco from '../../Noco'; -import BaseApiBuilder from './BaseApiBuilder'; +import type BaseApiBuilder from './BaseApiBuilder'; // import * as tsc from "typescript"; diff --git a/packages/nocodb/src/lib/utils/common/XcProcedure.ts b/packages/nocodb/src/lib/utils/common/XcProcedure.ts index e67d843779..c66fa67025 100644 --- a/packages/nocodb/src/lib/utils/common/XcProcedure.ts +++ b/packages/nocodb/src/lib/utils/common/XcProcedure.ts @@ -1,4 +1,4 @@ -import BaseApiBuilder from './BaseApiBuilder'; +import type BaseApiBuilder from './BaseApiBuilder'; export default class XcProcedure { private builder: BaseApiBuilder; diff --git a/packages/nocodb/src/lib/utils/common/handlers/xcMetaDiffSync.ts b/packages/nocodb/src/lib/utils/common/handlers/xcMetaDiffSync.ts index 3544737745..f4bda7957a 100644 --- a/packages/nocodb/src/lib/utils/common/handlers/xcMetaDiffSync.ts +++ b/packages/nocodb/src/lib/utils/common/handlers/xcMetaDiffSync.ts @@ -1,8 +1,7 @@ -import BaseApiBuilder, { XcTablesPopulateParams } from '../BaseApiBuilder'; -import xcMetaDiff, { - NcMetaDiff as NcMetaDiffType, - XcMetaDiffType, -} from '../../../meta/handlers/xcMetaDiff'; +import type { XcTablesPopulateParams } from '../BaseApiBuilder'; +import type BaseApiBuilder from '../BaseApiBuilder'; +import type { NcMetaDiff as NcMetaDiffType } from '../../../meta/handlers/xcMetaDiff'; +import xcMetaDiff, { XcMetaDiffType } from '../../../meta/handlers/xcMetaDiff'; import XcCache from '../../../v1-legacy/plugins/adapters/cache/XcCache'; import { GqlApiBuilder } from '../../../v1-legacy/gql/GqlApiBuilder'; diff --git a/packages/nocodb/src/lib/utils/common/jobs/ncModelsOrderUpgrader.ts b/packages/nocodb/src/lib/utils/common/jobs/ncModelsOrderUpgrader.ts index f2ba5aaad8..3444878811 100644 --- a/packages/nocodb/src/lib/utils/common/jobs/ncModelsOrderUpgrader.ts +++ b/packages/nocodb/src/lib/utils/common/jobs/ncModelsOrderUpgrader.ts @@ -1,4 +1,4 @@ -import { NcBuilderUpgraderCtx } from '../BaseApiBuilder'; +import type { NcBuilderUpgraderCtx } from '../BaseApiBuilder'; export default async function (ctx: NcBuilderUpgraderCtx) { const models = await ctx.xcMeta.metaList( diff --git a/packages/nocodb/src/lib/utils/common/jobs/ncParentModelTitleUpgrader.ts b/packages/nocodb/src/lib/utils/common/jobs/ncParentModelTitleUpgrader.ts index b6731cd0fb..d0c4dcf526 100644 --- a/packages/nocodb/src/lib/utils/common/jobs/ncParentModelTitleUpgrader.ts +++ b/packages/nocodb/src/lib/utils/common/jobs/ncParentModelTitleUpgrader.ts @@ -1,4 +1,4 @@ -import { NcBuilderUpgraderCtx } from '../BaseApiBuilder'; +import type { NcBuilderUpgraderCtx } from '../BaseApiBuilder'; export default async function (ctx: NcBuilderUpgraderCtx) { const views = await ctx.xcMeta.metaList( diff --git a/packages/nocodb/src/lib/utils/common/jobs/ncRemoveDuplicatedRelationRows.ts b/packages/nocodb/src/lib/utils/common/jobs/ncRemoveDuplicatedRelationRows.ts index 233cccd508..357ac640d4 100644 --- a/packages/nocodb/src/lib/utils/common/jobs/ncRemoveDuplicatedRelationRows.ts +++ b/packages/nocodb/src/lib/utils/common/jobs/ncRemoveDuplicatedRelationRows.ts @@ -1,4 +1,4 @@ -import { NcBuilderUpgraderCtx } from '../BaseApiBuilder'; +import type { NcBuilderUpgraderCtx } from '../BaseApiBuilder'; export default async function (ctx: NcBuilderUpgraderCtx) { try { diff --git a/packages/nocodb/src/lib/utils/pluginUtils.ts b/packages/nocodb/src/lib/utils/pluginUtils.ts index 1772657869..30221ef4a9 100644 --- a/packages/nocodb/src/lib/utils/pluginUtils.ts +++ b/packages/nocodb/src/lib/utils/pluginUtils.ts @@ -1,4 +1,4 @@ -import fs from 'fs'; +import type fs from 'fs'; import path from 'path'; import os from 'os'; diff --git a/packages/nocodb/src/lib/v1-legacy/NcProjectBuilder.ts b/packages/nocodb/src/lib/v1-legacy/NcProjectBuilder.ts index 15a63e4a6a..8571ab5cc5 100644 --- a/packages/nocodb/src/lib/v1-legacy/NcProjectBuilder.ts +++ b/packages/nocodb/src/lib/v1-legacy/NcProjectBuilder.ts @@ -5,11 +5,11 @@ import { promisify } from 'util'; import axios from 'axios'; import { Router } from 'express'; -import { NcConfig } from '../../interface/config'; +import type { NcConfig } from '../../interface/config'; import SqlClientFactory from '../db/sql-client/lib/SqlClientFactory'; import Migrator from '../db/sql-migrator/lib/KnexMigrator'; -import Noco from '../Noco'; +import type Noco from '../Noco'; import { T } from 'nc-help'; import { GqlApiBuilder } from './gql/GqlApiBuilder'; import { XCEeError } from '../meta/NcMetaMgr'; diff --git a/packages/nocodb/src/lib/v1-legacy/gql/GqlApiBuilder.ts b/packages/nocodb/src/lib/v1-legacy/gql/GqlApiBuilder.ts index 2d0c0894da..7900c2bf65 100644 --- a/packages/nocodb/src/lib/v1-legacy/gql/GqlApiBuilder.ts +++ b/packages/nocodb/src/lib/v1-legacy/gql/GqlApiBuilder.ts @@ -6,18 +6,17 @@ import { GraphQLJSON } from 'graphql-type-json'; import _ from 'lodash'; import { BaseType } from 'xc-core-ts'; -import XcMetaMgr from '../../../interface/XcMetaMgr'; -import { DbConfig, NcConfig } from '../../../interface/config'; +import type XcMetaMgr from '../../../interface/XcMetaMgr'; +import type { DbConfig, NcConfig } from '../../../interface/config'; import ExpressXcTsPolicyGql from '../../db/sql-mgr/code/gql-policies/xc-ts/ExpressXcTsPolicyGql'; import GqlXcSchemaFactory from '../../db/sql-mgr/code/gql-schema/xc-ts/GqlXcSchemaFactory'; import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; import NcHelp from '../../utils/NcHelp'; -import NcProjectBuilder from '../NcProjectBuilder'; -import Noco from '../../Noco'; -import BaseApiBuilder, { - XcTablesPopulateParams, -} from '../../utils/common/BaseApiBuilder'; -import NcMetaIO from '../../meta/NcMetaIO'; +import type NcProjectBuilder from '../NcProjectBuilder'; +import type Noco from '../../Noco'; +import type { XcTablesPopulateParams } from '../../utils/common/BaseApiBuilder'; +import BaseApiBuilder from '../../utils/common/BaseApiBuilder'; +import type NcMetaIO from '../../meta/NcMetaIO'; import { m2mNotChildren, m2mNotChildrenCount } from './GqlCommonResolvers'; import GqlMiddleware from './GqlMiddleware'; diff --git a/packages/nocodb/src/lib/v1-legacy/gql/GqlAuthResolver.ts b/packages/nocodb/src/lib/v1-legacy/gql/GqlAuthResolver.ts index fe3060edbc..5c7dffad62 100644 --- a/packages/nocodb/src/lib/v1-legacy/gql/GqlAuthResolver.ts +++ b/packages/nocodb/src/lib/v1-legacy/gql/GqlAuthResolver.ts @@ -6,10 +6,10 @@ import * as jwt from 'jsonwebtoken'; import passport from 'passport'; import { ExtractJwt, Strategy } from 'passport-jwt'; -import IEmailAdapter from '../../../interface/IEmailAdapter'; -import { DbConfig, NcConfig } from '../../../interface/config'; -import { Knex, XKnex } from '../../db/sql-data-mapper'; -import Noco from '../../Noco'; +import type IEmailAdapter from '../../../interface/IEmailAdapter'; +import type { DbConfig, NcConfig } from '../../../interface/config'; +import type { Knex, XKnex } from '../../db/sql-data-mapper'; +import type Noco from '../../Noco'; import authSchema from './auth/schema'; diff --git a/packages/nocodb/src/lib/v1-legacy/gql/GqlCommonResolvers.ts b/packages/nocodb/src/lib/v1-legacy/gql/GqlCommonResolvers.ts index a379f0fc1e..0bc6c9c975 100644 --- a/packages/nocodb/src/lib/v1-legacy/gql/GqlCommonResolvers.ts +++ b/packages/nocodb/src/lib/v1-legacy/gql/GqlCommonResolvers.ts @@ -1,4 +1,4 @@ -import { BaseModelSql } from '../../db/sql-data-mapper'; +import type { BaseModelSql } from '../../db/sql-data-mapper'; export const m2mNotChildren = ({ models = {}, diff --git a/packages/nocodb/src/lib/v1-legacy/gql/GqlMiddleware.ts b/packages/nocodb/src/lib/v1-legacy/gql/GqlMiddleware.ts index 039792eb81..a7099361a0 100644 --- a/packages/nocodb/src/lib/v1-legacy/gql/GqlMiddleware.ts +++ b/packages/nocodb/src/lib/v1-legacy/gql/GqlMiddleware.ts @@ -1,7 +1,7 @@ import autoBind from 'auto-bind'; import Handlebars from 'handlebars'; -import { Acls } from '../../../interface/config'; +import type { Acls } from '../../../interface/config'; export default class GqlMiddleware { private tn: any; diff --git a/packages/nocodb/src/lib/v1-legacy/gql/GqlProcedureResolver.ts b/packages/nocodb/src/lib/v1-legacy/gql/GqlProcedureResolver.ts index f9904b2715..32d236db91 100644 --- a/packages/nocodb/src/lib/v1-legacy/gql/GqlProcedureResolver.ts +++ b/packages/nocodb/src/lib/v1-legacy/gql/GqlProcedureResolver.ts @@ -3,7 +3,7 @@ import autoBind from 'auto-bind'; import BaseProcedure from '../../utils/common/BaseProcedure'; import XcProcedure from '../../utils/common/XcProcedure'; -import { GqlApiBuilder } from './GqlApiBuilder'; +import type { GqlApiBuilder } from './GqlApiBuilder'; import GqlBaseResolver from './GqlBaseResolver'; export class GqlProcedureResolver extends BaseProcedure { diff --git a/packages/nocodb/src/lib/v1-legacy/gql/GqlResolver.ts b/packages/nocodb/src/lib/v1-legacy/gql/GqlResolver.ts index 6b49e0d7c0..5fd6580c76 100644 --- a/packages/nocodb/src/lib/v1-legacy/gql/GqlResolver.ts +++ b/packages/nocodb/src/lib/v1-legacy/gql/GqlResolver.ts @@ -1,8 +1,8 @@ import autoBind from 'auto-bind'; -import { Acls } from '../../../interface/config'; -import { BaseModelSql } from '../../db/sql-data-mapper'; -import Noco from '../../Noco'; +import type { Acls } from '../../../interface/config'; +import type { BaseModelSql } from '../../db/sql-data-mapper'; +import type Noco from '../../Noco'; import GqlBaseResolver from './GqlBaseResolver'; import GqlMiddleware from './GqlMiddleware'; diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/NcPluginMgr.ts b/packages/nocodb/src/lib/v1-legacy/plugins/NcPluginMgr.ts index 0c83e3129b..b60444149b 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/NcPluginMgr.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/NcPluginMgr.ts @@ -1,9 +1,11 @@ -import { +import type { IEmailAdapter, IStorageAdapter, IWebhookNotificationAdapter, - XcEmailPlugin, XcPlugin, +} from 'nc-plugin'; +import { + XcEmailPlugin, XcStoragePlugin, XcWebhookNotificationPlugin, } from 'nc-plugin'; @@ -27,8 +29,8 @@ import TwilioWhatsappPluginConfig from '../../plugins/twilioWhatsapp'; import UpcloudPluginConfig from '../../plugins/upcloud'; import VultrPluginConfig from '../../plugins/vultr'; import SESPluginConfig from '../../plugins/ses'; -import Noco from '../../Noco'; -import NcMetaIO from '../../meta/NcMetaIO'; +import type Noco from '../../Noco'; +import type NcMetaIO from '../../meta/NcMetaIO'; import Local from './adapters/storage/Local'; diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/EmailFactory.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/EmailFactory.ts index 3989751a6b..87e3969b77 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/EmailFactory.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/EmailFactory.ts @@ -1,4 +1,4 @@ -import IEmailAdapter from '../../../../../interface/IEmailAdapter'; +import type IEmailAdapter from '../../../../../interface/IEmailAdapter'; import SES from './SES'; import SMTP from './SMTP'; diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/SES.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/SES.ts index db7a6573d6..eee0d1befc 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/SES.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/SES.ts @@ -1,5 +1,6 @@ // @ts-ignore -import IEmailAdapter, { XcEmail } from '../../../../../interface/IEmailAdapter'; +import type { XcEmail } from '../../../../../interface/IEmailAdapter'; +import type IEmailAdapter from '../../../../../interface/IEmailAdapter'; export default // @ts-ignore class SES implements IEmailAdapter { diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/SMTP.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/SMTP.ts index d8eb5f1cae..ff42521242 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/SMTP.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/SMTP.ts @@ -1,8 +1,9 @@ // @ts-ignore import nodemailer from 'nodemailer'; -import Mail from 'nodemailer/lib/mailer'; +import type Mail from 'nodemailer/lib/mailer'; -import IEmailAdapter, { XcEmail } from '../../../../../interface/IEmailAdapter'; +import type { XcEmail } from '../../../../../interface/IEmailAdapter'; +import type IEmailAdapter from '../../../../../interface/IEmailAdapter'; export default // @ts-ignore class SMTP implements IEmailAdapter { diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/storage/Local.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/storage/Local.ts index a03aaa2591..f145979636 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/storage/Local.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/storage/Local.ts @@ -4,7 +4,7 @@ import { promisify } from 'util'; import mkdirp from 'mkdirp'; -import { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import NcConfigFactory from '../../../../utils/NcConfigFactory'; import axios from 'axios'; diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/azure.ts b/packages/nocodb/src/lib/v1-legacy/plugins/azure.ts index c7af393be3..01ef941eea 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/azure.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/azure.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Azure Storage', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/brand.ts b/packages/nocodb/src/lib/v1-legacy/plugins/brand.ts index 719a53dbfe..ab35cf421f 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/brand.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/brand.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Branding', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/cache.ts b/packages/nocodb/src/lib/v1-legacy/plugins/cache.ts index 3fc34c0a01..2396d2f596 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/cache.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/cache.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Metadata LRU Cache', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/discord.ts b/packages/nocodb/src/lib/v1-legacy/plugins/discord.ts index baed027a9c..74d9e9ae1f 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/discord.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/discord.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Discord', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/ee.ts b/packages/nocodb/src/lib/v1-legacy/plugins/ee.ts index f264413785..dce92301c3 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/ee.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/ee.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Enterprise Edition', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/githubAuth.ts b/packages/nocodb/src/lib/v1-legacy/plugins/githubAuth.ts index 9d8fffacbb..7047e520f3 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/githubAuth.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/githubAuth.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Github Auth', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/googleAuth.ts b/packages/nocodb/src/lib/v1-legacy/plugins/googleAuth.ts index b3c0d9934f..f25bf0e8a9 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/googleAuth.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/googleAuth.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Google Auth', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/mattermost.ts b/packages/nocodb/src/lib/v1-legacy/plugins/mattermost.ts index edc81f4cef..04c7fc8a1b 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/mattermost.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/mattermost.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Mattermost', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/ses.ts b/packages/nocodb/src/lib/v1-legacy/plugins/ses.ts index e5f4b5272b..7f7ea7323d 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/ses.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/ses.ts @@ -1,6 +1,7 @@ // @wingkwong: Deprecated. Moved to nocodb/packages/nocodb/src/plugins/ses instead. Keep this file for migration only. -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Amazon Simple Email Service(SES)', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/slack.ts b/packages/nocodb/src/lib/v1-legacy/plugins/slack.ts index 5b7e0399e3..ac583707a1 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/slack.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/slack.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Slack', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/smtp.ts b/packages/nocodb/src/lib/v1-legacy/plugins/smtp.ts index 14ece0cd69..a6450cc7e1 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/smtp.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/smtp.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Email SMTP', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/twilio.ts b/packages/nocodb/src/lib/v1-legacy/plugins/twilio.ts index 3b9e73bb16..715613e775 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/twilio.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/twilio.ts @@ -1,4 +1,5 @@ -import { XcActionType, XcForm, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; +import { XcActionType, XcType } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Twilio', diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestApiBuilder.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestApiBuilder.ts index 4ed70240ac..8b7ce6b92e 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestApiBuilder.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestApiBuilder.ts @@ -10,7 +10,7 @@ import { glob } from 'glob'; import mkdirp from 'mkdirp'; import { URL } from 'url'; -import { DbConfig, NcConfig } from '../../../interface/config'; +import type { DbConfig, NcConfig } from '../../../interface/config'; import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; import SwaggerXc from '../../db/sql-mgr/code/routers/xc-ts/SwaggerXc'; import SwaggerXcBt from '../../db/sql-mgr/code/routers/xc-ts/SwaggerXcBt'; @@ -19,14 +19,16 @@ import ExpressXcTsRoutes from '../../db/sql-mgr/code/routes/xc-ts/ExpressXcTsRou import ExpressXcTsRoutesBt from '../../db/sql-mgr/code/routes/xc-ts/ExpressXcTsRoutesBt'; import ExpressXcTsRoutesHm from '../../db/sql-mgr/code/routes/xc-ts/ExpressXcTsRoutesHm'; import NcHelp from '../../utils/NcHelp'; -import NcProjectBuilder from '../NcProjectBuilder'; -import Noco from '../../Noco'; -import BaseApiBuilder, { - IGNORE_TABLES, +import type NcProjectBuilder from '../NcProjectBuilder'; +import type Noco from '../../Noco'; +import type { NcMetaData, XcTablesPopulateParams, } from '../../utils/common/BaseApiBuilder'; -import NcMetaIO from '../../meta/NcMetaIO'; +import BaseApiBuilder, { + IGNORE_TABLES, +} from '../../utils/common/BaseApiBuilder'; +import type NcMetaIO from '../../meta/NcMetaIO'; import { RestCtrl } from './RestCtrl'; import { RestCtrlBelongsTo } from './RestCtrlBelongsTo'; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts index 1c8f61268c..520c3dd9a8 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts @@ -10,9 +10,9 @@ import { Strategy as GoogleStrategy } from 'passport-google-oauth20'; import { ExtractJwt, Strategy } from 'passport-jwt'; import validator from 'validator'; -import { DbConfig, NcConfig } from '../../../interface/config'; -import { Knex } from '../../db/sql-data-mapper'; -import Noco from '../../Noco'; +import type { DbConfig, NcConfig } from '../../../interface/config'; +import type { Knex } from '../../db/sql-data-mapper'; +import type Noco from '../../Noco'; const autoBind = require('auto-bind'); const PassportLocalStrategy = require('passport-local').Strategy; @@ -22,13 +22,13 @@ const { v4: uuidv4 } = require('uuid'); import * as crypto from 'crypto'; -import NcMetaIO from '../../meta/NcMetaIO'; +import type NcMetaIO from '../../meta/NcMetaIO'; const { isEmail } = require('validator'); import axios from 'axios'; -import IEmailAdapter from '../../../interface/IEmailAdapter'; +import type IEmailAdapter from '../../../interface/IEmailAdapter'; import { T } from 'nc-help'; import XcCache from '../plugins/adapters/cache/XcCache'; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestBaseCtrl.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestBaseCtrl.ts index 7a5434c7c6..7c9ded5e45 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestBaseCtrl.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestBaseCtrl.ts @@ -1,7 +1,7 @@ -import { Handler, NextFunction, Request, Response, Router } from 'express'; +import type { Handler, NextFunction, Request, Response, Router } from 'express'; import Handlebars from 'handlebars'; -import { Route } from '../../../interface/config'; +import type { Route } from '../../../interface/config'; export abstract class RestBaseCtrl { public router: Router; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrl.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrl.ts index ff4e8a838e..de04891d13 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrl.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrl.ts @@ -1,11 +1,12 @@ import autoBind from 'auto-bind'; -import { NextFunction, Request, Response, Router } from 'express'; +import type { NextFunction, Request, Response } from 'express'; +import { Router } from 'express'; -import { Acl, Acls, Route } from '../../../interface/config'; -import { BaseModelSql } from '../../db/sql-data-mapper'; +import type { Acl, Acls, Route } from '../../../interface/config'; +import type { BaseModelSql } from '../../db/sql-data-mapper'; import { RestBaseCtrl } from './RestBaseCtrl'; -import { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; +import type { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; function parseHrtimeToSeconds(hrtime) { const seconds = (hrtime[0] + hrtime[1] / 1e6).toFixed(3); diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlBelongsTo.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlBelongsTo.ts index 8e9a99e643..0222c52cae 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlBelongsTo.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlBelongsTo.ts @@ -1,8 +1,8 @@ import autoBind from 'auto-bind'; -import { NextFunction, Request, Response } from 'express'; +import type { NextFunction, Request, Response } from 'express'; -import { Acl, Acls, Route } from '../../../interface/config'; -import { BaseModelSql } from '../../db/sql-data-mapper'; +import type { Acl, Acls, Route } from '../../../interface/config'; +import type { BaseModelSql } from '../../db/sql-data-mapper'; import { RestBaseCtrl } from './RestBaseCtrl'; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlCustom.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlCustom.ts index 347724098b..0b472a29c1 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlCustom.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlCustom.ts @@ -1,8 +1,9 @@ import autoBind from 'auto-bind'; -import { NextFunction, Request, Response, Router } from 'express'; +import type { NextFunction, Request, Response } from 'express'; +import { Router } from 'express'; -import { Route } from '../../../interface/config'; -import { BaseModelSql } from '../../db/sql-data-mapper'; +import type { Route } from '../../../interface/config'; +import type { BaseModelSql } from '../../db/sql-data-mapper'; import { RestBaseCtrl } from './RestBaseCtrl'; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlHasMany.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlHasMany.ts index 735d492a93..f12196b5fc 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlHasMany.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlHasMany.ts @@ -1,8 +1,8 @@ import autoBind from 'auto-bind'; -import { NextFunction, Request, Response } from 'express'; +import type { NextFunction, Request, Response } from 'express'; -import { Acl, Acls, Route } from '../../../interface/config'; -import { BaseModelSql } from '../../db/sql-data-mapper'; +import type { Acl, Acls, Route } from '../../../interface/config'; +import type { BaseModelSql } from '../../db/sql-data-mapper'; import { RestBaseCtrl } from './RestBaseCtrl'; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlMin.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlMin.ts index bb90f51b13..92d4aad690 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlMin.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlMin.ts @@ -1,8 +1,8 @@ import autoBind from 'auto-bind'; -import { Request, Response, Router } from 'express'; +import type { Request, Response, Router } from 'express'; -import { Acls } from '../../../interface/config'; -import { BaseModelSql } from '../../db/sql-data-mapper'; +import type { Acls } from '../../../interface/config'; +import type { BaseModelSql } from '../../db/sql-data-mapper'; function parseHrtimeToSeconds(hrtime) { const seconds = (hrtime[0] + hrtime[1] / 1e6).toFixed(3); diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlProcedure.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlProcedure.ts index c32016da00..9aa31cbbd5 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlProcedure.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlProcedure.ts @@ -1,10 +1,10 @@ import autoBind from 'auto-bind'; -import { Handler, NextFunction, Request, Response, Router } from 'express'; +import type { Handler, NextFunction, Request, Response, Router } from 'express'; import BaseProcedure from '../../utils/common/BaseProcedure'; import XcProcedure from '../../utils/common/XcProcedure'; -import { RestApiBuilder } from './RestApiBuilder'; +import type { RestApiBuilder } from './RestApiBuilder'; export class RestCtrlProcedure extends BaseProcedure { private acls: { [aclName: string]: { [role: string]: boolean } }; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlv2.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlv2.ts index e84621d43c..05ab899fe1 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlv2.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlv2.ts @@ -1,10 +1,10 @@ import autoBind from 'auto-bind'; -import { Router } from 'express'; +import type { Router } from 'express'; -import { Acls } from '../../../interface/config'; -import { BaseModelSql } from '../../db/sql-data-mapper'; +import type { Acls } from '../../../interface/config'; +import type { BaseModelSql } from '../../db/sql-data-mapper'; -import { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; +import type { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; // import { nocoExecute } from '../v1-legacy-resolver/NocoExecute'; // function parseHrtimeToSeconds(hrtime) { diff --git a/packages/nocodb/src/lib/v1-legacy/templates/NcTemplateParser.ts b/packages/nocodb/src/lib/v1-legacy/templates/NcTemplateParser.ts index fd9c47f11f..629361581e 100644 --- a/packages/nocodb/src/lib/v1-legacy/templates/NcTemplateParser.ts +++ b/packages/nocodb/src/lib/v1-legacy/templates/NcTemplateParser.ts @@ -1,12 +1,5 @@ -import { - MssqlUi, - MysqlUi, - OracleUi, - PgUi, - SqliteUi, - SqlUiFactory, - UITypes, -} from 'nocodb-sdk'; +import type { MssqlUi, MysqlUi, OracleUi, PgUi, SqliteUi } from 'nocodb-sdk'; +import { SqlUiFactory, UITypes } from 'nocodb-sdk'; export default class NcTemplateParser { sqlUi: diff --git a/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts index 7a1c945f22..ce4b7b526b 100644 --- a/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts @@ -1,7 +1,7 @@ -import { NcConfig } from '../../interface/config'; +import type { NcConfig } from '../../interface/config'; import debug from 'debug'; -import NcMetaIO from '../meta/NcMetaIO'; +import type NcMetaIO from '../meta/NcMetaIO'; import { T } from 'nc-help'; import ncProjectEnvUpgrader from './ncProjectEnvUpgrader'; import ncProjectEnvUpgrader0011045 from './ncProjectEnvUpgrader0011045'; diff --git a/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader.ts index 03c9913c09..8aea109e19 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader.ts @@ -1,11 +1,12 @@ -import { Knex } from 'knex'; -import { NcUpgraderCtx } from './NcUpgrader'; +import type { Knex } from 'knex'; +import type { NcUpgraderCtx } from './NcUpgrader'; import { MetaTable } from '../utils/globals'; import Base from '../models/Base'; import Model from '../models/Model'; -import { XKnex } from '../db/sql-data-mapper/index'; +import type { XKnex } from '../db/sql-data-mapper/index'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; -import { BaseType, UITypes } from 'nocodb-sdk'; +import type { BaseType } from 'nocodb-sdk'; +import { UITypes } from 'nocodb-sdk'; import { throwTimeoutError } from './ncUpgradeErrors'; // before 0.103.0, an attachment object was like diff --git a/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader_0104002.ts b/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader_0104002.ts index 13ef464913..62bf56fd19 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader_0104002.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader_0104002.ts @@ -1,11 +1,12 @@ -import { Knex } from 'knex'; -import { NcUpgraderCtx } from './NcUpgrader'; +import type { Knex } from 'knex'; +import type { NcUpgraderCtx } from './NcUpgrader'; import { MetaTable } from '../utils/globals'; import Base from '../models/Base'; import Model from '../models/Model'; -import { XKnex } from '../db/sql-data-mapper/index'; +import type { XKnex } from '../db/sql-data-mapper/index'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; -import { BaseType, UITypes } from 'nocodb-sdk'; +import type { BaseType } from 'nocodb-sdk'; +import { UITypes } from 'nocodb-sdk'; import { throwTimeoutError } from './ncUpgradeErrors'; // after 0101002 upgrader, the attachment object would become broken when diff --git a/packages/nocodb/src/lib/version-upgrader/ncDataTypesUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncDataTypesUpgrader.ts index 4c4f240cee..53bc82a0ea 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncDataTypesUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncDataTypesUpgrader.ts @@ -1,6 +1,6 @@ import { UITypes } from 'nocodb-sdk'; import { MetaTable } from '../utils/globals'; -import { NcUpgraderCtx } from './NcUpgrader'; +import type { NcUpgraderCtx } from './NcUpgrader'; // The Count and AutoNumber types are removed // so convert all existing Count and AutoNumber fields to Number type diff --git a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts index 6c250bd04c..f1490cac9d 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts @@ -1,4 +1,4 @@ -import { NcUpgraderCtx } from './NcUpgrader'; +import type { NcUpgraderCtx } from './NcUpgrader'; import { MetaTable } from '../utils/globals'; import View from '../models/View'; import Hook from '../models/Hook'; diff --git a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts index da12e72113..6140af6ae5 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts @@ -1,10 +1,11 @@ -import { NcUpgraderCtx } from './NcUpgrader'; +import type { NcUpgraderCtx } from './NcUpgrader'; import { MetaTable } from '../utils/globals'; -import NcMetaIO from '../meta/NcMetaIO'; +import type NcMetaIO from '../meta/NcMetaIO'; import Column from '../models/Column'; import Filter from '../models/Filter'; import Project from '../models/Project'; -import { SelectOptionsType, UITypes } from 'nocodb-sdk'; +import type { SelectOptionsType } from 'nocodb-sdk'; +import { UITypes } from 'nocodb-sdk'; // as of 0.104.3, almost all filter operators are available to all column types // while some of them aren't supposed to be shown diff --git a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0105003.ts b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0105003.ts index a2f6362bde..8b54f31857 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0105003.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0105003.ts @@ -1,6 +1,6 @@ -import { NcUpgraderCtx } from './NcUpgrader'; +import type { NcUpgraderCtx } from './NcUpgrader'; import { MetaTable } from '../utils/globals'; -import NcMetaIO from '../meta/NcMetaIO'; +import type NcMetaIO from '../meta/NcMetaIO'; import Column from '../models/Column'; import Filter from '../models/Filter'; import { UITypes } from 'nocodb-sdk'; diff --git a/packages/nocodb/src/lib/version-upgrader/ncProjectEnvUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncProjectEnvUpgrader.ts index 65ae9203e7..328365d68e 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncProjectEnvUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncProjectEnvUpgrader.ts @@ -1,4 +1,4 @@ -import { NcUpgraderCtx } from './NcUpgrader'; +import type { NcUpgraderCtx } from './NcUpgrader'; export default async function (ctx: NcUpgraderCtx) { const projects = await ctx.ncMeta.projectList(); diff --git a/packages/nocodb/src/lib/version-upgrader/ncProjectEnvUpgrader0011045.ts b/packages/nocodb/src/lib/version-upgrader/ncProjectEnvUpgrader0011045.ts index df089a8f7f..56fd587ca3 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncProjectEnvUpgrader0011045.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncProjectEnvUpgrader0011045.ts @@ -1,4 +1,4 @@ -import { NcUpgraderCtx } from './NcUpgrader'; +import type { NcUpgraderCtx } from './NcUpgrader'; export default async function (ctx: NcUpgraderCtx) { const projects = await ctx.ncMeta.projectList(); diff --git a/packages/nocodb/src/lib/version-upgrader/ncProjectRolesUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncProjectRolesUpgrader.ts index b8402a5c17..5dffe02964 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncProjectRolesUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncProjectRolesUpgrader.ts @@ -2,7 +2,7 @@ import { OrgUserRoles } from 'nocodb-sdk'; import { NC_APP_SETTINGS } from '../constants'; import Store from '../models/Store'; import { MetaTable } from '../utils/globals'; -import { NcUpgraderCtx } from './NcUpgrader'; +import type { NcUpgraderCtx } from './NcUpgrader'; /** Upgrader for upgrading roles */ export default async function ({ ncMeta }: NcUpgraderCtx) { diff --git a/packages/nocodb/src/lib/version-upgrader/ncProjectUpgraderV2_0090000.ts b/packages/nocodb/src/lib/version-upgrader/ncProjectUpgraderV2_0090000.ts index c77ae0b9e9..30141afed1 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncProjectUpgraderV2_0090000.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncProjectUpgraderV2_0090000.ts @@ -1,25 +1,26 @@ -import { NcUpgraderCtx } from './NcUpgrader'; +import type { NcUpgraderCtx } from './NcUpgrader'; import Noco from '../Noco'; import User from '../models/User'; import Project from '../models/Project'; import ProjectUser from '../models/ProjectUser'; import Model from '../models/Model'; +import type { ViewType } from 'nocodb-sdk'; import { ModelTypes, substituteColumnAliasWithIdInFormula, UITypes, - ViewType, ViewTypes, } from 'nocodb-sdk'; import Column from '../models/Column'; -import LinkToAnotherRecordColumn from '../models/LinkToAnotherRecordColumn'; +import type LinkToAnotherRecordColumn from '../models/LinkToAnotherRecordColumn'; import NcHelp from '../utils/NcHelp'; -import RollupColumn, { ROLLUP_FUNCTIONS } from '../models/RollupColumn'; +import type { ROLLUP_FUNCTIONS } from '../models/RollupColumn'; +import type RollupColumn from '../models/RollupColumn'; import View from '../models/View'; -import GridView from '../models/GridView'; -import KanbanView from '../models/KanbanView'; -import FormView from '../models/FormView'; -import GalleryView from '../models/GalleryView'; +import type GridView from '../models/GridView'; +import type KanbanView from '../models/KanbanView'; +import type FormView from '../models/FormView'; +import type GalleryView from '../models/GalleryView'; import Sort from '../models/Sort'; import Filter from '../models/Filter'; import ModelRoleVisibility from '../models/ModelRoleVisibility'; diff --git a/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts index 1fa222cd17..c7ed7f616d 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts @@ -1,4 +1,4 @@ -import { NcUpgraderCtx } from './NcUpgrader'; +import type { NcUpgraderCtx } from './NcUpgrader'; import { MetaTable } from '../utils/globals'; // before 0.104.3, display value column can be in any position in table