@tsed/cli 7.0.0-beta.12 → 7.0.0-beta.14

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);
@@ -20,21 +20,18 @@ export class AddCmd {
     $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/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

@@ -456,13 +456,12 @@ export const FeaturesPrompt = (availableRuntimes, availablePackageManagers) => [
         name: "passportPackage",
         message: "Which passport package ?",
         when: hasFeature(FeatureType.PASSPORTJS),
-        async source(_, input) {
+        async source(_) {
             const result = await inject(CliHttpClient).get(`https://www.passportjs.org/packages/-/all.json`, {});
             return Object.values(result)
                 .filter((o) => {
-                return o.name?.startsWith("passport-");
+                return o.name && o.name?.startsWith("passport-");
             })
-                .filter((item) => item.name.toLowerCase().includes(input.toLowerCase()))
                 .map((item) => ({
                 name: `${item.name} - ${item.description}`,
                 value: item.name

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/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 [