@microsoft/teamsfx-core 2.0.7-alpha.a10762b45.0 → 2.0.7-alpha.a372ccf67.0

package/build/component/generator/generator.js

@@ -18,30 +18,40 @@ const error_1 = require("./error");
 const generatorAction_1 = require("./generatorAction");
 const utils_2 = require("./utils");
 const featureFlags_1 = require("../../common/featureFlags");
-const utils_3 = require("../../common/spec-parser/utils");
+const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
 class Generator {
-    static getDefaultVariables(appName, safeProjectNameFromVS, targetFramework, apiKeyAuthData) {
-        var _a, _b, _c;
+    static getDefaultVariables(appName, safeProjectNameFromVS, targetFramework, placeProjectFileInSolutionDir, apiKeyAuthData, llmServiceData) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const safeProjectName = safeProjectNameFromVS !== null && safeProjectNameFromVS !== void 0 ? safeProjectNameFromVS : utils_1.convertToAlphanumericOnly(appName);
-        const safeRegistrationIdEnvName = utils_3.getSafeRegistrationIdEnvName((_a = apiKeyAuthData === null || apiKeyAuthData === void 0 ? void 0 : apiKeyAuthData.registrationIdEnvName) !== null && _a !== void 0 ? _a : "");
+        const safeRegistrationIdEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName((_a = apiKeyAuthData === null || apiKeyAuthData === void 0 ? void 0 : apiKeyAuthData.registrationIdEnvName) !== null && _a !== void 0 ? _a : "");
         return {
             appName: appName,
             ProjectName: appName,
             TargetFramework: targetFramework !== null && targetFramework !== void 0 ? targetFramework : "net8.0",
+            PlaceProjectFileInSolutionDir: placeProjectFileInSolutionDir ? "true" : "",
             SafeProjectName: safeProjectName,
             SafeProjectNameLowerCase: safeProjectName.toLocaleLowerCase(),
             ApiSpecAuthName: (_b = apiKeyAuthData === null || apiKeyAuthData === void 0 ? void 0 : apiKeyAuthData.authName) !== null && _b !== void 0 ? _b : "",
             ApiSpecAuthRegistrationIdEnvName: safeRegistrationIdEnvName,
             ApiSpecPath: (_c = apiKeyAuthData === null || apiKeyAuthData === void 0 ? void 0 : apiKeyAuthData.openapiSpecPath) !== null && _c !== void 0 ? _c : "",
             enableTestToolByDefault: featureFlags_1.enableTestToolByDefault() ? "true" : "",
+            useOpenAI: (llmServiceData === null || llmServiceData === void 0 ? void 0 : llmServiceData.llmService) === "llm-service-openai" ? "true" : "",
+            useAzureOpenAI: (llmServiceData === null || llmServiceData === void 0 ? void 0 : llmServiceData.llmService) === "llm-service-azure-openai" ? "true" : "",
+            openAIKey: (_d = llmServiceData === null || llmServiceData === void 0 ? void 0 : llmServiceData.openAIKey) !== null && _d !== void 0 ? _d : "",
+            azureOpenAIKey: (_e = llmServiceData === null || llmServiceData === void 0 ? void 0 : llmServiceData.azureOpenAIKey) !== null && _e !== void 0 ? _e : "",
+            azureOpenAIEndpoint: (_f = llmServiceData === null || llmServiceData === void 0 ? void 0 : llmServiceData.azureOpenAIEndpoint) !== null && _f !== void 0 ? _f : "",
+            isNewProjectTypeEnabled: featureFlags_1.isNewProjectTypeEnabled() ? "true" : "",
+            NewProjectTypeName: (_g = process.env.TEAMSFX_NEW_PROJECT_TYPE_NAME) !== null && _g !== void 0 ? _g : "M365App",
+            NewProjectTypeExt: (_h = process.env.TEAMSFX_NEW_PROJECT_TYPE_EXTENSION) !== null && _h !== void 0 ? _h : "maproj",
         };
     }
     static async generateTemplate(ctx, destinationPath, scenario, language, actionContext) {
-        var _a, _b, _c;
+        var _a, _b;
         const replaceMap = (_a = ctx.templateVariables) !== null && _a !== void 0 ? _a : {};
+        const lang = language !== null && language !== void 0 ? language : constant_1.commonTemplateName;
         const generatorContext = {
             name: scenario,
-            language: language !== null && language !== void 0 ? language : constant_1.commonTemplateName,
+            language: lang,
             destination: destinationPath,
             logProvider: ctx.logProvider,
             fileNameReplaceFn: (fileName, fileData) => utils_2.renderTemplateFileName(fileName, fileData, replaceMap)
@@ -51,7 +61,7 @@ class Generator {
             filterFn: (fileName) => fileName.replace(/\\/g, "/").startsWith(`${scenario}/`),
             onActionError: templateDefaultOnActionError,
         };
-        const templateName = `${scenario}-${generatorContext.name}`;
+        const templateName = `${scenario}-${lang}`;
         lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
             [telemetry_1.TelemetryProperty.TemplateName]: templateName,
         });
@@ -61,9 +71,6 @@ class Generator {
         lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
             [telemetry_1.TelemetryProperty.Fallback]: generatorContext.fallback ? "true" : "false", // Track fallback cases.
         });
-        if (!((_c = generatorContext.outputs) === null || _c === void 0 ? void 0 : _c.length)) {
-            return teamsfx_api_1.err(new error_1.TemplateNotFoundError(scenario).toFxError());
-        }
         return teamsfx_api_1.ok(undefined);
     }
     static async generateSample(ctx, destinationPath, sampleName, actionContext) {
@@ -82,7 +89,7 @@ class Generator {
         };
         await ((_a = actionContext === null || actionContext === void 0 ? void 0 : actionContext.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.generateSample(sampleName)));
         ctx.logProvider.debug(`Downloading sample "${sampleName}" to ${destinationPath}`);
-        await this.generate(generatorContext, generatorAction_1.DownloadDirectoryActionSeq);
+        await this.generate(generatorContext, generatorAction_1.SampleActionSeq);
         return teamsfx_api_1.ok(undefined);
     }
     static async generate(context, actions) {
@@ -94,8 +101,6 @@ class Generator {
                 await ((_b = context.onActionEnd) === null || _b === void 0 ? void 0 : _b.call(context, action, context));
             }
             catch (e) {
-                if (e instanceof componentError_1.BaseComponentInnerError)
-                    throw e.toFxError();
                 if (e instanceof Error)
                     await context.onActionError(action, context, e);
             }
@@ -137,20 +142,19 @@ tslib_1.__decorate([
 exports.Generator = Generator;
 function templateDefaultOnActionError(action, context, error) {
     switch (action.name) {
-        case generatorAction_1.GeneratorActionName.FetchTemplateUrlWithTag:
-        case generatorAction_1.GeneratorActionName.FetchZipFromUrl:
-            context.cancelDownloading = true;
-            if (!(error instanceof error_1.CancelDownloading)) {
-                context.logProvider.info(error.message);
-                context.logProvider.info(messages_1.LogMessages.getTemplateFromLocal);
-            }
+        case generatorAction_1.GeneratorActionName.ScaffoldRemoteTemplate:
+            context.fallback = true;
+            context.logProvider.debug(error.message);
+            context.logProvider.info(messages_1.LogMessages.getTemplateFromLocal);
             break;
-        case generatorAction_1.GeneratorActionName.FetchTemplateZipFromLocal:
-            context.logProvider.error(error.message);
-            return Promise.reject(new error_1.TemplateZipFallbackError().toFxError());
-        case generatorAction_1.GeneratorActionName.Unzip:
-            context.logProvider.error(error.message);
-            return Promise.reject(new error_1.UnzipError().toFxError());
+        case generatorAction_1.GeneratorActionName.ScaffoldLocalTemplate:
+            if (error instanceof componentError_1.BaseComponentInnerError) {
+                return Promise.reject(error.toFxError());
+            }
+            else {
+                context.logProvider.error(error.message);
+                return Promise.reject(new error_1.ScaffoldLocalTemplateError().toFxError());
+            }
         default:
             return Promise.reject(new Error(error.message));
     }
@@ -159,6 +163,8 @@ function templateDefaultOnActionError(action, context, error) {
 exports.templateDefaultOnActionError = templateDefaultOnActionError;
 async function sampleDefaultOnActionError(action, context, error) {
     context.logProvider.error(error.message);
+    if (error instanceof componentError_1.BaseComponentInnerError)
+        throw error.toFxError();
     if (await fs_extra_1.default.pathExists(context.destination)) {
         await fs_extra_1.default.rm(context.destination, { recursive: true });
     }

package/build/component/generator/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/component/generator/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/component/generator/generator.ts"],"names":[],"mappings":"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"}

package/build/component/generator/generatorAction.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import AdmZip from "adm-zip";
 import { LogProvider } from "@microsoft/teamsfx-api";
 import { SampleUrlInfo } from "./utils";
 export interface GeneratorContext {
@@ -9,11 +8,8 @@ export interface GeneratorContext {
     logProvider: LogProvider;
     tryLimits?: number;
     timeoutInMs?: number;
-    url?: string;
     sampleInfo?: SampleUrlInfo;
-    zip?: AdmZip;
     fallback?: boolean;
-    cancelDownloading?: boolean;
     outputs?: string[];
     filterFn?: (name: string) => boolean;
     fileNameReplaceFn?: (name: string, data: Buffer) => string;
@@ -27,22 +23,15 @@ export interface GeneratorAction {
     run: (context: GeneratorContext) => Promise<void>;
 }
 export declare enum GeneratorActionName {
-    FetchTemplateZipFromSourceCode = "FetchTemplateZipFromSourceCodeAction",
-    FetchTemplateUrlWithTag = "FetchTemplatesUrlWithTag",
-    FetchZipFromUrl = "FetchZipFromUrl",
-    FetchTemplateZipFromLocal = "FetchTemplateZipFromLocal",
+    ScaffoldRemoteTemplate = "ScaffoldRemoteTemplate",
+    ScaffoldLocalTemplate = "ScaffoldLocalTemplate",
     FetchSampleInfo = "FetchSampleInfo",
-    DownloadDirectory = "DownloadDirectory",
-    Unzip = "Unzip"
+    DownloadDirectory = "DownloadDirectory"
 }
-export declare const fetchTemplateZipFromSourceCodeAction: GeneratorAction;
+export declare const ScaffoldRemoteTemplateAction: GeneratorAction;
+export declare const ScaffoldLocalTemplateAction: GeneratorAction;
 export declare const fetchSampleInfoAction: GeneratorAction;
 export declare const downloadDirectoryAction: GeneratorAction;
-export declare const fetchTemplateUrlWithTagAction: GeneratorAction;
-export declare const fetchZipFromUrlAction: GeneratorAction;
-export declare const fetchTemplateFromLocalAction: GeneratorAction;
-export declare const unzipAction: GeneratorAction;
 export declare const TemplateActionSeq: GeneratorAction[];
 export declare const SampleActionSeq: GeneratorAction[];
-export declare const DownloadDirectoryActionSeq: GeneratorAction[];
 //# sourceMappingURL=generatorAction.d.ts.map

package/build/component/generator/generatorAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generatorAction.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":";AAGA,OAAO,MAAM,MAAM,SAAS,CAAC;AAI7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,OAAO,EAKL,aAAa,EAGd,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACrC,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3D,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,CAAC;IAEpE,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF,aAAa,EAAE,CACb,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,oBAAY,mBAAmB;IAC7B,8BAA8B,yCAAyC;IACvE,uBAAuB,6BAA6B;IACpD,eAAe,oBAAoB;IACnC,yBAAyB,8BAA8B;IACvD,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,KAAK,UAAU;CAChB;AAGD,eAAO,MAAM,oCAAoC,EAAE,eA4BlD,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eAMnC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,eAarC,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,eAc3C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eAanC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,eAyB1C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,eAezB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,eAAe,EAM9C,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAAe,EAAyC,CAAC;AACvF,eAAO,MAAM,0BAA0B,EAAE,eAAe,EAGvD,CAAC"}
+{"version":3,"file":"generatorAction.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIrD,OAAO,EAIL,aAAa,EAGd,MAAM,SAAS,CAAC;AAIjB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACrC,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3D,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,CAAC;IAEpE,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF,aAAa,EAAE,CACb,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,oBAAY,mBAAmB;IAC7B,sBAAsB,2BAA2B;IACjD,qBAAqB,0BAA0B;IAC/C,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;CACxC;AAED,eAAO,MAAM,4BAA4B,EAAE,eAiB1C,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,eAyBzC,CAAC;AAmBF,eAAO,MAAM,qBAAqB,EAAE,eAMnC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,eAarC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,eAAe,EAG9C,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAAe,EAAqD,CAAC"}

package/build/component/generator/generatorAction.js

@@ -2,46 +2,65 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DownloadDirectoryActionSeq = exports.SampleActionSeq = exports.TemplateActionSeq = exports.unzipAction = exports.fetchTemplateFromLocalAction = exports.fetchZipFromUrlAction = exports.fetchTemplateUrlWithTagAction = exports.downloadDirectoryAction = exports.fetchSampleInfoAction = exports.fetchTemplateZipFromSourceCodeAction = exports.GeneratorActionName = void 0;
+exports.SampleActionSeq = exports.TemplateActionSeq = exports.downloadDirectoryAction = exports.fetchSampleInfoAction = exports.ScaffoldLocalTemplateAction = exports.ScaffoldRemoteTemplateAction = exports.GeneratorActionName = void 0;
 const tslib_1 = require("tslib");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const constants_1 = require("../../common/constants");
 const folder_1 = require("../../folder");
 const error_1 = require("./error");
 const utils_1 = require("./utils");
+const semver_1 = tslib_1.__importDefault(require("semver"));
+const templates_config_json_1 = tslib_1.__importDefault(require("../../common/templates-config.json"));
 var GeneratorActionName;
 (function (GeneratorActionName) {
-    GeneratorActionName["FetchTemplateZipFromSourceCode"] = "FetchTemplateZipFromSourceCodeAction";
-    GeneratorActionName["FetchTemplateUrlWithTag"] = "FetchTemplatesUrlWithTag";
-    GeneratorActionName["FetchZipFromUrl"] = "FetchZipFromUrl";
-    GeneratorActionName["FetchTemplateZipFromLocal"] = "FetchTemplateZipFromLocal";
+    GeneratorActionName["ScaffoldRemoteTemplate"] = "ScaffoldRemoteTemplate";
+    GeneratorActionName["ScaffoldLocalTemplate"] = "ScaffoldLocalTemplate";
     GeneratorActionName["FetchSampleInfo"] = "FetchSampleInfo";
     GeneratorActionName["DownloadDirectory"] = "DownloadDirectory";
-    GeneratorActionName["Unzip"] = "Unzip";
 })(GeneratorActionName = exports.GeneratorActionName || (exports.GeneratorActionName = {}));
-// * This action is only for debug purpose
-exports.fetchTemplateZipFromSourceCodeAction = {
-    name: GeneratorActionName.FetchTemplateZipFromSourceCode,
-    run: (context) => {
-        const isDebugMode = () => {
-            const DebugTemplateFlag = process.env[constants_1.FeatureFlagName.DebugTemplate];
-            return (DebugTemplateFlag === null || DebugTemplateFlag === void 0 ? void 0 : DebugTemplateFlag.toLowerCase()) === "true" && process.env.NODE_ENV === "development";
-        };
-        if (!isDebugMode()) {
-            return Promise.resolve();
+exports.ScaffoldRemoteTemplateAction = {
+    name: GeneratorActionName.ScaffoldRemoteTemplate,
+    run: async (context) => {
+        const templateUrl = await determineTemplateSource(context);
+        if (templateUrl === "local") {
+            return;
         }
-        if (context.zip) {
-            return Promise.resolve();
+        const zip = await utils_1.fetchZipFromUrl(templateUrl, context.tryLimits, context.timeoutInMs);
+        context.outputs = await utils_1.unzip(zip, context.destination, context.fileNameReplaceFn, context.fileDataReplaceFn, context.filterFn);
+    },
+};
+exports.ScaffoldLocalTemplateAction = {
+    name: GeneratorActionName.ScaffoldLocalTemplate,
+    run: async (context) => {
+        var _a, _b;
+        if ((_a = context.outputs) === null || _a === void 0 ? void 0 : _a.length) {
+            return;
+        }
+        context.logProvider.debug(`Fetching zip from local: ${JSON.stringify(context)}`);
+        const fallbackPath = path_1.default.join(folder_1.getTemplatesFolder(), "fallback");
+        const fileName = `${context.language}.zip`;
+        const zipPath = path_1.default.join(fallbackPath, fileName);
+        const data = await fs_extra_1.default.readFile(zipPath);
+        const zip = new adm_zip_1.default(data);
+        context.outputs = await utils_1.unzip(zip, context.destination, context.fileNameReplaceFn, context.fileDataReplaceFn, context.filterFn);
+        if (!((_b = context.outputs) === null || _b === void 0 ? void 0 : _b.length)) {
+            throw new error_1.TemplateNotFoundError(context.name);
         }
-        context.logProvider.debug(`Fetching template zip from source code: ${JSON.stringify(context)}`);
-        //! This path only works in debug mode
-        const templateSourceCodePath = path_1.default.resolve(__dirname, "../../../../../", "templates", context.language);
-        context.zip = utils_1.zipFolder(templateSourceCodePath);
-        return Promise.resolve();
     },
 };
+async function determineTemplateSource(context) {
+    let url = "local";
+    if (!Boolean(templates_config_json_1.default.useLocalTemplate)) {
+        let latestTag = await utils_1.getTemplateLatestTag(context.language, context.tryLimits, context.timeoutInMs);
+        latestTag = latestTag.replace(templates_config_json_1.default.tagPrefix, "").trim();
+        if (semver_1.default.gt(latestTag, templates_config_json_1.default.localVersion)) {
+            // git tag version is higher than the local version, download template from github
+            url = `${templates_config_json_1.default.templateDownloadBaseURL}/${latestTag}/${context.language}.zip`;
+        }
+    }
+    return url;
+}
 exports.fetchSampleInfoAction = {
     name: GeneratorActionName.FetchSampleInfo,
     run: async (context) => {
@@ -63,69 +82,9 @@ exports.downloadDirectoryAction = {
         }
     },
 };
-exports.fetchTemplateUrlWithTagAction = {
-    name: GeneratorActionName.FetchTemplateUrlWithTag,
-    run: async (context) => {
-        if (context.zip || context.url || context.cancelDownloading) {
-            return;
-        }
-        context.logProvider.debug(`Fetching template url with tag: ${JSON.stringify(context)}`);
-        context.url = await utils_1.fetchTemplateZipUrl(context.language, context.tryLimits, context.timeoutInMs);
-    },
-};
-exports.fetchZipFromUrlAction = {
-    name: GeneratorActionName.FetchZipFromUrl,
-    run: async (context) => {
-        if (context.zip || context.cancelDownloading) {
-            return;
-        }
-        context.logProvider.debug(`Fetching zip from url: ${JSON.stringify(context)}`);
-        if (!context.url) {
-            throw new error_1.MissKeyError("url");
-        }
-        context.zip = await utils_1.fetchZipFromUrl(context.url, context.tryLimits, context.timeoutInMs);
-    },
-};
-exports.fetchTemplateFromLocalAction = {
-    name: GeneratorActionName.FetchTemplateZipFromLocal,
-    run: async (context) => {
-        var _a, _b;
-        if ((_a = context.outputs) === null || _a === void 0 ? void 0 : _a.length) {
-            return;
-        }
-        context.logProvider.debug(`Fetching zip from local: ${JSON.stringify(context)}`);
-        context.fallback = true;
-        const fallbackPath = path_1.default.join(folder_1.getTemplatesFolder(), "fallback");
-        const fileName = `${context.language}.zip`;
-        const zipPath = path_1.default.join(fallbackPath, fileName);
-        const data = await fs_extra_1.default.readFile(zipPath);
-        context.zip = new adm_zip_1.default(data);
-        context.outputs = await utils_1.unzip(context.zip, context.destination, context.fileNameReplaceFn, context.fileDataReplaceFn, context.filterFn);
-        if (!((_b = context.outputs) === null || _b === void 0 ? void 0 : _b.length)) {
-            throw new error_1.TemplateNotFoundError(context.name);
-        }
-    },
-};
-exports.unzipAction = {
-    name: GeneratorActionName.Unzip,
-    run: async (context) => {
-        if (!context.zip) {
-            return;
-        }
-        context.logProvider.debug(`Unzipping: ${JSON.stringify(context)}`);
-        context.outputs = await utils_1.unzip(context.zip, context.destination, context.fileNameReplaceFn, context.fileDataReplaceFn, context.filterFn);
-    },
-};
 exports.TemplateActionSeq = [
-    exports.fetchTemplateZipFromSourceCodeAction,
-    exports.fetchTemplateUrlWithTagAction,
-    exports.fetchZipFromUrlAction,
-    exports.unzipAction,
-    exports.fetchTemplateFromLocalAction,
-];
-exports.SampleActionSeq = [exports.fetchZipFromUrlAction, exports.unzipAction];
-exports.DownloadDirectoryActionSeq = [
-    exports.fetchSampleInfoAction,
-    exports.downloadDirectoryAction,
+    exports.ScaffoldRemoteTemplateAction,
+    exports.ScaffoldLocalTemplateAction,
 ];
+exports.SampleActionSeq = [exports.fetchSampleInfoAction, exports.downloadDirectoryAction];
 //# sourceMappingURL=generatorAction.js.map

package/build/component/generator/generatorAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"generatorAction.js","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generatorAction.js","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":"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"}

package/build/component/generator/officeAddin/config/projectProperties.d.ts

@@ -6,9 +6,40 @@ export declare const projectProperties: {
             manifestPath: string;
             templates: {
                 typescript: {
+                    prerelease: string;
                     repository: string;
                     branch: string;
-                    prerelease: string;
+                    archive: string;
+                    frameworks: {
+                        default: {
+                            repository: string;
+                            branch: string;
+                            prerelease: string;
+                            archive: string;
+                        };
+                        react: {
+                            repository: string;
+                            branch: string;
+                            prerelease: string;
+                            archive: string;
+                        };
+                    };
+                };
+                javascript: {
+                    frameworks: {
+                        default: {
+                            repository: string;
+                            branch: string;
+                            prerelease: string;
+                            archive: string;
+                        };
+                        react: {
+                            repository: string;
+                            branch: string;
+                            prerelease: string;
+                            archive: string;
+                        };
+                    };
                 };
             };
             supportedHosts: string[];

package/build/component/generator/officeAddin/config/projectProperties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectProperties.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoC7B,CAAC"}
+{"version":3,"file":"projectProperties.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqE7B,CAAC"}

package/build/component/generator/officeAddin/config/projectProperties.js

@@ -11,12 +11,43 @@ exports.projectProperties = {
             manifestPath: "manifest.json",
             templates: {
                 typescript: {
+                    prerelease: "json-preview-yo-office-prerelease",
                     repository: "https://github.com/OfficeDev/Office-Addin-TaskPane",
                     branch: "json-preview-yo-office",
-                    prerelease: "json-preview-yo-office-prerelease",
+                    archive: "https://aka.ms/teams-toolkit/office-addin-taskpane",
+                    frameworks: {
+                        default: {
+                            repository: "https://github.com/OfficeDev/Office-Addin-TaskPane",
+                            branch: "json-wxpo-preview",
+                            prerelease: "json-wxpo-preview",
+                            archive: "https://aka.ms/teams-toolkit/office-addin-taskpane/ts-default",
+                        },
+                        react: {
+                            repository: "https://github.com/OfficeDev/Office-Addin-TaskPane-React",
+                            branch: "json-wxpo-preview",
+                            prerelease: "json-wxpo-preview",
+                            archive: "https://aka.ms/teams-toolkit/office-addin-taskpane/ts-react",
+                        },
+                    },
+                },
+                javascript: {
+                    frameworks: {
+                        default: {
+                            repository: "https://github.com/OfficeDev/Office-Addin-TaskPane-JS",
+                            branch: "json-wxpo-preview",
+                            prerelease: "json-wxpo-preview",
+                            archive: "https://aka.ms/teams-toolkit/office-addin-taskpane/js-default",
+                        },
+                        react: {
+                            repository: "https://github.com/OfficeDev/Office-Addin-TaskPane-React-JS",
+                            branch: "json-wxpo-preview",
+                            prerelease: "json-wxpo-preview",
+                            archive: "https://aka.ms/teams-toolkit/office-addin-taskpane/js-react",
+                        },
+                    },
                 },
             },
-            supportedHosts: ["Outlook"],
+            supportedHosts: ["Outlook", "Word", "Excel", "PowerPoint"],
         },
     },
     hostTypes: {

package/build/component/generator/officeAddin/config/projectProperties.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectProperties.js","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,iBAAiB,GAAG;IAC/B,YAAY,EAAE;QACZ,QAAQ,EAAE;YACR,WAAW,EAAE,6BAA6B;YAC1C,MAAM,EAAE,8BAA8B;YACtC,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE;gBACT,UAAU,EAAE;oBACV,UAAU,EAAE,oDAAoD;oBAChE,MAAM,EAAE,wBAAwB;oBAChC,UAAU,EAAE,mCAAmC;iBAChD;aACF;YACD,cAAc,EAAE,CAAC,SAAS,CAAC;SAC5B;KACF;IACD,SAAS,EAAE;QACT,KAAK,EAAE;YACL,WAAW,EAAE,OAAO;SACrB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,UAAU,EAAE;YACV,WAAW,EAAE,YAAY;SAC1B;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,MAAM;SACpB;KACF;CACF,CAAC"}
+{"version":3,"file":"projectProperties.js","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,iBAAiB,GAAG;IAC/B,YAAY,EAAE;QACZ,QAAQ,EAAE;YACR,WAAW,EAAE,6BAA6B;YAC1C,MAAM,EAAE,8BAA8B;YACtC,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE;gBACT,UAAU,EAAE;oBACV,UAAU,EAAE,mCAAmC;oBAC/C,UAAU,EAAE,oDAAoD;oBAChE,MAAM,EAAE,wBAAwB;oBAChC,OAAO,EAAE,oDAAoD;oBAE7D,UAAU,EAAE;wBACV,OAAO,EAAE;4BACP,UAAU,EAAE,oDAAoD;4BAChE,MAAM,EAAE,mBAAmB;4BAC3B,UAAU,EAAE,mBAAmB;4BAC/B,OAAO,EAAE,+DAA+D;yBACzE;wBACD,KAAK,EAAE;4BACL,UAAU,EAAE,0DAA0D;4BACtE,MAAM,EAAE,mBAAmB;4BAC3B,UAAU,EAAE,mBAAmB;4BAC/B,OAAO,EAAE,6DAA6D;yBACvE;qBACF;iBACF;gBAED,UAAU,EAAE;oBACV,UAAU,EAAE;wBACV,OAAO,EAAE;4BACP,UAAU,EAAE,uDAAuD;4BACnE,MAAM,EAAE,mBAAmB;4BAC3B,UAAU,EAAE,mBAAmB;4BAC/B,OAAO,EAAE,+DAA+D;yBACzE;wBACD,KAAK,EAAE;4BACL,UAAU,EAAE,6DAA6D;4BACzE,MAAM,EAAE,mBAAmB;4BAC3B,UAAU,EAAE,mBAAmB;4BAC/B,OAAO,EAAE,6DAA6D;yBACvE;qBACF;iBACF;aACF;YACD,cAAc,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC;SAC3D;KACF;IACD,SAAS,EAAE;QACT,KAAK,EAAE;YACL,WAAW,EAAE,OAAO;SACrB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,UAAU,EAAE;YACV,WAAW,EAAE,YAAY;SAC1B;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,MAAM;SACpB;KACF;CACF,CAAC"}

package/build/component/generator/officeAddin/config/projectsJsonData.d.ts

@@ -6,15 +6,21 @@ export default class projectsJsonData {
     getParsedProjectJsonData(): unknown;
     getProjectTemplateNames(): string[];
     projectBothScriptTypes(projectType: string): boolean;
+    projectBothScriptTypesNew(projectType: string): boolean;
     getManifestPath(projectType: string): string | undefined;
     getHostTemplateNames(projectType: string): string[];
     getSupportedScriptTypes(projectType: string): string[];
+    getSupportedScriptTypesNew(projectType: string): string[];
     getHostDisplayName(hostKey: string): string | undefined;
     getProjectTemplateRepository(projectTypeKey: string, scriptType: string): string | undefined;
     getProjectTemplateBranchName(projectTypeKey: string, scriptType: string, prerelease: boolean): string | undefined;
-    getProjectRepoAndBranch(projectTypeKey: string, scriptType: string, prerelease: boolean): {
+    getProjectDownloadLink(projectTypeKey: string, scriptType: string): string;
+    getProjectDownloadLinkNew(projectTypeKey: string, scriptType: string, frameworkType: string): string;
+    getProjectRepoAndBranchNew(projectTypeKey: string, scriptType: string, frameworkType: string, prerelease: boolean): {
         repo: string | undefined;
         branch: string | undefined;
     };
+    getProjectTemplateRepositoryNew(projectTypeKey: string, scriptType: string, frameworkType: string): string | undefined;
+    getProjectTemplateBranchNameNew(projectTypeKey: string, scriptType: string, frameworkType: string, prerelease: boolean): string | undefined;
 }
 //# sourceMappingURL=projectsJsonData.d.ts.map

package/build/component/generator/officeAddin/config/projectsJsonData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectsJsonData.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectsJsonData.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAEnC,eAAe,EAAE,GAAG,CAAC;;IAMrB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAIlD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAI9C,wBAAwB,IAAI,OAAO;IAInC,uBAAuB,IAAI,MAAM,EAAE;IAQnC,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAOpD,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIxD,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAYnD,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAiBtD,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IASvD,4BAA4B,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAa5F,4BAA4B,CAC1B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,GAClB,MAAM,GAAG,SAAS;IAiBrB,uBAAuB,CACrB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,GAClB;QAAE,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;CAc5D"}
+{"version":3,"file":"projectsJsonData.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectsJsonData.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAEnC,eAAe,EAAE,GAAG,CAAC;;IAMrB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAIlD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAI9C,wBAAwB,IAAI,OAAO;IAInC,uBAAuB,IAAI,MAAM,EAAE;IAQnC,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IASpD,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAOvD,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIxD,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAYnD,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAetD,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAiBzD,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IASvD,4BAA4B,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAa5F,4BAA4B,CAC1B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,GAClB,MAAM,GAAG,SAAS;IAiBrB,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAM1E,yBAAyB,CACvB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,MAAM;IAOT,0BAA0B,CACxB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,OAAO,GAClB;QAAE,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;IAkB3D,+BAA+B,CAC7B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,MAAM,GAAG,SAAS;IAWrB,+BAA+B,CAC7B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,OAAO,GAClB,MAAM,GAAG,SAAS;CAgBtB"}

package/build/component/generator/officeAddin/config/projectsJsonData.js

@@ -26,6 +26,12 @@ class projectsJsonData {
         return projectTemplates;
     }
     projectBothScriptTypes(projectType) {
+        return (this.projectJsonData.projectTypes[lodash_1.default.toLower(projectType)].templates.javascript.archive !=
+            undefined &&
+            this.projectJsonData.projectTypes[lodash_1.default.toLower(projectType)].templates.typescript.archive !=
+                undefined);
+    }
+    projectBothScriptTypesNew(projectType) {
         return (this.projectJsonData.projectTypes[lodash_1.default.toLower(projectType)].templates.javascript != undefined &&
             this.projectJsonData.projectTypes[lodash_1.default.toLower(projectType)].templates.typescript != undefined);
     }
@@ -44,6 +50,21 @@ class projectsJsonData {
         return hosts;
     }
     getSupportedScriptTypes(projectType) {
+        const scriptTypes = [];
+        if (projectType) {
+            for (const template in this.projectJsonData.projectTypes[projectType].templates) {
+                const archive = this.projectJsonData.projectTypes[projectType].templates[template].archive;
+                if (template === "javascript" && archive !== undefined) {
+                    scriptTypes.push("JavaScript");
+                }
+                else if (template === "typescript" && archive !== undefined) {
+                    scriptTypes.push("TypeScript");
+                }
+            }
+        }
+        return scriptTypes;
+    }
+    getSupportedScriptTypesNew(projectType) {
         const scriptTypes = [];
         if (projectType) {
             for (const template in this.projectJsonData.projectTypes[projectType].templates) {
@@ -98,18 +119,47 @@ class projectsJsonData {
         }
         return undefined;
     }
-    getProjectRepoAndBranch(projectTypeKey, scriptType, prerelease) {
-        scriptType = scriptType === "TypeScript" ? "typescript" : "javascript";
+    getProjectDownloadLink(projectTypeKey, scriptType) {
+        scriptType = scriptType.toLowerCase();
+        return this.projectJsonData.projectTypes[projectTypeKey].templates[scriptType]
+            .archive;
+    }
+    getProjectDownloadLinkNew(projectTypeKey, scriptType, frameworkType) {
+        scriptType = scriptType.toLowerCase();
+        return this.projectJsonData.projectTypes[projectTypeKey].templates[scriptType].frameworks[frameworkType].archive;
+    }
+    getProjectRepoAndBranchNew(projectTypeKey, scriptType, frameworkType, prerelease) {
         const repoBranchInfo = {
             repo: null,
             branch: null,
         };
-        repoBranchInfo.repo = this.getProjectTemplateRepository(projectTypeKey, scriptType);
+        repoBranchInfo.repo = this.getProjectTemplateRepositoryNew(projectTypeKey, scriptType, frameworkType);
         repoBranchInfo.branch = repoBranchInfo.repo
-            ? this.getProjectTemplateBranchName(projectTypeKey, scriptType, prerelease)
+            ? this.getProjectTemplateBranchNameNew(projectTypeKey, scriptType, frameworkType, prerelease)
             : undefined;
         return repoBranchInfo;
     }
+    getProjectTemplateRepositoryNew(projectTypeKey, scriptType, frameworkType) {
+        for (const key in this.projectJsonData.projectTypes) {
+            if (lodash_1.default.toLower(projectTypeKey) == key) {
+                return this.projectJsonData.projectTypes[key].templates[scriptType].frameworks[frameworkType].repository;
+            }
+        }
+        return undefined;
+    }
+    getProjectTemplateBranchNameNew(projectTypeKey, scriptType, frameworkType, prerelease) {
+        for (const key in this.projectJsonData.projectTypes) {
+            if (lodash_1.default.toLower(projectTypeKey) == key) {
+                if (prerelease) {
+                    return this.projectJsonData.projectTypes[key].templates[scriptType].frameworks[frameworkType].prerelease;
+                }
+                else {
+                    return this.projectJsonData.projectTypes[key].templates[scriptType].frameworks[frameworkType].branch;
+                }
+            }
+        }
+        return undefined;
+    }
 }
 exports.default = projectsJsonData;
 //# sourceMappingURL=projectsJsonData.js.map