feat: restore cli options

OfficeDev · Jan 24, 2025 · 9945e31 · 9945e31
1 parent d475300
commit 9945e31
Show file tree

Hide file tree

Showing 3 changed files with 173 additions and 129 deletions.
diff --git a/packages/fx-core/src/question/generator.ts b/packages/fx-core/src/question/generator.ts
@@ -422,8 +422,8 @@ async function updateExports(filePath: string, exportStatement: string) {
 }
 
 async function batchGenerate() {
-  await generateCliOptions(questionNodes.createProject(Platform.CLI), "CreateProject");
-  await generateInputs(questionNodes.createProject(Platform.CLI), "CreateProject");
+  // await generateCliOptions(questionNodes.createProject(Platform.CLI), "CreateProject");
+  // await generateInputs(questionNodes.createProject(Platform.CLI), "CreateProject");
 
   await generateCliOptions(questionNodes.createSampleProject(), "CreateSampleProject");
   await generateInputs(questionNodes.createSampleProject(), "CreateSampleProject");

diff --git a/packages/fx-core/src/question/inputs/CreateProjectInputs.ts b/packages/fx-core/src/question/inputs/CreateProjectInputs.ts
@@ -11,38 +11,77 @@
 import { Inputs } from "@microsoft/teamsfx-api";
 
 export interface CreateProjectInputs extends Inputs {
+  /** @description Teams Toolkit: select runtime for your app */
+  runtime?: "node" | "dotnet";
   /** @description New Project */
-  "project-type"?:
-    | "copilot-agent-type"
-    | "custom-copilot-type"
-    | "bot-type"
-    | "tab-type"
-    | "me-type"
-    | "outlook-addin-type";
+  "project-type"?: "bot-type" | "tab-type" | "me-type" | "outlook-addin-type";
+  /** @description Capabilities */
+  capabilities?:
+    | "empty"
+    | "bot"
+    | "notification"
+    | "command-bot"
+    | "workflow-bot"
+    | "tab-non-sso"
+    | "sso-launch-page"
+    | "dashboard-tab"
+    | "tab-spfx"
+    | "search-app"
+    | "collect-form-message-extension"
+    | "search-message-extension"
+    | "link-unfurling"
+    | "declarative-agent"
+    | "custom-copilot-basic"
+    | "custom-copilot-rag"
+    | "custom-copilot-agent"
+    | "message-extension"
+    | "BotAndMessageExtension"
+    | "TabNonSsoAndBot"
+    | "json-taskpane"
+    | "office-content-addin";
+  /** @description Select triggers */
+  "bot-host-type-trigger"?:
+    | "http-express"
+    | "http-webapi"
+    | "http-and-timer-functions"
+    | "http-functions"
+    | "timer-functions";
+  /** @description SharePoint Solution */
+  "spfx-solution"?: "new" | "import";
+  /** @description SharePoint Framework */
+  "spfx-install-latest-package"?: boolean;
+  /** @description Framework */
+  "spfx-framework-type"?: "react" | "minimal" | "none";
+  /** @description Name for SharePoint Framework Web Part */
+  "spfx-webpart-name"?: string;
+  /** @description SPFx solution folder */
+  "spfx-folder"?: string;
+  /** @description Architecture of Search Based Message Extension */
+  "me-architecture"?: "new-api" | "api-spec" | "bot";
   /** @description Create Declarative Agent */
   "with-plugin"?: "no" | "yes";
   /** @description Create API Plugin */
   "api-plugin-type"?: "new-api" | "api-spec" | "existing-plugin";
-  /** @description Authentication Type */
-  "api-auth"?: "none" | "api-key" | "microsoft-entra" | "oauth";
-  /** @description OpenAPI Description Document */
-  "openapi-spec-location"?: string;
-  /** @description Select Operation(s) Teams Can Interact with */
-  "api-operation"?: string[];
   /** @description Import Manifest File */
   "plugin-manifest-path"?: string;
   /** @description Import OpenAPI Description Document */
   "plugin-opeanapi-spec-path"?: string;
-  /** @description App Features Using Teams AI Library */
-  capabilities?: "custom-copilot-basic" | "custom-copilot-rag" | "custom-copilot-agent";
+  /** @description Authentication Type */
+  "api-auth"?: "none" | "api-key" | "bearer-token" | "microsoft-entra" | "oauth";
   /** @description Chat With Your Data */
   "custom-copilot-rag"?:
     | "custom-copilot-rag-customize"
     | "custom-copilot-rag-azureAISearch"
     | "custom-copilot-rag-customApi"
     | "custom-copilot-rag-microsoft365";
+  /** @description OpenAPI Description Document */
+  "openapi-spec-location"?: string;
+  /** @description Select Operation(s) Teams Can Interact with */
+  "api-operation"?: string[];
   /** @description AI Agent */
   "custom-copilot-agent"?: "custom-copilot-agent-new" | "custom-copilot-agent-assistants-api";
+  /** @description Programming Language */
+  "programming-language"?: "javascript" | "typescript" | "csharp" | "python";
   /** @description Service for Large Language Model (LLM) */
   "llm-service"?: "llm-service-azure-openai" | "llm-service-openai";
   /** @description Azure OpenAI Key */
@@ -53,30 +92,6 @@ export interface CreateProjectInputs extends Inputs {
   "azure-openai-deployment-name"?: string;
   /** @description OpenAI Key */
   "openai-key"?: string;
-  /** @description Select triggers */
-  "bot-host-type-trigger"?:
-    | "http-express"
-    | "http-and-timer-functions"
-    | "http-functions"
-    | "timer-functions";
-  /** @description SharePoint Solution */
-  "spfx-solution"?: "new" | "import";
-  /** @description SharePoint Framework */
-  "spfx-install-latest-package"?: boolean;
-  /** @description Framework */
-  "spfx-framework-type"?: "react" | "minimal" | "none";
-  /** @description Name for SharePoint Framework Web Part */
-  "spfx-webpart-name"?: string;
-  /** @description SPFx solution folder */
-  "spfx-folder"?: string;
-  /** @description Architecture of Search Based Message Extension */
-  "me-architecture"?: "new-api" | "api-spec" | "bot-plugin";
-  /** @description Existing add-in project folder */
-  "addin-project-folder"?: string;
-  /** @description Select import project manifest file */
-  "addin-project-manifest"?: string;
-  /** @description Programming Language */
-  "programming-language"?: "javascript" | "typescript" | "csharp" | "python";
   /** @description Application Name */
   "app-name"?: string;
 }