refactor(fx-core): scaffold question and generator refactor

packages/api/src/constants.ts

@@ -41,6 +41,7 @@ export enum VsCodeEnv {
 
 export enum Stage {
   create = "create",
+  createTdp = "createTdp",
   build = "build",
   debug = "debug",
   provision = "provision",

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 @@ class CLIUserInteraction implements UserInteraction {
     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 @@ class CLIUserInteraction implements UserInteraction {
         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/cli/tests/unit/ui2.tests.ts

@@ -8,6 +8,7 @@ import {
   SingleSelectConfig,
   UserError,
   err,
+  ok,
 } from "@microsoft/teamsfx-api";
 import { SelectSubscriptionError, UnhandledError } from "@microsoft/teamsfx-core";
 import { assert } from "chai";
@@ -184,6 +185,19 @@ describe("UserInteraction(CLI) 2", () => {
         assert.isTrue(result.error instanceof SelectSubscriptionError);
       }
     });
+    it("happy return options", async () => {
+      const config: SingleSelectConfig = {
+        name: "test",
+        title: "test",
+        options: ["a", "b"],
+      };
+      sandbox.stub(UI, "singleSelect").resolves(ok("a"));
+      const result = await UI.selectOption(config);
+      assert.isTrue(result.isOk());
+      if (result.isOk()) {
+        assert.deepEqual(result.value.options, ["a", "b"]);
+      }
+    });
   });
 
   describe("inputText", () => {

packages/fx-core/src/component/coordinator/index.ts

@@ -206,17 +206,6 @@ class Coordinator {
 
     context.projectPath = projectPath;
 
-    if (inputs.teamsAppFromTdp) {
-      const res = await developerPortalScaffoldUtils.updateFilesForTdp(
-        context,
-        inputs.teamsAppFromTdp,
-        inputs
-      );
-      if (res.isErr()) {
-        return err(res.error);
-      }
-    }
-
     const trimRes = await manifestUtils.trimManifestShortName(projectPath);
     if (trimRes.isErr()) return err(trimRes.error);
 

packages/fx-core/src/component/generator/TdpGenerator.ts

@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+/**
+ * @author [email protected]
+ */
+
+import { Context, err, FxError, GeneratorResult, Inputs, ok, Result } from "@microsoft/teamsfx-api";
+import { InputValidationError } from "../../error";
+import { ProgrammingLanguage, QuestionNames } from "../../question/constants";
+import { developerPortalScaffoldUtils } from "../developerPortalScaffoldUtils";
+import { ActionContext } from "../middleware/actionExecutionMW";
+import { DefaultTemplateGenerator } from "./templates/templateGenerator";
+import { TemplateInfo } from "./templates/templateInfo";
+
+/**
+ * TdpGenerator is used to generate code from TDP app definition.
+ */
+export class TdpGenerator extends DefaultTemplateGenerator {
+  componentName = "tdp-generator";
+
+  // activation condition
+  public activate(context: Context, inputs: Inputs): boolean {
+    return inputs.teamsAppFromTdp !== undefined;
+  }
+
+  public async getTemplateInfos(
+    context: Context,
+    inputs: Inputs,
+    destinationPath: string,
+    actionContext?: ActionContext
+  ): Promise<Result<TemplateInfo[], FxError>> {
+    const templateName = inputs[QuestionNames.TemplateName];
+    if (!templateName) {
+      return err(
+        new InputValidationError("teamsAppFromTdp", "Invalid App Definition", "TdpGenerator")
+      );
+    }
+    const language = inputs[QuestionNames.ProgrammingLanguage] as ProgrammingLanguage;
+    return Promise.resolve(
+      ok([
+        {
+          templateName: templateName,
+          language: language,
+          replaceMap: {},
+        },
+      ])
+    );
+  }
+
+  async post(
+    context: Context,
+    inputs: Inputs,
+    destinationPath: string,
+    actionContext?: ActionContext
+  ): Promise<Result<GeneratorResult, FxError>> {
+    const res = await developerPortalScaffoldUtils.updateFilesForTdp(
+      context,
+      inputs.teamsAppFromTdp,
+      inputs
+    );
+    if (res.isErr()) {
+      return err(res.error);
+    }
+    return ok({});
+  }
+}