refactor: migrate plugins code to functional API

packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts

@@ -1,6 +1,6 @@
-import {CliFs, Command, type CommandProvider, Inject, Type} from "@tsed/cli-core";
+import {CliFs, Command, type CommandProvider, constant, inject, Type} from "@tsed/cli-core";
 import {isString} from "@tsed/core";
-import {Constant, InjectorService} from "@tsed/di";
+import {InjectorService} from "@tsed/di";
 import {camelCase} from "change-case";
 import path, {join, resolve} from "path";
 import {generateApi, type Hooks, type RawRouteInfo, type RouteNameInfo} from "swagger-typescript-api";
@@ -48,17 +48,9 @@ export interface GenerateHttpClientOpts {
   }
 })
 export class GenerateHttpClientCmd implements CommandProvider {
-  @Inject()
-  injector: InjectorService;
-
-  @Inject()
-  protected fs: CliFs;
-
-  @Constant("server")
-  protected serverModule: Type<any>;
-
-  @Constant("httpClient", {hooks: {}})
-  protected options: Partial<GenerateHttpClientOpts>;
+  protected fs = inject(CliFs);
+  protected serverModule = constant<Type<any>>("server");
+  protected options = constant<Partial<GenerateHttpClientOpts>>("httpClient", {hooks: {}});
 
   $mapContext($ctx: GenerateHttpClientCtx) {
     return {...$ctx, output: resolve(join(process.cwd(), $ctx.output))};

packages/cli-generate-swagger/src/commands/GenerateSwaggerCmd.ts

@@ -1,4 +1,4 @@
-import {CliFs, CliYaml, Command, type CommandProvider, Constant, Inject, InjectorService, Type} from "@tsed/cli-core";
+import {CliFs, CliYaml, Command, type CommandProvider, Constant, constant, Inject, inject, InjectorService, Type} from "@tsed/cli-core";
 import path, {join, resolve} from "path";
 
 export interface GenerateSwaggerCtx {
@@ -17,17 +17,9 @@ export interface GenerateSwaggerCtx {
   }
 })
 export class GenerateSwaggerCmd implements CommandProvider {
-  @Inject()
-  injector: InjectorService;
-
-  @Inject()
-  protected fs: CliFs;
-
-  @Inject()
-  protected cliYaml: CliYaml;
-
-  @Constant("server")
-  protected serverModule: Type<any>;
+  protected fs = inject(CliFs);
+  protected cliYaml = inject(CliYaml);
+  protected serverModule = constant<Type<any>>("server");
 
   $mapContext($ctx: GenerateSwaggerCtx) {
     return {...$ctx, output: resolve(join(process.cwd(), $ctx.output))};

packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts

@@ -1,18 +1,13 @@
 import type {InitCmdContext} from "@tsed/cli";
-import {Inject, Injectable, OnExec, OnPostInstall, PackageManagersModule, ProjectPackageJson, RootRendererService} from "@tsed/cli-core";
+import {inject, Injectable, OnExec, OnPostInstall, PackageManagersModule, ProjectPackageJson, RootRendererService} from "@tsed/cli-core";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";
 
 @Injectable()
 export class EslintInitHook {
-  @Inject()
-  protected packageJson: ProjectPackageJson;
-
-  @Inject()
-  protected packageManagers: PackageManagersModule;
-
-  @Inject()
-  protected rootRenderer: RootRendererService;
+  protected packageJson = inject(ProjectPackageJson);
+  protected packageManagers = inject(PackageManagersModule);
+  protected rootRenderer = inject(RootRendererService);
 
   @OnExec("init")
   onExec(ctx: InitCmdContext) {

packages/cli-plugin-jest/src/CliPluginJestModule.ts

@@ -1,6 +1,5 @@
 import {RuntimesModule} from "@tsed/cli";
-import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core";
-import {Inject} from "@tsed/di";
+import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core";
 
 import {JestGenerateHook} from "./hooks/JestGenerateHook.js";
 import {JestInitHook} from "./hooks/JestInitHook.js";
@@ -9,11 +8,8 @@ import {JestInitHook} from "./hooks/JestInitHook.js";
   imports: [JestInitHook, JestGenerateHook]
 })
 export class CliPluginJestModule {
-  @Inject()
-  runtimes: RuntimesModule;
-
-  @Inject()
-  packageJson: ProjectPackageJson;
+  protected runtimes = inject(RuntimesModule);
+  protected packageJson = inject(ProjectPackageJson);
 
   @OnAdd("@tsed/cli-plugin-jest")
   install() {

packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts

@@ -1,5 +1,4 @@
-import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core";
-import {Inject} from "@tsed/di";
+import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core";
 
 import {MongooseGenerateHook} from "./hooks/MongooseGenerateHook.js";
 import {MongooseInitHook} from "./hooks/MongooseInitHook.js";
@@ -9,8 +8,7 @@ import {CliMongoose} from "./services/CliMongoose.js";
   imports: [MongooseInitHook, MongooseGenerateHook, CliMongoose]
 })
 export class CliPluginMongooseModule {
-  @Inject()
-  packageJson: ProjectPackageJson;
+  protected packageJson = inject(ProjectPackageJson);
 
   @OnAdd("@tsed/cli-plugin-mongoose")
   install() {

packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts

@@ -1,5 +1,5 @@
 import {type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli";
-import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core";
+import {CliDockerComposeYaml, inject, OnExec, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 import {camelCase, kebabCase} from "change-case";
 // @ts-ignore
@@ -10,18 +10,11 @@ import {TEMPLATE_DIR} from "../utils/templateDir.js";
 
 @Injectable()
 export class MongooseGenerateHook {
-  @Inject()
-  projectPackageJson: ProjectPackageJson;
-
-  @Inject()
-  srcRenderService: SrcRendererService;
-
-  @Inject()
-  cliMongoose: CliMongoose;
-
-  packages: any[];
-  @Inject()
-  protected cliDockerComposeYaml: CliDockerComposeYaml;
+  protected projectPackageJson = inject(ProjectPackageJson);
+  protected srcRenderService = inject(SrcRendererService);
+  protected cliMongoose = inject(CliMongoose);
+  protected packages: any[];
+  protected cliDockerComposeYaml = inject(CliDockerComposeYaml);
 
   constructor(private providersInfoService: ProvidersInfoService) {
     providersInfoService

packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts

@@ -1,25 +1,14 @@
 import type {InitCmdContext} from "@tsed/cli";
-import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core";
+import {CliDockerComposeYaml, inject, OnExec, ProjectPackageJson} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 
 import {CliMongoose} from "../services/CliMongoose.js";
 
 @Injectable()
 export class MongooseInitHook {
-  @Inject()
-  cliMongoose: CliMongoose;
-
-  @Inject()
-  protected packageJson: ProjectPackageJson;
-
-  @Inject()
-  protected rootRenderer: RootRendererService;
-
-  @Inject()
-  protected srcRenderer: SrcRendererService;
-
-  @Inject()
-  protected cliDockerComposeYaml: CliDockerComposeYaml;
+  protected cliMongoose = inject(CliMongoose);
+  protected packageJson = inject(ProjectPackageJson);
+  protected cliDockerComposeYaml = inject(CliDockerComposeYaml);
 
   @OnExec("init")
   onExec(ctx: InitCmdContext) {

packages/cli-plugin-mongoose/src/services/CliMongoose.ts

@@ -1,16 +1,13 @@
-import {Inject, Injectable, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core";
+import {inject, Injectable, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core";
 import {camelCase, constantCase, kebabCase} from "change-case";
 import {basename, join} from "path";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";
 
 @Injectable()
 export class CliMongoose {
-  @Inject()
-  projectPackageJson: ProjectPackageJson;
-
-  @Inject()
-  protected srcRenderer: SrcRendererService;
+  protected projectPackageJson = inject(ProjectPackageJson);
+  protected srcRenderer = inject(SrcRendererService);
 
   async writeConfig(name: string, options: any = {}) {
     await this.srcRenderer.render(

packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts

@@ -1,14 +1,12 @@
-import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core";
-import {Inject} from "@tsed/di";
+import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core";
 
 import {OidcProviderInitHook} from "./hooks/OidcProviderInitHook.js";
 
 @Module({
   imports: [OidcProviderInitHook]
 })
 export class CliPluginOidcProviderModule {
-  @Inject()
-  packageJson: ProjectPackageJson;
+  protected packageJson = inject(ProjectPackageJson);
 
   @OnAdd("@tsed/cli-plugin-oidc-provider")
   install() {

packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts

@@ -1,22 +1,13 @@
 import type {InitCmdContext} from "@tsed/cli";
-import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core";
+import {inject, OnExec, ProjectPackageJson, RootRendererService} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";
 
 @Injectable()
 export class OidcProviderInitHook {
-  @Inject()
-  protected packageJson: ProjectPackageJson;
-
-  @Inject()
-  protected rootRenderer: RootRendererService;
-
-  @Inject()
-  protected srcRenderer: SrcRendererService;
-
-  @Inject()
-  protected cliDockerComposeYaml: CliDockerComposeYaml;
+  protected packageJson = inject(ProjectPackageJson);
+  protected rootRenderer = inject(RootRendererService);
 
   @OnExec("init")
   onExec(ctx: InitCmdContext) {

packages/cli-plugin-passport/src/CliPluginPassportModule.ts

@@ -1,4 +1,4 @@
-import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core";
+import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core";
 import {Inject} from "@tsed/di";
 
 import {PassportGenerateHook} from "./hooks/PassportGenerateHook.js";
@@ -7,8 +7,7 @@ import {PassportGenerateHook} from "./hooks/PassportGenerateHook.js";
   imports: [PassportGenerateHook]
 })
 export class CliPluginPassportModule {
-  @Inject()
-  packageJson: ProjectPackageJson;
+  protected packageJson = inject(ProjectPackageJson);
 
   @OnAdd("@tsed/cli-plugin-passport")
   install() {

packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts

@@ -1,5 +1,5 @@
 import {type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli";
-import {Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core";
+import {inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 import {kebabCase} from "change-case";
 
@@ -12,16 +12,10 @@ export interface PassportGenerateOptions extends GenerateCmdContext {
 
 @Injectable()
 export class PassportGenerateHook {
-  @Inject()
-  projectPackageJson: ProjectPackageJson;
-
-  @Inject()
-  srcRenderService: SrcRendererService;
-
-  @Inject()
-  passportClient: PassportClient;
-
-  packages: any[];
+  protected projectPackageJson = inject(ProjectPackageJson);
+  protected srcRenderService = inject(SrcRendererService);
+  protected passportClient = inject(PassportClient);
+  protected packages: any[];
 
   constructor(private providersInfoService: ProvidersInfoService) {
     providersInfoService.add(

packages/cli-plugin-passport/src/services/PassportClient.ts

@@ -1,11 +1,10 @@
-import {CliHttpClient, Inject, Injectable} from "@tsed/cli-core";
+import {CliHttpClient, inject, Injectable} from "@tsed/cli-core";
 
 const HOST = "http://www.passportjs.org/packages";
 
 @Injectable()
 export class PassportClient {
-  @Inject(CliHttpClient)
-  httpClient: CliHttpClient;
+  protected httpClient = inject(CliHttpClient);
 
   async getPackages(): Promise<any[]> {
     const result = await this.httpClient.get<any>(`${HOST}/-/all.json`, {});

packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts

@@ -1,13 +1,9 @@
-import {Module, ProjectPackageJson} from "@tsed/cli-core";
-import {Inject} from "@tsed/di";
+import {Module} from "@tsed/cli-core";
 
 import {PrismaCmd} from "./commands/PrismaCmd.js";
 import {PrismaInitHook} from "./hooks/PrismaInitHook.js";
 
 @Module({
   imports: [PrismaInitHook, PrismaCmd]
 })
-export class CliPluginPrismaModule {
-  @Inject()
-  packageJson: ProjectPackageJson;
-}
+export class CliPluginPrismaModule {}

packages/cli-plugin-prisma/src/commands/PrismaCmd.ts

@@ -1,4 +1,4 @@
-import {type CliDefaultOptions, Command, type CommandProvider, Inject} from "@tsed/cli-core";
+import {type CliDefaultOptions, Command, type CommandProvider, inject} from "@tsed/cli-core";
 
 import {CliPrisma} from "../services/CliPrisma.js";
 
@@ -20,8 +20,7 @@ export interface PrismaContext extends CliDefaultOptions {
   allowUnknownOption: true
 })
 export class PrismaCmd implements CommandProvider {
-  @Inject()
-  cli: CliPrisma;
+  protected cli = inject(CliPrisma);
 
   $exec(ctx: PrismaContext) {
     return [

packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts

@@ -1,22 +1,14 @@
 import type {InitCmdContext} from "@tsed/cli";
-import {CliService, Inject, OnExec, PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core";
+import {inject, OnExec, PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 
 import {CliPrisma} from "../services/CliPrisma.js";
 
 @Injectable()
 export class PrismaInitHook {
-  @Inject()
-  protected cliPrisma: CliPrisma;
-
-  @Inject()
-  protected cliService: CliService;
-
-  @Inject()
-  protected packageJson: ProjectPackageJson;
-
-  @Inject()
-  protected packageManagers: PackageManagersModule;
+  protected cliPrisma = inject(CliPrisma);
+  protected packageJson = inject(ProjectPackageJson);
+  protected packageManagers = inject(PackageManagersModule);
 
   @OnExec("init")
   onExec(ctx: InitCmdContext) {

packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts

@@ -1,4 +1,4 @@
-import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core";
+import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core";
 import {Inject} from "@tsed/di";
 
 import {TypeGraphqlInitHook} from "./hooks/TypeGraphqlInitHook.js";
@@ -7,8 +7,7 @@ import {TypeGraphqlInitHook} from "./hooks/TypeGraphqlInitHook.js";
   imports: [TypeGraphqlInitHook]
 })
 export class TypeGraphqlModule {
-  @Inject()
-  packageJson: ProjectPackageJson;
+  protected packageJson = inject(ProjectPackageJson);
 
   @OnAdd("@tsed/cli-plugin-typegraphql")
   install(ctx: any) {

packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts

@@ -1,19 +1,13 @@
 import type {InitCmdContext} from "@tsed/cli";
-import {Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core";
+import {inject, OnExec, ProjectPackageJson, RootRendererService} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";
 
 @Injectable()
 export class TypeGraphqlInitHook {
-  @Inject()
-  protected packageJson: ProjectPackageJson;
-
-  @Inject()
-  protected rootRenderer: RootRendererService;
-
-  @Inject()
-  protected srcRenderer: SrcRendererService;
+  protected packageJson = inject(ProjectPackageJson);
+  protected rootRenderer = inject(RootRendererService);
 
   @OnExec("init")
   onExec(ctx: InitCmdContext) {