@tsed/cli 7.0.0-beta.9 → 7.0.0-rc.2

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

@@ -1,4 +1,4 @@
-import { CliPlugins, command, createSubTasks, inject, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
+import { CliPlugins, command, inject, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
 export class AddCmd {
     constructor() {
         this.cliPlugins = inject(CliPlugins);
@@ -13,30 +13,25 @@ export class AddCmd {
                 message: "Which cli plugin ?",
                 default: initialOptions.name,
                 when: !initialOptions.name,
-                source: (state, keyword) => {
-                    return this.cliPlugins.searchPlugins(keyword);
-                }
+                source: () => this.cliPlugins.searchPlugins()
             }
         ];
     }
     $exec(ctx) {
         this.packageJson.addDevDependency(ctx.name, "latest");
         return [
-            {
-                title: "Install plugins",
-                task: createSubTasks(() => this.packageManagers.install(ctx), { ...ctx, concurrent: false })
-            },
+            this.packageManagers.task("Install plugins", ctx),
             {
                 title: "Load plugins",
                 task: () => this.cliPlugins.loadPlugins()
             },
             {
                 title: "Install plugins dependencies",
-                task: createSubTasks(() => this.cliPlugins.addPluginsDependencies(ctx), { ...ctx, concurrent: false })
+                task: () => this.cliPlugins.addPluginsDependencies(ctx)
             },
             {
                 title: "Transform files",
-                task: createSubTasks(() => this.cliPlugins.addPluginsDependencies(ctx), { ...ctx, concurrent: false })
+                task: () => this.cliPlugins.addPluginsDependencies(ctx)
             }
         ];
     }

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

@@ -3,14 +3,8 @@ import { CliProjectService } from "../../services/CliProjectService.js";
 import { CliTemplatesService } from "../../services/CliTemplatesService.js";
 import { addContextMethods } from "../../services/mappers/addContextMethods.js";
 import { mapDefaultTemplateOptions } from "../../services/mappers/mapDefaultTemplateOptions.js";
-const searchFactory = (list) => {
-    const items = list.map((item) => ({ name: item.label, value: item.id }));
-    return (_, keyword) => {
-        if (keyword) {
-            return items.filter((item) => item.name.toLowerCase().includes(keyword.toLowerCase()));
-        }
-        return items;
-    };
+const mapChoices = (list) => {
+    return list.map((item) => ({ label: item.label, value: item.id }));
 };
 export class GenerateCmd {
     constructor() {
@@ -21,11 +15,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",
@@ -33,7 +24,7 @@ export class GenerateCmd {
                 message: "Which template you want to use?",
                 default: data.type,
                 when: () => templates.length > 1,
-                source: searchFactory(this.templates.find(data.type))
+                choices: mapChoices(this.templates.find(data.type))
             },
             {
                 type: "input",
@@ -42,7 +33,7 @@ export class GenerateCmd {
                 default: data.getName,
                 when: !data.name
             },
-            ...templatesPrompts.flat()
+            ...additionalPrompts
         ];
     }
     $mapContext(ctx) {

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

@@ -1,5 +1,6 @@
 import { basename, join } from "node:path";
-import { CliExeca, CliFs, CliLoadFile, cliPackageJson, CliPlugins, command, Configuration, createSubTasks, createTasksRunner, inject, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
+import { CliExeca, CliFs, CliLoadFile, cliPackageJson, CliPlugins, command, Configuration, inject, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
+import { tasks } from "@tsed/cli-tasks";
 import { isString } from "@tsed/core";
 import { constant } from "@tsed/di";
 import { $asyncAlter } from "@tsed/hooks";
@@ -74,7 +75,7 @@ export class InitCmd {
             srcDir: constant("project.srcDir", "src")
         };
     }
-    async $exec(ctx) {
+    preExec(ctx) {
         this.fs.ensureDirSync(this.packageJson.cwd);
         ctx.projectName && (this.packageJson.name = ctx.projectName);
         ctx.packageManager && this.packageJson.setPreference("packageManager", ctx.packageManager);
@@ -83,7 +84,7 @@ export class InitCmd {
         ctx.convention && this.packageJson.setPreference("convention", ctx.convention);
         ctx.platform && this.packageJson.setPreference("platform", ctx.platform);
         ctx.GH_TOKEN && this.packageJson.setGhToken(ctx.GH_TOKEN);
-        await createTasksRunner([
+        return tasks([
             {
                 title: "Write RC files",
                 skip: () => !ctx.premium,
@@ -101,19 +102,19 @@ export class InitCmd {
                     this.addFeatures(ctx);
                 }
             },
-            {
-                title: "Install plugins",
-                task: createSubTasks(() => this.packageManagers.install(ctx), { ...ctx, concurrent: false })
-            },
+            this.packageManagers.task("Install plugins", ctx),
             {
                 title: "Load plugins",
                 task: () => this.cliPlugins.loadPlugins()
             },
             {
                 title: "Install plugins dependencies",
-                task: createSubTasks(() => this.cliPlugins.addPluginsDependencies(ctx), { ...ctx, concurrent: false })
+                task: () => this.cliPlugins.addPluginsDependencies(ctx)
             }
         ], ctx);
+    }
+    async $exec(ctx) {
+        await this.preExec(ctx);
         const runtime = this.runtimes.get();
         ctx = {
             ...ctx,
@@ -128,13 +129,13 @@ export class InitCmd {
             },
             {
                 title: "Alter package json",
-                task: () => {
-                    return $asyncAlter("$alterPackageJson", this.packageJson, [ctx]);
+                task: async () => {
+                    await $asyncAlter("$alterPackageJson", this.packageJson, [ctx]);
                 }
             },
             {
                 title: "Generate additional project files",
-                task: createSubTasks(async () => {
+                task: async () => {
                     const subTasks = [
                         ...(await exec("generate", {
                             //...ctx,
@@ -153,7 +154,7 @@ export class InitCmd {
                             : [])
                     ];
                     return $asyncAlter("$alterInitSubTasks", subTasks, [ctx]);
-                }, { ...ctx, concurrent: false })
+                }
             },
             {
                 title: "transform generated files to the project configuration",
@@ -165,6 +166,7 @@ export class InitCmd {
     }
     $afterPostInstall() {
         return [
+            this.packageManagers.task("Check installed dependencies"),
             {
                 title: "Generate barrels files",
                 task: () => {
@@ -280,7 +282,7 @@ export class InitCmd {
             "readme",
             "agents",
             `pm2.${pm2}`,
-            ctx.swagger && "/views/swagger.ejs",
+            "/views/home.ejs",
             ...runtime.files()
         ].map((id) => {
             return id && render(id, ctx);

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

@@ -1,3 +1,5 @@
+import { CliHttpClient } from "@tsed/cli-core";
+import { inject } from "@tsed/di";
 import { ArchitectureConvention, PlatformType, ProjectConvention } from "../../../interfaces/index.js";
 import { hasFeature, hasValue, hasValuePremium } from "../utils/hasFeature.js";
 import { isPlatform } from "../utils/isPlatform.js";
@@ -127,9 +129,6 @@ export const FeaturesMap = {
         name: "Commands",
         dependencies: {
             "@tsed/cli-core": "{{cliVersion}}"
-        },
-        devDependencies: {
-            "@types/inquirer": "^8.2.4"
         }
     },
     [ProjectConvention.DEFAULT]: {
@@ -452,6 +451,23 @@ export const FeaturesPrompt = (availableRuntimes, availablePackageManagers) => [
         ],
         when: hasValue("featuresDB", FeatureType.TYPEORM)
     },
+    {
+        type: "autocomplete",
+        name: "passportPackage",
+        message: "Which passport package ?",
+        when: hasFeature(FeatureType.PASSPORTJS),
+        async source(_) {
+            const result = await inject(CliHttpClient).get(`https://www.passportjs.org/packages/-/all.json`, {});
+            return Object.values(result)
+                .filter((o) => {
+                return o.name && o.name?.startsWith("passport-");
+            })
+                .map((item) => ({
+                name: `${item.name} - ${item.description}`,
+                value: item.name
+            }));
+        }
+    },
     {
         type: "password",
         name: "GH_TOKEN",

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

@@ -1,4 +1,5 @@
 import { CliFs, command, inject, normalizePath, ProjectPackageJson } from "@tsed/cli-core";
+import { taskLogger } from "@tsed/cli-tasks";
 import { logger } from "@tsed/di";
 import { CliRunScript } from "../../services/CliRunScript.js";
 export class RunCmd {
@@ -11,11 +12,10 @@ export class RunCmd {
         const cmd = "node";
         const args = ["--import", "@swc-node/register/esm-register"];
         const path = normalizePath("src/bin/index.ts");
-        logger().info(`Run ${cmd} ${[...args, path, ctx.command, ...ctx.rawArgs].join(" ")}`);
+        taskLogger().info(`Run ${cmd} ${[...args, path, ctx.command, ...ctx.rawArgs].join(" ")}`);
         await this.runScript.run(cmd, [...args, path, ctx.command, ...ctx.rawArgs], {
             env: process.env
         });
-        return [];
     }
 }
 command({

package/lib/esm/commands/template/CreateTemplateCommand.js

@@ -3,15 +3,6 @@ import { snakeCase } from "change-case";
 import { PKG } from "../../constants/index.js";
 import { render } from "../../fn/render.js";
 import { CliTemplatesService } from "../../services/CliTemplatesService.js";
-const searchFactory = (list) => {
-    const items = list.map((item) => ({ name: item.label, value: item.id }));
-    return (_, keyword) => {
-        if (keyword) {
-            return items.filter((item) => item.name.toLowerCase().includes(keyword.toLowerCase()));
-        }
-        return items;
-    };
-};
 export class CreateTemplateCommand {
     constructor() {
         this.projectPackageJson = inject(ProjectPackageJson);
@@ -38,7 +29,7 @@ export class CreateTemplateCommand {
                 when: (ctx) => {
                     return ctx.from === "existing";
                 },
-                source: searchFactory(this.templates.find())
+                source: () => this.templates.find().map((item) => ({ name: item.label, value: item.id }))
             },
             {
                 type: "confirm",

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

@@ -1,4 +1,4 @@
-import { CliPackageJson, command, createSubTasks, inject, NpmRegistryClient, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
+import { CliPackageJson, command, 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";
@@ -59,12 +59,7 @@ export class UpdateCmd {
                 }
             });
         }
-        return [
-            {
-                title: "Update packages",
-                task: createSubTasks(() => this.packageManagers.install(), { ...ctx, concurrent: false })
-            }
-        ];
+        return [this.packageManagers.task("Update dependencies", ctx)];
     }
     async getAvailableVersions() {
         const { versions } = await this.npmRegistryClient.info("@tsed/platform-http", 10);

package/lib/esm/processors/transformServerFile.js

@@ -49,12 +49,10 @@ export function transformServerFile(project, data) {
         });
         project.addNamespaceImport(sourceFile, isFeature ? "./rest/index.js" : "./controllers/rest/index.js", "rest");
         project.addMountPath(data.route || "/rest", "...Object.values(rest)");
-        if (data.swagger || data.oidc) {
-            sourceFile.addImportDeclaration({
-                moduleSpecifier: isFeature ? "./pages/index.js" : "./controllers/pages/index.js",
-                namespaceImport: "pages"
-            });
-            project.addMountPath("/", "...Object.values(pages)");
-        }
+        sourceFile.addImportDeclaration({
+            moduleSpecifier: isFeature ? "./pages/index.js" : "./controllers/pages/index.js",
+            namespaceImport: "pages"
+        });
+        project.addMountPath("/", "...Object.values(pages)");
     }
 }

package/lib/esm/templates/barrels.template.js

@@ -11,11 +11,7 @@ export default defineTemplate({
     preserveCase: true,
     render(_, context) {
         const barrels = $alter("$alterBarrels", {
-            directory: [
-                "./src/controllers/rest",
-                context.commands && "./src/bin/commands",
-                (context.swagger || context.oidc) && "./src/controllers/pages"
-            ].filter(Boolean),
+            directory: ["./src/controllers/rest", context.commands && "./src/bin/commands", "./src/controllers/pages"].filter(Boolean),
             exclude: ["**/__mock__", "**/__mocks__", "**/*.spec.ts"],
             delete: true
         });

package/lib/esm/templates/command.template.js

@@ -8,7 +8,8 @@ export default defineTemplate({
     outputDir: "{{srcDir}}/bin/commands",
     render(symbolName) {
         const symbolParamName = kebabCase(symbolName);
-        return `import {Command, CommandProvider, QuestionOptions} from "@tsed/cli-core";
+        return `import {Command, CommandProvider} from "@tsed/cli-core";
+import type {PromptOptions} from "@tsed/cli-prompts";
 
 export interface ${symbolName}Context {
 }
@@ -24,9 +25,10 @@ export interface ${symbolName}Context {
 })
 export class ${symbolName} implements CommandProvider {
   /**
-   *  Ask questions with Inquirer. Return an empty array or don't implement the method to skip this step
+   *  Ask questions with the Ts.ED prompt runner (powered by @clack/prompts).
+   *  Return an empty array or don't implement the method to skip this step.
    */
-  async $prompt(initialOptions: Partial<${symbolName}Context>): Promise<QuestionOptions> {
+  async $prompt(initialOptions: Partial<${symbolName}Context>): Promise<PromptOptions[]> {
     return [];
   }
 
@@ -40,7 +42,7 @@ export class ${symbolName} implements CommandProvider {
     };
   }
   /**
-   *  This step run your tasks with Listr module
+   *  This step runs your tasks via the @clack/prompts-based @tsed/cli-tasks helpers.
    */
   async $exec(ctx: ${symbolName}Context): Promise<any> {
     return [

package/lib/esm/templates/controller.template.js

@@ -20,7 +20,12 @@ export default defineTemplate({
                 when(state) {
                     return !!(["controller"].includes(state.type || context.type) || context.directory);
                 },
-                choices: context.getDirectories("controllers")
+                choices: context.getDirectories("controllers").map((value) => {
+                    return {
+                        label: value,
+                        value
+                    };
+                })
             },
             {
                 type: "input",

package/lib/esm/templates/index.command.template.js

@@ -11,7 +11,7 @@ export default defineTemplate({
         return `#!/usr/bin/env node
 import {CliCore} from "@tsed/cli-core";
 import {config} from "@/config/config.js";
-import * commands from "@/bin/commands/index.js";
+import * as commands from "@/bin/commands/index.js";
 
 CliCore.bootstrap({
   ...config,

package/lib/esm/templates/index.controller.template.js

@@ -6,33 +6,37 @@ export default defineTemplate({
     outputDir: "{{srcDir}}/controllers/pages",
     fileName: "index.controller",
     hidden: true,
-    render() {
+    render(_, ctx) {
         return `import {Constant, Controller} from "@tsed/di";
 import {HeaderParams} from "@tsed/platform-params";
-import {View} from "@tsed/platform-views";
-import {SwaggerSettings} from "@tsed/swagger";
+import {View} from "@tsed/schema";
+${ctx.swagger ? 'import type {SwaggerSettings} from "@tsed/swagger";' : ""}
 import {Hidden, Get, Returns} from "@tsed/schema";
 
 @Hidden()
 @Controller("/")
 export class IndexController {
-  @Constant("swagger", [])
-  private swagger: SwaggerSettings[];
+  ${ctx.swagger
+            ? `@Constant("swagger", [])
+  private swagger: SwaggerSettings[];`
+            : ""}
 
   @Get("/")
-  @View("swagger.ejs")
+  @View("home.ejs")
   @(Returns(200, String).ContentType("text/html"))
   get(@HeaderParams("x-forwarded-proto") protocol: string, @HeaderParams("host") host: string) {
     const hostUrl = \`\${protocol || "http"}://\${host}\`;
 
     return {
       BASE_URL: hostUrl,
-      docs: this.swagger.map((conf) => {
+      docs: ${ctx.swagger
+            ? `this.swagger.map((conf) => {
         return {
           url: hostUrl + conf.path,
           ...conf
         };
-      })
+      })`
+            : "[]"}
     };
   }
 }`;

package/lib/esm/templates/index.template.js

@@ -11,35 +11,25 @@ export default defineTemplate({
         return `import {$log} from "@tsed/logger";
 import {PlatformBuilder} from "@tsed/platform-http";
 
-const SIG_EVENTS = [
-  "beforeExit",
-  "SIGHUP",
-  "SIGINT",
-  "SIGQUIT",
-  "SIGILL",
-  "SIGTRAP",
-  "SIGABRT",
-  "SIGBUS",
-  "SIGFPE",
-  "SIGUSR1",
-  "SIGSEGV",
-  "SIGUSR2",
-  "SIGTERM"
-];
-
 try {
   const platform = await PlatformBuilder.bootstrap(Server);
 
   await platform.listen();
 
-  SIG_EVENTS.forEach((evt) => process.on(evt, () => platform.stop()));
+  const close = () => {
+    $log.warn('Stop server gracefully...');
+
+    platform
+      .stop()
+      .then(() => process.exit(0))
+      .catch((error) => {
+        console.error(error);
+        process.exit(-1);
+      });
+  };
 
-  ["uncaughtException", "unhandledRejection"].forEach((evt) =>
-    process.on(evt, async (error) => {
-      $log.error({event: "SERVER_" + evt.toUpperCase(), message: error.message, stack: error.stack});
-      await platform.stop();
-    })
-  );
+  process.on('SIGINT', close);
+  process.on('SIGTERM', close);
 } catch (error) {
   $log.error({event: "SERVER_BOOTSTRAP_ERROR", message: error.message, stack: error.stack});
 }