Revert "Feat/codecov"

lukeautry · Jan 23, 2024 · df7d14f · df7d14f
1 parent 579dc5e
commit df7d14f
Show file tree

Hide file tree

Showing 92 changed files with 101 additions and 937 deletions.
diff --git a/.github/workflows/runTestsOnPush.yml b/.github/workflows/runTestsOnPush.yml
@@ -50,10 +50,4 @@ jobs:
         run: yarn run lint
 
       - name: Test
-        run: yarn run test:coverage
-
-      - name: Coverage reports to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          files: ./coverage/lcov.info
-          move_coverage_to_trash: true
+        run: yarn run test
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,10 @@
 dist
 distForNoAdditional
 node_modules
-**/custom-route-generator/routes/*
-.idea/
-.nyc_output/
-coverage/
-
 routes.ts
 customRoutes.ts
+**/custom-route-generator/routes/*
+.idea/
 *.swp
 yarn-error.log
 tsconfig.tsbuildinfo
diff --git a/package.json b/package.json
@@ -36,7 +36,6 @@
     "prepare": "yarn build",
     "preversion": "yarn test",
     "test": "lerna run test --stream",
-    "test:coverage": "lerna run test:coverage --stream",
     "lint": "eslint . --ext .ts",
     "lint:fix": "yarn run eslint --ext .ts --fix",
     "watch": "lerna run watch",

diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
@@ -9,11 +9,11 @@ export * from './decorators/route';
 export * from './decorators/security';
 export * from './decorators/extension';
 export * from './decorators/middlewares';
-export * from './decorators/response';
 export * from './interfaces/controller';
 export * from './interfaces/response';
 export * from './interfaces/iocModule';
 export * from './interfaces/file';
+export * from './decorators/response';
 export * from './metadataGeneration/tsoa';
 export * from './routeGeneration/templateHelpers';
 export * from './routeGeneration/tsoa-route';

diff --git a/tests/.nycrc.json b/tests/.nycrc.json
diff --git a/tests/esm/fixtures/controllers/securityController.ts b/tests/esm/fixtures/controllers/securityController.ts
@@ -1,8 +1,4 @@
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Security } from '@tsoa/runtime/decorators/security';
-
+import { Controller, Get, Route, Security } from '@tsoa/runtime';
 import type { TestModel } from '../testModel.js';
 
 @Security('tsoa_auth')

diff --git a/tests/esm/fixtures/express/rootController.ts b/tests/esm/fixtures/express/rootController.ts
@@ -1,7 +1,4 @@
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-
+import { Controller, Get, Route } from '@tsoa/runtime';
 import type { TestModel } from '../testModel.js';
 
 @Route()

diff --git a/tests/fixtures/controllers/commonResponseHeaderClassController.ts b/tests/fixtures/controllers/commonResponseHeaderClassController.ts
@@ -1,8 +1,4 @@
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { Response } from '@tsoa/runtime/decorators/response';
-
+import { Controller, Get, Route, Response } from '@tsoa/runtime';
 
 /**
  * Common response header's description

diff --git a/tests/fixtures/controllers/commonResponseHeaderObjectController.ts b/tests/fixtures/controllers/commonResponseHeaderObjectController.ts
@@ -1,8 +1,4 @@
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { Response } from '@tsoa/runtime/decorators/response';
-
+import { Controller, Get, Route, Response } from '@tsoa/runtime';
 
 @Route('CommonResponseHeaderObject')
 @Response<

diff --git a/tests/fixtures/controllers/commonResponseHiddenModelController.ts b/tests/fixtures/controllers/commonResponseHiddenModelController.ts
@@ -1,8 +1,4 @@
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route, Hidden } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { Response } from '@tsoa/runtime/decorators/response';
-
+import { Controller, Get, Route, Response, Hidden } from '@tsoa/runtime';
 
 interface ToHideModel {
   something: string;

diff --git a/tests/fixtures/controllers/controllerWithCommonResponses.ts b/tests/fixtures/controllers/controllerWithCommonResponses.ts
@@ -1,8 +1,4 @@
-import { Get, Post } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { Response } from '@tsoa/runtime/decorators/response';
-
+import { Controller, Get, Response, Post, Route } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 import { ErrorResponseModel, TestModel } from '../testModel';
 

diff --git a/tests/fixtures/controllers/controllerWithJsDocResponseDescription.ts b/tests/fixtures/controllers/controllerWithJsDocResponseDescription.ts
@@ -1,8 +1,4 @@
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { SuccessResponse } from '@tsoa/runtime/decorators/response';
-
+import { Controller, Get, Route, SuccessResponse } from '@tsoa/runtime';
 import { TestModel } from '../testModel';
 import { ModelService } from 'fixtures/services/modelService';
 

diff --git a/tests/fixtures/controllers/controllerWithRenamedModelImport.ts b/tests/fixtures/controllers/controllerWithRenamedModelImport.ts
@@ -1,7 +1,4 @@
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-
+import { Controller, Get, Route } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 import { TestModel as TestModelRenamed } from '../testModel';
 

diff --git a/tests/fixtures/controllers/deleteController.ts b/tests/fixtures/controllers/deleteController.ts
@@ -1,7 +1,4 @@
-import { Query } from '@tsoa/runtime/decorators/parameter';
-import { Delete } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-
+import { Delete, Query, Route } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 import { TestModel } from '../testModel';
 

diff --git a/tests/fixtures/controllers/deprecatedController.ts b/tests/fixtures/controllers/deprecatedController.ts
@@ -1,8 +1,4 @@
-import { Deprecated } from '@tsoa/runtime/decorators/deprecated';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-
+import { Controller, Get, Route, Deprecated } from '@tsoa/runtime';
 import { TestModel } from '../../fixtures/testModel';
 import { ModelService } from '../services/modelService';
 

diff --git a/tests/fixtures/controllers/duplicateMethodsController.ts b/tests/fixtures/controllers/duplicateMethodsController.ts
@@ -1,6 +1,4 @@
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-
+import { Route, Get } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 
 @Route('GetTest')

diff --git a/tests/fixtures/controllers/duplicatePathParamController.ts b/tests/fixtures/controllers/duplicatePathParamController.ts
@@ -1,7 +1,4 @@
-import { Path } from '@tsoa/runtime/decorators/parameter';
-import { Get, Post, Delete, Head } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-
+import { Route, Get, Post, Path, Delete, Head } from '@tsoa/runtime';
 
 @Route('GetTest')
 export class DuplicatePathParamTestController {

diff --git a/tests/fixtures/controllers/exampleController.ts b/tests/fixtures/controllers/exampleController.ts
@@ -1,10 +1,4 @@
-import { Example } from '@tsoa/runtime/decorators/example';
-import { Path, Query, Header, Body, BodyProp } from '@tsoa/runtime/decorators/parameter';
-import { Get, Post } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { TsoaResponse } from '@tsoa/runtime/interfaces/response';
-import { Res, Produces } from '@tsoa/runtime/decorators/response';
-
+import { Route, Get, Path, Query, Header, Post, Body, BodyProp, Example, Res, TsoaResponse, Produces } from '@tsoa/runtime';
 import { exampleResponse } from './consts';
 
 /**

diff --git a/tests/fixtures/controllers/getController.ts b/tests/fixtures/controllers/getController.ts
@@ -1,15 +1,6 @@
 ///<reference path="../tsoaTestModule.d.ts" />
 import { Readable } from 'stream';
-import { Example } from '@tsoa/runtime/decorators/example';
-import { Query, Request, Queries } from '@tsoa/runtime/decorators/parameter';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Tags } from '@tsoa/runtime/decorators/tags';
-import { OperationId } from '@tsoa/runtime/decorators/operationid';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { TsoaResponse } from '@tsoa/runtime/interfaces/response';
-import { Response, SuccessResponse, Res } from '@tsoa/runtime/decorators/response';
-
+import { Controller, Example, Get, OperationId, Query, Request, Response, Route, SuccessResponse, Tags, Res, TsoaResponse, Queries } from '@tsoa/runtime';
 import '../duplicateTestModel';
 import {
   GenericModel,

diff --git a/tests/fixtures/controllers/headController.ts b/tests/fixtures/controllers/headController.ts
@@ -1,7 +1,4 @@
-import { Query } from '@tsoa/runtime/decorators/parameter';
-import { Head } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-
+import { Head, Query, Route } from '@tsoa/runtime';
 
 @Route('HeadTest')
 export class HeadTestController {

diff --git a/tests/fixtures/controllers/hiddenController.ts b/tests/fixtures/controllers/hiddenController.ts
@@ -1,7 +1,4 @@
-import { Get, Post } from '@tsoa/runtime/decorators/methods';
-import { Hidden, Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-
+import { Controller, Get, Hidden, Post, Route } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 import { TestModel } from '../testModel';
 

diff --git a/tests/fixtures/controllers/hiddenMethodController.ts b/tests/fixtures/controllers/hiddenMethodController.ts
@@ -1,8 +1,4 @@
-import { Query } from '@tsoa/runtime/decorators/parameter';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Hidden, Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-
+import { Controller, Get, Hidden, Route, Query } from '@tsoa/runtime';
 import { TestModel } from '../../fixtures/testModel';
 import { ModelService } from '../services/modelService';
 

diff --git a/tests/fixtures/controllers/incorrectResponseHeaderController.ts b/tests/fixtures/controllers/incorrectResponseHeaderController.ts
@@ -1,8 +1,4 @@
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { Response } from '@tsoa/runtime/decorators/response';
-
+import { Controller, Get, Response, Route } from '@tsoa/runtime';
 
 @Route('IncorrectResponseHeader')
 @Response<null, any>(200)

diff --git a/tests/fixtures/controllers/injectParameterController.ts b/tests/fixtures/controllers/injectParameterController.ts
@@ -1,8 +1,4 @@
-import { Query, Inject } from '@tsoa/runtime/decorators/parameter';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-
+import { Controller, Get, Query, Inject, Route } from '@tsoa/runtime';
 import { TestModel } from '../../fixtures/testModel';
 import { ModelService } from '../services/modelService';
 

diff --git a/tests/fixtures/controllers/invalidExampleController.ts b/tests/fixtures/controllers/invalidExampleController.ts
@@ -1,8 +1,4 @@
-import { Body } from '@tsoa/runtime/decorators/parameter';
-import { Post } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-
+import { Route, Controller, Post, Body } from '@tsoa/runtime';
 
 @Route('ExampleTest')
 export class InvalidExampleController extends Controller {

diff --git a/tests/fixtures/controllers/invalidExtensionController.ts b/tests/fixtures/controllers/invalidExtensionController.ts
@@ -1,7 +1,4 @@
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Extension } from '@tsoa/runtime/decorators/extension';
-
+import { Get, Route, Extension } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 import { TestModel } from '../testModel';
 

diff --git a/tests/fixtures/controllers/invalidExtensionModelController.ts b/tests/fixtures/controllers/invalidExtensionModelController.ts
@@ -1,6 +1,4 @@
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-
+import { Get, Route } from '@tsoa/runtime';
 
 interface InvalidExtension {
   /**

diff --git a/tests/fixtures/controllers/invalidGetController.ts b/tests/fixtures/controllers/invalidGetController.ts
@@ -1,7 +1,4 @@
-import { Query } from '@tsoa/runtime/decorators/parameter';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-
+import { Get, Query, Route } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 import { TestModel } from '../testModel';
 

diff --git a/tests/fixtures/controllers/invalidHeaderController.ts b/tests/fixtures/controllers/invalidHeaderController.ts
@@ -1,8 +1,4 @@
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { TsoaResponse } from '@tsoa/runtime/interfaces/response';
-import { Res } from '@tsoa/runtime/decorators/response';
-
+import { Get, Res, Route, TsoaResponse } from '@tsoa/runtime';
 
 @Route('/')
 export class InvalidHeaderTestController {

diff --git a/tests/fixtures/controllers/invalidNestedQueriesController.ts b/tests/fixtures/controllers/invalidNestedQueriesController.ts
@@ -1,8 +1,4 @@
-import { Queries } from '@tsoa/runtime/decorators/parameter';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-
+import { Controller, Get, Route, Queries } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 
 @Route('Controller')

diff --git a/tests/fixtures/controllers/invalidPostController.ts b/tests/fixtures/controllers/invalidPostController.ts
@@ -1,7 +1,4 @@
-import { Body } from '@tsoa/runtime/decorators/parameter';
-import { Post } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-
+import { Body, Post, Route } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 import { TestModel } from '../testModel';
 

diff --git a/tests/fixtures/controllers/invalidQueriesController.ts b/tests/fixtures/controllers/invalidQueriesController.ts
@@ -1,7 +1,4 @@
-import { Queries } from '@tsoa/runtime/decorators/parameter';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-
+import { Get, Queries, Route } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 import { TestModel } from '../testModel';
 

diff --git a/tests/fixtures/controllers/invalidQueryController.ts b/tests/fixtures/controllers/invalidQueryController.ts
@@ -1,7 +1,4 @@
-import { Queries, Query } from '@tsoa/runtime/decorators/parameter';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-
+import { Get, Queries, Query, Route } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 import { TestModel } from '../testModel';
 

diff --git a/tests/fixtures/controllers/invalidTagController.ts b/tests/fixtures/controllers/invalidTagController.ts
@@ -1,8 +1,4 @@
-import { Query } from '@tsoa/runtime/decorators/parameter';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-
+import { Route, Get, Query, Controller } from '@tsoa/runtime';
 
 @Route('TagTest')
 export class InvalidTagController extends Controller {

diff --git a/tests/fixtures/controllers/mediaTypeController.ts b/tests/fixtures/controllers/mediaTypeController.ts
@@ -1,10 +1,4 @@
-import { Body, Consumes, Path } from '@tsoa/runtime/decorators/parameter';
-import { Get, Post } from '@tsoa/runtime/decorators/methods';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { TsoaResponse } from '@tsoa/runtime/interfaces/response';
-import { Produces, Response, Res, SuccessResponse } from '@tsoa/runtime/decorators/response';
-
+import { Body, Consumes, Controller, Get, Produces, Path, Post, Response, Res, Route, SuccessResponse, TsoaResponse } from '@tsoa/runtime';
 import { ErrorResponseModel, UserResponseModel } from '../../fixtures/testModel';
 
 type UserRequestModel = Pick<UserResponseModel, 'name'>;

diff --git a/tests/fixtures/controllers/methodController.ts b/tests/fixtures/controllers/methodController.ts
@@ -1,12 +1,4 @@
-import { Example } from '@tsoa/runtime/decorators/example';
-import { Options, Delete, Get, Patch, Post, Put } from '@tsoa/runtime/decorators/methods';
-import { Tags } from '@tsoa/runtime/decorators/tags';
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Security } from '@tsoa/runtime/decorators/security';
-import { Extension } from '@tsoa/runtime/decorators/extension';
-import { Controller } from '@tsoa/runtime/interfaces/controller';
-import { Response, SuccessResponse } from '@tsoa/runtime/decorators/response';
-
+import { Controller, Extension, Options, Delete, Get, Patch, Post, Put, Response, Route, Security, SuccessResponse, Tags, Example } from '@tsoa/runtime';
 import { ModelService } from '../services/modelService';
 import { ErrorResponseModel, TestModel, TestModel as RenamedModel } from '../testModel';
 

diff --git a/tests/fixtures/controllers/middlewaresExpressController.ts b/tests/fixtures/controllers/middlewaresExpressController.ts
@@ -1,6 +1,4 @@
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Middlewares as GenericMiddlewares } from '@tsoa/runtime';
+import { Route, Get, Middlewares as GenericMiddlewares } from '@tsoa/runtime';
 
 import type { Request as ExpressRequest, Response as ExpressResponse, NextFunction as ExpressNextFunction, RequestHandler } from 'express';
 

diff --git a/tests/fixtures/controllers/middlewaresHapiController.ts b/tests/fixtures/controllers/middlewaresHapiController.ts
@@ -1,6 +1,4 @@
-import { Route } from '@tsoa/runtime/decorators/route';
-import { Get } from '@tsoa/runtime/decorators/methods';
-import { Middlewares as GenericMiddlewares } from '@tsoa/runtime';
+import { Route, Get, Middlewares as GenericMiddlewares } from '@tsoa/runtime';
 
 import type { Request, ResponseToolkit, RouteOptionsPreAllOptions } from '@hapi/hapi';