@microsoft/teamsfx-core 2.0.8-alpha.d1a09e202.0 → 2.0.8-alpha.ded43fb2d.0

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

@@ -2,32 +2,39 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OfficeAddinGenerator = void 0;
+exports.OfficeAddinGeneratorNew = exports.getHost = exports.OfficeAddinGenerator = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author yefuwang@microsoft.com
  */
+const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const path_1 = require("path");
-const helperMethods_1 = require("./helperMethods");
-const office_addin_manifest_1 = require("office-addin-manifest");
-const projectsJsonData_1 = tslib_1.__importDefault(require("./config/projectsJsonData"));
 const childProcess = tslib_1.__importStar(require("child_process"));
-const util_1 = require("util");
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
-const lib_1 = require("@feathersjs/hooks/lib");
-const actionExecutionMW_1 = require("../../middleware/actionExecutionMW");
-const generator_1 = require("../generator");
+const office_addin_manifest_1 = require("office-addin-manifest");
 const office_addin_project_1 = require("office-addin-project");
-const questionNames_1 = require("../../../question/questionNames");
-const create_1 = require("../../../question/create");
+const path_1 = require("path");
+const util_1 = require("util");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const error_1 = require("../../../error");
-const featureFlags_1 = require("../../../common/featureFlags");
+const create_1 = require("../../../question/create");
+const questionNames_1 = require("../../../question/questionNames");
+const actionExecutionMW_1 = require("../../middleware/actionExecutionMW");
+const generator_1 = require("../generator");
+const projectConfig_1 = require("../officeXMLAddin/projectConfig");
+const helperMethods_1 = require("./helperMethods");
+const lodash_1 = require("lodash");
+const utils_1 = require("../utils");
+const templateGenerator_1 = require("../templates/templateGenerator");
+const utils_2 = require("../../utils");
 const componentName = "office-addin";
 const telemetryEvent = "generate";
 const templateName = "office-addin";
 const templateNameForWXPO = "office-json-addin";
+/**
+ * case 1: project-type=office-xml-addin-type AND addin-host=outlook
+ * case 2: project-type=office-addin-type (addin-host=undefined)
+ * case 3: project-type=outlook-addin-type (addin-host=undefined)
+ */
 class OfficeAddinGenerator {
     static async generate(context, inputs, destinationPath) {
         const result = await OfficeAddinGenerator.doScaffolding(context, inputs, destinationPath);
@@ -35,8 +42,11 @@ class OfficeAddinGenerator {
             return teamsfx_api_1.err(result.error);
         }
         // If lang is undefined, it means the project is created from a folder.
-        const lang = inputs[questionNames_1.QuestionNames.ProgrammingLanguage];
-        const langKey = lang != "No Options" ? ((lang === null || lang === void 0 ? void 0 : lang.toLowerCase()) === "typescript" ? "ts" : "js") : undefined;
+        const lang = lodash_1.toLower(inputs[questionNames_1.QuestionNames.ProgrammingLanguage]);
+        const langKey = inputs[questionNames_1.QuestionNames.Capabilities] === create_1.CapabilityOptions.outlookAddinImport().id ||
+            inputs[questionNames_1.QuestionNames.Capabilities] === create_1.CapabilityOptions.officeAddinImport().id
+            ? "ts"
+            : utils_1.convertToLangKey(lang);
         const templateRes = await generator_1.Generator.generateTemplate(context, destinationPath, inputs[questionNames_1.QuestionNames.ProjectType] === create_1.ProjectTypeOptions.officeAddin().id
             ? templateNameForWXPO
             : templateName, langKey);
@@ -48,43 +58,54 @@ class OfficeAddinGenerator {
         return util_1.promisify(childProcess.exec)(cmdLine);
     }
     static async doScaffolding(context, inputs, destinationPath) {
-        const template = create_1.getTemplate(inputs);
         const name = inputs[questionNames_1.QuestionNames.AppName];
         const addinRoot = destinationPath;
         const fromFolder = inputs[questionNames_1.QuestionNames.OfficeAddinFolder];
-        const language = inputs[questionNames_1.QuestionNames.ProgrammingLanguage];
-        const host = featureFlags_1.isOfficeXMLAddinEnabled()
-            ? inputs[questionNames_1.QuestionNames.OfficeAddinCapability] === create_1.ProjectTypeOptions.outlookAddin().id
-                ? "Outlook"
-                : inputs[questionNames_1.QuestionNames.OfficeAddinCapability]
-            : inputs[questionNames_1.QuestionNames.OfficeAddinHost];
+        const language = lodash_1.toLower(inputs[questionNames_1.QuestionNames.ProgrammingLanguage]);
+        const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
+        const capability = inputs[questionNames_1.QuestionNames.Capabilities];
+        const inputHost = inputs[questionNames_1.QuestionNames.OfficeAddinHost];
+        let host = inputHost;
+        if (projectType === create_1.ProjectTypeOptions.outlookAddin().id ||
+            (projectType === create_1.ProjectTypeOptions.officeXMLAddin().id &&
+                inputHost === create_1.OfficeAddinHostOptions.outlook().id)) {
+            host = "outlook";
+        }
+        else if (projectType === create_1.ProjectTypeOptions.officeAddin().id) {
+            if (capability === "json-taskpane") {
+                host = "wxpo"; // wxpo - support word, excel, powerpoint, outlook
+            }
+            else if (capability === create_1.CapabilityOptions.officeContentAddin().id) {
+                host = "xp"; // content add-in support excel, powerpoint
+            }
+        }
         const workingDir = process.cwd();
-        const importProgress = context.userInteraction.createProgressBar(localizeUtils_1.getLocalizedString("core.generator.officeAddin.importProject.title"), 3);
+        const importProgressStr = projectType === create_1.ProjectTypeOptions.officeAddin().id
+            ? localizeUtils_1.getLocalizedString("core.generator.officeAddin.importOfficeProject.title")
+            : localizeUtils_1.getLocalizedString("core.generator.officeAddin.importProject.title");
+        const importProgress = context.userInteraction.createProgressBar(importProgressStr, 3);
         process.chdir(addinRoot);
         try {
             if (!fromFolder) {
                 // from template
-                const jsonData = new projectsJsonData_1.default();
-                const isOfficeAddin = inputs[questionNames_1.QuestionNames.ProjectType] === create_1.ProjectTypeOptions.officeAddin().id;
-                const framework = isOfficeAddin ? inputs[questionNames_1.QuestionNames.OfficeAddinFramework] : undefined;
-                const projectLink = isOfficeAddin
-                    ? jsonData.getProjectDownloadLinkNew(template, language, framework)
-                    : jsonData.getProjectDownloadLink(template, language);
+                const framework = create_1.getOfficeAddinFramework(inputs);
+                const templateConfig = projectConfig_1.getOfficeAddinTemplateConfig(projectType, inputs[questionNames_1.QuestionNames.OfficeAddinHost]);
+                const projectLink = templateConfig[capability].framework[framework][language];
                 // Copy project template files from project repository
                 if (projectLink) {
-                    await helperMethods_1.HelperMethods.downloadProjectTemplateZipFile(addinRoot, projectLink);
+                    const fetchRes = await utils_2.fetchAndUnzip("office-addin-generator", projectLink, addinRoot);
+                    if (fetchRes.isErr()) {
+                        return teamsfx_api_1.err(fetchRes.error);
+                    }
+                    let cmdLine = ""; // Call 'convert-to-single-host' npm script in generated project, passing in host parameter
                     if (inputs[questionNames_1.QuestionNames.ProjectType] === create_1.ProjectTypeOptions.officeAddin().id) {
-                        // Call 'convert-to-single-host' npm script in generated project, passing in host parameter
-                        const cmdLine = `npm run convert-to-single-host --if-present -- ${lodash_1.default.toLower("wxpo" // support word, excel, powerpoint, outlook
-                        )} ${"json"}`;
-                        await OfficeAddinGenerator.childProcessExec(cmdLine);
+                        cmdLine = `npm run convert-to-single-host --if-present -- ${host} json`;
                     }
                     else {
-                        // Call 'convert-to-single-host' npm script in generated project, passing in host parameter
-                        const cmdLine = `npm run convert-to-single-host --if-present -- ${lodash_1.default.toLower(host)}`;
-                        await OfficeAddinGenerator.childProcessExec(cmdLine);
+                        cmdLine = `npm run convert-to-single-host --if-present -- ${host}`;
                     }
-                    const manifestPath = jsonData.getManifestPath(template);
+                    await OfficeAddinGenerator.childProcessExec(cmdLine);
+                    const manifestPath = templateConfig[capability].manifestPath;
                     // modify manifest guid and DisplayName
                     await office_addin_manifest_1.OfficeAddinManifest.modifyManifestFile(`${path_1.join(addinRoot, manifestPath)}`, "random", `${name}`);
                     await helperMethods_1.HelperMethods.moveManifestLocation(addinRoot, manifestPath);
@@ -138,19 +159,51 @@ async function getHost(addinManifestPath) {
     const addinManifest = await teamsfx_api_1.ManifestUtil.loadFromPath(addinManifestPath);
     let host = "Outlook";
     switch ((_c = (_b = (_a = addinManifest.extensions) === null || _a === void 0 ? void 0 : _a[0].requirements) === null || _b === void 0 ? void 0 : _b.scopes) === null || _c === void 0 ? void 0 : _c[0]) {
-        // case "document":
-        //   host = "Word";
+        case "document":
+            host = "Word";
+            break;
         case "mail":
             host = "Outlook";
+            break;
         // case "notebook":
         //   host = "OneNote";
-        // case "presentation":
-        //   host = "PowerPoint";
+        case "presentation":
+            host = "PowerPoint";
+            break;
         // case "project":
         //   host = "Project";
-        // case "workbook":
-        //   host = "Excel";
+        case "workbook":
+            host = "Excel";
+            break;
     }
     return host;
 }
+exports.getHost = getHost;
+class OfficeAddinGeneratorNew extends templateGenerator_1.DefaultTemplateGenerator {
+    constructor() {
+        super(...arguments);
+        this.componentName = "office-addin-generator";
+    }
+    // activation condition
+    activate(context, inputs) {
+        const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
+        return create_1.ProjectTypeOptions.officeAddinAllIds().includes(projectType);
+    }
+    async getTemplateInfos(context, inputs, actionContext) {
+        const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
+        const tplName = projectType === create_1.ProjectTypeOptions.officeAddin().id ? templateNameForWXPO : templateName;
+        let lang = lodash_1.toLower(inputs[questionNames_1.QuestionNames.ProgrammingLanguage]);
+        lang =
+            inputs[questionNames_1.QuestionNames.Capabilities] === create_1.CapabilityOptions.outlookAddinImport().id ||
+                inputs[questionNames_1.QuestionNames.Capabilities] === create_1.CapabilityOptions.officeAddinImport().id
+                ? create_1.ProgrammingLanguage.TS
+                : lang;
+        const replaceMap = {};
+        return Promise.resolve(teamsfx_api_1.ok([{ templateName: tplName, language: lang, replaceMap }]));
+    }
+    async post(context, inputs, destinationPath, actionContext) {
+        return await OfficeAddinGenerator.doScaffolding(context, inputs, destinationPath);
+    }
+}
+exports.OfficeAddinGeneratorNew = OfficeAddinGeneratorNew;
 //# sourceMappingURL=generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,+CAA8C;AAC9C,wDASgC;AAChC,oEAA8C;AAC9C,iEAA4D;AAC5D,+DAAsD;AACtD,+BAA4B;AAC5B,+BAAiC;AACjC,iEAAmE;AACnE,0CAA+C;AAC/C,qDAMkC;AAClC,mEAAgE;AAChE,0EAAsF;AACtF,4CAAyC;AACzC,mEAA+E;AAC/E,mDAAgD;AAChD,mCAAiC;AACjC,oCAA4C;AAC5C,sEAA0E;AAE1E,uCAA4C;AAE5C,MAAM,aAAa,GAAG,cAAc,CAAC;AACrC,MAAM,cAAc,GAAG,UAAU,CAAC;AAClC,MAAM,YAAY,GAAG,cAAc,CAAC;AACpC,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AAEhD;;;;GAIG;AACH,MAAa,oBAAoB;IAS/B,MAAM,CAAC,KAAK,CAAC,QAAQ,CACnB,OAAgB,EAChB,MAAc,EACd,eAAuB;QAEvB,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;QAC1F,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1B;QAED,uEAAuE;QACvE,MAAM,IAAI,GAAG,gBAAO,CAAC,MAAM,CAAC,6BAAa,CAAC,mBAAmB,CAAC,CAAgC,CAAC;QAC/F,MAAM,OAAO,GACX,MAAM,CAAC,6BAAa,CAAC,YAAY,CAAC,KAAK,0BAAiB,CAAC,kBAAkB,EAAE,CAAC,EAAE;YAChF,MAAM,CAAC,6BAAa,CAAC,YAAY,CAAC,KAAK,0BAAiB,CAAC,iBAAiB,EAAE,CAAC,EAAE;YAC7E,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,wBAAgB,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,qBAAS,CAAC,gBAAgB,CAClD,OAAO,EACP,eAAe,EACf,MAAM,CAAC,6BAAa,CAAC,WAAW,CAAC,KAAK,2BAAkB,CAAC,WAAW,EAAE,CAAC,EAAE;YACvE,CAAC,CAAC,mBAAmB;YACrB,CAAC,CAAC,YAAY,EAChB,OAAO,CACR,CAAC;QACF,IAAI,WAAW,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEvD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAe;QAClD,OAAO,gBAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAC/B,OAAgB,EAChB,MAAc,EACd,eAAuB;QAEvB,MAAM,IAAI,GAAG,MAAM,CAAC,6BAAa,CAAC,OAAO,CAAW,CAAC;QACrD,MAAM,SAAS,GAAG,eAAe,CAAC;QAClC,MAAM,UAAU,GAAG,MAAM,CAAC,6BAAa,CAAC,iBAAiB,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,gBAAO,CAAC,MAAM,CAAC,6BAAa,CAAC,mBAAmB,CAAC,CAElD,CAAC;QACjB,MAAM,WAAW,GAAG,MAAM,CAAC,6BAAa,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,CAAC,6BAAa,CAAC,YAAY,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,MAAM,CAAC,6BAAa,CAAC,eAAe,CAAC,CAAC;QACxD,IAAI,IAAI,GAAW,SAAS,CAAC;QAC7B,IACE,WAAW,KAAK,2BAAkB,CAAC,YAAY,EAAE,CAAC,EAAE;YACpD,CAAC,WAAW,KAAK,2BAAkB,CAAC,cAAc,EAAE,CAAC,EAAE;gBACrD,SAAS,KAAK,+BAAsB,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EACpD;YACA,IAAI,GAAG,SAAS,CAAC;SAClB;aAAM,IAAI,WAAW,KAAK,2BAAkB,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE;YAC9D,IAAI,UAAU,KAAK,eAAe,EAAE;gBAClC,IAAI,GAAG,MAAM,CAAC,CAAC,kDAAkD;aAClE;iBAAM,IAAI,UAAU,KAAK,0BAAiB,CAAC,kBAAkB,EAAE,CAAC,EAAE,EAAE;gBACnE,IAAI,GAAG,IAAI,CAAC,CAAC,2CAA2C;aACzD;SACF;QACD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QACjC,MAAM,iBAAiB,GACrB,WAAW,KAAK,2BAAkB,CAAC,WAAW,EAAE,CAAC,EAAE;YACjD,CAAC,CAAC,kCAAkB,CAAC,sDAAsD,CAAC;YAC5E,CAAC,CAAC,kCAAkB,CAAC,gDAAgD,CAAC,CAAC;QAC3E,MAAM,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QAEvF,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzB,IAAI;YACF,IAAI,CAAC,UAAU,EAAE;gBACf,gBAAgB;gBAChB,MAAM,SAAS,GAAG,gCAAuB,CAAC,MAAM,CAAC,CAAC;gBAClD,MAAM,cAAc,GAAG,4CAA4B,CACjD,WAAW,EACX,MAAM,CAAC,6BAAa,CAAC,eAAe,CAAC,CACtC,CAAC;gBACF,MAAM,WAAW,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC;gBAE9E,sDAAsD;gBACtD,IAAI,WAAW,EAAE;oBACf,MAAM,QAAQ,GAAG,MAAM,qBAAa,CAAC,wBAAwB,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;oBACvF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE;wBACpB,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBAC5B;oBACD,IAAI,OAAO,GAAG,EAAE,CAAC,CAAC,2FAA2F;oBAC7G,IAAI,MAAM,CAAC,6BAAa,CAAC,WAAW,CAAC,KAAK,2BAAkB,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE;wBAC7E,OAAO,GAAG,kDAAkD,IAAI,OAAO,CAAC;qBACzE;yBAAM;wBACL,OAAO,GAAG,kDAAkD,IAAI,EAAE,CAAC;qBACpE;oBACD,MAAM,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;oBACrD,MAAM,YAAY,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,YAAsB,CAAC;oBACvE,uCAAuC;oBACvC,MAAM,2CAAmB,CAAC,kBAAkB,CAC1C,GAAG,WAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,EAClC,QAAQ,EACR,GAAG,IAAI,EAAE,CACV,CAAC;oBACF,MAAM,6BAAa,CAAC,oBAAoB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;iBACnE;aACF;iBAAM;gBACL,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC;gBAC7B,wBAAwB;gBACxB,MAAM,cAAc,CAAC,IAAI,CACvB,kCAAkB,CAAC,oDAAoD,CAAC,CACzE,CAAC;gBACF,6BAAa,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;gBACpD,MAAM,kBAAkB,GAAW,MAAM,CAAC,6BAAa,CAAC,mBAAmB,CAAC,CAAC;gBAC7E,IAAI,YAAY,GAAW,kBAAkB,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;gBAC7E,MAAM,cAAc,CAAC,IAAI,CACvB,kCAAkB,CAAC,yDAAyD,CAAC,CAC9E,CAAC;gBACF,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBACjC,wCAAwC;oBACxC,MAAM,qCAAc,CAAC,YAAY,CAAC,CAAC;oBACnC,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBACxD;gBACD,MAAM,CAAC,6BAAa,CAAC,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;gBACpE,MAAM,cAAc,CAAC,IAAI,CACvB,kCAAkB,CAAC,yDAAyD,CAAC,CAC9E,CAAC;gBACF,MAAM,6BAAa,CAAC,cAAc,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;aACnE;YACD,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,MAAM,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACrC,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACtB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,MAAM,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACtC,OAAO,iBAAG,CAAC,qBAAa,CAAC,CAAU,CAAC,CAAC,CAAC;SACvC;IACH,CAAC;CACF;AAtIC;IARC,WAAK,CAAC;QACL,qCAAiB,CAAC;YAChB,eAAe,EAAE,IAAI;YACrB,sBAAsB,EAAE,aAAa;YACrC,kBAAkB,EAAE,cAAc;YAClC,WAAW,EAAE,aAAa;SAC3B,CAAC;KACH,CAAC;;;;0CA6BD;AArCH,oDA+IC;AAKM,KAAK,UAAU,OAAO,CAAC,iBAAyB;;IACrD,4BAA4B;IAC5B,MAAM,aAAa,GAAgC,MAAM,0BAAY,CAAC,YAAY,CAChF,iBAAiB,CAClB,CAAC;IACF,IAAI,IAAI,GAAe,SAAS,CAAC;IACjC,QAAQ,MAAA,MAAA,MAAA,aAAa,CAAC,UAAU,0CAAG,CAAC,EAAE,YAAY,0CAAE,MAAM,0CAAG,CAAC,CAAC,EAAE;QAC/D,KAAK,UAAU;YACb,IAAI,GAAG,MAAM,CAAC;YACd,MAAM;QACR,KAAK,MAAM;YACT,IAAI,GAAG,SAAS,CAAC;YACjB,MAAM;QACR,mBAAmB;QACnB,sBAAsB;QACtB,KAAK,cAAc;YACjB,IAAI,GAAG,YAAY,CAAC;YACpB,MAAM;QACR,kBAAkB;QAClB,sBAAsB;QACtB,KAAK,UAAU;YACb,IAAI,GAAG,OAAO,CAAC;YACf,MAAM;KACT;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAzBD,0BAyBC;AAED,MAAa,uBAAwB,SAAQ,4CAAwB;IAArE;;QACE,kBAAa,GAAG,wBAAwB,CAAC;IAkC3C,CAAC;IAhCC,uBAAuB;IAChB,QAAQ,CAAC,OAAgB,EAAE,MAAc;QAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,6BAAa,CAAC,WAAW,CAAC,CAAC;QACtD,OAAO,2BAAkB,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACtE,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,OAAgB,EAChB,MAAc,EACd,aAA6B;QAE7B,MAAM,WAAW,GAAG,MAAM,CAAC,6BAAa,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,OAAO,GACX,WAAW,KAAK,2BAAkB,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,YAAY,CAAC;QAC3F,IAAI,IAAI,GAAG,gBAAO,CAAC,MAAM,CAAC,6BAAa,CAAC,mBAAmB,CAAC,CAAwB,CAAC;QACrF,IAAI;YACF,MAAM,CAAC,6BAAa,CAAC,YAAY,CAAC,KAAK,0BAAiB,CAAC,kBAAkB,EAAE,CAAC,EAAE;gBAChF,MAAM,CAAC,6BAAa,CAAC,YAAY,CAAC,KAAK,0BAAiB,CAAC,iBAAiB,EAAE,CAAC,EAAE;gBAC7E,CAAC,CAAC,4BAAmB,CAAC,EAAE;gBACxB,CAAC,CAAC,IAAI,CAAC;QACX,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAE,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IACtF,CAAC;IAEM,KAAK,CAAC,IAAI,CACf,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,OAAO,MAAM,oBAAoB,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IACpF,CAAC;CACF;AAnCD,0DAmCC"}

package/build/component/generator/officeAddin/helperMethods.d.ts

@@ -1,7 +1,4 @@
 export declare class HelperMethods {
-    static downloadProjectTemplateZipFile(projectFolder: string, projectRepo: string): Promise<void>;
-    static unzipProjectTemplate(projectFolder: string): Promise<void>;
-    static moveUnzippedFiles(projectFolder: string): void;
     static copyAddinFiles(fromFolder: string, toFolder: string): void;
     static updateManifest(projectRoot: string, addinManifestPath: string): Promise<void>;
     static moveManifestLocation(projectRoot: string, manifestRelativePath: string): Promise<void>;

package/build/component/generator/officeAddin/helperMethods.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAiBA,qBAAa,aAAa;WACX,8BAA8B,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC;WAqCH,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBvE,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAoBrD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAMpD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAwB7E,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC;CA2CjB;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAKxF"}
+{"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAiBA,qBAAa,aAAa;IACxB,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAMpD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAwB7E,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC;CA2CjB;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAKxF"}

package/build/component/generator/officeAddin/helperMethods.js

@@ -8,77 +8,12 @@ const tslib_1 = require("tslib");
  * @author darrmill@microsoft.com, yefuwang@microsoft.com
  */
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
-const unzip = tslib_1.__importStar(require("unzipper"));
 const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
-const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const common_1 = require("../../../error/common");
 const zipFile = "project.zip";
 class HelperMethods {
-    static async downloadProjectTemplateZipFile(projectFolder, projectRepo) {
-        const projectTemplateZipFile = projectRepo;
-        let response;
-        try {
-            response = await node_fetch_1.default(projectTemplateZipFile, { method: "GET" });
-        }
-        catch (e) {
-            throw new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", e);
-        }
-        return new Promise((resolve, reject) => {
-            if (response.body) {
-                response.body
-                    .pipe(fs_1.default.createWriteStream(path.resolve(projectFolder, zipFile)))
-                    .on("error", (err) => {
-                    reject(new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", err));
-                })
-                    .on("close", () => {
-                    HelperMethods.unzipProjectTemplate(projectFolder)
-                        .then(() => {
-                        resolve();
-                    })
-                        .catch((err) => {
-                        reject(err);
-                    });
-                });
-            }
-            else {
-                reject(new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", new Error(`Response body of GET "${projectTemplateZipFile}" is null.`)));
-            }
-        });
-    }
-    static async unzipProjectTemplate(projectFolder) {
-        return new Promise((resolve, reject) => {
-            // TODO: Verify file exists
-            const readStream = fs_1.default.createReadStream(path.resolve(`${projectFolder}/${zipFile}`));
-            readStream
-                .pipe(unzip.Extract({ path: projectFolder }))
-                .on("error", function (err) {
-                unzipErrorHandler(projectFolder, reject, err);
-            })
-                .on("close", () => {
-                HelperMethods.moveUnzippedFiles(projectFolder);
-                resolve();
-            });
-        });
-    }
-    static moveUnzippedFiles(projectFolder) {
-        // delete original zip file
-        const zipFilePath = path.resolve(`${projectFolder}/${zipFile}`);
-        if (fs_1.default.existsSync(zipFilePath)) {
-            fs_1.default.unlinkSync(zipFilePath);
-        }
-        // get path to unzipped folder
-        const unzippedFolder = fs_1.default.readdirSync(projectFolder).filter(function (file) {
-            return fs_1.default.statSync(`${projectFolder}/${file}`).isDirectory();
-        });
-        // construct paths to move files out of unzipped folder into project root folder
-        const fromFolder = path.resolve(`${projectFolder}/${unzippedFolder[0]}`);
-        HelperMethods.copyAddinFiles(fromFolder, projectFolder);
-        // delete project zipped folder
-        fs_1.default.rmSync(fromFolder, { recursive: true, force: true });
-    }
     static copyAddinFiles(fromFolder, toFolder) {
         fs_extra_1.default.copySync(fromFolder, toFolder, {
             filter: (path) => !path.includes("node_modules"),

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

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

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

@@ -1,6 +1,10 @@
-import { FxError, Inputs, Result, Context } from "@microsoft/teamsfx-api";
+import { Context, FxError, Inputs, Result } from "@microsoft/teamsfx-api";
+import { ActionContext } from "../../middleware/actionExecutionMW";
+/**
+ * project-type=office-xml-addin-type addin-host!==outlook
+ */
 export declare class OfficeXMLAddinGenerator {
-    static generate(context: Context, inputs: Inputs, destinationPath: string): Promise<Result<undefined, FxError>>;
+    static generate(context: Context, inputs: Inputs, destinationPath: string, actionContext?: ActionContext): Promise<Result<undefined, FxError>>;
     static childProcessExec(cmdLine: string): Promise<{
         stdout: string;
         stderr: string;

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

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAW,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAsBnF,qBAAa,uBAAuB;WASrB,QAAQ,CACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAsElB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAC7D,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CAGH"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AASnF,OAAO,EAAqB,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAmBtF;;GAEG;AACH,qBAAa,uBAAuB;WASrB,QAAQ,CACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAgGlB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAC7D,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CAGH"}

package/build/component/generator/officeXMLAddin/generator.js

@@ -10,55 +10,75 @@ const tslib_1 = require("tslib");
 const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const childProcess = tslib_1.__importStar(require("child_process"));
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const lodash_1 = tslib_1.__importStar(require("lodash"));
 const office_addin_manifest_1 = require("office-addin-manifest");
 const path_1 = require("path");
 const util_1 = require("util");
-const generator_1 = require("../generator");
-const helperMethods_1 = require("../officeAddin/helperMethods");
-const actionExecutionMW_1 = require("../../middleware/actionExecutionMW");
+const localizeUtils_1 = require("../../../common/localizeUtils");
 const error_1 = require("../../../error");
-const create_1 = require("../../../question/create");
 const questionNames_1 = require("../../../question/questionNames");
+const actionExecutionMW_1 = require("../../middleware/actionExecutionMW");
+const generator_1 = require("../generator");
 const projectConfig_1 = require("./projectConfig");
-const localizeUtils_1 = require("../../../common/localizeUtils");
+const utils_1 = require("../utils");
+const utils_2 = require("../../utils");
 const COMPONENT_NAME = "office-xml-addin";
 const TELEMETRY_EVENT = "generate";
 const TEMPLATE_BASE = "office-xml-addin";
+const TEMPLATE_COMMON_NAME = "office-xml-addin-common";
+const TEMPLATE_COMMON_LANG = "common";
+/**
+ * project-type=office-xml-addin-type addin-host!==outlook
+ */
 class OfficeXMLAddinGenerator {
-    static async generate(context, inputs, destinationPath) {
-        const host = inputs[questionNames_1.QuestionNames.OfficeAddinCapability];
-        const project = inputs[questionNames_1.QuestionNames.Capabilities];
-        const lang = inputs[questionNames_1.QuestionNames.ProgrammingLanguage] === create_1.ProgrammingLanguage.TS ? "ts" : "js";
+    static async generate(context, inputs, destinationPath, actionContext) {
+        const host = inputs[questionNames_1.QuestionNames.OfficeAddinHost];
+        const capability = inputs[questionNames_1.QuestionNames.Capabilities];
+        const lang = lodash_1.default.toLower(inputs[questionNames_1.QuestionNames.ProgrammingLanguage]);
+        const langKey = utils_1.convertToLangKey(lang);
         const appName = inputs[questionNames_1.QuestionNames.AppName];
-        const templateName = projectConfig_1.getOfficeXMLAddinHostProjectTemplateName(host, project);
-        const repoInfo = projectConfig_1.getOfficeXMLAddinHostProjectRepoInfo(host, project, lang);
+        const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
+        const templateConfig = projectConfig_1.getOfficeAddinTemplateConfig(projectType, host);
+        const templateName = templateConfig[capability].localTemplate;
+        const projectLink = templateConfig[capability].framework["default"][lang];
         const workingDir = process.cwd();
         const progressBar = context.userInteraction.createProgressBar(localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.bar.title"), 1);
+        lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
+            ["office-xml-addin-host" /* host */]: host,
+            ["office-xml-addin-project" /* project */]: capability,
+            ["office-xml-addin-lang" /* lang */]: lang,
+        });
         try {
             process.chdir(destinationPath);
             await progressBar.start();
             await progressBar.next(localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.bar.detail"));
-            if (!!repoInfo) {
+            if (!!projectLink) {
                 // [Condition]: Project have remote repo (not manifest-only proj)
                 // -> Step: Download the project from GitHub
-                await helperMethods_1.HelperMethods.downloadProjectTemplateZipFile(destinationPath, repoInfo);
+                const fetchRes = await utils_2.fetchAndUnzip("office-xml-addin-generator", projectLink, destinationPath);
+                if (fetchRes.isErr()) {
+                    return teamsfx_api_1.err(fetchRes.error);
+                }
                 // -> Step: Convert to single Host
                 await OfficeXMLAddinGenerator.childProcessExec(`npm run convert-to-single-host --if-present -- ${lodash_1.default.toLower(host)}`);
             }
             else {
                 // [Condition]: Manifest Only
                 // -> Step: Copy proj files for manifest-only project
-                const getManifestOnlyProjectTemplateRes = await generator_1.Generator.generateTemplate(context, destinationPath, `${TEMPLATE_BASE}-manifest-only`, lang);
+                const getManifestOnlyProjectTemplateRes = await generator_1.Generator.generateTemplate(context, destinationPath, `${TEMPLATE_BASE}-manifest-only`, langKey);
                 if (getManifestOnlyProjectTemplateRes.isErr())
-                    return teamsfx_api_1.err(getManifestOnlyProjectTemplateRes.error);
+                    throw teamsfx_api_1.err(getManifestOnlyProjectTemplateRes.error);
             }
             // -> Common Step: Copy the README (or with manifest for manifest-only proj)
-            const getReadmeTemplateRes = await generator_1.Generator.generateTemplate(context, destinationPath, `${TEMPLATE_BASE}-${templateName}`, lang);
+            const getReadmeTemplateRes = await generator_1.Generator.generateTemplate(context, destinationPath, `${TEMPLATE_BASE}-${templateName}`, langKey);
             if (getReadmeTemplateRes.isErr())
-                return teamsfx_api_1.err(getReadmeTemplateRes.error);
+                throw teamsfx_api_1.err(getReadmeTemplateRes.error);
             // -> Common Step: Modify the Manifest
             await office_addin_manifest_1.OfficeAddinManifest.modifyManifestFile(`${path_1.join(destinationPath, "manifest.xml")}`, "random", `${appName}`);
+            // -> Common Step: Generate OfficeXMLAddin specific `teamsapp.yml`
+            const generateOfficeYMLRes = await generator_1.Generator.generateTemplate(context, destinationPath, TEMPLATE_COMMON_NAME, TEMPLATE_COMMON_LANG);
+            if (generateOfficeYMLRes.isErr())
+                throw teamsfx_api_1.err(generateOfficeYMLRes.error);
             process.chdir(workingDir);
             await progressBar.end(true, true);
             return teamsfx_api_1.ok(undefined);
@@ -83,7 +103,7 @@ tslib_1.__decorate([
         }),
     ]),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object, String]),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], OfficeXMLAddinGenerator, "generate", null);
 exports.OfficeXMLAddinGenerator = OfficeXMLAddinGenerator;

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,+CAA8C;AAC9C,wDAAmF;AACnF,oEAA8C;AAC9C,yDAAkC;AAClC,iEAA4D;AAC5D,+BAA4B;AAC5B,+BAAiC;AACjC,iEAAmE;AACnE,0CAA+C;AAC/C,mEAAgE;AAChE,0EAAsF;AACtF,4CAAyC;AAEzC,mDAA+D;AAC/D,oCAA4C;AAC5C,uCAA4C;AAE5C,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAC1C,MAAM,eAAe,GAAG,UAAU,CAAC;AACnC,MAAM,aAAa,GAAG,kBAAkB,CAAC;AACzC,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;AACvD,MAAM,oBAAoB,GAAG,QAAQ,CAAC;AAQtC;;GAEG;AACH,MAAa,uBAAuB;IASlC,MAAM,CAAC,KAAK,CAAC,QAAQ,CACnB,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,IAAI,GAAG,MAAM,CAAC,6BAAa,CAAC,eAAe,CAAW,CAAC;QAC7D,MAAM,UAAU,GAAG,MAAM,CAAC,6BAAa,CAAC,YAAY,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,6BAAa,CAAC,mBAAmB,CAAC,CAEhD,CAAC;QACjB,MAAM,OAAO,GAAG,wBAAgB,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,MAAM,CAAC,6BAAa,CAAC,OAAO,CAAW,CAAC;QACxD,MAAM,WAAW,GAAG,MAAM,CAAC,6BAAa,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,cAAc,GAAG,4CAA4B,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACvE,MAAM,YAAY,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC;QAC9D,MAAM,WAAW,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QACjC,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAC3D,kCAAkB,CAAC,qDAAqD,CAAC,EACzE,CAAC,CACF,CAAC;QAEF,cAAK,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,EAAE;YACnC,oCAAwC,EAAE,IAAI;YAC9C,0CAA2C,EAAE,UAAU;YACvD,oCAAwC,EAAE,IAAI;SAC/C,CAAC,CAAC;QAEH,IAAI;YACF,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAC/B,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,WAAW,CAAC,IAAI,CACpB,kCAAkB,CAAC,sDAAsD,CAAC,CAC3E,CAAC;YAEF,IAAI,CAAC,CAAC,WAAW,EAAE;gBACjB,iEAAiE;gBAEjE,4CAA4C;gBAC5C,MAAM,QAAQ,GAAG,MAAM,qBAAa,CAClC,4BAA4B,EAC5B,WAAW,EACX,eAAe,CAChB,CAAC;gBACF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE;oBACpB,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;iBAC5B;gBACD,kCAAkC;gBAClC,MAAM,uBAAuB,CAAC,gBAAgB,CAC5C,kDAAkD,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CACpE,CAAC;aACH;iBAAM;gBACL,6BAA6B;gBAE7B,qDAAqD;gBACrD,MAAM,iCAAiC,GAAG,MAAM,qBAAS,CAAC,gBAAgB,CACxE,OAAO,EACP,eAAe,EACf,GAAG,aAAa,gBAAgB,EAChC,OAAO,CACR,CAAC;gBACF,IAAI,iCAAiC,CAAC,KAAK,EAAE;oBAC3C,MAAM,iBAAG,CAAC,iCAAiC,CAAC,KAAK,CAAC,CAAC;aACtD;YAED,4EAA4E;YAC5E,MAAM,oBAAoB,GAAG,MAAM,qBAAS,CAAC,gBAAgB,CAC3D,OAAO,EACP,eAAe,EACf,GAAG,aAAa,IAAI,YAAY,EAAE,EAClC,OAAO,CACR,CAAC;YACF,IAAI,oBAAoB,CAAC,KAAK,EAAE;gBAAE,MAAM,iBAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAExE,sCAAsC;YACtC,MAAM,2CAAmB,CAAC,kBAAkB,CAC1C,GAAG,WAAI,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE,EAC1C,QAAQ,EACR,GAAG,OAAO,EAAE,CACb,CAAC;YAEF,kEAAkE;YAClE,MAAM,oBAAoB,GAAG,MAAM,qBAAS,CAAC,gBAAgB,CAC3D,OAAO,EACP,eAAe,EACf,oBAAoB,EACpB,oBAAoB,CACrB,CAAC;YACF,IAAI,oBAAoB,CAAC,KAAK,EAAE;gBAAE,MAAM,iBAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAExE,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,MAAM,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAClC,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACtB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,MAAM,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACnC,OAAO,iBAAG,CAAC,qBAAa,CAAC,CAAU,CAAC,CAAC,CAAC;SACvC;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAe;QAIlD,OAAO,gBAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;CACF;AA3GC;IARC,WAAK,CAAC;QACL,qCAAiB,CAAC;YAChB,eAAe,EAAE,IAAI;YACrB,sBAAsB,EAAE,cAAc;YACtC,kBAAkB,EAAE,eAAe;YACnC,WAAW,EAAE,cAAc;SAC5B,CAAC;KACH,CAAC;;;;6CAoGD;AA5GH,0DAoHC"}

package/build/component/generator/officeXMLAddin/projectConfig.d.ts

@@ -1,36 +1,24 @@
 /**
- * Get all available Office XML Addin Project Options of one host
- * @param host Office host
- * @returns the detail proj options[] of the host
+ * @author zyun@microsoft.com
  */
-export declare function getOfficeXMLAddinHostProjectOptions(host: string): {
-    proj: string;
-    title: string;
-    detail: string;
-}[];
-/**
- * Get all available Lang Options of one host and proj
- * @param host Office host
- * @param proj proj name
- * @returns the detail lang options[] of the proj
- */
-export declare function getOfficeXMLAddinHostProjectLangOptions(host: string, proj: string): {
-    id: string;
-    label: string;
-}[];
-/**
- * Get all available Lang Options of one host and proj
- * @param host Office host
- * @param proj proj name
- * @returns the detail lang options[] of the proj
- */
-export declare function getOfficeXMLAddinHostProjectTemplateName(host: string, proj: string): string;
-/**
- * Get the Repo Info of the proj
- * @param host wxp
- * @param proj proj name
- * @param lang ts or js
- * @returns Repo Info
- */
-export declare function getOfficeXMLAddinHostProjectRepoInfo(host: string, proj: string, lang: "ts" | "js"): string;
+interface IOfficeAddinHostConfig {
+    [property: string]: {
+        title: string;
+        detail: string;
+        localTemplate: string;
+        manifestPath?: string;
+        framework: {
+            [property: string]: {
+                typescript?: string;
+                javascript?: string;
+            };
+        };
+    };
+}
+interface IOfficeAddinProjectConfig {
+    [property: string]: IOfficeAddinHostConfig;
+}
+export declare const OfficeAddinProjectConfig: IOfficeAddinProjectConfig;
+export declare function getOfficeAddinTemplateConfig(projectType: string, addinHost?: string): IOfficeAddinHostConfig;
+export {};
 //# sourceMappingURL=projectConfig.d.ts.map

package/build/component/generator/officeXMLAddin/projectConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectConfig.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/projectConfig.ts"],"names":[],"mappings":"AA0IA;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,MAAM,GAAG;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,EAAE,CAUF;AAED;;;;;GAKG;AACH,wBAAgB,uCAAuC,CACrD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX;IACD,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf,EAAE,CAUF;AAED;;;;;GAKG;AACH,wBAAgB,wCAAwC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3F;AAED;;;;;;GAMG;AACH,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,IAAI,GAAG,IAAI,GAChB,MAAM,CAGR"}
+{"version":3,"file":"projectConfig.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/projectConfig.ts"],"names":[],"mappings":"AAKA;;GAEG;AAEH,UAAU,sBAAsB;IAC9B,CAAC,QAAQ,EAAE,MAAM,GAAG;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,aAAa,EAAE,MAAM,CAAC;QACtB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,SAAS,EAAE;YACT,CAAC,QAAQ,EAAE,MAAM,GAAG;gBAClB,UAAU,CAAC,EAAE,MAAM,CAAC;gBACpB,UAAU,CAAC,EAAE,MAAM,CAAC;aACrB,CAAC;SACH,CAAC;KACH,CAAC;CACH;AAED,UAAU,yBAAyB;IACjC,CAAC,QAAQ,EAAE,MAAM,GAAG,sBAAsB,CAAC;CAC5C;AAsCD,eAAO,MAAM,wBAAwB,EAAE,yBA0HtC,CAAC;AAEF,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,GACjB,sBAAsB,CASxB"}