fix(cli-core): optimize bundle size

packages/cli-core/package.json

@@ -31,7 +31,6 @@
     "listr"
   ],
   "dependencies": {
-    "@npmcli/run-script": "9.0.0",
     "@tsed/logger": ">=7.0.1",
     "@tsed/normalize-path": ">=7.14.2",
     "@types/inquirer": "^9.0.7",
@@ -40,15 +39,11 @@
     "chalk": "^5.3.0",
     "change-case": "^5.4.4",
     "commander": "^12.1.0",
-    "consolidate": "^1.0.4",
-    "create-frame": "^1.0.0",
     "enquirer": "^2.4.1",
     "execa": "^8.0.1",
     "figures": "^6.1.0",
     "fs-extra": "^11.2.0",
     "globby": "^14.0.2",
-    "handlebars": "^4.7.8",
-    "handlebars-utils": "^1.0.6",
     "inquirer": "^9.3.7",
     "inquirer-autocomplete-prompt": "^3.0.1",
     "js-yaml": "^4.1.0",
@@ -67,7 +62,6 @@
   "devDependencies": {
     "@tsed/typescript": "workspace:*",
     "@types/commander": "2.12.2",
-    "@types/consolidate": "0.14.4",
     "@types/figures": "3.0.1",
     "@types/fs-extra": "^11.0.4",
     "@types/globby": "9.1.0",

packages/cli-core/src/services/index.ts

@@ -7,9 +7,7 @@ export * from "./CliLoadFile.js";
 export * from "./CliPackageJson.js";
 export * from "./CliPlugins.js";
 export * from "./CliProxyAgent.js";
-export * from "./CliRunScript.js";
 export * from "./CliService.js";
 export * from "./CliYaml.js";
 export * from "./NpmRegistryClient.js";
 export * from "./ProjectPackageJson.js";
-export * from "./Renderer.js";

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

@@ -1,5 +1,5 @@
-import type {InitCmdContext} from "@tsed/cli";
-import {inject, Injectable, OnExec, OnPostInstall, PackageManagersModule, ProjectPackageJson, RootRendererService} from "@tsed/cli-core";
+import {type InitCmdContext, RootRendererService} from "@tsed/cli";
+import {inject, Injectable, OnExec, OnPostInstall, PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";
 

packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts

@@ -1,13 +1,12 @@
-import type {GenerateCmdContext} from "@tsed/cli";
-import {Inject, Injectable, OnExec, SrcRendererService, type Tasks} from "@tsed/cli-core";
+import {type GenerateCmdContext, SrcRendererService} from "@tsed/cli";
+import {inject, Injectable, OnExec, type Tasks} from "@tsed/cli-core";
 import {normalizePath} from "@tsed/normalize-path";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";
 
 @Injectable()
 export class JestGenerateHook {
-  @Inject()
-  srcRenderService: SrcRendererService;
+  srcRenderService = inject(SrcRendererService);
 
   @OnExec("generate")
   onGenerateExec(ctx: GenerateCmdContext): Tasks {

packages/cli-plugin-jest/src/hooks/JestInitHook.ts

@@ -1,28 +1,12 @@
-import {
-  Inject,
-  Injectable,
-  OnExec,
-  ProjectPackageJson,
-  RootRendererService,
-  ScriptsRendererService,
-  SrcRendererService
-} from "@tsed/cli-core";
+import {RootRendererService} from "@tsed/cli";
+import {inject, Injectable, OnExec, ProjectPackageJson} from "@tsed/cli-core";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";
 
 @Injectable()
 export class JestInitHook {
-  @Inject()
-  protected packageJson: ProjectPackageJson;
-
-  @Inject()
-  protected srcRenderer: SrcRendererService;
-
-  @Inject()
-  protected rootRenderer: RootRendererService;
-
-  @Inject()
-  protected scriptsRenderer: ScriptsRendererService;
+  protected packageJson = inject(ProjectPackageJson);
+  protected rootRenderer = inject(RootRendererService);
 
   @OnExec("init")
   onInitExec() {

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 {type GenerateCmdContext, ProvidersInfoService, SrcRendererService} from "@tsed/cli";
+import {CliDockerComposeYaml, inject, OnExec, ProjectPackageJson, type Tasks} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 import {camelCase, kebabCase} from "change-case";
 // @ts-ignore

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

@@ -1,6 +1,7 @@
 import {basename, join} from "node:path";
 
-import {inject, Injectable, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core";
+import {SrcRendererService} from "@tsed/cli";
+import {inject, Injectable, ProjectPackageJson} from "@tsed/cli-core";
 import {camelCase, constantCase, kebabCase} from "change-case";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";

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

@@ -1,5 +1,5 @@
-import type {InitCmdContext} from "@tsed/cli";
-import {inject, OnExec, ProjectPackageJson, RootRendererService} from "@tsed/cli-core";
+import {type InitCmdContext, RootRendererService} from "@tsed/cli";
+import {inject, OnExec, ProjectPackageJson} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";

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 {type GenerateCmdContext, ProvidersInfoService, SrcRendererService} from "@tsed/cli";
+import {inject, OnExec, OnPrompt, ProjectPackageJson, type Tasks} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 import {kebabCase} from "change-case";
 

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

@@ -1,5 +1,5 @@
-import type {InitCmdContext} from "@tsed/cli";
-import {inject, OnExec, ProjectPackageJson, RootRendererService} from "@tsed/cli-core";
+import {type InitCmdContext, RootRendererService} from "@tsed/cli";
+import {inject, OnExec, ProjectPackageJson} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";

packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts

@@ -1,5 +1,5 @@
-import {FeaturesMap, type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli";
-import {CliDockerComposeYaml, inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core";
+import {FeaturesMap, type GenerateCmdContext, ProvidersInfoService, SrcRendererService} from "@tsed/cli";
+import {CliDockerComposeYaml, inject, OnExec, OnPrompt, ProjectPackageJson, type Tasks} from "@tsed/cli-core";
 import {Injectable} from "@tsed/di";
 import {camelCase} from "change-case";
 

packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts

@@ -1,5 +1,5 @@
-import type {GenerateCmdContext} from "@tsed/cli";
-import {inject, Injectable, OnExec, SrcRendererService, type Tasks} from "@tsed/cli-core";
+import {type GenerateCmdContext, SrcRendererService} from "@tsed/cli";
+import {inject, Injectable, OnExec, type Tasks} from "@tsed/cli-core";
 import {normalizePath} from "@tsed/normalize-path";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";

packages/cli-plugin-vitest/src/hooks/VitestInitHook.ts

@@ -1,28 +1,12 @@
-import {
-  Inject,
-  Injectable,
-  OnExec,
-  ProjectPackageJson,
-  RootRendererService,
-  ScriptsRendererService,
-  SrcRendererService
-} from "@tsed/cli-core";
+import {RootRendererService} from "@tsed/cli";
+import {inject, Injectable, OnExec, ProjectPackageJson} from "@tsed/cli-core";
 
 import {TEMPLATE_DIR} from "../utils/templateDir.js";
 
 @Injectable()
 export class VitestInitHook {
-  @Inject()
-  protected packageJson: ProjectPackageJson;
-
-  @Inject()
-  protected srcRenderer: SrcRendererService;
-
-  @Inject()
-  protected rootRenderer: RootRendererService;
-
-  @Inject()
-  protected scriptsRenderer: ScriptsRendererService;
+  protected packageJson = inject(ProjectPackageJson);
+  protected rootRenderer = inject(RootRendererService);
 
   @OnExec("init")
   onInitExec() {

packages/cli/package.json

@@ -63,6 +63,7 @@
     "node": ">=14"
   },
   "dependencies": {
+    "@npmcli/run-script": "9.0.0",
     "@swc-node/register": "^1.10.9",
     "@swc/core": "1.7.26",
     "@swc/helpers": "^0.5.13",
@@ -75,14 +76,19 @@
     "@tsed/schema": ">=8.0.0",
     "chalk": "^5.3.0",
     "change-case": "^5.4.4",
+    "consolidate": "^1.0.4",
+    "create-frame": "^1.0.0",
     "globby": "^14.0.2",
+    "handlebars": "^4.7.8",
+    "handlebars-utils": "^1.0.6",
     "read-pkg-up": "^11.0.0",
     "semver": "^7.6.3",
     "tslib": "^2.7.0"
   },
   "devDependencies": {
     "@tsed/typescript": "workspace:*",
     "@types/change-case": "^2.3.1",
+    "@types/consolidate": "0.14.4",
     "cross-env": "7.0.3",
     "typescript": "5.6.2",
     "vitest": "2.1.1"

packages/cli/src/commands/generate/GenerateCmd.spec.ts

@@ -1,8 +1,7 @@
 // @ts-ignore
-import {InjectorService, SrcRendererService} from "@tsed/cli-core";
-// @ts-ignore
 import {CliPlatformTest} from "@tsed/cli-testing";
 
+import {SrcRendererService} from "../../services/Renderer.js";
 import {GenerateCmd} from "./GenerateCmd.js";
 
 describe("GenerateCmd", () => {

packages/cli/src/commands/generate/GenerateCmd.ts

@@ -1,6 +1,6 @@
 import {basename, dirname, join} from "node:path";
 
-import {type CliDefaultOptions, Command, type CommandProvider, Inject, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core";
+import {type CliDefaultOptions, Command, type CommandProvider, Inject, inject, ProjectPackageJson} from "@tsed/cli-core";
 import {normalizePath} from "@tsed/normalize-path";
 import {kebabCase, pascalCase} from "change-case";
 import {globbySync} from "globby";
@@ -10,6 +10,7 @@ import {ClassNamePipe} from "../../pipes/ClassNamePipe.js";
 import {OutputFilePathPipe} from "../../pipes/OutputFilePathPipe.js";
 import {RoutePipe} from "../../pipes/RoutePipe.js";
 import {ProvidersInfoService} from "../../services/ProvidersInfoService.js";
+import {SrcRendererService} from "../../services/Renderer.js";
 import {fillImports} from "../../utils/fillImports.js";
 import {PROVIDER_TYPES} from "./ProviderTypes.js";
 
@@ -92,11 +93,8 @@ export class GenerateCmd implements CommandProvider {
   @Inject()
   routePipe: RoutePipe;
 
-  @Inject()
-  srcRenderService: SrcRendererService;
-
-  @Inject()
-  projectPackageJson: ProjectPackageJson;
+  srcRenderService = inject(SrcRendererService);
+  projectPackageJson = inject(ProjectPackageJson);
 
   constructor(private providersList: ProvidersInfoService) {
     PROVIDER_TYPES.forEach((info) => {

packages/cli/src/commands/init/InitCmd.ts

@@ -17,7 +17,6 @@ import {
   PackageManagersModule,
   ProjectPackageJson,
   type QuestionOptions,
-  RootRendererService,
   type Task
 } from "@tsed/cli-core";
 import {kebabCase, pascalCase} from "change-case";
@@ -31,6 +30,7 @@ import {InitPlatformsModule} from "../../platforms/InitPlatformsModule.js";
 import {RuntimesModule} from "../../runtimes/RuntimesModule.js";
 import {BunRuntime} from "../../runtimes/supports/BunRuntime.js";
 import {NodeRuntime} from "../../runtimes/supports/NodeRuntime.js";
+import {RootRendererService} from "../../services/Renderer.js";
 import {fillImports} from "../../utils/fillImports.js";
 import {FeaturesMap, FeatureType} from "./config/FeaturesPrompt.js";
 import {InitFileSchema} from "./config/InitFileSchema.js";

packages/cli/src/commands/run/RunCmd.spec.ts

@@ -1,8 +1,9 @@
 // @ts-ignore
-import {CliFs, CliRunScript} from "@tsed/cli-core";
+import {CliFs} from "@tsed/cli-core";
 // @ts-ignore
 import {CliPlatformTest} from "@tsed/cli-testing";
 
+import {CliRunScript} from "../../services/CliRunScript.js";
 import {RunCmd} from "./RunCmd.js";
 
 describe("RunCmd", () => {

packages/cli/src/commands/run/RunCmd.ts

@@ -1,4 +1,6 @@
-import {CliFs, CliRunScript, Command, type CommandProvider, inject, normalizePath, ProjectPackageJson, type Tasks} from "@tsed/cli-core";
+import {CliFs, Command, type CommandProvider, inject, normalizePath, ProjectPackageJson, type Tasks} from "@tsed/cli-core";
+
+import {CliRunScript} from "../../services/CliRunScript.js";
 
 export interface RunCmdContext {
   production: boolean;

packages/cli/src/index.ts

@@ -13,3 +13,4 @@ export * from "./interfaces/index.js";
 export * from "./pipes/index.js";
 export * from "./runtimes/index.js";
 export * from "./services/ProvidersInfoService.js";
+export * from "./services/Renderer.js";

packages/cli-core/src/services/CliRunScript.ts → packages/cli/src/services/CliRunScript.ts

@@ -1,7 +1,6 @@
+import {ProjectPackageJson} from "@tsed/cli-core";
 import {inject, Injectable} from "@tsed/di";
 
-import {ProjectPackageJson} from "./ProjectPackageJson.js";
-
 @Injectable()
 export class CliRunScript {
   async run(cmd: string, args: string[], options: any = {}) {

packages/cli-core/src/services/Renderer.spec.ts → packages/cli/src/services/Renderer.spec.ts

@@ -1,14 +1,13 @@
 import {join} from "node:path";
 
+import {CliFs, getTemplateDirectory} from "@tsed/cli-core";
 // @ts-ignore
 import {FakeCliFs, normalizePath} from "@tsed/cli-testing";
 import {configuration, DITest} from "@tsed/di";
 import Consolidate from "consolidate";
 import {globby} from "globby";
 import handlebars from "handlebars";
 
-import {getTemplateDirectory} from "../utils/index.js";
-import {CliFs} from "./CliFs.js";
 import {RootRendererService, SrcRendererService} from "./Renderer.js";
 
 const TEMPLATE_DIR = getTemplateDirectory(join(import.meta.url, "../../../cli-plugin-jest/src/utils"));

packages/cli-core/src/services/Renderer.ts → packages/cli/src/services/Renderer.ts

@@ -2,6 +2,7 @@ import "../utils/hbs/index.js";
 
 import {basename, dirname, join, relative} from "node:path";
 
+import {CliFs} from "@tsed/cli-core";
 import {isString} from "@tsed/core";
 import {constant, inject, Injectable} from "@tsed/di";
 import {normalizePath} from "@tsed/normalize-path";
@@ -13,7 +14,6 @@ import {Observable} from "rxjs";
 
 import {insertAfter} from "../utils/renderer/insertAfter.js";
 import {insertImport} from "../utils/renderer/insertImport.js";
-import {CliFs} from "./CliFs.js";
 
 export interface RenderOptions {
   path: string;

yarn.lock

@@ -2331,12 +2331,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@tsed/cli-core@workspace:packages/cli-core"
   dependencies:
-    "@npmcli/run-script": "npm:9.0.0"
     "@tsed/logger": "npm:>=7.0.1"
     "@tsed/normalize-path": "npm:>=7.14.2"
     "@tsed/typescript": "workspace:*"
     "@types/commander": "npm:2.12.2"
-    "@types/consolidate": "npm:0.14.4"
     "@types/figures": "npm:3.0.1"
     "@types/fs-extra": "npm:^11.0.4"
     "@types/globby": "npm:9.1.0"
@@ -2352,17 +2350,13 @@ __metadata:
     chalk: "npm:^5.3.0"
     change-case: "npm:^5.4.4"
     commander: "npm:^12.1.0"
-    consolidate: "npm:^1.0.4"
-    create-frame: "npm:^1.0.0"
     cross-env: "npm:7.0.3"
     deps: "npm:^1.0.0"
     enquirer: "npm:^2.4.1"
     execa: "npm:^8.0.1"
     figures: "npm:^6.1.0"
     fs-extra: "npm:^11.2.0"
     globby: "npm:^14.0.2"
-    handlebars: "npm:^4.7.8"
-    handlebars-utils: "npm:^1.0.6"
     inquirer: "npm:^9.3.7"
     inquirer-autocomplete-prompt: "npm:^3.0.1"
     js-yaml: "npm:^4.1.0"
@@ -2661,6 +2655,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@tsed/cli@workspace:packages/cli"
   dependencies:
+    "@npmcli/run-script": "npm:9.0.0"
     "@swc-node/register": "npm:^1.10.9"
     "@swc/core": "npm:1.7.26"
     "@swc/helpers": "npm:^0.5.13"
@@ -2673,10 +2668,15 @@ __metadata:
     "@tsed/schema": "npm:>=8.0.0"
     "@tsed/typescript": "workspace:*"
     "@types/change-case": "npm:^2.3.1"
+    "@types/consolidate": "npm:0.14.4"
     chalk: "npm:^5.3.0"
     change-case: "npm:^5.4.4"
+    consolidate: "npm:^1.0.4"
+    create-frame: "npm:^1.0.0"
     cross-env: "npm:7.0.3"
     globby: "npm:^14.0.2"
+    handlebars: "npm:^4.7.8"
+    handlebars-utils: "npm:^1.0.6"
     read-pkg-up: "npm:^11.0.0"
     semver: "npm:^7.6.3"
     tslib: "npm:^2.7.0"