@tsed/cli 7.0.0-beta.1 → 7.0.0-beta.11

package/lib/esm/bin/ts-mode.js

@@ -0,0 +1,10 @@
+if (process.env.CLI_MODE === "ts") {
+    try {
+        await import("@swc-node/register/esm-register");
+    }
+    catch (error) {
+        console.error("CLI_MODE=ts requires '@swc-node/register'. Install it and @swc/core to continue.");
+        process.env.CLI_MODE = undefined;
+    }
+}
+export {};

package/lib/esm/bin/tsed.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import "@swc-node/register/esm-register";
+import "./ts-mode.js";
 import { register } from "node:module";
 import { join } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -15,7 +15,7 @@ register(pathToFileURL(join(import.meta.dirname, `../loaders/alias.hook.${EXT}`)
     },
     transferList: []
 });
-const { commands, CliCore, PKG, TEMPLATE_DIR, ArchitectureConvention, ProjectConvention } = await import("../index.js");
+const { tools, commands, resources, CliCore, PKG, TEMPLATE_DIR, ArchitectureConvention, ProjectConvention } = await import("../index.js");
 CliCore.bootstrap({
     name: "tsed",
     pkg: PKG,
@@ -24,6 +24,8 @@ CliCore.bootstrap({
     updateNotifier: true,
     checkPrecondition: true,
     commands,
+    tools,
+    resources,
     defaultProjectPreferences() {
         return {
             convention: ProjectConvention.DEFAULT,

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

@@ -41,7 +41,8 @@ export class AddCmd {
         ];
     }
 }
-command(AddCmd, {
+command({
+    token: AddCmd,
     name: "add",
     description: "Add cli plugin to the current project",
     args: {

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

@@ -21,11 +21,8 @@ export class GenerateCmd {
     async $prompt(data) {
         data = addContextMethods(data);
         const templates = this.templates.find();
-        const templatesPrompts = await Promise.all(templates
-            .filter((template) => template.prompts)
-            .map((template) => {
-            return template.prompts(data);
-        }));
+        const templatesPrompts = await Promise.all(templates.filter((template) => template.prompts).map((template) => template.prompts(data)));
+        const additionalPrompts = templatesPrompts.flat();
         return [
             {
                 type: "autocomplete",
@@ -42,7 +39,7 @@ export class GenerateCmd {
                 default: data.getName,
                 when: !data.name
             },
-            ...templatesPrompts.flat()
+            ...additionalPrompts
         ];
     }
     $mapContext(ctx) {
@@ -63,7 +60,8 @@ export class GenerateCmd {
         ];
     }
 }
-command(GenerateCmd, {
+command({
+    token: GenerateCmd,
     name: "generate",
     alias: "g",
     description: "Generate a new provider class",

package/lib/esm/commands/index.js

@@ -1,7 +1,9 @@
 import { AddCmd } from "./add/AddCmd.js";
 import { GenerateCmd } from "./generate/GenerateCmd.js";
 import { InitCmd } from "./init/InitCmd.js";
+import { InitOptionsCommand } from "./init/InitOptionsCmd.js";
+import { McpCommand } from "./mcp/McpCommand.js";
 import { RunCmd } from "./run/RunCmd.js";
 import { CreateTemplateCommand } from "./template/CreateTemplateCommand.js";
 import { UpdateCmd } from "./update/UpdateCmd.js";
-export default [AddCmd, InitCmd, GenerateCmd, UpdateCmd, RunCmd, CreateTemplateCommand];
+export default [AddCmd, InitCmd, InitOptionsCommand, GenerateCmd, UpdateCmd, RunCmd, CreateTemplateCommand, McpCommand];

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

@@ -1,23 +1,20 @@
 import { basename, join } from "node:path";
-import { CliExeca, CliFs, CliLoadFile, cliPackageJson, CliPlugins, command, Configuration, createSubTasks, createTasksRunner, inject, PackageManager, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
+import { CliExeca, CliFs, CliLoadFile, cliPackageJson, CliPlugins, command, Configuration, createSubTasks, createTasksRunner, inject, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
 import { isString } from "@tsed/core";
 import { constant } from "@tsed/di";
 import { $asyncAlter } from "@tsed/hooks";
 import { kebabCase } from "change-case";
-import { DEFAULT_TSED_TAGS, TEMPLATE_DIR } from "../../constants/index.js";
+import { TEMPLATE_DIR } from "../../constants/index.js";
 import { exec } from "../../fn/exec.js";
 import { render } from "../../fn/render.js";
 import { taskOutput } from "../../fn/taskOutput.js";
-import { ArchitectureConvention } from "../../interfaces/ArchitectureConvention.js";
-import { PlatformType } from "../../interfaces/index.js";
-import { ProjectConvention } from "../../interfaces/ProjectConvention.js";
 import { PlatformsModule } from "../../platforms/PlatformsModule.js";
 import { RuntimesModule } from "../../runtimes/RuntimesModule.js";
 import { BunRuntime } from "../../runtimes/supports/BunRuntime.js";
 import { NodeRuntime } from "../../runtimes/supports/NodeRuntime.js";
 import { CliProjectService } from "../../services/CliProjectService.js";
 import { FeaturesMap, FeatureType } from "./config/FeaturesPrompt.js";
-import { InitFileSchema } from "./config/InitFileSchema.js";
+import { InitSchema } from "./config/InitSchema.js";
 import { mapToContext } from "./mappers/mapToContext.js";
 import { getFeaturesPrompt } from "./prompts/getFeaturesPrompt.js";
 export class InitCmd {
@@ -34,45 +31,14 @@ export class InitCmd {
         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)) {
-            throw new Error(`Invalid selected platform: ${ctx.platform}. Possible values: ${Object.values(PlatformType).join(", ")}.`);
-        }
-        if (!isValid(ArchitectureConvention, ctx.architecture)) {
-            throw new Error(`Invalid selected architecture: ${ctx.architecture}. Possible values: ${Object.values(ArchitectureConvention).join(", ")}.`);
-        }
-        if (!isValid(ProjectConvention, ctx.convention)) {
-            throw new Error(`Invalid selected convention: ${ctx.convention}. Possible values: ${Object.values(ProjectConvention).join(", ")}.`);
-        }
-        const runtimes = this.runtimes.list();
-        if (!runtimes.includes(ctx.runtime)) {
-            throw new Error(`Invalid selected runtime: ${ctx.runtime}. Possible values: ${runtimes.join(", ")}.`);
-        }
-        const managers = this.packageManagers.list();
-        if (!managers.includes(ctx.packageManager)) {
-            throw new Error(`Invalid selected package manager: ${ctx.packageManager}. Possible values: ${managers.join(", ")}.`);
-        }
-        if (ctx.features) {
-            ctx.features.forEach((value) => {
-                const feature = FeaturesMap[value.toLowerCase()];
-                if (!feature) {
-                    throw new Error(`Invalid selected feature: ${value}. Possible values: ${Object.values(FeatureType).join(", ")}.`);
-                }
-            });
-        }
-    }
-    async $beforePrompt(initialOptions) {
+    async $prompt(initialOptions) {
         if (initialOptions.file) {
-            const file = join(this.packageJson.dir, initialOptions.file);
-            return {
+            const file = join(this.packageJson.cwd, initialOptions.file);
+            initialOptions = {
                 ...initialOptions,
-                ...(await this.cliLoadFile.loadFile(file, InitFileSchema))
+                ...(await this.cliLoadFile.loadFile(file, InitSchema()))
             };
         }
-        return initialOptions;
-    }
-    $prompt(initialOptions) {
         if (initialOptions.skipPrompt) {
             return [];
         }
@@ -108,14 +74,14 @@ export class InitCmd {
             srcDir: constant("project.srcDir", "src")
         };
     }
-    async $beforeExec(ctx) {
-        this.fs.ensureDirSync(this.packageJson.dir);
+    async $exec(ctx) {
+        this.fs.ensureDirSync(this.packageJson.cwd);
         ctx.projectName && (this.packageJson.name = ctx.projectName);
         ctx.packageManager && this.packageJson.setPreference("packageManager", ctx.packageManager);
         ctx.runtime && this.packageJson.setPreference("runtime", ctx.runtime);
         ctx.architecture && this.packageJson.setPreference("architecture", ctx.architecture);
         ctx.convention && this.packageJson.setPreference("convention", ctx.convention);
-        ctx.platform && this.packageJson.setPreference("platform", ctx.convention);
+        ctx.platform && this.packageJson.setPreference("platform", ctx.platform);
         ctx.GH_TOKEN && this.packageJson.setGhToken(ctx.GH_TOKEN);
         await createTasksRunner([
             {
@@ -148,9 +114,6 @@ export class InitCmd {
                 task: createSubTasks(() => this.cliPlugins.addPluginsDependencies(ctx), { ...ctx, concurrent: false })
             }
         ], ctx);
-    }
-    async $exec(ctx) {
-        this.checkPrecondition(ctx);
         const runtime = this.runtimes.get();
         ctx = {
             ...ctx,
@@ -213,15 +176,15 @@ export class InitCmd {
         ];
     }
     resolveRootDir(ctx) {
-        const rootDirName = kebabCase(ctx.projectName || basename(this.packageJson.dir));
-        if (this.packageJson.dir.endsWith(rootDirName)) {
+        const rootDirName = kebabCase(ctx.projectName || basename(this.packageJson.cwd));
+        if (this.packageJson.cwd.endsWith(rootDirName)) {
             ctx.projectName = ctx.projectName || rootDirName;
             ctx.root = ".";
             return;
         }
         ctx.projectName = ctx.projectName || rootDirName;
         if (ctx.root && ctx.root !== ".") {
-            this.packageJson.dir = join(this.packageJson.dir, rootDirName);
+            this.packageJson.setCWD(join(this.packageJson.cwd, rootDirName));
             ctx.root = ".";
         }
     }
@@ -230,7 +193,7 @@ export class InitCmd {
         if (ctx.eslint || ctx.testing) {
             const runtime = this.runtimes.get();
             const scripts = {
-                test: [ctx.eslint && runtime.run("test:lint"), ctx.testing && runtime.run("test:coverage")].filter(Boolean).join("&&")
+                test: [ctx.eslint && runtime.run("test:lint"), ctx.testing && runtime.run("test:coverage")].filter(Boolean).join(" && ")
             };
             this.packageJson.addScripts(scripts);
         }
@@ -311,12 +274,13 @@ export class InitCmd {
             "index",
             "index.config.util",
             "index.logger",
-            "index.controller",
+            ctx.swagger && "index.controller",
             ctx.commands && "index.command",
             "barrels",
             "readme",
+            "agents",
             `pm2.${pm2}`,
-            ctx.swagger && "/views/swagger.ejs",
+            "/views/home.ejs",
             ...runtime.files()
         ].map((id) => {
             return id && render(id, ctx);
@@ -355,67 +319,10 @@ export class InitCmd {
         taskOutput(`Plugins files rendered (${Date.now() - startTime}ms)`);
     }
 }
-command(InitCmd, {
+command({
+    token: InitCmd,
     name: "init",
     description: "Init a new Ts.ED project",
-    args: {
-        root: {
-            type: String,
-            defaultValue: ".",
-            description: "Root directory to initialize the Ts.ED project"
-        }
-    },
-    options: {
-        "-n, --project-name <projectName>": {
-            type: String,
-            defaultValue: "",
-            description: "Set the project name. By default, the project is the same as the name directory."
-        },
-        "-a, --arch <architecture>": {
-            type: String,
-            defaultValue: ArchitectureConvention.DEFAULT,
-            description: `Set the default architecture convention (${ArchitectureConvention.DEFAULT} or ${ArchitectureConvention.FEATURE})`
-        },
-        "-c, --convention <convention>": {
-            type: String,
-            defaultValue: ProjectConvention.DEFAULT,
-            description: `Set the default project convention (${ArchitectureConvention.DEFAULT} or ${ArchitectureConvention.FEATURE})`
-        },
-        "-p, --platform <platform>": {
-            type: String,
-            defaultValue: PlatformType.EXPRESS,
-            description: "Set the default platform for Ts.ED (express, koa or fastify)"
-        },
-        "--features <features...>": {
-            type: Array,
-            itemType: String,
-            defaultValue: [],
-            description: "List of the Ts.ED features."
-        },
-        "--runtime <runtime>": {
-            itemType: String,
-            defaultValue: "node",
-            description: "The default runtime used to run the project"
-        },
-        "-m, --package-manager <packageManager>": {
-            itemType: String,
-            defaultValue: PackageManager.YARN,
-            description: "The default package manager to install the project"
-        },
-        "-t, --tsed-version <version>": {
-            type: String,
-            defaultValue: DEFAULT_TSED_TAGS,
-            description: "Use a specific version of Ts.ED (format: 5.x.x)."
-        },
-        "-f, --file <path>": {
-            type: String,
-            description: "Location of a file in which the features are defined."
-        },
-        "-s, --skip-prompt": {
-            type: Boolean,
-            defaultValue: false,
-            description: "Skip the prompt."
-        }
-    },
+    inputSchema: InitSchema,
     disableReadUpPkg: true
 });

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

@@ -0,0 +1,17 @@
+import { command } from "@tsed/cli-core";
+import { s } from "@tsed/schema";
+import { InitSchema } from "./config/InitSchema.js";
+export const InitOptionsCommand = command({
+    name: "init-options",
+    description: "Display available options for Ts.ED init command for external tool",
+    disableReadUpPkg: true,
+    inputSchema: s.object({
+        indent: s.number().default(0).description("Json indentation value").opt("-i, --indent <indent>")
+    }),
+    handler(data) {
+        console.log(JSON.stringify(InitSchema().toJSON({
+            useAlias: false,
+            customKeys: true
+        }), null, data.indent));
+    }
+}).token();

package/lib/esm/commands/init/config/FeaturesPrompt.js

@@ -9,7 +9,7 @@ export var FeatureType;
     FeatureType["PASSPORTJS"] = "passportjs";
     FeatureType["CONFIG"] = "config";
     FeatureType["COMMANDS"] = "commands";
-    FeatureType["DB"] = "db";
+    FeatureType["ORM"] = "orm";
     FeatureType["DOC"] = "doc";
     // CONFIG
     FeatureType["CONFIG_ENVS"] = "config:envs";
@@ -22,35 +22,35 @@ export var FeatureType;
     FeatureType["CONFIG_VAULT"] = "config:vault:premium";
     FeatureType["CONFIG_POSTGRES"] = "config:postgres:premium";
     // DOC
-    FeatureType["SWAGGER"] = "swagger";
-    FeatureType["SCALAR"] = "scalar";
+    FeatureType["SWAGGER"] = "doc:swagger";
+    FeatureType["SCALAR"] = "doc:scalar";
     // ORM
-    FeatureType["PRISMA"] = "prisma";
-    FeatureType["MONGOOSE"] = "mongoose";
+    FeatureType["PRISMA"] = "orm:prisma";
+    FeatureType["MONGOOSE"] = "orm:mongoose";
     // TYPEORM
-    FeatureType["TYPEORM"] = "typeorm";
-    FeatureType["TYPEORM_MYSQL"] = "typeorm:mysql";
-    FeatureType["TYPEORM_MARIADB"] = "typeorm:mariadb";
-    FeatureType["TYPEORM_POSTGRES"] = "typeorm:postgres";
-    FeatureType["TYPEORM_COCKROACHDB"] = "typeorm:cockroachdb";
-    FeatureType["TYPEORM_SQLITE"] = "typeorm:sqlite";
-    FeatureType["TYPEORM_BETTER_SQLITE3"] = "typeorm:better-sqlite3";
-    FeatureType["TYPEORM_CORDOVA"] = "typeorm:cordova";
-    FeatureType["TYPEORM_NATIVESCRIPT"] = "typeorm:nativescript";
-    FeatureType["TYPEORM_ORACLE"] = "typeorm:oracle";
-    FeatureType["TYPEORM_MSSQL"] = "typeorm:mssql";
-    FeatureType["TYPEORM_MONGODB"] = "typeorm:mongodb";
-    FeatureType["TYPEORM_SQLJS"] = "typeorm:sqljs";
-    FeatureType["TYPEORM_REACTNATIVE"] = "typeorm:reactnative";
-    FeatureType["TYPEORM_EXPO"] = "typeorm:expo";
+    FeatureType["TYPEORM"] = "orm:typeorm";
+    FeatureType["TYPEORM_MYSQL"] = "orm:typeorm:mysql";
+    FeatureType["TYPEORM_MARIADB"] = "orm:typeorm:mariadb";
+    FeatureType["TYPEORM_POSTGRES"] = "orm:typeorm:postgres";
+    FeatureType["TYPEORM_COCKROACHDB"] = "orm:typeorm:cockroachdb";
+    FeatureType["TYPEORM_SQLITE"] = "orm:typeorm:sqlite";
+    FeatureType["TYPEORM_BETTER_SQLITE3"] = "orm:typeorm:better-sqlite3";
+    FeatureType["TYPEORM_CORDOVA"] = "orm:typeorm:cordova";
+    FeatureType["TYPEORM_NATIVESCRIPT"] = "orm:typeorm:nativescript";
+    FeatureType["TYPEORM_ORACLE"] = "orm:typeorm:oracle";
+    FeatureType["TYPEORM_MSSQL"] = "orm:typeorm:mssql";
+    FeatureType["TYPEORM_MONGODB"] = "orm:typeorm:mongodb";
+    FeatureType["TYPEORM_SQLJS"] = "orm:typeorm:sqljs";
+    FeatureType["TYPEORM_REACTNATIVE"] = "orm:typeorm:reactnative";
+    FeatureType["TYPEORM_EXPO"] = "orm:typeorm:expo";
     // TESTING & LINTER
     FeatureType["TESTING"] = "testing";
-    FeatureType["JEST"] = "jest";
-    FeatureType["VITEST"] = "vitest";
+    FeatureType["JEST"] = "testing:jest";
+    FeatureType["VITEST"] = "testing:vitest";
     FeatureType["LINTER"] = "linter";
-    FeatureType["ESLINT"] = "eslint";
-    FeatureType["LINT_STAGED"] = "lintstaged";
-    FeatureType["PRETTIER"] = "prettier";
+    FeatureType["ESLINT"] = "linter:eslint";
+    FeatureType["LINT_STAGED"] = "linter:lintstaged";
+    FeatureType["PRETTIER"] = "linter:prettier";
 })(FeatureType || (FeatureType = {}));
 export const FeaturesMap = {
     [PlatformType.EXPRESS]: {
@@ -77,7 +77,7 @@ export const FeaturesMap = {
     [FeatureType.DOC]: {
         name: "Documentation"
     },
-    [FeatureType.DB]: {
+    [FeatureType.ORM]: {
         name: "Database"
     },
     [FeatureType.PASSPORTJS]: {
@@ -127,9 +127,6 @@ export const FeaturesMap = {
         name: "Commands",
         dependencies: {
             "@tsed/cli-core": "{{cliVersion}}"
-        },
-        devDependencies: {
-            "@types/inquirer": "^8.2.4"
         }
     },
     [ProjectConvention.DEFAULT]: {
@@ -363,14 +360,13 @@ export const FeaturesMap = {
         checked: false
     }
 };
-export const FrameworksPrompt = {
-    message: "Choose the target Framework:",
-    type: "list",
-    name: "platform",
-    choices: [PlatformType.EXPRESS, PlatformType.KOA, PlatformType.FASTIFY]
-};
 export const FeaturesPrompt = (availableRuntimes, availablePackageManagers) => [
-    FrameworksPrompt,
+    {
+        message: "Choose the target Framework:",
+        type: "list",
+        name: "platform",
+        choices: [PlatformType.EXPRESS, PlatformType.KOA, PlatformType.FASTIFY]
+    },
     {
         message: "Choose the architecture for your project:",
         type: "list",
@@ -386,11 +382,11 @@ export const FeaturesPrompt = (availableRuntimes, availablePackageManagers) => [
     {
         type: "checkbox",
         name: "features",
-        message: "Check the features needed for your project",
+        message: "Choose the features needed for your project",
         choices: [
             FeatureType.CONFIG,
             FeatureType.GRAPHQL,
-            FeatureType.DB,
+            FeatureType.ORM,
             FeatureType.PASSPORTJS,
             FeatureType.SOCKETIO,
             FeatureType.DOC,
@@ -428,7 +424,7 @@ export const FeaturesPrompt = (availableRuntimes, availablePackageManagers) => [
         message: "Choose a ORM manager",
         type: "list",
         name: "featuresDB",
-        when: hasFeature(FeatureType.DB),
+        when: hasFeature(FeatureType.ORM),
         choices: [FeatureType.PRISMA, FeatureType.MONGOOSE, FeatureType.TYPEORM]
     },
     {