diff --git a/package.json b/package.json index 0ae95966..e20a7a7a 100644 --- a/package.json +++ b/package.json @@ -173,6 +173,7 @@ "rollup": "*", "rollup-plugin-swc": "0.2.1", "socket.io": "4.5.4", + "source-map-support": "*", "ts-node": "10.9.1", "tsconfig-paths": "4.1.2", "typescript": "4.9.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef24f789..88a882de 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -121,6 +121,7 @@ importers: slugify: 1.6.5 snakecase-keys: 5.4.4 socket.io: 4.5.4 + source-map-support: '*' ts-node: 10.9.1 tsconfig-paths: 4.1.2 typescript: 4.9.4 @@ -250,6 +251,7 @@ importers: rollup: 3.10.0 rollup-plugin-swc: 0.2.1_de5ysct6uccdfq5hxeqm6o6wmq socket.io: 4.5.4 + source-map-support: 0.5.21 ts-node: 10.9.1_wi43jz256d2xml2r3owu6bqlae tsconfig-paths: 4.1.2 typescript: 4.9.4 diff --git a/src/app.controller.ts b/src/app.controller.ts index bfd76c0a..d1d2b304 100644 --- a/src/app.controller.ts +++ b/src/app.controller.ts @@ -7,14 +7,14 @@ import { } from '@nestjs/common' import { ApiTags } from '@nestjs/swagger' -import { ApiController } from '~/common/decorator/api-controller.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' import { InjectModel } from '~/transformers/model.transformer' import PKG from '../package.json' import { DEMO_MODE } from './app.config' -import { Auth } from './common/decorator/auth.decorator' -import { HttpCache } from './common/decorator/cache.decorator' -import { IpLocation, IpRecord } from './common/decorator/ip.decorator' +import { Auth } from './common/decorators/auth.decorator' +import { HttpCache } from './common/decorators/cache.decorator' +import { IpLocation, IpRecord } from './common/decorators/ip.decorator' import { AllowAllCorsInterceptor } from './common/interceptors/allow-all-cors.interceptor' import { RedisKeys } from './constants/cache.constant' import { OptionModel } from './modules/configs/configs.model' diff --git a/src/app.module.ts b/src/app.module.ts index c1d966a4..14344f33 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -4,7 +4,7 @@ import { APP_FILTER, APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core' import { DEMO_MODE } from './app.config' import { AppController } from './app.controller' import { AllExceptionsFilter } from './common/filters/any-exception.filter' -import { RolesGuard } from './common/guard/roles.guard' +import { RolesGuard } from './common/guards/roles.guard' import { AnalyzeInterceptor } from './common/interceptors/analyze.interceptor' import { HttpCacheInterceptor } from './common/interceptors/cache.interceptor' import { CountingInterceptor } from './common/interceptors/counting.interceptor' diff --git a/src/bootstrap.ts b/src/bootstrap.ts index cb9ad3ea..2f0343d0 100644 --- a/src/bootstrap.ts +++ b/src/bootstrap.ts @@ -10,7 +10,7 @@ import { API_VERSION, CROSS_DOMAIN, PORT } from './app.config' import { AppModule } from './app.module' import { fastifyApp } from './common/adapters/fastify.adapter' import { RedisIoAdapter } from './common/adapters/socket.adapter' -import { SpiderGuard } from './common/guard/spider.guard' +import { SpiderGuard } from './common/guards/spider.guard' import { LoggingInterceptor } from './common/interceptors/logging.interceptor' import { AggregateByTenantContextIdStrategy } from './common/strategies/context.strategy' import { isMainProcess, isTest } from './global/env.global' diff --git a/src/common/decorator/api-controller.decorator.ts b/src/common/decorators/api-controller.decorator.ts similarity index 100% rename from src/common/decorator/api-controller.decorator.ts rename to src/common/decorators/api-controller.decorator.ts diff --git a/src/common/decorator/auth.decorator.ts b/src/common/decorators/auth.decorator.ts similarity index 91% rename from src/common/decorator/auth.decorator.ts rename to src/common/decorators/auth.decorator.ts index 9ee13c4a..52a4a4ba 100644 --- a/src/common/decorator/auth.decorator.ts +++ b/src/common/decorators/auth.decorator.ts @@ -3,7 +3,7 @@ import { ApiBearerAuth, ApiUnauthorizedResponse } from '@nestjs/swagger' import { SECURITY } from '~/app.config' -import { AuthGuard } from '../guard/auth.guard' +import { AuthGuard } from '../guards/auth.guard' export function Auth() { const decorators: (ClassDecorator | PropertyDecorator | MethodDecorator)[] = diff --git a/src/common/decorator/cache.decorator.ts b/src/common/decorators/cache.decorator.ts similarity index 100% rename from src/common/decorator/cache.decorator.ts rename to src/common/decorators/cache.decorator.ts diff --git a/src/common/decorator/cookie.decorator.ts b/src/common/decorators/cookie.decorator.ts similarity index 100% rename from src/common/decorator/cookie.decorator.ts rename to src/common/decorators/cookie.decorator.ts diff --git a/src/common/decorator/cron-description.decorator.ts b/src/common/decorators/cron-description.decorator.ts similarity index 100% rename from src/common/decorator/cron-description.decorator.ts rename to src/common/decorators/cron-description.decorator.ts diff --git a/src/common/decorator/cron-once.decorator.ts b/src/common/decorators/cron-once.decorator.ts similarity index 100% rename from src/common/decorator/cron-once.decorator.ts rename to src/common/decorators/cron-once.decorator.ts diff --git a/src/common/decorator/current-user.decorator.ts b/src/common/decorators/current-user.decorator.ts similarity index 100% rename from src/common/decorator/current-user.decorator.ts rename to src/common/decorators/current-user.decorator.ts diff --git a/src/common/decorator/demo.decorator.ts b/src/common/decorators/demo.decorator.ts similarity index 100% rename from src/common/decorator/demo.decorator.ts rename to src/common/decorators/demo.decorator.ts diff --git a/src/common/decorator/http.decorator.ts b/src/common/decorators/http.decorator.ts similarity index 100% rename from src/common/decorator/http.decorator.ts rename to src/common/decorators/http.decorator.ts diff --git a/src/common/decorator/ip.decorator.ts b/src/common/decorators/ip.decorator.ts similarity index 100% rename from src/common/decorator/ip.decorator.ts rename to src/common/decorators/ip.decorator.ts diff --git a/src/common/decorator/openapi.decorator.ts b/src/common/decorators/openapi.decorator.ts similarity index 100% rename from src/common/decorator/openapi.decorator.ts rename to src/common/decorators/openapi.decorator.ts diff --git a/src/common/decorator/response-filter.decorator.ts b/src/common/decorators/response-filter.decorator.ts similarity index 100% rename from src/common/decorator/response-filter.decorator.ts rename to src/common/decorators/response-filter.decorator.ts diff --git a/src/common/decorator/role.decorator.ts b/src/common/decorators/role.decorator.ts similarity index 100% rename from src/common/decorator/role.decorator.ts rename to src/common/decorators/role.decorator.ts diff --git a/src/common/decorator/update-count.decorator.ts b/src/common/decorators/update-count.decorator.ts similarity index 100% rename from src/common/decorator/update-count.decorator.ts rename to src/common/decorators/update-count.decorator.ts diff --git a/src/common/guard/auth.guard.ts b/src/common/guards/auth.guard.ts similarity index 100% rename from src/common/guard/auth.guard.ts rename to src/common/guards/auth.guard.ts diff --git a/src/common/guard/roles.guard.ts b/src/common/guards/roles.guard.ts similarity index 100% rename from src/common/guard/roles.guard.ts rename to src/common/guards/roles.guard.ts diff --git a/src/common/guard/spider.guard.ts b/src/common/guards/spider.guard.ts similarity index 100% rename from src/common/guard/spider.guard.ts rename to src/common/guards/spider.guard.ts diff --git a/src/modules/aggregate/aggregate.controller.ts b/src/modules/aggregate/aggregate.controller.ts index a0f33761..703cf1cf 100644 --- a/src/modules/aggregate/aggregate.controller.ts +++ b/src/modules/aggregate/aggregate.controller.ts @@ -3,10 +3,10 @@ import { omit } from 'lodash' import { CacheKey, CacheTTL, Get, Query } from '@nestjs/common' import { ApiProperty } from '@nestjs/swagger' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' -import { IsMaster } from '~/common/decorator/role.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' +import { IsMaster } from '~/common/decorators/role.decorator' import { CacheKeys } from '~/constants/cache.constant' import { AnalyzeService } from '../analyze/analyze.service' diff --git a/src/modules/analyze/analyze.controller.ts b/src/modules/analyze/analyze.controller.ts index e1891a18..65b2b6b5 100644 --- a/src/modules/analyze/analyze.controller.ts +++ b/src/modules/analyze/analyze.controller.ts @@ -2,10 +2,10 @@ import dayjs from 'dayjs' import { Delete, Get, HttpCode, Query } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { Paginator } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { Paginator } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { RedisKeys } from '~/constants/cache.constant' import { CacheService } from '~/processors/redis/cache.service' import { PagerDto } from '~/shared/dto/pager.dto' diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts index 5baf4f31..70e7b4dc 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -17,9 +17,9 @@ import { } from '@nestjs/common' import { EventEmitter2 } from '@nestjs/event-emitter' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { EventBusEvents } from '~/constants/event-bus.constant' import { MongoIdDto } from '~/shared/dto/id.dto' diff --git a/src/modules/backup/backup.controller.ts b/src/modules/backup/backup.controller.ts index e7f3397d..58ad269d 100644 --- a/src/modules/backup/backup.controller.ts +++ b/src/modules/backup/backup.controller.ts @@ -16,11 +16,11 @@ import { } from '@nestjs/common' import { ApiProperty, ApiResponseProperty } from '@nestjs/swagger' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { BanInDemo } from '~/common/decorator/demo.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { BanInDemo } from '~/common/decorators/demo.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { UploadService } from '~/processors/helper/helper.upload.service' import { getMediumDateTime } from '~/utils' diff --git a/src/modules/category/category.controller.ts b/src/modules/category/category.controller.ts index 210201c9..c22a287c 100644 --- a/src/modules/category/category.controller.ts +++ b/src/modules/category/category.controller.ts @@ -16,10 +16,10 @@ import { } from '@nestjs/common' import { ApiQuery } from '@nestjs/swagger' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { CannotFindException } from '~/common/exceptions/cant-find.exception' import { NoContentCanBeModifiedException } from '~/common/exceptions/no-content-canbe-modified.exception' import { MongoIdDto } from '~/shared/dto/id.dto' diff --git a/src/modules/comment/comment.controller.ts b/src/modules/comment/comment.controller.ts index 42af5cf0..85a892b7 100644 --- a/src/modules/comment/comment.controller.ts +++ b/src/modules/comment/comment.controller.ts @@ -16,13 +16,13 @@ import { import { ApiOperation, ApiParam } from '@nestjs/swagger' import { DocumentType } from '@typegoose/typegoose' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { CurrentUser } from '~/common/decorator/current-user.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { IpLocation, IpRecord } from '~/common/decorator/ip.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' -import { IsMaster } from '~/common/decorator/role.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { CurrentUser } from '~/common/decorators/current-user.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { IpLocation, IpRecord } from '~/common/decorators/ip.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' +import { IsMaster } from '~/common/decorators/role.decorator' import { BizException } from '~/common/exceptions/biz.exception' import { CannotFindException } from '~/common/exceptions/cant-find.exception' import { NoContentCanBeModifiedException } from '~/common/exceptions/no-content-canbe-modified.exception' diff --git a/src/modules/debug/debug.controller.ts b/src/modules/debug/debug.controller.ts index 9b7b3c37..a6dac848 100644 --- a/src/modules/debug/debug.controller.ts +++ b/src/modules/debug/debug.controller.ts @@ -1,8 +1,8 @@ import { Body, Get, Post, Query, Request, Response } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { BusinessEvents, EventScope } from '~/constants/business-event.constant' import { EventManagerService } from '~/processors/helper/helper.event.service' diff --git a/src/modules/demo/demo.module.ts b/src/modules/demo/demo.module.ts index 9afe4960..0312f17e 100644 --- a/src/modules/demo/demo.module.ts +++ b/src/modules/demo/demo.module.ts @@ -3,7 +3,7 @@ import { resolve } from 'path' import { Module } from '@nestjs/common' import { CronExpression } from '@nestjs/schedule' -import { CronOnce } from '~/common/decorator/cron-once.decorator' +import { CronOnce } from '~/common/decorators/cron-once.decorator' import { AssetService } from '~/processors/helper/helper.asset.service' import { BackupModule } from '../backup/backup.module' diff --git a/src/modules/dependency/dependency.controller.ts b/src/modules/dependency/dependency.controller.ts index 6168d128..0a77716b 100644 --- a/src/modules/dependency/dependency.controller.ts +++ b/src/modules/dependency/dependency.controller.ts @@ -3,10 +3,10 @@ import { Observable } from 'rxjs' import { BadRequestException, Get, Query, Sse } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { DATA_DIR } from '~/constants/path.constant' import { installPKG } from '~/utils' diff --git a/src/modules/feed/feed.controller.ts b/src/modules/feed/feed.controller.ts index 26803dbe..14e38127 100644 --- a/src/modules/feed/feed.controller.ts +++ b/src/modules/feed/feed.controller.ts @@ -2,8 +2,8 @@ import xss from 'xss' import { CacheKey, CacheTTL, Controller, Get, Header } from '@nestjs/common' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { CacheKeys } from '~/constants/cache.constant' import { AggregateService } from '../aggregate/aggregate.service' diff --git a/src/modules/file/file.controller.ts b/src/modules/file/file.controller.ts index f27b9b56..15fd7c2d 100644 --- a/src/modules/file/file.controller.ts +++ b/src/modules/file/file.controller.ts @@ -5,11 +5,11 @@ import { customAlphabet } from 'nanoid/async' import { Delete, Get, Param, Post, Query, Req, Res } from '@nestjs/common' import { Throttle } from '@nestjs/throttler' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { BanInDemo } from '~/common/decorator/demo.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { BanInDemo } from '~/common/decorators/demo.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { CannotFindException } from '~/common/exceptions/cant-find.exception' import { alphabet } from '~/constants/other.constant' import { UploadService } from '~/processors/helper/helper.upload.service' diff --git a/src/modules/health/health.controller.ts b/src/modules/health/health.controller.ts index 38938a57..05f4ed41 100644 --- a/src/modules/health/health.controller.ts +++ b/src/modules/health/health.controller.ts @@ -1,10 +1,10 @@ import { Get } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HttpCache } from '~/common/decorator/cache.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HttpCache } from '~/common/decorators/cache.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { EmailService } from '~/processors/helper/helper.email.service' @ApiController('health') diff --git a/src/modules/health/sub-controller/cron.controller.ts b/src/modules/health/sub-controller/cron.controller.ts index e9adbbec..b1e05948 100644 --- a/src/modules/health/sub-controller/cron.controller.ts +++ b/src/modules/health/sub-controller/cron.controller.ts @@ -12,11 +12,11 @@ import { Reflector } from '@nestjs/core' import { SchedulerRegistry } from '@nestjs/schedule' import { SCHEDULE_CRON_OPTIONS } from '@nestjs/schedule/dist/schedule.constants' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { BanInDemo } from '~/common/decorator/demo.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { BanInDemo } from '~/common/decorators/demo.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { CRON_DESCRIPTION } from '~/constants/meta.constant' import { CronService } from '~/processors/helper/helper.cron.service' import { TaskQueueService } from '~/processors/helper/helper.tq.service' diff --git a/src/modules/health/sub-controller/log.controller.ts b/src/modules/health/sub-controller/log.controller.ts index 02b54e31..42c055d9 100644 --- a/src/modules/health/sub-controller/log.controller.ts +++ b/src/modules/health/sub-controller/log.controller.ts @@ -10,10 +10,10 @@ import { UnprocessableEntityException, } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { LOG_DIR } from '~/constants/path.constant' import { AdapterResponse } from '~/types/request' import { formatByteSize } from '~/utils' diff --git a/src/modules/init/init.controller.ts b/src/modules/init/init.controller.ts index d7bdca74..273e9a5f 100644 --- a/src/modules/init/init.controller.ts +++ b/src/modules/init/init.controller.ts @@ -8,8 +8,8 @@ import { UnprocessableEntityException, } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { ConfigsService } from '../configs/configs.service' import { ConfigKeyDto } from '../option/dtos/config.dto' diff --git a/src/modules/link/link.controller.ts b/src/modules/link/link.controller.ts index f505304f..07718e30 100644 --- a/src/modules/link/link.controller.ts +++ b/src/modules/link/link.controller.ts @@ -11,11 +11,11 @@ import { Query, } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators, Paginator } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' -import { IsMaster } from '~/common/decorator/role.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators, Paginator } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' +import { IsMaster } from '~/common/decorators/role.decorator' import { MongoIdDto } from '~/shared/dto/id.dto' import { PagerDto } from '~/shared/dto/pager.dto' import { diff --git a/src/modules/markdown/markdown.controller.ts b/src/modules/markdown/markdown.controller.ts index 0766d866..ab6be5ca 100644 --- a/src/modules/markdown/markdown.controller.ts +++ b/src/modules/markdown/markdown.controller.ts @@ -6,10 +6,10 @@ import { Readable } from 'stream' import { Body, CacheTTL, Get, Header, Param, Post, Query } from '@nestjs/common' import { ApiProperty } from '@nestjs/swagger' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { ArticleTypeEnum } from '~/constants/article.constant' import { MongoIdDto } from '~/shared/dto/id.dto' diff --git a/src/modules/note/note.controller.ts b/src/modules/note/note.controller.ts index e33b6143..410eeaaa 100644 --- a/src/modules/note/note.controller.ts +++ b/src/modules/note/note.controller.ts @@ -14,13 +14,13 @@ import { } from '@nestjs/common' import { ApiOperation } from '@nestjs/swagger' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators, Paginator } from '~/common/decorator/http.decorator' -import { IpLocation, IpRecord } from '~/common/decorator/ip.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' -import { IsMaster } from '~/common/decorator/role.decorator' -import { VisitDocument } from '~/common/decorator/update-count.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators, Paginator } from '~/common/decorators/http.decorator' +import { IpLocation, IpRecord } from '~/common/decorators/ip.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' +import { IsMaster } from '~/common/decorators/role.decorator' +import { VisitDocument } from '~/common/decorators/update-count.decorator' import { CannotFindException } from '~/common/exceptions/cant-find.exception' import { CountingService } from '~/processors/helper/helper.counting.service' import { TextMacroService } from '~/processors/helper/helper.macro.service' diff --git a/src/modules/option/controllers/base.option.controller.ts b/src/modules/option/controllers/base.option.controller.ts index 310759c6..4fc35033 100644 --- a/src/modules/option/controllers/base.option.controller.ts +++ b/src/modules/option/controllers/base.option.controller.ts @@ -9,8 +9,8 @@ import { UnprocessableEntityException, } from '@nestjs/common' -import { BanInDemo } from '~/common/decorator/demo.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' +import { BanInDemo } from '~/common/decorators/demo.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' import { IConfig } from '~/modules/configs/configs.interface' import { ConfigsService } from '~/modules/configs/configs.service' import { classToJsonSchema } from '~/utils/jsonschema.util' diff --git a/src/modules/option/option.decorator.ts b/src/modules/option/option.decorator.ts index 936bf8f7..7389b82f 100644 --- a/src/modules/option/option.decorator.ts +++ b/src/modules/option/option.decorator.ts @@ -1,8 +1,8 @@ import { applyDecorators } from '@nestjs/common' import { ApiTags } from '@nestjs/swagger' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' export function OptionController(name?: string, postfixRoute?: string) { const routes = ['options', 'config'] diff --git a/src/modules/page/page.controller.ts b/src/modules/page/page.controller.ts index 1337cca2..91589f3b 100644 --- a/src/modules/page/page.controller.ts +++ b/src/modules/page/page.controller.ts @@ -10,10 +10,10 @@ import { UnprocessableEntityException, } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators, Paginator } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators, Paginator } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { CannotFindException } from '~/common/exceptions/cant-find.exception' import { TextMacroService } from '~/processors/helper/helper.macro.service' import { MongoIdDto } from '~/shared/dto/id.dto' diff --git a/src/modules/pageproxy/pageproxy.controller.ts b/src/modules/pageproxy/pageproxy.controller.ts index 5bf842be..b842e7d4 100644 --- a/src/modules/pageproxy/pageproxy.controller.ts +++ b/src/modules/pageproxy/pageproxy.controller.ts @@ -15,9 +15,9 @@ import { Res, } from '@nestjs/common' -import { Cookies } from '~/common/decorator/cookie.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { Cookies } from '~/common/decorators/cookie.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { RedisKeys } from '~/constants/cache.constant' import { LOCAL_ADMIN_ASSET_PATH } from '~/constants/path.constant' import { CacheService } from '~/processors/redis/cache.service' diff --git a/src/modules/post/post.controller.ts b/src/modules/post/post.controller.ts index 3701cb14..a762e8b6 100644 --- a/src/modules/post/post.controller.ts +++ b/src/modules/post/post.controller.ts @@ -14,12 +14,12 @@ import { } from '@nestjs/common' import { ApiOperation } from '@nestjs/swagger' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators, Paginator } from '~/common/decorator/http.decorator' -import { IpLocation, IpRecord } from '~/common/decorator/ip.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' -import { VisitDocument } from '~/common/decorator/update-count.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators, Paginator } from '~/common/decorators/http.decorator' +import { IpLocation, IpRecord } from '~/common/decorators/ip.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' +import { VisitDocument } from '~/common/decorators/update-count.decorator' import { CannotFindException } from '~/common/exceptions/cant-find.exception' import { CountingService } from '~/processors/helper/helper.counting.service' import { MongoIdDto } from '~/shared/dto/id.dto' diff --git a/src/modules/pty/pty.controller.ts b/src/modules/pty/pty.controller.ts index 2fb2ab4e..cf93127a 100644 --- a/src/modules/pty/pty.controller.ts +++ b/src/modules/pty/pty.controller.ts @@ -1,8 +1,8 @@ import { Get } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { PTYService } from './pty.service' diff --git a/src/modules/recently/recently.controller.ts b/src/modules/recently/recently.controller.ts index 21d4be3f..73290cc6 100644 --- a/src/modules/recently/recently.controller.ts +++ b/src/modules/recently/recently.controller.ts @@ -8,11 +8,11 @@ import { Query, } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { IpLocation, IpRecord } from '~/common/decorator/ip.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { IpLocation, IpRecord } from '~/common/decorators/ip.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { MongoIdDto } from '~/shared/dto/id.dto' import { OffsetDto } from '~/shared/dto/pager.dto' diff --git a/src/modules/render/render.controller.ts b/src/modules/render/render.controller.ts index b05fce26..f6606912 100644 --- a/src/modules/render/render.controller.ts +++ b/src/modules/render/render.controller.ts @@ -15,11 +15,11 @@ import { Query, } from '@nestjs/common' -import { Auth } from '~/common/decorator/auth.decorator' -import { HttpCache } from '~/common/decorator/cache.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' -import { IsMaster } from '~/common/decorator/role.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HttpCache } from '~/common/decorators/cache.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' +import { IsMaster } from '~/common/decorators/role.decorator' import { MongoIdDto } from '~/shared/dto/id.dto' import { getShortDateTime } from '~/utils' diff --git a/src/modules/search/search.controller.ts b/src/modules/search/search.controller.ts index 356abd15..2776ef0c 100644 --- a/src/modules/search/search.controller.ts +++ b/src/modules/search/search.controller.ts @@ -1,10 +1,10 @@ import { BadRequestException, Get, Param, Query } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { HttpCache } from '~/common/decorator/cache.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' -import { IsMaster } from '~/common/decorator/role.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { HttpCache } from '~/common/decorators/cache.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' +import { IsMaster } from '~/common/decorators/role.decorator' import { SearchDto } from '~/modules/search/search.dto' import { SearchService } from './search.service' diff --git a/src/modules/serverless/serverless.controller.ts b/src/modules/serverless/serverless.controller.ts index 4ab39c10..e0570bfe 100644 --- a/src/modules/serverless/serverless.controller.ts +++ b/src/modules/serverless/serverless.controller.ts @@ -12,11 +12,11 @@ import { Response, } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' -import { IsMaster } from '~/common/decorator/role.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' +import { IsMaster } from '~/common/decorators/role.decorator' import { AssetService } from '~/processors/helper/helper.asset.service' import { SnippetType } from '../snippet/snippet.model' diff --git a/src/modules/sitemap/sitemap.controller.ts b/src/modules/sitemap/sitemap.controller.ts index 0f277944..e51e712b 100644 --- a/src/modules/sitemap/sitemap.controller.ts +++ b/src/modules/sitemap/sitemap.controller.ts @@ -1,7 +1,7 @@ import { CacheKey, CacheTTL, Controller, Get, Header } from '@nestjs/common' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { CacheKeys } from '~/constants/cache.constant' import { AggregateService } from '../aggregate/aggregate.service' diff --git a/src/modules/snippet/snippet.controller.ts b/src/modules/snippet/snippet.controller.ts index b0d03df1..615dcd2e 100644 --- a/src/modules/snippet/snippet.controller.ts +++ b/src/modules/snippet/snippet.controller.ts @@ -11,12 +11,12 @@ import { UnprocessableEntityException, } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { BanInDemo } from '~/common/decorator/demo.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' -import { IsMaster } from '~/common/decorator/role.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { BanInDemo } from '~/common/decorators/demo.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' +import { IsMaster } from '~/common/decorators/role.decorator' import { MongoIdDto } from '~/shared/dto/id.dto' import { PagerDto } from '~/shared/dto/pager.dto' import { transformDataToPaginate } from '~/transformers/paginate.transformer' diff --git a/src/modules/tool/tool.controller.ts b/src/modules/tool/tool.controller.ts index e185652d..6870614c 100644 --- a/src/modules/tool/tool.controller.ts +++ b/src/modules/tool/tool.controller.ts @@ -1,9 +1,9 @@ import { CacheTTL, Get, Param, Query } from '@nestjs/common' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HttpCache } from '~/common/decorator/cache.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HttpCache } from '~/common/decorators/cache.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { RedisKeys } from '~/constants/cache.constant' import { CacheService } from '~/processors/redis/cache.service' import { getRedisKey } from '~/utils/redis.util' diff --git a/src/modules/update/update.controller.ts b/src/modules/update/update.controller.ts index cfdba25a..56ed065d 100644 --- a/src/modules/update/update.controller.ts +++ b/src/modules/update/update.controller.ts @@ -5,10 +5,10 @@ import { lt, major, minor } from 'semver' import { Query, Sse } from '@nestjs/common' import { dashboard } from '~/../package.json' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators } from '~/common/decorator/http.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators } from '~/common/decorators/http.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' import { LOCAL_ADMIN_ASSET_PATH } from '~/constants/path.constant' import { UpdateAdminDto } from './update.dto' diff --git a/src/modules/user/user.controller.ts b/src/modules/user/user.controller.ts index 3b9a9043..92407051 100644 --- a/src/modules/user/user.controller.ts +++ b/src/modules/user/user.controller.ts @@ -10,17 +10,17 @@ import { } from '@nestjs/common' import { ApiOperation } from '@nestjs/swagger' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HttpCache } from '~/common/decorator/cache.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HttpCache } from '~/common/decorators/cache.decorator' import { CurrentUser, CurrentUserToken, -} from '~/common/decorator/current-user.decorator' -import { BanInDemo } from '~/common/decorator/demo.decorator' -import { IpLocation, IpRecord } from '~/common/decorator/ip.decorator' -import { ApiName } from '~/common/decorator/openapi.decorator' -import { IsMaster } from '~/common/decorator/role.decorator' +} from '~/common/decorators/current-user.decorator' +import { BanInDemo } from '~/common/decorators/demo.decorator' +import { IpLocation, IpRecord } from '~/common/decorators/ip.decorator' +import { ApiName } from '~/common/decorators/openapi.decorator' +import { IsMaster } from '~/common/decorators/role.decorator' import { getAvatar } from '~/utils' import { AuthService } from '../auth/auth.service' diff --git a/src/processors/helper/helper.cron.service.ts b/src/processors/helper/helper.cron.service.ts index 08cc2466..ae72a8cc 100644 --- a/src/processors/helper/helper.cron.service.ts +++ b/src/processors/helper/helper.cron.service.ts @@ -8,8 +8,8 @@ import { OnEvent } from '@nestjs/event-emitter' import { CronExpression } from '@nestjs/schedule' import { DEMO_MODE } from '~/app.config' -import { CronDescription } from '~/common/decorator/cron-description.decorator' -import { CronOnce } from '~/common/decorator/cron-once.decorator' +import { CronDescription } from '~/common/decorators/cron-description.decorator' +import { CronOnce } from '~/common/decorators/cron-once.decorator' import { RedisKeys } from '~/constants/cache.constant' import { EventBusEvents } from '~/constants/event-bus.constant' import { LOG_DIR, TEMP_DIR } from '~/constants/path.constant' diff --git a/src/transformers/crud-factor.transformer.ts b/src/transformers/crud-factor.transformer.ts index 1d8a2d1f..404e6711 100644 --- a/src/transformers/crud-factor.transformer.ts +++ b/src/transformers/crud-factor.transformer.ts @@ -15,9 +15,9 @@ import { import { ApiTags, PartialType } from '@nestjs/swagger' import { AnyParamConstructor } from '@typegoose/typegoose/lib/types' -import { ApiController } from '~/common/decorator/api-controller.decorator' -import { Auth } from '~/common/decorator/auth.decorator' -import { HTTPDecorators, Paginator } from '~/common/decorator/http.decorator' +import { ApiController } from '~/common/decorators/api-controller.decorator' +import { Auth } from '~/common/decorators/auth.decorator' +import { HTTPDecorators, Paginator } from '~/common/decorators/http.decorator' import { EventScope } from '~/constants/business-event.constant' import { EventManagerService } from '~/processors/helper/helper.event.service' import { MongoIdDto } from '~/shared/dto/id.dto' diff --git a/test/helper/db-mock.helper copy.ts b/test/helper/db-mock.helper copy.ts deleted file mode 100644 index 70f8fa9e..00000000 --- a/test/helper/db-mock.helper copy.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { MongoMemoryServer } from 'mongodb-memory-server' -import mongoose from 'mongoose' -import { nanoid } from 'nanoid/async' - -import { getModelForClass } from '@typegoose/typegoose' -import { - AnyParamConstructor, - BeAnObject, - IModelOptions, - ReturnModelType, -} from '@typegoose/typegoose/lib/types' - -let mongod: MongoMemoryServer - -const dbMap = new Map() -/** - - * Connect to mock memory db. - */ -const connect = async () => { - mongod = await MongoMemoryServer.create() - const uri = mongod.getUri() - - const mongooseInstance = await mongoose.connect(uri, { - autoIndex: true, - maxPoolSize: 10, - }) - const id = await nanoid() - dbMap.set(id, mongooseInstance) - return id -} - -/** - * Close db connection - */ -const closeDatabase = async (id: string) => { - const mongoose = dbMap.get(id) - if (!mongoose) { - return - } - await mongoose.connection.dropDatabase() - await mongoose.connection.close() - dbMap.delete(id) - if (dbMap.size === 0) await mongod.stop() -} - -/** - * Delete db collections - */ -const clearDatabase = async (id: string) => { - const mongoose = dbMap.get(id) - if (!mongoose) { - return - } - const collections = mongoose.connection.collections - - for (const key in collections) { - const collection = collections[key] - await collection.deleteMany({}) - } -} - -export const dbHelper = { - connect, - close: () => closeDatabase(), - clear: () => clearDatabase(), - - getModel, QueryHelpers = BeAnObject>( - cl: U, - options?: IModelOptions, - ): ReturnModelType { - return getModelForClass(cl, options) - }, -} diff --git a/vitest.config.ts b/vitest.config.ts index 435d0720..c8f39910 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -21,7 +21,9 @@ const swcPlugin = (() => { const originalTransform = plugin.transform! + // @ts-ignore const transform = function (...args: Parameters) { + // @ts-ignore if (!args[1].endsWith('html')) return originalTransform.apply(this, args) } @@ -54,6 +56,7 @@ export default defineConfig({ esbuild: false, plugins: [ + // @ts-ignore swcPlugin, tsconfigPath({ projects: [ @@ -63,7 +66,7 @@ export default defineConfig({ }), { - name: 'a-vitest-plugin-that-changes-config', + name: 'vitest-plugin', config: () => ({ test: { setupFiles: ['./setupFiles/lifecycle.ts'],