@tsed/cli 6.6.3 → 7.0.0-alpha.2

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

@@ -1,7 +1,6 @@
-import { __decorate } from "tslib";
-import { CliFs, Command, inject, normalizePath, ProjectPackageJson } from "@tsed/cli-core";
+import { CliFs, command, inject, normalizePath, ProjectPackageJson } from "@tsed/cli-core";
 import { CliRunScript } from "../../services/CliRunScript.js";
-let RunCmd = class RunCmd {
+export class RunCmd {
     constructor() {
         this.fs = inject(CliFs);
         this.projectPackageJson = inject(ProjectPackageJson);
@@ -16,26 +15,23 @@ let RunCmd = class RunCmd {
         });
         return [];
     }
-};
-RunCmd = __decorate([
-    Command({
-        name: "run",
-        description: "Run a project level command",
-        args: {
-            command: {
-                description: "The project command",
-                type: String,
-                required: true
-            }
-        },
-        options: {
-            "-p, --production": {
-                type: Boolean,
-                defaultValue: false,
-                description: "Set production profile to NODE_ENV"
-            }
-        },
-        allowUnknownOption: true
-    })
-], RunCmd);
-export { RunCmd };
+}
+command(RunCmd, {
+    name: "run",
+    description: "Run a project level command",
+    args: {
+        command: {
+            description: "The project command",
+            type: String,
+            required: true
+        }
+    },
+    options: {
+        "-p, --production": {
+            type: Boolean,
+            defaultValue: false,
+            description: "Set production profile to NODE_ENV"
+        }
+    },
+    allowUnknownOption: true
+});

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

@@ -1,5 +1,4 @@
-import { __decorate } from "tslib";
-import { CliPackageJson, Command, createSubTasks, Inject, inject, NpmRegistryClient, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
+import { CliPackageJson, command, createSubTasks, 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";
@@ -14,7 +13,7 @@ function isGreaterThan(a, b) {
 function shouldUpdate(pkg) {
     return pkg.includes("@tsed") && !pkg.includes("@tsed/cli") && !pkg.includes("@tsed/logger") && !pkg.includes("@tsed/barrels");
 }
-let UpdateCmd = class UpdateCmd {
+export class UpdateCmd {
     constructor() {
         this.npmRegistryClient = inject(NpmRegistryClient);
         this.projectPackage = inject(ProjectPackageJson);
@@ -97,13 +96,10 @@ let UpdateCmd = class UpdateCmd {
         }
         return version && isGreaterThan(version, this.cliPackage.version) ? version : this.cliPackage.version;
     }
-};
-UpdateCmd = __decorate([
-    Command({
-        name: "update",
-        description: "Update all Ts.ED packages used by your project",
-        args: {},
-        options: {}
-    })
-], UpdateCmd);
-export { UpdateCmd };
+}
+command(UpdateCmd, {
+    name: "update",
+    description: "Update all Ts.ED packages used by your project",
+    args: {},
+    options: {}
+});

package/lib/esm/fn/exec.js

@@ -0,0 +1,5 @@
+import { CliService } from "@tsed/cli-core";
+import { inject } from "@tsed/di";
+export function exec(command, data) {
+    return inject(CliService).getTasks(command, data);
+}

package/lib/esm/fn/render.js

@@ -0,0 +1,5 @@
+import { inject } from "@tsed/di";
+import { CliProjectService } from "../services/CliProjectService.js";
+export function render(id, data) {
+    return inject(CliProjectService).createFromTemplate(id, data);
+}

package/lib/esm/fn/taskOutput.js

@@ -0,0 +1,7 @@
+import { context } from "@tsed/di";
+export function taskOutput(output) {
+    const task = context().get("currentTask");
+    if (task) {
+        task.output = output;
+    }
+}

package/lib/esm/index.js

@@ -1,16 +1,19 @@
+import "./templates/index.js";
 export * from "./Cli.js";
 export * from "./commands/add/AddCmd.js";
 export * from "./commands/generate/GenerateCmd.js";
 export * from "./commands/init/config/FeaturesPrompt.js";
 export * from "./commands/init/config/FeaturesPrompt.js";
 export * from "./commands/init/InitCmd.js";
-export * from "./commands/init/interfaces/InitCmdContext.js";
-export * from "./commands/init/interfaces/InitOptions.js";
 export * from "./commands/init/prompts/getFeaturesPrompt.js";
 export * from "./commands/update/UpdateCmd.js";
 export * from "./constants/index.js";
+export * from "./fn/exec.js";
+export * from "./fn/render.js";
 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";
+export * from "./services/CliProjectService.js";
+export * from "./services/CliTemplatesService.js";
+export * from "./services/ProjectClient.js";
+export * from "./utils/defineTemplate.js";

package/lib/esm/interfaces/AlterPackageJson.js

@@ -0,0 +1 @@
+import { ProjectPackageJson } from "@tsed/cli-core";

package/lib/esm/interfaces/AlterProjectFiles.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/interfaces/AlterRenderFiles.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/interfaces/CliCommandHooks.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/interfaces/GenerateCmdContext.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/interfaces/InitCmdOptions.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/interfaces/RenderDataContext.js

@@ -0,0 +1 @@
+import { PackageManager } from "@tsed/cli-core";

package/lib/esm/interfaces/RuntimeTypes.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/interfaces/index.js

@@ -1,3 +1,12 @@
+export * from "./AlterGenerateTasks.js";
+export * from "./AlterInitSubTasks.js";
+export * from "./AlterPackageJson.js";
+export * from "./AlterProjectFiles.js";
+export * from "./AlterRenderFiles.js";
 export * from "./ArchitectureConvention.js";
+export * from "./CliCommandHooks.js";
+export * from "./GenerateCmdContext.js";
+export * from "./InitCmdOptions.js";
 export * from "./PlatformType.js";
 export * from "./ProjectConvention.js";
+export * from "./RenderDataContext.js";

package/lib/esm/pipes/OutputFilePathPipe.js

@@ -1,27 +1,49 @@
-import { __decorate } from "tslib";
-import { dirname, join } from "node:path";
-import { inject, Injectable, ProjectPackageJson } from "@tsed/cli-core";
-import { Inject } from "@tsed/di";
+import { basename, dirname, join } from "node:path";
+import { inject, injectable, ProjectPackageJson } from "@tsed/cli-core";
+import { constant } from "@tsed/di";
 import { ArchitectureConvention, ProjectConvention } from "../interfaces/index.js";
-import { ProvidersInfoService } from "../services/ProvidersInfoService.js";
-import { ClassNamePipe } from "./ClassNamePipe.js";
-let OutputFilePathPipe = class OutputFilePathPipe {
+import { CliTemplatesService } from "../services/CliTemplatesService.js";
+import { SymbolNamePipe } from "./SymbolNamePipe.js";
+export class OutputFilePathPipe {
     constructor() {
-        this.providers = inject(ProvidersInfoService);
+        this.templatesService = inject(CliTemplatesService);
         this.projectPackageJson = inject(ProjectPackageJson);
-        this.classNamePipe = inject(ClassNamePipe);
+        this.classNamePipe = inject(SymbolNamePipe);
     }
     transform(options) {
+        const template = this.templatesService.get(options.type);
+        const { outputDir, preserveCase, preserveDirectory } = template || {};
+        const hasSrcDir = outputDir?.includes("{{srcDir}}");
         options.format = options.format || this.projectPackageJson.preferences.convention || ProjectConvention.DEFAULT;
         const featureDir = dirname(options.name);
-        if (options.type === "server" || this.projectPackageJson.preferences.architecture === ArchitectureConvention.FEATURE) {
-            return join(options.subDir || "", featureDir, this.classNamePipe.transform(options));
+        const baseDir = this.getBaseDir(options.baseDir, outputDir, options.type);
+        if (!preserveCase && !preserveDirectory && this.projectPackageJson.preferences.architecture === ArchitectureConvention.FEATURE) {
+            return join(hasSrcDir ? constant("project.srcDir", "") : "", options.subDir || "", featureDir, this.classNamePipe.transform(options));
         }
-        const baseDir = (options.baseDir || this.providers.get(options.type)?.baseDir || `${options.type}s`).split(":").at(-1);
-        return join(baseDir, options.subDir || "", featureDir, this.classNamePipe.transform(options));
+        return join(hasSrcDir ? constant("project.srcDir", "") : "", baseDir, options.subDir || "", featureDir, this.classNamePipe.transform(options));
     }
-};
-OutputFilePathPipe = __decorate([
-    Injectable()
-], OutputFilePathPipe);
-export { OutputFilePathPipe };
+    getBaseDir(baseDir, outputDir, type) {
+        if (baseDir) {
+            return baseDir;
+        }
+        if (outputDir) {
+            return outputDir.replace(/\{\{srcDir}}/, "");
+        }
+        return `${type}s`.split(":").at(-1) || "";
+    }
+    getServerName() {
+        return basename(`${this.transform({
+            name: "Server",
+            type: "server",
+            format: this.projectPackageJson.preferences.convention
+        })}.ts`);
+    }
+    getIndexControllerName() {
+        return basename(`${this.transform({
+            name: "Index",
+            type: "controller",
+            format: this.projectPackageJson.preferences.convention
+        })}.ts`);
+    }
+}
+injectable(OutputFilePathPipe);

package/lib/esm/pipes/RoutePipe.js

@@ -1,7 +1,6 @@
-import { __decorate } from "tslib";
-import { Injectable } from "@tsed/cli-core";
+import { injectable } from "@tsed/cli-core";
 import { kebabCase } from "change-case";
-let RoutePipe = class RoutePipe {
+export class RoutePipe {
     transform(route) {
         const r = route
             .split("/")
@@ -15,8 +14,5 @@ let RoutePipe = class RoutePipe {
             .join("/");
         return `/${r}`.replace(/\/\//gi, "/");
     }
-};
-RoutePipe = __decorate([
-    Injectable()
-], RoutePipe);
-export { RoutePipe };
+}
+injectable(RoutePipe);

package/lib/esm/pipes/{ClassNamePipe.js → SymbolNamePipe.js}

@@ -1,18 +1,24 @@
-import { __decorate } from "tslib";
 import { basename } from "node:path";
 import { ProjectPackageJson } from "@tsed/cli-core";
-import { inject, Injectable } from "@tsed/di";
+import { inject, injectable } from "@tsed/di";
 import { kebabCase, pascalCase } from "change-case";
 import { ProjectConvention } from "../interfaces/ProjectConvention.js";
-import { ProvidersInfoService } from "../services/ProvidersInfoService.js";
-let ClassNamePipe = class ClassNamePipe {
+import { CliTemplatesService } from "../services/CliTemplatesService.js";
+export class SymbolNamePipe {
     constructor() {
-        this.providers = inject(ProvidersInfoService);
         this.projectPackageJson = inject(ProjectPackageJson);
+        this.templates = inject(CliTemplatesService);
     }
     transform(options) {
+        if (options.name === "index") {
+            return options.name;
+        }
         const format = options.format || this.projectPackageJson.preferences.convention || ProjectConvention.DEFAULT;
-        const meta = this.providers.get(options.type)?.model || "{{symbolName}}.{{symbolType}}?";
+        const template = this.templates.get(options.type);
+        if (template?.preserveCase) {
+            return template.fileName || options.name;
+        }
+        const meta = template?.fileName || "{{symbolName}}.{{symbolType}}?";
         const type = options.type.split(":").at(-1);
         const symbolName = kebabCase(basename(options.name)).replace(`-${type}`, "");
         const names = meta.split(".").reduce((acc, key) => {
@@ -29,8 +35,5 @@ let ClassNamePipe = class ClassNamePipe {
         }
         return [...names].join(".").toLowerCase();
     }
-};
-ClassNamePipe = __decorate([
-    Injectable()
-], ClassNamePipe);
-export { ClassNamePipe };
+}
+injectable(SymbolNamePipe);

package/lib/esm/pipes/index.js

@@ -1,3 +1,3 @@
-export * from "./ClassNamePipe.js";
 export * from "./OutputFilePathPipe.js";
 export * from "./RoutePipe.js";
+export * from "./SymbolNamePipe.js";

package/lib/esm/platforms/{InitPlatformsModule.js → PlatformsModule.js}

@@ -1,20 +1,14 @@
-import { __decorate } from "tslib";
 import { injectMany } from "@tsed/cli-core";
-import { Module } from "@tsed/di";
+import { injectable } from "@tsed/di";
 import { InitExpressPlatform } from "./supports/InitExpressPlatform.js";
 import { InitFastifyPlatform } from "./supports/InitFastifyPlatform.js";
 import { InitKoaPlatform } from "./supports/InitKoaPlatform.js";
-let InitPlatformsModule = class InitPlatformsModule {
+export class PlatformsModule {
     constructor() {
         this.platforms = injectMany("platform:init");
     }
     get(name) {
         return this.platforms.find((platform) => platform.name === name);
     }
-};
-InitPlatformsModule = __decorate([
-    Module({
-        imports: [InitExpressPlatform, InitKoaPlatform, InitFastifyPlatform]
-    })
-], InitPlatformsModule);
-export { InitPlatformsModule };
+}
+injectable(PlatformsModule).imports([InitExpressPlatform, InitKoaPlatform, InitFastifyPlatform]);

package/lib/esm/platforms/supports/InitExpressPlatform.js

@@ -1,9 +1,31 @@
-import { __decorate } from "tslib";
-import { Injectable } from "@tsed/cli-core";
-let InitExpressPlatform = class InitExpressPlatform {
+import { injectable } from "@tsed/cli-core";
+import { ts } from "ts-morph";
+var SyntaxKind = ts.SyntaxKind;
+export class InitExpressPlatform {
     constructor() {
         this.name = "express";
     }
+    alterProjectFiles(project) {
+        const options = project.findConfiguration("server");
+        if (options) {
+            const middlewares = [
+                "cors",
+                "cookie-parser",
+                "compression",
+                "method-override",
+                "json-parser",
+                {
+                    use: "urlencoded-parser",
+                    options: { extended: true }
+                }
+            ];
+            project.getPropertyAssignment(options, {
+                name: "middlewares",
+                kind: SyntaxKind.ArrayLiteralExpression,
+                initializer: JSON.stringify(middlewares, null, 2)
+            });
+        }
+    }
     dependencies(ctx) {
         return {
             "@tsed/platform-express": ctx.tsedVersion,
@@ -24,10 +46,5 @@ let InitExpressPlatform = class InitExpressPlatform {
             "@types/method-override": "latest"
         };
     }
-};
-InitExpressPlatform = __decorate([
-    Injectable({
-        type: "platform:init"
-    })
-], InitExpressPlatform);
-export { InitExpressPlatform };
+}
+injectable(InitExpressPlatform).type("platform:init");

package/lib/esm/platforms/supports/InitFastifyPlatform.js

@@ -1,9 +1,31 @@
-import { __decorate } from "tslib";
-import { Injectable } from "@tsed/cli-core";
-let InitFastifyPlatform = class InitFastifyPlatform {
+import { injectable } from "@tsed/cli-core";
+import { SyntaxKind } from "ts-morph";
+export class InitFastifyPlatform {
     constructor() {
         this.name = "fastify";
     }
+    alterProjectFiles(project) {
+        const options = project.findConfiguration("server");
+        if (options) {
+            const plugins = [
+                "@fastify/accepts",
+                "@fastify/cookie",
+                {
+                    use: "fastify-raw-body",
+                    options: {
+                        global: false,
+                        runFirst: true
+                    }
+                },
+                "@fastify/formbody"
+            ];
+            project.getPropertyAssignment(options, {
+                name: "plugins",
+                kind: SyntaxKind.ArrayLiteralExpression,
+                initializer: JSON.stringify(plugins, null, 2)
+            });
+        }
+    }
     dependencies(ctx) {
         return {
             "@tsed/platform-fastify": ctx.tsedVersion,
@@ -22,10 +44,5 @@ let InitFastifyPlatform = class InitFastifyPlatform {
             "@types/content-disposition": "latest"
         };
     }
-};
-InitFastifyPlatform = __decorate([
-    Injectable({
-        type: "platform:init"
-    })
-], InitFastifyPlatform);
-export { InitFastifyPlatform };
+}
+injectable(InitFastifyPlatform).type("platform:init");

package/lib/esm/platforms/supports/InitKoaPlatform.js

@@ -1,9 +1,20 @@
-import { __decorate } from "tslib";
-import { Injectable } from "@tsed/cli-core";
-let InitKoaPlatform = class InitKoaPlatform {
+import { injectable } from "@tsed/cli-core";
+import { SyntaxKind } from "ts-morph";
+export class InitKoaPlatform {
     constructor() {
         this.name = "koa";
     }
+    alterProjectFiles(project) {
+        const options = project.findConfiguration("server");
+        if (options) {
+            const middlewares = ["@koa/cors", "koa-compress", "koa-override", "koa-bodyparser"];
+            project.getPropertyAssignment(options, {
+                name: "middlewares",
+                kind: SyntaxKind.ArrayLiteralExpression,
+                initializer: JSON.stringify(middlewares, null, 2)
+            });
+        }
+    }
     dependencies(ctx) {
         return {
             "@tsed/platform-koa": ctx.tsedVersion,
@@ -28,10 +39,5 @@ let InitKoaPlatform = class InitKoaPlatform {
             "@types/koa__cors": "latest"
         };
     }
-};
-InitKoaPlatform = __decorate([
-    Injectable({
-        type: "platform:init"
-    })
-], InitKoaPlatform);
-export { InitKoaPlatform };
+}
+injectable(InitKoaPlatform).type("platform:init");

package/lib/esm/processors/__fixtures__/createFakeProject.js

@@ -0,0 +1,35 @@
+import { readFileSync } from "node:fs";
+import { join } from "path";
+import { ProjectConvention } from "../../interfaces/ProjectConvention.js";
+import { ProjectClient } from "../../services/ProjectClient.js";
+const root = join(import.meta.dirname, "../../../templates/init");
+const mockDir = join(import.meta.dirname, "__mock__");
+export function createFakeProject({ convention = ProjectConvention.DEFAULT }) {
+    const project = new ProjectClient({
+        fileSystem: undefined,
+        useInMemoryFileSystem: true,
+        rootDir: "/"
+    });
+    const indexContent = readFileSync(join(root, "src/index.ts"), { encoding: "utf8" });
+    project.createSourceFile("src/index.ts", indexContent, {
+        overwrite: true
+    });
+    const serverPath = convention === ProjectConvention.DEFAULT ? "src/Server.ts" : "src/server.ts";
+    const serverContent = readFileSync(join(root, "src/server.ts"), "utf8");
+    project.createSourceFile(serverPath, serverContent, {
+        overwrite: true
+    });
+    const configContent = readFileSync(join(root, "src/config/config.ts"), "utf8");
+    project.createSourceFile("src/config/config.ts", configContent, {
+        overwrite: true
+    });
+    const binContent = readFileSync(join(root, "src/bin/index.ts"), "utf8");
+    project.createSourceFile("src/bin/index.ts", binContent, {
+        overwrite: true
+    });
+    const commandContent = readFileSync(join(mockDir, "TestCommand.ts"), "utf8");
+    project.createSourceFile("src/bin/commands/TestCommand.ts", commandContent, {
+        overwrite: true
+    });
+    return project;
+}

package/lib/esm/processors/transformBinFile.js

@@ -0,0 +1,47 @@
+import { dirname, join, relative } from "node:path";
+import { normalizePath } from "@tsed/normalize-path";
+import { SyntaxKind } from "ts-morph";
+export function transformBinFile(project, data) {
+    const binSourceFile = project.binSourceFile;
+    const options = project.findConfiguration("bin");
+    if (!binSourceFile || !options) {
+        return;
+    }
+    // list all commands in the bin/commands directory
+    const files = project.fs.globSync([normalizePath(project.rootDir, "src/bin/commands/*.ts")]);
+    const commands = files
+        .map((file) => {
+        const source = project.getSourceFile(file);
+        if (!source) {
+            return undefined;
+        }
+        const command = source?.getClasses().find((cls) => {
+            return cls.getDecorators().some((decorator) => {
+                return decorator.getName() === "Command" && decorator.getArguments().length > 0;
+            });
+        });
+        return command ? { command, file: source.getFilePath() } : undefined;
+    })
+        .filter((f) => f !== undefined)
+        .map(({ file, command }) => {
+        binSourceFile.addImportDeclaration({
+            moduleSpecifier: "./" + relative(dirname(binSourceFile.getFilePath()), file).replace(".ts", ".js"),
+            namedImports: [command.getName()]
+        });
+        return command.getName();
+    })
+        .sort();
+    const list = project.getPropertyAssignment(options, {
+        name: "commands",
+        kind: SyntaxKind.ArrayLiteralExpression,
+        initializer: "[]"
+    });
+    const existingElements = list.getElements();
+    commands
+        .filter((command) => {
+        return !existingElements.some((element) => element.getText() === command);
+    })
+        .forEach((command) => {
+        list.addElement(command);
+    });
+}