@microsoft/teamsfx-core 2.0.5 → 2.0.6-beta.2023091908.0

package/build/common/deps-checker/internal/nodeChecker.js

@@ -29,7 +29,7 @@ class NodeChecker {
         let supportedVersions = [];
         try {
             supportedVersions = await this.getSupportedVersions(installOptions === null || installOptions === void 0 ? void 0 : installOptions.projectPath);
-            await this._logger.debug(`NodeChecker checking for supported versions: '${JSON.stringify(supportedVersions)}'`);
+            this._logger.debug(`NodeChecker checking for supported versions: '${JSON.stringify(supportedVersions)}'`);
             const currentVersion = await NodeChecker.getInstalledNodeVersion();
             if (currentVersion === null) {
                 this._telemetry.sendUserErrorEvent(telemetry_1.DepsCheckerEvent.nodeNotFound, "Node.js can't be found.");
@@ -53,8 +53,8 @@ class NodeChecker {
     async resolve(installOptions) {
         const installationInfo = await this.getInstallationInfo(installOptions);
         if (installationInfo.error) {
-            await this._logger.printDetailLog();
-            await this._logger.error(`${installationInfo.error.message}, error = '${installationInfo.error}'`);
+            this._logger.printDetailLog();
+            this._logger.error(`${installationInfo.error.message}, error = '${installationInfo.error.toString()}'`);
         }
         this._logger.cleanup();
         return installationInfo;

package/build/common/deps-checker/internal/nodeChecker.js.map

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

package/build/common/deps-checker/internal/testToolChecker.d.ts

@@ -0,0 +1,45 @@
+import { DependencyStatus, DepsChecker, TestToolInstallOptions } from "../depsChecker";
+declare enum InstallType {
+    Global = "global",
+    Portable = "portable"
+}
+declare type TestToolDependencyStatus = Omit<DependencyStatus, "isInstalled"> & ({
+    isInstalled: true;
+    installType: InstallType;
+} | {
+    isInstalled: false;
+});
+export declare class TestToolChecker implements DepsChecker {
+    private telemetryProperties;
+    private readonly name;
+    private readonly npmPackageName;
+    private readonly timeout;
+    private readonly checkUpdateTimeout;
+    private readonly commandName;
+    private readonly portableDirName;
+    private readonly defaultUpdateInterval;
+    constructor();
+    getInstallationInfo(installOptions: TestToolInstallOptions): Promise<TestToolDependencyStatus>;
+    resolve(installOptions: TestToolInstallOptions): Promise<DependencyStatus>;
+    private install;
+    private hasNewVersionReleasedInRange;
+    private autoUpdate;
+    private validateInstallInfoFile;
+    private readInstallInfoFile;
+    private writeInstallInfoFile;
+    private findLatestInstalledPortableVersion;
+    private checkVersion;
+    private queryVersion;
+    private hasNode;
+    private hasNPM;
+    private npmInstall;
+    private findLocalNpmPackage;
+    private getBinFolder;
+    private getPortableVersionsDir;
+    private getPortableInstallPath;
+    private getInstallInfoPath;
+    private getSuccessDepsInfo;
+    private createFailureDepsInfo;
+}
+export {};
+//# sourceMappingURL=testToolChecker.d.ts.map

package/build/common/deps-checker/internal/testToolChecker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"testToolChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/testToolChecker.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAY,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAOjG,aAAK,WAAW;IACd,MAAM,WAAW;IACjB,QAAQ,aAAa;CACtB;AAED,aAAK,wBAAwB,GAAG,IAAI,CAAC,gBAAgB,EAAE,aAAa,CAAC,GACnE,CAAC;IAAE,WAAW,EAAE,IAAI,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,WAAW,EAAE,KAAK,CAAA;CAAE,CAAC,CAAC;AAM7E,qBAAa,eAAgB,YAAW,WAAW;IACjD,OAAO,CAAC,mBAAmB,CAA4B;IACvD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAyB;IAC9C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwC;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAa;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IACrF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAc;IAE9C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA2B;;IAMpD,mBAAmB,CAC9B,cAAc,EAAE,sBAAsB,GACrC,OAAO,CAAC,wBAAwB,CAAC;IAwCvB,OAAO,CAAC,cAAc,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAmCzE,OAAO;YAkCP,4BAA4B;YA6B5B,UAAU;IA+CxB,OAAO,CAAC,uBAAuB;YAUjB,mBAAmB;YAgBnB,oBAAoB;YASpB,kCAAkC;YAqClC,YAAY;YAqBZ,YAAY;YAaZ,OAAO;YASP,MAAM;YASN,UAAU;YAwCV,mBAAmB;IAuBjC,OAAO,CAAC,YAAY;IAGpB,OAAO,CAAC,sBAAsB;IAG9B,OAAO,CAAC,sBAAsB;IAG9B,OAAO,CAAC,kBAAkB;YAGZ,kBAAkB;YAoBlB,qBAAqB;CAmBpC"}

package/build/common/deps-checker/internal/testToolChecker.js

@@ -0,0 +1,359 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestToolChecker = void 0;
+const tslib_1 = require("tslib");
+const fs = tslib_1.__importStar(require("fs-extra"));
+const os = tslib_1.__importStar(require("os"));
+const path = tslib_1.__importStar(require("path"));
+const url = tslib_1.__importStar(require("url"));
+const semver_1 = tslib_1.__importDefault(require("semver"));
+const uuid = tslib_1.__importStar(require("uuid"));
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const localizeUtils_1 = require("../../localizeUtils");
+const helpLink_1 = require("../constant/helpLink");
+const message_1 = require("../constant/message");
+const depsChecker_1 = require("../depsChecker");
+const depsError_1 = require("../depsError");
+const fileHelper_1 = require("../util/fileHelper");
+const system_1 = require("../util/system");
+const telemetry_1 = require("../constant/telemetry");
+const util_1 = require("../util");
+var InstallType;
+(function (InstallType) {
+    InstallType["Global"] = "global";
+    InstallType["Portable"] = "portable";
+})(InstallType || (InstallType = {}));
+class TestToolChecker {
+    constructor() {
+        this.name = "Teams App Test Tool";
+        this.npmPackageName = "@microsoft/teams-app-test-tool-cli";
+        this.timeout = 5 * 60 * 1000;
+        this.checkUpdateTimeout = 10 * 1000;
+        this.commandName = system_1.isWindows() ? "teamsapptester.cmd" : "teamsapptester";
+        this.portableDirName = "testTool";
+        // 7 days
+        this.defaultUpdateInterval = 7 * 24 * 60 * 60 * 1000;
+        this.telemetryProperties = {};
+    }
+    async getInstallationInfo(installOptions) {
+        const symlinkDir = path.resolve(installOptions.projectPath, installOptions.symlinkDir);
+        // check version in project devTools
+        const versionRes = await this.checkVersion(installOptions.versionRange, this.getBinFolder(symlinkDir));
+        if (versionRes.isOk()) {
+            this.telemetryProperties[telemetry_1.TelemetryProperties.SymlinkTestToolVersion] = versionRes.value;
+            return await this.getSuccessDepsInfo(versionRes.value, symlinkDir);
+        }
+        else {
+            this.telemetryProperties[telemetry_1.TelemetryProperties.SymlinkTestToolVersionError] =
+                versionRes.error.message;
+            await fileHelper_1.unlinkSymlink(symlinkDir);
+        }
+        // check version in ${HOME}/.fx/bin
+        const version = await this.findLatestInstalledPortableVersion(installOptions.versionRange);
+        if (version) {
+            const portablePath = path.join(this.getPortableVersionsDir(), version);
+            this.telemetryProperties[telemetry_1.TelemetryProperties.SelectedPortableTestToolVersion] = version;
+            await fileHelper_1.createSymlink(portablePath, symlinkDir);
+            return await this.getSuccessDepsInfo(version, symlinkDir);
+        }
+        // check global version in PATH
+        const globalVersionRes = await this.checkVersion(installOptions.versionRange);
+        if (globalVersionRes.isOk()) {
+            const version = globalVersionRes.value;
+            this.telemetryProperties[telemetry_1.TelemetryProperties.GlobalTestToolVersion] = version;
+            return this.getSuccessDepsInfo(version, undefined);
+        }
+        else {
+            this.telemetryProperties[telemetry_1.TelemetryProperties.GlobalTestToolVersionError] =
+                globalVersionRes.error.message;
+        }
+        return this.createFailureDepsInfo(installOptions.versionRange, undefined);
+    }
+    async resolve(installOptions) {
+        let installationInfo;
+        try {
+            if (!(await this.hasNode())) {
+                throw new depsError_1.NodeNotFoundError(message_1.Messages.NodeNotFound(), helpLink_1.v3NodeNotFoundHelpLink);
+            }
+            installationInfo = await this.getInstallationInfo(installOptions);
+            if (!installationInfo.isInstalled) {
+                const symlinkDir = path.resolve(installOptions.projectPath, installOptions.symlinkDir);
+                installationInfo = await this.install(installOptions.projectPath, installOptions.versionRange, symlinkDir);
+            }
+            else {
+                if (installationInfo.installType === InstallType.Portable) {
+                    const updateInstallationInfo = await this.autoUpdate(installOptions);
+                    if (updateInstallationInfo) {
+                        installationInfo = updateInstallationInfo;
+                    }
+                }
+            }
+            return installationInfo;
+        }
+        catch (error) {
+            if (error instanceof depsError_1.DepsCheckerError) {
+                return await this.createFailureDepsInfo(installOptions.versionRange, error);
+            }
+            return await this.createFailureDepsInfo(installOptions.versionRange, new depsError_1.DepsCheckerError(error.message, helpLink_1.v3DefaultHelpLink));
+        }
+    }
+    async install(projectPath, versionRange, symlinkDir) {
+        if (!(await this.hasNPM())) {
+            throw new depsError_1.DepsCheckerError(message_1.Messages.needInstallNpm(), helpLink_1.v3DefaultHelpLink);
+        }
+        const tmpVersion = `tmp-${uuid.v4().slice(0, 6)}`;
+        const tmpPath = this.getPortableInstallPath(tmpVersion);
+        await this.npmInstall(projectPath, tmpPath, versionRange);
+        const versionRes = await this.checkVersion(versionRange, this.getBinFolder(tmpPath));
+        if (versionRes.isErr()) {
+            await fileHelper_1.cleanup(tmpPath);
+            this.telemetryProperties[telemetry_1.TelemetryProperties.InstallTestToolError] = versionRes.error.message;
+            throw new depsError_1.DepsCheckerError(message_1.Messages.failToValidateTestTool(versionRes.error.message), helpLink_1.v3DefaultHelpLink);
+        }
+        const actualVersion = versionRes.value;
+        this.telemetryProperties[telemetry_1.TelemetryProperties.InstalledTestToolVersion] = actualVersion;
+        const actualPath = this.getPortableInstallPath(actualVersion);
+        await fileHelper_1.rename(tmpPath, actualPath);
+        await fileHelper_1.createSymlink(actualPath, symlinkDir);
+        await this.writeInstallInfoFile(projectPath);
+        return await this.getSuccessDepsInfo(versionRes.value, symlinkDir);
+    }
+    async hasNewVersionReleasedInRange(latestInstalledVersion, versionRange) {
+        try {
+            const result = await util_1.cpUtils.executeCommand(undefined, undefined, 
+            // avoid powershell execution policy issue.
+            { shell: system_1.isWindows() ? "cmd.exe" : true, timeout: this.checkUpdateTimeout }, "npm", "view", `"${this.npmPackageName}@${versionRange}"`, "version", "--json");
+            const versionList = JSON.parse(result);
+            if (!Array.isArray(versionList)) {
+                return true;
+            }
+            return versionList.filter((v) => semver_1.default.gt(v, latestInstalledVersion)).length > 0;
+        }
+        catch (_a) {
+            // just a best effort optimization to save one download if no recent version has been released
+            // do update if check failed
+            return true;
+        }
+    }
+    // return undefined if not updated or update failure
+    async autoUpdate(installOptions) {
+        var _a;
+        const installInfo = await this.readInstallInfoFile(installOptions.projectPath);
+        const now = new Date().getTime();
+        const updateExpired = !installInfo || now > installInfo.lastCheckTimestamp + this.defaultUpdateInterval;
+        if (!updateExpired) {
+            return undefined;
+        }
+        const latestInstalledVersion = await this.findLatestInstalledPortableVersion(installOptions.versionRange);
+        if (latestInstalledVersion !== undefined &&
+            !(await this.hasNewVersionReleasedInRange(latestInstalledVersion, installOptions.versionRange))) {
+            return undefined;
+        }
+        this.telemetryProperties[telemetry_1.TelemetryProperties.TestToolLastUpdateTimestamp] =
+            ((_a = installInfo === null || installInfo === void 0 ? void 0 : installInfo.lastCheckTimestamp) === null || _a === void 0 ? void 0 : _a.toString()) || "<never>";
+        this.telemetryProperties[telemetry_1.TelemetryProperties.TestToolUpdatePreviousVersion] =
+            latestInstalledVersion || "<undefined>";
+        const symlinkDir = path.resolve(installOptions.projectPath, installOptions.symlinkDir);
+        try {
+            return await this.install(installOptions.projectPath, installOptions.versionRange, symlinkDir);
+        }
+        catch (e) {
+            // ignore update failure and use existing version
+            if (e instanceof Error) {
+                this.telemetryProperties[telemetry_1.TelemetryProperties.TestToolUpdateError] = e.message;
+            }
+            await this.writeInstallInfoFile(installOptions.projectPath);
+            return undefined;
+        }
+    }
+    validateInstallInfoFile(data) {
+        if ("lastCheckTimestamp" in data) {
+            if (typeof data.lastCheckTimestamp === "number") {
+                return true;
+            }
+        }
+        return false;
+    }
+    async readInstallInfoFile(projectPath) {
+        const installInfoPath = this.getInstallInfoPath(projectPath);
+        try {
+            const data = await fs.readJson(installInfoPath);
+            if (this.validateInstallInfoFile(data)) {
+                return data;
+            }
+        }
+        catch (_a) {
+            // ignore invalid installation info file
+        }
+        await fileHelper_1.cleanup(installInfoPath);
+        return undefined;
+    }
+    async writeInstallInfoFile(projectPath) {
+        const projectInfoPath = this.getInstallInfoPath(projectPath);
+        const installInfo = {
+            lastCheckTimestamp: new Date().getTime(),
+        };
+        await fs.ensureDir(path.dirname(projectInfoPath));
+        await fs.writeJson(projectInfoPath, installInfo);
+    }
+    async findLatestInstalledPortableVersion(versionRange) {
+        var _a;
+        let portablePath;
+        try {
+            const portableVersionsDir = this.getPortableVersionsDir();
+            const dirs = await fs.readdir(portableVersionsDir, { withFileTypes: true });
+            const satisfiedVersions = dirs
+                .filter((dir) => dir.isDirectory() && semver_1.default.valid(dir.name) && semver_1.default.satisfies(dir.name, versionRange))
+                .map((dir) => dir.name);
+            // sort by version desc
+            satisfiedVersions.sort((a, b) => semver_1.default.rcompare(a, b));
+            // find the latest version that is working
+            for (const version of satisfiedVersions) {
+                portablePath = path.join(portableVersionsDir, version);
+                const checkVersionRes = await this.checkVersion(versionRange, this.getBinFolder(portablePath));
+                if (checkVersionRes.isOk()) {
+                    return version;
+                }
+                this.telemetryProperties[telemetry_1.TelemetryProperties.VersioningFuncVersionError] =
+                    ((_a = this.telemetryProperties[telemetry_1.TelemetryProperties.VersioningFuncVersionError]) !== null && _a !== void 0 ? _a : "") +
+                        `[${version}] ${checkVersionRes.error.message}`;
+            }
+        }
+        catch (_b) {
+            // ignore errors if portable dir doesn't exist
+        }
+        return undefined;
+    }
+    async checkVersion(versionRange, binFolder) {
+        try {
+            const actualVersion = await this.queryVersion(binFolder);
+            if (semver_1.default.satisfies(actualVersion, versionRange)) {
+                return teamsfx_api_1.ok(actualVersion);
+            }
+            else {
+                return teamsfx_api_1.err(new depsError_1.DepsCheckerError(message_1.Messages.testToolVersionNotMatch(actualVersion, versionRange), helpLink_1.v3DefaultHelpLink));
+            }
+        }
+        catch (error) {
+            return teamsfx_api_1.err(new depsError_1.DepsCheckerError(error.message, helpLink_1.v3DefaultHelpLink));
+        }
+    }
+    async queryVersion(binFolder) {
+        const execPath = binFolder ? path.resolve(binFolder, this.commandName) : this.commandName;
+        const output = await util_1.cpUtils.executeCommand(undefined, undefined, 
+        // avoid powershell execution policy issue.
+        { shell: system_1.isWindows() ? "cmd.exe" : true, timeout: this.timeout }, `"${execPath}"`, "--version");
+        return output.trim();
+    }
+    async hasNode() {
+        try {
+            await util_1.cpUtils.executeCommand(undefined, undefined, { shell: true }, "node", "--version");
+            return true;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+    async hasNPM() {
+        try {
+            await util_1.cpUtils.executeCommand(undefined, undefined, { shell: true }, "npm", "--version");
+            return true;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+    async npmInstall(projectPath, prefix, versionRange) {
+        var _a, _b;
+        let pkg;
+        // Before we release package to npm registry we can use tgz to test
+        pkg || (pkg = await this.findLocalNpmPackage(projectPath));
+        pkg || (pkg = await this.findLocalNpmPackage(path.join(projectPath, "devTools")));
+        pkg || (pkg = `${this.npmPackageName}@${versionRange}`);
+        try {
+            await util_1.cpUtils.executeCommand(undefined, undefined, 
+            // avoid powershell execution policy issue.
+            { shell: system_1.isWindows() ? "cmd.exe" : true, timeout: this.timeout }, `npm`, "install", `"${pkg}"`, "--prefix", `"${prefix}"`, "--no-audit");
+        }
+        catch (error) {
+            await fileHelper_1.cleanup(prefix);
+            // @ is incorrectly identified as an email format.
+            this.telemetryProperties[telemetry_1.TelemetryProperties.InstallTestToolError] = (_b = (_a = error.message) === null || _a === void 0 ? void 0 : _a.split(pkg)) === null || _b === void 0 ? void 0 : _b.join(pkg);
+            throw new depsError_1.DepsCheckerError(localizeUtils_1.getLocalizedString("error.common.InstallSoftwareError", this.name), helpLink_1.v3DefaultHelpLink);
+        }
+    }
+    // TODO: remove after release to npm
+    async findLocalNpmPackage(dir) {
+        try {
+            const files = await fs.readdir(dir);
+            for (const fileName of files) {
+                const fullPath = path.join(dir, fileName);
+                if (fileName.match(/microsoft-teams-app-test-tool-cli.*\.tgz/i)) {
+                    try {
+                        const st = await fs.stat(fullPath);
+                        if (st.isFile()) {
+                            // encode special characters in path
+                            return url.pathToFileURL(fullPath).toString();
+                        }
+                    }
+                    catch (_a) {
+                        // ignore invalid files
+                    }
+                }
+            }
+        }
+        catch (_b) {
+            // local npm package error should not block
+        }
+        return undefined;
+    }
+    getBinFolder(installPath) {
+        return path.join(installPath, "node_modules", ".bin");
+    }
+    getPortableVersionsDir() {
+        return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "bin", this.portableDirName);
+    }
+    getPortableInstallPath(version) {
+        return path.join(this.getPortableVersionsDir(), version);
+    }
+    getInstallInfoPath(projectDir) {
+        return path.join(projectDir, "devTools", ".testTool.installInfo.json");
+    }
+    async getSuccessDepsInfo(version, binFolder) {
+        return Promise.resolve({
+            name: this.name,
+            type: depsChecker_1.DepsType.TestTool,
+            isInstalled: true,
+            command: this.commandName,
+            details: {
+                isLinuxSupported: true,
+                supportedVersions: [],
+                binFolders: binFolder ? [binFolder] : [],
+                installVersion: version,
+            },
+            telemetryProperties: this.telemetryProperties,
+            error: undefined,
+            installType: binFolder ? InstallType.Portable : InstallType.Global,
+        });
+    }
+    async createFailureDepsInfo(version, error) {
+        return Promise.resolve({
+            name: this.name,
+            type: depsChecker_1.DepsType.TestTool,
+            isInstalled: false,
+            command: this.commandName,
+            details: {
+                isLinuxSupported: true,
+                supportedVersions: [],
+                binFolders: [],
+                installVersion: version,
+            },
+            telemetryProperties: this.telemetryProperties,
+            error: error,
+        });
+    }
+}
+exports.TestToolChecker = TestToolChecker;
+//# sourceMappingURL=testToolChecker.js.map

package/build/common/deps-checker/internal/testToolChecker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"testToolChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/testToolChecker.ts"],"names":[],"mappings":"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"}

package/build/common/deps-checker/util/cpUtils.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import * as cp from "child_process";
 export interface DebugLogger {
-    debug(message: string): Promise<boolean>;
+    debug(message: string): void;
 }
 export declare namespace cpUtils {
     function executeCommand(workingDirectory: string | undefined, logger: DebugLogger | undefined, options: cp.SpawnOptions | undefined, command: string, ...args: string[]): Promise<string>;

package/build/common/deps-checker/util/cpUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cpUtils.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/cpUtils.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAGpC,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1C;AAED,yBAAiB,OAAO,CAAC;IACvB,SAAsB,cAAc,CAClC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,EAAE,EAAE,CAAC,YAAY,GAAG,SAAS,EACpC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAkBjB;IAED,SAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,iBAAiB,EAAE,EAAE,CAAC,YAAY,GAAG,SAAS,EAC9C,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,cAAc,CAAC,CAwEzB;IAED,UAAiB,cAAc;QAC7B,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,MAAM,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB;IAID;;OAEG;IACH,SAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;IAED;;OAEG;IACH,SAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAO5F;CACF"}
+{"version":3,"file":"cpUtils.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/cpUtils.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAGpC,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,yBAAiB,OAAO,CAAC;IACvB,SAAsB,cAAc,CAClC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,EAAE,EAAE,CAAC,YAAY,GAAG,SAAS,EACpC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAkBjB;IAED,SAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,iBAAiB,EAAE,EAAE,CAAC,YAAY,GAAG,SAAS,EAC9C,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,cAAc,CAAC,CAwEzB;IAED,UAAiB,cAAc;QAC7B,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,MAAM,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB;IAID;;OAEG;IACH,SAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;IAED;;OAEG;IACH,SAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAO5F;CACF"}

package/build/common/deps-checker/util/cpUtils.js

@@ -14,11 +14,11 @@ var cpUtils;
         if (result.code !== 0) {
             const errorMessage = `Failed to run command: "${command} ${result.formattedArgs}", code: "${result.code}",
                             output: "${result.cmdOutput}", error: "${result.cmdOutputIncludingStderr}"`;
-            await (logger === null || logger === void 0 ? void 0 : logger.debug(errorMessage));
+            logger === null || logger === void 0 ? void 0 : logger.debug(errorMessage);
             throw new Error(errorMessage);
         }
         else {
-            await (logger === null || logger === void 0 ? void 0 : logger.debug(`Finished running command: "${command} ${result.formattedArgs}".`));
+            logger === null || logger === void 0 ? void 0 : logger.debug(`Finished running command: "${command} ${result.formattedArgs}".`);
         }
         return result.cmdOutput;
     }
@@ -42,7 +42,7 @@ var cpUtils;
                 timer = setTimeout(() => {
                     childProc.kill();
                     logger === null || logger === void 0 ? void 0 : logger.debug(`Stop exec due to timeout, command: "${command} ${formattedArgs}", options = '${JSON.stringify(options)}'`);
-                    reject(new Error(`Exec command: "${command} ${formattedArgs}" timeout, ${options.timeout} ms`));
+                    reject(new Error(`Exec command: "${command} ${formattedArgs}" timeout, ${options.timeout || 0} ms`));
                 }, options.timeout);
             }
             logger === null || logger === void 0 ? void 0 : logger.debug(`Running command: "${command} ${formattedArgs}", options = '${JSON.stringify(options)}'`);
@@ -56,7 +56,7 @@ var cpUtils;
                 cmdOutputIncludingStderr = cmdOutputIncludingStderr.concat(data);
             });
             childProc.on("error", (error) => {
-                logger === null || logger === void 0 ? void 0 : logger.debug(`Failed to run command '${command} ${formattedArgs}': cmdOutputIncludingStderr: '${cmdOutputIncludingStderr}', error: ${error}`);
+                logger === null || logger === void 0 ? void 0 : logger.debug(`Failed to run command '${command} ${formattedArgs}': cmdOutputIncludingStderr: '${cmdOutputIncludingStderr}', error: ${error.toString()}`);
                 if (timer) {
                     clearTimeout(timer);
                 }

package/build/common/deps-checker/util/cpUtils.js.map

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

package/build/common/deps-checker/util/fileHelper.d.ts

@@ -1,4 +1,5 @@
 export declare function unlinkSymlink(linkFilePath: string): Promise<void>;
 export declare function createSymlink(target: string, linkFilePath: string): Promise<void>;
 export declare function rename(oldPath: string, newPath: string): Promise<void>;
+export declare function cleanup(path: string): Promise<void>;
 //# sourceMappingURL=fileHelper.d.ts.map

package/build/common/deps-checker/util/fileHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileHelper.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/fileHelper.ts"],"names":[],"mappings":"AAWA,wBAAsB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYvE;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAavF;AAED,wBAAsB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5E"}
+{"version":3,"file":"fileHelper.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/fileHelper.ts"],"names":[],"mappings":"AAWA,wBAAsB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYvE;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAavF;AAED,wBAAsB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5E;AAGD,wBAAsB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIzD"}

package/build/common/deps-checker/util/fileHelper.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rename = exports.createSymlink = exports.unlinkSymlink = void 0;
+exports.cleanup = exports.rename = exports.createSymlink = exports.unlinkSymlink = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author Xiaofu Huang <xiaofhua@microsoft.com>
@@ -44,4 +44,12 @@ async function rename(oldPath, newPath) {
     await fs.rename(oldPath, newPath);
 }
 exports.rename = rename;
+// sliently remove file or dir
+async function cleanup(path) {
+    try {
+        await fs.remove(path);
+    }
+    catch (_a) { }
+}
+exports.cleanup = cleanup;
 //# sourceMappingURL=fileHelper.js.map

package/build/common/deps-checker/util/fileHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileHelper.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/fileHelper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,qDAA+B;AAC/B,mDAAyD;AACzD,iDAA+C;AAC/C,4CAAgD;AAEzC,KAAK,UAAU,aAAa,CAAC,YAAoB;IACtD,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE;YACzB,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;SAC/B;KACF;IAAC,OAAO,KAAc,EAAE;QACvB,MAAM,SAAS,GAAG,KAA0B,CAAC;QAC7C,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC/B,MAAM,KAAK,CAAC;SACb;KACF;AACH,CAAC;AAZD,sCAYC;AAEM,KAAK,UAAU,aAAa,CAAC,MAAc,EAAE,YAAoB;IACtE,MAAM,aAAa,CAAC,YAAY,CAAC,CAAC;IAClC,sCAAsC;IACtC,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QACrC,MAAM,IAAI,4BAAgB,CAAC,kBAAQ,CAAC,sBAAsB,EAAE,EAAE,4BAAiB,CAAC,CAAC;KAClF;IAED,OAAO,MAAM,EAAE,CAAC,aAAa,CAC3B,MAAM,EACN,YAAY;IACZ,mHAAmH;IACnH,UAAU,CACX,CAAC;AACJ,CAAC;AAbD,sCAaC;AAEM,KAAK,UAAU,MAAM,CAAC,OAAe,EAAE,OAAe;IAC3D,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAChC,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC1B;IACD,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC;AALD,wBAKC"}
+{"version":3,"file":"fileHelper.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/fileHelper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,qDAA+B;AAC/B,mDAAyD;AACzD,iDAA+C;AAC/C,4CAAgD;AAEzC,KAAK,UAAU,aAAa,CAAC,YAAoB;IACtD,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE;YACzB,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;SAC/B;KACF;IAAC,OAAO,KAAc,EAAE;QACvB,MAAM,SAAS,GAAG,KAA0B,CAAC;QAC7C,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC/B,MAAM,KAAK,CAAC;SACb;KACF;AACH,CAAC;AAZD,sCAYC;AAEM,KAAK,UAAU,aAAa,CAAC,MAAc,EAAE,YAAoB;IACtE,MAAM,aAAa,CAAC,YAAY,CAAC,CAAC;IAClC,sCAAsC;IACtC,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QACrC,MAAM,IAAI,4BAAgB,CAAC,kBAAQ,CAAC,sBAAsB,EAAE,EAAE,4BAAiB,CAAC,CAAC;KAClF;IAED,OAAO,MAAM,EAAE,CAAC,aAAa,CAC3B,MAAM,EACN,YAAY;IACZ,mHAAmH;IACnH,UAAU,CACX,CAAC;AACJ,CAAC;AAbD,sCAaC;AAEM,KAAK,UAAU,MAAM,CAAC,OAAe,EAAE,OAAe;IAC3D,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAChC,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC1B;IACD,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC;AALD,wBAKC;AAED,8BAA8B;AACvB,KAAK,UAAU,OAAO,CAAC,IAAY;IACxC,IAAI;QACF,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;KACvB;IAAC,WAAM,GAAE;AACZ,CAAC;AAJD,0BAIC"}

package/build/common/deps-checker/util/progressIndicator.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runWithProgressIndicator = void 0;
 const downloadIndicatorInterval = 1000; // same as vscode-dotnet-runtime
 async function runWithProgressIndicator(callback, logger) {
-    const timer = setInterval(async () => await logger.append("."), downloadIndicatorInterval);
+    const timer = setInterval(() => logger.append("."), downloadIndicatorInterval);
     try {
         await callback();
     }
     finally {
         clearTimeout(timer);
-        await logger.appendLine("");
+        logger.appendLine("");
     }
 }
 exports.runWithProgressIndicator = runWithProgressIndicator;

package/build/common/deps-checker/util/progressIndicator.js.map

@@ -1 +1 @@
-{"version":3,"file":"progressIndicator.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/progressIndicator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,MAAM,yBAAyB,GAAG,IAAI,CAAC,CAAC,gCAAgC;AAEjE,KAAK,UAAU,wBAAwB,CAC5C,QAA6B,EAC7B,MAAkB;IAElB,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,yBAAyB,CAAC,CAAC;IAC3F,IAAI;QACF,MAAM,QAAQ,EAAE,CAAC;KAClB;YAAS;QACR,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;KAC7B;AACH,CAAC;AAXD,4DAWC"}
+{"version":3,"file":"progressIndicator.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/progressIndicator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,MAAM,yBAAyB,GAAG,IAAI,CAAC,CAAC,gCAAgC;AAEjE,KAAK,UAAU,wBAAwB,CAC5C,QAA6B,EAC7B,MAAkB;IAElB,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,yBAAyB,CAAC,CAAC;IAC/E,IAAI;QACF,MAAM,QAAQ,EAAE,CAAC;KAClB;YAAS;QACR,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;KACvB;AACH,CAAC;AAXD,4DAWC"}

package/build/common/featureFlags.d.ts

@@ -8,5 +8,7 @@ export declare function isV3Enabled(): boolean;
 export declare function isVideoFilterEnabled(): boolean;
 export declare function isImportSPFxEnabled(): boolean;
 export declare function isCopilotPluginEnabled(): boolean;
+export declare function isApiCopilotPluginEnabled(): boolean;
 export declare function isCliNewUxEnabled(): boolean;
+export declare function isTestToolEnabled(): boolean;
 //# sourceMappingURL=featureFlags.d.ts.map