refactor: moved functions versions to core

Author: sgollapudi77

schema/swa-cli.config.schema.json

@@ -262,11 +262,11 @@
           "type": "boolean"
         },
         "apiLanguage": {
-          "description": "The runtime language of the function",
+          "description": "The runtime language of the API",
           "type": "string"
         },
         "apiVersion": {
-          "description": "The version of the function runtime language",
+          "description": "The version of the API runtime language",
           "type": "string"
         }
       },

src/cli/commands/deploy.ts

@@ -9,7 +9,6 @@ import {
   configureOptions,
   findSWAConfigFile,
   getCurrentSwaCliConfigFromFile,
-  getDefaultVersion,
   isUserOption,
   isUserOrConfigOption,
   logger,
@@ -21,6 +20,7 @@ import {
 import { chooseOrCreateProjectDetails, getStaticSiteDeployment } from "../../core/account";
 import { cleanUp, getDeployClientPath } from "../../core/deploy-client";
 import { swaCLIEnv } from "../../core/env";
+import { getDefaultVersion } from "../../core/functions-versions";
 import { addSharedLoginOptionsToCommand, login } from "./login";
 
 const packageInfo = require(path.join(__dirname, "..", "..", "..", "package.json"));
@@ -345,7 +345,7 @@ export async function deploy(options: SWACLIConfig) {
             else if (line.includes("[31m")) {
               if (line.includes("Cannot deploy to the function app because Function language info isn't provided.")) {
                 line = chalk.red(
-                  `Cannot deploy to the function app because Function language info isn't provided, use flags "--api-language" and "--api-version" or add a "platform.apiRuntime" property to your staticwebapp.config.json file, or create one in ${options.outputLocation!}. Please consult the documentation for more information about staticwebapp.config.json: https://learn.microsoft.com/en-us/azure/static-web-apps/build-configuration?tabs=github-actions#skip-building-the-api`
+                  `Cannot deploy to the function app because Function language info isn't provided, use flags "--api-language" and "--api-version" or add a "platform.apiRuntime" property to your staticwebapp.config.json file, or create one in ${options.outputLocation!}. Please consult the documentation for more information about staticwebapp.config.json: https://learn.microsoft.com/azure/static-web-apps/build-configuration?tabs=github-actions#skip-building-the-api`
                 );
               }
 

src/cli/commands/init.ts

@@ -2,7 +2,6 @@ import chalk from "chalk";
 import { Command } from "commander";
 import path from "path";
 import process from "process";
-import prompts from "prompts";
 import { promptOrUseDefault } from "../../core/prompts";
 import {
   configureOptions,
@@ -15,6 +14,7 @@ import {
   writeConfigFile,
 } from "../../core/utils";
 import { detectProjectFolders, generateConfiguration, isDescendantPath } from "../../core/frameworks";
+import { getChoicesForApiLanguage } from "../../core/functions-versions";
 
 export default function registerCommand(program: Command) {
   program
@@ -202,6 +202,23 @@ async function promptConfigSettings(disablePrompts: boolean, detectedConfig: Fra
       initial: detectedConfig.apiLocation,
       format: trimValue,
     },
+    {
+      type: (prev) => (prev != null ? "select" : null),
+      name: "apiLanguage",
+      message: "What's your API language? (optional)",
+      choices: [
+        { title: "Node.js", value: "node" },
+        { title: "Python", value: "python" },
+        { title: "Dotnet", value: "dotnet" },
+        { title: "Dotnet isolated", value: "dotnet-isolated" },
+      ],
+    },
+    {
+      type: (prev) => (prev != null ? "select" : null),
+      name: "apiVersion",
+      message: "What's your API version? (optional)",
+      choices: (prev) => getChoicesForApiLanguage(prev),
+    },
     {
       type: "text",
       name: "appBuildCommand",
@@ -240,75 +257,9 @@ async function promptConfigSettings(disablePrompts: boolean, detectedConfig: Fra
     },
   ]);
 
-  if (response.apiLocation) {
-    const apiLanguagePrompt = await prompts([
-      {
-        type: "select",
-        name: "apiLanguage",
-        message: "What's your API language? (optional)",
-        choices: [
-          { title: "Node.js", value: "node" },
-          { title: "Python", value: "python" },
-          { title: "Dotnet", value: "dotnet" },
-          { title: "Dotnet isolated", value: "dotnet-isolated" },
-        ],
-      },
-    ]);
-
-    response.apiLanguage = apiLanguagePrompt.apiLanguage;
-
-    const apiVersionPrompt = await prompts([
-      {
-        type: "select",
-        name: "apiVersion",
-        message: "What's your API version? (optional)",
-        choices: getChoicesForApiLanguage(response.apiLanguage),
-      },
-    ]);
-
-    response.apiVersion = apiVersionPrompt.apiVersion;
-  }
-
   return response;
 }
 
-function getChoicesForApiLanguage(apiLanguage: string) {
-  // Refer to this for functions and versions - https://learn.microsoft.com/en-us/azure/static-web-apps/configuration#selecting-the-api-language-runtime-version
-  let choices = [];
-  switch (apiLanguage) {
-    case "node":
-      choices = [
-        { title: "16", value: "16" },
-        { title: "14", value: "14" },
-        { title: "12", value: "12" },
-      ];
-      break;
-    case "python":
-      choices = [
-        { title: "3.8", value: "3.8" },
-        { title: "3.9", value: "3.9" },
-      ];
-      break;
-    case "dotnet":
-      choices = [
-        { title: "6.0", value: "6.0" },
-        { title: "3.1", value: "3.1" },
-      ];
-      break;
-    case "dotnet-isolated":
-      choices = [{ title: "6.0", value: "6.0" }];
-      break;
-    default:
-      choices = [
-        { title: "16", value: "16" },
-        { title: "14", value: "14" },
-        { title: "12", value: "12" },
-      ];
-      break;
-  }
-  return choices;
-}
-
 function printFrameworkConfig(config: FrameworkConfig) {
   logger.log(chalk.bold("\nDetected configuration for your app:"));
   logger.log(`- Framework(s): ${chalk.green(config.name ?? "none")}`);

src/core/frameworks/detect.ts

@@ -2,7 +2,6 @@ import { promises as fs } from "fs";
 import globrex from "globrex";
 import path from "path";
 import { DEFAULT_CONFIG } from "../../config";
-import { DEFAULT_DOTNET_ISOLATED_VERSION, DEFAULT_DOTNET_VERSION, DEFAULT_NODE_VERSION, DEFAULT_PYTHON_VERSION } from "../../core/constants";
 import { hasSpaces, logger, removeTrailingPathSep, safeReadFile, safeReadJson } from "../utils";
 import { apiFrameworks, appFrameworks } from "./frameworks";
 
@@ -392,26 +391,3 @@ export function formatDetectedFolders(folders: DetectedFolder[], type: string):
     `- ${folders.map((f) => `${f.rootPath} (${f.frameworks.map((fr) => fr.name).join(", ")})`).join("\n- ")}`
   );
 }
-export function getDefaultVersion(apiLanguage: string | undefined): string {
-  let apiVersion = "16";
-  if (!apiLanguage) apiLanguage = "node";
-  // apiLanguage = apiLanguage.toLowerCase();
-  switch (apiLanguage) {
-    case "node":
-      apiVersion = DEFAULT_NODE_VERSION;
-      break;
-    case "python":
-      apiVersion = DEFAULT_PYTHON_VERSION;
-      break;
-    case "dotnet":
-      apiVersion = DEFAULT_DOTNET_VERSION;
-      break;
-    case "dotnetisolated" || "dotnet isolated" || "dotnet-isolated":
-      apiVersion = DEFAULT_DOTNET_ISOLATED_VERSION;
-      break;
-    default:
-      apiVersion = DEFAULT_NODE_VERSION;
-      break;
-  }
-  return apiVersion;
-}

src/core/functions-versions.ts

@@ -0,0 +1,62 @@
+import { DEFAULT_DOTNET_ISOLATED_VERSION, DEFAULT_DOTNET_VERSION, DEFAULT_NODE_VERSION, DEFAULT_PYTHON_VERSION } from "./constants";
+
+export function getDefaultVersion(apiLanguage: string | undefined): string {
+  let apiVersion = "16";
+  if (!apiLanguage) apiLanguage = "node";
+  // apiLanguage = apiLanguage.toLowerCase();
+  switch (apiLanguage) {
+    case "node":
+      apiVersion = DEFAULT_NODE_VERSION;
+      break;
+    case "python":
+      apiVersion = DEFAULT_PYTHON_VERSION;
+      break;
+    case "dotnet":
+      apiVersion = DEFAULT_DOTNET_VERSION;
+      break;
+    case "dotnetisolated" || "dotnet isolated" || "dotnet-isolated":
+      apiVersion = DEFAULT_DOTNET_ISOLATED_VERSION;
+      break;
+    default:
+      apiVersion = DEFAULT_NODE_VERSION;
+      break;
+  }
+  return apiVersion;
+}
+
+export function getChoicesForApiLanguage(apiLanguage: string) {
+  // Refer to this for functions and versions - https://learn.microsoft.com/azure/static-web-apps/configuration#selecting-the-api-language-runtime-version
+  let choices = [];
+  switch (apiLanguage) {
+    case "node":
+      choices = [
+        { title: "16", value: "16" },
+        { title: "14", value: "14" },
+        { title: "12", value: "12" },
+      ];
+      break;
+    case "python":
+      choices = [
+        { title: "3.8", value: "3.8" },
+        { title: "3.9", value: "3.9" },
+      ];
+      break;
+    case "dotnet":
+      choices = [
+        { title: "6.0", value: "6.0" },
+        { title: "3.1", value: "3.1" },
+      ];
+      break;
+    case "dotnet-isolated":
+      choices = [{ title: "6.0", value: "6.0" }];
+      break;
+    default:
+      choices = [
+        { title: "16", value: "16" },
+        { title: "14", value: "14" },
+        { title: "12", value: "12" },
+      ];
+      break;
+  }
+  return choices;
+}