diff --git a/deno-example/example/example-controller.ts b/deno-example/example/example-controller.ts index 84e1e3bbf..5bf81b945 100644 --- a/deno-example/example/example-controller.ts +++ b/deno-example/example/example-controller.ts @@ -1,4 +1,4 @@ -import { Route, Body, Post, Get, Controller } from "@tsoa/runtime"; +import { Route, Body, Post, Get, Controller } from "@tsoa-deno/runtime"; interface EmbeddingRequest { input?: string diff --git a/lerna.json b/lerna.json index 9f5f19fe0..e439bc7c2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "6.1.0", + "version": "6.1.0-rc.3", "npmClient": "yarn", "command": { "version": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 9086df30b..89e1413a6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,5 +1,5 @@ { - "name": "@tsoa/cli", + "name": "@tsoa-deno/cli", "description": "Build swagger-compliant REST APIs using TypeScript and Node / Deno", "version": "6.1.0-rc.3", "main": "./dist/index.js", @@ -32,7 +32,7 @@ "author": "Luke Autry (http://www.lukeautry.com)", "license": "MIT", "dependencies": { - "@tsoa/runtime": "^6.1.0-rc.3", + "@tsoa-deno/runtime": "^6.1.0-rc.3", "@types/multer": "^1.4.11", "fs-extra": "^11.2.0", "glob": "^10.3.10", @@ -60,7 +60,7 @@ "url": "https://github.com/lukeautry/tsoa.git" }, "bin": { - "tsoa": "dist/cli.js" + "tsoa-deno": "dist/cli.js" }, "engines": { "yarn": ">=1.9.4", diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts index a1b3a31e8..843920958 100644 --- a/packages/cli/src/cli.ts +++ b/packages/cli/src/cli.ts @@ -2,7 +2,7 @@ import YAML from 'yamljs'; import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; -import { Config, RoutesConfig, SpecConfig, Tsoa } from '@tsoa/runtime'; +import { Config, RoutesConfig, SpecConfig, Tsoa } from '@tsoa-deno/runtime'; import { MetadataGenerator } from './metadataGeneration/metadataGenerator'; import { generateRoutes } from './module/generate-routes'; import { generateSpec } from './module/generate-spec'; @@ -29,7 +29,7 @@ const getPackageJsonValue = async (key: string, defaultValue = ''): Promise getPackageJsonValue('name', 'TSOA'); const versionDefault = () => getPackageJsonValue('version', '1.0.0'); -const descriptionDefault = () => getPackageJsonValue('description', 'Build swagger-compliant REST APIs using TypeScript and Node'); +const descriptionDefault = () => getPackageJsonValue('description', 'Build swagger-compliant REST APIs using TypeScript and Node / Deno'); const licenseDefault = () => getPackageJsonValue('license', 'MIT'); const determineNoImplicitAdditionalSetting = (noImplicitAdditionalProperties: Config['noImplicitAdditionalProperties']): Exclude => { if (noImplicitAdditionalProperties === 'silently-remove-extras' || noImplicitAdditionalProperties === 'throw-on-extras' || noImplicitAdditionalProperties === 'ignore') { diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index cd42e1e33..09d3a9c4d 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -5,5 +5,5 @@ export { HapiTemplateService } from './routeGeneration/templates/hapi/hapiTempla export { KoaTemplateService } from './routeGeneration/templates/koa/koaTemplateService'; export { AbstractRouteGenerator } from './routeGeneration/routeGenerator'; export { DefaultRouteGenerator } from './routeGeneration/defaultRouteGenerator'; -export { Config } from '@tsoa/runtime'; +export { Config } from '@tsoa-deno/runtime'; export * from './cli'; diff --git a/packages/cli/src/metadataGeneration/controllerGenerator.ts b/packages/cli/src/metadataGeneration/controllerGenerator.ts index ad3bc54da..2e9069cde 100644 --- a/packages/cli/src/metadataGeneration/controllerGenerator.ts +++ b/packages/cli/src/metadataGeneration/controllerGenerator.ts @@ -3,7 +3,7 @@ import { GenerateMetadataError } from './exceptions'; import { MetadataGenerator } from './metadataGenerator'; import { MethodGenerator } from './methodGenerator'; import { TypeResolver } from './typeResolver'; -import { Tsoa } from '@tsoa/runtime'; +import { Tsoa } from '@tsoa-deno/runtime'; import { getHeaderType } from '../utils/headerTypeHelpers'; import { isMethodDeclaration, type ClassDeclaration, type CallExpression, type StringLiteral } from 'typescript'; diff --git a/packages/cli/src/metadataGeneration/extension.ts b/packages/cli/src/metadataGeneration/extension.ts index 08ee2ffc4..852f618e2 100644 --- a/packages/cli/src/metadataGeneration/extension.ts +++ b/packages/cli/src/metadataGeneration/extension.ts @@ -1,7 +1,7 @@ import * as ts from 'typescript'; import { getInitializerValue, isNonUndefinedInitializerValue } from './initializer-value'; import { MetadataGenerator } from './metadataGenerator'; -import { Tsoa } from '@tsoa/runtime'; +import { Tsoa } from '@tsoa-deno/runtime'; import { safeFromJson } from '../utils/jsonUtils'; export function getExtensions(decorators: ts.Identifier[], metadataGenerator: MetadataGenerator): Tsoa.Extension[] { diff --git a/packages/cli/src/metadataGeneration/initializer-value.ts b/packages/cli/src/metadataGeneration/initializer-value.ts index c9811af82..c57886bfc 100644 --- a/packages/cli/src/metadataGeneration/initializer-value.ts +++ b/packages/cli/src/metadataGeneration/initializer-value.ts @@ -1,5 +1,5 @@ import * as ts from 'typescript'; -import { Tsoa } from '@tsoa/runtime'; +import { Tsoa } from '@tsoa-deno/runtime'; const hasInitializer = (node: ts.Node): node is ts.HasInitializer => Object.prototype.hasOwnProperty.call(node, 'initializer'); const extractInitializer = (decl?: ts.Declaration) => (decl && hasInitializer(decl) && (decl.initializer as ts.Expression)) || undefined; diff --git a/packages/cli/src/metadataGeneration/metadataGenerator.ts b/packages/cli/src/metadataGeneration/metadataGenerator.ts index 4646e2773..4032e80fc 100644 --- a/packages/cli/src/metadataGeneration/metadataGenerator.ts +++ b/packages/cli/src/metadataGeneration/metadataGenerator.ts @@ -1,4 +1,4 @@ -import { Config, Tsoa } from '@tsoa/runtime'; +import { Config, Tsoa } from '@tsoa-deno/runtime'; import { minimatch } from 'minimatch'; import { createProgram, forEachChild, isClassDeclaration, type ClassDeclaration, type CompilerOptions, type Program, type TypeChecker } from 'typescript'; import { getDecorators } from '../utils/decoratorUtils'; diff --git a/packages/cli/src/metadataGeneration/methodGenerator.ts b/packages/cli/src/metadataGeneration/methodGenerator.ts index 1d7b6b95f..a90b47e66 100644 --- a/packages/cli/src/metadataGeneration/methodGenerator.ts +++ b/packages/cli/src/metadataGeneration/methodGenerator.ts @@ -8,7 +8,7 @@ import { GenerateMetadataError } from './exceptions'; import { MetadataGenerator } from './metadataGenerator'; import { ParameterGenerator } from './parameterGenerator'; -import { Tsoa } from '@tsoa/runtime'; +import { Tsoa } from '@tsoa-deno/runtime'; import { TypeResolver } from './typeResolver'; import { getHeaderType } from '../utils/headerTypeHelpers'; diff --git a/packages/cli/src/metadataGeneration/parameterGenerator.ts b/packages/cli/src/metadataGeneration/parameterGenerator.ts index dc6c6164b..a71681b38 100644 --- a/packages/cli/src/metadataGeneration/parameterGenerator.ts +++ b/packages/cli/src/metadataGeneration/parameterGenerator.ts @@ -5,7 +5,7 @@ import { getParameterValidators } from './../utils/validatorUtils'; import { GenerateMetadataError } from './exceptions'; import { getInitializerValue } from './initializer-value'; import { MetadataGenerator } from './metadataGenerator'; -import { Tsoa } from '@tsoa/runtime'; +import { Tsoa } from '@tsoa-deno/runtime'; import { TypeResolver } from './typeResolver'; import { getHeaderType } from '../utils/headerTypeHelpers'; diff --git a/packages/cli/src/metadataGeneration/typeResolver.ts b/packages/cli/src/metadataGeneration/typeResolver.ts index 2ed06248a..cb1552dee 100644 --- a/packages/cli/src/metadataGeneration/typeResolver.ts +++ b/packages/cli/src/metadataGeneration/typeResolver.ts @@ -1,4 +1,4 @@ -import { assertNever, Tsoa } from '@tsoa/runtime'; +import { assertNever, Tsoa } from '@tsoa-deno/runtime'; import * as ts from 'typescript'; import { safeFromJson } from '../utils/jsonUtils'; import { getDecorators, getNodeFirstDecoratorValue, isDecorator } from './../utils/decoratorUtils'; diff --git a/packages/cli/src/module/generate-routes.ts b/packages/cli/src/module/generate-routes.ts index b1a14c7cd..add4c2535 100644 --- a/packages/cli/src/module/generate-routes.ts +++ b/packages/cli/src/module/generate-routes.ts @@ -1,11 +1,11 @@ import * as ts from 'typescript'; import { ExtendedRoutesConfig } from '../cli'; import { MetadataGenerator } from '../metadataGeneration/metadataGenerator'; -import { Tsoa } from '@tsoa/runtime'; +import { Tsoa } from '@tsoa-deno/runtime'; import { DefaultRouteGenerator } from '../routeGeneration/defaultRouteGenerator'; import { fsMkDir } from '../utils/fs'; import path = require('path'); -import { Config as BaseConfig } from "@tsoa/runtime"; +import { Config as BaseConfig } from "@tsoa-deno/runtime"; export async function generateRoutes( routesConfig: Config, diff --git a/packages/cli/src/module/generate-spec.ts b/packages/cli/src/module/generate-spec.ts index 8e7f12a02..8910b197b 100644 --- a/packages/cli/src/module/generate-spec.ts +++ b/packages/cli/src/module/generate-spec.ts @@ -2,7 +2,7 @@ import * as ts from 'typescript'; import * as YAML from 'yamljs'; import { ExtendedSpecConfig } from '../cli'; import { MetadataGenerator } from '../metadataGeneration/metadataGenerator'; -import { Tsoa, Swagger, Config } from '@tsoa/runtime'; +import { Tsoa, Swagger, Config } from '@tsoa-deno/runtime'; import { SpecGenerator2 } from '../swagger/specGenerator2'; import { SpecGenerator3 } from '../swagger/specGenerator3'; import { fsMkDir, fsWriteFile } from '../utils/fs'; diff --git a/packages/cli/src/routeGeneration/defaultRouteGenerator.ts b/packages/cli/src/routeGeneration/defaultRouteGenerator.ts index 2923044af..3e17d6220 100644 --- a/packages/cli/src/routeGeneration/defaultRouteGenerator.ts +++ b/packages/cli/src/routeGeneration/defaultRouteGenerator.ts @@ -2,7 +2,7 @@ import * as fs from 'fs'; import * as handlebars from 'handlebars'; import * as path from 'path'; import { ExtendedRoutesConfig } from '../cli'; -import { Tsoa, TsoaRoute, assertNever } from '@tsoa/runtime'; +import { Tsoa, TsoaRoute, assertNever } from '@tsoa-deno/runtime'; import { fsReadFile, fsWriteFile } from '../utils/fs'; import { convertBracesPathParams } from '../utils/pathUtils'; import { AbstractRouteGenerator } from './routeGenerator'; diff --git a/packages/cli/src/routeGeneration/routeGenerator.ts b/packages/cli/src/routeGeneration/routeGenerator.ts index 5eb470c27..eed432226 100644 --- a/packages/cli/src/routeGeneration/routeGenerator.ts +++ b/packages/cli/src/routeGeneration/routeGenerator.ts @@ -1,6 +1,6 @@ import * as path from 'path'; import { ExtendedRoutesConfig } from '../cli'; -import { Tsoa, TsoaRoute, assertNever } from '@tsoa/runtime'; +import { Tsoa, TsoaRoute, assertNever } from '@tsoa-deno/runtime'; import { isRefType } from '../utils/internalTypeGuards'; import { convertBracesPathParams, normalisePath } from '../utils/pathUtils'; import { fsExists, fsReadFile } from '../utils/fs'; diff --git a/packages/cli/src/routeGeneration/templates/express/express.hbs b/packages/cli/src/routeGeneration/templates/express/express.hbs index e9798e127..9c46620d5 100644 --- a/packages/cli/src/routeGeneration/templates/express/express.hbs +++ b/packages/cli/src/routeGeneration/templates/express/express.hbs @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa -import { TsoaRoute, fetchMiddlewares } from '@tsoa/runtime'; -import { ExpressTemplateService } from '@tsoa/cli'; +import { TsoaRoute, fetchMiddlewares } from '@tsoa-deno/runtime'; +import { ExpressTemplateService } from '@tsoa-deno/cli'; {{#each controllers}} // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa import { {{name}} } from '{{modulePath}}'; @@ -13,7 +13,7 @@ import { expressAuthentication } from '{{authenticationModule}}'; {{/if}} {{#if iocModule}} import { iocContainer } from '{{iocModule}}'; -import type { IocContainer, IocContainerFactory } from '@tsoa/runtime'; +import type { IocContainer, IocContainerFactory } from '@tsoa-deno/runtime'; {{/if}} import type { Request as ExRequest, Response as ExResponse, RequestHandler, Router } from 'express'; {{#if useFileUploads}} diff --git a/packages/cli/src/routeGeneration/templates/express/expressTemplateService.ts b/packages/cli/src/routeGeneration/templates/express/expressTemplateService.ts index 270ae2a84..1ef9d6166 100644 --- a/packages/cli/src/routeGeneration/templates/express/expressTemplateService.ts +++ b/packages/cli/src/routeGeneration/templates/express/expressTemplateService.ts @@ -1,5 +1,5 @@ import { Request as ExRequest, Response as ExResponse, NextFunction as ExNext } from 'express'; -import { Controller, FieldErrors, TsoaRoute, ValidateError } from '@tsoa/runtime'; +import { Controller, FieldErrors, TsoaRoute, ValidateError } from '@tsoa-deno/runtime'; import { TemplateService } from '../templateService'; diff --git a/packages/cli/src/routeGeneration/templates/hapi/hapi.hbs b/packages/cli/src/routeGeneration/templates/hapi/hapi.hbs index 45c9b48cb..946c8fe3d 100644 --- a/packages/cli/src/routeGeneration/templates/hapi/hapi.hbs +++ b/packages/cli/src/routeGeneration/templates/hapi/hapi.hbs @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa -import { TsoaRoute, fetchMiddlewares } from '@tsoa/runtime'; -import { HapiTemplateService } from '@tsoa/cli'; +import { TsoaRoute, fetchMiddlewares } from '@tsoa-deno/runtime'; +import { HapiTemplateService } from '@tsoa-deno/cli'; {{#each controllers}} // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa import { {{name}} } from '{{modulePath}}'; @@ -13,7 +13,7 @@ import { hapiAuthentication } from '{{authenticationModule}}'; {{/if}} {{#if iocModule}} import { iocContainer } from '{{iocModule}}'; -import type { IocContainer, IocContainerFactory } from '@tsoa/runtime'; +import type { IocContainer, IocContainerFactory } from '@tsoa-deno/runtime'; {{/if}} import { boomify, isBoom, type Payload } from '@hapi/boom'; import type { Request, ResponseToolkit, RouteOptionsPreAllOptions } from '@hapi/hapi'; diff --git a/packages/cli/src/routeGeneration/templates/hapi/hapiTemplateService.ts b/packages/cli/src/routeGeneration/templates/hapi/hapiTemplateService.ts index d55afa067..5cff336a4 100644 --- a/packages/cli/src/routeGeneration/templates/hapi/hapiTemplateService.ts +++ b/packages/cli/src/routeGeneration/templates/hapi/hapiTemplateService.ts @@ -1,6 +1,6 @@ import { Request as HRequest, ResponseToolkit as HResponse } from '@hapi/hapi'; import { boomify, isBoom, type Payload } from '@hapi/boom'; -import { Controller, FieldErrors, TsoaRoute, ValidateError } from '@tsoa/runtime'; +import { Controller, FieldErrors, TsoaRoute, ValidateError } from '@tsoa-deno/runtime'; import { TemplateService } from '../templateService'; diff --git a/packages/cli/src/routeGeneration/templates/hono/hono.hbs b/packages/cli/src/routeGeneration/templates/hono/hono.hbs index e263b681f..9dc5eaaf5 100644 --- a/packages/cli/src/routeGeneration/templates/hono/hono.hbs +++ b/packages/cli/src/routeGeneration/templates/hono/hono.hbs @@ -7,7 +7,7 @@ import { ValidationService, ValidateError, isTsoaContext -} from '@tsoa/runtime'; +} from '@tsoa-deno/runtime'; import { assert } from "https://deno.land/std@0.64.0/_util/assert.ts"; diff --git a/packages/cli/src/routeGeneration/templates/hono/honoTemplateService.ts b/packages/cli/src/routeGeneration/templates/hono/honoTemplateService.ts index 24e581324..88148ea5c 100644 --- a/packages/cli/src/routeGeneration/templates/hono/honoTemplateService.ts +++ b/packages/cli/src/routeGeneration/templates/hono/honoTemplateService.ts @@ -5,7 +5,7 @@ import { Readable } from 'https://deno.land/x/readable_stream@v3.6.0-deno.0.3.0/ import { encode as bufferToBase64 } from "https://deno.land/std@0.64.0/encoding/base64.ts"; import { HTTPException, Next, type Context as HonoContext } from '@hono'; -import { HttpStatusCodeLiteral, File as TsoaFile, FieldErrors, ValidateError, TsoaRoute, Controller, TemplateService } from '@tsoa/runtime'; +import { HttpStatusCodeLiteral, File as TsoaFile, FieldErrors, ValidateError, TsoaRoute, Controller, TemplateService } from '@tsoa-deno/runtime'; /** * Create a Tsoa compatible Hono context type that contains any request data available for consumption synchronously. diff --git a/packages/cli/src/routeGeneration/templates/koa/koa.hbs b/packages/cli/src/routeGeneration/templates/koa/koa.hbs index 881146532..14ed04e44 100644 --- a/packages/cli/src/routeGeneration/templates/koa/koa.hbs +++ b/packages/cli/src/routeGeneration/templates/koa/koa.hbs @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa -import { TsoaRoute, fetchMiddlewares } from '@tsoa/runtime'; -import { KoaTemplateService } from '@tsoa/cli'; +import { TsoaRoute, fetchMiddlewares } from '@tsoa-deno/runtime'; +import { KoaTemplateService } from '@tsoa-deno/cli'; {{#each controllers}} // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa import { {{name}} } from '{{modulePath}}'; @@ -13,7 +13,7 @@ import { koaAuthentication } from '{{authenticationModule}}'; {{/if}} {{#if iocModule}} import { iocContainer } from '{{iocModule}}'; -import type { IocContainer, IocContainerFactory } from '@tsoa/runtime'; +import type { IocContainer, IocContainerFactory } from '@tsoa-deno/runtime'; {{/if}} import type { Context, Next, Middleware } from 'koa'; import type * as KoaRouter from '@koa/router'; diff --git a/packages/cli/src/routeGeneration/templates/koa/koaTemplateService.ts b/packages/cli/src/routeGeneration/templates/koa/koaTemplateService.ts index 6cda579d0..82b559bc3 100644 --- a/packages/cli/src/routeGeneration/templates/koa/koaTemplateService.ts +++ b/packages/cli/src/routeGeneration/templates/koa/koaTemplateService.ts @@ -1,5 +1,5 @@ import type { Context, Next } from 'koa'; -import { Controller, FieldErrors, TsoaRoute, ValidateError } from '@tsoa/runtime'; +import { Controller, FieldErrors, TsoaRoute, ValidateError } from '@tsoa-deno/runtime'; import { TemplateService } from '../templateService'; diff --git a/packages/cli/src/routeGeneration/templates/templateService.ts b/packages/cli/src/routeGeneration/templates/templateService.ts index 8c3e313d6..a2333eb85 100644 --- a/packages/cli/src/routeGeneration/templates/templateService.ts +++ b/packages/cli/src/routeGeneration/templates/templateService.ts @@ -1,4 +1,4 @@ -import { Controller, TsoaRoute, ValidationService } from "@tsoa/runtime"; +import { Controller, TsoaRoute, ValidationService } from "@tsoa-deno/runtime"; export abstract class TemplateService { protected validationService: ValidationService; diff --git a/packages/cli/src/swagger/specGenerator.ts b/packages/cli/src/swagger/specGenerator.ts index 571515c66..028776d36 100644 --- a/packages/cli/src/swagger/specGenerator.ts +++ b/packages/cli/src/swagger/specGenerator.ts @@ -1,5 +1,5 @@ import { ExtendedSpecConfig } from '../cli'; -import { Tsoa, assertNever, Swagger } from '@tsoa/runtime'; +import { Tsoa, assertNever, Swagger } from '@tsoa-deno/runtime'; import * as handlebars from 'handlebars'; export abstract class SpecGenerator { diff --git a/packages/cli/src/swagger/specGenerator2.ts b/packages/cli/src/swagger/specGenerator2.ts index 745773b35..1ef1cfc66 100644 --- a/packages/cli/src/swagger/specGenerator2.ts +++ b/packages/cli/src/swagger/specGenerator2.ts @@ -1,6 +1,6 @@ import { merge as mergeAnything } from 'merge-anything' import { merge as deepMerge } from 'ts-deepmerge'; -import { Tsoa, assertNever, Swagger } from '@tsoa/runtime'; +import { Tsoa, assertNever, Swagger } from '@tsoa-deno/runtime'; import { SpecGenerator } from './specGenerator'; import { ExtendedSpecConfig } from '../cli'; diff --git a/packages/cli/src/swagger/specGenerator3.ts b/packages/cli/src/swagger/specGenerator3.ts index ac58ab82a..27e62ac00 100644 --- a/packages/cli/src/swagger/specGenerator3.ts +++ b/packages/cli/src/swagger/specGenerator3.ts @@ -1,6 +1,6 @@ import { merge as mergeAnything } from 'merge-anything' import { merge as deepMerge } from 'ts-deepmerge'; -import { Tsoa, assertNever, Swagger } from '@tsoa/runtime'; +import { Tsoa, assertNever, Swagger } from '@tsoa-deno/runtime'; import { ExtendedSpecConfig } from '../cli'; import { isVoidType } from '../utils/isVoidType'; diff --git a/packages/cli/src/utils/headerTypeHelpers.ts b/packages/cli/src/utils/headerTypeHelpers.ts index 1a469de69..4f42038ef 100644 --- a/packages/cli/src/utils/headerTypeHelpers.ts +++ b/packages/cli/src/utils/headerTypeHelpers.ts @@ -1,4 +1,4 @@ -import { Tsoa } from '@tsoa/runtime'; +import { Tsoa } from '@tsoa-deno/runtime'; import { NodeArray, TypeNode } from 'typescript'; import { GenerateMetadataError } from '../metadataGeneration/exceptions'; import { MetadataGenerator } from '../metadataGeneration/metadataGenerator'; diff --git a/packages/cli/src/utils/internalTypeGuards.ts b/packages/cli/src/utils/internalTypeGuards.ts index e28ab99b7..e9cf91fbb 100644 --- a/packages/cli/src/utils/internalTypeGuards.ts +++ b/packages/cli/src/utils/internalTypeGuards.ts @@ -1,5 +1,5 @@ // This file is designed to contain functions that narrow the input type to a type within src\metadataGeneration\tsoa.ts -import { Tsoa, assertNever } from '@tsoa/runtime'; +import { Tsoa, assertNever } from '@tsoa-deno/runtime'; /** * This will help us do exhaustive matching against only reference types. For example, once you have narrowed the input, you don't then have to check the case where it's a `integer` because it never will be. diff --git a/packages/cli/src/utils/isVoidType.ts b/packages/cli/src/utils/isVoidType.ts index a87a138c3..72a5ed1f6 100644 --- a/packages/cli/src/utils/isVoidType.ts +++ b/packages/cli/src/utils/isVoidType.ts @@ -1,4 +1,4 @@ -import { Tsoa } from '@tsoa/runtime'; +import { Tsoa } from '@tsoa-deno/runtime'; export const isVoidType = (type: Tsoa.Type): boolean => { if (type.dataType === 'void' || type.dataType === 'undefined') { diff --git a/packages/cli/src/utils/validatorUtils.ts b/packages/cli/src/utils/validatorUtils.ts index 582a0071c..fa3541b08 100644 --- a/packages/cli/src/utils/validatorUtils.ts +++ b/packages/cli/src/utils/validatorUtils.ts @@ -1,4 +1,4 @@ -import { Tsoa } from '@tsoa/runtime'; +import { Tsoa } from '@tsoa-deno/runtime'; import * as ts from 'typescript'; import validator from 'validator'; import { GenerateMetadataError } from './../metadataGeneration/exceptions'; diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 4f1b50a2a..5caf9be40 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -1,5 +1,5 @@ { - "name": "@tsoa/runtime", + "name": "@tsoa-deno/runtime", "description": "Build swagger-compliant REST APIs using TypeScript and Node / Deno", "version": "6.1.0-rc.3", "main": "./dist/index.js", diff --git a/packages/tsoa/package.json b/packages/tsoa/package.json index 7f43e2e68..e074e951e 100644 --- a/packages/tsoa/package.json +++ b/packages/tsoa/package.json @@ -1,5 +1,5 @@ { - "name": "tsoa", + "name": "tsoa-deno", "description": "Build swagger-compliant REST APIs using TypeScript and Node / Deno", "version": "6.1.0-rc.3", "main": "./dist/index.js", @@ -30,8 +30,8 @@ "author": "Luke Autry (http://www.lukeautry.com)", "license": "MIT", "dependencies": { - "@tsoa/cli": "^6.1.0-rc.3", - "@tsoa/runtime": "^6.1.0-rc.3" + "@tsoa-deno/cli": "^6.1.0-rc.3", + "@tsoa-deno/runtime": "^6.1.0-rc.3" }, "devDependencies": { "@types/node": "^18.0.0", @@ -42,7 +42,7 @@ "url": "https://github.com/lukeautry/tsoa.git" }, "bin": { - "tsoa": "dist/cli.js" + "tsoa-deno": "dist/cli.js" }, "engines": { "yarn": ">=1.9.4", diff --git a/packages/tsoa/src/cli.ts b/packages/tsoa/src/cli.ts index dae5fe23f..a098772c4 100644 --- a/packages/tsoa/src/cli.ts +++ b/packages/tsoa/src/cli.ts @@ -1,4 +1,4 @@ #!/usr/bin/env node -import { runCLI } from '@tsoa/cli'; +import { runCLI } from '@tsoa-deno/cli'; if (require.main === module) void runCLI(); diff --git a/packages/tsoa/src/index.ts b/packages/tsoa/src/index.ts index 7b8b1355f..9dd994da5 100644 --- a/packages/tsoa/src/index.ts +++ b/packages/tsoa/src/index.ts @@ -1,2 +1,2 @@ -export * from '@tsoa/runtime'; -export * from '@tsoa/cli'; +export * from '@tsoa-deno/runtime'; +export * from '@tsoa-deno/cli'; diff --git a/tests/esm/fixtures/controllers/securityController.ts b/tests/esm/fixtures/controllers/securityController.ts index 53c8ab049..ca6c9a2b4 100644 --- a/tests/esm/fixtures/controllers/securityController.ts +++ b/tests/esm/fixtures/controllers/securityController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route, Security } from '@tsoa/runtime'; +import { Controller, Get, Route, Security } from '@tsoa-deno/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 index bace749d8..ca8e225f1 100644 --- a/tests/esm/fixtures/express/rootController.ts +++ b/tests/esm/fixtures/express/rootController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route } from '@tsoa/runtime'; +import { Controller, Get, Route } from '@tsoa-deno/runtime'; import type { TestModel } from '../testModel.js'; @Route() diff --git a/tests/esm/fixtures/templating/dummyRouteGenerator.ts b/tests/esm/fixtures/templating/dummyRouteGenerator.ts index 7e47947db..ebd6badcb 100644 --- a/tests/esm/fixtures/templating/dummyRouteGenerator.ts +++ b/tests/esm/fixtures/templating/dummyRouteGenerator.ts @@ -1,4 +1,4 @@ -import { AbstractRouteGenerator } from '@tsoa/cli'; +import { AbstractRouteGenerator } from '@tsoa-deno/cli'; export class DummyRouteGenerator extends AbstractRouteGenerator { private static CALL_COUNT = 0; diff --git a/tests/esm/prepare.ts b/tests/esm/prepare.ts index dad3d0213..e96b8116a 100644 --- a/tests/esm/prepare.ts +++ b/tests/esm/prepare.ts @@ -1,5 +1,5 @@ import chalk from 'chalk'; -import { generateSpecAndRoutes, generateRoutes } from '@tsoa/cli'; +import { generateSpecAndRoutes, generateRoutes } from '@tsoa-deno/cli'; import { hrtime } from 'process'; const specESM = async () => { diff --git a/tests/esm/tsconfig.json b/tests/esm/tsconfig.json index 937fd933a..324ab6e2f 100644 --- a/tests/esm/tsconfig.json +++ b/tests/esm/tsconfig.json @@ -14,8 +14,8 @@ "allowSyntheticDefaultImports": true, "strict": true, "paths": { - "@tsoa/cli/*": ["../../packages/cli/src/*"], - "@tsoa/runtime/*": ["../../packages/runtime/src/*"] + "@tsoa-deno/cli/*": ["../../packages/cli/src/*"], + "@tsoa-deno/runtime/*": ["../../packages/runtime/src/*"] } }, "references": [{ "path": "../../packages/runtime" }, { "path": "../../packages/cli" }] diff --git a/tests/esm/unit/templating/routeGenerator.spec.ts b/tests/esm/unit/templating/routeGenerator.spec.ts index 833bc726d..3d58b4101 100644 --- a/tests/esm/unit/templating/routeGenerator.spec.ts +++ b/tests/esm/unit/templating/routeGenerator.spec.ts @@ -1,7 +1,7 @@ import chai from 'chai'; import chaiAsPromised from 'chai-as-promised'; import 'mocha'; -import { ExtendedRoutesConfig, generateRoutes } from 'tsoa'; +import { ExtendedRoutesConfig, generateRoutes } from 'tsoa-deno'; import { DummyRouteGenerator } from '../../fixtures/templating/dummyRouteGenerator'; chai.use(chaiAsPromised); diff --git a/tests/fixtures/controllers/annotatedTypesController.ts b/tests/fixtures/controllers/annotatedTypesController.ts index 4dd4aad07..b2578e488 100644 --- a/tests/fixtures/controllers/annotatedTypesController.ts +++ b/tests/fixtures/controllers/annotatedTypesController.ts @@ -1,5 +1,5 @@ -import {Route} from "@tsoa/runtime/decorators/route"; -import {Get} from "@tsoa/runtime/decorators/methods"; +import {Route} from "@tsoa-deno/runtime/decorators/route"; +import {Get} from "@tsoa-deno/runtime/decorators/methods"; @Route('AnnotatedTypesTest') export class AnnotatedTypesController { diff --git a/tests/fixtures/controllers/commonResponseHeaderClassController.ts b/tests/fixtures/controllers/commonResponseHeaderClassController.ts index 5e417465f..bc1727bb5 100644 --- a/tests/fixtures/controllers/commonResponseHeaderClassController.ts +++ b/tests/fixtures/controllers/commonResponseHeaderClassController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route, Response } from '@tsoa/runtime'; +import { Controller, Get, Route, Response } from '@tsoa-deno/runtime'; /** * Common response header's description diff --git a/tests/fixtures/controllers/commonResponseHeaderObjectController.ts b/tests/fixtures/controllers/commonResponseHeaderObjectController.ts index 9459d6bae..75c953779 100644 --- a/tests/fixtures/controllers/commonResponseHeaderObjectController.ts +++ b/tests/fixtures/controllers/commonResponseHeaderObjectController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route, Response } from '@tsoa/runtime'; +import { Controller, Get, Route, Response } from '@tsoa-deno/runtime'; @Route('CommonResponseHeaderObject') @Response< diff --git a/tests/fixtures/controllers/commonResponseHiddenModelController.ts b/tests/fixtures/controllers/commonResponseHiddenModelController.ts index 40b42ce95..f4199bd40 100644 --- a/tests/fixtures/controllers/commonResponseHiddenModelController.ts +++ b/tests/fixtures/controllers/commonResponseHiddenModelController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route, Response, Hidden } from '@tsoa/runtime'; +import { Controller, Get, Route, Response, Hidden } from '@tsoa-deno/runtime'; interface ToHideModel { something: string; diff --git a/tests/fixtures/controllers/controllerWithCommonResponses.ts b/tests/fixtures/controllers/controllerWithCommonResponses.ts index 9be4b3d05..5e4255cee 100644 --- a/tests/fixtures/controllers/controllerWithCommonResponses.ts +++ b/tests/fixtures/controllers/controllerWithCommonResponses.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Response, Post, Route } from '@tsoa/runtime'; +import { Controller, Get, Response, Post, Route } from '@tsoa-deno/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 index 6c74e0aad..6cf36e4a6 100644 --- a/tests/fixtures/controllers/controllerWithJsDocResponseDescription.ts +++ b/tests/fixtures/controllers/controllerWithJsDocResponseDescription.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route, SuccessResponse } from '@tsoa/runtime'; +import { Controller, Get, Route, SuccessResponse } from '@tsoa-deno/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 index beee47a4f..a8cec3411 100644 --- a/tests/fixtures/controllers/controllerWithRenamedModelImport.ts +++ b/tests/fixtures/controllers/controllerWithRenamedModelImport.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route } from '@tsoa/runtime'; +import { Controller, Get, Route } from '@tsoa-deno/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 index e56d19e84..fc5e2eea0 100644 --- a/tests/fixtures/controllers/deleteController.ts +++ b/tests/fixtures/controllers/deleteController.ts @@ -1,4 +1,4 @@ -import { Delete, Query, Route } from '@tsoa/runtime'; +import { Delete, Query, Route } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/deprecatedController.ts b/tests/fixtures/controllers/deprecatedController.ts index 019dca8d9..75193849a 100644 --- a/tests/fixtures/controllers/deprecatedController.ts +++ b/tests/fixtures/controllers/deprecatedController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route, Deprecated } from '@tsoa/runtime'; +import { Controller, Get, Route, Deprecated } from '@tsoa-deno/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 index 95522ecdf..7339c0f08 100644 --- a/tests/fixtures/controllers/duplicateMethodsController.ts +++ b/tests/fixtures/controllers/duplicateMethodsController.ts @@ -1,4 +1,4 @@ -import { Route, Get } from '@tsoa/runtime'; +import { Route, Get } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; @Route('GetTest') diff --git a/tests/fixtures/controllers/duplicatePathParamController.ts b/tests/fixtures/controllers/duplicatePathParamController.ts index 5f9793a88..2e911df74 100644 --- a/tests/fixtures/controllers/duplicatePathParamController.ts +++ b/tests/fixtures/controllers/duplicatePathParamController.ts @@ -1,4 +1,4 @@ -import { Route, Get, Post, Path, Delete, Head } from '@tsoa/runtime'; +import { Route, Get, Post, Path, Delete, Head } from '@tsoa-deno/runtime'; @Route('GetTest') export class DuplicatePathParamTestController { diff --git a/tests/fixtures/controllers/exampleController.ts b/tests/fixtures/controllers/exampleController.ts index 25f3e6798..a09455986 100644 --- a/tests/fixtures/controllers/exampleController.ts +++ b/tests/fixtures/controllers/exampleController.ts @@ -1,4 +1,4 @@ -import { Route, Get, Path, Query, Header, Post, Body, BodyProp, Example, Res, TsoaResponse, Produces } from '@tsoa/runtime'; +import { Route, Get, Path, Query, Header, Post, Body, BodyProp, Example, Res, TsoaResponse, Produces } from '@tsoa-deno/runtime'; import { exampleResponse } from './consts'; /** diff --git a/tests/fixtures/controllers/getController.ts b/tests/fixtures/controllers/getController.ts index 7dbfd6079..fa4300e0d 100644 --- a/tests/fixtures/controllers/getController.ts +++ b/tests/fixtures/controllers/getController.ts @@ -1,6 +1,6 @@ /// import { Readable } from 'stream'; -import { Controller, Example, Get, OperationId, Query, Request, Response, Route, SuccessResponse, Tags, Res, TsoaResponse, Queries } from '@tsoa/runtime'; +import { Controller, Example, Get, OperationId, Query, Request, Response, Route, SuccessResponse, Tags, Res, TsoaResponse, Queries } from '@tsoa-deno/runtime'; import '../duplicateTestModel'; import { GenericModel, diff --git a/tests/fixtures/controllers/headController.ts b/tests/fixtures/controllers/headController.ts index e4e4b1830..5ba634106 100644 --- a/tests/fixtures/controllers/headController.ts +++ b/tests/fixtures/controllers/headController.ts @@ -1,4 +1,4 @@ -import { Head, Query, Route } from '@tsoa/runtime'; +import { Head, Query, Route } from '@tsoa-deno/runtime'; @Route('HeadTest') export class HeadTestController { diff --git a/tests/fixtures/controllers/hiddenController.ts b/tests/fixtures/controllers/hiddenController.ts index 77bfb23d0..76566b976 100644 --- a/tests/fixtures/controllers/hiddenController.ts +++ b/tests/fixtures/controllers/hiddenController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Hidden, Post, Route } from '@tsoa/runtime'; +import { Controller, Get, Hidden, Post, Route } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/hiddenMethodController.ts b/tests/fixtures/controllers/hiddenMethodController.ts index 3175a3cc0..6453d8121 100644 --- a/tests/fixtures/controllers/hiddenMethodController.ts +++ b/tests/fixtures/controllers/hiddenMethodController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Hidden, Route, Query } from '@tsoa/runtime'; +import { Controller, Get, Hidden, Route, Query } from '@tsoa-deno/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 index 14de8e7b7..307e33243 100644 --- a/tests/fixtures/controllers/incorrectResponseHeaderController.ts +++ b/tests/fixtures/controllers/incorrectResponseHeaderController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Response, Route } from '@tsoa/runtime'; +import { Controller, Get, Response, Route } from '@tsoa-deno/runtime'; @Route('IncorrectResponseHeader') @Response(200) diff --git a/tests/fixtures/controllers/injectParameterController.ts b/tests/fixtures/controllers/injectParameterController.ts index 3d83cf8b2..7b0ef241a 100644 --- a/tests/fixtures/controllers/injectParameterController.ts +++ b/tests/fixtures/controllers/injectParameterController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Query, Inject, Route } from '@tsoa/runtime'; +import { Controller, Get, Query, Inject, Route } from '@tsoa-deno/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 index 00086d865..7ecc49a94 100644 --- a/tests/fixtures/controllers/invalidExampleController.ts +++ b/tests/fixtures/controllers/invalidExampleController.ts @@ -1,4 +1,4 @@ -import { Route, Controller, Post, Body } from '@tsoa/runtime'; +import { Route, Controller, Post, Body } from '@tsoa-deno/runtime'; @Route('ExampleTest') export class InvalidExampleController extends Controller { diff --git a/tests/fixtures/controllers/invalidExtensionController.ts b/tests/fixtures/controllers/invalidExtensionController.ts index 8b1cfb608..2f688a5a9 100644 --- a/tests/fixtures/controllers/invalidExtensionController.ts +++ b/tests/fixtures/controllers/invalidExtensionController.ts @@ -1,4 +1,4 @@ -import { Get, Route, Extension } from '@tsoa/runtime'; +import { Get, Route, Extension } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/invalidExtensionModelController.ts b/tests/fixtures/controllers/invalidExtensionModelController.ts index e09a522e3..6d1c620c0 100644 --- a/tests/fixtures/controllers/invalidExtensionModelController.ts +++ b/tests/fixtures/controllers/invalidExtensionModelController.ts @@ -1,4 +1,4 @@ -import { Get, Route } from '@tsoa/runtime'; +import { Get, Route } from '@tsoa-deno/runtime'; interface InvalidExtension { /** diff --git a/tests/fixtures/controllers/invalidGetController.ts b/tests/fixtures/controllers/invalidGetController.ts index bfb444426..2f96b0e9e 100644 --- a/tests/fixtures/controllers/invalidGetController.ts +++ b/tests/fixtures/controllers/invalidGetController.ts @@ -1,4 +1,4 @@ -import { Get, Query, Route } from '@tsoa/runtime'; +import { Get, Query, Route } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/invalidHeaderController.ts b/tests/fixtures/controllers/invalidHeaderController.ts index 1329137e3..97057ae8c 100644 --- a/tests/fixtures/controllers/invalidHeaderController.ts +++ b/tests/fixtures/controllers/invalidHeaderController.ts @@ -1,4 +1,4 @@ -import { Get, Res, Route, TsoaResponse } from '@tsoa/runtime'; +import { Get, Res, Route, TsoaResponse } from '@tsoa-deno/runtime'; @Route('/') export class InvalidHeaderTestController { diff --git a/tests/fixtures/controllers/invalidNestedQueriesController.ts b/tests/fixtures/controllers/invalidNestedQueriesController.ts index fe6a31051..91cc72916 100644 --- a/tests/fixtures/controllers/invalidNestedQueriesController.ts +++ b/tests/fixtures/controllers/invalidNestedQueriesController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route, Queries } from '@tsoa/runtime'; +import { Controller, Get, Route, Queries } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; @Route('Controller') diff --git a/tests/fixtures/controllers/invalidPostController.ts b/tests/fixtures/controllers/invalidPostController.ts index 9f23b480a..4b523d8aa 100644 --- a/tests/fixtures/controllers/invalidPostController.ts +++ b/tests/fixtures/controllers/invalidPostController.ts @@ -1,4 +1,4 @@ -import { Body, Post, Route } from '@tsoa/runtime'; +import { Body, Post, Route } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/invalidQueriesController.ts b/tests/fixtures/controllers/invalidQueriesController.ts index dc6a7ae40..8547230bd 100644 --- a/tests/fixtures/controllers/invalidQueriesController.ts +++ b/tests/fixtures/controllers/invalidQueriesController.ts @@ -1,4 +1,4 @@ -import { Get, Queries, Route } from '@tsoa/runtime'; +import { Get, Queries, Route } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/invalidQueryController.ts b/tests/fixtures/controllers/invalidQueryController.ts index 183eae2e8..b31c94e0f 100644 --- a/tests/fixtures/controllers/invalidQueryController.ts +++ b/tests/fixtures/controllers/invalidQueryController.ts @@ -1,4 +1,4 @@ -import { Get, Queries, Query, Route } from '@tsoa/runtime'; +import { Get, Queries, Query, Route } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/invalidTagController.ts b/tests/fixtures/controllers/invalidTagController.ts index 02f175e9f..9b813455e 100644 --- a/tests/fixtures/controllers/invalidTagController.ts +++ b/tests/fixtures/controllers/invalidTagController.ts @@ -1,4 +1,4 @@ -import { Route, Get, Query, Controller } from '@tsoa/runtime'; +import { Route, Get, Query, Controller } from '@tsoa-deno/runtime'; @Route('TagTest') export class InvalidTagController extends Controller { diff --git a/tests/fixtures/controllers/mediaTypeController.ts b/tests/fixtures/controllers/mediaTypeController.ts index 7182e8a85..3f98e49cb 100644 --- a/tests/fixtures/controllers/mediaTypeController.ts +++ b/tests/fixtures/controllers/mediaTypeController.ts @@ -1,4 +1,4 @@ -import { Body, Consumes, Controller, Get, Produces, Path, Post, Response, Res, Route, SuccessResponse, TsoaResponse } from '@tsoa/runtime'; +import { Body, Consumes, Controller, Get, Produces, Path, Post, Response, Res, Route, SuccessResponse, TsoaResponse } from '@tsoa-deno/runtime'; import { ErrorResponseModel, UserResponseModel } from '../../fixtures/testModel'; type UserRequestModel = Pick; diff --git a/tests/fixtures/controllers/methodController.ts b/tests/fixtures/controllers/methodController.ts index b90a46a26..928c8c8ec 100644 --- a/tests/fixtures/controllers/methodController.ts +++ b/tests/fixtures/controllers/methodController.ts @@ -1,4 +1,4 @@ -import { Controller, Extension, Options, Delete, Get, Patch, Post, Put, Response, Route, Security, SuccessResponse, Tags, Example } from '@tsoa/runtime'; +import { Controller, Extension, Options, Delete, Get, Patch, Post, Put, Response, Route, Security, SuccessResponse, Tags, Example } from '@tsoa-deno/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 index 4b8383d06..773473e3a 100644 --- a/tests/fixtures/controllers/middlewaresExpressController.ts +++ b/tests/fixtures/controllers/middlewaresExpressController.ts @@ -1,4 +1,4 @@ -import { Middlewares as GenericMiddlewares, Get, Route } from '@tsoa/runtime'; +import { Middlewares as GenericMiddlewares, Get, Route } from '@tsoa-deno/runtime'; import type { NextFunction as ExpressNextFunction, Request as ExpressRequest, Response as ExpressResponse, RequestHandler } from 'express'; diff --git a/tests/fixtures/controllers/middlewaresHapiController.ts b/tests/fixtures/controllers/middlewaresHapiController.ts index 3d270fd2e..fbd0f8d3b 100644 --- a/tests/fixtures/controllers/middlewaresHapiController.ts +++ b/tests/fixtures/controllers/middlewaresHapiController.ts @@ -1,4 +1,4 @@ -import { Middlewares as GenericMiddlewares, Get, Route } from '@tsoa/runtime'; +import { Middlewares as GenericMiddlewares, Get, Route } from '@tsoa-deno/runtime'; import type { Request, ResponseToolkit, RouteOptionsPreAllOptions } from '@hapi/hapi'; diff --git a/tests/fixtures/controllers/middlewaresHierarchyController.ts b/tests/fixtures/controllers/middlewaresHierarchyController.ts index 96fb8574c..2d6222d28 100644 --- a/tests/fixtures/controllers/middlewaresHierarchyController.ts +++ b/tests/fixtures/controllers/middlewaresHierarchyController.ts @@ -1,4 +1,4 @@ -import { Controller, Middlewares as GenericMiddlewares, Get, Route } from '@tsoa/runtime'; +import { Controller, Middlewares as GenericMiddlewares, Get, Route } from '@tsoa-deno/runtime'; import type { NextFunction, Request, RequestHandler, Response } from 'express'; diff --git a/tests/fixtures/controllers/middlewaresKoaController.ts b/tests/fixtures/controllers/middlewaresKoaController.ts index 06f7642df..7547efe9a 100644 --- a/tests/fixtures/controllers/middlewaresKoaController.ts +++ b/tests/fixtures/controllers/middlewaresKoaController.ts @@ -1,4 +1,4 @@ -import { Middlewares as GenericMiddlewares, Get, Route } from '@tsoa/runtime'; +import { Middlewares as GenericMiddlewares, Get, Route } from '@tsoa-deno/runtime'; import type { Context as KoaContext, Next as KoaNext, Middleware } from 'koa'; diff --git a/tests/fixtures/controllers/mixedEnumController.ts b/tests/fixtures/controllers/mixedEnumController.ts index 83e095b3f..483f4f24b 100644 --- a/tests/fixtures/controllers/mixedEnumController.ts +++ b/tests/fixtures/controllers/mixedEnumController.ts @@ -1,4 +1,4 @@ -import { Body, Controller, Post, Route } from '@tsoa/runtime'; +import { Body, Controller, Post, Route } from '@tsoa-deno/runtime'; export enum MixedStringAndNumberEnum { one = 1, diff --git a/tests/fixtures/controllers/noExtendsController.ts b/tests/fixtures/controllers/noExtendsController.ts index e8f79c159..9c0e17878 100644 --- a/tests/fixtures/controllers/noExtendsController.ts +++ b/tests/fixtures/controllers/noExtendsController.ts @@ -1,4 +1,4 @@ -import { Get, Route, SuccessResponse } from '@tsoa/runtime'; +import { Get, Route, SuccessResponse } from '@tsoa-deno/runtime'; enum TEST_ENUM_CODES { ACCEPTED = 202, diff --git a/tests/fixtures/controllers/noSecurityController.ts b/tests/fixtures/controllers/noSecurityController.ts index 6b46bd22d..9819af0f6 100644 --- a/tests/fixtures/controllers/noSecurityController.ts +++ b/tests/fixtures/controllers/noSecurityController.ts @@ -1,4 +1,4 @@ -import { Get, Request, Response, Route, Security, NoSecurity } from '@tsoa/runtime'; +import { Get, Request, Response, Route, Security, NoSecurity } from '@tsoa-deno/runtime'; import { ErrorResponseModel, UserResponseModel } from '../../fixtures/testModel'; interface RequestWithUser { diff --git a/tests/fixtures/controllers/noSecurityOnController.ts b/tests/fixtures/controllers/noSecurityOnController.ts index 202f43a9f..27bb6a4d4 100644 --- a/tests/fixtures/controllers/noSecurityOnController.ts +++ b/tests/fixtures/controllers/noSecurityOnController.ts @@ -1,4 +1,4 @@ -import { Get, Request, Response, Route, Security, NoSecurity } from '@tsoa/runtime'; +import { Get, Request, Response, Route, Security, NoSecurity } from '@tsoa-deno/runtime'; import { ErrorResponseModel, UserResponseModel } from '../testModel'; interface RequestWithUser { diff --git a/tests/fixtures/controllers/optionsController.ts b/tests/fixtures/controllers/optionsController.ts index 084bbe387..4c2d54275 100644 --- a/tests/fixtures/controllers/optionsController.ts +++ b/tests/fixtures/controllers/optionsController.ts @@ -1,4 +1,4 @@ -import { Controller, Options, Route } from '@tsoa/runtime'; +import { Controller, Options, Route } from '@tsoa-deno/runtime'; @Route('OptionsTest') export class OptionsTestController extends Controller { diff --git a/tests/fixtures/controllers/parameterController.ts b/tests/fixtures/controllers/parameterController.ts index 45417eae2..94ff04693 100644 --- a/tests/fixtures/controllers/parameterController.ts +++ b/tests/fixtures/controllers/parameterController.ts @@ -1,4 +1,4 @@ -import { Body, BodyProp, Get, Header, Path, Post, Query, Request, Route, Res, TsoaResponse, Deprecated, Queries, RequestProp } from '@tsoa/runtime'; +import { Body, BodyProp, Get, Header, Path, Post, Query, Request, Route, Res, TsoaResponse, Deprecated, Queries, RequestProp } from '@tsoa-deno/runtime'; import { Gender, ParameterTestModel } from '../testModel'; @Route('ParameterTest') diff --git a/tests/fixtures/controllers/patchController.ts b/tests/fixtures/controllers/patchController.ts index 7eb0f9f9d..716a52d33 100644 --- a/tests/fixtures/controllers/patchController.ts +++ b/tests/fixtures/controllers/patchController.ts @@ -1,4 +1,4 @@ -import { Body, Patch, Route } from '@tsoa/runtime'; +import { Body, Patch, Route } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/pathlessGetController.ts b/tests/fixtures/controllers/pathlessGetController.ts index ffa55f2ad..058466274 100644 --- a/tests/fixtures/controllers/pathlessGetController.ts +++ b/tests/fixtures/controllers/pathlessGetController.ts @@ -1,4 +1,4 @@ -import { Get, Route } from '@tsoa/runtime'; +import { Get, Route } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/postController.ts b/tests/fixtures/controllers/postController.ts index 11e645607..1a80e95d4 100644 --- a/tests/fixtures/controllers/postController.ts +++ b/tests/fixtures/controllers/postController.ts @@ -1,4 +1,4 @@ -import { Body, Deprecated, File, FormField, Patch, Post, Query, Route, UploadedFile, UploadedFiles } from '@tsoa/runtime'; +import { Body, Deprecated, File, FormField, Patch, Post, Query, Route, UploadedFile, UploadedFiles } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { GenericRequest, TestClassModel, TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/putController.ts b/tests/fixtures/controllers/putController.ts index 380216a26..e24d28ed7 100644 --- a/tests/fixtures/controllers/putController.ts +++ b/tests/fixtures/controllers/putController.ts @@ -1,4 +1,4 @@ -import { Body, Put, Route } from '@tsoa/runtime'; +import { Body, Put, Route } from '@tsoa-deno/runtime'; import { ModelService } from '../services/modelService'; import { TestModel } from '../testModel'; diff --git a/tests/fixtures/controllers/requestExpressController.ts b/tests/fixtures/controllers/requestExpressController.ts index 1cb704d36..1a4bbd627 100644 --- a/tests/fixtures/controllers/requestExpressController.ts +++ b/tests/fixtures/controllers/requestExpressController.ts @@ -1,5 +1,5 @@ import { Request as ExRequest } from 'express'; -import { Body, Controller, Get, Produces, Path, Post, Response, Res, Request, Route, SuccessResponse, TsoaResponse } from '@tsoa/runtime'; +import { Body, Controller, Get, Produces, Path, Post, Response, Res, Request, Route, SuccessResponse, TsoaResponse } from '@tsoa-deno/runtime'; import { ErrorResponseModel, UserResponseModel } from '../../fixtures/testModel'; interface UserResponseV2Model { diff --git a/tests/fixtures/controllers/responseHeaderController.ts b/tests/fixtures/controllers/responseHeaderController.ts index 9041fb2a0..7e7b7fa25 100644 --- a/tests/fixtures/controllers/responseHeaderController.ts +++ b/tests/fixtures/controllers/responseHeaderController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route, SuccessResponse, Response, TsoaResponse, Res } from '@tsoa/runtime'; +import { Controller, Get, Route, SuccessResponse, Response, TsoaResponse, Res } from '@tsoa-deno/runtime'; /** * response header's description diff --git a/tests/fixtures/controllers/rootController.ts b/tests/fixtures/controllers/rootController.ts index c631db76f..30358030c 100644 --- a/tests/fixtures/controllers/rootController.ts +++ b/tests/fixtures/controllers/rootController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route } from '@tsoa/runtime'; +import { Controller, Get, Route } from '@tsoa-deno/runtime'; import { TestModel } from '../../fixtures/testModel'; import { ModelService } from '../services/modelService'; diff --git a/tests/fixtures/controllers/securityController.ts b/tests/fixtures/controllers/securityController.ts index ec9c07d38..c16b13b2d 100644 --- a/tests/fixtures/controllers/securityController.ts +++ b/tests/fixtures/controllers/securityController.ts @@ -1,4 +1,4 @@ -import { Get, Request, Response, Route, Security } from '@tsoa/runtime'; +import { Get, Request, Response, Route, Security } from '@tsoa-deno/runtime'; import { ErrorResponseModel, UserResponseModel } from '../../fixtures/testModel'; interface RequestWithUser { diff --git a/tests/fixtures/controllers/subresourceController.ts b/tests/fixtures/controllers/subresourceController.ts index bb2f5af3b..d527646b8 100644 --- a/tests/fixtures/controllers/subresourceController.ts +++ b/tests/fixtures/controllers/subresourceController.ts @@ -1,4 +1,4 @@ -import { Get, Path, Route } from '@tsoa/runtime'; +import { Get, Path, Route } from '@tsoa-deno/runtime'; @Route('SubResourceTest/{mainResourceId}/SubResource') export class SubResourceTestController { diff --git a/tests/fixtures/controllers/tagController.ts b/tests/fixtures/controllers/tagController.ts index fbc8006c1..08ffaf7a4 100644 --- a/tests/fixtures/controllers/tagController.ts +++ b/tests/fixtures/controllers/tagController.ts @@ -1,4 +1,4 @@ -import { Route, Controller, Get, Query } from '@tsoa/runtime'; +import { Route, Controller, Get, Query } from '@tsoa-deno/runtime'; /** * @isLong diff --git a/tests/fixtures/controllers/testController.ts b/tests/fixtures/controllers/testController.ts index 5f73b7bfe..e1dac5f83 100644 --- a/tests/fixtures/controllers/testController.ts +++ b/tests/fixtures/controllers/testController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Route, SuccessResponse, Response } from '@tsoa/runtime'; +import { Controller, Get, Route, SuccessResponse, Response } from '@tsoa-deno/runtime'; import { ErrorResponseModel, TestModel } from '../testModel'; import { NonFactoryDecorator } from '../custom/non-factory-decorator'; import { ModelService } from '../services/modelService'; diff --git a/tests/fixtures/controllers/typeInferenceController.ts b/tests/fixtures/controllers/typeInferenceController.ts index 6e95bedea..5e941caaf 100644 --- a/tests/fixtures/controllers/typeInferenceController.ts +++ b/tests/fixtures/controllers/typeInferenceController.ts @@ -1,4 +1,4 @@ -import { Get, Route } from '@tsoa/runtime'; +import { Get, Route } from '@tsoa-deno/runtime'; import { TruncationTestModel } from '../testModel'; @Route('inference') diff --git a/tests/fixtures/controllers/unsupportedIndexedTypeController.ts b/tests/fixtures/controllers/unsupportedIndexedTypeController.ts index d5903bd0e..517d9ec09 100644 --- a/tests/fixtures/controllers/unsupportedIndexedTypeController.ts +++ b/tests/fixtures/controllers/unsupportedIndexedTypeController.ts @@ -1,4 +1,4 @@ -import { Get, Route } from '@tsoa/runtime'; +import { Get, Route } from '@tsoa-deno/runtime'; import { ForeignIndexedValue } from '../testModel'; @Route('UnsupportedIndexedType') diff --git a/tests/fixtures/controllers/validateController.ts b/tests/fixtures/controllers/validateController.ts index 6b95777f0..5dac09324 100644 --- a/tests/fixtures/controllers/validateController.ts +++ b/tests/fixtures/controllers/validateController.ts @@ -1,4 +1,4 @@ -import { Body, Get, Post, Query, Route } from '@tsoa/runtime'; +import { Body, Get, Post, Query, Route } from '@tsoa-deno/runtime'; import { ValidateMapStringToAny, ValidateMapStringToNumber, ValidateModel } from './../testModel'; export interface ValidateDateResponse { diff --git a/tests/fixtures/custom/custom-route-generator/serverlessRouteGenerator.ts b/tests/fixtures/custom/custom-route-generator/serverlessRouteGenerator.ts index 82c647875..b73a8b80a 100644 --- a/tests/fixtures/custom/custom-route-generator/serverlessRouteGenerator.ts +++ b/tests/fixtures/custom/custom-route-generator/serverlessRouteGenerator.ts @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/restrict-template-expressions */ import * as fs from 'fs'; import * as handlebars from 'handlebars'; -import { ExtendedRoutesConfig } from '@tsoa/cli/src/cli'; -import { Tsoa, TsoaRoute, assertNever } from '@tsoa/runtime'; -import { fsReadFile, fsWriteFile, fsExists, fsMkDir } from '@tsoa/cli/src/utils/fs'; -import { AbstractRouteGenerator } from '@tsoa/cli/src/routeGeneration/routeGenerator'; +import { ExtendedRoutesConfig } from '@tsoa-deno/cli/src/cli'; +import { Tsoa, TsoaRoute, assertNever } from '@tsoa-deno/runtime'; +import { fsReadFile, fsWriteFile, fsExists, fsMkDir } from '@tsoa-deno/cli/src/utils/fs'; +import { AbstractRouteGenerator } from '@tsoa-deno/cli/src/routeGeneration/routeGenerator'; import path = require('path'); export interface ServerlessRoutesConfig extends ExtendedRoutesConfig { diff --git a/tests/fixtures/custom/custom-route-generator/templates/handler.hbs b/tests/fixtures/custom/custom-route-generator/templates/handler.hbs index 2ab6b1517..a30704cac 100644 --- a/tests/fixtures/custom/custom-route-generator/templates/handler.hbs +++ b/tests/fixtures/custom/custom-route-generator/templates/handler.hbs @@ -4,7 +4,7 @@ import { {{controller.name}} } from '.{{controller.modulePath}}'; import { getValidatedArgs } from '.{{modelsFileName}}'; {{#if iocModule}} import { iocContainer } from '{{iocModule}}'; -import { IocContainer, IocContainerFactory } from '@tsoa/runtime'; +import { IocContainer, IocContainerFactory } from '@tsoa-deno/runtime'; {{/if}} {{#if iocModule}} diff --git a/tests/fixtures/custom/custom-route-generator/templates/models.hbs b/tests/fixtures/custom/custom-route-generator/templates/models.hbs index c90863d64..f5d4bb93d 100644 --- a/tests/fixtures/custom/custom-route-generator/templates/models.hbs +++ b/tests/fixtures/custom/custom-route-generator/templates/models.hbs @@ -1,4 +1,4 @@ -import { ValidationService, ValidateError, TsoaRoute, FieldErrors } from '@tsoa/runtime'; +import { ValidationService, ValidateError, TsoaRoute, FieldErrors } from '@tsoa-deno/runtime'; const models: TsoaRoute.Models = { {{#each models}} diff --git a/tests/fixtures/custom/custom-tsoa-template.ts.hbs b/tests/fixtures/custom/custom-tsoa-template.ts.hbs index c94c3639a..d7b664d5e 100644 --- a/tests/fixtures/custom/custom-tsoa-template.ts.hbs +++ b/tests/fixtures/custom/custom-tsoa-template.ts.hbs @@ -1,6 +1,6 @@ /* tslint:disable */ /* eslint-disable */ -import { Controller, ValidateParam, FieldErrors, ValidateError, TsoaRoute } from '@tsoa/runtime'; +import { Controller, ValidateParam, FieldErrors, ValidateError, TsoaRoute } from '@tsoa-deno/runtime'; {{#if iocModule}} import { iocContainer } from '{{iocModule}}'; {{/if}} diff --git a/tests/fixtures/defaultOptions.ts b/tests/fixtures/defaultOptions.ts index 50d85c022..b5113bbd6 100644 --- a/tests/fixtures/defaultOptions.ts +++ b/tests/fixtures/defaultOptions.ts @@ -1,5 +1,5 @@ -import { ExtendedSpecConfig } from '@tsoa/cli/cli'; -import { Config } from '@tsoa/runtime'; +import { ExtendedSpecConfig } from '@tsoa-deno/cli/cli'; +import { Config } from '@tsoa-deno/runtime'; export function getDefaultOptions(outputDirectory = '', entryFile = ''): Config { return { entryFile, diff --git a/tests/fixtures/hono/importMap.json b/tests/fixtures/hono/importMap.json index 159673d78..abb2ee27e 100644 --- a/tests/fixtures/hono/importMap.json +++ b/tests/fixtures/hono/importMap.json @@ -2,7 +2,7 @@ "imports": { "models" : "/models/", "@hono": "https://deno.land/x/hono@v3.7.6/mod.ts", - "@tsoa/runtime": "../../../packages/runtime/deno_dist", + "@tsoa-deno/runtime": "../../../packages/runtime/deno_dist", "stream": "https://deno.land/x/readable_stream@v3.6.0-deno.0.3.0/mod.ts", "tsoaTest": "./honoTestPolyfill.ts" } diff --git a/tests/fixtures/inversify-async/asyncController.ts b/tests/fixtures/inversify-async/asyncController.ts index 559cf9433..0191d147b 100644 --- a/tests/fixtures/inversify-async/asyncController.ts +++ b/tests/fixtures/inversify-async/asyncController.ts @@ -1,5 +1,5 @@ import { inject, injectable } from 'inversify'; -import { Get, Route } from '@tsoa/runtime'; +import { Get, Route } from '@tsoa-deno/runtime'; import { TestModel } from '../testModel'; import { AsyncService } from './asyncService'; diff --git a/tests/fixtures/inversify-async/asyncErrorController.ts b/tests/fixtures/inversify-async/asyncErrorController.ts index 5ab3b6033..0fba57ad0 100644 --- a/tests/fixtures/inversify-async/asyncErrorController.ts +++ b/tests/fixtures/inversify-async/asyncErrorController.ts @@ -1,5 +1,5 @@ import { inject, injectable } from 'inversify'; -import { Get, Route } from '@tsoa/runtime'; +import { Get, Route } from '@tsoa-deno/runtime'; @injectable() @Route('AsyncIocErrorTest') diff --git a/tests/fixtures/inversify-cpg/managedController.ts b/tests/fixtures/inversify-cpg/managedController.ts index 72950fb18..d9deb1645 100644 --- a/tests/fixtures/inversify-cpg/managedController.ts +++ b/tests/fixtures/inversify-cpg/managedController.ts @@ -1,5 +1,5 @@ import { inject } from 'inversify'; -import { Get, Route, Security } from '@tsoa/runtime'; +import { Get, Route, Security } from '@tsoa-deno/runtime'; import { TestModel } from '../testModel'; import { ManagedService } from './managedService'; import { provideSingleton } from './provideSingleton'; diff --git a/tests/fixtures/inversify-dynamic-container/ioc.ts b/tests/fixtures/inversify-dynamic-container/ioc.ts index fbd73ce33..8f0572fce 100644 --- a/tests/fixtures/inversify-dynamic-container/ioc.ts +++ b/tests/fixtures/inversify-dynamic-container/ioc.ts @@ -2,7 +2,7 @@ import e = require('express'); import { Container } from 'inversify'; import { ManagedController } from './managedController'; import { ManagedService } from './managedService'; -import { IocContainerFactory, IocContainer } from '@tsoa/runtime'; +import { IocContainerFactory, IocContainer } from '@tsoa-deno/runtime'; const iocContainer: IocContainerFactory = function (request: e.Request): IocContainer { const container = new Container(); diff --git a/tests/fixtures/inversify-dynamic-container/managedController.ts b/tests/fixtures/inversify-dynamic-container/managedController.ts index bc5596399..f0e149b32 100644 --- a/tests/fixtures/inversify-dynamic-container/managedController.ts +++ b/tests/fixtures/inversify-dynamic-container/managedController.ts @@ -1,5 +1,5 @@ import { inject, injectable } from 'inversify'; -import { Get, Route, Security } from '@tsoa/runtime'; +import { Get, Route, Security } from '@tsoa-deno/runtime'; import { ManagedService } from './managedService'; @injectable() diff --git a/tests/fixtures/inversify/managedController.ts b/tests/fixtures/inversify/managedController.ts index 51c5a4faf..9fe8ee5b6 100644 --- a/tests/fixtures/inversify/managedController.ts +++ b/tests/fixtures/inversify/managedController.ts @@ -1,5 +1,5 @@ import { inject, injectable } from 'inversify'; -import { Get, Route, Security } from '@tsoa/runtime'; +import { Get, Route, Security } from '@tsoa-deno/runtime'; import { TestModel } from '../testModel'; import { ManagedService } from './managedService'; diff --git a/tests/fixtures/testModel.ts b/tests/fixtures/testModel.ts index e0f5c450a..4221b5ac4 100644 --- a/tests/fixtures/testModel.ts +++ b/tests/fixtures/testModel.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ /* This is what we want to test here*/ -import { Deprecated, Example, Extension } from '@tsoa/runtime'; +import { Deprecated, Example, Extension } from '@tsoa-deno/runtime'; /** * This is a description of a model diff --git a/tests/integration/express-server.spec.ts b/tests/integration/express-server.spec.ts index 27a254c97..aadaf8ac7 100644 --- a/tests/integration/express-server.spec.ts +++ b/tests/integration/express-server.spec.ts @@ -1,4 +1,4 @@ -import { File } from '@tsoa/runtime'; +import { File } from '@tsoa-deno/runtime'; import { expect } from 'chai'; import { readFileSync } from 'fs'; import 'mocha'; diff --git a/tests/integration/hapi-server.spec.ts b/tests/integration/hapi-server.spec.ts index b8d7fea27..5243d0384 100644 --- a/tests/integration/hapi-server.spec.ts +++ b/tests/integration/hapi-server.spec.ts @@ -1,4 +1,4 @@ -import { File } from '@tsoa/runtime'; +import { File } from '@tsoa-deno/runtime'; import { expect } from 'chai'; import { readFileSync } from 'fs'; import 'mocha'; diff --git a/tests/integration/hono-server.test.ts b/tests/integration/hono-server.test.ts index eab378881..9456ffd19 100644 --- a/tests/integration/hono-server.test.ts +++ b/tests/integration/hono-server.test.ts @@ -9,7 +9,7 @@ import * as path from "https://deno.land/std/path/mod.ts"; import { expect } from 'npm:chai'; import { Buffer } from 'npm:buffer'; -import { File } from '@tsoa/runtime'; +import { File } from '@tsoa-deno/runtime'; import { server } from './../fixtures/hono/server.ts'; import { Gender, GenericModel, GenericRequest, Model, ParameterTestModel, TestClassModel, TestModel, ValidateMapStringToAny, ValidateMapStringToNumber, ValidateModel } from '../fixtures/testModel.ts'; diff --git a/tests/integration/koa-server.spec.ts b/tests/integration/koa-server.spec.ts index c1ade65eb..37ebf68b8 100644 --- a/tests/integration/koa-server.spec.ts +++ b/tests/integration/koa-server.spec.ts @@ -1,4 +1,4 @@ -import { File } from '@tsoa/runtime'; +import { File } from '@tsoa-deno/runtime'; import { expect } from 'chai'; import { readFileSync } from 'fs'; import 'mocha'; diff --git a/tests/prepare.ts b/tests/prepare.ts index 3d4a48bdf..bbc3aabac 100644 --- a/tests/prepare.ts +++ b/tests/prepare.ts @@ -1,6 +1,6 @@ /* eslint-disable no-console */ import { dim, green } from 'chalk'; -import { generateSpecAndRoutes, generateRoutes } from '@tsoa/cli'; +import { generateSpecAndRoutes, generateRoutes } from '@tsoa-deno/cli'; import { Timer } from './utils/timer'; import { tmpdir } from 'node:os'; diff --git a/tests/tsconfig.json b/tests/tsconfig.json index 0fc12f1fe..36916a2d1 100644 --- a/tests/tsconfig.json +++ b/tests/tsconfig.json @@ -15,8 +15,8 @@ "noImplicitAny": false, "skipLibCheck": true, "paths": { - "@tsoa/cli/*": ["../packages/cli/src/*"], - "@tsoa/runtime/*": ["../packages/runtime/src/*"] + "@tsoa-deno/cli/*": ["../packages/cli/src/*"], + "@tsoa-deno/runtime/*": ["../packages/runtime/src/*"] } }, "references": [{ "path": "../packages/runtime" }, { "path": "../packages/cli" }], diff --git a/tests/unit/swagger/common/paths.spec.ts b/tests/unit/swagger/common/paths.spec.ts index 4ab6eecb4..d72b0c922 100644 --- a/tests/unit/swagger/common/paths.spec.ts +++ b/tests/unit/swagger/common/paths.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import 'mocha'; -import { normalisePath, convertColonPathParams, convertBracesPathParams } from '@tsoa/cli/utils/pathUtils'; +import { normalisePath, convertColonPathParams, convertBracesPathParams } from '@tsoa-deno/cli/utils/pathUtils'; describe('Paths normalisation', () => { it('should remove all redundant symbols at the beginning and at the end', () => { diff --git a/tests/unit/swagger/config.spec.ts b/tests/unit/swagger/config.spec.ts index 17386f580..7860bea2c 100644 --- a/tests/unit/swagger/config.spec.ts +++ b/tests/unit/swagger/config.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import 'mocha'; -import { validateSpecConfig, ExtendedSpecConfig } from '@tsoa/cli/cli'; -import { Config } from '@tsoa/runtime'; +import { validateSpecConfig, ExtendedSpecConfig } from '@tsoa-deno/cli/cli'; +import { Config } from '@tsoa-deno/runtime'; import { getDefaultOptions } from '../../fixtures/defaultOptions'; describe('Configuration', () => { diff --git a/tests/unit/swagger/definitionsGeneration/definitions.spec.ts b/tests/unit/swagger/definitionsGeneration/definitions.spec.ts index c7db7c3c6..8d17efcad 100644 --- a/tests/unit/swagger/definitionsGeneration/definitions.spec.ts +++ b/tests/unit/swagger/definitionsGeneration/definitions.spec.ts @@ -1,7 +1,7 @@ -import { ExtendedSpecConfig } from '@tsoa/cli/cli'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; -import { Swagger } from '@tsoa/runtime'; +import { ExtendedSpecConfig } from '@tsoa-deno/cli/cli'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; +import { Swagger } from '@tsoa-deno/runtime'; import { expect } from 'chai'; import 'mocha'; import { versionMajorMinor } from 'typescript'; diff --git a/tests/unit/swagger/definitionsGeneration/metadata.spec.ts b/tests/unit/swagger/definitionsGeneration/metadata.spec.ts index e3d67210d..a273a9b14 100644 --- a/tests/unit/swagger/definitionsGeneration/metadata.spec.ts +++ b/tests/unit/swagger/definitionsGeneration/metadata.spec.ts @@ -1,8 +1,8 @@ import { expect } from 'chai'; import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { Tsoa } from '@tsoa/runtime'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { Tsoa } from '@tsoa-deno/runtime'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from '../../../fixtures/defaultOptions'; describe('Metadata generation', () => { diff --git a/tests/unit/swagger/parameterDetails3.spec.ts b/tests/unit/swagger/parameterDetails3.spec.ts index 7ea8e7d89..5d1872bbf 100644 --- a/tests/unit/swagger/parameterDetails3.spec.ts +++ b/tests/unit/swagger/parameterDetails3.spec.ts @@ -1,10 +1,10 @@ import { expect } from 'chai'; import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator3 } from '@tsoa/cli/swagger/specGenerator3'; -import { Swagger } from '@tsoa/runtime'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator3 } from '@tsoa-deno/cli/swagger/specGenerator3'; +import { Swagger } from '@tsoa-deno/runtime'; import { getDefaultOptions } from '../../fixtures/defaultOptions'; -import { ExtendedSpecConfig } from '@tsoa/cli/cli'; +import { ExtendedSpecConfig } from '@tsoa-deno/cli/cli'; describe('Parameter generation for OpenAPI 3.0.0', () => { const metadata = new MetadataGenerator('./fixtures/controllers/parameterController.ts').Generate(); diff --git a/tests/unit/swagger/pathGeneration/deleteRoutes.spec.ts b/tests/unit/swagger/pathGeneration/deleteRoutes.spec.ts index 20419bff2..9d2be6ccb 100644 --- a/tests/unit/swagger/pathGeneration/deleteRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/deleteRoutes.spec.ts @@ -1,10 +1,10 @@ import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from '../../../fixtures/defaultOptions'; import { VerifyPathableParameter } from '../../utilities/verifyParameter'; import { VerifyPath } from '../../utilities/verifyPath'; -import { Swagger } from '@tsoa/runtime'; +import { Swagger } from '@tsoa-deno/runtime'; describe('DELETE route generation', () => { const metadata = new MetadataGenerator('./fixtures/controllers/deleteController.ts').Generate(); diff --git a/tests/unit/swagger/pathGeneration/getRoutes.spec.ts b/tests/unit/swagger/pathGeneration/getRoutes.spec.ts index 0297a765f..4feefaef2 100644 --- a/tests/unit/swagger/pathGeneration/getRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/getRoutes.spec.ts @@ -1,8 +1,8 @@ import { expect } from 'chai'; import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; -import { SpecGenerator3 } from '@tsoa/cli/swagger/specGenerator3'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; +import { SpecGenerator3 } from '@tsoa-deno/cli/swagger/specGenerator3'; import { getDefaultExtendedOptions } from '../../../fixtures/defaultOptions'; import { VerifyPathableNumberParameter, VerifyPathableParameter, VerifyPathableStringParameter } from '../../utilities/verifyParameter'; import { VerifyPath } from '../../utilities/verifyPath'; diff --git a/tests/unit/swagger/pathGeneration/headRoutes.spec.ts b/tests/unit/swagger/pathGeneration/headRoutes.spec.ts index 39d90f6e9..5e1d9efde 100644 --- a/tests/unit/swagger/pathGeneration/headRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/headRoutes.spec.ts @@ -1,6 +1,6 @@ import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from '../../../fixtures/defaultOptions'; import { VerifyPathableParameter } from '../../utilities/verifyParameter'; import { VerifyPath } from '../../utilities/verifyPath'; diff --git a/tests/unit/swagger/pathGeneration/noSecurityRoutes.spec.ts b/tests/unit/swagger/pathGeneration/noSecurityRoutes.spec.ts index ee29f4b94..f982bf7fd 100644 --- a/tests/unit/swagger/pathGeneration/noSecurityRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/noSecurityRoutes.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from '../../../fixtures/defaultOptions'; import { VerifyPath } from '../../utilities/verifyPath'; diff --git a/tests/unit/swagger/pathGeneration/optionsRoutes.spec.ts b/tests/unit/swagger/pathGeneration/optionsRoutes.spec.ts index eb4407930..cef356530 100644 --- a/tests/unit/swagger/pathGeneration/optionsRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/optionsRoutes.spec.ts @@ -1,6 +1,6 @@ import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from 'fixtures/defaultOptions'; import { VerifyPath } from 'unit/utilities/verifyPath'; diff --git a/tests/unit/swagger/pathGeneration/patchRoutes.spec.ts b/tests/unit/swagger/pathGeneration/patchRoutes.spec.ts index 24c20579a..3f39de96a 100644 --- a/tests/unit/swagger/pathGeneration/patchRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/patchRoutes.spec.ts @@ -1,10 +1,10 @@ import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from '../../../fixtures/defaultOptions'; import { VerifyBodyParameter, VerifyPathableParameter } from '../../utilities/verifyParameter'; import { defaultModelName, VerifyPath } from '../../utilities/verifyPath'; -import { Swagger } from '@tsoa/runtime'; +import { Swagger } from '@tsoa-deno/runtime'; describe('PATCH route generation', () => { const metadata = new MetadataGenerator('./fixtures/controllers/patchController.ts').Generate(); diff --git a/tests/unit/swagger/pathGeneration/postRoutes.spec.ts b/tests/unit/swagger/pathGeneration/postRoutes.spec.ts index 5194202c2..54ce03078 100644 --- a/tests/unit/swagger/pathGeneration/postRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/postRoutes.spec.ts @@ -1,11 +1,11 @@ import * as chai from 'chai'; import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from '../../../fixtures/defaultOptions'; import { VerifyBodyParameter, VerifyPathableParameter } from '../../utilities/verifyParameter'; import { defaultModelName, VerifyPath } from '../../utilities/verifyPath'; -import { Swagger } from '@tsoa/runtime'; +import { Swagger } from '@tsoa-deno/runtime'; describe('POST route generation', () => { const metadata = new MetadataGenerator('./fixtures/controllers/postController.ts').Generate(); diff --git a/tests/unit/swagger/pathGeneration/putRoutes.spec.ts b/tests/unit/swagger/pathGeneration/putRoutes.spec.ts index 3b66e0af5..83e33c48a 100644 --- a/tests/unit/swagger/pathGeneration/putRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/putRoutes.spec.ts @@ -1,6 +1,6 @@ import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from '../../../fixtures/defaultOptions'; import { VerifyBodyParameter, VerifyPathableParameter } from '../../utilities/verifyParameter'; import { defaultModelName, VerifyPath } from '../../utilities/verifyPath'; diff --git a/tests/unit/swagger/pathGeneration/renamedImports.spec.ts b/tests/unit/swagger/pathGeneration/renamedImports.spec.ts index eaf6696b5..f6001a4b6 100644 --- a/tests/unit/swagger/pathGeneration/renamedImports.spec.ts +++ b/tests/unit/swagger/pathGeneration/renamedImports.spec.ts @@ -1,7 +1,7 @@ import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; -import { SpecGenerator3 } from '@tsoa/cli/swagger/specGenerator3'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; +import { SpecGenerator3 } from '@tsoa-deno/cli/swagger/specGenerator3'; import { getDefaultExtendedOptions } from 'fixtures/defaultOptions'; import { VerifyPath } from 'unit/utilities/verifyPath'; import { expect } from 'chai'; diff --git a/tests/unit/swagger/pathGeneration/rootSecurityRoutes.spec.ts b/tests/unit/swagger/pathGeneration/rootSecurityRoutes.spec.ts index 574d0e766..03a5f427f 100644 --- a/tests/unit/swagger/pathGeneration/rootSecurityRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/rootSecurityRoutes.spec.ts @@ -1,10 +1,10 @@ import { expect } from 'chai'; import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from '../../../fixtures/defaultOptions'; import { VerifyPath } from '../../utilities/verifyPath'; -import type { Swagger } from '@tsoa/runtime'; +import type { Swagger } from '@tsoa-deno/runtime'; describe('Security route generation with root security', () => { describe('with @Security() on controller', () => { diff --git a/tests/unit/swagger/pathGeneration/routeDuplicates.spec.ts b/tests/unit/swagger/pathGeneration/routeDuplicates.spec.ts index 04b4100a7..adf52900d 100644 --- a/tests/unit/swagger/pathGeneration/routeDuplicates.spec.ts +++ b/tests/unit/swagger/pathGeneration/routeDuplicates.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; import { spy } from 'sinon'; describe('Overlapping routes', () => { diff --git a/tests/unit/swagger/pathGeneration/securityRoutes.spec.ts b/tests/unit/swagger/pathGeneration/securityRoutes.spec.ts index 46c0794c1..ceb6206e1 100644 --- a/tests/unit/swagger/pathGeneration/securityRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/securityRoutes.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import 'mocha'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from '../../../fixtures/defaultOptions'; import { VerifyPath } from '../../utilities/verifyPath'; diff --git a/tests/unit/swagger/pathGeneration/subResourceRoutes.spec.ts b/tests/unit/swagger/pathGeneration/subResourceRoutes.spec.ts index 085b5b6c3..e1c867a54 100644 --- a/tests/unit/swagger/pathGeneration/subResourceRoutes.spec.ts +++ b/tests/unit/swagger/pathGeneration/subResourceRoutes.spec.ts @@ -1,7 +1,7 @@ import 'mocha'; import { expect } from 'chai'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { Tsoa } from '@tsoa/runtime'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { Tsoa } from '@tsoa-deno/runtime'; describe('Sub resource route generation', () => { const metadata = new MetadataGenerator('./fixtures/controllers/subresourceController.ts').Generate(); diff --git a/tests/unit/swagger/schemaDetails.spec.ts b/tests/unit/swagger/schemaDetails.spec.ts index 444966e21..733389a4d 100644 --- a/tests/unit/swagger/schemaDetails.spec.ts +++ b/tests/unit/swagger/schemaDetails.spec.ts @@ -2,11 +2,11 @@ import 'mocha'; import { expect } from 'chai'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator2 } from '@tsoa/cli/swagger/specGenerator2'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator2 } from '@tsoa-deno/cli/swagger/specGenerator2'; import { getDefaultExtendedOptions } from '../../fixtures/defaultOptions'; -import { Swagger, Tsoa } from '@tsoa/runtime'; -import { ExtendedSpecConfig } from '@tsoa/cli/cli'; +import { Swagger, Tsoa } from '@tsoa-deno/runtime'; +import { ExtendedSpecConfig } from '@tsoa-deno/cli/cli'; describe('Schema details generation', () => { const metadataGet = new MetadataGenerator('./fixtures/controllers/getController.ts').Generate(); diff --git a/tests/unit/swagger/schemaDetails3.spec.ts b/tests/unit/swagger/schemaDetails3.spec.ts index 11b9f3c0d..c3a913f4a 100644 --- a/tests/unit/swagger/schemaDetails3.spec.ts +++ b/tests/unit/swagger/schemaDetails3.spec.ts @@ -1,7 +1,7 @@ -import { ExtendedSpecConfig } from '@tsoa/cli/cli'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { SpecGenerator3 } from '@tsoa/cli/swagger/specGenerator3'; -import { Swagger, Tsoa } from '@tsoa/runtime'; +import { ExtendedSpecConfig } from '@tsoa-deno/cli/cli'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { SpecGenerator3 } from '@tsoa-deno/cli/swagger/specGenerator3'; +import { Swagger, Tsoa } from '@tsoa-deno/runtime'; import { expect } from 'chai'; import 'mocha'; import { versionMajorMinor } from 'typescript'; diff --git a/tests/unit/swagger/templateHelpers.spec.ts b/tests/unit/swagger/templateHelpers.spec.ts index 29616ca15..ecf5a4612 100644 --- a/tests/unit/swagger/templateHelpers.spec.ts +++ b/tests/unit/swagger/templateHelpers.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import 'mocha'; -import { TsoaRoute, FieldErrors, ValidationService, AdditionalProps } from '@tsoa/runtime'; +import { TsoaRoute, FieldErrors, ValidationService, AdditionalProps } from '@tsoa-deno/runtime'; import { TypeAliasDate, TypeAliasDateTime, TypeAliasModel1, TypeAliasModel2 } from 'fixtures/testModel'; describe('ValidationService', () => { diff --git a/tests/unit/templating/routeGenerator.spec.ts b/tests/unit/templating/routeGenerator.spec.ts index 1dcdb36f8..0390b9917 100644 --- a/tests/unit/templating/routeGenerator.spec.ts +++ b/tests/unit/templating/routeGenerator.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import 'mocha'; -import { Tsoa } from '@tsoa/runtime'; -import { DefaultRouteGenerator } from '@tsoa/cli/routeGeneration/defaultRouteGenerator'; +import { Tsoa } from '@tsoa-deno/runtime'; +import { DefaultRouteGenerator } from '@tsoa-deno/cli/routeGeneration/defaultRouteGenerator'; describe('RouteGenerator', () => { describe('.buildModels', () => { diff --git a/tests/unit/templating/templateHelpers.spec.ts b/tests/unit/templating/templateHelpers.spec.ts index 1602f0e70..8f3f03d08 100644 --- a/tests/unit/templating/templateHelpers.spec.ts +++ b/tests/unit/templating/templateHelpers.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import 'mocha'; -import { TsoaRoute, AdditionalProps, ValidateError, FieldErrors, ValidationService } from '@tsoa/runtime'; +import { TsoaRoute, AdditionalProps, ValidateError, FieldErrors, ValidationService } from '@tsoa-deno/runtime'; import { TypeAliasModel1, TypeAliasModel2 } from '../../fixtures/testModel'; it('ValidateError should be an instanceof ValidateError', () => { diff --git a/tests/unit/utilities/GenerateMetadataError.spec.ts b/tests/unit/utilities/GenerateMetadataError.spec.ts index 9b7eb49ba..84a4c22b6 100644 --- a/tests/unit/utilities/GenerateMetadataError.spec.ts +++ b/tests/unit/utilities/GenerateMetadataError.spec.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import 'mocha'; import { join, normalize } from 'path'; import { createProgram, InterfaceDeclaration, isInterfaceDeclaration, PropertySignature } from 'typescript'; -import { GenerateMetadataError } from '@tsoa/cli/metadataGeneration/exceptions'; +import { GenerateMetadataError } from '@tsoa-deno/cli/metadataGeneration/exceptions'; const path = normalize(join(__dirname, '../../fixtures/program.ts')); const program = createProgram([path], {}); diff --git a/tests/unit/utilities/specMerge.spec.ts b/tests/unit/utilities/specMerge.spec.ts index 9db843f0a..833437f69 100644 --- a/tests/unit/utilities/specMerge.spec.ts +++ b/tests/unit/utilities/specMerge.spec.ts @@ -1,10 +1,10 @@ import 'mocha'; import { expect } from 'chai'; import { getDefaultExtendedOptions } from '../../fixtures/defaultOptions'; -import { MetadataGenerator } from '@tsoa/cli/metadataGeneration/metadataGenerator'; -import { ExtendedSpecConfig } from '@tsoa/cli/cli'; -import { Swagger } from '@tsoa/runtime'; -import { SpecGenerator3 } from '@tsoa/cli/swagger/specGenerator3'; +import { MetadataGenerator } from '@tsoa-deno/cli/metadataGeneration/metadataGenerator'; +import { ExtendedSpecConfig } from '@tsoa-deno/cli/cli'; +import { Swagger } from '@tsoa-deno/runtime'; +import { SpecGenerator3 } from '@tsoa-deno/cli/swagger/specGenerator3'; describe('specMergins', () => { const metadata = new MetadataGenerator('./fixtures/controllers/getController.ts').Generate(); diff --git a/tests/unit/utilities/verifyParameter.ts b/tests/unit/utilities/verifyParameter.ts index fcb05010d..d96ab7ccc 100644 --- a/tests/unit/utilities/verifyParameter.ts +++ b/tests/unit/utilities/verifyParameter.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { Swagger } from '@tsoa/runtime'; +import { Swagger } from '@tsoa-deno/runtime'; export function VerifyPathableParameter(params: Swagger.Parameter[], paramValue: string, paramType: string, paramIn: string, formatType?: string) { const parameter = verifyParameter(params, paramValue, paramIn); diff --git a/tests/unit/utilities/verifyPath.ts b/tests/unit/utilities/verifyPath.ts index 1073b22ac..624e71309 100644 --- a/tests/unit/utilities/verifyPath.ts +++ b/tests/unit/utilities/verifyPath.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { Swagger } from '@tsoa/runtime'; +import { Swagger } from '@tsoa-deno/runtime'; export const defaultModelName = '#/definitions/TestModel'; diff --git a/yarn.lock b/yarn.lock index 992a7e117..159dd2507 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1229,15 +1229,6 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== -"@tsoa/runtime@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@tsoa/runtime/-/runtime-6.0.0.tgz#e8e6f5ae7704f7d6913da40ff8cbbe6661d60a6f" - integrity sha512-n0LYcjII313kDn3M4bZdAjU+sX7595sIEA3bw4pvxWRrkandyDdDFNrfQL8nZ3Pw6dkTmK7brZi0YBBDhe0Rzw== - dependencies: - "@types/multer" "^1.4.11" - reflect-metadata "^0.2.1" - validator "^13.11.0" - "@tufjs/canonical-json@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31"