npm - @microsoft/teamsfx-core - Versions diffs - 2.0.8-alpha.d1a09e202.0 → 2.0.8-alpha.ded43fb2d.0 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (313) hide show

package/build/common/projectTypeChecker.js CHANGED Viewed

@@ -9,6 +9,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const yaml_1 = require("yaml");
 const versionMetadata_1 = require("./versionMetadata");
+const projectSettingsHelper_1 = require("./projectSettingsHelper");
 var TeamsfxConfigType;
 (function (TeamsfxConfigType) {
     TeamsfxConfigType["projectSettingsJson"] = "projectSettings.json";
@@ -174,6 +175,14 @@ class ProjectTypeChecker {
         }
         return true;
     }
+    findOfficeAddinProject(filePath, data) {
+        if (projectSettingsHelper_1.isValidOfficeAddInProject(filePath)) {
+            data.officeAddinProjectType = "XML";
+            data.isTeamsFx = false;
+            return false;
+        }
+        return true;
+    }
     async checkProjectType(projectPath) {
         const result = {
             isTeamsFx: false,
@@ -187,6 +196,7 @@ class ProjectTypeChecker {
             //only scan direct sub folder
             await this.scanFolder(projectPath, ["node_modules", "bin", "build", "dist", ".vscode"], result, this.findTeamsFxCallback, 1, 0);
             await this.scanFolder(projectPath, ["node_modules", "bin", "build", "dist", ".vscode"], result, this.findSPFxCallback, 2, 0);
+            this.findOfficeAddinProject(projectPath, result);
         }
         catch (e) { }
         return result;
@@ -209,6 +219,9 @@ function getCapabilities(manifest) {
     if (manifest.extensions && manifest.extensions.length > 0) {
         capabilities.push("extension");
     }
+    if (manifest.plugins && manifest.plugins.length > 0) {
+        capabilities.push("plugin");
+    }
     return capabilities;
 }
 exports.getCapabilities = getCapabilities;

package/build/common/projectTypeChecker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"projectTypeChecker.js","sourceRoot":"","sources":["../../src/common/projectTypeChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,gEAA0B;AAC1B,wDAAwB;AACxB,4DAA4B;AAC5B,+BAAqC;AACrC,uDAA2D;~~AAE3D~~,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,iEAA4C,CAAA;IAC5C,iDAA4B,CAAA;AAC9B,CAAC,EAHW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B;AACY,QAAA,aAAa,GAAG,qBAAqB,CAAC;AAEtC,QAAA,OAAO,GAAG,iCAAiC,CAAC;AAEzD,IAAY,mBAKX;AALD,WAAY,mBAAmB;IAC7B,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;IACzB,kDAA2B,CAAA;IAC3B,0CAAmB,CAAA;AACrB,CAAC,EALW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAK9B;~~AAiBD~~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~~IACD~~,KAAK,CAAC,gBAAgB,CAAC,WAAmB;QACxC,MAAM,MAAM,GAAsB;YAChC,SAAS,EAAE,KAAK;YAChB,gBAAgB,EAAE,KAAK;YACvB,gBAAgB,EAAE,KAAK;YACvB,SAAS,EAAE,EAAE;SACd,CAAC;QACF,IAAI;YACF,MAAM,IAAI,CAAC,UAAU,CACnB,WAAW,EACX,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EACnD,MAAM,EACN,IAAI,CAAC,oBAAoB,EACzB,CAAC,EACD,CAAC,CACF,CAAC;YACF,MAAM,IAAI,CAAC,UAAU,CACnB,WAAW,EACX,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EACnD,MAAM,EACN,IAAI,CAAC,2BAA2B,EAChC,CAAC,EACD,CAAC,CACF,CAAC;YACF,6BAA6B;YAC7B,MAAM,IAAI,CAAC,UAAU,CACnB,WAAW,EACX,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EACnD,MAAM,EACN,IAAI,CAAC,mBAAmB,EACxB,CAAC,EACD,CAAC,CACF,CAAC;YACF,MAAM,IAAI,CAAC,UAAU,CACnB,WAAW,EACX,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EACnD,MAAM,EACN,IAAI,CAAC,gBAAgB,EACrB,CAAC,EACD,CAAC,CACF,CAAC;~~SACH~~;QAAC,OAAO,CAAC,EAAE,GAAE;QACd,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AACD,SAAgB,eAAe,CAAC,QAAa;IAC3C,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACzD,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;KAChC;IACD,IAAI,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;QACrE,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KACtC;IACD,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7C,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,IAAI,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QACvE,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;KACvC;IACD,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACzD,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;KAChC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;~~AAlBD~~,~~0CAkBC~~;AACY,QAAA,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC"}
1	+ {"version":3,"file":"projectTypeChecker.js","sourceRoot":"","sources":["../../src/common/projectTypeChecker.ts"],"names":[],"mappings":"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"}

package/build/common/samples.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import { SampleUrlInfo } from "../component/generator/utils";
-export declare const TeamsSampleConfigTag = "v2.4.0";
-export declare const OfficeSampleConfigTag = "v0.0.1";
+export declare const SampleConfigTag = "v2.4.0";
 export declare const SampleConfigBranchForPrerelease = "main";
 export interface SampleConfig {
     id: string;

package/build/common/samples.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"samples.d.ts","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAA0B,MAAM,8BAA8B,CAAC;~~AAYrF~~,eAAO,MAAM,~~oBAAoB~~,WAAW,CAAC;~~AAC7C~~,eAAO,MAAM~~,qBAAqB,WAAW,CAAC;AAE9C,eAAO,MAAM~~,+BAA+B,SAAS,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,IAAI,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IAExB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,aAAa,CAAC;CAChC;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,aAAa,EAAE;QACb,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;CACH;AAOD,cAAM,cAAc;IAClB,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,IAAW,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAKvD;IAEY,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;~~YAiD~~/C,uBAAuB;~~IAmErC~~,OAAO,CAAC,uBAAuB;~~IAiDlB~~,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YA2BzD,mBAAmB;~~CAuBlC~~;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
1	+ {"version":3,"file":"samples.d.ts","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAA0B,MAAM,8BAA8B,CAAC;AAUrF,eAAO,MAAM,eAAe,WAAW,CAAC;AAExC,eAAO,MAAM,+BAA+B,SAAS,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,IAAI,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IAExB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,aAAa,CAAC;CAChC;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,aAAa,EAAE;QACb,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;CACH;AAOD,cAAM,cAAc;IAClB,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,IAAW,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAKvD;IAEY,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;YAM/C,uBAAuB;IAsCrC,OAAO,CAAC,uBAAuB;IA4ClB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YA2BzD,mBAAmB;CAiBlC;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}

package/build/common/samples.js CHANGED Viewed

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sampleProvider = exports.SampleConfigBranchForPrerelease = exports.OfficeSampleConfigTag = exports.TeamsSampleConfigTag = void 0;
+exports.sampleProvider = exports.SampleConfigBranchForPrerelease = exports.SampleConfigTag = void 0;
 const tslib_1 = require("tslib");
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const hooks_1 = require("@feathersjs/hooks");
@@ -12,12 +12,9 @@ const common_1 = require("../error/common");
 const constants_1 = require("./constants");
 const packageJson = require("../../package.json");
 const SampleConfigOwner = "OfficeDev";
-const TeamsSampleConfigRepo = "TeamsFx-Samples";
-const TeamsSampleConfigFile = ".config/samples-config-v3.json";
-const OfficeSampleConfigRepo = "Office-Samples";
-const OfficeSampleConfigFile = ".config/samples-config-v1.json";
-exports.TeamsSampleConfigTag = "v2.4.0";
-exports.OfficeSampleConfigTag = "v0.0.1";
+const SampleConfigRepo = "TeamsFx-Samples";
+const SampleConfigFile = ".config/samples-config-v3.json";
+exports.SampleConfigTag = "v2.4.0";
 // prerelease tag is always using a branch.
 exports.SampleConfigBranchForPrerelease = "main";
 class SampleProvider {
@@ -28,94 +25,51 @@ class SampleProvider {
         return Promise.resolve(this.sampleCollection);
     }
     async refreshSampleConfig() {
-        const teamsRet = await this.fetchOnlineSampleConfig(TeamsSampleConfigRepo, TeamsSampleConfigFile);
-        const teamsSampleCollection = await this.parseOnlineSampleConfig(SampleConfigOwner, TeamsSampleConfigRepo, teamsRet.samplesConfig, teamsRet.ref);
-        const officeRet = await this.fetchOnlineSampleConfig(OfficeSampleConfigRepo, OfficeSampleConfigFile);
-        const officeSampleCollection = await this.parseOnlineSampleConfig(SampleConfigOwner, OfficeSampleConfigRepo, officeRet.samplesConfig, officeRet.ref);
-        // merge samples from TeamsFx-Samples and Office-Samples
-        // use Set to remove duplicates
-        this.sampleCollection = {
-            samples: [...teamsSampleCollection.samples, ...officeSampleCollection.samples],
-            filterOptions: {
-                capabilities: Array.from(new Set([
-                    ...teamsSampleCollection.filterOptions.capabilities,
-                    ...officeSampleCollection.filterOptions.capabilities,
-                ])),
-                languages: Array.from(new Set([
-                    ...teamsSampleCollection.filterOptions.languages,
-                    ...officeSampleCollection.filterOptions.languages,
-                ])),
-                technologies: Array.from(new Set([
-                    ...teamsSampleCollection.filterOptions.technologies,
-                    ...officeSampleCollection.filterOptions.technologies,
-                ])),
-            },
-        };
+        const { samplesConfig, ref } = await this.fetchOnlineSampleConfig();
+        this.sampleCollection = this.parseOnlineSampleConfig(samplesConfig, ref);
         return this.sampleCollection;
     }
-    async fetchOnlineSampleConfig(configRepo, configFile) {
-        const getRef = (configRepo, version) => {
-            if (configRepo === TeamsSampleConfigRepo) {
-                // Set default value for branchOrTag
-                if (version.includes("alpha")) {
-                    // daily build version always use 'dev' branch
-                    return "dev";
-                }
-                else if (version.includes("beta")) {
-                    // prerelease build version always use branch head for prerelease.
-                    return exports.SampleConfigBranchForPrerelease;
-                }
-                else if (version.includes("rc")) {
-                    // if there is a breaking change, the tag is not used by any stable version.
-                    return exports.TeamsSampleConfigTag;
-                }
-                else {
-                    // stable version uses the head of branch defined by feature flag when available
-                    return exports.TeamsSampleConfigTag;
-                }
-            }
-            else {
-                // Office Samples
-                if (version.includes("alpha")) {
-                    return "dev";
-                }
-                else if (version.includes("beta")) {
-                    return exports.SampleConfigBranchForPrerelease;
-                }
-                else if (version.includes("rc")) {
-                    return exports.OfficeSampleConfigTag;
-                }
-                else {
-                    return exports.OfficeSampleConfigTag;
-                }
-                // return "dev";
-            }
-        };
+    async fetchOnlineSampleConfig() {
         const version = packageJson.version;
-        const configBranchInEnv = process.env[configRepo === TeamsSampleConfigRepo
-            ? constants_1.FeatureFlagName.TeamsSampleConfigBranch
-            : constants_1.FeatureFlagName.OfficeSampleConfigBranch];
+        const configBranchInEnv = process.env[constants_1.FeatureFlagName.SampleConfigBranch];
         let samplesConfig;
-        let ref = getRef(configRepo, version);
+        let ref = exports.SampleConfigTag;
+        // Set default value for branchOrTag
+        if (version.includes("alpha")) {
+            // daily build version always use 'dev' branch
+            ref = "dev";
+        }
+        else if (version.includes("beta")) {
+            // prerelease build version always use branch head for prerelease.
+            ref = exports.SampleConfigBranchForPrerelease;
+        }
+        else if (version.includes("rc")) {
+            // if there is a breaking change, the tag is not used by any stable version.
+            ref = exports.SampleConfigTag;
+        }
+        else {
+            // stable version uses the head of branch defined by feature flag when available
+            ref = exports.SampleConfigTag;
+        }
         // Set branchOrTag value if branch in env is valid
         if (configBranchInEnv) {
             try {
-                const data = await this.fetchRawFileContent(SampleConfigOwner, configRepo, configBranchInEnv, configFile);
+                const data = await this.fetchRawFileContent(configBranchInEnv);
                 ref = configBranchInEnv;
                 samplesConfig = data;
             }
             catch (e) { }
         }
         if (samplesConfig === undefined) {
-            samplesConfig = (await this.fetchRawFileContent(SampleConfigOwner, configRepo, ref, configFile));
+            samplesConfig = (await this.fetchRawFileContent(ref));
         }
         return { samplesConfig, ref };
     }
-    parseOnlineSampleConfig(samplesOnwer, samplesRepo, samplesConfig, ref) {
+    parseOnlineSampleConfig(samplesConfig, ref) {
         const samples = (samplesConfig === null || samplesConfig === void 0 ? void 0 : samplesConfig.samples.map((sample) => {
             const isExternal = sample["downloadUrlInfo"] ? true : false;
             let gifUrl = sample["gifPath"] !== undefined
-                ? `https://raw.githubusercontent.com/${samplesOnwer}/${samplesRepo}/${ref}/${sample["id"]}/${sample["gifPath"]}`
+                ? `https://raw.githubusercontent.com/${SampleConfigOwner}/${SampleConfigRepo}/${ref}/${sample["id"]}/${sample["gifPath"]}`
                 : undefined;
             if (isExternal) {
                 const info = sample["downloadUrlInfo"];
@@ -128,19 +82,19 @@ class SampleProvider {
                     ? sample["downloadUrlInfo"]
                     : {
                         owner: SampleConfigOwner,
-                        repository: samplesRepo,
+                        repository: SampleConfigRepo,
                         ref: ref,
                         dir: sample["id"],
                     }, gifUrl: gifUrl });
         })) || [];
-        return Promise.resolve({
+        return {
             samples,
             filterOptions: {
                 capabilities: (samplesConfig === null || samplesConfig === void 0 ? void 0 : samplesConfig.filterOptions["capabilities"]) || [],
                 languages: (samplesConfig === null || samplesConfig === void 0 ? void 0 : samplesConfig.filterOptions["languages"]) || [],
                 technologies: (samplesConfig === null || samplesConfig === void 0 ? void 0 : samplesConfig.filterOptions["technologies"]) || [],
             },
-        });
+        };
     }
     async getSampleReadmeHtml(sample) {
         const urlInfo = sample.downloadUrlInfo;
@@ -165,8 +119,8 @@ class SampleProvider {
             throw new common_1.AccessGithubError(url, "SampleProvider", e);
         }
     }
-    async fetchRawFileContent(configOwner, configRepo, branchOrTag, configFile) {
-        const url = `https://raw.githubusercontent.com/${configOwner}/${configRepo}/${branchOrTag}/${configFile}`;
+    async fetchRawFileContent(branchOrTag) {
+        const url = `https://raw.githubusercontent.com/${SampleConfigOwner}/${SampleConfigRepo}/${branchOrTag}/${SampleConfigFile}`;
         try {
             const fileResponse = await utils_1.sendRequestWithTimeout(async () => {
                 return await axios_1.default.get(url, { responseType: "json" });
@@ -183,8 +137,8 @@ class SampleProvider {
 tslib_1.__decorate([
     hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "SampleProvider" })]),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, Object, String]),
-    tslib_1.__metadata("design:returntype", Promise)
+    tslib_1.__metadata("design:paramtypes", [Object, String]),
+    tslib_1.__metadata("design:returntype", Object)
 ], SampleProvider.prototype, "parseOnlineSampleConfig", null);
 exports.sampleProvider = new SampleProvider();
 //# sourceMappingURL=samples.js.map

package/build/common/samples.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"samples.js","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,0DAA0B;AAE1B,6CAA0C;AAE1C,wDAAqF;AACrF,mDAAoD;AACpD,4CAAoD;AACpD,2CAA8C;AAE9C,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAElD,MAAM,iBAAiB,GAAG,WAAW,CAAC;AACtC,MAAM,~~qBAAqB~~,GAAG,iBAAiB,CAAC;~~AAChD~~,MAAM,~~qBAAqB,GAAG,gCAAgC,CAAC;AAC/D,MAAM,sBAAsB,GAAG,~~gBAAgB,~~CAAC;AAChD,MAAM,sBAAsB,~~GAAG,gCAAgC,CAAC;~~AACnD~~,QAAA,~~oBAAoB~~,GAAG,QAAQ,CAAC;~~AAChC~~,~~QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAC9C,~~2CAA2C;AAC9B,QAAA,+BAA+B,GAAG,MAAM,CAAC;AAuCtD,MAAM,cAAc;IAGlB,IAAW,gBAAgB;QACzB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC;SACnC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAEM,KAAK,CAAC,mBAAmB;QAC9B,MAAM,~~QAAQ~~,~~GAAG,MAAM,IAAI,CAAC,uBAAuB,CACjD,qBAAqB,EACrB,qBAAqB,CACtB,CAAC;QACF,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAC9D,iBAAiB,EACjB,qBAAqB,EACrB,QAAQ,CAAC,~~aAAa,~~EACtB~~,~~QAAQ,CAAC,~~GAAG,~~CACb~~,~~CAAC;QACF,MAAM,SAAS,~~GAAG,MAAM,IAAI,CAAC,uBAAuB,~~CAClD~~,~~sBAAsB,EACtB,sBAAsB,CACvB,~~CAAC;~~QACF~~,~~MAAM,sBAAsB,GAAG,MAAM,~~IAAI,CAAC,~~uBAAuB,CAC/D,iBAAiB,EACjB,sBAAsB,EACtB,SAAS,CAAC,aAAa,EACvB,SAAS,CAAC,GAAG,CACd,CAAC;QACF,wDAAwD;QACxD,+BAA+B;QAC/B,IAAI,CAAC,~~gBAAgB,GAAG~~;YACtB~~,~~OAAO,EAAE,CAAC,GAAG,qBAAqB,CAAC,OAAO,EAAE,GAAG,sBAAsB,CAAC,OAAO,CAAC;YAC9E,aAAa,EAAE;gBACb,YAAY,EAAE,KAAK,CAAC,~~IAAI,~~CACtB,IAAI,GAAG,~~CAAC~~;oBACN~~,~~GAAG~~,~~qBAAqB,~~CAAC,aAAa,~~CAAC,YAAY;oBACnD,GAAG,sBAAsB,CAAC,aAAa,CAAC,YAAY;iBACrD,CAAC,CACH;gBACD,SAAS,~~EAAE,~~KAAK,CAAC,IAAI,CACnB,IAAI,~~GAAG,CAAC~~;oBACN~~,~~GAAG,qBAAqB,~~CAAC~~,aAAa,CAAC,SAAS~~;~~oBAChD~~,GAAG,sBAAsB,CAAC,aAAa,CAAC,SAAS;iBAClD,CAAC,CACH;gBACD,YAAY,EAAE,KAAK,CAAC,IAAI,CACtB,IAAI,GAAG,CAAC;oBACN,GAAG,qBAAqB,CAAC,aAAa,CAAC,YAAY;oBACnD,GAAG,sBAAsB,CAAC,aAAa,CAAC,YAAY;iBACrD,CAAC,CACH;aACF;SACF,CAAC;QACF,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,uBAAuB~~,CAAC,UAAkB,EAAE,UAAkB~~;~~QAC1E~~,MAAM,~~MAAM,GAAG,CAAC,UAAkB,EAAE,OAAe,EAAE,EAAE;YACrD,IAAI,UAAU,KAAK,qBAAqB,EAAE;gBACxC,oCAAoC;gBACpC,IAAI,~~OAAO,~~CAAC~~,~~QAAQ~~,CAAC,OAAO,CAAC~~,EAAE~~;~~oBAC7B~~,~~8CAA8C;oBAC9C~~,~~OAAO~~,~~KAAK~~,~~CAAC;iBACd;qBAAM,IAAI,~~OAAO,CAAC,~~QAAQ~~,CAAC,~~MAAM~~,CAAC,~~EAAE;oBACnC~~,~~kEAAkE;oBAClE~~,~~OAAO,uCAA+B,~~CAAC;~~iBACxC;qBAAM~~,IAAI,~~OAAO~~,CAAC,~~QAAQ,CAAC,~~IAAI,~~CAAC~~,~~EAAE;oBACjC~~,~~4EAA4E;oBAC5E~~,~~OAAO,4BAAoB,~~CAAC;~~iBAC7B;qBAAM;oBACL~~,~~gFAAgF~~;~~oBAChF~~,~~OAAO,4BAAoB,CAAC;iBAC7B;aACF;iBAAM;gBACL,iBAAiB;gBACjB,~~IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;~~oBAC7B~~,~~OAAO~~,KAAK,CAAC;~~iBACd~~;~~qBAAM~~,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;~~oBACnC~~,~~OAAO~~,uCAA+B,CAAC;~~iBACxC~~;~~qBAAM~~,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;~~oBACjC~~,~~OAAO,6BAAqB,CAAC~~;~~iBAC9B;qBAAM;oBACL~~,~~OAAO~~,~~6BAAqB~~,~~CAAC;iBAC9B;gBACD~~,~~gBAAgB;aACjB;QACH,~~CAAC~~,CAAC~~;~~QACF,MAAM,OAAO,GAAW,WAAW,CAAC,OAAO,CAAC~~;~~QAC5C,MAAM,iBAAiB,GACrB,OAAO,CAAC,GAAG,CACT,UAAU,KAAK,qBAAqB~~;~~YAClC~~,~~CAAC,CAAC,2BAAe,CAAC,uBAAuB~~;~~YACzC~~,~~CAAC,CAAC,2BAAe,CAAC,wBAAwB,CAC7C,CAAC;QACJ,IAAI,aAA2C,CAAC;QAChD,IAAI,~~GAAG,GAAG,~~MAAM~~,CAAC~~,UAAU,EAAE,OAAO,CAAC,CAAC~~;~~QACtC~~,kDAAkD;QAClD,IAAI,iBAAiB,EAAE;YACrB,IAAI;gBACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,mBAAmB,~~CACzC~~,iBAAiB,~~EACjB~~,~~UAAU,EACV,iBAAiB,EACjB,UAAU,CACX,~~CAAC;~~gBACF~~,GAAG,GAAG,iBAAiB,CAAC;gBACxB,aAAa,GAAG,IAAwB,CAAC;aAC1C;YAAC,OAAO,CAAU,EAAE,GAAE;SACxB;QAED,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,aAAa,GAAG,CAAC,MAAM,IAAI,CAAC,mBAAmB,~~CAC7C~~,~~iBAAiB,EACjB,UAAU,EACV,~~GAAG,~~EACH~~,~~UAAU,CACX,~~CAAqB,CAAC;~~SACxB~~;QAED,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC;IAChC,CAAC;IAGO,uBAAuB,~~CAC7B~~,~~YAAoB,EACpB,WAAmB,EACnB,~~aAA+B,~~EAC/B~~,GAAW;~~QAEX~~,MAAM,OAAO,GACX,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACpC,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;YAC5D,IAAI,MAAM,GACR,MAAM,CAAC,SAAS,CAAC,KAAK,SAAS;gBAC7B,CAAC,CAAC,qCAAqC,~~YAAY~~,IAAI,~~WAAW~~,IAAI,GAAG,~~IACrE~~,MAAM,CAAC,IAAI,CACb,IAAI,MAAM,CAAC,SAAS,CAAW,EAAE;gBACnC,CAAC,CAAC,SAAS,CAAC;YAChB,IAAI,UAAU,EAAE;gBACd,MAAM,IAAI,GAAG,MAAM,CAAC,iBAAiB,CAAkB,CAAC;gBACxD,MAAM;oBACJ,MAAM,CAAC,SAAS,CAAC,KAAK,SAAS;wBAC7B,CAAC,CAAC,qCAAqC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,IAC5E,IAAI,CAAC,GACP,IAAI,MAAM,CAAC,SAAS,CAAW,EAAE;wBACnC,CAAC,CAAC,SAAS,CAAC;aACjB;YACD,OAAO,gCACF,MAAM,KACT,WAAW,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAW,CAAC,EACtD,eAAe,EAAE,UAAU;oBACzB,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC;oBAC3B,CAAC,CAAC;wBACE,KAAK,EAAE,iBAAiB;wBACxB,UAAU,EAAE,~~WAAW~~;~~wBACvB~~,GAAG,EAAE,GAAG;wBACR,GAAG,EAAE,MAAM,CAAC,IAAI,CAAW;qBAC5B,EACL,MAAM,EAAE,MAAM,GACC,CAAC;QACpB,CAAC,CAAC,KAAI,EAAE,CAAC;QAEX,OAAO~~,OAAO,CAAC,OAAO,CAAC~~;~~YACrB~~,OAAO;YACP,aAAa,EAAE;gBACb,YAAY,EAAE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,aAAa,CAAC,cAAc,CAAC,KAAI,EAAE;gBAChE,SAAS,EAAE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,aAAa,CAAC,WAAW,CAAC,KAAI,EAAE;gBAC1D,YAAY,EAAE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,aAAa,CAAC,cAAc,CAAC,KAAI,EAAE;aACjE;SACF,CAAC~~,CAAC~~;~~IACL~~,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,MAAoB;QACnD,MAAM,OAAO,GAAG,MAAM,CAAC,eAAe,CAAC;QACvC,MAAM,GAAG,GAAG,gCAAgC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,UAAU,WAAW,OAAO,CAAC,GAAG,SAAS,OAAO,CAAC,GAAG,EAAE,CAAC;QAC5H,IAAI;YACF,MAAM,cAAc,GAAG,MAAM,8BAAsB,CACjD,KAAK,IAAI,EAAE;gBACT,OAAO,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE;oBAC1B,OAAO,EAAE;wBACP,MAAM,EAAE,6BAA6B;wBACrC,sBAAsB,EAAE,YAAY;qBACrC;iBACF,CAAC,CAAC;YACL,CAAC,EACD,IAAI,EACJ,CAAC,CACF,CAAC;YAEF,IAAI,cAAc,IAAI,cAAc,CAAC,IAAI,EAAE;gBACzC,OAAO,cAAc,CAAC,IAAc,CAAC;aACtC;iBAAM;gBACL,OAAO,EAAE,CAAC;aACX;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,0BAAiB,CAAC,GAAG,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;SACvD;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB,~~CAC/B~~,WAAmB~~,EACnB,UAAkB,EAClB,WAAmB,EACnB,UAAkB~~;~~QAElB~~,MAAM,GAAG,GAAG,qCAAqC,~~WAAW~~,IAAI,~~UAAU~~,IAAI,WAAW,IAAI,~~UAAU~~,EAAE,CAAC;~~QAC1G~~,IAAI;YACF,MAAM,YAAY,GAAG,MAAM,8BAAsB,CAC/C,KAAK,IAAI,EAAE;gBACT,OAAO,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;YACxD,CAAC,EACD,IAAI,EACJ,CAAC,CACF,CAAC;~~YAEF~~,IAAI,YAAY,IAAI,YAAY,CAAC,IAAI,EAAE;gBACrC,OAAO,YAAY,CAAC,IAAI,CAAC;aAC1B;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,0BAAiB,CAAC,GAAG,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;SACvD;IACH,CAAC;CACF;~~AAnGC~~;IADC,aAAK,CAAC,CAAC,2BAAc,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;;;;~~6DAgDxD~~;~~AAsDU~~,QAAA,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}
1	+ {"version":3,"file":"samples.js","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"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"}

package/build/common/stringUtils.d.ts ADDED Viewed

@@ -0,0 +1,10 @@
+export interface MaskSecretOptions {
+    threshold?: number;
+    whiteList?: string[];
+}
+export declare function maskSecret(inputText?: string, option?: {
+    threshold: number;
+    whiteList: string[];
+}): string;
+export declare function maskSecretValues(stdout: string, replace?: string): string;
+//# sourceMappingURL=stringUtils.d.ts.map

package/build/common/stringUtils.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"stringUtils.d.ts","sourceRoot":"","sources":["../../src/common/stringUtils.ts"],"names":[],"mappings":"AAgFA,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,wBAAgB,UAAU,CACxB,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM;;;CAAoD,GACzD,MAAM,CAyBR;AAUD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,SAAQ,GAAG,MAAM,CAUxE"}

package/build/common/stringUtils.js ADDED Viewed

@@ -0,0 +1,121 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.maskSecretValues = exports.maskSecret = void 0;
+const MIN_ENTROPY = 4;
+const SECRET_REPLACE = "<REDACTED:secret>";
+const USER_REPLACE = "<REDACTED:user>";
+const WHITE_LIST = [
+    "user-file-path",
+    "publish-app,",
+    "X-Correlation-ID",
+    "innerError",
+    "client-request-id",
+];
+function getProbMap(str) {
+    const probMap = new Map();
+    for (const char of str) {
+        probMap.set(char, (probMap.get(char) || 0) + 1);
+    }
+    for (const [char, freq] of probMap.entries()) {
+        const prob = freq / str.length;
+        probMap.set(char, prob);
+    }
+    return probMap;
+}
+// Measure the entropy of a string in bits per symbol.
+function shannonEntropy(str, probMap) {
+    let sum = 0;
+    for (const char of str) {
+        const prob = probMap.get(char) || 0;
+        const delta = (prob * Math.log(prob)) / Math.log(2);
+        sum += delta;
+    }
+    return -sum;
+}
+class Token {
+    constructor(value, splitter) {
+        this.value = value;
+        this.splitter = splitter;
+    }
+}
+function tokenize(text) {
+    const splitterString = " '`\n\t\r\",:{}";
+    const splitterChars = new Set();
+    for (const char of splitterString) {
+        splitterChars.add(char);
+    }
+    const tokens = [];
+    let currentToken = "";
+    for (const char of text) {
+        if (splitterChars.has(char)) {
+            if (currentToken.length > 0) {
+                tokens.push(new Token(currentToken, false));
+                currentToken = "";
+            }
+            tokens.push(new Token(char, true));
+        }
+        else {
+            currentToken += char;
+        }
+    }
+    if (currentToken.length > 0) {
+        tokens.push(new Token(currentToken, false));
+    }
+    return tokens;
+}
+function computeShannonEntropy(token) {
+    if (!token.splitter) {
+        const probMap = getProbMap(token.value);
+        token.entropy = shannonEntropy(token.value, probMap);
+    }
+}
+function maskSecret(inputText, option = { threshold: MIN_ENTROPY, whiteList: WHITE_LIST }) {
+    if (!inputText)
+        return "";
+    // mask by secret pattern
+    inputText = maskByPattern(inputText);
+    // mask by .env.xxx.user
+    inputText = maskSecretValues(inputText, SECRET_REPLACE);
+    // mask by entropy
+    let output = "";
+    const tokens = tokenize(inputText);
+    tokens.forEach((token) => {
+        var _a;
+        computeShannonEntropy(token);
+        if (((_a = option.whiteList) === null || _a === void 0 ? void 0 : _a.includes(token.value)) ||
+            token.splitter ||
+            (token.entropy || 0) <= option.threshold) {
+            output += token.value;
+        }
+        else {
+            output += SECRET_REPLACE;
+        }
+    });
+    // for (const token of tokens) {
+    //   console.log(token);
+    // }
+    return output;
+}
+exports.maskSecret = maskSecret;
+function maskByPattern(command) {
+    const regexU = /(-u|--username|--user) (\S+)/;
+    const regexP = /(-p|--password|--pwd) (\S+)/;
+    let output = command.replace(regexU, `$1 ${USER_REPLACE}`);
+    output = output.replace(regexP, `$1 ${SECRET_REPLACE}`);
+    return output;
+}
+function maskSecretValues(stdout, replace = "***") {
+    for (const key of Object.keys(process.env)) {
+        if (key.startsWith("SECRET_")) {
+            const value = process.env[key];
+            if (value) {
+                stdout = stdout.replace(value, replace);
+            }
+        }
+    }
+    return stdout;
+}
+exports.maskSecretValues = maskSecretValues;
+//# sourceMappingURL=stringUtils.js.map

package/build/common/stringUtils.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/build/common/telemetry.d.ts CHANGED Viewed

@@ -49,6 +49,9 @@ export declare enum TelemetryProperty {
     GraphPermissionHasRole = "graph-permission-has-role",
     GraphPermissionHasAdminScope = "graph-permission-has-admin-scope",
     GraphPermissionScopes = "graph-permission-scopes",
+    GraphPermissionRoles = "graph-permission-roles",
+    RscApplication = "rsc-application",
+    RscDelegated = "rsc-delegated",
     AadManifest = "aad-manifest"
 }
 export declare enum TelemetryEvent {
@@ -130,7 +133,8 @@ export declare enum ProjectTypeProps {
     TeamsManifestAppId = "manifest-app-id",
     TeamsManifestCapabilities = "manifest-capabilities",
     TeamsJs = "teams-js",
-    Lauguages = "languages"
+    Lauguages = "languages",
+    OfficeAddinProjectType = "office-addin-project-type"
 }
 export declare enum TelemetrySuccess {
     Yes = "yes",
@@ -186,4 +190,5 @@ export declare function sendTelemetryErrorEvent(component: string, eventName: st
  */
 export declare function fillInTelemetryPropsForFxError(props: Record<string, string>, error: FxError): void;
 export declare function fillinProjectTypeProperties(props: Record<string, string>, projectTypeRes: ProjectTypeResult): void;
+export declare function extractMethodNamesFromErrorStack(stack?: string): string;
 //# sourceMappingURL=telemetry.d.ts.map

package/build/common/telemetry.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAe,MAAM,wBAAwB,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;~~AAGzD~~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~~CACxB~~;AAED,oBAAY,gBAAgB;IAC1B,GAAG,QAAQ;IACX,EAAE,OAAO;CACV;AAED,oBAAY,kBAAkB;IAC5B,SAAS,SAAS;IAClB,WAAW,WAAW;CACvB;AAED,oBAAY,SAAS;IACnB,GAAG,cAAc;IACjB,GAAG,QAAQ;IACX,EAAE,OAAO;IACT,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,oBAAY,0BAA0B;IACpC,WAAW,iBAAiB;IAC5B,SAAS,eAAe;IACxB,QAAQ,cAAc;IACtB,wBAAwB,+BAA+B;IACvD,2BAA2B,kCAAkC;IAC7D,sBAAsB,6BAA6B;IACnD,eAAe,qBAAqB;CACrC;AAED,oBAAY,yBAAyB;IACnC,WAAW,iBAAiB;IAC5B,SAAS,eAAe;IACxB,QAAQ,cAAc;IACtB,OAAO,YAAY;CACpB;AAED,oBAAY,qBAAqB;IAC/B,EAAE,OAAO;IACT,MAAM,WAAW;CAClB;AAED,oBAAY,0BAA0B;IACpC,MAAM,WAAW;IACjB,SAAS,eAAe;IACxB,MAAM,WAAW;CAClB;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACpC,YAAY,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACrC,IAAI,CAMN;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACnC,IAAI,CASN;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,KAAK,EAAE,OAAO,GACb,IAAI,~~CAoCN~~;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,cAAc,EAAE,iBAAiB,~~QAiBlC~~"}
1	+ {"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}

package/build/common/telemetry.js CHANGED Viewed

@@ -2,11 +2,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fillinProjectTypeProperties = exports.fillInTelemetryPropsForFxError = exports.sendTelemetryErrorEvent = exports.sendTelemetryEvent = exports.ProjectMigratorGuideStatus = exports.ProjectMigratorStatus = exports.CustomizeSubscriptionType = exports.CustomizeResourceGroupType = exports.Component = exports.TelemetryErrorType = exports.TelemetrySuccess = exports.ProjectTypeProps = exports.TelemetryEvent = exports.TelemetryProperty = void 0;
+exports.extractMethodNamesFromErrorStack = exports.fillinProjectTypeProperties = exports.fillInTelemetryPropsForFxError = exports.sendTelemetryErrorEvent = exports.sendTelemetryEvent = exports.ProjectMigratorGuideStatus = exports.ProjectMigratorStatus = exports.CustomizeSubscriptionType = exports.CustomizeResourceGroupType = exports.Component = exports.TelemetryErrorType = exports.TelemetrySuccess = exports.ProjectTypeProps = exports.TelemetryEvent = exports.TelemetryProperty = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("../component/constants");
 const globalVars_1 = require("../core/globalVars");
 const lodash_1 = require("lodash");
+const stringUtils_1 = require("./stringUtils");
 var TelemetryProperty;
 (function (TelemetryProperty) {
     TelemetryProperty["TriggerFrom"] = "trigger-from";
@@ -57,6 +58,9 @@ var TelemetryProperty;
     TelemetryProperty["GraphPermissionHasRole"] = "graph-permission-has-role";
     TelemetryProperty["GraphPermissionHasAdminScope"] = "graph-permission-has-admin-scope";
     TelemetryProperty["GraphPermissionScopes"] = "graph-permission-scopes";
+    TelemetryProperty["GraphPermissionRoles"] = "graph-permission-roles";
+    TelemetryProperty["RscApplication"] = "rsc-application";
+    TelemetryProperty["RscDelegated"] = "rsc-delegated";
     TelemetryProperty["AadManifest"] = "aad-manifest";
 })(TelemetryProperty = exports.TelemetryProperty || (exports.TelemetryProperty = {}));
 var TelemetryEvent;
@@ -141,6 +145,7 @@ var ProjectTypeProps;
     ProjectTypeProps["TeamsManifestCapabilities"] = "manifest-capabilities";
     ProjectTypeProps["TeamsJs"] = "teams-js";
     ProjectTypeProps["Lauguages"] = "languages";
+    ProjectTypeProps["OfficeAddinProjectType"] = "office-addin-project-type";
 })(ProjectTypeProps = exports.ProjectTypeProps || (exports.ProjectTypeProps = {}));
 var TelemetrySuccess;
 (function (TelemetrySuccess) {
@@ -221,8 +226,10 @@ function fillInTelemetryPropsForFxError(props, error) {
     props[constants_1.TelemetryConstants.properties.errorCode] =
         props[constants_1.TelemetryConstants.properties.errorCode] || errorCode;
     props[constants_1.TelemetryConstants.properties.errorType] = errorType;
-    props[constants_1.TelemetryConstants.properties.errorMessage] = error.message;
-    props[constants_1.TelemetryConstants.properties.errorStack] = error.stack !== undefined ? error.stack : ""; // error stack will not append in error-message any more
+    props[constants_1.TelemetryConstants.properties.errorMessage] = error.skipProcessInTelemetry
+        ? error.message
+        : stringUtils_1.maskSecret(error.message);
+    props[constants_1.TelemetryConstants.properties.errorStack] = extractMethodNamesFromErrorStack(error.stack); // error stack will not append in error-message any more
     props[constants_1.TelemetryConstants.properties.errorName] = error.name;
     // append global context properties
     props[constants_1.TelemetryConstants.properties.errorComponent] = globalVars_1.globalVars.component;
@@ -232,9 +239,12 @@ function fillInTelemetryPropsForFxError(props, error) {
     if (error.innerError && error.innerError["code"]) {
         props[constants_1.TelemetryConstants.properties.errorInnerCode] = error.innerError["code"];
     }
-    if (error.innerError) {
-        props[constants_1.TelemetryConstants.properties.innerError] = JSON.stringify(error.innerError, Object.getOwnPropertyNames(error.innerError));
-    }
+    // if (error.innerError) {  // inner-error is retired
+    //   props[TelemetryConstants.properties.innerError] = JSON.stringify(
+    //     error.innerError,
+    //     Object.getOwnPropertyNames(error.innerError)
+    //   );
+    // }
     if (error.categories) {
         props[constants_1.TelemetryConstants.properties.errorCat] = error.categories.join("|");
         props[constants_1.TelemetryConstants.properties.errorCat1] = error.categories[0];
@@ -257,8 +267,21 @@ function fillinProjectTypeProperties(props, projectTypeRes) {
         [ProjectTypeProps.TeamsfxProjectId]: projectTypeRes.teamsfxProjectId || "",
         [ProjectTypeProps.Lauguages]: projectTypeRes.lauguages.join(","),
         [ProjectTypeProps.TeamsManifestCapabilities]: ((_a = projectTypeRes.manifestCapabilities) === null || _a === void 0 ? void 0 : _a.join(",")) || "",
+        [ProjectTypeProps.OfficeAddinProjectType]: projectTypeRes.officeAddinProjectType || "",
     };
     lodash_1.assign(props, newProps);
 }
 exports.fillinProjectTypeProperties = fillinProjectTypeProperties;
+function extractMethodNamesFromErrorStack(stack) {
+    if (!stack)
+        return "";
+    const methodNamesRegex = /at\s([\w.<>\[\]\s]+)\s\(/g;
+    let match;
+    const methodNames = [];
+    while ((match = methodNamesRegex.exec(stack)) !== null) {
+        methodNames.push(match[1]);
+    }
+    return methodNames.join(" | ");
+}
+exports.extractMethodNamesFromErrorStack = extractMethodNamesFromErrorStack;
 //# sourceMappingURL=telemetry.js.map

package/build/common/telemetry.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA8D;AAC9D,sDAA4D;AAC5D,mDAAuD;AAEvD,mCAAgC;AAEhC,IAAY,~~iBAkDX~~;~~AAlDD~~,WAAY,iBAAiB;IAC3B,iDAA4B,CAAA;IAC5B,4CAAuB,CAAA;IACvB,8CAAyB,CAAA;IACzB,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,oCAAe,CAAA;IACf,oCAAe,CAAA;IACf,wCAAmB,CAAA;IACnB,6CAAwB,CAAA;IACxB,6CAAwB,CAAA;IACxB,mDAA8B,CAAA;IAC9B,sDAAiC,CAAA;IACjC,6CAAwB,CAAA;IACxB,oDAA+B,CAAA;IAC/B,qDAAgC,CAAA;IAChC,gCAAW,CAAA;IACX,iFAA4D,CAAA;IAC5D,6CAAwB,CAAA;IACxB,sCAAiB,CAAA;IACjB,0CAAqB,CAAA;IACrB,uDAAkC,CAAA;IAClC,kDAA6B,CAAA;IAC7B,qDAAgC,CAAA;IAChC,4DAAuC,CAAA;IACvC,oEAA+C,CAAA;IAC/C,yEAAoD,CAAA;IACpD,+DAA0C,CAAA;IAC1C,+DAA0C,CAAA;IAC1C,sDAAiC,CAAA;IACjC,gDAA2B,CAAA;IAC3B,qDAAgC,CAAA;IAChC,2DAAsC,CAAA;IACtC,2DAAsC,CAAA;IACtC,2DAAsC,CAAA;IACtC,mDAA8B,CAAA;IAC9B,0EAAqD,CAAA;IACrD,0CAAqB,CAAA;IACrB,0EAAqD,CAAA;IACrD,gEAA2C,CAAA;IAC3C,8EAAyD,CAAA;IACzD,2DAAsC,CAAA;IACtC,uDAAkC,CAAA;IAClC,yCAAoB,CAAA;IACpB,4DAAuC,CAAA;IACvC,yDAAoC,CAAA;IACpC,yEAAoD,CAAA;IACpD,sFAAiE,CAAA;IACjE,sEAAiD,CAAA;IACjD,iDAA4B,CAAA;AAC9B,CAAC,~~EAlDW~~,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,~~QAkD5B~~;AAED,IAAY,cAmEX;AAnED,WAAY,cAAc;IACxB,uCAAqB,CAAA;IACrB,0DAAwC,CAAA;IACxC,4CAA0B,CAAA;IAC1B,qDAAmC,CAAA;IACnC,yCAAuB,CAAA;IACvB,kDAAgC,CAAA;IAChC,0CAAwB,CAAA;IACxB,mCAAiB,CAAA;IACjB,+DAA6C,CAAA;IAC7C,oDAAkC,CAAA;IAClC,0CAAwB,CAAA;IACxB,4CAA0B,CAAA;IAC1B,oDAAkC,CAAA;IAClC,+DAA6C,CAAA;IAC7C,wCAAsB,CAAA;IACtB,sDAAoC,CAAA;IACpC,gDAA8B,CAAA;IAC9B,wEAAsD,CAAA;IACtD,6DAA2C,CAAA;IAC3C,qEAAmD,CAAA;IACnD,0DAAwC,CAAA;IACxC,wDAAsC,CAAA;IACtC,0CAAwB,CAAA;IACxB,0FAAwE,CAAA;IACxE,0FAAwE,CAAA;IACxE,+EAA6D,CAAA;IAC7D,gFAA8D,CAAA;IAC9D,qEAAmD,CAAA;IACnD,qFAAmE,CAAA;IACnE,iEAA+C,CAAA;IAC/C,gGAA8E,CAAA;IAC9E,qFAAmE,CAAA;IACnE,sFAAoE,CAAA;IACpE,2EAAyD,CAAA;IACzD,gGAA8E,CAAA;IAC9E,qFAAmE,CAAA;IACnE,wGAAsF,CAAA;IACtF,6FAA2E,CAAA;IAC3E,4GAA0F,CAAA;IAC1F,iGAA+E,CAAA;IAC/E,0GAAwF,CAAA;IACxF,+FAA6E,CAAA;IAC7E,iGAA+E,CAAA;IAC/E,sFAAoE,CAAA;IACpE,kFAAgE,CAAA;IAChE,uEAAqD,CAAA;IACrD,uEAAqD,CAAA;IACrD,mGAAiF,CAAA;IACjF,uDAAqC,CAAA;IACrC,4CAA0B,CAAA;IAC1B,mDAAiC,CAAA;IACjC,8EAA4D,CAAA;IAC5D,mEAAiD,CAAA;IACjD,wDAAsC,CAAA;IACtC,oDAAkC,CAAA;IAClC,wDAAsC,CAAA;IACtC,oEAAkD,CAAA;IAClD,oDAAkC,CAAA;IAClC,sEAAoD,CAAA;IACpD,oEAAkD,CAAA;IAClD,4CAA0B,CAAA;IAC1B,0EAAwD,CAAA;IACxD,uCAAqB,CAAA;IACrB,8CAA4B,CAAA;IAC5B,kDAAgC,CAAA;IAChC,iDAA+B,CAAA;AACjC,CAAC,EAnEW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAmEzB;AAED,IAAY,~~gBAYX~~;~~AAZD~~,WAAY,gBAAgB;IAC1B,4CAAwB,CAAA;IACxB,6DAAyC,CAAA;IACzC,mEAA+C,CAAA;IAC/C,iEAA6C,CAAA;IAC7C,2DAAuC,CAAA;IACvC,kDAA8B,CAAA;IAC9B,6DAAyC,CAAA;IACzC,0DAAsC,CAAA;IACtC,uEAAmD,CAAA;IACnD,wCAAoB,CAAA;IACpB,2CAAuB,CAAA;~~AACzB~~,CAAC,~~EAZW~~,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,~~QAY3B~~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~~OAAO~~,CAAC~~;IAClE~~,KAAK,CAAC,~~8BAAkB~~,CAAC,~~UAAU~~,CAAC,~~UAAU~~,CAAC,~~GAAG~~,~~KAAK~~,CAAC,KAAK,~~KAAK~~,~~SAAS~~,CAAC,CAAC,CAAC,~~KAAK~~,CAAC,KAAK,CAAC,~~CAAC~~,CAAC,~~EAAE,~~CAAC,CAAC,wDAAwD;~~IACxJ~~,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;IAE5D,mCAAmC;IACnC,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,uBAAU,CAAC,SAAS,CAAC;IAC3E,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,uBAAU,CAAC,KAAK,CAAC;IACnE,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,uBAAU,CAAC,MAAM,CAAC;IACrE,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,uBAAU,CAAC,MAAM,CAAC;IACrE,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAChD,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KAChF;IAED,~~IAAI~~,~~KAAK~~,~~CAAC~~,~~UAAU~~,~~EAAE~~;~~QACpB~~,~~KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,~~IAAI~~,CAAC,SAAS,CAC9D,KAAK,CAAC,UAAU,EAChB,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAC7C,CAAC~~;~~KACH;IAED~~,IAAI,KAAK,CAAC,UAAU,EAAE;QACpB,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3E,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrE,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrE,KAAK,CAAC,8BAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KACtE;AACH,CAAC;~~AAvCD~~,~~wEAuCC~~;AAED,SAAgB,2BAA2B,CACzC,KAA6B,EAC7B,cAAiC;;IAEjC,MAAM,QAAQ,GAAG;QACf,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;QACzE,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,cAAc,CAAC,iBAAiB,IAAI,EAAE;QAC5E,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAAE,cAAc,CAAC,oBAAoB,IAAI,EAAE;QAClF,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,EAAE,cAAc,CAAC,mBAAmB,IAAI,EAAE;QAChF,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;QAC9E,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;QACpF,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAAE,cAAc,CAAC,eAAe,IAAI,EAAE;QAC7E,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,EAAE,cAAc,CAAC,aAAa,IAAI,EAAE;QACzE,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC,gBAAgB,IAAI,EAAE;QAC1E,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;QAChE,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,EAC1C,CAAA,MAAA,cAAc,CAAC,oBAAoB,0CAAE,IAAI,CAAC,GAAG,CAAC,KAAI,EAAE;~~KACvD~~,CAAC;IACF,eAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC1B,CAAC;~~AAnBD~~,~~kEAmBC~~"}
1	+ {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}