@tsed/cli 7.0.0-alpha.1 → 7.0.0-alpha.3

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

@@ -53,15 +53,11 @@ export class GenerateCmd {
             {
                 title: `Generate ${ctx.type} file to '${symbolPath}.ts'`,
                 skip: !this.templates.get(type),
-                task: () => {
-                    this.projectService.createFromTemplate(type, ctx);
-                }
+                task: () => this.projectService.createFromTemplate(type, ctx)
             },
             {
                 title: "Transform generated files",
-                task: () => {
-                    return this.projectService.transformFiles(ctx);
-                }
+                task: () => this.projectService.transformFiles(ctx)
             }
         ];
     }

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

@@ -7,6 +7,7 @@ import { kebabCase } from "change-case";
 import { DEFAULT_TSED_TAGS, 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";
@@ -160,13 +161,11 @@ export class InitCmd {
         return [
             {
                 title: "Render base files",
-                task: async () => {
-                    return this.renderFiles(ctx);
-                }
+                task: () => this.renderFiles(ctx)
             },
             {
                 title: "Alter package json",
-                task: async () => {
+                task: () => {
                     return $asyncAlter("$alterPackageJson", this.packageJson, [ctx]);
                 }
             },
@@ -175,7 +174,7 @@ export class InitCmd {
                 task: createSubTasks(async () => {
                     const subTasks = [
                         ...(await exec("generate", {
-                            ...ctx,
+                            //...ctx,
                             type: "controller",
                             route: "rest",
                             name: "HelloWorld",
@@ -183,7 +182,7 @@ export class InitCmd {
                         })),
                         ...(ctx.commands
                             ? await exec("generate", {
-                                ...ctx,
+                                //...ctx,
                                 type: "command",
                                 route: "hello",
                                 name: "hello"
@@ -241,6 +240,7 @@ export class InitCmd {
             "@tsed/core": ctx.tsedVersion,
             "@tsed/di": ctx.tsedVersion,
             "@tsed/ajv": ctx.tsedVersion,
+            "@tsed/config": ctx.tsedVersion,
             "@tsed/exceptions": ctx.tsedVersion,
             "@tsed/schema": ctx.tsedVersion,
             "@tsed/json-mapper": ctx.tsedVersion,
@@ -259,9 +259,6 @@ export class InitCmd {
             "@tsed/barrels": "latest",
             ajv: "latest",
             "cross-env": "latest",
-            dotenv: "latest",
-            "dotenv-expand": "latest",
-            "dotenv-flow": "latest",
             ...this.runtimes.get().dependencies(),
             ...this.platforms.get(ctx.platform).dependencies(ctx)
         });
@@ -326,8 +323,11 @@ export class InitCmd {
     }
     async renderFiles(ctx) {
         // base files
+        let startTime = Date.now();
         await this.baseFiles(ctx);
+        taskOutput(`Base files rendered (${Date.now() - startTime}ms)`);
         const files = await $asyncAlter("$alterRenderFiles", [], [ctx]);
+        startTime = Date.now();
         const promises = files.map((option) => {
             if (!option) {
                 return;
@@ -350,6 +350,7 @@ export class InitCmd {
             }
         });
         await Promise.all(promises);
+        taskOutput(`Plugins files rendered (${Date.now() - startTime}ms)`);
     }
 }
 command(InitCmd, {

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

@@ -16,6 +16,7 @@ export var FeatureType;
     FeatureType["CONFIG_DOTENV"] = "config:dotenv";
     FeatureType["CONFIG_JSON"] = "config:json";
     FeatureType["CONFIG_YAML"] = "config:yaml";
+    FeatureType["CONFIG_AWS_SECRETS"] = "config:aws_secrets";
     FeatureType["CONFIG_IOREDIS"] = "config:ioredis";
     FeatureType["CONFIG_MONGO"] = "config:mongo";
     FeatureType["CONFIG_VAULT"] = "config:vault";
@@ -158,39 +159,59 @@ export const FeaturesMap = {
         name: "Envs"
     },
     [FeatureType.CONFIG_DOTENV]: {
-        name: "Dotenv"
+        name: "Dotenv",
+        dependencies: {
+            dotenv: "latest",
+            "dotenv-expand": "latest",
+            "dotenv-flow": "latest"
+        }
     },
     [FeatureType.CONFIG_JSON]: {
         name: "JSON"
     },
     [FeatureType.CONFIG_YAML]: {
-        name: "YAML"
+        name: "YAML",
+        dependencies: {
+            "js-yaml": "latest"
+        }
+    },
+    [FeatureType.CONFIG_AWS_SECRETS]: {
+        name: "AWS Secrets Manager (Premium)",
+        dependencies: {
+            "@tsedio/config-source-aws-secrets": "latest",
+            "@aws-sdk/client-secrets-manager": "latest"
+        }
     },
     [FeatureType.CONFIG_IOREDIS]: {
         name: "IORedis (Premium)",
         dependencies: {
-            ioredis: "latest",
-            "@tsedio/config-ioredis": "{{tsedVersion}}"
+            "@tsedio/config-ioredis": "{{tsedVersion}}",
+            "@tsed/ioredis": "{{tsedVersion}}",
+            ioredis: "latest"
+        },
+        devDependencies: {
+            "@tsedio/testcontainers-redis": "latest"
         }
     },
     [FeatureType.CONFIG_MONGO]: {
         name: "MongoDB (Premium)",
         dependencies: {
             mongodb: "latest",
-            "@tsedio/config-mongo": "{{tsedVersion}}"
+            "@tsedio/config-mongo": "latest"
         }
     },
     [FeatureType.CONFIG_VAULT]: {
         name: "Vault (Premium)",
         dependencies: {
-            "@tsedio/config-vault": "{{tsedVersion}}"
+            "@tsedio/config-vault": "latest",
+            "node-vault": "latest"
         }
     },
     [FeatureType.CONFIG_POSTGRES]: {
         name: "Postgres (Premium)",
         dependencies: {
             pg: "latest",
-            "@tsedio/config-postgres": "{{tsedVersion}}"
+            "@tsedio/config-postgres": "latest"
         }
     },
     /// TYPEORM
@@ -389,6 +410,7 @@ export const FeaturesPrompt = (availableRuntimes, availablePackageManagers) => [
             FeatureType.CONFIG_DOTENV,
             FeatureType.CONFIG_JSON,
             FeatureType.CONFIG_YAML,
+            FeatureType.CONFIG_AWS_SECRETS,
             FeatureType.CONFIG_IOREDIS,
             FeatureType.CONFIG_MONGO,
             FeatureType.CONFIG_VAULT,

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/processors/transformConfigFile.js

@@ -1,26 +1,105 @@
-import { SyntaxKind } from "ts-morph";
 export function transformConfigFile(project, data) {
-    const sourceFile = project.configSourceFile;
-    const options = project.findConfiguration("config");
-    if (!options) {
-        return;
+    if (!data.config && data.commandName === "init") {
+        project.addConfigSource("EnvsConfigSource", {
+            moduleSpecifier: "@tsedio/config-envs/envs"
+        });
     }
     if (data.config) {
-        // const extendsConfig = project.getPropertyAssignment(options, {
-        //   name: "extends",
-        //   kind: SyntaxKind.ObjectLiteralExpression,
-        //   initializer: "[]"
-        // });
-        //
-        // if (data.configEnvs) {
-        //   sourceFile.addImportDeclaration({
-        //     moduleSpecifier: "@tsed/config/envs",
-        //     namedImports: [{name: "EnvsConfigSource"}]
-        //   });
-        // }
+        if (data.configDotenv) {
+            project.addConfigSource("DotenvConfigSource", {
+                moduleSpecifier: "@tsedio/config-envs/dotenv"
+            });
+        }
+        else if (data.configEnvs) {
+            project.addConfigSource("EnvsConfigSource", {
+                moduleSpecifier: "@tsedio/config-envs/envs"
+            });
+        }
+        if (data.configJson) {
+            project.addConfigSource("JsonConfigSource", {
+                moduleSpecifier: "@tsedio/config-envs/json",
+                content: `withOptions(JsonConfigSource, {
+      path: "./config.json"
+    })`
+            });
+        }
+        if (data.configYaml) {
+            project.addConfigSource("YamlConfigSource", {
+                moduleSpecifier: "@tsedio/config-envs/yaml",
+                content: `withOptions(YamlConfigSource, {
+      path: "./config.yaml"
+    })`
+            });
+        }
+        if (data.configAwsSecrets) {
+            project.addConfigSource("AwsSecretsConfigSource", {
+                moduleSpecifier: "@tsedio/config-source-aws-secrets",
+                content: `withOptions(AwsSecretsConfigSource, {
+              name: "aws",
+      path: "/my-app/config", // Path prefix in Secrets Manager
+      region: "us-east-1", // AWS region
+      watch: true // Enable secrets watching
+      // validationSchema: object({}) // Optional: add a validation schema
+      // maxConcurrency: 10
+      })`
+            });
+        }
+        if (data.configVault) {
+            project.addConfigSource("VaultConfigSource", {
+                moduleSpecifier: "@tsedio/config-vault",
+                content: `    withOptions(VaultConfigSource, {
+      name: "vault",
+      endpoint: "http://localhost:8200", // Vault server URL
+      token: "your-vault-token", // Your Vault token
+      secretPath: "secret/data/myapp", // Path to your secret (KV v2 or v1, see below)
+      refreshInterval: 10000 // ⏱️ Polling interval in ms (default: 10s)
+      // Additional node-vault options
+
+      // validationSchema: object({}) // Optional: add a validation schema
+    })`
+            });
+        }
+        if (data.configIoredis) {
+            project.addConfigSource("IoredisConfigSource", {
+                moduleSpecifier: "@tsedio/config-ioredis",
+                content: `withOptions(IoredisConfigSource, {
+      name: "redis",
+      prefixKey: "my-config", // Optional: All config keys will be prefixed
+      url: "redis://localhost:6379" // Or use any Redis/Cluster options
+      // validationSchema: object({}) // Optional: add a validation schema
+    })`
+            });
+        }
+        if (data.configMongo) {
+            project.addConfigSource("MongoConfigSource", {
+                moduleSpecifier: "@tsedio/config-mongo",
+                content: `withOptions(MongoConfigSource, {
+      name: "mongo",
+      url: "mongodb://localhost:27017", // MongoDB connection URL
+      database: "my_database", // Database name
+      collection: "config" // Collection used for config storage
+
+      // Additional MongoDB client options can be provided here
+
+      // ConfigSource options
+      // validationSchema: object({}) // Optional: add a validation schema
+    })`
+            });
+        }
+        if (data.configPostgres) {
+            project.addConfigSource("PostgresConfigSource", {
+                moduleSpecifier: "@tsedio/config-postgres",
+                content: `withOptions(PostgresConfigSource, {
+      name: "postgres",
+      connectionString: "postgresql://postgres:postgres@localhost:5432/my_database", // PostgreSQL connection string
+      table: "config" // Table used for config storage
+
+      // Additional PostgresSQL client options can be provided here
+
+      // ConfigSource options
+      // validationSchema: object({}) // Optional: add a validation schema
+    })`
+            });
+        }
     }
-    sourceFile.organizeImports();
-    sourceFile.formatText({
-        indentSize: 2
-    });
 }

package/lib/esm/processors/transformIndexFile.js

@@ -12,7 +12,6 @@ export function transformIndexFile(project, data) {
         moduleSpecifier: "@tsed/platform-" + data.platform.toLowerCase(),
         namedImports: [platformName]
     });
-    // replace PlatformBuilder with Platform<PlatformType>
     sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue() === "@tsed/platform-http")?.remove();
     sourceFile.getDescendantsOfKind(SyntaxKind.Identifier).map((identifier) => {
         if (identifier.getText() === "PlatformBuilder") {
@@ -21,8 +20,4 @@ export function transformIndexFile(project, data) {
         }
         return identifier;
     });
-    sourceFile.organizeImports();
-    sourceFile.formatText({
-        indentSize: 2
-    });
 }

package/lib/esm/processors/transformServerFile.js

@@ -57,8 +57,4 @@ export function transformServerFile(project, data) {
             project.addMountPath("/", "...Object.values(pages)");
         }
     }
-    sourceFile.organizeImports();
-    sourceFile.formatText({
-        indentSize: 2
-    });
 }

package/lib/esm/services/CliProjectService.js

@@ -4,10 +4,8 @@ import { constant, injectable } from "@tsed/di";
 import { $asyncAlter } from "@tsed/hooks";
 import { normalizePath } from "@tsed/normalize-path";
 import { globbySync } from "globby";
+import { taskOutput } from "../fn/taskOutput.js";
 import { PlatformsModule } from "../platforms/PlatformsModule.js";
-import { InitExpressPlatform } from "../platforms/supports/InitExpressPlatform.js";
-import { InitFastifyPlatform } from "../platforms/supports/InitFastifyPlatform.js";
-import { InitKoaPlatform } from "../platforms/supports/InitKoaPlatform.js";
 import { transformBinFile } from "../processors/transformBinFile.js";
 import { transformConfigFile } from "../processors/transformConfigFile.js";
 import { transformIndexFile } from "../processors/transformIndexFile.js";
@@ -28,13 +26,10 @@ export class CliProjectService {
     getServerFileName() {
         return this.get().getSource("Server.ts") ? "Server" : "server";
     }
-    get() {
-        if (this.project) {
-            return this.project;
-        }
+    create() {
+        taskOutput("Create typescript project");
         const fs = inject(CliFs);
         this.project = new ProjectClient({
-            // tsConfigFilePath: join(this.rootDir, "tsconfig.json"),
             rootDir: this.rootDir
         });
         const files = fs.globSync([join(constant("project.rootDir", process.cwd()), "**/*.ts")]);
@@ -43,6 +38,11 @@ export class CliProjectService {
                 overwrite: true
             });
         });
+    }
+    get() {
+        if (!this.project) {
+            this.create();
+        }
         return this.project;
     }
     async transformFiles(data) {
@@ -60,11 +60,16 @@ export class CliProjectService {
         await $asyncAlter(`$alterProjectFiles`, project, [data]);
         await Promise.all(project.getSourceFiles().map((sourceFile) => {
             sourceFile.organizeImports();
+            sourceFile.formatText({
+                indentSize: 2
+            });
             return sourceFile.save();
         }));
     }
     async createFromTemplate(templateId, ctx) {
+        const startTime = Date.now();
         const obj = await this.templates.render(templateId, ctx);
+        taskOutput(`Template ${templateId} rendered in ${Date.now() - startTime}ms`);
         const project = this.get();
         if (obj) {
             const sourceFile = await project.createSource(obj.outputPath, obj.content, {
@@ -88,4 +93,4 @@ export class CliProjectService {
         return [...set];
     }
 }
-injectable(PlatformsModule).imports([InitExpressPlatform, InitKoaPlatform, InitFastifyPlatform]);
+injectable(CliProjectService);

package/lib/esm/services/CliTemplatesService.js

@@ -54,10 +54,11 @@ export class CliTemplatesService {
         else {
             const from = data.from || TEMPLATE_DIR;
             const fromPath = join(from, templateId.replace("{{srcDir}}", "src"));
-            if (this.fs.fileExistsSync(fromPath)) {
+            if (await this.fs.fileExists(fromPath)) {
+                const content = await inject(CliFs).readFile(fromPath);
                 return {
                     templateId,
-                    content: await inject(CliFs).readFile(fromPath),
+                    content,
                     outputPath: templateId.replace("{{srcDir}}", constant("project.srcDir", ""))
                 };
             }

package/lib/esm/services/ProjectClient.js

@@ -1,4 +1,4 @@
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { CliDockerComposeYaml, CliFs, ProjectPackageJson } from "@tsed/cli-core";
 import { isString } from "@tsed/core";
 import { constant, inject } from "@tsed/di";
@@ -45,6 +45,7 @@ export class ProjectClient extends Project {
             await source.save();
             return source;
         }
+        await this.fs.ensureDir(dirname(path));
         await this.fs.writeFile(path, sourceFileText, { encoding: "utf-8" });
     }
     findClassDecorator(sourceFile, name) {
@@ -136,4 +137,26 @@ export class ProjectClient extends Project {
         }
         return undefined;
     }
+    addConfigSource(name, { content = name, moduleSpecifier }) {
+        const sourceFile = this.configSourceFile;
+        const options = this.findConfiguration("config");
+        if (!options) {
+            return;
+        }
+        const extendsConfig = this.getPropertyAssignment(options, {
+            name: "extends",
+            kind: SyntaxKind.ArrayLiteralExpression,
+            initializer: "[]"
+        });
+        const has = extendsConfig.getElements().some((expression) => {
+            return expression.getText().includes(name);
+        });
+        if (!has) {
+            sourceFile.addImportDeclaration({
+                moduleSpecifier,
+                namedImports: [{ name: name }]
+            });
+            extendsConfig.addElement("\n" + content);
+        }
+    }
 }