refactor(fx-core): split scaffold question models

packages/api/src/qm/question.ts

@@ -237,6 +237,11 @@ export interface SingleSelectQuestion extends UserInputQuestion {
    * whether to skip validation against allowed list in non-interactive mode, default false
    */
   skipValidation?: boolean;
+
+  /**
+   * callback function which is triggered when the value is selected
+   */
+  onDidSelection?: (itemOrId: string | OptionItem, inputs: Inputs) => Promise<void> | void;
 }
 
 /**

packages/api/src/qm/ui.ts

@@ -263,6 +263,11 @@ export interface InputResult<T> {
    * answer value
    */
   result?: T;
+
+  /**
+   * resolved option list
+   */
+  options?: StaticOptions;
 }
 
 export type ConfirmResult = InputResult<boolean>;

packages/cli/src/userInteraction.ts

@@ -274,12 +274,12 @@
     if (config.options.length === 1 && config.skipSingleOption) {
       const answer = (config.options as StaticOptions)[0];
       if (config.returnObject) {
-        return ok({ type: "skip", result: answer });
+        return ok({ type: "skip", result: answer, options: config.options as StaticOptions });
       } else {
         if (typeof answer === "string") {
-          return ok({ type: "skip", result: answer });
+          return ok({ type: "skip", result: answer, options: config.options as StaticOptions });
         } else {
-          return ok({ type: "skip", result: answer.id });
+          return ok({ type: "skip", result: answer.id, options: config.options as StaticOptions });
         }
       }
     }
@@ -310,9 +310,13 @@
         return ok({ type: "success", result: answer });
       } else {
         if (typeof answer === "string") {
-          return ok({ type: "success", result: answer });
+          return ok({ type: "success", result: answer, options: config.options as StaticOptions });
         } else {
-          return ok({ type: "success", result: answer.id });
+          return ok({
+            type: "success",
+            result: answer.id,
+            options: config.options as StaticOptions,
+          });
         }
       }
     } else {

packages/fx-core/src/component/generator/templates/templateGenerator.ts

@@ -7,23 +7,27 @@
   FxError,
   GeneratorResult,
   IGenerator,
+  IQTreeNode,
   Inputs,
   Result,
   err,
   ok,
 } from "@microsoft/teamsfx-api";
+import { merge } from "lodash";
+import { getLocalizedString } from "../../../common/localizeUtils";
 import { TelemetryEvent, TelemetryProperty } from "../../../common/telemetry";
+import { CapabilityOptions, ProgrammingLanguage, QuestionNames } from "../../../question/constants";
+import { botTriggerQuestion, meArchitectureQuestion } from "../../../question/create";
 import { ProgressMessages, ProgressTitles } from "../../messages";
 import { ActionContext, ActionExecutionMW } from "../../middleware/actionExecutionMW";
 import { commonTemplateName, componentName } from "../constant";
-import { ProgrammingLanguage, QuestionNames } from "../../../question/constants";
 import { Generator, templateDefaultOnActionError } from "../generator";
-import { convertToLangKey, renderTemplateFileData, renderTemplateFileName } from "../utils";
-import { merge } from "lodash";
 import { GeneratorContext, TemplateActionSeq } from "../generatorAction";
+import { convertToLangKey, renderTemplateFileData, renderTemplateFileName } from "../utils";
 import { TemplateInfo } from "./templateInfo";
 import { getTemplateName, tryGetTemplateName } from "./templateNames";
 import { getTemplateReplaceMap } from "./templateReplaceMap";
+import { Templates } from "../../../question/templates";
 
 export class DefaultTemplateGenerator implements IGenerator {
   // override this property to send telemetry event with different component name
@@ -124,4 +128,49 @@
       [TelemetryProperty.Fallback]: generatorContext.fallback ? "true" : "false", // Track fallback cases.
     });
   }
+
+  public getQuestionNode(): IQTreeNode {
+    return {
+      data: {
+        type: "group",
+      },
+      children: [
+        {
+          // Notification bot trigger sub-tree
+          condition: (input: Inputs) =>
+            input[QuestionNames.Capabilities] === CapabilityOptions.notificationBot().id,
+          data: botTriggerQuestion(),
+        },
+        {
+          // Search ME sub-tree
+          condition: (input: Inputs) =>
+            input[QuestionNames.Capabilities] === CapabilityOptions.m365SearchMe().id,
+          data: meArchitectureQuestion(),
+        },
+        {
+          data: {
+            type: "singleSelect",
+            title: getLocalizedString("core.ProgrammingLanguageQuestion.title"),
+            name: QuestionNames.ProgrammingLanguage,
+            staticOptions: [
+              { id: ProgrammingLanguage.JS, label: "JavaScript" },
+              { id: ProgrammingLanguage.TS, label: "TypeScript" },
+              { id: ProgrammingLanguage.CSharp, label: "C#" },
+              { id: ProgrammingLanguage.PY, label: "Python" },
+            ],
+            dynamicOptions: (inputs: Inputs) => {
+              const templateName = inputs[QuestionNames.TemplateName]; //inputs[QuestionNames.Capabilities];
+              const languages = Templates.filter((t) => t.name === templateName).map(
+                (t) => t.language
+              );
+              return languages;
+            },
+            skipSingleOption: true,
+          },
+        },
+      ],
+    };
+  }
 }
+
+export const defaultGenerator = new DefaultTemplateGenerator();

packages/fx-core/src/question/constants.ts

@@ -106,6 +106,8 @@ export enum QuestionNames {
   ImportPlugin = "import-plugin",
   PluginManifestFilePath = "plugin-manifest-path",
   PluginOpenApiSpecFilePath = "plugin-opeanapi-spec-path",
+
+  TemplateName = "template-name",
 }
 
 export const AppNamePattern =
@@ -917,9 +919,9 @@ export const NotificationTriggers = {
   TIMER: "timer",
 } as const;
 
-type NotificationTrigger = typeof NotificationTriggers[keyof typeof NotificationTriggers];
+export type NotificationTrigger = typeof NotificationTriggers[keyof typeof NotificationTriggers];
 
-interface HostTypeTriggerOptionItem extends OptionItem {
+export interface HostTypeTriggerOptionItem extends OptionItem {
   hostType: HostType;
   triggers?: NotificationTrigger[];
 }

packages/fx-core/src/question/create.ts

@@ -292,7 +292,7 @@ export function meArchitectureQuestion(): SingleSelectQuestion {
   };
 }
 
-function botTriggerQuestion(): SingleSelectQuestion {
+export function botTriggerQuestion(): SingleSelectQuestion {
   return {
     name: QuestionNames.BotTrigger,
     title: getLocalizedString("plugins.bot.questionHostTypeTrigger.title"),