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

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() {
@@ -30,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",

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",

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";
@@ -449,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

@@ -15,7 +15,6 @@ export class RunCmd {
         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/templates/command.template.js

@@ -42,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",