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

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

@@ -13,9 +13,7 @@ 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()
             }
         ];
     }

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/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,24 @@ export const FeaturesPrompt = (availableRuntimes, availablePackageManagers) => [
         ],
         when: hasValue("featuresDB", FeatureType.TYPEORM)
     },
+    {
+        type: "autocomplete",
+        name: "passportPackage",
+        message: "Which passport package ?",
+        when: hasFeature(FeatureType.PASSPORTJS),
+        async source(_, input) {
+            const result = await inject(CliHttpClient).get(`https://www.passportjs.org/packages/-/all.json`, {});
+            return Object.values(result)
+                .filter((o) => {
+                return o.name?.startsWith("passport-");
+            })
+                .filter((item) => item.name.toLowerCase().includes(input.toLowerCase()))
+                .map((item) => ({
+                name: `${item.name} - ${item.description}`,
+                value: item.name
+            }));
+        }
+    },
     {
         type: "password",
         name: "GH_TOKEN",

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/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 [];
   }
 

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