@tsed/cli 6.0.0-beta.1 → 6.0.0-beta.3

package/lib/esm/commands/add/AddCmd.js

@@ -1,7 +1,11 @@
-import { __decorate, __metadata } from "tslib";
-import { CliPlugins, Command, createSubTasks, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
-import { Inject } from "@tsed/di";
+import { __decorate } from "tslib";
+import { CliPlugins, Command, createSubTasks, inject, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
 let AddCmd = class AddCmd {
+    constructor() {
+        this.cliPlugins = inject(CliPlugins);
+        this.packageJson = inject(ProjectPackageJson);
+        this.packageManagers = inject(PackageManagersModule);
+    }
     $prompt(initialOptions) {
         return [
             {
@@ -34,18 +38,6 @@ let AddCmd = class AddCmd {
         ];
     }
 };
-__decorate([
-    Inject(CliPlugins),
-    __metadata("design:type", CliPlugins)
-], AddCmd.prototype, "cliPlugins", void 0);
-__decorate([
-    Inject(ProjectPackageJson),
-    __metadata("design:type", ProjectPackageJson)
-], AddCmd.prototype, "packageJson", void 0);
-__decorate([
-    Inject(PackageManagersModule),
-    __metadata("design:type", PackageManagersModule)
-], AddCmd.prototype, "packageManagers", void 0);
 AddCmd = __decorate([
     Command({
         name: "add",

package/lib/esm/commands/generate/GenerateCmd.js

@@ -1,6 +1,6 @@
 var GenerateCmd_1;
 import { __decorate, __metadata } from "tslib";
-import { Command, Inject, ProjectPackageJson, SrcRendererService } from "@tsed/cli-core";
+import { Command, Inject, inject, ProjectPackageJson, SrcRendererService } from "@tsed/cli-core";
 import { normalizePath } from "@tsed/normalize-path";
 import { kebabCase, pascalCase } from "change-case";
 import { globbySync } from "globby";

package/lib/esm/commands/init/InitCmd.js

@@ -1,5 +1,5 @@
-import { __decorate, __metadata } from "tslib";
-import { CliExeca, CliFs, CliLoadFile, CliPackageJson, CliPlugins, CliService, Command, Configuration, createSubTasks, createTasksRunner, Inject, PackageManager, PackageManagersModule, ProjectPackageJson, RootRendererService } from "@tsed/cli-core";
+import { __decorate } from "tslib";
+import { CliExeca, CliFs, CliLoadFile, cliPackageJson, CliPlugins, CliService, Command, Configuration, createSubTasks, createTasksRunner, Inject, inject, PackageManager, PackageManagersModule, ProjectPackageJson, RootRendererService } from "@tsed/cli-core";
 import { kebabCase, pascalCase } from "change-case";
 import { basename, join } from "path";
 import { DEFAULT_TSED_TAGS } from "../../constants/index.js";
@@ -17,6 +17,21 @@ import { InitFileSchema } from "./config/InitFileSchema.js";
 import { mapToContext } from "./mappers/mapToContext.js";
 import { getFeaturesPrompt } from "./prompts/getFeaturesPrompt.js";
 let InitCmd = class InitCmd {
+    constructor() {
+        this.configuration = inject(Configuration);
+        this.cliPlugins = inject(CliPlugins);
+        this.packageJson = inject(ProjectPackageJson);
+        this.packageManagers = inject(PackageManagersModule);
+        this.runtimes = inject(RuntimesModule);
+        this.platforms = inject(InitPlatformsModule);
+        this.cliPackageJson = cliPackageJson();
+        this.cliService = inject(CliService);
+        this.cliLoadFile = inject(CliLoadFile);
+        this.rootRenderer = inject(RootRendererService);
+        this.outputFilePathPipe = inject(OutputFilePathPipe);
+        this.execa = inject(CliExeca);
+        this.fs = inject(CliFs);
+    }
     checkPrecondition(ctx) {
         const isValid = (types, value) => (value ? Object.values(types).includes(value) : true);
         if (!isValid(PlatformType, ctx.platform)) {
@@ -201,7 +216,6 @@ let InitCmd = class InitCmd {
     }
     addDependencies(ctx) {
         this.packageJson.addDependencies({
-            "@tsed/common": ctx.tsedVersion,
             "@tsed/core": ctx.tsedVersion,
             "@tsed/di": ctx.tsedVersion,
             "@tsed/ajv": ctx.tsedVersion,
@@ -209,15 +223,15 @@ let InitCmd = class InitCmd {
             "@tsed/schema": ctx.tsedVersion,
             "@tsed/json-mapper": ctx.tsedVersion,
             "@tsed/openspec": ctx.tsedVersion,
+            "@tsed/platform-http": ctx.tsedVersion,
             "@tsed/platform-cache": ctx.tsedVersion,
             "@tsed/platform-exceptions": ctx.tsedVersion,
-            "@tsed/platform-log-middleware": ctx.tsedVersion,
+            "@tsed/platform-log-request": ctx.tsedVersion,
             "@tsed/platform-middlewares": ctx.tsedVersion,
             "@tsed/platform-params": ctx.tsedVersion,
             "@tsed/platform-response-filter": ctx.tsedVersion,
             "@tsed/platform-views": ctx.tsedVersion,
             "@tsed/logger": "latest",
-            "@tsed/logger-file": "latest",
             "@tsed/engines": "latest",
             "@tsed/barrels": "latest",
             ajv: "latest",
@@ -308,58 +322,6 @@ let InitCmd = class InitCmd {
         });
     }
 };
-__decorate([
-    Configuration(),
-    __metadata("design:type", Object)
-], InitCmd.prototype, "configuration", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliPlugins)
-], InitCmd.prototype, "cliPlugins", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", ProjectPackageJson)
-], InitCmd.prototype, "packageJson", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", PackageManagersModule)
-], InitCmd.prototype, "packageManagers", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", RuntimesModule)
-], InitCmd.prototype, "runtimes", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", InitPlatformsModule)
-], InitCmd.prototype, "platforms", void 0);
-__decorate([
-    CliPackageJson(),
-    __metadata("design:type", Object)
-], InitCmd.prototype, "cliPackageJson", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliService)
-], InitCmd.prototype, "cliService", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliLoadFile)
-], InitCmd.prototype, "cliLoadFile", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", RootRendererService)
-], InitCmd.prototype, "rootRenderer", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", OutputFilePathPipe)
-], InitCmd.prototype, "outputFilePathPipe", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliExeca)
-], InitCmd.prototype, "execa", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliFs)
-], InitCmd.prototype, "fs", void 0);
 InitCmd = __decorate([
     Command({
         name: "init",

package/lib/esm/commands/run/RunCmd.js

@@ -1,7 +1,12 @@
-import { __decorate, __metadata } from "tslib";
-import { CliFs, CliRunScript, Command, normalizePath, ProjectPackageJson } from "@tsed/cli-core";
+import { __decorate } from "tslib";
+import { CliFs, CliRunScript, Command, inject, normalizePath, ProjectPackageJson } from "@tsed/cli-core";
 import { Inject } from "@tsed/di";
 let RunCmd = class RunCmd {
+    constructor() {
+        this.fs = inject(CliFs);
+        this.projectPackageJson = inject(ProjectPackageJson);
+        this.runScript = inject(CliRunScript);
+    }
     async $exec(ctx) {
         const cmd = "node";
         const args = ["--import", "@swc-node/register/register-esm"];
@@ -12,18 +17,6 @@ let RunCmd = class RunCmd {
         return [];
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", CliFs)
-], RunCmd.prototype, "fs", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", ProjectPackageJson)
-], RunCmd.prototype, "projectPackageJson", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliRunScript)
-], RunCmd.prototype, "runScript", void 0);
 RunCmd = __decorate([
     Command({
         name: "run",

package/lib/esm/commands/update/UpdateCmd.js

@@ -1,5 +1,5 @@
-import { __decorate, __metadata } from "tslib";
-import { CliPackageJson, Command, createSubTasks, Inject, NpmRegistryClient, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
+import { __decorate } from "tslib";
+import { CliPackageJson, Command, createSubTasks, Inject, inject, NpmRegistryClient, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
 import { getValue } from "@tsed/core";
 import semver from "semver";
 import { IGNORE_TAGS, IGNORE_VERSIONS, MINIMAL_TSED_VERSION } from "../../constants/index.js";
@@ -15,6 +15,12 @@ function shouldUpdate(pkg) {
     return pkg.includes("@tsed") && !pkg.includes("@tsed/cli") && !pkg.includes("@tsed/logger");
 }
 let UpdateCmd = class UpdateCmd {
+    constructor() {
+        this.npmRegistryClient = inject(NpmRegistryClient);
+        this.projectPackage = inject(ProjectPackageJson);
+        this.packageManagers = inject(PackageManagersModule);
+        this.cliPackage = inject(CliPackageJson);
+    }
     async $prompt(initialOptions) {
         const versions = await this.getAvailableVersions();
         return [
@@ -62,7 +68,7 @@ let UpdateCmd = class UpdateCmd {
         ];
     }
     async getAvailableVersions() {
-        const { versions } = await this.npmRegistryClient.info("@tsed/common", 10);
+        const { versions } = await this.npmRegistryClient.info("@tsed/platform-http", 10);
         this.versions = versions;
         return Object.keys(versions)
             .filter((version) => version.split(".")[0] >= MINIMAL_TSED_VERSION)
@@ -92,22 +98,6 @@ let UpdateCmd = class UpdateCmd {
         return version && isGreaterThan(version, this.cliPackage.version) ? version : this.cliPackage.version;
     }
 };
-__decorate([
-    Inject(NpmRegistryClient),
-    __metadata("design:type", NpmRegistryClient)
-], UpdateCmd.prototype, "npmRegistryClient", void 0);
-__decorate([
-    Inject(ProjectPackageJson),
-    __metadata("design:type", ProjectPackageJson)
-], UpdateCmd.prototype, "projectPackage", void 0);
-__decorate([
-    Inject(PackageManagersModule),
-    __metadata("design:type", PackageManagersModule)
-], UpdateCmd.prototype, "packageManagers", void 0);
-__decorate([
-    CliPackageJson(),
-    __metadata("design:type", Object)
-], UpdateCmd.prototype, "cliPackage", void 0);
 UpdateCmd = __decorate([
     Command({
         name: "update",

package/lib/esm/constants/index.js

@@ -4,8 +4,8 @@ const { path, packageJson } = readPackageUpSync({
     cwd: join(import.meta.dirname, "..", "..")
 });
 export const PKG = packageJson;
-export const MINIMAL_TSED_VERSION = "7";
-export const DEFAULT_TSED_TAGS = "latest";
+export const MINIMAL_TSED_VERSION = "8";
+export const DEFAULT_TSED_TAGS = "beta";
 export const IGNORE_VERSIONS = ["6.0.0"];
 export const IGNORE_TAGS = false; // /alpha|beta/
 export const TEMPLATE_DIR = join(dirname(path), "templates");

package/lib/esm/pipes/ClassNamePipe.js

@@ -1,11 +1,15 @@
-import { __decorate, __metadata } from "tslib";
-import { Injectable, ProjectPackageJson } from "@tsed/cli-core";
-import { Inject } from "@tsed/di";
+import { __decorate } from "tslib";
+import { ProjectPackageJson } from "@tsed/cli-core";
+import { inject, Injectable } from "@tsed/di";
 import { kebabCase, pascalCase } from "change-case";
 import { basename } from "path";
 import { ProjectConvention } from "../interfaces/ProjectConvention.js";
 import { ProvidersInfoService } from "../services/ProvidersInfoService.js";
 let ClassNamePipe = class ClassNamePipe {
+    constructor() {
+        this.providers = inject(ProvidersInfoService);
+        this.projectPackageJson = inject(ProjectPackageJson);
+    }
     transform(options) {
         const format = options.format || this.projectPackageJson.preferences.convention || ProjectConvention.DEFAULT;
         const meta = this.providers.get(options.type)?.model || "{{symbolName}}.{{symbolType}}?";
@@ -26,14 +30,6 @@ let ClassNamePipe = class ClassNamePipe {
         return [...names].join(".").toLowerCase();
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", ProvidersInfoService)
-], ClassNamePipe.prototype, "providers", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", ProjectPackageJson)
-], ClassNamePipe.prototype, "projectPackageJson", void 0);
 ClassNamePipe = __decorate([
     Injectable()
 ], ClassNamePipe);

package/lib/esm/pipes/OutputFilePathPipe.js

@@ -1,13 +1,15 @@
-import { __decorate, __metadata } from "tslib";
-import { Injectable, ProjectPackageJson } from "@tsed/cli-core";
+import { __decorate } from "tslib";
+import { inject, Injectable, ProjectPackageJson } from "@tsed/cli-core";
 import { Inject } from "@tsed/di";
 import { dirname, join } from "path";
 import { ArchitectureConvention, ProjectConvention } from "../interfaces/index.js";
 import { ProvidersInfoService } from "../services/ProvidersInfoService.js";
 import { ClassNamePipe } from "./ClassNamePipe.js";
 let OutputFilePathPipe = class OutputFilePathPipe {
-    constructor(classNamePipe) {
-        this.classNamePipe = classNamePipe;
+    constructor() {
+        this.providers = inject(ProvidersInfoService);
+        this.projectPackageJson = inject(ProjectPackageJson);
+        this.classNamePipe = inject(ClassNamePipe);
     }
     transform(options) {
         options.format = options.format || this.projectPackageJson.preferences.convention || ProjectConvention.DEFAULT;
@@ -19,16 +21,7 @@ let OutputFilePathPipe = class OutputFilePathPipe {
         return join(baseDir, options.subDir || "", featureDir, this.classNamePipe.transform(options));
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", ProvidersInfoService)
-], OutputFilePathPipe.prototype, "providers", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", ProjectPackageJson)
-], OutputFilePathPipe.prototype, "projectPackageJson", void 0);
 OutputFilePathPipe = __decorate([
-    Injectable(),
-    __metadata("design:paramtypes", [ClassNamePipe])
+    Injectable()
 ], OutputFilePathPipe);
 export { OutputFilePathPipe };

package/lib/esm/platforms/InitPlatformsModule.js

@@ -1,11 +1,11 @@
-import { __decorate, __metadata, __param } from "tslib";
-import { Inject } from "@tsed/cli-core";
+import { __decorate } from "tslib";
+import { Inject, injectMany } from "@tsed/cli-core";
 import { Module } from "@tsed/di";
 import { InitExpressPlatform } from "./supports/InitExpressPlatform.js";
 import { InitKoaPlatform } from "./supports/InitKoaPlatform.js";
 let InitPlatformsModule = class InitPlatformsModule {
-    constructor(platforms) {
-        this.platforms = platforms;
+    constructor() {
+        this.platforms = injectMany("platform:init");
     }
     get(name) {
         return this.platforms.find((platform) => platform.name === name);
@@ -14,8 +14,6 @@ let InitPlatformsModule = class InitPlatformsModule {
 InitPlatformsModule = __decorate([
     Module({
         imports: [InitExpressPlatform, InitKoaPlatform]
-    }),
-    __param(0, Inject("platform:init")),
-    __metadata("design:paramtypes", [Array])
+    })
 ], InitPlatformsModule);
 export { InitPlatformsModule };

package/lib/esm/runtimes/RuntimesModule.js

@@ -1,6 +1,6 @@
 import { __decorate, __metadata, __param } from "tslib";
 import { PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
-import { Inject, Module } from "@tsed/di";
+import { Inject, inject, Module } from "@tsed/di";
 import { BabelRuntime } from "./supports/BabelRuntime.js";
 import { BaseRuntime } from "./supports/BaseRuntime.js";
 import { BunRuntime } from "./supports/BunRuntime.js";
@@ -9,6 +9,8 @@ import { WebpackRuntime } from "./supports/WebpackRuntime.js";
 let RuntimesModule = class RuntimesModule {
     constructor(runtimes) {
         this.runtimes = runtimes;
+        this.projectPackageJson = inject(ProjectPackageJson);
+        this.packagesManager = inject(PackageManagersModule);
         this.runtimes = runtimes.filter((manager) => manager.has());
     }
     init(ctx) {
@@ -42,14 +44,6 @@ let RuntimesModule = class RuntimesModule {
         };
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", ProjectPackageJson)
-], RuntimesModule.prototype, "projectPackageJson", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", PackageManagersModule)
-], RuntimesModule.prototype, "packagesManager", void 0);
 RuntimesModule = __decorate([
     Module({
         imports: [NodeRuntime, BabelRuntime, WebpackRuntime, BunRuntime]

package/lib/esm/utils/fillImports.js

@@ -13,6 +13,7 @@ export function fillImports(ctx) {
         ctx.graphql && "./src/resolvers"
     ].filter(Boolean));
     ctx.imports = [
+        { from: "@tsed/platform-log-request", comment: " // remove this import if you don't want log request" },
         ctx.express && { from: "@tsed/platform-express", comment: " // /!\\ keep this import" },
         ctx.koa && { from: "@tsed/platform-koa", comment: " // /!\\ keep this import" },
         { from: "@tsed/ajv" },