@tsed/cli-core 7.0.0-beta.10 → 7.0.0-beta.11

package/lib/esm/CliCore.js

@@ -1,5 +1,6 @@
 import "@tsed/logger-std";
 import { join, resolve } from "node:path";
+import { PromptCancelledError } from "@tsed/cli-prompts";
 import { constant, inject, injector } from "@tsed/di";
 import { $asyncEmit } from "@tsed/hooks";
 import chalk from "chalk";
@@ -88,6 +89,10 @@ export class CliCore {
             await cliService.parseArgs(constant("argv"));
         }
         catch (er) {
+            if (er instanceof PromptCancelledError) {
+                console.log(chalk.yellow("Prompt cancelled."));
+                return this;
+            }
             throw new CliError({ origin: er, cli: this });
         }
         return this;

package/lib/esm/index.js

@@ -1,5 +1,4 @@
 import "./utils/patchCommander.js";
-import Inquirer from "inquirer";
 export * from "./CliCore.js";
 export * from "./decorators/index.js";
 export * from "./fn/command.js";
@@ -7,8 +6,8 @@ export * from "./interfaces/index.js";
 export * from "./packageManagers/index.js";
 export * from "./services/index.js";
 export * from "./utils/index.js";
+export * from "@tsed/cli-prompts";
 export * from "@tsed/core";
 export * from "@tsed/di";
 export * from "@tsed/logger";
 export * from "@tsed/normalize-path";
-export { Inquirer };

package/lib/esm/interfaces/CommandProvider.js

@@ -1,2 +1 @@
-import "inquirer-autocomplete-prompt";
-import AutocompletePrompt from "inquirer-autocomplete-prompt";
+export {};

package/lib/esm/interfaces/index.js

@@ -1,4 +1,3 @@
-import { Type } from "@tsed/core";
 export * from "./CliDefaultOptions.js";
 export * from "./CommandData.js";
 export * from "./CommandMetadata.js";

package/lib/esm/services/CliService.js

@@ -1,10 +1,9 @@
+import { PromptRunner } from "@tsed/cli-prompts";
 import { classOf, isArrowFn } from "@tsed/core";
 import { configuration, constant, context, destroyInjector, DIContext, getContext, inject, injectable, injector, logger, Provider, runInContext } from "@tsed/di";
 import { $asyncAlter, $asyncEmit } from "@tsed/hooks";
 import { pascalCase } from "change-case";
 import { Argument, Command } from "commander";
-import Inquirer from "inquirer";
-import inquirer_autocomplete_prompt from "inquirer-autocomplete-prompt";
 import { v4 } from "uuid";
 import { PackageManagersModule } from "../packageManagers/index.js";
 import { createSubTasks, createTasksRunner } from "../utils/createTasksRunner.js";
@@ -14,7 +13,6 @@ import { mapCommanderArgs } from "../utils/mapCommanderArgs.js";
 import { parseOption } from "../utils/parseOption.js";
 import { CliHooks } from "./CliHooks.js";
 import { ProjectPackageJson } from "./ProjectPackageJson.js";
-Inquirer.registerPrompt("autocomplete", inquirer_autocomplete_prompt);
 export class CliService {
     constructor() {
         this.reinstallAfterRun = constant("project.reinstallAfterRun", false);
@@ -23,6 +21,7 @@ export class CliService {
         this.hooks = inject(CliHooks);
         this.projectPkg = inject(ProjectPackageJson);
         this.packageManagers = inject(PackageManagersModule);
+        this.promptRunner = inject(PromptRunner);
         this.commands = new Map();
     }
     /**
@@ -45,17 +44,18 @@ export class CliService {
         return runInContext($ctx, async () => {
             $ctx.set("dispatchCmd", cmdName);
             await $asyncEmit("$loadPackageJson");
-            data = await this.prompt(cmdName, data, $ctx);
             try {
+                data = await this.prompt(cmdName, data, $ctx);
                 await this.exec(cmdName, data, $ctx);
+                await $asyncEmit("$onFinish", [data]);
             }
             catch (er) {
                 await $asyncEmit("$onFinish", [data, er]);
-                await destroyInjector();
                 throw er;
             }
-            await $asyncEmit("$onFinish", [data]);
-            await destroyInjector();
+            finally {
+                await destroyInjector();
+            }
         });
     }
     async exec(cmdName, data, $ctx) {
@@ -84,11 +84,12 @@ export class CliService {
         const instance = inject(provider.token);
         $ctx.set("data", data);
         if (instance.$prompt) {
-            const questions = [...(await instance.$prompt(data))];
-            if (questions.length) {
+            const questions = await instance.$prompt(data);
+            if (questions) {
+                const answers = await this.promptRunner.run(questions, data);
                 data = {
                     ...data,
-                    ...(await Inquirer.prompt(questions))
+                    ...answers
                 };
             }
         }

package/lib/types/fn/command.d.ts

@@ -38,8 +38,8 @@ export declare function command<Input>(options: CommandOptions<Input>): TsED.Pro
 } | {
     $prompt: any;
     $exec: any;
-    prompt?<T extends import("inquirer").Answers = import("inquirer").Answers>(initialOptions: Partial<Input>): import("../interfaces/CommandProvider.js").QuestionOptions<T> | Promise<import("../interfaces/CommandProvider.js").QuestionOptions<T>>;
     handler: (data: Input) => import("../interfaces/Tasks.js").Tasks | Promise<import("../interfaces/Tasks.js").Tasks> | any | Promise<any>;
+    prompt?(initialOptions: Partial<Input>): import("@tsed/cli-prompts").PromptQuestion[] | Promise<import("@tsed/cli-prompts").PromptQuestion[]>;
     name: string;
     alias?: string;
     description: string;

package/lib/types/index.d.ts

@@ -1,5 +1,4 @@
 import "./utils/patchCommander.js";
-import Inquirer from "inquirer";
 export * from "./CliCore.js";
 export * from "./decorators/index.js";
 export * from "./fn/command.js";
@@ -7,8 +6,8 @@ export * from "./interfaces/index.js";
 export * from "./packageManagers/index.js";
 export * from "./services/index.js";
 export * from "./utils/index.js";
+export * from "@tsed/cli-prompts";
 export * from "@tsed/core";
 export * from "@tsed/di";
 export * from "@tsed/logger";
 export * from "@tsed/normalize-path";
-export { Inquirer };

package/lib/types/interfaces/CommandData.d.ts

@@ -9,4 +9,5 @@ export interface CommandData extends TsED.InitialCommandData {
     verbose?: boolean;
     bindLogger?: boolean;
     rawArgs?: string[];
+    [key: string]: any;
 }

package/lib/types/interfaces/CommandOptions.d.ts

@@ -1,8 +1,8 @@
+import type { PromptQuestion } from "@tsed/cli-prompts";
 import { Type } from "@tsed/core";
 import type { TokenProvider } from "@tsed/di";
 import type { JsonSchema } from "@tsed/schema";
-import type { Answers } from "inquirer";
-import type { CommandProvider, QuestionOptions } from "./CommandProvider.js";
+import type { CommandProvider } from "./CommandProvider.js";
 import type { Tasks } from "./Tasks.js";
 export interface CommandArg {
     /**
@@ -82,8 +82,8 @@ export interface BaseCommandOptions<Input> {
     bindLogger?: boolean;
 }
 interface FunctionalCommandOptions<Input> extends BaseCommandOptions<Input> {
-    prompt?<T extends Answers = Answers>(initialOptions: Partial<Input>): QuestionOptions<T> | Promise<QuestionOptions<T>>;
     handler: (data: Input) => Tasks | Promise<Tasks> | any | Promise<any>;
+    prompt?(initialOptions: Partial<Input>): PromptQuestion[] | Promise<PromptQuestion[]>;
     [key: string]: any;
 }
 export interface ClassCommandOptions<Input> extends BaseCommandOptions<Input> {

package/lib/types/interfaces/CommandProvider.d.ts

@@ -1,20 +1,12 @@
-import "inquirer-autocomplete-prompt";
-import type { Answers, QuestionCollection } from "inquirer";
-import AutocompletePrompt from "inquirer-autocomplete-prompt";
+import type { PromptQuestion } from "@tsed/cli-prompts";
 import type { Tasks } from "./Tasks.js";
-declare module "inquirer" {
-    interface QuestionMap<T extends Answers = Answers> {
-        autocomplete: AutocompletePrompt.AutocompleteQuestionOptions<T>;
-    }
-}
-export type QuestionOptions<T extends Answers = Answers> = QuestionCollection<T>;
 export interface CommandProvider<Ctx = any> {
     /**
-     * Hook to create the main prompt for the command
-     * See https://github.com/enquirer/enquirer for more detail on question configuration.
+     * Hook to create the main prompt for the command. Refer to {@link PromptQuestion}
+     * for supported question attributes.
      * @param initialOptions
      */
-    $prompt?<T extends Answers = Answers>(initialOptions: Partial<Ctx>): QuestionOptions<T> | Promise<QuestionOptions<T>>;
+    $prompt?(initialOptions: Partial<Ctx>): PromptQuestion[] | Promise<PromptQuestion[]>;
     /**
      * Hook to map options
      * @param ctx

package/lib/types/services/CliService.d.ts

@@ -1,3 +1,4 @@
+import { PromptRunner } from "@tsed/cli-prompts";
 import { DIContext } from "@tsed/di";
 import { Command } from "commander";
 import type { CommandData } from "../interfaces/CommandData.js";
@@ -13,6 +14,7 @@ export declare class CliService {
     protected hooks: CliHooks;
     protected projectPkg: ProjectPackageJson;
     protected packageManagers: PackageManagersModule;
+    protected promptRunner: PromptRunner;
     private commands;
     /**
      * Parse process.argv and runLifecycle action

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-core",
   "description": "Build your CLI with TypeScript and Decorators",
-  "version": "7.0.0-beta.10",
+  "version": "7.0.0-beta.11",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -28,28 +28,25 @@
     "api",
     "decorators",
     "commander.js",
-    "inquirer.js",
+    "prompts",
     "listr"
   ],
   "dependencies": {
     "@ts-morph/common": "0.28.0",
+    "@tsed/cli-prompts": "7.0.0-beta.11",
     "@tsed/logger": ">=8.0.3",
     "@tsed/logger-pattern-layout": ">=8.0.3",
     "@tsed/logger-std": ">=8.0.3",
     "@tsed/normalize-path": ">=8.0.0",
-    "@types/inquirer": "^9.0.7",
     "ajv": "^8.17.1",
     "axios": "^1.7.7",
     "chalk": "^5.3.0",
     "change-case": "^5.4.4",
     "commander": "^12.1.0",
-    "enquirer": "^2.4.1",
     "execa": "^8.0.1",
     "figures": "^6.1.0",
     "fs-extra": "^11.2.0",
     "globby": "^14.0.2",
-    "inquirer": "^9.3.7",
-    "inquirer-autocomplete-prompt": "^3.0.1",
     "js-yaml": "^4.1.0",
     "listr2": "^8.2.4",
     "read-pkg-up": "^11.0.0",
@@ -65,7 +62,7 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/typescript": "7.0.0-beta.10",
+    "@tsed/typescript": "7.0.0-beta.11",
     "@types/commander": "2.12.2",
     "@types/figures": "3.0.1",
     "@types/fs-extra": "^11.0.4",

package/readme.md

@@ -116,7 +116,7 @@ export class GenerateCmd implements CommandProvider {
   srcRenderService: SrcRendererService;
 
   /**
-   * Prompt use Inquirer.js to print questions (see Inquirer.js for more details)
+   * Prompts run through the Ts.ED prompt runner (powered by `@clack/prompts`) to gather inputs
    */
   $prompt(initialOptions: Partial<GenerateCmdContext>) {
     return [